diff --git a/.gitignore b/.gitignore
index 9da4d972909ecdc0cd5661e4b687f69a139167c4..fe89c74ab38864939d737fa40f8ff0671e5c6372 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,6 +16,10 @@ apps/*
!apps/user_ldap
!apps/user_webdavauth
+# ignore themes except the README
+themes/*
+!themes/README
+
# just sane ignores
.*.sw[po]
*.bak
@@ -72,4 +76,4 @@ nbproject
data-autotest
/tests/coverage*
/tests/autoconfig*
-/tests/autotest*
+/tests/autotest*
\ No newline at end of file
diff --git a/.htaccess b/.htaccess
index 201e0d605b72dc893a5680df1f89328a31912386..08e2a82facbfc2a80ef95eb21a3533de1136bc3f 100755
--- a/.htaccess
+++ b/.htaccess
@@ -12,6 +12,7 @@ ErrorDocument 404 /core/templates/404.php
php_value upload_max_filesize 513M
php_value post_max_size 513M
php_value memory_limit 512M
+php_value mbstring.func_overload 0
SetEnv htaccessWorking true
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 3f3cf20e9a59c7bd44db857abae8bba8adf74bb2..fd87513ec2a86c870ace782ab9ec8282a1017307 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -12,11 +12,12 @@ If you have questions about how to use ownCloud, please direct these to the [mai
- Apps:
- [Bookmarks](https://github.com/owncloud/bookmarks/issues)
- [Calendar](https://github.com/owncloud/calendar/issues)
+ - [Contacts](https://github.com/owncloud/contacts/issues)
- [Mail](https://github.com/owncloud/mail/issues)
- [News](https://github.com/owncloud/news/issues)
- [Notes](https://github.com/owncloud/notes/issues)
- [Shorty](https://github.com/owncloud/shorty/issues)
- - [other apps](https://github.com/owncloud/apps/issues) (e.g. Contacts, Pictures, Music, ...)
+ - [other apps](https://github.com/owncloud/apps/issues) (e.g. Pictures, Music, Tasks, ...)
If your issue appears to be a bug, and hasn't been reported, open a new issue.
diff --git a/apps/files/ajax/newfile.php b/apps/files/ajax/newfile.php
index 38714f34a639fa5bc8a9aa4a00c69833b23e20ad..8548fc95ddf963d6ef131b8b94fa808a5d547e21 100644
--- a/apps/files/ajax/newfile.php
+++ b/apps/files/ajax/newfile.php
@@ -85,7 +85,7 @@ if($source) {
}elseif(\OC\Files\Filesystem::touch($dir . '/' . $filename)) {
$meta = \OC\Files\Filesystem::getFileInfo($dir.'/'.$filename);
$id = $meta['fileid'];
- OCP\JSON::success(array("data" => array('content'=>$content, 'id' => $id)));
+ OCP\JSON::success(array("data" => array('content'=>$content, 'id' => $id, 'mime' => $meta['mimetype'])));
exit();
}
}
diff --git a/apps/files/ajax/rawlist.php b/apps/files/ajax/rawlist.php
index 1cd2944483cb337e547296224881252ebd4fc9d2..f568afad4da44f87f4d74cd301cee93202c8aa9b 100644
--- a/apps/files/ajax/rawlist.php
+++ b/apps/files/ajax/rawlist.php
@@ -15,6 +15,14 @@ $mimetype = isset($_GET['mimetype']) ? $_GET['mimetype'] : '';
// make filelist
$files = array();
+// If a type other than directory is requested first load them.
+if($mimetype && strpos($mimetype, 'httpd/unix-directory') === false) {
+ foreach( \OC\Files\Filesystem::getDirectoryContent( $dir, 'httpd/unix-directory' ) as $i ) {
+ $i["date"] = OCP\Util::formatDate($i["mtime"] );
+ $i['mimetype_icon'] = $i['type'] == 'dir' ? \mimetype_icon('dir'): \mimetype_icon($i['mimetype']);
+ $files[] = $i;
+ }
+}
foreach( \OC\Files\Filesystem::getDirectoryContent( $dir, $mimetype ) as $i ) {
$i["date"] = OCP\Util::formatDate($i["mtime"] );
$i['mimetype_icon'] = $i['type'] == 'dir' ? \mimetype_icon('dir'): \mimetype_icon($i['mimetype']);
diff --git a/apps/files/ajax/rename.php b/apps/files/ajax/rename.php
index 9fd2ce3ad4bc6d548aeb3a609e45863707ea7df7..f4551858283a21adb152160339bea773dc938113 100644
--- a/apps/files/ajax/rename.php
+++ b/apps/files/ajax/rename.php
@@ -1,26 +1,41 @@
.
+ *
+ */
OCP\JSON::checkLoggedIn();
OCP\JSON::callCheck();
-// Get data
-$dir = stripslashes($_GET["dir"]);
-$file = stripslashes($_GET["file"]);
-$newname = stripslashes($_GET["newname"]);
-
-$l = OC_L10N::get('files');
+$files = new \OCA\Files\App(
+ \OC\Files\Filesystem::getView(),
+ \OC_L10n::get('files')
+);
+$result = $files->rename(
+ $_GET["dir"],
+ $_GET["file"],
+ $_GET["newname"]
+);
-if ( $newname !== '.' and ($dir != '' || $file != 'Shared') and $newname !== '.') {
- $targetFile = \OC\Files\Filesystem::normalizePath($dir . '/' . $newname);
- $sourceFile = \OC\Files\Filesystem::normalizePath($dir . '/' . $file);
- if(\OC\Files\Filesystem::rename($sourceFile, $targetFile)) {
- OCP\JSON::success(array("data" => array( "dir" => $dir, "file" => $file, "newname" => $newname )));
- } else {
- OCP\JSON::error(array("data" => array( "message" => $l->t("Unable to rename file") )));
- }
-}else{
- OCP\JSON::error(array("data" => array( "message" => $l->t("Unable to rename file") )));
-}
+if($result['success'] === true){
+ OCP\JSON::success(array('data' => $result['data']));
+} else {
+ OCP\JSON::error(array('data' => $result['data']));
+}
\ No newline at end of file
diff --git a/apps/files/appinfo/app.php b/apps/files/appinfo/app.php
index 703b1c7cb6cd3c235010c6707336f7f83dabfcde..05ab1722b3e4f5411bb32671bb69dd03582ecd86 100644
--- a/apps/files/appinfo/app.php
+++ b/apps/files/appinfo/app.php
@@ -18,4 +18,6 @@ OC_Search::registerProvider('OC_Search_Provider_File');
\OC_Hook::connect('OC_Filesystem', 'post_write', '\OC\Files\Cache\Updater', 'writeHook');
\OC_Hook::connect('OC_Filesystem', 'post_touch', '\OC\Files\Cache\Updater', 'touchHook');
\OC_Hook::connect('OC_Filesystem', 'post_delete', '\OC\Files\Cache\Updater', 'deleteHook');
-\OC_Hook::connect('OC_Filesystem', 'post_rename', '\OC\Files\Cache\Updater', 'renameHook');
\ No newline at end of file
+\OC_Hook::connect('OC_Filesystem', 'post_rename', '\OC\Files\Cache\Updater', 'renameHook');
+
+\OC_BackgroundJob_RegularTask::register('\OC\Files\Cache\BackgroundWatcher', 'checkNext');
diff --git a/apps/files/css/files.css b/apps/files/css/files.css
index ec323915b4431a6b67b979f0f2b863a39fc61557..f788949b1b62feb82a07a8d6eb3f733f2a0f846e 100644
--- a/apps/files/css/files.css
+++ b/apps/files/css/files.css
@@ -5,7 +5,8 @@
/* FILE MENU */
.actions { padding:.3em; height:2em; width: 100%; }
.actions input, .actions button, .actions .button { margin:0; float:left; }
-
+.actions .button a { color: #555; }
+.actions .button a:hover, .actions .button a:active { color: #333; }
#new {
height:17px; margin:0 0 0 1em; z-index:1010; float:left;
}
@@ -34,6 +35,7 @@
background-image:url('%webroot%/core/img/actions/upload.svg');
background-repeat:no-repeat;
background-position:7px 6px;
+ opacity:0.65;
}
.file_upload_target { display:none; }
.file_upload_form { display:inline; float:left; margin:0; padding:0; cursor:pointer; overflow:visible; }
@@ -148,7 +150,7 @@ a.action>img { max-height:16px; max-width:16px; vertical-align:text-bottom; }
#scanning-message{ top:40%; left:40%; position:absolute; display:none; }
-div.crumb a{ padding:0.9em 0 0.7em 0; }
+div.crumb a{ padding:0.9em 0 0.7em 0; color:#555; }
table.dragshadow {
width:auto;
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index b1e9a885063e735d1f394a0750c4922bce4ebbb7..c24d1fd8244dd124d781e41f140cae700b6bb528 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -191,6 +191,13 @@ var FileList={
td.children('a.name').hide();
td.append(form);
input.focus();
+ //preselect input
+ var len = input.val().lastIndexOf('.');
+ if (len === -1) {
+ len = input.val().length;
+ }
+ input.selectRange(0,len);
+
form.submit(function(event){
event.stopPropagation();
event.preventDefault();
diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index a2d17fae7d2f48d207f4eb74ac07d957fe272834..a15f0588f9f3cec5ac8e589772e0809b132f7341 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -115,6 +115,11 @@ $(document).ready(function() {
return false;
});
+ // Trigger cancelling of file upload
+ $('#uploadprogresswrapper .stop').on('click', function() {
+ Files.cancelUploads();
+ });
+
// Show trash bin
$('#trash a').live('click', function() {
window.location=OC.filePath('files_trashbin', '', 'index.php');
@@ -506,9 +511,9 @@ $(document).ready(function() {
var date=new Date();
FileList.addFile(name,0,date,false,hidden);
var tr=$('tr').filterAttr('data-file',name);
- tr.attr('data-mime','text/plain');
+ tr.attr('data-mime',result.data.mime);
tr.attr('data-id', result.data.id);
- getMimeIcon('text/plain',function(path){
+ getMimeIcon(result.data.mime,function(path){
tr.find('td.filename').attr('style','background-image:url('+path+')');
});
} else {
diff --git a/apps/files/l10n/ar.php b/apps/files/l10n/ar.php
index ac0822d4519e2285a4e67d153a1cf80ef2713fc7..ca198b7efe95a31501f411f6f7d644addd3c0b54 100644
--- a/apps/files/l10n/ar.php
+++ b/apps/files/l10n/ar.php
@@ -1,7 +1,6 @@
"فشل في نقل الملف %s - يوجد ملف بنفس هذا الاسم",
"Could not move %s" => "فشل في نقل %s",
-"Unable to rename file" => "فشل في اعادة تسمية الملف",
"No file was uploaded. Unknown error" => "لم يتم رفع أي ملف , خطأ غير معروف",
"There is no error, the file uploaded with success" => "تم ترفيع الملفات بنجاح.",
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "حجم الملف المرفوع تجاوز قيمة upload_max_filesize الموجودة في ملف php.ini ",
@@ -15,7 +14,7 @@
"Files" => "الملفات",
"Share" => "شارك",
"Delete permanently" => "حذف بشكل دائم",
-"Delete" => "محذوف",
+"Delete" => "إلغاء",
"Rename" => "إعادة تسميه",
"Pending" => "قيد الانتظار",
"{new_name} already exists" => "{new_name} موجود مسبقا",
@@ -38,14 +37,15 @@
"URL cannot be empty." => "عنوان ال URL لا يجوز أن يكون فارغا.",
"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "إسم مجلد غير صحيح. استخدام مصطلح \"Shared\" محجوز للنظام",
"Error" => "خطأ",
-"Name" => "الاسم",
+"Name" => "اسم",
"Size" => "حجم",
"Modified" => "معدل",
"1 folder" => "مجلد عدد 1",
"{count} folders" => "{count} مجلدات",
"1 file" => "ملف واحد",
"{count} files" => "{count} ملفات",
-"Upload" => "إرفع",
+"Unable to rename file" => "فشل في اعادة تسمية الملف",
+"Upload" => "رفع",
"File handling" => "التعامل مع الملف",
"Maximum upload size" => "الحد الأقصى لحجم الملفات التي يمكن رفعها",
"max. possible: " => "الحد الأقصى المسموح به",
diff --git a/apps/files/l10n/bg_BG.php b/apps/files/l10n/bg_BG.php
index 519fbffb761bb75db9b0e335f051c35b76c5664f..661bb5718aea16680b2b61b4c9efa8aaafb42dd0 100644
--- a/apps/files/l10n/bg_BG.php
+++ b/apps/files/l10n/bg_BG.php
@@ -1,4 +1,8 @@
"Файлът е качен успешно",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Файлът който се опитвате да качите надвишава стойностите в MAX_FILE_SIZE в HTML формата.",
+"The uploaded file was only partially uploaded" => "Файлът е качен частично",
+"No file was uploaded" => "Фахлът не бе качен",
"Missing a temporary folder" => "Липсва временна папка",
"Failed to write to disk" => "Възникна проблем при запис в диска",
"Invalid directory." => "Невалидна директория.",
@@ -30,5 +34,7 @@
"Cancel upload" => "Спри качването",
"Nothing in here. Upload something!" => "Няма нищо тук. Качете нещо.",
"Download" => "Изтегляне",
-"Upload too large" => "Файлът който сте избрали за качване е прекалено голям"
+"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." => "Файловете се претърсват, изчакайте."
);
diff --git a/apps/files/l10n/bn_BD.php b/apps/files/l10n/bn_BD.php
index e49ac5f26280fcccd91d3ff4d880806438c6f545..83dd4dc36dc2a73e84bb1aad4a0013953e4a6e34 100644
--- a/apps/files/l10n/bn_BD.php
+++ b/apps/files/l10n/bn_BD.php
@@ -1,19 +1,18 @@
"%s কে স্থানান্তর করা সম্ভব হলো না - এই নামের ফাইল বিদ্যমান",
"Could not move %s" => "%s কে স্থানান্তর করা সম্ভব হলো না",
-"Unable to rename file" => "ফাইলের নাম পরিবর্তন করা সম্ভব হলো না",
-"No file was uploaded. Unknown error" => "কোন ফাইল আপলোড করা হয় নি। সমস্যা অজ্ঞাত।",
-"There is no error, the file uploaded with success" => "কোন সমস্যা নেই, ফাইল আপলোড সুসম্পন্ন হয়েছে",
+"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 তে বর্ণিত upload_max_filesize নির্দেশিত আয়তন অতিক্রম করছেঃ",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "আপলোড করা ফাইলটি HTML ফর্মে নির্ধারিত MAX_FILE_SIZE নির্দেশিত সর্বোচ্চ আকার অতিক্রম করেছে ",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "আপলোড করা ফাইলটি HTML ফর্মে উল্লিখিত MAX_FILE_SIZE নির্ধারিত ফাইলের সর্বোচ্চ আকার অতিক্রম করতে চলেছে ",
"The uploaded file was only partially uploaded" => "আপলোড করা ফাইলটি আংশিক আপলোড করা হয়েছে",
"No file was uploaded" => "কোন ফাইল আপলোড করা হয় নি",
-"Missing a temporary folder" => "অস্থায়ী ফোল্ডার খোয়া গিয়েছে",
+"Missing a temporary folder" => "অস্থায়ী ফোল্ডারটি হারানো গিয়েছে",
"Failed to write to disk" => "ডিস্কে লিখতে ব্যর্থ",
"Invalid directory." => "ভুল ডিরেক্টরি",
"Files" => "ফাইল",
"Share" => "ভাগাভাগি কর",
-"Delete" => "মুছে ফেল",
+"Delete" => "মুছে",
"Rename" => "পূনঃনামকরণ",
"Pending" => "মুলতুবি",
"{new_name} already exists" => "{new_name} টি বিদ্যমান",
@@ -33,13 +32,14 @@
"URL cannot be empty." => "URL ফাঁকা রাখা যাবে না।",
"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "ফোল্ডারের নামটি সঠিক নয়। 'ভাগাভাগি করা' শুধুমাত্র Owncloud এর জন্য সংরক্ষিত।",
"Error" => "সমস্যা",
-"Name" => "নাম",
+"Name" => "রাম",
"Size" => "আকার",
"Modified" => "পরিবর্তিত",
"1 folder" => "১টি ফোল্ডার",
"{count} folders" => "{count} টি ফোল্ডার",
"1 file" => "১টি ফাইল",
"{count} files" => "{count} টি ফাইল",
+"Unable to rename file" => "ফাইলের নাম পরিবর্তন করা সম্ভব হলো না",
"Upload" => "আপলোড",
"File handling" => "ফাইল হ্যার্ডলিং",
"Maximum upload size" => "আপলোডের সর্বোচ্চ আকার",
@@ -48,7 +48,7 @@
"Enable ZIP-download" => "ZIP ডাউনলোড সক্রিয় কর",
"0 is unlimited" => "০ এর অর্থ অসীম",
"Maximum input size for ZIP files" => "ZIP ফাইলের ইনপুটের সর্বোচ্চ আকার",
-"Save" => "সংরক্ষন কর",
+"Save" => "সংরক্ষণ",
"New" => "নতুন",
"Text file" => "টেক্সট ফাইল",
"Folder" => "ফোল্ডার",
diff --git a/apps/files/l10n/ca.php b/apps/files/l10n/ca.php
index 0f40e66df86f85aa18456dcc9146a66846430dc9..f34c9f59cf54b3cd7885b83b4d7fa9a2c7383a87 100644
--- a/apps/files/l10n/ca.php
+++ b/apps/files/l10n/ca.php
@@ -1,23 +1,22 @@
"No s'ha pogut moure %s - Ja hi ha un fitxer amb aquest nom",
"Could not move %s" => " No s'ha pogut moure %s",
-"Unable to rename file" => "No es pot canviar el nom del fitxer",
"No file was uploaded. Unknown error" => "No s'ha carregat cap fitxer. Error desconegut",
-"There is no error, the file uploaded with success" => "El fitxer s'ha pujat correctament",
+"There is no error, the file uploaded with success" => "No hi ha errors, el fitxer s'ha carregat correctament",
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "L’arxiu que voleu carregar supera el màxim definit en la directiva upload_max_filesize del php.ini:",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "El fitxer de pujada excedeix la directiva MAX_FILE_SIZE especificada al formulari HTML",
-"The uploaded file was only partially uploaded" => "El fitxer només s'ha pujat parcialment",
-"No file was uploaded" => "El fitxer no s'ha pujat",
-"Missing a temporary folder" => "S'ha perdut un fitxer temporal",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "El fitxer carregat supera la directiva MAX_FILE_SIZE especificada al formulari HTML",
+"The uploaded file was only partially uploaded" => "El fitxer només s'ha carregat parcialment",
+"No file was uploaded" => "No s'ha carregat cap fitxer",
+"Missing a temporary folder" => "Falta un fitxer temporal",
"Failed to write to disk" => "Ha fallat en escriure al disc",
"Not enough storage available" => "No hi ha prou espai disponible",
"Invalid directory." => "Directori no vàlid.",
"Files" => "Fitxers",
"Share" => "Comparteix",
"Delete permanently" => "Esborra permanentment",
-"Delete" => "Suprimeix",
+"Delete" => "Esborra",
"Rename" => "Reanomena",
-"Pending" => "Pendents",
+"Pending" => "Pendent",
"{new_name} already exists" => "{new_name} ja existeix",
"replace" => "substitueix",
"suggest name" => "sugereix un nom",
@@ -47,6 +46,8 @@
"{count} folders" => "{count} carpetes",
"1 file" => "1 fitxer",
"{count} files" => "{count} fitxers",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Nom de carpeta no vàlid. L'ús de 'Shared' està reservat per Owncloud",
+"Unable to rename file" => "No es pot canviar el nom del fitxer",
"Upload" => "Puja",
"File handling" => "Gestió de fitxers",
"Maximum upload size" => "Mida màxima de pujada",
@@ -56,7 +57,7 @@
"0 is unlimited" => "0 és sense límit",
"Maximum input size for ZIP files" => "Mida màxima d'entrada per fitxers ZIP",
"Save" => "Desa",
-"New" => "Nou",
+"New" => "Nova",
"Text file" => "Fitxer de text",
"Folder" => "Carpeta",
"From link" => "Des d'enllaç",
diff --git a/apps/files/l10n/cs_CZ.php b/apps/files/l10n/cs_CZ.php
index 1d7cdd2718a14990f92abff0cfe6d70c5810d631..de6a15424212d891a01bf270a991c85ceedb9461 100644
--- a/apps/files/l10n/cs_CZ.php
+++ b/apps/files/l10n/cs_CZ.php
@@ -1,7 +1,6 @@
"Nelze přesunout %s - existuje soubor se stejným názvem",
"Could not move %s" => "Nelze přesunout %s",
-"Unable to rename file" => "Nelze přejmenovat soubor",
"No file was uploaded. Unknown error" => "Soubor nebyl odeslán. Neznámá chyba",
"There is no error, the file uploaded with success" => "Soubor byl odeslán úspěšně",
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Odesílaný soubor přesahuje velikost upload_max_filesize povolenou v php.ini:",
@@ -17,7 +16,7 @@
"Delete permanently" => "Trvale odstranit",
"Delete" => "Smazat",
"Rename" => "Přejmenovat",
-"Pending" => "Čekající",
+"Pending" => "Nevyřízené",
"{new_name} already exists" => "{new_name} již existuje",
"replace" => "nahradit",
"suggest name" => "navrhnout název",
@@ -33,7 +32,7 @@
"Your storage is full, files can not be updated or synced anymore!" => "Vaše úložiště je plné, nelze aktualizovat ani synchronizovat soubory.",
"Your storage is almost full ({usedSpacePercent}%)" => "Vaše úložiště je téměř plné ({usedSpacePercent}%)",
"Your download is being prepared. This might take some time if the files are big." => "Vaše soubory ke stažení se připravují. Pokud jsou velké může to chvíli trvat.",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Nelze odeslat Váš soubor, protože je to adresář nebo má velikost 0 bajtů",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Nelze odeslat Váš soubor, protože je to adresář, nebo je jeho velikost 0 bajtů",
"Not enough space available" => "Nedostatek dostupného místa",
"Upload cancelled." => "Odesílání zrušeno.",
"File upload is in progress. Leaving the page now will cancel the upload." => "Probíhá odesílání souboru. Opuštění stránky vyústí ve zrušení nahrávání.",
@@ -42,11 +41,12 @@
"Error" => "Chyba",
"Name" => "Název",
"Size" => "Velikost",
-"Modified" => "Změněno",
+"Modified" => "Upraveno",
"1 folder" => "1 složka",
"{count} folders" => "{count} složky",
"1 file" => "1 soubor",
"{count} files" => "{count} soubory",
+"Unable to rename file" => "Nelze přejmenovat soubor",
"Upload" => "Odeslat",
"File handling" => "Zacházení se soubory",
"Maximum upload size" => "Maximální velikost pro odesílání",
@@ -66,7 +66,7 @@
"Nothing in here. Upload something!" => "Žádný obsah. Nahrajte něco.",
"Download" => "Stáhnout",
"Unshare" => "Zrušit sdílení",
-"Upload too large" => "Odeslaný soubor je příliš velký",
+"Upload too large" => "Odesílaný soubor je příliš velký",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Soubory, které se snažíte odeslat, překračují limit velikosti odesílání na tomto serveru.",
"Files are being scanned, please wait." => "Soubory se prohledávají, prosím čekejte.",
"Current scanning" => "Aktuální prohledávání",
diff --git a/apps/files/l10n/cy_GB.php b/apps/files/l10n/cy_GB.php
index 6ec0e7f914f85805bdd8f99e6423d3e48b98031f..ae3394889109c7c433750946b7d7c856e793ec89 100644
--- a/apps/files/l10n/cy_GB.php
+++ b/apps/files/l10n/cy_GB.php
@@ -1,7 +1,6 @@
"Methwyd symud %s - Mae ffeil gyda'r enw hwn eisoes yn bodoli",
"Could not move %s" => "Methwyd symud %s",
-"Unable to rename file" => "Methu ailenwi ffeil",
"No file was uploaded. Unknown error" => "Ni lwythwyd ffeil i fyny. Gwall anhysbys.",
"There is no error, the file uploaded with success" => "Does dim gwall, llwythodd y ffeil i fyny'n llwyddiannus",
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Mae'r ffeil lwythwyd i fyny'n fwy na chyfarwyddeb upload_max_filesize yn php.ini:",
@@ -47,6 +46,7 @@
"{count} folders" => "{count} plygell",
"1 file" => "1 ffeil",
"{count} files" => "{count} ffeil",
+"Unable to rename file" => "Methu ailenwi ffeil",
"Upload" => "Llwytho i fyny",
"File handling" => "Trafod ffeiliau",
"Maximum upload size" => "Maint mwyaf llwytho i fyny",
diff --git a/apps/files/l10n/da.php b/apps/files/l10n/da.php
index 785365a2fb4cf5b4bd70fb455661f829cae9a812..879fbc8451fcbb0ba17e2acae0609c4adb22f00d 100644
--- a/apps/files/l10n/da.php
+++ b/apps/files/l10n/da.php
@@ -1,14 +1,13 @@
"Kunne ikke flytte %s - der findes allerede en fil med dette navn",
"Could not move %s" => "Kunne ikke flytte %s",
-"Unable to rename file" => "Kunne ikke omdøbe fil",
"No file was uploaded. Unknown error" => "Ingen fil blev uploadet. Ukendt fejl.",
-"There is no error, the file uploaded with success" => "Der er ingen fejl, filen blev uploadet med success",
+"There is no error, the file uploaded with success" => "Der skete ingen fejl, filen blev succesfuldt uploadet",
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Den uploadede fil overstiger upload_max_filesize direktivet i php.ini",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Den uploadede fil overskrider MAX_FILE_SIZE -direktivet som er specificeret i HTML-formularen",
-"The uploaded file was only partially uploaded" => "Den uploadede file blev kun delvist uploadet",
-"No file was uploaded" => "Ingen fil blev uploadet",
-"Missing a temporary folder" => "Mangler en midlertidig mappe",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Den uploadede fil overstiger MAX_FILE_SIZE indstilingen, som specificeret i HTML formularen",
+"The uploaded file was only partially uploaded" => "Filen blev kun delvist uploadet.",
+"No file was uploaded" => "Ingen fil uploadet",
+"Missing a temporary folder" => "Manglende midlertidig mappe.",
"Failed to write to disk" => "Fejl ved skrivning til disk.",
"Not enough storage available" => "Der er ikke nok plads til rådlighed",
"Invalid directory." => "Ugyldig mappe.",
@@ -33,7 +32,7 @@
"Your storage is full, files can not be updated or synced anymore!" => "Din opbevaringsplads er fyldt op, filer kan ikke opdateres eller synkroniseres længere!",
"Your storage is almost full ({usedSpacePercent}%)" => "Din opbevaringsplads er næsten fyldt op ({usedSpacePercent}%)",
"Your download is being prepared. This might take some time if the files are big." => "Dit download forberedes. Dette kan tage lidt tid ved større filer.",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Kunne ikke uploade din fil, da det enten er en mappe eller er tom",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Kan ikke uploade din fil - det er enten en mappe eller en fil med et indhold på 0 bytes.",
"Not enough space available" => "ikke nok tilgængelig ledig plads ",
"Upload cancelled." => "Upload afbrudt.",
"File upload is in progress. Leaving the page now will cancel the upload." => "Fil upload kører. Hvis du forlader siden nu, vil uploadet blive annuleret.",
@@ -47,6 +46,7 @@
"{count} folders" => "{count} mapper",
"1 file" => "1 fil",
"{count} files" => "{count} filer",
+"Unable to rename file" => "Kunne ikke omdøbe fil",
"Upload" => "Upload",
"File handling" => "Filhåndtering",
"Maximum upload size" => "Maksimal upload-størrelse",
@@ -66,7 +66,7 @@
"Nothing in here. Upload something!" => "Her er tomt. Upload noget!",
"Download" => "Download",
"Unshare" => "Fjern deling",
-"Upload too large" => "Upload for stor",
+"Upload too large" => "Upload er for stor",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Filerne, du prøver at uploade, er større end den maksimale størrelse for fil-upload på denne server.",
"Files are being scanned, please wait." => "Filerne bliver indlæst, vent venligst.",
"Current scanning" => "Indlæser",
diff --git a/apps/files/l10n/de.php b/apps/files/l10n/de.php
index 6da281dafbeb66af6af596f381b4b9acc432207c..bcc3a4c6c9da269ffdc8e8bf943bf4eaaa0f3b7a 100644
--- a/apps/files/l10n/de.php
+++ b/apps/files/l10n/de.php
@@ -1,39 +1,38 @@
"%s konnte nicht verschoben werden - eine Datei mit diesem Namen existiert bereits.",
-"Could not move %s" => "%s konnte nicht verschoben werden",
-"Unable to rename file" => "Die Datei konnte nicht umbenannt werden",
+"Could not move %s - File with this name already exists" => "Konnte %s nicht verschieben. Eine Datei mit diesem Namen existiert bereits",
+"Could not move %s" => "Konnte %s nicht verschieben",
"No file was uploaded. Unknown error" => "Keine Datei hochgeladen. Unbekannter Fehler",
-"There is no error, the file uploaded with success" => "Datei fehlerfrei hochgeladen.",
+"There is no error, the file uploaded with success" => "Es ist kein Fehler aufgetreten. Die Datei wurde erfolgreich hochgeladen.",
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Die hochgeladene Datei überschreitet die upload_max_filesize Vorgabe in php.ini",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Die Größe der hochzuladenden Datei überschreitet die MAX_FILE_SIZE-Richtlinie, die im HTML-Formular angegeben wurde",
-"The uploaded file was only partially uploaded" => "Die Datei wurde nur teilweise hochgeladen.",
-"No file was uploaded" => "Es wurde keine Datei hochgeladen.",
-"Missing a temporary folder" => "Temporärer Ordner fehlt.",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Die Datei ist größer, als die MAX_FILE_SIZE Direktive erlaubt, die im HTML-Formular spezifiziert ist",
+"The uploaded file was only partially uploaded" => "Die Datei konnte nur teilweise übertragen werden",
+"No file was uploaded" => "Keine Datei konnte übertragen werden.",
+"Missing a temporary folder" => "Kein temporärer Ordner vorhanden",
"Failed to write to disk" => "Fehler beim Schreiben auf die Festplatte",
-"Not enough storage available" => "Nicht genug Speicherplatz verfügbar",
+"Not enough storage available" => "Nicht genug Speicher vorhanden.",
"Invalid directory." => "Ungültiges Verzeichnis.",
"Files" => "Dateien",
"Share" => "Teilen",
-"Delete permanently" => "Permanent löschen",
+"Delete permanently" => "Endgültig löschen",
"Delete" => "Löschen",
"Rename" => "Umbenennen",
"Pending" => "Ausstehend",
"{new_name} already exists" => "{new_name} existiert bereits",
"replace" => "ersetzen",
-"suggest name" => "Name vorschlagen",
+"suggest name" => "Namen vorschlagen",
"cancel" => "abbrechen",
"replaced {new_name} with {old_name}" => "{old_name} ersetzt durch {new_name}",
"undo" => "rückgängig machen",
"perform delete operation" => "Löschvorgang ausführen",
-"1 file uploading" => "Eine Datei wird hoch geladen",
+"1 file uploading" => "1 Datei wird hochgeladen",
"files uploading" => "Dateien werden hoch geladen",
"'.' is an invalid file name." => "'.' ist kein gültiger Dateiname.",
"File name cannot be empty." => "Der Dateiname darf nicht leer sein.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ungültiger Name, '\\', '/', '<', '>', ':', '\"', '|', '?' und '*' sind nicht zulässig.",
-"Your storage is full, files can not be updated or synced anymore!" => "Ihr Speicherplatz ist voll, Dateien können nicht mehr aktualisiert oder synchronisiert werden!",
-"Your storage is almost full ({usedSpacePercent}%)" => "Ihr Speicherplatz ist fast aufgebraucht ({usedSpacePercent}%)",
+"Your storage is full, files can not be updated or synced anymore!" => "Dein Speicher ist voll, daher können keine Dateien mehr aktualisiert oder synchronisiert werden!",
+"Your storage is almost full ({usedSpacePercent}%)" => "Dein Speicher ist fast voll ({usedSpacePercent}%)",
"Your download is being prepared. This might take some time if the files are big." => "Dein Download wird vorbereitet. Dies kann bei größeren Dateien etwas dauern.",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Deine Datei kann nicht hochgeladen werden, da sie entweder ein Verzeichnis oder 0 Bytes groß ist.",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Deine Datei kann nicht hochgeladen werden, weil es sich um einen Ordner handelt oder 0 Bytes groß ist.",
"Not enough space available" => "Nicht genug Speicherplatz verfügbar",
"Upload cancelled." => "Upload abgebrochen.",
"File upload is in progress. Leaving the page now will cancel the upload." => "Dateiupload läuft. Wenn Du die Seite jetzt verlässt, wird der Upload abgebrochen.",
@@ -42,11 +41,12 @@
"Error" => "Fehler",
"Name" => "Name",
"Size" => "Größe",
-"Modified" => "Bearbeitet",
+"Modified" => "Geändert",
"1 folder" => "1 Ordner",
"{count} folders" => "{count} Ordner",
"1 file" => "1 Datei",
"{count} files" => "{count} Dateien",
+"Unable to rename file" => "Konnte Datei nicht umbenennen",
"Upload" => "Hochladen",
"File handling" => "Dateibehandlung",
"Maximum upload size" => "Maximale Upload-Größe",
@@ -62,11 +62,11 @@
"From link" => "Von einem Link",
"Deleted files" => "Gelöschte Dateien",
"Cancel upload" => "Upload abbrechen",
-"You don’t have write permissions here." => "Du besitzt hier keine Schreib-Berechtigung.",
+"You don’t have write permissions here." => "Du hast hier keine Schreib-Berechtigung.",
"Nothing in here. Upload something!" => "Alles leer. Lade etwas hoch!",
"Download" => "Herunterladen",
-"Unshare" => "Nicht mehr freigeben",
-"Upload too large" => "Upload zu groß",
+"Unshare" => "Freigabe aufheben",
+"Upload too large" => "Der Upload ist zu groß",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Die Datei überschreitet die Maximalgröße für Uploads auf diesem Server.",
"Files are being scanned, please wait." => "Dateien werden gescannt, bitte warten.",
"Current scanning" => "Scanne",
diff --git a/apps/files/l10n/de_DE.php b/apps/files/l10n/de_DE.php
index 977309bfa7484d5f22619d006d98447536b2feb6..3c06c1ac83de1c42c3b3bf7be0dff05761723656 100644
--- a/apps/files/l10n/de_DE.php
+++ b/apps/files/l10n/de_DE.php
@@ -1,52 +1,53 @@
"Konnte %s nicht verschieben. Eine Datei mit diesem Namen existiert bereits",
"Could not move %s" => "Konnte %s nicht verschieben",
-"Unable to rename file" => "Konnte Datei nicht umbenennen",
"No file was uploaded. Unknown error" => "Keine Datei hochgeladen. Unbekannter Fehler",
-"There is no error, the file uploaded with success" => "Es sind keine Fehler aufgetreten. Die Datei wurde erfolgreich hochgeladen.",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Die hochgeladene Datei überschreitet die upload_max_filesize Vorgabe in der php.ini:",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Die Größe der hochzuladenden Datei überschreitet die MAX_FILE_SIZE-Richtlinie, die im HTML-Formular angegeben wurde",
-"The uploaded file was only partially uploaded" => "Die Datei wurde nur teilweise hochgeladen.",
-"No file was uploaded" => "Es wurde keine Datei hochgeladen.",
-"Missing a temporary folder" => "Der temporäre Ordner fehlt.",
+"There is no error, the file uploaded with success" => "Es ist kein Fehler aufgetreten. Die Datei wurde erfolgreich hochgeladen.",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Die hochgeladene Datei überschreitet die upload_max_filesize Vorgabe in php.ini",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Die Datei ist größer, als die MAX_FILE_SIZE Vorgabe erlaubt, die im HTML-Formular spezifiziert ist",
+"The uploaded file was only partially uploaded" => "Die Datei konnte nur teilweise übertragen werden",
+"No file was uploaded" => "Keine Datei konnte übertragen werden.",
+"Missing a temporary folder" => "Kein temporärer Ordner vorhanden",
"Failed to write to disk" => "Fehler beim Schreiben auf die Festplatte",
"Not enough storage available" => "Nicht genug Speicher vorhanden.",
"Invalid directory." => "Ungültiges Verzeichnis.",
"Files" => "Dateien",
"Share" => "Teilen",
-"Delete permanently" => "Entgültig löschen",
+"Delete permanently" => "Endgültig löschen",
"Delete" => "Löschen",
"Rename" => "Umbenennen",
"Pending" => "Ausstehend",
"{new_name} already exists" => "{new_name} existiert bereits",
"replace" => "ersetzen",
-"suggest name" => "Einen Namen vorschlagen",
+"suggest name" => "Namen vorschlagen",
"cancel" => "abbrechen",
"replaced {new_name} with {old_name}" => "{old_name} wurde ersetzt durch {new_name}",
"undo" => "rückgängig machen",
-"perform delete operation" => "führe das Löschen aus",
+"perform delete operation" => "Löschvorgang ausführen",
"1 file uploading" => "1 Datei wird hochgeladen",
"files uploading" => "Dateien werden hoch geladen",
"'.' is an invalid file name." => "'.' ist kein gültiger Dateiname.",
"File name cannot be empty." => "Der Dateiname darf nicht leer sein.",
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ungültiger Name! Die Zeichen '\\', '/', '<', '>', ':', '\"', '|', '?' und '*' sind nicht zulässig.",
-"Your storage is full, files can not be updated or synced anymore!" => "Ihr Speicher ist voll. Daher können keine Dateien mehr aktualisiert oder synchronisiert werden!",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ungültiger Name, '\\', '/', '<', '>', ':', '\"', '|', '?' und '*' sind nicht zulässig.",
+"Your storage is full, files can not be updated or synced anymore!" => "Ihr Speicher ist voll, daher können keine Dateien mehr aktualisiert oder synchronisiert werden!",
"Your storage is almost full ({usedSpacePercent}%)" => "Ihr Speicher ist fast voll ({usedSpacePercent}%)",
-"Your download is being prepared. This might take some time if the files are big." => "Ihr Download wird vorbereitet. Dies kann bei größeren Dateien einen Moment dauern.",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Ihre Datei kann nicht hochgeladen werden, da sie entweder ein Verzeichnis oder 0 Bytes groß ist.",
+"Your download is being prepared. This might take some time if the files are big." => "Ihr Download wird vorbereitet. Dies kann bei größeren Dateien etwas dauern.",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Ihre Datei kann nicht hochgeladen werden, weil es sich um einen Ordner handelt oder 0 Bytes groß ist.",
"Not enough space available" => "Nicht genügend Speicherplatz verfügbar",
"Upload cancelled." => "Upload abgebrochen.",
-"File upload is in progress. Leaving the page now will cancel the upload." => "Der Dateiupload läuft. Wenn Sie die Seite jetzt verlassen, wird der Upload abgebrochen.",
+"File upload is in progress. Leaving the page now will cancel the upload." => "Dateiupload läuft. Wenn Sie die Seite jetzt verlassen, wird der Upload abgebrochen.",
"URL cannot be empty." => "Die URL darf nicht leer sein.",
"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Ungültiger Verzeichnisname. Die Nutzung von \"Shared\" ist ownCloud vorbehalten",
"Error" => "Fehler",
"Name" => "Name",
"Size" => "Größe",
-"Modified" => "Bearbeitet",
+"Modified" => "Geändert",
"1 folder" => "1 Ordner",
"{count} folders" => "{count} Ordner",
"1 file" => "1 Datei",
"{count} files" => "{count} Dateien",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Ungültiger Ordnername. Die Verwendung von \"Shared\" ist ownCloud vorbehalten.",
+"Unable to rename file" => "Konnte Datei nicht umbenennen",
"Upload" => "Hochladen",
"File handling" => "Dateibehandlung",
"Maximum upload size" => "Maximale Upload-Größe",
@@ -63,12 +64,12 @@
"Deleted files" => "Gelöschte Dateien",
"Cancel upload" => "Upload abbrechen",
"You don’t have write permissions here." => "Sie haben hier keine Schreib-Berechtigungen.",
-"Nothing in here. Upload something!" => "Alles leer. Bitte laden Sie etwas hoch!",
+"Nothing in here. Upload something!" => "Alles leer. Laden Sie etwas hoch!",
"Download" => "Herunterladen",
"Unshare" => "Freigabe aufheben",
"Upload too large" => "Der Upload ist zu groß",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Die Datei überschreitet die Maximalgröße für Uploads auf diesem Server.",
"Files are being scanned, please wait." => "Dateien werden gescannt, bitte warten.",
"Current scanning" => "Scanne",
-"Upgrading filesystem cache..." => "Aktualisiere den Dateisystem-Cache..."
+"Upgrading filesystem cache..." => "Dateisystem-Cache wird aktualisiert ..."
);
diff --git a/apps/files/l10n/el.php b/apps/files/l10n/el.php
index c75305ef1ac14c22691288fb8d4e9da32c08a65e..b273f6b522dde74280b8fdf35be2ba7bb094b7da 100644
--- a/apps/files/l10n/el.php
+++ b/apps/files/l10n/el.php
@@ -1,11 +1,10 @@
"Αδυναμία μετακίνησης του %s - υπάρχει ήδη αρχείο με αυτό το όνομα",
"Could not move %s" => "Αδυναμία μετακίνησης του %s",
-"Unable to rename file" => "Αδυναμία μετονομασίας αρχείου",
"No file was uploaded. Unknown error" => "Δεν ανέβηκε κάποιο αρχείο. Άγνωστο σφάλμα",
"There is no error, the file uploaded with success" => "Δεν υπάρχει σφάλμα, το αρχείο εστάλει επιτυχώς",
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Το αρχείο που εστάλει υπερβαίνει την οδηγία μέγιστου επιτρεπτού μεγέθους \"upload_max_filesize\" του php.ini",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Το αρχείο υπερβαίνει την οδηγία μέγιστου επιτρεπτού μεγέθους \"MAX_FILE_SIZE\" που έχει οριστεί στην HTML φόρμα",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Το ανεβασμένο αρχείο υπερβαίνει το MAX_FILE_SIZE που ορίζεται στην HTML φόρμα",
"The uploaded file was only partially uploaded" => "Το αρχείο εστάλει μόνο εν μέρει",
"No file was uploaded" => "Κανένα αρχείο δεν στάλθηκε",
"Missing a temporary folder" => "Λείπει ο προσωρινός φάκελος",
@@ -47,7 +46,9 @@
"{count} folders" => "{count} φάκελοι",
"1 file" => "1 αρχείο",
"{count} files" => "{count} αρχεία",
-"Upload" => "Αποστολή",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Μη έγκυρο όνομα φακέλου. Η χρήση του 'Κοινόχρηστος' χρησιμοποιείται από το ownCloud",
+"Unable to rename file" => "Αδυναμία μετονομασίας αρχείου",
+"Upload" => "Μεταφόρτωση",
"File handling" => "Διαχείριση αρχείων",
"Maximum upload size" => "Μέγιστο μέγεθος αποστολής",
"max. possible: " => "μέγιστο δυνατό:",
@@ -65,7 +66,7 @@
"You don’t have write permissions here." => "Δεν έχετε δικαιώματα εγγραφής εδώ.",
"Nothing in here. Upload something!" => "Δεν υπάρχει τίποτα εδώ. Ανεβάστε κάτι!",
"Download" => "Λήψη",
-"Unshare" => "Διακοπή κοινής χρήσης",
+"Unshare" => "Σταμάτημα διαμοιρασμού",
"Upload too large" => "Πολύ μεγάλο αρχείο προς αποστολή",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Τα αρχεία που προσπαθείτε να ανεβάσετε υπερβαίνουν το μέγιστο μέγεθος αποστολής αρχείων σε αυτόν τον διακομιστή.",
"Files are being scanned, please wait." => "Τα αρχεία σαρώνονται, παρακαλώ περιμένετε.",
diff --git a/apps/files/l10n/en@pirate.php b/apps/files/l10n/en@pirate.php
new file mode 100644
index 0000000000000000000000000000000000000000..fdd1850da900c44cc2536ae2082becbf96f51e66
--- /dev/null
+++ b/apps/files/l10n/en@pirate.php
@@ -0,0 +1,3 @@
+ "Download"
+);
diff --git a/apps/files/l10n/eo.php b/apps/files/l10n/eo.php
index 1ef7c9f11d80ca5d61d3c0cbac3f55b6f6fa372e..3eeb88754c75fdde2d0082fa205e8d2038210059 100644
--- a/apps/files/l10n/eo.php
+++ b/apps/files/l10n/eo.php
@@ -1,14 +1,13 @@
"Ne eblis movi %s: dosiero kun ĉi tiu nomo jam ekzistas",
"Could not move %s" => "Ne eblis movi %s",
-"Unable to rename file" => "Ne eblis alinomigi dosieron",
"No file was uploaded. Unknown error" => "Neniu dosiero alŝutiĝis. Nekonata eraro.",
-"There is no error, the file uploaded with success" => "Ne estas eraro, la dosiero alŝutiĝis sukcese",
+"There is no error, the file uploaded with success" => "Ne estas eraro, la dosiero alŝutiĝis sukcese.",
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "La dosiero alŝutita superas la regulon upload_max_filesize el php.ini: ",
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "La dosiero alŝutita superas la regulon MAX_FILE_SIZE, kiu estas difinita en la HTML-formularo",
-"The uploaded file was only partially uploaded" => "La alŝutita dosiero nur parte alŝutiĝis",
-"No file was uploaded" => "Neniu dosiero estas alŝutita",
-"Missing a temporary folder" => "Mankas tempa dosierujo",
+"The uploaded file was only partially uploaded" => "la alŝutita dosiero nur parte alŝutiĝis",
+"No file was uploaded" => "Neniu dosiero alŝutiĝis.",
+"Missing a temporary folder" => "Mankas provizora dosierujo.",
"Failed to write to disk" => "Malsukcesis skribo al disko",
"Invalid directory." => "Nevalida dosierujo.",
"Files" => "Dosieroj",
@@ -23,6 +22,7 @@
"replaced {new_name} with {old_name}" => "anstataŭiĝis {new_name} per {old_name}",
"undo" => "malfari",
"1 file uploading" => "1 dosiero estas alŝutata",
+"files uploading" => "dosieroj estas alŝutataj",
"'.' is an invalid file name." => "'.' ne estas valida dosiernomo.",
"File name cannot be empty." => "Dosiernomo devas ne malpleni.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nevalida nomo: “\\”, “/”, “<”, “>”, “:”, “\"”, “|”, “?” kaj “*” ne permesatas.",
@@ -41,6 +41,7 @@
"{count} folders" => "{count} dosierujoj",
"1 file" => "1 dosiero",
"{count} files" => "{count} dosierujoj",
+"Unable to rename file" => "Ne eblis alinomigi dosieron",
"Upload" => "Alŝuti",
"File handling" => "Dosieradministro",
"Maximum upload size" => "Maksimuma alŝutogrando",
@@ -58,7 +59,7 @@
"Nothing in here. Upload something!" => "Nenio estas ĉi tie. Alŝutu ion!",
"Download" => "Elŝuti",
"Unshare" => "Malkunhavigi",
-"Upload too large" => "Elŝuto tro larĝa",
+"Upload too large" => "Alŝuto tro larĝa",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "La dosieroj, kiujn vi provas alŝuti, transpasas la maksimuman grandon por dosieralŝutoj en ĉi tiu servilo.",
"Files are being scanned, please wait." => "Dosieroj estas skanataj, bonvolu atendi.",
"Current scanning" => "Nuna skano"
diff --git a/apps/files/l10n/es.php b/apps/files/l10n/es.php
index 26e8c049fa9febe055741fc6ffd4f9a1e5f0564e..b11adfabeb3e0b67204d02f38ac274bd54f2adf0 100644
--- a/apps/files/l10n/es.php
+++ b/apps/files/l10n/es.php
@@ -1,14 +1,13 @@
"No se puede mover %s - Ya existe un archivo con ese nombre",
"Could not move %s" => "No se puede mover %s",
-"Unable to rename file" => "No se puede renombrar el archivo",
-"No file was uploaded. Unknown error" => "Fallo no se subió el fichero",
-"There is no error, the file uploaded with success" => "No se ha producido ningún error, el archivo se ha subido con éxito",
+"No file was uploaded. Unknown error" => "No se subió ningún archivo. Error desconocido",
+"There is no error, the file uploaded with success" => "No hay ningún error, el archivo se ha subido con éxito",
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "El archivo que intentas subir sobrepasa el tamaño definido por la variable upload_max_filesize en php.ini",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "El archivo que intentas subir sobrepasa el tamaño definido por la variable MAX_FILE_SIZE especificada en el formulario HTML",
-"The uploaded file was only partially uploaded" => "El archivo que intentas subir solo se subió parcialmente",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "El archivo subido sobrepasa la directiva MAX_FILE_SIZE especificada en el formulario HTML",
+"The uploaded file was only partially uploaded" => "El archivo se ha subido parcialmente",
"No file was uploaded" => "No se ha subido ningún archivo",
-"Missing a temporary folder" => "Falta un directorio temporal",
+"Missing a temporary folder" => "Falta la carpeta temporal",
"Failed to write to disk" => "La escritura en disco ha fallado",
"Not enough storage available" => "No hay suficiente espacio disponible",
"Invalid directory." => "Directorio invalido.",
@@ -17,7 +16,7 @@
"Delete permanently" => "Eliminar permanentemente",
"Delete" => "Eliminar",
"Rename" => "Renombrar",
-"Pending" => "Pendiente",
+"Pending" => "Pendientes",
"{new_name} already exists" => "{new_name} ya existe",
"replace" => "reemplazar",
"suggest name" => "sugerir nombre",
@@ -27,18 +26,18 @@
"perform delete operation" => "Eliminar",
"1 file uploading" => "subiendo 1 archivo",
"files uploading" => "subiendo archivos",
-"'.' is an invalid file name." => "'.' es un nombre de archivo inválido.",
+"'.' is an invalid file name." => "'.' no es un nombre de archivo válido.",
"File name cannot be empty." => "El nombre de archivo no puede estar vacío.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nombre Invalido, \"\\\", \"/\", \"<\", \">\", \":\", \"\", \"|\" \"?\" y \"*\" no están permitidos ",
-"Your storage is full, files can not be updated or synced anymore!" => "Su almacenamiento esta lleno, los archivos no pueden ser mas actualizados o sincronizados!",
-"Your storage is almost full ({usedSpacePercent}%)" => "Su almacenamiento esta lleno en un ({usedSpacePercent}%)",
-"Your download is being prepared. This might take some time if the files are big." => "Tu descarga esta siendo preparada. Esto puede tardar algun tiempo si los archivos son muy grandes.",
-"Unable to upload your file as it is a directory or has 0 bytes" => "No ha sido posible subir tu archivo porque es un directorio o tiene 0 bytes",
+"Your storage is full, files can not be updated or synced anymore!" => "Su almacenamiento está lleno, ¡no se pueden actualizar ni sincronizar archivos!",
+"Your storage is almost full ({usedSpacePercent}%)" => "Su almacenamiento está casi lleno ({usedSpacePercent}%)",
+"Your download is being prepared. This might take some time if the files are big." => "Su descarga está siendo preparada. Esto puede tardar algún tiempo si los archivos son muy grandes.",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Imposible subir su archivo, es un directorio o tiene 0 bytes",
"Not enough space available" => "No hay suficiente espacio disponible",
"Upload cancelled." => "Subida cancelada.",
-"File upload is in progress. Leaving the page now will cancel the upload." => "La subida del archivo está en proceso. Salir de la página ahora cancelará la subida.",
+"File upload is in progress. Leaving the page now will cancel the upload." => "La subida del archivo está en proceso. Si sale de la página ahora, se cancelará la subida.",
"URL cannot be empty." => "La URL no puede estar vacía.",
-"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Nombre de carpeta invalido. El uso de \"Shared\" esta reservado para Owncloud",
+"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "El nombre de carpeta no es válido. El uso de \"Shared\" está reservado para Owncloud",
"Error" => "Error",
"Name" => "Nombre",
"Size" => "Tamaño",
@@ -47,6 +46,8 @@
"{count} folders" => "{count} carpetas",
"1 file" => "1 archivo",
"{count} files" => "{count} archivos",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Nombre de carpeta invalido. El uso de \"Shared\" esta reservado para ownCloud",
+"Unable to rename file" => "No se puede renombrar el archivo",
"Upload" => "Subir",
"File handling" => "Tratamiento de archivos",
"Maximum upload size" => "Tamaño máximo de subida",
@@ -66,9 +67,9 @@
"Nothing in here. Upload something!" => "Aquí no hay nada. ¡Sube algo!",
"Download" => "Descargar",
"Unshare" => "Dejar de compartir",
-"Upload too large" => "El archivo es demasiado grande",
+"Upload too large" => "Subida demasido grande",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Los archivos que estás intentando subir sobrepasan el tamaño máximo permitido por este servidor.",
"Files are being scanned, please wait." => "Se están escaneando los archivos, por favor espere.",
-"Current scanning" => "Ahora escaneando",
-"Upgrading filesystem cache..." => "Actualizando cache de archivos de sistema"
+"Current scanning" => "Escaneo actual",
+"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 731aa345064a2ff0558ba63b536f5fe5194d2b73..0ae47302edf7f020ab8e603e88178b5ff7bf602d 100644
--- a/apps/files/l10n/es_AR.php
+++ b/apps/files/l10n/es_AR.php
@@ -1,14 +1,13 @@
"No se pudo mover %s - Un archivo con este nombre ya existe",
"Could not move %s" => "No se pudo mover %s ",
-"Unable to rename file" => "No fue posible cambiar el nombre al archivo",
"No file was uploaded. Unknown error" => "El archivo no fue subido. Error desconocido",
-"There is no error, the file uploaded with success" => "No se han producido errores, el archivo se ha subido con éxito",
+"There is no error, the file uploaded with success" => "No hay errores, el archivo fue subido con éxito",
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "El archivo que intentás subir excede el tamaño definido por upload_max_filesize en el php.ini:",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "El archivo que intentás subir sobrepasa el tamaño definido por la variable MAX_FILE_SIZE especificada en el formulario HTML",
-"The uploaded file was only partially uploaded" => "El archivo que intentás subir solo se subió parcialmente",
-"No file was uploaded" => "El archivo no fue subido",
-"Missing a temporary folder" => "Falta un directorio temporal",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "El archivo subido sobrepasa el valor MAX_FILE_SIZE especificada en el formulario HTML",
+"The uploaded file was only partially uploaded" => "El archivo fue subido parcialmente",
+"No file was uploaded" => "No se subió ningún archivo ",
+"Missing a temporary folder" => "Error en la carpera temporal",
"Failed to write to disk" => "Error al escribir en el disco",
"Not enough storage available" => "No hay suficiente capacidad de almacenamiento",
"Invalid directory." => "Directorio invalido.",
@@ -17,7 +16,7 @@
"Delete permanently" => "Borrar de manera permanente",
"Delete" => "Borrar",
"Rename" => "Cambiar nombre",
-"Pending" => "Pendiente",
+"Pending" => "Pendientes",
"{new_name} already exists" => "{new_name} ya existe",
"replace" => "reemplazar",
"suggest name" => "sugerir nombre",
@@ -47,6 +46,8 @@
"{count} folders" => "{count} directorios",
"1 file" => "1 archivo",
"{count} files" => "{count} archivos",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Nombre de carpeta inválido. El uso de \"Shared\" está reservado por ownCloud",
+"Unable to rename file" => "No fue posible cambiar el nombre al archivo",
"Upload" => "Subir",
"File handling" => "Tratamiento de archivos",
"Maximum upload size" => "Tamaño máximo de subida",
@@ -66,7 +67,7 @@
"Nothing in here. Upload something!" => "No hay nada. ¡Subí contenido!",
"Download" => "Descargar",
"Unshare" => "Dejar de compartir",
-"Upload too large" => "El archivo es demasiado grande",
+"Upload too large" => "El tamaño del archivo que querés subir es demasiado grande",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Los archivos que intentás subir sobrepasan el tamaño máximo ",
"Files are being scanned, please wait." => "Se están escaneando los archivos, por favor esperá.",
"Current scanning" => "Escaneo actual",
diff --git a/apps/files/l10n/et_EE.php b/apps/files/l10n/et_EE.php
index 050c9458325dd196782e36e4640dbe6a7938c5b2..d3fab4b0bd167e59a03f3f9e0f1f620a155b850c 100644
--- a/apps/files/l10n/et_EE.php
+++ b/apps/files/l10n/et_EE.php
@@ -1,11 +1,10 @@
"Ei saa liigutada faili %s - samanimeline fail on juba olemas",
"Could not move %s" => "%s liigutamine ebaõnnestus",
-"Unable to rename file" => "Faili ümbernimetamine ebaõnnestus",
"No file was uploaded. Unknown error" => "Ühtegi faili ei laetud üles. Tundmatu viga",
-"There is no error, the file uploaded with success" => "Ühtegi viga pole, fail on üles laetud",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Üleslaetava faili suurus ületab php.ini poolt määratud upload_max_filesize suuruse",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Üles laetud faili suurus ületab HTML vormis määratud upload_max_filesize suuruse",
+"There is no error, the file uploaded with success" => "Ühtegi tõrget polnud, fail on üles laetud",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Üleslaetava faili suurus ületab php.ini poolt määratud upload_max_filesize suuruse:",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Üleslaetud fail ületab MAX_FILE_SIZE suuruse, mis on HTML vormi jaoks määratud",
"The uploaded file was only partially uploaded" => "Fail laeti üles ainult osaliselt",
"No file was uploaded" => "Ühtegi faili ei laetud üles",
"Missing a temporary folder" => "Ajutiste failide kaust puudub",
@@ -16,7 +15,7 @@
"Share" => "Jaga",
"Delete permanently" => "Kustuta jäädavalt",
"Delete" => "Kustuta",
-"Rename" => "ümber",
+"Rename" => "Nimeta ümber",
"Pending" => "Ootel",
"{new_name} already exists" => "{new_name} on juba olemas",
"replace" => "asenda",
@@ -25,18 +24,18 @@
"replaced {new_name} with {old_name}" => "asendas nime {old_name} nimega {new_name}",
"undo" => "tagasi",
"perform delete operation" => "teosta kustutamine",
-"1 file uploading" => "1 faili üleslaadimisel",
-"files uploading" => "failide üleslaadimine",
+"1 file uploading" => "1 fail üleslaadimisel",
+"files uploading" => "faili üleslaadimisel",
"'.' is an invalid file name." => "'.' on vigane failinimi.",
"File name cannot be empty." => "Faili nimi ei saa olla tühi.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Vigane nimi, '\\', '/', '<', '>', ':', '\"', '|', '?' ja '*' pole lubatud.",
-"Your storage is full, files can not be updated or synced anymore!" => "Sinu andmemaht on täis! Faile ei uuendata ja sünkroniseerimist ei toimu!",
+"Your storage is full, files can not be updated or synced anymore!" => "Sinu andmemaht on täis! Faile ei uuendata ega sünkroniseerita!",
"Your storage is almost full ({usedSpacePercent}%)" => "Su andmemaht on peaaegu täis ({usedSpacePercent}%)",
-"Your download is being prepared. This might take some time if the files are big." => "Valmistatakse allalaadimist. See võib võtta veidi aega kui on tegu suurte failidega. ",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Sinu faili üleslaadimine ebaõnnestus, kuna see on kaust või selle suurus on 0 baiti",
+"Your download is being prepared. This might take some time if the files are big." => "Valmistatakse allalaadimist. See võib võtta veidi aega, kui on tegu suurte failidega. ",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Faili ei saa üles laadida, kuna see on kaust või selle suurus on 0 baiti",
"Not enough space available" => "Pole piisavalt ruumi",
"Upload cancelled." => "Üleslaadimine tühistati.",
-"File upload is in progress. Leaving the page now will cancel the upload." => "Faili üleslaadimine on töös. Lehelt lahkumine katkestab selle üleslaadimise.",
+"File upload is in progress. Leaving the page now will cancel the upload." => "Faili üleslaadimine on töös. Lehelt lahkumine katkestab selle üleslaadimise.",
"URL cannot be empty." => "URL ei saa olla tühi.",
"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Vigane kataloogi nimi. 'Shared' kasutamine on reserveeritud ownCloud poolt.",
"Error" => "Viga",
@@ -47,6 +46,8 @@
"{count} folders" => "{count} kausta",
"1 file" => "1 fail",
"{count} files" => "{count} faili",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Vigane kausta nimi. 'Shared' kasutamine on reserveeritud ownCloud poolt.",
+"Unable to rename file" => "Faili ümbernimetamine ebaõnnestus",
"Upload" => "Lae üles",
"File handling" => "Failide käsitlemine",
"Maximum upload size" => "Maksimaalne üleslaadimise suurus",
@@ -62,13 +63,13 @@
"From link" => "Allikast",
"Deleted files" => "Kustutatud failid",
"Cancel upload" => "Tühista üleslaadimine",
-"You don’t have write permissions here." => "Siin puudvad Sul kirjutamisõigused.",
+"You don’t have write permissions here." => "Siin puudvad sul kirjutamisõigused.",
"Nothing in here. Upload something!" => "Siin pole midagi. Lae midagi üles!",
"Download" => "Lae alla",
"Unshare" => "Lõpeta jagamine",
"Upload too large" => "Üleslaadimine on liiga suur",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Failid, mida sa proovid üles laadida, ületab serveri poolt üleslaetavatele failidele määratud maksimaalse suuruse.",
-"Files are being scanned, please wait." => "Faile skannitakse, palun oota",
+"Files are being scanned, please wait." => "Faile skannitakse, palun oota.",
"Current scanning" => "Praegune skannimine",
-"Upgrading filesystem cache..." => "Uuendan failisüsteemi puhvrit..."
+"Upgrading filesystem cache..." => "Failisüsteemi puhvri uuendamine..."
);
diff --git a/apps/files/l10n/eu.php b/apps/files/l10n/eu.php
index ebffc69f72b31cf511213598827ba7683674a9b5..a4afc2e8ca801c335c9f7970a0ea0b9ffdf22db3 100644
--- a/apps/files/l10n/eu.php
+++ b/apps/files/l10n/eu.php
@@ -1,14 +1,13 @@
"Ezin da %s mugitu - Izen hau duen fitxategia dagoeneko existitzen da",
"Could not move %s" => "Ezin dira fitxategiak mugitu %s",
-"Unable to rename file" => "Ezin izan da fitxategia berrizendatu",
"No file was uploaded. Unknown error" => "Ez da fitxategirik igo. Errore ezezaguna",
-"There is no error, the file uploaded with success" => "Ez da arazorik izan, fitxategia ongi igo da",
+"There is no error, the file uploaded with success" => "Ez da errorerik egon, fitxategia ongi igo da",
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Igotako fitxategiak php.ini fitxategian ezarritako upload_max_filesize muga gainditu du:",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Igotako fitxategiaren tamaina HTML inprimakiko MAX_FILESIZE direktiban adierazitakoa baino handiagoa da",
-"The uploaded file was only partially uploaded" => "Igotako fitxategiaren zati bat baino gehiago ez da igo",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Igotako fitxategia HTML formularioan zehaztutako MAX_FILE_SIZE direktiba baino handidagoa da.",
+"The uploaded file was only partially uploaded" => "Igotako fitxategiaren zati bat bakarrik igo da",
"No file was uploaded" => "Ez da fitxategirik igo",
-"Missing a temporary folder" => "Aldi baterako karpeta falta da",
+"Missing a temporary folder" => "Aldi bateko karpeta falta da",
"Failed to write to disk" => "Errore bat izan da diskoan idazterakoan",
"Not enough storage available" => "Ez dago behar aina leku erabilgarri,",
"Invalid directory." => "Baliogabeko karpeta.",
@@ -26,13 +25,14 @@
"undo" => "desegin",
"perform delete operation" => "Ezabatu",
"1 file uploading" => "fitxategi 1 igotzen",
+"files uploading" => "fitxategiak igotzen",
"'.' is an invalid file name." => "'.' ez da fitxategi izen baliogarria.",
"File name cannot be empty." => "Fitxategi izena ezin da hutsa izan.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "IZen aliogabea, '\\', '/', '<', '>', ':', '\"', '|', '?' eta '*' ez daude baimenduta.",
"Your storage is full, files can not be updated or synced anymore!" => "Zure biltegiratzea beterik dago, ezingo duzu aurrerantzean fitxategirik igo edo sinkronizatu!",
"Your storage is almost full ({usedSpacePercent}%)" => "Zure biltegiratzea nahiko beterik dago (%{usedSpacePercent})",
"Your download is being prepared. This might take some time if the files are big." => "Zure deskarga prestatu egin behar da. Denbora bat har lezake fitxategiak handiak badira. ",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Ezin da zure fitxategia igo, karpeta bat da edo 0 byt ditu",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Ezin izan da zure fitxategia igo karpeta bat delako edo 0 byte dituelako",
"Not enough space available" => "Ez dago leku nahikorik.",
"Upload cancelled." => "Igoera ezeztatuta",
"File upload is in progress. Leaving the page now will cancel the upload." => "Fitxategien igoera martxan da. Orria orain uzteak igoera ezeztatutko du.",
@@ -46,6 +46,7 @@
"{count} folders" => "{count} karpeta",
"1 file" => "fitxategi bat",
"{count} files" => "{count} fitxategi",
+"Unable to rename file" => "Ezin izan da fitxategia berrizendatu",
"Upload" => "Igo",
"File handling" => "Fitxategien kudeaketa",
"Maximum upload size" => "Igo daitekeen gehienezko tamaina",
@@ -65,7 +66,7 @@
"Nothing in here. Upload something!" => "Ez dago ezer. Igo zerbait!",
"Download" => "Deskargatu",
"Unshare" => "Ez elkarbanatu",
-"Upload too large" => "Igotakoa handiegia da",
+"Upload too large" => "Igoera handiegia da",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Igotzen saiatzen ari zaren fitxategiak zerbitzari honek igotzeko onartzen duena baino handiagoak dira.",
"Files are being scanned, please wait." => "Fitxategiak eskaneatzen ari da, itxoin mezedez.",
"Current scanning" => "Orain eskaneatzen ari da",
diff --git a/apps/files/l10n/fa.php b/apps/files/l10n/fa.php
index 5effe83d9f0db96fe2bf5ce25b5b16366b9ba756..b97067ac19314eb9fc3d694ff8f638faffc48b22 100644
--- a/apps/files/l10n/fa.php
+++ b/apps/files/l10n/fa.php
@@ -1,21 +1,20 @@
"%s نمی تواند حرکت کند - در حال حاضر پرونده با این نام وجود دارد. ",
"Could not move %s" => "%s نمی تواند حرکت کند ",
-"Unable to rename file" => "قادر به تغییر نام پرونده نیست.",
"No file was uploaded. Unknown error" => "هیچ فایلی آپلود نشد.خطای ناشناس",
-"There is no error, the file uploaded with success" => "هیچ خطایی وجود ندارد فایل با موفقیت بار گذاری شد",
+"There is no error, the file uploaded with success" => "هیچ خطایی نیست بارگذاری پرونده موفقیت آمیز بود",
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "پرونده آپلود شده بیش ازدستور ماکزیمم_حجم فایل_برای آپلود در php.ini استفاده کرده است.",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "حداکثر حجم مجاز برای بارگذاری از طریق HTML \nMAX_FILE_SIZE",
-"The uploaded file was only partially uploaded" => "مقدار کمی از فایل بارگذاری شده",
-"No file was uploaded" => "هیچ فایلی بارگذاری نشده",
-"Missing a temporary folder" => "یک پوشه موقت گم شده است",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "حداکثر حجم قابل بار گذاری از طریق HTML MAX_FILE_SIZE است",
+"The uploaded file was only partially uploaded" => "پرونده بارگذاری شده فقط تاحدودی بارگذاری شده",
+"No file was uploaded" => "هیچ پروندهای بارگذاری نشده",
+"Missing a temporary folder" => "یک پوشه موقت گم شده",
"Failed to write to disk" => "نوشتن بر روی دیسک سخت ناموفق بود",
"Not enough storage available" => "فضای کافی در دسترس نیست",
"Invalid directory." => "فهرست راهنما نامعتبر می باشد.",
-"Files" => "فایل ها",
+"Files" => "پروندهها",
"Share" => "اشتراکگذاری",
"Delete permanently" => "حذف قطعی",
-"Delete" => "پاک کردن",
+"Delete" => "حذف",
"Rename" => "تغییرنام",
"Pending" => "در انتظار",
"{new_name} already exists" => "{نام _جدید} در حال حاضر وجود دارد.",
@@ -42,12 +41,13 @@
"Error" => "خطا",
"Name" => "نام",
"Size" => "اندازه",
-"Modified" => "تغییر یافته",
+"Modified" => "تاریخ",
"1 folder" => "1 پوشه",
"{count} folders" => "{ شمار} پوشه ها",
"1 file" => "1 پرونده",
"{count} files" => "{ شمار } فایل ها",
-"Upload" => "بارگذاری",
+"Unable to rename file" => "قادر به تغییر نام پرونده نیست.",
+"Upload" => "بارگزاری",
"File handling" => "اداره پرونده ها",
"Maximum upload size" => "حداکثر اندازه بارگزاری",
"max. possible: " => "حداکثرمقدارممکن:",
@@ -64,9 +64,9 @@
"Cancel upload" => "متوقف کردن بار گذاری",
"You don’t have write permissions here." => "شما اجازه ی نوشتن در اینجا را ندارید",
"Nothing in here. Upload something!" => "اینجا هیچ چیز نیست.",
-"Download" => "بارگیری",
+"Download" => "دانلود",
"Unshare" => "لغو اشتراک",
-"Upload too large" => "حجم بارگذاری بسیار زیاد است",
+"Upload too large" => "سایز فایل برای آپلود زیاد است(م.تنظیمات در php.ini)",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "فایلها بیش از حد تعیین شده در این سرور هستند\nمترجم:با تغییر فایل php,ini میتوان این محدودیت را برطرف کرد",
"Files are being scanned, please wait." => "پرونده ها در حال بازرسی هستند لطفا صبر کنید",
"Current scanning" => "بازرسی کنونی",
diff --git a/apps/files/l10n/fi_FI.php b/apps/files/l10n/fi_FI.php
index e795438b9ff0e723a87c1859575862dc3ef61a35..3d0d724578144d9776db2c9d8d7752a27138aa54 100644
--- a/apps/files/l10n/fi_FI.php
+++ b/apps/files/l10n/fi_FI.php
@@ -1,14 +1,13 @@
"Kohteen %s siirto ei onnistunut - Tiedosto samalla nimellä on jo olemassa",
"Could not move %s" => "Kohteen %s siirto ei onnistunut",
-"Unable to rename file" => "Tiedoston nimeäminen uudelleen ei onnistunut",
"No file was uploaded. Unknown error" => "Tiedostoa ei lähetetty. Tuntematon virhe",
"There is no error, the file uploaded with success" => "Ei virheitä, tiedosto lähetettiin onnistuneesti",
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Lähetetyn tiedoston koko ylittää php.ini-tiedoston upload_max_filesize-säännön:",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Lähetetty tiedosto ylittää HTML-lomakkeessa määritetyn MAX_FILE_SIZE-arvon ylärajan",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Ladattavan tiedoston maksimikoko ylittää MAX_FILE_SIZE dirketiivin, joka on määritelty HTML-lomakkeessa",
"The uploaded file was only partially uploaded" => "Tiedoston lähetys onnistui vain osittain",
"No file was uploaded" => "Yhtäkään tiedostoa ei lähetetty",
-"Missing a temporary folder" => "Väliaikaiskansiota ei ole olemassa",
+"Missing a temporary folder" => "Tilapäiskansio puuttuu",
"Failed to write to disk" => "Levylle kirjoitus epäonnistui",
"Not enough storage available" => "Tallennustilaa ei ole riittävästi käytettävissä",
"Invalid directory." => "Virheellinen kansio.",
@@ -30,7 +29,7 @@
"Your storage is full, files can not be updated or synced anymore!" => "Tallennustila on loppu, tiedostoja ei voi enää päivittää tai synkronoida!",
"Your storage is almost full ({usedSpacePercent}%)" => "Tallennustila on melkein loppu ({usedSpacePercent}%)",
"Your download is being prepared. This might take some time if the files are big." => "Lataustasi valmistellaan. Tämä saattaa kestää hetken, jos tiedostot ovat suuria kooltaan.",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Tiedoston lähetys epäonnistui, koska sen koko on 0 tavua tai kyseessä on kansio",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Tiedoston lähetys epäonnistui, koska sen koko on 0 tavua tai kyseessä on kansio.",
"Not enough space available" => "Tilaa ei ole riittävästi",
"Upload cancelled." => "Lähetys peruttu.",
"File upload is in progress. Leaving the page now will cancel the upload." => "Tiedoston lähetys on meneillään. Sivulta poistuminen nyt peruu tiedoston lähetyksen.",
@@ -38,11 +37,12 @@
"Error" => "Virhe",
"Name" => "Nimi",
"Size" => "Koko",
-"Modified" => "Muutettu",
+"Modified" => "Muokattu",
"1 folder" => "1 kansio",
"{count} folders" => "{count} kansiota",
"1 file" => "1 tiedosto",
"{count} files" => "{count} tiedostoa",
+"Unable to rename file" => "Tiedoston nimeäminen uudelleen ei onnistunut",
"Upload" => "Lähetä",
"File handling" => "Tiedostonhallinta",
"Maximum upload size" => "Lähetettävän tiedoston suurin sallittu koko",
diff --git a/apps/files/l10n/fr.php b/apps/files/l10n/fr.php
index d92a9e151107141caaa39cb52009eaea092eead0..39c697396c919c69a6349ae94f44b2f47c8f2882 100644
--- a/apps/files/l10n/fr.php
+++ b/apps/files/l10n/fr.php
@@ -1,14 +1,13 @@
"Impossible de déplacer %s - Un fichier possédant ce nom existe déjà",
"Could not move %s" => "Impossible de déplacer %s",
-"Unable to rename file" => "Impossible de renommer le fichier",
-"No file was uploaded. Unknown error" => "Aucun fichier n'a été chargé. Erreur inconnue",
-"There is no error, the file uploaded with success" => "Aucune erreur, le fichier a été téléversé avec succès",
+"No file was uploaded. Unknown error" => "Aucun fichier n'a été envoyé. Erreur inconnue",
+"There is no error, the file uploaded with success" => "Aucune erreur, le fichier a été envoyé avec succès.",
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Le fichier envoyé dépasse la valeur upload_max_filesize située dans le fichier php.ini:",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Le fichier téléversé excède la valeur de MAX_FILE_SIZE spécifiée dans le formulaire HTML",
-"The uploaded file was only partially uploaded" => "Le fichier n'a été que partiellement téléversé",
-"No file was uploaded" => "Aucun fichier n'a été téléversé",
-"Missing a temporary folder" => "Il manque un répertoire temporaire",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Le fichier envoyé dépasse la directive MAX_FILE_SIZE qui est spécifiée dans le formulaire HTML.",
+"The uploaded file was only partially uploaded" => "Le fichier n'a été que partiellement envoyé.",
+"No file was uploaded" => "Pas de fichier envoyé.",
+"Missing a temporary folder" => "Absence de dossier temporaire.",
"Failed to write to disk" => "Erreur d'écriture sur le disque",
"Not enough storage available" => "Plus assez d'espace de stockage disponible",
"Invalid directory." => "Dossier invalide.",
@@ -17,7 +16,7 @@
"Delete permanently" => "Supprimer de façon définitive",
"Delete" => "Supprimer",
"Rename" => "Renommer",
-"Pending" => "En cours",
+"Pending" => "En attente",
"{new_name} already exists" => "{new_name} existe déjà",
"replace" => "remplacer",
"suggest name" => "Suggérer un nom",
@@ -25,17 +24,17 @@
"replaced {new_name} with {old_name}" => "{new_name} a été remplacé par {old_name}",
"undo" => "annuler",
"perform delete operation" => "effectuer l'opération de suppression",
-"1 file uploading" => "1 fichier en cours de téléchargement",
-"files uploading" => "fichiers en cours de téléchargement",
+"1 file uploading" => "1 fichier en cours d'envoi",
+"files uploading" => "fichiers en cours d'envoi",
"'.' is an invalid file name." => "'.' n'est pas un nom de fichier valide.",
"File name cannot be empty." => "Le nom de fichier ne peut être vide.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nom invalide, les caractères '\\', '/', '<', '>', ':', '\"', '|', '?' et '*' ne sont pas autorisés.",
"Your storage is full, files can not be updated or synced anymore!" => "Votre espage de stockage est plein, les fichiers ne peuvent plus être téléversés ou synchronisés !",
"Your storage is almost full ({usedSpacePercent}%)" => "Votre espace de stockage est presque plein ({usedSpacePercent}%)",
"Your download is being prepared. This might take some time if the files are big." => "Votre téléchargement est cours de préparation. Ceci peut nécessiter un certain temps si les fichiers sont volumineux.",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Impossible de charger vos fichiers car il s'agit d'un dossier ou le fichier fait 0 octet.",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Impossible d'envoyer votre fichier dans la mesure où il s'agit d'un répertoire ou d'un fichier de taille nulle",
"Not enough space available" => "Espace disponible insuffisant",
-"Upload cancelled." => "Chargement annulé.",
+"Upload cancelled." => "Envoi annulé.",
"File upload is in progress. Leaving the page now will cancel the upload." => "L'envoi du fichier est en cours. Quitter cette page maintenant annulera l'envoi du fichier.",
"URL cannot be empty." => "L'URL ne peut-être vide",
"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Nom de dossier invalide. L'utilisation du mot 'Shared' est réservée à Owncloud",
@@ -47,6 +46,8 @@
"{count} folders" => "{count} dossiers",
"1 file" => "1 fichier",
"{count} files" => "{count} fichiers",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Nom de dossier invalide. L'utilisation du mot 'Shared' est réservée à Owncloud",
+"Unable to rename file" => "Impossible de renommer le fichier",
"Upload" => "Envoyer",
"File handling" => "Gestion des fichiers",
"Maximum upload size" => "Taille max. d'envoi",
@@ -66,7 +67,7 @@
"Nothing in here. Upload something!" => "Il n'y a rien ici ! Envoyez donc quelque chose :)",
"Download" => "Télécharger",
"Unshare" => "Ne plus partager",
-"Upload too large" => "Fichier trop volumineux",
+"Upload too large" => "Téléversement trop volumineux",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Les fichiers que vous essayez d'envoyer dépassent la taille maximale permise par ce serveur.",
"Files are being scanned, please wait." => "Les fichiers sont en cours d'analyse, veuillez patienter.",
"Current scanning" => "Analyse en cours",
diff --git a/apps/files/l10n/gl.php b/apps/files/l10n/gl.php
index 91fd2339457295d72dea5ec05a2190dc63f2b06c..d22ed4b87215d156509866f3a81ac712d2c9b02f 100644
--- a/apps/files/l10n/gl.php
+++ b/apps/files/l10n/gl.php
@@ -1,14 +1,13 @@
"Non se moveu %s - Xa existe un ficheiro con ese nome.",
"Could not move %s" => "Non foi posíbel mover %s",
-"Unable to rename file" => "Non é posíbel renomear o ficheiro",
-"No file was uploaded. Unknown error" => "Non foi enviado ningún ficheiro. Produciuse un erro descoñecido.",
-"There is no error, the file uploaded with success" => "Non se produciu ningún erro. O ficheiro enviouse correctamente",
+"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:",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "O ficheiro enviado excede a directiva MAX_FILE_SIZE que foi indicada no formulario HTML",
-"The uploaded file was only partially uploaded" => "O ficheiro enviado foi só parcialmente enviado",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "O ficheiro enviado excede da directiva MAX_FILE_SIZE especificada no formulario HTML",
+"The uploaded file was only partially uploaded" => "O ficheiro so foi parcialmente enviado",
"No file was uploaded" => "Non se enviou ningún ficheiro",
-"Missing a temporary folder" => "Falta un cartafol temporal",
+"Missing a temporary folder" => "Falta o cartafol temporal",
"Failed to write to disk" => "Produciuse un erro ao escribir no disco",
"Not enough storage available" => "Non hai espazo de almacenamento abondo",
"Invalid directory." => "O directorio é incorrecto.",
@@ -47,12 +46,14 @@
"{count} folders" => "{count} cartafoles",
"1 file" => "1 ficheiro",
"{count} files" => "{count} ficheiros",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Nome de cartafol incorrecto. O uso de «Compartido» e «Shared» está reservado para o ownClod",
+"Unable to rename file" => "Non é posíbel renomear o ficheiro",
"Upload" => "Enviar",
"File handling" => "Manexo de ficheiro",
"Maximum upload size" => "Tamaño máximo do envío",
"max. possible: " => "máx. posíbel: ",
"Needed for multi-file and folder downloads." => "Precísase para a descarga de varios ficheiros e cartafoles.",
-"Enable ZIP-download" => "Habilitar a descarga-ZIP",
+"Enable ZIP-download" => "Activar a descarga ZIP",
"0 is unlimited" => "0 significa ilimitado",
"Maximum input size for ZIP files" => "Tamaño máximo de descarga para os ficheiros ZIP",
"Save" => "Gardar",
diff --git a/apps/files/l10n/he.php b/apps/files/l10n/he.php
index a404a8f00657d644bbd83dc3079d80b4a8ec7eb7..963f25ebedcd661eb55f46ecd4c458b116fd0a91 100644
--- a/apps/files/l10n/he.php
+++ b/apps/files/l10n/he.php
@@ -1,11 +1,11 @@
"לא הועלה קובץ. טעות בלתי מזוהה.",
-"There is no error, the file uploaded with success" => "לא אירעה תקלה, הקבצים הועלו בהצלחה",
+"There is no error, the file uploaded with success" => "לא התרחשה שגיאה, הקובץ הועלה בהצלחה",
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "הקבצים שנשלחו חורגים מהגודל שצוין בהגדרה upload_max_filesize שבקובץ php.ini:",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "הקובץ שהועלה חרג מההנחיה MAX_FILE_SIZE שצוינה בטופס ה־HTML",
-"The uploaded file was only partially uploaded" => "הקובץ שהועלה הועלה בצורה חלקית",
-"No file was uploaded" => "לא הועלו קבצים",
-"Missing a temporary folder" => "תיקייה זמנית חסרה",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "הקובץ שהועלה גדוך מהערך MAX_FILE_SIZE שהוגדר בתופס HTML",
+"The uploaded file was only partially uploaded" => "הקובץ הועלה באופן חלקי בלבד",
+"No file was uploaded" => "שום קובץ לא הועלה",
+"Missing a temporary folder" => "תקיה זמנית חסרה",
"Failed to write to disk" => "הכתיבה לכונן נכשלה",
"Files" => "קבצים",
"Share" => "שתף",
diff --git a/apps/files/l10n/hr.php b/apps/files/l10n/hr.php
index 30af812d439a91ebe996aa8fe3f718138f7b0e2a..d634faee7537ca22813eb4b21ff54c969fb838b3 100644
--- a/apps/files/l10n/hr.php
+++ b/apps/files/l10n/hr.php
@@ -1,13 +1,13 @@
"Datoteka je poslana uspješno i bez pogrešaka",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Poslana datoteka izlazi iz okvira MAX_FILE_SIZE direktive postavljene u HTML obrascu",
-"The uploaded file was only partially uploaded" => "Datoteka je poslana samo djelomično",
-"No file was uploaded" => "Ni jedna datoteka nije poslana",
-"Missing a temporary folder" => "Nedostaje privremena mapa",
+"There is no error, the file uploaded with success" => "Nema pogreške, datoteka je poslana uspješno.",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Poslana datoteka prelazi veličinu prikazanu u MAX_FILE_SIZE direktivi u HTML formi",
+"The uploaded file was only partially uploaded" => "Poslana datoteka je parcijalno poslana",
+"No file was uploaded" => "Datoteka nije poslana",
+"Missing a temporary folder" => "Nedostaje privremeni direktorij",
"Failed to write to disk" => "Neuspjelo pisanje na disk",
"Files" => "Datoteke",
"Share" => "Podijeli",
-"Delete" => "Briši",
+"Delete" => "Obriši",
"Rename" => "Promjeni ime",
"Pending" => "U tijeku",
"replace" => "zamjeni",
@@ -15,14 +15,15 @@
"cancel" => "odustani",
"undo" => "vrati",
"1 file uploading" => "1 datoteka se učitava",
+"files uploading" => "datoteke se učitavaju",
"Unable to upload your file as it is a directory or has 0 bytes" => "Nemoguće poslati datoteku jer je prazna ili je direktorij",
"Upload cancelled." => "Slanje poništeno.",
"File upload is in progress. Leaving the page now will cancel the upload." => "Učitavanje datoteke. Napuštanjem stranice će prekinuti učitavanje.",
"Error" => "Greška",
-"Name" => "Naziv",
+"Name" => "Ime",
"Size" => "Veličina",
"Modified" => "Zadnja promjena",
-"Upload" => "Pošalji",
+"Upload" => "Učitaj",
"File handling" => "datoteka za rukovanje",
"Maximum upload size" => "Maksimalna veličina prijenosa",
"max. possible: " => "maksimalna moguća: ",
@@ -36,8 +37,8 @@
"Folder" => "mapa",
"Cancel upload" => "Prekini upload",
"Nothing in here. Upload something!" => "Nema ničega u ovoj mapi. Pošalji nešto!",
-"Download" => "Preuzmi",
-"Unshare" => "Prekini djeljenje",
+"Download" => "Preuzimanje",
+"Unshare" => "Makni djeljenje",
"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.",
diff --git a/apps/files/l10n/hu_HU.php b/apps/files/l10n/hu_HU.php
index ffbe0fd9c54bd2cbf8d69a6431e5a4019b33b4f3..4520bfdd085dd934fee131f490e5e3a19ebaf5c9 100644
--- a/apps/files/l10n/hu_HU.php
+++ b/apps/files/l10n/hu_HU.php
@@ -1,13 +1,12 @@
"%s áthelyezése nem sikerült - már létezik másik fájl ezzel a névvel",
"Could not move %s" => "Nem sikerült %s áthelyezése",
-"Unable to rename file" => "Nem lehet átnevezni a fájlt",
"No file was uploaded. Unknown error" => "Nem történt feltöltés. Ismeretlen hiba",
"There is no error, the file uploaded with success" => "A fájlt sikerült feltölteni",
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "A feltöltött fájl mérete meghaladja a php.ini állományban megadott upload_max_filesize paraméter értékét.",
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "A feltöltött fájl mérete meghaladja a MAX_FILE_SIZE paramétert, ami a HTML formban került megadásra.",
"The uploaded file was only partially uploaded" => "Az eredeti fájlt csak részben sikerült feltölteni.",
-"No file was uploaded" => "Nem töltődött fel semmi",
+"No file was uploaded" => "Nem töltődött fel állomány",
"Missing a temporary folder" => "Hiányzik egy ideiglenes mappa",
"Failed to write to disk" => "Nem sikerült a lemezre történő írás",
"Not enough storage available" => "Nincs elég szabad hely.",
@@ -47,6 +46,7 @@
"{count} folders" => "{count} mappa",
"1 file" => "1 fájl",
"{count} files" => "{count} fájl",
+"Unable to rename file" => "Nem lehet átnevezni a fájlt",
"Upload" => "Feltöltés",
"File handling" => "Fájlkezelés",
"Maximum upload size" => "Maximális feltölthető fájlméret",
@@ -65,7 +65,7 @@
"You don’t have write permissions here." => "Itt nincs írásjoga.",
"Nothing in here. Upload something!" => "Itt nincs semmi. Töltsön fel valamit!",
"Download" => "Letöltés",
-"Unshare" => "Megosztás visszavonása",
+"Unshare" => "A megosztás visszavonása",
"Upload too large" => "A feltöltés túl nagy",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "A feltöltendő állományok mérete meghaladja a kiszolgálón megengedett maximális méretet.",
"Files are being scanned, please wait." => "A fájllista ellenőrzése zajlik, kis türelmet!",
diff --git a/apps/files/l10n/ia.php b/apps/files/l10n/ia.php
index 8c47b2011a502745be9765c4c83caa5e3421f016..886922d954687866367c1e806a5f7d50a62430c2 100644
--- a/apps/files/l10n/ia.php
+++ b/apps/files/l10n/ia.php
@@ -1,10 +1,11 @@
"Le file incargate solmente esseva incargate partialmente",
-"No file was uploaded" => "Nulle file esseva incargate",
+"No file was uploaded" => "Nulle file esseva incargate.",
"Missing a temporary folder" => "Manca un dossier temporari",
"Files" => "Files",
"Share" => "Compartir",
"Delete" => "Deler",
+"Error" => "Error",
"Name" => "Nomine",
"Size" => "Dimension",
"Modified" => "Modificate",
diff --git a/apps/files/l10n/id.php b/apps/files/l10n/id.php
index 1ec8713d50ec81a40ebe62453ee89ccbd4df27dc..58cc0ea7fd953e2c086f45a3983d593012151b19 100644
--- a/apps/files/l10n/id.php
+++ b/apps/files/l10n/id.php
@@ -1,8 +1,7 @@
"Tidak dapat memindahkan %s - Berkas dengan nama ini sudah ada",
"Could not move %s" => "Tidak dapat memindahkan %s",
-"Unable to rename file" => "Tidak dapat mengubah nama berkas",
-"No file was uploaded. Unknown error" => "Tidak ada berkas yang diunggah. Galat tidak dikenal",
+"No file was uploaded. Unknown error" => "Tidak ada berkas yang diunggah. Galat tidak dikenal.",
"There is no error, the file uploaded with success" => "Tidak ada galat, berkas sukses diunggah",
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Berkas yang diunggah melampaui direktif upload_max_filesize pada php.ini",
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Berkas yang diunggah melampaui direktif MAX_FILE_SIZE yang ditentukan dalam formulir HTML.",
@@ -33,7 +32,7 @@
"Your storage is full, files can not be updated or synced anymore!" => "Ruang penyimpanan Anda penuh, berkas tidak dapat diperbarui atau disinkronkan lagi!",
"Your storage is almost full ({usedSpacePercent}%)" => "Ruang penyimpanan hampir penuh ({usedSpacePercent}%)",
"Your download is being prepared. This might take some time if the files are big." => "Unduhan Anda sedang disiapkan. Prosesnya dapat berlangsung agak lama jika ukuran berkasnya besar.",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Gagal mengunggah berkas Anda karena berupa direktori atau ukurannya 0 byte",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Gagal mengunggah berkas Anda karena berupa direktori atau mempunyai ukuran 0 byte",
"Not enough space available" => "Ruang penyimpanan tidak mencukupi",
"Upload cancelled." => "Pengunggahan dibatalkan.",
"File upload is in progress. Leaving the page now will cancel the upload." => "Berkas sedang diunggah. Meninggalkan halaman ini akan membatalkan proses.",
@@ -47,6 +46,7 @@
"{count} folders" => "{count} folder",
"1 file" => "1 berkas",
"{count} files" => "{count} berkas",
+"Unable to rename file" => "Tidak dapat mengubah nama berkas",
"Upload" => "Unggah",
"File handling" => "Penanganan berkas",
"Maximum upload size" => "Ukuran pengunggahan maksimum",
@@ -66,7 +66,7 @@
"Nothing in here. Upload something!" => "Tidak ada apa-apa di sini. Unggah sesuatu!",
"Download" => "Unduh",
"Unshare" => "Batalkan berbagi",
-"Upload too large" => "Unggahan terlalu besar",
+"Upload too large" => "Yang diunggah terlalu besar",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Berkas yang dicoba untuk diunggah melebihi ukuran maksimum pengunggahan berkas di server ini.",
"Files are being scanned, please wait." => "Berkas sedang dipindai, silakan tunggu.",
"Current scanning" => "Yang sedang dipindai",
diff --git a/apps/files/l10n/is.php b/apps/files/l10n/is.php
index f0a4aa81efa1b6d90a2821a30cd1b5861211cfc2..aa10c838c1d71a945c8b8e9cc5358085fdc71213 100644
--- a/apps/files/l10n/is.php
+++ b/apps/files/l10n/is.php
@@ -1,7 +1,6 @@
"Gat ekki fært %s - Skrá með þessu nafni er þegar til",
"Could not move %s" => "Gat ekki fært %s",
-"Unable to rename file" => "Gat ekki endurskýrt skrá",
"No file was uploaded. Unknown error" => "Engin skrá var send inn. Óþekkt villa.",
"There is no error, the file uploaded with success" => "Engin villa, innsending heppnaðist",
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Innsend skrá er stærri en upload_max stillingin í php.ini:",
@@ -40,6 +39,7 @@
"{count} folders" => "{count} möppur",
"1 file" => "1 skrá",
"{count} files" => "{count} skrár",
+"Unable to rename file" => "Gat ekki endurskýrt skrá",
"Upload" => "Senda inn",
"File handling" => "Meðhöndlun skrár",
"Maximum upload size" => "Hámarks stærð innsendingar",
diff --git a/apps/files/l10n/it.php b/apps/files/l10n/it.php
index d8cdd7dfac40c2a783677066ac4998b21d3b85b6..c588285aacabab0d61dc185d882b4017fd224af2 100644
--- a/apps/files/l10n/it.php
+++ b/apps/files/l10n/it.php
@@ -1,14 +1,13 @@
"Impossibile spostare %s - un file con questo nome esiste già",
"Could not move %s" => "Impossibile spostare %s",
-"Unable to rename file" => "Impossibile rinominare il file",
"No file was uploaded. Unknown error" => "Nessun file è stato inviato. Errore sconosciuto",
-"There is no error, the file uploaded with success" => "Non ci sono errori, file caricato con successo",
+"There is no error, the file uploaded with success" => "Non ci sono errori, il file è stato caricato correttamente",
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Il file caricato supera la direttiva upload_max_filesize in php.ini:",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Il file caricato supera il valore MAX_FILE_SIZE definito nel form HTML",
-"The uploaded file was only partially uploaded" => "Il file è stato parzialmente caricato",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Il file inviato supera la direttiva MAX_FILE_SIZE specificata nel modulo HTML",
+"The uploaded file was only partially uploaded" => "Il file è stato caricato solo parzialmente",
"No file was uploaded" => "Nessun file è stato caricato",
-"Missing a temporary folder" => "Cartella temporanea mancante",
+"Missing a temporary folder" => "Manca una cartella temporanea",
"Failed to write to disk" => "Scrittura su disco non riuscita",
"Not enough storage available" => "Spazio di archiviazione insufficiente",
"Invalid directory." => "Cartella non valida.",
@@ -33,7 +32,7 @@
"Your storage is full, files can not be updated or synced anymore!" => "Lo spazio di archiviazione è pieno, i file non possono essere più aggiornati o sincronizzati!",
"Your storage is almost full ({usedSpacePercent}%)" => "Lo spazio di archiviazione è quasi pieno ({usedSpacePercent}%)",
"Your download is being prepared. This might take some time if the files are big." => "Il tuo scaricamento è in fase di preparazione. Ciò potrebbe richiedere del tempo se i file sono grandi.",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Impossibile inviare il file poiché è una cartella o ha dimensione 0 byte",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Impossibile caricare il file poiché è una cartella o ha una dimensione di 0 byte",
"Not enough space available" => "Spazio disponibile insufficiente",
"Upload cancelled." => "Invio annullato",
"File upload is in progress. Leaving the page now will cancel the upload." => "Caricamento del file in corso. La chiusura della pagina annullerà il caricamento.",
@@ -47,6 +46,8 @@
"{count} folders" => "{count} cartelle",
"1 file" => "1 file",
"{count} files" => "{count} file",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Nome della cartella non valido. L'uso di 'Shared' è riservato a ownCloud",
+"Unable to rename file" => "Impossibile rinominare il file",
"Upload" => "Carica",
"File handling" => "Gestione file",
"Maximum upload size" => "Dimensione massima upload",
@@ -66,7 +67,7 @@
"Nothing in here. Upload something!" => "Non c'è niente qui. Carica qualcosa!",
"Download" => "Scarica",
"Unshare" => "Rimuovi condivisione",
-"Upload too large" => "Il file caricato è troppo grande",
+"Upload too large" => "Caricamento troppo grande",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "I file che stai provando a caricare superano la dimensione massima consentita su questo server.",
"Files are being scanned, please wait." => "Scansione dei file in corso, attendi",
"Current scanning" => "Scansione corrente",
diff --git a/apps/files/l10n/ja_JP.php b/apps/files/l10n/ja_JP.php
index 503511804e3337e4ad15cd7004b9b6a4875c0cdc..55dcf3640e7746d8d23a7cd00873474604fa32e9 100644
--- a/apps/files/l10n/ja_JP.php
+++ b/apps/files/l10n/ja_JP.php
@@ -1,14 +1,13 @@
"%s を移動できませんでした ― この名前のファイルはすでに存在します",
"Could not move %s" => "%s を移動できませんでした",
-"Unable to rename file" => "ファイル名の変更ができません",
"No file was uploaded. Unknown error" => "ファイルは何もアップロードされていません。不明なエラー",
"There is no error, the file uploaded with success" => "エラーはありません。ファイルのアップロードは成功しました",
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "アップロードされたファイルはphp.ini の upload_max_filesize に設定されたサイズを超えています:",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "アップロードされたファイルはHTMLのフォームに設定されたMAX_FILE_SIZEに設定されたサイズを超えています",
-"The uploaded file was only partially uploaded" => "ファイルは一部分しかアップロードされませんでした",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "アップロードファイルはHTMLフォームで指定された MAX_FILE_SIZE の制限を超えています",
+"The uploaded file was only partially uploaded" => "アップロードファイルは一部分だけアップロードされました",
"No file was uploaded" => "ファイルはアップロードされませんでした",
-"Missing a temporary folder" => "テンポラリフォルダが見つかりません",
+"Missing a temporary folder" => "一時保存フォルダが見つかりません",
"Failed to write to disk" => "ディスクへの書き込みに失敗しました",
"Not enough storage available" => "ストレージに十分な空き容量がありません",
"Invalid directory." => "無効なディレクトリです。",
@@ -17,7 +16,7 @@
"Delete permanently" => "完全に削除する",
"Delete" => "削除",
"Rename" => "名前の変更",
-"Pending" => "保留",
+"Pending" => "中断",
"{new_name} already exists" => "{new_name} はすでに存在しています",
"replace" => "置き換え",
"suggest name" => "推奨名称",
@@ -42,11 +41,13 @@
"Error" => "エラー",
"Name" => "名前",
"Size" => "サイズ",
-"Modified" => "更新日時",
+"Modified" => "変更",
"1 folder" => "1 フォルダ",
"{count} folders" => "{count} フォルダ",
"1 file" => "1 ファイル",
"{count} files" => "{count} ファイル",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "無効なフォルダ名です。'Shared' の利用はownCloudで予約済みです",
+"Unable to rename file" => "ファイル名の変更ができません",
"Upload" => "アップロード",
"File handling" => "ファイル操作",
"Maximum upload size" => "最大アップロードサイズ",
@@ -65,8 +66,8 @@
"You don’t have write permissions here." => "あなたには書き込み権限がありません。",
"Nothing in here. Upload something!" => "ここには何もありません。何かアップロードしてください。",
"Download" => "ダウンロード",
-"Unshare" => "共有しない",
-"Upload too large" => "ファイルサイズが大きすぎます",
+"Unshare" => "共有解除",
+"Upload too large" => "アップロードには大きすぎます。",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "アップロードしようとしているファイルは、サーバで規定された最大サイズを超えています。",
"Files are being scanned, please wait." => "ファイルをスキャンしています、しばらくお待ちください。",
"Current scanning" => "スキャン中",
diff --git a/apps/files/l10n/ka_GE.php b/apps/files/l10n/ka_GE.php
index 1e645dfb001c84c7d3c96e1e08a63df9f3d3f23d..c50ca2594b6db137143b18a48ba7cd8077544176 100644
--- a/apps/files/l10n/ka_GE.php
+++ b/apps/files/l10n/ka_GE.php
@@ -1,7 +1,6 @@
"%s –ის გადატანა ვერ მოხერხდა – ფაილი ამ სახელით უკვე არსებობს",
"Could not move %s" => "%s –ის გადატანა ვერ მოხერხდა",
-"Unable to rename file" => "ფაილის სახელის გადარქმევა ვერ მოხერხდა",
"No file was uploaded. Unknown error" => "ფაილი არ აიტვირთა. უცნობი შეცდომა",
"There is no error, the file uploaded with success" => "ჭოცდომა არ დაფიქსირდა, ფაილი წარმატებით აიტვირთა",
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "ატვირთული ფაილი აჭარბებს upload_max_filesize დირექტივას php.ini ფაილში",
@@ -47,6 +46,7 @@
"{count} folders" => "{count} საქაღალდე",
"1 file" => "1 ფაილი",
"{count} files" => "{count} ფაილი",
+"Unable to rename file" => "ფაილის სახელის გადარქმევა ვერ მოხერხდა",
"Upload" => "ატვირთვა",
"File handling" => "ფაილის დამუშავება",
"Maximum upload size" => "მაქსიმუმ ატვირთის ზომა",
@@ -65,7 +65,7 @@
"You don’t have write permissions here." => "თქვენ არ გაქვთ ჩაწერის უფლება აქ.",
"Nothing in here. Upload something!" => "აქ არაფერი არ არის. ატვირთე რამე!",
"Download" => "ჩამოტვირთვა",
-"Unshare" => "გაზიარების მოხსნა",
+"Unshare" => "გაუზიარებადი",
"Upload too large" => "ასატვირთი ფაილი ძალიან დიდია",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "ფაილის ზომა რომლის ატვირთვასაც თქვენ აპირებთ, აჭარბებს სერვერზე დაშვებულ მაქსიმუმს.",
"Files are being scanned, please wait." => "მიმდინარეობს ფაილების სკანირება, გთხოვთ დაელოდოთ.",
diff --git a/apps/files/l10n/ko.php b/apps/files/l10n/ko.php
index 48078908e815bfc1f7346a1d1e033c2c1fc37ef3..c78f58542e460d27b5b9cab6acb249a4e2b15580 100644
--- a/apps/files/l10n/ko.php
+++ b/apps/files/l10n/ko.php
@@ -1,35 +1,38 @@
"%s 항목을 이동시키지 못하였음 - 파일 이름이 이미 존재함",
"Could not move %s" => "%s 항목을 이딩시키지 못하였음",
-"Unable to rename file" => "파일 이름바꾸기 할 수 없음",
"No file was uploaded. Unknown error" => "파일이 업로드되지 않았습니다. 알 수 없는 오류입니다",
-"There is no error, the file uploaded with success" => "업로드에 성공하였습니다.",
+"There is no error, the file uploaded with success" => "파일 업로드에 성공하였습니다.",
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "업로드한 파일이 php.ini의 upload_max_filesize보다 큽니다:",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "업로드한 파일이 HTML 문서에 지정한 MAX_FILE_SIZE보다 더 큼",
-"The uploaded file was only partially uploaded" => "파일이 부분적으로 업로드됨",
-"No file was uploaded" => "업로드된 파일 없음",
-"Missing a temporary folder" => "임시 폴더가 사라짐",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "업로드한 파일 크기가 HTML 폼의 MAX_FILE_SIZE보다 큼",
+"The uploaded file was only partially uploaded" => "파일의 일부분만 업로드됨",
+"No file was uploaded" => "파일이 업로드되지 않았음",
+"Missing a temporary folder" => "임시 폴더가 없음",
"Failed to write to disk" => "디스크에 쓰지 못했습니다",
+"Not enough storage available" => "저장소가 용량이 충분하지 않습니다.",
"Invalid directory." => "올바르지 않은 디렉터리입니다.",
"Files" => "파일",
"Share" => "공유",
+"Delete permanently" => "영원히 삭제",
"Delete" => "삭제",
"Rename" => "이름 바꾸기",
-"Pending" => "보류 중",
+"Pending" => "대기 중",
"{new_name} already exists" => "{new_name}이(가) 이미 존재함",
"replace" => "바꾸기",
"suggest name" => "이름 제안",
"cancel" => "취소",
"replaced {new_name} with {old_name}" => "{old_name}이(가) {new_name}(으)로 대체됨",
-"undo" => "실행 취소",
+"undo" => "되돌리기",
+"perform delete operation" => "삭제 작업중",
"1 file uploading" => "파일 1개 업로드 중",
+"files uploading" => "파일 업로드중",
"'.' is an invalid file name." => "'.' 는 올바르지 않은 파일 이름 입니다.",
"File name cannot be empty." => "파일 이름이 비어 있을 수 없습니다.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "폴더 이름이 올바르지 않습니다. 이름에 문자 '\\', '/', '<', '>', ':', '\"', '|', '? ', '*'는 사용할 수 없습니다.",
"Your storage is full, files can not be updated or synced anymore!" => "저장 공간이 가득 찼습니다. 파일을 업데이트하거나 동기화할 수 없습니다!",
"Your storage is almost full ({usedSpacePercent}%)" => "저장 공간이 거의 가득 찼습니다 ({usedSpacePercent}%)",
"Your download is being prepared. This might take some time if the files are big." => "다운로드가 준비 중입니다. 파일 크기가 크다면 시간이 오래 걸릴 수도 있습니다.",
-"Unable to upload your file as it is a directory or has 0 bytes" => "이 파일은 디렉터리이거나 비어 있기 때문에 업로드할 수 없습니다",
+"Unable to upload your file as it is a directory or has 0 bytes" => "디렉터리 및 빈 파일은 업로드할 수 없습니다",
"Not enough space available" => "여유 공간이 부족합니다",
"Upload cancelled." => "업로드가 취소되었습니다.",
"File upload is in progress. Leaving the page now will cancel the upload." => "파일 업로드가 진행 중입니다. 이 페이지를 벗어나면 업로드가 취소됩니다.",
@@ -43,6 +46,7 @@
"{count} folders" => "폴더 {count}개",
"1 file" => "파일 1개",
"{count} files" => "파일 {count}개",
+"Unable to rename file" => "파일 이름바꾸기 할 수 없음",
"Upload" => "업로드",
"File handling" => "파일 처리",
"Maximum upload size" => "최대 업로드 크기",
@@ -56,11 +60,13 @@
"Text file" => "텍스트 파일",
"Folder" => "폴더",
"From link" => "링크에서",
+"Deleted files" => "파일 삭제됨",
"Cancel upload" => "업로드 취소",
+"You don’t have write permissions here." => "당신은 여기에 쓰기를 할 수 있는 권한이 없습니다.",
"Nothing in here. Upload something!" => "내용이 없습니다. 업로드할 수 있습니다!",
"Download" => "다운로드",
"Unshare" => "공유 해제",
-"Upload too large" => "업로드 용량 초과",
+"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" => "현재 검색",
diff --git a/apps/files/l10n/lb.php b/apps/files/l10n/lb.php
index 6c703691784c07c8b5f3b7535c650b73fbd57689..4a60295c5cb3680a3759f857c16579c7b06ef721 100644
--- a/apps/files/l10n/lb.php
+++ b/apps/files/l10n/lb.php
@@ -2,7 +2,7 @@
"There is no error, the file uploaded with success" => "Keen Feeler, Datei ass komplett ropgelueden ginn",
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Déi ropgelueden Datei ass méi grouss wei d'MAX_FILE_SIZE Eegenschaft déi an der HTML form uginn ass",
"The uploaded file was only partially uploaded" => "Déi ropgelueden Datei ass nëmmen hallef ropgelueden ginn",
-"No file was uploaded" => "Et ass keng Datei ropgelueden ginn",
+"No file was uploaded" => "Et ass kee Fichier ropgeluede ginn",
"Missing a temporary folder" => "Et feelt en temporären Dossier",
"Failed to write to disk" => "Konnt net op den Disk schreiwen",
"Files" => "Dateien",
@@ -32,7 +32,7 @@
"Folder" => "Dossier",
"Cancel upload" => "Upload ofbriechen",
"Nothing in here. Upload something!" => "Hei ass näischt. Lued eppes rop!",
-"Download" => "Eroflueden",
+"Download" => "Download",
"Unshare" => "Net méi deelen",
"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.",
diff --git a/apps/files/l10n/lt_LT.php b/apps/files/l10n/lt_LT.php
index b53a390db650e4ee6ec8fcd36480f4982387b34c..3e2ea80c9491d42023a6bfd8f6dd17671ffa7a3d 100644
--- a/apps/files/l10n/lt_LT.php
+++ b/apps/files/l10n/lt_LT.php
@@ -1,8 +1,8 @@
"Klaidų nėra, failas įkeltas sėkmingai",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Įkeliamo failo dydis viršija MAX_FILE_SIZE parametrą, kuris yra nustatytas HTML formoje",
+"There is no error, the file uploaded with success" => "Failas įkeltas sėkmingai, be klaidų",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Įkeliamo failo dydis viršija MAX_FILE_SIZE nustatymą, kuris naudojamas HTML formoje.",
"The uploaded file was only partially uploaded" => "Failas buvo įkeltas tik dalinai",
-"No file was uploaded" => "Nebuvo įkeltas nė vienas failas",
+"No file was uploaded" => "Nebuvo įkeltas joks failas",
"Missing a temporary folder" => "Nėra laikinojo katalogo",
"Failed to write to disk" => "Nepavyko įrašyti į diską",
"Files" => "Failai",
@@ -45,7 +45,7 @@
"Download" => "Atsisiųsti",
"Unshare" => "Nebesidalinti",
"Upload too large" => "Įkėlimui failas per didelis",
-"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Bandomų įkelti failų dydis viršija maksimalų leidžiamą šiame serveryje",
+"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"
);
diff --git a/apps/files/l10n/lv.php b/apps/files/l10n/lv.php
index c5bf938f73a397155ac3a26ffd7490040a69f0a6..f62bdd2d49226306ebaaa5870d6f532fe6f688d5 100644
--- a/apps/files/l10n/lv.php
+++ b/apps/files/l10n/lv.php
@@ -1,9 +1,8 @@
"Nevarēja pārvietot %s — jau eksistē datne ar tādu nosaukumu",
"Could not move %s" => "Nevarēja pārvietot %s",
-"Unable to rename file" => "Nevarēja pārsaukt datni",
"No file was uploaded. Unknown error" => "Netika augšupielādēta neviena datne. Nezināma kļūda",
-"There is no error, the file uploaded with success" => "Augšupielāde pabeigta bez kļūdām",
+"There is no error, the file uploaded with success" => "Viss kārtībā, datne augšupielādēta veiksmīga",
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Augšupielādētā datne pārsniedz upload_max_filesize norādījumu php.ini datnē:",
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Augšupielādētā datne pārsniedz MAX_FILE_SIZE norādi, kas ir norādīta HTML formā",
"The uploaded file was only partially uploaded" => "Augšupielādētā datne ir tikai daļēji augšupielādēta",
@@ -32,7 +31,7 @@
"Your storage is full, files can not be updated or synced anymore!" => "Jūsu krātuve ir pilna, datnes vairs nevar augšupielādēt vai sinhronizēt!",
"Your storage is almost full ({usedSpacePercent}%)" => "Jūsu krātuve ir gandrīz pilna ({usedSpacePercent}%)",
"Your download is being prepared. This might take some time if the files are big." => "Tiek sagatavota lejupielāde. Tas var aizņemt kādu laiciņu, ja datnes ir lielas.",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Nevar augšupielādēt jūsu datni, jo tā ir direktorija vai arī tās izmērs ir 0 baiti",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Nevar augšupielādēt jūsu datni, jo tā ir direktorija vai arī tā ir 0 baitu liela",
"Not enough space available" => "Nepietiek brīvas vietas",
"Upload cancelled." => "Augšupielāde ir atcelta.",
"File upload is in progress. Leaving the page now will cancel the upload." => "Notiek augšupielāde. Pametot lapu tagad, tiks atcelta augšupielāde.",
@@ -46,6 +45,7 @@
"{count} folders" => "{count} mapes",
"1 file" => "1 datne",
"{count} files" => "{count} datnes",
+"Unable to rename file" => "Nevarēja pārsaukt datni",
"Upload" => "Augšupielādēt",
"File handling" => "Datņu pārvaldība",
"Maximum upload size" => "Maksimālais datņu augšupielādes apjoms",
diff --git a/apps/files/l10n/mk.php b/apps/files/l10n/mk.php
index 50aadc7e1f6059e023dffc6e6f46770e97f5e447..992618f06bfc044c4181be525a9b54f34346140e 100644
--- a/apps/files/l10n/mk.php
+++ b/apps/files/l10n/mk.php
@@ -1,11 +1,11 @@
"Ниту еден фајл не се вчита. Непозната грешка",
-"There is no error, the file uploaded with success" => "Нема грешка, датотеката беше подигната успешно",
+"There is no error, the file uploaded with success" => "Датотеката беше успешно подигната.",
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Подигнатата датотека ја надминува upload_max_filesize директивата во php.ini:",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Подигнатата датотеката ја надминува MAX_FILE_SIZE директивата која беше поставена во HTML формата",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Големината на датотеката ја надминува MAX_FILE_SIZE директивата која беше специфицирана во HTML формата",
"The uploaded file was only partially uploaded" => "Датотеката беше само делумно подигната.",
-"No file was uploaded" => "Не беше подигната датотека",
-"Missing a temporary folder" => "Не постои привремена папка",
+"No file was uploaded" => "Не беше подигната датотека.",
+"Missing a temporary folder" => "Недостасува привремена папка",
"Failed to write to disk" => "Неуспеав да запишам на диск",
"Files" => "Датотеки",
"Share" => "Сподели",
@@ -49,7 +49,7 @@
"Nothing in here. Upload something!" => "Тука нема ништо. Снимете нешто!",
"Download" => "Преземи",
"Unshare" => "Не споделувај",
-"Upload too large" => "Датотеката е премногу голема",
+"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" => "Моментално скенирам"
diff --git a/apps/files/l10n/ms_MY.php b/apps/files/l10n/ms_MY.php
index 9ec795d7c50f0f5f26e3093d7e7584651aed67df..2ce4f1633284f2efb84b9d42cb080536a7a0c509 100644
--- a/apps/files/l10n/ms_MY.php
+++ b/apps/files/l10n/ms_MY.php
@@ -1,12 +1,12 @@
"Tiada fail dimuatnaik. Ralat tidak diketahui.",
-"There is no error, the file uploaded with success" => "Tiada ralat, fail berjaya dimuat naik.",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Fail yang dimuat naik melebihi MAX_FILE_SIZE yang dinyatakan dalam form HTML ",
-"The uploaded file was only partially uploaded" => "Sebahagian daripada fail telah dimuat naik. ",
-"No file was uploaded" => "Tiada fail yang dimuat naik",
-"Missing a temporary folder" => "Folder sementara hilang",
+"There is no error, the file uploaded with success" => "Tiada ralat berlaku, fail berjaya dimuatnaik",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Saiz fail yang dimuatnaik melebihi MAX_FILE_SIZE yang ditetapkan dalam borang HTML",
+"The uploaded file was only partially uploaded" => "Fail yang dimuatnaik tidak lengkap",
+"No file was uploaded" => "Tiada fail dimuatnaik",
+"Missing a temporary folder" => "Direktori sementara hilang",
"Failed to write to disk" => "Gagal untuk disimpan",
-"Files" => "fail",
+"Files" => "Fail-fail",
"Share" => "Kongsi",
"Delete" => "Padam",
"Pending" => "Dalam proses",
@@ -15,7 +15,7 @@
"Unable to upload your file as it is a directory or has 0 bytes" => "Tidak boleh memuatnaik fail anda kerana mungkin ianya direktori atau saiz fail 0 bytes",
"Upload cancelled." => "Muatnaik dibatalkan.",
"Error" => "Ralat",
-"Name" => "Nama ",
+"Name" => "Nama",
"Size" => "Saiz",
"Modified" => "Dimodifikasi",
"Upload" => "Muat naik",
@@ -33,7 +33,7 @@
"Cancel upload" => "Batal muat naik",
"Nothing in here. Upload something!" => "Tiada apa-apa di sini. Muat naik sesuatu!",
"Download" => "Muat turun",
-"Upload too large" => "Muat naik terlalu besar",
+"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"
diff --git a/apps/files/l10n/nb_NO.php b/apps/files/l10n/nb_NO.php
index 921eacdc721730062c195363daf0984dfcb421a3..d5710a4927a07f438afa6531298606fdbd8a3593 100644
--- a/apps/files/l10n/nb_NO.php
+++ b/apps/files/l10n/nb_NO.php
@@ -1,11 +1,16 @@
"Kan ikke flytte %s - En fil med samme navn finnes allerede",
+"Could not move %s" => "Kunne ikke flytte %s",
"No file was uploaded. Unknown error" => "Ingen filer ble lastet opp. Ukjent feil.",
-"There is no error, the file uploaded with success" => "Det er ingen feil. Filen ble lastet opp.",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Filstørrelsen overskrider maksgrensen på MAX_FILE_SIZE som ble oppgitt i HTML-skjemaet",
-"The uploaded file was only partially uploaded" => "Filopplastningen ble bare delvis gjennomført",
-"No file was uploaded" => "Ingen fil ble lastet opp",
-"Missing a temporary folder" => "Mangler en midlertidig mappe",
+"There is no error, the file uploaded with success" => "Pust ut, ingen feil. Filen ble lastet opp problemfritt",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Filstørrelsen overskrider maksgrensedirektivet upload_max_filesize i php.ini-konfigurasjonen.",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Filen du prøvde å laste opp var større enn grensen satt i MAX_FILE_SIZE i HTML-skjemaet.",
+"The uploaded file was only partially uploaded" => "Filen du prøvde å laste opp ble kun delvis lastet opp",
+"No file was uploaded" => "Ingen filer ble lastet opp",
+"Missing a temporary folder" => "Mangler midlertidig mappe",
"Failed to write to disk" => "Klarte ikke å skrive til disk",
+"Not enough storage available" => "Ikke nok lagringsplass",
+"Invalid directory." => "Ugyldig katalog.",
"Files" => "Filer",
"Share" => "Del",
"Delete permanently" => "Slett permanent",
@@ -18,12 +23,21 @@
"cancel" => "avbryt",
"replaced {new_name} with {old_name}" => "erstatt {new_name} med {old_name}",
"undo" => "angre",
+"perform delete operation" => "utfør sletting",
"1 file uploading" => "1 fil lastes opp",
+"files uploading" => "filer lastes opp",
+"'.' is an invalid file name." => "'.' er et ugyldig filnavn.",
+"File name cannot be empty." => "Filnavn kan ikke være tomt.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ugyldig navn, '\\', '/', '<', '>', ':', '\"', '|', '?' og '*' er ikke tillatt.",
+"Your storage is full, files can not be updated or synced anymore!" => "Lagringsplass er oppbrukt, filer kan ikke lenger oppdateres eller synkroniseres!",
+"Your storage is almost full ({usedSpacePercent}%)" => "Lagringsplass er nesten oppbruker ([usedSpacePercent}%)",
+"Your download is being prepared. This might take some time if the files are big." => "Nedlastingen din klargjøres. Hvis filene er store kan dette ta litt tid.",
"Unable to upload your file as it is a directory or has 0 bytes" => "Kan ikke laste opp filen din siden det er en mappe eller den har 0 bytes",
+"Not enough space available" => "Ikke nok lagringsplass",
"Upload cancelled." => "Opplasting avbrutt.",
"File upload is in progress. Leaving the page now will cancel the upload." => "Filopplasting pågår. Forlater du siden nå avbrytes opplastingen.",
"URL cannot be empty." => "URL-en kan ikke være tom.",
+"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Ugyldig mappenavn. Bruk av \"Shared\" er reservert av ownCloud.",
"Error" => "Feil",
"Name" => "Navn",
"Size" => "Størrelse",
@@ -32,6 +46,8 @@
"{count} folders" => "{count} mapper",
"1 file" => "1 fil",
"{count} files" => "{count} filer",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Ugyldig mappenavn. Bruk av \"Shared\" er reservert av ownCloud.",
+"Unable to rename file" => "Kan ikke gi nytt navn",
"Upload" => "Last opp",
"File handling" => "Filhåndtering",
"Maximum upload size" => "Maksimum opplastingsstørrelse",
@@ -45,12 +61,15 @@
"Text file" => "Tekstfil",
"Folder" => "Mappe",
"From link" => "Fra link",
+"Deleted files" => "Slettet filer",
"Cancel upload" => "Avbryt opplasting",
+"You don’t have write permissions here." => "Du har ikke skrivetilgang her.",
"Nothing in here. Upload something!" => "Ingenting her. Last opp noe!",
"Download" => "Last ned",
"Unshare" => "Avslutt deling",
-"Upload too large" => "Opplasting for stor",
+"Upload too large" => "Filen er for stor",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Filene du prøver å laste opp er for store for å laste opp til denne serveren.",
"Files are being scanned, please wait." => "Skanner etter filer, vennligst vent.",
-"Current scanning" => "Pågående skanning"
+"Current scanning" => "Pågående skanning",
+"Upgrading filesystem cache..." => "Oppgraderer filsystemets mellomlager..."
);
diff --git a/apps/files/l10n/nl.php b/apps/files/l10n/nl.php
index 8b366af83a8d414c1248260f3fea76b437f095d5..bc4158df3b3928befe482bbd8d5692f677d7de0a 100644
--- a/apps/files/l10n/nl.php
+++ b/apps/files/l10n/nl.php
@@ -1,14 +1,13 @@
"Kon %s niet verplaatsen - Er bestaat al een bestand met deze naam",
"Could not move %s" => "Kon %s niet verplaatsen",
-"Unable to rename file" => "Kan bestand niet hernoemen",
"No file was uploaded. Unknown error" => "Er was geen bestand geladen. Onbekende fout",
-"There is no error, the file uploaded with success" => "Geen fout opgetreden, bestand successvol geupload.",
+"There is no error, the file uploaded with success" => "De upload van het bestand is goedgegaan.",
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Het geüploade bestand overscheidt de upload_max_filesize optie in php.ini:",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Het geüploade bestand is groter dan de MAX_FILE_SIZE richtlijn die is opgegeven in de HTML-formulier",
-"The uploaded file was only partially uploaded" => "Het bestand is slechts gedeeltelijk geupload",
-"No file was uploaded" => "Geen bestand geüpload",
-"Missing a temporary folder" => "Een tijdelijke map mist",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Het bestand overschrijdt de MAX_FILE_SIZE instelling dat is opgegeven in het HTML formulier",
+"The uploaded file was only partially uploaded" => "Het bestand is gedeeltelijk geüpload",
+"No file was uploaded" => "Er is geen bestand geüpload",
+"Missing a temporary folder" => "Er ontbreekt een tijdelijke map",
"Failed to write to disk" => "Schrijven naar schijf mislukt",
"Not enough storage available" => "Niet genoeg opslagruimte beschikbaar",
"Invalid directory." => "Ongeldige directory.",
@@ -17,7 +16,7 @@
"Delete permanently" => "Verwijder definitief",
"Delete" => "Verwijder",
"Rename" => "Hernoem",
-"Pending" => "Wachten",
+"Pending" => "In behandeling",
"{new_name} already exists" => "{new_name} bestaat al",
"replace" => "vervang",
"suggest name" => "Stel een naam voor",
@@ -33,7 +32,7 @@
"Your storage is full, files can not be updated or synced anymore!" => "Uw opslagruimte zit vol, Bestanden kunnen niet meer worden ge-upload of gesynchroniseerd!",
"Your storage is almost full ({usedSpacePercent}%)" => "Uw opslagruimte zit bijna vol ({usedSpacePercent}%)",
"Your download is being prepared. This might take some time if the files are big." => "Uw download wordt voorbereid. Dit kan enige tijd duren bij grote bestanden.",
-"Unable to upload your file as it is a directory or has 0 bytes" => "uploaden van de file mislukt, het is of een directory of de bestandsgrootte is 0 bytes",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Het lukt niet om uw bestand te uploaded, omdat het een folder of 0 bytes is",
"Not enough space available" => "Niet genoeg ruimte beschikbaar",
"Upload cancelled." => "Uploaden geannuleerd.",
"File upload is in progress. Leaving the page now will cancel the upload." => "Bestandsupload is bezig. Wanneer de pagina nu verlaten wordt, stopt de upload.",
@@ -41,13 +40,15 @@
"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Ongeldige mapnaam. Gebruik van'Gedeeld' is voorbehouden aan Owncloud",
"Error" => "Fout",
"Name" => "Naam",
-"Size" => "Bestandsgrootte",
-"Modified" => "Laatst aangepast",
+"Size" => "Grootte",
+"Modified" => "Aangepast",
"1 folder" => "1 map",
"{count} folders" => "{count} mappen",
"1 file" => "1 bestand",
"{count} files" => "{count} bestanden",
-"Upload" => "Upload",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Ongeldige mapnaam. Gebruik van 'Gedeeld' is voorbehouden aan Owncloud zelf",
+"Unable to rename file" => "Kan bestand niet hernoemen",
+"Upload" => "Uploaden",
"File handling" => "Bestand",
"Maximum upload size" => "Maximale bestandsgrootte voor uploads",
"max. possible: " => "max. mogelijk: ",
@@ -55,7 +56,7 @@
"Enable ZIP-download" => "Zet ZIP-download aan",
"0 is unlimited" => "0 is ongelimiteerd",
"Maximum input size for ZIP files" => "Maximale grootte voor ZIP bestanden",
-"Save" => "Opslaan",
+"Save" => "Bewaren",
"New" => "Nieuw",
"Text file" => "Tekstbestand",
"Folder" => "Map",
@@ -64,9 +65,9 @@
"Cancel upload" => "Upload afbreken",
"You don’t have write permissions here." => "U hebt hier geen schrijfpermissies.",
"Nothing in here. Upload something!" => "Er bevindt zich hier niets. Upload een bestand!",
-"Download" => "Download",
-"Unshare" => "Stop delen",
-"Upload too large" => "Bestanden te groot",
+"Download" => "Downloaden",
+"Unshare" => "Stop met delen",
+"Upload too large" => "Upload is te groot",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "De bestanden die u probeert te uploaden zijn groter dan de maximaal toegestane bestandsgrootte voor deze server.",
"Files are being scanned, please wait." => "Bestanden worden gescand, even wachten.",
"Current scanning" => "Er wordt gescand",
diff --git a/apps/files/l10n/nn_NO.php b/apps/files/l10n/nn_NO.php
index 8f32dc012e35a9214de0bd04d0bd16cb36394409..29593b6f2def50a7d86a473355100ec45ba099ad 100644
--- a/apps/files/l10n/nn_NO.php
+++ b/apps/files/l10n/nn_NO.php
@@ -1,23 +1,75 @@
"Klarte ikkje flytta %s – det finst allereie ei fil med dette namnet",
+"Could not move %s" => "Klarte ikkje flytta %s",
+"No file was uploaded. Unknown error" => "Ingen filer lasta opp. Ukjend feil",
"There is no error, the file uploaded with success" => "Ingen feil, fila vart lasta opp",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Fila du lasta opp er større enn det «upload_max_filesize» i php.ini tillater: ",
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Den opplasta fila er større enn variabelen MAX_FILE_SIZE i HTML-skjemaet",
"The uploaded file was only partially uploaded" => "Fila vart berre delvis lasta opp",
"No file was uploaded" => "Ingen filer vart lasta opp",
"Missing a temporary folder" => "Manglar ei mellombels mappe",
+"Failed to write to disk" => "Klarte ikkje skriva til disk",
+"Not enough storage available" => "Ikkje nok lagringsplass tilgjengeleg",
+"Invalid directory." => "Ugyldig mappe.",
"Files" => "Filer",
+"Share" => "Del",
+"Delete permanently" => "Slett for godt",
"Delete" => "Slett",
+"Rename" => "Endra namn",
+"Pending" => "Under vegs",
+"{new_name} already exists" => "{new_name} finst allereie",
+"replace" => "byt ut",
+"suggest name" => "føreslå namn",
+"cancel" => "avbryt",
+"replaced {new_name} with {old_name}" => "bytte ut {new_name} med {old_name}",
+"undo" => "angre",
+"perform delete operation" => "utfør sletting",
+"1 file uploading" => "1 fil lastar opp",
+"files uploading" => "filer lastar opp",
+"'.' is an invalid file name." => "«.» er eit ugyldig filnamn.",
+"File name cannot be empty." => "Filnamnet kan ikkje vera tomt.",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ugyldig namn, «\\», «/», «<», «>», «:», «\"», «|», «?» og «*» er ikkje tillate.",
+"Your storage is full, files can not be updated or synced anymore!" => "Lagringa di er full, kan ikkje lenger oppdatera eller synkronisera!",
+"Your storage is almost full ({usedSpacePercent}%)" => "Lagringa di er nesten full ({usedSpacePercent} %)",
+"Your download is being prepared. This might take some time if the files are big." => "Gjer klar nedlastinga di. Dette kan ta ei stund viss filene er store.",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Klarte ikkje lasta opp fila sidan ho er ei mappe eller er på 0 byte",
+"Not enough space available" => "Ikkje nok lagringsplass tilgjengeleg",
+"Upload cancelled." => "Opplasting avbroten.",
+"File upload is in progress. Leaving the page now will cancel the upload." => "Fila lastar no opp. Viss du forlèt sida no vil opplastinga verta avbroten.",
+"URL cannot be empty." => "Nettadressa kan ikkje vera tom.",
+"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Ugyldig mappenamn. Mappa «Shared» er reservert av ownCloud",
"Error" => "Feil",
"Name" => "Namn",
"Size" => "Storleik",
"Modified" => "Endra",
+"1 folder" => "1 mappe",
+"{count} folders" => "{count} mapper",
+"1 file" => "1 fil",
+"{count} files" => "{count} filer",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Ugyldig mappenamn. Mappa «Shared» er reservert av ownCloud",
+"Unable to rename file" => "Klarte ikkje endra filnamnet",
"Upload" => "Last opp",
+"File handling" => "Filhandtering",
"Maximum upload size" => "Maksimal opplastingsstorleik",
+"max. possible: " => "maks. moglege:",
+"Needed for multi-file and folder downloads." => "Nødvendig for fleirfils- og mappenedlastingar.",
+"Enable ZIP-download" => "Slå på ZIP-nedlasting",
+"0 is unlimited" => "0 er ubegrensa",
+"Maximum input size for ZIP files" => "Maksimal storleik for ZIP-filer",
"Save" => "Lagre",
"New" => "Ny",
"Text file" => "Tekst fil",
"Folder" => "Mappe",
+"From link" => "Frå lenkje",
+"Deleted files" => "Sletta filer",
+"Cancel upload" => "Avbryt opplasting",
+"You don’t have write permissions here." => "Du har ikkje skriverettar her.",
"Nothing in here. Upload something!" => "Ingenting her. Last noko opp!",
"Download" => "Last ned",
+"Unshare" => "Udel",
"Upload too large" => "For stor opplasting",
-"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Filene du prøver å laste opp er større enn maksgrensa til denne tenaren."
+"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Filene du prøver å lasta opp er større enn maksgrensa til denne tenaren.",
+"Files are being scanned, please wait." => "Skannar filer, ver venleg og vent.",
+"Current scanning" => "Køyrande skanning",
+"Upgrading filesystem cache..." => "Oppgraderer mellomlageret av filsystemet …"
);
diff --git a/apps/files/l10n/oc.php b/apps/files/l10n/oc.php
index 70a41fc17f373cd7dbf1d2bc113d54edf49a3eff..fa31ddf9f43ea9a21720305209f30fd588a063f9 100644
--- a/apps/files/l10n/oc.php
+++ b/apps/files/l10n/oc.php
@@ -15,6 +15,7 @@
"cancel" => "anulla",
"undo" => "defar",
"1 file uploading" => "1 fichièr al amontcargar",
+"files uploading" => "fichièrs al amontcargar",
"Unable to upload your file as it is a directory or has 0 bytes" => "Impossible d'amontcargar lo teu fichièr qu'es un repertòri o que ten pas que 0 octet.",
"Upload cancelled." => "Amontcargar anullat.",
"File upload is in progress. Leaving the page now will cancel the upload." => "Un amontcargar es a se far. Daissar aquesta pagina ara tamparà lo cargament. ",
@@ -37,7 +38,7 @@
"Cancel upload" => " Anulla l'amontcargar",
"Nothing in here. Upload something!" => "Pas res dedins. Amontcarga qualquaren",
"Download" => "Avalcarga",
-"Unshare" => "Non parteja",
+"Unshare" => "Pas partejador",
"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, ",
diff --git a/apps/files/l10n/pl.php b/apps/files/l10n/pl.php
index cc35d498ca0a81196a6f2b69c4766e385d5a9f3c..4bdac05578189551de8da55cd84b5631ed25256c 100644
--- a/apps/files/l10n/pl.php
+++ b/apps/files/l10n/pl.php
@@ -1,14 +1,13 @@
"Nie można było przenieść %s - Plik o takiej nazwie już istnieje",
"Could not move %s" => "Nie można było przenieść %s",
-"Unable to rename file" => "Nie można zmienić nazwy pliku",
"No file was uploaded. Unknown error" => "Żaden plik nie został załadowany. Nieznany błąd",
-"There is no error, the file uploaded with success" => "Przesłano plik",
+"There is no error, the file uploaded with success" => "Nie było błędów, plik wysłano poprawnie.",
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Wgrany plik przekracza wartość upload_max_filesize zdefiniowaną w php.ini: ",
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Wysłany plik przekracza wielkość dyrektywy MAX_FILE_SIZE określonej w formularzu HTML",
"The uploaded file was only partially uploaded" => "Załadowany plik został wysłany tylko częściowo.",
-"No file was uploaded" => "Nie przesłano żadnego pliku",
-"Missing a temporary folder" => "Brak katalogu tymczasowego",
+"No file was uploaded" => "Nie wysłano żadnego pliku",
+"Missing a temporary folder" => "Brak folderu tymczasowego",
"Failed to write to disk" => "Błąd zapisu na dysk",
"Not enough storage available" => "Za mało dostępnego miejsca",
"Invalid directory." => "Zła ścieżka.",
@@ -47,7 +46,9 @@
"{count} folders" => "Ilość folderów: {count}",
"1 file" => "1 plik",
"{count} files" => "Ilość plików: {count}",
-"Upload" => "Prześlij",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Nieprawidłowa nazwa folderu. Wykorzystanie 'Shared' jest zarezerwowane przez ownCloud",
+"Unable to rename file" => "Nie można zmienić nazwy pliku",
+"Upload" => "Wyślij",
"File handling" => "Zarządzanie plikami",
"Maximum upload size" => "Maksymalny rozmiar wysyłanego pliku",
"max. possible: " => "maks. możliwy:",
@@ -58,15 +59,15 @@
"Save" => "Zapisz",
"New" => "Nowy",
"Text file" => "Plik tekstowy",
-"Folder" => "Katalog",
+"Folder" => "Folder",
"From link" => "Z odnośnika",
"Deleted files" => "Pliki usunięte",
"Cancel upload" => "Anuluj wysyłanie",
"You don’t have write permissions here." => "Nie masz uprawnień do zapisu w tym miejscu.",
"Nothing in here. Upload something!" => "Pusto. Wyślij coś!",
"Download" => "Pobierz",
-"Unshare" => "Nie udostępniaj",
-"Upload too large" => "Wysyłany plik ma za duży rozmiar",
+"Unshare" => "Zatrzymaj współdzielenie",
+"Upload too large" => "Ładowany plik jest za duży",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Pliki, które próbujesz przesłać, przekraczają maksymalną dopuszczalną wielkość.",
"Files are being scanned, please wait." => "Skanowanie plików, proszę czekać.",
"Current scanning" => "Aktualnie skanowane",
diff --git a/apps/files/l10n/pt_BR.php b/apps/files/l10n/pt_BR.php
index ad5a8d138e43e03ba6c4d6cbfd5df8efd9c9f0b4..0f349b694812830acc2dec8a4a813cccfc419443 100644
--- a/apps/files/l10n/pt_BR.php
+++ b/apps/files/l10n/pt_BR.php
@@ -1,13 +1,12 @@
"Impossível mover %s - Um arquivo com este nome já existe",
"Could not move %s" => "Impossível mover %s",
-"Unable to rename file" => "Impossível renomear arquivo",
"No file was uploaded. Unknown error" => "Nenhum arquivo foi enviado. Erro desconhecido",
-"There is no error, the file uploaded with success" => "Não houve nenhum erro, o arquivo foi transferido com sucesso",
+"There is no error, the file uploaded with success" => "Sem erros, o arquivo foi enviado com sucesso",
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "O arquivo enviado excede a diretiva upload_max_filesize no php.ini: ",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "O arquivo carregado excede o MAX_FILE_SIZE que foi especificado no formulário HTML",
-"The uploaded file was only partially uploaded" => "O arquivo foi transferido parcialmente",
-"No file was uploaded" => "Nenhum arquivo foi transferido",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "O arquivo carregado excede o argumento MAX_FILE_SIZE especificado no formulário HTML",
+"The uploaded file was only partially uploaded" => "O arquivo foi parcialmente enviado",
+"No file was uploaded" => "Nenhum arquivo enviado",
"Missing a temporary folder" => "Pasta temporária não encontrada",
"Failed to write to disk" => "Falha ao escrever no disco",
"Not enough storage available" => "Espaço de armazenamento insuficiente",
@@ -47,7 +46,9 @@
"{count} folders" => "{count} pastas",
"1 file" => "1 arquivo",
"{count} files" => "{count} arquivos",
-"Upload" => "Carregar",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Nome de pasta inválido. O uso do nome 'Compartilhado' é reservado ao ownCloud",
+"Unable to rename file" => "Impossível renomear arquivo",
+"Upload" => "Upload",
"File handling" => "Tratamento de Arquivo",
"Maximum upload size" => "Tamanho máximo para carregar",
"max. possible: " => "max. possível:",
@@ -55,7 +56,7 @@
"Enable ZIP-download" => "Habilitar ZIP-download",
"0 is unlimited" => "0 para ilimitado",
"Maximum input size for ZIP files" => "Tamanho máximo para arquivo ZIP",
-"Save" => "Salvar",
+"Save" => "Guardar",
"New" => "Novo",
"Text file" => "Arquivo texto",
"Folder" => "Pasta",
@@ -66,7 +67,7 @@
"Nothing in here. Upload something!" => "Nada aqui.Carrege alguma coisa!",
"Download" => "Baixar",
"Unshare" => "Descompartilhar",
-"Upload too large" => "Arquivo muito grande",
+"Upload too large" => "Upload muito grande",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Os arquivos que você está tentando carregar excedeu o tamanho máximo para arquivos no servidor.",
"Files are being scanned, please wait." => "Arquivos sendo escaneados, por favor aguarde.",
"Current scanning" => "Scanning atual",
diff --git a/apps/files/l10n/pt_PT.php b/apps/files/l10n/pt_PT.php
index fea77e86e7b8d76b0e484b4bea130f5f24e091f5..15d6fc80bd36cec03e9c89bb6b5cd83653f1ebfb 100644
--- a/apps/files/l10n/pt_PT.php
+++ b/apps/files/l10n/pt_PT.php
@@ -1,21 +1,20 @@
"Não foi possível mover o ficheiro %s - Já existe um ficheiro com esse nome",
"Could not move %s" => "Não foi possível move o ficheiro %s",
-"Unable to rename file" => "Não foi possível renomear o ficheiro",
"No file was uploaded. Unknown error" => "Nenhum ficheiro foi carregado. Erro desconhecido",
-"There is no error, the file uploaded with success" => "Sem erro, ficheiro enviado com sucesso",
+"There is no error, the file uploaded with success" => "Não ocorreram erros, o ficheiro foi submetido com sucesso",
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "O ficheiro enviado excede o limite permitido na directiva do php.ini upload_max_filesize",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "O ficheiro enviado excede o diretivo MAX_FILE_SIZE especificado no formulário HTML",
-"The uploaded file was only partially uploaded" => "O ficheiro enviado só foi enviado parcialmente",
-"No file was uploaded" => "Não foi enviado nenhum ficheiro",
-"Missing a temporary folder" => "Falta uma pasta temporária",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "O tamanho do ficheiro carregado ultrapassa o valor MAX_FILE_SIZE definido no formulário HTML",
+"The uploaded file was only partially uploaded" => "O ficheiro seleccionado foi apenas carregado parcialmente",
+"No file was uploaded" => "Nenhum ficheiro foi submetido",
+"Missing a temporary folder" => "Está a faltar a pasta temporária",
"Failed to write to disk" => "Falhou a escrita no disco",
"Not enough storage available" => "Não há espaço suficiente em disco",
"Invalid directory." => "Directório Inválido",
"Files" => "Ficheiros",
"Share" => "Partilhar",
"Delete permanently" => "Eliminar permanentemente",
-"Delete" => "Apagar",
+"Delete" => "Eliminar",
"Rename" => "Renomear",
"Pending" => "Pendente",
"{new_name} already exists" => "O nome {new_name} já existe",
@@ -47,11 +46,12 @@
"{count} folders" => "{count} pastas",
"1 file" => "1 ficheiro",
"{count} files" => "{count} ficheiros",
-"Upload" => "Enviar",
+"Unable to rename file" => "Não foi possível renomear o ficheiro",
+"Upload" => "Carregar",
"File handling" => "Manuseamento de ficheiros",
"Maximum upload size" => "Tamanho máximo de envio",
"max. possible: " => "max. possivel: ",
-"Needed for multi-file and folder downloads." => "Necessário para descarregamento múltiplo de ficheiros e pastas",
+"Needed for multi-file and folder downloads." => "Necessário para multi download de ficheiros e pastas",
"Enable ZIP-download" => "Permitir descarregar em ficheiro ZIP",
"0 is unlimited" => "0 é ilimitado",
"Maximum input size for ZIP files" => "Tamanho máximo para ficheiros ZIP",
@@ -66,8 +66,8 @@
"Nothing in here. Upload something!" => "Vazio. Envie alguma coisa!",
"Download" => "Transferir",
"Unshare" => "Deixar de partilhar",
-"Upload too large" => "Envio muito grande",
-"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Os ficheiros que está a tentar enviar excedem o tamanho máximo de envio permitido neste servidor.",
+"Upload too large" => "Upload muito grande",
+"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Os ficheiro que está a tentar enviar excedem o tamanho máximo de envio neste servidor.",
"Files are being scanned, please wait." => "Os ficheiros estão a ser analisados, por favor aguarde.",
"Current scanning" => "Análise actual",
"Upgrading filesystem cache..." => "Atualizar cache do sistema de ficheiros..."
diff --git a/apps/files/l10n/ro.php b/apps/files/l10n/ro.php
index 2c8da6ae6e7bd2320a220796ec4e70f997abc8de..8fdf62aeb32b1aab7004642d0287eb0c0142c930 100644
--- a/apps/files/l10n/ro.php
+++ b/apps/files/l10n/ro.php
@@ -1,18 +1,19 @@
"Nu se poate de mutat %s - Fișier cu acest nume deja există",
"Could not move %s" => "Nu s-a putut muta %s",
-"Unable to rename file" => "Nu s-a putut redenumi fișierul",
"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" => "Nicio eroare, fișierul a fost încărcat cu succes",
+"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: ",
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Fișierul are o dimensiune mai mare decât variabile MAX_FILE_SIZE specificată în formularul HTML",
"The uploaded file was only partially uploaded" => "Fișierul a fost încărcat doar parțial",
-"No file was uploaded" => "Niciun fișier încărcat",
-"Missing a temporary folder" => "Lipsește un dosar temporar",
+"No file was uploaded" => "Nu a fost încărcat nici un fișier",
+"Missing a temporary folder" => "Lipsește un director temporar",
"Failed to write to disk" => "Eroare la scriere pe disc",
+"Not enough storage available" => "Nu este suficient spațiu disponibil",
"Invalid directory." => "Director invalid.",
"Files" => "Fișiere",
"Share" => "Partajează",
+"Delete permanently" => "Stergere permanenta",
"Delete" => "Șterge",
"Rename" => "Redenumire",
"Pending" => "În așteptare",
@@ -22,10 +23,14 @@
"cancel" => "anulare",
"replaced {new_name} with {old_name}" => "{new_name} inlocuit cu {old_name}",
"undo" => "Anulează ultima acțiune",
+"perform delete operation" => "efectueaza operatiunea de stergere",
"1 file uploading" => "un fișier se încarcă",
+"files uploading" => "fișiere se încarcă",
"'.' is an invalid file name." => "'.' este un nume invalid de fișier.",
"File name cannot be empty." => "Numele fișierului nu poate rămâne gol.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nume invalid, '\\', '/', '<', '>', ':', '\"', '|', '?' si '*' nu sunt permise.",
+"Your storage is full, files can not be updated or synced anymore!" => "Spatiul de stocare este plin, nu mai puteti incarca s-au sincroniza alte fisiere.",
+"Your storage is almost full ({usedSpacePercent}%)" => "Spatiul de stocare este aproape plin ({usedSpacePercent}%)",
"Your download is being prepared. This might take some time if the files are big." => "Se pregătește descărcarea. Aceasta poate să dureze ceva timp dacă fișierele sunt mari.",
"Unable to upload your file as it is a directory or has 0 bytes" => "Nu s-a putut încărca fișierul tău deoarece pare să fie un director sau are 0 bytes.",
"Not enough space available" => "Nu este suficient spațiu disponibil",
@@ -41,7 +46,8 @@
"{count} folders" => "{count} foldare",
"1 file" => "1 fisier",
"{count} files" => "{count} fisiere",
-"Upload" => "Încarcă",
+"Unable to rename file" => "Nu s-a putut redenumi fișierul",
+"Upload" => "Încărcare",
"File handling" => "Manipulare fișiere",
"Maximum upload size" => "Dimensiune maximă admisă la încărcare",
"max. possible: " => "max. posibil:",
@@ -49,17 +55,20 @@
"Enable ZIP-download" => "Activează descărcare fișiere compresate",
"0 is unlimited" => "0 e nelimitat",
"Maximum input size for ZIP files" => "Dimensiunea maximă de intrare pentru fișiere compresate",
-"Save" => "Salvare",
+"Save" => "Salvează",
"New" => "Nou",
"Text file" => "Fișier text",
"Folder" => "Dosar",
"From link" => "de la adresa",
+"Deleted files" => "Sterge fisierele",
"Cancel upload" => "Anulează încărcarea",
+"You don’t have write permissions here." => "Nu ai permisiunea de a sterge fisiere aici.",
"Nothing in here. Upload something!" => "Nimic aici. Încarcă ceva!",
"Download" => "Descarcă",
-"Unshare" => "Anulează partajarea",
+"Unshare" => "Anulare partajare",
"Upload too large" => "Fișierul încărcat este prea mare",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Fișierul care l-ai încărcat a depășită limita maximă admisă la încărcare pe acest server.",
"Files are being scanned, please wait." => "Fișierele sunt scanate, te rog așteptă.",
-"Current scanning" => "În curs de scanare"
+"Current scanning" => "În curs de scanare",
+"Upgrading filesystem cache..." => "Modernizare fisiere de sistem cache.."
);
diff --git a/apps/files/l10n/ru.php b/apps/files/l10n/ru.php
index 89a164a35fec2297fd1a37b006191c7761fc34b8..83412bf2be80060232d6f0eece793056fc640832 100644
--- a/apps/files/l10n/ru.php
+++ b/apps/files/l10n/ru.php
@@ -1,14 +1,13 @@
"Невозможно переместить %s - файл с таким именем уже существует",
"Could not move %s" => "Невозможно переместить %s",
-"Unable to rename file" => "Невозможно переименовать файл",
"No file was uploaded. Unknown error" => "Файл не был загружен. Неизвестная ошибка",
-"There is no error, the file uploaded with success" => "Файл успешно загружен",
+"There is no error, the file uploaded with success" => "Файл загружен успешно.",
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Файл превышает размер установленный upload_max_filesize в php.ini:",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Файл превышает размер MAX_FILE_SIZE, указаный в HTML-форме",
-"The uploaded file was only partially uploaded" => "Файл был загружен не полностью",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Загружаемый файл превосходит значение переменной MAX_FILE_SIZE, указанной в форме HTML",
+"The uploaded file was only partially uploaded" => "Файл загружен частично",
"No file was uploaded" => "Файл не был загружен",
-"Missing a temporary folder" => "Невозможно найти временную папку",
+"Missing a temporary folder" => "Отсутствует временная папка",
"Failed to write to disk" => "Ошибка записи на диск",
"Not enough storage available" => "Недостаточно доступного места в хранилище",
"Invalid directory." => "Неправильный каталог.",
@@ -26,27 +25,29 @@
"undo" => "отмена",
"perform delete operation" => "выполняется операция удаления",
"1 file uploading" => "загружается 1 файл",
+"files uploading" => "файлы загружаются",
"'.' is an invalid file name." => "'.' - неправильное имя файла.",
"File name cannot be empty." => "Имя файла не может быть пустым.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Неправильное имя, '\\', '/', '<', '>', ':', '\"', '|', '?' и '*' недопустимы.",
"Your storage is full, files can not be updated or synced anymore!" => "Ваше дисковое пространство полностью заполнено, произведите очистку перед загрузкой новых файлов.",
"Your storage is almost full ({usedSpacePercent}%)" => "Ваше хранилище почти заполнено ({usedSpacePercent}%)",
"Your download is being prepared. This might take some time if the files are big." => "Загрузка началась. Это может потребовать много времени, если файл большого размера.",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Не удается загрузить файл размером 0 байт в каталог",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Файл не был загружен: его размер 0 байт либо это не файл, а директория.",
"Not enough space available" => "Недостаточно свободного места",
"Upload cancelled." => "Загрузка отменена.",
"File upload is in progress. Leaving the page now will cancel the upload." => "Файл в процессе загрузки. Покинув страницу вы прервёте загрузку.",
"URL cannot be empty." => "Ссылка не может быть пустой.",
"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Неправильное имя каталога. Имя 'Shared' зарезервировано.",
"Error" => "Ошибка",
-"Name" => "Название",
+"Name" => "Имя",
"Size" => "Размер",
"Modified" => "Изменён",
"1 folder" => "1 папка",
"{count} folders" => "{count} папок",
"1 file" => "1 файл",
"{count} files" => "{count} файлов",
-"Upload" => "Загрузить",
+"Unable to rename file" => "Невозможно переименовать файл",
+"Upload" => "Загрузка",
"File handling" => "Управление файлами",
"Maximum upload size" => "Максимальный размер загружаемого файла",
"max. possible: " => "макс. возможно: ",
@@ -64,8 +65,8 @@
"You don’t have write permissions here." => "У вас нет разрешений на запись здесь.",
"Nothing in here. Upload something!" => "Здесь ничего нет. Загрузите что-нибудь!",
"Download" => "Скачать",
-"Unshare" => "Отменить публикацию",
-"Upload too large" => "Файл слишком большой",
+"Unshare" => "Закрыть общий доступ",
+"Upload too large" => "Файл слишком велик",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Файлы, которые Вы пытаетесь загрузить, превышают лимит для файлов на этом сервере.",
"Files are being scanned, please wait." => "Подождите, файлы сканируются.",
"Current scanning" => "Текущее сканирование",
diff --git a/apps/files/l10n/ru_RU.php b/apps/files/l10n/ru_RU.php
index 400a0dc8de710ee60b14f6e718b45c97719ee2e3..e0bfab33215ff8036017e3b024630f40c148fe63 100644
--- a/apps/files/l10n/ru_RU.php
+++ b/apps/files/l10n/ru_RU.php
@@ -1,71 +1,16 @@
"Неполучается перенести %s - Файл с таким именем уже существует",
-"Could not move %s" => "Неполучается перенести %s ",
-"Unable to rename file" => "Невозможно переименовать файл",
"No file was uploaded. Unknown error" => "Файл не был загружен. Неизвестная ошибка",
-"There is no error, the file uploaded with success" => "Ошибка отсутствует, файл загружен успешно.",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Размер загружаемого файла превышает upload_max_filesize директиву в php.ini:",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Размер загруженного",
-"The uploaded file was only partially uploaded" => "Загружаемый файл был загружен частично",
+"There is no error, the file uploaded with success" => "Ошибки нет, файл успешно загружен",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Размер загружаемого файла превысил максимально допустимый в директиве MAX_FILE_SIZE, специфицированной в HTML-форме",
+"The uploaded file was only partially uploaded" => "Загружаемый файл был загружен лишь частично",
"No file was uploaded" => "Файл не был загружен",
-"Missing a temporary folder" => "Отсутствует временная папка",
+"Missing a temporary folder" => "Отсутствие временной папки",
"Failed to write to disk" => "Не удалось записать на диск",
"Not enough storage available" => "Недостаточно места в хранилище",
-"Invalid directory." => "Неверный каталог.",
-"Files" => "Файлы",
"Share" => "Сделать общим",
-"Delete permanently" => "Удалить навсегда",
"Delete" => "Удалить",
-"Rename" => "Переименовать",
-"Pending" => "Ожидающий решения",
-"{new_name} already exists" => "{новое_имя} уже существует",
-"replace" => "отмена",
-"suggest name" => "подобрать название",
-"cancel" => "отменить",
-"replaced {new_name} with {old_name}" => "заменено {новое_имя} с {старое_имя}",
-"undo" => "отменить действие",
-"perform delete operation" => "выполняется процесс удаления",
-"1 file uploading" => "загрузка 1 файла",
-"'.' is an invalid file name." => "'.' является неверным именем файла.",
-"File name cannot be empty." => "Имя файла не может быть пустым.",
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Некорректное имя, '\\', '/', '<', '>', ':', '\"', '|', '?' и '*' не допустимы.",
-"Your storage is full, files can not be updated or synced anymore!" => "Ваше хранилище переполнено, фалы больше не могут быть обновлены или синхронизированы!",
-"Your storage is almost full ({usedSpacePercent}%)" => "Ваше хранилище почти полно ({usedSpacePercent}%)",
-"Your download is being prepared. This might take some time if the files are big." => "Идёт подготовка к скачке Вашего файла. Это может занять некоторое время, если фалы большие.",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Невозможно загрузить файл,\n так как он имеет нулевой размер или является директорией",
-"Not enough space available" => "Не достаточно свободного места",
-"Upload cancelled." => "Загрузка отменена",
-"File upload is in progress. Leaving the page now will cancel the upload." => "Процесс загрузки файла. Если покинуть страницу сейчас, загрузка будет отменена.",
-"URL cannot be empty." => "URL не должен быть пустым.",
-"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Неверное имя папки. Использование наименования 'Опубликовано' зарезервировано Owncloud",
"Error" => "Ошибка",
"Name" => "Имя",
-"Size" => "Размер",
-"Modified" => "Изменен",
-"1 folder" => "1 папка",
-"{count} folders" => "{количество} папок",
-"1 file" => "1 файл",
-"{count} files" => "{количество} файлов",
-"Upload" => "Загрузить ",
-"File handling" => "Работа с файлами",
-"Maximum upload size" => "Максимальный размер загружаемого файла",
-"max. possible: " => "Максимально возможный",
-"Needed for multi-file and folder downloads." => "Необходимо для множественной загрузки.",
-"Enable ZIP-download" => "Включение ZIP-загрузки",
-"0 is unlimited" => "0 без ограничений",
-"Maximum input size for ZIP files" => "Максимальный размер входящих ZIP-файлов ",
"Save" => "Сохранить",
-"New" => "Новый",
-"Text file" => "Текстовый файл",
-"Folder" => "Папка",
-"From link" => "По ссылке",
-"Cancel upload" => "Отмена загрузки",
-"Nothing in here. Upload something!" => "Здесь ничего нет. Загрузите что-нибудь!",
-"Download" => "Загрузить",
-"Unshare" => "Скрыть",
-"Upload too large" => "Загрузка слишком велика",
-"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Размер файлов, которые Вы пытаетесь загрузить, превышает максимально допустимый размер для загрузки на данный сервер.",
-"Files are being scanned, please wait." => "Файлы сканируются, пожалуйста, подождите.",
-"Current scanning" => "Текущее сканирование",
-"Upgrading filesystem cache..." => "Обновление кэша файловой системы... "
+"Download" => "Загрузка"
);
diff --git a/apps/files/l10n/si_LK.php b/apps/files/l10n/si_LK.php
index c1e5805031a2604959732f834e561910d5927ed8..351021a9f8bf1ad3df0a7eac44c692418d1af737 100644
--- a/apps/files/l10n/si_LK.php
+++ b/apps/files/l10n/si_LK.php
@@ -1,14 +1,14 @@
"ගොනුවක් උඩුගත නොවුනි. නොහැඳිනු දෝෂයක්",
-"There is no error, the file uploaded with success" => "නිවැරදි ව ගොනුව උඩුගත කෙරිනි",
+"There is no error, the file uploaded with success" => "දෝෂයක් නොමැත. සාර්ථකව ගොනුව උඩුගත කෙරුණි",
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "උඩුගත කළ ගොනුවේ විශාලත්වය HTML පෝරමයේ නියම කළ ඇති MAX_FILE_SIZE විශාලත්වයට වඩා වැඩිය",
"The uploaded file was only partially uploaded" => "උඩුගත කළ ගොනුවේ කොටසක් පමණක් උඩුගත විය",
-"No file was uploaded" => "කිසිදු ගොනවක් උඩුගත නොවිනි",
-"Missing a temporary folder" => "තාවකාලික ෆොල්ඩරයක් සොයාගත නොහැක",
+"No file was uploaded" => "ගොනුවක් උඩුගත නොවුණි",
+"Missing a temporary folder" => "තාවකාලික ෆොල්ඩරයක් අතුරුදහන්",
"Failed to write to disk" => "තැටිගත කිරීම අසාර්ථකයි",
"Files" => "ගොනු",
"Share" => "බෙදා හදා ගන්න",
-"Delete" => "මකන්න",
+"Delete" => "මකා දමන්න",
"Rename" => "නැවත නම් කරන්න",
"replace" => "ප්රතිස්ථාපනය කරන්න",
"suggest name" => "නමක් යෝජනා කරන්න",
@@ -24,7 +24,7 @@
"Modified" => "වෙනස් කළ",
"1 folder" => "1 ෆොල්ඩරයක්",
"1 file" => "1 ගොනුවක්",
-"Upload" => "උඩුගත කිරීම",
+"Upload" => "උඩුගත කරන්න",
"File handling" => "ගොනු පරිහරණය",
"Maximum upload size" => "උඩුගත කිරීමක උපරිම ප්රමාණය",
"max. possible: " => "හැකි උපරිමය:",
@@ -39,7 +39,7 @@
"From link" => "යොමුවෙන්",
"Cancel upload" => "උඩුගත කිරීම අත් හරින්න",
"Nothing in here. Upload something!" => "මෙහි කිසිවක් නොමැත. යමක් උඩුගත කරන්න",
-"Download" => "බාගත කිරීම",
+"Download" => "බාන්න",
"Unshare" => "නොබෙදු",
"Upload too large" => "උඩුගත කිරීම විශාල වැඩිය",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "ඔබ උඩුගත කිරීමට තැත් කරන ගොනු මෙම සේවාදායකයා උඩුගත කිරීමට ඉඩදී ඇති උපරිම ගොනු විශාලත්වයට වඩා වැඩිය",
diff --git a/apps/files/l10n/sk_SK.php b/apps/files/l10n/sk_SK.php
index 909c3b2ac298011f60a3cae19d8b40bc83f8a4e7..ad33c9b4eeedcbda5a008fbe6d6ea498bf882878 100644
--- a/apps/files/l10n/sk_SK.php
+++ b/apps/files/l10n/sk_SK.php
@@ -1,23 +1,22 @@
"Nie je možné presunúť %s - súbor s týmto menom už existuje",
"Could not move %s" => "Nie je možné presunúť %s",
-"Unable to rename file" => "Nemožno premenovať súbor",
"No file was uploaded. Unknown error" => "Žiaden súbor nebol odoslaný. Neznáma chyba",
"There is no error, the file uploaded with success" => "Nenastala žiadna chyba, súbor bol úspešne nahraný",
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Nahraný súbor predčil konfiguračnú direktívu upload_max_filesize v súbore php.ini:",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Nahrávaný súbor presiahol MAX_FILE_SIZE direktívu, ktorá bola špecifikovaná v HTML formulári",
-"The uploaded file was only partially uploaded" => "Nahrávaný súbor bol iba čiastočne nahraný",
-"No file was uploaded" => "Žiaden súbor nebol nahraný",
-"Missing a temporary folder" => "Chýbajúci dočasný priečinok",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Ukladaný súbor prekračuje nastavenie MAX_FILE_SIZE z volieb HTML formulára.",
+"The uploaded file was only partially uploaded" => "Ukladaný súbor sa nahral len čiastočne",
+"No file was uploaded" => "Žiadny súbor nebol uložený",
+"Missing a temporary folder" => "Chýba dočasný priečinok",
"Failed to write to disk" => "Zápis na disk sa nepodaril",
"Not enough storage available" => "Nedostatok dostupného úložného priestoru",
"Invalid directory." => "Neplatný priečinok",
"Files" => "Súbory",
"Share" => "Zdieľať",
"Delete permanently" => "Zmazať trvalo",
-"Delete" => "Odstrániť",
+"Delete" => "Zmazať",
"Rename" => "Premenovať",
-"Pending" => "Čaká sa",
+"Pending" => "Prebieha",
"{new_name} already exists" => "{new_name} už existuje",
"replace" => "nahradiť",
"suggest name" => "pomôcť s menom",
@@ -33,20 +32,22 @@
"Your storage is full, files can not be updated or synced anymore!" => "Vaše úložisko je plné. Súbory nemožno aktualizovať ani synchronizovať!",
"Your storage is almost full ({usedSpacePercent}%)" => "Vaše úložisko je takmer plné ({usedSpacePercent}%)",
"Your download is being prepared. This might take some time if the files are big." => "Vaše sťahovanie sa pripravuje. Ak sú sťahované súbory veľké, môže to chvíľu trvať.",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Nemôžem nahrať súbor lebo je to priečinok alebo má 0 bajtov.",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Nedá sa odoslať Váš súbor, pretože je to priečinok, alebo je jeho veľkosť 0 bajtov",
"Not enough space available" => "Nie je k dispozícii dostatok miesta",
"Upload cancelled." => "Odosielanie zrušené",
"File upload is in progress. Leaving the page now will cancel the upload." => "Opustenie stránky zruší práve prebiehajúce odosielanie súboru.",
"URL cannot be empty." => "URL nemôže byť prázdne",
"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Neplatné meno priečinka. Používanie mena 'Shared' je vyhradené len pre Owncloud",
"Error" => "Chyba",
-"Name" => "Meno",
+"Name" => "Názov",
"Size" => "Veľkosť",
"Modified" => "Upravené",
"1 folder" => "1 priečinok",
"{count} folders" => "{count} priečinkov",
"1 file" => "1 súbor",
"{count} files" => "{count} súborov",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Neplatný názov priečinka. Názov \"Shared\" je rezervovaný pre ownCloud",
+"Unable to rename file" => "Nemožno premenovať súbor",
"Upload" => "Odoslať",
"File handling" => "Nastavenie správania sa k súborom",
"Maximum upload size" => "Maximálna veľkosť odosielaného súboru",
@@ -56,7 +57,7 @@
"0 is unlimited" => "0 znamená neobmedzené",
"Maximum input size for ZIP files" => "Najväčšia veľkosť ZIP súborov",
"Save" => "Uložiť",
-"New" => "Nový",
+"New" => "Nová",
"Text file" => "Textový súbor",
"Folder" => "Priečinok",
"From link" => "Z odkazu",
@@ -64,9 +65,9 @@
"Cancel upload" => "Zrušiť odosielanie",
"You don’t have write permissions here." => "Nemáte oprávnenie na zápis.",
"Nothing in here. Upload something!" => "Žiadny súbor. Nahrajte niečo!",
-"Download" => "Stiahnuť",
-"Unshare" => "Nezdielať",
-"Upload too large" => "Odosielaný súbor je príliš veľký",
+"Download" => "Sťahovanie",
+"Unshare" => "Zrušiť zdieľanie",
+"Upload too large" => "Nahrávanie je príliš veľké",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Súbory, ktoré sa snažíte nahrať, presahujú maximálnu veľkosť pre nahratie súborov na tento server.",
"Files are being scanned, please wait." => "Čakajte, súbory sú prehľadávané.",
"Current scanning" => "Práve prezerané",
diff --git a/apps/files/l10n/sl.php b/apps/files/l10n/sl.php
index a43c8dc9de72b91a27beae06d3a593c9f992657e..6902d311ab76327b93b19abe746e635283e7df21 100644
--- a/apps/files/l10n/sl.php
+++ b/apps/files/l10n/sl.php
@@ -1,20 +1,19 @@
"Ni mogoče premakniti %s - datoteka s tem imenom že obstaja",
"Could not move %s" => "Ni mogoče premakniti %s",
-"Unable to rename file" => "Ni mogoče preimenovati datoteke",
-"No file was uploaded. Unknown error" => "Ni poslane nobene datoteke. Neznana napaka.",
-"There is no error, the file uploaded with success" => "Datoteka je uspešno poslana.",
+"No file was uploaded. Unknown error" => "Ni poslane datoteke. Neznana napaka.",
+"There is no error, the file uploaded with success" => "Datoteka je uspešno naložena.",
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Poslana datoteka presega dovoljeno velikost, ki je določena z možnostjo upload_max_filesize v datoteki php.ini:",
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Poslana datoteka presega velikost, ki jo določa parameter največje dovoljene velikosti v obrazcu HTML.",
-"The uploaded file was only partially uploaded" => "Datoteka je le delno naložena",
-"No file was uploaded" => "Nobena datoteka ni bila naložena",
+"The uploaded file was only partially uploaded" => "Poslan je le del datoteke.",
+"No file was uploaded" => "Ni poslane datoteke",
"Missing a temporary folder" => "Manjka začasna mapa",
"Failed to write to disk" => "Pisanje na disk je spodletelo",
"Not enough storage available" => "Na voljo ni dovolj prostora",
"Invalid directory." => "Neveljavna mapa.",
"Files" => "Datoteke",
"Share" => "Souporaba",
-"Delete permanently" => "Izbriši trajno",
+"Delete permanently" => "Izbriši dokončno",
"Delete" => "Izbriši",
"Rename" => "Preimenuj",
"Pending" => "V čakanju ...",
@@ -33,7 +32,7 @@
"Your storage is full, files can not be updated or synced anymore!" => "Shramba je povsem napolnjena. Datotek ni več mogoče posodabljati in usklajevati!",
"Your storage is almost full ({usedSpacePercent}%)" => "Mesto za shranjevanje je skoraj polno ({usedSpacePercent}%)",
"Your download is being prepared. This might take some time if the files are big." => "Postopek priprave datoteke za prejem je lahko dolgotrajen, če je datoteka zelo velika.",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Pošiljanje ni mogoče, saj gre za mapo, ali pa je datoteka velikosti 0 bajtov.",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Pošiljanja ni mogoče izvesti, saj gre za mapo oziroma datoteko velikosti 0 bajtov.",
"Not enough space available" => "Na voljo ni dovolj prostora.",
"Upload cancelled." => "Pošiljanje je preklicano.",
"File upload is in progress. Leaving the page now will cancel the upload." => "V teku je pošiljanje datoteke. Če zapustite to stran zdaj, bo pošiljanje preklicano.",
@@ -47,6 +46,7 @@
"{count} folders" => "{count} map",
"1 file" => "1 datoteka",
"{count} files" => "{count} datotek",
+"Unable to rename file" => "Ni mogoče preimenovati datoteke",
"Upload" => "Pošlji",
"File handling" => "Upravljanje z datotekami",
"Maximum upload size" => "Največja velikost za pošiljanja",
@@ -56,7 +56,7 @@
"0 is unlimited" => "0 predstavlja neomejeno vrednost",
"Maximum input size for ZIP files" => "Največja vhodna velikost za datoteke ZIP",
"Save" => "Shrani",
-"New" => "Nova",
+"New" => "Novo",
"Text file" => "Besedilna datoteka",
"Folder" => "Mapa",
"From link" => "Iz povezave",
@@ -65,7 +65,7 @@
"You don’t have write permissions here." => "Za to mesto ni ustreznih dovoljenj za pisanje.",
"Nothing in here. Upload something!" => "Tukaj še ni ničesar. Najprej je treba kakšno datoteko poslati v oblak!",
"Download" => "Prejmi",
-"Unshare" => "Odstrani iz souporabe",
+"Unshare" => "Prekliči souporabo",
"Upload too large" => "Prekoračenje omejitve velikosti",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Datoteke, ki jih želite poslati, presegajo največjo dovoljeno velikost na strežniku.",
"Files are being scanned, please wait." => "Poteka preučevanje datotek, počakajte ...",
diff --git a/apps/files/l10n/sq.php b/apps/files/l10n/sq.php
index fe3ae9e7a96491e5d53fb0d5ded6658a4bb4a4a9..63c95f692e26842b4b33785d8b02e002a81a2ac5 100644
--- a/apps/files/l10n/sq.php
+++ b/apps/files/l10n/sq.php
@@ -1,7 +1,6 @@
"%s nuk u spostua - Aty ekziston një skedar me të njëjtin emër",
"Could not move %s" => "%s nuk u spostua",
-"Unable to rename file" => "Nuk është i mundur riemërtimi i skedarit",
"No file was uploaded. Unknown error" => "Nuk u ngarkua asnjë skedar. Veprim i gabuar i panjohur",
"There is no error, the file uploaded with success" => "Nuk pati veprime të gabuara, skedari u ngarkua me sukses",
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Skedari i ngarkuar tejkalon udhëzimin upload_max_filesize tek php.ini:",
@@ -47,6 +46,7 @@
"{count} folders" => "{count} dosje",
"1 file" => "1 skedar",
"{count} files" => "{count} skedarë",
+"Unable to rename file" => "Nuk është i mundur riemërtimi i skedarit",
"Upload" => "Ngarko",
"File handling" => "Trajtimi i skedarit",
"Maximum upload size" => "Dimensioni maksimal i ngarkimit",
diff --git a/apps/files/l10n/sr.php b/apps/files/l10n/sr.php
index 5d32cdd9fb86ce8cb18d6e595d25faee299121e1..3be6dde91a7ed6c1256187bbacca416aee34c1ee 100644
--- a/apps/files/l10n/sr.php
+++ b/apps/files/l10n/sr.php
@@ -1,7 +1,6 @@
"Не могу да преместим %s – датотека с овим именом већ постоји",
"Could not move %s" => "Не могу да преместим %s",
-"Unable to rename file" => "Не могу да преименујем датотеку",
"No file was uploaded. Unknown error" => "Ниједна датотека није отпремљена услед непознате грешке",
"There is no error, the file uploaded with success" => "Није дошло до грешке. Датотека је успешно отпремљена.",
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Отпремљена датотека прелази смерницу upload_max_filesize у датотеци php.ini:",
@@ -40,13 +39,14 @@
"URL cannot be empty." => "Адреса не може бити празна.",
"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Неисправно име фасцикле. Фасцикла „Shared“ је резервисана за ownCloud.",
"Error" => "Грешка",
-"Name" => "Назив",
+"Name" => "Име",
"Size" => "Величина",
"Modified" => "Измењено",
"1 folder" => "1 фасцикла",
"{count} folders" => "{count} фасцикле/и",
"1 file" => "1 датотека",
"{count} files" => "{count} датотеке/а",
+"Unable to rename file" => "Не могу да преименујем датотеку",
"Upload" => "Отпреми",
"File handling" => "Управљање датотекама",
"Maximum upload size" => "Највећа величина датотеке",
diff --git a/apps/files/l10n/sv.php b/apps/files/l10n/sv.php
index 020df1776e70ccffce1e7002641580497144fe0b..82d169d569c0acbe23b24c29d47a81caedafe535 100644
--- a/apps/files/l10n/sv.php
+++ b/apps/files/l10n/sv.php
@@ -1,14 +1,13 @@
"Kunde inte flytta %s - Det finns redan en fil med detta namn",
"Could not move %s" => "Kan inte flytta %s",
-"Unable to rename file" => "Kan inte byta namn på filen",
"No file was uploaded. Unknown error" => "Ingen fil uppladdad. Okänt fel",
-"There is no error, the file uploaded with success" => "Inga fel uppstod. Filen laddades upp utan problem",
+"There is no error, the file uploaded with success" => "Inga fel uppstod. Filen laddades upp utan problem.",
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Den uppladdade filen överskrider upload_max_filesize direktivet php.ini:",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Den uppladdade filen överstiger MAX_FILE_SIZE direktivet som anges i HTML-formulär",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Den uppladdade filen överskrider MAX_FILE_SIZE direktivet som har angetts i HTML formuläret",
"The uploaded file was only partially uploaded" => "Den uppladdade filen var endast delvis uppladdad",
-"No file was uploaded" => "Ingen fil blev uppladdad",
-"Missing a temporary folder" => "Saknar en tillfällig mapp",
+"No file was uploaded" => "Ingen fil laddades upp",
+"Missing a temporary folder" => "En temporär mapp saknas",
"Failed to write to disk" => "Misslyckades spara till disk",
"Not enough storage available" => "Inte tillräckligt med lagringsutrymme tillgängligt",
"Invalid directory." => "Felaktig mapp.",
@@ -26,13 +25,14 @@
"undo" => "ångra",
"perform delete operation" => "utför raderingen",
"1 file uploading" => "1 filuppladdning",
+"files uploading" => "filer laddas upp",
"'.' is an invalid file name." => "'.' är ett ogiltigt filnamn.",
"File name cannot be empty." => "Filnamn kan inte vara tomt.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ogiltigt namn, '\\', '/', '<', '>', ':', '\"', '|', '?' och '*' är inte tillåtet.",
"Your storage is full, files can not be updated or synced anymore!" => "Ditt lagringsutrymme är fullt, filer kan ej längre laddas upp eller synkas!",
"Your storage is almost full ({usedSpacePercent}%)" => "Ditt lagringsutrymme är nästan fullt ({usedSpacePercent}%)",
"Your download is being prepared. This might take some time if the files are big." => "Din nedladdning förbereds. Det kan ta tid om det är stora filer.",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Kunde inte ladda upp dina filer eftersom det antingen är en mapp eller har 0 bytes.",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Kan inte ladda upp din fil eftersom det är en katalog eller har 0 bytes",
"Not enough space available" => "Inte tillräckligt med utrymme tillgängligt",
"Upload cancelled." => "Uppladdning avbruten.",
"File upload is in progress. Leaving the page now will cancel the upload." => "Filuppladdning pågår. Lämnar du sidan så avbryts uppladdningen.",
@@ -46,6 +46,7 @@
"{count} folders" => "{count} mappar",
"1 file" => "1 fil",
"{count} files" => "{count} filer",
+"Unable to rename file" => "Kan inte byta namn på filen",
"Upload" => "Ladda upp",
"File handling" => "Filhantering",
"Maximum upload size" => "Maximal storlek att ladda upp",
diff --git a/apps/files/l10n/ta_LK.php b/apps/files/l10n/ta_LK.php
index 7b90dd8e11b3f32c7f30e5583d262a15daa94e3a..e5f7bbdf9bb667ebb623df18bc8901706cfaf59e 100644
--- a/apps/files/l10n/ta_LK.php
+++ b/apps/files/l10n/ta_LK.php
@@ -8,7 +8,7 @@
"Failed to write to disk" => "வட்டில் எழுத முடியவில்லை",
"Files" => "கோப்புகள்",
"Share" => "பகிர்வு",
-"Delete" => "அழிக்க",
+"Delete" => "நீக்குக",
"Rename" => "பெயர்மாற்றம்",
"Pending" => "நிலுவையிலுள்ள",
"{new_name} already exists" => "{new_name} ஏற்கனவே உள்ளது",
@@ -39,7 +39,7 @@
"Enable ZIP-download" => "ZIP பதிவிறக்கலை இயலுமைப்படுத்துக",
"0 is unlimited" => "0 ஆனது எல்லையற்றது",
"Maximum input size for ZIP files" => "ZIP கோப்புகளுக்கான ஆகக்கூடிய உள்ளீட்டு அளவு",
-"Save" => "சேமிக்க",
+"Save" => "சேமிக்க ",
"New" => "புதிய",
"Text file" => "கோப்பு உரை",
"Folder" => "கோப்புறை",
diff --git a/apps/files/l10n/th_TH.php b/apps/files/l10n/th_TH.php
index a1f9f84f1ba457b07e7893d6ae2c9e8d185402a4..06d26edfec8ea21f483427c4de13b8a062fe38da 100644
--- a/apps/files/l10n/th_TH.php
+++ b/apps/files/l10n/th_TH.php
@@ -1,14 +1,13 @@
"ไม่สามารถย้าย %s ได้ - ไฟล์ที่ใช้ชื่อนี้มีอยู่แล้ว",
"Could not move %s" => "ไม่สามารถย้าย %s ได้",
-"Unable to rename file" => "ไม่สามารถเปลี่ยนชื่อไฟล์ได้",
"No file was uploaded. Unknown error" => "ยังไม่มีไฟล์ใดที่ถูกอัพโหลด เกิดข้อผิดพลาดที่ไม่ทราบสาเหตุ",
-"There is no error, the file uploaded with success" => "ไม่มีข้อผิดพลาดใดๆ ไฟล์ถูกอัพโหลดเรียบร้อยแล้ว",
+"There is no error, the file uploaded with success" => "ไม่พบข้อผิดพลาดใดๆ, ไฟล์ถูกอัพโหลดเรียบร้อยแล้ว",
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "ขนาดไฟล์ที่อัพโหลดมีขนาดเกิน upload_max_filesize ที่ระบุไว้ใน php.ini",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "ไฟล์ที่อัพโหลดมีขนาดเกินคำสั่ง MAX_FILE_SIZE ที่ระบุเอาไว้ในรูปแบบคำสั่งในภาษา HTML",
-"The uploaded file was only partially uploaded" => "ไฟล์ที่อัพโหลดยังไม่ได้ถูกอัพโหลดอย่างสมบูรณ์",
-"No file was uploaded" => "ยังไม่มีไฟล์ที่ถูกอัพโหลด",
-"Missing a temporary folder" => "แฟ้มเอกสารชั่วคราวเกิดการสูญหาย",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "ไฟล์ที่อัพโหลดมีขนาดไฟล์ใหญ่เกินจำนวนที่กำหนดไว้ในคำสั่ง MAX_FILE_SIZE ที่ถูกระบุไว้ในรูปแบบของ HTML",
+"The uploaded file was only partially uploaded" => "ไฟล์ถูกอัพโหลดได้เพียงบางส่วนเท่านั้น",
+"No file was uploaded" => "ไม่มีไฟล์ที่ถูกอัพโหลด",
+"Missing a temporary folder" => "โฟลเดอร์ชั่วคราวเกิดการสูญหาย",
"Failed to write to disk" => "เขียนข้อมูลลงแผ่นดิสก์ล้มเหลว",
"Not enough storage available" => "เหลือพื้นที่ไม่เพียงสำหรับใช้งาน",
"Invalid directory." => "ไดเร็กทอรี่ไม่ถูกต้อง",
@@ -25,13 +24,14 @@
"undo" => "เลิกทำ",
"perform delete operation" => "ดำเนินการตามคำสั่งลบ",
"1 file uploading" => "กำลังอัพโหลดไฟล์ 1 ไฟล์",
+"files uploading" => "การอัพโหลดไฟล์",
"'.' is an invalid file name." => "'.' เป็นชื่อไฟล์ที่ไม่ถูกต้อง",
"File name cannot be empty." => "ชื่อไฟล์ไม่สามารถเว้นว่างได้",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "ชื่อที่ใช้ไม่ถูกต้อง, '\\', '/', '<', '>', ':', '\"', '|', '?' และ '*' ไม่ได้รับอนุญาตให้ใช้งานได้",
"Your storage is full, files can not be updated or synced anymore!" => "พื้นที่จัดเก็บข้อมูลของคุณเต็มแล้ว ไม่สามารถอัพเดทหรือผสานไฟล์ต่างๆได้อีกต่อไป",
"Your storage is almost full ({usedSpacePercent}%)" => "พื้นที่จัดเก็บข้อมูลของคุณใกล้เต็มแล้ว ({usedSpacePercent}%)",
"Your download is being prepared. This might take some time if the files are big." => "กำลังเตรียมดาวน์โหลดข้อมูล หากไฟล์มีขนาดใหญ่ อาจใช้เวลาสักครู่",
-"Unable to upload your file as it is a directory or has 0 bytes" => "ไม่สามารถอัพโหลดไฟล์ของคุณได้ เนื่องจากไฟล์ดังกล่าวเป็นไดเร็กทอรี่หรือมีขนาด 0 ไบต์",
+"Unable to upload your file as it is a directory or has 0 bytes" => "ไม่สามารถอัพโหลดไฟล์ของคุณได้ เนื่องจากไฟล์ดังกล่าวเป็นไดเร็กทอรี่ หรือ มีขนาดไฟล์ 0 ไบต์",
"Not enough space available" => "มีพื้นที่เหลือไม่เพียงพอ",
"Upload cancelled." => "การอัพโหลดถูกยกเลิก",
"File upload is in progress. Leaving the page now will cancel the upload." => "การอัพโหลดไฟล์กำลังอยู่ในระหว่างดำเนินการ การออกจากหน้าเว็บนี้จะทำให้การอัพโหลดถูกยกเลิก",
@@ -40,11 +40,12 @@
"Error" => "ข้อผิดพลาด",
"Name" => "ชื่อ",
"Size" => "ขนาด",
-"Modified" => "ปรับปรุงล่าสุด",
+"Modified" => "แก้ไขแล้ว",
"1 folder" => "1 โฟลเดอร์",
"{count} folders" => "{count} โฟลเดอร์",
"1 file" => "1 ไฟล์",
"{count} files" => "{count} ไฟล์",
+"Unable to rename file" => "ไม่สามารถเปลี่ยนชื่อไฟล์ได้",
"Upload" => "อัพโหลด",
"File handling" => "การจัดกาไฟล์",
"Maximum upload size" => "ขนาดไฟล์สูงสุดที่อัพโหลดได้",
@@ -61,7 +62,7 @@
"Cancel upload" => "ยกเลิกการอัพโหลด",
"Nothing in here. Upload something!" => "ยังไม่มีไฟล์ใดๆอยู่ที่นี่ กรุณาอัพโหลดไฟล์!",
"Download" => "ดาวน์โหลด",
-"Unshare" => "ยกเลิกการแชร์ข้อมูล",
+"Unshare" => "ยกเลิกการแชร์",
"Upload too large" => "ไฟล์ที่อัพโหลดมีขนาดใหญ่เกินไป",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "ไฟล์ที่คุณพยายามที่จะอัพโหลดมีขนาดเกินกว่าขนาดสูงสุดที่กำหนดไว้ให้อัพโหลดได้สำหรับเซิร์ฟเวอร์นี้",
"Files are being scanned, please wait." => "ไฟล์กำลังอยู่ระหว่างการสแกน, กรุณารอสักครู่.",
diff --git a/apps/files/l10n/tr.php b/apps/files/l10n/tr.php
index a4206d86e52ddf4746fc7b0898f2513472c4d0b7..6a096d270391fb5947399848f0d6b8c5b81a33e8 100644
--- a/apps/files/l10n/tr.php
+++ b/apps/files/l10n/tr.php
@@ -1,14 +1,13 @@
"%s taşınamadı. Bu isimde dosya zaten var.",
"Could not move %s" => "%s taşınamadı",
-"Unable to rename file" => "Dosya adı değiştirilemedi",
"No file was uploaded. Unknown error" => "Dosya yüklenmedi. Bilinmeyen hata",
-"There is no error, the file uploaded with success" => "Bir hata yok, dosya başarıyla yüklendi",
+"There is no error, the file uploaded with success" => "Dosya başarıyla yüklendi, hata oluşmadı",
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "php.ini dosyasında upload_max_filesize ile belirtilen dosya yükleme sınırı aşıldı.",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Yüklenen dosya HTML formundaki MAX_FILE_SIZE sınırını aşıyor",
-"The uploaded file was only partially uploaded" => "Yüklenen dosyanın sadece bir kısmı yüklendi",
-"No file was uploaded" => "Hiç dosya yüklenmedi",
-"Missing a temporary folder" => "Geçici bir klasör eksik",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Yüklenecek dosyanın boyutu HTML formunda belirtilen MAX_FILE_SIZE limitini aşıyor",
+"The uploaded file was only partially uploaded" => "Dosya kısmen karşıya yüklenebildi",
+"No file was uploaded" => "Hiç dosya gönderilmedi",
+"Missing a temporary folder" => "Geçici dizin eksik",
"Failed to write to disk" => "Diske yazılamadı",
"Not enough storage available" => "Yeterli disk alanı yok",
"Invalid directory." => "Geçersiz dizin.",
@@ -40,13 +39,15 @@
"URL cannot be empty." => "URL boş olamaz.",
"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Geçersiz dizin adı. Shared isminin kullanımı Owncloud tarafından rezerver edilmiştir.",
"Error" => "Hata",
-"Name" => "Ad",
+"Name" => "İsim",
"Size" => "Boyut",
"Modified" => "Değiştirilme",
"1 folder" => "1 dizin",
"{count} folders" => "{count} dizin",
"1 file" => "1 dosya",
"{count} files" => "{count} dosya",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Geçersiz dizin adı. 'Shared' dizin ismi kullanımı ownCloud tarafından rezerve edilmiştir.",
+"Unable to rename file" => "Dosya adı değiştirilemedi",
"Upload" => "Yükle",
"File handling" => "Dosya taşıma",
"Maximum upload size" => "Maksimum yükleme boyutu",
@@ -66,7 +67,7 @@
"Nothing in here. Upload something!" => "Burada hiçbir şey yok. Birşeyler yükleyin!",
"Download" => "İndir",
"Unshare" => "Paylaşılmayan",
-"Upload too large" => "Yüklemeniz çok büyük",
+"Upload too large" => "Yükleme çok büyük",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Yüklemeye çalıştığınız dosyalar bu sunucudaki maksimum yükleme boyutunu aşıyor.",
"Files are being scanned, please wait." => "Dosyalar taranıyor, lütfen bekleyin.",
"Current scanning" => "Güncel tarama",
diff --git a/apps/files/l10n/ug.php b/apps/files/l10n/ug.php
new file mode 100644
index 0000000000000000000000000000000000000000..fb8f187adef2623055b1ffaa168aac115cb419eb
--- /dev/null
+++ b/apps/files/l10n/ug.php
@@ -0,0 +1,44 @@
+ "%s يۆتكىيەلمەيدۇ",
+"No file was uploaded. Unknown error" => "ھېچقانداق ھۆججەت يۈكلەنمىدى. يوچۇن خاتالىق",
+"No file was uploaded" => "ھېچقانداق ھۆججەت يۈكلەنمىدى",
+"Missing a temporary folder" => "ۋاقىتلىق قىسقۇچ كەم.",
+"Failed to write to disk" => "دىسكىغا يازالمىدى",
+"Not enough storage available" => "يېتەرلىك ساقلاش بوشلۇقى يوق",
+"Files" => "ھۆججەتلەر",
+"Share" => "ھەمبەھىر",
+"Delete permanently" => "مەڭگۈلۈك ئۆچۈر",
+"Delete" => "ئۆچۈر",
+"Rename" => "ئات ئۆزگەرت",
+"Pending" => "كۈتۈۋاتىدۇ",
+"{new_name} already exists" => "{new_name} مەۋجۇت",
+"replace" => "ئالماشتۇر",
+"suggest name" => "تەۋسىيە ئات",
+"cancel" => "ۋاز كەچ",
+"undo" => "يېنىۋال",
+"1 file uploading" => "1 ھۆججەت يۈكلىنىۋاتىدۇ",
+"files uploading" => "ھۆججەت يۈكلىنىۋاتىدۇ",
+"Not enough space available" => "يېتەرلىك بوشلۇق يوق",
+"Upload cancelled." => "يۈكلەشتىن ۋاز كەچتى.",
+"File upload is in progress. Leaving the page now will cancel the upload." => "ھۆججەت يۈكلەش مەشغۇلاتى ئېلىپ بېرىلىۋاتىدۇ. Leaving the page now will cancel the upload.",
+"Error" => "خاتالىق",
+"Name" => "ئاتى",
+"Size" => "چوڭلۇقى",
+"Modified" => "ئۆزگەرتكەن",
+"1 folder" => "1 قىسقۇچ",
+"1 file" => "1 ھۆججەت",
+"{count} files" => "{count} ھۆججەت",
+"Unable to rename file" => "ھۆججەت ئاتىنى ئۆزگەرتكىلى بولمايدۇ",
+"Upload" => "يۈكلە",
+"Save" => "ساقلا",
+"New" => "يېڭى",
+"Text file" => "تېكىست ھۆججەت",
+"Folder" => "قىسقۇچ",
+"Deleted files" => "ئۆچۈرۈلگەن ھۆججەتلەر",
+"Cancel upload" => "يۈكلەشتىن ۋاز كەچ",
+"Nothing in here. Upload something!" => "بۇ جايدا ھېچنېمە يوق. Upload something!",
+"Download" => "چۈشۈر",
+"Unshare" => "ھەمبەھىرلىمە",
+"Upload too large" => "يۈكلەندىغىنى بەك چوڭ",
+"Upgrading filesystem cache..." => "ھۆججەت سىستېما غەملىكىنى يۈكسەلدۈرۈۋاتىدۇ…"
+);
diff --git a/apps/files/l10n/uk.php b/apps/files/l10n/uk.php
index b796c6413d8bf13c496ec0b82595ad91ceeab101..324b28936e75c5f3e2f8d9ddc29d5c8a0f18ee27 100644
--- a/apps/files/l10n/uk.php
+++ b/apps/files/l10n/uk.php
@@ -1,7 +1,6 @@
"Не вдалося перемістити %s - Файл з таким ім'ям вже існує",
"Could not move %s" => "Не вдалося перемістити %s",
-"Unable to rename file" => "Не вдалося перейменувати файл",
"No file was uploaded. Unknown error" => "Не завантажено жодного файлу. Невідома помилка",
"There is no error, the file uploaded with success" => "Файл успішно вивантажено без помилок.",
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Розмір звантаження перевищує upload_max_filesize параметра в php.ini: ",
@@ -47,7 +46,8 @@
"{count} folders" => "{count} папок",
"1 file" => "1 файл",
"{count} files" => "{count} файлів",
-"Upload" => "Відвантажити",
+"Unable to rename file" => "Не вдалося перейменувати файл",
+"Upload" => "Вивантажити",
"File handling" => "Робота з файлами",
"Maximum upload size" => "Максимальний розмір відвантажень",
"max. possible: " => "макс.можливе:",
@@ -65,7 +65,7 @@
"You don’t have write permissions here." => "У вас тут немає прав на запис.",
"Nothing in here. Upload something!" => "Тут нічого немає. Відвантажте що-небудь!",
"Download" => "Завантажити",
-"Unshare" => "Заборонити доступ",
+"Unshare" => "Закрити доступ",
"Upload too large" => "Файл занадто великий",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Файли,що ви намагаєтесь відвантажити перевищують максимальний дозволений розмір файлів на цьому сервері.",
"Files are being scanned, please wait." => "Файли скануються, зачекайте, будь-ласка.",
diff --git a/apps/files/l10n/ur_PK.php b/apps/files/l10n/ur_PK.php
index e13a623fecc335ac65e09bcaeca82fe9abb71099..aa87eeda385efc7fd0a155e28808004f47a2b8c8 100644
--- a/apps/files/l10n/ur_PK.php
+++ b/apps/files/l10n/ur_PK.php
@@ -1,3 +1,4 @@
"ایرر"
+"Error" => "ایرر",
+"Unshare" => "شئیرنگ ختم کریں"
);
diff --git a/apps/files/l10n/vi.php b/apps/files/l10n/vi.php
index e5a4035791e7c63e7ec70e90ff6dbbf8d58fd1ce..c8aa11295c89a53b250178fec387a46db8af0b38 100644
--- a/apps/files/l10n/vi.php
+++ b/apps/files/l10n/vi.php
@@ -1,13 +1,12 @@
"Không thể di chuyển %s - Đã có tên file này trên hệ thống",
+"Could not move %s - File with this name already exists" => "Không thể di chuyển %s - Đã có tên tập tin này trên hệ thống",
"Could not move %s" => "Không thể di chuyển %s",
-"Unable to rename file" => "Không thể đổi tên file",
"No file was uploaded. Unknown error" => "Không có tập tin nào được tải lên. Lỗi không xác định",
"There is no error, the file uploaded with success" => "Không có lỗi, các tập tin đã được tải lên thành công",
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "The uploaded file exceeds the upload_max_filesize directive in php.ini: ",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Kích thước những tập tin tải lên vượt quá MAX_FILE_SIZE đã được quy định",
-"The uploaded file was only partially uploaded" => "Tập tin tải lên mới chỉ tải lên được một phần",
-"No file was uploaded" => "Không có tập tin nào được tải lên",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Tập tin được tải lên vượt quá MAX_FILE_SIZE được quy định trong mẫu HTML",
+"The uploaded file was only partially uploaded" => "Các tập tin được tải lên chỉ tải lên được một phần",
+"No file was uploaded" => "Chưa có file nào được tải lên",
"Missing a temporary folder" => "Không tìm thấy thư mục tạm",
"Failed to write to disk" => "Không thể ghi ",
"Not enough storage available" => "Không đủ không gian lưu trữ",
@@ -17,7 +16,7 @@
"Delete permanently" => "Xóa vĩnh vễn",
"Delete" => "Xóa",
"Rename" => "Sửa tên",
-"Pending" => "Chờ",
+"Pending" => "Đang chờ",
"{new_name} already exists" => "{new_name} đã tồn tại",
"replace" => "thay thế",
"suggest name" => "tên gợi ý",
@@ -26,13 +25,15 @@
"undo" => "lùi lại",
"perform delete operation" => "thực hiện việc xóa",
"1 file uploading" => "1 tệp tin đang được tải lên",
+"files uploading" => "tệp tin đang được tải lên",
"'.' is an invalid file name." => "'.' là một tên file không hợp lệ",
"File name cannot be empty." => "Tên file không được rỗng",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Tên không hợp lệ, '\\', '/', '<', '>', ':', '\"', '|', '?' và '*' thì không được phép dùng.",
"Your storage is full, files can not be updated or synced anymore!" => "Your storage is full, files can not be updated or synced anymore!",
"Your storage is almost full ({usedSpacePercent}%)" => "Your storage is almost full ({usedSpacePercent}%)",
"Your download is being prepared. This might take some time if the files are big." => "Your download is being prepared. This might take some time if the files are big.",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Không thể tải lên tập tin này do nó là một thư mục hoặc kích thước tập tin bằng 0 byte",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Không thể tải lên tập tin của bạn ,nó như là một thư mục hoặc có 0 byte",
+"Not enough space available" => "Không đủ chỗ trống cần thiết",
"Upload cancelled." => "Hủy tải lên",
"File upload is in progress. Leaving the page now will cancel the upload." => "Tập tin tải lên đang được xử lý. Nếu bạn rời khỏi trang bây giờ sẽ hủy quá trình này.",
"URL cannot be empty." => "URL không được để trống.",
@@ -45,6 +46,7 @@
"{count} folders" => "{count} thư mục",
"1 file" => "1 tập tin",
"{count} files" => "{count} tập tin",
+"Unable to rename file" => "Không thể đổi tên file",
"Upload" => "Tải lên",
"File handling" => "Xử lý tập tin",
"Maximum upload size" => "Kích thước tối đa ",
@@ -60,12 +62,13 @@
"From link" => "Từ liên kết",
"Deleted files" => "File đã bị xóa",
"Cancel upload" => "Hủy upload",
+"You don’t have write permissions here." => "Bạn không có quyền ghi vào đây.",
"Nothing in here. Upload something!" => "Không có gì ở đây .Hãy tải lên một cái gì đó !",
-"Download" => "Tải xuống",
-"Unshare" => "Không chia sẽ",
+"Download" => "Tải về",
+"Unshare" => "Bỏ chia sẻ",
"Upload too large" => "Tập tin tải lên quá lớn",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Các tập tin bạn đang tải lên vượt quá kích thước tối đa cho phép trên máy chủ .",
"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",
-"Upgrading filesystem cache..." => "Upgrading filesystem cache..."
+"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 0a2c1ea00d6dd6e28ccfd9c4369b5aa557885073..0d87975918e4a0705a5871c94b61a79f3dec4246 100644
--- a/apps/files/l10n/zh_CN.GB2312.php
+++ b/apps/files/l10n/zh_CN.GB2312.php
@@ -1,16 +1,16 @@
"没有上传文件。未知错误",
-"There is no error, the file uploaded with success" => "没有任何错误,文件上传成功了",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "上传的文件超过了HTML表单指定的MAX_FILE_SIZE",
-"The uploaded file was only partially uploaded" => "文件只有部分被上传",
-"No file was uploaded" => "没有上传完成的文件",
-"Missing a temporary folder" => "丢失了一个临时文件夹",
+"There is no error, the file uploaded with success" => "文件上传成功",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "上传的文件超过了 HTML 表格中指定的 MAX_FILE_SIZE 选项",
+"The uploaded file was only partially uploaded" => "文件部分上传",
+"No file was uploaded" => "没有上传文件",
+"Missing a temporary folder" => "缺失临时文件夹",
"Failed to write to disk" => "写磁盘失败",
"Files" => "文件",
"Share" => "分享",
"Delete" => "删除",
"Rename" => "重命名",
-"Pending" => "Pending",
+"Pending" => "等待中",
"{new_name} already exists" => "{new_name} 已存在",
"replace" => "替换",
"suggest name" => "推荐名称",
@@ -18,12 +18,13 @@
"replaced {new_name} with {old_name}" => "已用 {old_name} 替换 {new_name}",
"undo" => "撤销",
"1 file uploading" => "1 个文件正在上传",
-"Unable to upload your file as it is a directory or has 0 bytes" => "不能上传你指定的文件,可能因为它是个文件夹或者大小为0",
+"files uploading" => "个文件正在上传",
+"Unable to upload your file as it is a directory or has 0 bytes" => "不能上传您的文件,由于它是文件夹或者为空文件",
"Upload cancelled." => "上传取消了",
"File upload is in progress. Leaving the page now will cancel the upload." => "文件正在上传。关闭页面会取消上传。",
"URL cannot be empty." => "网址不能为空。",
"Error" => "出错",
-"Name" => "名字",
+"Name" => "名称",
"Size" => "大小",
"Modified" => "修改日期",
"1 folder" => "1 个文件夹",
@@ -46,8 +47,8 @@
"Cancel upload" => "取消上传",
"Nothing in here. Upload something!" => "这里没有东西.上传点什么!",
"Download" => "下载",
-"Unshare" => "取消共享",
-"Upload too large" => "上传的文件太大了",
+"Unshare" => "取消分享",
+"Upload too large" => "上传过大",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "你正在试图上传的文件超过了此服务器支持的最大的文件大小.",
"Files are being scanned, please wait." => "正在扫描文件,请稍候.",
"Current scanning" => "正在扫描"
diff --git a/apps/files/l10n/zh_CN.php b/apps/files/l10n/zh_CN.php
index 2f9e434993c62bf5fe2987a640cd78c67f5bdede..c883670e8485f22440438ae3580e36512d4b231c 100644
--- a/apps/files/l10n/zh_CN.php
+++ b/apps/files/l10n/zh_CN.php
@@ -1,13 +1,12 @@
"无法移动 %s - 同名文件已存在",
"Could not move %s" => "无法移动 %s",
-"Unable to rename file" => "无法重命名文件",
"No file was uploaded. Unknown error" => "没有文件被上传。未知错误",
-"There is no error, the file uploaded with success" => "没有发生错误,文件上传成功。",
+"There is no error, the file uploaded with success" => "文件上传成功,没有错误发生",
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "上传文件大小已超过php.ini中upload_max_filesize所规定的值",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "上传的文件超过了在HTML 表单中指定的MAX_FILE_SIZE",
-"The uploaded file was only partially uploaded" => "只上传了文件的一部分",
-"No file was uploaded" => "文件没有上传",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "上传的文件长度超出了 HTML 表单中 MAX_FILE_SIZE 的限制",
+"The uploaded file was only partially uploaded" => "已上传文件只上传了部分(不完整)",
+"No file was uploaded" => "没有文件被上传",
"Missing a temporary folder" => "缺少临时目录",
"Failed to write to disk" => "写入磁盘失败",
"Not enough storage available" => "没有足够的存储空间",
@@ -17,7 +16,7 @@
"Delete permanently" => "永久删除",
"Delete" => "删除",
"Rename" => "重命名",
-"Pending" => "操作等待中",
+"Pending" => "等待",
"{new_name} already exists" => "{new_name} 已存在",
"replace" => "替换",
"suggest name" => "建议名称",
@@ -33,7 +32,7 @@
"Your storage is full, files can not be updated or synced anymore!" => "您的存储空间已满,文件将无法更新或同步!",
"Your storage is almost full ({usedSpacePercent}%)" => "您的存储空间即将用完 ({usedSpacePercent}%)",
"Your download is being prepared. This might take some time if the files are big." => "下载正在准备中。如果文件较大可能会花费一些时间。",
-"Unable to upload your file as it is a directory or has 0 bytes" => "无法上传文件,因为它是一个目录或者大小为 0 字节",
+"Unable to upload your file as it is a directory or has 0 bytes" => "无法上传您的文件,文件夹或者空文件",
"Not enough space available" => "没有足够可用空间",
"Upload cancelled." => "上传已取消",
"File upload is in progress. Leaving the page now will cancel the upload." => "文件正在上传中。现在离开此页会导致上传动作被取消。",
@@ -47,6 +46,8 @@
"{count} folders" => "{count} 个文件夹",
"1 file" => "1 个文件",
"{count} files" => "{count} 个文件",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "无效的文件夹名。”Shared“ 是 Owncloud 预留的文件夹",
+"Unable to rename file" => "无法重命名文件",
"Upload" => "上传",
"File handling" => "文件处理",
"Maximum upload size" => "最大上传大小",
@@ -65,7 +66,7 @@
"You don’t have write permissions here." => "您没有写权限",
"Nothing in here. Upload something!" => "这里还什么都没有。上传些东西吧!",
"Download" => "下载",
-"Unshare" => "取消分享",
+"Unshare" => "取消共享",
"Upload too large" => "上传文件过大",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "您正尝试上传的文件超过了此服务器可以上传的最大容量限制",
"Files are being scanned, please wait." => "文件正在被扫描,请稍候。",
diff --git a/apps/files/l10n/zh_TW.php b/apps/files/l10n/zh_TW.php
index 5cc7e358f029c012827c2cf3e00413476a070563..600048a321c41172531177aa52360b9e1d11957e 100644
--- a/apps/files/l10n/zh_TW.php
+++ b/apps/files/l10n/zh_TW.php
@@ -1,7 +1,6 @@
"無法移動 %s - 同名的檔案已經存在",
"Could not move %s" => "無法移動 %s",
-"Unable to rename file" => "無法重新命名檔案",
"No file was uploaded. Unknown error" => "沒有檔案被上傳。未知的錯誤。",
"There is no error, the file uploaded with success" => "無錯誤,檔案上傳成功",
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "上傳的檔案大小超過 php.ini 當中 upload_max_filesize 參數的設定:",
@@ -47,6 +46,7 @@
"{count} folders" => "{count} 個資料夾",
"1 file" => "1 個檔案",
"{count} files" => "{count} 個檔案",
+"Unable to rename file" => "無法重新命名檔案",
"Upload" => "上傳",
"File handling" => "檔案處理",
"Maximum upload size" => "最大上傳檔案大小",
diff --git a/apps/files/lib/app.php b/apps/files/lib/app.php
new file mode 100644
index 0000000000000000000000000000000000000000..c2a4b9c2675dcc3bfe2f510916b7abb322ad5b72
--- /dev/null
+++ b/apps/files/lib/app.php
@@ -0,0 +1,79 @@
+.
+ *
+ */
+
+
+namespace OCA\Files;
+
+class App {
+ private $l10n;
+ private $view;
+
+ public function __construct($view, $l10n) {
+ $this->view = $view;
+ $this->l10n = $l10n;
+ }
+
+ /**
+ * rename a file
+ *
+ * @param string $dir
+ * @param string $oldname
+ * @param string $newname
+ * @return array
+ */
+ public function rename($dir, $oldname, $newname) {
+ $result = array(
+ 'success' => false,
+ 'data' => NULL
+ );
+
+ // rename to "/Shared" is denied
+ if( $dir === '/' and $newname === 'Shared' ) {
+ $result['data'] = array(
+ 'message' => $this->l10n->t("Invalid folder name. Usage of 'Shared' is reserved by ownCloud")
+ );
+ } elseif(
+ // rename to "." is denied
+ $newname !== '.' and
+ // rename of "/Shared" is denied
+ !($dir === '/' and $oldname === 'Shared') and
+ // THEN try to rename
+ $this->view->rename($dir . '/' . $oldname, $dir . '/' . $newname)
+ ) {
+ // successful rename
+ $result['success'] = true;
+ $result['data'] = array(
+ 'dir' => $dir,
+ 'file' => $oldname,
+ 'newname' => $newname
+ );
+ } else {
+ // rename failed
+ $result['data'] = array(
+ 'message' => $this->l10n->t('Unable to rename file')
+ );
+ }
+ return $result;
+ }
+
+}
\ No newline at end of file
diff --git a/apps/files/templates/index.php b/apps/files/templates/index.php
index 69fcb94e68197d05ced7d9dc9c4788c8e3a406c4..b576253f4f0f324cd83d2a8602ed4c0e229bd1e8 100644
--- a/apps/files/templates/index.php
+++ b/apps/files/templates/index.php
@@ -34,7 +34,7 @@
value="(max )">
-
+
@@ -46,7 +46,6 @@
diff --git a/apps/files/tests/ajax_rename.php b/apps/files/tests/ajax_rename.php
new file mode 100644
index 0000000000000000000000000000000000000000..23e5761ddda44869855bc22a7f13b59caa29ab95
--- /dev/null
+++ b/apps/files/tests/ajax_rename.php
@@ -0,0 +1,117 @@
+.
+ *
+ */
+
+class Test_OC_Files_App_Rename extends \PHPUnit_Framework_TestCase {
+
+ function setUp() {
+ // mock OC_L10n
+ $l10nMock = $this->getMock('\OC_L10N', array('t'), array(), '', false);
+ $l10nMock->expects($this->any())
+ ->method('t')
+ ->will($this->returnArgument(0));
+ $viewMock = $this->getMock('\OC\Files\View', array('rename', 'normalizePath'), array(), '', false);
+ $viewMock->expects($this->any())
+ ->method('normalizePath')
+ ->will($this->returnArgument(0));
+ $viewMock->expects($this->any())
+ ->method('rename')
+ ->will($this->returnValue(true));
+ $this->files = new \OCA\Files\App($viewMock, $l10nMock);
+ }
+
+ /**
+ * @brief test rename of file/folder named "Shared"
+ */
+ function testRenameSharedFolder() {
+ $dir = '/';
+ $oldname = 'Shared';
+ $newname = 'new_name';
+
+ $result = $this->files->rename($dir, $oldname, $newname);
+ $expected = array(
+ 'success' => false,
+ 'data' => array('message' => 'Unable to rename file')
+ );
+
+ $this->assertEquals($expected, $result);
+ }
+
+ /**
+ * @brief test rename of file/folder named "Shared"
+ */
+ function testRenameSharedFolderInSubdirectory() {
+ $dir = '/test';
+ $oldname = 'Shared';
+ $newname = 'new_name';
+
+ $result = $this->files->rename($dir, $oldname, $newname);
+ $expected = array(
+ 'success' => true,
+ 'data' => array(
+ 'dir' => $dir,
+ 'file' => $oldname,
+ 'newname' => $newname
+ )
+ );
+
+ $this->assertEquals($expected, $result);
+ }
+
+ /**
+ * @brief test rename of file/folder to "Shared"
+ */
+ function testRenameFolderToShared() {
+ $dir = '/';
+ $oldname = 'oldname';
+ $newname = 'Shared';
+
+ $result = $this->files->rename($dir, $oldname, $newname);
+ $expected = array(
+ 'success' => false,
+ 'data' => array('message' => "Invalid folder name. Usage of 'Shared' is reserved by ownCloud")
+ );
+
+ $this->assertEquals($expected, $result);
+ }
+
+ /**
+ * @brief test rename of file/folder
+ */
+ function testRenameFolder() {
+ $dir = '/';
+ $oldname = 'oldname';
+ $newname = 'newname';
+
+ $result = $this->files->rename($dir, $oldname, $newname);
+ $expected = array(
+ 'success' => true,
+ 'data' => array(
+ 'dir' => $dir,
+ 'file' => $oldname,
+ 'newname' => $newname
+ )
+ );
+
+ $this->assertEquals($expected, $result);
+ }
+}
\ No newline at end of file
diff --git a/apps/files_encryption/3rdparty/Crypt_Blowfish/Blowfish.php b/apps/files_encryption/3rdparty/Crypt_Blowfish/Blowfish.php
new file mode 100644
index 0000000000000000000000000000000000000000..4ccacb963e3c535182eba8f5f74470c86abdfc6d
--- /dev/null
+++ b/apps/files_encryption/3rdparty/Crypt_Blowfish/Blowfish.php
@@ -0,0 +1,317 @@
+
+ * @copyright 2005 Matthew Fonda
+ * @license http://www.php.net/license/3_0.txt PHP License 3.0
+ * @version CVS: $Id: Blowfish.php,v 1.81 2005/05/30 18:40:36 mfonda Exp $
+ * @link http://pear.php.net/package/Crypt_Blowfish
+ */
+
+
+require_once 'PEAR.php';
+
+
+/**
+ *
+ * Example usage:
+ * $bf = new Crypt_Blowfish('some secret key!');
+ * $encrypted = $bf->encrypt('this is some example plain text');
+ * $plaintext = $bf->decrypt($encrypted);
+ * echo "plain text: $plaintext";
+ *
+ *
+ * @category Encryption
+ * @package Crypt_Blowfish
+ * @author Matthew Fonda
+ * @copyright 2005 Matthew Fonda
+ * @license http://www.php.net/license/3_0.txt PHP License 3.0
+ * @link http://pear.php.net/package/Crypt_Blowfish
+ * @version @package_version@
+ * @access public
+ */
+class Crypt_Blowfish
+{
+ /**
+ * P-Array contains 18 32-bit subkeys
+ *
+ * @var array
+ * @access private
+ */
+ var $_P = array();
+
+
+ /**
+ * Array of four S-Blocks each containing 256 32-bit entries
+ *
+ * @var array
+ * @access private
+ */
+ var $_S = array();
+
+ /**
+ * Mcrypt td resource
+ *
+ * @var resource
+ * @access private
+ */
+ var $_td = null;
+
+ /**
+ * Initialization vector
+ *
+ * @var string
+ * @access private
+ */
+ var $_iv = null;
+
+
+ /**
+ * Crypt_Blowfish Constructor
+ * Initializes the Crypt_Blowfish object, and gives a sets
+ * the secret key
+ *
+ * @param string $key
+ * @access public
+ */
+ function Crypt_Blowfish($key)
+ {
+ if (extension_loaded('mcrypt')) {
+ $this->_td = mcrypt_module_open(MCRYPT_BLOWFISH, '', 'ecb', '');
+ $this->_iv = mcrypt_create_iv(8, MCRYPT_RAND);
+ }
+ $this->setKey($key);
+ }
+
+ /**
+ * Deprecated isReady method
+ *
+ * @return bool
+ * @access public
+ * @deprecated
+ */
+ function isReady()
+ {
+ return true;
+ }
+
+ /**
+ * Deprecated init method - init is now a private
+ * method and has been replaced with _init
+ *
+ * @return bool
+ * @access public
+ * @deprecated
+ * @see Crypt_Blowfish::_init()
+ */
+ function init()
+ {
+ $this->_init();
+ }
+
+ /**
+ * Initializes the Crypt_Blowfish object
+ *
+ * @access private
+ */
+ function _init()
+ {
+ $defaults = new Crypt_Blowfish_DefaultKey();
+ $this->_P = $defaults->P;
+ $this->_S = $defaults->S;
+ }
+
+ /**
+ * Enciphers a single 64 bit block
+ *
+ * @param int &$Xl
+ * @param int &$Xr
+ * @access private
+ */
+ function _encipher(&$Xl, &$Xr)
+ {
+ for ($i = 0; $i < 16; $i++) {
+ $temp = $Xl ^ $this->_P[$i];
+ $Xl = ((($this->_S[0][($temp>>24) & 255] +
+ $this->_S[1][($temp>>16) & 255]) ^
+ $this->_S[2][($temp>>8) & 255]) +
+ $this->_S[3][$temp & 255]) ^ $Xr;
+ $Xr = $temp;
+ }
+ $Xr = $Xl ^ $this->_P[16];
+ $Xl = $temp ^ $this->_P[17];
+ }
+
+
+ /**
+ * Deciphers a single 64 bit block
+ *
+ * @param int &$Xl
+ * @param int &$Xr
+ * @access private
+ */
+ function _decipher(&$Xl, &$Xr)
+ {
+ for ($i = 17; $i > 1; $i--) {
+ $temp = $Xl ^ $this->_P[$i];
+ $Xl = ((($this->_S[0][($temp>>24) & 255] +
+ $this->_S[1][($temp>>16) & 255]) ^
+ $this->_S[2][($temp>>8) & 255]) +
+ $this->_S[3][$temp & 255]) ^ $Xr;
+ $Xr = $temp;
+ }
+ $Xr = $Xl ^ $this->_P[1];
+ $Xl = $temp ^ $this->_P[0];
+ }
+
+
+ /**
+ * Encrypts a string
+ *
+ * @param string $plainText
+ * @return string Returns cipher text on success, PEAR_Error on failure
+ * @access public
+ */
+ function encrypt($plainText)
+ {
+ if (!is_string($plainText)) {
+ PEAR::raiseError('Plain text must be a string', 0, PEAR_ERROR_DIE);
+ }
+
+ if (extension_loaded('mcrypt')) {
+ return mcrypt_generic($this->_td, $plainText);
+ }
+
+ $cipherText = '';
+ $len = strlen($plainText);
+ $plainText .= str_repeat(chr(0),(8 - ($len%8))%8);
+ for ($i = 0; $i < $len; $i += 8) {
+ list(,$Xl,$Xr) = unpack("N2",substr($plainText,$i,8));
+ $this->_encipher($Xl, $Xr);
+ $cipherText .= pack("N2", $Xl, $Xr);
+ }
+ return $cipherText;
+ }
+
+
+ /**
+ * Decrypts an encrypted string
+ *
+ * @param string $cipherText
+ * @return string Returns plain text on success, PEAR_Error on failure
+ * @access public
+ */
+ function decrypt($cipherText)
+ {
+ if (!is_string($cipherText)) {
+ PEAR::raiseError('Cipher text must be a string', 1, PEAR_ERROR_DIE);
+ }
+
+ if (extension_loaded('mcrypt')) {
+ return mdecrypt_generic($this->_td, $cipherText);
+ }
+
+ $plainText = '';
+ $len = strlen($cipherText);
+ $cipherText .= str_repeat(chr(0),(8 - ($len%8))%8);
+ for ($i = 0; $i < $len; $i += 8) {
+ list(,$Xl,$Xr) = unpack("N2",substr($cipherText,$i,8));
+ $this->_decipher($Xl, $Xr);
+ $plainText .= pack("N2", $Xl, $Xr);
+ }
+ return $plainText;
+ }
+
+
+ /**
+ * Sets the secret key
+ * The key must be non-zero, and less than or equal to
+ * 56 characters in length.
+ *
+ * @param string $key
+ * @return bool Returns true on success, PEAR_Error on failure
+ * @access public
+ */
+ function setKey($key)
+ {
+ if (!is_string($key)) {
+ PEAR::raiseError('Key must be a string', 2, PEAR_ERROR_DIE);
+ }
+
+ $len = strlen($key);
+
+ if ($len > 56 || $len == 0) {
+ PEAR::raiseError('Key must be less than 56 characters and non-zero. Supplied key length: ' . $len, 3, PEAR_ERROR_DIE);
+ }
+
+ if (extension_loaded('mcrypt')) {
+ mcrypt_generic_init($this->_td, $key, $this->_iv);
+ return true;
+ }
+
+ require_once 'Blowfish/DefaultKey.php';
+ $this->_init();
+
+ $k = 0;
+ $data = 0;
+ $datal = 0;
+ $datar = 0;
+
+ for ($i = 0; $i < 18; $i++) {
+ $data = 0;
+ for ($j = 4; $j > 0; $j--) {
+ $data = $data << 8 | ord($key{$k});
+ $k = ($k+1) % $len;
+ }
+ $this->_P[$i] ^= $data;
+ }
+
+ for ($i = 0; $i <= 16; $i += 2) {
+ $this->_encipher($datal, $datar);
+ $this->_P[$i] = $datal;
+ $this->_P[$i+1] = $datar;
+ }
+ for ($i = 0; $i < 256; $i += 2) {
+ $this->_encipher($datal, $datar);
+ $this->_S[0][$i] = $datal;
+ $this->_S[0][$i+1] = $datar;
+ }
+ for ($i = 0; $i < 256; $i += 2) {
+ $this->_encipher($datal, $datar);
+ $this->_S[1][$i] = $datal;
+ $this->_S[1][$i+1] = $datar;
+ }
+ for ($i = 0; $i < 256; $i += 2) {
+ $this->_encipher($datal, $datar);
+ $this->_S[2][$i] = $datal;
+ $this->_S[2][$i+1] = $datar;
+ }
+ for ($i = 0; $i < 256; $i += 2) {
+ $this->_encipher($datal, $datar);
+ $this->_S[3][$i] = $datal;
+ $this->_S[3][$i+1] = $datar;
+ }
+
+ return true;
+ }
+
+}
+
+?>
diff --git a/apps/files_encryption/3rdparty/Crypt_Blowfish/Blowfish/DefaultKey.php b/apps/files_encryption/3rdparty/Crypt_Blowfish/Blowfish/DefaultKey.php
new file mode 100644
index 0000000000000000000000000000000000000000..2ff8ac788a6b62a4abde68d476c673612b8bfe01
--- /dev/null
+++ b/apps/files_encryption/3rdparty/Crypt_Blowfish/Blowfish/DefaultKey.php
@@ -0,0 +1,327 @@
+
+ * @copyright 2005 Matthew Fonda
+ * @license http://www.php.net/license/3_0.txt PHP License 3.0
+ * @version CVS: $Id: DefaultKey.php,v 1.81 2005/05/30 18:40:37 mfonda Exp $
+ * @link http://pear.php.net/package/Crypt_Blowfish
+ */
+
+
+/**
+ * Class containing default key
+ *
+ * @category Encryption
+ * @package Crypt_Blowfish
+ * @author Matthew Fonda
+ * @copyright 2005 Matthew Fonda
+ * @license http://www.php.net/license/3_0.txt PHP License 3.0
+ * @link http://pear.php.net/package/Crypt_Blowfish
+ * @version @package_version@
+ * @access public
+ */
+class Crypt_Blowfish_DefaultKey
+{
+ var $P = array();
+
+ var $S = array();
+
+ function Crypt_Blowfish_DefaultKey()
+ {
+ $this->P = array(
+ 0x243F6A88, 0x85A308D3, 0x13198A2E, 0x03707344,
+ 0xA4093822, 0x299F31D0, 0x082EFA98, 0xEC4E6C89,
+ 0x452821E6, 0x38D01377, 0xBE5466CF, 0x34E90C6C,
+ 0xC0AC29B7, 0xC97C50DD, 0x3F84D5B5, 0xB5470917,
+ 0x9216D5D9, 0x8979FB1B
+ );
+
+ $this->S = array(
+ array(
+ 0xD1310BA6, 0x98DFB5AC, 0x2FFD72DB, 0xD01ADFB7,
+ 0xB8E1AFED, 0x6A267E96, 0xBA7C9045, 0xF12C7F99,
+ 0x24A19947, 0xB3916CF7, 0x0801F2E2, 0x858EFC16,
+ 0x636920D8, 0x71574E69, 0xA458FEA3, 0xF4933D7E,
+ 0x0D95748F, 0x728EB658, 0x718BCD58, 0x82154AEE,
+ 0x7B54A41D, 0xC25A59B5, 0x9C30D539, 0x2AF26013,
+ 0xC5D1B023, 0x286085F0, 0xCA417918, 0xB8DB38EF,
+ 0x8E79DCB0, 0x603A180E, 0x6C9E0E8B, 0xB01E8A3E,
+ 0xD71577C1, 0xBD314B27, 0x78AF2FDA, 0x55605C60,
+ 0xE65525F3, 0xAA55AB94, 0x57489862, 0x63E81440,
+ 0x55CA396A, 0x2AAB10B6, 0xB4CC5C34, 0x1141E8CE,
+ 0xA15486AF, 0x7C72E993, 0xB3EE1411, 0x636FBC2A,
+ 0x2BA9C55D, 0x741831F6, 0xCE5C3E16, 0x9B87931E,
+ 0xAFD6BA33, 0x6C24CF5C, 0x7A325381, 0x28958677,
+ 0x3B8F4898, 0x6B4BB9AF, 0xC4BFE81B, 0x66282193,
+ 0x61D809CC, 0xFB21A991, 0x487CAC60, 0x5DEC8032,
+ 0xEF845D5D, 0xE98575B1, 0xDC262302, 0xEB651B88,
+ 0x23893E81, 0xD396ACC5, 0x0F6D6FF3, 0x83F44239,
+ 0x2E0B4482, 0xA4842004, 0x69C8F04A, 0x9E1F9B5E,
+ 0x21C66842, 0xF6E96C9A, 0x670C9C61, 0xABD388F0,
+ 0x6A51A0D2, 0xD8542F68, 0x960FA728, 0xAB5133A3,
+ 0x6EEF0B6C, 0x137A3BE4, 0xBA3BF050, 0x7EFB2A98,
+ 0xA1F1651D, 0x39AF0176, 0x66CA593E, 0x82430E88,
+ 0x8CEE8619, 0x456F9FB4, 0x7D84A5C3, 0x3B8B5EBE,
+ 0xE06F75D8, 0x85C12073, 0x401A449F, 0x56C16AA6,
+ 0x4ED3AA62, 0x363F7706, 0x1BFEDF72, 0x429B023D,
+ 0x37D0D724, 0xD00A1248, 0xDB0FEAD3, 0x49F1C09B,
+ 0x075372C9, 0x80991B7B, 0x25D479D8, 0xF6E8DEF7,
+ 0xE3FE501A, 0xB6794C3B, 0x976CE0BD, 0x04C006BA,
+ 0xC1A94FB6, 0x409F60C4, 0x5E5C9EC2, 0x196A2463,
+ 0x68FB6FAF, 0x3E6C53B5, 0x1339B2EB, 0x3B52EC6F,
+ 0x6DFC511F, 0x9B30952C, 0xCC814544, 0xAF5EBD09,
+ 0xBEE3D004, 0xDE334AFD, 0x660F2807, 0x192E4BB3,
+ 0xC0CBA857, 0x45C8740F, 0xD20B5F39, 0xB9D3FBDB,
+ 0x5579C0BD, 0x1A60320A, 0xD6A100C6, 0x402C7279,
+ 0x679F25FE, 0xFB1FA3CC, 0x8EA5E9F8, 0xDB3222F8,
+ 0x3C7516DF, 0xFD616B15, 0x2F501EC8, 0xAD0552AB,
+ 0x323DB5FA, 0xFD238760, 0x53317B48, 0x3E00DF82,
+ 0x9E5C57BB, 0xCA6F8CA0, 0x1A87562E, 0xDF1769DB,
+ 0xD542A8F6, 0x287EFFC3, 0xAC6732C6, 0x8C4F5573,
+ 0x695B27B0, 0xBBCA58C8, 0xE1FFA35D, 0xB8F011A0,
+ 0x10FA3D98, 0xFD2183B8, 0x4AFCB56C, 0x2DD1D35B,
+ 0x9A53E479, 0xB6F84565, 0xD28E49BC, 0x4BFB9790,
+ 0xE1DDF2DA, 0xA4CB7E33, 0x62FB1341, 0xCEE4C6E8,
+ 0xEF20CADA, 0x36774C01, 0xD07E9EFE, 0x2BF11FB4,
+ 0x95DBDA4D, 0xAE909198, 0xEAAD8E71, 0x6B93D5A0,
+ 0xD08ED1D0, 0xAFC725E0, 0x8E3C5B2F, 0x8E7594B7,
+ 0x8FF6E2FB, 0xF2122B64, 0x8888B812, 0x900DF01C,
+ 0x4FAD5EA0, 0x688FC31C, 0xD1CFF191, 0xB3A8C1AD,
+ 0x2F2F2218, 0xBE0E1777, 0xEA752DFE, 0x8B021FA1,
+ 0xE5A0CC0F, 0xB56F74E8, 0x18ACF3D6, 0xCE89E299,
+ 0xB4A84FE0, 0xFD13E0B7, 0x7CC43B81, 0xD2ADA8D9,
+ 0x165FA266, 0x80957705, 0x93CC7314, 0x211A1477,
+ 0xE6AD2065, 0x77B5FA86, 0xC75442F5, 0xFB9D35CF,
+ 0xEBCDAF0C, 0x7B3E89A0, 0xD6411BD3, 0xAE1E7E49,
+ 0x00250E2D, 0x2071B35E, 0x226800BB, 0x57B8E0AF,
+ 0x2464369B, 0xF009B91E, 0x5563911D, 0x59DFA6AA,
+ 0x78C14389, 0xD95A537F, 0x207D5BA2, 0x02E5B9C5,
+ 0x83260376, 0x6295CFA9, 0x11C81968, 0x4E734A41,
+ 0xB3472DCA, 0x7B14A94A, 0x1B510052, 0x9A532915,
+ 0xD60F573F, 0xBC9BC6E4, 0x2B60A476, 0x81E67400,
+ 0x08BA6FB5, 0x571BE91F, 0xF296EC6B, 0x2A0DD915,
+ 0xB6636521, 0xE7B9F9B6, 0xFF34052E, 0xC5855664,
+ 0x53B02D5D, 0xA99F8FA1, 0x08BA4799, 0x6E85076A
+ ),
+ array(
+ 0x4B7A70E9, 0xB5B32944, 0xDB75092E, 0xC4192623,
+ 0xAD6EA6B0, 0x49A7DF7D, 0x9CEE60B8, 0x8FEDB266,
+ 0xECAA8C71, 0x699A17FF, 0x5664526C, 0xC2B19EE1,
+ 0x193602A5, 0x75094C29, 0xA0591340, 0xE4183A3E,
+ 0x3F54989A, 0x5B429D65, 0x6B8FE4D6, 0x99F73FD6,
+ 0xA1D29C07, 0xEFE830F5, 0x4D2D38E6, 0xF0255DC1,
+ 0x4CDD2086, 0x8470EB26, 0x6382E9C6, 0x021ECC5E,
+ 0x09686B3F, 0x3EBAEFC9, 0x3C971814, 0x6B6A70A1,
+ 0x687F3584, 0x52A0E286, 0xB79C5305, 0xAA500737,
+ 0x3E07841C, 0x7FDEAE5C, 0x8E7D44EC, 0x5716F2B8,
+ 0xB03ADA37, 0xF0500C0D, 0xF01C1F04, 0x0200B3FF,
+ 0xAE0CF51A, 0x3CB574B2, 0x25837A58, 0xDC0921BD,
+ 0xD19113F9, 0x7CA92FF6, 0x94324773, 0x22F54701,
+ 0x3AE5E581, 0x37C2DADC, 0xC8B57634, 0x9AF3DDA7,
+ 0xA9446146, 0x0FD0030E, 0xECC8C73E, 0xA4751E41,
+ 0xE238CD99, 0x3BEA0E2F, 0x3280BBA1, 0x183EB331,
+ 0x4E548B38, 0x4F6DB908, 0x6F420D03, 0xF60A04BF,
+ 0x2CB81290, 0x24977C79, 0x5679B072, 0xBCAF89AF,
+ 0xDE9A771F, 0xD9930810, 0xB38BAE12, 0xDCCF3F2E,
+ 0x5512721F, 0x2E6B7124, 0x501ADDE6, 0x9F84CD87,
+ 0x7A584718, 0x7408DA17, 0xBC9F9ABC, 0xE94B7D8C,
+ 0xEC7AEC3A, 0xDB851DFA, 0x63094366, 0xC464C3D2,
+ 0xEF1C1847, 0x3215D908, 0xDD433B37, 0x24C2BA16,
+ 0x12A14D43, 0x2A65C451, 0x50940002, 0x133AE4DD,
+ 0x71DFF89E, 0x10314E55, 0x81AC77D6, 0x5F11199B,
+ 0x043556F1, 0xD7A3C76B, 0x3C11183B, 0x5924A509,
+ 0xF28FE6ED, 0x97F1FBFA, 0x9EBABF2C, 0x1E153C6E,
+ 0x86E34570, 0xEAE96FB1, 0x860E5E0A, 0x5A3E2AB3,
+ 0x771FE71C, 0x4E3D06FA, 0x2965DCB9, 0x99E71D0F,
+ 0x803E89D6, 0x5266C825, 0x2E4CC978, 0x9C10B36A,
+ 0xC6150EBA, 0x94E2EA78, 0xA5FC3C53, 0x1E0A2DF4,
+ 0xF2F74EA7, 0x361D2B3D, 0x1939260F, 0x19C27960,
+ 0x5223A708, 0xF71312B6, 0xEBADFE6E, 0xEAC31F66,
+ 0xE3BC4595, 0xA67BC883, 0xB17F37D1, 0x018CFF28,
+ 0xC332DDEF, 0xBE6C5AA5, 0x65582185, 0x68AB9802,
+ 0xEECEA50F, 0xDB2F953B, 0x2AEF7DAD, 0x5B6E2F84,
+ 0x1521B628, 0x29076170, 0xECDD4775, 0x619F1510,
+ 0x13CCA830, 0xEB61BD96, 0x0334FE1E, 0xAA0363CF,
+ 0xB5735C90, 0x4C70A239, 0xD59E9E0B, 0xCBAADE14,
+ 0xEECC86BC, 0x60622CA7, 0x9CAB5CAB, 0xB2F3846E,
+ 0x648B1EAF, 0x19BDF0CA, 0xA02369B9, 0x655ABB50,
+ 0x40685A32, 0x3C2AB4B3, 0x319EE9D5, 0xC021B8F7,
+ 0x9B540B19, 0x875FA099, 0x95F7997E, 0x623D7DA8,
+ 0xF837889A, 0x97E32D77, 0x11ED935F, 0x16681281,
+ 0x0E358829, 0xC7E61FD6, 0x96DEDFA1, 0x7858BA99,
+ 0x57F584A5, 0x1B227263, 0x9B83C3FF, 0x1AC24696,
+ 0xCDB30AEB, 0x532E3054, 0x8FD948E4, 0x6DBC3128,
+ 0x58EBF2EF, 0x34C6FFEA, 0xFE28ED61, 0xEE7C3C73,
+ 0x5D4A14D9, 0xE864B7E3, 0x42105D14, 0x203E13E0,
+ 0x45EEE2B6, 0xA3AAABEA, 0xDB6C4F15, 0xFACB4FD0,
+ 0xC742F442, 0xEF6ABBB5, 0x654F3B1D, 0x41CD2105,
+ 0xD81E799E, 0x86854DC7, 0xE44B476A, 0x3D816250,
+ 0xCF62A1F2, 0x5B8D2646, 0xFC8883A0, 0xC1C7B6A3,
+ 0x7F1524C3, 0x69CB7492, 0x47848A0B, 0x5692B285,
+ 0x095BBF00, 0xAD19489D, 0x1462B174, 0x23820E00,
+ 0x58428D2A, 0x0C55F5EA, 0x1DADF43E, 0x233F7061,
+ 0x3372F092, 0x8D937E41, 0xD65FECF1, 0x6C223BDB,
+ 0x7CDE3759, 0xCBEE7460, 0x4085F2A7, 0xCE77326E,
+ 0xA6078084, 0x19F8509E, 0xE8EFD855, 0x61D99735,
+ 0xA969A7AA, 0xC50C06C2, 0x5A04ABFC, 0x800BCADC,
+ 0x9E447A2E, 0xC3453484, 0xFDD56705, 0x0E1E9EC9,
+ 0xDB73DBD3, 0x105588CD, 0x675FDA79, 0xE3674340,
+ 0xC5C43465, 0x713E38D8, 0x3D28F89E, 0xF16DFF20,
+ 0x153E21E7, 0x8FB03D4A, 0xE6E39F2B, 0xDB83ADF7
+ ),
+ array(
+ 0xE93D5A68, 0x948140F7, 0xF64C261C, 0x94692934,
+ 0x411520F7, 0x7602D4F7, 0xBCF46B2E, 0xD4A20068,
+ 0xD4082471, 0x3320F46A, 0x43B7D4B7, 0x500061AF,
+ 0x1E39F62E, 0x97244546, 0x14214F74, 0xBF8B8840,
+ 0x4D95FC1D, 0x96B591AF, 0x70F4DDD3, 0x66A02F45,
+ 0xBFBC09EC, 0x03BD9785, 0x7FAC6DD0, 0x31CB8504,
+ 0x96EB27B3, 0x55FD3941, 0xDA2547E6, 0xABCA0A9A,
+ 0x28507825, 0x530429F4, 0x0A2C86DA, 0xE9B66DFB,
+ 0x68DC1462, 0xD7486900, 0x680EC0A4, 0x27A18DEE,
+ 0x4F3FFEA2, 0xE887AD8C, 0xB58CE006, 0x7AF4D6B6,
+ 0xAACE1E7C, 0xD3375FEC, 0xCE78A399, 0x406B2A42,
+ 0x20FE9E35, 0xD9F385B9, 0xEE39D7AB, 0x3B124E8B,
+ 0x1DC9FAF7, 0x4B6D1856, 0x26A36631, 0xEAE397B2,
+ 0x3A6EFA74, 0xDD5B4332, 0x6841E7F7, 0xCA7820FB,
+ 0xFB0AF54E, 0xD8FEB397, 0x454056AC, 0xBA489527,
+ 0x55533A3A, 0x20838D87, 0xFE6BA9B7, 0xD096954B,
+ 0x55A867BC, 0xA1159A58, 0xCCA92963, 0x99E1DB33,
+ 0xA62A4A56, 0x3F3125F9, 0x5EF47E1C, 0x9029317C,
+ 0xFDF8E802, 0x04272F70, 0x80BB155C, 0x05282CE3,
+ 0x95C11548, 0xE4C66D22, 0x48C1133F, 0xC70F86DC,
+ 0x07F9C9EE, 0x41041F0F, 0x404779A4, 0x5D886E17,
+ 0x325F51EB, 0xD59BC0D1, 0xF2BCC18F, 0x41113564,
+ 0x257B7834, 0x602A9C60, 0xDFF8E8A3, 0x1F636C1B,
+ 0x0E12B4C2, 0x02E1329E, 0xAF664FD1, 0xCAD18115,
+ 0x6B2395E0, 0x333E92E1, 0x3B240B62, 0xEEBEB922,
+ 0x85B2A20E, 0xE6BA0D99, 0xDE720C8C, 0x2DA2F728,
+ 0xD0127845, 0x95B794FD, 0x647D0862, 0xE7CCF5F0,
+ 0x5449A36F, 0x877D48FA, 0xC39DFD27, 0xF33E8D1E,
+ 0x0A476341, 0x992EFF74, 0x3A6F6EAB, 0xF4F8FD37,
+ 0xA812DC60, 0xA1EBDDF8, 0x991BE14C, 0xDB6E6B0D,
+ 0xC67B5510, 0x6D672C37, 0x2765D43B, 0xDCD0E804,
+ 0xF1290DC7, 0xCC00FFA3, 0xB5390F92, 0x690FED0B,
+ 0x667B9FFB, 0xCEDB7D9C, 0xA091CF0B, 0xD9155EA3,
+ 0xBB132F88, 0x515BAD24, 0x7B9479BF, 0x763BD6EB,
+ 0x37392EB3, 0xCC115979, 0x8026E297, 0xF42E312D,
+ 0x6842ADA7, 0xC66A2B3B, 0x12754CCC, 0x782EF11C,
+ 0x6A124237, 0xB79251E7, 0x06A1BBE6, 0x4BFB6350,
+ 0x1A6B1018, 0x11CAEDFA, 0x3D25BDD8, 0xE2E1C3C9,
+ 0x44421659, 0x0A121386, 0xD90CEC6E, 0xD5ABEA2A,
+ 0x64AF674E, 0xDA86A85F, 0xBEBFE988, 0x64E4C3FE,
+ 0x9DBC8057, 0xF0F7C086, 0x60787BF8, 0x6003604D,
+ 0xD1FD8346, 0xF6381FB0, 0x7745AE04, 0xD736FCCC,
+ 0x83426B33, 0xF01EAB71, 0xB0804187, 0x3C005E5F,
+ 0x77A057BE, 0xBDE8AE24, 0x55464299, 0xBF582E61,
+ 0x4E58F48F, 0xF2DDFDA2, 0xF474EF38, 0x8789BDC2,
+ 0x5366F9C3, 0xC8B38E74, 0xB475F255, 0x46FCD9B9,
+ 0x7AEB2661, 0x8B1DDF84, 0x846A0E79, 0x915F95E2,
+ 0x466E598E, 0x20B45770, 0x8CD55591, 0xC902DE4C,
+ 0xB90BACE1, 0xBB8205D0, 0x11A86248, 0x7574A99E,
+ 0xB77F19B6, 0xE0A9DC09, 0x662D09A1, 0xC4324633,
+ 0xE85A1F02, 0x09F0BE8C, 0x4A99A025, 0x1D6EFE10,
+ 0x1AB93D1D, 0x0BA5A4DF, 0xA186F20F, 0x2868F169,
+ 0xDCB7DA83, 0x573906FE, 0xA1E2CE9B, 0x4FCD7F52,
+ 0x50115E01, 0xA70683FA, 0xA002B5C4, 0x0DE6D027,
+ 0x9AF88C27, 0x773F8641, 0xC3604C06, 0x61A806B5,
+ 0xF0177A28, 0xC0F586E0, 0x006058AA, 0x30DC7D62,
+ 0x11E69ED7, 0x2338EA63, 0x53C2DD94, 0xC2C21634,
+ 0xBBCBEE56, 0x90BCB6DE, 0xEBFC7DA1, 0xCE591D76,
+ 0x6F05E409, 0x4B7C0188, 0x39720A3D, 0x7C927C24,
+ 0x86E3725F, 0x724D9DB9, 0x1AC15BB4, 0xD39EB8FC,
+ 0xED545578, 0x08FCA5B5, 0xD83D7CD3, 0x4DAD0FC4,
+ 0x1E50EF5E, 0xB161E6F8, 0xA28514D9, 0x6C51133C,
+ 0x6FD5C7E7, 0x56E14EC4, 0x362ABFCE, 0xDDC6C837,
+ 0xD79A3234, 0x92638212, 0x670EFA8E, 0x406000E0
+ ),
+ array(
+ 0x3A39CE37, 0xD3FAF5CF, 0xABC27737, 0x5AC52D1B,
+ 0x5CB0679E, 0x4FA33742, 0xD3822740, 0x99BC9BBE,
+ 0xD5118E9D, 0xBF0F7315, 0xD62D1C7E, 0xC700C47B,
+ 0xB78C1B6B, 0x21A19045, 0xB26EB1BE, 0x6A366EB4,
+ 0x5748AB2F, 0xBC946E79, 0xC6A376D2, 0x6549C2C8,
+ 0x530FF8EE, 0x468DDE7D, 0xD5730A1D, 0x4CD04DC6,
+ 0x2939BBDB, 0xA9BA4650, 0xAC9526E8, 0xBE5EE304,
+ 0xA1FAD5F0, 0x6A2D519A, 0x63EF8CE2, 0x9A86EE22,
+ 0xC089C2B8, 0x43242EF6, 0xA51E03AA, 0x9CF2D0A4,
+ 0x83C061BA, 0x9BE96A4D, 0x8FE51550, 0xBA645BD6,
+ 0x2826A2F9, 0xA73A3AE1, 0x4BA99586, 0xEF5562E9,
+ 0xC72FEFD3, 0xF752F7DA, 0x3F046F69, 0x77FA0A59,
+ 0x80E4A915, 0x87B08601, 0x9B09E6AD, 0x3B3EE593,
+ 0xE990FD5A, 0x9E34D797, 0x2CF0B7D9, 0x022B8B51,
+ 0x96D5AC3A, 0x017DA67D, 0xD1CF3ED6, 0x7C7D2D28,
+ 0x1F9F25CF, 0xADF2B89B, 0x5AD6B472, 0x5A88F54C,
+ 0xE029AC71, 0xE019A5E6, 0x47B0ACFD, 0xED93FA9B,
+ 0xE8D3C48D, 0x283B57CC, 0xF8D56629, 0x79132E28,
+ 0x785F0191, 0xED756055, 0xF7960E44, 0xE3D35E8C,
+ 0x15056DD4, 0x88F46DBA, 0x03A16125, 0x0564F0BD,
+ 0xC3EB9E15, 0x3C9057A2, 0x97271AEC, 0xA93A072A,
+ 0x1B3F6D9B, 0x1E6321F5, 0xF59C66FB, 0x26DCF319,
+ 0x7533D928, 0xB155FDF5, 0x03563482, 0x8ABA3CBB,
+ 0x28517711, 0xC20AD9F8, 0xABCC5167, 0xCCAD925F,
+ 0x4DE81751, 0x3830DC8E, 0x379D5862, 0x9320F991,
+ 0xEA7A90C2, 0xFB3E7BCE, 0x5121CE64, 0x774FBE32,
+ 0xA8B6E37E, 0xC3293D46, 0x48DE5369, 0x6413E680,
+ 0xA2AE0810, 0xDD6DB224, 0x69852DFD, 0x09072166,
+ 0xB39A460A, 0x6445C0DD, 0x586CDECF, 0x1C20C8AE,
+ 0x5BBEF7DD, 0x1B588D40, 0xCCD2017F, 0x6BB4E3BB,
+ 0xDDA26A7E, 0x3A59FF45, 0x3E350A44, 0xBCB4CDD5,
+ 0x72EACEA8, 0xFA6484BB, 0x8D6612AE, 0xBF3C6F47,
+ 0xD29BE463, 0x542F5D9E, 0xAEC2771B, 0xF64E6370,
+ 0x740E0D8D, 0xE75B1357, 0xF8721671, 0xAF537D5D,
+ 0x4040CB08, 0x4EB4E2CC, 0x34D2466A, 0x0115AF84,
+ 0xE1B00428, 0x95983A1D, 0x06B89FB4, 0xCE6EA048,
+ 0x6F3F3B82, 0x3520AB82, 0x011A1D4B, 0x277227F8,
+ 0x611560B1, 0xE7933FDC, 0xBB3A792B, 0x344525BD,
+ 0xA08839E1, 0x51CE794B, 0x2F32C9B7, 0xA01FBAC9,
+ 0xE01CC87E, 0xBCC7D1F6, 0xCF0111C3, 0xA1E8AAC7,
+ 0x1A908749, 0xD44FBD9A, 0xD0DADECB, 0xD50ADA38,
+ 0x0339C32A, 0xC6913667, 0x8DF9317C, 0xE0B12B4F,
+ 0xF79E59B7, 0x43F5BB3A, 0xF2D519FF, 0x27D9459C,
+ 0xBF97222C, 0x15E6FC2A, 0x0F91FC71, 0x9B941525,
+ 0xFAE59361, 0xCEB69CEB, 0xC2A86459, 0x12BAA8D1,
+ 0xB6C1075E, 0xE3056A0C, 0x10D25065, 0xCB03A442,
+ 0xE0EC6E0E, 0x1698DB3B, 0x4C98A0BE, 0x3278E964,
+ 0x9F1F9532, 0xE0D392DF, 0xD3A0342B, 0x8971F21E,
+ 0x1B0A7441, 0x4BA3348C, 0xC5BE7120, 0xC37632D8,
+ 0xDF359F8D, 0x9B992F2E, 0xE60B6F47, 0x0FE3F11D,
+ 0xE54CDA54, 0x1EDAD891, 0xCE6279CF, 0xCD3E7E6F,
+ 0x1618B166, 0xFD2C1D05, 0x848FD2C5, 0xF6FB2299,
+ 0xF523F357, 0xA6327623, 0x93A83531, 0x56CCCD02,
+ 0xACF08162, 0x5A75EBB5, 0x6E163697, 0x88D273CC,
+ 0xDE966292, 0x81B949D0, 0x4C50901B, 0x71C65614,
+ 0xE6C6C7BD, 0x327A140A, 0x45E1D006, 0xC3F27B9A,
+ 0xC9AA53FD, 0x62A80F00, 0xBB25BFE2, 0x35BDD2F6,
+ 0x71126905, 0xB2040222, 0xB6CBCF7C, 0xCD769C2B,
+ 0x53113EC0, 0x1640E3D3, 0x38ABBD60, 0x2547ADF0,
+ 0xBA38209C, 0xF746CE76, 0x77AFA1C5, 0x20756060,
+ 0x85CBFE4E, 0x8AE88DD8, 0x7AAAF9B0, 0x4CF9AA7E,
+ 0x1948C25C, 0x02FB8A8C, 0x01C36AE4, 0xD6EBE1F9,
+ 0x90D4F869, 0xA65CDEA0, 0x3F09252D, 0xC208E69F,
+ 0xB74E6132, 0xCE77E25B, 0x578FDFE3, 0x3AC372E6
+ )
+ );
+ }
+
+}
+
+?>
diff --git a/apps/files_encryption/ajax/adminrecovery.php b/apps/files_encryption/ajax/adminrecovery.php
new file mode 100644
index 0000000000000000000000000000000000000000..6d7953b5639fd9a02633c5e955093a81a08f73e4
--- /dev/null
+++ b/apps/files_encryption/ajax/adminrecovery.php
@@ -0,0 +1,43 @@
+
+ * This file is licensed under the Affero General Public License version 3 or later.
+ * See the COPYING-README file.
+ *
+ * @brief Script to handle admin settings for encrypted key recovery
+ */
+use OCA\Encryption;
+
+\OCP\JSON::checkAdminUser();
+\OCP\JSON::checkAppEnabled('files_encryption');
+\OCP\JSON::callCheck();
+
+$l=OC_L10N::get('files_encryption');
+
+$return = false;
+
+// Enable recoveryAdmin
+
+$recoveryKeyId = OC_Appconfig::getValue('files_encryption', 'recoveryKeyId');
+
+if (isset($_POST['adminEnableRecovery']) && $_POST['adminEnableRecovery'] == 1){
+
+ $return = \OCA\Encryption\Helper::adminEnableRecovery($recoveryKeyId, $_POST['recoveryPassword']);
+ $action = "enable";
+
+// Disable recoveryAdmin
+} elseif (
+ isset($_POST['adminEnableRecovery'])
+ && 0 == $_POST['adminEnableRecovery']
+) {
+ $return = \OCA\Encryption\Helper::adminDisableRecovery($_POST['recoveryPassword']);
+ $action = "disable";
+}
+
+// Return success or failure
+if ($return) {
+ \OCP\JSON::success(array("data" => array( "message" => $l->t('Recovery key successfully ' . $action.'d'))));
+} else {
+ \OCP\JSON::error(array("data" => array( "message" => $l->t('Could not '.$action.' recovery key. Please check your recovery key password!'))));
+}
diff --git a/apps/files_encryption/ajax/changeRecoveryPassword.php b/apps/files_encryption/ajax/changeRecoveryPassword.php
new file mode 100644
index 0000000000000000000000000000000000000000..d990796a4fbbec02fe6b19d6d825b78a784efb32
--- /dev/null
+++ b/apps/files_encryption/ajax/changeRecoveryPassword.php
@@ -0,0 +1,52 @@
+
+ * This file is licensed under the Affero General Public License version 3 or later.
+ * See the COPYING-README file.
+ *
+ * @brief Script to change recovery key password
+ *
+ */
+
+use OCA\Encryption;
+
+\OCP\JSON::checkAdminUser();
+\OCP\JSON::checkAppEnabled('files_encryption');
+\OCP\JSON::callCheck();
+
+$l=OC_L10N::get('core');
+
+$return = false;
+
+$oldPassword = $_POST['oldPassword'];
+$newPassword = $_POST['newPassword'];
+
+$util = new \OCA\Encryption\Util(new \OC_FilesystemView('/'), \OCP\User::getUser());
+
+$result = $util->checkRecoveryPassword($oldPassword);
+
+if ($result) {
+ $keyId = $util->getRecoveryKeyId();
+ $keyPath = '/owncloud_private_key/' . $keyId . ".private.key";
+ $view = new \OC\Files\View('/');
+
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
+ $encryptedRecoveryKey = $view->file_get_contents($keyPath);
+ $decryptedRecoveryKey = \OCA\Encryption\Crypt::symmetricDecryptFileContent($encryptedRecoveryKey, $oldPassword);
+ $encryptedRecoveryKey = \OCA\Encryption\Crypt::symmetricEncryptFileContent($decryptedRecoveryKey, $newPassword);
+ $view->file_put_contents($keyPath, $encryptedRecoveryKey);
+
+ \OC_FileProxy::$enabled = $proxyStatus;
+
+ $return = true;
+}
+
+// success or failure
+if ($return) {
+ \OCP\JSON::success(array("data" => array( "message" => $l->t('Password successfully changed.'))));
+} else {
+ \OCP\JSON::error(array("data" => array( "message" => $l->t('Could not change the password. Maybe the old password was not correct.'))));
+}
\ No newline at end of file
diff --git a/apps/files_encryption/ajax/userrecovery.php b/apps/files_encryption/ajax/userrecovery.php
new file mode 100644
index 0000000000000000000000000000000000000000..1f42b376e422f0a044a22ce0dcd2d9d7af3eff85
--- /dev/null
+++ b/apps/files_encryption/ajax/userrecovery.php
@@ -0,0 +1,41 @@
+
+ * This file is licensed under the Affero General Public License version 3 or later.
+ * See the COPYING-README file.
+ *
+ * @brief Script to handle admin settings for encrypted key recovery
+ */
+
+use OCA\Encryption;
+
+\OCP\JSON::checkLoggedIn();
+\OCP\JSON::checkAppEnabled( 'files_encryption' );
+\OCP\JSON::callCheck();
+
+if (
+ isset( $_POST['userEnableRecovery'] )
+ && ( 0 == $_POST['userEnableRecovery'] || 1 == $_POST['userEnableRecovery'] )
+) {
+
+ $userId = \OCP\USER::getUser();
+ $view = new \OC_FilesystemView( '/' );
+ $util = new \OCA\Encryption\Util( $view, $userId );
+
+ // Save recovery preference to DB
+ $return = $util->setRecoveryForUser( $_POST['userEnableRecovery'] );
+
+ if ($_POST['userEnableRecovery'] == "1") {
+ $util->addRecoveryKeys();
+ } else {
+ $util->removeRecoveryKeys();
+ }
+
+} else {
+
+ $return = false;
+
+}
+
+// Return success or failure
+( $return ) ? \OCP\JSON::success() : \OCP\JSON::error();
\ No newline at end of file
diff --git a/apps/files_encryption/appinfo/app.php b/apps/files_encryption/appinfo/app.php
index bf16fec3aea0d60678d0a26d8121c9cbd0413868..7d01696e08a51a516553de81a0d2b544930afabf 100644
--- a/apps/files_encryption/appinfo/app.php
+++ b/apps/files_encryption/appinfo/app.php
@@ -8,42 +8,44 @@ OC::$CLASSPATH['OCA\Encryption\Stream'] = 'files_encryption/lib/stream.php';
OC::$CLASSPATH['OCA\Encryption\Proxy'] = 'files_encryption/lib/proxy.php';
OC::$CLASSPATH['OCA\Encryption\Session'] = 'files_encryption/lib/session.php';
OC::$CLASSPATH['OCA\Encryption\Capabilities'] = 'files_encryption/lib/capabilities.php';
+OC::$CLASSPATH['OCA\Encryption\Helper'] = 'files_encryption/lib/helper.php';
OC_FileProxy::register( new OCA\Encryption\Proxy() );
-// User-related hooks
-OCP\Util::connectHook( 'OC_User', 'post_login', 'OCA\Encryption\Hooks', 'login' );
-OCP\Util::connectHook( 'OC_User', 'pre_setPassword', 'OCA\Encryption\Hooks', 'setPassphrase' );
+// User related hooks
+OCA\Encryption\Helper::registerUserHooks();
-// Sharing-related hooks
-OCP\Util::connectHook( 'OCP\Share', 'post_shared', 'OCA\Encryption\Hooks', 'postShared' );
-OCP\Util::connectHook( 'OCP\Share', 'pre_unshare', 'OCA\Encryption\Hooks', 'preUnshare' );
-OCP\Util::connectHook( 'OCP\Share', 'pre_unshareAll', 'OCA\Encryption\Hooks', 'preUnshareAll' );
+// Sharing related hooks
+OCA\Encryption\Helper::registerShareHooks();
-// Webdav-related hooks
-OCP\Util::connectHook( 'OC_Webdav_Properties', 'update', 'OCA\Encryption\Hooks', 'updateKeyfile' );
+// Filesystem related hooks
+OCA\Encryption\Helper::registerFilesystemHooks();
stream_wrapper_register( 'crypt', 'OCA\Encryption\Stream' );
-$session = new OCA\Encryption\Session();
+// check if we are logged in
+if (OCP\User::isLoggedIn()) {
+ $view = new OC_FilesystemView('/');
+ $session = new \OCA\Encryption\Session($view);
-if (
- ! $session->getPrivateKey( \OCP\USER::getUser() )
- && OCP\User::isLoggedIn()
- && OCA\Encryption\Crypt::mode() == 'server'
-) {
+ // check if user has a private key
+ if (
+ !$session->getPrivateKey(\OCP\USER::getUser())
+ && OCA\Encryption\Crypt::mode() === 'server'
+ ) {
- // Force the user to log-in again if the encryption key isn't unlocked
- // (happens when a user is logged in before the encryption app is
- // enabled)
- OCP\User::logout();
-
- header( "Location: " . OC::$WEBROOT.'/' );
-
- exit();
+ // Force the user to log-in again if the encryption key isn't unlocked
+ // (happens when a user is logged in before the encryption app is
+ // enabled)
+ OCP\User::logout();
+ header("Location: " . OC::$WEBROOT . '/');
+
+ exit();
+ }
}
// Register settings scripts
-OCP\App::registerAdmin( 'files_encryption', 'settings' );
+OCP\App::registerAdmin( 'files_encryption', 'settings-admin' );
OCP\App::registerPersonal( 'files_encryption', 'settings-personal' );
+
diff --git a/apps/files_encryption/appinfo/database.xml b/apps/files_encryption/appinfo/database.xml
index d294c35d63d0052e14cc188cebb3603822113aac..4587930da0a3c25fb3eecbb4c39afebf9de866ec 100644
--- a/apps/files_encryption/appinfo/database.xml
+++ b/apps/files_encryption/appinfo/database.xml
@@ -18,6 +18,21 @@
texttrue64
+ What client-side / server-side configuration is used
+
+
+ recovery_enabled
+ integer
+ true
+ 0
+ Whether encryption key recovery is enabled
+
+
+ migration_status
+ integer
+ true
+ 0
+ Whether encryption migration has been performed
diff --git a/apps/files_encryption/appinfo/info.xml b/apps/files_encryption/appinfo/info.xml
index 39ea155488f4f1944a152cc4b85b49bd0394b5fb..9de2798dd7cd0589f020e02a4c68d7e3b4c081c5 100644
--- a/apps/files_encryption/appinfo/info.xml
+++ b/apps/files_encryption/appinfo/info.xml
@@ -4,7 +4,7 @@
EncryptionServer side encryption of files. Warning: You will lose your data if you enable this App and forget your password. Encryption is not yet compatible with LDAP.AGPL
- Sam Tuke
+ Sam Tuke, Bjoern Schiessle, Florin Peter4true
diff --git a/apps/files_encryption/appinfo/spec.txt b/apps/files_encryption/appinfo/spec.txt
index 2d22dffe08da9d3e1a331aff5166aa9dfd05e16c..ddd3983a9eba2f2e33850d0fe57532093e7c7584 100644
--- a/apps/files_encryption/appinfo/spec.txt
+++ b/apps/files_encryption/appinfo/spec.txt
@@ -9,6 +9,57 @@ Encrypted files
[encrypted data string][delimiter][IV][padding]
[anhAAjAmcGXqj1X9g==][00iv00][MSHU5N5gECP7aAg7][xx] (square braces added)
+
+- Directory structure:
+ - Encrypted user data (catfiles) are stored in the usual /data/user/files dir
+ - Keyfiles are stored in /data/user/files_encryption/keyfiles
+ - Sharekey are stored in /data/user/files_encryption/share-files
+
+- File extensions:
+ - Catfiles have to keep the file extension of the original file, pre-encryption
+ - Keyfiles use .keyfile
+ - Sharekeys have .shareKey
+
+Shared files
+------------
+
+Shared files have a centrally stored catfile and keyfile, and one sharekey for
+each user that shares it.
+
+When sharing is used, a different encryption method is used to encrypt the
+keyfile (openssl_seal). Although shared files have a keyfile, its contents
+use a different format therefore.
+
+Each time a shared file is edited or deleted, all sharekeys for users sharing
+that file must have their sharekeys changed also. The keyfile and catfile
+however need only changing in the owners files, as there is only one copy of
+these.
+
+Publicly shared files (public links)
+------------------------------------
+
+Files shared via public links use a separate system user account called 'ownCloud'. All public files are shared to that user's public key, and the private key is used to access the files when the public link is used in browser.
+
+This means that files shared via public links are accessible only to users who know the shared URL, or to admins who know the 'ownCloud' user password.
+
+Lost password recovery
+----------------------
+
+In order to enable users to read their encrypted files in the event of a password loss/reset scenario, administrators can choose to enable a 'recoveryAdmin' account. This is a user that all user files will automatically be shared to of the option is enabled. This allows the recoveryAdmin user to generate new keyfiles for the user. By default the UID of the recoveryAdmin is 'recoveryAdmin'.
+
+OC_FilesystemView
+-----------------
+
+files_encryption deals extensively with paths and the filesystem. In order to minimise bugs, it makes calls to filesystem methods in a consistent way: OC_FilesystemView{} objects always use '/' as their root, and specify paths each time particular methods are called. e.g. do this:
+
+$view->file_exists( 'path/to/file' );
+
+Not:
+
+$view->chroot( 'path/to' );
+$view->file_exists( 'file' );
+
+Using this convention means that $view objects are more predictable and less likely to break. Problems with paths are the #1 cause of bugs in this app, and consistent $view handling is an important way to prevent them.
Notes
-----
@@ -16,4 +67,11 @@ Notes
- The user passphrase is required in order to set up or upgrade the app. New
keypair generation, and the re-encryption of legacy encrypted files requires
it. Therefore an appinfo/update.php script cannot be used, and upgrade logic
- is handled in the login hook listener.
\ No newline at end of file
+ is handled in the login hook listener. Therefore each time the user logs in
+ their files are scanned to detect unencrypted and legacy encrypted files, and
+ they are (re)encrypted as necessary. This may present a performance issue; we
+ need to monitor this.
+- When files are saved to ownCloud via WebDAV, a .part file extension is used so
+ that the file isn't cached before the upload has been completed. .part files
+ are not compatible with files_encrytion's key management system however, so
+ we have to always sanitise such paths manually before using them.
\ No newline at end of file
diff --git a/apps/files_encryption/css/settings-personal.css b/apps/files_encryption/css/settings-personal.css
new file mode 100644
index 0000000000000000000000000000000000000000..4ee0acc9768ce52dc9262764086ecc2f66400b1d
--- /dev/null
+++ b/apps/files_encryption/css/settings-personal.css
@@ -0,0 +1,10 @@
+/* Copyright (c) 2013, Sam Tuke,
+ This file is licensed under the Affero General Public License version 3 or later.
+ See the COPYING-README file. */
+
+#encryptAllError
+, #encryptAllSuccess
+, #recoveryEnabledError
+, #recoveryEnabledSuccess {
+ display: none;
+}
\ No newline at end of file
diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php
index 2731d5a92f74ad4ed435d77a37d35cc9018cb7df..2066300a1639cd154bdc7ecc7e8eea673a592d7a 100644
--- a/apps/files_encryption/hooks/hooks.php
+++ b/apps/files_encryption/hooks/hooks.php
@@ -23,10 +23,11 @@
namespace OCA\Encryption;
+use OC\Files\Filesystem;
+
/**
* Class for hook specific logic
*/
-
class Hooks {
// TODO: use passphrase for encrypting private key that is separate to
@@ -40,152 +41,471 @@ class Hooks {
// Manually initialise Filesystem{} singleton with correct
// fake root path, in order to avoid fatal webdav errors
- \OC\Files\Filesystem::init( $params['uid'], $params['uid'] . '/' . 'files' . '/' );
+ // NOTE: disabled because this give errors on webdav!
+ //\OC\Files\Filesystem::init( $params['uid'], '/' . 'files' . '/' );
$view = new \OC_FilesystemView( '/' );
$util = new Util( $view, $params['uid'] );
-
- // Check files_encryption infrastructure is ready for action
- if ( ! $util->ready() ) {
-
- \OC_Log::write( 'Encryption library', 'User account "' . $params['uid'] . '" is not ready for encryption; configuration started', \OC_Log::DEBUG );
-
- return $util->setupServerSide( $params['password'] );
- }
-
- \OC_FileProxy::$enabled = false;
-
+ // setup user, if user not ready force relogin
+ if(Helper::setupUser($util, $params['password']) === false) {
+ return false;
+ }
+
$encryptedKey = Keymanager::getPrivateKey( $view, $params['uid'] );
- \OC_FileProxy::$enabled = true;
-
$privateKey = Crypt::symmetricDecryptFileContent( $encryptedKey, $params['password'] );
-
- $session = new Session();
+
+ $session = new Session( $view );
$session->setPrivateKey( $privateKey, $params['uid'] );
- $view1 = new \OC_FilesystemView( '/' . $params['uid'] );
+ // Check if first-run file migration has already been performed
+ $migrationCompleted = $util->getMigrationStatus();
- // Set legacy encryption key if it exists, to support
- // depreciated encryption system
- if (
- $view1->file_exists( 'encryption.key' )
- && $encLegacyKey = $view1->file_get_contents( 'encryption.key' )
- ) {
+ // If migration not yet done
+ if ( ! $migrationCompleted ) {
- $plainLegacyKey = Crypt::legacyDecrypt( $encLegacyKey, $params['password'] );
+ $userView = new \OC_FilesystemView( '/' . $params['uid'] );
- $session->setLegacyKey( $plainLegacyKey );
-
- }
-
- $publicKey = Keymanager::getPublicKey( $view, $params['uid'] );
-
- // Encrypt existing user files:
- // This serves to upgrade old versions of the encryption
- // app (see appinfo/spec.txt)
- if (
- $util->encryptAll( $publicKey, '/' . $params['uid'] . '/' . 'files', $session->getLegacyKey(), $params['password'] )
- ) {
+ // Set legacy encryption key if it exists, to support
+ // depreciated encryption system
+ if (
+ $userView->file_exists( 'encryption.key' )
+ && $encLegacyKey = $userView->file_get_contents( 'encryption.key' )
+ ) {
+
+ $plainLegacyKey = Crypt::legacyDecrypt( $encLegacyKey, $params['password'] );
+
+ $session->setLegacyKey( $plainLegacyKey );
+
+ }
+
+ $publicKey = Keymanager::getPublicKey( $view, $params['uid'] );
+
+ // Encrypt existing user files:
+ // This serves to upgrade old versions of the encryption
+ // app (see appinfo/spec.txt)
+ if (
+ $util->encryptAll( '/' . $params['uid'] . '/' . 'files', $session->getLegacyKey(), $params['password'] )
+ ) {
+
+ \OC_Log::write(
+ 'Encryption library', 'Encryption of existing files belonging to "' . $params['uid'] . '" completed'
+ , \OC_Log::INFO
+ );
- \OC_Log::write(
- 'Encryption library', 'Encryption of existing files belonging to "' . $params['uid'] . '" started at login'
- , \OC_Log::INFO
- );
+ }
+
+ // Register successful migration in DB
+ $util->setMigrationStatus( 1 );
}
return true;
}
-
- /**
+
+ /**
+ * @brief setup encryption backend upon user created
+ * @note This method should never be called for users using client side encryption
+ */
+ public static function postCreateUser( $params ) {
+ $view = new \OC_FilesystemView( '/' );
+
+ $util = new Util( $view, $params['uid'] );
+
+ Helper::setupUser($util, $params['password']);
+ }
+
+ /**
+ * @brief cleanup encryption backend upon user deleted
+ * @note This method should never be called for users using client side encryption
+ */
+ public static function postDeleteUser( $params ) {
+ $view = new \OC_FilesystemView( '/' );
+
+ // cleanup public key
+ $publicKey = '/public-keys/' . $params['uid'] . '.public.key';
+
+ // Disable encryption proxy to prevent recursive calls
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
+ $view->unlink($publicKey);
+
+ \OC_FileProxy::$enabled = $proxyStatus;
+ }
+
+ /**
* @brief Change a user's encryption passphrase
* @param array $params keys: uid, password
*/
- public static function setPassphrase( $params ) {
-
+ public static function setPassphrase($params) {
+
// Only attempt to change passphrase if server-side encryption
// is in use (client-side encryption does not have access to
// the necessary keys)
- if ( Crypt::mode() == 'server' ) {
-
- $session = new Session();
-
- // Get existing decrypted private key
- $privateKey = $session->getPrivateKey();
-
- // Encrypt private key with new user pwd as passphrase
- $encryptedPrivateKey = Crypt::symmetricEncryptFileContent( $privateKey, $params['password'] );
-
- // Save private key
- Keymanager::setPrivateKey( $encryptedPrivateKey );
-
- // NOTE: Session does not need to be updated as the
- // private key has not changed, only the passphrase
- // used to decrypt it has changed
-
- }
-
- }
-
- /**
- * @brief update the encryption key of the file uploaded by the client
- */
- public static function updateKeyfile( $params ) {
-
- if ( Crypt::mode() == 'client' ) {
+ if (Crypt::mode() == 'server') {
+
+ if ($params['uid'] == \OCP\User::getUser()) {
+
+ $view = new \OC_FilesystemView('/');
+
+ $session = new Session($view);
+
+ // Get existing decrypted private key
+ $privateKey = $session->getPrivateKey();
+
+ // Encrypt private key with new user pwd as passphrase
+ $encryptedPrivateKey = Crypt::symmetricEncryptFileContent($privateKey, $params['password']);
+
+ // Save private key
+ Keymanager::setPrivateKey($encryptedPrivateKey);
+
+ // NOTE: Session does not need to be updated as the
+ // private key has not changed, only the passphrase
+ // used to decrypt it has changed
- if ( isset( $params['properties']['key'] ) ) {
- $view = new \OC_FilesystemView( '/' );
- $userId = \OCP\User::getUser();
+ } else { // admin changed the password for a different user, create new keys and reencrypt file keys
- Keymanager::setFileKey( $view, $params['path'], $userId, $params['properties']['key'] );
-
- } else {
-
- \OC_Log::write(
- 'Encryption library', "Client side encryption is enabled but the client doesn't provide a encryption key for the file!"
- , \OC_Log::ERROR
- );
-
- error_log( "Client side encryption is enabled but the client doesn't provide an encryption key for the file!" );
+ $user = $params['uid'];
+ $recoveryPassword = $params['recoveryPassword'];
+ $newUserPassword = $params['password'];
+
+ $view = new \OC_FilesystemView('/');
+
+ // make sure that the users home is mounted
+ \OC\Files\Filesystem::initMountPoints($user);
+
+ $keypair = Crypt::createKeypair();
+ // Disable encryption proxy to prevent recursive calls
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
+ // Save public key
+ $view->file_put_contents( '/public-keys/'.$user.'.public.key', $keypair['publicKey'] );
+
+ // Encrypt private key empty passphrase
+ $encryptedPrivateKey = Crypt::symmetricEncryptFileContent( $keypair['privateKey'], $newUserPassword );
+
+ // Save private key
+ $view->file_put_contents( '/'.$user.'/files_encryption/'.$user.'.private.key', $encryptedPrivateKey );
+
+ if ( $recoveryPassword ) { // if recovery key is set we can re-encrypt the key files
+ $util = new Util($view, $user);
+ $util->recoverUsersFiles($recoveryPassword);
+ }
+
+ \OC_FileProxy::$enabled = $proxyStatus;
}
-
}
-
}
-
+
+ /*
+ * @brief check if files can be encrypted to every user.
+ */
/**
- * @brief
+ * @param $params
*/
- public static function postShared( $params ) {
+ public static function preShared($params) {
+
+ $users = array();
+ $view = new \OC\Files\View('/public-keys/');
+
+ switch ($params['shareType']) {
+ case \OCP\Share::SHARE_TYPE_USER:
+ $users[] = $params['shareWith'];
+ break;
+ case \OCP\Share::SHARE_TYPE_GROUP:
+ $users = \OC_Group::usersInGroup($params['shareWith']);
+ break;
+ }
+
+ $error = false;
+ foreach ($users as $user) {
+ if (!$view->file_exists($user . '.public.key')) {
+ $error = true;
+ break;
+ }
+ }
+
+ if($error)
+ // Set flag var 'run' to notify emitting
+ // script that hook execution failed
+ $params['run']->run = false;
+ // TODO: Make sure files_sharing provides user
+ // feedback on failed share
}
-
+
/**
* @brief
*/
- public static function preUnshare( $params ) {
-
- // Delete existing catfile
-
- // Generate new catfile and env keys
-
- // Save env keys to user folders
+ public static function postShared($params) {
+
+ // NOTE: $params has keys:
+ // [itemType] => file
+ // itemSource -> int, filecache file ID
+ // [parent] =>
+ // [itemTarget] => /13
+ // shareWith -> string, uid of user being shared to
+ // fileTarget -> path of file being shared
+ // uidOwner -> owner of the original file being shared
+ // [shareType] => 0
+ // [shareWith] => test1
+ // [uidOwner] => admin
+ // [permissions] => 17
+ // [fileSource] => 13
+ // [fileTarget] => /test8
+ // [id] => 10
+ // [token] =>
+ // [run] => whether emitting script should continue to run
+ // TODO: Should other kinds of item be encrypted too?
+
+ if ($params['itemType'] === 'file' || $params['itemType'] === 'folder') {
+
+ $view = new \OC_FilesystemView('/');
+ $session = new Session($view);
+ $userId = \OCP\User::getUser();
+ $util = new Util($view, $userId);
+ $path = $util->fileIdToPath($params['itemSource']);
+
+ $share = $util->getParentFromShare($params['id']);
+ //if parent is set, then this is a re-share action
+ if ($share['parent'] != null) {
+
+ // get the parent from current share
+ $parent = $util->getShareParent($params['parent']);
+
+ // if parent is file the it is an 1:1 share
+ if ($parent['item_type'] === 'file') {
+
+ // prefix path with Shared
+ $path = '/Shared' . $parent['file_target'];
+ } else {
+
+ // NOTE: parent is folder but shared was a file!
+ // we try to rebuild the missing path
+ // some examples we face here
+ // user1 share folder1 with user2 folder1 has
+ // the following structure
+ // /folder1/subfolder1/subsubfolder1/somefile.txt
+ // user2 re-share subfolder2 with user3
+ // user3 re-share somefile.txt user4
+ // so our path should be
+ // /Shared/subfolder1/subsubfolder1/somefile.txt
+ // while user3 is sharing
+
+ if ($params['itemType'] === 'file') {
+ // get target path
+ $targetPath = $util->fileIdToPath($params['fileSource']);
+ $targetPathSplit = array_reverse(explode('/', $targetPath));
+
+ // init values
+ $path = '';
+ $sharedPart = ltrim($parent['file_target'], '/');
+
+ // rebuild path
+ foreach ($targetPathSplit as $pathPart) {
+ if ($pathPart !== $sharedPart) {
+ $path = '/' . $pathPart . $path;
+ } else {
+ break;
+ }
+ }
+ // prefix path with Shared
+ $path = '/Shared' . $parent['file_target'] . $path;
+ } else {
+ // prefix path with Shared
+ $path = '/Shared' . $parent['file_target'] . $params['fileTarget'];
+ }
+ }
+ }
+
+ $sharingEnabled = \OCP\Share::isEnabled();
+
+ // if a folder was shared, get a list of all (sub-)folders
+ if ($params['itemType'] === 'folder') {
+ $allFiles = $util->getAllFiles($path);
+ } else {
+ $allFiles = array($path);
+ }
+
+ foreach ($allFiles as $path) {
+ $usersSharing = $util->getSharingUsersArray($sharingEnabled, $path);
+ $util->setSharedFileKeyfiles( $session, $usersSharing, $path );
+ }
+ }
}
/**
* @brief
*/
- public static function preUnshareAll( $params ) {
-
- trigger_error( "preUnshareAll" );
-
+ public static function postUnshare( $params ) {
+
+ // NOTE: $params has keys:
+ // [itemType] => file
+ // [itemSource] => 13
+ // [shareType] => 0
+ // [shareWith] => test1
+ // [itemParent] =>
+
+ if ( $params['itemType'] === 'file' || $params['itemType'] === 'folder' ) {
+
+ $view = new \OC_FilesystemView( '/' );
+ $userId = \OCP\User::getUser();
+ $util = new Util( $view, $userId);
+ $path = $util->fileIdToPath( $params['itemSource'] );
+
+ // check if this is a re-share
+ if ( $params['itemParent'] ) {
+
+ // get the parent from current share
+ $parent = $util->getShareParent( $params['itemParent'] );
+
+ // get target path
+ $targetPath = $util->fileIdToPath( $params['itemSource'] );
+ $targetPathSplit = array_reverse( explode( '/', $targetPath ) );
+
+ // init values
+ $path = '';
+ $sharedPart = ltrim( $parent['file_target'], '/' );
+
+ // rebuild path
+ foreach ( $targetPathSplit as $pathPart ) {
+
+ if ( $pathPart !== $sharedPart ) {
+
+ $path = '/' . $pathPart . $path;
+
+ } else {
+
+ break;
+
+ }
+
+ }
+
+ // prefix path with Shared
+ $path = '/Shared' . $parent['file_target'] . $path;
+ }
+
+ // for group shares get a list of the group members
+ if ( $params['shareType'] == \OCP\Share::SHARE_TYPE_GROUP ) {
+ $userIds = \OC_Group::usersInGroup($params['shareWith']);
+ } else if ( $params['shareType'] == \OCP\Share::SHARE_TYPE_LINK ){
+ $userIds = array( $util->getPublicShareKeyId() );
+ } else {
+ $userIds = array( $params['shareWith'] );
+ }
+
+ // if we unshare a folder we need a list of all (sub-)files
+ if ( $params['itemType'] === 'folder' ) {
+
+ $allFiles = $util->getAllFiles( $path );
+
+ } else {
+
+ $allFiles = array( $path );
+ }
+
+ foreach ( $allFiles as $path ) {
+
+ // check if the user still has access to the file, otherwise delete share key
+ $sharingUsers = $util->getSharingUsersArray( true, $path );
+
+ // Unshare every user who no longer has access to the file
+ $delUsers = array_diff( $userIds, $sharingUsers);
+
+ // delete share key
+ Keymanager::delShareKey( $view, $delUsers, $path );
+ }
+
+ }
}
+ /**
+ * @brief after a file is renamed, rename its keyfile and share-keys also fix the file size and fix also the sharing
+ * @param array with oldpath and newpath
+ *
+ * This function is connected to the rename signal of OC_Filesystem and adjust the name and location
+ * of the stored versions along the actual file
+ */
+ public static function postRename($params) {
+ // Disable encryption proxy to prevent recursive calls
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
+ $view = new \OC_FilesystemView('/');
+ $session = new Session($view);
+ $userId = \OCP\User::getUser();
+ $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']);
+
+ // add key ext if this is not an folder
+ if (!$view->is_dir($oldKeyfilePath)) {
+ $oldKeyfilePath .= '.key';
+ $newKeyfilePath .= '.key';
+
+ // handle share-keys
+ $localKeyPath = $view->getLocalFile($userId.'/files_encryption/share-keys/'.$params['oldpath']);
+ $matches = glob(preg_quote($localKeyPath).'*.shareKey');
+ foreach ($matches as $src) {
+ $dst = \OC\Files\Filesystem::normalizePath(str_replace($params['oldpath'], $params['newpath'], $src));
+
+ // create destination folder if not exists
+ if(!file_exists(dirname($dst))) {
+ mkdir(dirname($dst), 0750, true);
+ }
+
+ rename($src, $dst);
+ }
+
+ } 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']);
+
+ // create destination folder if not exists
+ if(!$view->file_exists(dirname($newShareKeyfilePath))) {
+ $view->mkdir(dirname($newShareKeyfilePath), 0750, true);
+ }
+
+ $view->rename($oldShareKeyfilePath, $newShareKeyfilePath);
+ }
+
+ // Rename keyfile so it isn't orphaned
+ if($view->file_exists($oldKeyfilePath)) {
+
+ // create destination folder if not exists
+ if(!$view->file_exists(dirname($newKeyfilePath))) {
+ $view->mkdir(dirname($newKeyfilePath), 0750, true);
+ }
+
+ $view->rename($oldKeyfilePath, $newKeyfilePath);
+ }
+
+ // build the path to the file
+ $newPath = '/' . $userId . '/files' .$params['newpath'];
+ $newPathRelative = $params['newpath'];
+
+ if($util->fixFileSize($newPath)) {
+ // get sharing app state
+ $sharingEnabled = \OCP\Share::isEnabled();
+
+ // get users
+ $usersSharing = $util->getSharingUsersArray($sharingEnabled, $newPathRelative);
+
+ // update sharing-keys
+ $util->setSharedFileKeyfiles($session, $usersSharing, $newPathRelative);
+ }
+
+ \OC_FileProxy::$enabled = $proxyStatus;
+ }
}
diff --git a/apps/files_encryption/js/settings-admin.js b/apps/files_encryption/js/settings-admin.js
new file mode 100644
index 0000000000000000000000000000000000000000..7c1866445eee9133cf090a0a0bc0757d6e33aa22
--- /dev/null
+++ b/apps/files_encryption/js/settings-admin.js
@@ -0,0 +1,102 @@
+/**
+ * Copyright (c) 2013, Sam Tuke , Robin Appelman
+ *
+ * This file is licensed under the Affero General Public License version 3 or later.
+ * See the COPYING-README file.
+ */
+
+OC.msg={
+ startSaving:function(selector){
+ $(selector)
+ .html( t('settings', 'Saving...') )
+ .removeClass('success')
+ .removeClass('error')
+ .stop(true, true)
+ .show();
+ },
+ finishedSaving:function(selector, data){
+ if( data.status === "success" ){
+ $(selector).html( data.data.message )
+ .addClass('success')
+ .stop(true, true)
+ .delay(3000)
+ .fadeOut(900);
+ }else{
+ $(selector).html( data.data.message ).addClass('error');
+ }
+ }
+};
+
+$(document).ready(function(){
+ // Trigger ajax on recoveryAdmin status change
+ var enabledStatus = $('#adminEnableRecovery').val();
+
+ $('input:password[name="recoveryPassword"]').keyup(function(event) {
+ var recoveryPassword = $( '#recoveryPassword' ).val();
+ var checkedButton = $('input:radio[name="adminEnableRecovery"]:checked').val();
+ var uncheckedValue = (1+parseInt(checkedButton)) % 2;
+ if (recoveryPassword != '' ) {
+ $('input:radio[name="adminEnableRecovery"][value="'+uncheckedValue.toString()+'"]').removeAttr("disabled");
+ } else {
+ $('input:radio[name="adminEnableRecovery"][value="'+uncheckedValue.toString()+'"]').attr("disabled", "true");
+ }
+ });
+
+ $( 'input:radio[name="adminEnableRecovery"]' ).change(
+ function() {
+ var recoveryStatus = $( this ).val();
+ var oldStatus = (1+parseInt(recoveryStatus)) % 2;
+ var recoveryPassword = $( '#recoveryPassword' ).val();
+ $.post(
+ OC.filePath( 'files_encryption', 'ajax', 'adminrecovery.php' )
+ , { adminEnableRecovery: recoveryStatus, recoveryPassword: recoveryPassword }
+ , function( result ) {
+ if (result.status === "error") {
+ OC.Notification.show(t('admin', result.data.message));
+ $('input:radio[name="adminEnableRecovery"][value="'+oldStatus.toString()+'"]').attr("checked", "true");
+ } else {
+ OC.Notification.hide();
+ if (recoveryStatus === "0") {
+ $('button:button[name="submitChangeRecoveryKey"]').attr("disabled", "true");
+ $('input:password[name="changeRecoveryPassword"]').attr("disabled", "true");
+ $('input:password[name="changeRecoveryPassword"]').val("");
+ } else {
+ $('input:password[name="changeRecoveryPassword"]').removeAttr("disabled");
+ }
+ }
+ }
+ );
+ }
+ );
+
+ // change recovery password
+
+ $('input:password[name="changeRecoveryPassword"]').keyup(function(event) {
+ var oldRecoveryPassword = $('input:password[id="oldRecoveryPassword"]').val();
+ var newRecoveryPassword = $('input:password[id="newRecoveryPassword"]').val();
+ if (newRecoveryPassword != '' && oldRecoveryPassword != '' ) {
+ $('button:button[name="submitChangeRecoveryKey"]').removeAttr("disabled");
+ } else {
+ $('button:button[name="submitChangeRecoveryKey"]').attr("disabled", "true");
+ }
+ });
+
+
+ $('button:button[name="submitChangeRecoveryKey"]').click(function() {
+ var oldRecoveryPassword = $('input:password[id="oldRecoveryPassword"]').val();
+ var newRecoveryPassword = $('input:password[id="newRecoveryPassword"]').val();
+ OC.msg.startSaving('#encryption .msg');
+ $.post(
+ OC.filePath( 'files_encryption', 'ajax', 'changeRecoveryPassword.php' )
+ , { oldPassword: oldRecoveryPassword, newPassword: newRecoveryPassword }
+ , function( data ) {
+ if (data.status == "error") {
+ OC.msg.finishedSaving('#encryption .msg', data);
+ } else {
+ OC.msg.finishedSaving('#encryption .msg', data);
+ }
+ }
+ );
+ });
+
+});
\ No newline at end of file
diff --git a/apps/files_encryption/js/settings-personal.js b/apps/files_encryption/js/settings-personal.js
new file mode 100644
index 0000000000000000000000000000000000000000..312b672ad464be90d5b3ef5cd466c5677141baa2
--- /dev/null
+++ b/apps/files_encryption/js/settings-personal.js
@@ -0,0 +1,60 @@
+/**
+ * Copyright (c) 2013, Sam Tuke
+ * This file is licensed under the Affero General Public License version 3 or later.
+ * See the COPYING-README file.
+ */
+
+$(document).ready(function(){
+ // Trigger ajax on recoveryAdmin status change
+ $( 'input:radio[name="userEnableRecovery"]' ).change(
+ function() {
+
+ // Hide feedback messages in case they're already visible
+ $('#recoveryEnabledSuccess').hide();
+ $('#recoveryEnabledError').hide();
+
+ var recoveryStatus = $( this ).val();
+
+ $.post(
+ OC.filePath( 'files_encryption', 'ajax', 'userrecovery.php' )
+ , { userEnableRecovery: recoveryStatus }
+ , function( data ) {
+ if ( data.status == "success" ) {
+ $('#recoveryEnabledSuccess').show();
+ } else {
+ $('#recoveryEnabledError').show();
+ }
+ }
+ );
+ // Ensure page is not reloaded on form submit
+ return false;
+ }
+ );
+
+ $("#encryptAll").click(
+ function(){
+
+ // Hide feedback messages in case they're already visible
+ $('#encryptAllSuccess').hide();
+ $('#encryptAllError').hide();
+
+ var userPassword = $( '#userPassword' ).val();
+ var encryptAll = $( '#encryptAll' ).val();
+
+ $.post(
+ OC.filePath( 'files_encryption', 'ajax', 'encryptall.php' )
+ , { encryptAll: encryptAll, userPassword: userPassword }
+ , function( data ) {
+ if ( data.status == "success" ) {
+ $('#encryptAllSuccess').show();
+ } else {
+ $('#encryptAllError').show();
+ }
+ }
+ );
+ // Ensure page is not reloaded on form submit
+ return false;
+ }
+
+ );
+});
\ No newline at end of file
diff --git a/apps/files_encryption/js/settings.js b/apps/files_encryption/js/settings.js
deleted file mode 100644
index 0be857bb73e9dd6d35a7ad30e702d3a5c25a08a6..0000000000000000000000000000000000000000
--- a/apps/files_encryption/js/settings.js
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * Copyright (c) 2011, Robin Appelman
- * This file is licensed under the Affero General Public License version 3 or later.
- * See the COPYING-README file.
- */
-
-
-$(document).ready(function(){
- $('#encryption_blacklist').multiSelect({
- oncheck:blackListChange,
- onuncheck:blackListChange,
- createText:'...'
- });
-
- function blackListChange(){
- var blackList=$('#encryption_blacklist').val().join(',');
- OC.AppConfig.setValue('files_encryption','type_blacklist',blackList);
- }
-})
\ No newline at end of file
diff --git a/apps/files_encryption/l10n/ca.php b/apps/files_encryption/l10n/ca.php
index 0c661353a776ce7644bc8ad3e5c954e2becc28ad..2d59a306d33bfcdd090f16dcac2eae1a6858dd5d 100644
--- a/apps/files_encryption/l10n/ca.php
+++ b/apps/files_encryption/l10n/ca.php
@@ -1,7 +1,7 @@
"Encriptatge",
-"File encryption is enabled." => "L'encriptació de fitxers està activada.",
-"The following file types will not be encrypted:" => "Els tipus de fitxers següents no s'encriptaran:",
-"Exclude the following file types from encryption:" => "Exclou els tipus de fitxers següents de l'encriptatge:",
+"Encryption" => "Xifrat",
+"File encryption is enabled." => "El xifrat de fitxers està activat.",
+"The following file types will not be encrypted:" => "Els tipus de fitxers següents no es xifraran:",
+"Exclude the following file types from encryption:" => "Exclou els tipus de fitxers següents del xifratge:",
"None" => "Cap"
);
diff --git a/apps/files_encryption/l10n/cy_GB.php b/apps/files_encryption/l10n/cy_GB.php
new file mode 100644
index 0000000000000000000000000000000000000000..523b5dd73dff8cd97306b67eaaf33632eeb85531
--- /dev/null
+++ b/apps/files_encryption/l10n/cy_GB.php
@@ -0,0 +1,7 @@
+ "Amgryptiad",
+"File encryption is enabled." => "Galluogwyd amgryptio ffeiliau.",
+"The following file types will not be encrypted:" => "Ni fydd ffeiliau o'r math yma'n cael eu hamgryptio:",
+"Exclude the following file types from encryption:" => "Eithrio'r mathau canlynol o ffeiliau rhag cael eu hamgryptio:",
+"None" => "Dim"
+);
diff --git a/apps/files_encryption/l10n/ug.php b/apps/files_encryption/l10n/ug.php
new file mode 100644
index 0000000000000000000000000000000000000000..34eeb373b3e2bf4b98576c78d1b402562f6ef9ce
--- /dev/null
+++ b/apps/files_encryption/l10n/ug.php
@@ -0,0 +1,7 @@
+ "شىفىرلاش",
+"File encryption is enabled." => "ھۆججەت شىفىرلاش قوزغىتىلدى.",
+"The following file types will not be encrypted:" => "تۆۋەندىكى ھۆججەت تىپلىرى شىفىرلانمايدۇ:",
+"Exclude the following file types from encryption:" => "تۆۋەندىكى ھۆججەت تىپلىرى شىفىرلاشنىڭ سىرتىدا:",
+"None" => "يوق"
+);
diff --git a/apps/files_encryption/lib/crypt.php b/apps/files_encryption/lib/crypt.php
index 437a18669e5f2e8d67bb46a9b01752b0873f896b..f5b7a8a0a40394af9a27bfec45fde1bd0a00cb38 100755
--- a/apps/files_encryption/lib/crypt.php
+++ b/apps/files_encryption/lib/crypt.php
@@ -25,23 +25,19 @@
namespace OCA\Encryption;
-require_once 'Crypt_Blowfish/Blowfish.php';
-
-// Todo:
-// - Add a setting "Don´t encrypt files larger than xx because of performance"
-// - Don't use a password directly as encryption key. but a key which is
-// stored on the server and encrypted with the user password. -> change pass
-// faster
+//require_once '../3rdparty/Crypt_Blowfish/Blowfish.php';
+require_once realpath( dirname( __FILE__ ) . '/../3rdparty/Crypt_Blowfish/Blowfish.php' );
/**
* Class for common cryptography functionality
*/
-class Crypt {
+class Crypt
+{
/**
* @brief return encryption mode client or server side encryption
- * @param string user name (use system wide setting if name=null)
+ * @param string $user name (use system wide setting if name=null)
* @return string 'client' or 'server'
*/
public static function mode( $user = null ) {
@@ -56,7 +52,7 @@ class Crypt {
*/
public static function createKeypair() {
- $res = openssl_pkey_new();
+ $res = openssl_pkey_new( array( 'private_key_bits' => 4096 ) );
// Get private key
openssl_pkey_export( $res, $privateKey );
@@ -66,14 +62,14 @@ class Crypt {
$publicKey = $publicKey['key'];
- return( array( 'publicKey' => $publicKey, 'privateKey' => $privateKey ) );
+ return ( array( 'publicKey' => $publicKey, 'privateKey' => $privateKey ) );
}
/**
* @brief Add arbitrary padding to encrypted data
* @param string $data data to be padded
- * @return padded data
+ * @return string padded data
* @note In order to end up with data exactly 8192 bytes long we must
* add two letters. It is impossible to achieve exactly 8192 length
* blocks with encryption alone, hence padding is added to achieve the
@@ -90,7 +86,7 @@ class Crypt {
/**
* @brief Remove arbitrary padding to encrypted data
* @param string $padded padded data to remove padding from
- * @return unpadded data on success, false on error
+ * @return string unpadded data on success, false on error
*/
public static function removePadding( $padded ) {
@@ -111,10 +107,11 @@ class Crypt {
/**
* @brief Check if a file's contents contains an IV and is symmetrically encrypted
- * @return true / false
+ * @param $content
+ * @return boolean
* @note see also OCA\Encryption\Util->isEncryptedPath()
*/
- public static function isCatfile( $content ) {
+ public static function isCatfileContent( $content ) {
if ( !$content ) {
@@ -133,7 +130,7 @@ class Crypt {
// Fetch identifier from start of metadata
$identifier = substr( $meta, 0, 6 );
- if ( $identifier == '00iv00') {
+ if ( $identifier == '00iv00' ) {
return true;
@@ -155,7 +152,7 @@ class Crypt {
// TODO: Use DI to get \OC\Files\Filesystem out of here
// Fetch all file metadata from DB
- $metadata = \OC\Files\Filesystem::getFileInfo( $path, '' );
+ $metadata = \OC\Files\Filesystem::getFileInfo( $path );
// Return encryption status
return isset( $metadata['encrypted'] ) and ( bool )$metadata['encrypted'];
@@ -164,9 +161,10 @@ class Crypt {
/**
* @brief Check if a file is encrypted via legacy system
+ * @param $data
* @param string $relPath The path of the file, relative to user/data;
* e.g. filename or /Docs/filename, NOT admin/files/filename
- * @return true / false
+ * @return boolean
*/
public static function isLegacyEncryptedContent( $data, $relPath ) {
@@ -179,7 +177,7 @@ class Crypt {
if (
isset( $metadata['encrypted'] )
and $metadata['encrypted'] === true
- and ! self::isCatfile( $data )
+ and !self::isCatfileContent( $data )
) {
return true;
@@ -194,7 +192,10 @@ class Crypt {
/**
* @brief Symmetrically encrypt a string
- * @returns encrypted file
+ * @param $plainContent
+ * @param $iv
+ * @param string $passphrase
+ * @return string encrypted file content
*/
public static function encrypt( $plainContent, $iv, $passphrase = '' ) {
@@ -214,7 +215,11 @@ class Crypt {
/**
* @brief Symmetrically decrypt a string
- * @returns decrypted file
+ * @param $encryptedContent
+ * @param $iv
+ * @param $passphrase
+ * @throws \Exception
+ * @return string decrypted file content
*/
public static function decrypt( $encryptedContent, $iv, $passphrase ) {
@@ -222,7 +227,6 @@ class Crypt {
return $plainContent;
-
} else {
throw new \Exception( 'Encryption library: Decryption (symmetric) of content failed' );
@@ -237,7 +241,7 @@ class Crypt {
* @param string $iv IV to be concatenated
* @returns string concatenated content
*/
- public static function concatIv ( $content, $iv ) {
+ public static function concatIv( $content, $iv ) {
$combined = $content . '00iv00' . $iv;
@@ -250,7 +254,7 @@ class Crypt {
* @param string $catFile concatenated data to be split
* @returns array keys: encrypted, iv
*/
- public static function splitIv ( $catFile ) {
+ public static function splitIv( $catFile ) {
// Fetch encryption metadata from end of file
$meta = substr( $catFile, -22 );
@@ -272,8 +276,10 @@ class Crypt {
/**
* @brief Symmetrically encrypts a string and returns keyfile content
- * @param $plainContent content to be encrypted in keyfile
- * @returns encrypted content combined with IV
+ * @param string $plainContent content to be encrypted in keyfile
+ * @param string $passphrase
+ * @return bool|string
+ * @return string encrypted content combined with IV
* @note IV need not be specified, as it will be stored in the returned keyfile
* and remain accessible therein.
*/
@@ -309,10 +315,14 @@ class Crypt {
/**
* @brief Symmetrically decrypts keyfile content
- * @param string $source
- * @param string $target
- * @param string $key the decryption key
- * @returns decrypted content
+ * @param $keyfileContent
+ * @param string $passphrase
+ * @throws \Exception
+ * @return bool|string
+ * @internal param string $source
+ * @internal param string $target
+ * @internal param string $key the decryption key
+ * @returns string decrypted content
*
* This function decrypts a file
*/
@@ -334,6 +344,8 @@ class Crypt {
return $plainContent;
+ } else {
+ return false;
}
}
@@ -350,11 +362,11 @@ class Crypt {
$key = self::generateKey();
- if( $encryptedContent = self::symmetricEncryptFileContent( $plainContent, $key ) ) {
+ if ( $encryptedContent = self::symmetricEncryptFileContent( $plainContent, $key ) ) {
return array(
- 'key' => $key
- , 'encrypted' => $encryptedContent
+ 'key' => $key,
+ 'encrypted' => $encryptedContent
);
} else {
@@ -368,22 +380,41 @@ class Crypt {
/**
* @brief Create asymmetrically encrypted keyfile content using a generated key
* @param string $plainContent content to be encrypted
- * @returns array keys: key, encrypted
- * @note symmetricDecryptFileContent() can be used to decrypt files created using this method
- *
- * This function decrypts a file
+ * @param array $publicKeys array keys must be the userId of corresponding user
+ * @returns array keys: keys (array, key = userId), data
+ * @note symmetricDecryptFileContent() can decrypt files created using this method
*/
public static function multiKeyEncrypt( $plainContent, array $publicKeys ) {
+ // openssl_seal returns false without errors if $plainContent
+ // is empty, so trigger our own error
+ if ( empty( $plainContent ) ) {
+
+ throw new \Exception( 'Cannot mutliKeyEncrypt empty plain content' );
+
+ }
+
// Set empty vars to be set by openssl by reference
$sealed = '';
- $envKeys = array();
+ $shareKeys = array();
+ $mappedShareKeys = array();
+
+ if ( openssl_seal( $plainContent, $sealed, $shareKeys, $publicKeys ) ) {
+
+ $i = 0;
- if( openssl_seal( $plainContent, $sealed, $envKeys, $publicKeys ) ) {
+ // Ensure each shareKey is labelled with its
+ // corresponding userId
+ foreach ( $publicKeys as $userId => $publicKey ) {
+
+ $mappedShareKeys[$userId] = $shareKeys[$i];
+ $i++;
+
+ }
return array(
- 'keys' => $envKeys
- , 'encrypted' => $sealed
+ 'keys' => $mappedShareKeys,
+ 'data' => $sealed
);
} else {
@@ -396,13 +427,17 @@ class Crypt {
/**
* @brief Asymmetrically encrypt a file using multiple public keys
- * @param string $plainContent content to be encrypted
+ * @param $encryptedContent
+ * @param $shareKey
+ * @param $privateKey
+ * @return bool
+ * @internal param string $plainContent content to be encrypted
* @returns string $plainContent decrypted string
* @note symmetricDecryptFileContent() can be used to decrypt files created using this method
*
* This function decrypts a file
*/
- public static function multiKeyDecrypt( $encryptedContent, $envKey, $privateKey ) {
+ public static function multiKeyDecrypt( $encryptedContent, $shareKey, $privateKey ) {
if ( !$encryptedContent ) {
@@ -410,7 +445,7 @@ class Crypt {
}
- if ( openssl_open( $encryptedContent, $plainContent, $envKey, $privateKey ) ) {
+ if ( openssl_open( $encryptedContent, $plainContent, $shareKey, $privateKey ) ) {
return $plainContent;
@@ -425,8 +460,8 @@ class Crypt {
}
/**
- * @brief Asymmetrically encrypt a string using a public key
- * @returns encrypted file
+ * @brief Asymetrically encrypt a string using a public key
+ * @return string encrypted file
*/
public static function keyEncrypt( $plainContent, $publicKey ) {
@@ -438,110 +473,17 @@ class Crypt {
/**
* @brief Asymetrically decrypt a file using a private key
- * @returns decrypted file
+ * @return string decrypted file
*/
public static function keyDecrypt( $encryptedContent, $privatekey ) {
- openssl_private_decrypt( $encryptedContent, $plainContent, $privatekey );
-
- return $plainContent;
-
- }
-
- /**
- * @brief Encrypts content symmetrically and generates keyfile asymmetrically
- * @returns array containing catfile and new keyfile.
- * keys: data, key
- * @note this method is a wrapper for combining other crypt class methods
- */
- public static function keyEncryptKeyfile( $plainContent, $publicKey ) {
-
- // Encrypt plain data, generate keyfile & encrypted file
- $cryptedData = self::symmetricEncryptFileContentKeyfile( $plainContent );
-
- // Encrypt keyfile
- $cryptedKey = self::keyEncrypt( $cryptedData['key'], $publicKey );
-
- return array( 'data' => $cryptedData['encrypted'], 'key' => $cryptedKey );
-
- }
-
- /**
- * @brief Takes catfile, keyfile, and private key, and
- * performs decryption
- * @returns decrypted content
- * @note this method is a wrapper for combining other crypt class methods
- */
- public static function keyDecryptKeyfile( $catfile, $keyfile, $privateKey ) {
-
- // Decrypt the keyfile with the user's private key
- $decryptedKeyfile = self::keyDecrypt( $keyfile, $privateKey );
-
- // Decrypt the catfile symmetrically using the decrypted keyfile
- $decryptedData = self::symmetricDecryptFileContent( $catfile, $decryptedKeyfile );
-
- return $decryptedData;
-
- }
-
- /**
- * @brief Symmetrically encrypt a file by combining encrypted component data blocks
- */
- public static function symmetricBlockEncryptFileContent( $plainContent, $key ) {
-
- $crypted = '';
-
- $remaining = $plainContent;
-
- $testarray = array();
-
- while( strlen( $remaining ) ) {
-
- //echo "\n\n\$block = ".substr( $remaining, 0, 6126 );
-
- // Encrypt a chunk of unencrypted data and add it to the rest
- $block = self::symmetricEncryptFileContent( substr( $remaining, 0, 6126 ), $key );
-
- $padded = self::addPadding( $block );
-
- $crypted .= $block;
-
- $testarray[] = $block;
-
- // Remove the data already encrypted from remaining unencrypted data
- $remaining = substr( $remaining, 6126 );
-
- }
-
- return $crypted;
-
- }
-
-
- /**
- * @brief Symmetrically decrypt a file by combining encrypted component data blocks
- */
- public static function symmetricBlockDecryptFileContent( $crypted, $key ) {
-
- $decrypted = '';
-
- $remaining = $crypted;
-
- $testarray = array();
-
- while( strlen( $remaining ) ) {
-
- $testarray[] = substr( $remaining, 0, 8192 );
-
- // Decrypt a chunk of unencrypted data and add it to the rest
- $decrypted .= self::symmetricDecryptFileContent( $remaining, $key );
-
- // Remove the data already encrypted from remaining unencrypted data
- $remaining = substr( $remaining, 8192 );
+ $result = @openssl_private_decrypt( $encryptedContent, $plainContent, $privatekey );
+ if ( $result ) {
+ return $plainContent;
}
- return $decrypted;
+ return $result;
}
@@ -586,7 +528,7 @@ class Crypt {
if ( !$strong ) {
// If OpenSSL indicates randomness is insecure, log error
- throw new \Exception ( 'Encryption library, Insecure symmetric key was generated using openssl_random_pseudo_bytes()' );
+ throw new \Exception( 'Encryption library, Insecure symmetric key was generated using openssl_random_pseudo_bytes()' );
}
@@ -621,6 +563,10 @@ class Crypt {
}
+ /**
+ * @param $passphrase
+ * @return mixed
+ */
public static function legacyCreateKey( $passphrase ) {
// Generate a random integer
@@ -635,9 +581,11 @@ class Crypt {
/**
* @brief encrypts content using legacy blowfish system
- * @param $content the cleartext message you want to encrypt
- * @param $key the encryption key (optional)
- * @returns encrypted content
+ * @param string $content the cleartext message you want to encrypt
+ * @param string $passphrase
+ * @return
+ * @internal param \OCA\Encryption\the $key encryption key (optional)
+ * @returns string encrypted content
*
* This function encrypts an content
*/
@@ -651,9 +599,11 @@ class Crypt {
/**
* @brief decrypts content using legacy blowfish system
- * @param $content the cleartext message you want to decrypt
- * @param $key the encryption key (optional)
- * @returns cleartext content
+ * @param string $content the cleartext message you want to decrypt
+ * @param string $passphrase
+ * @return string
+ * @internal param \OCA\Encryption\the $key encryption key (optional)
+ * @return string cleartext content
*
* This function decrypts an content
*/
@@ -663,33 +613,49 @@ class Crypt {
$decrypted = $bf->decrypt( $content );
- $trimmed = rtrim( $decrypted, "\0" );
-
- return $trimmed;
+ return rtrim( $decrypted, "\0" );;
}
- public static function legacyKeyRecryptKeyfile( $legacyEncryptedContent, $legacyPassphrase, $publicKey, $newPassphrase ) {
-
- $decrypted = self::legacyDecrypt( $legacyEncryptedContent, $legacyPassphrase );
-
- $recrypted = self::keyEncryptKeyfile( $decrypted, $publicKey );
-
- return $recrypted;
-
+ /**
+ * @param $data
+ * @param string $key
+ * @param int $maxLength
+ * @return string
+ */
+ private static function legacyBlockDecrypt( $data, $key = '', $maxLength = 0 ) {
+ $result = '';
+ while ( strlen( $data ) ) {
+ $result .= self::legacyDecrypt( substr( $data, 0, 8192 ), $key );
+ $data = substr( $data, 8192 );
+ }
+ if ( $maxLength > 0 ) {
+ return substr( $result, 0, $maxLength );
+ } else {
+ return rtrim( $result, "\0" );
+ }
}
/**
- * @brief Re-encryptes a legacy blowfish encrypted file using AES with integrated IV
- * @param $legacyContent the legacy encrypted content to re-encrypt
- * @returns cleartext content
- *
- * This function decrypts an content
+ * @param $legacyEncryptedContent
+ * @param $legacyPassphrase
+ * @param $publicKeys
+ * @param $newPassphrase
+ * @param $path
+ * @return array
*/
- public static function legacyRecrypt( $legacyContent, $legacyPassphrase, $newPassphrase ) {
+ public static function legacyKeyRecryptKeyfile( $legacyEncryptedContent, $legacyPassphrase, $publicKeys, $newPassphrase, $path ) {
+
+ $decrypted = self::legacyBlockDecrypt( $legacyEncryptedContent, $legacyPassphrase );
+
+ // Encrypt plain data, generate keyfile & encrypted file
+ $cryptedData = self::symmetricEncryptFileContentKeyfile( $decrypted );
+
+ // Encrypt plain keyfile to multiple sharefiles
+ $multiEncrypted = Crypt::multiKeyEncrypt( $cryptedData['key'], $publicKeys );
- // TODO: write me
+ return array( 'data' => $cryptedData['encrypted'], 'filekey' => $multiEncrypted['data'], 'sharekeys' => $multiEncrypted['keys'] );
}
-}
+}
\ No newline at end of file
diff --git a/apps/files_encryption/lib/helper.php b/apps/files_encryption/lib/helper.php
new file mode 100755
index 0000000000000000000000000000000000000000..43f573c16b9789ef74c9ba6b4184d24fbaf43f5a
--- /dev/null
+++ b/apps/files_encryption/lib/helper.php
@@ -0,0 +1,176 @@
+
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library. If not, see .
+ *
+ */
+
+namespace OCA\Encryption;
+
+ /**
+ * @brief Class to manage registration of hooks an various helper methods
+ */
+/**
+ * Class Helper
+ * @package OCA\Encryption
+ */
+class Helper
+{
+
+ /**
+ * @brief register share related hooks
+ *
+ */
+ public static function registerShareHooks() {
+
+ \OCP\Util::connectHook( 'OCP\Share', 'pre_shared', 'OCA\Encryption\Hooks', 'preShared' );
+ \OCP\Util::connectHook( 'OCP\Share', 'post_shared', 'OCA\Encryption\Hooks', 'postShared' );
+ \OCP\Util::connectHook( 'OCP\Share', 'post_unshare', 'OCA\Encryption\Hooks', 'postUnshare' );
+ }
+
+ /**
+ * @brief register user related hooks
+ *
+ */
+ public static function registerUserHooks() {
+
+ \OCP\Util::connectHook( 'OC_User', 'post_login', 'OCA\Encryption\Hooks', 'login' );
+ \OCP\Util::connectHook( 'OC_User', 'post_setPassword', 'OCA\Encryption\Hooks', 'setPassphrase' );
+ \OCP\Util::connectHook( 'OC_User', 'post_createUser', 'OCA\Encryption\Hooks', 'postCreateUser' );
+ \OCP\Util::connectHook( 'OC_User', 'post_deleteUser', 'OCA\Encryption\Hooks', 'postDeleteUser' );
+ }
+
+ /**
+ * @brief register filesystem related hooks
+ *
+ */
+ public static function registerFilesystemHooks() {
+
+ \OCP\Util::connectHook( 'OC_Filesystem', 'post_rename', 'OCA\Encryption\Hooks', 'postRename' );
+ }
+
+ /**
+ * @brief setup user for files_encryption
+ *
+ * @param Util $util
+ * @param string $password
+ * @return bool
+ */
+ public static function setupUser( $util, $password ) {
+ // Check files_encryption infrastructure is ready for action
+ if ( !$util->ready() ) {
+
+ \OC_Log::write( 'Encryption library', 'User account "' . $util->getUserId() . '" is not ready for encryption; configuration started', \OC_Log::DEBUG );
+
+ if ( !$util->setupServerSide( $password ) ) {
+ return false;
+ }
+ }
+
+ return true;
+ }
+
+ /**
+ * @brief enable recovery
+ *
+ * @param $recoveryKeyId
+ * @param $recoveryPassword
+ * @internal param \OCA\Encryption\Util $util
+ * @internal param string $password
+ * @return bool
+ */
+ public static function adminEnableRecovery( $recoveryKeyId, $recoveryPassword ) {
+ $view = new \OC\Files\View( '/' );
+
+ if ( $recoveryKeyId === null ) {
+ $recoveryKeyId = 'recovery_' . substr( md5( time() ), 0, 8 );
+ \OC_Appconfig::setValue( 'files_encryption', 'recoveryKeyId', $recoveryKeyId );
+ }
+
+ if ( !$view->is_dir( '/owncloud_private_key' ) ) {
+ $view->mkdir( '/owncloud_private_key' );
+ }
+
+ if (
+ ( !$view->file_exists( "/public-keys/" . $recoveryKeyId . ".public.key" )
+ || !$view->file_exists( "/owncloud_private_key/" . $recoveryKeyId . ".private.key" ) )
+ ) {
+
+ $keypair = \OCA\Encryption\Crypt::createKeypair();
+
+ \OC_FileProxy::$enabled = false;
+
+ // Save public key
+
+ if ( !$view->is_dir( '/public-keys' ) ) {
+ $view->mkdir( '/public-keys' );
+ }
+
+ $view->file_put_contents( '/public-keys/' . $recoveryKeyId . '.public.key', $keypair['publicKey'] );
+
+ // Encrypt private key empthy passphrase
+ $encryptedPrivateKey = \OCA\Encryption\Crypt::symmetricEncryptFileContent( $keypair['privateKey'], $recoveryPassword );
+
+ // Save private key
+ $view->file_put_contents( '/owncloud_private_key/' . $recoveryKeyId . '.private.key', $encryptedPrivateKey );
+
+ // create control file which let us check later on if the entered password was correct.
+ $encryptedControlData = \OCA\Encryption\Crypt::keyEncrypt( "ownCloud", $keypair['publicKey'] );
+ if ( !$view->is_dir( '/control-file' ) ) {
+ $view->mkdir( '/control-file' );
+ }
+ $view->file_put_contents( '/control-file/controlfile.enc', $encryptedControlData );
+
+ \OC_FileProxy::$enabled = true;
+
+ // Set recoveryAdmin as enabled
+ \OC_Appconfig::setValue( 'files_encryption', 'recoveryAdminEnabled', 1 );
+
+ $return = true;
+
+ } else { // get recovery key and check the password
+ $util = new \OCA\Encryption\Util( new \OC_FilesystemView( '/' ), \OCP\User::getUser() );
+ $return = $util->checkRecoveryPassword( $_POST['recoveryPassword'] );
+ if ( $return ) {
+ \OC_Appconfig::setValue( 'files_encryption', 'recoveryAdminEnabled', 1 );
+ }
+ }
+
+ return $return;
+ }
+
+
+ /**
+ * @brief disable recovery
+ *
+ * @param $recoveryPassword
+ * @return bool
+ */
+ public static function adminDisableRecovery( $recoveryPassword ) {
+ $util = new Util( new \OC_FilesystemView( '/' ), \OCP\User::getUser() );
+ $return = $util->checkRecoveryPassword( $recoveryPassword );
+
+ if ( $return ) {
+ // Set recoveryAdmin as disabled
+ \OC_Appconfig::setValue( 'files_encryption', 'recoveryAdminEnabled', 0 );
+ }
+
+ return $return;
+ }
+}
\ No newline at end of file
diff --git a/apps/files_encryption/lib/keymanager.php b/apps/files_encryption/lib/keymanager.php
index 955877971540bf86144ec6048ec47742cefff752..aaa2e4ba1b5cfa883930e7169b5e8f652ea29c76 100755
--- a/apps/files_encryption/lib/keymanager.php
+++ b/apps/files_encryption/lib/keymanager.php
@@ -27,20 +27,28 @@ namespace OCA\Encryption;
* @brief Class to manage storage and retrieval of encryption keys
* @note Where a method requires a view object, it's root must be '/'
*/
-class Keymanager {
-
+class Keymanager
+{
+
/**
* @brief retrieve the ENCRYPTED private key from a user
- *
- * @return string private key or false
+ *
+ * @param \OC_FilesystemView $view
+ * @param string $user
+ * @return string private key or false (hopefully)
* @note the key returned by this method must be decrypted before use
*/
public static function getPrivateKey( \OC_FilesystemView $view, $user ) {
-
- $path = '/' . $user . '/' . 'files_encryption' . '/' . $user.'.private.key';
-
+
+ $path = '/' . $user . '/' . 'files_encryption' . '/' . $user . '.private.key';
+
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
$key = $view->file_get_contents( $path );
-
+
+ \OC_FileProxy::$enabled = $proxyStatus;
+
return $key;
}
@@ -51,101 +59,150 @@ class Keymanager {
* @return string public key or false
*/
public static function getPublicKey( \OC_FilesystemView $view, $userId ) {
-
- return $view->file_get_contents( '/public-keys/' . '/' . $userId . '.public.key' );
-
+
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
+ $result = $view->file_get_contents( '/public-keys/' . $userId . '.public.key' );
+
+ \OC_FileProxy::$enabled = $proxyStatus;
+
+ return $result;
+
}
-
+
/**
- * @brief retrieve both keys from a user (private and public)
+ * @brief Retrieve a user's public and private key
* @param \OC_FilesystemView $view
* @param $userId
* @return array keys: privateKey, publicKey
*/
public static function getUserKeys( \OC_FilesystemView $view, $userId ) {
-
+
return array(
'publicKey' => self::getPublicKey( $view, $userId )
- , 'privateKey' => self::getPrivateKey( $view, $userId )
+ , 'privateKey' => self::getPrivateKey( $view, $userId )
);
-
+
}
-
+
/**
- * @brief Retrieve public keys of all users with access to a file
- * @param string $path Path to file
- * @return array of public keys for the given file
- * @note Checks that the sharing app is enabled should be performed
- * by client code, that isn't checked here
+ * @brief Retrieve public keys for given users
+ * @param \OC_FilesystemView $view
+ * @param array $userIds
+ * @return array of public keys for the specified users
*/
- public static function getPublicKeys( \OC_FilesystemView $view, $userId, $filePath ) {
-
- $path = ltrim( $path, '/' );
-
- $filepath = '/' . $userId . '/files/' . $filePath;
-
- // Check if sharing is enabled
- if ( OC_App::isEnabled( 'files_sharing' ) ) {
-
-
-
- } else {
-
- // check if it is a file owned by the user and not shared at all
- $userview = new \OC_FilesystemView( '/'.$userId.'/files/' );
-
- if ( $userview->file_exists( $path ) ) {
-
- $users[] = $userId;
-
- }
-
- }
-
- $view = new \OC_FilesystemView( '/public-keys/' );
-
- $keylist = array();
-
- $count = 0;
-
- foreach ( $users as $user ) {
-
- $keylist['key'.++$count] = $view->file_get_contents( $user.'.public.key' );
-
+ public static function getPublicKeys( \OC_FilesystemView $view, array $userIds ) {
+
+ $keys = array();
+
+ foreach ( $userIds as $userId ) {
+
+ $keys[$userId] = self::getPublicKey( $view, $userId );
+
}
-
- return $keylist;
-
+
+ return $keys;
+
}
-
+
/**
* @brief store file encryption key
*
+ * @param \OC_FilesystemView $view
* @param string $path relative path of the file, including filename
- * @param string $key
+ * @param $userId
+ * @param $catfile
+ * @internal param string $key
* @return bool true/false
- * @note The keyfile is not encrypted here. Client code must
+ * @note The keyfile is not encrypted here. Client code must
* asymmetrically encrypt the keyfile before passing it to this method
*/
public static function setFileKey( \OC_FilesystemView $view, $path, $userId, $catfile ) {
-
- $basePath = '/' . $userId . '/files_encryption/keyfiles';
-
- $targetPath = self::keySetPreparation( $view, $path, $basePath, $userId );
-
- if ( $view->is_dir( $basePath . '/' . $targetPath ) ) {
-
-
-
+
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
+ //here we need the currently logged in user, while userId can be a different user
+ $util = new Util( $view, \OCP\User::getUser() );
+ list( $owner, $filename ) = $util->getUidAndFilename( $path );
+
+ $basePath = '/' . $owner . '/files_encryption/keyfiles';
+
+ $targetPath = self::keySetPreparation( $view, $filename, $basePath, $owner );
+
+ if ( !$view->is_dir( $basePath . '/' . $targetPath ) ) {
+
+ // create all parent folders
+ $info = pathinfo( $basePath . '/' . $targetPath );
+ $keyfileFolderName = $view->getLocalFolder( $info['dirname'] );
+
+ if ( !file_exists( $keyfileFolderName ) ) {
+
+ mkdir( $keyfileFolderName, 0750, true );
+
+ }
+ }
+
+ // try reusing key file if part file
+ if ( self::isPartialFilePath( $targetPath ) ) {
+
+ $result = $view->file_put_contents( $basePath . '/' . self::fixPartialFilePath( $targetPath ) . '.key', $catfile );
+
} else {
- // Save the keyfile in parallel directory
- return $view->file_put_contents( $basePath . '/' . $targetPath . '.key', $catfile );
-
+ $result = $view->file_put_contents( $basePath . '/' . $targetPath . '.key', $catfile );
+
}
-
+
+ \OC_FileProxy::$enabled = $proxyStatus;
+
+ return $result;
+
}
-
+
+ /**
+ * @brief Remove .path extension from a file path
+ * @param string $path Path that may identify a .part file
+ * @return string File path without .part extension
+ * @note this is needed for reusing keys
+ */
+ public static function fixPartialFilePath( $path ) {
+
+ if ( preg_match( '/\.part$/', $path ) ) {
+
+ $newLength = strlen( $path ) - 5;
+ $fPath = substr( $path, 0, $newLength );
+
+ return $fPath;
+
+ } else {
+
+ return $path;
+
+ }
+
+ }
+
+ /**
+ * @brief Check if a path is a .part file
+ * @param string $path Path that may identify a .part file
+ * @return bool
+ */
+ public static function isPartialFilePath( $path ) {
+
+ if ( preg_match( '/\.part$/', $path ) ) {
+
+ return true;
+
+ } else {
+
+ return false;
+
+ }
+
+ }
+
/**
* @brief retrieve keyfile for an encrypted file
* @param \OC_FilesystemView $view
@@ -157,27 +214,50 @@ class Keymanager {
* of the keyfile must be performed by client code
*/
public static function getFileKey( \OC_FilesystemView $view, $userId, $filePath ) {
-
- $filePath_f = ltrim( $filePath, '/' );
-
- $catfilePath = '/' . $userId . '/files_encryption/keyfiles/' . $filePath_f . '.key';
-
- if ( $view->file_exists( $catfilePath ) ) {
-
- return $view->file_get_contents( $catfilePath );
-
+
+ // try reusing key file if part file
+ if ( self::isPartialFilePath( $filePath ) ) {
+
+ $result = self::getFileKey( $view, $userId, self::fixPartialFilePath( $filePath ) );
+
+ if ( $result ) {
+
+ return $result;
+
+ }
+
+ }
+
+ $util = new Util( $view, \OCP\User::getUser() );
+
+ list( $owner, $filename ) = $util->getUidAndFilename( $filePath );
+ $filePath_f = ltrim( $filename, '/' );
+
+ $keyfilePath = '/' . $owner . '/files_encryption/keyfiles/' . $filePath_f . '.key';
+
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
+ if ( $view->file_exists( $keyfilePath ) ) {
+
+ $result = $view->file_get_contents( $keyfilePath );
+
} else {
-
- return false;
-
+
+ $result = false;
+
}
-
+
+ \OC_FileProxy::$enabled = $proxyStatus;
+
+ return $result;
+
}
-
+
/**
* @brief Delete a keyfile
*
- * @param OC_FilesystemView $view
+ * @param \OC_FilesystemView $view
* @param string $userId username
* @param string $path path of the file the key belongs to
* @return bool Outcome of unlink operation
@@ -185,139 +265,299 @@ class Keymanager {
* /data/admin/files/mydoc.txt
*/
public static function deleteFileKey( \OC_FilesystemView $view, $userId, $path ) {
-
+
$trimmed = ltrim( $path, '/' );
- $keyPath = '/' . $userId . '/files_encryption/keyfiles/' . $trimmed . '.key';
-
- // Unlink doesn't tell us if file was deleted (not found returns
- // true), so we perform our own test
- if ( $view->file_exists( $keyPath ) ) {
-
- return $view->unlink( $keyPath );
-
- } else {
-
+ $keyPath = '/' . $userId . '/files_encryption/keyfiles/' . $trimmed;
+
+ $result = false;
+
+ if ( $view->is_dir( $keyPath ) ) {
+
+ $result = $view->unlink( $keyPath );
+
+ } else if ( $view->file_exists( $keyPath . '.key' ) ) {
+
+ $result = $view->unlink( $keyPath . '.key' );
+
+ }
+
+ if ( !$result ) {
+
\OC_Log::write( 'Encryption library', 'Could not delete keyfile; does not exist: "' . $keyPath, \OC_Log::ERROR );
-
- return false;
-
+
}
-
+
+ return $result;
+
}
-
+
/**
* @brief store private key from the user
- * @param string key
+ * @param string $key
* @return bool
* @note Encryption of the private key must be performed by client code
* as no encryption takes place here
*/
public static function setPrivateKey( $key ) {
-
+
$user = \OCP\User::getUser();
-
+
$view = new \OC_FilesystemView( '/' . $user . '/files_encryption' );
-
+
+ $proxyStatus = \OC_FileProxy::$enabled;
\OC_FileProxy::$enabled = false;
-
+
if ( !$view->file_exists( '' ) )
$view->mkdir( '' );
-
- return $view->file_put_contents( $user . '.private.key', $key );
+
+ $result = $view->file_put_contents( $user . '.private.key', $key );
+
+ \OC_FileProxy::$enabled = $proxyStatus;
+
+ return $result;
}
-
+
/**
- * @brief store private keys from the user
+ * @brief store share key
*
- * @param string privatekey
- * @param string publickey
+ * @param \OC_FilesystemView $view
+ * @param string $path relative path of the file, including filename
+ * @param $userId
+ * @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 setUserKeys($privatekey, $publickey) {
-
- return ( self::setPrivateKey( $privatekey ) && self::setPublicKey( $publickey ) );
-
+ 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';
+
+ }
+
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
+ $result = $view->file_put_contents( $writePath, $shareKey );
+
+ \OC_FileProxy::$enabled = $proxyStatus;
+
+ if (
+ is_int( $result )
+ && $result > 0
+ ) {
+
+ return true;
+
+ } else {
+
+ return false;
+
+ }
+
}
-
+
/**
- * @brief store public key of the user
- *
- * @param string key
- * @return bool true/false
+ * @brief store multiple share keys for a single file
+ * @param \OC_FilesystemView $view
+ * @param $path
+ * @param array $shareKeys
+ * @return bool
+ */
+ public static function setShareKeys( \OC_FilesystemView $view, $path, array $shareKeys ) {
+
+ // $shareKeys must be an array with the following format:
+ // [userId] => [encrypted key]
+
+ $result = true;
+
+ foreach ( $shareKeys as $userId => $shareKey ) {
+
+ if ( !self::setShareKey( $view, $path, $userId, $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;
+
+ }
+
+ /**
+ * @brief retrieve shareKey for an encrypted file
+ * @param \OC_FilesystemView $view
+ * @param string $userId
+ * @param string $filePath
+ * @internal param \OCA\Encryption\file $string name
+ * @return string file key or false
+ * @note The sharekey returned is encrypted. Decryption
+ * of the keyfile must be performed by client code
*/
- public static function setPublicKey( $key ) {
-
- $view = new \OC_FilesystemView( '/public-keys' );
-
+ public static function getShareKey( \OC_FilesystemView $view, $userId, $filePath ) {
+
+ // try reusing key file if part file
+ if ( self::isPartialFilePath( $filePath ) ) {
+
+ $result = self::getShareKey( $view, $userId, self::fixPartialFilePath( $filePath ) );
+
+ if ( $result ) {
+
+ return $result;
+
+ }
+
+ }
+
+ $proxyStatus = \OC_FileProxy::$enabled;
\OC_FileProxy::$enabled = false;
-
- if ( !$view->file_exists( '' ) )
- $view->mkdir( '' );
-
- return $view->file_put_contents( \OCP\User::getUser() . '.public.key', $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( $filePath );
+ $shareKeyPath = \OC\Files\Filesystem::normalizePath( '/' . $owner . '/files_encryption/share-keys/' . $filename . '.' . $userId . '.shareKey' );
+
+ if ( $view->file_exists( $shareKeyPath ) ) {
+
+ $result = $view->file_get_contents( $shareKeyPath );
+
+ } else {
+
+ $result = false;
+
+ }
+
+ \OC_FileProxy::$enabled = $proxyStatus;
+
+ return $result;
+
}
-
+
/**
- * @brief store file encryption key
+ * @brief delete all share keys of a given file
+ * @param \OC_FilesystemView $view
+ * @param string $userId owner of the file
+ * @param string $filePath path to the file, relative to the owners file dir
+ */
+ public static function delAllShareKeys( \OC_FilesystemView $view, $userId, $filePath ) {
+
+ if ( $view->is_dir( $userId . '/files/' . $filePath ) ) {
+ $view->unlink( $userId . '/files_encryption/share-keys/' . $filePath );
+ } else {
+ $localKeyPath = $view->getLocalFile( $userId . '/files_encryption/share-keys/' . $filePath );
+ $matches = glob( preg_quote( $localKeyPath ) . '*.shareKey' );
+ foreach ( $matches as $ma ) {
+ $result = unlink( $ma );
+ if ( !$result ) {
+ \OC_Log::write( 'Encryption library', 'Keyfile or shareKey could not be deleted for file "' . $filePath . '"', \OC_Log::ERROR );
+ }
+ }
+ }
+ }
+
+ /**
+ * @brief Delete a single user's shareKey for a single file
+ */
+ public static function delShareKey( \OC_FilesystemView $view, $userIds, $filePath ) {
+
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
+ //here we need the currently logged in user, while userId can be a different user
+ $util = new Util( $view, \OCP\User::getUser() );
+
+ list( $owner, $filename ) = $util->getUidAndFilename( $filePath );
+
+ $shareKeyPath = \OC\Files\Filesystem::normalizePath( '/' . $owner . '/files_encryption/share-keys/' . $filename );
+
+ if ( $view->is_dir( $shareKeyPath ) ) {
+
+ $localPath = \OC\Files\Filesystem::normalizePath( $view->getLocalFolder( $shareKeyPath ) );
+ self::recursiveDelShareKeys( $localPath, $userIds );
+
+ } else {
+
+ foreach ( $userIds as $userId ) {
+
+ if ( !$view->unlink( $shareKeyPath . '.' . $userId . '.shareKey' ) ) {
+ \OC_Log::write( 'Encryption library', 'Could not delete shareKey; does not exist: "' . $shareKeyPath . '.' . $userId . '.shareKey"', \OC_Log::ERROR );
+ }
+
+ }
+ }
+
+ \OC_FileProxy::$enabled = $proxyStatus;
+ }
+
+ /**
+ * @brief recursively delete share keys from given users
*
- * @param string $path relative path of the file, including filename
- * @param string $key
- * @param null $view
- * @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
+ * @param string $dir directory
+ * @param array $userIds user ids for which the share keys should be deleted
*/
- public static function setShareKey( \OC_FilesystemView $view, $path, $userId, $shareKey ) {
-
- $basePath = '/' . $userId . '/files_encryption/share-keys';
-
- $shareKeyPath = self::keySetPreparation( $view, $path, $basePath, $userId );
-
- return $view->file_put_contents( $basePath . '/' . $shareKeyPath . '.shareKey', $shareKey );
-
+ private static function recursiveDelShareKeys( $dir, $userIds ) {
+ foreach ( $userIds as $userId ) {
+ $matches = glob( preg_quote( $dir ) . '/*' . preg_quote( '.' . $userId . '.shareKey' ) );
+ }
+ /** @var $matches array */
+ foreach ( $matches as $ma ) {
+ if ( !unlink( $ma ) ) {
+ \OC_Log::write( 'Encryption library', 'Could not delete shareKey; does not exist: "' . $ma . '"', \OC_Log::ERROR );
+ }
+ }
+ $subdirs = $directories = glob( preg_quote( $dir ) . '/*', GLOB_ONLYDIR );
+ foreach ( $subdirs as $subdir ) {
+ self::recursiveDelShareKeys( $subdir, $userIds );
+ }
}
-
+
/**
* @brief Make preparations to vars and filesystem for saving a keyfile
*/
public static function keySetPreparation( \OC_FilesystemView $view, $path, $basePath, $userId ) {
-
+
$targetPath = ltrim( $path, '/' );
-
+
$path_parts = pathinfo( $targetPath );
-
+
// If the file resides within a subdirectory, create it
- if (
- isset( $path_parts['dirname'] )
- && ! $view->file_exists( $basePath . '/' . $path_parts['dirname'] )
+ if (
+ isset( $path_parts['dirname'] )
+ && !$view->file_exists( $basePath . '/' . $path_parts['dirname'] )
) {
-
- $view->mkdir( $basePath . '/' . $path_parts['dirname'] );
-
+ $sub_dirs = explode( DIRECTORY_SEPARATOR, $basePath . '/' . $path_parts['dirname'] );
+ $dir = '';
+ foreach ( $sub_dirs as $sub_dir ) {
+ $dir .= '/' . $sub_dir;
+ if ( !$view->is_dir( $dir ) ) {
+ $view->mkdir( $dir );
+ }
+ }
}
-
+
return $targetPath;
-
- }
- /**
- * @brief Fetch the legacy encryption key from user files
- * @param string $login used to locate the legacy key
- * @param string $passphrase used to decrypt the legacy key
- * @return true / false
- *
- * if the key is left out, the default handler will be used
- */
- public function getLegacyKey() {
-
- $user = \OCP\User::getUser();
- $view = new \OC_FilesystemView( '/' . $user );
- return $view->file_get_contents( 'encryption.key' );
-
}
-
}
\ No newline at end of file
diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php
index 55cddf2bec81761ca0b6ccbcd27d7fbce7237219..eaaeae9b61951bccf39895bfaa7e64ba743b805b 100644
--- a/apps/files_encryption/lib/proxy.php
+++ b/apps/files_encryption/lib/proxy.php
@@ -1,41 +1,46 @@
.
-*
-*/
+ * ownCloud
+ *
+ * @author Sam Tuke, Robin Appelman
+ * @copyright 2012 Sam Tuke samtuke@owncloud.com, Robin Appelman
+ * icewind1991@gmail.com
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library. If not, see .
+ *
+ */
/**
-* @brief Encryption proxy which handles filesystem operations before and after
-* execution and encrypts, and handles keyfiles accordingly. Used for
-* webui.
-*/
+ * @brief Encryption proxy which handles filesystem operations before and after
+ * execution and encrypts, and handles keyfiles accordingly. Used for
+ * webui.
+ */
namespace OCA\Encryption;
-class Proxy extends \OC_FileProxy {
+/**
+ * Class Proxy
+ * @package OCA\Encryption
+ */
+class Proxy extends \OC_FileProxy
+{
private static $blackList = null; //mimetypes blacklisted from encryption
-
+
private static $enableEncryption = null;
-
+
/**
* Check if a file requires encryption
* @param string $path
@@ -44,346 +49,417 @@ class Proxy extends \OC_FileProxy {
* Tests if server side encryption is enabled, and file is allowed by blacklists
*/
private static function shouldEncrypt( $path ) {
-
+
if ( is_null( self::$enableEncryption ) ) {
-
- if (
- \OCP\Config::getAppValue( 'files_encryption', 'enable_encryption', 'true' ) == 'true'
- && Crypt::mode() == 'server'
+
+ if (
+ \OCP\Config::getAppValue( 'files_encryption', 'enable_encryption', 'true' ) == 'true'
+ && Crypt::mode() == 'server'
) {
-
+
self::$enableEncryption = true;
-
+
} else {
-
+
self::$enableEncryption = false;
-
+
}
-
+
}
-
+
if ( !self::$enableEncryption ) {
-
+
return false;
-
+
}
-
- if ( is_null(self::$blackList ) ) {
-
- self::$blackList = explode(',', \OCP\Config::getAppValue( 'files_encryption', 'type_blacklist', 'jpg,png,jpeg,avi,mpg,mpeg,mkv,mp3,oga,ogv,ogg' ) );
-
+
+ if ( is_null( self::$blackList ) ) {
+
+ self::$blackList = explode( ',', \OCP\Config::getAppValue( 'files_encryption', 'type_blacklist', '' ) );
+
}
-
- if ( Crypt::isCatfile( $path ) ) {
-
+
+ if ( Crypt::isCatfileContent( $path ) ) {
+
return true;
-
+
}
-
- $extension = substr( $path, strrpos( $path, '.' ) +1 );
-
+
+ $extension = substr( $path, strrpos( $path, '.' ) + 1 );
+
if ( array_search( $extension, self::$blackList ) === false ) {
-
+
return true;
-
+
}
-
+
return false;
}
-
+
+ /**
+ * @param $path
+ * @param $data
+ * @return bool
+ */
public function preFile_put_contents( $path, &$data ) {
-
+
if ( self::shouldEncrypt( $path ) ) {
-
- if ( !is_resource( $data ) ) { //stream put contents should have been converted to fopen
-
+
+ // Stream put contents should have been converted to fopen
+ if ( !is_resource( $data ) ) {
+
$userId = \OCP\USER::getUser();
-
- $rootView = new \OC_FilesystemView( '/' );
-
+ $view = new \OC_FilesystemView( '/' );
+ $util = new Util( $view, $userId );
+ $session = new Session( $view );
+ $privateKey = $session->getPrivateKey();
+ $filePath = $util->stripUserFilesPath( $path );
// Set the filesize for userland, before encrypting
$size = strlen( $data );
-
+
// Disable encryption proxy to prevent recursive calls
+ $proxyStatus = \OC_FileProxy::$enabled;
\OC_FileProxy::$enabled = false;
-
- // TODO: Check if file is shared, if so, use multiKeyEncrypt
-
- // Encrypt plain data and fetch key
- $encrypted = Crypt::keyEncryptKeyfile( $data, Keymanager::getPublicKey( $rootView, $userId ) );
-
- // Replace plain content with encrypted content by reference
- $data = $encrypted['data'];
-
- $filePath = explode( '/', $path );
-
- $filePath = array_slice( $filePath, 3 );
-
- $filePath = '/' . implode( '/', $filePath );
-
- // TODO: make keyfile dir dynamic from app config
-
- $view = new \OC_FilesystemView( '/' );
-
+
+ // Check if there is an existing key we can reuse
+ if ( $encKeyfile = Keymanager::getFileKey( $view, $userId, $filePath ) ) {
+
+ // Fetch shareKey
+ $shareKey = Keymanager::getShareKey( $view, $userId, $filePath );
+
+ // Decrypt the keyfile
+ $plainKey = Crypt::multiKeyDecrypt( $encKeyfile, $shareKey, $privateKey );
+
+ } else {
+
+ // Make a new key
+ $plainKey = Crypt::generateKey();
+
+ }
+
+ // Encrypt data
+ $encData = Crypt::symmetricEncryptFileContent( $data, $plainKey );
+
+ $sharingEnabled = \OCP\Share::isEnabled();
+
+ // if file exists try to get sharing users
+ if ( $view->file_exists( $path ) ) {
+ $uniqueUserIds = $util->getSharingUsersArray( $sharingEnabled, $filePath, $userId );
+ } else {
+ $uniqueUserIds[] = $userId;
+ }
+
+ // Fetch public keys for all users who will share the file
+ $publicKeys = Keymanager::getPublicKeys( $view, $uniqueUserIds );
+
+ // Encrypt plain keyfile to multiple sharefiles
+ $multiEncrypted = Crypt::multiKeyEncrypt( $plainKey, $publicKeys );
+
+ // Save sharekeys to user folders
+ Keymanager::setShareKeys( $view, $filePath, $multiEncrypted['keys'] );
+
+ // Set encrypted keyfile as common varname
+ $encKey = $multiEncrypted['data'];
+
// Save keyfile for newly encrypted file in parallel directory tree
- Keymanager::setFileKey( $view, $filePath, $userId, $encrypted['key'] );
-
+ Keymanager::setFileKey( $view, $filePath, $userId, $encKey );
+
+ // Replace plain content with encrypted content by reference
+ $data = $encData;
+
// Update the file cache with file info
- \OC\Files\Filesystem::putFileInfo( $path, array( 'encrypted'=>true, 'size' => $size ), '' );
-
+ \OC\Files\Filesystem::putFileInfo( $filePath, array( 'encrypted' => true, 'size' => strlen( $data ), 'unencrypted_size' => $size ), '' );
+
// Re-enable proxy - our work is done
- \OC_FileProxy::$enabled = true;
-
+ \OC_FileProxy::$enabled = $proxyStatus;
+
}
}
-
+
+ return true;
+
}
-
+
/**
* @param string $path Path of file from which has been read
* @param string $data Data that has been read from file
*/
public function postFile_get_contents( $path, $data ) {
-
- // TODO: Use dependency injection to add required args for view and user etc. to this method
+
+ $userId = \OCP\USER::getUser();
+ $view = new \OC_FilesystemView( '/' );
+ $util = new Util( $view, $userId );
+
+ $relPath = $util->stripUserFilesPath( $path );
// Disable encryption proxy to prevent recursive calls
+ $proxyStatus = \OC_FileProxy::$enabled;
\OC_FileProxy::$enabled = false;
-
+
+ // init session
+ $session = new Session( $view );
+
// If data is a catfile
- if (
- Crypt::mode() == 'server'
- && Crypt::isCatfile( $data )
+ if (
+ Crypt::mode() == 'server'
+ && Crypt::isCatfileContent( $data )
) {
-
- $split = explode( '/', $path );
-
- $filePath = array_slice( $split, 3 );
-
- $filePath = '/' . implode( '/', $filePath );
-
- //$cached = \OC\Files\Filesystem::getFileInfo( $path, '' );
-
- $view = new \OC_FilesystemView( '' );
-
- $userId = \OCP\USER::getUser();
-
- // TODO: Check if file is shared, if so, use multiKeyDecrypt
-
- $encryptedKeyfile = Keymanager::getFileKey( $view, $userId, $filePath );
-
- $session = new Session();
-
- $decrypted = Crypt::keyDecryptKeyfile( $data, $encryptedKeyfile, $session->getPrivateKey( $split[1] ) );
-
+
+ $privateKey = $session->getPrivateKey( $userId );
+
+ // Get the encrypted keyfile
+ $encKeyfile = Keymanager::getFileKey( $view, $userId, $relPath );
+
+ // Attempt to fetch the user's shareKey
+ $shareKey = Keymanager::getShareKey( $view, $userId, $relPath );
+
+ // Decrypt keyfile with shareKey
+ $plainKeyfile = Crypt::multiKeyDecrypt( $encKeyfile, $shareKey, $privateKey );
+
+ $plainData = Crypt::symmetricDecryptFileContent( $data, $plainKeyfile );
+
} elseif (
- Crypt::mode() == 'server'
- && isset( $_SESSION['legacyenckey'] )
- && Crypt::isEncryptedMeta( $path )
+ Crypt::mode() == 'server'
+ && isset( $_SESSION['legacyenckey'] )
+ && Crypt::isEncryptedMeta( $path )
) {
-
- $decrypted = Crypt::legacyDecrypt( $data, $_SESSION['legacyenckey'] );
-
+ $plainData = Crypt::legacyDecrypt( $data, $session->getLegacyKey() );
}
-
- \OC_FileProxy::$enabled = true;
-
- if ( ! isset( $decrypted ) ) {
-
- $decrypted = $data;
-
+
+ \OC_FileProxy::$enabled = $proxyStatus;
+
+ if ( !isset( $plainData ) ) {
+
+ $plainData = $data;
+
}
-
- return $decrypted;
-
+
+ return $plainData;
+
}
-
+
/**
* @brief When a file is deleted, remove its keyfile also
*/
public function preUnlink( $path ) {
-
+
+ // let the trashbin handle this
+ if ( \OCP\App::isEnabled( 'files_trashbin' ) ) {
+ return true;
+ }
+
// Disable encryption proxy to prevent recursive calls
+ $proxyStatus = \OC_FileProxy::$enabled;
\OC_FileProxy::$enabled = false;
-
+
$view = new \OC_FilesystemView( '/' );
-
+
$userId = \OCP\USER::getUser();
-
+
+ $util = new Util( $view, $userId );
+
// Format path to be relative to user files dir
- $trimmed = ltrim( $path, '/' );
- $split = explode( '/', $trimmed );
- $sliced = array_slice( $split, 2 );
- $relPath = implode( '/', $sliced );
-
- if ( $view->is_dir( $path ) ) {
-
- // Dirs must be handled separately as deleteFileKey
- // doesn't handle them
- $view->unlink( $userId . '/' . 'files_encryption' . '/' . 'keyfiles' . '/'. $relPath );
-
- } else {
-
- // Delete keyfile so it isn't orphaned
- $result = Keymanager::deleteFileKey( $view, $userId, $relPath );
-
- \OC_FileProxy::$enabled = true;
-
- return $result;
-
+ $relPath = $util->stripUserFilesPath( $path );
+
+ list( $owner, $ownerPath ) = $util->getUidAndFilename( $relPath );
+
+ // Delete keyfile & shareKey so it isn't orphaned
+ if ( !Keymanager::deleteFileKey( $view, $owner, $ownerPath ) ) {
+ \OC_Log::write( 'Encryption library', 'Keyfile or shareKey could not be deleted for file "' . $ownerPath . '"', \OC_Log::ERROR );
}
-
+
+ Keymanager::delAllShareKeys( $view, $owner, $ownerPath );
+
+ \OC_FileProxy::$enabled = $proxyStatus;
+
+ // If we don't return true then file delete will fail; better
+ // to leave orphaned keyfiles than to disallow file deletion
+ return true;
+
}
/**
- * @brief When a file is renamed, rename its keyfile also
- * @return bool Result of rename()
- * @note This is pre rather than post because using post didn't work
+ * @param $path
+ * @return bool
*/
- public function preRename( $oldPath, $newPath ) {
-
- // Disable encryption proxy to prevent recursive calls
- \OC_FileProxy::$enabled = false;
-
- $view = new \OC_FilesystemView( '/' );
-
- $userId = \OCP\USER::getUser();
-
- // Format paths to be relative to user files dir
- $oldTrimmed = ltrim( $oldPath, '/' );
- $oldSplit = explode( '/', $oldTrimmed );
- $oldSliced = array_slice( $oldSplit, 2 );
- $oldRelPath = implode( '/', $oldSliced );
- $oldKeyfilePath = $userId . '/' . 'files_encryption' . '/' . 'keyfiles' . '/' . $oldRelPath . '.key';
-
- $newTrimmed = ltrim( $newPath, '/' );
- $newSplit = explode( '/', $newTrimmed );
- $newSliced = array_slice( $newSplit, 2 );
- $newRelPath = implode( '/', $newSliced );
- $newKeyfilePath = $userId . '/' . 'files_encryption' . '/' . 'keyfiles' . '/' . $newRelPath . '.key';
-
- // Rename keyfile so it isn't orphaned
- $result = $view->rename( $oldKeyfilePath, $newKeyfilePath );
-
- \OC_FileProxy::$enabled = true;
-
- return $result;
-
+ public function postTouch( $path ) {
+ $this->handleFile( $path );
+
+ return true;
}
-
- public function postFopen( $path, &$result ){
-
+
+ /**
+ * @param $path
+ * @param $result
+ * @return resource
+ */
+ public function postFopen( $path, &$result ) {
+
if ( !$result ) {
-
+
return $result;
-
+
}
-
+
// Reformat path for use with OC_FSV
$path_split = explode( '/', $path );
- $path_f = implode( array_slice( $path_split, 3 ) );
-
+ $path_f = implode( '/', array_slice( $path_split, 3 ) );
+
+ // FIXME: handling for /userId/cache used by webdav for chunking. The cache chunks are NOT encrypted
+ if ( count($path_split) >= 2 && $path_split[2] == 'cache' ) {
+ return $result;
+ }
+
// Disable encryption proxy to prevent recursive calls
+ $proxyStatus = \OC_FileProxy::$enabled;
\OC_FileProxy::$enabled = false;
-
+
$meta = stream_get_meta_data( $result );
-
+
$view = new \OC_FilesystemView( '' );
-
- $util = new Util( $view, \OCP\USER::getUser());
-
+
+ $util = new Util( $view, \OCP\USER::getUser() );
+
// If file is already encrypted, decrypt using crypto protocol
- if (
- Crypt::mode() == 'server'
- && $util->isEncryptedPath( $path )
+ if (
+ Crypt::mode() == 'server'
+ && $util->isEncryptedPath( $path )
) {
-
+
// Close the original encrypted file
fclose( $result );
-
+
// Open the file using the crypto stream wrapper
// protocol and let it do the decryption work instead
$result = fopen( 'crypt://' . $path_f, $meta['mode'] );
-
-
- } elseif (
- self::shouldEncrypt( $path )
- and $meta ['mode'] != 'r'
- and $meta['mode'] != 'rb'
+
+ } elseif (
+ self::shouldEncrypt( $path )
+ and $meta ['mode'] != 'r'
+ and $meta['mode'] != 'rb'
) {
- // If the file is not yet encrypted, but should be
- // encrypted when it's saved (it's not read only)
-
- // NOTE: this is the case for new files saved via WebDAV
-
- if (
- $view->file_exists( $path )
- and $view->filesize( $path ) > 0
- ) {
- $x = $view->file_get_contents( $path );
-
- $tmp = tmpfile();
-
-// // Make a temporary copy of the original file
-// \OCP\Files::streamCopy( $result, $tmp );
-//
-// // Close the original stream, we'll return another one
-// fclose( $result );
-//
-// $view->file_put_contents( $path_f, $tmp );
-//
-// fclose( $tmp );
-
- }
-
- $result = fopen( 'crypt://'.$path_f, $meta['mode'] );
-
+ $result = fopen( 'crypt://' . $path_f, $meta['mode'] );
}
-
+
// Re-enable the proxy
- \OC_FileProxy::$enabled = true;
-
+ \OC_FileProxy::$enabled = $proxyStatus;
+
return $result;
-
- }
- public function postGetMimeType( $path, $mime ) {
-
- if ( Crypt::isCatfile( $path ) ) {
-
- $mime = \OCP\Files::getMimeType( 'crypt://' . $path, 'w' );
-
- }
-
- return $mime;
-
}
- public function postStat( $path, $data ) {
-
- if ( Crypt::isCatfile( $path ) ) {
-
- $cached = \OC\Files\Filesystem::getFileInfo( $path, '' );
-
- $data['size'] = $cached['size'];
-
+ /**
+ * @param $path
+ * @param $data
+ * @return array
+ */
+ public function postGetFileInfo( $path, $data ) {
+
+ // if path is a folder do nothing
+ if ( is_array( $data ) && array_key_exists( 'size', $data ) ) {
+
+ // Disable encryption proxy to prevent recursive calls
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
+ // get file size
+ $data['size'] = self::postFileSize( $path, $data['size'] );
+
+ // Re-enable the proxy
+ \OC_FileProxy::$enabled = $proxyStatus;
}
-
+
return $data;
}
+ /**
+ * @param $path
+ * @param $size
+ * @return bool
+ */
public function postFileSize( $path, $size ) {
-
- if ( Crypt::isCatfile( $path ) ) {
-
- $cached = \OC\Files\Filesystem::getFileInfo( $path, '' );
-
- return $cached['size'];
-
- } else {
-
+
+ $view = new \OC_FilesystemView( '/' );
+
+ // if path is a folder do nothing
+ if ( $view->is_dir( $path ) ) {
+ return $size;
+ }
+
+ // Reformat path for use with OC_FSV
+ $path_split = explode( '/', $path );
+ $path_f = implode( '/', array_slice( $path_split, 3 ) );
+
+ // if path is empty we cannot resolve anything
+ if ( empty( $path_f ) ) {
return $size;
-
}
+
+ $fileInfo = false;
+ // get file info from database/cache if not .part file
+ if ( !Keymanager::isPartialFilePath( $path ) ) {
+ $fileInfo = $view->getFileInfo( $path );
+ }
+
+ // if file is encrypted return real file size
+ if ( is_array( $fileInfo ) && $fileInfo['encrypted'] === true ) {
+ $size = $fileInfo['unencrypted_size'];
+ } else {
+ // self healing if file was removed from file cache
+ if ( !is_array( $fileInfo ) ) {
+ $fileInfo = array();
+ }
+
+ $userId = \OCP\User::getUser();
+ $util = new Util( $view, $userId );
+ $fixSize = $util->getFileSize( $path );
+ if ( $fixSize > 0 ) {
+ $size = $fixSize;
+
+ $fileInfo['encrypted'] = true;
+ $fileInfo['unencrypted_size'] = $size;
+
+ // put file info if not .part file
+ if ( !Keymanager::isPartialFilePath( $path_f ) ) {
+ $view->putFileInfo( $path, $fileInfo );
+ }
+ }
+
+ }
+ return $size;
+ }
+
+ /**
+ * @param $path
+ */
+ public function handleFile( $path ) {
+
+ // Disable encryption proxy to prevent recursive calls
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
+ $view = new \OC_FilesystemView( '/' );
+ $session = new Session( $view );
+ $userId = \OCP\User::getUser();
+ $util = new Util( $view, $userId );
+
+ // Reformat path for use with OC_FSV
+ $path_split = explode( '/', $path );
+ $path_f = implode( '/', array_slice( $path_split, 3 ) );
+
+ // only if file is on 'files' folder fix file size and sharing
+ if ( count($path_split) >= 2 && $path_split[2] == 'files' && $util->fixFileSize( $path ) ) {
+
+ // get sharing app state
+ $sharingEnabled = \OCP\Share::isEnabled();
+
+ // get users
+ $usersSharing = $util->getSharingUsersArray( $sharingEnabled, $path_f );
+
+ // update sharing-keys
+ $util->setSharedFileKeyfiles( $session, $usersSharing, $path_f );
+ }
+
+ \OC_FileProxy::$enabled = $proxyStatus;
}
}
diff --git a/apps/files_encryption/lib/session.php b/apps/files_encryption/lib/session.php
index 769a40b359f4f7249c9fcc44353de603f66cdd63..2ddad0a15dacf188fb21575f45fb9cb3010922a4 100644
--- a/apps/files_encryption/lib/session.php
+++ b/apps/files_encryption/lib/session.php
@@ -26,78 +26,146 @@ namespace OCA\Encryption;
* Class for handling encryption related session data
*/
-class Session {
+class Session
+{
+
+ private $view;
+
+ /**
+ * @brief if session is started, check if ownCloud key pair is set up, if not create it
+ * @param \OC_FilesystemView $view
+ *
+ * @note The ownCloud key pair is used to allow public link sharing even if encryption is enabled
+ */
+ public function __construct( $view ) {
+
+ $this->view = $view;
+
+ if ( !$this->view->is_dir( 'owncloud_private_key' ) ) {
+
+ $this->view->mkdir( 'owncloud_private_key' );
+
+ }
+
+ $publicShareKeyId = \OC_Appconfig::getValue( 'files_encryption', 'publicShareKeyId' );
+
+ if ( $publicShareKeyId === null ) {
+ $publicShareKeyId = 'pubShare_' . substr( md5( time() ), 0, 8 );
+ \OC_Appconfig::setValue( 'files_encryption', 'publicShareKeyId', $publicShareKeyId );
+ }
+
+ if (
+ !$this->view->file_exists( "/public-keys/" . $publicShareKeyId . ".public.key" )
+ || !$this->view->file_exists( "/owncloud_private_key/" . $publicShareKeyId . ".private.key" )
+ ) {
+
+ $keypair = Crypt::createKeypair();
+
+ // Disable encryption proxy to prevent recursive calls
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
+ // Save public key
+
+ if ( !$view->is_dir( '/public-keys' ) ) {
+ $view->mkdir( '/public-keys' );
+ }
+
+ $this->view->file_put_contents( '/public-keys/' . $publicShareKeyId . '.public.key', $keypair['publicKey'] );
+
+ // Encrypt private key empty passphrase
+ $encryptedPrivateKey = Crypt::symmetricEncryptFileContent( $keypair['privateKey'], '' );
+
+ // Save private key
+ $this->view->file_put_contents( '/owncloud_private_key/' . $publicShareKeyId . '.private.key', $encryptedPrivateKey );
+
+ \OC_FileProxy::$enabled = $proxyStatus;
+
+ }
+
+ if ( \OCP\USER::getUser() === false ||
+ ( isset( $_GET['service'] ) && $_GET['service'] == 'files' &&
+ isset( $_GET['t'] ) )
+ ) {
+ // Disable encryption proxy to prevent recursive calls
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
+ $encryptedKey = $this->view->file_get_contents( '/owncloud_private_key/' . $publicShareKeyId . '.private.key' );
+ $privateKey = Crypt::symmetricDecryptFileContent( $encryptedKey, '' );
+ $this->setPrivateKey( $privateKey );
+
+ \OC_FileProxy::$enabled = $proxyStatus;
+ }
+ }
/**
* @brief Sets user private key to session
+ * @param string $privateKey
* @return bool
- *
*/
public function setPrivateKey( $privateKey ) {
-
+
$_SESSION['privateKey'] = $privateKey;
-
+
return true;
-
+
}
-
+
/**
* @brief Gets user private key from session
* @returns string $privateKey The user's plaintext private key
*
*/
public function getPrivateKey() {
-
- if (
+
+ if (
isset( $_SESSION['privateKey'] )
&& !empty( $_SESSION['privateKey'] )
) {
-
+
return $_SESSION['privateKey'];
-
+
} else {
-
+
return false;
-
+
}
-
+
}
-
+
/**
* @brief Sets user legacy key to session
+ * @param $legacyKey
* @return bool
- *
*/
public function setLegacyKey( $legacyKey ) {
-
- if ( $_SESSION['legacyKey'] = $legacyKey ) {
-
- return true;
-
- }
-
+
+ $_SESSION['legacyKey'] = $legacyKey;
+
+ return true;
}
-
+
/**
* @brief Gets user legacy key from session
* @returns string $legacyKey The user's plaintext legacy key
*
*/
public function getLegacyKey() {
-
- if (
+
+ if (
isset( $_SESSION['legacyKey'] )
&& !empty( $_SESSION['legacyKey'] )
) {
-
+
return $_SESSION['legacyKey'];
-
+
} else {
-
+
return false;
-
+
}
-
+
}
}
\ No newline at end of file
diff --git a/apps/files_encryption/lib/stream.php b/apps/files_encryption/lib/stream.php
index 65d7d57a05a740bd164e7476b1c3910afcd7f49f..fa9df02f085095d9100d20f7e4f8160491cb7708 100644
--- a/apps/files_encryption/lib/stream.php
+++ b/apps/files_encryption/lib/stream.php
@@ -3,7 +3,7 @@
* ownCloud
*
* @author Robin Appelman
- * @copyright 2012 Sam Tuke , 2011 Robin Appelman
+ * @copyright 2012 Sam Tuke , 2011 Robin Appelman
*
*
* This library is free software; you can redistribute it and/or
@@ -32,27 +32,29 @@ namespace OCA\Encryption;
/**
* @brief Provides 'crypt://' stream wrapper protocol.
- * @note We use a stream wrapper because it is the most secure way to handle
+ * @note We use a stream wrapper because it is the most secure way to handle
* decrypted content transfers. There is no safe way to decrypt the entire file
* somewhere on the server, so we have to encrypt and decrypt blocks on the fly.
* @note Paths used with this protocol MUST BE RELATIVE. Use URLs like:
- * crypt://filename, or crypt://subdirectory/filename, NOT
- * crypt:///home/user/owncloud/data. Otherwise keyfiles will be put in
- * [owncloud]/data/user/files_encryption/keyfiles/home/user/owncloud/data and
+ * crypt://filename, or crypt://subdirectory/filename, NOT
+ * crypt:///home/user/owncloud/data. Otherwise keyfiles will be put in
+ * [owncloud]/data/user/files_encryption/keyfiles/home/user/owncloud/data and
* will not be accessible to other methods.
- * @note Data read and written must always be 8192 bytes long, as this is the
- * buffer size used internally by PHP. The encryption process makes the input
- * data longer, and input is chunked into smaller pieces in order to result in
+ * @note Data read and written must always be 8192 bytes long, as this is the
+ * buffer size used internally by PHP. The encryption process makes the input
+ * data longer, and input is chunked into smaller pieces in order to result in
* a 8192 encrypted block size.
+ * @note When files are deleted via webdav, or when they are updated and the
+ * previous version deleted, this is handled by OC\Files\View, and thus the
+ * encryption proxies are used and keyfiles deleted.
*/
-class Stream {
+class Stream
+{
+ private $plainKey;
+ private $encKeyfiles;
- public static $sourceStreams = array();
-
- // TODO: make all below properties private again once unit testing is
- // configured correctly
- public $rawPath; // The raw path received by stream_open
- public $path_f; // The raw path formatted to include username and data dir
+ private $rawPath; // The raw path relative to the data dir
+ private $relPath; // rel path to users file dir
private $userId;
private $handle; // Resource returned by fopen
private $path;
@@ -60,117 +62,99 @@ class Stream {
private $meta = array(); // Header / meta for source stream
private $count;
private $writeCache;
- public $size;
+ private $size;
+ private $unencryptedSize;
private $publicKey;
private $keyfile;
private $encKeyfile;
private static $view; // a fsview object set to user dir
private $rootView; // a fsview object set to '/'
+ /**
+ * @param $path
+ * @param $mode
+ * @param $options
+ * @param $opened_path
+ * @return bool
+ */
public function stream_open( $path, $mode, $options, &$opened_path ) {
-
- // Get access to filesystem via filesystemview object
- if ( !self::$view ) {
-
- self::$view = new \OC_FilesystemView( $this->userId . '/' );
+ if ( !isset( $this->rootView ) ) {
+ $this->rootView = new \OC_FilesystemView( '/' );
}
-
- // Set rootview object if necessary
- if ( ! $this->rootView ) {
- $this->rootView = new \OC_FilesystemView( $this->userId . '/' );
+ $util = new Util( $this->rootView, \OCP\USER::getUser() );
- }
-
- $this->userId = \OCP\User::getUser();
-
- // Get the bare file path
- $path = str_replace( 'crypt://', '', $path );
-
- $this->rawPath = $path;
-
- $this->path_f = $this->userId . '/files/' . $path;
-
- if (
- dirname( $path ) == 'streams'
- and isset( self::$sourceStreams[basename( $path )] )
- ) {
-
- // Is this just for unit testing purposes?
-
- $this->handle = self::$sourceStreams[basename( $path )]['stream'];
+ $this->userId = $util->getUserId();
- $this->path = self::$sourceStreams[basename( $path )]['path'];
+ // Strip identifier text from path, this gives us the path relative to data//files
+ $this->relPath = \OC\Files\Filesystem::normalizePath( str_replace( 'crypt://', '', $path ) );
- $this->size = self::$sourceStreams[basename( $path )]['size'];
+ // rawPath is relative to the data directory
+ $this->rawPath = $util->getUserFilesDir() . $this->relPath;
- } else {
+ // Disable fileproxies so we can get the file size and open the source file without recursive encryption
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
- if (
- $mode == 'w'
- or $mode == 'w+'
- or $mode == 'wb'
- or $mode == 'wb+'
- ) {
+ if (
+ $mode == 'w'
+ or $mode == 'w+'
+ or $mode == 'wb'
+ or $mode == 'wb+'
+ ) {
- $this->size = 0;
+ // We're writing a new file so start write counter with 0 bytes
+ $this->size = 0;
+ $this->unencryptedSize = 0;
- } else {
-
-
-
- $this->size = self::$view->filesize( $this->path_f, $mode );
-
- //$this->size = filesize( $path );
-
- }
+ } else {
- // Disable fileproxies so we can open the source file without recursive encryption
- \OC_FileProxy::$enabled = false;
+ $this->size = $this->rootView->filesize( $this->rawPath, $mode );
+ }
- //$this->handle = fopen( $path, $mode );
-
- $this->handle = self::$view->fopen( $this->path_f, $mode );
-
- \OC_FileProxy::$enabled = true;
+ $this->handle = $this->rootView->fopen( $this->rawPath, $mode );
- if ( !is_resource( $this->handle ) ) {
+ \OC_FileProxy::$enabled = $proxyStatus;
- \OCP\Util::writeLog( 'files_encryption', 'failed to open '.$path, \OCP\Util::ERROR );
+ if ( !is_resource( $this->handle ) ) {
- }
+ \OCP\Util::writeLog( 'files_encryption', 'failed to open file "' . $this->rawPath . '"', \OCP\Util::ERROR );
- }
-
- if ( is_resource( $this->handle ) ) {
+ } else {
$this->meta = stream_get_meta_data( $this->handle );
}
+
return is_resource( $this->handle );
}
-
+
+ /**
+ * @param $offset
+ * @param int $whence
+ */
public function stream_seek( $offset, $whence = SEEK_SET ) {
-
+
$this->flush();
-
+
fseek( $this->handle, $offset, $whence );
-
- }
-
- public function stream_tell() {
- return ftell($this->handle);
+
}
-
+
+ /**
+ * @param $count
+ * @return bool|string
+ * @throws \Exception
+ */
public function stream_read( $count ) {
-
+
$this->writeCache = '';
if ( $count != 8192 ) {
-
+
// $count will always be 8192 https://bugs.php.net/bug.php?id=21641
// This makes this function a lot simpler, but will break this class if the above 'bug' gets 'fixed'
\OCP\Util::writeLog( 'files_encryption', 'PHP "bug" 21641 no longer holds, decryption system requires refactoring', \OCP\Util::FATAL );
@@ -179,107 +163,89 @@ class Stream {
}
-// $pos = ftell( $this->handle );
-//
// Get the data from the file handle
$data = fread( $this->handle, 8192 );
-
+
+ $result = '';
+
if ( strlen( $data ) ) {
-
- $this->getKey();
-
- $result = Crypt::symmetricDecryptFileContent( $data, $this->keyfile );
-
- } else {
- $result = '';
+ if ( !$this->getKey() ) {
- }
+ // Error! We don't have a key to decrypt the file with
+ throw new \Exception( 'Encryption key not found for "' . $this->rawPath . '" during attempted read via stream' );
-// $length = $this->size - $pos;
-//
-// if ( $length < 8192 ) {
-//
-// $result = substr( $result, 0, $length );
-//
-// }
+ }
+
+ // Decrypt data
+ $result = Crypt::symmetricDecryptFileContent( $data, $this->plainKey );
+
+ }
return $result;
}
-
+
/**
* @brief Encrypt and pad data ready for writing to disk
* @param string $plainData data to be encrypted
* @param string $key key to use for encryption
- * @return encrypted data on success, false on failure
+ * @return string encrypted data on success, false on failure
*/
public function preWriteEncrypt( $plainData, $key ) {
-
+
// Encrypt data to 'catfile', which includes IV
if ( $encrypted = Crypt::symmetricEncryptFileContent( $plainData, $key ) ) {
-
- return $encrypted;
-
+
+ return $encrypted;
+
} else {
-
+
return false;
-
+
}
-
+
}
-
+
/**
- * @brief Get the keyfile for the current file, generate one if necessary
- * @param bool $generate if true, a new key will be generated if none can be found
+ * @brief Fetch the plain encryption key for the file and set it as plainKey property
+ * @internal param bool $generate if true, a new key will be generated if none can be found
* @return bool true on key found and set, false on key not found and new key generated and set
*/
public function getKey() {
-
- // If a keyfile already exists for a file named identically to
- // file to be written
- if ( self::$view->file_exists( $this->userId . '/'. 'files_encryption' . '/' . 'keyfiles' . '/' . $this->rawPath . '.key' ) ) {
-
- // TODO: add error handling for when file exists but no
- // keyfile
-
- // Fetch existing keyfile
- $this->encKeyfile = Keymanager::getFileKey( $this->rootView, $this->userId, $this->rawPath );
-
- $this->getUser();
-
- $session = new Session();
-
+
+ // Check if key is already set
+ if ( isset( $this->plainKey ) && isset( $this->encKeyfile ) ) {
+
+ return true;
+
+ }
+
+ // Fetch and decrypt keyfile
+ // Fetch existing keyfile
+ $this->encKeyfile = Keymanager::getFileKey( $this->rootView, $this->userId, $this->relPath );
+
+ // If a keyfile already exists
+ if ( $this->encKeyfile ) {
+
+ $session = new Session( $this->rootView );
+
$privateKey = $session->getPrivateKey( $this->userId );
-
- $this->keyfile = Crypt::keyDecrypt( $this->encKeyfile, $privateKey );
-
+
+ $shareKey = Keymanager::getShareKey( $this->rootView, $this->userId, $this->relPath );
+
+ $this->plainKey = Crypt::multiKeyDecrypt( $this->encKeyfile, $shareKey, $privateKey );
+
return true;
-
+
} else {
-
+
return false;
-
- }
-
- }
-
- public function getuser() {
-
- // Only get the user again if it isn't already set
- if ( empty( $this->userId ) ) {
-
- // TODO: Move this user call out of here - it belongs
- // elsewhere
- $this->userId = \OCP\User::getUser();
-
+
}
-
- // TODO: Add a method for getting the user in case OCP\User::
- // getUser() doesn't work (can that scenario ever occur?)
-
+
}
-
+
/**
* @brief Handle plain data from the stream, and write it in 8192 byte blocks
* @param string $data data to be written to disk
@@ -290,98 +256,54 @@ class Stream {
* @note PHP automatically updates the file pointer after writing data to reflect it's length. There is generally no need to update the poitner manually using fseek
*/
public function stream_write( $data ) {
-
+
// Disable the file proxies so that encryption is not
// automatically attempted when the file is written to disk -
// we are handling that separately here and we don't want to
// get into an infinite loop
+ $proxyStatus = \OC_FileProxy::$enabled;
\OC_FileProxy::$enabled = false;
-
+
// Get the length of the unencrypted data that we are handling
$length = strlen( $data );
-
- // So far this round, no data has been written
- $written = 0;
-
- // Find out where we are up to in the writing of data to the
+
+ // Find out where we are up to in the writing of data to the
// file
$pointer = ftell( $this->handle );
-
- // Make sure the userId is set
- $this->getuser();
-
- // TODO: Check if file is shared, if so, use multiKeyEncrypt and
- // save shareKeys in necessary user directories
-
+
// Get / generate the keyfile for the file we're handling
// If we're writing a new file (not overwriting an existing
// one), save the newly generated keyfile
- if ( ! $this->getKey() ) {
-
- $this->keyfile = Crypt::generateKey();
-
- $this->publicKey = Keymanager::getPublicKey( $this->rootView, $this->userId );
-
- $this->encKeyfile = Crypt::keyEncrypt( $this->keyfile, $this->publicKey );
-
- $view = new \OC_FilesystemView( '/' );
- $userId = \OCP\User::getUser();
-
- // Save the new encrypted file key
- Keymanager::setFileKey( $view, $this->rawPath, $userId, $this->encKeyfile );
-
+ if ( !$this->getKey() ) {
+
+ $this->plainKey = Crypt::generateKey();
+
}
// If extra data is left over from the last round, make sure it
// is integrated into the next 6126 / 8192 block
if ( $this->writeCache ) {
-
+
// Concat writeCache to start of $data
$data = $this->writeCache . $data;
-
- // Clear the write cache, ready for resuse - it has been
+
+ // Clear the write cache, ready for reuse - it has been
// flushed and its old contents processed
$this->writeCache = '';
}
-//
-// // Make sure we always start on a block start
- if ( 0 != ( $pointer % 8192 ) ) {
- // if the current position of
- // file indicator is not aligned to a 8192 byte block, fix it
- // so that it is
-
-// fseek( $this->handle, - ( $pointer % 8192 ), SEEK_CUR );
-//
-// $pointer = ftell( $this->handle );
-//
-// $unencryptedNewBlock = fread( $this->handle, 8192 );
-//
-// fseek( $this->handle, - ( $currentPos % 8192 ), SEEK_CUR );
-//
-// $block = Crypt::symmetricDecryptFileContent( $unencryptedNewBlock, $this->keyfile );
-//
-// $x = substr( $block, 0, $currentPos % 8192 );
-//
-// $data = $x . $data;
-//
-// fseek( $this->handle, - ( $currentPos % 8192 ), SEEK_CUR );
-//
- }
-// $currentPos = ftell( $this->handle );
-
-// // While there still remains somed data to be processed & written
- while( strlen( $data ) > 0 ) {
-//
-// // Remaining length for this iteration, not of the
-// // entire file (may be greater than 8192 bytes)
-// $remainingLength = strlen( $data );
-//
-// // If data remaining to be written is less than the
-// // size of 1 6126 byte block
- if ( strlen( $data ) < 6126 ) {
-
+ // While there still remains some data to be processed & written
+ while ( strlen( $data ) > 0 ) {
+
+ // Remaining length for this iteration, not of the
+ // entire file (may be greater than 8192 bytes)
+ $remainingLength = strlen( $data );
+
+ // If data remaining to be written is less than the
+ // size of 1 6126 byte block
+ if ( $remainingLength < 6126 ) {
+
// Set writeCache to contents of $data
// The writeCache will be carried over to the
// next write round, and added to the start of
@@ -394,98 +316,164 @@ class Stream {
// Clear $data ready for next round
$data = '';
-//
+
} else {
-
+
// Read the chunk from the start of $data
$chunk = substr( $data, 0, 6126 );
-
- $encrypted = $this->preWriteEncrypt( $chunk, $this->keyfile );
-
+
+ $encrypted = $this->preWriteEncrypt( $chunk, $this->plainKey );
+
// Write the data chunk to disk. This will be
// attended to the last data chunk if the file
// being handled totals more than 6126 bytes
fwrite( $this->handle, $encrypted );
-
- $writtenLen = strlen( $encrypted );
- //fseek( $this->handle, $writtenLen, SEEK_CUR );
- // Remove the chunk we just processed from
+ // Remove the chunk we just processed from
// $data, leaving only unprocessed data in $data
// var, for handling on the next round
$data = substr( $data, 6126 );
}
-
+
}
$this->size = max( $this->size, $pointer + $length );
-
+ $this->unencryptedSize += $length;
+
+ \OC_FileProxy::$enabled = $proxyStatus;
+
return $length;
}
+ /**
+ * @param $option
+ * @param $arg1
+ * @param $arg2
+ */
public function stream_set_option( $option, $arg1, $arg2 ) {
- switch($option) {
+ $return = false;
+ switch ( $option ) {
case STREAM_OPTION_BLOCKING:
- stream_set_blocking( $this->handle, $arg1 );
+ $return = stream_set_blocking( $this->handle, $arg1 );
break;
case STREAM_OPTION_READ_TIMEOUT:
- stream_set_timeout( $this->handle, $arg1, $arg2 );
+ $return = stream_set_timeout( $this->handle, $arg1, $arg2 );
break;
case STREAM_OPTION_WRITE_BUFFER:
- stream_set_write_buffer( $this->handle, $arg1, $arg2 );
+ $return = stream_set_write_buffer( $this->handle, $arg1 );
}
+
+ return $return;
}
+ /**
+ * @return array
+ */
public function stream_stat() {
- return fstat($this->handle);
+ return fstat( $this->handle );
}
-
+
+ /**
+ * @param $mode
+ */
public function stream_lock( $mode ) {
- flock( $this->handle, $mode );
+ return flock( $this->handle, $mode );
}
-
+
+ /**
+ * @return bool
+ */
public function stream_flush() {
-
- return fflush( $this->handle );
+
+ return fflush( $this->handle );
// Not a typo: http://php.net/manual/en/function.fflush.php
-
+
}
+ /**
+ * @return bool
+ */
public function stream_eof() {
- return feof($this->handle);
+ return feof( $this->handle );
}
private function flush() {
-
+
if ( $this->writeCache ) {
-
+
// Set keyfile property for file in question
$this->getKey();
-
- $encrypted = $this->preWriteEncrypt( $this->writeCache, $this->keyfile );
-
+
+ $encrypted = $this->preWriteEncrypt( $this->writeCache, $this->plainKey );
+
fwrite( $this->handle, $encrypted );
-
+
$this->writeCache = '';
-
+
}
-
+
}
+ /**
+ * @return bool
+ */
public function stream_close() {
-
+
$this->flush();
- if (
- $this->meta['mode']!='r'
- and $this->meta['mode']!='rb'
+ if (
+ $this->meta['mode'] != 'r'
+ and $this->meta['mode'] != 'rb'
+ and $this->size > 0
) {
+ // Disable encryption proxy to prevent recursive calls
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
+ // Fetch user's public key
+ $this->publicKey = Keymanager::getPublicKey( $this->rootView, $this->userId );
+
+ // Check if OC sharing api is enabled
+ $sharingEnabled = \OCP\Share::isEnabled();
+
+ $util = new Util( $this->rootView, $this->userId );
+
+ // Get all users sharing the file includes current user
+ $uniqueUserIds = $util->getSharingUsersArray( $sharingEnabled, $this->relPath, $this->userId );
+
+ // Fetch public keys for all sharing users
+ $publicKeys = Keymanager::getPublicKeys( $this->rootView, $uniqueUserIds );
+
+ // Encrypt enc key for all sharing users
+ $this->encKeyfiles = Crypt::multiKeyEncrypt( $this->plainKey, $publicKeys );
+
+ $view = new \OC_FilesystemView( '/' );
+
+ // Save the new encrypted file key
+ Keymanager::setFileKey( $this->rootView, $this->relPath, $this->userId, $this->encKeyfiles['data'] );
+
+ // Save the sharekeys
+ Keymanager::setShareKeys( $view, $this->relPath, $this->encKeyfiles['keys'] );
+
+ // get file info
+ $fileInfo = $view->getFileInfo( $this->rawPath );
+ if ( !is_array( $fileInfo ) ) {
+ $fileInfo = array();
+ }
+
+ // Re-enable proxy - our work is done
+ \OC_FileProxy::$enabled = $proxyStatus;
- \OC\Files\Filesystem::putFileInfo( $this->path, array( 'encrypted' => true, 'size' => $this->size ), '' );
+ // set encryption data
+ $fileInfo['encrypted'] = true;
+ $fileInfo['size'] = $this->size;
+ $fileInfo['unencrypted_size'] = $this->unencryptedSize;
+ // set fileinfo
+ $view->putFileInfo( $this->rawPath, $fileInfo );
}
return fclose( $this->handle );
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index 52bc74db27a61ee0c26af4e2b2cffdca8b2df419..2980aa94e0c2d00b1e39b2a5c3654526f62e0b96 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -3,8 +3,8 @@
* ownCloud
*
* @author Sam Tuke, Frank Karlitschek
- * @copyright 2012 Sam Tuke samtuke@owncloud.com,
- * Frank Karlitschek frank@owncloud.org
+ * @copyright 2012 Sam Tuke ,
+ * Frank Karlitschek
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
@@ -21,17 +21,29 @@
*
*/
-// Todo:
+# Bugs
+# ----
+# Sharing a file to a user without encryption set up will not provide them with access but won't notify the sharer
+# Sharing all files to admin for recovery purposes still in progress
+# Possibly public links are broken (not tested since last merge of master)
+
+
+# Missing features
+# ----------------
+# Make sure user knows if large files weren't encrypted
+
+
+# Test
+# ----
+# Test that writing files works when recovery is enabled, and sharing API is disabled
+# Test trashbin support
+
+
+// Old Todo:
// - Crypt/decrypt button in the userinterface
// - Setting if crypto should be on by default
// - Add a setting "Don´t encrypt files larger than xx because of performance
// reasons"
-// - Transparent decrypt/encrypt in filesystem.php. Autodetect if a file is
-// encrypted (.encrypted extension)
-// - Don't use a password directly as encryption key. but a key which is
-// stored on the server and encrypted with the user password. -> password
-// change faster
-// - IMPORTANT! Check if the block lenght of the encrypted data stays the same
namespace OCA\Encryption;
@@ -43,56 +55,49 @@ namespace OCA\Encryption;
* unused, likely to become obsolete shortly
*/
-class Util {
-
-
+class Util
+{
+
// Web UI:
-
+
//// DONE: files created via web ui are encrypted
//// DONE: file created & encrypted via web ui are readable in web ui
//// DONE: file created & encrypted via web ui are readable via webdav
-
-
+
+
// WebDAV:
-
+
//// DONE: new data filled files added via webdav get encrypted
//// DONE: new data filled files added via webdav are readable via webdav
//// DONE: reading unencrypted files when encryption is enabled works via
//// webdav
//// DONE: files created & encrypted via web ui are readable via webdav
-
-
+
+
// Legacy support:
-
+
//// DONE: add method to check if file is encrypted using new system
//// DONE: add method to check if file is encrypted using old system
//// DONE: add method to fetch legacy key
//// DONE: add method to decrypt legacy encrypted data
-
-
+
+
// Admin UI:
-
+
//// DONE: changing user password also changes encryption passphrase
-
+
//// TODO: add support for optional recovery in case of lost passphrase / keys
//// TODO: add admin optional required long passphrase for users
- //// TODO: add UI buttons for encrypt / decrypt everything
//// TODO: implement flag system to allow user to specify encryption by folder, subfolder, etc.
-
-
- // Sharing:
-
- //// TODO: add support for encrypting to multiple public keys
- //// TODO: add support for decrypting to multiple private keys
-
-
+
+
// Integration testing:
-
+
//// TODO: test new encryption with versioning
- //// TODO: test new encryption with sharing
+ //// DONE: test new encryption with sharing
//// TODO: test new encryption with proxies
-
-
+
+
private $view; // OC_FilesystemView object for filesystem operations
private $userId; // ID of the currently logged-in user
private $pwd; // User Password
@@ -103,166 +108,303 @@ class Util {
private $shareKeysPath; // Dir containing env keys for shared files
private $publicKeyPath; // Path to user's public key
private $privateKeyPath; // Path to user's private key
+ private $publicShareKeyId;
+ private $recoveryKeyId;
+ private $isPublic;
+ /**
+ * @param \OC_FilesystemView $view
+ * @param $userId
+ * @param bool $client
+ */
public function __construct( \OC_FilesystemView $view, $userId, $client = false ) {
-
+
$this->view = $view;
$this->userId = $userId;
$this->client = $client;
- $this->userDir = '/' . $this->userId;
- $this->userFilesDir = '/' . $this->userId . '/' . 'files';
- $this->publicKeyDir = '/' . 'public-keys';
- $this->encryptionDir = '/' . $this->userId . '/' . 'files_encryption';
- $this->keyfilesPath = $this->encryptionDir . '/' . 'keyfiles';
- $this->shareKeysPath = $this->encryptionDir . '/' . 'share-keys';
- $this->publicKeyPath = $this->publicKeyDir . '/' . $this->userId . '.public.key'; // e.g. data/public-keys/admin.public.key
- $this->privateKeyPath = $this->encryptionDir . '/' . $this->userId . '.private.key'; // e.g. data/admin/admin.private.key
-
- }
-
+ $this->isPublic = false;
+
+ $this->publicShareKeyId = \OC_Appconfig::getValue( 'files_encryption', 'publicShareKeyId' );
+ $this->recoveryKeyId = \OC_Appconfig::getValue( 'files_encryption', 'recoveryKeyId' );
+
+ // if we are anonymous/public
+ if ( $this->userId === false ||
+ ( isset( $_GET['service'] ) && $_GET['service'] == 'files' &&
+ isset( $_GET['t'] ) )
+ ) {
+ $this->userId = $this->publicShareKeyId;
+
+ // only handle for files_sharing app
+ if ( $GLOBALS['app'] === 'files_sharing' ) {
+ $this->userDir = '/' . $GLOBALS['fileOwner'];
+ $this->fileFolderName = 'files';
+ $this->userFilesDir = '/' . $GLOBALS['fileOwner'] . '/' . $this->fileFolderName; // TODO: Does this need to be user configurable?
+ $this->publicKeyDir = '/' . 'public-keys';
+ $this->encryptionDir = '/' . $GLOBALS['fileOwner'] . '/' . 'files_encryption';
+ $this->keyfilesPath = $this->encryptionDir . '/' . 'keyfiles';
+ $this->shareKeysPath = $this->encryptionDir . '/' . 'share-keys';
+ $this->publicKeyPath = $this->publicKeyDir . '/' . $this->userId . '.public.key'; // e.g. data/public-keys/admin.public.key
+ $this->privateKeyPath = '/owncloud_private_key/' . $this->userId . '.private.key'; // e.g. data/admin/admin.private.key
+ $this->isPublic = true;
+ }
+
+ } else {
+ $this->userDir = '/' . $this->userId;
+ $this->fileFolderName = 'files';
+ $this->userFilesDir = '/' . $this->userId . '/' . $this->fileFolderName; // TODO: Does this need to be user configurable?
+ $this->publicKeyDir = '/' . 'public-keys';
+ $this->encryptionDir = '/' . $this->userId . '/' . 'files_encryption';
+ $this->keyfilesPath = $this->encryptionDir . '/' . 'keyfiles';
+ $this->shareKeysPath = $this->encryptionDir . '/' . 'share-keys';
+ $this->publicKeyPath = $this->publicKeyDir . '/' . $this->userId . '.public.key'; // e.g. data/public-keys/admin.public.key
+ $this->privateKeyPath = $this->encryptionDir . '/' . $this->userId . '.private.key'; // e.g. data/admin/admin.private.key
+ }
+ }
+
+ /**
+ * @return bool
+ */
public function ready() {
-
- if(
- !$this->view->file_exists( $this->encryptionDir )
- or !$this->view->file_exists( $this->keyfilesPath )
- or !$this->view->file_exists( $this->shareKeysPath )
- or !$this->view->file_exists( $this->publicKeyPath )
- or !$this->view->file_exists( $this->privateKeyPath )
+
+ if (
+ !$this->view->file_exists( $this->encryptionDir )
+ or !$this->view->file_exists( $this->keyfilesPath )
+ or !$this->view->file_exists( $this->shareKeysPath )
+ or !$this->view->file_exists( $this->publicKeyPath )
+ or !$this->view->file_exists( $this->privateKeyPath )
) {
-
+
return false;
-
+
} else {
-
+
return true;
-
+
}
-
+
}
-
- /**
- * @brief Sets up user folders and keys for serverside encryption
- * @param $passphrase passphrase to encrypt server-stored private key with
- */
+
+ /**
+ * @brief Sets up user folders and keys for serverside encryption
+ * @param string $passphrase passphrase to encrypt server-stored private key with
+ */
public function setupServerSide( $passphrase = null ) {
-
- // Create user dir
- if( !$this->view->file_exists( $this->userDir ) ) {
-
- $this->view->mkdir( $this->userDir );
-
- }
-
- // Create user files dir
- if( !$this->view->file_exists( $this->userFilesDir ) ) {
-
- $this->view->mkdir( $this->userFilesDir );
-
- }
-
- // Create shared public key directory
- if( !$this->view->file_exists( $this->publicKeyDir ) ) {
-
- $this->view->mkdir( $this->publicKeyDir );
-
- }
-
- // Create encryption app directory
- if( !$this->view->file_exists( $this->encryptionDir ) ) {
-
- $this->view->mkdir( $this->encryptionDir );
-
- }
-
- // Create mirrored keyfile directory
- if( !$this->view->file_exists( $this->keyfilesPath ) ) {
-
- $this->view->mkdir( $this->keyfilesPath );
-
- }
-
- // Create mirrored share env keys directory
- if( !$this->view->file_exists( $this->shareKeysPath ) ) {
-
- $this->view->mkdir( $this->shareKeysPath );
-
- }
-
+
+ // Set directories to check / create
+ $setUpDirs = array(
+ $this->userDir
+ , $this->userFilesDir
+ , $this->publicKeyDir
+ , $this->encryptionDir
+ , $this->keyfilesPath
+ , $this->shareKeysPath
+ );
+
+ // Check / create all necessary dirs
+ foreach ( $setUpDirs as $dirPath ) {
+
+ if ( !$this->view->file_exists( $dirPath ) ) {
+
+ $this->view->mkdir( $dirPath );
+
+ }
+
+ }
+
// Create user keypair
- if (
- ! $this->view->file_exists( $this->publicKeyPath )
- or ! $this->view->file_exists( $this->privateKeyPath )
+ // we should never override a keyfile
+ if (
+ !$this->view->file_exists( $this->publicKeyPath )
+ && !$this->view->file_exists( $this->privateKeyPath )
) {
-
+
// Generate keypair
$keypair = Crypt::createKeypair();
-
+
\OC_FileProxy::$enabled = false;
-
+
// Save public key
$this->view->file_put_contents( $this->publicKeyPath, $keypair['publicKey'] );
-
+
// Encrypt private key with user pwd as passphrase
$encryptedPrivateKey = Crypt::symmetricEncryptFileContent( $keypair['privateKey'], $passphrase );
-
+
// Save private key
$this->view->file_put_contents( $this->privateKeyPath, $encryptedPrivateKey );
-
+
\OC_FileProxy::$enabled = true;
-
+
+ } else {
+ // check if public-key exists but private-key is missing
+ if ( $this->view->file_exists( $this->publicKeyPath ) && !$this->view->file_exists( $this->privateKeyPath ) ) {
+ \OC_Log::write( 'Encryption library', 'public key exists but private key is missing for "' . $this->userId . '"', \OC_Log::FATAL );
+ return false;
+ } else if ( !$this->view->file_exists( $this->publicKeyPath ) && $this->view->file_exists( $this->privateKeyPath ) ) {
+ \OC_Log::write( 'Encryption library', 'private key exists but public key is missing for "' . $this->userId . '"', \OC_Log::FATAL );
+ return false;
+ }
+ }
+
+ // If there's no record for this user's encryption preferences
+ if ( false === $this->recoveryEnabledForUser() ) {
+
+ // create database configuration
+ $sql = 'INSERT INTO `*PREFIX*encryption` (`uid`,`mode`,`recovery_enabled`) VALUES (?,?,?)';
+ $args = array( $this->userId, 'server-side', 0 );
+ $query = \OCP\DB::prepare( $sql );
+ $query->execute( $args );
+
}
-
+
return true;
-
+
+ }
+
+ /**
+ * @return string
+ */
+ public function getPublicShareKeyId() {
+ return $this->publicShareKeyId;
+ }
+
+ /**
+ * @brief Check whether pwd recovery is enabled for a given user
+ * @return bool 1 = yes, 0 = no, false = no record
+ *
+ * @note If records are not being returned, check for a hidden space
+ * at the start of the uid in db
+ */
+ public function recoveryEnabledForUser() {
+
+ $sql = 'SELECT
+ recovery_enabled
+ FROM
+ `*PREFIX*encryption`
+ WHERE
+ uid = ?';
+
+ $args = array( $this->userId );
+
+ $query = \OCP\DB::prepare( $sql );
+
+ $result = $query->execute( $args );
+
+ $recoveryEnabled = array();
+
+ while ( $row = $result->fetchRow() ) {
+
+ $recoveryEnabled[] = $row['recovery_enabled'];
+
+ }
+
+ // If no record is found
+ if ( empty( $recoveryEnabled ) ) {
+
+ return false;
+
+ // If a record is found
+ } else {
+
+ return $recoveryEnabled[0];
+
+ }
+
+ }
+
+ /**
+ * @brief Enable / disable pwd recovery for a given user
+ * @param bool $enabled Whether to enable or disable recovery
+ * @return bool
+ */
+ public function setRecoveryForUser( $enabled ) {
+
+ $recoveryStatus = $this->recoveryEnabledForUser();
+
+ // If a record for this user already exists, update it
+ if ( false === $recoveryStatus ) {
+
+ $sql = 'INSERT INTO `*PREFIX*encryption`
+ (`uid`,`mode`,`recovery_enabled`)
+ VALUES (?,?,?)';
+
+ $args = array( $this->userId, 'server-side', $enabled );
+
+ // Create a new record instead
+ } else {
+
+ $sql = 'UPDATE
+ *PREFIX*encryption
+ SET
+ recovery_enabled = ?
+ WHERE
+ uid = ?';
+
+ $args = array( $enabled, $this->userId );
+
+ }
+
+ $query = \OCP\DB::prepare( $sql );
+
+ if ( $query->execute( $args ) ) {
+
+ return true;
+
+ } else {
+
+ return false;
+
+ }
+
}
-
+
/**
* @brief Find all files and their encryption status within a directory
* @param string $directory The path of the parent directory to search
* @return mixed false if 0 found, array on success. Keys: name, path
-
* @note $directory needs to be a path relative to OC data dir. e.g.
* /admin/files NOT /backup OR /home/www/oc/data/admin/files
*/
- public function findFiles( $directory ) {
-
+ public function findEncFiles( $directory, &$found = false ) {
+
// Disable proxy - we don't want files to be decrypted before
// we handle them
\OC_FileProxy::$enabled = false;
-
- $found = array( 'plain' => array(), 'encrypted' => array(), 'legacy' => array() );
-
- if (
- $this->view->is_dir( $directory )
- && $handle = $this->view->opendir( $directory )
+
+ if ( $found == false ) {
+ $found = array( 'plain' => array(), 'encrypted' => array(), 'legacy' => array() );
+ }
+
+ if (
+ $this->view->is_dir( $directory )
+ && $handle = $this->view->opendir( $directory )
) {
-
+
while ( false !== ( $file = readdir( $handle ) ) ) {
-
+
if (
- $file != "."
- && $file != ".."
+ $file != "."
+ && $file != ".."
) {
-
+
$filePath = $directory . '/' . $this->view->getRelativePath( '/' . $file );
$relPath = $this->stripUserFilesPath( $filePath );
-
+
// If the path is a directory, search
// its contents
- if ( $this->view->is_dir( $filePath ) ) {
-
- $this->findFiles( $filePath );
-
- // If the path is a file, determine
- // its encryption status
+ if ( $this->view->is_dir( $filePath ) ) {
+
+ $this->findEncFiles( $filePath, $found );
+
+ // If the path is a file, determine
+ // its encryption status
} elseif ( $this->view->is_file( $filePath ) ) {
-
+
// Disable proxies again, some-
// where they got re-enabled :/
\OC_FileProxy::$enabled = false;
-
+
$data = $this->view->file_get_contents( $filePath );
-
+
// If the file is encrypted
// NOTE: If the userId is
// empty or not set, file will
@@ -270,207 +412,1049 @@ class Util {
// NOTE: This is inefficient;
// scanning every file like this
// will eat server resources :(
- if (
- Keymanager::getFileKey( $this->view, $this->userId, $file )
- && Crypt::isCatfile( $data )
+ if (
+ Keymanager::getFileKey( $this->view, $this->userId, $relPath )
+ && Crypt::isCatfileContent( $data )
) {
-
+
$found['encrypted'][] = array( 'name' => $file, 'path' => $filePath );
-
- // If the file uses old
- // encryption system
- } elseif ( Crypt::isLegacyEncryptedContent( $this->view->file_get_contents( $filePath ), $relPath ) ) {
-
+
+ // If the file uses old
+ // encryption system
+ } elseif ( Crypt::isLegacyEncryptedContent( $this->tail( $filePath, 3 ), $relPath ) ) {
+
$found['legacy'][] = array( 'name' => $file, 'path' => $filePath );
-
- // If the file is not encrypted
+
+ // If the file is not encrypted
} else {
-
- $found['plain'][] = array( 'name' => $file, 'path' => $filePath );
-
+
+ $found['plain'][] = array( 'name' => $file, 'path' => $relPath );
+
}
-
+
}
-
+
}
-
+
}
-
+
\OC_FileProxy::$enabled = true;
-
+
if ( empty( $found ) ) {
-
+
return false;
-
+
} else {
-
+
return $found;
-
+
}
-
+
}
-
+
\OC_FileProxy::$enabled = true;
-
+
return false;
}
-
- /**
- * @brief Check if a given path identifies an encrypted file
- * @return true / false
- */
+
+ /**
+ * @brief Fetch the last lines of a file efficiently
+ * @note Safe to use on large files; does not read entire file to memory
+ * @note Derivative of http://tekkie.flashbit.net/php/tail-functionality-in-php
+ */
+ public function tail( $filename, $numLines ) {
+
+ \OC_FileProxy::$enabled = false;
+
+ $text = '';
+ $pos = -1;
+ $handle = $this->view->fopen( $filename, 'r' );
+
+ while ( $numLines > 0 ) {
+
+ --$pos;
+
+ if ( fseek( $handle, $pos, SEEK_END ) !== 0 ) {
+
+ rewind( $handle );
+ $numLines = 0;
+
+ } elseif ( fgetc( $handle ) === "\n" ) {
+
+ --$numLines;
+
+ }
+
+ $block_size = ( -$pos ) % 8192;
+ if ( $block_size === 0 || $numLines === 0 ) {
+
+ $text = fread( $handle, ( $block_size === 0 ? 8192 : $block_size ) ) . $text;
+
+ }
+ }
+
+ fclose( $handle );
+
+ \OC_FileProxy::$enabled = true;
+
+ return $text;
+ }
+
+ /**
+ * @brief Check if a given path identifies an encrypted file
+ * @param $path
+ * @return boolean
+ */
public function isEncryptedPath( $path ) {
-
- // Disable encryption proxy so data retreived is in its
+
+ // Disable encryption proxy so data retrieved is in its
// original form
+ $proxyStatus = \OC_FileProxy::$enabled;
\OC_FileProxy::$enabled = false;
-
- $data = $this->view->file_get_contents( $path );
-
- \OC_FileProxy::$enabled = true;
-
- return Crypt::isCatfile( $data );
-
+
+ // we only need 24 byte from the last chunk
+ $data = '';
+ $handle = $this->view->fopen( $path, 'r' );
+ if ( !fseek( $handle, -24, SEEK_END ) ) {
+ $data = fgets( $handle );
+ }
+
+ // re-enable proxy
+ \OC_FileProxy::$enabled = $proxyStatus;
+
+ return Crypt::isCatfileContent( $data );
+
+ }
+
+ /**
+ * @brief get the file size of the unencrypted file
+ * @param string $path absolute path
+ * @return bool
+ */
+ public function getFileSize( $path ) {
+
+ $result = 0;
+
+ // Disable encryption proxy to prevent recursive calls
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
+ // Reformat path for use with OC_FSV
+ $pathSplit = explode( '/', $path );
+ $pathRelative = implode( '/', array_slice( $pathSplit, 3 ) );
+
+ if ( $pathSplit[2] == 'files' && $this->view->file_exists( $path ) && $this->isEncryptedPath( $path ) ) {
+
+ // get the size from filesystem
+ $fullPath = $this->view->getLocalFile( $path );
+ $size = filesize( $fullPath );
+
+ // calculate last chunk nr
+ $lastChunkNr = floor( $size / 8192 );
+
+ // open stream
+ $stream = fopen( 'crypt://' . $pathRelative, "r" );
+
+ if ( is_resource( $stream ) ) {
+ // calculate last chunk position
+ $lastChunckPos = ( $lastChunkNr * 8192 );
+
+ // seek to end
+ fseek( $stream, $lastChunckPos );
+
+ // get the content of the last chunk
+ $lastChunkContent = fread( $stream, 8192 );
+
+ // calc the real file size with the size of the last chunk
+ $realSize = ( ( $lastChunkNr * 6126 ) + strlen( $lastChunkContent ) );
+
+ // store file size
+ $result = $realSize;
+ }
+ }
+
+ \OC_FileProxy::$enabled = $proxyStatus;
+
+ return $result;
+ }
+
+ /**
+ * @brief fix the file size of the encrypted file
+ * @param $path absolute path
+ * @return true / false if file is encrypted
+ */
+ public function fixFileSize( $path ) {
+
+ $result = false;
+
+ // Disable encryption proxy to prevent recursive calls
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
+ $realSize = $this->getFileSize( $path );
+
+ if ( $realSize > 0 ) {
+
+ $cached = $this->view->getFileInfo( $path );
+ $cached['encrypted'] = true;
+
+ // set the size
+ $cached['unencrypted_size'] = $realSize;
+
+ // put file info
+ $this->view->putFileInfo( $path, $cached );
+
+ $result = true;
+
+ }
+
+ \OC_FileProxy::$enabled = $proxyStatus;
+
+ return $result;
}
-
+
/**
* @brief Format a path to be relative to the /user/files/ directory
+ * @note e.g. turns '/admin/files/test.txt' into 'test.txt'
*/
public function stripUserFilesPath( $path ) {
-
+
$trimmed = ltrim( $path, '/' );
$split = explode( '/', $trimmed );
$sliced = array_slice( $split, 2 );
$relPath = implode( '/', $sliced );
-
+
return $relPath;
-
+
+ }
+
+ /**
+ * @param $path
+ * @return bool
+ */
+ public function isSharedPath( $path ) {
+
+ $trimmed = ltrim( $path, '/' );
+ $split = explode( '/', $trimmed );
+
+ if ( $split[2] == "Shared" ) {
+
+ return true;
+
+ } else {
+
+ return false;
+
+ }
+
}
-
+
/**
* @brief Encrypt all files in a directory
- * @param string $publicKey the public key to encrypt files with
* @param string $dirPath the directory whose files will be encrypted
+ * @param null $legacyPassphrase
+ * @param null $newPassphrase
+ * @return bool
* @note Encryption is recursive
*/
- public function encryptAll( $publicKey, $dirPath, $legacyPassphrase = null, $newPassphrase = null ) {
-
- if ( $found = $this->findFiles( $dirPath ) ) {
-
+ public function encryptAll( $dirPath, $legacyPassphrase = null, $newPassphrase = null ) {
+
+ if ( $found = $this->findEncFiles( $dirPath ) ) {
+
// Disable proxy to prevent file being encrypted twice
\OC_FileProxy::$enabled = false;
-
+
// Encrypt unencrypted files
foreach ( $found['plain'] as $plainFile ) {
-
- // Fetch data from file
- $plainData = $this->view->file_get_contents( $plainFile['path'] );
-
- // Encrypt data, generate catfile
- $encrypted = Crypt::keyEncryptKeyfile( $plainData, $publicKey );
-
- $relPath = $this->stripUserFilesPath( $plainFile['path'] );
-
- // Save keyfile
- Keymanager::setFileKey( $this->view, $relPath, $this->userId, $encrypted['key'] );
-
- // Overwrite the existing file with the encrypted one
- $this->view->file_put_contents( $plainFile['path'], $encrypted['data'] );
-
- $size = strlen( $encrypted['data'] );
-
- // Add the file to the cache
- \OC\Files\Filesystem::putFileInfo( $plainFile['path'], array( 'encrypted'=>true, 'size' => $size ), '' );
-
- }
-
- // Encrypt legacy encrypted files
- if (
- ! empty( $legacyPassphrase )
- && ! empty( $newPassphrase )
+
+ //relative to data//file
+ $relPath = $plainFile['path'];
+
+ //relative to /data
+ $rawPath = $this->userId . '/files/' . $plainFile['path'];
+
+ // Open plain file handle for binary reading
+ $plainHandle1 = $this->view->fopen( $rawPath, 'rb' );
+
+ // 2nd handle for moving plain file - view->rename() doesn't work, this is a workaround
+ $plainHandle2 = $this->view->fopen( $rawPath . '.plaintmp', 'wb' );
+
+ // Move plain file to a temporary location
+ stream_copy_to_stream( $plainHandle1, $plainHandle2 );
+
+ // Close access to original file
+ // $this->view->fclose( $plainHandle1 ); // not implemented in view{}
+ // Delete original plain file so we can rename enc file later
+ $this->view->unlink( $rawPath );
+
+ // Open enc file handle for binary writing, with same filename as original plain file
+ $encHandle = fopen( 'crypt://' . $relPath, 'wb' );
+
+ // Save data from plain stream to new encrypted file via enc stream
+ // NOTE: Stream{} will be invoked for handling
+ // the encryption, and should handle all keys
+ // and their generation etc. automatically
+ stream_copy_to_stream( $plainHandle2, $encHandle );
+
+ // get file size
+ $size = $this->view->filesize( $rawPath . '.plaintmp' );
+
+ // Delete temporary plain copy of file
+ $this->view->unlink( $rawPath . '.plaintmp' );
+
+ // Add the file to the cache
+ \OC\Files\Filesystem::putFileInfo( $plainFile['path'], array( 'encrypted' => true, 'size' => $size, 'unencrypted_size' => $size ) );
+ }
+
+ // Encrypt legacy encrypted files
+ if (
+ !empty( $legacyPassphrase )
+ && !empty( $newPassphrase )
) {
-
+
foreach ( $found['legacy'] as $legacyFile ) {
-
+
// Fetch data from file
$legacyData = $this->view->file_get_contents( $legacyFile['path'] );
-
+
+ $sharingEnabled = \OCP\Share::isEnabled();
+
+ // if file exists try to get sharing users
+ if ( $this->view->file_exists( $legacyFile['path'] ) ) {
+ $uniqueUserIds = $this->getSharingUsersArray( $sharingEnabled, $legacyFile['path'], $this->userId );
+ } else {
+ $uniqueUserIds[] = $this->userId;
+ }
+
+ // Fetch public keys for all users who will share the file
+ $publicKeys = Keymanager::getPublicKeys( $this->view, $uniqueUserIds );
+
// Recrypt data, generate catfile
- $recrypted = Crypt::legacyKeyRecryptKeyfile( $legacyData, $legacyPassphrase, $publicKey, $newPassphrase );
-
- $relPath = $this->stripUserFilesPath( $legacyFile['path'] );
-
+ $recrypted = Crypt::legacyKeyRecryptKeyfile( $legacyData, $legacyPassphrase, $publicKeys, $newPassphrase, $legacyFile['path'] );
+
+ $rawPath = $legacyFile['path'];
+ $relPath = $this->stripUserFilesPath( $rawPath );
+
// Save keyfile
- Keymanager::setFileKey( $this->view, $relPath, $this->userId, $recrypted['key'] );
-
+ Keymanager::setFileKey( $this->view, $relPath, $this->userId, $recrypted['filekey'] );
+
+ // Save sharekeys to user folders
+ Keymanager::setShareKeys( $this->view, $relPath, $recrypted['sharekeys'] );
+
// Overwrite the existing file with the encrypted one
- $this->view->file_put_contents( $legacyFile['path'], $recrypted['data'] );
-
+ $this->view->file_put_contents( $rawPath, $recrypted['data'] );
+
$size = strlen( $recrypted['data'] );
-
+
// Add the file to the cache
- \OC\Files\Filesystem::putFileInfo( $legacyFile['path'], array( 'encrypted'=>true, 'size' => $size ), '' );
-
+ \OC\Files\Filesystem::putFileInfo( $rawPath, array( 'encrypted' => true, 'size' => $size ), '' );
}
-
}
-
+
\OC_FileProxy::$enabled = true;
-
+
// If files were found, return true
return true;
-
} else {
-
+
// If no files were found, return false
return false;
-
}
-
}
-
+
/**
* @brief Return important encryption related paths
* @param string $pathName Name of the directory to return the path of
* @return string path
*/
public function getPath( $pathName ) {
-
+
switch ( $pathName ) {
-
+
case 'publicKeyDir':
-
+
return $this->publicKeyDir;
-
+
break;
-
+
case 'encryptionDir':
-
+
return $this->encryptionDir;
-
+
break;
-
+
case 'keyfilesPath':
-
+
return $this->keyfilesPath;
-
+
break;
-
+
case 'publicKeyPath':
-
+
return $this->publicKeyPath;
-
+
break;
-
+
case 'privateKeyPath':
-
+
return $this->privateKeyPath;
-
+
break;
-
}
-
+
+ return false;
+
+ }
+
+ /**
+ * @brief get path of a file.
+ * @param int $fileId id of the file
+ * @return string path of the file
+ */
+ public static function fileIdToPath( $fileId ) {
+
+ $query = \OC_DB::prepare( 'SELECT `path`'
+ . ' FROM `*PREFIX*filecache`'
+ . ' WHERE `fileid` = ?' );
+
+ $result = $query->execute( array( $fileId ) );
+
+ $row = $result->fetchRow();
+
+ return substr( $row['path'], 5 );
+
+ }
+
+ /**
+ * @brief Filter an array of UIDs to return only ones ready for sharing
+ * @param array $unfilteredUsers users to be checked for sharing readiness
+ * @return multi-dimensional array. keys: ready, unready
+ */
+ public function filterShareReadyUsers( $unfilteredUsers ) {
+
+ // This array will collect the filtered IDs
+ $readyIds = $unreadyIds = array();
+
+ // Loop through users and create array of UIDs that need new keyfiles
+ foreach ( $unfilteredUsers as $user ) {
+
+ $util = new Util( $this->view, $user );
+
+ // Check that the user is encryption capable, or is the
+ // public system user 'ownCloud' (for public shares)
+ if (
+ $user == $this->publicShareKeyId
+ or $user == $this->recoveryKeyId
+ or $util->ready()
+ ) {
+
+ // Construct array of ready UIDs for Keymanager{}
+ $readyIds[] = $user;
+
+ } else {
+
+ // Construct array of unready UIDs for Keymanager{}
+ $unreadyIds[] = $user;
+
+ // Log warning; we can't do necessary setup here
+ // because we don't have the user passphrase
+ \OC_Log::write( 'Encryption library', '"' . $user . '" is not setup for encryption', \OC_Log::WARN );
+
+ }
+
+ }
+
+ return array(
+ 'ready' => $readyIds,
+ 'unready' => $unreadyIds
+ );
+
+ }
+
+ /**
+ * @brief Decrypt a keyfile without knowing how it was encrypted
+ * @param string $filePath
+ * @param string $fileOwner
+ * @param string $privateKey
+ * @note Checks whether file was encrypted with openssl_seal or
+ * openssl_encrypt, and decrypts accrdingly
+ * @note This was used when 2 types of encryption for keyfiles was used,
+ * but now we've switched to exclusively using openssl_seal()
+ */
+ public function decryptUnknownKeyfile( $filePath, $fileOwner, $privateKey ) {
+
+ // Get the encrypted keyfile
+ // NOTE: the keyfile format depends on how it was encrypted! At
+ // this stage we don't know how it was encrypted
+ $encKeyfile = Keymanager::getFileKey( $this->view, $this->userId, $filePath );
+
+ // We need to decrypt the keyfile
+ // Has the file been shared yet?
+ if (
+ $this->userId == $fileOwner
+ && !Keymanager::getShareKey( $this->view, $this->userId, $filePath ) // NOTE: we can't use isShared() here because it's a post share hook so it always returns true
+ ) {
+
+ // The file has no shareKey, and its keyfile must be
+ // decrypted conventionally
+ $plainKeyfile = Crypt::keyDecrypt( $encKeyfile, $privateKey );
+
+
+ } else {
+
+ // The file has a shareKey and must use it for decryption
+ $shareKey = Keymanager::getShareKey( $this->view, $this->userId, $filePath );
+
+ $plainKeyfile = Crypt::multiKeyDecrypt( $encKeyfile, $shareKey, $privateKey );
+
+ }
+
+ return $plainKeyfile;
+
+ }
+
+ /**
+ * @brief Encrypt keyfile to multiple users
+ * @param Session $session
+ * @param array $users list of users which should be able to access the file
+ * @param string $filePath path of the file to be shared
+ * @return bool
+ */
+ public function setSharedFileKeyfiles( Session $session, array $users, $filePath ) {
+
+ // Make sure users are capable of sharing
+ $filteredUids = $this->filterShareReadyUsers( $users );
+
+ // If we're attempting to share to unready users
+ if ( !empty( $filteredUids['unready'] ) ) {
+
+ \OC_Log::write( 'Encryption library', 'Sharing to these user(s) failed as they are unready for encryption:"' . print_r( $filteredUids['unready'], 1 ), \OC_Log::WARN );
+
+ return false;
+
+ }
+
+ // Get public keys for each user, ready for generating sharekeys
+ $userPubKeys = Keymanager::getPublicKeys( $this->view, $filteredUids['ready'] );
+
+ // Note proxy status then disable it
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
+ // Get the current users's private key for decrypting existing keyfile
+ $privateKey = $session->getPrivateKey();
+
+ $fileOwner = \OC\Files\Filesystem::getOwner( $filePath );
+
+ // Decrypt keyfile
+ $plainKeyfile = $this->decryptUnknownKeyfile( $filePath, $fileOwner, $privateKey );
+
+ // Re-enc keyfile to (additional) sharekeys
+ $multiEncKey = Crypt::multiKeyEncrypt( $plainKeyfile, $userPubKeys );
+
+ // Save the recrypted key to it's owner's keyfiles directory
+ // Save new sharekeys to all necessary user directory
+ if (
+ !Keymanager::setFileKey( $this->view, $filePath, $fileOwner, $multiEncKey['data'] )
+ || !Keymanager::setShareKeys( $this->view, $filePath, $multiEncKey['keys'] )
+ ) {
+
+ \OC_Log::write( 'Encryption library', 'Keyfiles could not be saved for users sharing ' . $filePath, \OC_Log::ERROR );
+
+ return false;
+
+ }
+
+ // Return proxy to original status
+ \OC_FileProxy::$enabled = $proxyStatus;
+
+ return true;
+ }
+
+ /**
+ * @brief Find, sanitise and format users sharing a file
+ * @note This wraps other methods into a portable bundle
+ */
+ public function getSharingUsersArray( $sharingEnabled, $filePath, $currentUserId = false ) {
+
+ // Check if key recovery is enabled
+ if (
+ \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
+ list( $owner, $ownerPath ) = $this->getUidAndFilename( $filePath );
+
+ $userIds = array();
+ if ( $sharingEnabled ) {
+
+ // Find out who, if anyone, is sharing the file
+ $result = \OCP\Share::getUsersSharingFile( $ownerPath, $owner, true, true, true );
+ $userIds = $result['users'];
+ if ( $result['public'] ) {
+ $userIds[] = $this->publicShareKeyId;
+ }
+
+ }
+
+ // 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;
+
+ }
+
+ // Remove duplicate UIDs
+ $uniqueUserIds = array_unique( $userIds );
+
+ return $uniqueUserIds;
+
+ }
+
+ /**
+ * @brief Set file migration status for user
+ * @param $status
+ * @return bool
+ */
+ public function setMigrationStatus( $status ) {
+
+ $sql = 'UPDATE
+ *PREFIX*encryption
+ SET
+ migration_status = ?
+ WHERE
+ uid = ?';
+
+ $args = array( $status, $this->userId );
+
+ $query = \OCP\DB::prepare( $sql );
+
+ if ( $query->execute( $args ) ) {
+
+ return true;
+
+ } else {
+
+ return false;
+
+ }
+
+ }
+
+ /**
+ * @brief Check whether pwd recovery is enabled for a given user
+ * @return bool 1 = yes, 0 = no, false = no record
+ * @note If records are not being returned, check for a hidden space
+ * at the start of the uid in db
+ */
+ public function getMigrationStatus() {
+
+ $sql = 'SELECT
+ migration_status
+ FROM
+ `*PREFIX*encryption`
+ WHERE
+ uid = ?';
+
+ $args = array( $this->userId );
+
+ $query = \OCP\DB::prepare( $sql );
+
+ $result = $query->execute( $args );
+
+ $migrationStatus = array();
+
+ $row = $result->fetchRow();
+ if($row) {
+ $migrationStatus[] = $row['migration_status'];
+ }
+
+ // If no record is found
+ if ( empty( $migrationStatus ) ) {
+
+ return false;
+
+ // If a record is found
+ } else {
+
+ return $migrationStatus[0];
+
+ }
+
+ }
+
+ /**
+ * @brief get uid of the owners of the file and the path to the file
+ * @param string $path Path of the file to check
+ * @note $shareFilePath must be relative to data/UID/files. Files
+ * relative to /Shared are also acceptable
+ * @return array
+ */
+ public function getUidAndFilename( $path ) {
+
+ $view = new \OC\Files\View( $this->userFilesDir );
+ $fileOwnerUid = $view->getOwner( $path );
+
+ // handle public access
+ if ( $this->isPublic ) {
+ $filename = $path;
+ $fileOwnerUid = $GLOBALS['fileOwner'];
+
+ return array( $fileOwnerUid, $filename );
+ } else {
+
+ // Check that UID is valid
+ if ( !\OCP\User::userExists( $fileOwnerUid ) ) {
+ throw new \Exception( 'Could not find owner (UID = "' . var_export( $fileOwnerUid, 1 ) . '") of file "' . $path . '"' );
+ }
+
+ // NOTE: Bah, this dependency should be elsewhere
+ \OC\Files\Filesystem::initMountPoints( $fileOwnerUid );
+
+ // If the file owner is the currently logged in user
+ if ( $fileOwnerUid == $this->userId ) {
+
+ // Assume the path supplied is correct
+ $filename = $path;
+
+ } else {
+
+ $info = $view->getFileInfo( $path );
+ $ownerView = new \OC\Files\View( '/' . $fileOwnerUid . '/files' );
+
+ // Fetch real file path from DB
+ $filename = $ownerView->getPath( $info['fileid'] ); // TODO: Check that this returns a path without including the user data dir
+
+ }
+
+ return array( $fileOwnerUid, $filename );
+ }
+
+
+ }
+
+ /**
+ * @brief go recursively through a dir and collect all files and sub files.
+ * @param string $dir relative to the users files folder
+ * @return array with list of files relative to the users files folder
+ */
+ public function getAllFiles( $dir ) {
+
+ $result = array();
+
+ $content = $this->view->getDirectoryContent( $this->userFilesDir . $dir );
+
+ // handling for re shared folders
+ $path_split = explode( '/', $dir );
+
+ foreach ( $content as $c ) {
+
+ $sharedPart = $path_split[sizeof( $path_split ) - 1];
+ $targetPathSplit = array_reverse( explode( '/', $c['path'] ) );
+
+ $path = '';
+
+ // rebuild path
+ foreach ( $targetPathSplit as $pathPart ) {
+
+ if ( $pathPart !== $sharedPart ) {
+
+ $path = '/' . $pathPart . $path;
+
+ } else {
+
+ break;
+
+ }
+
+ }
+
+ $path = $dir . $path;
+
+ if ( $c['type'] === "dir" ) {
+
+ $result = array_merge( $result, $this->getAllFiles( $path ) );
+
+ } else {
+
+ $result[] = $path;
+
+ }
+ }
+
+ return $result;
+
+ }
+
+ /**
+ * @brief get shares parent.
+ * @param int $id of the current share
+ * @return array of the parent
+ */
+ public static function getShareParent( $id ) {
+
+ $query = \OC_DB::prepare( 'SELECT `file_target`, `item_type`'
+ . ' FROM `*PREFIX*share`'
+ . ' WHERE `id` = ?' );
+
+ $result = $query->execute( array( $id ) );
+
+ $row = $result->fetchRow();
+
+ return $row;
+
+ }
+
+ /**
+ * @brief get shares parent.
+ * @param int $id of the current share
+ * @return array of the parent
+ */
+ public static function getParentFromShare( $id ) {
+
+ $query = \OC_DB::prepare( 'SELECT `parent`'
+ . ' FROM `*PREFIX*share`'
+ . ' WHERE `id` = ?' );
+
+ $result = $query->execute( array( $id ) );
+
+ $row = $result->fetchRow();
+
+ return $row;
+
+ }
+
+ /**
+ * @brief get owner of the shared files.
+ * @param $id
+ * @internal param int $Id of a share
+ * @return string owner
+ */
+ public function getOwnerFromSharedFile( $id ) {
+
+ $query = \OC_DB::prepare( 'SELECT `parent`, `uid_owner` FROM `*PREFIX*share` WHERE `id` = ?', 1 );
+ $source = $query->execute( array( $id ) )->fetchRow();
+
+ $fileOwner = false;
+
+ if ( isset( $source['parent'] ) ) {
+
+ $parent = $source['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 = $source['uid_owner'];
+
+ }
+
+ return $fileOwner;
+
+ }
+
+ /**
+ * @return string
+ */
+ public function getUserId() {
+ return $this->userId;
+ }
+
+ /**
+ * @return string
+ */
+ public function getUserFilesDir() {
+ return $this->userFilesDir;
+ }
+
+ /**
+ * @param $password
+ * @return bool
+ */
+ public function checkRecoveryPassword( $password ) {
+
+ $pathKey = '/owncloud_private_key/' . $this->recoveryKeyId . ".private.key";
+ $pathControlData = '/control-file/controlfile.enc';
+
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
+ $recoveryKey = $this->view->file_get_contents( $pathKey );
+
+ $decryptedRecoveryKey = Crypt::symmetricDecryptFileContent( $recoveryKey, $password );
+
+ $controlData = $this->view->file_get_contents( $pathControlData );
+ $decryptedControlData = Crypt::keyDecrypt( $controlData, $decryptedRecoveryKey );
+
+ \OC_FileProxy::$enabled = $proxyStatus;
+
+ if ( $decryptedControlData === 'ownCloud' ) {
+ return true;
+ }
+
+ return false;
+ }
+
+ /**
+ * @return string
+ */
+ public function getRecoveryKeyId() {
+ return $this->recoveryKeyId;
+ }
+
+ /**
+ * @brief add recovery key to all encrypted files
+ */
+ public function addRecoveryKeys( $path = '/' ) {
+ $dirContent = $this->view->getDirectoryContent( $this->keyfilesPath . $path );
+ foreach ( $dirContent as $item ) {
+ // get relative path from files_encryption/keyfiles/
+ $filePath = substr( $item['path'], strlen('files_encryption/keyfiles') );
+ if ( $item['type'] == 'dir' ) {
+ $this->addRecoveryKeys( $filePath . '/' );
+ } else {
+ $session = new Session( new \OC_FilesystemView( '/' ) );
+ $sharingEnabled = \OCP\Share::isEnabled();
+ $file = substr( $filePath, 0, -4 );
+ $usersSharing = $this->getSharingUsersArray( $sharingEnabled, $file );
+ $this->setSharedFileKeyfiles( $session, $usersSharing, $file );
+ }
+ }
+ }
+
+ /**
+ * @brief remove recovery key to all encrypted files
+ */
+ public function removeRecoveryKeys( $path = '/' ) {
+ $dirContent = $this->view->getDirectoryContent( $this->keyfilesPath . $path );
+ foreach ( $dirContent as $item ) {
+ // get relative path from files_encryption/keyfiles
+ $filePath = substr( $item['path'], strlen('files_encryption/keyfiles') );
+ if ( $item['type'] == 'dir' ) {
+ $this->removeRecoveryKeys( $filePath . '/' );
+ } else {
+ $file = substr( $filePath, 0, -4 );
+ $this->view->unlink( $this->shareKeysPath . '/' . $file . '.' . $this->recoveryKeyId . '.shareKey' );
+ }
+ }
+ }
+
+ /**
+ * @brief decrypt given file with recovery key and encrypt it again to the owner and his new key
+ * @param string $file
+ * @param string $privateKey recovery key to decrypt the file
+ */
+ private function recoverFile( $file, $privateKey ) {
+
+ $sharingEnabled = \OCP\Share::isEnabled();
+
+ // Find out who, if anyone, is sharing the file
+ if ( $sharingEnabled ) {
+ $result = \OCP\Share::getUsersSharingFile( $file, $this->userId, true, true, true );
+ $userIds = $result['users'];
+ $userIds[] = $this->recoveryKeyId;
+ if ( $result['public'] ) {
+ $userIds[] = $this->publicShareKeyId;
+ }
+ } else {
+ $userIds = array( $this->userId, $this->recoveryKeyId );
+ }
+ $filteredUids = $this->filterShareReadyUsers( $userIds );
+
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
+ //decrypt file key
+ $encKeyfile = $this->view->file_get_contents( $this->keyfilesPath . $file . ".key" );
+ $shareKey = $this->view->file_get_contents( $this->shareKeysPath . $file . "." . $this->recoveryKeyId . ".shareKey" );
+ $plainKeyfile = Crypt::multiKeyDecrypt( $encKeyfile, $shareKey, $privateKey );
+ // encrypt file key again to all users, this time with the new public key for the recovered use
+ $userPubKeys = Keymanager::getPublicKeys( $this->view, $filteredUids['ready'] );
+ $multiEncKey = Crypt::multiKeyEncrypt( $plainKeyfile, $userPubKeys );
+
+ // write new keys to filesystem TDOO!
+ $this->view->file_put_contents( $this->keyfilesPath . $file . '.key', $multiEncKey['data'] );
+ foreach ( $multiEncKey['keys'] as $userId => $shareKey ) {
+ $shareKeyPath = $this->shareKeysPath . $file . '.' . $userId . '.shareKey';
+ $this->view->file_put_contents( $shareKeyPath, $shareKey );
+ }
+
+ // Return proxy to original status
+ \OC_FileProxy::$enabled = $proxyStatus;
+ }
+
+ /**
+ * @brief collect all files and recover them one by one
+ * @param string $path to look for files keys
+ * @param string $privateKey private recovery key which is used to decrypt the files
+ */
+ private function recoverAllFiles( $path, $privateKey ) {
+ $dirContent = $this->view->getDirectoryContent( $this->keyfilesPath . $path );
+ foreach ( $dirContent as $item ) {
+ $filePath = substr( $item['path'], 25 );
+ if ( $item['type'] == 'dir' ) {
+ $this->recoverAllFiles( $filePath . '/', $privateKey );
+ } else {
+ $file = substr( $filePath, 0, -4 );
+ $this->recoverFile( $file, $privateKey );
+ }
+ }
+ }
+
+ /**
+ * @brief recover users files in case of password lost
+ * @param string $recoveryPassword
+ */
+ public function recoverUsersFiles( $recoveryPassword ) {
+
+ // Disable encryption proxy to prevent recursive calls
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
+ $encryptedKey = $this->view->file_get_contents( '/owncloud_private_key/' . $this->recoveryKeyId . '.private.key' );
+ $privateKey = Crypt::symmetricDecryptFileContent( $encryptedKey, $recoveryPassword );
+
+ \OC_FileProxy::$enabled = $proxyStatus;
+
+ $this->recoverAllFiles( '/', $privateKey );
}
}
diff --git a/apps/files_encryption/settings-admin.php b/apps/files_encryption/settings-admin.php
new file mode 100644
index 0000000000000000000000000000000000000000..6cc5b997fdbf111a6eb33e20040a42529ce180aa
--- /dev/null
+++ b/apps/files_encryption/settings-admin.php
@@ -0,0 +1,23 @@
+
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+\OC_Util::checkAdminUser();
+
+$tmpl = new OCP\Template( 'files_encryption', 'settings-admin' );
+
+// Check if an adminRecovery account is enabled for recovering files after lost pwd
+$view = new OC_FilesystemView( '' );
+
+$recoveryAdminEnabled = OC_Appconfig::getValue( 'files_encryption', 'recoveryAdminEnabled' );
+
+$tmpl->assign( 'recoveryEnabled', $recoveryAdminEnabled );
+
+\OCP\Util::addscript( 'files_encryption', 'settings-admin' );
+\OCP\Util::addscript( 'core', 'multiselect' );
+
+return $tmpl->fetchPage();
diff --git a/apps/files_encryption/settings-personal.php b/apps/files_encryption/settings-personal.php
index af0273cfdc4dc4cf1a5c31f6155ff158c8b04d5b..57f7f584523c17f129866efddff545c5e9dc184e 100644
--- a/apps/files_encryption/settings-personal.php
+++ b/apps/files_encryption/settings-personal.php
@@ -6,12 +6,23 @@
* See the COPYING-README file.
*/
+// Add CSS stylesheet
+\OC_Util::addStyle( 'files_encryption', 'settings-personal' );
+
$tmpl = new OCP\Template( 'files_encryption', 'settings-personal');
-$blackList = explode( ',', \OCP\Config::getAppValue( 'files_encryption', 'type_blacklist', 'jpg,png,jpeg,avi,mpg,mpeg,mkv,mp3,oga,ogv,ogg' ) );
+$user = \OCP\USER::getUser();
+$view = new \OC_FilesystemView( '/' );
+$util = new \OCA\Encryption\Util( $view, $user );
-$tmpl->assign( 'blacklist', $blackList );
+$recoveryAdminEnabled = OC_Appconfig::getValue( 'files_encryption', 'recoveryAdminEnabled' );
+$recoveryEnabledForUser = $util->recoveryEnabledForUser();
+
+\OCP\Util::addscript( 'files_encryption', 'settings-personal' );
+\OCP\Util::addScript( 'settings', 'personal' );
+
+$tmpl->assign( 'recoveryEnabled', $recoveryAdminEnabled );
+$tmpl->assign( 'recoveryEnabledForUser', $recoveryEnabledForUser );
return $tmpl->fetchPage();
-return null;
diff --git a/apps/files_encryption/settings.php b/apps/files_encryption/settings.php
deleted file mode 100644
index d1260f44e9f6ef98a6702f13a9fc3fd3a2a38073..0000000000000000000000000000000000000000
--- a/apps/files_encryption/settings.php
+++ /dev/null
@@ -1,21 +0,0 @@
-
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
-\OC_Util::checkAdminUser();
-
-$tmpl = new OCP\Template( 'files_encryption', 'settings' );
-
-$blackList = explode( ',', \OCP\Config::getAppValue( 'files_encryption', 'type_blacklist', 'jpg,png,jpeg,avi,mpg,mpeg,mkv,mp3,oga,ogv,ogg' ) );
-
-$tmpl->assign( 'blacklist', $blackList );
-$tmpl->assign( 'encryption_mode', \OC_Appconfig::getValue( 'files_encryption', 'mode', 'none' ) );
-
-\OCP\Util::addscript( 'files_encryption', 'settings' );
-\OCP\Util::addscript( 'core', 'multiselect' );
-
-return $tmpl->fetchPage();
diff --git a/apps/files_encryption/templates/settings-admin.php b/apps/files_encryption/templates/settings-admin.php
new file mode 100644
index 0000000000000000000000000000000000000000..18fea1845f42189f9fce958377cd5984c5e1cccb
--- /dev/null
+++ b/apps/files_encryption/templates/settings-admin.php
@@ -0,0 +1,56 @@
+
diff --git a/apps/files_encryption/templates/settings-personal.php b/apps/files_encryption/templates/settings-personal.php
index 5f0accaed5fd960c3c6a2a08b3493f483148b841..04d6e79179ea219190ced54d76f0321ca096d1d2 100644
--- a/apps/files_encryption/templates/settings-personal.php
+++ b/apps/files_encryption/templates/settings-personal.php
@@ -1,22 +1,33 @@
diff --git a/apps/files_encryption/templates/settings.php b/apps/files_encryption/templates/settings.php
deleted file mode 100644
index b873d7f5aafd8e081088de28b8ad009aabcc5a56..0000000000000000000000000000000000000000
--- a/apps/files_encryption/templates/settings.php
+++ /dev/null
@@ -1,20 +0,0 @@
-
diff --git a/apps/files_encryption/test/crypt.php b/apps/files_encryption/test/crypt.php
deleted file mode 100755
index aa87ec328211bd936b922ae7ed3b0daa45594f68..0000000000000000000000000000000000000000
--- a/apps/files_encryption/test/crypt.php
+++ /dev/null
@@ -1,667 +0,0 @@
-, and
- * Robin Appelman
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
-//require_once "PHPUnit/Framework/TestCase.php";
-require_once realpath( dirname(__FILE__).'/../../../3rdparty/Crypt_Blowfish/Blowfish.php' );
-require_once realpath( dirname(__FILE__).'/../../../lib/base.php' );
-require_once realpath( dirname(__FILE__).'/../lib/crypt.php' );
-require_once realpath( dirname(__FILE__).'/../lib/keymanager.php' );
-require_once realpath( dirname(__FILE__).'/../lib/proxy.php' );
-require_once realpath( dirname(__FILE__).'/../lib/stream.php' );
-require_once realpath( dirname(__FILE__).'/../lib/util.php' );
-require_once realpath( dirname(__FILE__).'/../appinfo/app.php' );
-
-use OCA\Encryption;
-
-// This has to go here because otherwise session errors arise, and the private
-// encryption key needs to be saved in the session
-\OC_User::login( 'admin', 'admin' );
-
-/**
- * @note It would be better to use Mockery here for mocking out the session
- * handling process, and isolate calls to session class and data from the unit
- * tests relating to them (stream etc.). However getting mockery to work and
- * overload classes whilst also using the OC autoloader is difficult due to
- * load order Pear errors.
- */
-
-class Test_Crypt extends \PHPUnit_Framework_TestCase {
-
- function setUp() {
-
- // set content for encrypting / decrypting in tests
- $this->dataLong = file_get_contents( realpath( dirname(__FILE__).'/../lib/crypt.php' ) );
- $this->dataShort = 'hats';
- $this->dataUrl = realpath( dirname(__FILE__).'/../lib/crypt.php' );
- $this->legacyData = realpath( dirname(__FILE__).'/legacy-text.txt' );
- $this->legacyEncryptedData = realpath( dirname(__FILE__).'/legacy-encrypted-text.txt' );
- $this->randomKey = Encryption\Crypt::generateKey();
-
- $keypair = Encryption\Crypt::createKeypair();
- $this->genPublicKey = $keypair['publicKey'];
- $this->genPrivateKey = $keypair['privateKey'];
-
- $this->view = new \OC_FilesystemView( '/' );
-
- \OC_User::setUserId( 'admin' );
- $this->userId = 'admin';
- $this->pass = 'admin';
-
- \OC_Filesystem::init( '/' );
- \OC_Filesystem::mount( 'OC_Filestorage_Local', array('datadir' => \OC_User::getHome($this->userId)), '/' );
-
- }
-
- function tearDown() {
-
- }
-
- function testGenerateKey() {
-
- # TODO: use more accurate (larger) string length for test confirmation
-
- $key = Encryption\Crypt::generateKey();
-
- $this->assertTrue( strlen( $key ) > 16 );
-
- }
-
- function testGenerateIv() {
-
- $iv = Encryption\Crypt::generateIv();
-
- $this->assertEquals( 16, strlen( $iv ) );
-
- return $iv;
-
- }
-
- /**
- * @depends testGenerateIv
- */
- function testConcatIv( $iv ) {
-
- $catFile = Encryption\Crypt::concatIv( $this->dataLong, $iv );
-
- // Fetch encryption metadata from end of file
- $meta = substr( $catFile, -22 );
-
- $identifier = substr( $meta, 0, 6);
-
- // Fetch IV from end of file
- $foundIv = substr( $meta, 6 );
-
- $this->assertEquals( '00iv00', $identifier );
-
- $this->assertEquals( $iv, $foundIv );
-
- // Remove IV and IV identifier text to expose encrypted content
- $data = substr( $catFile, 0, -22 );
-
- $this->assertEquals( $this->dataLong, $data );
-
- return array(
- 'iv' => $iv
- , 'catfile' => $catFile
- );
-
- }
-
- /**
- * @depends testConcatIv
- */
- function testSplitIv( $testConcatIv ) {
-
- // Split catfile into components
- $splitCatfile = Encryption\Crypt::splitIv( $testConcatIv['catfile'] );
-
- // Check that original IV and split IV match
- $this->assertEquals( $testConcatIv['iv'], $splitCatfile['iv'] );
-
- // Check that original data and split data match
- $this->assertEquals( $this->dataLong, $splitCatfile['encrypted'] );
-
- }
-
- function testAddPadding() {
-
- $padded = Encryption\Crypt::addPadding( $this->dataLong );
-
- $padding = substr( $padded, -2 );
-
- $this->assertEquals( 'xx' , $padding );
-
- return $padded;
-
- }
-
- /**
- * @depends testAddPadding
- */
- function testRemovePadding( $padded ) {
-
- $noPadding = Encryption\Crypt::RemovePadding( $padded );
-
- $this->assertEquals( $this->dataLong, $noPadding );
-
- }
-
- function testEncrypt() {
-
- $random = openssl_random_pseudo_bytes( 13 );
-
- $iv = substr( base64_encode( $random ), 0, -4 ); // i.e. E5IG033j+mRNKrht
-
- $crypted = Encryption\Crypt::encrypt( $this->dataUrl, $iv, 'hat' );
-
- $this->assertNotEquals( $this->dataUrl, $crypted );
-
- }
-
- function testDecrypt() {
-
- $random = openssl_random_pseudo_bytes( 13 );
-
- $iv = substr( base64_encode( $random ), 0, -4 ); // i.e. E5IG033j+mRNKrht
-
- $crypted = Encryption\Crypt::encrypt( $this->dataUrl, $iv, 'hat' );
-
- $decrypt = Encryption\Crypt::decrypt( $crypted, $iv, 'hat' );
-
- $this->assertEquals( $this->dataUrl, $decrypt );
-
- }
-
- function testSymmetricEncryptFileContent() {
-
- # TODO: search in keyfile for actual content as IV will ensure this test always passes
-
- $crypted = Encryption\Crypt::symmetricEncryptFileContent( $this->dataShort, 'hat' );
-
- $this->assertNotEquals( $this->dataShort, $crypted );
-
-
- $decrypt = Encryption\Crypt::symmetricDecryptFileContent( $crypted, 'hat' );
-
- $this->assertEquals( $this->dataShort, $decrypt );
-
- }
-
- // These aren't used for now
-// function testSymmetricBlockEncryptShortFileContent() {
-//
-// $crypted = Encryption\Crypt::symmetricBlockEncryptFileContent( $this->dataShort, $this->randomKey );
-//
-// $this->assertNotEquals( $this->dataShort, $crypted );
-//
-//
-// $decrypt = Encryption\Crypt::symmetricBlockDecryptFileContent( $crypted, $this->randomKey );
-//
-// $this->assertEquals( $this->dataShort, $decrypt );
-//
-// }
-//
-// function testSymmetricBlockEncryptLongFileContent() {
-//
-// $crypted = Encryption\Crypt::symmetricBlockEncryptFileContent( $this->dataLong, $this->randomKey );
-//
-// $this->assertNotEquals( $this->dataLong, $crypted );
-//
-//
-// $decrypt = Encryption\Crypt::symmetricBlockDecryptFileContent( $crypted, $this->randomKey );
-//
-// $this->assertEquals( $this->dataLong, $decrypt );
-//
-// }
-
- function testSymmetricStreamEncryptShortFileContent() {
-
- $filename = 'tmp-'.time();
-
- $cryptedFile = file_put_contents( 'crypt://' . $filename, $this->dataShort );
-
- // Test that data was successfully written
- $this->assertTrue( is_int( $cryptedFile ) );
-
-
- // Get file contents without using any wrapper to get it's actual contents on disk
- $retreivedCryptedFile = $this->view->file_get_contents( $this->userId . '/files/' . $filename );
-
- // Check that the file was encrypted before being written to disk
- $this->assertNotEquals( $this->dataShort, $retreivedCryptedFile );
-
- // Get private key
- $encryptedPrivateKey = Encryption\Keymanager::getPrivateKey( $this->view, $this->userId );
-
- $decryptedPrivateKey = Encryption\Crypt::symmetricDecryptFileContent( $encryptedPrivateKey, $this->pass );
-
-
- // Get keyfile
- $encryptedKeyfile = Encryption\Keymanager::getFileKey( $this->view, $this->userId, $filename );
-
- $decryptedKeyfile = Encryption\Crypt::keyDecrypt( $encryptedKeyfile, $decryptedPrivateKey );
-
-
- // Manually decrypt
- $manualDecrypt = Encryption\Crypt::symmetricBlockDecryptFileContent( $retreivedCryptedFile, $decryptedKeyfile );
-
- // Check that decrypted data matches
- $this->assertEquals( $this->dataShort, $manualDecrypt );
-
- }
-
- /**
- * @brief Test that data that is written by the crypto stream wrapper
- * @note Encrypted data is manually prepared and decrypted here to avoid dependency on success of stream_read
- * @note If this test fails with truncate content, check that enough array slices are being rejoined to form $e, as the crypt.php file may have gotten longer and broken the manual
- * reassembly of its data
- */
- function testSymmetricStreamEncryptLongFileContent() {
-
- // Generate a a random filename
- $filename = 'tmp-'.time();
-
- // Save long data as encrypted file using stream wrapper
- $cryptedFile = file_put_contents( 'crypt://' . $filename, $this->dataLong.$this->dataLong );
-
- // Test that data was successfully written
- $this->assertTrue( is_int( $cryptedFile ) );
-
- // Get file contents without using any wrapper to get it's actual contents on disk
- $retreivedCryptedFile = $this->view->file_get_contents( $this->userId . '/files/' . $filename );
-
-// echo "\n\n\$retreivedCryptedFile = $retreivedCryptedFile\n\n";
-
- // Check that the file was encrypted before being written to disk
- $this->assertNotEquals( $this->dataLong.$this->dataLong, $retreivedCryptedFile );
-
- // Manuallly split saved file into separate IVs and encrypted chunks
- $r = preg_split('/(00iv00.{16,18})/', $retreivedCryptedFile, NULL, PREG_SPLIT_DELIM_CAPTURE);
-
- //print_r($r);
-
- // Join IVs and their respective data chunks
- $e = array( $r[0].$r[1], $r[2].$r[3], $r[4].$r[5], $r[6].$r[7], $r[8].$r[9], $r[10].$r[11], $r[12].$r[13] );//.$r[11], $r[12].$r[13], $r[14] );
-
- //print_r($e);
-
-
- // Get private key
- $encryptedPrivateKey = Encryption\Keymanager::getPrivateKey( $this->view, $this->userId );
-
- $decryptedPrivateKey = Encryption\Crypt::symmetricDecryptFileContent( $encryptedPrivateKey, $this->pass );
-
-
- // Get keyfile
- $encryptedKeyfile = Encryption\Keymanager::getFileKey( $this->view, $this->userId, $filename );
-
- $decryptedKeyfile = Encryption\Crypt::keyDecrypt( $encryptedKeyfile, $decryptedPrivateKey );
-
-
- // Set var for reassembling decrypted content
- $decrypt = '';
-
- // Manually decrypt chunk
- foreach ($e as $e) {
-
-// echo "\n\$e = $e";
-
- $chunkDecrypt = Encryption\Crypt::symmetricDecryptFileContent( $e, $decryptedKeyfile );
-
- // Assemble decrypted chunks
- $decrypt .= $chunkDecrypt;
-
-// echo "\n\$chunkDecrypt = $chunkDecrypt";
-
- }
-
-// echo "\n\$decrypt = $decrypt";
-
- $this->assertEquals( $this->dataLong.$this->dataLong, $decrypt );
-
- // Teardown
-
- $this->view->unlink( $filename );
-
- Encryption\Keymanager::deleteFileKey( $filename );
-
- }
-
- /**
- * @brief Test that data that is read by the crypto stream wrapper
- */
- function testSymmetricStreamDecryptShortFileContent() {
-
- $filename = 'tmp-'.time();
-
- // Save long data as encrypted file using stream wrapper
- $cryptedFile = file_put_contents( 'crypt://' . $filename, $this->dataShort );
-
- // Test that data was successfully written
- $this->assertTrue( is_int( $cryptedFile ) );
-
-
- // Get file contents without using any wrapper to get it's actual contents on disk
- $retreivedCryptedFile = $this->view->file_get_contents( $this->userId . '/files/' . $filename );
-
- $decrypt = file_get_contents( 'crypt://' . $filename );
-
- $this->assertEquals( $this->dataShort, $decrypt );
-
- }
-
- function testSymmetricStreamDecryptLongFileContent() {
-
- $filename = 'tmp-'.time();
-
- // Save long data as encrypted file using stream wrapper
- $cryptedFile = file_put_contents( 'crypt://' . $filename, $this->dataLong );
-
- // Test that data was successfully written
- $this->assertTrue( is_int( $cryptedFile ) );
-
-
- // Get file contents without using any wrapper to get it's actual contents on disk
- $retreivedCryptedFile = $this->view->file_get_contents( $this->userId . '/files/' . $filename );
-
- $decrypt = file_get_contents( 'crypt://' . $filename );
-
- $this->assertEquals( $this->dataLong, $decrypt );
-
- }
-
- // Is this test still necessary?
-// function testSymmetricBlockStreamDecryptFileContent() {
-//
-// \OC_User::setUserId( 'admin' );
-//
-// // Disable encryption proxy to prevent unwanted en/decryption
-// \OC_FileProxy::$enabled = false;
-//
-// $cryptedFile = file_put_contents( 'crypt://' . '/blockEncrypt', $this->dataUrl );
-//
-// // Disable encryption proxy to prevent unwanted en/decryption
-// \OC_FileProxy::$enabled = false;
-//
-// echo "\n\n\$cryptedFile = " . $this->view->file_get_contents( '/blockEncrypt' );
-//
-// $retreivedCryptedFile = file_get_contents( 'crypt://' . '/blockEncrypt' );
-//
-// $this->assertEquals( $this->dataUrl, $retreivedCryptedFile );
-//
-// \OC_FileProxy::$enabled = false;
-//
-// }
-
- function testSymmetricEncryptFileContentKeyfile() {
-
- # TODO: search in keyfile for actual content as IV will ensure this test always passes
-
- $crypted = Encryption\Crypt::symmetricEncryptFileContentKeyfile( $this->dataUrl );
-
- $this->assertNotEquals( $this->dataUrl, $crypted['encrypted'] );
-
-
- $decrypt = Encryption\Crypt::symmetricDecryptFileContent( $crypted['encrypted'], $crypted['key'] );
-
- $this->assertEquals( $this->dataUrl, $decrypt );
-
- }
-
- function testIsEncryptedContent() {
-
- $this->assertFalse( Encryption\Crypt::isCatfile( $this->dataUrl ) );
-
- $this->assertFalse( Encryption\Crypt::isCatfile( $this->legacyEncryptedData ) );
-
- $keyfileContent = Encryption\Crypt::symmetricEncryptFileContent( $this->dataUrl, 'hat' );
-
- $this->assertTrue( Encryption\Crypt::isCatfile( $keyfileContent ) );
-
- }
-
- function testMultiKeyEncrypt() {
-
- # TODO: search in keyfile for actual content as IV will ensure this test always passes
-
- $pair1 = Encryption\Crypt::createKeypair();
-
- $this->assertEquals( 2, count( $pair1 ) );
-
- $this->assertTrue( strlen( $pair1['publicKey'] ) > 1 );
-
- $this->assertTrue( strlen( $pair1['privateKey'] ) > 1 );
-
-
- $crypted = Encryption\Crypt::multiKeyEncrypt( $this->dataUrl, array( $pair1['publicKey'] ) );
-
- $this->assertNotEquals( $this->dataUrl, $crypted['encrypted'] );
-
-
- $decrypt = Encryption\Crypt::multiKeyDecrypt( $crypted['encrypted'], $crypted['keys'][0], $pair1['privateKey'] );
-
- $this->assertEquals( $this->dataUrl, $decrypt );
-
- }
-
- function testKeyEncrypt() {
-
- // Generate keypair
- $pair1 = Encryption\Crypt::createKeypair();
-
- // Encrypt data
- $crypted = Encryption\Crypt::keyEncrypt( $this->dataUrl, $pair1['publicKey'] );
-
- $this->assertNotEquals( $this->dataUrl, $crypted );
-
- // Decrypt data
- $decrypt = Encryption\Crypt::keyDecrypt( $crypted, $pair1['privateKey'] );
-
- $this->assertEquals( $this->dataUrl, $decrypt );
-
- }
-
- // What is the point of this test? It doesn't use keyEncryptKeyfile()
- function testKeyEncryptKeyfile() {
-
- # TODO: Don't repeat encryption from previous tests, use PHPUnit test interdependency instead
-
- // Generate keypair
- $pair1 = Encryption\Crypt::createKeypair();
-
- // Encrypt plain data, generate keyfile & encrypted file
- $cryptedData = Encryption\Crypt::symmetricEncryptFileContentKeyfile( $this->dataUrl );
-
- // Encrypt keyfile
- $cryptedKey = Encryption\Crypt::keyEncrypt( $cryptedData['key'], $pair1['publicKey'] );
-
- // Decrypt keyfile
- $decryptKey = Encryption\Crypt::keyDecrypt( $cryptedKey, $pair1['privateKey'] );
-
- // Decrypt encrypted file
- $decryptData = Encryption\Crypt::symmetricDecryptFileContent( $cryptedData['encrypted'], $decryptKey );
-
- $this->assertEquals( $this->dataUrl, $decryptData );
-
- }
-
- /**
- * @brief test functionality of keyEncryptKeyfile() and
- * keyDecryptKeyfile()
- */
- function testKeyDecryptKeyfile() {
-
- $encrypted = Encryption\Crypt::keyEncryptKeyfile( $this->dataShort, $this->genPublicKey );
-
- $this->assertNotEquals( $encrypted['data'], $this->dataShort );
-
- $decrypted = Encryption\Crypt::keyDecryptKeyfile( $encrypted['data'], $encrypted['key'], $this->genPrivateKey );
-
- $this->assertEquals( $decrypted, $this->dataShort );
-
- }
-
-
- /**
- * @brief test encryption using legacy blowfish method
- */
- function testLegacyEncryptShort() {
-
- $crypted = Encryption\Crypt::legacyEncrypt( $this->dataShort, $this->pass );
-
- $this->assertNotEquals( $this->dataShort, $crypted );
-
- # TODO: search inencrypted text for actual content to ensure it
- # genuine transformation
-
- return $crypted;
-
- }
-
- /**
- * @brief test decryption using legacy blowfish method
- * @depends testLegacyEncryptShort
- */
- function testLegacyDecryptShort( $crypted ) {
-
- $decrypted = Encryption\Crypt::legacyDecrypt( $crypted, $this->pass );
-
- $this->assertEquals( $this->dataShort, $decrypted );
-
- }
-
- /**
- * @brief test encryption using legacy blowfish method
- */
- function testLegacyEncryptLong() {
-
- $crypted = Encryption\Crypt::legacyEncrypt( $this->dataLong, $this->pass );
-
- $this->assertNotEquals( $this->dataLong, $crypted );
-
- # TODO: search inencrypted text for actual content to ensure it
- # genuine transformation
-
- return $crypted;
-
- }
-
- /**
- * @brief test decryption using legacy blowfish method
- * @depends testLegacyEncryptLong
- */
- function testLegacyDecryptLong( $crypted ) {
-
- $decrypted = Encryption\Crypt::legacyDecrypt( $crypted, $this->pass );
-
- $this->assertEquals( $this->dataLong, $decrypted );
-
- }
-
- /**
- * @brief test generation of legacy encryption key
- * @depends testLegacyDecryptShort
- */
- function testLegacyCreateKey() {
-
- // Create encrypted key
- $encKey = Encryption\Crypt::legacyCreateKey( $this->pass );
-
- // Decrypt key
- $key = Encryption\Crypt::legacyDecrypt( $encKey, $this->pass );
-
- $this->assertTrue( is_numeric( $key ) );
-
- // Check that key is correct length
- $this->assertEquals( 20, strlen( $key ) );
-
- }
-
- /**
- * @brief test decryption using legacy blowfish method
- * @depends testLegacyEncryptLong
- */
- function testLegacyKeyRecryptKeyfileEncrypt( $crypted ) {
-
- $recrypted = Encryption\Crypt::LegacyKeyRecryptKeyfile( $crypted, $this->pass, $this->genPublicKey, $this->pass );
-
- $this->assertNotEquals( $this->dataLong, $recrypted['data'] );
-
- return $recrypted;
-
- # TODO: search inencrypted text for actual content to ensure it
- # genuine transformation
-
- }
-
-// function testEncryption(){
-//
-// $key=uniqid();
-// $file=OC::$SERVERROOT.'/3rdparty/MDB2.php';
-// $source=file_get_contents($file); //nice large text file
-// $encrypted=OC_Encryption\Crypt::encrypt($source,$key);
-// $decrypted=OC_Encryption\Crypt::decrypt($encrypted,$key);
-// $decrypted=rtrim($decrypted, "\0");
-// $this->assertNotEquals($encrypted,$source);
-// $this->assertEquals($decrypted,$source);
-//
-// $chunk=substr($source,0,8192);
-// $encrypted=OC_Encryption\Crypt::encrypt($chunk,$key);
-// $this->assertEquals(strlen($chunk),strlen($encrypted));
-// $decrypted=OC_Encryption\Crypt::decrypt($encrypted,$key);
-// $decrypted=rtrim($decrypted, "\0");
-// $this->assertEquals($decrypted,$chunk);
-//
-// $encrypted=OC_Encryption\Crypt::blockEncrypt($source,$key);
-// $decrypted=OC_Encryption\Crypt::blockDecrypt($encrypted,$key);
-// $this->assertNotEquals($encrypted,$source);
-// $this->assertEquals($decrypted,$source);
-//
-// $tmpFileEncrypted=OCP\Files::tmpFile();
-// OC_Encryption\Crypt::encryptfile($file,$tmpFileEncrypted,$key);
-// $encrypted=file_get_contents($tmpFileEncrypted);
-// $decrypted=OC_Encryption\Crypt::blockDecrypt($encrypted,$key);
-// $this->assertNotEquals($encrypted,$source);
-// $this->assertEquals($decrypted,$source);
-//
-// $tmpFileDecrypted=OCP\Files::tmpFile();
-// OC_Encryption\Crypt::decryptfile($tmpFileEncrypted,$tmpFileDecrypted,$key);
-// $decrypted=file_get_contents($tmpFileDecrypted);
-// $this->assertEquals($decrypted,$source);
-//
-// $file=OC::$SERVERROOT.'/core/img/weather-clear.png';
-// $source=file_get_contents($file); //binary file
-// $encrypted=OC_Encryption\Crypt::encrypt($source,$key);
-// $decrypted=OC_Encryption\Crypt::decrypt($encrypted,$key);
-// $decrypted=rtrim($decrypted, "\0");
-// $this->assertEquals($decrypted,$source);
-//
-// $encrypted=OC_Encryption\Crypt::blockEncrypt($source,$key);
-// $decrypted=OC_Encryption\Crypt::blockDecrypt($encrypted,$key);
-// $this->assertEquals($decrypted,$source);
-//
-// }
-//
-// function testBinary(){
-// $key=uniqid();
-//
-// $file=__DIR__.'/binary';
-// $source=file_get_contents($file); //binary file
-// $encrypted=OC_Encryption\Crypt::encrypt($source,$key);
-// $decrypted=OC_Encryption\Crypt::decrypt($encrypted,$key);
-//
-// $decrypted=rtrim($decrypted, "\0");
-// $this->assertEquals($decrypted,$source);
-//
-// $encrypted=OC_Encryption\Crypt::blockEncrypt($source,$key);
-// $decrypted=OC_Encryption\Crypt::blockDecrypt($encrypted,$key,strlen($source));
-// $this->assertEquals($decrypted,$source);
-// }
-
-}
diff --git a/apps/files_encryption/test/keymanager.php b/apps/files_encryption/test/keymanager.php
deleted file mode 100644
index bf453fe3163b8455136fc5b501beb451ba54c251..0000000000000000000000000000000000000000
--- a/apps/files_encryption/test/keymanager.php
+++ /dev/null
@@ -1,130 +0,0 @@
-
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
-//require_once "PHPUnit/Framework/TestCase.php";
-require_once realpath( dirname(__FILE__).'/../../../lib/base.php' );
-require_once realpath( dirname(__FILE__).'/../lib/crypt.php' );
-require_once realpath( dirname(__FILE__).'/../lib/keymanager.php' );
-require_once realpath( dirname(__FILE__).'/../lib/proxy.php' );
-require_once realpath( dirname(__FILE__).'/../lib/stream.php' );
-require_once realpath( dirname(__FILE__).'/../lib/util.php' );
-require_once realpath( dirname(__FILE__).'/../appinfo/app.php' );
-
-use OCA\Encryption;
-
-// This has to go here because otherwise session errors arise, and the private
-// encryption key needs to be saved in the session
-\OC_User::login( 'admin', 'admin' );
-
-class Test_Keymanager extends \PHPUnit_Framework_TestCase {
-
- function setUp() {
-
- \OC_FileProxy::$enabled = false;
-
- // set content for encrypting / decrypting in tests
- $this->dataLong = file_get_contents( realpath( dirname(__FILE__).'/../lib/crypt.php' ) );
- $this->dataShort = 'hats';
- $this->dataUrl = realpath( dirname(__FILE__).'/../lib/crypt.php' );
- $this->legacyData = realpath( dirname(__FILE__).'/legacy-text.txt' );
- $this->legacyEncryptedData = realpath( dirname(__FILE__).'/legacy-encrypted-text.txt' );
- $this->randomKey = Encryption\Crypt::generateKey();
-
- $keypair = Encryption\Crypt::createKeypair();
- $this->genPublicKey = $keypair['publicKey'];
- $this->genPrivateKey = $keypair['privateKey'];
-
- $this->view = new \OC_FilesystemView( '/' );
-
- \OC_User::setUserId( 'admin' );
- $this->userId = 'admin';
- $this->pass = 'admin';
-
- \OC_Filesystem::init( '/' );
- \OC_Filesystem::mount( 'OC_Filestorage_Local', array('datadir' => \OC_User::getHome($this->userId)), '/' );
-
- }
-
- function tearDown(){
-
- \OC_FileProxy::$enabled = true;
-
- }
-
- function testGetPrivateKey() {
-
- $key = Encryption\Keymanager::getPrivateKey( $this->view, $this->userId );
-
- // Will this length vary? Perhaps we should use a range instead
- $this->assertEquals( 2296, strlen( $key ) );
-
- }
-
- function testGetPublicKey() {
-
- $key = Encryption\Keymanager::getPublicKey( $this->view, $this->userId );
-
- $this->assertEquals( 451, strlen( $key ) );
-
- $this->assertEquals( '-----BEGIN PUBLIC KEY-----', substr( $key, 0, 26 ) );
- }
-
- function testSetFileKey() {
-
- # NOTE: This cannot be tested until we are able to break out
- # of the FileSystemView data directory root
-
- $key = Encryption\Crypt::symmetricEncryptFileContentKeyfile( $this->randomKey, 'hat' );
-
- $path = 'unittest-'.time().'txt';
-
- //$view = new \OC_FilesystemView( '/' . $this->userId . '/files_encryption/keyfiles' );
-
- Encryption\Keymanager::setFileKey( $this->view, $path, $this->userId, $key['key'] );
-
- }
-
-// /**
-// * @depends testGetPrivateKey
-// */
-// function testGetPrivateKey_decrypt() {
-//
-// $key = Encryption\Keymanager::getPrivateKey( $this->view, $this->userId );
-//
-// # TODO: replace call to Crypt with a mock object?
-// $decrypted = Encryption\Crypt::symmetricDecryptFileContent( $key, $this->passphrase );
-//
-// $this->assertEquals( 1704, strlen( $decrypted ) );
-//
-// $this->assertEquals( '-----BEGIN PRIVATE KEY-----', substr( $decrypted, 0, 27 ) );
-//
-// }
-
- function testGetUserKeys() {
-
- $keys = Encryption\Keymanager::getUserKeys( $this->view, $this->userId );
-
- $this->assertEquals( 451, strlen( $keys['publicKey'] ) );
- $this->assertEquals( '-----BEGIN PUBLIC KEY-----', substr( $keys['publicKey'], 0, 26 ) );
- $this->assertEquals( 2296, strlen( $keys['privateKey'] ) );
-
- }
-
- function testGetPublicKeys() {
-
- # TODO: write me
-
- }
-
- function testGetFileKey() {
-
-// Encryption\Keymanager::getFileKey( $this->view, $this->userId, $this->filePath );
-
- }
-
-}
diff --git a/apps/files_encryption/test/legacy-encrypted-text.txt b/apps/files_encryption/test/legacy-encrypted-text.txt
deleted file mode 100644
index cb5bf50550d91842c8a0bd214edf9569daeadc48..0000000000000000000000000000000000000000
Binary files a/apps/files_encryption/test/legacy-encrypted-text.txt and /dev/null differ
diff --git a/apps/files_encryption/test/stream.php b/apps/files_encryption/test/stream.php
deleted file mode 100644
index ba82ac80eabb17dc16d01dce0d61d0f042c8a1b0..0000000000000000000000000000000000000000
--- a/apps/files_encryption/test/stream.php
+++ /dev/null
@@ -1,226 +0,0 @@
-//
-// * This file is licensed under the Affero General Public License version 3 or
-// * later.
-// * See the COPYING-README file.
-// */
-//
-// namespace OCA\Encryption;
-//
-// class Test_Stream extends \PHPUnit_Framework_TestCase {
-//
-// function setUp() {
-//
-// \OC_Filesystem::mount( 'OC_Filestorage_Local', array(), '/' );
-//
-// $this->empty = '';
-//
-// $this->stream = new Stream();
-//
-// $this->dataLong = file_get_contents( realpath( dirname(__FILE__).'/../lib/crypt.php' ) );
-// $this->dataShort = 'hats';
-//
-// $this->emptyTmpFilePath = \OCP\Files::tmpFile();
-//
-// $this->dataTmpFilePath = \OCP\Files::tmpFile();
-//
-// file_put_contents( $this->dataTmpFilePath, "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec a diam lectus. Sed sit amet ipsum mauris. Maecenas congue ligula ac quam viverra nec consectetur ante hendrerit. Donec et mollis dolor. Praesent et diam eget libero egestas mattis sit amet vitae augue. Nam tincidunt congue enim, ut porta lorem lacinia consectetur. Donec ut libero sed arcu vehicula ultricies a non tortor. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean ut gravida lorem. Ut turpis felis, pulvinar a semper sed, adipiscing id dolor. Pellentesque auctor nisi id magna consequat sagittis. Curabitur dapibus enim sit amet elit pharetra tincidunt feugiat nisl imperdiet. Ut convallis libero in urna ultrices accumsan. Donec sed odio eros. Donec viverra mi quis quam pulvinar at malesuada arcu rhoncus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. In rutrum accumsan ultricies. Mauris vitae nisi at sem facilisis semper ac in est." );
-//
-// }
-//
-// function testStreamOpen() {
-//
-// $stream1 = new Stream();
-//
-// $handle1 = $stream1->stream_open( $this->emptyTmpFilePath, 'wb', array(), $this->empty );
-//
-// // Test that resource was returned successfully
-// $this->assertTrue( $handle1 );
-//
-// // Test that file has correct size
-// $this->assertEquals( 0, $stream1->size );
-//
-// // Test that path is correct
-// $this->assertEquals( $this->emptyTmpFilePath, $stream1->rawPath );
-//
-// $stream2 = new Stream();
-//
-// $handle2 = $stream2->stream_open( 'crypt://' . $this->emptyTmpFilePath, 'wb', array(), $this->empty );
-//
-// // Test that protocol identifier is removed from path
-// $this->assertEquals( $this->emptyTmpFilePath, $stream2->rawPath );
-//
-// // "Stat failed error" prevents this test from executing
-// // $stream3 = new Stream();
-// //
-// // $handle3 = $stream3->stream_open( $this->dataTmpFilePath, 'r', array(), $this->empty );
-// //
-// // $this->assertEquals( 0, $stream3->size );
-//
-// }
-//
-// function testStreamWrite() {
-//
-// $stream1 = new Stream();
-//
-// $handle1 = $stream1->stream_open( $this->emptyTmpFilePath, 'r+b', array(), $this->empty );
-//
-// # what about the keymanager? there is no key for the newly created temporary file!
-//
-// $stream1->stream_write( $this->dataShort );
-//
-// }
-//
-// // function getStream( $id, $mode, $size ) {
-// //
-// // if ( $id === '' ) {
-// //
-// // $id = uniqid();
-// // }
-// //
-// //
-// // if ( !isset( $this->tmpFiles[$id] ) ) {
-// //
-// // // If tempfile with given name does not already exist, create it
-// //
-// // $file = OCP\Files::tmpFile();
-// //
-// // $this->tmpFiles[$id] = $file;
-// //
-// // } else {
-// //
-// // $file = $this->tmpFiles[$id];
-// //
-// // }
-// //
-// // $stream = fopen( $file, $mode );
-// //
-// // Stream::$sourceStreams[$id] = array( 'path' => 'dummy' . $id, 'stream' => $stream, 'size' => $size );
-// //
-// // return fopen( 'crypt://streams/'.$id, $mode );
-// //
-// // }
-// //
-// // function testStream( ){
-// //
-// // $stream = $this->getStream( 'test1', 'w', strlen( 'foobar' ) );
-// //
-// // fwrite( $stream, 'foobar' );
-// //
-// // fclose( $stream );
-// //
-// //
-// // $stream = $this->getStream( 'test1', 'r', strlen( 'foobar' ) );
-// //
-// // $data = fread( $stream, 6 );
-// //
-// // fclose( $stream );
-// //
-// // $this->assertEquals( 'foobar', $data );
-// //
-// //
-// // $file = OC::$SERVERROOT.'/3rdparty/MDB2.php';
-// //
-// // $source = fopen( $file, 'r' );
-// //
-// // $target = $this->getStream( 'test2', 'w', 0 );
-// //
-// // OCP\Files::streamCopy( $source, $target );
-// //
-// // fclose( $target );
-// //
-// // fclose( $source );
-// //
-// //
-// // $stream = $this->getStream( 'test2', 'r', filesize( $file ) );
-// //
-// // $data = stream_get_contents( $stream );
-// //
-// // $original = file_get_contents( $file );
-// //
-// // $this->assertEquals( strlen( $original ), strlen( $data ) );
-// //
-// // $this->assertEquals( $original, $data );
-// //
-// // }
-//
-// }
-//
-// // class Test_CryptStream extends PHPUnit_Framework_TestCase {
-// // private $tmpFiles=array();
-// //
-// // function testStream(){
-// // $stream=$this->getStream('test1','w',strlen('foobar'));
-// // fwrite($stream,'foobar');
-// // fclose($stream);
-// //
-// // $stream=$this->getStream('test1','r',strlen('foobar'));
-// // $data=fread($stream,6);
-// // fclose($stream);
-// // $this->assertEquals('foobar',$data);
-// //
-// // $file=OC::$SERVERROOT.'/3rdparty/MDB2.php';
-// // $source=fopen($file,'r');
-// // $target=$this->getStream('test2','w',0);
-// // OCP\Files::streamCopy($source,$target);
-// // fclose($target);
-// // fclose($source);
-// //
-// // $stream=$this->getStream('test2','r',filesize($file));
-// // $data=stream_get_contents($stream);
-// // $original=file_get_contents($file);
-// // $this->assertEquals(strlen($original),strlen($data));
-// // $this->assertEquals($original,$data);
-// // }
-// //
-// // /**
-// // * get a cryptstream to a temporary file
-// // * @param string $id
-// // * @param string $mode
-// // * @param int size
-// // * @return resource
-// // */
-// // function getStream($id,$mode,$size){
-// // if($id===''){
-// // $id=uniqid();
-// // }
-// // if(!isset($this->tmpFiles[$id])){
-// // $file=OCP\Files::tmpFile();
-// // $this->tmpFiles[$id]=$file;
-// // }else{
-// // $file=$this->tmpFiles[$id];
-// // }
-// // $stream=fopen($file,$mode);
-// // OC_CryptStream::$sourceStreams[$id]=array('path'=>'dummy'.$id,'stream'=>$stream,'size'=>$size);
-// // return fopen('crypt://streams/'.$id,$mode);
-// // }
-// //
-// // function testBinary(){
-// // $file=__DIR__.'/binary';
-// // $source=file_get_contents($file);
-// //
-// // $stream=$this->getStream('test','w',strlen($source));
-// // fwrite($stream,$source);
-// // fclose($stream);
-// //
-// // $stream=$this->getStream('test','r',strlen($source));
-// // $data=stream_get_contents($stream);
-// // fclose($stream);
-// // $this->assertEquals(strlen($data),strlen($source));
-// // $this->assertEquals($source,$data);
-// //
-// // $file=__DIR__.'/zeros';
-// // $source=file_get_contents($file);
-// //
-// // $stream=$this->getStream('test2','w',strlen($source));
-// // fwrite($stream,$source);
-// // fclose($stream);
-// //
-// // $stream=$this->getStream('test2','r',strlen($source));
-// // $data=stream_get_contents($stream);
-// // fclose($stream);
-// // $this->assertEquals(strlen($data),strlen($source));
-// // $this->assertEquals($source,$data);
-// // }
-// // }
diff --git a/apps/files_encryption/test/util.php b/apps/files_encryption/test/util.php
deleted file mode 100755
index 1cdeff8008df2417e7e09c6cdbbb11b9e414c065..0000000000000000000000000000000000000000
--- a/apps/files_encryption/test/util.php
+++ /dev/null
@@ -1,225 +0,0 @@
-
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
-//require_once "PHPUnit/Framework/TestCase.php";
-require_once realpath( dirname(__FILE__).'/../../../lib/base.php' );
-require_once realpath( dirname(__FILE__).'/../lib/crypt.php' );
-require_once realpath( dirname(__FILE__).'/../lib/keymanager.php' );
-require_once realpath( dirname(__FILE__).'/../lib/proxy.php' );
-require_once realpath( dirname(__FILE__).'/../lib/stream.php' );
-require_once realpath( dirname(__FILE__).'/../lib/util.php' );
-require_once realpath( dirname(__FILE__).'/../appinfo/app.php' );
-
-// Load mockery files
-require_once 'Mockery/Loader.php';
-require_once 'Hamcrest/Hamcrest.php';
-$loader = new \Mockery\Loader;
-$loader->register();
-
-use \Mockery as m;
-use OCA\Encryption;
-
-class Test_Enc_Util extends \PHPUnit_Framework_TestCase {
-
- function setUp() {
-
- \OC_Filesystem::mount( 'OC_Filestorage_Local', array(), '/' );
-
- // set content for encrypting / decrypting in tests
- $this->dataUrl = realpath( dirname(__FILE__).'/../lib/crypt.php' );
- $this->dataShort = 'hats';
- $this->dataLong = file_get_contents( realpath( dirname(__FILE__).'/../lib/crypt.php' ) );
- $this->legacyData = realpath( dirname(__FILE__).'/legacy-text.txt' );
- $this->legacyEncryptedData = realpath( dirname(__FILE__).'/legacy-encrypted-text.txt' );
-
- $this->userId = 'admin';
- $this->pass = 'admin';
-
- $keypair = Encryption\Crypt::createKeypair();
-
- $this->genPublicKey = $keypair['publicKey'];
- $this->genPrivateKey = $keypair['privateKey'];
-
- $this->publicKeyDir = '/' . 'public-keys';
- $this->encryptionDir = '/' . $this->userId . '/' . 'files_encryption';
- $this->keyfilesPath = $this->encryptionDir . '/' . 'keyfiles';
- $this->publicKeyPath = $this->publicKeyDir . '/' . $this->userId . '.public.key'; // e.g. data/public-keys/admin.public.key
- $this->privateKeyPath = $this->encryptionDir . '/' . $this->userId . '.private.key'; // e.g. data/admin/admin.private.key
-
- $this->view = new \OC_FilesystemView( '/' );
-
- $this->mockView = m::mock('OC_FilesystemView');
- $this->util = new Encryption\Util( $this->mockView, $this->userId );
-
- }
-
- function tearDown(){
-
- m::close();
-
- }
-
- /**
- * @brief test that paths set during User construction are correct
- */
- function testKeyPaths() {
-
- $mockView = m::mock('OC_FilesystemView');
-
- $util = new Encryption\Util( $mockView, $this->userId );
-
- $this->assertEquals( $this->publicKeyDir, $util->getPath( 'publicKeyDir' ) );
- $this->assertEquals( $this->encryptionDir, $util->getPath( 'encryptionDir' ) );
- $this->assertEquals( $this->keyfilesPath, $util->getPath( 'keyfilesPath' ) );
- $this->assertEquals( $this->publicKeyPath, $util->getPath( 'publicKeyPath' ) );
- $this->assertEquals( $this->privateKeyPath, $util->getPath( 'privateKeyPath' ) );
-
- }
-
- /**
- * @brief test setup of encryption directories when they don't yet exist
- */
- function testSetupServerSideNotSetup() {
-
- $mockView = m::mock('OC_FilesystemView');
-
- $mockView->shouldReceive( 'file_exists' )->times(5)->andReturn( false );
- $mockView->shouldReceive( 'mkdir' )->times(4)->andReturn( true );
- $mockView->shouldReceive( 'file_put_contents' )->withAnyArgs();
-
- $util = new Encryption\Util( $mockView, $this->userId );
-
- $this->assertEquals( true, $util->setupServerSide( $this->pass ) );
-
- }
-
- /**
- * @brief test setup of encryption directories when they already exist
- */
- function testSetupServerSideIsSetup() {
-
- $mockView = m::mock('OC_FilesystemView');
-
- $mockView->shouldReceive( 'file_exists' )->times(6)->andReturn( true );
- $mockView->shouldReceive( 'file_put_contents' )->withAnyArgs();
-
- $util = new Encryption\Util( $mockView, $this->userId );
-
- $this->assertEquals( true, $util->setupServerSide( $this->pass ) );
-
- }
-
- /**
- * @brief test checking whether account is ready for encryption, when it isn't ready
- */
- function testReadyNotReady() {
-
- $mockView = m::mock('OC_FilesystemView');
-
- $mockView->shouldReceive( 'file_exists' )->times(1)->andReturn( false );
-
- $util = new Encryption\Util( $mockView, $this->userId );
-
- $this->assertEquals( false, $util->ready() );
-
- # TODO: Add more tests here to check that if any of the dirs are
- # then false will be returned. Use strict ordering?
-
- }
-
- /**
- * @brief test checking whether account is ready for encryption, when it is ready
- */
- function testReadyIsReady() {
-
- $mockView = m::mock('OC_FilesystemView');
-
- $mockView->shouldReceive( 'file_exists' )->times(3)->andReturn( true );
-
- $util = new Encryption\Util( $mockView, $this->userId );
-
- $this->assertEquals( true, $util->ready() );
-
- # TODO: Add more tests here to check that if any of the dirs are
- # then false will be returned. Use strict ordering?
-
- }
-
- function testFindFiles() {
-
-// $this->view->chroot( "/data/{$this->userId}/files" );
-
- $util = new Encryption\Util( $this->view, $this->userId );
-
- $files = $util->findFiles( '/', 'encrypted' );
-
- var_dump( $files );
-
- # TODO: Add more tests here to check that if any of the dirs are
- # then false will be returned. Use strict ordering?
-
- }
-
-// /**
-// * @brief test decryption using legacy blowfish method
-// * @depends testLegacyEncryptLong
-// */
-// function testLegacyKeyRecryptKeyfileDecrypt( $recrypted ) {
-//
-// $decrypted = Encryption\Crypt::keyDecryptKeyfile( $recrypted['data'], $recrypted['key'], $this->genPrivateKey );
-//
-// $this->assertEquals( $this->dataLong, $decrypted );
-//
-// }
-
-// // Cannot use this test for now due to hidden dependencies in OC_FileCache
-// function testIsLegacyEncryptedContent() {
-//
-// $keyfileContent = OCA\Encryption\Crypt::symmetricEncryptFileContent( $this->legacyEncryptedData, 'hat' );
-//
-// $this->assertFalse( OCA\Encryption\Crypt::isLegacyEncryptedContent( $keyfileContent, '/files/admin/test.txt' ) );
-//
-// OC_FileCache::put( '/admin/files/legacy-encrypted-test.txt', $this->legacyEncryptedData );
-//
-// $this->assertTrue( OCA\Encryption\Crypt::isLegacyEncryptedContent( $this->legacyEncryptedData, '/files/admin/test.txt' ) );
-//
-// }
-
-// // Cannot use this test for now due to need for different root in OC_Filesystem_view class
-// function testGetLegacyKey() {
-//
-// $c = new \OCA\Encryption\Util( $view, false );
-//
-// $bool = $c->getLegacyKey( 'admin' );
-//
-// $this->assertTrue( $bool );
-//
-// $this->assertTrue( $c->legacyKey );
-//
-// $this->assertTrue( is_int( $c->legacyKey ) );
-//
-// $this->assertTrue( strlen( $c->legacyKey ) == 20 );
-//
-// }
-
-// // Cannot use this test for now due to need for different root in OC_Filesystem_view class
-// function testLegacyDecrypt() {
-//
-// $c = new OCA\Encryption\Util( $this->view, false );
-//
-// $bool = $c->getLegacyKey( 'admin' );
-//
-// $encrypted = $c->legacyEncrypt( $this->data, $c->legacyKey );
-//
-// $decrypted = $c->legacyDecrypt( $encrypted, $c->legacyKey );
-//
-// $this->assertEquals( $decrypted, $this->data );
-//
-// }
-
-}
\ No newline at end of file
diff --git a/apps/files_encryption/test/binary b/apps/files_encryption/tests/binary
similarity index 100%
rename from apps/files_encryption/test/binary
rename to apps/files_encryption/tests/binary
diff --git a/apps/files_encryption/tests/crypt.php b/apps/files_encryption/tests/crypt.php
new file mode 100755
index 0000000000000000000000000000000000000000..621941c52a10ec6e1dd8c78097ed0f3a100c32a2
--- /dev/null
+++ b/apps/files_encryption/tests/crypt.php
@@ -0,0 +1,833 @@
+, and
+ * Robin Appelman
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+require_once realpath(dirname(__FILE__) . '/../3rdparty/Crypt_Blowfish/Blowfish.php');
+require_once realpath(dirname(__FILE__) . '/../../../lib/base.php');
+require_once realpath(dirname(__FILE__) . '/../lib/crypt.php');
+require_once realpath(dirname(__FILE__) . '/../lib/keymanager.php');
+require_once realpath(dirname(__FILE__) . '/../lib/proxy.php');
+require_once realpath(dirname(__FILE__) . '/../lib/stream.php');
+require_once realpath(dirname(__FILE__) . '/../lib/util.php');
+require_once realpath(dirname(__FILE__) . '/../lib/helper.php');
+require_once realpath(dirname(__FILE__) . '/../appinfo/app.php');
+
+use OCA\Encryption;
+
+/**
+ * Class Test_Encryption_Crypt
+ */
+class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase
+{
+
+ public $userId;
+ public $pass;
+ public $stateFilesTrashbin;
+ public $dataLong;
+ public $dataUrl;
+ public $dataShort;
+ /**
+ * @var OC_FilesystemView
+ */
+ public $view;
+ public $legacyEncryptedData;
+ public $genPrivateKey;
+ public $genPublicKey;
+
+ function setUp()
+ {
+ // reset backend
+ \OC_User::clearBackends();
+ \OC_User::useBackend('database');
+
+ // set content for encrypting / decrypting in tests
+ $this->dataLong = file_get_contents(realpath(dirname(__FILE__) . '/../lib/crypt.php'));
+ $this->dataShort = 'hats';
+ $this->dataUrl = realpath(dirname(__FILE__) . '/../lib/crypt.php');
+ $this->legacyData = realpath(dirname(__FILE__) . '/legacy-text.txt');
+ $this->legacyEncryptedData = realpath(dirname(__FILE__) . '/legacy-encrypted-text.txt');
+ $this->legacyEncryptedDataKey = realpath(dirname(__FILE__) . '/encryption.key');
+ $this->randomKey = Encryption\Crypt::generateKey();
+
+ $keypair = Encryption\Crypt::createKeypair();
+ $this->genPublicKey = $keypair['publicKey'];
+ $this->genPrivateKey = $keypair['privateKey'];
+
+ $this->view = new \OC_FilesystemView('/');
+
+ \OC_User::setUserId('admin');
+ $this->userId = 'admin';
+ $this->pass = 'admin';
+
+ $userHome = \OC_User::getHome($this->userId);
+ $this->dataDir = str_replace('/' . $this->userId, '', $userHome);
+
+ // Filesystem related hooks
+ \OCA\Encryption\Helper::registerFilesystemHooks();
+
+ // Filesystem related hooks
+ \OCA\Encryption\Helper::registerUserHooks();
+
+ \OC_FileProxy::register(new OCA\Encryption\Proxy());
+
+ // remember files_trashbin state
+ $this->stateFilesTrashbin = OC_App::isEnabled('files_trashbin');
+
+ // we don't want to tests with app files_trashbin enabled
+ \OC_App::disable('files_trashbin');
+
+ \OC_Util::tearDownFS();
+ \OC_User::setUserId('');
+ \OC\Files\Filesystem::tearDown();
+ \OC_Util::setupFS($this->userId);
+ \OC_User::setUserId($this->userId);
+
+ $params['uid'] = $this->userId;
+ $params['password'] = $this->pass;
+ OCA\Encryption\Hooks::login($params);
+
+ }
+
+ function tearDown()
+ {
+ \OC_FileProxy::clearProxies();
+
+ // reset app files_trashbin
+ if ($this->stateFilesTrashbin) {
+ OC_App::enable('files_trashbin');
+ } else {
+ OC_App::disable('files_trashbin');
+ }
+ }
+
+ function testGenerateKey()
+ {
+
+ # TODO: use more accurate (larger) string length for test confirmation
+
+ $key = Encryption\Crypt::generateKey();
+
+ $this->assertTrue(strlen($key) > 16);
+
+ }
+
+ /**
+ * @return String
+ */
+ function testGenerateIv()
+ {
+
+ $iv = Encryption\Crypt::generateIv();
+
+ $this->assertEquals(16, strlen($iv));
+
+ return $iv;
+
+ }
+
+ /**
+ * @depends testGenerateIv
+ */
+ function testConcatIv($iv)
+ {
+
+ $catFile = Encryption\Crypt::concatIv($this->dataLong, $iv);
+
+ // Fetch encryption metadata from end of file
+ $meta = substr($catFile, -22);
+
+ $identifier = substr($meta, 0, 6);
+
+ // Fetch IV from end of file
+ $foundIv = substr($meta, 6);
+
+ $this->assertEquals('00iv00', $identifier);
+
+ $this->assertEquals($iv, $foundIv);
+
+ // Remove IV and IV identifier text to expose encrypted content
+ $data = substr($catFile, 0, -22);
+
+ $this->assertEquals($this->dataLong, $data);
+
+ return array(
+ 'iv' => $iv
+ , 'catfile' => $catFile
+ );
+
+ }
+
+ /**
+ * @depends testConcatIv
+ */
+ function testSplitIv($testConcatIv)
+ {
+
+ // Split catfile into components
+ $splitCatfile = Encryption\Crypt::splitIv($testConcatIv['catfile']);
+
+ // Check that original IV and split IV match
+ $this->assertEquals($testConcatIv['iv'], $splitCatfile['iv']);
+
+ // Check that original data and split data match
+ $this->assertEquals($this->dataLong, $splitCatfile['encrypted']);
+
+ }
+
+ /**
+ * @return string padded
+ */
+ function testAddPadding()
+ {
+
+ $padded = Encryption\Crypt::addPadding($this->dataLong);
+
+ $padding = substr($padded, -2);
+
+ $this->assertEquals('xx', $padding);
+
+ return $padded;
+
+ }
+
+ /**
+ * @depends testAddPadding
+ */
+ function testRemovePadding($padded)
+ {
+
+ $noPadding = Encryption\Crypt::RemovePadding($padded);
+
+ $this->assertEquals($this->dataLong, $noPadding);
+
+ }
+
+ function testEncrypt()
+ {
+
+ $random = openssl_random_pseudo_bytes(13);
+
+ $iv = substr(base64_encode($random), 0, -4); // i.e. E5IG033j+mRNKrht
+
+ $crypted = Encryption\Crypt::encrypt($this->dataUrl, $iv, 'hat');
+
+ $this->assertNotEquals($this->dataUrl, $crypted);
+
+ }
+
+ function testDecrypt()
+ {
+
+ $random = openssl_random_pseudo_bytes(13);
+
+ $iv = substr(base64_encode($random), 0, -4); // i.e. E5IG033j+mRNKrht
+
+ $crypted = Encryption\Crypt::encrypt($this->dataUrl, $iv, 'hat');
+
+ $decrypt = Encryption\Crypt::decrypt($crypted, $iv, 'hat');
+
+ $this->assertEquals($this->dataUrl, $decrypt);
+
+ }
+
+ function testSymmetricEncryptFileContent()
+ {
+
+ # TODO: search in keyfile for actual content as IV will ensure this test always passes
+
+ $crypted = Encryption\Crypt::symmetricEncryptFileContent($this->dataShort, 'hat');
+
+ $this->assertNotEquals($this->dataShort, $crypted);
+
+
+ $decrypt = Encryption\Crypt::symmetricDecryptFileContent($crypted, 'hat');
+
+ $this->assertEquals($this->dataShort, $decrypt);
+
+ }
+
+ function testSymmetricStreamEncryptShortFileContent()
+ {
+
+ $filename = 'tmp-' . time() . '.test';
+
+ $cryptedFile = file_put_contents('crypt://' . $filename, $this->dataShort);
+
+ // Test that data was successfully written
+ $this->assertTrue(is_int($cryptedFile));
+
+ // Disable encryption proxy to prevent recursive calls
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
+ // Get file contents without using any wrapper to get it's actual contents on disk
+ $retreivedCryptedFile = $this->view->file_get_contents($this->userId . '/files/' . $filename);
+
+ // Re-enable proxy - our work is done
+ \OC_FileProxy::$enabled = $proxyStatus;
+
+ // Check that the file was encrypted before being written to disk
+ $this->assertNotEquals($this->dataShort, $retreivedCryptedFile);
+
+ // Get the encrypted keyfile
+ $encKeyfile = Encryption\Keymanager::getFileKey($this->view, $this->userId, $filename);
+
+ // Attempt to fetch the user's shareKey
+ $shareKey = Encryption\Keymanager::getShareKey($this->view, $this->userId, $filename);
+
+ // get session
+ $session = new Encryption\Session($this->view);
+
+ // get private key
+ $privateKey = $session->getPrivateKey($this->userId);
+
+ // Decrypt keyfile with shareKey
+ $plainKeyfile = Encryption\Crypt::multiKeyDecrypt($encKeyfile, $shareKey, $privateKey);
+
+ // Manually decrypt
+ $manualDecrypt = Encryption\Crypt::symmetricDecryptFileContent($retreivedCryptedFile, $plainKeyfile);
+
+ // Check that decrypted data matches
+ $this->assertEquals($this->dataShort, $manualDecrypt);
+
+ // Teardown
+ $this->view->unlink($this->userId . '/files/' . $filename);
+
+ Encryption\Keymanager::deleteFileKey($this->view, $this->userId, $filename);
+ }
+
+ /**
+ * @brief Test that data that is written by the crypto stream wrapper
+ * @note Encrypted data is manually prepared and decrypted here to avoid dependency on success of stream_read
+ * @note If this test fails with truncate content, check that enough array slices are being rejoined to form $e, as the crypt.php file may have gotten longer and broken the manual
+ * reassembly of its data
+ */
+ function testSymmetricStreamEncryptLongFileContent()
+ {
+
+ // Generate a a random filename
+ $filename = 'tmp-' . time() . '.test';
+
+ // Save long data as encrypted file using stream wrapper
+ $cryptedFile = file_put_contents('crypt://' . $filename, $this->dataLong . $this->dataLong);
+
+ // Test that data was successfully written
+ $this->assertTrue(is_int($cryptedFile));
+
+ // Disable encryption proxy to prevent recursive calls
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
+ // Get file contents without using any wrapper to get it's actual contents on disk
+ $retreivedCryptedFile = $this->view->file_get_contents($this->userId . '/files/' . $filename);
+
+ // Re-enable proxy - our work is done
+ \OC_FileProxy::$enabled = $proxyStatus;
+
+
+ // Check that the file was encrypted before being written to disk
+ $this->assertNotEquals($this->dataLong . $this->dataLong, $retreivedCryptedFile);
+
+ // Manuallly split saved file into separate IVs and encrypted chunks
+ $r = preg_split('/(00iv00.{16,18})/', $retreivedCryptedFile, NULL, PREG_SPLIT_DELIM_CAPTURE);
+
+ //print_r($r);
+
+ // Join IVs and their respective data chunks
+ $e = array($r[0] . $r[1], $r[2] . $r[3], $r[4] . $r[5], $r[6] . $r[7], $r[8] . $r[9], $r[10] . $r[11]); //.$r[11], $r[12].$r[13], $r[14] );
+
+ //print_r($e);
+
+ // Get the encrypted keyfile
+ $encKeyfile = Encryption\Keymanager::getFileKey($this->view, $this->userId, $filename);
+
+ // Attempt to fetch the user's shareKey
+ $shareKey = Encryption\Keymanager::getShareKey($this->view, $this->userId, $filename);
+
+ // get session
+ $session = new Encryption\Session($this->view);
+
+ // get private key
+ $privateKey = $session->getPrivateKey($this->userId);
+
+ // Decrypt keyfile with shareKey
+ $plainKeyfile = Encryption\Crypt::multiKeyDecrypt($encKeyfile, $shareKey, $privateKey);
+
+ // Set var for reassembling decrypted content
+ $decrypt = '';
+
+ // Manually decrypt chunk
+ foreach ($e as $chunk) {
+
+ $chunkDecrypt = Encryption\Crypt::symmetricDecryptFileContent($chunk, $plainKeyfile);
+
+ // Assemble decrypted chunks
+ $decrypt .= $chunkDecrypt;
+
+ }
+
+ $this->assertEquals($this->dataLong . $this->dataLong, $decrypt);
+
+ // Teardown
+
+ $this->view->unlink($this->userId . '/files/' . $filename);
+
+ Encryption\Keymanager::deleteFileKey($this->view, $this->userId, $filename);
+
+ }
+
+ /**
+ * @brief Test that data that is read by the crypto stream wrapper
+ */
+ function testSymmetricStreamDecryptShortFileContent()
+ {
+
+ $filename = 'tmp-' . time();
+
+ // Save long data as encrypted file using stream wrapper
+ $cryptedFile = file_put_contents('crypt://' . $filename, $this->dataShort);
+
+ // Test that data was successfully written
+ $this->assertTrue(is_int($cryptedFile));
+
+ // Disable encryption proxy to prevent recursive calls
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
+ $this->assertTrue(Encryption\Crypt::isEncryptedMeta($filename));
+
+ \OC_FileProxy::$enabled = $proxyStatus;
+
+ // Get file decrypted contents
+ $decrypt = file_get_contents('crypt://' . $filename);
+
+ $this->assertEquals($this->dataShort, $decrypt);
+
+ // tear down
+ $this->view->unlink($this->userId . '/files/' . $filename);
+ }
+
+ function testSymmetricStreamDecryptLongFileContent()
+ {
+
+ $filename = 'tmp-' . time();
+
+ // Save long data as encrypted file using stream wrapper
+ $cryptedFile = file_put_contents('crypt://' . $filename, $this->dataLong);
+
+ // Test that data was successfully written
+ $this->assertTrue(is_int($cryptedFile));
+
+ // Get file decrypted contents
+ $decrypt = file_get_contents('crypt://' . $filename);
+
+ $this->assertEquals($this->dataLong, $decrypt);
+
+ // tear down
+ $this->view->unlink($this->userId . '/files/' . $filename);
+ }
+
+ function testSymmetricEncryptFileContentKeyfile()
+ {
+
+ # TODO: search in keyfile for actual content as IV will ensure this test always passes
+
+ $crypted = Encryption\Crypt::symmetricEncryptFileContentKeyfile($this->dataUrl);
+
+ $this->assertNotEquals($this->dataUrl, $crypted['encrypted']);
+
+
+ $decrypt = Encryption\Crypt::symmetricDecryptFileContent($crypted['encrypted'], $crypted['key']);
+
+ $this->assertEquals($this->dataUrl, $decrypt);
+
+ }
+
+ function testIsEncryptedContent()
+ {
+
+ $this->assertFalse(Encryption\Crypt::isCatfileContent($this->dataUrl));
+
+ $this->assertFalse(Encryption\Crypt::isCatfileContent($this->legacyEncryptedData));
+
+ $keyfileContent = Encryption\Crypt::symmetricEncryptFileContent($this->dataUrl, 'hat');
+
+ $this->assertTrue(Encryption\Crypt::isCatfileContent($keyfileContent));
+
+ }
+
+ function testMultiKeyEncrypt()
+ {
+
+ # TODO: search in keyfile for actual content as IV will ensure this test always passes
+
+ $pair1 = Encryption\Crypt::createKeypair();
+
+ $this->assertEquals(2, count($pair1));
+
+ $this->assertTrue(strlen($pair1['publicKey']) > 1);
+
+ $this->assertTrue(strlen($pair1['privateKey']) > 1);
+
+
+ $crypted = Encryption\Crypt::multiKeyEncrypt($this->dataShort, array($pair1['publicKey']));
+
+ $this->assertNotEquals($this->dataShort, $crypted['data']);
+
+
+ $decrypt = Encryption\Crypt::multiKeyDecrypt($crypted['data'], $crypted['keys'][0], $pair1['privateKey']);
+
+ $this->assertEquals($this->dataShort, $decrypt);
+
+ }
+
+ function testKeyEncrypt()
+ {
+
+ // Generate keypair
+ $pair1 = Encryption\Crypt::createKeypair();
+
+ // Encrypt data
+ $crypted = Encryption\Crypt::keyEncrypt($this->dataUrl, $pair1['publicKey']);
+
+ $this->assertNotEquals($this->dataUrl, $crypted);
+
+ // Decrypt data
+ $decrypt = Encryption\Crypt::keyDecrypt($crypted, $pair1['privateKey']);
+
+ $this->assertEquals($this->dataUrl, $decrypt);
+
+ }
+
+ /**
+ * @brief test encryption using legacy blowfish method
+ */
+ function testLegacyEncryptShort()
+ {
+
+ $crypted = Encryption\Crypt::legacyEncrypt($this->dataShort, $this->pass);
+
+ $this->assertNotEquals($this->dataShort, $crypted);
+
+ # TODO: search inencrypted text for actual content to ensure it
+ # genuine transformation
+
+ return $crypted;
+
+ }
+
+ /**
+ * @brief test decryption using legacy blowfish method
+ * @depends testLegacyEncryptShort
+ */
+ function testLegacyDecryptShort($crypted)
+ {
+
+ $decrypted = Encryption\Crypt::legacyDecrypt($crypted, $this->pass);
+
+ $this->assertEquals($this->dataShort, $decrypted);
+
+ }
+
+ /**
+ * @brief test encryption using legacy blowfish method
+ */
+ function testLegacyEncryptLong()
+ {
+
+ $crypted = Encryption\Crypt::legacyEncrypt($this->dataLong, $this->pass);
+
+ $this->assertNotEquals($this->dataLong, $crypted);
+
+ # TODO: search inencrypted text for actual content to ensure it
+ # genuine transformation
+
+ return $crypted;
+
+ }
+
+ /**
+ * @brief test decryption using legacy blowfish method
+ * @depends testLegacyEncryptLong
+ */
+ function testLegacyDecryptLong($crypted)
+ {
+
+ $decrypted = Encryption\Crypt::legacyDecrypt($crypted, $this->pass);
+
+ $this->assertEquals($this->dataLong, $decrypted);
+
+ $this->assertFalse(Encryption\Crypt::getBlowfish(''));
+ }
+
+ /**
+ * @brief test generation of legacy encryption key
+ * @depends testLegacyDecryptShort
+ */
+ function testLegacyCreateKey()
+ {
+
+ // Create encrypted key
+ $encKey = Encryption\Crypt::legacyCreateKey($this->pass);
+
+ // Decrypt key
+ $key = Encryption\Crypt::legacyDecrypt($encKey, $this->pass);
+
+ $this->assertTrue(is_numeric($key));
+
+ // Check that key is correct length
+ $this->assertEquals(20, strlen($key));
+
+ }
+
+ /**
+ * @brief test decryption using legacy blowfish method
+ * @depends testLegacyEncryptLong
+ */
+ function testLegacyKeyRecryptKeyfileEncrypt($crypted)
+ {
+
+ $recrypted = Encryption\Crypt::LegacyKeyRecryptKeyfile($crypted, $this->pass, array($this->genPublicKey), $this->pass, '');
+
+ $this->assertNotEquals($this->dataLong, $recrypted['data']);
+
+ return $recrypted;
+
+ # TODO: search inencrypted text for actual content to ensure it
+ # genuine transformation
+
+ }
+
+ function testRenameFile()
+ {
+
+ $filename = 'tmp-' . time();
+
+ // Save long data as encrypted file using stream wrapper
+ $cryptedFile = file_put_contents('crypt://' . $filename, $this->dataLong);
+
+ // Test that data was successfully written
+ $this->assertTrue(is_int($cryptedFile));
+
+ // Get file decrypted contents
+ $decrypt = file_get_contents('crypt://' . $filename);
+
+ $this->assertEquals($this->dataLong, $decrypt);
+
+ $newFilename = 'tmp-new-' . time();
+ $view = new \OC\Files\View('/' . $this->userId . '/files');
+ $view->rename($filename, $newFilename);
+
+ // Get file decrypted contents
+ $newDecrypt = file_get_contents('crypt://' . $newFilename);
+
+ $this->assertEquals($this->dataLong, $newDecrypt);
+
+ // tear down
+ $view->unlink($newFilename);
+ }
+
+ function testMoveFileIntoFolder()
+ {
+
+ $filename = 'tmp-' . time();
+
+ // Save long data as encrypted file using stream wrapper
+ $cryptedFile = file_put_contents('crypt://' . $filename, $this->dataLong);
+
+ // Test that data was successfully written
+ $this->assertTrue(is_int($cryptedFile));
+
+ // Get file decrypted contents
+ $decrypt = file_get_contents('crypt://' . $filename);
+
+ $this->assertEquals($this->dataLong, $decrypt);
+
+ $newFolder = '/newfolder' . time();
+ $newFilename = 'tmp-new-' . time();
+ $view = new \OC\Files\View('/' . $this->userId . '/files');
+ $view->mkdir($newFolder);
+ $view->rename($filename, $newFolder . '/' . $newFilename);
+
+ // Get file decrypted contents
+ $newDecrypt = file_get_contents('crypt://' . $newFolder . '/' . $newFilename);
+
+ $this->assertEquals($this->dataLong, $newDecrypt);
+
+ // tear down
+ $view->unlink($newFolder);
+ }
+
+ function testMoveFolder()
+ {
+
+ $view = new \OC\Files\View('/' . $this->userId . '/files');
+
+ $filename = '/tmp-' . time();
+ $folder = '/folder' . time();
+
+ $view->mkdir($folder);
+
+ // Save long data as encrypted file using stream wrapper
+ $cryptedFile = file_put_contents('crypt://' . $folder . $filename, $this->dataLong);
+
+ // Test that data was successfully written
+ $this->assertTrue(is_int($cryptedFile));
+
+ // Get file decrypted contents
+ $decrypt = file_get_contents('crypt://' . $folder . $filename);
+
+ $this->assertEquals($this->dataLong, $decrypt);
+
+ $newFolder = '/newfolder/subfolder' . time();
+ $view->mkdir('/newfolder');
+
+ $view->rename($folder, $newFolder);
+
+ // Get file decrypted contents
+ $newDecrypt = file_get_contents('crypt://' . $newFolder . $filename);
+
+ $this->assertEquals($this->dataLong, $newDecrypt);
+
+ // tear down
+ $view->unlink($newFolder);
+ }
+
+ function testChangePassphrase()
+ {
+ $filename = 'tmp-' . time();
+
+ // Save long data as encrypted file using stream wrapper
+ $cryptedFile = file_put_contents('crypt://' . $filename, $this->dataLong);
+
+ // Test that data was successfully written
+ $this->assertTrue(is_int($cryptedFile));
+
+ // Get file decrypted contents
+ $decrypt = file_get_contents('crypt://' . $filename);
+
+ $this->assertEquals($this->dataLong, $decrypt);
+
+ // change password
+ \OC_User::setPassword($this->userId, 'test', null);
+
+ // relogin
+ $params['uid'] = $this->userId;
+ $params['password'] = 'test';
+ OCA\Encryption\Hooks::login($params);
+
+ // Get file decrypted contents
+ $newDecrypt = file_get_contents('crypt://' . $filename);
+
+ $this->assertEquals($this->dataLong, $newDecrypt);
+
+ // tear down
+ // change password back
+ \OC_User::setPassword($this->userId, $this->pass);
+ $view = new \OC\Files\View('/' . $this->userId . '/files');
+ $view->unlink($filename);
+ }
+
+ function testViewFilePutAndGetContents()
+ {
+
+ $filename = '/tmp-' . time();
+ $view = new \OC\Files\View('/' . $this->userId . '/files');
+
+ // Save short data as encrypted file using stream wrapper
+ $cryptedFile = $view->file_put_contents($filename, $this->dataShort);
+
+ // Test that data was successfully written
+ $this->assertTrue(is_int($cryptedFile));
+
+ // Get file decrypted contents
+ $decrypt = $view->file_get_contents($filename);
+
+ $this->assertEquals($this->dataShort, $decrypt);
+
+ // Save long data as encrypted file using stream wrapper
+ $cryptedFileLong = $view->file_put_contents($filename, $this->dataLong);
+
+ // Test that data was successfully written
+ $this->assertTrue(is_int($cryptedFileLong));
+
+ // Get file decrypted contents
+ $decryptLong = $view->file_get_contents($filename);
+
+ $this->assertEquals($this->dataLong, $decryptLong);
+
+ // tear down
+ $view->unlink($filename);
+ }
+
+ function testTouchExistingFile()
+ {
+ $filename = '/tmp-' . time();
+ $view = new \OC\Files\View('/' . $this->userId . '/files');
+
+ // Save short data as encrypted file using stream wrapper
+ $cryptedFile = $view->file_put_contents($filename, $this->dataShort);
+
+ // Test that data was successfully written
+ $this->assertTrue(is_int($cryptedFile));
+
+ $view->touch($filename);
+
+ // Get file decrypted contents
+ $decrypt = $view->file_get_contents($filename);
+
+ $this->assertEquals($this->dataShort, $decrypt);
+
+ // tear down
+ $view->unlink($filename);
+ }
+
+ function testTouchFile()
+ {
+ $filename = '/tmp-' . time();
+ $view = new \OC\Files\View('/' . $this->userId . '/files');
+
+ $view->touch($filename);
+
+ // Save short data as encrypted file using stream wrapper
+ $cryptedFile = $view->file_put_contents($filename, $this->dataShort);
+
+ // Test that data was successfully written
+ $this->assertTrue(is_int($cryptedFile));
+
+ // Get file decrypted contents
+ $decrypt = $view->file_get_contents($filename);
+
+ $this->assertEquals($this->dataShort, $decrypt);
+
+ // tear down
+ $view->unlink($filename);
+ }
+
+ function testFopenFile()
+ {
+ $filename = '/tmp-' . time();
+ $view = new \OC\Files\View('/' . $this->userId . '/files');
+
+ // Save short data as encrypted file using stream wrapper
+ $cryptedFile = $view->file_put_contents($filename, $this->dataShort);
+
+ // Test that data was successfully written
+ $this->assertTrue(is_int($cryptedFile));
+
+ $handle = $view->fopen($filename, 'r');
+
+ // Get file decrypted contents
+ $decrypt = fgets($handle);
+
+ $this->assertEquals($this->dataShort, $decrypt);
+
+ // tear down
+ $view->unlink($filename);
+ }
+}
diff --git a/apps/files_encryption/tests/encryption.key b/apps/files_encryption/tests/encryption.key
new file mode 100644
index 0000000000000000000000000000000000000000..4495cee78e257cc4ef42add0616a1071ecb43b72
--- /dev/null
+++ b/apps/files_encryption/tests/encryption.key
@@ -0,0 +1 @@
+E_cP6HVs
\ No newline at end of file
diff --git a/apps/files_encryption/tests/keymanager.php b/apps/files_encryption/tests/keymanager.php
new file mode 100644
index 0000000000000000000000000000000000000000..b1bae673e8264d26bc4fe9bba79831b0e04e1f43
--- /dev/null
+++ b/apps/files_encryption/tests/keymanager.php
@@ -0,0 +1,245 @@
+
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+require_once realpath(dirname(__FILE__) . '/../../../lib/base.php');
+require_once realpath(dirname(__FILE__) . '/../lib/crypt.php');
+require_once realpath(dirname(__FILE__) . '/../lib/keymanager.php');
+require_once realpath(dirname(__FILE__) . '/../lib/proxy.php');
+require_once realpath(dirname(__FILE__) . '/../lib/stream.php');
+require_once realpath(dirname(__FILE__) . '/../lib/util.php');
+require_once realpath(dirname(__FILE__) . '/../lib/helper.php');
+require_once realpath(dirname(__FILE__) . '/../appinfo/app.php');
+
+use OCA\Encryption;
+
+/**
+ * Class Test_Encryption_Keymanager
+ */
+class Test_Encryption_Keymanager extends \PHPUnit_Framework_TestCase
+{
+
+ public $userId;
+ public $pass;
+ public $stateFilesTrashbin;
+ /**
+ * @var OC_FilesystemView
+ */
+ public $view;
+ public $randomKey;
+ public $dataShort;
+
+ function setUp()
+ {
+ // reset backend
+ \OC_User::clearBackends();
+ \OC_User::useBackend('database');
+
+ \OC_FileProxy::$enabled = false;
+
+ // set content for encrypting / decrypting in tests
+ $this->dataLong = file_get_contents(realpath(dirname(__FILE__) . '/../lib/crypt.php'));
+ $this->dataShort = 'hats';
+ $this->dataUrl = realpath(dirname(__FILE__) . '/../lib/crypt.php');
+ $this->legacyData = realpath(dirname(__FILE__) . '/legacy-text.txt');
+ $this->legacyEncryptedData = realpath(dirname(__FILE__) . '/legacy-encrypted-text.txt');
+ $this->randomKey = Encryption\Crypt::generateKey();
+
+ $keypair = Encryption\Crypt::createKeypair();
+ $this->genPublicKey = $keypair['publicKey'];
+ $this->genPrivateKey = $keypair['privateKey'];
+
+ $this->view = new \OC_FilesystemView('/');
+
+ \OC_User::setUserId('admin');
+ $this->userId = 'admin';
+ $this->pass = 'admin';
+
+ $userHome = \OC_User::getHome($this->userId);
+ $this->dataDir = str_replace('/' . $this->userId, '', $userHome);
+
+ // Filesystem related hooks
+ \OCA\Encryption\Helper::registerFilesystemHooks();
+
+ \OC_FileProxy::register(new OCA\Encryption\Proxy());
+
+ // remember files_trashbin state
+ $this->stateFilesTrashbin = OC_App::isEnabled('files_trashbin');
+
+ // we don't want to tests with app files_trashbin enabled
+ \OC_App::disable('files_trashbin');
+
+ \OC_Util::tearDownFS();
+ \OC_User::setUserId('');
+ \OC\Files\Filesystem::tearDown();
+ \OC_Util::setupFS($this->userId);
+ \OC_User::setUserId($this->userId);
+
+ $params['uid'] = $this->userId;
+ $params['password'] = $this->pass;
+ OCA\Encryption\Hooks::login($params);
+ }
+
+ function tearDown()
+ {
+
+ \OC_FileProxy::$enabled = true;
+ \OC_FileProxy::clearProxies();
+
+ // reset app files_trashbin
+ if ($this->stateFilesTrashbin) {
+ OC_App::enable('files_trashbin');
+ } else {
+ OC_App::disable('files_trashbin');
+ }
+ }
+
+ function testGetPrivateKey()
+ {
+
+ $key = Encryption\Keymanager::getPrivateKey($this->view, $this->userId);
+
+ $privateKey = Encryption\Crypt::symmetricDecryptFileContent($key, $this->pass);
+
+ $res = openssl_pkey_get_private($privateKey);
+
+ $this->assertTrue(is_resource($res));
+
+ $sslInfo = openssl_pkey_get_details($res);
+
+ $this->assertArrayHasKey('key', $sslInfo);
+
+ }
+
+ function testGetPublicKey()
+ {
+
+ $publiceKey = Encryption\Keymanager::getPublicKey($this->view, $this->userId);
+
+ $res = openssl_pkey_get_public($publiceKey);
+
+ $this->assertTrue(is_resource($res));
+
+ $sslInfo = openssl_pkey_get_details($res);
+
+ $this->assertArrayHasKey('key', $sslInfo);
+ }
+
+ function testSetFileKey()
+ {
+
+ # NOTE: This cannot be tested until we are able to break out
+ # of the FileSystemView data directory root
+
+ $key = Encryption\Crypt::symmetricEncryptFileContentKeyfile($this->randomKey, 'hat');
+
+ $file = 'unittest-' . time() . '.txt';
+
+ // Disable encryption proxy to prevent recursive calls
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
+ $this->view->file_put_contents($this->userId . '/files/' . $file, $key['encrypted']);
+
+ // Re-enable proxy - our work is done
+ \OC_FileProxy::$enabled = $proxyStatus;
+
+ //$view = new \OC_FilesystemView( '/' . $this->userId . '/files_encryption/keyfiles' );
+ Encryption\Keymanager::setFileKey($this->view, $file, $this->userId, $key['key']);
+
+ // enable encryption proxy
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = true;
+
+ // cleanup
+ $this->view->unlink('/' . $this->userId . '/files/' . $file);
+
+ // change encryption proxy to previous state
+ \OC_FileProxy::$enabled = $proxyStatus;
+
+ }
+
+ function testGetUserKeys()
+ {
+
+ $keys = Encryption\Keymanager::getUserKeys($this->view, $this->userId);
+
+ $resPublic = openssl_pkey_get_public($keys['publicKey']);
+
+ $this->assertTrue(is_resource($resPublic));
+
+ $sslInfoPublic = openssl_pkey_get_details($resPublic);
+
+ $this->assertArrayHasKey('key', $sslInfoPublic);
+
+ $privateKey = Encryption\Crypt::symmetricDecryptFileContent($keys['privateKey'], $this->pass);
+
+ $resPrivate = openssl_pkey_get_private($privateKey);
+
+ $this->assertTrue(is_resource($resPrivate));
+
+ $sslInfoPrivate = openssl_pkey_get_details($resPrivate);
+
+ $this->assertArrayHasKey('key', $sslInfoPrivate);
+ }
+
+ function testFixPartialFilePath()
+ {
+
+ $partFilename = 'testfile.txt.part';
+ $filename = 'testfile.txt';
+
+ $this->assertTrue(Encryption\Keymanager::isPartialFilePath($partFilename));
+
+ $this->assertEquals('testfile.txt', Encryption\Keymanager::fixPartialFilePath($partFilename));
+
+ $this->assertFalse(Encryption\Keymanager::isPartialFilePath($filename));
+
+ $this->assertEquals('testfile.txt', Encryption\Keymanager::fixPartialFilePath($filename));
+ }
+
+ function testRecursiveDelShareKeys()
+ {
+
+ // generate filename
+ $filename = '/tmp-' . time() . '.txt';
+
+ // create folder structure
+ $this->view->mkdir('/admin/files/folder1');
+ $this->view->mkdir('/admin/files/folder1/subfolder');
+ $this->view->mkdir('/admin/files/folder1/subfolder/subsubfolder');
+
+ // enable encryption proxy
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = true;
+
+ // save file with content
+ $cryptedFile = file_put_contents('crypt:///folder1/subfolder/subsubfolder/' . $filename, $this->dataShort);
+
+ // test that data was successfully written
+ $this->assertTrue(is_int($cryptedFile));
+
+ // change encryption proxy to previous state
+ \OC_FileProxy::$enabled = $proxyStatus;
+
+ // recursive delete keys
+ Encryption\Keymanager::delShareKey($this->view, array('admin'), '/folder1/');
+
+ // check if share key not exists
+ $this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys/folder1/subfolder/subsubfolder/' . $filename . '.admin.shareKey'));
+
+ // enable encryption proxy
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = true;
+
+ // cleanup
+ $this->view->unlink('/admin/files/folder1');
+
+ // change encryption proxy to previous state
+ \OC_FileProxy::$enabled = $proxyStatus;
+ }
+}
diff --git a/apps/files_encryption/tests/legacy-encrypted-text.txt b/apps/files_encryption/tests/legacy-encrypted-text.txt
new file mode 100644
index 0000000000000000000000000000000000000000..d38cb7d1b0dc6c45f755c81887f7e0887e436624
--- /dev/null
+++ b/apps/files_encryption/tests/legacy-encrypted-text.txt
@@ -0,0 +1 @@
+
ߕt.dS@t9QJ
\ No newline at end of file
diff --git a/apps/files_encryption/test/proxy.php b/apps/files_encryption/tests/proxy.php
similarity index 98%
rename from apps/files_encryption/test/proxy.php
rename to apps/files_encryption/tests/proxy.php
index 709730f7609ca2464a1faa2c410569b50fa80c19..5a2d851ff7c1019144c132875d94ddc28506ab07 100644
--- a/apps/files_encryption/test/proxy.php
+++ b/apps/files_encryption/tests/proxy.php
@@ -52,7 +52,7 @@
// $this->userId = 'admin';
// $this->pass = 'admin';
//
-// $this->session = new Encryption\Session();
+// $this->session = new Encryption\Session( $view ); // FIXME: Provide a $view object for use here
//
// $this->session->setPrivateKey(
// '-----BEGIN PRIVATE KEY-----
diff --git a/apps/files_encryption/tests/share.php b/apps/files_encryption/tests/share.php
new file mode 100755
index 0000000000000000000000000000000000000000..1d0cbfbc1def814a512a2f05a8481eac9b251898
--- /dev/null
+++ b/apps/files_encryption/tests/share.php
@@ -0,0 +1,790 @@
+
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library. If not, see .
+ *
+ */
+
+require_once realpath(dirname(__FILE__) . '/../3rdparty/Crypt_Blowfish/Blowfish.php');
+require_once realpath(dirname(__FILE__) . '/../../../lib/base.php');
+require_once realpath(dirname(__FILE__) . '/../lib/crypt.php');
+require_once realpath(dirname(__FILE__) . '/../lib/keymanager.php');
+require_once realpath(dirname(__FILE__) . '/../lib/proxy.php');
+require_once realpath(dirname(__FILE__) . '/../lib/stream.php');
+require_once realpath(dirname(__FILE__) . '/../lib/util.php');
+require_once realpath(dirname(__FILE__) . '/../lib/helper.php');
+require_once realpath(dirname(__FILE__) . '/../appinfo/app.php');
+
+use OCA\Encryption;
+
+/**
+ * Class Test_Encryption_Share
+ */
+class Test_Encryption_Share extends \PHPUnit_Framework_TestCase
+{
+
+ public $stateFilesTrashbin;
+ public $filename;
+ public $dataShort;
+ /**
+ * @var OC_FilesystemView
+ */
+ public $view;
+ public $folder1;
+ public $subfolder;
+ public $subsubfolder;
+
+ function setUp()
+ {
+ // reset backend
+ \OC_User::clearBackends();
+ \OC_User::useBackend('database');
+
+ $this->dataShort = 'hats';
+ $this->view = new \OC_FilesystemView('/');
+
+ $userHome = \OC_User::getHome('admin');
+ $this->dataDir = str_replace('/admin', '', $userHome);
+
+ $this->folder1 = '/folder1';
+ $this->subfolder = '/subfolder1';
+ $this->subsubfolder = '/subsubfolder1';
+
+ $this->filename = 'share-tmp.test';
+
+ // enable resharing
+ \OC_Appconfig::setValue('core', 'shareapi_allow_resharing', 'yes');
+
+ // clear share hooks
+ \OC_Hook::clear('OCP\\Share');
+ \OC::registerShareHooks();
+ \OCP\Util::connectHook('OC_Filesystem', 'setup', '\OC\Files\Storage\Shared', 'setup');
+
+ // Sharing related hooks
+ \OCA\Encryption\Helper::registerShareHooks();
+
+ // Filesystem related hooks
+ \OCA\Encryption\Helper::registerFilesystemHooks();
+
+ \OC_FileProxy::register(new OCA\Encryption\Proxy());
+
+ // remember files_trashbin state
+ $this->stateFilesTrashbin = OC_App::isEnabled('files_trashbin');
+
+ // we don't want to tests with app files_trashbin enabled
+ \OC_App::disable('files_trashbin');
+
+ // create users
+ $this->loginHelper('user1', true);
+ $this->loginHelper('user2', true);
+ $this->loginHelper('user3', true);
+
+ // create group and assign users
+ \OC_Group::createGroup('group1');
+ \OC_Group::addToGroup('user2', 'group1');
+ \OC_Group::addToGroup('user3', 'group1');
+ }
+
+ function tearDown()
+ {
+ // reset app files_trashbin
+ if ($this->stateFilesTrashbin) {
+ OC_App::enable('files_trashbin');
+ } else {
+ OC_App::disable('files_trashbin');
+ }
+
+ // clean group
+ \OC_Group::deleteGroup('group1');
+
+ // cleanup users
+ \OC_User::deleteUser('user1');
+ \OC_User::deleteUser('user2');
+ \OC_User::deleteUser('user3');
+
+ \OC_FileProxy::clearProxies();
+ }
+
+ /**
+ * @param bool $withTeardown
+ */
+ function testShareFile($withTeardown = true)
+ {
+ // login as admin
+ $this->loginHelper('admin');
+
+ // save file with content
+ $cryptedFile = file_put_contents('crypt://' . $this->filename, $this->dataShort);
+
+ // test that data was successfully written
+ $this->assertTrue(is_int($cryptedFile));
+
+ // disable encryption proxy to prevent recursive calls
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
+ // get the file info from previous created file
+ $fileInfo = $this->view->getFileInfo('/admin/files/' . $this->filename);
+
+ // check if we have a valid file info
+ $this->assertTrue(is_array($fileInfo));
+
+ // check if the unencrypted file size is stored
+ $this->assertGreaterThan(0, $fileInfo['unencrypted_size']);
+
+ // re-enable the file proxy
+ \OC_FileProxy::$enabled = $proxyStatus;
+
+ // share the file
+ \OCP\Share::shareItem('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, 'user1', OCP\PERMISSION_ALL);
+
+ // login as admin
+ $this->loginHelper('admin');
+
+ // check if share key for user1 exists
+ $this->assertTrue($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->filename . '.user1.shareKey'));
+
+ // login as user1
+ $this->loginHelper('user1');
+
+ // get file contents
+ $retrievedCryptedFile = $this->view->file_get_contents('/user1/files/Shared/' . $this->filename);
+
+ // check if data is the same as we previously written
+ $this->assertEquals($this->dataShort, $retrievedCryptedFile);
+
+ // cleanup
+ if ($withTeardown) {
+
+ // login as admin
+ $this->loginHelper('admin');
+
+ // unshare the file
+ \OCP\Share::unshare('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, 'user1');
+
+ // check if share key not exists
+ $this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->filename . '.user1.shareKey'));
+
+ // cleanup
+ $this->view->unlink('/admin/files/' . $this->filename);
+
+ // check if share key not exists
+ $this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->filename . '.admin.shareKey'));
+ }
+ }
+
+ /**
+ * @param bool $withTeardown
+ */
+ function testReShareFile($withTeardown = true)
+ {
+ $this->testShareFile(false);
+
+ // login as user1
+ $this->loginHelper('user1');
+
+ // get the file info
+ $fileInfo = $this->view->getFileInfo('/user1/files/Shared/' . $this->filename);
+
+ // share the file with user2
+ \OCP\Share::shareItem('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, 'user2', OCP\PERMISSION_ALL);
+
+ // login as admin
+ $this->loginHelper('admin');
+
+ // check if share key for user2 exists
+ $this->assertTrue($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->filename . '.user2.shareKey'));
+
+ // login as user2
+ $this->loginHelper('user2');
+
+ // get file contents
+ $retrievedCryptedFile = $this->view->file_get_contents('/user2/files/Shared/' . $this->filename);
+
+ // check if data is the same as previously written
+ $this->assertEquals($this->dataShort, $retrievedCryptedFile);
+
+ // cleanup
+ if ($withTeardown) {
+
+ // login as user1
+ $this->loginHelper('user1');
+
+ // unshare the file with user2
+ \OCP\Share::unshare('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, 'user2');
+
+ // login as admin
+ $this->loginHelper('admin');
+
+ // check if share key not exists
+ $this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->filename . '.user2.shareKey'));
+
+ // unshare the file with user1
+ \OCP\Share::unshare('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, 'user1');
+
+ // check if share key not exists
+ $this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->filename . '.user1.shareKey'));
+
+ // cleanup
+ $this->view->unlink('/admin/files/' . $this->filename);
+
+ // check if share key not exists
+ $this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->filename . '.admin.shareKey'));
+ }
+ }
+
+ /**
+ * @param bool $withTeardown
+ * @return array
+ */
+ function testShareFolder($withTeardown = true)
+ {
+ // login as admin
+ $this->loginHelper('admin');
+
+ // create folder structure
+ $this->view->mkdir('/admin/files' . $this->folder1);
+ $this->view->mkdir('/admin/files' . $this->folder1 . $this->subfolder);
+ $this->view->mkdir('/admin/files' . $this->folder1 . $this->subfolder . $this->subsubfolder);
+
+ // save file with content
+ $cryptedFile = file_put_contents('crypt://' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/' . $this->filename, $this->dataShort);
+
+ // test that data was successfully written
+ $this->assertTrue(is_int($cryptedFile));
+
+ // disable encryption proxy to prevent recursive calls
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
+ // get the file info from previous created folder
+ $fileInfo = $this->view->getFileInfo('/admin/files' . $this->folder1);
+
+ // check if we have a valid file info
+ $this->assertTrue(is_array($fileInfo));
+
+ // re-enable the file proxy
+ \OC_FileProxy::$enabled = $proxyStatus;
+
+ // share the folder with user1
+ \OCP\Share::shareItem('folder', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, 'user1', OCP\PERMISSION_ALL);
+
+ // login as admin
+ $this->loginHelper('admin');
+
+ // check if share key for user1 exists
+ $this->assertTrue($this->view->file_exists('/admin/files_encryption/share-keys' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/' . $this->filename . '.user1.shareKey'));
+
+ // login as user1
+ $this->loginHelper('user1');
+
+ // get file contents
+ $retrievedCryptedFile = $this->view->file_get_contents('/user1/files/Shared' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/' . $this->filename);
+
+ // check if data is the same
+ $this->assertEquals($this->dataShort, $retrievedCryptedFile);
+
+ // cleanup
+ if ($withTeardown) {
+
+ // login as admin
+ $this->loginHelper('admin');
+
+ // unshare the folder with user1
+ \OCP\Share::unshare('folder', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, 'user1');
+
+ // check if share key not exists
+ $this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/' . $this->filename . '.user1.shareKey'));
+
+ // cleanup
+ $this->view->unlink('/admin/files' . $this->folder1);
+
+ // check if share key not exists
+ $this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/' . $this->filename . '.admin.shareKey'));
+ }
+
+ return $fileInfo;
+ }
+
+ /**
+ * @param bool $withTeardown
+ */
+ function testReShareFolder($withTeardown = true)
+ {
+ $fileInfoFolder1 = $this->testShareFolder(false);
+
+ // login as user1
+ $this->loginHelper('user1');
+
+ // disable encryption proxy to prevent recursive calls
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
+ // get the file info from previous created folder
+ $fileInfoSubFolder = $this->view->getFileInfo('/user1/files/Shared' . $this->folder1 . $this->subfolder);
+
+ // check if we have a valid file info
+ $this->assertTrue(is_array($fileInfoSubFolder));
+
+ // re-enable the file proxy
+ \OC_FileProxy::$enabled = $proxyStatus;
+
+ // share the file with user2
+ \OCP\Share::shareItem('folder', $fileInfoSubFolder['fileid'], \OCP\Share::SHARE_TYPE_USER, 'user2', OCP\PERMISSION_ALL);
+
+ // login as admin
+ $this->loginHelper('admin');
+
+ // check if share key for user2 exists
+ $this->assertTrue($this->view->file_exists('/admin/files_encryption/share-keys' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/' . $this->filename . '.user2.shareKey'));
+
+ // login as user2
+ $this->loginHelper('user2');
+
+ // get file contents
+ $retrievedCryptedFile = $this->view->file_get_contents('/user2/files/Shared' . $this->subfolder . $this->subsubfolder . '/' . $this->filename);
+
+ // check if data is the same
+ $this->assertEquals($this->dataShort, $retrievedCryptedFile);
+
+ // get the file info
+ $fileInfo = $this->view->getFileInfo('/user2/files/Shared' . $this->subfolder . $this->subsubfolder . '/' . $this->filename);
+
+ // check if we have fileInfos
+ $this->assertTrue(is_array($fileInfo));
+
+ // share the file with user3
+ \OCP\Share::shareItem('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, 'user3', OCP\PERMISSION_ALL);
+
+ // login as admin
+ $this->loginHelper('admin');
+
+ // check if share key for user3 exists
+ $this->assertTrue($this->view->file_exists('/admin/files_encryption/share-keys' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/' . $this->filename . '.user3.shareKey'));
+
+ // login as user3
+ $this->loginHelper('user3');
+
+ // get file contents
+ $retrievedCryptedFile = $this->view->file_get_contents('/user3/files/Shared/' . $this->filename);
+
+ // check if data is the same
+ $this->assertEquals($this->dataShort, $retrievedCryptedFile);
+
+ // cleanup
+ if ($withTeardown) {
+
+ // login as user2
+ $this->loginHelper('user2');
+
+ // unshare the file with user3
+ \OCP\Share::unshare('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, 'user3');
+
+ // check if share key not exists
+ $this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/' . $this->filename . '.user3.shareKey'));
+
+ // login as user1
+ $this->loginHelper('user1');
+
+ // unshare the folder with user2
+ \OCP\Share::unshare('folder', $fileInfoSubFolder['fileid'], \OCP\Share::SHARE_TYPE_USER, 'user2');
+
+ // check if share key not exists
+ $this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/' . $this->filename . '.user2.shareKey'));
+
+ // login as admin
+ $this->loginHelper('admin');
+
+ // unshare the folder1 with user1
+ \OCP\Share::unshare('folder', $fileInfoFolder1['fileid'], \OCP\Share::SHARE_TYPE_USER, 'user1');
+
+ // check if share key not exists
+ $this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/' . $this->filename . '.user1.shareKey'));
+
+ // cleanup
+ $this->view->unlink('/admin/files' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/' . $this->filename);
+
+ // check if share key not exists
+ $this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/' . $this->filename . '.admin.shareKey'));
+ }
+ }
+
+ function testPublicShareFile()
+ {
+ // login as admin
+ $this->loginHelper('admin');
+
+ // save file with content
+ $cryptedFile = file_put_contents('crypt://' . $this->filename, $this->dataShort);
+
+ // test that data was successfully written
+ $this->assertTrue(is_int($cryptedFile));
+
+ // disable encryption proxy to prevent recursive calls
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
+ // get the file info from previous created file
+ $fileInfo = $this->view->getFileInfo('/admin/files/' . $this->filename);
+
+ // check if we have a valid file info
+ $this->assertTrue(is_array($fileInfo));
+
+ // check if the unencrypted file size is stored
+ $this->assertGreaterThan(0, $fileInfo['unencrypted_size']);
+
+ // re-enable the file proxy
+ \OC_FileProxy::$enabled = $proxyStatus;
+
+ // share the file
+ \OCP\Share::shareItem('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_LINK, false, OCP\PERMISSION_ALL);
+
+ // login as admin
+ $this->loginHelper('admin');
+
+ $publicShareKeyId = \OC_Appconfig::getValue('files_encryption', 'publicShareKeyId');
+
+ // check if share key for public exists
+ $this->assertTrue($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->filename . '.' . $publicShareKeyId . '.shareKey'));
+
+ // some hacking to simulate public link
+ $GLOBALS['app'] = 'files_sharing';
+ $GLOBALS['fileOwner'] = 'admin';
+ \OC_User::setUserId('');
+
+ // get file contents
+ $retrievedCryptedFile = file_get_contents('crypt://' . $this->filename);
+
+ // check if data is the same as we previously written
+ $this->assertEquals($this->dataShort, $retrievedCryptedFile);
+
+ // tear down
+
+ // login as admin
+ $this->loginHelper('admin');
+
+ // unshare the file
+ \OCP\Share::unshare('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_LINK, null);
+
+ // check if share key not exists
+ $this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->filename . '.' . $publicShareKeyId . '.shareKey'));
+
+ // cleanup
+ $this->view->unlink('/admin/files/' . $this->filename);
+
+ // check if share key not exists
+ $this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->filename . '.admin.shareKey'));
+ }
+
+ function testShareFileWithGroup()
+ {
+ // login as admin
+ $this->loginHelper('admin');
+
+ // save file with content
+ $cryptedFile = file_put_contents('crypt://' . $this->filename, $this->dataShort);
+
+ // test that data was successfully written
+ $this->assertTrue(is_int($cryptedFile));
+
+ // disable encryption proxy to prevent recursive calls
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
+ // get the file info from previous created file
+ $fileInfo = $this->view->getFileInfo('/admin/files/' . $this->filename);
+
+ // check if we have a valid file info
+ $this->assertTrue(is_array($fileInfo));
+
+ // check if the unencrypted file size is stored
+ $this->assertGreaterThan(0, $fileInfo['unencrypted_size']);
+
+ // re-enable the file proxy
+ \OC_FileProxy::$enabled = $proxyStatus;
+
+ // share the file
+ \OCP\Share::shareItem('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_GROUP, 'group1', OCP\PERMISSION_ALL);
+
+ // login as admin
+ $this->loginHelper('admin');
+
+ // check if share key for user2 and user3 exists
+ $this->assertTrue($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->filename . '.user2.shareKey'));
+ $this->assertTrue($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->filename . '.user3.shareKey'));
+
+ // login as user1
+ $this->loginHelper('user2');
+
+ // get file contents
+ $retrievedCryptedFile = $this->view->file_get_contents('/user2/files/Shared/' . $this->filename);
+
+ // check if data is the same as we previously written
+ $this->assertEquals($this->dataShort, $retrievedCryptedFile);
+
+ // login as admin
+ $this->loginHelper('admin');
+
+ // unshare the file
+ \OCP\Share::unshare('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_GROUP, 'group1');
+
+ // check if share key not exists
+ $this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->filename . '.user2.shareKey'));
+ $this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->filename . '.user3.shareKey'));
+
+ // cleanup
+ $this->view->unlink('/admin/files/' . $this->filename);
+
+ // check if share key not exists
+ $this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->filename . '.admin.shareKey'));
+
+ }
+
+ function testRecoveryFile()
+ {
+ \OCA\Encryption\Helper::adminEnableRecovery(null, 'test123');
+ $recoveryKeyId = OC_Appconfig::getValue('files_encryption', 'recoveryKeyId');
+
+ // check if control file created
+ $this->assertTrue($this->view->file_exists('/control-file/controlfile.enc'));
+
+ // login as admin
+ $this->loginHelper('admin');
+
+ $util = new \OCA\Encryption\Util(new \OC_FilesystemView('/'), 'admin');
+
+ // check if recovery password match
+ $this->assertTrue($util->checkRecoveryPassword('test123'));
+
+ // enable recovery for admin
+ $this->assertTrue($util->setRecoveryForUser(1));
+
+ // create folder structure
+ $this->view->mkdir('/admin/files' . $this->folder1);
+ $this->view->mkdir('/admin/files' . $this->folder1 . $this->subfolder);
+ $this->view->mkdir('/admin/files' . $this->folder1 . $this->subfolder . $this->subsubfolder);
+
+ // save file with content
+ $cryptedFile1 = file_put_contents('crypt://' . $this->filename, $this->dataShort);
+ $cryptedFile2 = file_put_contents('crypt://' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/' . $this->filename, $this->dataShort);
+
+ // test that data was successfully written
+ $this->assertTrue(is_int($cryptedFile1));
+ $this->assertTrue(is_int($cryptedFile2));
+
+ // check if share key for admin and recovery exists
+ $this->assertTrue($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->filename . '.admin.shareKey'));
+ $this->assertTrue($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->filename . '.' . $recoveryKeyId . '.shareKey'));
+ $this->assertTrue($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/' . $this->filename . '.admin.shareKey'));
+ $this->assertTrue($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/' . $this->filename . '.' . $recoveryKeyId . '.shareKey'));
+
+ // disable recovery for admin
+ $this->assertTrue($util->setRecoveryForUser(0));
+
+ // remove all recovery keys
+ $util->removeRecoveryKeys('/');
+
+ // check if share key for recovery not exists
+ $this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->filename . '.' . $recoveryKeyId . '.shareKey'));
+ $this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/' . $this->filename . '.' . $recoveryKeyId . '.shareKey'));
+
+ // enable recovery for admin
+ $this->assertTrue($util->setRecoveryForUser(1));
+
+ // remove all recovery keys
+ $util->addRecoveryKeys('/');
+
+ // check if share key for admin and recovery exists
+ $this->assertTrue($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->filename . '.' . $recoveryKeyId . '.shareKey'));
+ $this->assertTrue($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/' . $this->filename . '.' . $recoveryKeyId . '.shareKey'));
+
+ // cleanup
+ $this->view->unlink('/admin/files/' . $this->filename);
+ $this->view->unlink('/admin/files/' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/' . $this->filename);
+
+ // check if share key for recovery not exists
+ $this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->filename . '.' . $recoveryKeyId . '.shareKey'));
+ $this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/' . $this->filename . '.' . $recoveryKeyId . '.shareKey'));
+
+ $this->assertTrue(\OCA\Encryption\Helper::adminEnableRecovery(null, 'test123'));
+ $this->assertTrue(\OCA\Encryption\Helper::adminDisableRecovery('test123'));
+ $this->assertEquals(0, \OC_Appconfig::getValue('files_encryption', 'recoveryAdminEnabled'));
+ }
+
+ function testRecoveryForUser()
+ {
+ // login as admin
+ $this->loginHelper('admin');
+
+ \OCA\Encryption\Helper::adminEnableRecovery(null, 'test123');
+ $recoveryKeyId = OC_Appconfig::getValue('files_encryption', 'recoveryKeyId');
+
+ // check if control file created
+ $this->assertTrue($this->view->file_exists('/control-file/controlfile.enc'));
+
+ // login as user1
+ $this->loginHelper('user1');
+
+ $util = new \OCA\Encryption\Util(new \OC_FilesystemView('/'), 'user1');
+
+ // enable recovery for admin
+ $this->assertTrue($util->setRecoveryForUser(1));
+
+ // create folder structure
+ $this->view->mkdir('/user1/files' . $this->folder1);
+ $this->view->mkdir('/user1/files' . $this->folder1 . $this->subfolder);
+ $this->view->mkdir('/user1/files' . $this->folder1 . $this->subfolder . $this->subsubfolder);
+
+ // save file with content
+ $cryptedFile1 = file_put_contents('crypt://' . $this->filename, $this->dataShort);
+ $cryptedFile2 = file_put_contents('crypt://' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/' . $this->filename, $this->dataShort);
+
+ // test that data was successfully written
+ $this->assertTrue(is_int($cryptedFile1));
+ $this->assertTrue(is_int($cryptedFile2));
+
+ // check if share key for user and recovery exists
+ $this->assertTrue($this->view->file_exists('/user1/files_encryption/share-keys/' . $this->filename . '.user1.shareKey'));
+ $this->assertTrue($this->view->file_exists('/user1/files_encryption/share-keys/' . $this->filename . '.' . $recoveryKeyId . '.shareKey'));
+ $this->assertTrue($this->view->file_exists('/user1/files_encryption/share-keys/' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/' . $this->filename . '.user1.shareKey'));
+ $this->assertTrue($this->view->file_exists('/user1/files_encryption/share-keys/' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/' . $this->filename . '.' . $recoveryKeyId . '.shareKey'));
+
+ // login as admin
+ $this->loginHelper('admin');
+
+ // change password
+ \OC_User::setPassword('user1', 'test', 'test123');
+
+ // login as user1
+ $this->loginHelper('user1', false, 'test');
+
+ // get file contents
+ $retrievedCryptedFile1 = file_get_contents('crypt://' . $this->filename);
+ $retrievedCryptedFile2 = file_get_contents('crypt://' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/' . $this->filename);
+
+ // check if data is the same as we previously written
+ $this->assertEquals($this->dataShort, $retrievedCryptedFile1);
+ $this->assertEquals($this->dataShort, $retrievedCryptedFile2);
+
+ // cleanup
+ $this->view->unlink('/user1/files' . $this->folder1);
+ $this->view->unlink('/user1/files' . $this->filename);
+
+ // check if share key for user and recovery exists
+ $this->assertFalse($this->view->file_exists('/user1/files_encryption/share-keys/' . $this->filename . '.user1.shareKey'));
+ $this->assertFalse($this->view->file_exists('/user1/files_encryption/share-keys/' . $this->filename . '.' . $recoveryKeyId . '.shareKey'));
+ $this->assertFalse($this->view->file_exists('/user1/files_encryption/share-keys/' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/' . $this->filename . '.user1.shareKey'));
+ $this->assertFalse($this->view->file_exists('/user1/files_encryption/share-keys/' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/' . $this->filename . '.' . $recoveryKeyId . '.shareKey'));
+
+ // enable recovery for admin
+ $this->assertTrue($util->setRecoveryForUser(0));
+
+ \OCA\Encryption\Helper::adminDisableRecovery('test123');
+ $this->assertEquals(0, \OC_Appconfig::getValue('files_encryption', 'recoveryAdminEnabled'));
+ }
+
+ function testFailShareFile()
+ {
+ // login as admin
+ $this->loginHelper('admin');
+
+ // save file with content
+ $cryptedFile = file_put_contents('crypt://' . $this->filename, $this->dataShort);
+
+ // test that data was successfully written
+ $this->assertTrue(is_int($cryptedFile));
+
+ // disable encryption proxy to prevent recursive calls
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
+ // get the file info from previous created file
+ $fileInfo = $this->view->getFileInfo('/admin/files/' . $this->filename);
+
+ // check if we have a valid file info
+ $this->assertTrue(is_array($fileInfo));
+
+ // check if the unencrypted file size is stored
+ $this->assertGreaterThan(0, $fileInfo['unencrypted_size']);
+
+ // break users public key
+ $this->view->rename('/public-keys/user2.public.key', '/public-keys/user2.public.key_backup');
+
+ // re-enable the file proxy
+ \OC_FileProxy::$enabled = $proxyStatus;
+
+ // share the file
+ \OCP\Share::shareItem('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_GROUP, 'group1', OCP\PERMISSION_ALL);
+
+ // login as admin
+ $this->loginHelper('admin');
+
+ // check if share key for user1 not exists
+ $this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->filename . '.user2.shareKey'));
+
+ // disable encryption proxy to prevent recursive calls
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
+ // break user1 public key
+ $this->view->rename('/public-keys/user2.public.key_backup', '/public-keys/user2.public.key');
+
+ // remove share file
+ $this->view->unlink('/admin/files_encryption/share-keys/' . $this->filename . '.user2.shareKey');
+
+ // re-enable the file proxy
+ \OC_FileProxy::$enabled = $proxyStatus;
+
+ // unshare the file with user1
+ \OCP\Share::unshare('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_GROUP, 'group1');
+
+ // check if share key not exists
+ $this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->filename . '.user2.shareKey'));
+
+ // cleanup
+ $this->view->unlink('/admin/files/' . $this->filename);
+ }
+
+
+
+ /**
+ * @param $user
+ * @param bool $create
+ * @param bool $password
+ */
+ function loginHelper($user, $create = false, $password = false)
+ {
+ if ($create) {
+ \OC_User::createUser($user, $user);
+ }
+
+ if ($password === false) {
+ $password = $user;
+ }
+
+ \OC_Util::tearDownFS();
+ \OC_User::setUserId('');
+ \OC\Files\Filesystem::tearDown();
+ \OC_Util::setupFS($user);
+ \OC_User::setUserId($user);
+
+ $params['uid'] = $user;
+ $params['password'] = $password;
+ OCA\Encryption\Hooks::login($params);
+ }
+}
diff --git a/apps/files_encryption/tests/stream.php b/apps/files_encryption/tests/stream.php
new file mode 100644
index 0000000000000000000000000000000000000000..3765d986e12c22d537ed416666617737352f725a
--- /dev/null
+++ b/apps/files_encryption/tests/stream.php
@@ -0,0 +1,182 @@
+
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library. If not, see .
+ *
+ */
+
+require_once realpath(dirname(__FILE__) . '/../../../lib/base.php');
+require_once realpath(dirname(__FILE__) . '/../lib/crypt.php');
+require_once realpath(dirname(__FILE__) . '/../lib/keymanager.php');
+require_once realpath(dirname(__FILE__) . '/../lib/proxy.php');
+require_once realpath(dirname(__FILE__) . '/../lib/stream.php');
+require_once realpath(dirname(__FILE__) . '/../lib/util.php');
+require_once realpath(dirname(__FILE__) . '/../appinfo/app.php');
+
+use OCA\Encryption;
+
+/**
+ * Class Test_Encryption_Stream
+ * @brief this class provide basic stream tests
+ */
+class Test_Encryption_Stream extends \PHPUnit_Framework_TestCase
+{
+
+ public $userId;
+ public $pass;
+ /**
+ * @var \OC_FilesystemView
+ */
+ public $view;
+ public $dataShort;
+ public $stateFilesTrashbin;
+
+ function setUp()
+ {
+ // reset backend
+ \OC_User::useBackend('database');
+
+ // set user id
+ \OC_User::setUserId('admin');
+ $this->userId = 'admin';
+ $this->pass = 'admin';
+
+ // init filesystem view
+ $this->view = new \OC_FilesystemView('/');
+
+ // init short data
+ $this->dataShort = 'hats';
+
+ // init filesystem related hooks
+ \OCA\Encryption\Helper::registerFilesystemHooks();
+
+ // register encryption file proxy
+ \OC_FileProxy::register(new OCA\Encryption\Proxy());
+
+ // remember files_trashbin state
+ $this->stateFilesTrashbin = OC_App::isEnabled('files_trashbin');
+
+ // we don't want to tests with app files_trashbin enabled
+ \OC_App::disable('files_trashbin');
+
+ // init filesystem for user
+ \OC_Util::tearDownFS();
+ \OC_User::setUserId('');
+ \OC\Files\Filesystem::tearDown();
+ \OC_Util::setupFS($this->userId);
+ \OC_User::setUserId($this->userId);
+
+ // login user
+ $params['uid'] = $this->userId;
+ $params['password'] = $this->pass;
+ OCA\Encryption\Hooks::login($params);
+ }
+
+ function tearDown()
+ {
+ // reset app files_trashbin
+ if ($this->stateFilesTrashbin) {
+ OC_App::enable('files_trashbin');
+ } else {
+ OC_App::disable('files_trashbin');
+ }
+
+ // clear all proxies
+ \OC_FileProxy::clearProxies();
+ }
+
+ function testStreamOptions() {
+ $filename = '/tmp-' . time();
+ $view = new \OC\Files\View('/' . $this->userId . '/files');
+
+ // Save short data as encrypted file using stream wrapper
+ $cryptedFile = $view->file_put_contents($filename, $this->dataShort);
+
+ // Test that data was successfully written
+ $this->assertTrue(is_int($cryptedFile));
+
+ $handle = $view->fopen($filename, 'r');
+
+ // check if stream is at position zero
+ $this->assertEquals(0,ftell($handle));
+
+ // set stream options
+ $this->assertTrue(flock($handle, LOCK_SH));
+ $this->assertTrue(flock($handle, LOCK_UN));
+
+ // tear down
+ $view->unlink($filename);
+ }
+
+ function testStreamSetBlocking() {
+ $filename = '/tmp-' . time();
+ $view = new \OC\Files\View('/' . $this->userId . '/files');
+
+ // Save short data as encrypted file using stream wrapper
+ $cryptedFile = $view->file_put_contents($filename, $this->dataShort);
+
+ // Test that data was successfully written
+ $this->assertTrue(is_int($cryptedFile));
+
+ $handle = $view->fopen($filename, 'r');
+
+ // set stream options
+ $this->assertTrue(stream_set_blocking($handle,1));
+
+ // tear down
+ $view->unlink($filename);
+ }
+
+ function testStreamSetTimeout() {
+ $filename = '/tmp-' . time();
+ $view = new \OC\Files\View('/' . $this->userId . '/files');
+
+ // Save short data as encrypted file using stream wrapper
+ $cryptedFile = $view->file_put_contents($filename, $this->dataShort);
+
+ // Test that data was successfully written
+ $this->assertTrue(is_int($cryptedFile));
+
+ $handle = $view->fopen($filename, 'r');
+
+ // set stream options
+ $this->assertFalse(stream_set_timeout($handle,1));
+
+ // tear down
+ $view->unlink($filename);
+ }
+
+ function testStreamSetWriteBuffer() {
+ $filename = '/tmp-' . time();
+ $view = new \OC\Files\View('/' . $this->userId . '/files');
+
+ // Save short data as encrypted file using stream wrapper
+ $cryptedFile = $view->file_put_contents($filename, $this->dataShort);
+
+ // Test that data was successfully written
+ $this->assertTrue(is_int($cryptedFile));
+
+ $handle = $view->fopen($filename, 'r');
+
+ // set stream options
+ $this->assertEquals(0, stream_set_write_buffer($handle,1024));
+
+ // tear down
+ $view->unlink($filename);
+ }
+}
\ No newline at end of file
diff --git a/apps/files_encryption/tests/trashbin.php b/apps/files_encryption/tests/trashbin.php
new file mode 100755
index 0000000000000000000000000000000000000000..b62041a6d3c2c1e9294e529ddfd18ba968cb72fe
--- /dev/null
+++ b/apps/files_encryption/tests/trashbin.php
@@ -0,0 +1,269 @@
+
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library. If not, see .
+ *
+ */
+
+require_once realpath(dirname(__FILE__) . '/../../../lib/base.php');
+require_once realpath(dirname(__FILE__) . '/../lib/crypt.php');
+require_once realpath(dirname(__FILE__) . '/../lib/keymanager.php');
+require_once realpath(dirname(__FILE__) . '/../lib/proxy.php');
+require_once realpath(dirname(__FILE__) . '/../lib/stream.php');
+require_once realpath(dirname(__FILE__) . '/../lib/util.php');
+require_once realpath(dirname(__FILE__) . '/../appinfo/app.php');
+require_once realpath(dirname(__FILE__) . '/../../files_trashbin/appinfo/app.php');
+
+use OCA\Encryption;
+
+/**
+ * Class Test_Encryption_Trashbin
+ * @brief this class provide basic trashbin app tests
+ */
+class Test_Encryption_Trashbin extends \PHPUnit_Framework_TestCase
+{
+
+ public $userId;
+ public $pass;
+ /**
+ * @var \OC_FilesystemView
+ */
+ public $view;
+ public $dataShort;
+ public $stateFilesTrashbin;
+ public $folder1;
+ public $subfolder;
+ public $subsubfolder;
+
+ function setUp()
+ {
+ // reset backend
+ \OC_User::useBackend('database');
+
+ // set user id
+ \OC_User::setUserId('admin');
+ $this->userId = 'admin';
+ $this->pass = 'admin';
+
+ // init filesystem view
+ $this->view = new \OC_FilesystemView('/');
+
+ // init short data
+ $this->dataShort = 'hats';
+
+ $this->folder1 = '/folder1';
+ $this->subfolder = '/subfolder1';
+ $this->subsubfolder = '/subsubfolder1';
+
+ \OC_Hook::clear('OC_Filesystem');
+ \OC_Hook::clear('OC_User');
+
+ // init filesystem related hooks
+ \OCA\Encryption\Helper::registerFilesystemHooks();
+
+ // register encryption file proxy
+ \OC_FileProxy::register(new OCA\Encryption\Proxy());
+
+ // trashbin hooks
+ \OCA\Files_Trashbin\Trashbin::registerHooks();
+
+ // remember files_trashbin state
+ $this->stateFilesTrashbin = OC_App::isEnabled('files_trashbin');
+
+ // we don't want to tests with app files_trashbin enabled
+ \OC_App::enable('files_trashbin');
+
+ // init filesystem for user
+ \OC_Util::tearDownFS();
+ \OC_User::setUserId('');
+ \OC\Files\Filesystem::tearDown();
+ \OC_Util::setupFS($this->userId);
+ \OC_User::setUserId($this->userId);
+
+ // login user
+ $params['uid'] = $this->userId;
+ $params['password'] = $this->pass;
+ OCA\Encryption\Hooks::login($params);
+ }
+
+ function tearDown()
+ {
+ // reset app files_trashbin
+ if ($this->stateFilesTrashbin) {
+ OC_App::enable('files_trashbin');
+ } else {
+ OC_App::disable('files_trashbin');
+ }
+
+ // clear all proxies
+ \OC_FileProxy::clearProxies();
+ }
+
+ /**
+ * @brief test delete file
+ */
+ function testDeleteFile() {
+
+ // generate filename
+ $filename = 'tmp-' . time() . '.txt';
+
+ // save file with content
+ $cryptedFile = file_put_contents('crypt:///' . $filename, $this->dataShort);
+
+ // test that data was successfully written
+ $this->assertTrue(is_int($cryptedFile));
+
+ // check if key for admin exists
+ $this->assertTrue($this->view->file_exists('/admin/files_encryption/keyfiles/' . $filename . '.key'));
+
+ // check if share key for admin exists
+ $this->assertTrue($this->view->file_exists('/admin/files_encryption/share-keys/' . $filename . '.admin.shareKey'));
+
+ // delete file
+ \OC\FIles\Filesystem::unlink($filename);
+
+ // check if file not exists
+ $this->assertFalse($this->view->file_exists('/admin/files/' . $filename));
+
+ // check if key for admin not exists
+ $this->assertFalse($this->view->file_exists('/admin/files_encryption/keyfiles/' . $filename . '.key'));
+
+ // check if share key for admin not exists
+ $this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys/' . $filename . '.admin.shareKey'));
+
+ // get files
+ $trashFiles = $this->view->getDirectoryContent('/admin/files_trashbin/files/');
+
+ $trashFileSuffix = null;
+ // find created file with timestamp
+ foreach($trashFiles as $file) {
+ if(strncmp($file['path'], $filename, strlen($filename))) {
+ $path_parts = pathinfo($file['name']);
+ $trashFileSuffix = $path_parts['extension'];
+ }
+ }
+
+ // check if we found the file we created
+ $this->assertNotNull($trashFileSuffix);
+
+ // check if key for admin not exists
+ $this->assertTrue($this->view->file_exists('/admin/files_trashbin/keyfiles/' . $filename . '.key.' . $trashFileSuffix));
+
+ // check if share key for admin not exists
+ $this->assertTrue($this->view->file_exists('/admin/files_trashbin/share-keys/' . $filename . '.admin.shareKey.' . $trashFileSuffix));
+
+ // return filename for next test
+ return $filename . '.' . $trashFileSuffix;
+ }
+
+ /**
+ * @brief test restore file
+ *
+ * @depends testDeleteFile
+ */
+ function testRestoreFile($filename) {
+
+ // prepare file information
+ $path_parts = pathinfo($filename);
+ $trashFileSuffix = $path_parts['extension'];
+ $timestamp = str_replace('d', '', $trashFileSuffix);
+ $fileNameWithoutSuffix = str_replace('.'.$trashFileSuffix, '', $filename);
+
+ // restore file
+ $this->assertTrue(\OCA\Files_Trashbin\Trashbin::restore($filename, $fileNameWithoutSuffix, $timestamp));
+
+ // check if file exists
+ $this->assertTrue($this->view->file_exists('/admin/files/' . $fileNameWithoutSuffix));
+
+ // check if key for admin exists
+ $this->assertTrue($this->view->file_exists('/admin/files_encryption/keyfiles/' . $fileNameWithoutSuffix . '.key'));
+
+ // check if share key for admin exists
+ $this->assertTrue($this->view->file_exists('/admin/files_encryption/share-keys/' . $fileNameWithoutSuffix . '.admin.shareKey'));
+ }
+
+ /**
+ * @brief test delete file forever
+ */
+ function testPermanentDeleteFile() {
+
+ // generate filename
+ $filename = 'tmp-' . time() . '.txt';
+
+ // save file with content
+ $cryptedFile = file_put_contents('crypt:///' . $filename, $this->dataShort);
+
+ // test that data was successfully written
+ $this->assertTrue(is_int($cryptedFile));
+
+ // check if key for admin exists
+ $this->assertTrue($this->view->file_exists('/admin/files_encryption/keyfiles/' . $filename . '.key'));
+
+ // check if share key for admin exists
+ $this->assertTrue($this->view->file_exists('/admin/files_encryption/share-keys/' . $filename . '.admin.shareKey'));
+
+ // delete file
+ \OC\FIles\Filesystem::unlink($filename);
+
+ // check if file not exists
+ $this->assertFalse($this->view->file_exists('/admin/files/' . $filename));
+
+ // check if key for admin not exists
+ $this->assertFalse($this->view->file_exists('/admin/files_encryption/keyfiles/' . $filename . '.key'));
+
+ // check if share key for admin not exists
+ $this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys/' . $filename . '.admin.shareKey'));
+
+ // get files
+ $trashFiles = $this->view->getDirectoryContent('/admin/files_trashbin/files/');
+
+ $trashFileSuffix = null;
+ // find created file with timestamp
+ foreach($trashFiles as $file) {
+ if(strncmp($file['path'], $filename, strlen($filename))) {
+ $path_parts = pathinfo($file['name']);
+ $trashFileSuffix = $path_parts['extension'];
+ }
+ }
+
+ // check if we found the file we created
+ $this->assertNotNull($trashFileSuffix);
+
+ // check if key for admin exists
+ $this->assertTrue($this->view->file_exists('/admin/files_trashbin/keyfiles/' . $filename . '.key.' . $trashFileSuffix));
+
+ // check if share key for admin exists
+ $this->assertTrue($this->view->file_exists('/admin/files_trashbin/share-keys/' . $filename . '.admin.shareKey.' . $trashFileSuffix));
+
+ // get timestamp from file
+ $timestamp = str_replace('d', '', $trashFileSuffix);
+
+ // delete file forever
+ $this->assertGreaterThan(0, \OCA\Files_Trashbin\Trashbin::delete($filename, $timestamp));
+
+ // check if key for admin not exists
+ $this->assertFalse($this->view->file_exists('/admin/files_trashbin/files/' . $filename . '.' . $trashFileSuffix));
+
+ // check if key for admin not exists
+ $this->assertFalse($this->view->file_exists('/admin/files_trashbin/keyfiles/' . $filename . '.key.' . $trashFileSuffix));
+
+ // check if share key for admin not exists
+ $this->assertFalse($this->view->file_exists('/admin/files_trashbin/share-keys/' . $filename . '.admin.shareKey.' . $trashFileSuffix));
+ }
+
+}
\ No newline at end of file
diff --git a/apps/files_encryption/tests/util.php b/apps/files_encryption/tests/util.php
new file mode 100755
index 0000000000000000000000000000000000000000..a2be8a40417f4ed754ae477a6002dcb7cd21d0f5
--- /dev/null
+++ b/apps/files_encryption/tests/util.php
@@ -0,0 +1,277 @@
+
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+require_once realpath(dirname(__FILE__) . '/../../../lib/base.php');
+require_once realpath(dirname(__FILE__) . '/../lib/crypt.php');
+require_once realpath(dirname(__FILE__) . '/../lib/keymanager.php');
+require_once realpath(dirname(__FILE__) . '/../lib/proxy.php');
+require_once realpath(dirname(__FILE__) . '/../lib/stream.php');
+require_once realpath(dirname(__FILE__) . '/../lib/util.php');
+require_once realpath(dirname(__FILE__) . '/../appinfo/app.php');
+
+use OCA\Encryption;
+
+/**
+ * Class Test_Encryption_Util
+ */
+class Test_Encryption_Util extends \PHPUnit_Framework_TestCase
+{
+
+ public $userId;
+ public $encryptionDir;
+ public $publicKeyDir;
+ public $pass;
+ /**
+ * @var OC_FilesystemView
+ */
+ public $view;
+ public $keyfilesPath;
+ public $publicKeyPath;
+ public $privateKeyPath;
+ /**
+ * @var \OCA\Encryption\Util
+ */
+ public $util;
+ public $dataShort;
+ public $legacyEncryptedData;
+ public $legacyEncryptedDataKey;
+ public $lagacyKey;
+
+ function setUp()
+ {
+ // reset backend
+ \OC_User::useBackend('database');
+
+ \OC_User::setUserId('admin');
+ $this->userId = 'admin';
+ $this->pass = 'admin';
+
+ // set content for encrypting / decrypting in tests
+ $this->dataUrl = realpath(dirname(__FILE__) . '/../lib/crypt.php');
+ $this->dataShort = 'hats';
+ $this->dataLong = file_get_contents(realpath(dirname(__FILE__) . '/../lib/crypt.php'));
+ $this->legacyData = realpath(dirname(__FILE__) . '/legacy-text.txt');
+ $this->legacyEncryptedData = realpath(dirname(__FILE__) . '/legacy-encrypted-text.txt');
+ $this->legacyEncryptedDataKey = realpath(dirname(__FILE__) . '/encryption.key');
+ $this->lagacyKey = '62829813025828180801';
+
+ $keypair = Encryption\Crypt::createKeypair();
+
+ $this->genPublicKey = $keypair['publicKey'];
+ $this->genPrivateKey = $keypair['privateKey'];
+
+ $this->publicKeyDir = '/' . 'public-keys';
+ $this->encryptionDir = '/' . $this->userId . '/' . 'files_encryption';
+ $this->keyfilesPath = $this->encryptionDir . '/' . 'keyfiles';
+ $this->publicKeyPath = $this->publicKeyDir . '/' . $this->userId . '.public.key'; // e.g. data/public-keys/admin.public.key
+ $this->privateKeyPath = $this->encryptionDir . '/' . $this->userId . '.private.key'; // e.g. data/admin/admin.private.key
+
+ $this->view = new \OC_FilesystemView('/');
+
+ $userHome = \OC_User::getHome($this->userId);
+ $this->dataDir = str_replace('/' . $this->userId, '', $userHome);
+
+ // Filesystem related hooks
+ \OCA\Encryption\Helper::registerFilesystemHooks();
+
+ \OC_FileProxy::register(new OCA\Encryption\Proxy());
+
+ \OC_Util::tearDownFS();
+ \OC_User::setUserId('');
+ \OC\Files\Filesystem::tearDown();
+ \OC_Util::setupFS($this->userId);
+ \OC_User::setUserId($this->userId);
+
+ $params['uid'] = $this->userId;
+ $params['password'] = $this->pass;
+ OCA\Encryption\Hooks::login($params);
+
+ $this->util = new Encryption\Util($this->view, $this->userId);
+ }
+
+ function tearDown()
+ {
+
+ \OC_FileProxy::clearProxies();
+ }
+
+ /**
+ * @brief test that paths set during User construction are correct
+ */
+ function testKeyPaths()
+ {
+ $util = new Encryption\Util($this->view, $this->userId);
+
+ $this->assertEquals($this->publicKeyDir, $util->getPath('publicKeyDir'));
+ $this->assertEquals($this->encryptionDir, $util->getPath('encryptionDir'));
+ $this->assertEquals($this->keyfilesPath, $util->getPath('keyfilesPath'));
+ $this->assertEquals($this->publicKeyPath, $util->getPath('publicKeyPath'));
+ $this->assertEquals($this->privateKeyPath, $util->getPath('privateKeyPath'));
+
+ }
+
+ /**
+ * @brief test setup of encryption directories
+ */
+ function testSetupServerSide()
+ {
+ $this->assertEquals(true, $this->util->setupServerSide($this->pass));
+ }
+
+ /**
+ * @brief test checking whether account is ready for encryption,
+ */
+ function testUserIsReady()
+ {
+ $this->assertEquals(true, $this->util->ready());
+ }
+
+ /**
+ * @brief test checking whether account is not ready for encryption,
+ */
+ function testUserIsNotReady()
+ {
+ $this->view->unlink($this->publicKeyDir);
+
+ $params['uid'] = $this->userId;
+ $params['password'] = $this->pass;
+ $this->assertFalse(OCA\Encryption\Hooks::login($params));
+
+ $this->view->unlink($this->privateKeyPath);
+ }
+
+ /**
+ * @brief test checking whether account is not ready for encryption,
+ */
+ function testIsLagacyUser()
+ {
+ $userView = new \OC_FilesystemView( '/' . $this->userId );
+
+ // Disable encryption proxy to prevent recursive calls
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
+ $encryptionKeyContent = file_get_contents($this->legacyEncryptedDataKey);
+ $userView->file_put_contents('/encryption.key', $encryptionKeyContent);
+
+ \OC_FileProxy::$enabled = $proxyStatus;
+
+ $params['uid'] = $this->userId;
+ $params['password'] = $this->pass;
+
+ $util = new Encryption\Util($this->view, $this->userId);
+ $util->setMigrationStatus(0);
+
+ $this->assertTrue(OCA\Encryption\Hooks::login($params));
+
+ $this->assertEquals($this->lagacyKey, $_SESSION['legacyKey']);
+ }
+
+ function testRecoveryEnabledForUser()
+ {
+
+ $util = new Encryption\Util($this->view, $this->userId);
+
+ // Record the value so we can return it to it's original state later
+ $enabled = $util->recoveryEnabledForUser();
+
+ $this->assertTrue($util->setRecoveryForUser(1));
+
+ $this->assertEquals(1, $util->recoveryEnabledForUser());
+
+ $this->assertTrue($util->setRecoveryForUser(0));
+
+ $this->assertEquals(0, $util->recoveryEnabledForUser());
+
+ // Return the setting to it's previous state
+ $this->assertTrue($util->setRecoveryForUser($enabled));
+
+ }
+
+ function testGetUidAndFilename()
+ {
+
+ \OC_User::setUserId('admin');
+
+ $filename = 'tmp-' . time() . '.test';
+
+ // Disable encryption proxy to prevent recursive calls
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
+ $this->view->file_put_contents($this->userId . '/files/' . $filename, $this->dataShort);
+
+ // Re-enable proxy - our work is done
+ \OC_FileProxy::$enabled = $proxyStatus;
+
+ $util = new Encryption\Util($this->view, $this->userId);
+
+ list($fileOwnerUid, $file) = $util->getUidAndFilename($filename);
+
+ $this->assertEquals('admin', $fileOwnerUid);
+
+ $this->assertEquals($file, $filename);
+ }
+
+ function testIsSharedPath() {
+ $sharedPath = '/user1/files/Shared/test';
+ $path = '/user1/files/test';
+
+ $this->assertTrue($this->util->isSharedPath($sharedPath));
+
+ $this->assertFalse($this->util->isSharedPath($path));
+ }
+
+ function testEncryptLagacyFiles()
+ {
+ $userView = new \OC_FilesystemView( '/' . $this->userId);
+ $view = new \OC_FilesystemView( '/' . $this->userId . '/files' );
+
+ // Disable encryption proxy to prevent recursive calls
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
+ $encryptionKeyContent = file_get_contents($this->legacyEncryptedDataKey);
+ $userView->file_put_contents('/encryption.key', $encryptionKeyContent);
+
+ $legacyEncryptedData = file_get_contents($this->legacyEncryptedData);
+ $view->mkdir('/test/');
+ $view->mkdir('/test/subtest/');
+ $view->file_put_contents('/test/subtest/legacy-encrypted-text.txt', $legacyEncryptedData);
+
+ $fileInfo = $view->getFileInfo('/test/subtest/legacy-encrypted-text.txt');
+ $fileInfo['encrypted'] = true;
+ $view->putFileInfo('/test/subtest/legacy-encrypted-text.txt', $fileInfo);
+
+ \OC_FileProxy::$enabled = $proxyStatus;
+
+ $params['uid'] = $this->userId;
+ $params['password'] = $this->pass;
+
+ $util = new Encryption\Util($this->view, $this->userId);
+ $util->setMigrationStatus(0);
+
+ $this->assertTrue(OCA\Encryption\Hooks::login($params));
+
+ $this->assertEquals($this->lagacyKey, $_SESSION['legacyKey']);
+
+ $files = $util->findEncFiles('/' . $this->userId . '/files/');
+
+ $this->assertTrue(is_array($files));
+
+ $found = false;
+ foreach($files['encrypted'] as $encryptedFile) {
+ if($encryptedFile['name'] === 'legacy-encrypted-text.txt') {
+ $found = true;
+ break;
+ }
+ }
+
+ $this->assertTrue($found);
+ }
+}
\ No newline at end of file
diff --git a/apps/files_encryption/tests/webdav.php b/apps/files_encryption/tests/webdav.php
new file mode 100755
index 0000000000000000000000000000000000000000..4b453d0c9d16221c24caa7343237af716a490409
--- /dev/null
+++ b/apps/files_encryption/tests/webdav.php
@@ -0,0 +1,251 @@
+
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library. If not, see .
+ *
+ */
+
+require_once realpath(dirname(__FILE__) . '/../../../lib/base.php');
+require_once realpath(dirname(__FILE__) . '/../lib/crypt.php');
+require_once realpath(dirname(__FILE__) . '/../lib/keymanager.php');
+require_once realpath(dirname(__FILE__) . '/../lib/proxy.php');
+require_once realpath(dirname(__FILE__) . '/../lib/stream.php');
+require_once realpath(dirname(__FILE__) . '/../lib/util.php');
+require_once realpath(dirname(__FILE__) . '/../appinfo/app.php');
+
+use OCA\Encryption;
+
+/**
+ * Class Test_Encryption_Webdav
+ * @brief this class provide basic webdav tests for PUT,GET and DELETE
+ */
+class Test_Encryption_Webdav extends \PHPUnit_Framework_TestCase
+{
+
+ public $userId;
+ public $pass;
+ /**
+ * @var \OC_FilesystemView
+ */
+ public $view;
+ public $dataShort;
+ public $stateFilesTrashbin;
+
+ function setUp()
+ {
+ // reset backend
+ \OC_User::useBackend('database');
+
+ // set user id
+ \OC_User::setUserId('admin');
+ $this->userId = 'admin';
+ $this->pass = 'admin';
+
+ // init filesystem view
+ $this->view = new \OC_FilesystemView('/');
+
+ // init short data
+ $this->dataShort = 'hats';
+
+ // init filesystem related hooks
+ \OCA\Encryption\Helper::registerFilesystemHooks();
+
+ // register encryption file proxy
+ \OC_FileProxy::register(new OCA\Encryption\Proxy());
+
+ // remember files_trashbin state
+ $this->stateFilesTrashbin = OC_App::isEnabled('files_trashbin');
+
+ // we don't want to tests with app files_trashbin enabled
+ \OC_App::disable('files_trashbin');
+
+ // init filesystem for user
+ \OC_Util::tearDownFS();
+ \OC_User::setUserId('');
+ \OC\Files\Filesystem::tearDown();
+ \OC_Util::setupFS($this->userId);
+ \OC_User::setUserId($this->userId);
+
+ // login user
+ $params['uid'] = $this->userId;
+ $params['password'] = $this->pass;
+ OCA\Encryption\Hooks::login($params);
+ }
+
+ function tearDown()
+ {
+ // reset app files_trashbin
+ if ($this->stateFilesTrashbin) {
+ OC_App::enable('files_trashbin');
+ } else {
+ OC_App::disable('files_trashbin');
+ }
+
+ // clear all proxies
+ \OC_FileProxy::clearProxies();
+ }
+
+ /**
+ * @brief test webdav put random file
+ */
+ function testWebdavPUT() {
+
+ // generate filename
+ $filename = '/tmp-' . time() . '.txt';
+
+ // set server vars
+ $_SERVER['REQUEST_METHOD'] = 'OPTIONS';
+
+ $_SERVER['REQUEST_METHOD'] = 'PUT';
+ $_SERVER['REQUEST_URI'] = '/remote.php/webdav' . $filename;
+ $_SERVER['HTTP_AUTHORIZATION'] = 'Basic YWRtaW46YWRtaW4=';
+ $_SERVER['CONTENT_TYPE'] = 'application/octet-stream';
+ $_SERVER['PATH_INFO'] = '/webdav' . $filename;
+ $_SERVER['CONTENT_LENGTH'] = strlen($this->dataShort);
+
+ // handle webdav request
+ $this->handleWebdavRequest($this->dataShort);
+
+ // check if file was created
+ $this->assertTrue($this->view->file_exists('/' . $this->userId . '/files' . $filename));
+
+ // check if key-file was created
+ $this->assertTrue($this->view->file_exists('/' . $this->userId . '/files_encryption/keyfiles/' . $filename . '.key'));
+
+ // check if shareKey-file was created
+ $this->assertTrue($this->view->file_exists('/' . $this->userId . '/files_encryption/share-keys/' . $filename . '.' . $this->userId . '.shareKey'));
+
+ // disable encryption proxy to prevent recursive calls
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
+ // get encrypted file content
+ $encryptedContent = $this->view->file_get_contents('/' . $this->userId . '/files' . $filename);
+
+ // restore proxy state
+ \OC_FileProxy::$enabled = $proxyStatus;
+
+ // check if encrypted content is valid
+ $this->assertTrue(Encryption\Crypt::isCatfileContent($encryptedContent));
+
+ // get decrypted file contents
+ $decrypt = file_get_contents('crypt://' . $filename);
+
+ // check if file content match with the written content
+ $this->assertEquals($this->dataShort, $decrypt);
+
+ // return filename for next test
+ return $filename;
+ }
+
+ /**
+ * @brief test webdav get random file
+ *
+ * @depends testWebdavPUT
+ */
+ function testWebdavGET($filename) {
+
+ // set server vars
+ $_SERVER['REQUEST_METHOD'] = 'GET';
+ $_SERVER['REQUEST_URI'] = '/remote.php/webdav' . $filename;
+ $_SERVER['HTTP_AUTHORIZATION'] = 'Basic YWRtaW46YWRtaW4=';
+ $_SERVER['PATH_INFO'] = '/webdav' . $filename;
+
+ // handle webdav request
+ $content = $this->handleWebdavRequest();
+
+ // check if file content match with the written content
+ $this->assertEquals($this->dataShort, $content);
+
+ // return filename for next test
+ return $filename;
+ }
+
+ /**
+ * @brief test webdav delete random file
+ * @depends testWebdavGET
+ */
+ function testWebdavDELETE($filename) {
+ // set server vars
+ $_SERVER['REQUEST_METHOD'] = 'DELETE';
+ $_SERVER['REQUEST_URI'] = '/remote.php/webdav' . $filename;
+ $_SERVER['HTTP_AUTHORIZATION'] = 'Basic YWRtaW46YWRtaW4=';
+ $_SERVER['PATH_INFO'] = '/webdav' . $filename;
+
+ // handle webdav request
+ $content = $this->handleWebdavRequest();
+
+ // check if file was removed
+ $this->assertFalse($this->view->file_exists('/' . $this->userId . '/files' . $filename));
+
+ // check if key-file was removed
+ $this->assertFalse($this->view->file_exists('/' . $this->userId . '/files_encryption/keyfiles' . $filename . '.key'));
+
+ // check if shareKey-file was removed
+ $this->assertFalse($this->view->file_exists('/' . $this->userId . '/files_encryption/share-keys' . $filename . '.' . $this->userId . '.shareKey'));
+ }
+
+ /**
+ * @brief handle webdav request
+ *
+ * @param bool $body
+ *
+ * @note this init procedure is copied from /apps/files/remote.php
+ */
+ function handleWebdavRequest($body = false) {
+ // Backends
+ $authBackend = new OC_Connector_Sabre_Auth();
+ $lockBackend = new OC_Connector_Sabre_Locks();
+ $requestBackend = new OC_Connector_Sabre_Request();
+
+ // Create ownCloud Dir
+ $publicDir = new OC_Connector_Sabre_Directory('');
+
+ // Fire up server
+ $server = new Sabre_DAV_Server($publicDir);
+ $server->httpRequest = $requestBackend;
+ $server->setBaseUri('/remote.php/webdav/');
+
+ // Load plugins
+ $server->addPlugin(new Sabre_DAV_Auth_Plugin($authBackend, 'ownCloud'));
+ $server->addPlugin(new Sabre_DAV_Locks_Plugin($lockBackend));
+ $server->addPlugin(new Sabre_DAV_Browser_Plugin(false)); // Show something in the Browser, but no upload
+ $server->addPlugin(new OC_Connector_Sabre_QuotaPlugin());
+ $server->addPlugin(new OC_Connector_Sabre_MaintenancePlugin());
+
+ // And off we go!
+ if($body) {
+ $server->httpRequest->setBody($body);
+ }
+
+ // turn on output buffering
+ ob_start();
+
+ // handle request
+ $server->exec();
+
+ // file content is written in the output buffer
+ $content = ob_get_contents();
+
+ // flush the output buffer and turn off output buffering
+ ob_end_clean();
+
+ // return captured content
+ return $content;
+ }
+}
\ No newline at end of file
diff --git a/apps/files_encryption/test/zeros b/apps/files_encryption/tests/zeros
similarity index 100%
rename from apps/files_encryption/test/zeros
rename to apps/files_encryption/tests/zeros
diff --git a/apps/files_external/l10n/ar.php b/apps/files_external/l10n/ar.php
index 06837d5085c7e2607125d7b42be994a6812ae0cc..a53bfe48bc3c82a5f1659537d337390903c6f136 100644
--- a/apps/files_external/l10n/ar.php
+++ b/apps/files_external/l10n/ar.php
@@ -1,5 +1,5 @@
"مجموعات",
"Users" => "المستخدمين",
-"Delete" => "حذف"
+"Delete" => "إلغاء"
);
diff --git a/apps/files_external/l10n/bn_BD.php b/apps/files_external/l10n/bn_BD.php
index 07ccd50074667723f638cc89f7c04d82f9246cfe..0f032df9f05782566bf6f92f82a3dcb02a6fe6c9 100644
--- a/apps/files_external/l10n/bn_BD.php
+++ b/apps/files_external/l10n/bn_BD.php
@@ -12,7 +12,7 @@
"All Users" => "সমস্ত ব্যবহারকারী",
"Groups" => "গোষ্ঠীসমূহ",
"Users" => "ব্যবহারকারী",
-"Delete" => "মুছে ফেল",
+"Delete" => "মুছে",
"Enable User External Storage" => "ব্যবহারকারীর বাহ্যিক সংরক্ষণাগার সক্রিয় কর",
"Allow users to mount their own external storage" => "ব্যবহারকারীদেরকে তাদের নিজস্ব বাহ্যিক সংরক্ষনাগার সাউন্ট করতে অনুমোদন দাও",
"SSL root certificates" => "SSL রুট সনদপত্র",
diff --git a/apps/files_external/l10n/ca.php b/apps/files_external/l10n/ca.php
index aa9304d3301a234835b4cdf0291e8a31a0682632..90ac954301f827110222c7abf00c5187e97c00fb 100644
--- a/apps/files_external/l10n/ca.php
+++ b/apps/files_external/l10n/ca.php
@@ -6,6 +6,7 @@
"Error configuring Google Drive storage" => "Error en configurar l'emmagatzemament Google Drive",
"Warning: \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "Avís: \"smbclient\" no està instal·lat. No es pot muntar la compartició CIFS/SMB. Demaneu a l'administrador del sistema que l'instal·li.",
"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." => "Avís: El suport FTP per PHP no està activat o no està instal·lat. No es pot muntar la compartició FTP. Demaneu a l'administrador del sistema que l'instal·li.",
+"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." => "Avís:El suport Curl de PHP no està activat o instal·lat. No es pot muntar ownCloud / WebDAV o GoogleDrive. Demaneu a l'administrador que l'instal·li.",
"External Storage" => "Emmagatzemament extern",
"Folder name" => "Nom de la carpeta",
"External storage" => "Emmagatzemament extern",
@@ -17,7 +18,7 @@
"All Users" => "Tots els usuaris",
"Groups" => "Grups",
"Users" => "Usuaris",
-"Delete" => "Elimina",
+"Delete" => "Esborra",
"Enable User External Storage" => "Habilita l'emmagatzemament extern d'usuari",
"Allow users to mount their own external storage" => "Permet als usuaris muntar el seu emmagatzemament extern propi",
"SSL root certificates" => "Certificats SSL root",
diff --git a/apps/files_external/l10n/cy_GB.php b/apps/files_external/l10n/cy_GB.php
index aee58477639591fe954309b54bcc4f167ce98ede..78bbb987eb89093f6cd7b433b0db498071696f8e 100644
--- a/apps/files_external/l10n/cy_GB.php
+++ b/apps/files_external/l10n/cy_GB.php
@@ -1,4 +1,5 @@
"Grwpiau",
"Users" => "Defnyddwyr",
"Delete" => "Dileu"
);
diff --git a/apps/files_external/l10n/de.php b/apps/files_external/l10n/de.php
index 24183772217a0d59ce1b14f7569b5ac653319aef..8dfa0eafbb4b037fa9910a93f0223bb1651f2ee4 100644
--- a/apps/files_external/l10n/de.php
+++ b/apps/files_external/l10n/de.php
@@ -6,6 +6,7 @@
"Error configuring Google Drive storage" => "Fehler beim Einrichten von Google Drive",
"Warning: \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "Warnung: \"smbclient\" ist nicht installiert. Das Einhängen von CIFS/SMB-Freigaben ist nicht möglich. Bitte Deinen System-Administrator, dies zu installieren.",
"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." => "Warnung:: Die FTP Unterstützung von PHP ist nicht aktiviert oder installiert. Bitte wende Dich an Deinen Systemadministrator.",
+"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." => "Warnung: Die Curl-Unterstützung in PHP ist nicht aktiviert oder installiert. Das Einbinden von ownCloud / WebDav der GoogleDrive-Freigaben ist nicht möglich. Bitte Deinen Systemadminstrator um die Installation. ",
"External Storage" => "Externer Speicher",
"Folder name" => "Ordnername",
"External storage" => "Externer Speicher",
diff --git a/apps/files_external/l10n/de_DE.php b/apps/files_external/l10n/de_DE.php
index e1a5c2ffcc645e796bf5f8d971aeef1622848941..9b7ab4d53ca80523d2dee4b7f998aa83e14c14f7 100644
--- a/apps/files_external/l10n/de_DE.php
+++ b/apps/files_external/l10n/de_DE.php
@@ -6,7 +6,7 @@
"Error configuring Google Drive storage" => "Fehler beim Einrichten von Google Drive",
"Warning: \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "Warnung: \"smbclient\" ist nicht installiert. Das Einhängen von CIFS/SMB-Freigaben ist nicht möglich. Bitten Sie Ihren Systemadministrator, dies zu installieren.",
"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." => "Warnung:: Die FTP Unterstützung von PHP ist nicht aktiviert oder installiert. Bitte wenden Sie sich an Ihren Systemadministrator.",
-"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." => "Achtung: Die Curl Unterstützung von PHP ist nicht aktiviert oder installiert. Das Laden von ownCloud / WebDAV oder GoogleDrive Freigaben ist nicht möglich. Bitte Sie Ihren Systemadministrator, das Modul zu installieren.",
+"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." => "Achtung: Die Curl-Unterstützung von PHP ist nicht aktiviert oder installiert. Das Laden von ownCloud / WebDAV oder GoogleDrive Freigaben ist nicht möglich. Bitte Sie Ihren Systemadministrator, das Modul zu installieren.",
"External Storage" => "Externer Speicher",
"Folder name" => "Ordnername",
"External storage" => "Externer Speicher",
@@ -20,7 +20,7 @@
"Users" => "Benutzer",
"Delete" => "Löschen",
"Enable User External Storage" => "Externen Speicher für Benutzer aktivieren",
-"Allow users to mount their own external storage" => "Erlaubt Benutzern ihre eigenen externen Speicher einzubinden",
+"Allow users to mount their own external storage" => "Erlaubt Benutzern, ihre eigenen externen Speicher einzubinden",
"SSL root certificates" => "SSL-Root-Zertifikate",
"Import Root Certificate" => "Root-Zertifikate importieren"
);
diff --git a/apps/files_external/l10n/el.php b/apps/files_external/l10n/el.php
index 6c519a1b413bd8705f48841df49bcb40ce80fe90..62703b08fbc1422f2b7b9b95bd65643009da7825 100644
--- a/apps/files_external/l10n/el.php
+++ b/apps/files_external/l10n/el.php
@@ -6,6 +6,7 @@
"Error configuring Google Drive storage" => "Σφάλμα ρυθμίζωντας αποθήκευση Google Drive ",
"Warning: \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "Προσοχή: Ο \"smbclient\" δεν εγκαταστάθηκε. Δεν είναι δυνατή η προσάρτηση CIFS/SMB. Παρακαλώ ενημερώστε τον διαχειριστή συστήματος να το εγκαταστήσει.",
"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." => "Προσοχή: Η υποστήριξη FTP στην PHP δεν ενεργοποιήθηκε ή εγκαταστάθηκε. Δεν είναι δυνατή η προσάρτηση FTP. Παρακαλώ ενημερώστε τον διαχειριστή συστήματος να το εγκαταστήσει.",
+"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." => "<Προειδοποίηση Η υποστήριξη του συστήματος Curl στο PHP δεν είναι ενεργοποιημένη ή εγκαταστημένη. Η αναπαραγωγή του ownCloud/WebDAV ή GoogleDrive δεν είναι δυνατή. Παρακαλώ ρωτήστε τον διαχειριστλη του συστήματος για την εγκατάσταση. ",
"External Storage" => "Εξωτερικό Αποθηκευτικό Μέσο",
"Folder name" => "Όνομα φακέλου",
"External storage" => "Εξωτερική αποθήκευση",
diff --git a/apps/files_external/l10n/es.php b/apps/files_external/l10n/es.php
index 59318d239502434d49793e548df1bb4c3e533504..f83562dd643e2b491c219639689e8650da4b7f28 100644
--- a/apps/files_external/l10n/es.php
+++ b/apps/files_external/l10n/es.php
@@ -18,7 +18,7 @@
"All Users" => "Todos los usuarios",
"Groups" => "Grupos",
"Users" => "Usuarios",
-"Delete" => "Eliiminar",
+"Delete" => "Eliminar",
"Enable User External Storage" => "Habilitar almacenamiento de usuario externo",
"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 ",
diff --git a/apps/files_external/l10n/et_EE.php b/apps/files_external/l10n/et_EE.php
index 5aea335ad60025a9e2a4dc5eafb89957fb2dc0cd..465201df4dd3834a40f41c088ca9f7a2c1ce1199 100644
--- a/apps/files_external/l10n/et_EE.php
+++ b/apps/files_external/l10n/et_EE.php
@@ -5,8 +5,8 @@
"Please provide a valid Dropbox app key and secret." => "Palun sisesta korrektne Dropboxi rakenduse võti ja salasõna.",
"Error configuring Google Drive storage" => "Viga Google Drive'i salvestusruumi seadistamisel",
"Warning: \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "Hoiatus: \"smbclient\" pole paigaldatud. Jagatud CIFS/SMB hoidlate ühendamine pole võimalik. Palu oma süsteemihalduril paigaldata SAMBA tugi.",
-"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." => "Hoiatus: FTP tugi puudub PHP paigalduses. Jagatud FTP hoidlate ühendamine pole võimalik. Palu oma süsteemihalduril paigaldata FTP tugi.",
-"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." => "Hoiatus: Curl tugi puudub PHP paigalduses. Jagatud ownCloud / WebDAV või GoogleDrive ühendamine pole võimalik. Palu oma süsteemihalduril see paigaldada.",
+"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." => "Hoiatus: PHP-s puudub FTP tugi. Jagatud FTP hoidlate ühendamine pole võimalik. Palu oma süsteemihalduril paigaldata FTP tugi.",
+"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." => "Hoiatus: PHP-s puudub Curl tugi. Jagatud ownCloud / WebDAV või GoogleDrive ühendamine pole võimalik. Palu oma süsteemihalduril see paigaldada.",
"External Storage" => "Väline salvestuskoht",
"Folder name" => "Kausta nimi",
"External storage" => "Väline andmehoidla",
diff --git a/apps/files_external/l10n/fr.php b/apps/files_external/l10n/fr.php
index c42c89f8572e6eaec912951b5a872cccba978146..5006133a7b688cc4e59bb84d097a777acc5ac7ec 100644
--- a/apps/files_external/l10n/fr.php
+++ b/apps/files_external/l10n/fr.php
@@ -6,6 +6,7 @@
"Error configuring Google Drive storage" => "Erreur lors de la configuration du support de stockage Google Drive",
"Warning: \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "Attention : \"smbclient\" n'est pas installé. Le montage des partages CIFS/SMB n'est pas disponible. Contactez votre administrateur système pour l'installer.",
"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." => "Attention : Le support FTP de PHP n'est pas activé ou installé. Le montage des partages FTP n'est pas disponible. Contactez votre administrateur système pour l'installer.",
+"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." => "Attention : Le support de Curl n'est pas activé ou installé dans PHP. Le montage de ownCloud / WebDAV ou GoogleDrive n'est pas possible. Contactez votre administrateur système pour l'installer.",
"External Storage" => "Stockage externe",
"Folder name" => "Nom du dossier",
"External storage" => "Stockage externe",
diff --git a/apps/files_external/l10n/hu_HU.php b/apps/files_external/l10n/hu_HU.php
index 9ecd2d1088b7a0d348409b470ee196c2d4c52309..b88737a19abde8df8d97c60f132795cc2f4c8d30 100644
--- a/apps/files_external/l10n/hu_HU.php
+++ b/apps/files_external/l10n/hu_HU.php
@@ -6,6 +6,7 @@
"Error configuring Google Drive storage" => "A Google Drive tárolót nem sikerült beállítani",
"Warning: \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "Figyelem: az \"smbclient\" nincs telepítve a kiszolgálón. Emiatt nem lehet CIFS/SMB megosztásokat fölcsatolni. Kérje meg a rendszergazdát, hogy telepítse a szükséges programot.",
"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." => "Figyelem: a PHP FTP támogatása vagy nincs telepítve, vagy nincs engedélyezve a kiszolgálón. Emiatt nem lehetséges FTP-tárolókat fölcsatolni. Kérje meg a rendszergazdát, hogy telepítse a szükséges programot.",
+"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." => "Figyelmeztetés: A PHP-ben nincs telepítve vagy engedélyezve a Curl támogatás. Nem lehetséges ownCloud / WebDAV ill. GoogleDrive tárolók becsatolása. Kérje meg a rendszergazdát, hogy telepítse a szükséges programot!",
"External Storage" => "Külső tárolási szolgáltatások becsatolása",
"Folder name" => "Mappanév",
"External storage" => "Külső tárolók",
diff --git a/apps/files_external/l10n/lb.php b/apps/files_external/l10n/lb.php
index 2a62cad3fe90c3a6e2e97a7de790f5faf8ef0958..4e78227ec4854d4d7281a9fc69199347bde8c6f1 100644
--- a/apps/files_external/l10n/lb.php
+++ b/apps/files_external/l10n/lb.php
@@ -1,5 +1,6 @@
"Dossiers Numm:",
"Groups" => "Gruppen",
+"Users" => "Benotzer",
"Delete" => "Läschen"
);
diff --git a/apps/files_external/l10n/nb_NO.php b/apps/files_external/l10n/nb_NO.php
index 961ef2b1046bb8833751b47be4a337f77c761371..ea8648303d1be23bec5c75f626e4f1f5ccaf63ec 100644
--- a/apps/files_external/l10n/nb_NO.php
+++ b/apps/files_external/l10n/nb_NO.php
@@ -2,6 +2,11 @@
"Access granted" => "Tilgang innvilget",
"Error configuring Dropbox storage" => "Feil ved konfigurering av Dropbox-lagring",
"Grant access" => "Gi tilgang",
+"Please provide a valid Dropbox app key and secret." => "Vær vennlig å oppgi gyldig Dropbox appnøkkel og hemmelighet.",
+"Error configuring Google Drive storage" => "Feil med konfigurering av Google Drive",
+"Warning: \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "Advarsel: \"smbclient\" er ikke installert. Kan ikke montere CIFS/SMB mapper. Ta kontakt med din systemadministrator for å installere det.",
+"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." => "Advarsel: FTP støtte i PHP er ikke slått på eller innstallert. Kan ikke montere FTP mapper. Ta kontakt med din systemadministrator for å innstallere det.",
+"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." => "Advarsel: Curl støtte i PHP er ikke aktivert eller innstallert. Kan ikke montere owncloud/WebDAV eller Googledrive. Ta kontakt med din systemadministrator for å innstallerer det.",
"External Storage" => "Ekstern lagring",
"Folder name" => "Mappenavn",
"External storage" => "Ekstern lagringsplass",
diff --git a/apps/files_external/l10n/nl.php b/apps/files_external/l10n/nl.php
index ad3eda9747fe44c0dda8ef59b8e433a807598ee1..ded5a861a8b50ca0509b0dce2ceb65b97c96715e 100644
--- a/apps/files_external/l10n/nl.php
+++ b/apps/files_external/l10n/nl.php
@@ -6,6 +6,7 @@
"Error configuring Google Drive storage" => "Fout tijdens het configureren van Google Drive opslag",
"Warning: \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "Waarschuwing: \"smbclient\" is niet geïnstalleerd. Mounten van CIFS/SMB shares is niet mogelijk. Vraag uw beheerder om smbclient te installeren.",
"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." => "Waarschuwing: FTP ondersteuning in PHP is niet geactiveerd of geïnstalleerd. Mounten van FTP shares is niet mogelijk. Vraag uw beheerder FTP ondersteuning te installeren.",
+"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." => "Waarschuwing: Curl ondersteuning in PHP is niet geactiveerd of geïnstalleerd. Mounten van ownCloud / WebDAV of GoogleDrive is niet mogelijk. Vraag uw systeembeheerder dit te installeren.",
"External Storage" => "Externe opslag",
"Folder name" => "Mapnaam",
"External storage" => "Externe opslag",
diff --git a/apps/files_external/l10n/pl.php b/apps/files_external/l10n/pl.php
index cd1b1fe84a1f4145a50bd3ba44a5b9d7c68c11f3..e03ded1e70a222268880990d6d7fc2339755e9e4 100644
--- a/apps/files_external/l10n/pl.php
+++ b/apps/files_external/l10n/pl.php
@@ -6,6 +6,7 @@
"Error configuring Google Drive storage" => "Wystąpił błąd podczas konfigurowania zasobu Google Drive",
"Warning: \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "Ostrzeżenie: \"smbclient\" nie jest zainstalowany. Zamontowanie katalogów CIFS/SMB nie jest możliwe. Skontaktuj sie z administratorem w celu zainstalowania.",
"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." => "Ostrzeżenie: Wsparcie dla FTP w PHP nie jest zainstalowane lub włączone. Skontaktuj sie z administratorem w celu zainstalowania lub włączenia go.",
+"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." => "Ostrzeżenie: Wsparcie dla Curl w PHP nie jest zainstalowane lub włączone. Montowanie WebDAV lub GoogleDrive nie będzie możliwe. Skontaktuj się z administratorem w celu zainstalowania lub włączenia tej opcji.",
"External Storage" => "Zewnętrzna zasoby dyskowe",
"Folder name" => "Nazwa folderu",
"External storage" => "Zewnętrzne zasoby dyskowe",
diff --git a/apps/files_external/l10n/pt_BR.php b/apps/files_external/l10n/pt_BR.php
index a358d56913916cff5bdeddc883acf765aba20a30..bc3c356a5175f89f4d93437da084f4b67376aa4b 100644
--- a/apps/files_external/l10n/pt_BR.php
+++ b/apps/files_external/l10n/pt_BR.php
@@ -6,6 +6,7 @@
"Error configuring Google Drive storage" => "Erro ao configurar armazenamento do Google Drive",
"Warning: \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "Aviso: \"smbclient\" não está instalado. Impossível montar compartilhamentos de CIFS/SMB. Por favor, peça ao seu administrador do sistema para instalá-lo.",
"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." => "Aviso: O suporte para FTP do PHP não está ativado ou instalado. Impossível montar compartilhamentos FTP. Por favor, peça ao seu administrador do sistema para instalá-lo.",
+"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." => " Aviso: O suport a Curl em PHP não está habilitado ou instalado. A montagem do ownCloud / WebDAV ou GoogleDrive não é possível. Por favor, solicite ao seu administrador do sistema instalá-lo.",
"External Storage" => "Armazenamento Externo",
"Folder name" => "Nome da pasta",
"External storage" => "Armazenamento Externo",
@@ -17,7 +18,7 @@
"All Users" => "Todos os Usuários",
"Groups" => "Grupos",
"Users" => "Usuários",
-"Delete" => "Remover",
+"Delete" => "Excluir",
"Enable User External Storage" => "Habilitar Armazenamento Externo do Usuário",
"Allow users to mount their own external storage" => "Permitir usuários a montar seus próprios armazenamentos externos",
"SSL root certificates" => "Certificados SSL raíz",
diff --git a/apps/files_external/l10n/pt_PT.php b/apps/files_external/l10n/pt_PT.php
index aac3c1c2ca0779e1ca00f13a17a6d3fd986e82e0..0a05d1f8825fb3654dae7470c8b54616aa82dcf6 100644
--- a/apps/files_external/l10n/pt_PT.php
+++ b/apps/files_external/l10n/pt_PT.php
@@ -6,6 +6,7 @@
"Error configuring Google Drive storage" => "Erro ao configurar o armazenamento do Google Drive",
"Warning: \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "Atenção: O cliente \"smbclient\" não está instalado. Não é possível montar as partilhas CIFS/SMB . Peça ao seu administrador para instalar.",
"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." => "Aviso: O suporte FTP no PHP não está activate ou instalado. Não é possível montar as partilhas FTP. Peça ao seu administrador para instalar.",
+"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." => "Atenção: O suporte PHP para o Curl não está activado ou instalado. A montagem do ownCloud/WebDav ou GoolgeDriver não é possível. Por favor contacte o administrador para o instalar.",
"External Storage" => "Armazenamento Externo",
"Folder name" => "Nome da pasta",
"External storage" => "Armazenamento Externo",
diff --git a/apps/files_external/l10n/ro.php b/apps/files_external/l10n/ro.php
index 5747205dc0590730806b6e5a0bff56918f86dc26..ed23b4cca8f7c52266f92e96603956a8bd59eb9b 100644
--- a/apps/files_external/l10n/ro.php
+++ b/apps/files_external/l10n/ro.php
@@ -6,11 +6,14 @@
"Error configuring Google Drive storage" => "Eroare la configurarea mediului de stocare Google Drive",
"Warning: \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "Atenție: \"smbclient\" nu este instalat. Montarea mediilor CIFS/SMB partajate nu este posibilă. Solicită administratorului sistemului tău să îl instaleaze.",
"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." => "Atenție: suportul pentru FTP în PHP nu este activat sau instalat. Montarea mediilor FPT partajate nu este posibilă. Solicită administratorului sistemului tău să îl instaleze.",
+"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." => "Atentie: Suportul Curl nu este pornit / instalat in configuratia PHP! Montarea ownCloud / WebDAV / GoogleDrive nu este posibila! Intrebati administratorul sistemului despre aceasta problema!",
"External Storage" => "Stocare externă",
"Folder name" => "Denumire director",
+"External storage" => "Stocare externă",
"Configuration" => "Configurație",
"Options" => "Opțiuni",
"Applicable" => "Aplicabil",
+"Add storage" => "Adauga stocare",
"None set" => "Niciunul",
"All Users" => "Toți utilizatorii",
"Groups" => "Grupuri",
diff --git a/apps/files_external/l10n/ru.php b/apps/files_external/l10n/ru.php
index 46b73a67f046d8bc53d8eaf4c29d0e5500821ff7..d2c5292bac414da45f92ca36d928ff3ff087d238 100644
--- a/apps/files_external/l10n/ru.php
+++ b/apps/files_external/l10n/ru.php
@@ -6,6 +6,7 @@
"Error configuring Google Drive storage" => "Ошибка при настройке хранилища Google Drive",
"Warning: \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "Внимание: \"smbclient\" не установлен. Подключение по CIFS/SMB невозможно. Пожалуйста, обратитесь к системному администратору, чтобы установить его.",
"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." => "Внимание: Поддержка FTP не включена в PHP. Подключение по FTP невозможно. Пожалуйста, обратитесь к системному администратору, чтобы включить.",
+"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." => "Внимание: Поддержка Curl в PHP не включена или не установлена. Подключение ownCloud / WebDAV или GoogleDrive невозможно. Попросите вашего системного администратора установить его.",
"External Storage" => "Внешний носитель",
"Folder name" => "Имя папки",
"External storage" => "Внешний носитель данных",
diff --git a/apps/files_external/l10n/ru_RU.php b/apps/files_external/l10n/ru_RU.php
index 406e284b2781734bdcdde8fb67bf3c99845057a9..a43417dfbc1a134a783914c108680fa888d81f06 100644
--- a/apps/files_external/l10n/ru_RU.php
+++ b/apps/files_external/l10n/ru_RU.php
@@ -1,23 +1,4 @@
"Доступ разрешен",
-"Error configuring Dropbox storage" => "Ошибка при конфигурировании хранилища Dropbox",
-"Grant access" => "Предоставить доступ",
-"Please provide a valid Dropbox app key and secret." => "Пожалуйста представьте допустимый ключ приложения Dropbox и пароль.",
-"Error configuring Google Drive storage" => "Ошибка настройки хранилища Google Drive",
-"Warning: \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "Предупреждение: \"smbclient\" не установлен. Подключение общих папок CIFS/SMB невозможно. Пожалуйста, обратитесь к системному администратору, чтобы установить его.",
-"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." => "Предупреждение: Поддержка FTP в PHP не включена или не установлена. Подключение по FTP невозможно. Пожалуйста, обратитесь к системному администратору, чтобы установить ее.",
-"External Storage" => "Внешние системы хранения данных",
-"Folder name" => "Имя папки",
-"Configuration" => "Конфигурация",
-"Options" => "Опции",
-"Applicable" => "Применимый",
-"None set" => "Не задан",
-"All Users" => "Все пользователи",
"Groups" => "Группы",
-"Users" => "Пользователи",
-"Delete" => "Удалить",
-"Enable User External Storage" => "Включить пользовательскую внешнюю систему хранения данных",
-"Allow users to mount their own external storage" => "Разрешить пользователям монтировать их собственную внешнюю систему хранения данных",
-"SSL root certificates" => "Корневые сертификаты SSL",
-"Import Root Certificate" => "Импортировать корневые сертификаты"
+"Delete" => "Удалить"
);
diff --git a/apps/files_external/l10n/sk_SK.php b/apps/files_external/l10n/sk_SK.php
index af6b7b4ae6e2bb3fd4a6489735f0c7fda3ca8b4d..33edcb9d4c8c112202b001263ff202486b01156e 100644
--- a/apps/files_external/l10n/sk_SK.php
+++ b/apps/files_external/l10n/sk_SK.php
@@ -6,6 +6,7 @@
"Error configuring Google Drive storage" => "Chyba pri konfigurácii úložiska Google drive",
"Warning: \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "Upozornenie: \"smbclient\" nie je nainštalovaný. Nie je možné pripojenie oddielov CIFS/SMB. Požiadajte administrátora systému, nech ho nainštaluje.",
"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." => "Upozornenie: Podpora FTP v PHP nie je povolená alebo nainštalovaná. Nie je možné pripojenie oddielov FTP. Požiadajte administrátora systému, nech ho nainštaluje.",
+"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." => "Varovanie: nie je nainštalovaná, alebo povolená, podpora Curl v PHP. Nie je možné pripojenie oddielov ownCloud, WebDAV, či GoogleDrive. Prosím požiadajte svojho administrátora systému, nech ju nainštaluje.",
"External Storage" => "Externé úložisko",
"Folder name" => "Meno priečinka",
"External storage" => "Externé úložisko",
@@ -17,7 +18,7 @@
"All Users" => "Všetci používatelia",
"Groups" => "Skupiny",
"Users" => "Používatelia",
-"Delete" => "Odstrániť",
+"Delete" => "Zmazať",
"Enable User External Storage" => "Povoliť externé úložisko",
"Allow users to mount their own external storage" => "Povoliť používateľom pripojiť ich vlastné externé úložisko",
"SSL root certificates" => "Koreňové SSL certifikáty",
diff --git a/apps/files_external/l10n/sl.php b/apps/files_external/l10n/sl.php
index 4ff2eed3bf0de9dc2ae984ce7ff2ddd182438331..09b91b913e9a796899b1b8b96d7756939b5e8814 100644
--- a/apps/files_external/l10n/sl.php
+++ b/apps/files_external/l10n/sl.php
@@ -5,7 +5,8 @@
"Please provide a valid Dropbox app key and secret." => "Vpisati je treba veljaven ključ programa in kodo za Dropbox",
"Error configuring Google Drive storage" => "Napaka nastavljanja shrambe Google Drive",
"Warning: \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "Opozorilo: paket \"smbclient\" ni nameščen. Priklapljanje pogonov CIFS/SMB ne bo mogoče.",
-"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." => "Opozorilo: podpora FTP v PHP ni omogočena ali pa ni nameščena. Priklapljanje pogonov FTP zato ni mogoče.",
+"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." => "Opozorilo: podpora FTP v PHP ni omogočena ali pa ni nameščena. Priklapljanje pogonov FTP zato ne bo mogoče.",
+"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." => "Opozorilo: podpora za Curl v PHP ni omogočena ali pa ni nameščena. Priklapljanje točke ownCloud / WebDAV ali GoogleDrive zato ne bo mogoče. Zahtevane pakete je treba pred uporabo namestiti.",
"External Storage" => "Zunanja podatkovna shramba",
"Folder name" => "Ime mape",
"External storage" => "Zunanja shramba",
@@ -18,7 +19,7 @@
"Groups" => "Skupine",
"Users" => "Uporabniki",
"Delete" => "Izbriši",
-"Enable User External Storage" => "Omogoči uporabniško zunanjo podatkovno shrambo",
+"Enable User External Storage" => "Omogoči zunanjo uporabniško podatkovno shrambo",
"Allow users to mount their own external storage" => "Dovoli uporabnikom priklop lastne zunanje podatkovne shrambe",
"SSL root certificates" => "Korenska potrdila SSL",
"Import Root Certificate" => "Uvozi korensko potrdilo"
diff --git a/apps/files_external/l10n/ug.php b/apps/files_external/l10n/ug.php
new file mode 100644
index 0000000000000000000000000000000000000000..2d1dea989063c0cc93a38882d4c7303f60e6ae1e
--- /dev/null
+++ b/apps/files_external/l10n/ug.php
@@ -0,0 +1,9 @@
+ "قىسقۇچ ئاتى",
+"External storage" => "سىرتقى ساقلىغۇچ",
+"Configuration" => "سەپلىمە",
+"Options" => "تاللانما",
+"Groups" => "گۇرۇپپا",
+"Users" => "ئىشلەتكۈچىلەر",
+"Delete" => "ئۆچۈر"
+);
diff --git a/apps/files_external/l10n/vi.php b/apps/files_external/l10n/vi.php
index 84f31e88924a8fafd610a0e98f68077b778406ad..769f9e2a0976aa443ffda271da4e10fe6de52959 100644
--- a/apps/files_external/l10n/vi.php
+++ b/apps/files_external/l10n/vi.php
@@ -6,11 +6,14 @@
"Error configuring Google Drive storage" => "Lỗi cấu hình lưu trữ Google Drive",
"Warning: \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "Cảnh báo: \"smbclient\" chưa được cài đặt. Mount CIFS/SMB shares là không thể thực hiện được. Hãy hỏi người quản trị hệ thống để cài đặt nó.",
"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." => "Cảnh báo: FTP trong PHP chưa được cài đặt hoặc chưa được mở. Mount FTP shares là không thể. Xin hãy yêu cầu quản trị hệ thống của bạn cài đặt nó.",
+"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." => "Cảnh báo: Tính năng Curl trong PHP chưa được kích hoạt hoặc cài đặt. Việc gắn kết ownCloud / WebDAV hay GoogleDrive không thực hiện được. Vui lòng liên hệ người quản trị để cài đặt nó.",
"External Storage" => "Lưu trữ ngoài",
"Folder name" => "Tên thư mục",
+"External storage" => "Lưu trữ ngoài",
"Configuration" => "Cấu hình",
"Options" => "Tùy chọn",
"Applicable" => "Áp dụng",
+"Add storage" => "Thêm bộ nhớ",
"None set" => "không",
"All Users" => "Tất cả người dùng",
"Groups" => "Nhóm",
diff --git a/apps/files_external/l10n/zh_TW.php b/apps/files_external/l10n/zh_TW.php
index 873b555348e546bf356cd71c9cf755d185f79e7b..a8314dcef03660b8b3ecd734b66c340f5fb3c610 100644
--- a/apps/files_external/l10n/zh_TW.php
+++ b/apps/files_external/l10n/zh_TW.php
@@ -1,16 +1,26 @@
"訪問權已被准許",
-"Grant access" => "准許訪問權",
-"External Storage" => "外部儲存裝置",
+"Access granted" => "允許存取",
+"Error configuring Dropbox storage" => "設定 Dropbox 儲存時發生錯誤",
+"Grant access" => "允許存取",
+"Please provide a valid Dropbox app key and secret." => "請提供有效的 Dropbox app key 和 app secret 。",
+"Error configuring Google Drive storage" => "設定 Google Drive 儲存時發生錯誤",
+"Warning: \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "警告:未安裝 \"smbclient\" ,因此無法掛載 CIFS/SMB 分享,請洽您的系統管理員將其安裝。",
+"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." => "警告:PHP 並未啓用 FTP 的支援,因此無法掛載 FTP 分享,請洽您的系統管理員將其安裝並啓用。",
+"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." => "警告:PHP 並未啓用 Curl 的支援,因此無法掛載 ownCloud/WebDAV 或 Google Drive 分享,請洽您的系統管理員將其安裝並啓用。",
+"External Storage" => "外部儲存",
"Folder name" => "資料夾名稱",
-"External storage" => "外部儲存裝置",
+"External storage" => "外部儲存",
"Configuration" => "設定",
"Options" => "選項",
-"Add storage" => "添加儲存區",
+"Applicable" => "可用的",
+"Add storage" => "增加儲存區",
"None set" => "尚未設定",
"All Users" => "所有使用者",
"Groups" => "群組",
"Users" => "使用者",
"Delete" => "刪除",
+"Enable User External Storage" => "啓用使用者外部儲存",
+"Allow users to mount their own external storage" => "允許使用者自行掛載他們的外部儲存",
+"SSL root certificates" => "SSL 根憑證",
"Import Root Certificate" => "匯入根憑證"
);
diff --git a/apps/files_external/lib/dropbox.php b/apps/files_external/lib/dropbox.php
index cb04e557f8a6b2b3c01a26e0a32330bd3c04cd65..081c54788814788ba2d7cd63142dbb08ba103543 100755
--- a/apps/files_external/lib/dropbox.php
+++ b/apps/files_external/lib/dropbox.php
@@ -45,7 +45,6 @@ class Dropbox extends \OC\Files\Storage\Common {
$oauth = new \Dropbox_OAuth_Curl($params['app_key'], $params['app_secret']);
$oauth->setToken($params['token'], $params['token_secret']);
$this->dropbox = new \Dropbox_API($oauth, 'dropbox');
- $this->mkdir('');
} else {
throw new \Exception('Creating \OC\Files\Storage\Dropbox storage failed');
}
diff --git a/apps/files_external/lib/ftp.php b/apps/files_external/lib/ftp.php
index 8a7375ebe38730a270ba74ea1f275543e100fffd..ca6c635eb2b802812e8a3ef43d5dca6538e3760c 100644
--- a/apps/files_external/lib/ftp.php
+++ b/apps/files_external/lib/ftp.php
@@ -35,10 +35,6 @@ class FTP extends \OC\Files\Storage\StreamWrapper{
if ( ! $this->root || $this->root[0]!='/') {
$this->root='/'.$this->root;
}
- //create the root folder if necessary
- if ( ! $this->is_dir('')) {
- $this->mkdir('');
- }
} else {
throw new \Exception();
}
@@ -63,7 +59,6 @@ class FTP extends \OC\Files\Storage\StreamWrapper{
return $url;
}
public function fopen($path,$mode) {
- $this->init();
switch($mode) {
case 'r':
case 'rb':
@@ -100,7 +95,6 @@ class FTP extends \OC\Files\Storage\StreamWrapper{
}
public function writeBack($tmpFile) {
- $this->init();
if (isset(self::$tempFiles[$tmpFile])) {
$this->uploadFile($tmpFile, self::$tempFiles[$tmpFile]);
unlink($tmpFile);
diff --git a/apps/files_external/lib/sftp.php b/apps/files_external/lib/sftp.php
index ede6c251fd9e18463590b04ff7ee72a725c5f536..4fd360964631d652372d454d2097700d2b68d6cf 100644
--- a/apps/files_external/lib/sftp.php
+++ b/apps/files_external/lib/sftp.php
@@ -50,10 +50,6 @@ class SFTP extends \OC\Files\Storage\Common {
$host_keys[$this->host] = $current_host_key;
$this->write_host_keys($host_keys);
}
-
- if(!$this->file_exists('')){
- $this->mkdir('');
- }
}
public function test() {
diff --git a/apps/files_external/lib/smb.php b/apps/files_external/lib/smb.php
index 961efb1a50a43123a43d299296cbb30d305875c7..655c3c9a81653b1fafad3bee8c8e6ffb9d1e4129 100644
--- a/apps/files_external/lib/smb.php
+++ b/apps/files_external/lib/smb.php
@@ -73,7 +73,6 @@ class SMB extends \OC\Files\Storage\StreamWrapper{
* @return bool
*/
public function hasUpdated($path,$time) {
- $this->init();
if(!$path and $this->root=='/') {
// mtime doesn't work for shares, but giving the nature of the backend,
// doing a full update is still just fast enough
diff --git a/apps/files_external/lib/streamwrapper.php b/apps/files_external/lib/streamwrapper.php
index 4685877f26b7ea0bb0d7266bfceb897afa08f809..09041f335b46517a6076edb15f2db942a53aa9fc 100644
--- a/apps/files_external/lib/streamwrapper.php
+++ b/apps/files_external/lib/streamwrapper.php
@@ -8,46 +8,28 @@
namespace OC\Files\Storage;
-abstract class StreamWrapper extends \OC\Files\Storage\Common{
- private $ready = false;
-
- protected function init(){
- if($this->ready) {
- return;
- }
- $this->ready = true;
-
- //create the root folder if necesary
- if(!$this->is_dir('')) {
- $this->mkdir('');
- }
- }
-
+abstract class StreamWrapper extends Common{
abstract public function constructUrl($path);
public function mkdir($path) {
- $this->init();
return mkdir($this->constructUrl($path));
}
public function rmdir($path) {
- $this->init();
if($this->file_exists($path)) {
- $succes = rmdir($this->constructUrl($path));
+ $success = rmdir($this->constructUrl($path));
clearstatcache();
- return $succes;
+ return $success;
} else {
return false;
}
}
public function opendir($path) {
- $this->init();
return opendir($this->constructUrl($path));
}
public function filetype($path) {
- $this->init();
return filetype($this->constructUrl($path));
}
@@ -60,24 +42,20 @@ abstract class StreamWrapper extends \OC\Files\Storage\Common{
}
public function file_exists($path) {
- $this->init();
return file_exists($this->constructUrl($path));
}
public function unlink($path) {
- $this->init();
- $succes = unlink($this->constructUrl($path));
+ $success = unlink($this->constructUrl($path));
clearstatcache();
- return $succes;
+ return $success;
}
public function fopen($path, $mode) {
- $this->init();
return fopen($this->constructUrl($path), $mode);
}
public function touch($path, $mtime=null) {
- $this->init();
if(is_null($mtime)) {
$fh = $this->fopen($path, 'a');
fwrite($fh, '');
@@ -88,22 +66,18 @@ abstract class StreamWrapper extends \OC\Files\Storage\Common{
}
public function getFile($path, $target) {
- $this->init();
return copy($this->constructUrl($path), $target);
}
public function uploadFile($path, $target) {
- $this->init();
return copy($path, $this->constructUrl($target));
}
public function rename($path1, $path2) {
- $this->init();
return rename($this->constructUrl($path1), $this->constructUrl($path2));
}
public function stat($path) {
- $this->init();
return stat($this->constructUrl($path));
}
diff --git a/apps/files_external/lib/swift.php b/apps/files_external/lib/swift.php
index 68c4b48f17c18ae41562bc9a3f44122517bb10ac..a9cfe5bd20f69807f21a59f4920a38f25a656e80 100644
--- a/apps/files_external/lib/swift.php
+++ b/apps/files_external/lib/swift.php
@@ -287,6 +287,7 @@ class SWIFT extends \OC\Files\Storage\Common{
if ( ! $this->root || $this->root[0]!='/') {
$this->root='/'.$this->root;
}
+ $this->id = 'swift:' . $this->host . ':'.$this->root . ':' . $this->user;
} else {
throw new \Exception();
}
diff --git a/apps/files_external/lib/webdav.php b/apps/files_external/lib/webdav.php
index 3ba7c48cd5742adcabbb94bc831364ee4c2f2ae2..c2fe7c67b582e994f65e60215d797590327665a0 100644
--- a/apps/files_external/lib/webdav.php
+++ b/apps/files_external/lib/webdav.php
@@ -73,8 +73,6 @@ class DAV extends \OC\Files\Storage\Common{
$this->client->addTrustedCertificates($certPath);
}
}
- //create the root folder if necessary
- $this->mkdir('');
}
public function getId(){
diff --git a/apps/files_external/tests/ftp.php b/apps/files_external/tests/ftp.php
index 923b5e39681bd144a4adb3952d94ee17a92a1276..e146725473ac2bfb3444090a03ebfde58db86836 100644
--- a/apps/files_external/tests/ftp.php
+++ b/apps/files_external/tests/ftp.php
@@ -19,6 +19,7 @@ class FTP extends Storage {
}
$this->config['ftp']['root'] .= '/' . $id; //make sure we have an new empty folder to work in
$this->instance = new \OC\Files\Storage\FTP($this->config['ftp']);
+ $this->instance->mkdir('/');
}
public function tearDown() {
diff --git a/apps/files_external/tests/sftp.php b/apps/files_external/tests/sftp.php
index 16964e208781c34b4d8ecce4d90230496b51c2fe..efea7f075ff20d48d19d4b49a5e68448a023d423 100644
--- a/apps/files_external/tests/sftp.php
+++ b/apps/files_external/tests/sftp.php
@@ -33,6 +33,7 @@ class SFTP extends Storage {
}
$this->config['sftp']['root'] .= '/' . $id; //make sure we have an new empty folder to work in
$this->instance = new \OC\Files\Storage\SFTP($this->config['sftp']);
+ $this->instance->mkdir('/');
}
public function tearDown() {
@@ -40,4 +41,4 @@ class SFTP extends Storage {
$this->instance->rmdir('/');
}
}
-}
\ No newline at end of file
+}
diff --git a/apps/files_external/tests/smb.php b/apps/files_external/tests/smb.php
index be3ea5a8308baed4a36ecfd70dfce9a04f28ca2e..ca2a93c894449f5584be40d6b996cc339b3aec89 100644
--- a/apps/files_external/tests/smb.php
+++ b/apps/files_external/tests/smb.php
@@ -20,6 +20,7 @@ class SMB extends Storage {
}
$this->config['smb']['root'] .= $id; //make sure we have an new empty folder to work in
$this->instance = new \OC\Files\Storage\SMB($this->config['smb']);
+ $this->instance->mkdir('/');
}
public function tearDown() {
diff --git a/apps/files_external/tests/webdav.php b/apps/files_external/tests/webdav.php
index 1702898045e772f34da117641a5038a8264dc753..1f9b767eca69d24ca1fff865471972f7c6a79eb6 100644
--- a/apps/files_external/tests/webdav.php
+++ b/apps/files_external/tests/webdav.php
@@ -20,6 +20,7 @@ class DAV extends Storage {
}
$this->config['webdav']['root'] .= '/' . $id; //make sure we have an new empty folder to work in
$this->instance = new \OC\Files\Storage\DAV($this->config['webdav']);
+ $this->instance->mkdir('/');
}
public function tearDown() {
diff --git a/apps/files_sharing/l10n/bn_BD.php b/apps/files_sharing/l10n/bn_BD.php
index c3af434ee2934d590c2467400afb792661c9cbc0..5fdf6de50c03fcdc28ec7bf5ca1ccf5b52aaa9f6 100644
--- a/apps/files_sharing/l10n/bn_BD.php
+++ b/apps/files_sharing/l10n/bn_BD.php
@@ -1,6 +1,6 @@
"কূটশব্দ",
-"Submit" => "জমা দাও",
+"Submit" => "জমা দিন",
"%s shared the folder %s with you" => "%s আপনার সাথে %s ফোল্ডারটি ভাগাভাগি করেছেন",
"%s shared the file %s with you" => "%s আপনার সাথে %s ফাইলটি ভাগাভাগি করেছেন",
"Download" => "ডাউনলোড",
diff --git a/apps/files_sharing/l10n/de_DE.php b/apps/files_sharing/l10n/de_DE.php
index b92d6d478c9ae99203a0e7fa377742a85a54d067..ab81589b0eb2b1991cec699cfdc79267b17310f7 100644
--- a/apps/files_sharing/l10n/de_DE.php
+++ b/apps/files_sharing/l10n/de_DE.php
@@ -1,9 +1,9 @@
"Passwort",
-"Submit" => "Absenden",
+"Submit" => "Bestätigen",
"%s shared the folder %s with you" => "%s hat den Ordner %s mit Ihnen geteilt",
"%s shared the file %s with you" => "%s hat die Datei %s mit Ihnen geteilt",
-"Download" => "Download",
+"Download" => "Herunterladen",
"No preview available for" => "Es ist keine Vorschau verfügbar für",
"web services under your control" => "Web-Services unter Ihrer Kontrolle"
);
diff --git a/apps/files_sharing/l10n/en@pirate.php b/apps/files_sharing/l10n/en@pirate.php
new file mode 100644
index 0000000000000000000000000000000000000000..02ee8440487e6729fc9f21207d797bc07a4e4b53
--- /dev/null
+++ b/apps/files_sharing/l10n/en@pirate.php
@@ -0,0 +1,9 @@
+ "Secret Code",
+"Submit" => "Submit",
+"%s shared the folder %s with you" => "%s shared the folder %s with you",
+"%s shared the file %s with you" => "%s shared the file %s with you",
+"Download" => "Download",
+"No preview available for" => "No preview available for",
+"web services under your control" => "web services under your control"
+);
diff --git a/apps/files_sharing/l10n/he.php b/apps/files_sharing/l10n/he.php
index ff7be88af87ed7de04c0303ebe1476584e1d9b2f..2ea5ba76ab162e1ec6f7098e77525eb03e9ad128 100644
--- a/apps/files_sharing/l10n/he.php
+++ b/apps/files_sharing/l10n/he.php
@@ -1,5 +1,5 @@
"ססמה",
+"Password" => "סיסמא",
"Submit" => "שליחה",
"%s shared the folder %s with you" => "%s שיתף עמך את התיקייה %s",
"%s shared the file %s with you" => "%s שיתף עמך את הקובץ %s",
diff --git a/apps/files_sharing/l10n/hi.php b/apps/files_sharing/l10n/hi.php
new file mode 100644
index 0000000000000000000000000000000000000000..560df54fc94879dc4a36194c970aa8fc1400a6a7
--- /dev/null
+++ b/apps/files_sharing/l10n/hi.php
@@ -0,0 +1,3 @@
+ "पासवर्ड"
+);
diff --git a/apps/files_sharing/l10n/hr.php b/apps/files_sharing/l10n/hr.php
new file mode 100644
index 0000000000000000000000000000000000000000..b2dca866bbd8e13b7f653e77a8296769ed1f331c
--- /dev/null
+++ b/apps/files_sharing/l10n/hr.php
@@ -0,0 +1,6 @@
+ "Lozinka",
+"Submit" => "Pošalji",
+"Download" => "Preuzimanje",
+"web services under your control" => "web usluge pod vašom kontrolom"
+);
diff --git a/apps/files_sharing/l10n/hy.php b/apps/files_sharing/l10n/hy.php
new file mode 100644
index 0000000000000000000000000000000000000000..438e8a7433cfde7ccdab2b0e2a3c466fb56a415f
--- /dev/null
+++ b/apps/files_sharing/l10n/hy.php
@@ -0,0 +1,4 @@
+ "Հաստատել",
+"Download" => "Բեռնել"
+);
diff --git a/apps/files_sharing/l10n/ia.php b/apps/files_sharing/l10n/ia.php
new file mode 100644
index 0000000000000000000000000000000000000000..d229135a71d89304766a4a846e2d073e4eb25e62
--- /dev/null
+++ b/apps/files_sharing/l10n/ia.php
@@ -0,0 +1,6 @@
+ "Contrasigno",
+"Submit" => "Submitter",
+"Download" => "Discargar",
+"web services under your control" => "servicios web sub tu controlo"
+);
diff --git a/apps/files_sharing/l10n/ku_IQ.php b/apps/files_sharing/l10n/ku_IQ.php
index f139b0a06438f16c8ae797d1bee15cf9b221ddd2..675fc372e1527a24eadcd2d14e82bc5f5f118bd9 100644
--- a/apps/files_sharing/l10n/ku_IQ.php
+++ b/apps/files_sharing/l10n/ku_IQ.php
@@ -1,5 +1,5 @@
"تێپهڕهوشه",
+"Password" => "وشەی تێپەربو",
"Submit" => "ناردن",
"%s shared the folder %s with you" => "%s دابهشی کردووه بوخچهی %s لهگهڵ تۆ",
"%s shared the file %s with you" => "%s دابهشی کردووه پهڕگهیی %s لهگهڵ تۆ",
diff --git a/apps/files_sharing/l10n/lb.php b/apps/files_sharing/l10n/lb.php
index 8aba5806aa03c9ece3e8630f7e065da5a293c302..630866ab4c572cebb05745bc333ff925a9f89470 100644
--- a/apps/files_sharing/l10n/lb.php
+++ b/apps/files_sharing/l10n/lb.php
@@ -1,3 +1,6 @@
"Passwuert"
+"Password" => "Passwuert",
+"Submit" => "Fortschécken",
+"Download" => "Download",
+"web services under your control" => "Web Servicer ënnert denger Kontroll"
);
diff --git a/apps/files_sharing/l10n/lt_LT.php b/apps/files_sharing/l10n/lt_LT.php
index d21a3c14f4044e594080241e97a200c247df5fcf..96ab48cd2c53377218b351872305ea70944de9f8 100644
--- a/apps/files_sharing/l10n/lt_LT.php
+++ b/apps/files_sharing/l10n/lt_LT.php
@@ -1,6 +1,6 @@
"Dydis",
-"Modified" => "Pakeista",
-"Delete all" => "Ištrinti viską",
-"Delete" => "Ištrinti"
+"Password" => "Slaptažodis",
+"Submit" => "Išsaugoti",
+"Download" => "Atsisiųsti",
+"web services under your control" => "jūsų valdomos web paslaugos"
);
diff --git a/apps/files_sharing/l10n/lv.php b/apps/files_sharing/l10n/lv.php
index 0b22486708959b12614f26618fcf016001261683..88faeaf9f11fed7fbf054b1c8ea65970f3be9882 100644
--- a/apps/files_sharing/l10n/lv.php
+++ b/apps/files_sharing/l10n/lv.php
@@ -5,5 +5,5 @@
"%s shared the file %s with you" => "%s ar jums dalījās ar datni %s",
"Download" => "Lejupielādēt",
"No preview available for" => "Nav pieejams priekšskatījums priekš",
-"web services under your control" => "jūsu vadībā esošie tīmekļa servisi"
+"web services under your control" => "tīmekļa servisi tavā varā"
);
diff --git a/apps/files_sharing/l10n/ms_MY.php b/apps/files_sharing/l10n/ms_MY.php
new file mode 100644
index 0000000000000000000000000000000000000000..879524afce3cc02d199e80fb415e05c7d05df3b1
--- /dev/null
+++ b/apps/files_sharing/l10n/ms_MY.php
@@ -0,0 +1,6 @@
+ "Kata laluan",
+"Submit" => "Hantar",
+"Download" => "Muat turun",
+"web services under your control" => "Perkhidmatan web di bawah kawalan anda"
+);
diff --git a/apps/files_sharing/l10n/nn_NO.php b/apps/files_sharing/l10n/nn_NO.php
new file mode 100644
index 0000000000000000000000000000000000000000..aeba545dabc1d1a634b989fbbe5274ef680e7b4e
--- /dev/null
+++ b/apps/files_sharing/l10n/nn_NO.php
@@ -0,0 +1,9 @@
+ "Passord",
+"Submit" => "Send",
+"%s shared the folder %s with you" => "%s delte mappa %s med deg",
+"%s shared the file %s with you" => "%s delte fila %s med deg",
+"Download" => "Last ned",
+"No preview available for" => "Inga førehandsvising tilgjengeleg for",
+"web services under your control" => "Vev tjenester under din kontroll"
+);
diff --git a/apps/files_sharing/l10n/oc.php b/apps/files_sharing/l10n/oc.php
new file mode 100644
index 0000000000000000000000000000000000000000..07bc26ecdd4f35c6f532758ee775511d1b635136
--- /dev/null
+++ b/apps/files_sharing/l10n/oc.php
@@ -0,0 +1,6 @@
+ "Senhal",
+"Submit" => "Sosmetre",
+"Download" => "Avalcarga",
+"web services under your control" => "Services web jos ton contraròtle"
+);
diff --git a/apps/files_sharing/l10n/pt_BR.php b/apps/files_sharing/l10n/pt_BR.php
index 4dde4bb5ad5b380daa58c4bd6b7bd267fe78f6ea..ce4c28ddcb5aa6620cff971dcc2e01dd7d52c2fc 100644
--- a/apps/files_sharing/l10n/pt_BR.php
+++ b/apps/files_sharing/l10n/pt_BR.php
@@ -5,5 +5,5 @@
"%s shared the file %s with you" => "%s compartilhou o arquivo %s com você",
"Download" => "Baixar",
"No preview available for" => "Nenhuma visualização disponível para",
-"web services under your control" => "web services sob seu controle"
+"web services under your control" => "serviços web sob seu controle"
);
diff --git a/apps/files_sharing/l10n/ru_RU.php b/apps/files_sharing/l10n/ru_RU.php
index 36e4b2fd0e1fceccc83a859368d0a7a9d6d189e2..2cadd163462aaa92e781eb415cde248d47a4d088 100644
--- a/apps/files_sharing/l10n/ru_RU.php
+++ b/apps/files_sharing/l10n/ru_RU.php
@@ -1,9 +1,3 @@
"Пароль",
-"Submit" => "Передать",
-"%s shared the folder %s with you" => "%s имеет общий с Вами доступ к папке %s ",
-"%s shared the file %s with you" => "%s имеет общий с Вами доступ к файлу %s ",
-"Download" => "Загрузка",
-"No preview available for" => "Предварительный просмотр недоступен",
-"web services under your control" => "веб-сервисы под Вашим контролем"
+"Download" => "Загрузка"
);
diff --git a/apps/files_sharing/l10n/si_LK.php b/apps/files_sharing/l10n/si_LK.php
index 1c69c608178673c4f6bd4ca5aae050b4df68f17d..580f7b1990a01502cfdfd38895bbfb75c7eded2a 100644
--- a/apps/files_sharing/l10n/si_LK.php
+++ b/apps/files_sharing/l10n/si_LK.php
@@ -1,9 +1,9 @@
"මුරපදය",
+"Password" => "මුර පදය",
"Submit" => "යොමු කරන්න",
"%s shared the folder %s with you" => "%s ඔබව %s ෆෝල්ඩරයට හවුල් කරගත්තේය",
"%s shared the file %s with you" => "%s ඔබ සමඟ %s ගොනුව බෙදාහදාගත්තේය",
-"Download" => "භාගත කරන්න",
+"Download" => "බාන්න",
"No preview available for" => "පූර්වදර්ශනයක් නොමැත",
"web services under your control" => "ඔබට පාලනය කළ හැකි වෙබ් සේවාවන්"
);
diff --git a/apps/files_sharing/l10n/sk_SK.php b/apps/files_sharing/l10n/sk_SK.php
index 2e781f76f385540606664e20a8a67876b1a2d37e..14124eeb8745f3c1d976dd881f22065c455c0d30 100644
--- a/apps/files_sharing/l10n/sk_SK.php
+++ b/apps/files_sharing/l10n/sk_SK.php
@@ -3,7 +3,7 @@
"Submit" => "Odoslať",
"%s shared the folder %s with you" => "%s zdieľa s vami priečinok %s",
"%s shared the file %s with you" => "%s zdieľa s vami súbor %s",
-"Download" => "Stiahnuť",
+"Download" => "Sťahovanie",
"No preview available for" => "Žiaden náhľad k dispozícii pre",
"web services under your control" => "webové služby pod Vašou kontrolou"
);
diff --git a/apps/files_sharing/l10n/sr.php b/apps/files_sharing/l10n/sr.php
index 6e277f677119ce3b1f1373b57267142b73463d4c..be24c06e465c4e57f0f5876498dcf9ba61c353d2 100644
--- a/apps/files_sharing/l10n/sr.php
+++ b/apps/files_sharing/l10n/sr.php
@@ -1,5 +1,6 @@
"Лозинка",
"Submit" => "Пошаљи",
-"Download" => "Преузми"
+"Download" => "Преузми",
+"web services under your control" => "веб сервиси под контролом"
);
diff --git a/apps/files_sharing/l10n/sr@latin.php b/apps/files_sharing/l10n/sr@latin.php
new file mode 100644
index 0000000000000000000000000000000000000000..cce6bd1f77154802b284a078142dbcdaf2d6864b
--- /dev/null
+++ b/apps/files_sharing/l10n/sr@latin.php
@@ -0,0 +1,5 @@
+ "Lozinka",
+"Submit" => "Pošalji",
+"Download" => "Preuzmi"
+);
diff --git a/apps/files_sharing/l10n/tr.php b/apps/files_sharing/l10n/tr.php
index f2e6e5697d629b473966dda9fb59438f7cea5f0d..42dfec8cc6f0a08d1a85dc73c1476e1715da2966 100644
--- a/apps/files_sharing/l10n/tr.php
+++ b/apps/files_sharing/l10n/tr.php
@@ -1,5 +1,5 @@
"Şifre",
+"Password" => "Parola",
"Submit" => "Gönder",
"%s shared the folder %s with you" => "%s sizinle paylaşılan %s klasör",
"%s shared the file %s with you" => "%s sizinle paylaşılan %s klasör",
diff --git a/apps/files_sharing/l10n/ug.php b/apps/files_sharing/l10n/ug.php
new file mode 100644
index 0000000000000000000000000000000000000000..348acc4a898fda96c9ccde1479343933d95c37a6
--- /dev/null
+++ b/apps/files_sharing/l10n/ug.php
@@ -0,0 +1,5 @@
+ "ئىم",
+"Submit" => "تاپشۇر",
+"Download" => "چۈشۈر"
+);
diff --git a/apps/files_sharing/l10n/uk.php b/apps/files_sharing/l10n/uk.php
index cdc103ad465be0e0c5dec0df6655bb5a5ca5ed9a..8e1fa4bc980892d9e7d6531b2611ad835934da62 100644
--- a/apps/files_sharing/l10n/uk.php
+++ b/apps/files_sharing/l10n/uk.php
@@ -1,6 +1,6 @@
"Пароль",
-"Submit" => "Submit",
+"Submit" => "Передати",
"%s shared the folder %s with you" => "%s опублікував каталог %s для Вас",
"%s shared the file %s with you" => "%s опублікував файл %s для Вас",
"Download" => "Завантажити",
diff --git a/apps/files_sharing/l10n/zh_TW.php b/apps/files_sharing/l10n/zh_TW.php
index f1d28731a7fc78f11f3f48033e64cbd4423d63ba..14e4466ecb6183396ad5a6a895a7d501e2971c67 100644
--- a/apps/files_sharing/l10n/zh_TW.php
+++ b/apps/files_sharing/l10n/zh_TW.php
@@ -1,9 +1,9 @@
"密碼",
"Submit" => "送出",
-"%s shared the folder %s with you" => "%s 分享了資料夾 %s 給您",
-"%s shared the file %s with you" => "%s 分享了檔案 %s 給您",
+"%s shared the folder %s with you" => "%s 和您分享了資料夾 %s ",
+"%s shared the file %s with you" => "%s 和您分享了檔案 %s",
"Download" => "下載",
"No preview available for" => "無法預覽",
-"web services under your control" => "在您掌控之下的網路服務"
+"web services under your control" => "由您控制的網路服務"
);
diff --git a/apps/files_sharing/lib/cache.php b/apps/files_sharing/lib/cache.php
index 9fccd0b46f32481684e993d66b081cd4580b5cf0..2160fe9a393bb366a1e4fd0c6d3bf415684e2a1a 100644
--- a/apps/files_sharing/lib/cache.php
+++ b/apps/files_sharing/lib/cache.php
@@ -44,9 +44,9 @@ class Shared_Cache extends Cache {
$source = \OC_Share_Backend_File::getSource($target);
if (isset($source['path']) && isset($source['fileOwner'])) {
\OC\Files\Filesystem::initMountPoints($source['fileOwner']);
- $mount = \OC\Files\Mount::findByNumericId($source['storage']);
- if ($mount) {
- $fullPath = $mount->getMountPoint().$source['path'];
+ $mount = \OC\Files\Filesystem::getMountByNumericId($source['storage']);
+ if (is_array($mount)) {
+ $fullPath = $mount[key($mount)]->getMountPoint().$source['path'];
list($storage, $internalPath) = \OC\Files\Filesystem::resolvePath($fullPath);
if ($storage) {
$this->files[$target] = $internalPath;
@@ -60,6 +60,14 @@ class Shared_Cache extends Cache {
return false;
}
+ public function getNumericStorageId() {
+ if (isset($this->numericId)) {
+ return $this->numericId;
+ } else {
+ return false;
+ }
+ }
+
/**
* get the stored metadata of a file or folder
*
@@ -182,12 +190,10 @@ class Shared_Cache extends Cache {
*/
public function move($source, $target) {
if ($cache = $this->getSourceCache($source)) {
- $targetPath = \OC_Share_Backend_File::getSourcePath(dirname($target));
- if ($targetPath) {
- $targetPath .= '/' . basename($target);
- $cache->move($this->files[$source], $targetPath);
+ $file = \OC_Share_Backend_File::getSource($target);
+ if ($file && isset($file['path'])) {
+ $cache->move($this->files[$source], $file['path']);
}
-
}
}
@@ -269,4 +275,17 @@ class Shared_Cache extends Cache {
return \OCP\Share::getItemsSharedWith('file', \OC_Share_Backend_File::FORMAT_GET_ALL);
}
-}
+ /**
+ * find a folder in the cache which has not been fully scanned
+ *
+ * If multiply incomplete folders are in the cache, the one with the highest id will be returned,
+ * use the one with the highest id gives the best result with the background scanner, since that is most
+ * likely the folder where we stopped scanning previously
+ *
+ * @return string|bool the path of the folder or false when no folder matched
+ */
+ public function getIncomplete() {
+ return false;
+ }
+
+}
\ No newline at end of file
diff --git a/apps/files_sharing/lib/sharedstorage.php b/apps/files_sharing/lib/sharedstorage.php
index ffd4e5ced22bdd1264b2898b6b62bbe646f4be07..5c23a9eb0d0a69a0c1001786538c624790a718c6 100644
--- a/apps/files_sharing/lib/sharedstorage.php
+++ b/apps/files_sharing/lib/sharedstorage.php
@@ -71,9 +71,9 @@ class Shared extends \OC\Files\Storage\Common {
if ($source) {
if (!isset($source['fullPath'])) {
\OC\Files\Filesystem::initMountPoints($source['fileOwner']);
- $mount = \OC\Files\Mount::findByNumericId($source['storage']);
- if ($mount) {
- $this->files[$target]['fullPath'] = $mount->getMountPoint().$source['path'];
+ $mount = \OC\Files\Filesystem::getMountByNumericId($source['storage']);
+ if (is_array($mount)) {
+ $this->files[$target]['fullPath'] = $mount[key($mount)]->getMountPoint().$source['path'];
} else {
$this->files[$target]['fullPath'] = false;
}
diff --git a/apps/files_sharing/public.php b/apps/files_sharing/public.php
index c8aca498f8c573affb7c7d6389178dea2110cf5b..59598e35fa241b8a923d77b49c4d44e6f6e1376e 100644
--- a/apps/files_sharing/public.php
+++ b/apps/files_sharing/public.php
@@ -1,8 +1,14 @@
printPage();
+ exit();
+}
+
function fileCmp($a, $b) {
if ($a['type'] == 'dir' and $b['type'] != 'dir') {
return -1;
@@ -39,6 +45,7 @@ if (isset($_GET['t'])) {
$fileOwner = $shareOwner;
}
if (isset($fileOwner)) {
+ OC_Util::tearDownFS();
OC_Util::setupFS($fileOwner);
$path = \OC\Files\Filesystem::getPath($linkItem['file_source']);
}
diff --git a/apps/files_trashbin/appinfo/app.php b/apps/files_trashbin/appinfo/app.php
index e83d3b8fbbd766ccadf600b766452bec191e3a16..3b1e0ac30cc3e4dc802cc86e427e3f7c64d4e475 100644
--- a/apps/files_trashbin/appinfo/app.php
+++ b/apps/files_trashbin/appinfo/app.php
@@ -3,7 +3,5 @@
OC::$CLASSPATH['OCA\Files_Trashbin\Hooks'] = 'files_trashbin/lib/hooks.php';
OC::$CLASSPATH['OCA\Files_Trashbin\Trashbin'] = 'files_trashbin/lib/trash.php';
-//Listen to delete file signal
-OCP\Util::connectHook('OC_Filesystem', 'delete', "OCA\Files_Trashbin\Hooks", "remove_hook");
-//Listen to delete user signal
-OCP\Util::connectHook('OC_User', 'pre_deleteUser', "OCA\Files_Trashbin\Hooks", "deleteUser_hook");
\ No newline at end of file
+// register hooks
+\OCA\Files_Trashbin\Trashbin::registerHooks();
\ No newline at end of file
diff --git a/apps/files_trashbin/index.php b/apps/files_trashbin/index.php
index 8a5875b9ce605214fcf65c2d34c27d52dcf5d779..a32b7414ac6a1b5a9a14c56d9753853ce38fb270 100644
--- a/apps/files_trashbin/index.php
+++ b/apps/files_trashbin/index.php
@@ -21,8 +21,7 @@ $dir = isset($_GET['dir']) ? stripslashes($_GET['dir']) : '';
$result = array();
if ($dir) {
$dirlisting = true;
- $fullpath = \OCP\Config::getSystemValue('datadirectory').$view->getAbsolutePath($dir);
- $dirContent = opendir($fullpath);
+ $dirContent = $view->opendir($dir);
$i = 0;
while($entryName = readdir($dirContent)) {
if ( $entryName != '.' && $entryName != '..' ) {
diff --git a/apps/files_trashbin/l10n/bg_BG.php b/apps/files_trashbin/l10n/bg_BG.php
index 288518e1a41320914d5abee9cae4a70af6460318..31c5dcb4ef19470bb49004af6e990cac3ccb0e69 100644
--- a/apps/files_trashbin/l10n/bg_BG.php
+++ b/apps/files_trashbin/l10n/bg_BG.php
@@ -13,6 +13,5 @@
"{count} files" => "{count} файла",
"Nothing in here. Your trash bin is empty!" => "Няма нищо. Кофата е празна!",
"Restore" => "Възтановяване",
-"Delete" => "Изтриване",
-"Deleted Files" => "Изтрити файлове"
+"Delete" => "Изтриване"
);
diff --git a/apps/files_trashbin/l10n/ia.php b/apps/files_trashbin/l10n/ia.php
index 0a51752312f37a994aeda4b736d693241143e46a..dea25b30ba45adc3b79a7625bed071f62e29890f 100644
--- a/apps/files_trashbin/l10n/ia.php
+++ b/apps/files_trashbin/l10n/ia.php
@@ -1,4 +1,5 @@
"Error",
"Name" => "Nomine",
"Delete" => "Deler"
);
diff --git a/apps/files_trashbin/l10n/ko.php b/apps/files_trashbin/l10n/ko.php
index f06c90962eaed68b56d0b60f642679822e443673..42ad87e98d2247283f347a1df1e85f5de1e4f83e 100644
--- a/apps/files_trashbin/l10n/ko.php
+++ b/apps/files_trashbin/l10n/ko.php
@@ -1,5 +1,6 @@
"오류",
+"Delete permanently" => "영원히 삭제",
"Name" => "이름",
"1 folder" => "폴더 1개",
"{count} folders" => "폴더 {count}개",
diff --git a/apps/files_trashbin/l10n/nb_NO.php b/apps/files_trashbin/l10n/nb_NO.php
index e1dce4b399525bf2fb3672a8595958393b7d65b7..43ad018049447a8d0a1b6c1bcf98a031bf498680 100644
--- a/apps/files_trashbin/l10n/nb_NO.php
+++ b/apps/files_trashbin/l10n/nb_NO.php
@@ -13,5 +13,6 @@
"{count} files" => "{count} filer",
"Nothing in here. Your trash bin is empty!" => "Ingenting her. Søppelkassen din er tom!",
"Restore" => "Gjenopprett",
-"Delete" => "Slett"
+"Delete" => "Slett",
+"Deleted Files" => "Slettet filer"
);
diff --git a/apps/files_trashbin/l10n/nn_NO.php b/apps/files_trashbin/l10n/nn_NO.php
index 14345ddcc4d49bedbb37d3f547197fd7b8e048ed..454ea2b05753198172040752659ff7bc99149290 100644
--- a/apps/files_trashbin/l10n/nn_NO.php
+++ b/apps/files_trashbin/l10n/nn_NO.php
@@ -1,5 +1,18 @@
"Klarte ikkje sletta %s for godt",
+"Couldn't restore %s" => "Klarte ikkje gjenoppretta %s",
+"perform restore operation" => "utfør gjenoppretting",
"Error" => "Feil",
+"delete file permanently" => "slett fila for godt",
+"Delete permanently" => "Slett for godt",
"Name" => "Namn",
-"Delete" => "Slett"
+"Deleted" => "Sletta",
+"1 folder" => "1 mappe",
+"{count} folders" => "{count} mapper",
+"1 file" => "1 fil",
+"{count} files" => "{count} filer",
+"Nothing in here. Your trash bin is empty!" => "Ingenting her. Papirkorga di er tom!",
+"Restore" => "Gjenopprett",
+"Delete" => "Slett",
+"Deleted Files" => "Sletta filer"
);
diff --git a/apps/files_trashbin/l10n/ru_RU.php b/apps/files_trashbin/l10n/ru_RU.php
index 178eb531077ceb3e661ff107f9480da8b9fdb31d..8636e417ecb207808d94e78c9acc8e05d51d1266 100644
--- a/apps/files_trashbin/l10n/ru_RU.php
+++ b/apps/files_trashbin/l10n/ru_RU.php
@@ -1,18 +1,5 @@
"%s не может быть удалён навсегда",
-"Couldn't restore %s" => "%s не может быть восстановлен",
-"perform restore operation" => "выполнить операцию восстановления",
"Error" => "Ошибка",
-"delete file permanently" => "удалить файл навсегда",
-"Delete permanently" => "Удалить навсегда",
"Name" => "Имя",
-"Deleted" => "Удалён",
-"1 folder" => "1 папка",
-"{count} folders" => "{количество} папок",
-"1 file" => "1 файл",
-"{count} files" => "{количество} файлов",
-"Nothing in here. Your trash bin is empty!" => "Здесь ничего нет. Ваша корзина пуста!",
-"Restore" => "Восстановить",
-"Delete" => "Удалить",
-"Deleted Files" => "Удаленные файлы"
+"Delete" => "Удалить"
);
diff --git a/apps/files_trashbin/l10n/ug.php b/apps/files_trashbin/l10n/ug.php
new file mode 100644
index 0000000000000000000000000000000000000000..c369e385f740c1950fd7a105c8901054eecb10fd
--- /dev/null
+++ b/apps/files_trashbin/l10n/ug.php
@@ -0,0 +1,11 @@
+ "خاتالىق",
+"Delete permanently" => "مەڭگۈلۈك ئۆچۈر",
+"Name" => "ئاتى",
+"Deleted" => "ئۆچۈرۈلدى",
+"1 folder" => "1 قىسقۇچ",
+"1 file" => "1 ھۆججەت",
+"{count} files" => "{count} ھۆججەت",
+"Nothing in here. Your trash bin is empty!" => "بۇ جايدا ھېچنېمە يوق. Your trash bin is empty!",
+"Delete" => "ئۆچۈر"
+);
diff --git a/apps/files_trashbin/lib/trash.php b/apps/files_trashbin/lib/trash.php
index f0b56eef01403ce3bf12493916614b7070be6f73..2d1830a38f1b4a8e10e575dab4cfc2b5222fdb49 100644
--- a/apps/files_trashbin/lib/trash.php
+++ b/apps/files_trashbin/lib/trash.php
@@ -29,6 +29,17 @@ class Trashbin {
// unit: percentage; 50% of available disk space/quota
const DEFAULTMAXSIZE=50;
+ public static function getUidAndFilename($filename) {
+ $uid = \OC\Files\Filesystem::getOwner($filename);
+ \OC\Files\Filesystem::initMountPoints($uid);
+ if ( $uid != \OCP\User::getUser() ) {
+ $info = \OC\Files\Filesystem::getFileInfo($filename);
+ $ownerView = new \OC\Files\View('/'.$uid.'/files');
+ $filename = $ownerView->getPath($info['fileid']);
+ }
+ return array($uid, $filename);
+ }
+
/**
* move file to the trash bin
*
@@ -39,14 +50,15 @@ class Trashbin {
$view = new \OC\Files\View('/'. $user);
if (!$view->is_dir('files_trashbin')) {
$view->mkdir('files_trashbin');
- $view->mkdir("files_trashbin/files");
- $view->mkdir("files_trashbin/versions");
- $view->mkdir("files_trashbin/keyfiles");
+ $view->mkdir('files_trashbin/files');
+ $view->mkdir('files_trashbin/versions');
+ $view->mkdir('files_trashbin/keyfiles');
+ $view->mkdir('files_trashbin/share-keys');
}
$path_parts = pathinfo($file_path);
- $deleted = $path_parts['basename'];
+ $filename = $path_parts['basename'];
$location = $path_parts['dirname'];
$timestamp = time();
$mime = $view->getMimeType('files'.$file_path);
@@ -61,46 +73,29 @@ class Trashbin {
if ( $trashbinSize === false || $trashbinSize < 0 ) {
$trashbinSize = self::calculateSize(new \OC\Files\View('/'. $user.'/files_trashbin'));
}
-
- $sizeOfAddedFiles = self::copy_recursive($file_path, 'files_trashbin/files/'.$deleted.'.d'.$timestamp, $view);
-
- if ( $view->file_exists('files_trashbin/files/'.$deleted.'.d'.$timestamp) ) {
+
+ // disable proxy to prevent recursive calls
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+ $sizeOfAddedFiles = self::copy_recursive($file_path, 'files_trashbin/files/'.$filename.'.d'.$timestamp, $view);
+ \OC_FileProxy::$enabled = $proxyStatus;
+
+ if ( $view->file_exists('files_trashbin/files/'.$filename.'.d'.$timestamp) ) {
$trashbinSize += $sizeOfAddedFiles;
$query = \OC_DB::prepare("INSERT INTO `*PREFIX*files_trash` (`id`,`timestamp`,`location`,`type`,`mime`,`user`) VALUES (?,?,?,?,?,?)");
- $result = $query->execute(array($deleted, $timestamp, $location, $type, $mime, $user));
+ $result = $query->execute(array($filename, $timestamp, $location, $type, $mime, $user));
if ( !$result ) { // if file couldn't be added to the database than also don't store it in the trash bin.
- $view->deleteAll('files_trashbin/files/'.$deleted.'.d'.$timestamp);
+ $view->deleteAll('files_trashbin/files/'.$filename.'.d'.$timestamp);
\OC_Log::write('files_trashbin', 'trash bin database couldn\'t be updated', \OC_log::ERROR);
return;
}
\OCP\Util::emitHook('\OCA\Files_Trashbin\Trashbin', 'post_moveToTrash',
array('filePath' => \OC\Files\Filesystem::normalizePath($file_path),
- 'trashPath' => \OC\Files\Filesystem::normalizePath($deleted.'.d'.$timestamp)));
-
- // Take care of file versions
- if ( \OCP\App::isEnabled('files_versions') ) {
- if ( $view->is_dir('files_versions/'.$file_path) ) {
- $trashbinSize += self::calculateSize(new \OC\Files\View('/'. $user.'/files_versions/'.$file_path));
- $view->rename('files_versions/'.$file_path, 'files_trashbin/versions'. $deleted.'.d'.$timestamp);
- } else if ( $versions = \OCA\Files_Versions\Storage::getVersions($user, $file_path) ) {
- foreach ($versions as $v) {
- $trashbinSize += $view->filesize('files_versions'.$v['path'].'.v'.$v['version']);
- $view->rename('files_versions'.$v['path'].'.v'.$v['version'], 'files_trashbin/versions/'. $deleted.'.v'.$v['version'].'.d'.$timestamp);
- }
- }
- }
-
- // Take care of encryption keys
- $keyfile = \OC\Files\Filesystem::normalizePath('files_encryption/keyfiles/'.$file_path);
- if ( \OCP\App::isEnabled('files_encryption') && $view->file_exists($keyfile.'.key') ) {
- if ( $view->is_dir('files'.$file_path) ) {
- $trashbinSize += self::calculateSize(new \OC\Files\View('/'.$user.'/'.$keyfile));
- $view->rename($keyfile, 'files_trashbin/keyfiles/'. $deleted.'.d'.$timestamp);
- } else {
- $trashbinSize += $view->filesize($keyfile.'.key');
- $view->rename($keyfile.'.key', 'files_trashbin/keyfiles/'. $deleted.'.key.d'.$timestamp);
- }
- }
+ 'trashPath' => \OC\Files\Filesystem::normalizePath($filename.'.d'.$timestamp)));
+
+ $trashbinSize += self::retainVersions($view, $file_path, $filename, $timestamp);
+ $trashbinSize += self::retainEncryptionKeys($view, $file_path, $filename, $timestamp);
+
} else {
\OC_Log::write('files_trashbin', 'Couldn\'t move '.$file_path.' to the trash bin', \OC_log::ERROR);
}
@@ -111,15 +106,141 @@ class Trashbin {
}
+ /**
+ * Move file versions to trash so that they can be restored later
+ *
+ * @param \OC\Files\View $view
+ * @param $file_path path to original file
+ * @param $filename of deleted file
+ * @param $timestamp when the file was deleted
+ *
+ * @return size of stored versions
+ */
+ private static function retainVersions($view, $file_path, $filename, $timestamp) {
+ $size = 0;
+ if (\OCP\App::isEnabled('files_versions')) {
+
+ // disable proxy to prevent recursive calls
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
+ $user = \OCP\User::getUser();
+ $rootView = new \OC\Files\View('/');
+
+ list($owner, $ownerPath) = self::getUidAndFilename($file_path);
+
+ if ($rootView->is_dir($owner.'/files_versions/' . $ownerPath)) {
+ $size += self::calculateSize(new \OC\Files\View('/' . $owner . '/files_versions/' . $ownerPath));
+ $rootView->rename($owner.'/files_versions/' . $ownerPath, $user.'/files_trashbin/versions/' . $filename . '.d' . $timestamp);
+ } else if ($versions = \OCA\Files_Versions\Storage::getVersions($owner, $ownerPath)) {
+ foreach ($versions as $v) {
+ $size += $rootView->filesize($owner.'/files_versions' . $v['path'] . '.v' . $v['version']);
+ $rootView->rename($owner.'/files_versions' . $v['path'] . '.v' . $v['version'], $user.'/files_trashbin/versions/' . $filename . '.v' . $v['version'] . '.d' . $timestamp);
+ }
+ }
+
+ // enable proxy
+ \OC_FileProxy::$enabled = $proxyStatus;
+ }
+
+ return $size;
+ }
+
+ /**
+ * Move encryption keys to trash so that they can be restored later
+ *
+ * @param \OC\Files\View $view
+ * @param $file_path path to original file
+ * @param $filename of deleted file
+ * @param $timestamp when the file was deleted
+ *
+ * @return size of encryption keys
+ */
+ private static function retainEncryptionKeys($view, $file_path, $filename, $timestamp) {
+ $size = 0;
+
+ if (\OCP\App::isEnabled('files_encryption')) {
+
+ $user = \OCP\User::getUser();
+ $rootView = new \OC\Files\View('/');
+
+ list($owner, $ownerPath) = self::getUidAndFilename($file_path);
+
+
+ // 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 ($rootView->is_dir($keyfile) || $rootView->file_exists($keyfile . '.key')) {
+ // move keyfiles
+ if ($rootView->is_dir($keyfile)) {
+ $size += self::calculateSize(new \OC\Files\View($keyfile));
+ $rootView->rename($keyfile, $user.'/files_trashbin/keyfiles/' . $filename . '.d' . $timestamp);
+ } else {
+ $size += $rootView->filesize($keyfile . '.key');
+ $rootView->rename($keyfile . '.key', $user.'/files_trashbin/keyfiles/' . $filename . '.key.d' . $timestamp);
+ }
+ }
+
+ // retain share keys
+ $sharekeys = \OC\Files\Filesystem::normalizePath($owner.'/files_encryption/share-keys/' . $ownerPath);
+
+ if ($rootView->is_dir($sharekeys)) {
+ $size += self::calculateSize(new \OC\Files\View($sharekeys));
+ $rootView->rename($sharekeys, $user.'/files_trashbin/share-keys/' . $filename . '.d' . $timestamp);
+ } else {
+ // get local path to share-keys
+ $localShareKeysPath = $rootView->getLocalFile($sharekeys);
+
+ // handle share-keys
+ $matches = glob(preg_quote($localShareKeysPath).'*.shareKey');
+ foreach ($matches as $src) {
+ // get source file parts
+ $pathinfo = pathinfo($src);
+
+ // we only want to keep the owners key so we can access the private key
+ $ownerShareKey = $filename . '.' . $user. '.shareKey';
+
+ // if we found the share-key for the owner, we need to move it to files_trashbin
+ if($pathinfo['basename'] == $ownerShareKey) {
+
+ // calculate size
+ $size += $rootView->filesize($sharekeys. '.' . $user. '.shareKey');
+
+ // move file
+ $rootView->rename($sharekeys. '.' . $user. '.shareKey', $user.'/files_trashbin/share-keys/' . $ownerShareKey . '.d' . $timestamp);
+ } else {
+
+ // calculate size
+ $size += filesize($src);
+
+ // don't keep other share-keys
+ unlink($src);
+ }
+ }
+
+ }
+
+ // enable proxy
+ \OC_FileProxy::$enabled = $proxyStatus;
+ }
+ return $size;
+ }
/**
* restore files from trash bin
* @param $file path to the deleted file
* @param $filename name of the file
* @param $timestamp time when the file was deleted
- */
+ *
+ * @return bool
+ */
public static function restore($file, $filename, $timestamp) {
- $user = \OCP\User::getUser();
+
+ $user = \OCP\User::getUser();
$view = new \OC\Files\View('/'.$user);
$trashbinSize = self::getTrashbinSize($user);
@@ -157,8 +278,20 @@ class Trashbin {
// we need a extension in case a file/dir with the same name already exists
$ext = self::getUniqueExtension($location, $filename, $view);
$mtime = $view->filemtime($source);
- if( $view->rename($source, $target.$ext) ) {
- $view->touch($target.$ext, $mtime);
+
+ // disable proxy to prevent recursive calls
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
+ // restore file
+ $restoreResult = $view->rename($source, $target.$ext);
+
+ // handle the restore result
+ if( $restoreResult ) {
+ $fakeRoot = $view->getRoot();
+ $view->chroot('/'.$user.'/files');
+ $view->touch('/'.$location.'/'.$filename.$ext, $mtime);
+ $view->chroot($fakeRoot);
\OCP\Util::emitHook('\OCA\Files_Trashbin\Trashbin', 'post_restore',
array('filePath' => \OC\Files\Filesystem::normalizePath('/'.$location.'/'.$filename.$ext),
'trashPath' => \OC\Files\Filesystem::normalizePath($file)));
@@ -167,68 +300,195 @@ class Trashbin {
} else {
$trashbinSize -= $view->filesize($target.$ext);
}
- // if versioning app is enabled, copy versions from the trash bin back to the original location
- if ( \OCP\App::isEnabled('files_versions') ) {
- if ($timestamp ) {
- $versionedFile = $filename;
- } else {
- $versionedFile = $file;
- }
- if ( $result[0]['type'] === 'dir' ) {
- $trashbinSize -= self::calculateSize(new \OC\Files\View('/'.$user.'/'.'files_trashbin/versions/'. $file));
- $view->rename(\OC\Files\Filesystem::normalizePath('files_trashbin/versions/'. $file), \OC\Files\Filesystem::normalizePath('files_versions/'.$location.'/'.$filename.$ext));
- } else if ( $versions = self::getVersionsFromTrash($versionedFile, $timestamp) ) {
- foreach ($versions as $v) {
- if ($timestamp ) {
- $trashbinSize -= $view->filesize('files_trashbin/versions/'.$versionedFile.'.v'.$v.'.d'.$timestamp);
- $view->rename('files_trashbin/versions/'.$versionedFile.'.v'.$v.'.d'.$timestamp, 'files_versions/'.$location.'/'.$filename.$ext.'.v'.$v);
- } else {
- $trashbinSize -= $view->filesize('files_trashbin/versions/'.$versionedFile.'.v'.$v);
- $view->rename('files_trashbin/versions/'.$versionedFile.'.v'.$v, 'files_versions/'.$location.'/'.$filename.$ext.'.v'.$v);
- }
- }
- }
- }
-
- // Take care of encryption keys TODO! Get '.key' in file between file name and delete date (also for permanent delete!)
- $parts = pathinfo($file);
- if ( $result[0]['type'] === 'dir' ) {
- $keyfile = \OC\Files\Filesystem::normalizePath('files_trashbin/keyfiles/'.$parts['dirname'].'/'.$filename);
- } else {
- $keyfile = \OC\Files\Filesystem::normalizePath('files_trashbin/keyfiles/'.$parts['dirname'].'/'.$filename.'.key');
- }
- if ($timestamp) {
- $keyfile .= '.d'.$timestamp;
- }
- if ( \OCP\App::isEnabled('files_encryption') && $view->file_exists($keyfile) ) {
- if ( $result[0]['type'] === 'dir' ) {
- $trashbinSize -= self::calculateSize(new \OC\Files\View('/'.$user.'/'.$keyfile));
- $view->rename($keyfile, 'files_encryption/keyfiles/'. $location.'/'.$filename);
- } else {
- $trashbinSize -= $view->filesize($keyfile);
- $view->rename($keyfile, 'files_encryption/keyfiles/'. $location.'/'.$filename.'.key');
- }
- }
-
+
+ $trashbinSize -= self::restoreVersions($view, $file, $filename, $ext, $location, $timestamp);
+ $trashbinSize -= self::restoreEncryptionKeys($view, $file, $filename, $ext, $location, $timestamp);
+
if ( $timestamp ) {
$query = \OC_DB::prepare('DELETE FROM `*PREFIX*files_trash` WHERE `user`=? AND `id`=? AND `timestamp`=?');
$query->execute(array($user,$filename,$timestamp));
}
self::setTrashbinSize($user, $trashbinSize);
-
+
+ // enable proxy
+ \OC_FileProxy::$enabled = $proxyStatus;
+
return true;
- } else {
- \OC_Log::write('files_trashbin', 'Couldn\'t restore file from trash bin, '.$filename, \OC_log::ERROR);
}
+ // enable proxy
+ \OC_FileProxy::$enabled = $proxyStatus;
+
return false;
}
+ /**
+ * @brief restore versions from trash bin
+ *
+ * @param \OC\Files\View $view file view
+ * @param $file complete path to file
+ * @param $filename name of file
+ * @param $ext file extension in case a file with the same $filename already exists
+ * @param $location location if file
+ * @param $timestamp deleteion time
+ *
+ * @return size of restored versions
+ */
+ private static function restoreVersions($view, $file, $filename, $ext, $location, $timestamp) {
+ $size = 0;
+ if (\OCP\App::isEnabled('files_versions')) {
+ // disable proxy to prevent recursive calls
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
+ $user = \OCP\User::getUser();
+ $rootView = new \OC\Files\View('/');
+
+ $target = \OC\Files\Filesystem::normalizePath('/'.$location.'/'.$filename.$ext);
+
+ list($owner, $ownerPath) = self::getUidAndFilename($target);
+
+ if ($timestamp) {
+ $versionedFile = $filename;
+ } else {
+ $versionedFile = $file;
+ }
+
+ if ($view->is_dir('/files_trashbin/versions/'.$file)) {
+ $size += self::calculateSize(new \OC\Files\View('/' . $user . '/' . 'files_trashbin/versions/' . $file));
+ $rootView->rename(\OC\Files\Filesystem::normalizePath($user.'/files_trashbin/versions/' . $file), \OC\Files\Filesystem::normalizePath($owner.'/files_versions/' . $ownerPath));
+ } else if ($versions = self::getVersionsFromTrash($versionedFile, $timestamp)) {
+ foreach ($versions as $v) {
+ if ($timestamp) {
+ $size += $view->filesize('files_trashbin/versions/' . $versionedFile . '.v' . $v . '.d' . $timestamp);
+ $rootView->rename($user.'/files_trashbin/versions/' . $versionedFile . '.v' . $v . '.d' . $timestamp, $owner.'/files_versions/' . $ownerPath . '.v' . $v);
+ } else {
+ $size += $view->filesize('files_trashbin/versions/' . $versionedFile . '.v' . $v);
+ $rootView->rename($user.'/files_trashbin/versions/' . $versionedFile . '.v' . $v, $owner.'/files_versions/' . $ownerPath . '.v' . $v);
+ }
+ }
+ }
+
+ // enable proxy
+ \OC_FileProxy::$enabled = $proxyStatus;
+ }
+ return $size;
+ }
+
+
+ /**
+ * @brief restore encryption keys from trash bin
+ *
+ * @param \OC\Files\View $view
+ * @param $file complete path to file
+ * @param $filename name of file
+ * @param $ext file extension in case a file with the same $filename already exists
+ * @param $location location of file
+ * @param $timestamp deleteion time
+ *
+ * @return size of restored encrypted file
+ */
+ private static function restoreEncryptionKeys($view, $file, $filename, $ext, $location, $timestamp) {
+ // Take care of encryption keys TODO! Get '.key' in file between file name and delete date (also for permanent delete!)
+ $size = 0;
+ if (\OCP\App::isEnabled('files_encryption')) {
+ $user = \OCP\User::getUser();
+ $rootView = new \OC\Files\View('/');
+
+ $target = \OC\Files\Filesystem::normalizePath('/'.$location.'/'.$filename.$ext);
+
+ list($owner, $ownerPath) = self::getUidAndFilename($target);
+
+ $path_parts = pathinfo($file);
+ $source_location = $path_parts['dirname'];
+
+ if ($view->is_dir('/files_trashbin/keyfiles/'.$file)) {
+ if($source_location != '.') {
+ $keyfile = \OC\Files\Filesystem::normalizePath($user.'/files_trashbin/keyfiles/' . $source_location . '/' . $filename);
+ $sharekey = \OC\Files\Filesystem::normalizePath($user.'/files_trashbin/share-keys/' . $source_location . '/' . $filename);
+ } else {
+ $keyfile = \OC\Files\Filesystem::normalizePath($user.'/files_trashbin/keyfiles/' . $filename);
+ $sharekey = \OC\Files\Filesystem::normalizePath($user.'/files_trashbin/share-keys/' . $filename);
+ }
+ } else {
+ $keyfile = \OC\Files\Filesystem::normalizePath($user.'/files_trashbin/keyfiles/' . $source_location . '/' . $filename . '.key');
+ }
+
+ if ($timestamp) {
+ $keyfile .= '.d' . $timestamp;
+ }
+
+ // disable proxy to prevent recursive calls
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
+ if ($rootView->file_exists($keyfile)) {
+ // handle directory
+ if ($rootView->is_dir($keyfile)) {
+
+ // handle keyfiles
+ $size += self::calculateSize(new \OC\Files\View($keyfile));
+ $rootView->rename($keyfile, $owner.'/files_encryption/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);
+
+ } else {
+ // handle keyfiles
+ $size += $rootView->filesize($keyfile);
+ $rootView->rename($keyfile, $owner.'/files_encryption/keyfiles/' . $ownerPath . '.key');
+
+ // handle share-keys
+ $ownerShareKey = \OC\Files\Filesystem::normalizePath($user.'/files_trashbin/share-keys/' . $source_location . '/' . $filename . '.' . $user. '.shareKey');
+ if ($timestamp) {
+ $ownerShareKey .= '.d' . $timestamp;
+ }
+
+ $size += $rootView->filesize($ownerShareKey);
+
+ // move only owners key
+ $rootView->rename($ownerShareKey, $owner.'/files_encryption/share-keys/' . $ownerPath . '.' . $user. '.shareKey');
+
+ // try to re-share if file is shared
+ $filesystemView = new \OC_FilesystemView('/');
+ $session = new \OCA\Encryption\Session($filesystemView);
+ $util = new \OCA\Encryption\Util($filesystemView, $user);
+
+ // fix the file size
+ $absolutePath = \OC\Files\Filesystem::normalizePath('/' . $owner . '/files/'. $ownerPath);
+ $util->fixFileSize($absolutePath);
+
+ // get current sharing state
+ $sharingEnabled = \OCP\Share::isEnabled();
+
+ // get the final filename
+ $target = \OC\Files\Filesystem::normalizePath($location.'/'.$filename);
+
+ // get users sharing this file
+ $usersSharing = $util->getSharingUsersArray($sharingEnabled, $target.$ext, $user);
+
+ // Attempt to set shareKey
+ $util->setSharedFileKeyfiles($session, $usersSharing, $target.$ext);
+ }
+ }
+
+ // enable proxy
+ \OC_FileProxy::$enabled = $proxyStatus;
+ }
+ return $size;
+ }
+
/**
- * delete file from trash bin permanently
+ * @brief delete file from trash bin permanently
+ *
* @param $filename path to the file
* @param $timestamp of deletion time
+ *
* @return size of deleted files
*/
public static function delete($filename, $timestamp=null) {
@@ -249,7 +509,25 @@ class Trashbin {
$file = $filename;
}
+ $size += self::deleteVersions($view, $file, $filename, $timestamp);
+ $size += self::deleteEncryptionKeys($view, $file, $filename, $timestamp);
+
+ if ($view->is_dir('/files_trashbin/files/'.$file)) {
+ $size += self::calculateSize(new \OC\Files\View('/'.$user.'/files_trashbin/files/'.$file));
+ } else {
+ $size += $view->filesize('/files_trashbin/files/'.$file);
+ }
+ $view->unlink('/files_trashbin/files/'.$file);
+ $trashbinSize -= $size;
+ self::setTrashbinSize($user, $trashbinSize);
+
+ return $size;
+ }
+
+ private static function deleteVersions($view, $file, $filename, $timestamp) {
+ $size = 0;
if ( \OCP\App::isEnabled('files_versions') ) {
+ $user = \OCP\User::getUser();
if ($view->is_dir('files_trashbin/versions/'.$file)) {
$size += self::calculateSize(new \OC\Files\view('/'.$user.'/files_trashbin/versions/'.$file));
$view->unlink('files_trashbin/versions/'.$file);
@@ -265,35 +543,37 @@ class Trashbin {
}
}
}
-
- // Take care of encryption keys
- $parts = pathinfo($file);
- if ( $view->is_dir('/files_trashbin/files/'.$file) ) {
- $keyfile = \OC\Files\Filesystem::normalizePath('files_trashbin/keyfiles/'.$filename);
- } else {
- $keyfile = \OC\Files\Filesystem::normalizePath('files_trashbin/keyfiles/'.$filename.'.key');
- }
- if ($timestamp) {
- $keyfile .= '.d'.$timestamp;
- }
- if ( \OCP\App::isEnabled('files_encryption') && $view->file_exists($keyfile) ) {
- if ( $view->is_dir($keyfile) ) {
- $size += self::calculateSize(new \OC\Files\View('/'.$user.'/'.$keyfile));
+ return $size;
+ }
+
+ private static function deleteEncryptionKeys($view, $file, $filename, $timestamp) {
+ $size = 0;
+ if (\OCP\App::isEnabled('files_encryption')) {
+ $user = \OCP\User::getUser();
+
+ if ($view->is_dir('/files_trashbin/files/' . $file)) {
+ $keyfile = \OC\Files\Filesystem::normalizePath('files_trashbin/keyfiles/' . $filename);
+ $sharekeys = \OC\Files\Filesystem::normalizePath('files_trashbin/share-keys/' . $filename);
} else {
- $size += $view->filesize($keyfile);
+ $keyfile = \OC\Files\Filesystem::normalizePath('files_trashbin/keyfiles/' . $filename . '.key');
+ $sharekeys = \OC\Files\Filesystem::normalizePath('files_trashbin/share-keys/' . $filename . '.' . $user . '.shareKey');
+ }
+ if ($timestamp) {
+ $keyfile .= '.d' . $timestamp;
+ $sharekeys .= '.d' . $timestamp;
+ }
+ if ($view->file_exists($keyfile)) {
+ if ($view->is_dir($keyfile)) {
+ $size += self::calculateSize(new \OC\Files\View('/' . $user . '/' . $keyfile));
+ $size += self::calculateSize(new \OC\Files\View('/' . $user . '/' . $sharekeys));
+ } else {
+ $size += $view->filesize($keyfile);
+ $size += $view->filesize($sharekeys);
+ }
+ $view->unlink($keyfile);
+ $view->unlink($sharekeys);
}
- $view->unlink($keyfile);
- }
-
- if ($view->is_dir('/files_trashbin/files/'.$file)) {
- $size += self::calculateSize(new \OC\Files\View('/'.$user.'/files_trashbin/files/'.$file));
- } else {
- $size += $view->filesize('/files_trashbin/files/'.$file);
}
- $view->unlink('/files_trashbin/files/'.$file);
- $trashbinSize -= $size;
- self::setTrashbinSize($user, $trashbinSize);
-
return $size;
}
@@ -553,5 +833,14 @@ class Trashbin {
}
$query->execute(array($size, $user));
}
-
+
+ /**
+ * register hooks
+ */
+ public static function registerHooks() {
+ //Listen to delete file signal
+ \OCP\Util::connectHook('OC_Filesystem', 'delete', "OCA\Files_Trashbin\Hooks", "remove_hook");
+ //Listen to delete user signal
+ \OCP\Util::connectHook('OC_User', 'pre_deleteUser', "OCA\Files_Trashbin\Hooks", "deleteUser_hook");
+ }
}
diff --git a/apps/files_versions/l10n/et_EE.php b/apps/files_versions/l10n/et_EE.php
index 930cfbc33a7e3cb335cfd3d7d0de66f0b98d15e0..c8d2f7cfacdc289bce2ef79d46c63841de943149 100644
--- a/apps/files_versions/l10n/et_EE.php
+++ b/apps/files_versions/l10n/et_EE.php
@@ -7,5 +7,5 @@
"No old versions available" => "Vanu versioone pole saadaval",
"No path specified" => "Asukohta pole määratud",
"Versions" => "Versioonid",
-"Revert a file to a previous version by clicking on its revert button" => "Taasta fail varasemale versioonile klikkides \"Revert\" nupule"
+"Revert a file to a previous version by clicking on its revert button" => "Taasta fail varasemale versioonile klikkides nupule \"Taasta\""
);
diff --git a/apps/files_versions/l10n/he.php b/apps/files_versions/l10n/he.php
index 9eb4df64857fbd7675bc0814d65a286c39b96871..ad2e261d5391028d34b81bc2c2beca95e83e0f74 100644
--- a/apps/files_versions/l10n/he.php
+++ b/apps/files_versions/l10n/he.php
@@ -1,5 +1,3 @@
"היסטוריה",
-"Files Versioning" => "שמירת הבדלי גרסאות של קבצים",
-"Enable" => "הפעלה"
+"Versions" => "גרסאות"
);
diff --git a/apps/files_versions/l10n/ku_IQ.php b/apps/files_versions/l10n/ku_IQ.php
index db5dbad49fcae65da0279cb0693592900767bca7..9132caf75e3123387298d67c5a24794245dd23bb 100644
--- a/apps/files_versions/l10n/ku_IQ.php
+++ b/apps/files_versions/l10n/ku_IQ.php
@@ -1,5 +1,3 @@
"مێژوو",
-"Files Versioning" => "وهشانی پهڕگه",
-"Enable" => "چالاککردن"
+"Versions" => "وهشان"
);
diff --git a/apps/files_versions/l10n/nb_NO.php b/apps/files_versions/l10n/nb_NO.php
index 18c725061027a0a0d216ca3850a5aaf50e71c1ff..df59dfe4c8c094872bd470a2d08de9c326dc9430 100644
--- a/apps/files_versions/l10n/nb_NO.php
+++ b/apps/files_versions/l10n/nb_NO.php
@@ -1,5 +1,3 @@
"Historie",
-"Files Versioning" => "Fil versjonering",
-"Enable" => "Aktiver"
+"Versions" => "Versjoner"
);
diff --git a/apps/files_versions/l10n/nn_NO.php b/apps/files_versions/l10n/nn_NO.php
new file mode 100644
index 0000000000000000000000000000000000000000..940cc2371a107918df31404f5cd3d4504eaa9e71
--- /dev/null
+++ b/apps/files_versions/l10n/nn_NO.php
@@ -0,0 +1,11 @@
+ "Klarte ikkje å tilbakestilla: %s",
+"success" => "vellukka",
+"File %s was reverted to version %s" => "Tilbakestilte fila %s til utgåva %s",
+"failure" => "feil",
+"File %s could not be reverted to version %s" => "Klarte ikkje tilbakestilla fila %s til utgåva %s",
+"No old versions available" => "Ingen eldre utgåver tilgjengelege",
+"No path specified" => "Ingen sti gjeve",
+"Versions" => "Utgåver",
+"Revert a file to a previous version by clicking on its revert button" => "Tilbakestill ei fil til ei tidlegare utgåve ved å klikka tilbakestill-knappen"
+);
diff --git a/apps/files_versions/l10n/ro.php b/apps/files_versions/l10n/ro.php
index 7dfaee3672b1c391f0968599560062f54ccc4cb0..cd9fc89dcc6bb545bdbec800d9713c25ef65f5d5 100644
--- a/apps/files_versions/l10n/ro.php
+++ b/apps/files_versions/l10n/ro.php
@@ -1,5 +1,11 @@
"Istoric",
-"Files Versioning" => "Versionare fișiere",
-"Enable" => "Activare"
+"Could not revert: %s" => "Nu a putut reveni: %s",
+"success" => "success",
+"File %s was reverted to version %s" => "Fisierul %s a revenit la versiunea %s",
+"failure" => "eșec",
+"File %s could not be reverted to version %s" => "Fisierele %s nu au putut reveni la versiunea %s",
+"No old versions available" => "Versiunile vechi nu sunt disponibile",
+"No path specified" => "Nici un dosar specificat",
+"Versions" => "Versiuni",
+"Revert a file to a previous version by clicking on its revert button" => "Readuceti un fișier la o versiune anterioară, făcând clic pe butonul revenire"
);
diff --git a/apps/files_versions/l10n/si_LK.php b/apps/files_versions/l10n/si_LK.php
index 37debf869bc55f054c322f5993256f8f8e9c7ebf..c7ee63d8ef637ca2775906527634bb3f94ee3509 100644
--- a/apps/files_versions/l10n/si_LK.php
+++ b/apps/files_versions/l10n/si_LK.php
@@ -1,5 +1,3 @@
"ඉතිහාසය",
-"Files Versioning" => "ගොනු අනුවාදයන්",
-"Enable" => "සක්රිය කරන්න"
+"Versions" => "අනුවාද"
);
diff --git a/apps/files_versions/l10n/ta_LK.php b/apps/files_versions/l10n/ta_LK.php
index aca76dcc2621697e3f515abcbbc9229da15a6511..61a47e42f0a13eac7636bf9408137adacaad908c 100644
--- a/apps/files_versions/l10n/ta_LK.php
+++ b/apps/files_versions/l10n/ta_LK.php
@@ -1,5 +1,3 @@
"வரலாறு",
-"Files Versioning" => "கோப்பு பதிப்புகள்",
-"Enable" => "இயலுமைப்படுத்துக"
+"Versions" => "பதிப்புகள்"
);
diff --git a/apps/files_versions/l10n/th_TH.php b/apps/files_versions/l10n/th_TH.php
index e1e996903aea02efcef879b9c7c8525ae842928c..2998f74838991e12191754b17f30c93c4bac2d4d 100644
--- a/apps/files_versions/l10n/th_TH.php
+++ b/apps/files_versions/l10n/th_TH.php
@@ -1,5 +1,3 @@
"ประวัติ",
-"Files Versioning" => "การกำหนดเวอร์ชั่นของไฟล์",
-"Enable" => "เปิดใช้งาน"
+"Versions" => "รุ่น"
);
diff --git a/apps/files_versions/l10n/ug.php b/apps/files_versions/l10n/ug.php
new file mode 100644
index 0000000000000000000000000000000000000000..024f326b032a9574b864cdda14d9a70df2298aaf
--- /dev/null
+++ b/apps/files_versions/l10n/ug.php
@@ -0,0 +1,9 @@
+ "ئەسلىگە قايتۇرالمايدۇ: %s",
+"success" => "مۇۋەپپەقىيەتلىك",
+"File %s was reverted to version %s" => "ھۆججەت %s نى %s نەشرىگە ئەسلىگە قايتۇردى",
+"failure" => "مەغلۇپ بولدى",
+"No old versions available" => "كونا نەشرى يوق",
+"No path specified" => "يول بەلگىلەنمىگەن",
+"Versions" => "نەشرى"
+);
diff --git a/apps/files_versions/l10n/vi.php b/apps/files_versions/l10n/vi.php
index f2499e7bf355fe4dae3b0bff6fb4caabc67e0ed5..33b045f2e3e859a6e99d3a73ed29bcef23d3e8d9 100644
--- a/apps/files_versions/l10n/vi.php
+++ b/apps/files_versions/l10n/vi.php
@@ -6,5 +6,6 @@
"File %s could not be reverted to version %s" => "File %s không thể khôi phục về phiên bản %s",
"No old versions available" => "Không có phiên bản cũ nào",
"No path specified" => "Không chỉ ra đường dẫn rõ ràng",
+"Versions" => "Phiên bản",
"Revert a file to a previous version by clicking on its revert button" => "Khôi phục một file về phiên bản trước đó bằng cách click vào nút Khôi phục tương ứng"
);
diff --git a/apps/files_versions/l10n/zh_TW.php b/apps/files_versions/l10n/zh_TW.php
index a191d5945237d18d9cbb54852a0ff7b9eb8a2640..2ae9ce657ceec2d379c69eaab4ef5933900367c6 100644
--- a/apps/files_versions/l10n/zh_TW.php
+++ b/apps/files_versions/l10n/zh_TW.php
@@ -5,7 +5,7 @@
"failure" => "失敗",
"File %s could not be reverted to version %s" => "檔案 %s 無法復原至版本 %s",
"No old versions available" => "沒有舊的版本",
-"No path specified" => "沒有指定路線",
+"No path specified" => "沒有指定路徑",
"Versions" => "版本",
-"Revert a file to a previous version by clicking on its revert button" => "按一按復原的按鈕,就能把一個檔案復原至以前的版本"
+"Revert a file to a previous version by clicking on its revert button" => "按一下復原的按鈕即可把檔案復原至以前的版本"
);
diff --git a/apps/files_versions/lib/versions.php b/apps/files_versions/lib/versions.php
index c38ba688fe086e4e8e0d72011b04a84d90d5ca5c..5fdbef27743b8f719ef4971104e69be6fb72670e 100644
--- a/apps/files_versions/lib/versions.php
+++ b/apps/files_versions/lib/versions.php
@@ -184,11 +184,12 @@ class Storage {
/**
* rollback to an old version of a file.
*/
- public static function rollback($filename, $revision) {
+ public static function rollback($file, $revision) {
if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') {
- list($uid, $filename) = self::getUidAndFilename($filename);
+ list($uid, $filename) = self::getUidAndFilename($file);
$users_view = new \OC\Files\View('/'.$uid);
+ $files_view = new \OC\Files\View('/'.\OCP\User::getUser().'/files');
$versionCreated = false;
//first create a new version
@@ -199,9 +200,9 @@ class Storage {
}
// rollback
- if( @$users_view->copy('files_versions'.$filename.'.v'.$revision, 'files'.$filename) ) {
- $users_view->touch('files'.$filename, $revision);
- Storage::expire($filename);
+ if( @$users_view->rename('files_versions'.$filename.'.v'.$revision, 'files'.$filename) ) {
+ $files_view->touch($file, $revision);
+ Storage::expire($file);
return true;
}else if ( $versionCreated ) {
diff --git a/apps/files_versions/templates/history.php b/apps/files_versions/templates/history.php
index f7284439041e7762f50723fc87bbf5a7d77ae12b..3a6d5f0c9e7baaae22bf7d94be22553ff10546fe 100644
--- a/apps/files_versions/templates/history.php
+++ b/apps/files_versions/templates/history.php
@@ -5,18 +5,18 @@
if( isset( $_['message'] ) ) {
- if( isset($_['path'] ) ) print_unescaped('File: '.OC_Util::sanitizeHTML($_['path'])).' ';
- print_unescaped(''.OC_Util::sanitizeHTML($_['message']) ).' ';
+ if( isset($_['path'] ) ) print_unescaped('File: '.OC_Util::sanitizeHTML($_['path']).' ');
+ print_unescaped(''.OC_Util::sanitizeHTML($_['message']) .' ');
}else{
if( isset( $_['outcome_stat'] ) ) {
- print_unescaped( '
'.OC_Util::sanitizeHTML($_['outcome_msg']) ).'
';
+ print_unescaped( '
'.OC_Util::sanitizeHTML($_['outcome_msg']).'
');
}
- print_unescaped( 'Versions of '.OC_Util::sanitizeHTML($_['path']) ).' ';
+ print_unescaped( 'Versions of '.OC_Util::sanitizeHTML($_['path']).' ');
print_unescaped('
'.OC_Util::sanitizeHTML($l->t('Revert a file to a previous version by clicking on its revert button')).'
');
foreach ( $_['versions'] as $v ) {
diff --git a/apps/user_ldap/ajax/clearMappings.php b/apps/user_ldap/ajax/clearMappings.php
new file mode 100644
index 0000000000000000000000000000000000000000..5dab39839b63327b1219dc18b0d97391c13698fa
--- /dev/null
+++ b/apps/user_ldap/ajax/clearMappings.php
@@ -0,0 +1,35 @@
+.
+ *
+ */
+
+// Check user and app status
+OCP\JSON::checkAdminUser();
+OCP\JSON::checkAppEnabled('user_ldap');
+OCP\JSON::callCheck();
+
+$subject = $_POST['ldap_clear_mapping'];
+if(\OCA\user_ldap\lib\Helper::clearMapping($subject)) {
+ OCP\JSON::success();
+} else {
+ $l=OC_L10N::get('user_ldap');
+ OCP\JSON::error(array('message' => $l->t('Failed to clear the mappings.')));
+}
\ No newline at end of file
diff --git a/apps/user_ldap/appinfo/app.php b/apps/user_ldap/appinfo/app.php
index 89410b5ef07e821cae7046c55197c98bda73a409..81eaa0404b759dbef6be6590521b08b47493ef52 100644
--- a/apps/user_ldap/appinfo/app.php
+++ b/apps/user_ldap/appinfo/app.php
@@ -24,7 +24,7 @@
OCP\App::registerAdmin('user_ldap', 'settings');
$configPrefixes = OCA\user_ldap\lib\Helper::getServerConfigurationPrefixes(true);
-if(count($configPrefixes) == 1) {
+if(count($configPrefixes) === 1) {
$connector = new OCA\user_ldap\lib\Connection($configPrefixes[0]);
$userBackend = new OCA\user_ldap\USER_LDAP();
$userBackend->setConnector($connector);
diff --git a/apps/user_ldap/appinfo/install.php b/apps/user_ldap/appinfo/install.php
index 378957ec4095dba8968f4301d4bbe65860f3c8cb..c0c33a25c75f3b835cfe2697382b7608f65b0a8c 100644
--- a/apps/user_ldap/appinfo/install.php
+++ b/apps/user_ldap/appinfo/install.php
@@ -1,6 +1,6 @@
getUUID($newDN);
//fix home folder to avoid new ones depending on the configuration
$userBE->getHome($dn['owncloud_name']);
diff --git a/apps/user_ldap/css/settings.css b/apps/user_ldap/css/settings.css
index 84ada0832ab52f5ac263a65aaf93dde25e22fa71..185952e14bbdda762f427eee7e42084ed9a9badd 100644
--- a/apps/user_ldap/css/settings.css
+++ b/apps/user_ldap/css/settings.css
@@ -11,6 +11,10 @@
display: inline-block;
}
+.ldapIndent {
+ margin-left: 50px;
+}
+
.ldapwarning {
margin-left: 1.4em;
color: #FF3B3B;
diff --git a/apps/user_ldap/group_ldap.php b/apps/user_ldap/group_ldap.php
index 432ddd215db6e1d4dcaeaccfefb70fa66c9c4c34..04ff392f9205ab88f692e4994abc47a19b080a6d 100644
--- a/apps/user_ldap/group_ldap.php
+++ b/apps/user_ldap/group_ldap.php
@@ -66,7 +66,7 @@ class GROUP_LDAP extends lib\Access implements \OCP\GroupInterface {
//extra work if we don't get back user DNs
//TODO: this can be done with one LDAP query
- if(strtolower($this->connection->ldapGroupMemberAssocAttr) == 'memberuid') {
+ if(strtolower($this->connection->ldapGroupMemberAssocAttr) === 'memberuid') {
$dns = array();
foreach($members as $mid) {
$filter = str_replace('%uid', $mid, $this->connection->ldapLoginFilter);
@@ -108,11 +108,11 @@ class GROUP_LDAP extends lib\Access implements \OCP\GroupInterface {
}
//uniqueMember takes DN, memberuid the uid, so we need to distinguish
- if((strtolower($this->connection->ldapGroupMemberAssocAttr) == 'uniquemember')
- || (strtolower($this->connection->ldapGroupMemberAssocAttr) == 'member')
+ if((strtolower($this->connection->ldapGroupMemberAssocAttr) === 'uniquemember')
+ || (strtolower($this->connection->ldapGroupMemberAssocAttr) === 'member')
) {
$uid = $userDN;
- } else if(strtolower($this->connection->ldapGroupMemberAssocAttr) == 'memberuid') {
+ } else if(strtolower($this->connection->ldapGroupMemberAssocAttr) === 'memberuid') {
$result = $this->readAttribute($userDN, 'uid');
$uid = $result[0];
} else {
@@ -157,7 +157,7 @@ class GROUP_LDAP extends lib\Access implements \OCP\GroupInterface {
return $groupUsers;
}
- if($limit == -1) {
+ if($limit === -1) {
$limit = null;
}
$groupDN = $this->groupname2dn($gid);
@@ -175,7 +175,7 @@ class GROUP_LDAP extends lib\Access implements \OCP\GroupInterface {
}
$groupUsers = array();
- $isMemberUid = (strtolower($this->connection->ldapGroupMemberAssocAttr) == 'memberuid');
+ $isMemberUid = (strtolower($this->connection->ldapGroupMemberAssocAttr) === 'memberuid');
foreach($members as $member) {
if($isMemberUid) {
//we got uids, need to get their DNs to 'tranlsate' them to usernames
diff --git a/apps/user_ldap/js/settings.js b/apps/user_ldap/js/settings.js
index e34849ec8878e394b23e90e01acd4996a13d5a74..f47d49cf222a9142b433b55c9a58966b27f75dab 100644
--- a/apps/user_ldap/js/settings.js
+++ b/apps/user_ldap/js/settings.js
@@ -8,13 +8,13 @@ var LdapConfiguration = {
OC.filePath('user_ldap','ajax','getConfiguration.php'),
$('#ldap_serverconfig_chooser').serialize(),
function (result) {
- if(result.status == 'success') {
+ if(result.status === 'success') {
$.each(result.configuration, function(configkey, configvalue) {
elementID = '#'+configkey;
//deal with Checkboxes
if($(elementID).is('input[type=checkbox]')) {
- if(configvalue == 1) {
+ if(configvalue === 1) {
$(elementID).attr('checked', 'checked');
} else {
$(elementID).removeAttr('checked');
@@ -37,13 +37,13 @@ var LdapConfiguration = {
resetDefaults: function() {
$('#ldap').find('input[type=text], input[type=number], input[type=password], textarea, select').each(function() {
- if($(this).attr('id') == 'ldap_serverconfig_chooser') {
+ if($(this).attr('id') === 'ldap_serverconfig_chooser') {
return;
}
$(this).val($(this).attr('data-default'));
});
$('#ldap').find('input[type=checkbox]').each(function() {
- if($(this).attr('data-default') == 1) {
+ if($(this).attr('data-default') === 1) {
$(this).attr('checked', 'checked');
} else {
$(this).removeAttr('checked');
@@ -56,7 +56,7 @@ var LdapConfiguration = {
OC.filePath('user_ldap','ajax','deleteConfiguration.php'),
$('#ldap_serverconfig_chooser').serialize(),
function (result) {
- if(result.status == 'success') {
+ if(result.status === 'success') {
$('#ldap_serverconfig_chooser option:selected').remove();
$('#ldap_serverconfig_chooser option:first').select();
LdapConfiguration.refreshConfig();
@@ -74,7 +74,7 @@ var LdapConfiguration = {
$.post(
OC.filePath('user_ldap','ajax','getNewServerConfigPrefix.php'),
function (result) {
- if(result.status == 'success') {
+ if(result.status === 'success') {
if(doNotAsk) {
LdapConfiguration.resetDefaults();
} else {
@@ -99,6 +99,26 @@ var LdapConfiguration = {
}
}
);
+ },
+
+ clearMappings: function(mappingSubject) {
+ $.post(
+ OC.filePath('user_ldap','ajax','clearMappings.php'),
+ 'ldap_clear_mapping='+mappingSubject,
+ function(result) {
+ if(result.status == 'success') {
+ OC.dialogs.info(
+ t('user_ldap', 'mappings cleared'),
+ t('user_ldap', 'Success')
+ );
+ } else {
+ OC.dialogs.alert(
+ result.message,
+ t('user_ldap', 'Error')
+ );
+ }
+ }
+ );
}
}
@@ -115,7 +135,7 @@ $(document).ready(function() {
OC.filePath('user_ldap','ajax','testConfiguration.php'),
$('#ldap').serialize(),
function (result) {
- if (result.status == 'success') {
+ if (result.status === 'success') {
OC.dialogs.alert(
result.message,
t('user_ldap', 'Connection test succeeded')
@@ -150,7 +170,7 @@ $(document).ready(function() {
$('#ldap').serialize(),
function (result) {
bgcolor = $('#ldap_submit').css('background');
- if (result.status == 'success') {
+ if (result.status === 'success') {
//the dealing with colors is a but ugly, but the jQuery version in use has issues with rgba colors
$('#ldap_submit').css('background', '#fff');
$('#ldap_submit').effect('highlight', {'color':'#A8FA87'}, 5000, function() {
@@ -166,9 +186,19 @@ $(document).ready(function() {
);
});
+ $('#ldap_action_clear_user_mappings').click(function(event) {
+ event.preventDefault();
+ LdapConfiguration.clearMappings('user');
+ });
+
+ $('#ldap_action_clear_group_mappings').click(function(event) {
+ event.preventDefault();
+ LdapConfiguration.clearMappings('group');
+ });
+
$('#ldap_serverconfig_chooser').change(function(event) {
value = $('#ldap_serverconfig_chooser option:selected:first').attr('value');
- if(value == 'NEW') {
+ if(value === 'NEW') {
LdapConfiguration.addConfiguration(false);
} else {
LdapConfiguration.refreshConfig();
diff --git a/apps/user_ldap/l10n/ar.php b/apps/user_ldap/l10n/ar.php
index 4d7b7ac4ade26c6a187b92dce01b2ad567e68f68..5f8b6b8145514e00aabda1c4908a04848c0c0544 100644
--- a/apps/user_ldap/l10n/ar.php
+++ b/apps/user_ldap/l10n/ar.php
@@ -1,5 +1,6 @@
"فشل الحذف",
+"Error" => "خطأ",
"Password" => "كلمة المرور",
"Help" => "المساعدة"
);
diff --git a/apps/user_ldap/l10n/bg_BG.php b/apps/user_ldap/l10n/bg_BG.php
index c064534a6b8a16924045f7478c423f53d0d50ece..0330046d80e00c6018e5b427823472148acbc26f 100644
--- a/apps/user_ldap/l10n/bg_BG.php
+++ b/apps/user_ldap/l10n/bg_BG.php
@@ -1,4 +1,5 @@
"Грешка",
"Password" => "Парола",
"Help" => "Помощ"
);
diff --git a/apps/user_ldap/l10n/bn_BD.php b/apps/user_ldap/l10n/bn_BD.php
index 69dfc8961792f1c28f914ec45f4b8907398869e6..4cee35777df353a724ad0ed574a27d7ede63f7ff 100644
--- a/apps/user_ldap/l10n/bn_BD.php
+++ b/apps/user_ldap/l10n/bn_BD.php
@@ -1,4 +1,5 @@
"সমস্যা",
"Host" => "হোস্ট",
"You can omit the protocol, except you require SSL. Then start with ldaps://" => "SSL আবশ্যক না হলে আপনি এই প্রটোকলটি মুছে ফেলতে পারেন । এরপর শুরু করুন এটা দিয়ে ldaps://",
"Base DN" => "ভিত্তি DN",
diff --git a/apps/user_ldap/l10n/ca.php b/apps/user_ldap/l10n/ca.php
index abdecb164e8f29c1f4bd0487e556ba56743994f7..7f0849b2382e3b5c9616c7e219652ea3a8d6bd3a 100644
--- a/apps/user_ldap/l10n/ca.php
+++ b/apps/user_ldap/l10n/ca.php
@@ -1,4 +1,5 @@
"Ha fallat en eliminar els mapatges",
"Failed to delete the server configuration" => "Ha fallat en eliminar la configuració del servidor",
"The configuration is valid and the connection could be established!" => "La configuració és vàlida i s'ha pogut establir la comunicació!",
"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "La configuració és vàlida, però ha fallat el Bind. Comproveu les credencials i l'arranjament del servidor.",
@@ -7,6 +8,9 @@
"Take over settings from recent server configuration?" => "Voleu prendre l'arranjament de la configuració actual del servidor?",
"Keep settings?" => "Voleu mantenir la configuració?",
"Cannot add server configuration" => "No es pot afegir la configuració del servidor",
+"mappings cleared" => "s'han eliminat els mapatges",
+"Success" => "Èxit",
+"Error" => "Error",
"Connection test succeeded" => "La prova de connexió ha reeixit",
"Connection test failed" => "La prova de connexió ha fallat",
"Do you really want to delete the current Server Configuration?" => "Voleu eliminar la configuració actual del servidor?",
@@ -15,7 +19,7 @@
"Warning: The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "Avís: El mòdul PHP LDAP no està instal·lat, el dorsal no funcionarà. Demaneu a l'administrador del sistema que l'instal·li.",
"Server configuration" => "Configuració del servidor",
"Add Server Configuration" => "Afegeix la configuració del servidor",
-"Host" => "Màquina",
+"Host" => "Equip remot",
"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Podeu ometre el protocol, excepte si requeriu SSL. Llavors comenceu amb ldaps://",
"Base DN" => "DN Base",
"One Base DN per line" => "Una DN Base per línia",
@@ -70,6 +74,16 @@
"Email Field" => "Camp de correu electrònic",
"User Home Folder Naming Rule" => "Norma per anomenar la carpeta arrel d'usuari",
"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Deixeu-ho buit pel nom d'usuari (per defecte). Altrament, especifiqueu un atribut LDAP/AD.",
+"Internal Username" => "Nom d'usuari intern",
+"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." => "Per defecte el nom d'usuari intern es crearà a partir de l'atribut UUID. Això assegura que el nom d'usuari és únic i que els caràcters no s'han de convertir. El nom d'usuari intern té la restricció que només estan permesos els caràcters: [ a-zA-Z0-9_.@- ]. Els altres caràcters es substitueixen pel seu corresponent ASCII o simplement s'ometen. En cas de col·lisió s'incrementa/decrementa en un. El nom d'usuari intern s'utilitza per identificar un usuari internament. També és el nom per defecte de la carpeta home a ownCloud. És també un port de URLs remotes, per exemple tots els serveis *DAV. Amb aquest arranjament es pot variar el comportament per defecte. Per obtenir un comportament similar al d'abans de ownCloud 5, escriviu el nom d'usuari a mostrar en el camp següent. Deixei-lo en blanc si preferiu el comportament per defecte. Els canvis tindran efecte només en els nous usuaris LDAP mapats (afegits).",
+"Internal Username Attribute:" => "Atribut nom d'usuari intern:",
+"Override UUID detection" => "Sobrescriu la detecció UUID",
+"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." => "Per defecte, owncloud autodetecta l'atribut UUID. L'atribut UUID s'utilitza per identificar usuaris i grups de forma indubtable. També el nom d'usuari intern es crearà en base a la UUIS, si no heu especificat res diferent a dalt. Podeu sobreescriure l'arranjament i passar l'atribut que desitgeu. Heu d'assegurar-vos que l'atribut que escolliu pot ser recollit tant pels usuaris com pels grups i que és únic. Deixeu-ho en blanc si preferiu el comportament per defecte. els canvis s'aplicaran en els usuaris i grups LDAP mapats de nou (afegits).",
+"UUID Attribute:" => "Atribut UUID:",
+"Username-LDAP User Mapping" => "Mapatge d'usuari Nom d'usuari-LDAP",
+"ownCloud uses usernames to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from ownCloud username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found by ownCloud. The internal ownCloud name is used all over in ownCloud. Clearing the Mappings will have leftovers everywhere. Clearing the Mappings is not configuration sensitive, it affects all LDAP configurations! Do never clear the mappings in a production environment. Only clear mappings in a testing or experimental stage." => "ownCloud utilitza els noms d'usuari per emmagatzemar i assignar (meta)dades. per tal d'identificar usuaris de forma precisa, cada usuari LDAP tindrà un nom d'usuari intern. Això requereix un mapatge del nom d'usuari ownCloud a l'usuari LDAP. El nom d'usuari creat es mapa a la UUID de l'usuari LDAP. Addicionalment, la DN es desa a la memòria de cau per reduïr la interacció LDAP, però no s'usa per a identificació. Si la DN canvia, els canvis són detectats per ownCloud. El nom d'usuari intern ownCloud s'utilitza internament arreu de ownCloud. Eliminar els mapatges tindrà efectues per tot arreu. L'eliminació dels mapatges no és sensible a la configuració, afecta a totes les configuracions LDAP! No elimineu mai els mapatges en un entorn de producció. Elimineu-los només en un estadi experimental o de prova.",
+"Clear Username-LDAP User Mapping" => "Elimina el mapatge d'usuari Nom d'usuari-LDAP",
+"Clear Groupname-LDAP Group Mapping" => "Elimina el mapatge de grup Nom de grup-LDAP",
"Test Configuration" => "Comprovació de la configuració",
"Help" => "Ajuda"
);
diff --git a/apps/user_ldap/l10n/cs_CZ.php b/apps/user_ldap/l10n/cs_CZ.php
index c5d77026b9e9b317dc7b6a1bbc46ef67d1ef298a..dd7373eb690a66b6d8dbb7bf81712c187b50007e 100644
--- a/apps/user_ldap/l10n/cs_CZ.php
+++ b/apps/user_ldap/l10n/cs_CZ.php
@@ -7,6 +7,8 @@
"Take over settings from recent server configuration?" => "Převzít nastavení z nedávného nastavení serveru?",
"Keep settings?" => "Ponechat nastavení?",
"Cannot add server configuration" => "Nelze přidat nastavení serveru",
+"Success" => "Úspěch",
+"Error" => "Chyba",
"Connection test succeeded" => "Test spojení byl úspěšný",
"Connection test failed" => "Test spojení selhal",
"Do you really want to delete the current Server Configuration?" => "Opravdu si přejete smazat současné nastavení serveru?",
diff --git a/apps/user_ldap/l10n/cy_GB.php b/apps/user_ldap/l10n/cy_GB.php
index 335e2109c2db7d79a7980b07cd1eb3f409db351d..abe2336b2ba8c9fdbd5e9ca74a0d95030b2746dc 100644
--- a/apps/user_ldap/l10n/cy_GB.php
+++ b/apps/user_ldap/l10n/cy_GB.php
@@ -1,5 +1,6 @@
"Methwyd dileu",
+"Error" => "Gwall",
"Password" => "Cyfrinair",
"Help" => "Cymorth"
);
diff --git a/apps/user_ldap/l10n/da.php b/apps/user_ldap/l10n/da.php
index 9329c4e8a2416f1db1fd0993a1d6f28f76f62c0d..0a77f46647977050177d02cbb51c4977986611f4 100644
--- a/apps/user_ldap/l10n/da.php
+++ b/apps/user_ldap/l10n/da.php
@@ -1,5 +1,7 @@
"Fejl ved sletning",
+"Success" => "Succes",
+"Error" => "Fejl",
"Host" => "Host",
"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Du kan udelade protokollen, medmindre du skal bruge SSL. Start i så fald med ldaps://",
"Base DN" => "Base DN",
diff --git a/apps/user_ldap/l10n/de.php b/apps/user_ldap/l10n/de.php
index e86d877ecd77271a6eeec19dc736072cfb0293aa..f00108184214f9c959315ec7100f66ce7316d276 100644
--- a/apps/user_ldap/l10n/de.php
+++ b/apps/user_ldap/l10n/de.php
@@ -1,31 +1,33 @@
"Löschen der Serverkonfiguration fehlgeschlagen",
-"The configuration is valid and the connection could be established!" => "Die Konfiguration war erfolgreich, 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.",
-"The configuration is invalid. Please look in the ownCloud log for further details." => "Die Konfiguration ist ungültig, bitte sehen Sie für weitere Details im ownCloud Log nach",
+"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üfe die Servereinstellungen und Anmeldeinformationen.",
+"The configuration is invalid. Please look in the ownCloud log for further details." => "Die Konfiguration ist ungültig, sieh für weitere Details bitte im ownCloud Log nach",
"Deletion failed" => "Löschen fehlgeschlagen",
"Take over settings from recent server configuration?" => "Einstellungen von letzter Konfiguration übernehmen?",
"Keep settings?" => "Einstellungen beibehalten?",
-"Cannot add server configuration" => "Serverkonfiguration konnte nicht hinzugefügt werden.",
+"Cannot add server configuration" => "Das Hinzufügen der Serverkonfiguration schlug fehl",
+"Success" => "Erfolgreich",
+"Error" => "Fehler",
"Connection test succeeded" => "Verbindungstest erfolgreich",
"Connection test failed" => "Verbindungstest fehlgeschlagen",
-"Do you really want to delete the current Server Configuration?" => "Wollen Sie die aktuelle Serverkonfiguration wirklich löschen?",
+"Do you really want to delete the current Server Configuration?" => "Möchtest Du die aktuelle Serverkonfiguration wirklich löschen?",
"Confirm Deletion" => "Löschung bestätigen",
-"Warning: Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "Warnung: Die Anwendungen user_ldap und user_webdavauth sind inkompatibel. Es kann demzufolge zu unerwarteten Verhalten kommen. Bitte Deinen Systemadministator eine der beiden Anwendungen zu deaktivieren.",
+"Warning: Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "Warnung: Die Anwendungen user_ldap und user_webdavauth sind inkompatibel. Es kann demzufolge zu unerwartetem Verhalten kommen. Bitte Deinen Systemadministator eine der beiden Anwendungen zu deaktivieren.",
"Warning: The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "Warnung: Da das PHP-Modul für LDAP nicht installiert ist, wird das Backend nicht funktionieren. Bitte Deinen Systemadministrator das Modul zu installieren.",
"Server configuration" => "Serverkonfiguration",
"Add Server Configuration" => "Serverkonfiguration hinzufügen",
"Host" => "Host",
"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Du kannst das Protokoll auslassen, außer wenn Du SSL benötigst. Beginne dann mit ldaps://",
"Base DN" => "Basis-DN",
-"One Base DN per line" => "Ein Base DN pro Zeile",
+"One Base DN per line" => "Ein Basis-DN pro Zeile",
"You can specify Base DN for users and groups in the Advanced tab" => "Du kannst Basis-DN für Benutzer und Gruppen in dem \"Erweitert\"-Reiter konfigurieren",
"User DN" => "Benutzer-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." => "Der DN des Benutzers für LDAP-Bind, z.B.: uid=agent,dc=example,dc=com. Für anonymen Zugriff lasse DN und Passwort leer.",
"Password" => "Passwort",
-"For anonymous access, leave DN and Password empty." => "Lasse die Felder von DN und Passwort für anonymen Zugang leer.",
+"For anonymous access, leave DN and Password empty." => "Lasse die Felder DN und Passwort für anonymen Zugang leer.",
"User Login Filter" => "Benutzer-Login-Filter",
-"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Bestimmt den angewendeten Filter, wenn eine Anmeldung versucht wird. %%uid ersetzt den Benutzernamen bei dem Anmeldeversuch.",
+"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Bestimmt den angewendeten Filter, wenn eine Anmeldung versucht wird. %%uid ersetzt den Benutzernamen beim Anmeldeversuch.",
"use %%uid placeholder, e.g. \"uid=%%uid\"" => "verwende %%uid Platzhalter, z. B. \"uid=%%uid\"",
"User List Filter" => "Benutzer-Filter-Liste",
"Defines the filter to apply, when retrieving users." => "Definiert den Filter für die Anfrage der Benutzer.",
@@ -54,13 +56,13 @@
"User Display Name Field" => "Feld für den Anzeigenamen des Benutzers",
"The LDAP attribute to use to generate the user`s ownCloud name." => "Das LDAP-Attribut für die Generierung des Benutzernamens in ownCloud. ",
"Base User Tree" => "Basis-Benutzerbaum",
-"One User Base DN per line" => "Ein Benutzer Base DN pro Zeile",
+"One User Base DN per line" => "Ein Benutzer Basis-DN pro Zeile",
"User Search Attributes" => "Benutzersucheigenschaften",
-"Optional; one attribute per line" => "Optional; eine Eigenschaft pro Zeile",
+"Optional; one attribute per line" => "Optional; ein Attribut pro Zeile",
"Group Display Name Field" => "Feld für den Anzeigenamen der Gruppe",
"The LDAP attribute to use to generate the groups`s ownCloud name." => "Das LDAP-Attribut für die Generierung des Gruppennamens in ownCloud. ",
"Base Group Tree" => "Basis-Gruppenbaum",
-"One Group Base DN per line" => "Ein Gruppen Base DN pro Zeile",
+"One Group Base DN per line" => "Ein Gruppen Basis-DN pro Zeile",
"Group Search Attributes" => "Gruppensucheigenschaften",
"Group-Member association" => "Assoziation zwischen Gruppe und Benutzer",
"Special Attributes" => "Spezielle Eigenschaften",
diff --git a/apps/user_ldap/l10n/de_DE.php b/apps/user_ldap/l10n/de_DE.php
index 3b5d60387a6409754d2daf65064f5d290b749c8b..e22c5b5bdd900f1dae429a7d3a9c7f8d3f055273 100644
--- a/apps/user_ldap/l10n/de_DE.php
+++ b/apps/user_ldap/l10n/de_DE.php
@@ -1,31 +1,33 @@
"Das Löschen der Server-Konfiguration schlug fehl",
+"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 das Herstellen der Verbindung schlug fehl. Bitte überprüfen Sie die Server-Einstellungen und Zertifikate.",
-"The configuration is invalid. Please look in the ownCloud log for further details." => "Die Konfiguration ist ungültig. Weitere Details können Sie im ownCloud-Log nachlesen.",
+"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.",
+"The configuration is invalid. Please look in the ownCloud log for further details." => "Die Konfiguration ist ungültig, sehen Sie für weitere Details bitte im ownCloud Log nach",
"Deletion failed" => "Löschen fehlgeschlagen",
-"Take over settings from recent server configuration?" => "Sollen die Einstellungen der letzten Serverkonfiguration übernommen werden?",
-"Keep settings?" => "Einstellungen behalten?",
+"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",
+"Success" => "Erfolg",
+"Error" => "Fehler",
"Connection test succeeded" => "Verbindungstest erfolgreich",
"Connection test failed" => "Verbindungstest fehlgeschlagen",
-"Do you really want to delete the current Server Configuration?" => "Möchten Sie die Serverkonfiguration wirklich löschen?",
+"Do you really want to delete the current Server Configuration?" => "Möchten Sie die aktuelle Serverkonfiguration wirklich löschen?",
"Confirm Deletion" => "Löschung bestätigen",
-"Warning: Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "Warnung: Die Anwendungen user_ldap und user_webdavauth sind inkompatibel. Es kann demzufolge zu unerwarteten Verhalten kommen. Bitten Sie Ihren Systemadministator eine der beiden Anwendungen zu deaktivieren.",
+"Warning: Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "Warnung: Die Anwendungen user_ldap und user_webdavauth sind inkompatibel. Es kann demzufolge zu unerwartetem Verhalten kommen. Bitten Sie Ihren Systemadministator eine der beiden Anwendungen zu deaktivieren.",
"Warning: The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "Warnung: Da das PHP-Modul für LDAP nicht installiert ist, wird das Backend nicht funktionieren. Bitten Sie Ihren Systemadministrator das Modul zu installieren.",
"Server configuration" => "Serverkonfiguration",
"Add Server Configuration" => "Serverkonfiguration hinzufügen",
"Host" => "Host",
"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Sie können das Protokoll auslassen, außer wenn Sie SSL benötigen. Beginnen Sie dann mit ldaps://",
"Base DN" => "Basis-DN",
-"One Base DN per line" => "Ein Base DN pro Zeile",
+"One Base DN per line" => "Ein Basis-DN pro Zeile",
"You can specify Base DN for users and groups in the Advanced tab" => "Sie können Basis-DN für Benutzer und Gruppen in dem \"Erweitert\"-Reiter konfigurieren",
"User DN" => "Benutzer-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." => "Der DN des Benutzers für LDAP-Bind, z.B.: uid=agent,dc=example,dc=com. Für einen anonymen Zugriff lassen Sie DN und Passwort leer.",
"Password" => "Passwort",
-"For anonymous access, leave DN and Password empty." => "Lassen Sie die Felder von DN und Passwort für einen anonymen Zugang leer.",
+"For anonymous access, leave DN and Password empty." => "Lassen Sie die Felder DN und Passwort für einen anonymen Zugang leer.",
"User Login Filter" => "Benutzer-Login-Filter",
-"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Bestimmt den angewendeten Filter, wenn eine Anmeldung durchgeführt wird. %%uid ersetzt den Benutzernamen bei dem Anmeldeversuch.",
+"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Bestimmt den angewendeten Filter, wenn eine Anmeldung durchgeführt wird. %%uid ersetzt den Benutzernamen beim Anmeldeversuch.",
"use %%uid placeholder, e.g. \"uid=%%uid\"" => "verwenden Sie %%uid Platzhalter, z. B. \"uid=%%uid\"",
"User List Filter" => "Benutzer-Filter-Liste",
"Defines the filter to apply, when retrieving users." => "Definiert den Filter für die Anfrage der Benutzer.",
@@ -37,12 +39,12 @@
"Configuration Active" => "Konfiguration aktiv",
"When unchecked, this configuration will be skipped." => "Wenn nicht angehakt, wird diese Konfiguration übersprungen.",
"Port" => "Port",
-"Backup (Replica) Host" => "Back-Up (Replikation) Host",
-"Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Geben Sie einen optionalen Backup-Host an. Es muss ein Replikat des Haupt-LDAP/AD Servers sein.",
-"Backup (Replica) Port" => "Back-Up (Replikation) Port",
+"Backup (Replica) Host" => "Backup Host (Kopie)",
+"Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Geben Sie einen optionalen Backup Host an. Es muss sich um eine Kopie des Haupt LDAP/AD Servers handeln.",
+"Backup (Replica) Port" => "Backup Port",
"Disable Main Server" => "Hauptserver deaktivieren",
-"When switched on, ownCloud will only connect to the replica server." => "Wenn eingeschaltet, wird sich die ownCloud nur mit dem Replikat-Server verbinden.",
-"Use TLS" => "Benutze TLS",
+"When switched on, ownCloud will only connect to the replica server." => "Wenn aktiviert, wird ownCloud ausschließlich den Backupserver verwenden.",
+"Use TLS" => "Nutze TLS",
"Do not use it additionally for LDAPS connections, it will fail." => "Benutzen Sie es nicht in Verbindung mit LDAPS Verbindungen, es wird fehlschlagen.",
"Case insensitve LDAP server (Windows)" => "LDAP-Server (Windows: Groß- und Kleinschreibung bleibt unbeachtet)",
"Turn off SSL certificate validation." => "Schalten Sie die SSL-Zertifikatsprüfung aus.",
@@ -50,26 +52,28 @@
"Not recommended, use for testing only." => "Nicht empfohlen, nur zu Testzwecken.",
"Cache Time-To-Live" => "Speichere Time-To-Live zwischen",
"in seconds. A change empties the cache." => "in Sekunden. Eine Änderung leert den Cache.",
-"Directory Settings" => "Verzeichniseinstellungen",
+"Directory Settings" => "Ordnereinstellungen",
"User Display Name Field" => "Feld für den Anzeigenamen des Benutzers",
"The LDAP attribute to use to generate the user`s ownCloud name." => "Das LDAP-Attribut für die Generierung des Benutzernamens in ownCloud. ",
"Base User Tree" => "Basis-Benutzerbaum",
-"One User Base DN per line" => "Ein Benutzer Base DN pro Zeile",
-"User Search Attributes" => "Eigenschaften der Benutzer-Suche",
+"One User Base DN per line" => "Ein Benutzer Basis-DN pro Zeile",
+"User Search Attributes" => "Benutzersucheigenschaften",
"Optional; one attribute per line" => "Optional; ein Attribut pro Zeile",
"Group Display Name Field" => "Feld für den Anzeigenamen der Gruppe",
"The LDAP attribute to use to generate the groups`s ownCloud name." => "Das LDAP-Attribut für die Generierung des Gruppennamens in ownCloud. ",
"Base Group Tree" => "Basis-Gruppenbaum",
-"One Group Base DN per line" => "Ein Gruppen Base DN pro Zeile",
-"Group Search Attributes" => "Eigenschaften der Gruppen-Suche",
+"One Group Base DN per line" => "Ein Gruppen Basis-DN pro Zeile",
+"Group Search Attributes" => "Gruppensucheigenschaften",
"Group-Member association" => "Assoziation zwischen Gruppe und Benutzer",
-"Special Attributes" => "Besondere Eigenschaften",
+"Special Attributes" => "Spezielle Eigenschaften",
"Quota Field" => "Kontingent-Feld",
"Quota Default" => "Standard-Kontingent",
"in bytes" => "in Bytes",
"Email Field" => "E-Mail-Feld",
"User Home Folder Naming Rule" => "Benennungsregel für das Home-Verzeichnis des Benutzers",
"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.",
"Test Configuration" => "Testkonfiguration",
"Help" => "Hilfe"
);
diff --git a/apps/user_ldap/l10n/el.php b/apps/user_ldap/l10n/el.php
index e5fe6b6da7e3f245b95b2fef5a3a56369c504be2..acecf27125f1a2287c37402ca570016dd5c68539 100644
--- a/apps/user_ldap/l10n/el.php
+++ b/apps/user_ldap/l10n/el.php
@@ -7,6 +7,8 @@
"Take over settings from recent server configuration?" => "Πάρτε πάνω από τις πρόσφατες ρυθμίσεις διαμόρφωσης του διακομιστή?",
"Keep settings?" => "Διατήρηση ρυθμίσεων;",
"Cannot add server configuration" => "Αδυναμία προσθήκης ρυθμίσεων διακομιστή",
+"Success" => "Επιτυχία",
+"Error" => "Σφάλμα",
"Connection test succeeded" => "Επιτυχημένη δοκιμαστική σύνδεση",
"Connection test failed" => "Αποτυχημένη δοκιμαστική σύνδεσης.",
"Do you really want to delete the current Server Configuration?" => "Θέλετε να διαγράψετε τις τρέχουσες ρυθμίσεις του διακομιστή;",
diff --git a/apps/user_ldap/l10n/en@pirate.php b/apps/user_ldap/l10n/en@pirate.php
new file mode 100644
index 0000000000000000000000000000000000000000..482632f3fdab19ae3bd7efb9a1ed366c0f00ac9c
--- /dev/null
+++ b/apps/user_ldap/l10n/en@pirate.php
@@ -0,0 +1,3 @@
+ "Passcode"
+);
diff --git a/apps/user_ldap/l10n/eo.php b/apps/user_ldap/l10n/eo.php
index 3ffcbddb3e3652e6d2696ed333520bef2b883414..c9a9ba130c6fbd2c9bcaa49127fb61f473c6b490 100644
--- a/apps/user_ldap/l10n/eo.php
+++ b/apps/user_ldap/l10n/eo.php
@@ -1,5 +1,7 @@
"Forigo malsukcesis",
+"Success" => "Sukceso",
+"Error" => "Eraro",
"Host" => "Gastigo",
"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Vi povas neglekti la protokolon, escepte se vi bezonas SSL-on. Tiuokaze, komencu per ldaps://",
"Base DN" => "Bazo-DN",
diff --git a/apps/user_ldap/l10n/es.php b/apps/user_ldap/l10n/es.php
index 098e16a5d130034a571ed6316d16852859322540..7c72cc8e63237e10dc4401f9c956a8ff74401ba6 100644
--- a/apps/user_ldap/l10n/es.php
+++ b/apps/user_ldap/l10n/es.php
@@ -7,6 +7,8 @@
"Take over settings from recent server configuration?" => "Hacerse cargo de los ajustes de configuración del servidor reciente?",
"Keep settings?" => "Mantener la configuración?",
"Cannot add server configuration" => "No se puede añadir la configuración del servidor",
+"Success" => "Éxito",
+"Error" => "Error",
"Connection test succeeded" => "La prueba de conexión fue exitosa",
"Connection test failed" => "La prueba de conexión falló",
"Do you really want to delete the current Server Configuration?" => "¿Realmente desea eliminar la configuración actual del servidor?",
@@ -70,6 +72,8 @@
"Email Field" => "E-mail",
"User Home Folder Naming Rule" => "Regla para la carpeta Home de usuario",
"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Vacío para el nombre de usuario (por defecto). En otro caso, especifique un atributo LDAP/AD.",
+"Internal Username" => "Nombre de usuario interno",
+"ownCloud uses usernames to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from ownCloud username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found by ownCloud. The internal ownCloud name is used all over in ownCloud. Clearing the Mappings will have leftovers everywhere. Clearing the Mappings is not configuration sensitive, it affects all LDAP configurations! Do never clear the mappings in a production environment. Only clear mappings in a testing or experimental stage." => "ownCloud utiliza nombre de usuarios para almacenar y asignar (meta) datos. Con el fin de identificar con precisión y reconocer usuarios, cada usuario LDAP tendrá un nombre de usuario interno. Esto requiere una asignación de nombre de usuario de ownCloud a usuario LDAP. El nombre de usuario creado se asigna al UUID del usuario LDAP. Además el DN se almacena en caché más bien para reducir la interacción de LDAP, pero no se utiliza para la identificación. Si la DN cambia, los cambios serán encontrados por ownCloud. El nombre interno de ownCloud se utiliza para todo en ownCloud. Eliminando las asignaciones tendrá restos por todas partes. Eliminando las asignaciones no es sensible a la configuración, que afecta a todas las configuraciones de LDAP! No limpiar nunca las asignaciones en un entorno de producción. Sólo borrar asignaciones en una situación de prueba o experimental.",
"Test Configuration" => "Configuración de prueba",
"Help" => "Ayuda"
);
diff --git a/apps/user_ldap/l10n/es_AR.php b/apps/user_ldap/l10n/es_AR.php
index c8aec0cd41ba2d901ffdb5920182e2bc03aa2a3b..98fb32b1d26e902e19b819bf0e4c2aa506ec2fdd 100644
--- a/apps/user_ldap/l10n/es_AR.php
+++ b/apps/user_ldap/l10n/es_AR.php
@@ -7,6 +7,8 @@
"Take over settings from recent server configuration?" => "Tomar los valores de la anterior configuración de servidor?",
"Keep settings?" => "¿Mantener preferencias?",
"Cannot add server configuration" => "No se pudo añadir la configuración del servidor",
+"Success" => "Éxito",
+"Error" => "Error",
"Connection test succeeded" => "El este de conexión ha sido completado satisfactoriamente",
"Connection test failed" => "Falló es test de conexión",
"Do you really want to delete the current Server Configuration?" => "¿Realmente desea borrar la configuración actual del servidor?",
diff --git a/apps/user_ldap/l10n/et_EE.php b/apps/user_ldap/l10n/et_EE.php
index 665e9d6fa2c2ebf1c21025e5acabdf2783f677ce..39346def039f056196426f3f0965df2cb217b9c1 100644
--- a/apps/user_ldap/l10n/et_EE.php
+++ b/apps/user_ldap/l10n/et_EE.php
@@ -1,14 +1,18 @@
"Vastendususte puhastamine ebaõnnestus.",
"Failed to delete the server configuration" => "Serveri seadistuse kustutamine ebaõnnestus",
"The configuration is valid and the connection could be established!" => "Seadistus on korrektne ning ühendus on olemas!",
"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "Seadistus on korrektne, kuid ühendus ebaõnnestus. Palun kontrolli serveri seadeid ja ühenduseks kasutatavaid kasutajatunnuseid.",
"The configuration is invalid. Please look in the ownCloud log for further details." => "Seadistus on vigane. Palun vaata ownCloud logist täpsemalt.",
"Deletion failed" => "Kustutamine ebaõnnestus",
"Take over settings from recent server configuration?" => "Võta sätted viimasest serveri seadistusest?",
-"Keep settings?" => "Säilitada seadistus?",
+"Keep settings?" => "Säilitada seadistused?",
"Cannot add server configuration" => "Ei suuda lisada serveri seadistust",
-"Connection test succeeded" => "Test ühendus õnnestus",
-"Connection test failed" => "Test ühendus ebaõnnestus",
+"mappings cleared" => "vastendused puhastatud",
+"Success" => "Korras",
+"Error" => "Viga",
+"Connection test succeeded" => "Ühenduse testimine õnnestus",
+"Connection test failed" => "Ühenduse testimine ebaõnnestus",
"Do you really want to delete the current Server Configuration?" => "Oled kindel, et tahad kustutada praegust serveri seadistust?",
"Confirm Deletion" => "Kinnita kustutamine",
"Warning: Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "Hoiatus: rakendused user_ldap ja user_webdavauht ei ole ühilduvad. Töös võib esineda ootamatuid tõrkeid.\nPalu oma süsteemihalduril üks neist rakendustest kasutusest eemaldada.",
@@ -39,10 +43,10 @@
"Port" => "Port",
"Backup (Replica) Host" => "Varuserver",
"Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Lisa täiendav LDAP/AD server, mida replikeeritakse peaserveriga.",
-"Backup (Replica) Port" => "Varuserveri (replika) ldap port",
+"Backup (Replica) Port" => "Varuserveri (replika) port",
"Disable Main Server" => "Ära kasuta peaserverit",
"When switched on, ownCloud will only connect to the replica server." => "Märgituna ownCloud ühendub ainult varuserverisse.",
-"Use TLS" => "Kasutaja TLS",
+"Use TLS" => "Kasuta TLS-i",
"Do not use it additionally for LDAPS connections, it will fail." => "LDAPS puhul ära kasuta. Ühendus ei toimi.",
"Case insensitve LDAP server (Windows)" => "Mittetõstutundlik LDAP server (Windows)",
"Turn off SSL certificate validation." => "Lülita SSL sertifikaadi kontrollimine välja.",
@@ -70,6 +74,16 @@
"Email Field" => "Email atribuut",
"User Home Folder Naming Rule" => "Kasutaja kodukataloogi nimetamise reegel",
"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Kasutajanime (vaikeväärtus) kasutamiseks jäta tühjaks. Vastasel juhul määra LDAP/AD omadus.",
+"Internal Username" => "Sisemine kasutajanimi",
+"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." => "Vaikimisi tekitatakse sisemine kasutajanimi UUID atribuudist. See tagab, et kasutajanimi on unikaalne ja sümboleid pole vaja muuta. Sisemisel kasutajatunnuse puhul on lubatud ainult järgmised sümbolid: [ a-zA-Z0-9_.@- ]. Muud sümbolid asendatakse nende ASCII vastega või lihtsalt hüljatakse. Tõrgete korral lisatakse number või suurendatakse seda. Sisemist kasutajatunnust kasutatakse kasutaja sisemiseks tuvastamiseks. Ühtlasi on see ownCloudis kasutaja vaikimisi kodukataloogi nimeks. See on ka serveri URL pordiks, näiteks kõikidel *DAV teenustel.Selle seadistusega saab tühistada vaikimisi käitumise. Saavutamaks sarnast käitumist eelnevate ownCloud 5 versioonidega, sisesta kasutaja kuvatava nime atribuut järgnevale väljale. Vaikimisi seadistuseks jäta tühjaks. Muudatused mõjutavad ainult uusi LDAP kasutajate vastendusi (lisatud).",
+"Internal Username Attribute:" => "Sisemise kasutajatunnuse atribuut:",
+"Override UUID detection" => "Tühista UUID tuvastus",
+"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." => "Vaikimis ownCloud tuvastab automaatlselt UUID atribuudi. UUID atribuuti kasutatakse LDAP kasutajate ja gruppide kindlaks tuvastamiseks. Samuti tekitatakse sisemine kasutajanimi UUID alusel, kui pole määratud teisiti. Sa saad tühistada selle seadistuse ning määrata atribuudi omal valikul. Pead veenduma, et valitud atribuut toimib nii kasutajate kui gruppide puhul ning on unikaalne. Vaikimisi seadistuseks jäta tühjaks. Muudatused mõjutavad ainult uusi LDAP kasutajate vastendusi (lisatud).",
+"UUID Attribute:" => "UUID atribuut:",
+"Username-LDAP User Mapping" => "LDAP-Kasutajatunnus Kasutaja Vastendus",
+"ownCloud uses usernames to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from ownCloud username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found by ownCloud. The internal ownCloud name is used all over in ownCloud. Clearing the Mappings will have leftovers everywhere. Clearing the Mappings is not configuration sensitive, it affects all LDAP configurations! Do never clear the mappings in a production environment. Only clear mappings in a testing or experimental stage." => "ownCloud kasutab kasutajanime talletamaks ja omistamaks (pseudo) andmeid. Et täpselt tuvastada ja määratleda kasutajaid, iga LDAP kasutaja peab omama sisemist kasutajatunnust. See vajab ownCloud kasutajatunnuse vastendust LDAP kasutajaks. Tekitatud kasutanimi vastendatakse LDAP kasutaja UUID-iks. Lisaks puhverdatakse DN vähendamaks LDAP päringuid, kuid seda ei kasutata tuvastamisel. ownCloud suudab tuvastada ka DN muutumise. ownCloud sisemist kasutajatunnust kasutatakse üle kogu ownCloudi. Eemaldates vastenduse tekivad kõikjal andmejäägid. Vastenduste eemaldamine ei ole konfiguratsiooni tundlik, see mõjutab kõiki LDAP seadistusi! Ära kunagi eemalda vastendusi produktsioonis! Seda võid teha ainult testis või katsetuste masinas.",
+"Clear Username-LDAP User Mapping" => "Puhasta LDAP-Kasutajatunnus Kasutaja Vastendus",
+"Clear Groupname-LDAP Group Mapping" => "Puhasta LDAP-Grupinimi Grupp Vastendus",
"Test Configuration" => "Testi seadistust",
"Help" => "Abiinfo"
);
diff --git a/apps/user_ldap/l10n/eu.php b/apps/user_ldap/l10n/eu.php
index 5e9fd014c64f3a5875ea41d396007b1a078e0e67..42f184e53902efa1b5af5bec74247e2a255bf8ed 100644
--- a/apps/user_ldap/l10n/eu.php
+++ b/apps/user_ldap/l10n/eu.php
@@ -7,6 +7,8 @@
"Take over settings from recent server configuration?" => "oraintsuko zerbitzariaren konfigurazioaren ezarpenen ardura hartu?",
"Keep settings?" => "Mantendu ezarpenak?",
"Cannot add server configuration" => "Ezin da zerbitzariaren konfigurazioa gehitu",
+"Success" => "Arrakasta",
+"Error" => "Errorea",
"Connection test succeeded" => "Konexio froga ongi burutu da",
"Connection test failed" => "Konexio frogak huts egin du",
"Do you really want to delete the current Server Configuration?" => "Ziur zaude Zerbitzariaren Konfigurazioa ezabatu nahi duzula?",
diff --git a/apps/user_ldap/l10n/fa.php b/apps/user_ldap/l10n/fa.php
index 9a01a67703decb41720fff28b0d9c3d2058cb605..bef13457adb7cc80bae02c2464a5aa7a84aa7e71 100644
--- a/apps/user_ldap/l10n/fa.php
+++ b/apps/user_ldap/l10n/fa.php
@@ -3,6 +3,7 @@
"The configuration is valid and the connection could be established!" => "پیکربندی معتبر است و ارتباط می تواند برقرار شود",
"Deletion failed" => "حذف کردن انجام نشد",
"Keep settings?" => "آیا تنظیمات ذخیره شود ؟",
+"Error" => "خطا",
"Connection test succeeded" => "تست اتصال با موفقیت انجام گردید",
"Connection test failed" => "تست اتصال ناموفق بود",
"Do you really want to delete the current Server Configuration?" => "آیا واقعا می خواهید پیکربندی کنونی سرور را حذف کنید؟",
@@ -10,7 +11,7 @@
"Server configuration" => "پیکربندی سرور",
"Add Server Configuration" => "افزودن پیکربندی سرور",
"Host" => "میزبانی",
-"Password" => "رمز عبور",
+"Password" => "گذرواژه",
"Group Filter" => "فیلتر گروه",
"Port" => "درگاه",
"in bytes" => "در بایت",
diff --git a/apps/user_ldap/l10n/fi_FI.php b/apps/user_ldap/l10n/fi_FI.php
index 38ecb5d82a882f55dfa576ca8305aa0793c222db..38a8b99cf7e5424a0fd82fba75cb240869b265a3 100644
--- a/apps/user_ldap/l10n/fi_FI.php
+++ b/apps/user_ldap/l10n/fi_FI.php
@@ -2,6 +2,8 @@
"Deletion failed" => "Poisto epäonnistui",
"Keep settings?" => "Säilytetäänkö asetukset?",
"Cannot add server configuration" => "Palvelinasetusten lisäys epäonnistui",
+"Success" => "Onnistui!",
+"Error" => "Virhe",
"Connection test succeeded" => "Yhteystesti onnistui",
"Connection test failed" => "Yhteystesti epäonnistui",
"Confirm Deletion" => "Vahvista poisto",
diff --git a/apps/user_ldap/l10n/fr.php b/apps/user_ldap/l10n/fr.php
index ea07bd4a11c19a9e870dd5b03f34c78d3974d905..11f8fbaaf4483ec1f1fb8507a81f8c0f946f7505 100644
--- a/apps/user_ldap/l10n/fr.php
+++ b/apps/user_ldap/l10n/fr.php
@@ -1,4 +1,5 @@
"Erreur lors de la suppression des associations.",
"Failed to delete the server configuration" => "Échec de la suppression de la configuration du serveur",
"The configuration is valid and the connection could be established!" => "La configuration est valide et la connexion peut être établie !",
"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "La configuration est valide, mais le lien ne peut être établi. Veuillez vérifier les paramètres du serveur ainsi que vos identifiants de connexion.",
@@ -6,9 +7,12 @@
"Deletion failed" => "La suppression a échoué",
"Take over settings from recent server configuration?" => "Récupérer les paramètres depuis une configuration récente du serveur ?",
"Keep settings?" => "Garder ces paramètres ?",
-"Cannot add server configuration" => "Impossible d'ajouter la configuration du serveur.",
+"Cannot add server configuration" => "Impossible d'ajouter la configuration du serveur",
+"mappings cleared" => "associations supprimées",
+"Success" => "Succès",
+"Error" => "Erreur",
"Connection test succeeded" => "Test de connexion réussi",
-"Connection test failed" => "Le test de connexion a échoué",
+"Connection test failed" => "Test de connexion échoué",
"Do you really want to delete the current Server Configuration?" => "Êtes-vous vraiment sûr de vouloir effacer la configuration actuelle du serveur ?",
"Confirm Deletion" => "Confirmer la suppression",
"Warning: Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "Avertissement: Les applications user_ldap et user_webdavauth sont incompatibles. Des disfonctionnements peuvent survenir. Contactez votre administrateur système pour qu'il désactive l'une d'elles.",
@@ -17,13 +21,13 @@
"Add Server Configuration" => "Ajouter une configuration du serveur",
"Host" => "Hôte",
"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Vous pouvez omettre le protocole, sauf si vous avez besoin de SSL. Dans ce cas préfixez avec ldaps://",
-"Base DN" => "DN Racine",
+"Base DN" => "DN racine",
"One Base DN per line" => "Un DN racine par ligne",
"You can specify Base DN for users and groups in the Advanced tab" => "Vous pouvez spécifier les DN Racines de vos utilisateurs et groupes via l'onglet Avancé",
"User DN" => "DN Utilisateur (Autorisé à consulter l'annuaire)",
"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 de l'utilisateur client pour lequel la liaison doit se faire, par exemple uid=agent,dc=example,dc=com. Pour un accès anonyme, laisser le DN et le mot de passe vides.",
"Password" => "Mot de passe",
-"For anonymous access, leave DN and Password empty." => "Pour un accès anonyme, laisser le DN Utilisateur et le mot de passe vides.",
+"For anonymous access, leave DN and Password empty." => "Pour un accès anonyme, laisser le DN utilisateur et le mot de passe vides.",
"User Login Filter" => "Modèle d'authentification utilisateurs",
"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Définit le motif à appliquer, lors d'une tentative de connexion. %%uid est remplacé par le nom d'utilisateur lors de la connexion.",
"use %%uid placeholder, e.g. \"uid=%%uid\"" => "veuillez utiliser le champ %%uid , ex.: \"uid=%%uid\"",
@@ -66,10 +70,20 @@
"Special Attributes" => "Attributs spéciaux",
"Quota Field" => "Champ du quota",
"Quota Default" => "Quota par défaut",
-"in bytes" => "en octets",
+"in bytes" => "en bytes",
"Email Field" => "Champ Email",
"User Home Folder Naming Rule" => "Convention de nommage du répertoire utilisateur",
"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Laisser vide ",
+"Internal Username" => "Nom d'utilisateur interne",
+"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." => "Par défaut le nom d'utilisateur interne sera créé à partir de l'attribut UUID. Ceci permet d'assurer que le nom d'utilisateur est unique et que les caractères ne nécessitent pas de convertion. Le nom d'utilisateur interne doit contenir seulement les caractères suivants: [ a-zA-Z0-9_.@- ]. Les autres caractères sont remplacés par leur correspondance ASCII ou simplement omis. En cas de collision le nombre est incrémenté/décrémenté. Le nom d'utilisateur interne est utilisé pour identifier l'utilisateur au sein du système. C'est aussi le nom par défaut du répertoire utilisateur dans ownCloud. C'est aussi le port d'URLs distants, par exemple pour tous les services *DAV. Le comportement par défaut peut être modifié à l'aide de ce paramètre. Pour obtenir un comportement similaire aux versions précédentes à ownCloud 5, saisir le nom d'utilisateur à afficher dans le champ suivant. Laissez à blanc pour le comportement par défaut. Les modifications prendront effet seulement pour les nouveaux (ajoutés) utilisateurs LDAP.",
+"Internal Username Attribute:" => "Nom d'utilisateur interne:",
+"Override UUID detection" => "Surcharger la détection d'UUID",
+"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." => "Par défaut, ownCloud détecte automatiquement l'attribut UUID. L'attribut UUID est utilisé pour identifier les utilisateurs et groupes de façon prédictive. De plus, le nom d'utilisateur interne sera créé basé sur l'UUID s'il n'est pas explicité ci-dessus. Vous pouvez modifier ce comportement et définir l'attribut de votre choix. Vous devez alors vous assurer que l'attribut de votre choix peut être récupéré pour les utilisateurs ainsi que pour les groupes et qu'il soit unique. Laisser à blanc pour le comportement par défaut. Les modifications seront effectives uniquement pour les nouveaux (ajoutés) utilisateurs et groupes LDAP.",
+"UUID Attribute:" => "Attribut UUID :",
+"Username-LDAP User Mapping" => "Association Nom d'utilisateur-Utilisateur LDAP",
+"ownCloud uses usernames to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from ownCloud username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found by ownCloud. The internal ownCloud name is used all over in ownCloud. Clearing the Mappings will have leftovers everywhere. Clearing the Mappings is not configuration sensitive, it affects all LDAP configurations! Do never clear the mappings in a production environment. Only clear mappings in a testing or experimental stage." => "ownCloud utilise les noms d'utilisateurs pour le stockage et l'assignation de (meta) data. Pour identifier et reconnaitre précisément les utilisateurs, chaque utilisateur aura un nom interne spécifique. Cela requiert l'association d'un nom d'utilisateur ownCloud à un nom d'utilisateur LDAP. Le nom d'utilisateur créé est associé à l'attribut UUID de l'utilisateur LDAP. Par ailleurs le DN est mémorisé en cache pour limiter les interactions LDAP mais il n'est pas utilisé pour l'identification. ownCloud détectera le changement de DN, le cas échéant. Seul le nom interne à ownCloud est utilisé au sein du produit. Supprimer les associations créera des orphelins et l'action affectera toutes les configurations LDAP. NE JAMAIS SUPPRIMER LES ASSOCIATIONS EN ENVIRONNEMENT DE PRODUCTION. Le faire seulement sur les environnements de tests et d'expérimentation.",
+"Clear Username-LDAP User Mapping" => "Supprimer l'association utilisateur interne-utilisateur LDAP",
+"Clear Groupname-LDAP Group Mapping" => "Supprimer l'association nom de groupe-groupe LDAP",
"Test Configuration" => "Tester la configuration",
"Help" => "Aide"
);
diff --git a/apps/user_ldap/l10n/gl.php b/apps/user_ldap/l10n/gl.php
index deb6dbb5553a2e395c758588eaefb2eb8a0672c0..3f44ccd9bd1a0a95a2b87ec43f4dd1894f7a9897 100644
--- a/apps/user_ldap/l10n/gl.php
+++ b/apps/user_ldap/l10n/gl.php
@@ -1,12 +1,16 @@
"Non foi posíbel limpar as asignacións.",
"Failed to delete the server configuration" => "Non foi posíbel eliminar a configuración do servidor",
"The configuration is valid and the connection could be established!" => "A configuración é correcta e pode estabelecerse a conexión.",
"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "A configuración é correcta, mais a ligazón non. Comprobe a configuración do servidor e as credenciais.",
"The configuration is invalid. Please look in the ownCloud log for further details." => "A configuración non é correcta. Vexa o rexistro de ownCloud para máis detalles",
-"Deletion failed" => "Fallou o borrado",
+"Deletion failed" => "Produciuse un fallo ao eliminar",
"Take over settings from recent server configuration?" => "Tomar os recentes axustes de configuración do servidor?",
"Keep settings?" => "Manter os axustes?",
"Cannot add server configuration" => "Non é posíbel engadir a configuración do servidor",
+"mappings cleared" => "limpadas as asignacións",
+"Success" => "Correcto",
+"Error" => "Erro",
"Connection test succeeded" => "A proba de conexión foi satisfactoria",
"Connection test failed" => "A proba de conexión fracasou",
"Do you really want to delete the current Server Configuration?" => "Confirma que quere eliminar a configuración actual do servidor?",
@@ -70,6 +74,16 @@
"Email Field" => "Campo do correo",
"User Home Folder Naming Rule" => "Regra de nomeado do cartafol do usuario",
"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Deixar baleiro para o nome de usuario (predeterminado). Noutro caso, especifique un atributo LDAP/AD.",
+"Internal Username" => "Nome de usuario interno",
+"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." => "De xeito predeterminado, o nome de usuario interno crease a partires do atributo UUID. Asegurase de que o nome de usuario é único e de non ter que converter os caracteres. O nome de usuario interno ten a limitación de que só están permitidos estes caracteres: [ a-zA-Z0-9_.@- ]. Os outros caracteres substitúense pola súa correspondencia ASCII ou simplemente omítense. Nas colisións engadirase/incrementarase un número. O nome de usuario interno utilizase para identificar a un usuario interno. É tamén o nome predeterminado do cartafol persoal do usuario en ownCloud. Tamén é un porto de URL remoto, por exemplo, para todos os servizos *DAV. Con este axuste, o comportamento predeterminado pode ser sobrescrito. Para lograr un comportamento semellante ao anterior ownCloud 5 introduza o atributo do nome para amosar do usuario no seguinte campo. Déixeo baleiro para o comportamento predeterminado. Os cambios terán efecto só nas novas asignacións (engadidos) de usuarios de LDAP.",
+"Internal Username Attribute:" => "Atributo do nome de usuario interno:",
+"Override UUID detection" => "Ignorar a detección do UUID",
+"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." => "De xeito predeterminado, ownCloud detecta automaticamente o atributo UUID. O atributo UUID utilizase para identificar, sen dúbida, aos usuarios e grupos LDAP. Ademais, crearase o usuario interno baseado no UUID, se non se especifica anteriormente o contrario. Pode anular a configuración e pasar un atributo da súa escolla. Vostede debe asegurarse de que o atributo da súa escolla pode ser recuperado polos usuarios e grupos e de que é único. Déixeo baleiro para o comportamento predeterminado. Os cambios terán efecto só nas novas asignacións (engadidos) de usuarios de LDAP.",
+"UUID Attribute:" => "Atributo do UUID:",
+"Username-LDAP User Mapping" => "Asignación do usuario ao «nome de usuario LDAP»",
+"ownCloud uses usernames to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from ownCloud username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found by ownCloud. The internal ownCloud name is used all over in ownCloud. Clearing the Mappings will have leftovers everywhere. Clearing the Mappings is not configuration sensitive, it affects all LDAP configurations! Do never clear the mappings in a production environment. Only clear mappings in a testing or experimental stage." => "ownCloud utiliza os nomes de usuario para almacenar e asignar (meta) datos. Coa fin de identificar con precisión e recoñecer aos usuarios, cada usuario LDAP terá un nome de usuario interno. Isto require unha asignación de ownCloud nome de usuario a usuario LDAP. O nome de usuario creado asignase ao UUID do usuario LDAP. Ademais o DN almacenase na caché, para así reducir a interacción do LDAP, mais non se utiliza para a identificación. Se o DN cambia, os cambios poden ser atopados polo ownCloud. O nome interno no ownCloud utilizase en todo o ownCloud. A limpeza das asignacións deixará rastros en todas partes. A limpeza das asignacións non é sensíbel á configuración, afecta a todas as configuracións de LDAP! Non limpar nunca as asignacións nun entorno de produción. Limpar as asignacións só en fases de proba ou experimentais.",
+"Clear Username-LDAP User Mapping" => "Limpar a asignación do usuario ao «nome de usuario LDAP»",
+"Clear Groupname-LDAP Group Mapping" => "Limpar a asignación do grupo ao «nome de grupo LDAP»",
"Test Configuration" => "Probar a configuración",
"Help" => "Axuda"
);
diff --git a/apps/user_ldap/l10n/he.php b/apps/user_ldap/l10n/he.php
index c9b0e282f1d26908fa3ab55e391f036f8083f1de..0d60768dcfccc232f58642638c133aceed661bce 100644
--- a/apps/user_ldap/l10n/he.php
+++ b/apps/user_ldap/l10n/he.php
@@ -1,5 +1,14 @@
"מחיקה נכשלה",
+"Keep settings?" => "האם לשמור את ההגדרות?",
+"Cannot add server configuration" => "לא ניתן להוסיף את הגדרות השרת",
+"Error" => "שגיאה",
+"Connection test succeeded" => "בדיקת החיבור עברה בהצלחה",
+"Connection test failed" => "בדיקת החיבור נכשלה",
+"Do you really want to delete the current Server Configuration?" => "האם אכן למחוק את הגדרות השרת הנוכחיות?",
+"Confirm Deletion" => "אישור המחיקה",
+"Server configuration" => "הגדרות השרת",
+"Add Server Configuration" => "הוספת הגדרות השרת",
"Host" => "מארח",
"User DN" => "DN משתמש",
"Password" => "סיסמא",
diff --git a/apps/user_ldap/l10n/hi.php b/apps/user_ldap/l10n/hi.php
index 60d4ea98e84abe1a2062f5e57fab5dc6f727d98d..45166eb0e3e893844d3a3ad02fd4d7537230ad4e 100644
--- a/apps/user_ldap/l10n/hi.php
+++ b/apps/user_ldap/l10n/hi.php
@@ -1,3 +1,4 @@
"पासवर्ड",
"Help" => "सहयोग"
);
diff --git a/apps/user_ldap/l10n/hr.php b/apps/user_ldap/l10n/hr.php
index 91503315066c42bb31391ed0f1ea03a8c3fb95b3..cc8918301f5e955b179f81bc7e044cf75e0f304c 100644
--- a/apps/user_ldap/l10n/hr.php
+++ b/apps/user_ldap/l10n/hr.php
@@ -1,3 +1,5 @@
"Greška",
+"Password" => "Lozinka",
"Help" => "Pomoć"
);
diff --git a/apps/user_ldap/l10n/hu_HU.php b/apps/user_ldap/l10n/hu_HU.php
index a82a64ab32f1387660ebfb3b93c38cf19f6db002..cbbcc69edebe75d7a494f60cbe6d3e8d4ff6665a 100644
--- a/apps/user_ldap/l10n/hu_HU.php
+++ b/apps/user_ldap/l10n/hu_HU.php
@@ -7,6 +7,7 @@
"Take over settings from recent server configuration?" => "Vegyük át a beállításokat az előző konfigurációból?",
"Keep settings?" => "Tartsuk meg a beállításokat?",
"Cannot add server configuration" => "Az új kiszolgáló konfigurációja nem hozható létre",
+"Error" => "Hiba",
"Connection test succeeded" => "A kapcsolatellenőrzés eredménye: sikerült",
"Connection test failed" => "A kapcsolatellenőrzés eredménye: nem sikerült",
"Do you really want to delete the current Server Configuration?" => "Tényleg törölni szeretné a kiszolgáló beállításait?",
diff --git a/apps/user_ldap/l10n/ia.php b/apps/user_ldap/l10n/ia.php
index 3586bf5a2e74cb7ea0cec1f9979b5ca872777621..624fd4fa0eb460d3e1053c539407864a390208ed 100644
--- a/apps/user_ldap/l10n/ia.php
+++ b/apps/user_ldap/l10n/ia.php
@@ -1,3 +1,5 @@
"Error",
+"Password" => "Contrasigno",
"Help" => "Adjuta"
);
diff --git a/apps/user_ldap/l10n/id.php b/apps/user_ldap/l10n/id.php
index 1f6d8fcffe37b645b22e5b31916ffed630b20e1d..c04d09fc671b0f531b856845cf33e5f5f27480fc 100644
--- a/apps/user_ldap/l10n/id.php
+++ b/apps/user_ldap/l10n/id.php
@@ -3,10 +3,12 @@
"The configuration is valid and the connection could be established!" => "Konfigurasi valid dan koneksi dapat dilakukan!",
"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "Konfigurasi valid, tetapi Bind gagal. Silakan cek pengaturan server dan keamanan.",
"The configuration is invalid. Please look in the ownCloud log for further details." => "Konfigurasi salah. Silakan lihat log ownCloud untuk lengkapnya.",
-"Deletion failed" => "penghapusan gagal",
+"Deletion failed" => "Penghapusan gagal",
"Take over settings from recent server configuration?" => "Ambil alih pengaturan dari konfigurasi server saat ini?",
"Keep settings?" => "Biarkan pengaturan?",
"Cannot add server configuration" => "Gagal menambah konfigurasi server",
+"Success" => "Sukses",
+"Error" => "Galat",
"Connection test succeeded" => "Tes koneksi sukses",
"Connection test failed" => "Tes koneksi gagal",
"Do you really want to delete the current Server Configuration?" => "Anda ingin menghapus Konfigurasi Server saat ini?",
@@ -15,14 +17,14 @@
"Warning: The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "Peringatan: Modul LDAP PHP tidak terpasang, perangkat tidak akan bekerja. Silakan minta administrator sistem untuk memasangnya.",
"Server configuration" => "Konfigurasi server",
"Add Server Configuration" => "Tambah Konfigurasi Server",
-"Host" => "host",
+"Host" => "Host",
"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Protokol dapat tidak ditulis, kecuali anda menggunakan SSL. Lalu jalankan dengan ldaps://",
"Base DN" => "Base DN",
"One Base DN per line" => "Satu Base DN per baris",
"You can specify Base DN for users and groups in the Advanced tab" => "Anda dapat menetapkan Base DN untuk pengguna dan grup dalam tab Lanjutan",
"User DN" => "User 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 dari klien pengguna yang dengannya tautan akan diterapkan, mis. uid=agen,dc=contoh,dc=com. Untuk akses anonim, biarkan DN dan kata sandi kosong.",
-"Password" => "kata kunci",
+"Password" => "Sandi",
"For anonymous access, leave DN and Password empty." => "Untuk akses anonim, biarkan DN dan Kata sandi kosong.",
"User Login Filter" => "gunakan saringan login",
"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Definisikan filter untuk diterapkan, saat login dilakukan. %%uid menggantikan username saat login.",
@@ -71,5 +73,5 @@
"User Home Folder Naming Rule" => "Aturan Penamaan Folder Home Pengguna",
"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Biarkan nama pengguna kosong (default). Atau tetapkan atribut LDAP/AD.",
"Test Configuration" => "Uji Konfigurasi",
-"Help" => "bantuan"
+"Help" => "Bantuan"
);
diff --git a/apps/user_ldap/l10n/is.php b/apps/user_ldap/l10n/is.php
index 29bc769279588e25bbe41e52870b0dd4c362851f..dadac9eedaafec867fc819fadf930a242865807a 100644
--- a/apps/user_ldap/l10n/is.php
+++ b/apps/user_ldap/l10n/is.php
@@ -1,4 +1,5 @@
"Villa",
"Host" => "Netþjónn",
"Password" => "Lykilorð",
"Help" => "Hjálp"
diff --git a/apps/user_ldap/l10n/it.php b/apps/user_ldap/l10n/it.php
index a2790fd1dec60f2a6e4079930e25590b93878d89..48bcbdf589a17a16d42851bf96b822ef165a759e 100644
--- a/apps/user_ldap/l10n/it.php
+++ b/apps/user_ldap/l10n/it.php
@@ -1,4 +1,5 @@
"Cancellazione delle associazioni non riuscita.",
"Failed to delete the server configuration" => "Eliminazione della configurazione del server non riuscita",
"The configuration is valid and the connection could be established!" => "La configurazione è valida e la connessione può essere stabilita.",
"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "La configurazione è valida, ma il Bind non è riuscito. Controlla le impostazioni del server e le credenziali.",
@@ -7,6 +8,9 @@
"Take over settings from recent server configuration?" => "Vuoi recuperare le impostazioni dalla configurazione recente del server?",
"Keep settings?" => "Vuoi mantenere le impostazioni?",
"Cannot add server configuration" => "Impossibile aggiungere la configurazione del server",
+"mappings cleared" => "associazioni cancellate",
+"Success" => "Riuscito",
+"Error" => "Errore",
"Connection test succeeded" => "Prova di connessione riuscita",
"Connection test failed" => "Prova di connessione non riuscita",
"Do you really want to delete the current Server Configuration?" => "Vuoi davvero eliminare la configurazione attuale del server?",
@@ -70,6 +74,16 @@
"Email Field" => "Campo Email",
"User Home Folder Naming Rule" => "Regola di assegnazione del nome della cartella utente",
"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Lascia vuoto per il nome utente (predefinito). Altrimenti, specifica un attributo LDAP/AD.",
+"Internal Username" => "Nome utente interno",
+"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." => "In modo predefinito, il nome utente interno sarà creato dall'attributo UUID. Ciò assicura che il nome utente sia univoco e che non sia necessario convertire i caratteri. Il nome utente interno consente l'uso di determinati caratteri: [ a-zA-Z0-9_.@- ]. Altri caratteri sono sostituiti con il corrispondente ASCII o sono semplicemente omessi. In caso di conflitto, sarà incrementato/decrementato un numero. Il nome utente interno è utilizzato per identificare un utente internamente. Rappresenta, inoltre, il nome predefinito per la cartella home dell'utente in ownCloud. Costituisce anche una porta di URL remoti, ad esempio per tutti i servizi *DAV. Con questa impostazione, il comportamento predefinito può essere scavalcato. Per ottenere un comportamento simile alle versioni precedenti ownCloud 5, inserisci l'attributo del nome visualizzato dell'utente nel campo seguente. Lascialo vuoto per il comportamento predefinito. Le modifiche avranno effetto solo sui nuovo utenti LDAP associati (aggiunti).",
+"Internal Username Attribute:" => "Attributo nome utente interno:",
+"Override UUID detection" => "Ignora rilevamento UUID",
+"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." => "In modo predefinito, ownCloud rileva automaticamente l'attributo UUID. L'attributo UUID è utilizzato per identificare senza alcun dubbio gli utenti e i gruppi LDAP. Inoltre, il nome utente interno sarà creato sulla base dell'UUID, se non è specificato in precedenza. Puoi ignorare l'impostazione e fornire un attributo di tua scelta. Assicurati che l'attributo scelto possa essere ottenuto sia per gli utenti che per i gruppi e che sia univoco. Lascialo vuoto per ottenere il comportamento predefinito. Le modifiche avranno effetto solo sui nuovi utenti e gruppi LDAP associati (aggiunti).",
+"UUID Attribute:" => "Attributo UUID:",
+"Username-LDAP User Mapping" => "Associazione Nome utente-Utente LDAP",
+"ownCloud uses usernames to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from ownCloud username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found by ownCloud. The internal ownCloud name is used all over in ownCloud. Clearing the Mappings will have leftovers everywhere. Clearing the Mappings is not configuration sensitive, it affects all LDAP configurations! Do never clear the mappings in a production environment. Only clear mappings in a testing or experimental stage." => "ownCloud utilizza i nomi utente per archiviare e assegnare i (meta) dati. Per identificare con precisione e riconoscere gli utenti, ogni utente LDAP avrà un nome utente interno. Ciò richiede un'associazione tra il nome utente di ownCloud e l'utente LDAP. In aggiunta, il DN viene mantenuto in cache per ridurre l'interazione con LDAP, ma non è utilizzato per l'identificazione. Se il DN cambia, le modifiche saranno rilevate da ownCloud. Il nome utente interno di ownCloud è utilizzato dappertutto in ownCloud. La cancellazione delle associazioni lascerà tracce residue ovunque e interesserà esclusivamente la configurazione LDAP. Non cancellare mai le associazioni in un ambiente di produzione. Procedere alla cancellazione delle associazioni solo in una fase sperimentale o di test.",
+"Clear Username-LDAP User Mapping" => "Cancella associazione Nome utente-Utente LDAP",
+"Clear Groupname-LDAP Group Mapping" => "Cancella associazione Nome gruppo-Gruppo LDAP",
"Test Configuration" => "Prova configurazione",
"Help" => "Aiuto"
);
diff --git a/apps/user_ldap/l10n/ja_JP.php b/apps/user_ldap/l10n/ja_JP.php
index 3ae7d2e639222326d4e24adcbbb9d434776845e4..53fa9ae697df3760b086c28d249b71168440f19f 100644
--- a/apps/user_ldap/l10n/ja_JP.php
+++ b/apps/user_ldap/l10n/ja_JP.php
@@ -1,4 +1,5 @@
"マッピングのクリアに失敗しました。",
"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." => "設定は有効ですが、接続に失敗しました。サーバ設定と資格情報を確認して下さい。",
@@ -7,6 +8,9 @@
"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?" => "現在のサーバ設定を本当に削除してもよろしいですか?",
@@ -70,6 +74,16 @@
"Email Field" => "メールフィールド",
"User Home Folder Naming Rule" => "ユーザのホームフォルダ命名規則",
"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "ユーザ名を空のままにしてください(デフォルト)。そうでない場合は、LDAPもしくはADの属性を指定してください。",
-"Test Configuration" => "テスト設定",
+"Internal Username" => "内部ユーザ名",
+"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." => "デフォルトでは、内部ユーザ名はUUID属性から作成されます。これにより、ユーザ名がユニークであり、かつ文字の変換が必要ないことを保証します。内部ユーザ名には、[ a-zA-Z0-9_.@- ] の文字のみが有効であるという制限があり、その他の文字は対応する ASCII コードに変換されるか単に無視されます。そのため、他のユーザ名との衝突の回数が増加するでしょう。内部ユーザ名は、内部的にユーザを識別するために用いられ、また、ownCloudにおけるデフォルトのホームフォルダ名としても用いられます。例えば*DAVサービスのように、リモートURLのポートでもあります。この設定により、デフォルトの振る舞いを再定義します。ownCloud 5 以前と同じような振る舞いにするためには、以下のフィールドにユーザ表示名の属性を入力します。空にするとデフォルトの振る舞いとなります。変更は新しくマッピング(追加)されたLDAPユーザにおいてのみ有効となります。",
+"Internal Username Attribute:" => "内部ユーザ名属性:",
+"Override UUID detection" => "UUID検出を再定義する",
+"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." => "デフォルトでは、ownCloud は UUID 属性を自動的に検出します。UUID属性は、LDAPユーザとLDAPグループを間違いなく識別するために利用されます。また、もしこれを指定しない場合は、内部ユーザ名はUUIDに基づいて作成されます。この設定は再定義することができ、あなたの選択した属性を用いることができます。選択した属性がユーザとグループの両方に対して適用でき、かつユニークであることを確認してください。空であればデフォルトの振る舞いとなります。変更は、新しくマッピング(追加)されたLDAPユーザとLDAPグループに対してのみ有効となります。",
+"UUID Attribute:" => "UUID属性:",
+"Username-LDAP User Mapping" => "ユーザ名とLDAPユーザのマッピング",
+"ownCloud uses usernames to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from ownCloud username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found by ownCloud. The internal ownCloud name is used all over in ownCloud. Clearing the Mappings will have leftovers everywhere. Clearing the Mappings is not configuration sensitive, it affects all LDAP configurations! Do never clear the mappings in a production environment. Only clear mappings in a testing or experimental stage." => "ownCloudは(メタ) データの保存と割り当てにユーザ名を使用します。ユーザを正確に識別して認識するために、個々のLDAPユーザは内部ユーザ名を持っています。これは、ownCloudユーザ名とLDAPユーザ名の間のマッピングが必要であることを意味しています。生成されたユーザ名は、LDAPユーザのUUIDとマッピングされます。加えて、DNがLDAPとのインタラクションを削減するためにキャッシュされますが、識別には利用されません。DNが変わった場合は、変更をownCloudが見つけます。内部のownCloud名はownCloud全体に亘って利用されます。マッピングをクリアすると、いたるところに使われないままの物が残るでしょう。マッピングのクリアは設定に敏感ではありませんが、全てのLDAPの設定に影響を与えます!本番の環境では決してマッピングをクリアしないでください。テストもしくは実験の段階でのみマッピングのクリアを行なってください。",
+"Clear Username-LDAP User Mapping" => "ユーザ名とLDAPユーザのマッピングをクリアする",
+"Clear Groupname-LDAP Group Mapping" => "グループ名とLDAPグループのマッピングをクリアする",
+"Test Configuration" => "設定をテスト",
"Help" => "ヘルプ"
);
diff --git a/apps/user_ldap/l10n/ka_GE.php b/apps/user_ldap/l10n/ka_GE.php
index b3f6058a0ca421e505ada2913fb52f93ce054f1d..8057f7c845550bdb99e486cf344c5dc9dca4b5c6 100644
--- a/apps/user_ldap/l10n/ka_GE.php
+++ b/apps/user_ldap/l10n/ka_GE.php
@@ -7,6 +7,8 @@
"Take over settings from recent server configuration?" => "დაბრუნდებით სერვერის წინა კონფიგურაციაში?",
"Keep settings?" => "დავტოვოთ პარამეტრები?",
"Cannot add server configuration" => "სერვერის პარამეტრების დამატება ვერ მოხერხდა",
+"Success" => "დასრულდა",
+"Error" => "შეცდომა",
"Connection test succeeded" => "კავშირის ტესტირება მოხერხდა",
"Connection test failed" => "კავშირის ტესტირება ვერ მოხერხდა",
"Do you really want to delete the current Server Configuration?" => "ნამდვილად გინდათ წაშალოთ სერვერის მიმდინარე პარამეტრები?",
diff --git a/apps/user_ldap/l10n/ko.php b/apps/user_ldap/l10n/ko.php
index 8aa9fe74b3d1f513c3c73de5c3b58f0930c2557e..b8196e09d09a93f9e4adf0915b35466de90718b2 100644
--- a/apps/user_ldap/l10n/ko.php
+++ b/apps/user_ldap/l10n/ko.php
@@ -1,6 +1,7 @@
"삭제 실패",
"Keep settings?" => "설정을 유지합니까?",
+"Error" => "오류",
"Connection test succeeded" => "연결 시험 성공",
"Connection test failed" => "연결 시험 실패",
"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 앱은 호환되지 않습니다. 오동작을 일으킬 수 있으므로, 시스템 관리자에게 요청하여 둘 중 하나만 사용하도록 하십시오.",
diff --git a/apps/user_ldap/l10n/ku_IQ.php b/apps/user_ldap/l10n/ku_IQ.php
index 1ae808ddd91007e3b322192016aed9d0c25781ea..00602ae5d79c4b80e14384f64f43c4499fa08486 100644
--- a/apps/user_ldap/l10n/ku_IQ.php
+++ b/apps/user_ldap/l10n/ku_IQ.php
@@ -1,3 +1,6 @@
"سهرکهوتن",
+"Error" => "ههڵه",
+"Password" => "وشەی تێپەربو",
"Help" => "یارمەتی"
);
diff --git a/apps/user_ldap/l10n/lb.php b/apps/user_ldap/l10n/lb.php
index 39ed627ce2c92fc3d9a169b91f3d8bfcebcf34e3..cf58c9ec5be9c0ba08f0b2bf0898f229ae1037ff 100644
--- a/apps/user_ldap/l10n/lb.php
+++ b/apps/user_ldap/l10n/lb.php
@@ -1,5 +1,6 @@
"Konnt net läschen",
+"Error" => "Fehler",
"Password" => "Passwuert",
"Help" => "Hëllef"
);
diff --git a/apps/user_ldap/l10n/lt_LT.php b/apps/user_ldap/l10n/lt_LT.php
index aa21dd2d3c164aab23dd346d23ec69aee5f62389..6f396847b8efeb640890231ca1ad4c8b979b6407 100644
--- a/apps/user_ldap/l10n/lt_LT.php
+++ b/apps/user_ldap/l10n/lt_LT.php
@@ -1,5 +1,6 @@
"Ištrinti nepavyko",
+"Error" => "Klaida",
"Password" => "Slaptažodis",
"Group Filter" => "Grupės filtras",
"Port" => "Prievadas",
diff --git a/apps/user_ldap/l10n/lv.php b/apps/user_ldap/l10n/lv.php
index 50126664e5be9fc8205e6f80bfb3926551c9a948..73ffedcb134637416ea928d11bbc11911020824b 100644
--- a/apps/user_ldap/l10n/lv.php
+++ b/apps/user_ldap/l10n/lv.php
@@ -7,6 +7,7 @@
"Take over settings from recent server configuration?" => "Paņemt iestatījumus no nesenas servera konfigurācijas?",
"Keep settings?" => "Paturēt iestatījumus?",
"Cannot add server configuration" => "Nevar pievienot servera konfigurāciju",
+"Error" => "Kļūda",
"Connection test succeeded" => "Savienojuma tests ir veiksmīgs",
"Connection test failed" => "Savienojuma tests cieta neveiksmi",
"Do you really want to delete the current Server Configuration?" => "Vai tiešām vēlaties dzēst pašreizējo servera konfigurāciju?",
diff --git a/apps/user_ldap/l10n/mk.php b/apps/user_ldap/l10n/mk.php
index 7d34ff49492ec982e3c420ff6561f1fb719c181b..6a060aca415cc55fd885e95b60da06258b2546fe 100644
--- a/apps/user_ldap/l10n/mk.php
+++ b/apps/user_ldap/l10n/mk.php
@@ -1,5 +1,6 @@
"Бришењето е неуспешно",
+"Error" => "Грешка",
"Host" => "Домаќин",
"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Може да го скокнете протколот освен ако не ви треба SSL. Тогаш ставете ldaps://",
"Password" => "Лозинка",
diff --git a/apps/user_ldap/l10n/ms_MY.php b/apps/user_ldap/l10n/ms_MY.php
index 17a6cbe2cb6a5f6df2e6ca9fbc2fad2741113fb1..b3004028c58a2c83fff365ee58520103376636cb 100644
--- a/apps/user_ldap/l10n/ms_MY.php
+++ b/apps/user_ldap/l10n/ms_MY.php
@@ -1,4 +1,6 @@
"Pemadaman gagal",
+"Error" => "Ralat",
+"Password" => "Kata laluan",
"Help" => "Bantuan"
);
diff --git a/apps/user_ldap/l10n/nb_NO.php b/apps/user_ldap/l10n/nb_NO.php
index c4700245f24059f50b3be04e0bd8c061b40d3d5d..f8cdf694ff6f2d392f90dbcda07db766a0cee9aa 100644
--- a/apps/user_ldap/l10n/nb_NO.php
+++ b/apps/user_ldap/l10n/nb_NO.php
@@ -7,6 +7,8 @@
"Take over settings from recent server configuration?" => "Hent innstillinger fra tidligere tjener-konfigurasjon?",
"Keep settings?" => "Behold innstillinger?",
"Cannot add server configuration" => "Kan ikke legge til tjener-konfigurasjon",
+"Success" => "Suksess",
+"Error" => "Feil",
"Connection test succeeded" => "Tilkoblingstest lyktes",
"Connection test failed" => "Tilkoblingstest mislyktes",
"Do you really want to delete the current Server Configuration?" => "Er du sikker på at du vil slette aktiv tjener-konfigurasjon?",
diff --git a/apps/user_ldap/l10n/nl.php b/apps/user_ldap/l10n/nl.php
index 7973c66cd10d8cc3d5dee001a2a04d787aa6d63f..c935d387ccc51475f408cc117a7ed79521626926 100644
--- a/apps/user_ldap/l10n/nl.php
+++ b/apps/user_ldap/l10n/nl.php
@@ -1,4 +1,5 @@
"Niet gelukt de vertalingen leeg te maken.",
"Failed to delete the server configuration" => "Verwijderen serverconfiguratie mislukt",
"The configuration is valid and the connection could be established!" => "De configuratie is geldig en de verbinding is geslaagd!",
"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "De configuratie is geldig, maar Bind mislukte. Controleer de serverinstellingen en inloggegevens.",
@@ -7,6 +8,9 @@
"Take over settings from recent server configuration?" => "Overnemen instellingen van de recente serverconfiguratie?",
"Keep settings?" => "Instellingen bewaren?",
"Cannot add server configuration" => "Kon de serverconfiguratie niet toevoegen",
+"mappings cleared" => "vertaaltabel leeggemaakt",
+"Success" => "Succes",
+"Error" => "Fout",
"Connection test succeeded" => "Verbindingstest geslaagd",
"Connection test failed" => "Verbindingstest mislukt",
"Do you really want to delete the current Server Configuration?" => "Wilt u werkelijk de huidige Serverconfiguratie verwijderen?",
@@ -70,6 +74,13 @@
"Email Field" => "E-mailveld",
"User Home Folder Naming Rule" => "Gebruikers Home map naamgevingsregel",
"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Laat leeg voor de gebruikersnaam (standaard). Of, specificeer een LDAP/AD attribuut.",
+"Internal Username" => "Interne gebruikersnaam",
+"Internal Username Attribute:" => "Interne gebruikersnaam attribuut:",
+"Override UUID detection" => "Negeren UUID detectie",
+"UUID Attribute:" => "UUID Attribuut:",
+"Username-LDAP User Mapping" => "Gebruikersnaam-LDAP gebruikers vertaling",
+"Clear Username-LDAP User Mapping" => "Leegmaken Gebruikersnaam-LDAP gebruikers vertaling",
+"Clear Groupname-LDAP Group Mapping" => "Leegmaken Groepsnaam-LDAP groep vertaling",
"Test Configuration" => "Test configuratie",
"Help" => "Help"
);
diff --git a/apps/user_ldap/l10n/nn_NO.php b/apps/user_ldap/l10n/nn_NO.php
index 54d1f158f65f05cca5fb71c7d96c5ee838a9f6fe..459100228035b1ecbc424f6fc9bb06e0613ca3a1 100644
--- a/apps/user_ldap/l10n/nn_NO.php
+++ b/apps/user_ldap/l10n/nn_NO.php
@@ -1,3 +1,6 @@
"Feil ved sletting",
+"Error" => "Feil",
+"Password" => "Passord",
"Help" => "Hjelp"
);
diff --git a/apps/user_ldap/l10n/oc.php b/apps/user_ldap/l10n/oc.php
index a128638172a1c3f77be1bc3e9a5d175d02835f1a..95ab51caadd798298171fce3ddd897a38e458115 100644
--- a/apps/user_ldap/l10n/oc.php
+++ b/apps/user_ldap/l10n/oc.php
@@ -1,4 +1,6 @@
"Fracàs d'escafatge",
+"Error" => "Error",
+"Password" => "Senhal",
"Help" => "Ajuda"
);
diff --git a/apps/user_ldap/l10n/pl.php b/apps/user_ldap/l10n/pl.php
index 776aa445e4eebbf8f32d15ffffd9d553d7b2209b..a7a831e3e57489dc970c472b0e80fdf29448e61c 100644
--- a/apps/user_ldap/l10n/pl.php
+++ b/apps/user_ldap/l10n/pl.php
@@ -3,10 +3,12 @@
"The configuration is valid and the connection could be established!" => "Konfiguracja jest prawidłowa i można ustanowić połączenie!",
"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "Konfiguracja jest prawidłowa, ale Bind nie. Sprawdź ustawienia serwera i poświadczenia.",
"The configuration is invalid. Please look in the ownCloud log for further details." => "Konfiguracja jest nieprawidłowa. Proszę przejrzeć logi dziennika ownCloud ",
-"Deletion failed" => "Skasowanie nie powiodło się",
+"Deletion failed" => "Usunięcie nie powiodło się",
"Take over settings from recent server configuration?" => "Przejmij ustawienia z ostatnich konfiguracji serwera?",
"Keep settings?" => "Zachować ustawienia?",
"Cannot add server configuration" => "Nie można dodać konfiguracji serwera",
+"Success" => "Sukces",
+"Error" => "Błąd",
"Connection test succeeded" => "Test połączenia udany",
"Connection test failed" => "Test połączenia nie udany",
"Do you really want to delete the current Server Configuration?" => "Czy chcesz usunąć bieżącą konfigurację serwera?",
diff --git a/apps/user_ldap/l10n/pt_BR.php b/apps/user_ldap/l10n/pt_BR.php
index a728ea15fde20d9a9e366d70841a6a81f8b61261..22247b81005b43eb620917c4b2f4186963285777 100644
--- a/apps/user_ldap/l10n/pt_BR.php
+++ b/apps/user_ldap/l10n/pt_BR.php
@@ -1,4 +1,5 @@
"Falha ao limpar os mapeamentos.",
"Failed to delete the server configuration" => "Falha ao deletar a configuração do servidor",
"The configuration is valid and the connection could be established!" => "A configuração é válida e a conexão foi estabelecida!",
"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "A configuração é válida, mas o Bind falhou. Confira as configurações do servidor e as credenciais.",
@@ -7,6 +8,9 @@
"Take over settings from recent server configuration?" => "Tomar parámetros de recente configuração de servidor?",
"Keep settings?" => "Manter ajustes?",
"Cannot add server configuration" => "Impossível adicionar a configuração do servidor",
+"mappings cleared" => "mapeamentos limpos",
+"Success" => "Sucesso",
+"Error" => "Erro",
"Connection test succeeded" => "Teste de conexão bem sucedida",
"Connection test failed" => "Teste de conexão falhou",
"Do you really want to delete the current Server Configuration?" => "Você quer realmente deletar as atuais Configurações de Servidor?",
@@ -70,6 +74,16 @@
"Email Field" => "Campo de Email",
"User Home Folder Naming Rule" => "Regra para Nome da Pasta Pessoal do Usuário",
"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Deixe vazio para nome de usuário (padrão). Caso contrário, especifique um atributo LDAP/AD.",
+"Internal Username" => "Nome de usuário interno",
+"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." => "Por padrão, o nome de usuário interno será criado a partir do atributo UUID. Ele garante que o nome de usuário é única e personagens não precisam ser convertidos. O nome de usuário interno tem a restrição de que apenas estes caracteres são permitidos: [a-zA-Z0-9_ @ -.]. Outros caracteres são substituídas por seu correspondente ASCII ou simplesmente serão omitidos. Em colisões um número será adicionado/aumentado. O nome de utilizador interna é usada para identificar um utilizador internamente. É também o nome padrão para a pasta home do usuário em ownCloud. É também um porto de URLs remoto, por exemplo, para todos os serviços de *DAV. Com esta definição, o comportamento padrão pode ser anulado. Para conseguir um comportamento semelhante como antes ownCloud 5 entrar na tela atributo nome de usuário no campo seguinte. Deixe-o vazio para o comportamento padrão. As alterações terão efeito apenas no recém mapeados (adicionado) de usuários LDAP. ",
+"Internal Username Attribute:" => "Atributo Interno de Nome de Usuário:",
+"Override UUID detection" => "Substituir detecção UUID",
+"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." => "Por padrão, ownCloud detecta automaticamente o atributo UUID. O atributo UUID é usado para identificar, sem dúvida, os usuários e grupos LDAP. Além disso, o nome de usuário interno será criado com base no UUID, se não especificada acima. Você pode substituir a configuração e passar um atributo de sua escolha. Você deve certificar-se de que o atributo de sua escolha pode ser obtida tanto para usuários e grupos e é único. Deixe-o vazio para o comportamento padrão. As alterações terão efeito apenas no recém mapeados (adicionado) de usuários e grupos LDAP.",
+"UUID Attribute:" => "Atributo UUID:",
+"Username-LDAP User Mapping" => "Usuário-LDAP Mapeamento de Usuário",
+"ownCloud uses usernames to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from ownCloud username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found by ownCloud. The internal ownCloud name is used all over in ownCloud. Clearing the Mappings will have leftovers everywhere. Clearing the Mappings is not configuration sensitive, it affects all LDAP configurations! Do never clear the mappings in a production environment. Only clear mappings in a testing or experimental stage." => "ownCloud usa nomes de usuários para armazenar e atribuir (meta) dados. A fim de identificar com precisão e reconhecer usuários, cada usuário LDAP terá um nome de usuário interno. Isso requer um mapeamento de ownCloud do nome de usuário para usuário LDAP. O nome de usuário criado é mapeado para o UUID do usuário LDAP. Além disso, o DN está em cache, assim como para reduzir a interação LDAP, mas que não é utilizado para a identificação. Se a DN muda, as mudanças serão encontradas pelo ownCloud. O nome ownCloud interno é utilizado em todo ownCloud. Limpando os mapeamentos terá sobras em todos os lugares. Limpeza dos mapeamentos não são sensíveis a configuração, isso afeta todas as configurações LDAP! Nunca limpar os mapeamentos em um ambiente de produção. Somente limpe os mapeamentos em uma fase de testes ou experimental.",
+"Clear Username-LDAP User Mapping" => "Limpar Mapeamento de Usuário Nome de Usuário-LDAP",
+"Clear Groupname-LDAP Group Mapping" => "Limpar NomedoGrupo-LDAP Mapeamento do Grupo",
"Test Configuration" => "Teste de Configuração",
"Help" => "Ajuda"
);
diff --git a/apps/user_ldap/l10n/pt_PT.php b/apps/user_ldap/l10n/pt_PT.php
index 3092d061437e537618aa08824aab23c5eaadc819..ed1e0f376db9b1daae01a2b2267b09aa278b6ee6 100644
--- a/apps/user_ldap/l10n/pt_PT.php
+++ b/apps/user_ldap/l10n/pt_PT.php
@@ -7,6 +7,8 @@
"Take over settings from recent server configuration?" => "Assumir as configurações da configuração do servidor mais recente?",
"Keep settings?" => "Manter as definições?",
"Cannot add server configuration" => "Não foi possível adicionar as configurações do servidor.",
+"Success" => "Sucesso",
+"Error" => "Erro",
"Connection test succeeded" => "Teste de conecção passado com sucesso.",
"Connection test failed" => "Erro no teste de conecção.",
"Do you really want to delete the current Server Configuration?" => "Deseja realmente apagar as configurações de servidor actuais?",
@@ -22,7 +24,7 @@
"You can specify Base DN for users and groups in the Advanced tab" => "Pode especificar o ND Base para utilizadores e grupos no separador Avançado",
"User DN" => "DN do utilizador",
"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." => "O DN to cliente ",
-"Password" => "Palavra-passe",
+"Password" => "Password",
"For anonymous access, leave DN and Password empty." => "Para acesso anónimo, deixe DN e a Palavra-passe vazios.",
"User Login Filter" => "Filtro de login de utilizador",
"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Define o filtro a aplicar, para aquando de uma tentativa de login. %%uid substitui o nome de utilizador utilizado.",
diff --git a/apps/user_ldap/l10n/ro.php b/apps/user_ldap/l10n/ro.php
index 8f55a35b4916dccc41dc74146411ebcd3200d550..260ee610639b4b0066d0f5f6d76abd803763108a 100644
--- a/apps/user_ldap/l10n/ro.php
+++ b/apps/user_ldap/l10n/ro.php
@@ -1,5 +1,7 @@
"Ștergerea a eșuat",
+"Success" => "Succes",
+"Error" => "Eroare",
"Warning: Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "Atentie: Apps user_ldap si user_webdavauth sunt incompatibile. Este posibil sa experimentati un comportament neasteptat. Vă rugăm să întrebați administratorul de sistem pentru a dezactiva una dintre ele.",
"Warning: The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "Atenție Modulul PHP LDAP nu este instalat, infrastructura nu va funcționa. Contactează administratorul sistemului pentru al instala.",
"Host" => "Gazdă",
diff --git a/apps/user_ldap/l10n/ru.php b/apps/user_ldap/l10n/ru.php
index 0746e1e8929f33876af29823c6d528d77e626199..eed6d373b9f0cad67262378cfb8ddada1e1cf2f5 100644
--- a/apps/user_ldap/l10n/ru.php
+++ b/apps/user_ldap/l10n/ru.php
@@ -7,6 +7,8 @@
"Take over settings from recent server configuration?" => "Принять настройки из последней конфигурации сервера?",
"Keep settings?" => "Сохранить настройки?",
"Cannot add server configuration" => "Не получилось добавить конфигурацию сервера",
+"Success" => "Успешно",
+"Error" => "Ошибка",
"Connection test succeeded" => "Проверка соединения удалась",
"Connection test failed" => "Проверка соединения не удалась",
"Do you really want to delete the current Server Configuration?" => "Вы действительно хотите удалить существующую конфигурацию сервера?",
diff --git a/apps/user_ldap/l10n/ru_RU.php b/apps/user_ldap/l10n/ru_RU.php
index a4ed503b1d12d3646de81295be67ae5e718e9d5f..7b6833ebf8cd2d6827a929379fb7de529b0d18ee 100644
--- a/apps/user_ldap/l10n/ru_RU.php
+++ b/apps/user_ldap/l10n/ru_RU.php
@@ -1,42 +1,4 @@
"Удаление не удалось",
-"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 не установлен, бэкэнд не будет работать. Пожалуйста, обратитесь к Вашему системному администратору, чтобы установить его.",
-"Host" => "Хост",
-"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Вы можете пропустить протокол, если Вам не требуется SSL. Затем начните с ldaps://",
-"Base DN" => "База DN",
-"One Base DN per line" => "Одно базовое DN на линию",
-"You can specify Base DN for users and groups in the Advanced tab" => "Вы можете задать Base DN для пользователей и групп во вкладке «Дополнительно»",
-"User DN" => "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 заполнитель, например, \"uid=%%uid\"",
-"User List Filter" => "Фильтр списка пользователей",
-"Defines the filter to apply, when retrieving users." => "Задает фильтр, применяемый при получении пользователей.",
-"without any placeholder, e.g. \"objectClass=person\"." => "без каких-либо заполнителей, например, \"objectClass=person\".",
-"Group Filter" => "Групповой фильтр",
-"Defines the filter to apply, when retrieving groups." => "Задает фильтр, применяемый при получении групп.",
-"without any placeholder, e.g. \"objectClass=posixGroup\"." => "без каких-либо заполнителей, например, \"objectClass=posixGroup\".",
-"Port" => "Порт",
-"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." => "Если соединение работает только с этой опцией, импортируйте SSL-сертификат LDAP сервера в ваш ownCloud сервер.",
-"Not recommended, use for testing only." => "Не рекомендовано, используйте только для тестирования.",
-"in seconds. A change empties the cache." => "в секундах. Изменение очищает кэш.",
-"User Display Name Field" => "Поле, отображаемое как имя пользователя",
-"The LDAP attribute to use to generate the user`s ownCloud name." => "Атрибут LDAP, используемый для создания имени пользователя в ownCloud.",
-"Base User Tree" => "Базовое дерево пользователей",
-"One User Base DN per line" => "Одно пользовательское базовое DN на линию",
-"Group Display Name Field" => "Поле, отображаемое как имя группы",
-"The LDAP attribute to use to generate the groups`s ownCloud name." => "Атрибут LDAP, используемый для создания группового имени в ownCloud.",
-"Base Group Tree" => "Базовое дерево групп",
-"One Group Base DN per line" => "Одно групповое базовое DN на линию",
-"Group-Member association" => "Связь член-группа",
-"in bytes" => "в байтах",
-"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Оставьте пустым под имя пользователя (по умолчанию). В противном случае задайте LDAP/AD атрибут.",
-"Help" => "Помощь"
+"Success" => "Успех",
+"Error" => "Ошибка"
);
diff --git a/apps/user_ldap/l10n/si_LK.php b/apps/user_ldap/l10n/si_LK.php
index 50124e4d54f1f8f604b32dab2172dfe9b8b8cf13..1d81b341b46242d9567de7ef2b2ac2780f50d70e 100644
--- a/apps/user_ldap/l10n/si_LK.php
+++ b/apps/user_ldap/l10n/si_LK.php
@@ -1,5 +1,7 @@
"මකාදැමීම අසාර්ථකයි",
+"Success" => "සාර්ථකයි",
+"Error" => "දෝෂයක්",
"Host" => "සත්කාරකය",
"You can omit the protocol, except you require SSL. Then start with ldaps://" => "SSL අවශ්යය වන විට පමණක් හැර, අන් අවස්ථාවන්හිදී ප්රොටොකෝලය අත් හැරිය හැක. භාවිතා කරන විට ldaps:// ලෙස ආරම්භ කරන්න",
"Password" => "මුර පදය",
diff --git a/apps/user_ldap/l10n/sk_SK.php b/apps/user_ldap/l10n/sk_SK.php
index cb55762e64f6beeea256f7a145d1dc5fdeed53dd..b31fe3775639988f304681a57f333769c6fa5bc1 100644
--- a/apps/user_ldap/l10n/sk_SK.php
+++ b/apps/user_ldap/l10n/sk_SK.php
@@ -7,6 +7,8 @@
"Take over settings from recent server configuration?" => "Prebrať nastavenia z nedávneho nastavenia servera?",
"Keep settings?" => "Ponechať nastavenia?",
"Cannot add server configuration" => "Nemožno pridať nastavenie servera",
+"Success" => "Úspešné",
+"Error" => "Chyba",
"Connection test succeeded" => "Test pripojenia bol úspešný",
"Connection test failed" => "Test pripojenia zlyhal",
"Do you really want to delete the current Server Configuration?" => "Naozaj chcete zmazať súčasné nastavenie servera?",
diff --git a/apps/user_ldap/l10n/sl.php b/apps/user_ldap/l10n/sl.php
index 8ff1fd53440eb2d77f168478e17683c3b1eb2e51..1ade5d9b733f3ef7e8dcc11e4d9d8e2d2e6b4a92 100644
--- a/apps/user_ldap/l10n/sl.php
+++ b/apps/user_ldap/l10n/sl.php
@@ -7,6 +7,8 @@
"Take over settings from recent server configuration?" => "Ali naj se prevzame nastavitve nedavne nastavitve strežnika?",
"Keep settings?" => "Ali nas se nastavitve ohranijo?",
"Cannot add server configuration" => "Ni mogoče dodati nastavitev strežnika",
+"Success" => "Uspešno končano.",
+"Error" => "Napaka",
"Connection test succeeded" => "Preizkus povezave je uspešno končan.",
"Connection test failed" => "Preizkus povezave je spodletel.",
"Do you really want to delete the current Server Configuration?" => "Ali res želite izbrisati trenutne nastavitve strežnika?",
diff --git a/apps/user_ldap/l10n/sq.php b/apps/user_ldap/l10n/sq.php
index 24fd869057ddd922bb0a53a40722bf15f0f2dbf2..12324b9f966cfe6fa5ea2caab20182dccafc39d4 100644
--- a/apps/user_ldap/l10n/sq.php
+++ b/apps/user_ldap/l10n/sq.php
@@ -1,4 +1,5 @@
"Veprim i gabuar",
"Password" => "Kodi",
"Help" => "Ndihmë"
);
diff --git a/apps/user_ldap/l10n/sr.php b/apps/user_ldap/l10n/sr.php
index 52569a08ef831d37f4a082678d442192c8a1b414..b94bc83e1e477166237a64ae530da8eec4491de7 100644
--- a/apps/user_ldap/l10n/sr.php
+++ b/apps/user_ldap/l10n/sr.php
@@ -1,5 +1,6 @@
"Брисање није успело",
+"Error" => "Грешка",
"Host" => "Домаћин",
"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Можете да изоставите протокол, осим ако захтевате SSL. У том случају почните са ldaps://.",
"Base DN" => "База DN",
diff --git a/apps/user_ldap/l10n/sr@latin.php b/apps/user_ldap/l10n/sr@latin.php
index 91503315066c42bb31391ed0f1ea03a8c3fb95b3..005a76d4bbc0ea523d4c973ffed057827f6d6536 100644
--- a/apps/user_ldap/l10n/sr@latin.php
+++ b/apps/user_ldap/l10n/sr@latin.php
@@ -1,3 +1,4 @@
"Lozinka",
"Help" => "Pomoć"
);
diff --git a/apps/user_ldap/l10n/sv.php b/apps/user_ldap/l10n/sv.php
index 1bb4d9dc0b15b092e961bff2e83d1269701ce14b..eb30bd22f019b24fc08023cf062748f644aa44be 100644
--- a/apps/user_ldap/l10n/sv.php
+++ b/apps/user_ldap/l10n/sv.php
@@ -7,6 +7,8 @@
"Take over settings from recent server configuration?" => "Ta över inställningar från tidigare serverkonfiguration?",
"Keep settings?" => "Behåll inställningarna?",
"Cannot add server configuration" => "Kunde inte lägga till serverinställning",
+"Success" => "Lyckat",
+"Error" => "Fel",
"Connection test succeeded" => "Anslutningstestet lyckades",
"Connection test failed" => "Anslutningstestet misslyckades",
"Do you really want to delete the current Server Configuration?" => "Vill du verkligen radera den nuvarande serverinställningen?",
diff --git a/apps/user_ldap/l10n/ta_LK.php b/apps/user_ldap/l10n/ta_LK.php
index f6beb3c48630c51f702acdac786cfc320da4ef22..997f09ca8776bb98ad62959ef6df024f749a1dd8 100644
--- a/apps/user_ldap/l10n/ta_LK.php
+++ b/apps/user_ldap/l10n/ta_LK.php
@@ -1,5 +1,6 @@
"நீக்கம் தோல்வியடைந்தது",
+"Error" => "வழு",
"Host" => "ஓம்புனர்",
"You can omit the protocol, except you require SSL. Then start with ldaps://" => "நீங்கள் SSL சேவையை தவிர உடன்படு வரைமுறையை தவிர்க்க முடியும். பிறகு ldaps:.// உடன் ஆரம்பிக்கவும்",
"Base DN" => "தள DN",
diff --git a/apps/user_ldap/l10n/te.php b/apps/user_ldap/l10n/te.php
index d9a3e713f034d3bafd328301ad48b6925a02576e..3f047631cf70efdb246ea3fbd13df274b80d07b2 100644
--- a/apps/user_ldap/l10n/te.php
+++ b/apps/user_ldap/l10n/te.php
@@ -1,4 +1,5 @@
"పొరపాటు",
"Password" => "సంకేతపదం",
"Help" => "సహాయం"
);
diff --git a/apps/user_ldap/l10n/th_TH.php b/apps/user_ldap/l10n/th_TH.php
index 802badb2f0304e4352af8874496f64f328087cc4..ec279ba01e5e97dc355cf1642678b572d962129e 100644
--- a/apps/user_ldap/l10n/th_TH.php
+++ b/apps/user_ldap/l10n/th_TH.php
@@ -6,6 +6,8 @@
"Deletion failed" => "การลบทิ้งล้มเหลว",
"Keep settings?" => "รักษาการตั้งค่าไว้?",
"Cannot add server configuration" => "ไม่สามารถเพิ่มค่ากำหนดเซิร์ฟเวอร์ได้",
+"Success" => "เสร็จสิ้น",
+"Error" => "ข้อผิดพลาด",
"Connection test succeeded" => "ทดสอบการเชื่อมต่อสำเร็จ",
"Connection test failed" => "ทดสอบการเชื่อมต่อล้มเหลว",
"Do you really want to delete the current Server Configuration?" => "คุณแน่ใจแล้วหรือว่าต้องการลบการกำหนดค่าเซิร์ฟเวอร์ปัจจุบันทิ้งไป?",
diff --git a/apps/user_ldap/l10n/tr.php b/apps/user_ldap/l10n/tr.php
index 3cb94d5df03fd235204304f34d62d83ef6868248..3835c72313ab32688bcaed94b6669dcc989c3ada 100644
--- a/apps/user_ldap/l10n/tr.php
+++ b/apps/user_ldap/l10n/tr.php
@@ -1,13 +1,25 @@
"Sunucu yapılandırmasını silme başarısız oldu",
+"The configuration is valid and the connection could be established!" => "Yapılandırma geçerli ve bağlantı kuruldu!",
+"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "Yapılandırma geçerli fakat bağlanma(bind) başarısız. Lütfen Sunucu ayarları ve kimlik bilgilerini kontrol ediniz.",
+"The configuration is invalid. Please look in the ownCloud log for further details." => "Yapılandırma geçersiz. Daha fazla detay için lütfen ownCloud günlüklerine bakınız.",
"Deletion failed" => "Silme başarısız oldu",
-"Keep settings?" => "Ayarları kalsınmı?",
+"Take over settings from recent server configuration?" => "Ayarları son sunucu yapılandırmalarından devral?",
+"Keep settings?" => "Ayarlar kalsın mı?",
+"Cannot add server configuration" => "Sunucu yapılandırması eklenemedi",
+"Error" => "Hata",
"Connection test succeeded" => "Bağlantı testi başarılı oldu",
"Connection test failed" => "Bağlantı testi başarısız oldu",
+"Do you really want to delete the current Server Configuration?" => "Şu anki sunucu yapılandırmasını silmek istediğinizden emin misiniz?",
"Confirm Deletion" => "Silmeyi onayla",
"Warning: Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "Uyari Apps kullanici_Idap ve user_webdavauth uyunmayan. Bu belki sik degil. Lutfen sistem yonetici sormak on aktif yapmaya. ",
+"Warning: The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "Ihbar Modulu PHP LDAP yuklemdi degil, backend calismacak. Lutfen sistem yonetici sormak yuklemek icin.",
+"Server configuration" => "Sunucu uyunlama ",
+"Add Server Configuration" => "Sunucu Uyunlama birlemek ",
"Host" => "Sunucu",
"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Protokol atlamak edesin, sadece SSL istiyorsaniz. O zaman, idapsile baslamak. ",
"Base DN" => "Ana DN",
+"One Base DN per line" => "Bir Tabani DN herbir dizi. ",
"You can specify Base DN for users and groups in the Advanced tab" => "Base DN kullanicileri ve kaynaklari icin tablosu Advanced tayin etmek ederiz. ",
"User DN" => "Kullanıcı 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 musterinin, kimle baglamaya yapacagiz,meselâ uid=agent.dc mesela, dc=com Gecinme adisiz ici, DN ve Parola bos birakmak. ",
@@ -23,18 +35,32 @@
"Defines the filter to apply, when retrieving groups." => "Filter uyunmak icin tayin ediyor, ne zaman grubalari tekrar aliyor. ",
"without any placeholder, e.g. \"objectClass=posixGroup\"." => "siz bir yer tutucu, mes. 'objectClass=posixGroup ('posixGrubu''. ",
"Connection Settings" => "Bağlantı ayarları",
+"When unchecked, this configuration will be skipped." => "Ne zaman iptal, bu uynnlama isletici ",
"Port" => "Port",
+"Backup (Replica) Host" => "Sigorta Kopya Cephe ",
+"Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Bir kopya cevre vermek, kopya sunucu onemli olmali. ",
+"Backup (Replica) Port" => "Kopya Port ",
"Disable Main Server" => "Ana sunucuyu devredışı birak",
+"When switched on, ownCloud will only connect to the replica server." => "Ne zaman acik, ownCloud sadece sunuce replikayin baglamis.",
"Use TLS" => "TLS kullan",
+"Do not use it additionally for LDAPS connections, it will fail." => "Bu LDAPS baglama icin kullamaminiz, basamacak. ",
+"Case insensitve LDAP server (Windows)" => "Dusme sunucu LDAP zor degil. (Windows)",
"Turn off SSL certificate validation." => "SSL sertifika doğrulamasını kapat.",
"If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Bagladiginda, bunla secene sadece calisiyor, sunucu LDAP SSL sunucun ithal etemek, dneyme sizine sunucu ownClouden. ",
"Not recommended, use for testing only." => "Önerilmez, sadece test için kullanın.",
+"Cache Time-To-Live" => "Cache Time-To-Live ",
"in seconds. A change empties the cache." => "saniye cinsinden. Bir değişiklik önbelleği temizleyecektir.",
+"Directory Settings" => "Parametrar Listesin Adresinin ",
"User Display Name Field" => "Ekran Adi Kullanici, (Alan Adi Kullanici Ekrane)",
+"The LDAP attribute to use to generate the user`s ownCloud name." => "LDAP kategori kullanmaya adi ownCloud kullanicin uremek icin. ",
"Base User Tree" => "Temel Kullanıcı Ağacı",
+"One User Base DN per line" => "Bir Temel Kullanici DN her dizgi ",
+"User Search Attributes" => "Kategorii Arama Kullanici ",
"Group Display Name Field" => "Grub Ekrane Alani Adi",
"The LDAP attribute to use to generate the groups`s ownCloud name." => "LDAP kullamayin grub adi ownCloud uremek icin. ",
"Base Group Tree" => "Temel Grup Ağacı",
+"One Group Base DN per line" => "Bir Grubu Tabani DN her dizgi. ",
+"Group Search Attributes" => "Kategorii Arama Grubu",
"Group-Member association" => "Grup-Üye işbirliği",
"in bytes" => "byte cinsinden",
"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Kullanıcı adı bölümünü boş bırakın (varsayılan). ",
diff --git a/apps/user_ldap/l10n/ug.php b/apps/user_ldap/l10n/ug.php
new file mode 100644
index 0000000000000000000000000000000000000000..8634cdbe1bec1b8ab32e3e0b0895a87eea006e0c
--- /dev/null
+++ b/apps/user_ldap/l10n/ug.php
@@ -0,0 +1,14 @@
+ "ئۆچۈرۈش مەغلۇپ بولدى",
+"Error" => "خاتالىق",
+"Host" => "باش ئاپپارات",
+"Password" => "ئىم",
+"User Login Filter" => "ئىشلەتكۈچى تىزىمغا كىرىش سۈزگۈچى",
+"User List Filter" => "ئىشلەتكۈچى تىزىم سۈزگۈچى",
+"Group Filter" => "گۇرۇپپا سۈزگۈچ",
+"Connection Settings" => "باغلىنىش تەڭشىكى",
+"Configuration Active" => "سەپلىمە ئاكتىپ",
+"Port" => "ئېغىز",
+"Use TLS" => "TLS ئىشلەت",
+"Help" => "ياردەم"
+);
diff --git a/apps/user_ldap/l10n/uk.php b/apps/user_ldap/l10n/uk.php
index 623d34c98e6a5f3a26b8a8b58b4187a5e95c07d9..f92c6d5894ef6ffd87102c880a45c401f1ff9c90 100644
--- a/apps/user_ldap/l10n/uk.php
+++ b/apps/user_ldap/l10n/uk.php
@@ -7,6 +7,8 @@
"Take over settings from recent server configuration?" => "Застосувати налаштування з останньої конфігурації сервера ?",
"Keep settings?" => "Зберегти налаштування ?",
"Cannot add server configuration" => "Неможливо додати конфігурацію сервера",
+"Success" => "Успіх",
+"Error" => "Помилка",
"Connection test succeeded" => "Перевірка з'єднання пройшла успішно",
"Connection test failed" => "Перевірка з'єднання завершилась неуспішно",
"Do you really want to delete the current Server Configuration?" => "Ви дійсно бажаєте видалити поточну конфігурацію сервера ?",
diff --git a/apps/user_ldap/l10n/ur_PK.php b/apps/user_ldap/l10n/ur_PK.php
index 4c606a138081f80fed2752ffeaba5a345108481a..83570a596a24b06d91371aed8ebf8206acc1ce02 100644
--- a/apps/user_ldap/l10n/ur_PK.php
+++ b/apps/user_ldap/l10n/ur_PK.php
@@ -1,4 +1,5 @@
"ایرر",
"Password" => "پاسورڈ",
"Help" => "مدد"
);
diff --git a/apps/user_ldap/l10n/vi.php b/apps/user_ldap/l10n/vi.php
index 4bbb977f36362ff85c5375811920f57e19b753ea..7e598225926a4eff92474a16eeb370f87b3adcca 100644
--- a/apps/user_ldap/l10n/vi.php
+++ b/apps/user_ldap/l10n/vi.php
@@ -1,5 +1,7 @@
"Xóa thất bại",
+"Success" => "Thành công",
+"Error" => "Lỗi",
"Host" => "Máy chủ",
"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Bạn có thể bỏ qua các giao thức, ngoại trừ SSL. Sau đó bắt đầu với ldaps://",
"Base DN" => "DN cơ bản",
diff --git a/apps/user_ldap/l10n/zh_CN.GB2312.php b/apps/user_ldap/l10n/zh_CN.GB2312.php
index f5bc41fd46b3df5cf756bc50d09df33f7a78036a..6c60ec64e270aadb8159b4b72f35364b8cabf380 100644
--- a/apps/user_ldap/l10n/zh_CN.GB2312.php
+++ b/apps/user_ldap/l10n/zh_CN.GB2312.php
@@ -1,5 +1,7 @@
"删除失败",
+"Success" => "成功",
+"Error" => "出错",
"Host" => "主机",
"You can omit the protocol, except you require SSL. Then start with ldaps://" => "您可以忽略协议,除非您需要 SSL。然后用 ldaps:// 开头",
"Base DN" => "基本判别名",
diff --git a/apps/user_ldap/l10n/zh_CN.php b/apps/user_ldap/l10n/zh_CN.php
index 1911734805fbba894a2c85335f55fc74282f2df5..7b8389227aec8bf927826bc2b722d104c97c3c2f 100644
--- a/apps/user_ldap/l10n/zh_CN.php
+++ b/apps/user_ldap/l10n/zh_CN.php
@@ -7,6 +7,8 @@
"Take over settings from recent server configuration?" => "从近期的服务器配置中导入设置?",
"Keep settings?" => "保留设置吗?",
"Cannot add server configuration" => "无法添加服务器配置",
+"Success" => "成功",
+"Error" => "错误",
"Connection test succeeded" => "连接测试成功",
"Connection test failed" => "连接测试失败",
"Do you really want to delete the current Server Configuration?" => "您真的想要删除当前服务器配置吗?",
diff --git a/apps/user_ldap/l10n/zh_HK.php b/apps/user_ldap/l10n/zh_HK.php
index 190e4eba798e9dafde81516fcd728426558ad291..ba55c4147905453e86c73a362a57fe7998dbe7a9 100644
--- a/apps/user_ldap/l10n/zh_HK.php
+++ b/apps/user_ldap/l10n/zh_HK.php
@@ -1,4 +1,6 @@
"成功",
+"Error" => "錯誤",
"Password" => "密碼",
"Port" => "連接埠",
"Help" => "幫助"
diff --git a/apps/user_ldap/l10n/zh_TW.php b/apps/user_ldap/l10n/zh_TW.php
index 9a12bad07479e0f20cf24d60ad6a114cafbc410d..d01e75356c05efb2de994564d50f465664499367 100644
--- a/apps/user_ldap/l10n/zh_TW.php
+++ b/apps/user_ldap/l10n/zh_TW.php
@@ -1,5 +1,7 @@
"移除失敗",
+"Success" => "成功",
+"Error" => "錯誤",
"Host" => "主機",
"Password" => "密碼",
"Port" => "連接阜",
diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php
index 6d32e9b2ab029cd619b2c7f45c8394f936ad8887..a7611eb3e846690c0a69b8f90756ae625dcbb5de 100644
--- a/apps/user_ldap/lib/access.php
+++ b/apps/user_ldap/lib/access.php
@@ -87,7 +87,7 @@ abstract class Access {
for($i=0;$i<$result[$attr]['count'];$i++) {
if($this->resemblesDN($attr)) {
$values[] = $this->sanitizeDN($result[$attr][$i]);
- } elseif(strtolower($attr) == 'objectguid' || strtolower($attr) == 'guid') {
+ } elseif(strtolower($attr) === 'objectguid' || strtolower($attr) === 'guid') {
$values[] = $this->convertObjectGUID2Str($result[$attr][$i]);
} else {
$values[] = $result[$attr][$i];
@@ -317,7 +317,19 @@ abstract class Access {
}
$ldapname = $ldapname[0];
}
- $intname = $isUser ? $this->sanitizeUsername($uuid) : $this->sanitizeUsername($ldapname);
+
+ if($isUser) {
+ $usernameAttribute = $this->connection->ldapExpertUsernameAttr;
+ if(!emptY($usernameAttribute)) {
+ $username = $this->readAttribute($dn, $usernameAttribute);
+ $username = $username[0];
+ } else {
+ $username = $uuid;
+ }
+ $intname = $this->sanitizeUsername($username);
+ } else {
+ $intname = $ldapname;
+ }
//a new user/group! Add it only if it doesn't conflict with other backend's users or existing groups
//disabling Cache is required to avoid that the new user is cached as not-existing in fooExists check
@@ -462,7 +474,7 @@ abstract class Access {
while($row = $res->fetchRow()) {
$usedNames[] = $row['owncloud_name'];
}
- if(!($usedNames) || count($usedNames) == 0) {
+ if(!($usedNames) || count($usedNames) === 0) {
$lastNo = 1; //will become name_2
} else {
natsort($usedNames);
@@ -550,7 +562,7 @@ abstract class Access {
$sqlAdjustment = '';
$dbtype = \OCP\Config::getSystemValue('dbtype');
- if($dbtype == 'mysql') {
+ if($dbtype === 'mysql') {
$sqlAdjustment = 'FROM DUAL';
}
@@ -574,7 +586,7 @@ abstract class Access {
$insRows = $res->numRows();
- if($insRows == 0) {
+ if($insRows === 0) {
return false;
}
@@ -656,7 +668,7 @@ abstract class Access {
$linkResources = array_pad(array(), count($base), $link_resource);
$sr = ldap_search($linkResources, $base, $filter, $attr);
$error = ldap_errno($link_resource);
- if(!is_array($sr) || $error != 0) {
+ if(!is_array($sr) || $error !== 0) {
\OCP\Util::writeLog('user_ldap',
'Error when searching: '.ldap_error($link_resource).' code '.ldap_errno($link_resource),
\OCP\Util::ERROR);
@@ -724,7 +736,7 @@ abstract class Access {
foreach($attr as $key) {
$key = mb_strtolower($key, 'UTF-8');
if(isset($item[$key])) {
- if($key != 'dn') {
+ if($key !== 'dn') {
$selection[$i][$key] = $this->resemblesDN($key) ?
$this->sanitizeDN($item[$key][0])
: $item[$key][0];
@@ -816,7 +828,7 @@ abstract class Access {
private function combineFilter($filters, $operator) {
$combinedFilter = '('.$operator;
foreach($filters as $filter) {
- if($filter[0] != '(') {
+ if($filter[0] !== '(') {
$filter = '('.$filter.')';
}
$combinedFilter.=$filter;
@@ -857,7 +869,7 @@ abstract class Access {
private function getFilterPartForSearch($search, $searchAttributes, $fallbackAttribute) {
$filter = array();
$search = empty($search) ? '*' : '*'.$search.'*';
- if(!is_array($searchAttributes) || count($searchAttributes) == 0) {
+ if(!is_array($searchAttributes) || count($searchAttributes) === 0) {
if(empty($fallbackAttribute)) {
return '';
}
@@ -867,7 +879,7 @@ abstract class Access {
$filter[] = $attribute . '=' . $search;
}
}
- if(count($filter) == 1) {
+ if(count($filter) === 1) {
return '('.$filter[0].')';
}
return $this->combineFilterWithOr($filter);
@@ -893,7 +905,13 @@ abstract class Access {
* @returns true on success, false otherwise
*/
private function detectUuidAttribute($dn, $force = false) {
- if(($this->connection->ldapUuidAttribute != 'auto') && !$force) {
+ if(($this->connection->ldapUuidAttribute !== 'auto') && !$force) {
+ return true;
+ }
+
+ $fixedAttribute = $this->connection->ldapExpertUUIDAttr;
+ if(!empty($fixedAttribute)) {
+ $this->connection->ldapUuidAttribute = $fixedAttribute;
return true;
}
@@ -1007,7 +1025,7 @@ abstract class Access {
* @returns string containing the key or empty if none is cached
*/
private function getPagedResultCookie($base, $filter, $limit, $offset) {
- if($offset == 0) {
+ if($offset === 0) {
return '';
}
$offset -= $limit;
@@ -1031,7 +1049,7 @@ abstract class Access {
*/
private function setPagedResultCookie($base, $filter, $limit, $offset, $cookie) {
if(!empty($cookie)) {
- $cachekey = 'lc' . dechex(crc32($base)) . '-' . dechex(crc32($filter)) . '-' .$limit . '-' . $offset;
+ $cachekey = 'lc' . crc32($base) . '-' . crc32($filter) . '-' .$limit . '-' . $offset;
$cookie = $this->connection->writeToCache($cachekey, $cookie);
}
}
diff --git a/apps/user_ldap/lib/connection.php b/apps/user_ldap/lib/connection.php
index 20784570e93925c47184faa51681bfd56c31fc68..ba4de1353412dbb6756a74f9de54d2cefaf4ea03 100644
--- a/apps/user_ldap/lib/connection.php
+++ b/apps/user_ldap/lib/connection.php
@@ -65,6 +65,8 @@ class Connection {
'ldapAttributesForGroupSearch' => null,
'homeFolderNamingRule' => null,
'hasPagedResultSupport' => false,
+ 'ldapExpertUsernameAttr' => null,
+ 'ldapExpertUUIDAttr' => null,
);
/**
@@ -99,7 +101,7 @@ class Connection {
public function __set($name, $value) {
$changed = false;
//only few options are writable
- if($name == 'ldapUuidAttribute') {
+ if($name === 'ldapUuidAttribute') {
\OCP\Util::writeLog('user_ldap', 'Set config ldapUuidAttribute to '.$value, \OCP\Util::DEBUG);
$this->config[$name] = $value;
if(!empty($this->configID)) {
@@ -265,6 +267,10 @@ class Connection {
= preg_split('/\r\n|\r|\n/', $this->$v('ldap_attributes_for_user_search'));
$this->config['ldapAttributesForGroupSearch']
= preg_split('/\r\n|\r|\n/', $this->$v('ldap_attributes_for_group_search'));
+ $this->config['ldapExpertUsernameAttr']
+ = $this->$v('ldap_expert_username_attr');
+ $this->config['ldapExpertUUIDAttr']
+ = $this->$v('ldap_expert_uuid_attr');
$this->configured = $this->validateConfiguration();
}
@@ -290,7 +296,6 @@ class Connection {
'ldap_group_filter'=>'ldapGroupFilter',
'ldap_display_name'=>'ldapUserDisplayName',
'ldap_group_display_name'=>'ldapGroupDisplayName',
-
'ldap_tls'=>'ldapTLS',
'ldap_nocase'=>'ldapNoCase',
'ldap_quota_def'=>'ldapQuotaDefault',
@@ -302,7 +307,9 @@ class Connection {
'ldap_turn_off_cert_check' => 'turnOffCertCheck',
'ldap_configuration_active' => 'ldapConfigurationActive',
'ldap_attributes_for_user_search' => 'ldapAttributesForUserSearch',
- 'ldap_attributes_for_group_search' => 'ldapAttributesForGroupSearch'
+ 'ldap_attributes_for_group_search' => 'ldapAttributesForGroupSearch',
+ 'ldap_expert_username_attr' => 'ldapExpertUsernameAttr',
+ 'ldap_expert_uuid_attr' => 'ldapExpertUUIDAttr',
);
return $array;
}
@@ -321,9 +328,9 @@ class Connection {
$params = $this->getConfigTranslationArray();
foreach($config as $parameter => $value) {
- if(($parameter == 'homeFolderNamingRule'
+ if(($parameter === 'homeFolderNamingRule'
|| (isset($params[$parameter])
- && $params[$parameter] == 'homeFolderNamingRule'))
+ && $params[$parameter] === 'homeFolderNamingRule'))
&& !empty($value)) {
$value = 'attr:'.$value;
}
@@ -389,7 +396,7 @@ class Connection {
$trans = $this->getConfigTranslationArray();
$config = array();
foreach($trans as $dbKey => $classKey) {
- if($classKey == 'homeFolderNamingRule') {
+ if($classKey === 'homeFolderNamingRule') {
if(strpos($this->config[$classKey], 'attr:') === 0) {
$config[$dbKey] = substr($this->config[$classKey], 5);
} else {
@@ -427,7 +434,9 @@ class Connection {
'No group filter is specified, LDAP group feature will not be used.',
\OCP\Util::INFO);
}
- if(!in_array($this->config['ldapUuidAttribute'], array('auto', 'entryuuid', 'nsuniqueid', 'objectguid'))
+ $uuidAttributes = array(
+ 'auto', 'entryuuid', 'nsuniqueid', 'objectguid', 'guid');
+ if(!in_array($this->config['ldapUuidAttribute'], $uuidAttributes)
&& (!is_null($this->configID))) {
\OCP\Config::setAppValue($this->configID, $this->configPrefix.'ldap_uuid_attribute', 'auto');
\OCP\Util::writeLog('user_ldap',
@@ -440,7 +449,7 @@ class Connection {
}
foreach(array('ldapAttributesForUserSearch', 'ldapAttributesForGroupSearch') as $key) {
if(is_array($this->config[$key])
- && count($this->config[$key]) == 1
+ && count($this->config[$key]) === 1
&& empty($this->config[$key][0])) {
$this->config[$key] = array();
}
@@ -503,6 +512,10 @@ class Connection {
$configurationOK = false;
}
+ if(!empty($this->config['ldapExpertUUIDAttr'])) {
+ $this->config['ldapUuidAttribute'] = $this->config['ldapExpertUUIDAttr'];
+ }
+
return $configurationOK;
}
@@ -541,6 +554,8 @@ class Connection {
'ldap_configuration_active' => 1,
'ldap_attributes_for_user_search' => '',
'ldap_attributes_for_group_search' => '',
+ 'ldap_expert_username_attr' => '',
+ 'ldap_expert_uuid_attr' => '',
);
}
@@ -588,12 +603,12 @@ class Connection {
$error = null;
//if LDAP server is not reachable, try the Backup (Replica!) Server
- if((!$bindStatus && ($error == -1))
+ if((!$bindStatus && ($error === -1))
|| $this->config['ldapOverrideMainServer']
|| $this->getFromCache('overrideMainServer')) {
$this->doConnect($this->config['ldapBackupHost'], $this->config['ldapBackupPort']);
$bindStatus = $this->bind();
- if($bindStatus && $error == -1) {
+ if($bindStatus && $error === -1) {
//when bind to backup server succeeded and failed to main server,
//skip contacting him until next cache refresh
$this->writeToCache('overrideMainServer', true);
diff --git a/apps/user_ldap/lib/helper.php b/apps/user_ldap/lib/helper.php
index 612a088269bec3382b8a659188ef4a2678aed6ea..07d13a806a624fcff9982d38cb508afca3d4da01 100644
--- a/apps/user_ldap/lib/helper.php
+++ b/apps/user_ldap/lib/helper.php
@@ -96,7 +96,32 @@ class Helper {
return false;
}
- if($res->numRows() == 0) {
+ if($res->numRows() === 0) {
+ return false;
+ }
+
+ return true;
+ }
+
+ /**
+ * Truncate's the given mapping table
+ *
+ * @param string $mapping either 'user' or 'group'
+ * @return boolean true on success, false otherwise
+ */
+ static public function clearMapping($mapping) {
+ if($mapping === 'user') {
+ $table = '`*PREFIX*ldap_user_mapping`';
+ } else if ($mapping === 'group') {
+ $table = '`*PREFIX*ldap_group_mapping`';
+ } else {
+ return false;
+ }
+
+ $query = \OCP\DB::prepare('TRUNCATE '.$table);
+ $res = $query->execute();
+
+ if(\OCP\DB::isError($res)) {
return false;
}
diff --git a/apps/user_ldap/settings.php b/apps/user_ldap/settings.php
index 05497ae8a3375790a9bd2530f3f46bc338a0fc27..22e2dac6d26bca29705fcb3a3f8bfdf4fe2104de 100644
--- a/apps/user_ldap/settings.php
+++ b/apps/user_ldap/settings.php
@@ -4,7 +4,9 @@
* ownCloud - user_ldap
*
* @author Dominik Schmidt
+ * @author Arthur Schiwon
* @copyright 2011 Dominik Schmidt dev@dominik-schmidt.de
+ * @copyright 2012-2013 Arthur Schiwon blizzz@owncloud.com
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
diff --git a/apps/user_ldap/templates/settings.php b/apps/user_ldap/templates/settings.php
index d3c2c298904305f72af82fc52ddf8e872987e6d7..972970aa3ef11445789bbb51390cffe5c35ec8f6 100644
--- a/apps/user_ldap/templates/settings.php
+++ b/apps/user_ldap/templates/settings.php
@@ -3,6 +3,7 @@
'.$l->t('Warning: Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them.').'');
@@ -14,7 +15,7 @@
t('Special Attributes'));?>
@@ -96,6 +97,17 @@
+
t('Help'));?>
diff --git a/apps/user_ldap/user_ldap.php b/apps/user_ldap/user_ldap.php
index 1277e074714619b9fea87c232a475a8da17cc097..41e2926605e75f04af7702666485ade9ef696f34 100644
--- a/apps/user_ldap/user_ldap.php
+++ b/apps/user_ldap/user_ldap.php
@@ -197,9 +197,9 @@ class USER_LDAP extends lib\Access implements \OCP\UserInterface {
//if attribute's value is an absolute path take this, otherwise append it to data dir
//check for / at the beginning or pattern c:\ resp. c:/
if(
- '/' == $path[0]
+ '/' === $path[0]
|| (3 < strlen($path) && ctype_alpha($path[0])
- && $path[1] == ':' && ('\\' == $path[2] || '/' == $path[2]))
+ && $path[1] === ':' && ('\\' === $path[2] || '/' === $path[2]))
) {
$homedir = $path;
} else {
diff --git a/apps/user_ldap/user_proxy.php b/apps/user_ldap/user_proxy.php
index 7e5b9045df3f42064ef0e75a71ece3adc2a7c277..73cc0963182c454ef4d67c392654869b55956565 100644
--- a/apps/user_ldap/user_proxy.php
+++ b/apps/user_ldap/user_proxy.php
@@ -174,7 +174,7 @@ class User_Proxy extends lib\Proxy implements \OCP\UserInterface {
foreach($this->backends as $backend) {
$backendUsers = $backend->getDisplayNames($search, $limit, $offset);
if (is_array($backendUsers)) {
- $users = array_merge($users, $backendUsers);
+ $users = $users + $backendUsers;
}
}
return $users;
diff --git a/apps/user_webdavauth/l10n/ug.php b/apps/user_webdavauth/l10n/ug.php
new file mode 100644
index 0000000000000000000000000000000000000000..03ced5f4aa27cb15be74c348234fe0e8ade77c06
--- /dev/null
+++ b/apps/user_webdavauth/l10n/ug.php
@@ -0,0 +1,4 @@
+ "WebDAV سالاھىيەت دەلىللەش",
+"URL: http://" => "URL: http://"
+);
diff --git a/apps/user_webdavauth/l10n/zh_TW.php b/apps/user_webdavauth/l10n/zh_TW.php
index 7a9d767eec11d66605fe40cf9d642f5f080eb1cd..6f94b77ac5794f6a4eaba19d43b687e8b26643ca 100644
--- a/apps/user_webdavauth/l10n/zh_TW.php
+++ b/apps/user_webdavauth/l10n/zh_TW.php
@@ -1,5 +1,5 @@
"WebDAV 認證",
"URL: http://" => "網址:http://",
-"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會將把用戶的證件發送到這個網址。這個插件會檢查回應,並把HTTP狀態代碼401和403視為無效證件和所有其他回應視為有效證件。"
+"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 會將把用戶的登入資訊發送到這個網址以嘗試登入,並檢查回應, HTTP 狀態碼401和403視為登入失敗,所有其他回應視為登入成功。"
);
diff --git a/autotest.sh b/autotest.sh
index fdf6d2fe098267dd414acd4b573f0b8fd5385d02..267815e96d82e147c86c6163791bfff5028db1dc 100755
--- a/autotest.sh
+++ b/autotest.sh
@@ -90,7 +90,12 @@ function execute_tests {
rm -rf coverage-html-$1
mkdir coverage-html-$1
php -f enable_all.php
- phpunit --configuration phpunit-autotest.xml --log-junit autotest-results-$1.xml --coverage-clover autotest-clover-$1.xml --coverage-html coverage-html-$1
+ if [ "$1" == "pgsql" ] ; then
+ # no coverage with pg - causes segfault on ci.tmit.eu - reason unknown
+ phpunit --configuration phpunit-autotest.xml --log-junit autotest-results-$1.xml
+ else
+ phpunit --configuration phpunit-autotest.xml --log-junit autotest-results-$1.xml --coverage-clover autotest-clover-$1.xml --coverage-html coverage-html-$1
+ fi
}
#
diff --git a/core/css/styles.css b/core/css/styles.css
index 4dfa3f64a375c70a5ea3f9e8b524b229e5a25c45..70a840d68903ce08ece49a46dfbd9348a12c828b 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -220,6 +220,8 @@ label.infield { cursor:text !important; top:1.05em; left:.85em; }
}
#login #databaseField .infield { padding-left:0; }
#login form input[type="checkbox"]+label { position:relative; margin:0; font-size:1em; text-shadow:#fff 0 1px 0; }
+#login form .errors { background:#fed7d7; border:1px solid #f00; list-style-indent:inside; margin:0 0 2em; padding:1em; }
+#login .success { background:#d7fed7; border:1px solid #0f0; width: 35%; margin: 30px auto; padding:1em; text-align: center;}
/* Show password toggle */
#show, #dbpassword { position:absolute; right:1em; top:.8em; float:right; }
@@ -342,8 +344,8 @@ li.update, li.error { width:640px; margin:4em auto; padding:1em 1em 1em 4em; bac
.center { text-align:center; }
#notification-container { position: fixed; top: 0px; width: 100%; text-align: center; z-index: 101; line-height: 1.2;}
-#notification { z-index:101; background-color:#fc4; border:0; padding:0 .7em .3em; display:none; position: relative; top:0; -moz-border-radius-bottomleft:1em; -webkit-border-bottom-left-radius:1em; border-bottom-left-radius:1em; -moz-border-radius-bottomright:1em; -webkit-border-bottom-right-radius:1em; border-bottom-right-radius:1em; }
-#notification span { cursor:pointer; font-weight:bold; margin-left:1em; }
+#notification, #update-notification { z-index:101; background-color:#fc4; border:0; padding:0 .7em .3em; display:none; position: relative; top:0; -moz-border-radius-bottomleft:1em; -webkit-border-bottom-left-radius:1em; border-bottom-left-radius:1em; -moz-border-radius-bottomright:1em; -webkit-border-bottom-right-radius:1em; border-bottom-right-radius:1em; }
+#notification span, #update-notification span { cursor:pointer; font-weight:bold; margin-left:1em; }
tr .action:not(.permanent), .selectedActions a { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)"; filter:alpha(opacity=0); opacity:0; }
tr:hover .action, tr .action.permanent, .selectedActions a { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=50)"; filter:alpha(opacity=50); opacity:.5; }
@@ -380,13 +382,22 @@ a.bookmarklet { background-color:#ddd; border:1px solid #ccc; padding:5px;paddin
.ui-datepicker-prev,.ui-datepicker-next{ border:1px solid #ddd; background:#fff; }
/* ---- DIALOGS ---- */
-#dirup {width:4%;}
-#dirtree {width:92%;}
-#filelist {height:270px; overflow-y:auto; background-color:white; width:100%;}
-.filepicker_element_selected { background-color:lightblue;}
-.filepicker_loader {height:170px; width:100%; background-color:#333; -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=30)"; filter:alpha(opacity=30); opacity:.3; visibility:visible; position:absolute; top:0; left:0; text-align:center; padding-top:150px;}
+#oc-dialog-filepicker-content .dirtree {width:92%; overflow:hidden; }
+#oc-dialog-filepicker-content .dirtree .home {
+ background-image:url('../img/places/home.svg');
+ background-repeat:no-repeat;
+ background-position: left center;
+}
+#oc-dialog-filepicker-content .dirtree span:not(:last-child) { cursor: pointer; }
+#oc-dialog-filepicker-content .dirtree span:last-child { font-weight: bold; }
+#oc-dialog-filepicker-content .dirtree span:not(:last-child)::after { content: '>'; padding: 3px;}
+#oc-dialog-filepicker-content .filelist {height:270px; overflow-y:auto; background-color:white; width:100%;}
+#oc-dialog-filepicker-content .filelist img { margin: 2px 1em 0 4px; }
+#oc-dialog-filepicker-content .filelist .date { float:right;margin-right:1em; }
+#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; }
/* ---- CATEGORIES ---- */
#categoryform .scrollarea { position:absolute; left:10px; top:10px; right:10px; bottom:50px; overflow:auto; border:1px solid #ddd; background:#f8f8f8; }
diff --git a/core/js/compatibility.js b/core/js/compatibility.js
index cc37949409d3585e2acb3f1e49b38652ed053d60..b690803ca7727c9214b8bc788d480afb4afd551d 100644
--- a/core/js/compatibility.js
+++ b/core/js/compatibility.js
@@ -133,4 +133,18 @@ if(!String.prototype.trim) {
String.prototype.trim = function () {
return this.replace(/^\s+|\s+$/g,'');
};
-}
\ No newline at end of file
+}
+
+// Older Firefoxes doesn't support outerHTML
+// From http://stackoverflow.com/questions/1700870/how-do-i-do-outerhtml-in-firefox#answer-3819589
+function outerHTML(node){
+ // In newer browsers use the internal property otherwise build a wrapper.
+ return node.outerHTML || (
+ function(n){
+ var div = document.createElement('div'), h;
+ div.appendChild( n.cloneNode(true) );
+ h = div.innerHTML;
+ div = null;
+ return h;
+ })(node);
+}
diff --git a/core/js/config.php b/core/js/config.php
index 0aaa44822876b339d4b47c73ad8f6145069b6d0e..53a8fb96388601b1f8e57e387fbee1076892ae91 100644
--- a/core/js/config.php
+++ b/core/js/config.php
@@ -26,8 +26,8 @@ $array = array(
"oc_debug" => (defined('DEBUG') && DEBUG) ? 'true' : 'false',
"oc_webroot" => "\"".OC::$WEBROOT."\"",
"oc_appswebroots" => str_replace('\\/', '/', json_encode($apps_paths)), // Ugly unescape slashes waiting for better solution
- "oc_current_user" => "\"".OC_User::getUser(). "\"",
- "oc_requesttoken" => "\"".OC_Util::callRegister(). "\"",
+ "oc_current_user" => "document.getElementsByTagName('head')[0].getAttribute('data-user')",
+ "oc_requesttoken" => "document.getElementsByTagName('head')[0].getAttribute('data-requesttoken')",
"datepickerFormatDate" => json_encode($l->l('jsdate', 'jsdate')),
"dayNames" => json_encode(
array(
diff --git a/core/js/jquery-showpassword.js b/core/js/jquery-showpassword.js
index 0f4678327a3bc64a2d4dbdb1ee2213993e6ab9e2..e1737643b484e3055fc90ce42119658f006d12ca 100644
--- a/core/js/jquery-showpassword.js
+++ b/core/js/jquery-showpassword.js
@@ -35,7 +35,8 @@
'style' : $element.attr('style'),
'size' : $element.attr('size'),
'name' : $element.attr('name')+'-clone',
- 'tabindex' : $element.attr('tabindex')
+ 'tabindex' : $element.attr('tabindex'),
+ 'autocomplete' : 'off'
});
return $clone;
@@ -102,7 +103,16 @@
$clone.bind('blur', function() { $input.trigger('focusout'); });
setState( $checkbox, $input, $clone );
-
+
+ // set type of password field clone (type=text) to password right on submit
+ // to prevent browser save the value of this field
+ $clone.closest('form').submit(function(e) {
+ // .prop has to be used, because .attr throws
+ // an error while changing a type of an input
+ // element
+ $clone.prop('type', 'password');
+ });
+
if( callback.fn ){
callback.fn( callback.args );
}
diff --git a/core/js/js.js b/core/js/js.js
index d85e6d88f8aed5529840b2a10875b98745596ab3..3cb4d3dd151582915626c2363dc106b4a7de1fc3 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -767,6 +767,26 @@ OC.set=function(name, value) {
context[tail]=value;
};
+/**
+ * select a range in an input field
+ * @link http://stackoverflow.com/questions/499126/jquery-set-cursor-position-in-text-area
+ * @param {type} start
+ * @param {type} end
+ */
+$.fn.selectRange = function(start, end) {
+ return this.each(function() {
+ if (this.setSelectionRange) {
+ this.focus();
+ this.setSelectionRange(start, end);
+ } else if (this.createTextRange) {
+ var range = this.createTextRange();
+ range.collapse(true);
+ range.moveEnd('character', end);
+ range.moveStart('character', start);
+ range.select();
+ }
+ });
+};
/**
* Calls the server periodically every 15 mins to ensure that session doesnt
diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js
index 990c3f8bf38b19cedb8bfed7785864174971e681..e1d3657724e14822eb2431c3667789c7b3db1c56 100644
--- a/core/js/oc-dialogs.js
+++ b/core/js/oc-dialogs.js
@@ -1,7 +1,7 @@
/**
* ownCloud
*
- * @author Bartek Przybylski
+ * @author Bartek Przybylski, Christopher Schäpers, Thomas Tanghus
* @copyright 2012 Bartek Przybylski bartek@alefzero.eu
*
* This library is free software; you can redistribute it and/or
@@ -23,6 +23,11 @@
* this class to ease the usage of jquery dialogs
*/
var OCdialogs = {
+ // dialog button types
+ YES_NO_BUTTONS: 70,
+ OK_BUTTONS: 71,
+ // used to name each dialog
+ dialogs_counter: 0,
/**
* displays alert dialog
* @param text content of dialog
@@ -31,8 +36,7 @@ var OCdialogs = {
* @param modal make the dialog modal
*/
alert:function(text, title, callback, modal) {
- var content = '
' + escapeHTML(text) + '
';
- OCdialogs.message(content, title, OCdialogs.ALERT_DIALOG, OCdialogs.OK_BUTTON, callback, modal);
+ this.message(text, title, 'alert', OCdialogs.OK_BUTTON, callback, modal);
},
/**
* displays info dialog
@@ -42,8 +46,7 @@ var OCdialogs = {
* @param modal make the dialog modal
*/
info:function(text, title, callback, modal) {
- var content = '
';
- OCdialogs.message(content, title, OCdialogs.ALERT_DIALOG, OCdialogs.YES_NO_BUTTONS, callback, modal);
- },
- /**
- * prompt for user input
- * @param text content of dialog
- * @param title dialog title
- * @param callback which will be triggered when user presses OK (input text will be passed to callback)
- * @param modal make the dialog modal
- */
- prompt:function(text, title, default_value, callback, modal) {
- var input = '';
- var content = '
' + escapeHTML(text) + ': ' + input + '
';
- OCdialogs.message(content, title, OCdialogs.PROMPT_DIALOG, OCdialogs.OK_BUTTON, callback, modal);
- },
- /**
- * prompt user for input with custom form
- * fields should be passed in following format: [{text:'prompt text', name:'return name', type:'input type', value: 'default value'},...]
- * example:
- * var fields=[{text:'Test', name:'test', type:'select', options:[{text:'hello1',value:1},{text:'hello2',value:2}] }];
- * @param fields to display
- * @param title dialog title
- * @param callback which will be triggered when user presses OK (user answers will be passed to callback in following format: [{name:'return name', value: 'user value'},...])
- * @param modal make the dialog modal
- */
- form:function(fields, title, callback, modal) {
- var content = '
';
- var files = '';
+ _fillFilePicker:function(dir) {
var dirs = [];
var others = [];
- $.each(request.data, function(index, file) {
- if (file.type === 'dir') {
- dirs.push(file);
- } else {
- others.push(file);
- }
- });
- var sorted = dirs.concat(others);
- for (var i = 0; i < sorted.length; i++) {
- files_content = template_content.replace('*LASTMODDATE*', OC.mtime2date(sorted[i].mtime)).replace('*NAME*', escapeHTML(sorted[i].name)).replace('*MIMETYPEICON*', sorted[i].mimetype_icon);
- files += template.replace('*ENTRYNAME*', escapeHTML(sorted[i].name)).replace('*ENTRYTYPE*', escapeHTML(sorted[i].type)).replace('*CONTENT*', files_content);
- }
+ var self = this;
+ this.$filelist.empty().addClass('loading');
+ this.$filePicker.data('path', dir);
+ $.when(this._getFileList(dir, this.$filePicker.data('mimetype'))).then(function(response) {
+ $.each(response.data, function(index, file) {
+ if (file.type === 'dir') {
+ dirs.push(file);
+ } else {
+ others.push(file);
+ }
+ });
- $(dialog_content_id + ' #filelist').html(files);
- $('#filelist div').click(function() {
- OCdialogs.handlePickerClick($(this), $(this).data('entryname'), dialog_content_id);
- });
+ self._fillSlug();
+ var sorted = dirs.concat(others);
- $(dialog_content_id + ' .filepicker_loader').css('visibility', 'hidden');
- },
- /**
- * fills the tree list with directories
- */
- fillTreeList: function(request, dialog_id) {
- var template = '';
- var paths = '';
- $.each(request.data, function(index, file) {
- paths += template.replace('*COUNT*', index).replace('*NAME*', escapeHTML(file.name));
- });
+ $.each(sorted, function(idx, entry) {
+ $li = self.$listTmpl.octemplate({
+ type: entry.type,
+ dir: dir,
+ filename: entry.name,
+ date: OC.mtime2date(entry.mtime)
+ });
+ $li.find('img').attr('src', entry.mimetype_icon);
+ self.$filelist.append($li);
+ });
- $(dialog_id + ' #dirtree').html(paths);
+ self.$filelist.removeClass('loading');
+ });
},
/**
- * handle selection made in the tree list
+ * fills the tree list with directories
*/
- handleTreeListSelect:function(event) {
- if ($("option:selected", this).html().indexOf('/') !== -1) { // if there's a slash in the selected path, don't append it
- $(event.data.dcid).data('path', $("option:selected", this).html());
- } else {
- $(event.data.dcid).data('path', $(event.data.dcid).data('path') + $("option:selected", this).html() + '/');
+ _fillSlug: function() {
+ this.$dirTree.empty();
+ var self = this
+ var path = this.$filePicker.data('path');
+ var $template = $('{name}');
+ if(path) {
+ var paths = path.split('/');
+ $.each(paths, function(index, dir) {
+ var dir = paths.pop();
+ if(dir === '') {
+ return false;
+ }
+ self.$dirTree.prepend($template.octemplate({
+ dir: paths.join('/') + '/' + dir,
+ name: dir
+ }));
+ });
}
- $(event.data.dcid + ' .filepicker_loader').css('visibility', 'visible');
- $.getJSON(
- OC.filePath('files', 'ajax', 'rawlist.php'),
- {
- dir: $(event.data.dcid).data('path'),
- mimetype: $(event.data.dcid).data('mimetype')
- },
- function(request) { OCdialogs.fillFilePicker(request, event.data.dcid) }
- );
- $.getJSON(
- OC.filePath('files', 'ajax', 'rawlist.php'),
- {
- dir: $(event.data.dcid).data('path'),
- mimetype: "httpd/unix-directory"
- },
- function(request) { OCdialogs.fillTreeList(request, event.data.dcid) }
- );
+ $template.octemplate({
+ dir: '',
+ name: ' ' // Ugly but works ;)
+ }, {escapeFunction: null}).addClass('home svg').prependTo(this.$dirTree);
},
/**
- * go one directory up
+ * handle selection made in the tree list
*/
- filepickerDirUp:function(event) {
- var old_path = $(event.data.dcid).data('path');
- if ( old_path !== "/") {
- var splitted_path = old_path.split("/");
- var new_path = ""
- for (var i = 0; i < splitted_path.length - 2; i++) {
- new_path += splitted_path[i] + "/"
- }
- $(event.data.dcid).data('path', new_path);
- $.getJSON(
- OC.filePath('files', 'ajax', 'rawlist.php'),
- {
- dir: $(event.data.dcid).data('path'),
- mimetype: $(event.data.dcid).data('mimetype')
- },
- function(request) { OCdialogs.fillFilePicker(request, event.data.dcid) }
- );
- $.getJSON(
- OC.filePath('files', 'ajax', 'rawlist.php'),
- {
- dir: $(event.data.dcid).data('path'),
- mimetype: "httpd/unix-directory"
- },
- function(request) { OCdialogs.fillTreeList(request, event.data.dcid) }
- );
- }
+ _handleTreeListSelect:function(event) {
+ var self = event.data;
+ var dir = $(event.target).data('dir');
+ self._fillFilePicker(dir);
},
/**
* handle clicks made in the filepicker
*/
- handlePickerClick:function(element, name, dialog_content_id) {
- if ( $(element).attr('data') === 'file' ){
- if ( $(dialog_content_id).data('multiselect') !== true) {
- $(dialog_content_id + ' .filepicker_element_selected').removeClass('filepicker_element_selected');
+ _handlePickerClick:function(event, $element) {
+ if ($element.data('type') === 'file') {
+ if (this.$filePicker.data('multiselect') !== true || !event.ctrlKey) {
+ this.$filelist.find('.filepicker_element_selected').removeClass('filepicker_element_selected');
}
- $(element).toggleClass('filepicker_element_selected');
+ $element.toggleClass('filepicker_element_selected');
return;
- } else if ( $(element).attr('data') === 'dir' ) {
- var datapath = escapeHTML( $(dialog_content_id).data('path') + name + '/' );
- $(dialog_content_id).data('path', datapath);
- $(dialog_content_id + ' .filepicker_loader').css('visibility', 'visible');
- $.getJSON(
- OC.filePath('files', 'ajax', 'rawlist.php'),
- {
- dir: datapath,
- mimetype: $(dialog_content_id).data('mimetype')
- },
- function(request){ OCdialogs.fillFilePicker(request, dialog_content_id) }
- );
- $.getJSON(
- OC.filePath('files', 'ajax', 'rawlist.php'),
- {
- dir: datapath,
- mimetype: "httpd/unix-directory"
- },
- function(request) { OCdialogs.fillTreeList(request, dialog_content_id) }
- );
+ } else if ( $element.data('type') === 'dir' ) {
+ this._fillFilePicker(this.$filePicker.data('path') + '/' + $element.data('entryname'))
}
}
};
diff --git a/core/js/octemplate.js b/core/js/octemplate.js
index a5d56852a5754c6e40fb4e483ba8914c599f9092..e032506c0b1b3c93f5d3a116a868fe2d581d02bf 100644
--- a/core/js/octemplate.js
+++ b/core/js/octemplate.js
@@ -72,7 +72,7 @@
},
// From stackoverflow.com/questions/1408289/best-way-to-do-variable-interpolation-in-javascript
_build: function(o){
- var data = this.elem.attr('type') === 'text/template' ? this.elem.html() : this.elem.get(0).outerHTML;
+ var data = this.elem.attr('type') === 'text/template' ? this.elem.html() : outerHTML(this.elem.get(0));
try {
return data.replace(/{([^{}]*)}/g,
function (a, b) {
diff --git a/core/l10n/ar.php b/core/l10n/ar.php
index 4d413715de3ef4e98ae81cb754d72acfc7fcc768..8bd4429338a339d7e9f1ddfb6a5fe75a1169b574 100644
--- a/core/l10n/ar.php
+++ b/core/l10n/ar.php
@@ -30,7 +30,7 @@
"October" => "تشرين الاول",
"November" => "تشرين الثاني",
"December" => "كانون الاول",
-"Settings" => "تعديلات",
+"Settings" => "إعدادات",
"seconds ago" => "منذ ثواني",
"1 minute ago" => "منذ دقيقة",
"{minutes} minutes ago" => "{minutes} منذ دقائق",
@@ -44,11 +44,11 @@
"months ago" => "شهر مضى",
"last year" => "السنةالماضية",
"years ago" => "سنة مضت",
-"Ok" => "موافق",
-"Cancel" => "الغاء",
"Choose" => "اختيار",
+"Cancel" => "الغاء",
"Yes" => "نعم",
"No" => "لا",
+"Ok" => "موافق",
"The object type is not specified." => "نوع العنصر غير محدد.",
"Error" => "خطأ",
"The app name is not specified." => "اسم التطبيق غير محدد.",
@@ -63,7 +63,7 @@
"Share with" => "شارك مع",
"Share with link" => "شارك مع رابط",
"Password protect" => "حماية كلمة السر",
-"Password" => "كلمة السر",
+"Password" => "كلمة المرور",
"Email link to person" => "ارسل الرابط بالبريد الى صديق",
"Send" => "أرسل",
"Set expiration date" => "تعيين تاريخ إنتهاء الصلاحية",
@@ -89,23 +89,21 @@
"ownCloud password reset" => "إعادة تعيين كلمة سر ownCloud",
"Use the following link to reset your password: {link}" => "استخدم هذه الوصلة لاسترجاع كلمة السر: {link}",
"You will receive a link to reset your password via Email." => "سوف نرسل لك بريد يحتوي على وصلة لتجديد كلمة السر.",
-"Reset email send." => "إعادة إرسال البريد الإلكتروني.",
-"Request failed!" => "فشل الطلب",
"Username" => "إسم المستخدم",
"Request reset" => "طلب تعديل",
"Your password was reset" => "لقد تم تعديل كلمة السر",
"To login page" => "الى صفحة الدخول",
-"New password" => "كلمة سر جديدة",
+"New password" => "كلمات سر جديدة",
"Reset password" => "تعديل كلمة السر",
-"Personal" => "خصوصيات",
-"Users" => "المستخدم",
+"Personal" => "شخصي",
+"Users" => "المستخدمين",
"Apps" => "التطبيقات",
-"Admin" => "مستخدم رئيسي",
+"Admin" => "المدير",
"Help" => "المساعدة",
"Access forbidden" => "التوصّل محظور",
"Cloud not found" => "لم يتم إيجاد",
"Edit categories" => "عدل الفئات",
-"Add" => "أدخل",
+"Add" => "اضف",
"Security Warning" => "تحذير أمان",
"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)",
"Please update your PHP installation to use ownCloud securely." => "Please update your PHP installation to use ownCloud securely.",
@@ -114,7 +112,7 @@
"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "مجلدات البيانات والملفات الخاصة قد تكون قابلة للوصول اليها عن طريق شبكة الانترنت وذلك بسبب ان ملف .htaccess لا يعمل بشكل صحيح.",
"For information how to properly configure your server, please see the documentation." => "للحصول على معلومات عن كيفية اعداد الخادم الخاص بك , يرجى زيارة الرابط التالي documentation.",
"Create an admin account" => "أضف مستخدم رئيسي ",
-"Advanced" => "خيارات متقدمة",
+"Advanced" => "تعديلات متقدمه",
"Data folder" => "مجلد المعلومات",
"Configure the database" => "أسس قاعدة البيانات",
"will be used" => "سيتم استخدمه",
@@ -124,7 +122,7 @@
"Database tablespace" => "مساحة جدول قاعدة البيانات",
"Database host" => "خادم قاعدة البيانات",
"Finish setup" => "انهاء التعديلات",
-"web services under your control" => "خدمات الوب تحت تصرفك",
+"web services under your control" => "خدمات الشبكة تحت سيطرتك",
"Log out" => "الخروج",
"Automatic logon rejected!" => "تم رفض تسجيل الدخول التلقائي!",
"If you did not change your password recently, your account may be compromised!" => "قد يكون حسابك في خطر إن لم تقم بإعادة تعيين كلمة السر حديثاً",
diff --git a/core/l10n/bg_BG.php b/core/l10n/bg_BG.php
index 217f823168e863d3f5eafc5aa9b929b12f5ee80c..6c04907e15b1b182140fd560f345f00f7c92f38d 100644
--- a/core/l10n/bg_BG.php
+++ b/core/l10n/bg_BG.php
@@ -1,4 +1,24 @@
"Няма избрани категории за изтриване",
+"Sunday" => "Неделя",
+"Monday" => "Понеделник",
+"Tuesday" => "Вторник",
+"Wednesday" => "Сряда",
+"Thursday" => "Четвъртък",
+"Friday" => "Петък",
+"Saturday" => "Събота",
+"January" => "Януари",
+"February" => "Февруари",
+"March" => "Март",
+"April" => "Април",
+"May" => "Май",
+"June" => "Юни",
+"July" => "Юли",
+"August" => "Август",
+"September" => "Септември",
+"October" => "Октомври",
+"November" => "Ноември",
+"December" => "Декември",
"Settings" => "Настройки",
"seconds ago" => "преди секунди",
"1 minute ago" => "преди 1 минута",
@@ -9,18 +29,44 @@
"last year" => "последната година",
"years ago" => "последните години",
"Cancel" => "Отказ",
+"Yes" => "Да",
+"No" => "Не",
+"Ok" => "Добре",
"Error" => "Грешка",
"Share" => "Споделяне",
"Share with" => "Споделено с",
"Password" => "Парола",
"create" => "създаване",
+"You will receive a link to reset your password via Email." => "Ще получите връзка за нулиране на паролата Ви.",
"Username" => "Потребител",
+"Request reset" => "Нулиране на заявка",
+"Your password was reset" => "Вашата парола е нулирана",
"New password" => "Нова парола",
+"Reset password" => "Нулиране на парола",
"Personal" => "Лични",
"Users" => "Потребители",
"Apps" => "Приложения",
"Admin" => "Админ",
"Help" => "Помощ",
+"Access forbidden" => "Достъпът е забранен",
+"Cloud not found" => "облакът не намерен",
+"Edit categories" => "Редактиране на категориите",
"Add" => "Добавяне",
-"web services under your control" => "уеб услуги под Ваш контрол"
+"Create an admin account" => "Създаване на админ профил",
+"Advanced" => "Разширено",
+"Data folder" => "Директория за данни",
+"Configure the database" => "Конфигуриране на базата",
+"will be used" => "ще се ползва",
+"Database user" => "Потребител за базата",
+"Database password" => "Парола за базата",
+"Database name" => "Име на базата",
+"Database host" => "Хост за базата",
+"Finish setup" => "Завършване на настройките",
+"web services under your control" => "уеб услуги под Ваш контрол",
+"Log out" => "Изход",
+"Lost your password?" => "Забравена парола?",
+"remember" => "запомни",
+"Log in" => "Вход",
+"prev" => "пред.",
+"next" => "следващо"
);
diff --git a/core/l10n/bn_BD.php b/core/l10n/bn_BD.php
index 1b18b6ae3e4c788b0f99470c4dec6942164a15c8..218bbce04aa2fff3900d8f754c5b6147826cd148 100644
--- a/core/l10n/bn_BD.php
+++ b/core/l10n/bn_BD.php
@@ -8,13 +8,13 @@
"Object type not provided." => "অবজেক্টের ধরণটি প্রদান করা হয় নি।",
"%s ID not provided." => "%s ID প্রদান করা হয় নি।",
"Error adding %s to favorites." => "প্রিয়তে %s যোগ করতে সমস্যা দেখা দিয়েছে।",
-"No categories selected for deletion." => "মুছে ফেলার জন্য কোন ক্যাটেগরি নির্বাচন করা হয় নি ।",
+"No categories selected for deletion." => "মুছে ফেলার জন্য কনো ক্যাটেগরি নির্বাচন করা হয় নি।",
"Error removing %s from favorites." => "প্রিয় থেকে %s সরিয়ে ফেলতে সমস্যা দেখা দিয়েছে।",
"Sunday" => "রবিবার",
"Monday" => "সোমবার",
"Tuesday" => "মঙ্গলবার",
"Wednesday" => "বুধবার",
-"Thursday" => "বৃহষ্পতিবার",
+"Thursday" => "বৃহস্পতিবার",
"Friday" => "শুক্রবার",
"Saturday" => "শনিবার",
"January" => "জানুয়ারি",
@@ -31,23 +31,23 @@
"December" => "ডিসেম্বর",
"Settings" => "নিয়ামকসমূহ",
"seconds ago" => "সেকেন্ড পূর্বে",
-"1 minute ago" => "1 মিনিট পূর্বে",
+"1 minute ago" => "১ মিনিট পূর্বে",
"{minutes} minutes ago" => "{minutes} মিনিট পূর্বে",
"1 hour ago" => "1 ঘন্টা পূর্বে",
"{hours} hours ago" => "{hours} ঘন্টা পূর্বে",
"today" => "আজ",
"yesterday" => "গতকাল",
"{days} days ago" => "{days} দিন পূর্বে",
-"last month" => "গতমাস",
+"last month" => "গত মাস",
"{months} months ago" => "{months} মাস পূর্বে",
"months ago" => "মাস পূর্বে",
"last year" => "গত বছর",
"years ago" => "বছর পূর্বে",
-"Ok" => "তথাস্তু",
-"Cancel" => "বাতির",
"Choose" => "বেছে নিন",
+"Cancel" => "বাতির",
"Yes" => "হ্যাঁ",
"No" => "না",
+"Ok" => "তথাস্তু",
"The object type is not specified." => "অবজেক্টের ধরণটি সুনির্দিষ্ট নয়।",
"Error" => "সমস্যা",
"The app name is not specified." => "অ্যাপের নামটি সুনির্দিষ্ট নয়।",
@@ -71,7 +71,7 @@
"No people found" => "কোন ব্যক্তি খুঁজে পাওয়া গেল না",
"Resharing is not allowed" => "পূনঃরায় ভাগাভাগি অনুমোদিত নয়",
"Shared in {item} with {user}" => "{user} এর সাথে {item} ভাগাভাগি করা হয়েছে",
-"Unshare" => "ভাগাভাগি বাতিল কর",
+"Unshare" => "ভাগাভাগি বাতিল ",
"can edit" => "সম্পাদনা করতে পারবেন",
"access control" => "অধিগম্যতা নিয়ন্ত্রণ",
"create" => "তৈরী করুন",
@@ -86,8 +86,6 @@
"ownCloud password reset" => "ownCloud কূটশব্দ পূনঃনির্ধারণ",
"Use the following link to reset your password: {link}" => "আপনার কূটশব্দটি পূনঃনির্ধারণ করার জন্য নিম্নোক্ত লিংকটি ব্যবহার করুনঃ {link}",
"You will receive a link to reset your password via Email." => "কূটশব্দ পূনঃনির্ধারণের জন্য একটি টূনঃনির্ধারণ লিংকটি আপনাকে ই-মেইলে পাঠানো হয়েছে ।",
-"Reset email send." => "পূনঃনির্ধারণ ই-মেইল পাঠানো হয়েছে।",
-"Request failed!" => "অনুরোধ ব্যর্থ !",
"Username" => "ব্যবহারকারী",
"Request reset" => "অনুরোধ পূনঃনির্ধারণ",
"Your password was reset" => "আপনার কূটশব্দটি পূনঃনির্ধারণ করা হয়েছে",
@@ -96,7 +94,7 @@
"Reset password" => "কূটশব্দ পূনঃনির্ধারণ কর",
"Personal" => "ব্যক্তিগত",
"Users" => "ব্যবহারকারী",
-"Apps" => "অ্যাপস",
+"Apps" => "অ্যাপ",
"Admin" => "প্রশাসন",
"Help" => "সহায়িকা",
"Access forbidden" => "অধিগমনের অনুমতি নেই",
@@ -115,7 +113,7 @@
"Database tablespace" => "ডাটাবেজ টেবলস্পেস",
"Database host" => "ডাটাবেজ হোস্ট",
"Finish setup" => "সেটআপ সুসম্পন্ন কর",
-"web services under your control" => "ওয়েব সার্ভিসের নিয়ন্ত্রণ আপনার হাতের মুঠোয়",
+"web services under your control" => "ওয়েব সার্ভিস আপনার হাতের মুঠোয়",
"Log out" => "প্রস্থান",
"Lost your password?" => "কূটশব্দ হারিয়েছেন?",
"remember" => "মনে রাখ",
diff --git a/core/l10n/ca.php b/core/l10n/ca.php
index 91b51d1b31d19f91cbccc111a7377d9aa471a69e..6a5a6ea54263da7db7bdb7ff22a3abe020e17e69 100644
--- a/core/l10n/ca.php
+++ b/core/l10n/ca.php
@@ -30,7 +30,7 @@
"October" => "Octubre",
"November" => "Novembre",
"December" => "Desembre",
-"Settings" => "Arranjament",
+"Settings" => "Configuració",
"seconds ago" => "segons enrere",
"1 minute ago" => "fa 1 minut",
"{minutes} minutes ago" => "fa {minutes} minuts",
@@ -44,11 +44,11 @@
"months ago" => "mesos enrere",
"last year" => "l'any passat",
"years ago" => "anys enrere",
-"Ok" => "D'acord",
-"Cancel" => "Cancel·la",
"Choose" => "Escull",
+"Cancel" => "Cancel·la",
"Yes" => "Sí",
"No" => "No",
+"Ok" => "D'acord",
"The object type is not specified." => "No s'ha especificat el tipus d'objecte.",
"Error" => "Error",
"The app name is not specified." => "No s'ha especificat el nom de l'aplicació.",
@@ -88,9 +88,9 @@
"The update was successful. Redirecting you to ownCloud now." => "L'actualització ha estat correcte. Ara us redirigim a ownCloud.",
"ownCloud password reset" => "estableix de nou la contrasenya Owncloud",
"Use the following link to reset your password: {link}" => "Useu l'enllaç següent per restablir la contrasenya: {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 ." => "L'enllaç per reiniciar la vostra contrasenya s'ha enviat al vostre correu. Si no el rebeu en un temps raonable comproveu les carpetes de spam. Si no és allà, pregunteu a l'administrador local.",
+"Request failed! Did you make sure your email/username was right?" => "La petició ha fallat! Esteu segur que el correu/nom d'usuari és correcte?",
"You will receive a link to reset your password via Email." => "Rebreu un enllaç al correu electrònic per reiniciar la contrasenya.",
-"Reset email send." => "S'ha enviat el correu reinicialització",
-"Request failed!" => "El requeriment ha fallat!",
"Username" => "Nom d'usuari",
"Request reset" => "Sol·licita reinicialització",
"Your password was reset" => "La vostra contrasenya s'ha reinicialitzat",
@@ -100,7 +100,7 @@
"Personal" => "Personal",
"Users" => "Usuaris",
"Apps" => "Aplicacions",
-"Admin" => "Administrador",
+"Admin" => "Administració",
"Help" => "Ajuda",
"Access forbidden" => "Accés prohibit",
"Cloud not found" => "No s'ha trobat el núvol",
@@ -125,6 +125,7 @@
"Database host" => "Ordinador central de la base de dades",
"Finish setup" => "Acaba la configuració",
"web services under your control" => "controleu els vostres serveis web",
+"%s is available. Get more information on how to update." => "%s està disponible. Obtingueu més informació de com actualitzar.",
"Log out" => "Surt",
"Automatic logon rejected!" => "L'ha rebutjat l'acceditació automàtica!",
"If you did not change your password recently, your account may be compromised!" => "Se no heu canviat la contrasenya recentment el vostre compte pot estar compromès!",
diff --git a/core/l10n/cs_CZ.php b/core/l10n/cs_CZ.php
index f8d5e697ebfefc28717b352a6c14e94b78f21810..06cf7c214be0f0811a15e8f493496755b58c853c 100644
--- a/core/l10n/cs_CZ.php
+++ b/core/l10n/cs_CZ.php
@@ -44,11 +44,11 @@
"months ago" => "před měsíci",
"last year" => "minulý rok",
"years ago" => "před lety",
-"Ok" => "Ok",
-"Cancel" => "Zrušit",
"Choose" => "Vybrat",
+"Cancel" => "Zrušit",
"Yes" => "Ano",
"No" => "Ne",
+"Ok" => "Ok",
"The object type is not specified." => "Není určen typ objektu.",
"Error" => "Chyba",
"The app name is not specified." => "Není určen název aplikace.",
@@ -88,9 +88,9 @@
"The update was successful. Redirecting you to ownCloud now." => "Aktualizace byla úspěšná. Přesměrovávám na ownCloud.",
"ownCloud password reset" => "Obnovení hesla pro ownCloud",
"Use the following link to reset your password: {link}" => "Heslo obnovíte použitím následujícího odkazu: {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 ." => "Odkaz na obnovení hesla byl odeslán na vaši e-mailovou adresu. Pokud jej v krátké době neobdržíte, zkontrolujte váš koš a složku spam. Pokud jej nenaleznete, kontaktujte svého správce.",
+"Request failed! Did you make sure your email/username was right?" => "Požadavek selhal. Ujistili jste se, že vaše uživatelské jméno a e-mail jsou správně?",
"You will receive a link to reset your password via Email." => "Bude Vám e-mailem zaslán odkaz pro obnovu hesla.",
-"Reset email send." => "Obnovovací e-mail odeslán.",
-"Request failed!" => "Požadavek selhal.",
"Username" => "Uživatelské jméno",
"Request reset" => "Vyžádat obnovu",
"Your password was reset" => "Vaše heslo bylo obnoveno",
@@ -124,7 +124,8 @@
"Database tablespace" => "Tabulkový prostor databáze",
"Database host" => "Hostitel databáze",
"Finish setup" => "Dokončit nastavení",
-"web services under your control" => "webové služby pod Vaší kontrolou",
+"web services under your control" => "služby webu pod Vaší kontrolou",
+"%s is available. Get more information on how to update." => "%s je dostupná. Získejte více informací k postupu aktualizace.",
"Log out" => "Odhlásit se",
"Automatic logon rejected!" => "Automatické přihlášení odmítnuto.",
"If you did not change your password recently, your account may be compromised!" => "V nedávné době jste nezměnili své heslo, Váš účet může být kompromitován.",
diff --git a/core/l10n/cy_GB.php b/core/l10n/cy_GB.php
index 4d28ae29a989dde45102a65b37a8940e2d1c13c8..cdb2576d4576a332f4bb01abb11eeda292eb8cb0 100644
--- a/core/l10n/cy_GB.php
+++ b/core/l10n/cy_GB.php
@@ -44,11 +44,11 @@
"months ago" => "misoedd yn ôl",
"last year" => "y llynedd",
"years ago" => "blwyddyn yn ôl",
-"Ok" => "Iawn",
-"Cancel" => "Diddymu",
"Choose" => "Dewisiwch",
+"Cancel" => "Diddymu",
"Yes" => "Ie",
"No" => "Na",
+"Ok" => "Iawn",
"The object type is not specified." => "Nid yw'r math o wrthrych wedi cael ei nodi.",
"Error" => "Gwall",
"The app name is not specified." => "Nid yw enw'r pecyn wedi cael ei nodi.",
@@ -88,9 +88,9 @@
"The update was successful. Redirecting you to ownCloud now." => "Roedd y diweddariad yn llwyddiannus. Cewch eich ailgyfeirio i ownCloud nawr.",
"ownCloud password reset" => "ailosod cyfrinair ownCloud",
"Use the following link to reset your password: {link}" => "Defnyddiwch y ddolen hon i ailosod eich cyfrinair: {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 ." => "Anfonwyd y ddolen i ailosod eich cyfrinair i'ch cyfeiriad ebost. Os nad yw'n cyrraedd o fewn amser rhesymol gwiriwch eich plygell spam/sothach. Os nad yw yno, cysylltwch â'ch gweinyddwr lleol.",
+"Request failed! Did you make sure your email/username was right?" => "Methodd y cais! Gwiriwch eich enw defnyddiwr ac ebost.",
"You will receive a link to reset your password via Email." => "Byddwch yn derbyn dolen drwy e-bost i ailosod eich cyfrinair.",
-"Reset email send." => "Ailosod anfon e-bost.",
-"Request failed!" => "Methodd y cais!",
"Username" => "Enw defnyddiwr",
"Request reset" => "Gwneud cais i ailosod",
"Your password was reset" => "Ailosodwyd eich cyfrinair",
@@ -111,7 +111,7 @@
"Please update your PHP installation to use ownCloud securely." => "Diweddarwch eich PHP i ddefnyddio ownCloud yn ddiogel.",
"No secure random number generator is available, please enable the PHP OpenSSL extension." => "Does dim cynhyrchydd rhifau hap diogel ar gael, galluogwch estyniad PHP OpenSSL.",
"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Heb gynhyrchydd rhifau hap diogel efallai y gall ymosodwr ragweld tocynnau ailosod cyfrinair a meddiannu eich cyfrif.",
-"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Mwy na thebyg fod modd cyrraeddd eich cyfeiriadur data a ffeilau o'r rhyngrwyd oherwydd nid yw'r ffeil .htaccess yn gweithio. ",
+"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Mwy na thebyg fod modd cyrraedd eich cyfeiriadur data a ffeilau o'r rhyngrwyd oherwydd nid yw'r ffeil .htaccess yn gweithio. ",
"For information how to properly configure your server, please see the documentation." => "Am wybodaeth ar sut i gyflunio'r gweinydd yn gywir, cyfeiriwch at y ddogfennaeth.",
"Create an admin account" => "Crewch gyfrif gweinyddol",
"Advanced" => "Uwch",
@@ -125,6 +125,7 @@
"Database host" => "Gwesteiwr cronfa ddata",
"Finish setup" => "Gorffen sefydlu",
"web services under your control" => "gwasanaethau gwe a reolir gennych",
+"%s is available. Get more information on how to update." => "%s ar gael. Mwy o wybodaeth am sut i ddiweddaru.",
"Log out" => "Allgofnodi",
"Automatic logon rejected!" => "Gwrthodwyd mewngofnodi awtomatig!",
"If you did not change your password recently, your account may be compromised!" => "Os na wnaethoch chi newid eich cyfrinair yn ddiweddar, gall eich cyfrif fod yn anniogel!",
diff --git a/core/l10n/da.php b/core/l10n/da.php
index 286f524b678f8616bf4c22451d7479fc26daff90..4e9f742e80d0bd8a2947c1b05d7dcd6e41f0c5ed 100644
--- a/core/l10n/da.php
+++ b/core/l10n/da.php
@@ -44,11 +44,11 @@
"months ago" => "måneder siden",
"last year" => "sidste år",
"years ago" => "år siden",
-"Ok" => "OK",
-"Cancel" => "Fortryd",
"Choose" => "Vælg",
+"Cancel" => "Annuller",
"Yes" => "Ja",
"No" => "Nej",
+"Ok" => "OK",
"The object type is not specified." => "Objekttypen er ikke angivet.",
"Error" => "Fejl",
"The app name is not specified." => "Den app navn er ikke angivet.",
@@ -89,15 +89,13 @@
"ownCloud password reset" => "Nulstil ownCloud kodeord",
"Use the following link to reset your password: {link}" => "Anvend følgende link til at nulstille din adgangskode: {link}",
"You will receive a link to reset your password via Email." => "Du vil modtage et link til at nulstille dit kodeord via email.",
-"Reset email send." => "Reset-mail afsendt.",
-"Request failed!" => "Anmodningen mislykkedes!",
"Username" => "Brugernavn",
"Request reset" => "Anmod om nulstilling",
"Your password was reset" => "Dit kodeord blev nulstillet",
"To login page" => "Til login-side",
"New password" => "Nyt kodeord",
"Reset password" => "Nulstil kodeord",
-"Personal" => "Personlig",
+"Personal" => "Personligt",
"Users" => "Brugere",
"Apps" => "Apps",
"Admin" => "Admin",
diff --git a/core/l10n/de.php b/core/l10n/de.php
index 3af653b9ac9789975c2e3b3c639a30276db02614..62e9925b945308eb6644232aa97e17854f995d15 100644
--- a/core/l10n/de.php
+++ b/core/l10n/de.php
@@ -44,11 +44,11 @@
"months ago" => "Vor Monaten",
"last year" => "Letztes Jahr",
"years ago" => "Vor Jahren",
-"Ok" => "OK",
-"Cancel" => "Abbrechen",
"Choose" => "Auswählen",
+"Cancel" => "Abbrechen",
"Yes" => "Ja",
"No" => "Nein",
+"Ok" => "OK",
"The object type is not specified." => "Der Objekttyp ist nicht angegeben.",
"Error" => "Fehler",
"The app name is not specified." => "Der App-Name ist nicht angegeben.",
@@ -56,7 +56,7 @@
"Shared" => "Geteilt",
"Share" => "Teilen",
"Error while sharing" => "Fehler beim Teilen",
-"Error while unsharing" => "Fehler beim Aufheben der Teilung",
+"Error while unsharing" => "Fehler beim Aufheben der Freigabe",
"Error while changing permissions" => "Fehler beim Ändern der Rechte",
"Shared with you and the group {group} by {owner}" => "{owner} hat dies mit Dir und der Gruppe {group} geteilt",
"Shared with you by {owner}" => "{owner} hat dies mit Dir geteilt",
@@ -80,17 +80,17 @@
"delete" => "löschen",
"share" => "teilen",
"Password protected" => "Durch ein Passwort geschützt",
-"Error unsetting expiration date" => "Fehler beim entfernen des Ablaufdatums",
+"Error unsetting expiration date" => "Fehler beim Entfernen des Ablaufdatums",
"Error setting expiration date" => "Fehler beim Setzen des Ablaufdatums",
"Sending ..." => "Sende ...",
"Email sent" => "E-Mail wurde verschickt",
-"The update was unsuccessful. Please report this issue to the ownCloud community." => "Das Update ist fehlgeschlagen. Bitte melden Sie dieses Problem an die ownCloud Community.",
-"The update was successful. Redirecting you to ownCloud now." => "Das Update war erfolgreich. Sie werden nun zu ownCloud weitergeleitet.",
+"The update was unsuccessful. Please report this issue to the ownCloud community." => "Das Update ist fehlgeschlagen. Bitte melde dieses Problem an die ownCloud Community.",
+"The update was successful. Redirecting you to ownCloud now." => "Das Update war erfolgreich. Du wirst nun zu ownCloud weitergeleitet.",
"ownCloud password reset" => "ownCloud-Passwort zurücksetzen",
"Use the following link to reset your password: {link}" => "Nutze den nachfolgenden Link, um Dein Passwort zurückzusetzen: {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 ." => "Der Link zum Rücksetzen Deines Passwort ist an Deine E-Mail-Adresse geschickt worden. Wenn Du ihn nicht innerhalb einer vernünftigen Zeit empfängst, prüfe Deine Spam-Verzeichnisse. Wenn er nicht dort ist, frage Deinen lokalen Administrator.",
+"Request failed! Did you make sure your email/username was right?" => "Anfrage fehlgeschlagen! Hast Du darauf geachtet, dass Deine E-Mail/Dein Benutzername korrekt war?",
"You will receive a link to reset your password via Email." => "Du erhältst einen Link per E-Mail, um Dein Passwort zurückzusetzen.",
-"Reset email send." => "Die E-Mail zum Zurücksetzen wurde versendet.",
-"Request failed!" => "Die Anfrage schlug fehl!",
"Username" => "Benutzername",
"Request reset" => "Beantrage Zurücksetzung",
"Your password was reset" => "Dein Passwort wurde zurückgesetzt.",
@@ -99,8 +99,8 @@
"Reset password" => "Passwort zurücksetzen",
"Personal" => "Persönlich",
"Users" => "Benutzer",
-"Apps" => "Anwendungen",
-"Admin" => "Admin",
+"Apps" => "Apps",
+"Admin" => "Administration",
"Help" => "Hilfe",
"Access forbidden" => "Zugriff verboten",
"Cloud not found" => "Cloud nicht gefunden",
@@ -108,11 +108,11 @@
"Add" => "Hinzufügen",
"Security Warning" => "Sicherheitswarnung",
"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Deine PHP Version ist durch die NULL Byte Attacke (CVE-2006-7243) angreifbar",
-"Please update your PHP installation to use ownCloud securely." => "Bitte bringe deine PHP Installation auf den neuesten Stand, um ownCloud sicher nutzen zu können.",
+"Please update your PHP installation to use ownCloud securely." => "Bitte bringe Deine PHP Installation auf den neuesten Stand, um ownCloud sicher nutzen zu können.",
"No secure random number generator is available, please enable the PHP OpenSSL extension." => "Es ist kein sicherer Zufallszahlengenerator verfügbar, bitte aktiviere die PHP-Erweiterung für OpenSSL.",
"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Ohne einen sicheren Zufallszahlengenerator sind Angreifer in der Lage die Tokens für das Zurücksetzen der Passwörter vorherzusehen und Konten zu übernehmen.",
-"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Dein Datenverzeichnis und deine Dateien sind wahrscheinlich vom Internet aus erreichbar, weil die .htaccess-Datei nicht funktioniert.",
-"For information how to properly configure your server, please see the documentation." => "Bitte lesen Sie die Dokumentation für Informationen, wie Sie Ihren Server konfigurieren.",
+"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Dein Datenverzeichnis und Deine Dateien sind wahrscheinlich vom Internet aus erreichbar, weil die .htaccess-Datei nicht funktioniert.",
+"For information how to properly configure your server, please see the documentation." => "Bitte ließ die Dokumentation für Informationen, wie Du Deinen Server konfigurierst.",
"Create an admin account" => "Administrator-Konto anlegen",
"Advanced" => "Fortgeschritten",
"Data folder" => "Datenverzeichnis",
@@ -124,7 +124,8 @@
"Database tablespace" => "Datenbank-Tablespace",
"Database host" => "Datenbank-Host",
"Finish setup" => "Installation abschließen",
-"web services under your control" => "Web-Services unter Ihrer Kontrolle",
+"web services under your control" => "Web-Services unter Deiner Kontrolle",
+"%s is available. Get more information on how to update." => "%s ist verfügbar. Holen Sie weitere Informationen zu Aktualisierungen ein.",
"Log out" => "Abmelden",
"Automatic logon rejected!" => "Automatischer Login zurückgewiesen!",
"If you did not change your password recently, your account may be compromised!" => "Wenn Du Dein Passwort nicht vor kurzem geändert hast, könnte Dein\nAccount kompromittiert sein!",
diff --git a/core/l10n/de_DE.php b/core/l10n/de_DE.php
index 4065f2484f53150215600ba00f00fe570452517c..f395c192bd0aaa6caa71d6368dcd7ff52c09ed11 100644
--- a/core/l10n/de_DE.php
+++ b/core/l10n/de_DE.php
@@ -44,11 +44,11 @@
"months ago" => "Vor Monaten",
"last year" => "Letztes Jahr",
"years ago" => "Vor Jahren",
-"Ok" => "OK",
-"Cancel" => "Abbrechen",
"Choose" => "Auswählen",
+"Cancel" => "Abbrechen",
"Yes" => "Ja",
"No" => "Nein",
+"Ok" => "OK",
"The object type is not specified." => "Der Objekttyp ist nicht angegeben.",
"Error" => "Fehler",
"The app name is not specified." => "Der App-Name ist nicht angegeben.",
@@ -56,7 +56,7 @@
"Shared" => "Geteilt",
"Share" => "Teilen",
"Error while sharing" => "Fehler beim Teilen",
-"Error while unsharing" => "Fehler bei der Aufhebung der Teilung",
+"Error while unsharing" => "Fehler beim Aufheben der Freigabe",
"Error while changing permissions" => "Fehler bei der Änderung der Rechte",
"Shared with you and the group {group} by {owner}" => "Von {owner} mit Ihnen und der Gruppe {group} geteilt.",
"Shared with you by {owner}" => "Von {owner} mit Ihnen geteilt.",
@@ -88,23 +88,23 @@
"The update was successful. Redirecting you to ownCloud now." => "Das Update war erfolgreich. Sie werden nun zu ownCloud weitergeleitet.",
"ownCloud password reset" => "ownCloud-Passwort zurücksetzen",
"Use the following link to reset your password: {link}" => "Nutzen Sie den nachfolgenden Link, um Ihr Passwort zurückzusetzen: {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 ." => "Der Link zum Rücksetzen Ihres Passworts ist an Ihre E-Mail-Adresse gesendet worde. Wenn Sie ihn nicht innerhalb einer vernünftigen Zeitspanne erhalten, prüfen Sie bitte Ihre Spam-Verzeichnisse. Wenn er nicht dort ist, fragen Sie Ihren lokalen Administrator.",
+"Request failed! Did you make sure your email/username was right?" => "Anfrage fehlgeschlagen! Haben Sie darauf geachtet, dass E-Mail-Adresse/Nutzername korrekt waren?",
"You will receive a link to reset your password via Email." => "Sie erhalten einen Link per E-Mail, um Ihr Passwort zurückzusetzen.",
-"Reset email send." => "Eine E-Mail zum Zurücksetzen des Passworts wurde gesendet.",
-"Request failed!" => "Die Anfrage schlug fehl!",
"Username" => "Benutzername",
-"Request reset" => "Zurücksetzung beantragen",
+"Request reset" => "Zurücksetzung anfordern",
"Your password was reset" => "Ihr Passwort wurde zurückgesetzt.",
"To login page" => "Zur Login-Seite",
"New password" => "Neues Passwort",
"Reset password" => "Passwort zurücksetzen",
"Personal" => "Persönlich",
"Users" => "Benutzer",
-"Apps" => "Anwendungen",
-"Admin" => "Admin",
+"Apps" => "Apps",
+"Admin" => "Administrator",
"Help" => "Hilfe",
"Access forbidden" => "Zugriff verboten",
"Cloud not found" => "Cloud wurde nicht gefunden",
-"Edit categories" => "Kategorien bearbeiten",
+"Edit categories" => "Kategorien ändern",
"Add" => "Hinzufügen",
"Security Warning" => "Sicherheitshinweis",
"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Ihre PHP Version ist durch die NULL Byte Attacke (CVE-2006-7243) angreifbar",
@@ -125,8 +125,9 @@
"Database host" => "Datenbank-Host",
"Finish setup" => "Installation abschließen",
"web services under your control" => "Web-Services unter Ihrer Kontrolle",
+"%s is available. Get more information on how to update." => "%s ist verfügbar. Holen Sie weitere Informationen zu Aktualisierungen ein.",
"Log out" => "Abmelden",
-"Automatic logon rejected!" => "Automatische Anmeldung verweigert.",
+"Automatic logon rejected!" => "Automatische Anmeldung verweigert!",
"If you did not change your password recently, your account may be compromised!" => "Wenn Sie Ihr Passwort nicht vor kurzem geändert haben, könnte Ihr\nAccount kompromittiert sein!",
"Please change your password to secure your account again." => "Bitte ändern Sie Ihr Passwort, um Ihr Konto wieder zu sichern.",
"Lost your password?" => "Passwort vergessen?",
diff --git a/core/l10n/el.php b/core/l10n/el.php
index 4fc5b4aa86ed8d0b4714362c6b6da3bf9446a7cc..11295105e311fcbbdd596de21c4d23c7cea9d3ee 100644
--- a/core/l10n/el.php
+++ b/core/l10n/el.php
@@ -44,11 +44,11 @@
"months ago" => "μήνες πριν",
"last year" => "τελευταίο χρόνο",
"years ago" => "χρόνια πριν",
-"Ok" => "Οκ",
-"Cancel" => "Άκυρο",
"Choose" => "Επιλέξτε",
+"Cancel" => "Άκυρο",
"Yes" => "Ναι",
"No" => "Όχι",
+"Ok" => "Οκ",
"The object type is not specified." => "Δεν καθορίστηκε ο τύπος του αντικειμένου.",
"Error" => "Σφάλμα",
"The app name is not specified." => "Δεν καθορίστηκε το όνομα της εφαρμογής.",
@@ -88,10 +88,10 @@
"The update was successful. Redirecting you to ownCloud now." => "Η ενημέρωση ήταν επιτυχής. Μετάβαση στο ownCloud.",
"ownCloud password reset" => "Επαναφορά συνθηματικού ownCloud",
"Use the following link to reset your password: {link}" => "Χρησιμοποιήστε τον ακόλουθο σύνδεσμο για να επανεκδόσετε τον κωδικό: {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 ." => "Ο σύνδεσμος για να επανακτήσετε τον κωδικό σας έχει σταλεί στο email αν δεν το λάβετε μέσα σε ορισμένο διάστημα, ελέγξετε τους φακελλους σας spam/junk αν δεν είναι εκεί ρωτήστε τον τοπικό σας διαχειριστή ",
+"Request failed! Did you make sure your email/username was right?" => "Η αίτηση απέτυχε! Βεβαιωθηκατε ότι το email σας / username ειναι σωστο? ",
"You will receive a link to reset your password via Email." => "Θα λάβετε ένα σύνδεσμο για να επαναφέρετε τον κωδικό πρόσβασής σας μέσω ηλεκτρονικού ταχυδρομείου.",
-"Reset email send." => "Η επαναφορά του email στάλθηκε.",
-"Request failed!" => "Η αίτηση απέτυχε!",
-"Username" => "Όνομα Χρήστη",
+"Username" => "Όνομα χρήστη",
"Request reset" => "Επαναφορά αίτησης",
"Your password was reset" => "Ο κωδικός πρόσβασής σας επαναφέρθηκε",
"To login page" => "Σελίδα εισόδου",
@@ -124,7 +124,7 @@
"Database tablespace" => "Κενά Πινάκων Βάσης Δεδομένων",
"Database host" => "Διακομιστής βάσης δεδομένων",
"Finish setup" => "Ολοκλήρωση εγκατάστασης",
-"web services under your control" => "Υπηρεσίες web υπό τον έλεγχό σας",
+"web services under your control" => "υπηρεσίες δικτύου υπό τον έλεγχό σας",
"Log out" => "Αποσύνδεση",
"Automatic logon rejected!" => "Απορρίφθηκε η αυτόματη σύνδεση!",
"If you did not change your password recently, your account may be compromised!" => "Εάν δεν αλλάξατε το συνθηματικό σας προσφάτως, ο λογαριασμός μπορεί να έχει διαρρεύσει!",
diff --git a/core/l10n/en@pirate.php b/core/l10n/en@pirate.php
new file mode 100644
index 0000000000000000000000000000000000000000..981d9a1ca0f326481cfa383fd15b3a7696dfe001
--- /dev/null
+++ b/core/l10n/en@pirate.php
@@ -0,0 +1,5 @@
+ "User %s shared a file with you",
+"Password" => "Passcode",
+"web services under your control" => "web services under your control"
+);
diff --git a/core/l10n/eo.php b/core/l10n/eo.php
index 5c8fe3403171d693487d365c9789ab44fc05feb0..72cdf90c61e8d1bfaeb0a2b520581f1f7af91a07 100644
--- a/core/l10n/eo.php
+++ b/core/l10n/eo.php
@@ -43,11 +43,11 @@
"months ago" => "monatoj antaŭe",
"last year" => "lastajare",
"years ago" => "jaroj antaŭe",
-"Ok" => "Akcepti",
-"Cancel" => "Nuligi",
"Choose" => "Elekti",
+"Cancel" => "Nuligi",
"Yes" => "Jes",
"No" => "Ne",
+"Ok" => "Akcepti",
"The object type is not specified." => "Ne indikiĝis tipo de la objekto.",
"Error" => "Eraro",
"The app name is not specified." => "Ne indikiĝis nomo de la aplikaĵo.",
@@ -85,7 +85,6 @@
"ownCloud password reset" => "La pasvorto de ownCloud restariĝis.",
"Use the following link to reset your password: {link}" => "Uzu la jenan ligilon por restarigi vian pasvorton: {link}",
"You will receive a link to reset your password via Email." => "Vi ricevos ligilon retpoŝte por rekomencigi vian pasvorton.",
-"Request failed!" => "Peto malsukcesis!",
"Username" => "Uzantonomo",
"Request reset" => "Peti rekomencigon",
"Your password was reset" => "Via pasvorto rekomencis",
@@ -114,7 +113,7 @@
"Database tablespace" => "Datumbaza tabelospaco",
"Database host" => "Datumbaza gastigo",
"Finish setup" => "Fini la instalon",
-"web services under your control" => "TTT-servoj sub via kontrolo",
+"web services under your control" => "TTT-servoj regataj de vi",
"Log out" => "Elsaluti",
"If you did not change your password recently, your account may be compromised!" => "Se vi ne ŝanĝis vian pasvorton lastatempe, via konto eble kompromitas!",
"Please change your password to secure your account again." => "Bonvolu ŝanĝi vian pasvorton por sekurigi vian konton ree.",
diff --git a/core/l10n/es.php b/core/l10n/es.php
index 543563bed11c2f5c10d46ef06717e75202a05280..2d9adb15cc59e0b1373b4d05a905f21ec75b28a7 100644
--- a/core/l10n/es.php
+++ b/core/l10n/es.php
@@ -1,13 +1,13 @@
"El usuario %s ha compartido un archivo contigo",
-"User %s shared a folder with you" => "El usuario %s ha compartido una carpeta contigo",
-"User %s shared the file \"%s\" with you. It is available for download here: %s" => "El usuario %s ha compartido el archivo \"%s\" contigo. Puedes descargarlo aquí: %s",
-"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "El usuario %s ha compartido la carpeta \"%s\" contigo. Puedes descargarla aquí: %s",
-"Category type not provided." => "Tipo de categoria no proporcionado.",
+"User %s shared a file with you" => "El usuario %s ha compartido un archivo contigo.",
+"User %s shared a folder with you" => "El usuario %s ha compartido una carpeta contigo.",
+"User %s shared the file \"%s\" with you. It is available for download here: %s" => "El usuario %s ha compartido el archivo \"%s\" contigo. Puedes descargarlo aquí: %s.",
+"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "El usuario %s ha compartido la carpeta \"%s\" contigo. Puedes descargarla aquí: %s.",
+"Category type not provided." => "Tipo de categoría no proporcionado.",
"No category to add?" => "¿Ninguna categoría para añadir?",
-"This category already exists: %s" => "Esta categoria ya existe: %s",
-"Object type not provided." => "ipo de objeto no proporcionado.",
-"%s ID not provided." => "%s ID no proporcionado.",
+"This category already exists: %s" => "Ya existe esta categoría: %s",
+"Object type not provided." => "Tipo de objeto no proporcionado.",
+"%s ID not provided." => "ID de %s no proporcionado.",
"Error adding %s to favorites." => "Error añadiendo %s a los favoritos.",
"No categories selected for deletion." => "No hay categorías seleccionadas para borrar.",
"Error removing %s from favorites." => "Error eliminando %s de los favoritos.",
@@ -39,20 +39,20 @@
"today" => "hoy",
"yesterday" => "ayer",
"{days} days ago" => "hace {days} días",
-"last month" => "mes pasado",
+"last month" => "el mes pasado",
"{months} months ago" => "Hace {months} meses",
"months ago" => "hace meses",
-"last year" => "año pasado",
+"last year" => "el año pasado",
"years ago" => "hace años",
-"Ok" => "Aceptar",
-"Cancel" => "Cancelar",
"Choose" => "Seleccionar",
+"Cancel" => "Cancelar",
"Yes" => "Sí",
"No" => "No",
-"The object type is not specified." => "El tipo de objeto no se ha especificado.",
-"Error" => "Fallo",
-"The app name is not specified." => "El nombre de la app no se ha especificado.",
-"The required file {file} is not installed!" => "El fichero {file} requerido, no está instalado.",
+"Ok" => "Aceptar",
+"The object type is not specified." => "No se ha especificado el tipo de objeto",
+"Error" => "Error",
+"The app name is not specified." => "No se ha especificado el nombre de la aplicación.",
+"The required file {file} is not installed!" => "¡El fichero requerido {file} no está instalado!",
"Shared" => "Compartido",
"Share" => "Compartir",
"Error while sharing" => "Error compartiendo",
@@ -68,15 +68,15 @@
"Send" => "Enviar",
"Set expiration date" => "Establecer fecha de caducidad",
"Expiration date" => "Fecha de caducidad",
-"Share via email:" => "compartido via e-mail:",
+"Share via email:" => "Compartido por correo electrónico:",
"No people found" => "No se encontró gente",
"Resharing is not allowed" => "No se permite compartir de nuevo",
"Shared in {item} with {user}" => "Compartido en {item} con {user}",
-"Unshare" => "No compartir",
+"Unshare" => "Dejar de compartir",
"can edit" => "puede editar",
"access control" => "control de acceso",
"create" => "crear",
-"update" => "modificar",
+"update" => "actualizar",
"delete" => "eliminar",
"share" => "compartir",
"Password protected" => "Protegido por contraseña",
@@ -84,36 +84,36 @@
"Error setting expiration date" => "Error estableciendo fecha de caducidad",
"Sending ..." => "Enviando...",
"Email sent" => "Correo electrónico enviado",
-"The update was unsuccessful. Please report this issue to the ownCloud community." => "La actualización ha fracasado. Por favor, informe este problema a la Comunidad de ownCloud a>.",
+"The update was unsuccessful. Please report this issue to the ownCloud community." => "La actualización ha fracasado. Por favor, informe de este problema a la Comunidad de ownCloud a>.",
"The update was successful. Redirecting you to ownCloud now." => "La actualización se ha realizado correctamente. Redireccionando a ownCloud ahora.",
-"ownCloud password reset" => "Reiniciar contraseña de ownCloud",
+"ownCloud password reset" => "Restablecer contraseña de ownCloud",
"Use the following link to reset your password: {link}" => "Utiliza el siguiente enlace para restablecer tu contraseña: {link}",
-"You will receive a link to reset your password via Email." => "Recibirás un enlace por correo electrónico para restablecer tu contraseña",
-"Reset email send." => "Email de reconfiguración enviado.",
-"Request failed!" => "Pedido fallado!",
+"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 ." => "El enlace para restablecer la contraseña ha sido enviada a su correo electrónico. Si no lo recibe en un plazo razonable de tiempo, revise su carpeta de spam / correo no deseado. Si no está allí, pregunte a su administrador local.",
+"Request failed! Did you make sure your email/username was right?" => "La petición ha fallado! ¿Está seguro de que su dirección de correo electrónico o nombre de usuario era correcto?",
+"You will receive a link to reset your password via Email." => "Recibirá un enlace por correo electrónico para restablecer su contraseña",
"Username" => "Nombre de usuario",
"Request reset" => "Solicitar restablecimiento",
-"Your password was reset" => "Tu contraseña se ha restablecido",
+"Your password was reset" => "Su contraseña ha sido establecida",
"To login page" => "A la página de inicio de sesión",
"New password" => "Nueva contraseña",
"Reset password" => "Restablecer contraseña",
"Personal" => "Personal",
"Users" => "Usuarios",
"Apps" => "Aplicaciones",
-"Admin" => "Administrador",
+"Admin" => "Administración",
"Help" => "Ayuda",
"Access forbidden" => "Acceso denegado",
"Cloud not found" => "No se ha encontrado la nube",
"Edit categories" => "Editar categorías",
-"Add" => "Añadir",
+"Add" => "Agregar",
"Security Warning" => "Advertencia de seguridad",
"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "La versión de PHP es vulnerable al ataque de Byte NULL (CVE-2006-7243)",
-"Please update your PHP installation to use ownCloud securely." => "Por favor, actualice su instalación de PHP para utilizar ownCloud en forma segura.",
+"Please update your PHP installation to use ownCloud securely." => "Por favor, actualice su instalación de PHP para utilizar ownCloud de manera segura.",
"No secure random number generator is available, please enable the PHP OpenSSL extension." => "No está disponible un generador de números aleatorios seguro, por favor habilite la extensión OpenSSL de PHP.",
-"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Sin un generador de números aleatorios seguro un atacante podría predecir los tokens de reinicio de su contraseña y tomar control de su cuenta.",
-"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Su directorio de datos y sus archivos están probablemente accesibles a través de internet ya que el archivo .htaccess no está funcionando.",
+"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Sin un generador de números aleatorios seguro, un atacante podría predecir los tokens de restablecimiento de contraseñas y tomar el control de su cuenta.",
+"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Probablemente su directorio de datos y sus archivos sean accesibles a través de internet ya que el archivo .htaccess no funciona.",
"For information how to properly configure your server, please see the documentation." => "Para información sobre cómo configurar adecuadamente su servidor, por favor vea la documentación.",
-"Create an admin account" => "Crea una cuenta de administrador",
+"Create an admin account" => "Crear una cuenta de administrador",
"Advanced" => "Avanzado",
"Data folder" => "Directorio de almacenamiento",
"Configure the database" => "Configurar la base de datos",
@@ -124,13 +124,14 @@
"Database tablespace" => "Espacio de tablas de la base de datos",
"Database host" => "Host de la base de datos",
"Finish setup" => "Completar la instalación",
-"web services under your control" => "servicios web bajo tu control",
+"web services under your control" => "Servicios web bajo su control",
+"%s is available. Get more information on how to update." => "%s esta disponible. Obtener mas información de como actualizar.",
"Log out" => "Salir",
"Automatic logon rejected!" => "¡Inicio de sesión automático rechazado!",
"If you did not change your password recently, your account may be compromised!" => "Si usted no ha cambiado su contraseña recientemente, ¡puede que su cuenta esté comprometida!",
"Please change your password to secure your account again." => "Por favor cambie su contraseña para asegurar su cuenta nuevamente.",
-"Lost your password?" => "¿Has perdido tu contraseña?",
-"remember" => "recuérdame",
+"Lost your password?" => "¿Ha perdido su contraseña?",
+"remember" => "recordarme",
"Log in" => "Entrar",
"Alternative Logins" => "Nombre de usuarios alternativos",
"prev" => "anterior",
diff --git a/core/l10n/es_AR.php b/core/l10n/es_AR.php
index 748de3ddd1382195e44686577137bd394ec397ad..38b0791b94bdce60fa678d271a88c97ca88c136f 100644
--- a/core/l10n/es_AR.php
+++ b/core/l10n/es_AR.php
@@ -9,7 +9,7 @@
"Object type not provided." => "Tipo de objeto no provisto. ",
"%s ID not provided." => "%s ID no provista. ",
"Error adding %s to favorites." => "Error al agregar %s a favoritos. ",
-"No categories selected for deletion." => "No hay categorías seleccionadas para borrar.",
+"No categories selected for deletion." => "No se seleccionaron categorías para borrar.",
"Error removing %s from favorites." => "Error al remover %s de favoritos. ",
"Sunday" => "Domingo",
"Monday" => "Lunes",
@@ -18,23 +18,23 @@
"Thursday" => "Jueves",
"Friday" => "Viernes",
"Saturday" => "Sábado",
-"January" => "Enero",
-"February" => "Febrero",
-"March" => "Marzo",
-"April" => "Abril",
-"May" => "Mayo",
-"June" => "Junio",
-"July" => "Julio",
-"August" => "Agosto",
-"September" => "Septiembre",
-"October" => "Octubre",
-"November" => "Noviembre",
-"December" => "Diciembre",
-"Settings" => "Ajustes",
+"January" => "enero",
+"February" => "febrero",
+"March" => "marzo",
+"April" => "abril",
+"May" => "mayo",
+"June" => "junio",
+"July" => "julio",
+"August" => "agosto",
+"September" => "septiembre",
+"October" => "octubre",
+"November" => "noviembre",
+"December" => "diciembre",
+"Settings" => "Configuración",
"seconds ago" => "segundos atrás",
"1 minute ago" => "hace 1 minuto",
"{minutes} minutes ago" => "hace {minutes} minutos",
-"1 hour ago" => "Hace 1 hora",
+"1 hour ago" => "1 hora atrás",
"{hours} hours ago" => "{hours} horas atrás",
"today" => "hoy",
"yesterday" => "ayer",
@@ -44,11 +44,11 @@
"months ago" => "meses atrás",
"last year" => "el año pasado",
"years ago" => "años atrás",
-"Ok" => "Aceptar",
-"Cancel" => "Cancelar",
"Choose" => "Elegir",
+"Cancel" => "Cancelar",
"Yes" => "Sí",
"No" => "No",
+"Ok" => "Aceptar",
"The object type is not specified." => "El tipo de objeto no esta especificado. ",
"Error" => "Error",
"The app name is not specified." => "El nombre de la aplicación no esta especificado.",
@@ -72,7 +72,7 @@
"No people found" => "No se encontraron usuarios",
"Resharing is not allowed" => "No se permite volver a compartir",
"Shared in {item} with {user}" => "Compartido en {item} con {user}",
-"Unshare" => "Remover compartir",
+"Unshare" => "Dejar de compartir",
"can edit" => "puede editar",
"access control" => "control de acceso",
"create" => "crear",
@@ -89,18 +89,16 @@
"ownCloud password reset" => "Restablecer contraseña de ownCloud",
"Use the following link to reset your password: {link}" => "Usá este enlace para restablecer tu contraseña: {link}",
"You will receive a link to reset your password via Email." => "Vas a recibir un enlace por e-mail para restablecer tu contraseña",
-"Reset email send." => "Reiniciar envío de email.",
-"Request failed!" => "Error en el pedido!",
"Username" => "Nombre de usuario",
"Request reset" => "Solicitar restablecimiento",
"Your password was reset" => "Tu contraseña fue restablecida",
"To login page" => "A la página de inicio de sesión",
-"New password" => "Nueva contraseña",
+"New password" => "Nueva contraseña:",
"Reset password" => "Restablecer contraseña",
"Personal" => "Personal",
"Users" => "Usuarios",
"Apps" => "Aplicaciones",
-"Admin" => "Administrador",
+"Admin" => "Administración",
"Help" => "Ayuda",
"Access forbidden" => "Acceso denegado",
"Cloud not found" => "No se encontró ownCloud",
@@ -124,7 +122,7 @@
"Database tablespace" => "Espacio de tablas de la base de datos",
"Database host" => "Host de la base de datos",
"Finish setup" => "Completar la instalación",
-"web services under your control" => "servicios web sobre los que tenés control",
+"web services under your control" => "servicios web controlados por vos",
"Log out" => "Cerrar la sesión",
"Automatic logon rejected!" => "¡El inicio de sesión automático fue rechazado!",
"If you did not change your password recently, your account may be compromised!" => "¡Si no cambiaste tu contraseña recientemente, puede ser que tu cuenta esté comprometida!",
diff --git a/core/l10n/et_EE.php b/core/l10n/et_EE.php
index b6b6d4c9d94f3e3db78edba477a29ea468699a89..d298b74fc0a624030c5e511a6ee0839e988d0d28 100644
--- a/core/l10n/et_EE.php
+++ b/core/l10n/et_EE.php
@@ -1,13 +1,13 @@
"Kasutaja %s jagas Sinuga faili",
-"User %s shared a folder with you" => "Kasutaja %s jagas Sinuga kataloogi.",
+"User %s shared a folder with you" => "Kasutaja %s jagas Sinuga kausta.",
"User %s shared the file \"%s\" with you. It is available for download here: %s" => "Kasutaja %s jagas Sinuga faili \"%s\". See on allalaadimiseks saadaval siin: %s",
"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "Kasutaja %s jagas Sinuga kataloogi \"%s\". See on allalaadimiseks saadaval siin: %s",
"Category type not provided." => "Kategooria tüüp puudub.",
"No category to add?" => "Pole kategooriat, mida lisada?",
-"This category already exists: %s" => "See kategooria juba eksisteerib: %s",
+"This category already exists: %s" => "See kategooria on juba olemas: %s",
"Object type not provided." => "Objekti tüüb puudub.",
-"%s ID not provided." => "%s ID puudub",
+"%s ID not provided." => "%s ID puudub.",
"Error adding %s to favorites." => "Viga %s lisamisel lemmikutesse.",
"No categories selected for deletion." => "Kustutamiseks pole kategooriat valitud.",
"Error removing %s from favorites." => "Viga %s eemaldamisel lemmikutest",
@@ -44,12 +44,12 @@
"months ago" => "kuu tagasi",
"last year" => "viimasel aastal",
"years ago" => "aastat tagasi",
-"Ok" => "Ok",
-"Cancel" => "Loobu",
"Choose" => "Vali",
+"Cancel" => "Loobu",
"Yes" => "Jah",
"No" => "Ei",
-"The object type is not specified." => "Objekti tüüb pole määratletud",
+"Ok" => "Ok",
+"The object type is not specified." => "Objekti tüüp pole määratletud.",
"Error" => "Viga",
"The app name is not specified." => "Rakenduse nimi ole määratletud",
"The required file {file} is not installed!" => "Vajalikku faili {file} pole paigaldatud!",
@@ -64,7 +64,7 @@
"Share with link" => "Jaga lingiga",
"Password protect" => "Parooliga kaitstud",
"Password" => "Parool",
-"Email link to person" => "Saada link isikule emailiga",
+"Email link to person" => "Saada link isikule e-postiga",
"Send" => "Saada",
"Set expiration date" => "Määra aegumise kuupäev",
"Expiration date" => "Aegumise kuupäev",
@@ -88,18 +88,18 @@
"The update was successful. Redirecting you to ownCloud now." => "Uuendus oli edukas. Kohe suunatakse Sind ownCloudi.",
"ownCloud password reset" => "ownCloud parooli taastamine",
"Use the following link to reset your password: {link}" => "Kasuta järgnevat linki oma parooli taastamiseks: {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 ." => "Link parooli vahetuseks on saadetud Sinu e-posti aadressil. Kui kiri pole saabunud mõistliku aja jooksul, siis kontrolli oma spam-/rämpskirjade katalooge. Kui kirja pole ka seal, siis küsi abi süsteemihaldurilt.",
+"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.",
-"Reset email send." => "Taastamise e-kiri on saadetud.",
-"Request failed!" => "Päring ebaõnnestus!",
"Username" => "Kasutajanimi",
"Request reset" => "Päringu taastamine",
"Your password was reset" => "Sinu parool on taastatud",
"To login page" => "Sisselogimise lehele",
"New password" => "Uus parool",
"Reset password" => "Nulli parool",
-"Personal" => "isiklik",
+"Personal" => "Isiklik",
"Users" => "Kasutajad",
-"Apps" => "Programmid",
+"Apps" => "Rakendused",
"Admin" => "Admin",
"Help" => "Abiinfo",
"Access forbidden" => "Ligipääs on keelatud",
@@ -114,7 +114,7 @@
"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Su andmete kataloog ja failid on tõenäoliselt internetist vabalt saadaval kuna .htaccess fail ei toimi.",
"For information how to properly configure your server, please see the documentation." => "Serveri korrektseks seadistuseks palun tutvu dokumentatsiooniga.",
"Create an admin account" => "Loo admini konto",
-"Advanced" => "Lisavalikud",
+"Advanced" => "Täpsem",
"Data folder" => "Andmete kaust",
"Configure the database" => "Seadista andmebaasi",
"will be used" => "kasutatakse",
@@ -124,7 +124,8 @@
"Database tablespace" => "Andmebaasi tabeliruum",
"Database host" => "Andmebaasi host",
"Finish setup" => "Lõpeta seadistamine",
-"web services under your control" => "veebiteenused sinu kontrolli all",
+"web services under your control" => "veebitenused sinu kontrolli all",
+"%s is available. Get more information on how to update." => "%s on saadaval. Vaata lähemalt kuidas uuendada.",
"Log out" => "Logi välja",
"Automatic logon rejected!" => "Automaatne sisselogimine lükati tagasi!",
"If you did not change your password recently, your account may be compromised!" => "Kui sa ei muutnud oma parooli hiljut, siis võib su kasutajakonto olla ohustatud!",
diff --git a/core/l10n/eu.php b/core/l10n/eu.php
index 76e38a92d1f4b08c47a46237caf68624ed28907e..1ec4ee8f5c4a8523aa89e9ed5b3c3cb45aa91cfa 100644
--- a/core/l10n/eu.php
+++ b/core/l10n/eu.php
@@ -44,11 +44,11 @@
"months ago" => "hilabete",
"last year" => "joan den urtean",
"years ago" => "urte",
-"Ok" => "Ados",
-"Cancel" => "Ezeztatu",
"Choose" => "Aukeratu",
+"Cancel" => "Ezeztatu",
"Yes" => "Bai",
"No" => "Ez",
+"Ok" => "Ados",
"The object type is not specified." => "Objetu mota ez dago zehaztuta.",
"Error" => "Errorea",
"The app name is not specified." => "App izena ez dago zehaztuta.",
@@ -89,8 +89,6 @@
"ownCloud password reset" => "ownCloud-en pasahitza berrezarri",
"Use the following link to reset your password: {link}" => "Eribili hurrengo lotura zure pasahitza berrezartzeko: {link}",
"You will receive a link to reset your password via Email." => "Zure pashitza berrezartzeko lotura bat jasoko duzu Epostaren bidez.",
-"Reset email send." => "Berrezartzeko eposta bidali da.",
-"Request failed!" => "Eskariak huts egin du!",
"Username" => "Erabiltzaile izena",
"Request reset" => "Eskaera berrezarri da",
"Your password was reset" => "Zure pasahitza berrezarri da",
@@ -100,7 +98,7 @@
"Personal" => "Pertsonala",
"Users" => "Erabiltzaileak",
"Apps" => "Aplikazioak",
-"Admin" => "Kudeatzailea",
+"Admin" => "Admin",
"Help" => "Laguntza",
"Access forbidden" => "Sarrera debekatuta",
"Cloud not found" => "Ez da hodeia aurkitu",
diff --git a/core/l10n/fa.php b/core/l10n/fa.php
index e6f5aaac0cb3c25fd16670c853be307b918f3a97..fb8a312587c99b12c562d0dbe358b646d1a6fccd 100644
--- a/core/l10n/fa.php
+++ b/core/l10n/fa.php
@@ -44,17 +44,17 @@
"months ago" => "ماههای قبل",
"last year" => "سال قبل",
"years ago" => "سالهای قبل",
-"Ok" => "قبول",
-"Cancel" => "منصرف شدن",
"Choose" => "انتخاب کردن",
+"Cancel" => "منصرف شدن",
"Yes" => "بله",
"No" => "نه",
+"Ok" => "قبول",
"The object type is not specified." => "نوع شی تعیین نشده است.",
"Error" => "خطا",
"The app name is not specified." => "نام برنامه تعیین نشده است.",
"The required file {file} is not installed!" => "پرونده { پرونده} درخواست شده نصب نشده است !",
"Shared" => "اشتراک گذاشته شده",
-"Share" => "اشتراکگزاری",
+"Share" => "اشتراکگذاری",
"Error while sharing" => "خطا درحال به اشتراک گذاشتن",
"Error while unsharing" => "خطا درحال لغو اشتراک",
"Error while changing permissions" => "خطا در حال تغییر مجوز",
@@ -89,22 +89,20 @@
"ownCloud password reset" => "پسورد ابرهای شما تغییرکرد",
"Use the following link to reset your password: {link}" => "از لینک زیر جهت دوباره سازی پسورد استفاده کنید :\n{link}",
"You will receive a link to reset your password via Email." => "شما یک نامه الکترونیکی حاوی یک لینک جهت بازسازی گذرواژه دریافت خواهید کرد.",
-"Reset email send." => "تنظیم مجدد ایمیل را بفرستید.",
-"Request failed!" => "درخواست رد شده است !",
-"Username" => "شناسه",
+"Username" => "نام کاربری",
"Request reset" => "درخواست دوباره سازی",
"Your password was reset" => "گذرواژه شما تغییرکرد",
"To login page" => "به صفحه ورود",
"New password" => "گذرواژه جدید",
"Reset password" => "دوباره سازی گذرواژه",
"Personal" => "شخصی",
-"Users" => "کاربر ها",
-"Apps" => "برنامه",
+"Users" => "کاربران",
+"Apps" => " برنامه ها",
"Admin" => "مدیر",
-"Help" => "کمک",
+"Help" => "راهنما",
"Access forbidden" => "اجازه دسترسی به مناطق ممنوعه را ندارید",
"Cloud not found" => "پیدا نشد",
-"Edit categories" => "ویرایش گروه ها",
+"Edit categories" => "ویرایش گروه",
"Add" => "افزودن",
"Security Warning" => "اخطار امنیتی",
"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "نسخه ی PHP شما در برابر حملات NULL Byte آسیب پذیر است.(CVE-2006-7243)",
@@ -114,7 +112,7 @@
"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "فایلها و فهرست های داده های شما قابل از اینترنت قابل دسترسی هستند، چونکه فایل htacces. کار نمی کند.",
"For information how to properly configure your server, please see the documentation." => "برای مطلع شدن از چگونگی تنظیم سرورتان،لطفا این را ببینید.",
"Create an admin account" => "لطفا یک شناسه برای مدیر بسازید",
-"Advanced" => "حرفه ای",
+"Advanced" => "پیشرفته",
"Data folder" => "پوشه اطلاعاتی",
"Configure the database" => "پایگاه داده برنامه ریزی شدند",
"will be used" => "استفاده خواهد شد",
@@ -124,7 +122,7 @@
"Database tablespace" => "جدول پایگاه داده",
"Database host" => "هاست پایگاه داده",
"Finish setup" => "اتمام نصب",
-"web services under your control" => "سرویس وب تحت کنترل شما",
+"web services under your control" => "سرویس های تحت وب در کنترل شما",
"Log out" => "خروج",
"Automatic logon rejected!" => "ورود به سیستم اتوماتیک ردشد!",
"If you did not change your password recently, your account may be compromised!" => "اگر شما اخیرا رمزعبور را تغییر نداده اید، حساب شما در معرض خطر می باشد !",
diff --git a/core/l10n/fi_FI.php b/core/l10n/fi_FI.php
index ec79d03122784070ca9d434dbe7b33d545c91eb8..1f7a01e0e06950ebbc22fdfe1eeb79f66f450f64 100644
--- a/core/l10n/fi_FI.php
+++ b/core/l10n/fi_FI.php
@@ -9,25 +9,25 @@
"Error adding %s to favorites." => "Virhe lisätessä kohdetta %s suosikkeihin.",
"No categories selected for deletion." => "Luokkia ei valittu poistettavaksi.",
"Error removing %s from favorites." => "Virhe poistaessa kohdetta %s suosikeista.",
-"Sunday" => "Sunnuntai",
-"Monday" => "Maanantai",
-"Tuesday" => "Tiistai",
-"Wednesday" => "Keskiviikko",
-"Thursday" => "Torstai",
-"Friday" => "Perjantai",
-"Saturday" => "Lauantai",
-"January" => "Tammikuu",
-"February" => "Helmikuu",
-"March" => "Maaliskuu",
-"April" => "Huhtikuu",
-"May" => "Toukokuu",
-"June" => "Kesäkuu",
-"July" => "Heinäkuu",
-"August" => "Elokuu",
-"September" => "Syyskuu",
-"October" => "Lokakuu",
-"November" => "Marraskuu",
-"December" => "Joulukuu",
+"Sunday" => "sunnuntai",
+"Monday" => "maanantai",
+"Tuesday" => "tiistai",
+"Wednesday" => "keskiviikko",
+"Thursday" => "torstai",
+"Friday" => "perjantai",
+"Saturday" => "lauantai",
+"January" => "tammikuu",
+"February" => "helmikuu",
+"March" => "maaliskuu",
+"April" => "huhtikuu",
+"May" => "toukokuu",
+"June" => "kesäkuu",
+"July" => "heinäkuu",
+"August" => "elokuu",
+"September" => "syyskuu",
+"October" => "lokakuu",
+"November" => "marraskuu",
+"December" => "joulukuu",
"Settings" => "Asetukset",
"seconds ago" => "sekuntia sitten",
"1 minute ago" => "1 minuutti sitten",
@@ -42,11 +42,11 @@
"months ago" => "kuukautta sitten",
"last year" => "viime vuonna",
"years ago" => "vuotta sitten",
-"Ok" => "Ok",
-"Cancel" => "Peru",
"Choose" => "Valitse",
+"Cancel" => "Peru",
"Yes" => "Kyllä",
"No" => "Ei",
+"Ok" => "Ok",
"Error" => "Virhe",
"The app name is not specified." => "Sovelluksen nimeä ei ole määritelty.",
"The required file {file} is not installed!" => "Vaadittua tiedostoa {file} ei ole asennettu!",
@@ -84,19 +84,18 @@
"The update was successful. Redirecting you to ownCloud now." => "Päivitys onnistui. Selain ohjautuu nyt ownCloudiisi.",
"ownCloud password reset" => "ownCloud-salasanan nollaus",
"Use the following link to reset your password: {link}" => "Voit palauttaa salasanasi seuraavassa osoitteessa: {link}",
+"Request failed! Did you make sure your email/username was right?" => "Pyyntö epäonnistui! Olihan sähköpostiosoitteesi/käyttäjätunnuksesi oikein?",
"You will receive a link to reset your password via Email." => "Saat sähköpostitse linkin nollataksesi salasanan.",
-"Reset email send." => "Salasanan nollausviesti lähetetty.",
-"Request failed!" => "Pyyntö epäonnistui!",
"Username" => "Käyttäjätunnus",
"Request reset" => "Tilaus lähetetty",
"Your password was reset" => "Salasanasi nollattiin",
"To login page" => "Kirjautumissivulle",
"New password" => "Uusi salasana",
"Reset password" => "Palauta salasana",
-"Personal" => "Henkilökohtaiset",
+"Personal" => "Henkilökohtainen",
"Users" => "Käyttäjät",
"Apps" => "Sovellukset",
-"Admin" => "Hallinta",
+"Admin" => "Ylläpitäjä",
"Help" => "Ohje",
"Access forbidden" => "Pääsy estetty",
"Cloud not found" => "Pilveä ei löydy",
@@ -105,6 +104,7 @@
"Security Warning" => "Turvallisuusvaroitus",
"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "PHP-asennuksesi on haavoittuvainen NULL Byte -hyökkäykselle (CVE-2006-7243)",
"Please update your PHP installation to use ownCloud securely." => "Päivitä PHP-asennuksesi käyttääksesi ownCloudia turvallisesti.",
+"No secure random number generator is available, please enable the PHP OpenSSL extension." => "Turvallista satunnaislukugeneraattoria ei ole käytettävissä, ota käyttöön PHP:n OpenSSL-laajennus",
"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Datakansiosi ja tiedostosi ovat mitä luultavimmin muiden saavutettavissa internetistä, koska .htaccess-tiedosto ei toimi.",
"For information how to properly configure your server, please see the documentation." => "Katso palvelimen asetuksien määrittämiseen liittyvät ohjeet dokumentaatiosta.",
"Create an admin account" => "Luo ylläpitäjän tunnus",
@@ -119,6 +119,7 @@
"Database host" => "Tietokantapalvelin",
"Finish setup" => "Viimeistele asennus",
"web services under your control" => "verkkopalvelut hallinnassasi",
+"%s is available. Get more information on how to update." => "%s on saatavilla. Lue lisätietoja, miten päivitys asennetaan.",
"Log out" => "Kirjaudu ulos",
"Automatic logon rejected!" => "Automaattinen sisäänkirjautuminen hylättiin!",
"If you did not change your password recently, your account may be compromised!" => "Jos et vaihtanut salasanaasi äskettäin, tilisi saattaa olla murrettu.",
diff --git a/core/l10n/fr.php b/core/l10n/fr.php
index 3b89d69b3b9f9cdf104041f395de6681acb2c095..b01625a887b86102fb8be013944350b1a50151f6 100644
--- a/core/l10n/fr.php
+++ b/core/l10n/fr.php
@@ -9,7 +9,7 @@
"Object type not provided." => "Type d'objet non spécifié.",
"%s ID not provided." => "L'identifiant de %s n'est pas spécifié.",
"Error adding %s to favorites." => "Erreur lors de l'ajout de %s aux favoris.",
-"No categories selected for deletion." => "Aucune catégorie sélectionnée pour suppression",
+"No categories selected for deletion." => "Pas de catégorie sélectionnée pour la suppression.",
"Error removing %s from favorites." => "Erreur lors de la suppression de %s des favoris.",
"Sunday" => "Dimanche",
"Monday" => "Lundi",
@@ -44,11 +44,11 @@
"months ago" => "il y a plusieurs mois",
"last year" => "l'année dernière",
"years ago" => "il y a plusieurs années",
-"Ok" => "Ok",
-"Cancel" => "Annuler",
"Choose" => "Choisir",
+"Cancel" => "Annuler",
"Yes" => "Oui",
"No" => "Non",
+"Ok" => "Ok",
"The object type is not specified." => "Le type d'objet n'est pas spécifié.",
"Error" => "Erreur",
"The app name is not specified." => "Le nom de l'application n'est pas spécifié.",
@@ -88,23 +88,23 @@
"The update was successful. Redirecting you to ownCloud now." => "La mise à jour a réussi. Vous êtes redirigé maintenant vers ownCloud.",
"ownCloud password reset" => "Réinitialisation de votre mot de passe Owncloud",
"Use the following link to reset your password: {link}" => "Utilisez le lien suivant pour réinitialiser votre mot de passe : {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 ." => "Le lien permettant de réinitialiser votre mot de passe vous a été transmis. Si vous ne le recevez pas dans un délai raisonnable, vérifier votre boîte de pourriels. Au besoin, contactez votre administrateur local.",
+"Request failed! Did you make sure your email/username was right?" => "Requête en échec! Avez-vous vérifié vos courriel/nom d'utilisateur?",
"You will receive a link to reset your password via Email." => "Vous allez recevoir un e-mail contenant un lien pour réinitialiser votre mot de passe.",
-"Reset email send." => "Mail de réinitialisation envoyé.",
-"Request failed!" => "La requête a échoué !",
"Username" => "Nom d'utilisateur",
"Request reset" => "Demander la réinitialisation",
"Your password was reset" => "Votre mot de passe a été réinitialisé",
"To login page" => "Retour à la page d'authentification",
"New password" => "Nouveau mot de passe",
"Reset password" => "Réinitialiser le mot de passe",
-"Personal" => "Personnels",
+"Personal" => "Personnel",
"Users" => "Utilisateurs",
"Apps" => "Applications",
"Admin" => "Administration",
"Help" => "Aide",
"Access forbidden" => "Accès interdit",
"Cloud not found" => "Introuvable",
-"Edit categories" => "Modifier les catégories",
+"Edit categories" => "Editer les catégories",
"Add" => "Ajouter",
"Security Warning" => "Avertissement de sécurité",
"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Votre version de PHP est vulnérable à l'attaque par caractère NULL (CVE-2006-7243)",
@@ -125,6 +125,7 @@
"Database host" => "Serveur de la base de données",
"Finish setup" => "Terminer l'installation",
"web services under your control" => "services web sous votre contrôle",
+"%s is available. Get more information on how to update." => "%s est disponible. Obtenez plus d'informations sur la façon de mettre à jour.",
"Log out" => "Se déconnecter",
"Automatic logon rejected!" => "Connexion automatique rejetée !",
"If you did not change your password recently, your account may be compromised!" => "Si vous n'avez pas changé votre mot de passe récemment, votre compte risque d'être compromis !",
diff --git a/core/l10n/gl.php b/core/l10n/gl.php
index fd237a39c862c4e01e43c4cea3c8758557fdda44..3e05f7ec3f1ee9ebf1c50d56b0e4100c8cd85f90 100644
--- a/core/l10n/gl.php
+++ b/core/l10n/gl.php
@@ -9,7 +9,7 @@
"Object type not provided." => "Non se forneceu o tipo de obxecto.",
"%s ID not provided." => "Non se forneceu o ID %s.",
"Error adding %s to favorites." => "Produciuse un erro ao engadir %s aos favoritos.",
-"No categories selected for deletion." => "Non hai categorías seleccionadas para eliminar.",
+"No categories selected for deletion." => "Non se seleccionaron categorías para eliminación.",
"Error removing %s from favorites." => "Produciuse un erro ao eliminar %s dos favoritos.",
"Sunday" => "Domingo",
"Monday" => "Luns",
@@ -30,11 +30,11 @@
"October" => "outubro",
"November" => "novembro",
"December" => "decembro",
-"Settings" => "Configuracións",
+"Settings" => "Axustes",
"seconds ago" => "segundos atrás",
"1 minute ago" => "hai 1 minuto",
"{minutes} minutes ago" => "hai {minutes} minutos",
-"1 hour ago" => "hai 1 hora",
+"1 hour ago" => "Vai 1 hora",
"{hours} hours ago" => "hai {hours} horas",
"today" => "hoxe",
"yesterday" => "onte",
@@ -44,11 +44,11 @@
"months ago" => "meses atrás",
"last year" => "último ano",
"years ago" => "anos atrás",
-"Ok" => "Aceptar",
-"Cancel" => "Cancelar",
"Choose" => "Escoller",
+"Cancel" => "Cancelar",
"Yes" => "Si",
"No" => "Non",
+"Ok" => "Aceptar",
"The object type is not specified." => "Non se especificou o tipo de obxecto.",
"Error" => "Erro",
"The app name is not specified." => "Non se especificou o nome do aplicativo.",
@@ -88,9 +88,9 @@
"The update was successful. Redirecting you to ownCloud now." => "A actualización realizouse correctamente. Redirixíndoo agora á ownCloud.",
"ownCloud password reset" => "Restabelecer o contrasinal de ownCloud",
"Use the following link to reset your password: {link}" => "Usa a seguinte ligazón para restabelecer o contrasinal: {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 ." => "Envióuselle ao seu correo unha ligazón para restabelecer o seu contrasinal. Se non o recibe nun prazo razoábel de tempo, revise o seu cartafol de correo lixo ou de non desexados. Se non o atopa aí pregúntelle ao seu administrador local..",
+"Request failed! Did you make sure your email/username was right?" => "Non foi posíbel facer a petición! Asegúrese de que o seu enderezo de correo ou nome de usuario é correcto.",
"You will receive a link to reset your password via Email." => "Recibirá unha ligazón por correo para restabelecer o contrasinal",
-"Reset email send." => "Restabelecer o envío por correo.",
-"Request failed!" => "Non foi posíbel facer a petición",
"Username" => "Nome de usuario",
"Request reset" => "Petición de restabelecemento",
"Your password was reset" => "O contrasinal foi restabelecido",
@@ -100,11 +100,11 @@
"Personal" => "Persoal",
"Users" => "Usuarios",
"Apps" => "Aplicativos",
-"Admin" => "Admin",
+"Admin" => "Administración",
"Help" => "Axuda",
"Access forbidden" => "Acceso denegado",
"Cloud not found" => "Nube non atopada",
-"Edit categories" => "Editar categorías",
+"Edit categories" => "Editar as categorías",
"Add" => "Engadir",
"Security Warning" => "Aviso de seguranza",
"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "A súa versión de PHP é vulnerábel a un ataque de byte nulo (CVE-2006-7243)",
@@ -125,6 +125,7 @@
"Database host" => "Servidor da base de datos",
"Finish setup" => "Rematar a configuración",
"web services under your control" => "servizos web baixo o seu control",
+"%s is available. Get more information on how to update." => "%s está dispoñíbel. Obteña máis información sobre como actualizar.",
"Log out" => "Desconectar",
"Automatic logon rejected!" => "Rexeitouse a entrada automática",
"If you did not change your password recently, your account may be compromised!" => "Se non fixo recentemente cambios de contrasinal é posíbel que a súa conta estea comprometida!",
diff --git a/core/l10n/he.php b/core/l10n/he.php
index 56f273e95dea107e5ce0b6e35385e8a775d5433c..eb2c3f3d1538979af80d18e97af9cff8942247c4 100644
--- a/core/l10n/he.php
+++ b/core/l10n/he.php
@@ -44,11 +44,11 @@
"months ago" => "חודשים",
"last year" => "שנה שעברה",
"years ago" => "שנים",
-"Ok" => "בסדר",
-"Cancel" => "ביטול",
"Choose" => "בחירה",
+"Cancel" => "ביטול",
"Yes" => "כן",
"No" => "לא",
+"Ok" => "בסדר",
"The object type is not specified." => "סוג הפריט לא צוין.",
"Error" => "שגיאה",
"The app name is not specified." => "שם היישום לא צוין.",
@@ -63,7 +63,7 @@
"Share with" => "שיתוף עם",
"Share with link" => "שיתוף עם קישור",
"Password protect" => "הגנה בססמה",
-"Password" => "ססמה",
+"Password" => "סיסמא",
"Email link to person" => "שליחת קישור בדוא״ל למשתמש",
"Send" => "שליחה",
"Set expiration date" => "הגדרת תאריך תפוגה",
@@ -89,8 +89,6 @@
"ownCloud password reset" => "איפוס הססמה של ownCloud",
"Use the following link to reset your password: {link}" => "יש להשתמש בקישור הבא כדי לאפס את הססמה שלך: {link}",
"You will receive a link to reset your password via Email." => "יישלח לתיבת הדוא״ל שלך קישור לאיפוס הססמה.",
-"Reset email send." => "איפוס שליחת דוא״ל.",
-"Request failed!" => "הבקשה נכשלה!",
"Username" => "שם משתמש",
"Request reset" => "בקשת איפוס",
"Your password was reset" => "הססמה שלך אופסה",
@@ -104,9 +102,10 @@
"Help" => "עזרה",
"Access forbidden" => "הגישה נחסמה",
"Cloud not found" => "ענן לא נמצא",
-"Edit categories" => "עריכת הקטגוריות",
+"Edit categories" => "ערוך קטגוריות",
"Add" => "הוספה",
"Security Warning" => "אזהרת אבטחה",
+"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "גרסת ה־PHP פגיעה בפני התקפת בית NULL/ריק (CVE-2006-7243)",
"No secure random number generator is available, please enable the PHP OpenSSL extension." => "אין מחולל מספרים אקראיים מאובטח, נא להפעיל את ההרחבה OpenSSL ב־PHP.",
"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "ללא מחולל מספרים אקראיים מאובטח תוקף יכול לנבא את מחרוזות איפוס הססמה ולהשתלט על החשבון שלך.",
"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "תיקיית וקבצי המידע שלך כנראה נגישים מהאינטרנט מכיוון שקובץ ה.htaccess לא עובד.",
@@ -122,7 +121,7 @@
"Database tablespace" => "מרחב הכתובות של מסד הנתונים",
"Database host" => "שרת בסיס נתונים",
"Finish setup" => "סיום התקנה",
-"web services under your control" => "שירותי רשת בשליטתך",
+"web services under your control" => "שירותי רשת תחת השליטה שלך",
"Log out" => "התנתקות",
"Automatic logon rejected!" => "בקשת הכניסה האוטומטית נדחתה!",
"If you did not change your password recently, your account may be compromised!" => "אם לא שינית את ססמתך לאחרונה, יתכן שחשבונך נפגע!",
diff --git a/core/l10n/hr.php b/core/l10n/hr.php
index d32d8d4b2278580c8f8dfd79b55662c8fc3eeece..660b47c54fdbb0b9566a27e9c93cd617e2229e17 100644
--- a/core/l10n/hr.php
+++ b/core/l10n/hr.php
@@ -1,6 +1,6 @@
"Nemate kategorija koje možete dodati?",
-"No categories selected for deletion." => "Nema odabranih kategorija za brisanje.",
+"No categories selected for deletion." => "Niti jedna kategorija nije odabrana za brisanje.",
"Sunday" => "nedelja",
"Monday" => "ponedeljak",
"Tuesday" => "utorak",
@@ -28,12 +28,12 @@
"months ago" => "mjeseci",
"last year" => "prošlu godinu",
"years ago" => "godina",
-"Ok" => "U redu",
-"Cancel" => "Odustani",
"Choose" => "Izaberi",
+"Cancel" => "Odustani",
"Yes" => "Da",
"No" => "Ne",
-"Error" => "Pogreška",
+"Ok" => "U redu",
+"Error" => "Greška",
"Share" => "Podijeli",
"Error while sharing" => "Greška prilikom djeljenja",
"Error while unsharing" => "Greška prilikom isključivanja djeljenja",
@@ -76,7 +76,7 @@
"Edit categories" => "Uredi kategorije",
"Add" => "Dodaj",
"Create an admin account" => "Stvori administratorski račun",
-"Advanced" => "Dodatno",
+"Advanced" => "Napredno",
"Data folder" => "Mapa baze podataka",
"Configure the database" => "Konfiguriraj bazu podataka",
"will be used" => "će se koristiti",
diff --git a/core/l10n/hu_HU.php b/core/l10n/hu_HU.php
index eb0a3d1a91d51e62106256c099d52dfae71f1cdb..6b477746f25d8b9053e02ed6ea383550b968884b 100644
--- a/core/l10n/hu_HU.php
+++ b/core/l10n/hu_HU.php
@@ -44,11 +44,11 @@
"months ago" => "több hónapja",
"last year" => "tavaly",
"years ago" => "több éve",
-"Ok" => "Ok",
-"Cancel" => "Mégse",
"Choose" => "Válasszon",
+"Cancel" => "Mégsem",
"Yes" => "Igen",
"No" => "Nem",
+"Ok" => "Ok",
"The object type is not specified." => "Az objektum típusa nincs megadva.",
"Error" => "Hiba",
"The app name is not specified." => "Az alkalmazás neve nincs megadva.",
@@ -88,19 +88,19 @@
"The update was successful. Redirecting you to ownCloud now." => "A frissítés sikeres volt. Visszairányítjuk az ownCloud szolgáltatáshoz.",
"ownCloud password reset" => "ownCloud jelszó-visszaállítás",
"Use the following link to reset your password: {link}" => "Használja ezt a linket a jelszó ismételt beállításához: {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 ." => "Emailben fog kapni egy linket, amivel új jelszót tud majd beállítani magának. Ha a levél nem jött meg, holott úgy érzi, hogy már meg kellett volna érkeznie, akkor ellenőrizze a spam/levélszemét mappáját. Ha ott sincsen, akkor érdeklődjön a rendszergazdánál.",
+"Request failed! Did you make sure your email/username was right?" => "A kérést nem sikerült teljesíteni! Biztos, hogy jó emailcímet/felhasználónevet adott meg?",
"You will receive a link to reset your password via Email." => "Egy emailben fog értesítést kapni a jelszóbeállítás módjáról.",
-"Reset email send." => "Elküldtük az emailt a jelszó ismételt beállításához.",
-"Request failed!" => "Nem sikerült a kérést teljesíteni!",
"Username" => "Felhasználónév",
"Request reset" => "Visszaállítás igénylése",
"Your password was reset" => "Jelszó megváltoztatva",
"To login page" => "A bejelentkező ablakhoz",
-"New password" => "Új jelszó",
+"New password" => "Az új jelszó",
"Reset password" => "Jelszó-visszaállítás",
"Personal" => "Személyes",
"Users" => "Felhasználók",
"Apps" => "Alkalmazások",
-"Admin" => "Adminisztráció",
+"Admin" => "Adminsztráció",
"Help" => "Súgó",
"Access forbidden" => "A hozzáférés nem engedélyezett",
"Cloud not found" => "A felhő nem található",
@@ -125,6 +125,7 @@
"Database host" => "Adatbázis szerver",
"Finish setup" => "A beállítások befejezése",
"web services under your control" => "webszolgáltatások saját kézben",
+"%s is available. Get more information on how to update." => "%s rendelkezésre áll. További információ a frissítéshez.",
"Log out" => "Kilépés",
"Automatic logon rejected!" => "Az automatikus bejelentkezés sikertelen!",
"If you did not change your password recently, your account may be compromised!" => "Ha mostanában nem módosította a jelszavát, akkor lehetséges, hogy idegenek jutottak be a rendszerbe az Ön nevében!",
diff --git a/core/l10n/hy.php b/core/l10n/hy.php
new file mode 100644
index 0000000000000000000000000000000000000000..de0c725c73b62b4590d04682d08660eeef60c2de
--- /dev/null
+++ b/core/l10n/hy.php
@@ -0,0 +1,21 @@
+ "Կիրակի",
+"Monday" => "Երկուշաբթի",
+"Tuesday" => "Երեքշաբթի",
+"Wednesday" => "Չորեքշաբթի",
+"Thursday" => "Հինգշաբթի",
+"Friday" => "Ուրբաթ",
+"Saturday" => "Շաբաթ",
+"January" => "Հունվար",
+"February" => "Փետրվար",
+"March" => "Մարտ",
+"April" => "Ապրիլ",
+"May" => "Մայիս",
+"June" => "Հունիս",
+"July" => "Հուլիս",
+"August" => "Օգոստոս",
+"September" => "Սեպտեմբեր",
+"October" => "Հոկտեմբեր",
+"November" => "Նոյեմբեր",
+"December" => "Դեկտեմբեր"
+);
diff --git a/core/l10n/ia.php b/core/l10n/ia.php
index 8adc38f0bba595f065e6a630d4649b8e7ab6624c..b6bb75f2b3becfca76fcae938bff18303dcd03b4 100644
--- a/core/l10n/ia.php
+++ b/core/l10n/ia.php
@@ -20,8 +20,10 @@
"December" => "Decembre",
"Settings" => "Configurationes",
"Cancel" => "Cancellar",
+"Error" => "Error",
"Share" => "Compartir",
"Password" => "Contrasigno",
+"Send" => "Invia",
"ownCloud password reset" => "Reinitialisation del contrasigno de ownCLoud",
"Username" => "Nomine de usator",
"Request reset" => "Requestar reinitialisation",
diff --git a/core/l10n/id.php b/core/l10n/id.php
index 9eeaba3454327241eae86adb7c02a9d2f3a5c08e..065a4f2e72771e452bcb0ecb3fbee51c5467e17c 100644
--- a/core/l10n/id.php
+++ b/core/l10n/id.php
@@ -44,11 +44,11 @@
"months ago" => "beberapa bulan lalu",
"last year" => "tahun kemarin",
"years ago" => "beberapa tahun lalu",
-"Ok" => "Oke",
-"Cancel" => "Batalkan",
"Choose" => "Pilih",
+"Cancel" => "Batal",
"Yes" => "Ya",
"No" => "Tidak",
+"Ok" => "Oke",
"The object type is not specified." => "Tipe objek tidak ditentukan.",
"Error" => "Galat",
"The app name is not specified." => "Nama aplikasi tidak ditentukan.",
@@ -89,9 +89,7 @@
"ownCloud password reset" => "Setel ulang sandi ownCloud",
"Use the following link to reset your password: {link}" => "Gunakan tautan berikut untuk menyetel ulang sandi Anda: {link}",
"You will receive a link to reset your password via Email." => "Anda akan menerima tautan penyetelan ulang sandi lewat Email.",
-"Reset email send." => "Email penyetelan ulang dikirim.",
-"Request failed!" => "Permintaan gagal!",
-"Username" => "Nama Pengguna",
+"Username" => "Nama pengguna",
"Request reset" => "Ajukan penyetelan ulang",
"Your password was reset" => "Sandi Anda telah disetel ulang",
"To login page" => "Ke halaman masuk",
@@ -105,7 +103,7 @@
"Access forbidden" => "Akses ditolak",
"Cloud not found" => "Cloud tidak ditemukan",
"Edit categories" => "Edit kategori",
-"Add" => "Tambahkan",
+"Add" => "Tambah",
"Security Warning" => "Peringatan Keamanan",
"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Versi PHP Anda rentan terhadap serangan NULL Byte (CVE-2006-7243)",
"Please update your PHP installation to use ownCloud securely." => "Silakan perbarui instalasi PHP untuk dapat menggunakan ownCloud secara aman.",
@@ -114,7 +112,7 @@
"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Kemungkinan direktori data dan berkas Anda dapat diakses dari internet karena berkas .htaccess tidak berfungsi.",
"For information how to properly configure your server, please see the documentation." => "Untuk informasi lebih lanjut tentang pengaturan server yang benar, silakan lihat dokumentasi.",
"Create an admin account" => "Buat sebuah akun admin",
-"Advanced" => "Tingkat Lanjut",
+"Advanced" => "Lanjutan",
"Data folder" => "Folder data",
"Configure the database" => "Konfigurasikan basis data",
"will be used" => "akan digunakan",
diff --git a/core/l10n/is.php b/core/l10n/is.php
index c6b7a6df3259dc73a1fd5e342983910614b04c39..bd8b58b29049eedc0dfe99563eb049e587ad068f 100644
--- a/core/l10n/is.php
+++ b/core/l10n/is.php
@@ -30,8 +30,8 @@
"November" => "Nóvember",
"December" => "Desember",
"Settings" => "Stillingar",
-"seconds ago" => "sek síðan",
-"1 minute ago" => "1 min síðan",
+"seconds ago" => "sek.",
+"1 minute ago" => "Fyrir 1 mínútu",
"{minutes} minutes ago" => "{minutes} min síðan",
"1 hour ago" => "Fyrir 1 klst.",
"{hours} hours ago" => "fyrir {hours} klst.",
@@ -42,12 +42,12 @@
"{months} months ago" => "fyrir {months} mánuðum",
"months ago" => "mánuðir síðan",
"last year" => "síðasta ári",
-"years ago" => "árum síðan",
-"Ok" => "Í lagi",
-"Cancel" => "Hætta við",
+"years ago" => "einhverjum árum",
"Choose" => "Veldu",
+"Cancel" => "Hætta við",
"Yes" => "Já",
"No" => "Nei",
+"Ok" => "Í lagi",
"The object type is not specified." => "Tegund ekki tilgreind",
"Error" => "Villa",
"The app name is not specified." => "Nafn forrits ekki tilgreint",
@@ -85,23 +85,21 @@
"ownCloud password reset" => "endursetja ownCloud lykilorð",
"Use the following link to reset your password: {link}" => "Notað eftirfarandi veftengil til að endursetja lykilorðið þitt: {link}",
"You will receive a link to reset your password via Email." => "Þú munt fá veftengil í tölvupósti til að endursetja lykilorðið.",
-"Reset email send." => "Beiðni um endursetningu send.",
-"Request failed!" => "Beiðni mistókst!",
"Username" => "Notendanafn",
"Request reset" => "Endursetja lykilorð",
"Your password was reset" => "Lykilorðið þitt hefur verið endursett.",
"To login page" => "Fara á innskráningarsíðu",
"New password" => "Nýtt lykilorð",
"Reset password" => "Endursetja lykilorð",
-"Personal" => "Persónustillingar",
+"Personal" => "Um mig",
"Users" => "Notendur",
"Apps" => "Forrit",
-"Admin" => "Vefstjórn",
+"Admin" => "Stjórnun",
"Help" => "Hjálp",
"Access forbidden" => "Aðgangur bannaður",
"Cloud not found" => "Ský finnst ekki",
"Edit categories" => "Breyta flokkum",
-"Add" => "Bæta",
+"Add" => "Bæta við",
"Security Warning" => "Öryggis aðvörun",
"No secure random number generator is available, please enable the PHP OpenSSL extension." => "Enginn traustur slembitölugjafi í boði, vinsamlegast virkjaðu PHP OpenSSL viðbótina.",
"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Án öruggs slembitölugjafa er mögulegt að sjá fyrir öryggis auðkenni til að endursetja lykilorð og komast inn á aðganginn þinn.",
diff --git a/core/l10n/it.php b/core/l10n/it.php
index d24c3330bfded3f671b1dab13e4afde5574ce728..ce8f6411295657f8c4205ebf22b97800eea10a7d 100644
--- a/core/l10n/it.php
+++ b/core/l10n/it.php
@@ -44,11 +44,12 @@
"months ago" => "mesi fa",
"last year" => "anno scorso",
"years ago" => "anni fa",
-"Ok" => "Ok",
-"Cancel" => "Annulla",
"Choose" => "Scegli",
+"Cancel" => "Annulla",
+"Error loading file picker template" => "Errore durante il caricamento del modello del selezionatore di file",
"Yes" => "Sì",
"No" => "No",
+"Ok" => "Ok",
"The object type is not specified." => "Il tipo di oggetto non è specificato.",
"Error" => "Errore",
"The app name is not specified." => "Il nome dell'applicazione non è specificato.",
@@ -77,8 +78,8 @@
"access control" => "controllo d'accesso",
"create" => "creare",
"update" => "aggiornare",
-"delete" => "eliminare",
-"share" => "condividere",
+"delete" => "elimina",
+"share" => "condividi",
"Password protected" => "Protetta da password",
"Error unsetting expiration date" => "Errore durante la rimozione della data di scadenza",
"Error setting expiration date" => "Errore durante l'impostazione della data di scadenza",
@@ -88,9 +89,9 @@
"The update was successful. Redirecting you to ownCloud now." => "L'aggiornamento è stato effettuato correttamente. Stai per essere reindirizzato a ownCloud.",
"ownCloud password reset" => "Ripristino password di ownCloud",
"Use the following link to reset your password: {link}" => "Usa il collegamento seguente per ripristinare la password: {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 ." => "Il collegamento per ripristinare la password è stato inviato al tuo indirizzo di posta. Se non lo ricevi in tempi ragionevoli, controlla le cartelle della posta indesiderata. Se non dovesse essere nemmeno lì, contatta il tuo amministratore locale.",
+"Request failed! Did you make sure your email/username was right?" => "Richiesta non riuscita! Sei sicuro che l'indirizzo di posta/nome utente fosse corretto?",
"You will receive a link to reset your password via Email." => "Riceverai un collegamento per ripristinare la tua password via email",
-"Reset email send." => "Email di ripristino inviata.",
-"Request failed!" => "Richiesta non riuscita!",
"Username" => "Nome utente",
"Request reset" => "Richiesta di ripristino",
"Your password was reset" => "La password è stata ripristinata",
@@ -104,7 +105,7 @@
"Help" => "Aiuto",
"Access forbidden" => "Accesso negato",
"Cloud not found" => "Nuvola non trovata",
-"Edit categories" => "Modifica le categorie",
+"Edit categories" => "Modifica categorie",
"Add" => "Aggiungi",
"Security Warning" => "Avviso di sicurezza",
"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "La tua versione di PHP è vulnerabile all'attacco NULL Byte (CVE-2006-7243)",
@@ -114,7 +115,7 @@
"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "La cartella dei dati e i file sono probabilmente accessibili da Internet poiché il file .htaccess non funziona.",
"For information how to properly configure your server, please see the documentation." => "Per informazioni su come configurare correttamente il server, vedi la documentazione.",
"Create an admin account" => "Crea un account amministratore",
-"Advanced" => "Avanzate",
+"Advanced" => "Avanzat",
"Data folder" => "Cartella dati",
"Configure the database" => "Configura il database",
"will be used" => "sarà utilizzato",
@@ -125,6 +126,7 @@
"Database host" => "Host del database",
"Finish setup" => "Termina la configurazione",
"web services under your control" => "servizi web nelle tue mani",
+"%s is available. Get more information on how to update." => "%s è disponibile. Ottieni ulteriori informazioni sull'aggiornamento.",
"Log out" => "Esci",
"Automatic logon rejected!" => "Accesso automatico rifiutato.",
"If you did not change your password recently, your account may be compromised!" => "Se non hai cambiato la password recentemente, il tuo account potrebbe essere compromesso.",
diff --git a/core/l10n/ja_JP.php b/core/l10n/ja_JP.php
index 200e494d8c1743b767ffb8396252af878b3950cf..5f2544508083a9f279afcbb42d1af3ecf1362053 100644
--- a/core/l10n/ja_JP.php
+++ b/core/l10n/ja_JP.php
@@ -44,11 +44,11 @@
"months ago" => "月前",
"last year" => "一年前",
"years ago" => "年前",
-"Ok" => "OK",
-"Cancel" => "キャンセル",
"Choose" => "選択",
+"Cancel" => "キャンセル",
"Yes" => "はい",
"No" => "いいえ",
+"Ok" => "OK",
"The object type is not specified." => "オブジェクタイプが指定されていません。",
"Error" => "エラー",
"The app name is not specified." => "アプリ名がしていされていません。",
@@ -88,19 +88,19 @@
"The update was successful. Redirecting you to ownCloud now." => "更新に成功しました。今すぐownCloudにリダイレクトします。",
"ownCloud password reset" => "ownCloudのパスワードをリセットします",
"Use the following link to reset your password: {link}" => "パスワードをリセットするには次のリンクをクリックして下さい: {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." => "メールでパスワードをリセットするリンクが届きます。",
-"Reset email send." => "リセットメールを送信します。",
-"Request failed!" => "リクエスト失敗!",
-"Username" => "ユーザ名",
+"Username" => "ユーザー名",
"Request reset" => "リセットを要求します。",
"Your password was reset" => "あなたのパスワードはリセットされました。",
"To login page" => "ログインページへ戻る",
"New password" => "新しいパスワードを入力",
"Reset password" => "パスワードをリセット",
-"Personal" => "個人設定",
+"Personal" => "個人",
"Users" => "ユーザ",
"Apps" => "アプリ",
-"Admin" => "管理者",
+"Admin" => "管理",
"Help" => "ヘルプ",
"Access forbidden" => "アクセスが禁止されています",
"Cloud not found" => "見つかりません",
@@ -110,7 +110,7 @@
"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "あなたのPHPのバージョンには、Null Byte攻撃(CVE-2006-7243)という脆弱性が含まれています。",
"Please update your PHP installation to use ownCloud securely." => "ownCloud を安全に利用するに、PHPの更新を行なってください。",
"No secure random number generator is available, please enable the PHP OpenSSL extension." => "セキュアな乱数生成器が利用可能ではありません。PHPのOpenSSL拡張を有効にして下さい。",
-"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "セキュアな乱数生成器が無い場合、攻撃者はパスワードリセットのトークンを予測してアカウントを乗っ取られる可能性があります。",
+"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "セキュアな乱数生成器が無い場合、攻撃者がパスワードリセットのトークンを予測してアカウントを乗っ取られる可能性があります。",
"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => ".htaccess ファイルが動作していないため、おそらくあなたのデータディレクトリもしくはファイルはインターネットからアクセス可能です。",
"For information how to properly configure your server, please see the documentation." => "あなたのサーバの適切な設定に関する情報として、ドキュメントを参照して下さい。",
"Create an admin account" => "管理者アカウントを作成してください",
@@ -124,7 +124,8 @@
"Database tablespace" => "データベースの表領域",
"Database host" => "データベースのホスト名",
"Finish setup" => "セットアップを完了します",
-"web services under your control" => "管理下にあるウェブサービス",
+"web services under your control" => "管理下のウェブサービス",
+"%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!" => "最近パスワードを変更していない場合、あなたのアカウントは危険にさらされているかもしれません。",
diff --git a/core/l10n/ka_GE.php b/core/l10n/ka_GE.php
index 190a2f5eabe1e2560975a3877a5ede777a210c72..b474548eae84b5444a87cf37444c0e5b834723e4 100644
--- a/core/l10n/ka_GE.php
+++ b/core/l10n/ka_GE.php
@@ -44,11 +44,11 @@
"months ago" => "თვის წინ",
"last year" => "ბოლო წელს",
"years ago" => "წლის წინ",
-"Ok" => "დიახ",
-"Cancel" => "უარყოფა",
"Choose" => "არჩევა",
+"Cancel" => "უარყოფა",
"Yes" => "კი",
"No" => "არა",
+"Ok" => "დიახ",
"The object type is not specified." => "ობიექტის ტიპი არ არის მითითებული.",
"Error" => "შეცდომა",
"The app name is not specified." => "აპლიკაციის სახელი არ არის მითითებული.",
@@ -60,7 +60,7 @@
"Error while changing permissions" => "შეცდომა დაშვების ცვლილების დროს",
"Shared with you and the group {group} by {owner}" => "გაზიარდა თქვენთვის და ჯგუფისთვის {group}, {owner}–ის მიერ",
"Shared with you by {owner}" => "გაზიარდა თქვენთვის {owner}–ის მიერ",
-"Share with" => "გაუზიარე",
+"Share with" => "გააზიარე შემდეგით:",
"Share with link" => "გაუზიარე ლინკით",
"Password protect" => "პაროლით დაცვა",
"Password" => "პაროლი",
@@ -72,7 +72,7 @@
"No people found" => "მომხმარებელი არ არის ნაპოვნი",
"Resharing is not allowed" => "მეორეჯერ გაზიარება არ არის დაშვებული",
"Shared in {item} with {user}" => "გაზიარდა {item}–ში {user}–ის მიერ",
-"Unshare" => "გაზიარების მოხსნა",
+"Unshare" => "გაუზიარებადი",
"can edit" => "შეგიძლია შეცვლა",
"access control" => "დაშვების კონტროლი",
"create" => "შექმნა",
@@ -89,18 +89,16 @@
"ownCloud password reset" => "ownCloud პაროლის შეცვლა",
"Use the following link to reset your password: {link}" => "გამოიყენე შემდეგი ლინკი პაროლის შესაცვლელად: {link}",
"You will receive a link to reset your password via Email." => "თქვენ მოგივათ პაროლის შესაცვლელი ლინკი მეილზე",
-"Reset email send." => "რესეტის მეილი გაიგზავნა",
-"Request failed!" => "მოთხოვნა შეწყდა!",
-"Username" => "მომხმარებელი",
+"Username" => "მომხმარებლის სახელი",
"Request reset" => "პაროლის შეცვლის მოთხოვნა",
"Your password was reset" => "თქვენი პაროლი შეცვლილია",
"To login page" => "შესვლის გვერდზე",
"New password" => "ახალი პაროლი",
"Reset password" => "პაროლის შეცვლა",
"Personal" => "პირადი",
-"Users" => "მომხმარებლები",
+"Users" => "მომხმარებელი",
"Apps" => "აპლიკაციები",
-"Admin" => "ადმინი",
+"Admin" => "ადმინისტრატორი",
"Help" => "დახმარება",
"Access forbidden" => "წვდომა აკრძალულია",
"Cloud not found" => "ღრუბელი არ არსებობს",
@@ -124,7 +122,7 @@
"Database tablespace" => "ბაზის ცხრილის ზომა",
"Database host" => "მონაცემთა ბაზის ჰოსტი",
"Finish setup" => "კონფიგურაციის დასრულება",
-"web services under your control" => "თქვენი კონტროლის ქვეშ მყოფი ვებ სერვისები",
+"web services under your control" => "web services under your control",
"Log out" => "გამოსვლა",
"Automatic logon rejected!" => "ავტომატური შესვლა უარყოფილია!",
"If you did not change your password recently, your account may be compromised!" => "თუ თქვენ არ შეცვლით პაროლს, თქვენი ანგარიში შეიძლება იყოს დაშვებადი სხვებისთვის",
diff --git a/core/l10n/ko.php b/core/l10n/ko.php
index 2a75ce9c4f453d6a295348eda7da8e8f31294f4c..6b97d672cfd16243adf162611e210930e2fe1c4a 100644
--- a/core/l10n/ko.php
+++ b/core/l10n/ko.php
@@ -5,10 +5,11 @@
"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "%s 님이 폴더 \"%s\"을(를) 공유하였습니다. 여기에서 다운로드할 수 있습니다: %s",
"Category type not provided." => "분류 형식이 제공되지 않았습니다.",
"No category to add?" => "추가할 분류가 없습니까?",
+"This category already exists: %s" => "분류가 이미 존재합니다: %s",
"Object type not provided." => "객체 형식이 제공되지 않았습니다.",
"%s ID not provided." => "%s ID가 제공되지 않았습니다.",
"Error adding %s to favorites." => "책갈피에 %s을(를) 추가할 수 없었습니다.",
-"No categories selected for deletion." => "삭제할 분류를 선택하지 않았습니다.",
+"No categories selected for deletion." => "삭제할 분류를 선택하지 않았습니다. ",
"Error removing %s from favorites." => "책갈피에서 %s을(를) 삭제할 수 없었습니다.",
"Sunday" => "일요일",
"Monday" => "월요일",
@@ -43,11 +44,11 @@
"months ago" => "개월 전",
"last year" => "작년",
"years ago" => "년 전",
-"Ok" => "승락",
-"Cancel" => "취소",
"Choose" => "선택",
+"Cancel" => "취소",
"Yes" => "예",
"No" => "아니요",
+"Ok" => "승락",
"The object type is not specified." => "객체 유형이 지정되지 않았습니다.",
"Error" => "오류",
"The app name is not specified." => "앱 이름이 지정되지 않았습니다.",
@@ -74,7 +75,7 @@
"Unshare" => "공유 해제",
"can edit" => "편집 가능",
"access control" => "접근 제어",
-"create" => "만들기",
+"create" => "생성",
"update" => "업데이트",
"delete" => "삭제",
"share" => "공유",
@@ -88,8 +89,6 @@
"ownCloud password reset" => "ownCloud 암호 재설정",
"Use the following link to reset your password: {link}" => "다음 링크를 사용하여 암호를 재설정할 수 있습니다: {link}",
"You will receive a link to reset your password via Email." => "이메일로 암호 재설정 링크를 보냈습니다.",
-"Reset email send." => "초기화 이메일을 보냈습니다.",
-"Request failed!" => "요청이 실패했습니다!",
"Username" => "사용자 이름",
"Request reset" => "요청 초기화",
"Your password was reset" => "암호가 재설정되었습니다",
@@ -103,11 +102,15 @@
"Help" => "도움말",
"Access forbidden" => "접근 금지됨",
"Cloud not found" => "클라우드를 찾을 수 없습니다",
-"Edit categories" => "분류 편집",
+"Edit categories" => "분류 수정",
"Add" => "추가",
"Security Warning" => "보안 경고",
+"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "사용 중인 PHP 버전이 NULL 바이트 공격에 취약합니다 (CVE-2006-7243)",
+"Please update your PHP installation to use ownCloud securely." => "ownCloud의 보안을 위하여 PHP 버전을 업데이트하십시오.",
"No secure random number generator is available, please enable the PHP OpenSSL extension." => "안전한 난수 생성기를 사용할 수 없습니다. PHP의 OpenSSL 확장을 활성화해 주십시오.",
"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "안전한 난수 생성기를 사용하지 않으면 공격자가 암호 초기화 토큰을 추측하여 계정을 탈취할 수 있습니다.",
+"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => ".htaccess 파일이 처리되지 않아서 데이터 디렉터리와 파일을 인터넷에서 접근할 수 없을 수도 있습니다.",
+"For information how to properly configure your server, please see the documentation." => "서버를 올바르게 설정하는 방법을 알아보려면 문서를 참고하십시오..",
"Create an admin account" => "관리자 계정 만들기",
"Advanced" => "고급",
"Data folder" => "데이터 폴더",
@@ -127,6 +130,7 @@
"Lost your password?" => "암호를 잊으셨습니까?",
"remember" => "기억하기",
"Log in" => "로그인",
+"Alternative Logins" => "대체 ",
"prev" => "이전",
"next" => "다음",
"Updating ownCloud to version %s, this may take a while." => "ownCloud를 버전 %s(으)로 업데이트합니다. 잠시 기다려 주십시오."
diff --git a/core/l10n/lb.php b/core/l10n/lb.php
index 79258b8e9741f23384686e078de0441d6c495972..4c312df6618c974f3cbffe9ba995a434d5238c6b 100644
--- a/core/l10n/lb.php
+++ b/core/l10n/lb.php
@@ -28,11 +28,11 @@
"months ago" => "Méint hier",
"last year" => "Läscht Joer",
"years ago" => "Joren hier",
-"Ok" => "OK",
-"Cancel" => "Ofbriechen",
"Choose" => "Auswielen",
+"Cancel" => "Ofbriechen",
"Yes" => "Jo",
"No" => "Nee",
+"Ok" => "OK",
"Error" => "Fehler",
"Share" => "Deelen",
"Password" => "Passwuert",
@@ -57,7 +57,7 @@
"Access forbidden" => "Access net erlaabt",
"Cloud not found" => "Cloud net fonnt",
"Edit categories" => "Kategorien editéieren",
-"Add" => "Bäisetzen",
+"Add" => "Dobäisetzen",
"Security Warning" => "Sécherheets Warnung",
"Create an admin account" => "En Admin Account uleeën",
"Advanced" => "Avancéiert",
diff --git a/core/l10n/lt_LT.php b/core/l10n/lt_LT.php
index 0f55c341e56ba20e08fdf221434a0a1b3b17a93c..1cd400117c8336afa625f31bf80b87ae6ef32ef7 100644
--- a/core/l10n/lt_LT.php
+++ b/core/l10n/lt_LT.php
@@ -1,4 +1,6 @@
"Vartotojas %s pasidalino su jumis failu",
+"User %s shared a folder with you" => "Vartotojas %s su jumis pasidalino aplanku",
"No category to add?" => "Nepridėsite jokios kategorijos?",
"No categories selected for deletion." => "Trynimui nepasirinkta jokia kategorija.",
"Sunday" => "Sekmadienis",
@@ -31,11 +33,11 @@
"months ago" => "prieš mėnesį",
"last year" => "praeitais metais",
"years ago" => "prieš metus",
-"Ok" => "Gerai",
-"Cancel" => "Atšaukti",
"Choose" => "Pasirinkite",
+"Cancel" => "Atšaukti",
"Yes" => "Taip",
"No" => "Ne",
+"Ok" => "Gerai",
"Error" => "Klaida",
"Share" => "Dalintis",
"Error while sharing" => "Klaida, dalijimosi metu",
@@ -53,7 +55,7 @@
"No people found" => "Žmonių nerasta",
"Resharing is not allowed" => "Dalijinasis išnaujo negalimas",
"Shared in {item} with {user}" => "Pasidalino {item} su {user}",
-"Unshare" => "Nesidalinti",
+"Unshare" => "Nebesidalinti",
"can edit" => "gali redaguoti",
"access control" => "priėjimo kontrolė",
"create" => "sukurti",
diff --git a/core/l10n/lv.php b/core/l10n/lv.php
index 76188662fbb6fb59d817154712438c6506dded30..e3d668d0183a2754b490d9a8a847c68105192d8d 100644
--- a/core/l10n/lv.php
+++ b/core/l10n/lv.php
@@ -9,7 +9,7 @@
"Object type not provided." => "Objekta tips nav norādīts.",
"%s ID not provided." => "%s ID nav norādīts.",
"Error adding %s to favorites." => "Kļūda, pievienojot %s izlasei.",
-"No categories selected for deletion." => "Neviena kategorija nav izvēlēta dzēšanai",
+"No categories selected for deletion." => "Neviena kategorija nav izvēlēta dzēšanai.",
"Error removing %s from favorites." => "Kļūda, izņemot %s no izlases.",
"Sunday" => "Svētdiena",
"Monday" => "Pirmdiena",
@@ -44,11 +44,11 @@
"months ago" => "mēnešus atpakaļ",
"last year" => "gājušajā gadā",
"years ago" => "gadus atpakaļ",
-"Ok" => "Labi",
-"Cancel" => "Atcelt",
"Choose" => "Izvēlieties",
+"Cancel" => "Atcelt",
"Yes" => "Jā",
"No" => "Nē",
+"Ok" => "Labi",
"The object type is not specified." => "Nav norādīts objekta tips.",
"Error" => "Kļūda",
"The app name is not specified." => "Nav norādīts lietotnes nosaukums.",
@@ -72,7 +72,7 @@
"No people found" => "Nav atrastu cilvēku",
"Resharing is not allowed" => "Atkārtota dalīšanās nav atļauta",
"Shared in {item} with {user}" => "Dalījās ar {item} ar {user}",
-"Unshare" => "Beigt dalīties",
+"Unshare" => "Pārtraukt dalīšanos",
"can edit" => "var rediģēt",
"access control" => "piekļuves vadība",
"create" => "izveidot",
@@ -89,8 +89,6 @@
"ownCloud password reset" => "ownCloud paroles maiņa",
"Use the following link to reset your password: {link}" => "Izmantojiet šo saiti, lai mainītu paroli: {link}",
"You will receive a link to reset your password via Email." => "Jūs savā epastā saņemsiet interneta saiti, caur kuru varēsiet atjaunot paroli.",
-"Reset email send." => "Atstatīt e-pasta sūtīšanu.",
-"Request failed!" => "Pieprasījums neizdevās!",
"Username" => "Lietotājvārds",
"Request reset" => "Pieprasīt paroles maiņu",
"Your password was reset" => "Jūsu parole tika nomainīta",
@@ -100,7 +98,7 @@
"Personal" => "Personīgi",
"Users" => "Lietotāji",
"Apps" => "Lietotnes",
-"Admin" => "Administrators",
+"Admin" => "Administratori",
"Help" => "Palīdzība",
"Access forbidden" => "Pieeja ir liegta",
"Cloud not found" => "Mākonis netika atrasts",
diff --git a/core/l10n/mk.php b/core/l10n/mk.php
index 9743d8b299ec0b7c0e04e9ce23d98bd5b4192055..b0c39debb8a042a2cad28af24a1102e9627ad562 100644
--- a/core/l10n/mk.php
+++ b/core/l10n/mk.php
@@ -29,7 +29,7 @@
"October" => "Октомври",
"November" => "Ноември",
"December" => "Декември",
-"Settings" => "Поставки",
+"Settings" => "Подесувања",
"seconds ago" => "пред секунди",
"1 minute ago" => "пред 1 минута",
"{minutes} minutes ago" => "пред {minutes} минути",
@@ -43,11 +43,11 @@
"months ago" => "пред месеци",
"last year" => "минатата година",
"years ago" => "пред години",
-"Ok" => "Во ред",
-"Cancel" => "Откажи",
"Choose" => "Избери",
+"Cancel" => "Откажи",
"Yes" => "Да",
"No" => "Не",
+"Ok" => "Во ред",
"The object type is not specified." => "Не е специфициран типот на објект.",
"Error" => "Грешка",
"The app name is not specified." => "Името на апликацијата не е специфицирано.",
@@ -85,8 +85,6 @@
"ownCloud password reset" => "ресетирање на лозинка за ownCloud",
"Use the following link to reset your password: {link}" => "Користете ја следната врска да ја ресетирате Вашата лозинка: {link}",
"You will receive a link to reset your password via Email." => "Ќе добиете врска по е-пошта за да може да ја ресетирате Вашата лозинка.",
-"Reset email send." => "Порката за ресетирање на лозинка пратена.",
-"Request failed!" => "Барањето не успеа!",
"Username" => "Корисничко име",
"Request reset" => "Побарајте ресетирање",
"Your password was reset" => "Вашата лозинка беше ресетирана",
@@ -95,7 +93,7 @@
"Reset password" => "Ресетирај лозинка",
"Personal" => "Лично",
"Users" => "Корисници",
-"Apps" => "Апликации",
+"Apps" => "Аппликации",
"Admin" => "Админ",
"Help" => "Помош",
"Access forbidden" => "Забранет пристап",
diff --git a/core/l10n/ms_MY.php b/core/l10n/ms_MY.php
index d8a2cf88367df9b7aedddc9b5efe85b2fd0f1594..e7dc73a32c15fc7a545f5e1cb057537363d50781 100644
--- a/core/l10n/ms_MY.php
+++ b/core/l10n/ms_MY.php
@@ -1,6 +1,6 @@
"Tiada kategori untuk di tambah?",
-"No categories selected for deletion." => "tiada kategori dipilih untuk penghapusan",
+"No categories selected for deletion." => "Tiada kategori dipilih untuk dibuang.",
"Sunday" => "Ahad",
"Monday" => "Isnin",
"Tuesday" => "Selasa",
@@ -21,10 +21,10 @@
"November" => "November",
"December" => "Disember",
"Settings" => "Tetapan",
-"Ok" => "Ok",
"Cancel" => "Batal",
"Yes" => "Ya",
"No" => "Tidak",
+"Ok" => "Ok",
"Error" => "Ralat",
"Share" => "Kongsi",
"Password" => "Kata laluan",
@@ -44,7 +44,7 @@
"Help" => "Bantuan",
"Access forbidden" => "Larangan akses",
"Cloud not found" => "Awan tidak dijumpai",
-"Edit categories" => "Edit kategori",
+"Edit categories" => "Ubah kategori",
"Add" => "Tambah",
"Security Warning" => "Amaran keselamatan",
"Create an admin account" => "buat akaun admin",
diff --git a/core/l10n/my_MM.php b/core/l10n/my_MM.php
index ef8be954ede180a0a0a2d2097fbbb6d326e87fc7..6ea6a2c7bb52911c44f291c3b7b72002b1a06c7a 100644
--- a/core/l10n/my_MM.php
+++ b/core/l10n/my_MM.php
@@ -21,11 +21,11 @@
"last month" => "ပြီးခဲ့သောလ",
"last year" => "မနှစ်က",
"years ago" => "နှစ် အရင်က",
-"Ok" => "အိုကေ",
-"Cancel" => "ပယ်ဖျက်မည်",
"Choose" => "ရွေးချယ်",
+"Cancel" => "ပယ်ဖျက်မည်",
"Yes" => "ဟုတ်",
"No" => "မဟုတ်ဘူး",
+"Ok" => "အိုကေ",
"Password" => "စကားဝှက်",
"Set expiration date" => "သက်တမ်းကုန်ဆုံးမည့်ရက်သတ်မှတ်မည်",
"Expiration date" => "သက်တမ်းကုန်ဆုံးမည့်ရက်",
diff --git a/core/l10n/nb_NO.php b/core/l10n/nb_NO.php
index 4e1ee45eec9e5d60f2b8b1e426c33b366700dd1b..30d3f91df2ac2e37421bf22ffdab07af6bd343bb 100644
--- a/core/l10n/nb_NO.php
+++ b/core/l10n/nb_NO.php
@@ -34,11 +34,11 @@
"months ago" => "måneder siden",
"last year" => "forrige år",
"years ago" => "år siden",
-"Ok" => "Ok",
-"Cancel" => "Avbryt",
"Choose" => "Velg",
+"Cancel" => "Avbryt",
"Yes" => "Ja",
"No" => "Nei",
+"Ok" => "Ok",
"Error" => "Feil",
"Share" => "Del",
"Error while sharing" => "Feil under deling",
@@ -92,7 +92,7 @@
"Database tablespace" => "Database tabellområde",
"Database host" => "Databasevert",
"Finish setup" => "Fullfør oppsetting",
-"web services under your control" => "nettjenester under din kontroll",
+"web services under your control" => "web tjenester du kontrollerer",
"Log out" => "Logg ut",
"Automatic logon rejected!" => "Automatisk pålogging avvist!",
"If you did not change your password recently, your account may be compromised!" => "Hvis du ikke har endret passordet ditt nylig kan kontoen din være kompromitert",
diff --git a/core/l10n/nl.php b/core/l10n/nl.php
index 5e050c33becb5a7b3d4e284d57dee1e7a282c9ea..a39f34fb90c43023b065dd40f72a6a12ceecc789 100644
--- a/core/l10n/nl.php
+++ b/core/l10n/nl.php
@@ -44,11 +44,11 @@
"months ago" => "maanden geleden",
"last year" => "vorig jaar",
"years ago" => "jaar geleden",
-"Ok" => "Ok",
-"Cancel" => "Annuleren",
"Choose" => "Kies",
+"Cancel" => "Annuleer",
"Yes" => "Ja",
"No" => "Nee",
+"Ok" => "Ok",
"The object type is not specified." => "Het object type is niet gespecificeerd.",
"Error" => "Fout",
"The app name is not specified." => "De app naam is niet gespecificeerd.",
@@ -75,7 +75,7 @@
"Unshare" => "Stop met delen",
"can edit" => "kan wijzigen",
"access control" => "toegangscontrole",
-"create" => "maak",
+"create" => "creëer",
"update" => "bijwerken",
"delete" => "verwijderen",
"share" => "deel",
@@ -88,14 +88,14 @@
"The update was successful. Redirecting you to ownCloud now." => "De update is geslaagd. U wordt teruggeleid naar uw eigen ownCloud.",
"ownCloud password reset" => "ownCloud wachtwoord herstellen",
"Use the following link to reset your password: {link}" => "Gebruik de volgende link om je wachtwoord te resetten: {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 voor het resetten van uw wachtwoord is verzonden naar uw e-mailadres. Als u dat bericht niet snel ontvangen hebt, controleer dan uw spambakje. Als het daar ook niet is, vraag dan uw beheerder om te helpen.",
+"Request failed! Did you make sure your email/username was right?" => "Aanvraag mislukt! Weet u zeker dat uw gebruikersnaam en/of wachtwoord goed waren?",
"You will receive a link to reset your password via Email." => "U ontvangt een link om uw wachtwoord opnieuw in te stellen via e-mail.",
-"Reset email send." => "Reset e-mail verstuurd.",
-"Request failed!" => "Verzoek mislukt!",
"Username" => "Gebruikersnaam",
"Request reset" => "Resetaanvraag",
"Your password was reset" => "Je wachtwoord is gewijzigd",
"To login page" => "Naar de login-pagina",
-"New password" => "Nieuw wachtwoord",
+"New password" => "Nieuw",
"Reset password" => "Reset wachtwoord",
"Personal" => "Persoonlijk",
"Users" => "Gebruikers",
@@ -104,7 +104,7 @@
"Help" => "Help",
"Access forbidden" => "Toegang verboden",
"Cloud not found" => "Cloud niet gevonden",
-"Edit categories" => "Wijzigen categorieën",
+"Edit categories" => "Wijzig categorieën",
"Add" => "Toevoegen",
"Security Warning" => "Beveiligingswaarschuwing",
"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Uw PHP versie is kwetsbaar voor de NULL byte aanval (CVE-2006-7243)",
@@ -125,6 +125,7 @@
"Database host" => "Database server",
"Finish setup" => "Installatie afronden",
"web services under your control" => "Webdiensten in eigen beheer",
+"%s is available. Get more information on how to update." => "%s is beschikbaar. Verkrijg meer informatie over het bijwerken.",
"Log out" => "Afmelden",
"Automatic logon rejected!" => "Automatische aanmelding geweigerd!",
"If you did not change your password recently, your account may be compromised!" => "Als u uw wachtwoord niet onlangs heeft aangepast, kan uw account overgenomen zijn!",
diff --git a/core/l10n/nn_NO.php b/core/l10n/nn_NO.php
index 61b2baffbf2136be5b10399e49d9510d603ba8c0..de181ccc7ad791cb529555aa196d8a80dd02e19d 100644
--- a/core/l10n/nn_NO.php
+++ b/core/l10n/nn_NO.php
@@ -1,4 +1,16 @@
"Brukaren %s delte ei fil med deg",
+"User %s shared a folder with you" => "Brukaren %s delte ei mappe med deg",
+"User %s shared the file \"%s\" with you. It is available for download here: %s" => "Brukaren %s delte fila «%s» med deg. Du kan lasta ho ned her: %s",
+"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "Brukaren %s delte mappa «%s» med deg. Du kan lasta ho ned her: %s",
+"Category type not provided." => "Ingen kategoritype.",
+"No category to add?" => "Ingen kategori å leggja til?",
+"This category already exists: %s" => "Denne kategorien finst alt: %s",
+"Object type not provided." => "Ingen objekttype.",
+"%s ID not provided." => "Ingen %s-ID.",
+"Error adding %s to favorites." => "Klarte ikkje leggja til %s i favorittar.",
+"No categories selected for deletion." => "Ingen kategoriar valt for sletting.",
+"Error removing %s from favorites." => "Klarte ikkje fjerna %s frå favorittar.",
"Sunday" => "Søndag",
"Monday" => "Måndag",
"Tuesday" => "Tysdag",
@@ -19,39 +31,110 @@
"November" => "November",
"December" => "Desember",
"Settings" => "Innstillingar",
-"Cancel" => "Kanseller",
+"seconds ago" => "sekund sidan",
+"1 minute ago" => "1 minutt sidan",
+"{minutes} minutes ago" => "{minutes} minutt sidan",
+"1 hour ago" => "1 time sidan",
+"{hours} hours ago" => "{hours} timar sidan",
+"today" => "i dag",
+"yesterday" => "i går",
+"{days} days ago" => "{days} dagar sidan",
+"last month" => "førre månad",
+"{months} months ago" => "{months} månadar sidan",
+"months ago" => "månadar sidan",
+"last year" => "i fjor",
+"years ago" => "år sidan",
+"Choose" => "Vel",
+"Cancel" => "Avbryt",
+"Yes" => "Ja",
+"No" => "Nei",
+"Ok" => "Greitt",
+"The object type is not specified." => "Objekttypen er ikkje spesifisert.",
"Error" => "Feil",
+"The app name is not specified." => "Programnamnet er ikkje spesifisert.",
+"The required file {file} is not installed!" => "Den kravde fila {file} er ikkje installert!",
+"Shared" => "Delt",
+"Share" => "Del",
+"Error while sharing" => "Feil ved deling",
+"Error while unsharing" => "Feil ved udeling",
+"Error while changing permissions" => "Feil ved endring av tillatingar",
+"Shared with you and the group {group} by {owner}" => "Delt med deg og gruppa {group} av {owner}",
+"Shared with you by {owner}" => "Delt med deg av {owner}",
+"Share with" => "Del med",
+"Share with link" => "Del med lenkje",
+"Password protect" => "Passordvern",
"Password" => "Passord",
-"Use the following link to reset your password: {link}" => "Bruk føljane link til å tilbakestille passordet ditt: {link}",
-"You will receive a link to reset your password via Email." => "Du vil få ei lenkje for å nullstilla passordet via epost.",
+"Email link to person" => "Send lenkja over e-post",
+"Send" => "Send",
+"Set expiration date" => "Set utløpsdato",
+"Expiration date" => "Utløpsdato",
+"Share via email:" => "Del over e-post:",
+"No people found" => "Fann ingen personar",
+"Resharing is not allowed" => "Vidaredeling er ikkje tillate",
+"Shared in {item} with {user}" => "Delt i {item} med {brukar}",
+"Unshare" => "Udel",
+"can edit" => "kan endra",
+"access control" => "tilgangskontroll",
+"create" => "lag",
+"update" => "oppdater",
+"delete" => "slett",
+"share" => "del",
+"Password protected" => "Passordverna",
+"Error unsetting expiration date" => "Klarte ikkje fjerna utløpsdato",
+"Error setting expiration date" => "Klarte ikkje setja utløpsdato",
+"Sending ..." => "Sender …",
+"Email sent" => "E-post sendt",
+"The update was unsuccessful. Please report this issue to the ownCloud community." => "Oppdateringa feila. Ver venleg og rapporter feilen til ownCloud-fellesskapet.",
+"The update was successful. Redirecting you to ownCloud now." => "Oppdateringa er fullført. Sender deg vidare til ownCloud no.",
+"ownCloud password reset" => "Nullstilling av ownCloud-passord",
+"Use the following link to reset your password: {link}" => "Klikk følgjande lenkje til å nullstilla passordet ditt: {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 ." => "Lenkja til å nullstilla passordet med er sendt til e-posten din. Sjå i spam-/søppelmappa di viss du ikkje ser e-posten innan rimeleg tid. Spør din lokale administrator viss han ikkje er der heller.",
+"Request failed! Did you make sure your email/username was right?" => "Førespurnaden feila! Er du viss på at du skreiv inn rett e-post/brukarnamn?",
+"You will receive a link to reset your password via Email." => "Du vil få ein e-post med ei lenkje for å nullstilla passordet.",
"Username" => "Brukarnamn",
"Request reset" => "Be om nullstilling",
"Your password was reset" => "Passordet ditt er nullstilt",
-"To login page" => "Til innloggings sida",
+"To login page" => "Til innloggingssida",
"New password" => "Nytt passord",
"Reset password" => "Nullstill passord",
"Personal" => "Personleg",
"Users" => "Brukarar",
-"Apps" => "Applikasjonar",
-"Admin" => "Administrer",
+"Apps" => "Program",
+"Admin" => "Admin",
"Help" => "Hjelp",
+"Access forbidden" => "Tilgang forbudt",
"Cloud not found" => "Fann ikkje skyen",
+"Edit categories" => "Endra kategoriar",
"Add" => "Legg til",
+"Security Warning" => "Tryggleiksåtvaring",
+"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "PHP-utgåva di er sårbar for NULL-byteåtaket (CVE-2006-7243)",
+"Please update your PHP installation to use ownCloud securely." => "Ver venleg og oppdater PHP-installasjonen din så han køyrer ownCloud på ein trygg måte.",
+"No secure random number generator is available, please enable the PHP OpenSSL extension." => "Ingen tilgjengeleg tilfeldig nummer-generator, ver venleg og aktiver OpenSSL-utvidinga i PHP.",
+"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Utan ein trygg tilfeldig nummer-generator er det enklare for ein åtakar å gjetta seg fram til passordnullstillingskodar og dimed ta over kontoen din.",
+"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Datamappa og filene dine er sannsynlegvis tilgjengelege frå Internett sidan .htaccess-fila ikkje fungerer.",
+"For information how to properly configure your server, please see the documentation." => "Ver venleg og les dokumentasjonen for å læra korleis du set opp tenaren din på rett måte.",
"Create an admin account" => "Lag ein admin-konto",
"Advanced" => "Avansert",
"Data folder" => "Datamappe",
-"Configure the database" => "Konfigurer databasen",
-"will be used" => "vil bli nytta",
+"Configure the database" => "Set opp databasen",
+"will be used" => "vil verta nytta",
"Database user" => "Databasebrukar",
"Database password" => "Databasepassord",
"Database name" => "Databasenamn",
+"Database tablespace" => "Tabellnamnrom for database",
"Database host" => "Databasetenar",
"Finish setup" => "Fullfør oppsettet",
-"web services under your control" => "Vev tjenester under din kontroll",
+"web services under your control" => "Vevtenester under din kontroll",
+"%s is available. Get more information on how to update." => "%s er tilgjengeleg. Få meir informasjon om korleis du oppdaterer.",
"Log out" => "Logg ut",
+"Automatic logon rejected!" => "Automatisk innlogging avvist!",
+"If you did not change your password recently, your account may be compromised!" => "Viss du ikkje endra passordet ditt nyleg, så kan kontoen din vera kompromittert!",
+"Please change your password to secure your account again." => "Ver venleg og endra passordet for å gjera kontoen din trygg igjen.",
"Lost your password?" => "Gløymt passordet?",
"remember" => "hugs",
"Log in" => "Logg inn",
+"Alternative Logins" => "Alternative innloggingar",
"prev" => "førre",
-"next" => "neste"
+"next" => "neste",
+"Updating ownCloud to version %s, this may take a while." => "Oppdaterer ownCloud til utgåve %s, dette kan ta ei stund."
);
diff --git a/core/l10n/oc.php b/core/l10n/oc.php
index ec432d495a44c8c65a4a218f73a9c594230575fa..1d14428f183743d2f2ce37de06f3ac08153d9f53 100644
--- a/core/l10n/oc.php
+++ b/core/l10n/oc.php
@@ -8,16 +8,16 @@
"Thursday" => "Dijòus",
"Friday" => "Divendres",
"Saturday" => "Dissabte",
-"January" => "Genièr",
-"February" => "Febrièr",
-"March" => "Març",
-"April" => "Abril",
-"May" => "Mai",
-"June" => "Junh",
-"July" => "Julhet",
-"August" => "Agost",
-"September" => "Septembre",
-"October" => "Octobre",
+"January" => "genièr",
+"February" => "febrièr",
+"March" => "març",
+"April" => "abril",
+"May" => "mai",
+"June" => "junh",
+"July" => "julhet",
+"August" => "agost",
+"September" => "septembre",
+"October" => "octobre",
"November" => "Novembre",
"December" => "Decembre",
"Settings" => "Configuracion",
@@ -29,11 +29,11 @@
"months ago" => "meses a",
"last year" => "an passat",
"years ago" => "ans a",
-"Ok" => "D'accòrdi",
-"Cancel" => "Anulla",
"Choose" => "Causís",
+"Cancel" => "Annula",
"Yes" => "Òc",
"No" => "Non",
+"Ok" => "D'accòrdi",
"Error" => "Error",
"Share" => "Parteja",
"Error while sharing" => "Error al partejar",
@@ -48,7 +48,7 @@
"Share via email:" => "Parteja tras corrièl :",
"No people found" => "Deguns trobat",
"Resharing is not allowed" => "Tornar partejar es pas permis",
-"Unshare" => "Non parteje",
+"Unshare" => "Pas partejador",
"can edit" => "pòt modificar",
"access control" => "Contraròtle d'acces",
"create" => "crea",
@@ -61,11 +61,11 @@
"ownCloud password reset" => "senhal d'ownCloud tornat botar",
"Use the following link to reset your password: {link}" => "Utiliza lo ligam seguent per tornar botar lo senhal : {link}",
"You will receive a link to reset your password via Email." => "Reçaupràs un ligam per tornar botar ton senhal via corrièl.",
-"Username" => "Nom d'usancièr",
+"Username" => "Non d'usancièr",
"Request reset" => "Tornar botar requesit",
"Your password was reset" => "Ton senhal es estat tornat botar",
"To login page" => "Pagina cap al login",
-"New password" => "Senhal nòu",
+"New password" => "Senhal novèl",
"Reset password" => "Senhal tornat botar",
"Personal" => "Personal",
"Users" => "Usancièrs",
diff --git a/core/l10n/pl.php b/core/l10n/pl.php
index 2821bf77eed074c058ef7952938131908dcddc6f..335dda6f4d0d2d66d7a5fb3700721badd8853bd6 100644
--- a/core/l10n/pl.php
+++ b/core/l10n/pl.php
@@ -44,11 +44,11 @@
"months ago" => "miesięcy temu",
"last year" => "w zeszłym roku",
"years ago" => "lat temu",
-"Ok" => "OK",
-"Cancel" => "Anuluj",
"Choose" => "Wybierz",
+"Cancel" => "Anuluj",
"Yes" => "Tak",
"No" => "Nie",
+"Ok" => "OK",
"The object type is not specified." => "Nie określono typu obiektu.",
"Error" => "Błąd",
"The app name is not specified." => "Nie określono nazwy aplikacji.",
@@ -88,9 +88,9 @@
"The update was successful. Redirecting you to ownCloud now." => "Aktualizacji zakończyła się powodzeniem. Przekierowuję do ownCloud.",
"ownCloud password reset" => "restart hasła ownCloud",
"Use the following link to reset your password: {link}" => "Użyj tego odnośnika by zresetować hasło: {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 ." => "Link do zresetowania hasła została wysłana na adres email. Jeśli nie otrzymasz go w najbliższym czasie, sprawdź folder ze spamem. Jeśli go tam nie ma zwrócić się do administratora tego ownCloud-a.",
+"Request failed! Did you make sure your email/username was right?" => "Żądanie niepowiodło się! Czy Twój email/nazwa użytkownika są poprawne?",
"You will receive a link to reset your password via Email." => "Odnośnik służący do resetowania hasła zostanie wysłany na adres e-mail.",
-"Reset email send." => "Wysłano e-mail resetujący.",
-"Request failed!" => "Żądanie nieudane!",
"Username" => "Nazwa użytkownika",
"Request reset" => "Żądanie resetowania",
"Your password was reset" => "Zresetowano hasło",
@@ -124,7 +124,8 @@
"Database tablespace" => "Obszar tabel bazy danych",
"Database host" => "Komputer bazy danych",
"Finish setup" => "Zakończ konfigurowanie",
-"web services under your control" => "usługi internetowe pod kontrolą",
+"web services under your control" => "Kontrolowane serwisy",
+"%s is available. Get more information on how to update." => "%s jest dostępna. Dowiedz się więcej na temat aktualizacji.",
"Log out" => "Wyloguj",
"Automatic logon rejected!" => "Automatyczne logowanie odrzucone!",
"If you did not change your password recently, your account may be compromised!" => "Jeśli hasło było dawno niezmieniane, twoje konto może być zagrożone!",
diff --git a/core/l10n/pt_BR.php b/core/l10n/pt_BR.php
index e5acd4da8f6bdfbddcd2a3adb131c8ab32d0cedc..9ce255980cea916896b72110e977978e12f20605 100644
--- a/core/l10n/pt_BR.php
+++ b/core/l10n/pt_BR.php
@@ -9,7 +9,7 @@
"Object type not provided." => "tipo de objeto não fornecido.",
"%s ID not provided." => "%s ID não fornecido(s).",
"Error adding %s to favorites." => "Erro ao adicionar %s aos favoritos.",
-"No categories selected for deletion." => "Nenhuma categoria selecionada para excluir.",
+"No categories selected for deletion." => "Nenhuma categoria selecionada para remoção.",
"Error removing %s from favorites." => "Erro ao remover %s dos favoritos.",
"Sunday" => "Domingo",
"Monday" => "Segunda-feira",
@@ -30,7 +30,7 @@
"October" => "outubro",
"November" => "novembro",
"December" => "dezembro",
-"Settings" => "Configurações",
+"Settings" => "Ajustes",
"seconds ago" => "segundos atrás",
"1 minute ago" => "1 minuto atrás",
"{minutes} minutes ago" => "{minutes} minutos atrás",
@@ -44,11 +44,11 @@
"months ago" => "meses atrás",
"last year" => "último ano",
"years ago" => "anos atrás",
-"Ok" => "Ok",
-"Cancel" => "Cancelar",
"Choose" => "Escolha",
+"Cancel" => "Cancelar",
"Yes" => "Sim",
"No" => "Não",
+"Ok" => "Ok",
"The object type is not specified." => "O tipo de objeto não foi especificado.",
"Error" => "Erro",
"The app name is not specified." => "O nome do app não foi especificado.",
@@ -88,10 +88,10 @@
"The update was successful. Redirecting you to ownCloud now." => "A atualização teve êxito. Você será redirecionado ao ownCloud agora.",
"ownCloud password reset" => "Redefinir senha ownCloud",
"Use the following link to reset your password: {link}" => "Use o seguinte link para redefinir sua senha: {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 ." => "O link para redefinir sua senha foi enviada para o seu e-mail. Se você não recebê-lo dentro de um período razoável de tempo, verifique o spam/lixo. Se ele não estiver lá perguntar ao seu administrador local.",
+"Request failed! Did you make sure your email/username was right?" => "O pedido falhou! Certifique-se que seu e-mail/username estavam corretos?",
"You will receive a link to reset your password via Email." => "Você receberá um link para redefinir sua senha por e-mail.",
-"Reset email send." => "Email de redefinição de senha enviado.",
-"Request failed!" => "A requisição falhou!",
-"Username" => "Nome de Usuário",
+"Username" => "Nome de usuário",
"Request reset" => "Pedir redefinição",
"Your password was reset" => "Sua senha foi redefinida",
"To login page" => "Para a página de login",
@@ -99,7 +99,7 @@
"Reset password" => "Redefinir senha",
"Personal" => "Pessoal",
"Users" => "Usuários",
-"Apps" => "Apps",
+"Apps" => "Aplicações",
"Admin" => "Admin",
"Help" => "Ajuda",
"Access forbidden" => "Acesso proibido",
@@ -125,6 +125,7 @@
"Database host" => "Host do banco de dados",
"Finish setup" => "Concluir configuração",
"web services under your control" => "serviços web sob seu controle",
+"%s is available. Get more information on how to update." => "%s está disponível. Obtenha mais informações sobre como atualizar.",
"Log out" => "Sair",
"Automatic logon rejected!" => "Entrada Automática no Sistema Rejeitada!",
"If you did not change your password recently, your account may be compromised!" => "Se você não mudou a sua senha recentemente, a sua conta pode estar comprometida!",
diff --git a/core/l10n/pt_PT.php b/core/l10n/pt_PT.php
index 67d43e372a14075eb60efaeb73dd80a5d3fd6ab8..0b2f511cb8ef77f0e8e12e80ac2caa2f7b4662c5 100644
--- a/core/l10n/pt_PT.php
+++ b/core/l10n/pt_PT.php
@@ -9,7 +9,7 @@
"Object type not provided." => "Tipo de objecto não fornecido",
"%s ID not provided." => "ID %s não fornecido",
"Error adding %s to favorites." => "Erro a adicionar %s aos favoritos",
-"No categories selected for deletion." => "Nenhuma categoria seleccionada para apagar",
+"No categories selected for deletion." => "Nenhuma categoria seleccionada para eliminar.",
"Error removing %s from favorites." => "Erro a remover %s dos favoritos.",
"Sunday" => "Domingo",
"Monday" => "Segunda",
@@ -30,11 +30,11 @@
"October" => "Outubro",
"November" => "Novembro",
"December" => "Dezembro",
-"Settings" => "Definições",
+"Settings" => "Configurações",
"seconds ago" => "Minutos atrás",
"1 minute ago" => "Há 1 minuto",
"{minutes} minutes ago" => "{minutes} minutos atrás",
-"1 hour ago" => "Há 1 hora",
+"1 hour ago" => "Há 1 horas",
"{hours} hours ago" => "Há {hours} horas atrás",
"today" => "hoje",
"yesterday" => "ontem",
@@ -44,11 +44,11 @@
"months ago" => "meses atrás",
"last year" => "ano passado",
"years ago" => "anos atrás",
-"Ok" => "Ok",
-"Cancel" => "Cancelar",
"Choose" => "Escolha",
+"Cancel" => "Cancelar",
"Yes" => "Sim",
"No" => "Não",
+"Ok" => "Ok",
"The object type is not specified." => "O tipo de objecto não foi especificado",
"Error" => "Erro",
"The app name is not specified." => "O nome da aplicação não foi especificado",
@@ -63,7 +63,7 @@
"Share with" => "Partilhar com",
"Share with link" => "Partilhar com link",
"Password protect" => "Proteger com palavra-passe",
-"Password" => "Palavra chave",
+"Password" => "Password",
"Email link to person" => "Enviar o link por e-mail",
"Send" => "Enviar",
"Set expiration date" => "Especificar data de expiração",
@@ -88,14 +88,14 @@
"The update was successful. Redirecting you to ownCloud now." => "A actualização foi concluída com sucesso. Vai ser redireccionado para o ownCloud agora.",
"ownCloud password reset" => "Reposição da password ownCloud",
"Use the following link to reset your password: {link}" => "Use o seguinte endereço para repor a sua password: {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 ." => "O link para fazer reset à sua password foi enviado para o seu e-mail. Se não o recebeu dentro um espaço de tempo aceitável, por favor verifique a sua pasta de SPAM. Se não o encontrar, por favor contacte o seu administrador.",
+"Request failed! Did you make sure your email/username was right?" => "O pedido falhou! Tem a certeza que introduziu o seu email/username correcto?",
"You will receive a link to reset your password via Email." => "Vai receber um endereço para repor a sua password",
-"Reset email send." => "E-mail de reinicialização enviado.",
-"Request failed!" => "O pedido falhou!",
-"Username" => "Utilizador",
+"Username" => "Nome de utilizador",
"Request reset" => "Pedir reposição",
"Your password was reset" => "A sua password foi reposta",
"To login page" => "Para a página de entrada",
-"New password" => "Nova password",
+"New password" => "Nova palavra-chave",
"Reset password" => "Repor password",
"Personal" => "Pessoal",
"Users" => "Utilizadores",
@@ -125,6 +125,7 @@
"Database host" => "Anfitrião da base de dados",
"Finish setup" => "Acabar instalação",
"web services under your control" => "serviços web sob o seu controlo",
+"%s is available. Get more information on how to update." => "%s está disponível. Tenha mais informações como actualizar.",
"Log out" => "Sair",
"Automatic logon rejected!" => "Login automático rejeitado!",
"If you did not change your password recently, your account may be compromised!" => "Se não mudou a sua palavra-passe recentemente, a sua conta pode ter sido comprometida!",
diff --git a/core/l10n/ro.php b/core/l10n/ro.php
index 51c1523d7e01a529a91198c930d51c89e2446b0d..3d25a5f042bbec9e59d1f47e8d3ac37c152e2686 100644
--- a/core/l10n/ro.php
+++ b/core/l10n/ro.php
@@ -5,6 +5,7 @@
"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "Utilizatorul %s a partajat dosarul \"%s\" cu tine. Îl poți descărca de aici: %s ",
"Category type not provided." => "Tipul de categorie nu este prevazut",
"No category to add?" => "Nici o categorie de adăugat?",
+"This category already exists: %s" => "Această categorie deja există: %s",
"Object type not provided." => "Tipul obiectului nu este prevazut",
"%s ID not provided." => "ID-ul %s nu a fost introdus",
"Error adding %s to favorites." => "Eroare la adăugarea %s la favorite",
@@ -29,7 +30,7 @@
"October" => "Octombrie",
"November" => "Noiembrie",
"December" => "Decembrie",
-"Settings" => "Configurări",
+"Settings" => "Setări",
"seconds ago" => "secunde în urmă",
"1 minute ago" => "1 minut în urmă",
"{minutes} minutes ago" => "{minutes} minute in urma",
@@ -43,15 +44,16 @@
"months ago" => "luni în urmă",
"last year" => "ultimul an",
"years ago" => "ani în urmă",
-"Ok" => "Ok",
-"Cancel" => "Anulare",
"Choose" => "Alege",
+"Cancel" => "Anulare",
"Yes" => "Da",
"No" => "Nu",
+"Ok" => "Ok",
"The object type is not specified." => "Tipul obiectului nu a fost specificat",
"Error" => "Eroare",
"The app name is not specified." => "Numele aplicației nu a fost specificat",
"The required file {file} is not installed!" => "Fișierul obligatoriu {file} nu este instalat!",
+"Shared" => "Partajat",
"Share" => "Partajează",
"Error while sharing" => "Eroare la partajare",
"Error while unsharing" => "Eroare la anularea partajării",
@@ -61,7 +63,7 @@
"Share with" => "Partajat cu",
"Share with link" => "Partajare cu legătură",
"Password protect" => "Protejare cu parolă",
-"Password" => "Parola",
+"Password" => "Parolă",
"Email link to person" => "Expediază legătura prin poșta electronică",
"Send" => "Expediază",
"Set expiration date" => "Specifică data expirării",
@@ -82,12 +84,14 @@
"Error setting expiration date" => "Eroare la specificarea datei de expirare",
"Sending ..." => "Se expediază...",
"Email sent" => "Mesajul a fost expediat",
+"The update was unsuccessful. Please report this issue to the ownCloud community." => "Modernizarea a eșuat! Te rugam sa raportezi problema aici..",
+"The update was successful. Redirecting you to ownCloud now." => "Modernizare reusita! Vei fii redirectionat!",
"ownCloud password reset" => "Resetarea parolei ownCloud ",
"Use the following link to reset your password: {link}" => "Folosește următorul link pentru a reseta parola: {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 ." => "Linkul pentru resetarea parolei tale a fost trimis pe email. Daca nu ai primit email-ul intr-un timp rezonabil, verifica folderul spam/junk. Daca nu sunt acolo intreaba administratorul local.",
+"Request failed! Did you make sure your email/username was right?" => "Cerere esuata! Esti sigur ca email-ul/numele de utilizator sunt corecte?",
"You will receive a link to reset your password via Email." => "Vei primi un mesaj prin care vei putea reseta parola via email",
-"Reset email send." => "Resetarea emailu-lui trimisa.",
-"Request failed!" => "Solicitarea nu a reusit",
-"Username" => "Utilizator",
+"Username" => "Nume utilizator",
"Request reset" => "Cerere trimisă",
"Your password was reset" => "Parola a fost resetată",
"To login page" => "Spre pagina de autentificare",
@@ -96,15 +100,19 @@
"Personal" => "Personal",
"Users" => "Utilizatori",
"Apps" => "Aplicații",
-"Admin" => "Administrator",
+"Admin" => "Admin",
"Help" => "Ajutor",
"Access forbidden" => "Acces interzis",
"Cloud not found" => "Nu s-a găsit",
-"Edit categories" => "Editează categoriile",
+"Edit categories" => "Editează categorii",
"Add" => "Adaugă",
"Security Warning" => "Avertisment de securitate",
+"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Versiunea dvs. PHP este vulnerabil la acest atac un octet null (CVE-2006-7243)",
+"Please update your PHP installation to use ownCloud securely." => "Vă rugăm să actualizați instalarea dvs. PHP pentru a utiliza ownCloud in siguranță.",
"No secure random number generator is available, please enable the PHP OpenSSL extension." => "Generatorul de numere pentru securitate nu este disponibil, va rog activati extensia PHP OpenSSL",
"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Fara generatorul pentru numere de securitate , un atacator poate afla parola si reseta contul tau",
+"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Directorul de date și fișiere sunt, probabil, accesibile de pe Internet, deoarece .htaccess nu funcționează.",
+"For information how to properly configure your server, please see the documentation." => "Pentru informatii despre configurarea corecta a serverului accesati pagina Documentare.",
"Create an admin account" => "Crează un cont de administrator",
"Advanced" => "Avansat",
"Data folder" => "Director date",
@@ -124,6 +132,7 @@
"Lost your password?" => "Ai uitat parola?",
"remember" => "amintește",
"Log in" => "Autentificare",
+"Alternative Logins" => "Conectări alternative",
"prev" => "precedentul",
"next" => "următorul",
"Updating ownCloud to version %s, this may take a while." => "Actualizăm ownCloud la versiunea %s, aceasta poate dura câteva momente."
diff --git a/core/l10n/ru.php b/core/l10n/ru.php
index 0625a5d11d4f377a0007d9ff7d3bdf3d64e07add..781eb1bbfa8c9c48da01d6cdfd1cfaf8567f55ef 100644
--- a/core/l10n/ru.php
+++ b/core/l10n/ru.php
@@ -30,7 +30,7 @@
"October" => "Октябрь",
"November" => "Ноябрь",
"December" => "Декабрь",
-"Settings" => "Настройки",
+"Settings" => "Конфигурация",
"seconds ago" => "несколько секунд назад",
"1 minute ago" => "1 минуту назад",
"{minutes} minutes ago" => "{minutes} минут назад",
@@ -44,11 +44,11 @@
"months ago" => "несколько месяцев назад",
"last year" => "в прошлом году",
"years ago" => "несколько лет назад",
-"Ok" => "Ок",
-"Cancel" => "Отмена",
"Choose" => "Выбрать",
+"Cancel" => "Отменить",
"Yes" => "Да",
"No" => "Нет",
+"Ok" => "Ок",
"The object type is not specified." => "Тип объекта не указан",
"Error" => "Ошибка",
"The app name is not specified." => "Имя приложения не указано",
@@ -88,9 +88,9 @@
"The update was successful. Redirecting you to ownCloud now." => "Обновление прошло успешно. Перенаправляемся в Ваш ownCloud...",
"ownCloud password reset" => "Сброс пароля ",
"Use the following link to reset your password: {link}" => "Используйте следующую ссылку чтобы сбросить пароль: {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?" => "Что-то не так. Вы уверены что Email / Имя пользователя указаны верно?",
"You will receive a link to reset your password via Email." => "На ваш адрес Email выслана ссылка для сброса пароля.",
-"Reset email send." => "Отправка письма с информацией для сброса.",
-"Request failed!" => "Запрос не удался!",
"Username" => "Имя пользователя",
"Request reset" => "Запросить сброс",
"Your password was reset" => "Ваш пароль был сброшен",
@@ -100,11 +100,11 @@
"Personal" => "Личное",
"Users" => "Пользователи",
"Apps" => "Приложения",
-"Admin" => "Администратор",
+"Admin" => "Admin",
"Help" => "Помощь",
"Access forbidden" => "Доступ запрещён",
"Cloud not found" => "Облако не найдено",
-"Edit categories" => "Редактировать категории",
+"Edit categories" => "Редактировать категрии",
"Add" => "Добавить",
"Security Warning" => "Предупреждение безопасности",
"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Ваша версия PHP уязвима к атаке NULL Byte (CVE-2006-7243)",
@@ -124,7 +124,8 @@
"Database tablespace" => "Табличое пространство базы данных",
"Database host" => "Хост базы данных",
"Finish setup" => "Завершить установку",
-"web services under your control" => "Сетевые службы под твоим контролем",
+"web services under your control" => "веб-сервисы под вашим управлением",
+"%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!" => "Если Вы недавно не меняли свой пароль, то Ваша учетная запись может быть скомпрометирована!",
diff --git a/core/l10n/ru_RU.php b/core/l10n/ru_RU.php
index 1afb9e20c9bce823f2e784d4fc36bee0f2857cab..580df5961f80b764fa4dd88d58add1a9aada8036 100644
--- a/core/l10n/ru_RU.php
+++ b/core/l10n/ru_RU.php
@@ -1,137 +1,7 @@
"Пользователь %s открыл Вам доступ к файлу",
-"User %s shared a folder with you" => "Пользователь %s открыл Вам доступ к папке",
-"User %s shared the file \"%s\" with you. It is available for download here: %s" => "Пользователь %s открыл Вам доступ к файлу \"%s\". Он доступен для загрузки здесь: %s",
-"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "Пользователь %s открыл Вам доступ к папке \"%s\". Она доступена для загрузки здесь: %s",
-"Category type not provided." => "Тип категории не предоставлен.",
-"No category to add?" => "Нет категории для добавления?",
-"This category already exists: %s" => "Эта категория уже существует: %s",
-"Object type not provided." => "Тип объекта не предоставлен.",
-"%s ID not provided." => "%s ID не предоставлен.",
-"Error adding %s to favorites." => "Ошибка добавления %s в избранное.",
-"No categories selected for deletion." => "Нет категорий, выбранных для удаления.",
-"Error removing %s from favorites." => "Ошибка удаления %s из избранного.",
-"Sunday" => "Воскресенье",
-"Monday" => "Понедельник",
-"Tuesday" => "Вторник",
-"Wednesday" => "Среда",
-"Thursday" => "Четверг",
-"Friday" => "Пятница",
-"Saturday" => "Суббота",
-"January" => "Январь",
-"February" => "Февраль",
-"March" => "Март",
-"April" => "Апрель",
-"May" => "Май",
-"June" => "Июнь",
-"July" => "Июль",
-"August" => "Август",
-"September" => "Сентябрь",
-"October" => "Октябрь",
-"November" => "Ноябрь",
-"December" => "Декабрь",
"Settings" => "Настройки",
-"seconds ago" => "секунд назад",
-"1 minute ago" => " 1 минуту назад",
-"{minutes} minutes ago" => "{минуты} минут назад",
-"1 hour ago" => "1 час назад",
-"{hours} hours ago" => "{часы} часов назад",
-"today" => "сегодня",
-"yesterday" => "вчера",
-"{days} days ago" => "{дни} дней назад",
-"last month" => "в прошлом месяце",
-"{months} months ago" => "{месяцы} месяцев назад",
-"months ago" => "месяц назад",
-"last year" => "в прошлом году",
-"years ago" => "лет назад",
-"Ok" => "Да",
"Cancel" => "Отмена",
-"Choose" => "Выбрать",
-"Yes" => "Да",
-"No" => "Нет",
-"The object type is not specified." => "Тип объекта не указан.",
"Error" => "Ошибка",
-"The app name is not specified." => "Имя приложения не указано.",
-"The required file {file} is not installed!" => "Требуемый файл {файл} не установлен!",
-"Shared" => "Опубликовано",
"Share" => "Сделать общим",
-"Error while sharing" => "Ошибка создания общего доступа",
-"Error while unsharing" => "Ошибка отключения общего доступа",
-"Error while changing permissions" => "Ошибка при изменении прав доступа",
-"Shared with you and the group {group} by {owner}" => "Опубликовано для Вас и группы {группа} {собственник}",
-"Shared with you by {owner}" => "Опубликовано для Вас {собственник}",
-"Share with" => "Сделать общим с",
-"Share with link" => "Опубликовать с ссылкой",
-"Password protect" => "Защитить паролем",
-"Password" => "Пароль",
-"Email link to person" => "Ссылка на адрес электронной почты",
-"Send" => "Отправить",
-"Set expiration date" => "Установить срок действия",
-"Expiration date" => "Дата истечения срока действия",
-"Share via email:" => "Сделать общедоступным посредством email:",
-"No people found" => "Не найдено людей",
-"Resharing is not allowed" => "Рекурсивный общий доступ не разрешен",
-"Shared in {item} with {user}" => "Совместное использование в {объект} с {пользователь}",
-"Unshare" => "Отключить общий доступ",
-"can edit" => "возможно редактирование",
-"access control" => "контроль доступа",
-"create" => "создать",
-"update" => "обновить",
-"delete" => "удалить",
-"share" => "сделать общим",
-"Password protected" => "Пароль защищен",
-"Error unsetting expiration date" => "Ошибка при отключении даты истечения срока действия",
-"Error setting expiration date" => "Ошибка при установке даты истечения срока действия",
-"Sending ..." => "Отправка ...",
-"Email sent" => "Письмо отправлено",
-"The update was unsuccessful. Please report this issue to the ownCloud community." => "Обновление прошло неудачно. Пожалуйста, сообщите об этом результате в ownCloud community.",
-"The update was successful. Redirecting you to ownCloud now." => "Обновление прошло успешно. Немедленное перенаправление Вас на ownCloud.",
-"ownCloud password reset" => "Переназначение пароля",
-"Use the following link to reset your password: {link}" => "Воспользуйтесь следующей ссылкой для переназначения пароля: {link}",
-"You will receive a link to reset your password via Email." => "Вы получите ссылку для восстановления пароля по электронной почте.",
-"Reset email send." => "Сброс отправки email.",
-"Request failed!" => "Не удалось выполнить запрос!",
-"Username" => "Имя пользователя",
-"Request reset" => "Сброс запроса",
-"Your password was reset" => "Ваш пароль был переустановлен",
-"To login page" => "На страницу входа",
-"New password" => "Новый пароль",
-"Reset password" => "Переназначение пароля",
-"Personal" => "Персональный",
-"Users" => "Пользователи",
-"Apps" => "Приложения",
-"Admin" => "Администратор",
-"Help" => "Помощь",
-"Access forbidden" => "Доступ запрещен",
-"Cloud not found" => "Облако не найдено",
-"Edit categories" => "Редактирование категорий",
-"Add" => "Добавить",
-"Security Warning" => "Предупреждение системы безопасности",
-"No secure random number generator is available, please enable the PHP OpenSSL extension." => "Нет доступного защищенного генератора случайных чисел, пожалуйста, включите расширение PHP OpenSSL.",
-"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Без защищенного генератора случайных чисел злоумышленник может спрогнозировать пароль, сбросить учетные данные и завладеть Вашим аккаунтом.",
-"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Ваша папка с данными и файлы возможно доступны из интернета потому что файл .htaccess не работает.",
-"For information how to properly configure your server, please see the documentation." => "Для информации как правильно настроить Ваш сервер, пожалйста загляните в документацию.",
-"Create an admin account" => "Создать admin account",
-"Advanced" => "Расширенный",
-"Data folder" => "Папка данных",
-"Configure the database" => "Настроить базу данных",
-"will be used" => "будет использоваться",
-"Database user" => "Пользователь базы данных",
-"Database password" => "Пароль базы данных",
-"Database name" => "Имя базы данных",
-"Database tablespace" => "Табличная область базы данных",
-"Database host" => "Сервер базы данных",
-"Finish setup" => "Завершение настройки",
-"web services under your control" => "веб-сервисы под Вашим контролем",
-"Log out" => "Выйти",
-"Automatic logon rejected!" => "Автоматический вход в систему отклонен!",
-"If you did not change your password recently, your account may be compromised!" => "Если Вы недавно не меняли пароль, Ваш аккаунт может быть подвергнут опасности!",
-"Please change your password to secure your account again." => "Пожалуйста, измените пароль, чтобы защитить ваш аккаунт еще раз.",
-"Lost your password?" => "Забыли пароль?",
-"remember" => "запомнить",
-"Log in" => "Войти",
-"Alternative Logins" => "Альтернативные Имена",
-"prev" => "предыдущий",
-"next" => "следующий",
-"Updating ownCloud to version %s, this may take a while." => "Обновление ownCloud до версии %s, это может занять некоторое время."
+"Add" => "Добавить"
);
diff --git a/core/l10n/si_LK.php b/core/l10n/si_LK.php
index dc9801139a44da296f1b0ccd15f28e7afe029165..be7c1a24aad895bb0d9d7693a7ff80f17fca0ee2 100644
--- a/core/l10n/si_LK.php
+++ b/core/l10n/si_LK.php
@@ -16,10 +16,10 @@
"July" => "ජූලි",
"August" => "අගෝස්තු",
"September" => "සැප්තැම්බර්",
-"October" => "ඔක්තෝබර්",
+"October" => "ඔක්තෝබර",
"November" => "නොවැම්බර්",
"December" => "දෙසැම්බර්",
-"Settings" => "සැකසුම්",
+"Settings" => "සිටුවම්",
"seconds ago" => "තත්පරයන්ට පෙර",
"1 minute ago" => "1 මිනිත්තුවකට පෙර",
"today" => "අද",
@@ -28,17 +28,17 @@
"months ago" => "මාස කීපයකට පෙර",
"last year" => "පෙර අවුරුද්දේ",
"years ago" => "අවුරුදු කීපයකට පෙර",
-"Ok" => "හරි",
-"Cancel" => "එපා",
"Choose" => "තෝරන්න",
+"Cancel" => "එපා",
"Yes" => "ඔව්",
-"No" => "නැහැ",
+"No" => "එපා",
+"Ok" => "හරි",
"Error" => "දෝෂයක්",
"Share" => "බෙදා හදා ගන්න",
"Share with" => "බෙදාගන්න",
"Share with link" => "යොමුවක් මඟින් බෙදාගන්න",
"Password protect" => "මුර පදයකින් ආරක්ශාකරන්න",
-"Password" => "මුර පදය ",
+"Password" => "මුර පදය",
"Set expiration date" => "කල් ඉකුත් විමේ දිනය දමන්න",
"Expiration date" => "කල් ඉකුත් විමේ දිනය",
"Share via email:" => "විද්යුත් තැපෑල මඟින් බෙදාගන්න: ",
@@ -54,11 +54,10 @@
"Error setting expiration date" => "කල් ඉකුත් දිනය ස්ථාපනය කිරීමේ දෝෂයක්",
"ownCloud password reset" => "ownCloud මුරපදය ප්රත්යාරම්භ කරන්න",
"You will receive a link to reset your password via Email." => "ඔබගේ මුරපදය ප්රත්යාරම්භ කිරීම සඳහා යොමුව විද්යුත් තැපෑලෙන් ලැබෙනු ඇත",
-"Request failed!" => "ඉල්ලීම අසාර්ථකයි!",
"Username" => "පරිශීලක නම",
"Your password was reset" => "ඔබේ මුරපදය ප්රත්යාරම්භ කරන ලදී",
"To login page" => "පිවිසුම් පිටුවට",
-"New password" => "නව මුර පදයක්",
+"New password" => "නව මුරපදය",
"Reset password" => "මුරපදය ප්රත්යාරම්භ කරන්න",
"Personal" => "පෞද්ගලික",
"Users" => "පරිශීලකයන්",
@@ -68,7 +67,7 @@
"Access forbidden" => "ඇතුල් වීම තහනම්",
"Cloud not found" => "සොයා ගත නොහැක",
"Edit categories" => "ප්රභේදයන් සංස්කරණය",
-"Add" => "එක් කරන්න",
+"Add" => "එකතු කරන්න",
"Security Warning" => "ආරක්ෂක නිවේදනයක්",
"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "ආරක්ෂිත අහඹු සංඛ්යා උත්පාදකයක් නොමැති නම් ඔබගේ ගිණුමට පහරදෙන අයකුට එහි මුරපද යළි පිහිටුවීමට අවශ්ය ටෝකන පහසුවෙන් සොයාගෙන ඔබගේ ගිණුම පැහැරගත හැක.",
"Advanced" => "දියුණු/උසස්",
diff --git a/core/l10n/sk_SK.php b/core/l10n/sk_SK.php
index b52c8b03c4159114b1e54379740282ced45066c2..2dfaa01b5a1f9d2bfacd0ba374adf8ce5fde5425 100644
--- a/core/l10n/sk_SK.php
+++ b/core/l10n/sk_SK.php
@@ -34,7 +34,7 @@
"seconds ago" => "pred sekundami",
"1 minute ago" => "pred minútou",
"{minutes} minutes ago" => "pred {minutes} minútami",
-"1 hour ago" => "Pred 1 hodinou.",
+"1 hour ago" => "Pred 1 hodinou",
"{hours} hours ago" => "Pred {hours} hodinami.",
"today" => "dnes",
"yesterday" => "včera",
@@ -44,11 +44,11 @@
"months ago" => "pred mesiacmi",
"last year" => "minulý rok",
"years ago" => "pred rokmi",
-"Ok" => "Ok",
-"Cancel" => "Zrušiť",
"Choose" => "Výber",
+"Cancel" => "Zrušiť",
"Yes" => "Áno",
"No" => "Nie",
+"Ok" => "Ok",
"The object type is not specified." => "Nešpecifikovaný typ objektu.",
"Error" => "Chyba",
"The app name is not specified." => "Nešpecifikované meno aplikácie.",
@@ -88,10 +88,10 @@
"The update was successful. Redirecting you to ownCloud now." => "Aktualizácia bola úspešná. Presmerovávam na prihlasovaciu stránku.",
"ownCloud password reset" => "Obnovenie hesla pre ownCloud",
"Use the following link to reset your password: {link}" => "Použite nasledujúci odkaz pre obnovenie vášho hesla: {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 ." => "Odkaz na obnovenie hesla bol odoslaný na Vašu emailovú adresu. Ak ho v krátkej dobe neobdržíte, skontrolujte si Váš kôš a priečinok spam. Ak ho ani tam nenájdete, kontaktujte svojho administrátora.",
+"Request failed! Did you make sure your email/username was right?" => "Požiadavka zlyhala. Uistili ste sa, že Vaše používateľské meno a email sú správne?",
"You will receive a link to reset your password via Email." => "Odkaz pre obnovenie hesla obdržíte e-mailom.",
-"Reset email send." => "Obnovovací email bol odoslaný.",
-"Request failed!" => "Požiadavka zlyhala!",
-"Username" => "Prihlasovacie meno",
+"Username" => "Meno používateľa",
"Request reset" => "Požiadať o obnovenie",
"Your password was reset" => "Vaše heslo bolo obnovené",
"To login page" => "Na prihlasovaciu stránku",
@@ -100,11 +100,11 @@
"Personal" => "Osobné",
"Users" => "Používatelia",
"Apps" => "Aplikácie",
-"Admin" => "Administrácia",
+"Admin" => "Administrátor",
"Help" => "Pomoc",
"Access forbidden" => "Prístup odmietnutý",
"Cloud not found" => "Nenájdené",
-"Edit categories" => "Úprava kategórií",
+"Edit categories" => "Upraviť kategórie",
"Add" => "Pridať",
"Security Warning" => "Bezpečnostné varovanie",
"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Verzia Vášho PHP je napadnuteľná pomocou techniky \"NULL Byte\" (CVE-2006-7243)",
@@ -124,7 +124,8 @@
"Database tablespace" => "Tabuľkový priestor databázy",
"Database host" => "Server databázy",
"Finish setup" => "Dokončiť inštaláciu",
-"web services under your control" => "webové služby pod vašou kontrolou",
+"web services under your control" => "webové služby pod Vašou kontrolou",
+"%s is available. Get more information on how to update." => "%s je dostupná. Získajte viac informácií k postupu aktualizáce.",
"Log out" => "Odhlásiť",
"Automatic logon rejected!" => "Automatické prihlásenie bolo zamietnuté!",
"If you did not change your password recently, your account may be compromised!" => "V nedávnej dobe ste nezmenili svoje heslo, Váš účet môže byť kompromitovaný.",
diff --git a/core/l10n/sl.php b/core/l10n/sl.php
index b3cd5c353cf652a8287d95f129657523802cf208..a433aa2cc4ec8d1fcc810d8244d588c86c12b883 100644
--- a/core/l10n/sl.php
+++ b/core/l10n/sl.php
@@ -34,7 +34,7 @@
"seconds ago" => "pred nekaj sekundami",
"1 minute ago" => "pred minuto",
"{minutes} minutes ago" => "pred {minutes} minutami",
-"1 hour ago" => "pred 1 uro",
+"1 hour ago" => "Pred 1 uro",
"{hours} hours ago" => "pred {hours} urami",
"today" => "danes",
"yesterday" => "včeraj",
@@ -44,11 +44,11 @@
"months ago" => "mesecev nazaj",
"last year" => "lansko leto",
"years ago" => "let nazaj",
-"Ok" => "V redu",
-"Cancel" => "Prekliči",
"Choose" => "Izbor",
+"Cancel" => "Prekliči",
"Yes" => "Da",
"No" => "Ne",
+"Ok" => "V redu",
"The object type is not specified." => "Vrsta predmeta ni podana.",
"Error" => "Napaka",
"The app name is not specified." => "Ime programa ni podano.",
@@ -72,7 +72,7 @@
"No people found" => "Ni najdenih uporabnikov",
"Resharing is not allowed" => "Nadaljnja souporaba ni dovoljena",
"Shared in {item} with {user}" => "V souporabi v {item} z {user}",
-"Unshare" => "Odstrani souporabo",
+"Unshare" => "Prekliči souporabo",
"can edit" => "lahko ureja",
"access control" => "nadzor dostopa",
"create" => "ustvari",
@@ -88,10 +88,10 @@
"The update was successful. Redirecting you to ownCloud now." => "Posodobitev je uspešno končana. Stran bo preusmerjena na oblak ownCloud.",
"ownCloud password reset" => "Ponastavitev gesla za oblak ownCloud",
"Use the following link to reset your password: {link}" => "Za ponastavitev gesla uporabite povezavo: {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 ." => "Povezava za ponastavitev gesla je bila poslana na elektronski naslov. V kolikor sporočila ne prejmete v doglednem času, preverite tudi mape vsiljene pošte. Če ne bo niti tam, stopite v stik s skrbnikom.",
+"Request failed! Did you make sure your email/username was right?" => "Zahteva je spodletela! Ali sta elektronski naslov oziroma uporabniško ime navedena pravilno?",
"You will receive a link to reset your password via Email." => "Na elektronski naslov boste prejeli povezavo za ponovno nastavitev gesla.",
-"Reset email send." => "Sporočilo z navodili za ponastavitev gesla je poslana na vaš elektronski naslov.",
-"Request failed!" => "Zahteva je spodletela!",
-"Username" => "Uporabniško Ime",
+"Username" => "Uporabniško ime",
"Request reset" => "Zahtevaj ponovno nastavitev",
"Your password was reset" => "Geslo je ponovno nastavljeno",
"To login page" => "Na prijavno stran",
@@ -125,6 +125,7 @@
"Database host" => "Gostitelj podatkovne zbirke",
"Finish setup" => "Končaj namestitev",
"web services under your control" => "spletne storitve pod vašim nadzorom",
+"%s is available. Get more information on how to update." => "%s je na voljo. Pridobite več podrobnosti za posodobitev.",
"Log out" => "Odjava",
"Automatic logon rejected!" => "Samodejno prijavljanje je zavrnjeno!",
"If you did not change your password recently, your account may be compromised!" => "V primeru, da gesla za dostop že nekaj časa niste spremenili, je račun lahko ogrožen!",
diff --git a/core/l10n/sq.php b/core/l10n/sq.php
index 6881d0105c7c6ff77b01881b83304d3fd9936802..40562add933e72af656cf1b96feb62fdc3ed94e1 100644
--- a/core/l10n/sq.php
+++ b/core/l10n/sq.php
@@ -30,7 +30,7 @@
"October" => "Tetor",
"November" => "Nëntor",
"December" => "Dhjetor",
-"Settings" => "Parametrat",
+"Settings" => "Parametra",
"seconds ago" => "sekonda më parë",
"1 minute ago" => "1 minutë më parë",
"{minutes} minutes ago" => "{minutes} minuta më parë",
@@ -44,11 +44,11 @@
"months ago" => "muaj më parë",
"last year" => "vitin e shkuar",
"years ago" => "vite më parë",
-"Ok" => "Në rregull",
-"Cancel" => "Anulo",
"Choose" => "Zgjidh",
+"Cancel" => "Anulo",
"Yes" => "Po",
"No" => "Jo",
+"Ok" => "Në rregull",
"The object type is not specified." => "Nuk është specifikuar tipi i objektit.",
"Error" => "Veprim i gabuar",
"The app name is not specified." => "Nuk është specifikuar emri i app-it.",
@@ -88,9 +88,9 @@
"The update was successful. Redirecting you to ownCloud now." => "Azhurnimi u krye. Tani do t'ju kaloj tek ownCloud-i.",
"ownCloud password reset" => "Rivendosja e kodit të ownCloud-it",
"Use the following link to reset your password: {link}" => "Përdorni lidhjen në vijim për të rivendosur kodin: {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 ." => "Lidhja për rivendosjen e kodit tuaj u dërgua tek email-i juaj. Nëqoftëse nuk e merrni brenda një kohe të arsyeshme, kontrolloni dosjet e postës së padëshirueshme (spam). Nëqoftëse nuk është as aty, pyesni administratorin tuaj lokal.",
+"Request failed! Did you make sure your email/username was right?" => "Kërkesa dështoi! A u siguruat që email-i/përdoruesi juaj ishte i saktë?",
"You will receive a link to reset your password via Email." => "Do t'iu vijë një email që përmban një lidhje për ta rivendosur kodin.",
-"Reset email send." => "Emaili i rivendosjes u dërgua.",
-"Request failed!" => "Kërkesa dështoi!",
"Username" => "Përdoruesi",
"Request reset" => "Bëj kërkesë për rivendosjen",
"Your password was reset" => "Kodi yt u rivendos",
diff --git a/core/l10n/sr.php b/core/l10n/sr.php
index b71d8cdd9451d05fffda342059f929ede4b41329..49664f19f34b6324559b658e986e2eb2243c9db0 100644
--- a/core/l10n/sr.php
+++ b/core/l10n/sr.php
@@ -27,7 +27,7 @@
"October" => "Октобар",
"November" => "Новембар",
"December" => "Децембар",
-"Settings" => "Подешавања",
+"Settings" => "Поставке",
"seconds ago" => "пре неколико секунди",
"1 minute ago" => "пре 1 минут",
"{minutes} minutes ago" => "пре {minutes} минута",
@@ -41,16 +41,16 @@
"months ago" => "месеци раније",
"last year" => "прошле године",
"years ago" => "година раније",
-"Ok" => "У реду",
-"Cancel" => "Откажи",
"Choose" => "Одабери",
+"Cancel" => "Откажи",
"Yes" => "Да",
"No" => "Не",
+"Ok" => "У реду",
"The object type is not specified." => "Врста објекта није подешена.",
"Error" => "Грешка",
"The app name is not specified." => "Име програма није унето.",
"The required file {file} is not installed!" => "Потребна датотека {file} није инсталирана.",
-"Share" => "Дељење",
+"Share" => "Дели",
"Error while sharing" => "Грешка у дељењу",
"Error while unsharing" => "Грешка код искључења дељења",
"Error while changing permissions" => "Грешка код промене дозвола",
@@ -67,7 +67,7 @@
"No people found" => "Особе нису пронађене.",
"Resharing is not allowed" => "Поновно дељење није дозвољено",
"Shared in {item} with {user}" => "Подељено унутар {item} са {user}",
-"Unshare" => "Не дели",
+"Unshare" => "Укини дељење",
"can edit" => "може да мења",
"access control" => "права приступа",
"create" => "направи",
@@ -82,18 +82,16 @@
"ownCloud password reset" => "Поништавање лозинке за ownCloud",
"Use the following link to reset your password: {link}" => "Овом везом ресетујте своју лозинку: {link}",
"You will receive a link to reset your password via Email." => "Добићете везу за ресетовање лозинке путем е-поште.",
-"Reset email send." => "Захтев је послат поштом.",
-"Request failed!" => "Захтев одбијен!",
"Username" => "Корисничко име",
"Request reset" => "Захтевај ресетовање",
"Your password was reset" => "Ваша лозинка је ресетована",
"To login page" => "На страницу за пријаву",
"New password" => "Нова лозинка",
"Reset password" => "Ресетуј лозинку",
-"Personal" => "Лична",
+"Personal" => "Лично",
"Users" => "Корисници",
-"Apps" => "Програми",
-"Admin" => "Аднинистрација",
+"Apps" => "Апликације",
+"Admin" => "Администратор",
"Help" => "Помоћ",
"Access forbidden" => "Забрањен приступ",
"Cloud not found" => "Облак није нађен",
diff --git a/core/l10n/sr@latin.php b/core/l10n/sr@latin.php
index ec3eab34e29d801fec536a601e20bc22e6213392..238843aa1762711c47198fef0f76878141d65a9f 100644
--- a/core/l10n/sr@latin.php
+++ b/core/l10n/sr@latin.php
@@ -27,7 +27,7 @@
"Your password was reset" => "Vaša lozinka je resetovana",
"New password" => "Nova lozinka",
"Reset password" => "Resetuj lozinku",
-"Personal" => "Lična",
+"Personal" => "Lično",
"Users" => "Korisnici",
"Apps" => "Programi",
"Admin" => "Adninistracija",
diff --git a/core/l10n/sv.php b/core/l10n/sv.php
index 553afea5f71075ca937a7318ae187d4231c2e571..d4154678b65c3a7286d59f1be73d13191d7a532e 100644
--- a/core/l10n/sv.php
+++ b/core/l10n/sv.php
@@ -44,11 +44,11 @@
"months ago" => "månader sedan",
"last year" => "förra året",
"years ago" => "år sedan",
-"Ok" => "Ok",
-"Cancel" => "Avbryt",
"Choose" => "Välj",
+"Cancel" => "Avbryt",
"Yes" => "Ja",
"No" => "Nej",
+"Ok" => "Ok",
"The object type is not specified." => "Objekttypen är inte specificerad.",
"Error" => "Fel",
"The app name is not specified." => " Namnet på appen är inte specificerad.",
@@ -89,8 +89,6 @@
"ownCloud password reset" => "ownCloud lösenordsåterställning",
"Use the following link to reset your password: {link}" => "Använd följande länk för att återställa lösenordet: {link}",
"You will receive a link to reset your password via Email." => "Du får en länk att återställa ditt lösenord via e-post.",
-"Reset email send." => "Återställ skickad e-post.",
-"Request failed!" => "Begäran misslyckades!",
"Username" => "Användarnamn",
"Request reset" => "Begär återställning",
"Your password was reset" => "Ditt lösenord har återställts",
@@ -104,7 +102,7 @@
"Help" => "Hjälp",
"Access forbidden" => "Åtkomst förbjuden",
"Cloud not found" => "Hittade inget moln",
-"Edit categories" => "Redigera kategorier",
+"Edit categories" => "Editera kategorier",
"Add" => "Lägg till",
"Security Warning" => "Säkerhetsvarning",
"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Din version av PHP är sårbar för NULL byte attack (CVE-2006-7243)",
@@ -114,7 +112,7 @@
"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Din datakatalog och filer är förmodligen tillgängliga från Internet, eftersom .htaccess-filen inte fungerar.",
"For information how to properly configure your server, please see the documentation." => "För information hur man korrekt konfigurera servern, var god se documentation.",
"Create an admin account" => "Skapa ett administratörskonto",
-"Advanced" => "Avancerat",
+"Advanced" => "Avancerad",
"Data folder" => "Datamapp",
"Configure the database" => "Konfigurera databasen",
"will be used" => "kommer att användas",
diff --git a/core/l10n/ta_LK.php b/core/l10n/ta_LK.php
index b45f38627a39f6626c644bb2a4289e7f2a893541..b67f5e967ece8c2a8da9be5d5c459dad0adbb2e2 100644
--- a/core/l10n/ta_LK.php
+++ b/core/l10n/ta_LK.php
@@ -39,11 +39,11 @@
"months ago" => "மாதங்களுக்கு முன்",
"last year" => "கடந்த வருடம்",
"years ago" => "வருடங்களுக்கு முன்",
-"Ok" => "சரி",
-"Cancel" => "இரத்து செய்க",
"Choose" => "தெரிவுசெய்க ",
+"Cancel" => "இரத்து செய்க",
"Yes" => "ஆம்",
"No" => "இல்லை",
+"Ok" => "சரி",
"The object type is not specified." => "பொருள் வகை குறிப்பிடப்படவில்லை.",
"Error" => "வழு",
"The app name is not specified." => "செயலி பெயர் குறிப்பிடப்படவில்லை.",
@@ -64,10 +64,10 @@
"No people found" => "நபர்கள் யாரும் இல்லை",
"Resharing is not allowed" => "மீள்பகிர்வதற்கு அனுமதி இல்லை ",
"Shared in {item} with {user}" => "{பயனாளர்} உடன் {உருப்படி} பகிரப்பட்டுள்ளது",
-"Unshare" => "பகிரமுடியாது",
+"Unshare" => "பகிரப்படாதது",
"can edit" => "தொகுக்க முடியும்",
"access control" => "கட்டுப்பாடான அணுகல்",
-"create" => "படைத்தல்",
+"create" => "உருவவாக்கல்",
"update" => "இற்றைப்படுத்தல்",
"delete" => "நீக்குக",
"share" => "பகிர்தல்",
@@ -77,8 +77,6 @@
"ownCloud password reset" => "ownCloud இன் கடவுச்சொல் மீளமைப்பு",
"Use the following link to reset your password: {link}" => "உங்கள் கடவுச்சொல்லை மீளமைக்க பின்வரும் இணைப்பை பயன்படுத்தவும் : {இணைப்பு}",
"You will receive a link to reset your password via Email." => "நீங்கள் மின்னஞ்சல் மூலம் உங்களுடைய கடவுச்சொல்லை மீளமைப்பதற்கான இணைப்பை பெறுவீர்கள். ",
-"Reset email send." => "மின்னுஞ்சல் அனுப்புதலை மீளமைக்குக",
-"Request failed!" => "வேண்டுகோள் தோல்வியுற்றது!",
"Username" => "பயனாளர் பெயர்",
"Request reset" => "கோரிக்கை மீளமைப்பு",
"Your password was reset" => "உங்களுடைய கடவுச்சொல் மீளமைக்கப்பட்டது",
@@ -86,9 +84,9 @@
"New password" => "புதிய கடவுச்சொல்",
"Reset password" => "மீளமைத்த கடவுச்சொல்",
"Personal" => "தனிப்பட்ட",
-"Users" => "பயனாளர்கள்",
-"Apps" => "பயன்பாடுகள்",
-"Admin" => "நிர்வாகி",
+"Users" => "பயனாளர்",
+"Apps" => "செயலிகள்",
+"Admin" => "நிர்வாகம்",
"Help" => "உதவி",
"Access forbidden" => "அணுக தடை",
"Cloud not found" => "Cloud காணப்படவில்லை",
@@ -98,7 +96,7 @@
"No secure random number generator is available, please enable the PHP OpenSSL extension." => "குறிப்பிட்ட எண்ணிக்கை பாதுகாப்பான புறப்பாக்கி / உண்டாக்கிகள் இல்லை, தயவுசெய்து PHP OpenSSL நீட்சியை இயலுமைப்படுத்துக. ",
"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "பாதுகாப்பான சீரற்ற எண்ணிக்கையான புறப்பாக்கி இல்லையெனின், தாக்குனரால் கடவுச்சொல் மீளமைப்பு அடையாளவில்லைகள் முன்மொழியப்பட்டு உங்களுடைய கணக்கை கைப்பற்றலாம்.",
"Create an admin account" => " நிர்வாக கணக்கொன்றை உருவாக்குக",
-"Advanced" => "மேம்பட்ட",
+"Advanced" => "உயர்ந்த",
"Data folder" => "தரவு கோப்புறை",
"Configure the database" => "தரவுத்தளத்தை தகவமைக்க",
"will be used" => "பயன்படுத்தப்படும்",
@@ -108,7 +106,7 @@
"Database tablespace" => "தரவுத்தள அட்டவணை",
"Database host" => "தரவுத்தள ஓம்புனர்",
"Finish setup" => "அமைப்பை முடிக்க",
-"web services under your control" => "உங்கள் கட்டுப்பாட்டின் கீழ் இணைய சேவைகள்",
+"web services under your control" => "வலைய சேவைகள் உங்களுடைய கட்டுப்பாட்டின் கீழ் உள்ளது",
"Log out" => "விடுபதிகை செய்க",
"Automatic logon rejected!" => "தன்னிச்சையான புகுபதிகை நிராகரிப்பட்டது!",
"If you did not change your password recently, your account may be compromised!" => "உங்களுடைய கடவுச்சொல்லை அண்மையில் மாற்றவில்லையின், உங்களுடைய கணக்கு சமரசமாகிவிடும்!",
diff --git a/core/l10n/te.php b/core/l10n/te.php
index 040ab9b550e81740deb2f06af26b5c4a7d94339e..1469d37296f33e76d3d4cec12ab148a34674946d 100644
--- a/core/l10n/te.php
+++ b/core/l10n/te.php
@@ -33,10 +33,10 @@
"months ago" => "నెలల క్రితం",
"last year" => "పోయిన సంవత్సరం",
"years ago" => "సంవత్సరాల క్రితం",
-"Ok" => "సరే",
"Cancel" => "రద్దుచేయి",
"Yes" => "అవును",
"No" => "కాదు",
+"Ok" => "సరే",
"Error" => "పొరపాటు",
"Password" => "సంకేతపదం",
"Send" => "పంపించు",
diff --git a/core/l10n/th_TH.php b/core/l10n/th_TH.php
index 47d4b87b17cbd92b8b11d9c60adf2d5b84d9730a..66f5629b93309c2085c4eb680ec22ee865594500 100644
--- a/core/l10n/th_TH.php
+++ b/core/l10n/th_TH.php
@@ -43,13 +43,13 @@
"months ago" => "เดือน ที่ผ่านมา",
"last year" => "ปีที่แล้ว",
"years ago" => "ปี ที่ผ่านมา",
-"Ok" => "ตกลง",
-"Cancel" => "ยกเลิก",
"Choose" => "เลือก",
+"Cancel" => "ยกเลิก",
"Yes" => "ตกลง",
"No" => "ไม่ตกลง",
+"Ok" => "ตกลง",
"The object type is not specified." => "ชนิดของวัตถุยังไม่ได้รับการระบุ",
-"Error" => "พบข้อผิดพลาด",
+"Error" => "ข้อผิดพลาด",
"The app name is not specified." => "ชื่อของแอปยังไม่ได้รับการระบุชื่อ",
"The required file {file} is not installed!" => "ไฟล์ {file} ซึ่งเป็นไฟล์ที่จำเป็นต้องได้รับการติดตั้งไว้ก่อน ยังไม่ได้ถูกติดตั้ง",
"Shared" => "แชร์แล้ว",
@@ -88,8 +88,6 @@
"ownCloud password reset" => "รีเซ็ตรหัสผ่าน ownCloud",
"Use the following link to reset your password: {link}" => "ใช้ลิงค์ต่อไปนี้เพื่อเปลี่ยนรหัสผ่านของคุณใหม่: {link}",
"You will receive a link to reset your password via Email." => "คุณจะได้รับลิงค์เพื่อกำหนดรหัสผ่านใหม่ทางอีเมล์",
-"Reset email send." => "รีเซ็ตค่าการส่งอีเมล",
-"Request failed!" => "คำร้องขอล้มเหลว!",
"Username" => "ชื่อผู้ใช้งาน",
"Request reset" => "ขอเปลี่ยนรหัสใหม่",
"Your password was reset" => "รหัสผ่านของคุณถูกเปลี่ยนเรียบร้อยแล้ว",
@@ -98,8 +96,8 @@
"Reset password" => "เปลี่ยนรหัสผ่าน",
"Personal" => "ส่วนตัว",
"Users" => "ผู้ใช้งาน",
-"Apps" => "Apps",
-"Admin" => "ผู้ดูแลระบบ",
+"Apps" => "แอปฯ",
+"Admin" => "ผู้ดูแล",
"Help" => "ช่วยเหลือ",
"Access forbidden" => "การเข้าถึงถูกหวงห้าม",
"Cloud not found" => "ไม่พบ Cloud",
@@ -119,7 +117,7 @@
"Database tablespace" => "พื้นที่ตารางในฐานข้อมูล",
"Database host" => "Database host",
"Finish setup" => "ติดตั้งเรียบร้อยแล้ว",
-"web services under your control" => "web services under your control",
+"web services under your control" => "เว็บเซอร์วิสที่คุณควบคุมการใช้งานได้",
"Log out" => "ออกจากระบบ",
"Automatic logon rejected!" => "การเข้าสู่ระบบอัตโนมัติถูกปฏิเสธแล้ว",
"If you did not change your password recently, your account may be compromised!" => "หากคุณยังไม่ได้เปลี่ยนรหัสผ่านของคุณเมื่อเร็วๆนี้, บัญชีของคุณอาจถูกบุกรุกโดยผู้อื่น",
diff --git a/core/l10n/tr.php b/core/l10n/tr.php
index d6b25b40933e773a864d5b9660d7bdfa6aa1982f..47574a012590f34a68a870aa308e5bfbdbc03240 100644
--- a/core/l10n/tr.php
+++ b/core/l10n/tr.php
@@ -44,11 +44,11 @@
"months ago" => "ay önce",
"last year" => "geçen yıl",
"years ago" => "yıl önce",
-"Ok" => "Tamam",
-"Cancel" => "İptal",
"Choose" => "seç",
+"Cancel" => "İptal",
"Yes" => "Evet",
"No" => "Hayır",
+"Ok" => "Tamam",
"The object type is not specified." => "Nesne türü belirtilmemiş.",
"Error" => "Hata",
"The app name is not specified." => "uygulama adı belirtilmedi.",
@@ -88,10 +88,10 @@
"The update was successful. Redirecting you to ownCloud now." => "Güncelleme başarılı. ownCloud'a yönlendiriliyor.",
"ownCloud password reset" => "ownCloud parola sıfırlama",
"Use the following link to reset your password: {link}" => "Bu bağlantıyı kullanarak parolanızı sıfırlayı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 ." => "Parolanızı değiştirme bağlantısı e-posta adresinize gönderildi. I Eğer makül bir süre içerisinde mesajı almadıysanız spam/junk dizinini kontrol ediniz. Eğer orada da bulamazsanız sistem yöneticinize sorunuz.",
+"Request failed! Did you make sure your email/username was right?" => "Isteği başarısız oldu! E-posta / kullanıcı adınızı doğru olduğundan emin misiniz?",
"You will receive a link to reset your password via Email." => "Parolanızı sıfırlamak için bir bağlantı Eposta olarak gönderilecek.",
-"Reset email send." => "Sıfırlama epostası gönderildi.",
-"Request failed!" => "İstek reddedildi!",
-"Username" => "Kullanıcı adı",
+"Username" => "Kullanıcı Adı",
"Request reset" => "Sıfırlama iste",
"Your password was reset" => "Parolanız sıfırlandı",
"To login page" => "Giriş sayfasına git",
@@ -124,7 +124,8 @@
"Database tablespace" => "Veritabanı tablo alanı",
"Database host" => "Veritabanı sunucusu",
"Finish setup" => "Kurulumu tamamla",
-"web services under your control" => "kontrolünüzdeki web servisleri",
+"web services under your control" => "Bilgileriniz güvenli ve şifreli",
+"%s is available. Get more information on how to update." => "%s mevcuttur. Güncelleştirme hakkında daha fazla bilgi alın.",
"Log out" => "Çıkış yap",
"Automatic logon rejected!" => "Otomatik oturum açma reddedildi!",
"If you did not change your password recently, your account may be compromised!" => "Yakın zamanda parolanızı değiştirmedi iseniz hesabınız riske girebilir.",
diff --git a/core/l10n/ug.php b/core/l10n/ug.php
new file mode 100644
index 0000000000000000000000000000000000000000..c1bf48e07dded9119c15e733ebc761836cc69f57
--- /dev/null
+++ b/core/l10n/ug.php
@@ -0,0 +1,48 @@
+ "يەكشەنبە",
+"Monday" => "دۈشەنبە",
+"Tuesday" => "سەيشەنبە",
+"Wednesday" => "چارشەنبە",
+"Thursday" => "پەيشەنبە",
+"Friday" => "جۈمە",
+"Saturday" => "شەنبە",
+"January" => "قەھرىتان",
+"February" => "ھۇت",
+"March" => "نەۋرۇز",
+"April" => "ئۇمۇت",
+"May" => "باھار",
+"June" => "سەپەر",
+"July" => "چىللە",
+"August" => "تومۇز",
+"September" => "مىزان",
+"October" => "ئوغۇز",
+"November" => "ئوغلاق",
+"December" => "كۆنەك",
+"Settings" => "تەڭشەكلەر",
+"1 minute ago" => "1 مىنۇت ئىلگىرى",
+"1 hour ago" => "1 سائەت ئىلگىرى",
+"today" => "بۈگۈن",
+"yesterday" => "تۈنۈگۈن",
+"Cancel" => "ۋاز كەچ",
+"Yes" => "ھەئە",
+"No" => "ياق",
+"Ok" => "جەزملە",
+"Error" => "خاتالىق",
+"Share" => "ھەمبەھىر",
+"Share with" => "ھەمبەھىر",
+"Password" => "ئىم",
+"Send" => "يوللا",
+"Unshare" => "ھەمبەھىرلىمە",
+"delete" => "ئۆچۈر",
+"share" => "ھەمبەھىر",
+"Username" => "ئىشلەتكۈچى ئاتى",
+"New password" => "يېڭى ئىم",
+"Personal" => "شەخسىي",
+"Users" => "ئىشلەتكۈچىلەر",
+"Apps" => "ئەپلەر",
+"Help" => "ياردەم",
+"Add" => "قوش",
+"Advanced" => "ئالىي",
+"Finish setup" => "تەڭشەك تامام",
+"Log out" => "تىزىمدىن چىق"
+);
diff --git a/core/l10n/uk.php b/core/l10n/uk.php
index 1e86ed7d36c93b6c7d916087dde268ee3a7902d4..65577297c3cc07a4ad7bddf9e799bbf55cd316e4 100644
--- a/core/l10n/uk.php
+++ b/core/l10n/uk.php
@@ -44,11 +44,11 @@
"months ago" => "місяці тому",
"last year" => "минулого року",
"years ago" => "роки тому",
-"Ok" => "Ok",
-"Cancel" => "Відмінити",
"Choose" => "Обрати",
+"Cancel" => "Відмінити",
"Yes" => "Так",
"No" => "Ні",
+"Ok" => "Ok",
"The object type is not specified." => "Не визначено тип об'єкту.",
"Error" => "Помилка",
"The app name is not specified." => "Не визначено ім'я програми.",
@@ -72,7 +72,7 @@
"No people found" => "Жодної людини не знайдено",
"Resharing is not allowed" => "Пере-публікація не дозволяється",
"Shared in {item} with {user}" => "Опубліковано {item} для {user}",
-"Unshare" => "Заборонити доступ",
+"Unshare" => "Закрити доступ",
"can edit" => "може редагувати",
"access control" => "контроль доступу",
"create" => "створити",
@@ -89,8 +89,6 @@
"ownCloud password reset" => "скидання пароля ownCloud",
"Use the following link to reset your password: {link}" => "Використовуйте наступне посилання для скидання пароля: {link}",
"You will receive a link to reset your password via Email." => "Ви отримаєте посилання для скидання вашого паролю на Ел. пошту.",
-"Reset email send." => "Лист скидання відправлено.",
-"Request failed!" => "Невдалий запит!",
"Username" => "Ім'я користувача",
"Request reset" => "Запит скидання",
"Your password was reset" => "Ваш пароль був скинутий",
@@ -100,7 +98,7 @@
"Personal" => "Особисте",
"Users" => "Користувачі",
"Apps" => "Додатки",
-"Admin" => "Адміністратор",
+"Admin" => "Адмін",
"Help" => "Допомога",
"Access forbidden" => "Доступ заборонено",
"Cloud not found" => "Cloud не знайдено",
@@ -124,7 +122,7 @@
"Database tablespace" => "Таблиця бази даних",
"Database host" => "Хост бази даних",
"Finish setup" => "Завершити налаштування",
-"web services under your control" => "веб-сервіс під вашим контролем",
+"web services under your control" => "підконтрольні Вам веб-сервіси",
"Log out" => "Вихід",
"Automatic logon rejected!" => "Автоматичний вхід в систему відхилений!",
"If you did not change your password recently, your account may be compromised!" => "Якщо Ви не міняли пароль останнім часом, Ваш обліковий запис може бути скомпрометованим!",
diff --git a/core/l10n/ur_PK.php b/core/l10n/ur_PK.php
index 544d041e48f6b272970d1c3f1281a696bacf2797..cf26212c25e05eccebffaa6f35b43969034b72ed 100644
--- a/core/l10n/ur_PK.php
+++ b/core/l10n/ur_PK.php
@@ -14,11 +14,11 @@
"November" => "نومبر",
"December" => "دسمبر",
"Settings" => "سیٹینگز",
-"Ok" => "اوکے",
-"Cancel" => "منسوخ کریں",
"Choose" => "منتخب کریں",
+"Cancel" => "منسوخ کریں",
"Yes" => "ہاں",
"No" => "نہیں",
+"Ok" => "اوکے",
"Error" => "ایرر",
"Error while sharing" => "شئیرنگ کے دوران ایرر",
"Error while unsharing" => "شئیرنگ ختم کرنے کے دوران ایرر",
diff --git a/core/l10n/vi.php b/core/l10n/vi.php
index 709a8743086c32325b00ea37677fca74a134fba7..3e320ecf800dc2d37f61dde172d57623ded11a9d 100644
--- a/core/l10n/vi.php
+++ b/core/l10n/vi.php
@@ -9,7 +9,7 @@
"Object type not provided." => "Loại đối tượng không được cung cấp.",
"%s ID not provided." => "%s ID không được cung cấp.",
"Error adding %s to favorites." => "Lỗi thêm %s vào mục yêu thích.",
-"No categories selected for deletion." => "Không có thể loại nào được chọn để xóa.",
+"No categories selected for deletion." => "Bạn chưa chọn mục để xóa",
"Error removing %s from favorites." => "Lỗi xóa %s từ mục yêu thích.",
"Sunday" => "Chủ nhật",
"Monday" => "Thứ 2",
@@ -44,11 +44,11 @@
"months ago" => "tháng trước",
"last year" => "năm trước",
"years ago" => "năm trước",
-"Ok" => "Đồng ý",
-"Cancel" => "Hủy",
"Choose" => "Chọn",
+"Cancel" => "Hủy",
"Yes" => "Có",
"No" => "Không",
+"Ok" => "Đồng ý",
"The object type is not specified." => "Loại đối tượng không được chỉ định.",
"Error" => "Lỗi",
"The app name is not specified." => "Tên ứng dụng không được chỉ định.",
@@ -72,7 +72,7 @@
"No people found" => "Không tìm thấy người nào",
"Resharing is not allowed" => "Chia sẻ lại không được cho phép",
"Shared in {item} with {user}" => "Đã được chia sẽ trong {item} với {user}",
-"Unshare" => "Gỡ bỏ chia sẻ",
+"Unshare" => "Bỏ chia sẻ",
"can edit" => "có thể chỉnh sửa",
"access control" => "quản lý truy cập",
"create" => "tạo",
@@ -88,25 +88,27 @@
"The update was successful. Redirecting you to ownCloud now." => "Cập nhật thành công .Hệ thống sẽ đưa bạn tới ownCloud.",
"ownCloud password reset" => "Khôi phục mật khẩu Owncloud ",
"Use the following link to reset your password: {link}" => "Dùng đường dẫn sau để khôi phục lại mật khẩu : {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 ." => "Liên kết tạo lại mật khẩu đã được gửi tới hộp thư của bạn. Nếu bạn không thấy nó sau một khoảng thời gian, vui lòng kiểm tra trong thư mục Spam/Rác. Nếu vẫn không thấy, vui lòng hỏi người quản trị hệ thống.",
+"Request failed! Did you make sure your email/username was right?" => "Yêu cầu thất bại! Bạn có chắc là email/tên đăng nhập của bạn chính xác?",
"You will receive a link to reset your password via Email." => "Vui lòng kiểm tra Email để khôi phục lại mật khẩu.",
-"Reset email send." => "Thiết lập lại email gởi.",
-"Request failed!" => "Yêu cầu của bạn không thành công !",
-"Username" => "Tên người dùng",
+"Username" => "Tên đăng nhập",
"Request reset" => "Yêu cầu thiết lập lại ",
"Your password was reset" => "Mật khẩu của bạn đã được khôi phục",
"To login page" => "Trang đăng nhập",
"New password" => "Mật khẩu mới",
"Reset password" => "Khôi phục mật khẩu",
"Personal" => "Cá nhân",
-"Users" => "Người sử dụng",
+"Users" => "Người dùng",
"Apps" => "Ứng dụng",
"Admin" => "Quản trị",
"Help" => "Giúp đỡ",
"Access forbidden" => "Truy cập bị cấm",
"Cloud not found" => "Không tìm thấy Clound",
-"Edit categories" => "Sửa thể loại",
+"Edit categories" => "Sửa chuyên mục",
"Add" => "Thêm",
"Security Warning" => "Cảnh bảo bảo mật",
+"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Phiên bản PHP của bạn có lỗ hổng NULL Byte attack (CVE-2006-7243)",
+"Please update your PHP installation to use ownCloud securely." => "Vui lòng cập nhật bản cài đặt PHP để sử dụng ownCloud một cách an toàn.",
"No secure random number generator is available, please enable the PHP OpenSSL extension." => "Không an toàn ! chức năng random number generator đã có sẵn ,vui lòng bật PHP OpenSSL extension.",
"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Nếu không có random number generator , Hacker có thể thiết lập lại mật khẩu và chiếm tài khoản của bạn.",
"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Thư mục và file dữ liệu của bạn có thể được truy cập từ internet bởi vì file .htaccess không hoạt động",
@@ -122,7 +124,8 @@
"Database tablespace" => "Cơ sở dữ liệu tablespace",
"Database host" => "Database host",
"Finish setup" => "Cài đặt hoàn tất",
-"web services under your control" => "các dịch vụ web dưới sự kiểm soát của bạn",
+"web services under your control" => "dịch vụ web dưới sự kiểm soát của bạn",
+"%s is available. Get more information on how to update." => "%s còn trống. Xem thêm thông tin cách cập nhật.",
"Log out" => "Đăng xuất",
"Automatic logon rejected!" => "Tự động đăng nhập đã bị từ chối !",
"If you did not change your password recently, your account may be compromised!" => "Nếu bạn không thay đổi mật khẩu gần đây của bạn, tài khoản của bạn có thể gặp nguy hiểm!",
diff --git a/core/l10n/zh_CN.GB2312.php b/core/l10n/zh_CN.GB2312.php
index 9fbfac2eec1c624d8f43b0190240aea9fedc039c..2e0d0da6f2f9fedc6437fecb8419f83257ed4674 100644
--- a/core/l10n/zh_CN.GB2312.php
+++ b/core/l10n/zh_CN.GB2312.php
@@ -7,7 +7,7 @@
"No category to add?" => "没有分类添加了?",
"This category already exists: %s" => "此分类已存在:%s",
"Object type not provided." => "未选择对象类型。",
-"No categories selected for deletion." => "没有选者要删除的分类.",
+"No categories selected for deletion." => "没有选中要删除的分类。",
"Sunday" => "星期天",
"Monday" => "星期一",
"Tuesday" => "星期二",
@@ -41,13 +41,13 @@
"months ago" => "月前",
"last year" => "去年",
"years ago" => "年前",
-"Ok" => "好的",
-"Cancel" => "取消",
"Choose" => "选择",
+"Cancel" => "取消",
"Yes" => "是",
"No" => "否",
+"Ok" => "好的",
"The object type is not specified." => "未指定对象类型。",
-"Error" => "错误",
+"Error" => "出错",
"The app name is not specified." => "未指定应用名称。",
"The required file {file} is not installed!" => "未安装所需要的文件 {file} !",
"Shared" => "已分享",
@@ -86,18 +86,16 @@
"ownCloud password reset" => "私有云密码重置",
"Use the following link to reset your password: {link}" => "使用下面的链接来重置你的密码:{link}",
"You will receive a link to reset your password via Email." => "你将会收到一个重置密码的链接",
-"Reset email send." => "重置邮件已发送。",
-"Request failed!" => "请求失败!",
"Username" => "用户名",
"Request reset" => "要求重置",
"Your password was reset" => "你的密码已经被重置了",
"To login page" => "转至登陆页面",
"New password" => "新密码",
"Reset password" => "重置密码",
-"Personal" => "个人的",
+"Personal" => "私人",
"Users" => "用户",
-"Apps" => "应用程序",
-"Admin" => "管理",
+"Apps" => "程序",
+"Admin" => "管理员",
"Help" => "帮助",
"Access forbidden" => "禁止访问",
"Cloud not found" => "云 没有被找到",
@@ -120,7 +118,7 @@
"Database tablespace" => "数据库表格空间",
"Database host" => "数据库主机",
"Finish setup" => "完成安装",
-"web services under your control" => "你控制下的网络服务",
+"web services under your control" => "您控制的网络服务",
"Log out" => "注销",
"Automatic logon rejected!" => "自动登录被拒绝!",
"If you did not change your password recently, your account may be compromised!" => "如果您最近没有修改您的密码,那您的帐号可能被攻击了!",
diff --git a/core/l10n/zh_CN.php b/core/l10n/zh_CN.php
index 437a5f8c8f17ce8fb743df293817e1865c182d29..59dd4d2b86aeebec5fc35cee0020987a4d42ae22 100644
--- a/core/l10n/zh_CN.php
+++ b/core/l10n/zh_CN.php
@@ -44,23 +44,23 @@
"months ago" => "月前",
"last year" => "去年",
"years ago" => "年前",
-"Ok" => "好",
-"Cancel" => "取消",
"Choose" => "选择(&C)...",
+"Cancel" => "取消",
"Yes" => "是",
"No" => "否",
+"Ok" => "好",
"The object type is not specified." => "未指定对象类型。",
"Error" => "错误",
"The app name is not specified." => "未指定App名称。",
"The required file {file} is not installed!" => "所需文件{file}未安装!",
"Shared" => "已共享",
-"Share" => "共享",
+"Share" => "分享",
"Error while sharing" => "共享时出错",
"Error while unsharing" => "取消共享时出错",
"Error while changing permissions" => "修改权限时出错",
"Shared with you and the group {group} by {owner}" => "{owner}共享给您及{group}组",
"Shared with you by {owner}" => " {owner}与您共享",
-"Share with" => "共享",
+"Share with" => "分享之",
"Share with link" => "共享链接",
"Password protect" => "密码保护",
"Password" => "密码",
@@ -88,9 +88,9 @@
"The update was successful. Redirecting you to ownCloud now." => "更新成功。正在重定向至 ownCloud。",
"ownCloud password reset" => "重置 ownCloud 密码",
"Use the following link to reset your password: {link}" => "使用以下链接重置您的密码:{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 ." => "重置密码的链接已发送到您的邮箱。 如果您觉得在合理的时间内还未收到邮件,请查看 spam/junk 目录。 如果没有在那里,请询问您的本地管理员。",
+"Request failed! Did you make sure your email/username was right?" => "请求失败 您确定您的邮箱/用户名是正确的?",
"You will receive a link to reset your password via Email." => "您将会收到包含可以重置密码链接的邮件。",
-"Reset email send." => "重置邮件已发送。",
-"Request failed!" => "请求失败!",
"Username" => "用户名",
"Request reset" => "请求重置",
"Your password was reset" => "您的密码已重置",
@@ -100,12 +100,12 @@
"Personal" => "个人",
"Users" => "用户",
"Apps" => "应用",
-"Admin" => "管理员",
+"Admin" => "管理",
"Help" => "帮助",
"Access forbidden" => "访问禁止",
"Cloud not found" => "未找到云",
"Edit categories" => "编辑分类",
-"Add" => "添加",
+"Add" => "增加",
"Security Warning" => "安全警告",
"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "你的PHP版本容易受到空字节攻击 (CVE-2006-7243)",
"Please update your PHP installation to use ownCloud securely." => "为保证安全使用 ownCloud 请更新您的PHP。",
@@ -124,7 +124,8 @@
"Database tablespace" => "数据库表空间",
"Database host" => "数据库主机",
"Finish setup" => "安装完成",
-"web services under your control" => "由您掌控的网络服务",
+"web services under your control" => "您控制的web服务",
+"%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!" => "如果您没有最近修改您的密码,您的帐户可能会受到影响!",
diff --git a/core/l10n/zh_HK.php b/core/l10n/zh_HK.php
index 178ab88e5e091f4a93088003434d5b3dc302bfd2..21418fe2eeb9bdf1742c05e3f77f86c8cf9a59df 100644
--- a/core/l10n/zh_HK.php
+++ b/core/l10n/zh_HK.php
@@ -23,10 +23,10 @@
"yesterday" => "昨日",
"last month" => "前一月",
"months ago" => "個月之前",
-"Ok" => "OK",
"Cancel" => "取消",
"Yes" => "Yes",
"No" => "No",
+"Ok" => "OK",
"Error" => "錯誤",
"Shared" => "已分享",
"Share" => "分享",
@@ -55,8 +55,6 @@
"The update was successful. Redirecting you to ownCloud now." => "更新成功, 正",
"Use the following link to reset your password: {link}" => "請用以下連結重設你的密碼: {link}",
"You will receive a link to reset your password via Email." => "你將收到一封電郵",
-"Reset email send." => "重設密碼郵件已傳",
-"Request failed!" => "請求失敗",
"Username" => "用戶名稱",
"Request reset" => "重設",
"Your password was reset" => "你的密碼已被重設",
diff --git a/core/l10n/zh_TW.php b/core/l10n/zh_TW.php
index 3199688be308e124143a56a0752479e94c13812d..4de9123032754aa23653a07ce29167d832203057 100644
--- a/core/l10n/zh_TW.php
+++ b/core/l10n/zh_TW.php
@@ -34,7 +34,7 @@
"seconds ago" => "幾秒前",
"1 minute ago" => "1 分鐘前",
"{minutes} minutes ago" => "{minutes} 分鐘前",
-"1 hour ago" => "1 個小時前",
+"1 hour ago" => "1 小時之前",
"{hours} hours ago" => "{hours} 小時前",
"today" => "今天",
"yesterday" => "昨天",
@@ -44,11 +44,11 @@
"months ago" => "幾個月前",
"last year" => "去年",
"years ago" => "幾年前",
-"Ok" => "好",
-"Cancel" => "取消",
"Choose" => "選擇",
+"Cancel" => "取消",
"Yes" => "是",
"No" => "否",
+"Ok" => "好",
"The object type is not specified." => "未指定物件類型。",
"Error" => "錯誤",
"The app name is not specified." => "沒有指定 app 名稱。",
@@ -88,9 +88,9 @@
"The update was successful. Redirecting you to ownCloud now." => "升級成功,正將您重新導向至 ownCloud 。",
"ownCloud password reset" => "ownCloud 密碼重設",
"Use the following link to reset your password: {link}" => "請至以下連結重設您的密碼: {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 ." => "重設密碼的連結已經寄至您的電子郵件信箱,如果您過了一段時間還是沒有收到它,請檢查看看它是不是被放到垃圾郵件了,如果還是沒有的話,請聯絡您的 ownCloud 系統管理員。",
+"Request failed! Did you make sure your email/username was right?" => "請求失敗! 您確定填入的電子郵件地址或是帳號名稱是正確的嗎?",
"You will receive a link to reset your password via Email." => "重設密碼的連結將會寄到你的電子郵件信箱。",
-"Reset email send." => "重設郵件已送出。",
-"Request failed!" => "請求失敗!",
"Username" => "使用者名稱",
"Request reset" => "請求重設",
"Your password was reset" => "您的密碼已重設",
@@ -100,8 +100,8 @@
"Personal" => "個人",
"Users" => "使用者",
"Apps" => "應用程式",
-"Admin" => "管理者",
-"Help" => "幫助",
+"Admin" => "管理",
+"Help" => "說明",
"Access forbidden" => "存取被拒",
"Cloud not found" => "未發現雲端",
"Edit categories" => "編輯分類",
@@ -125,6 +125,7 @@
"Database host" => "資料庫主機",
"Finish setup" => "完成設定",
"web services under your control" => "由您控制的網路服務",
+"%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!" => "如果您最近並未更改密碼,您的帳號可能已經遭到入侵!",
diff --git a/core/lostpassword/templates/lostpassword.php b/core/lostpassword/templates/lostpassword.php
index dc9f0bc8ad380b891df236caf3ffc8830ebd6fca..c19c6893f13fe69d61c2b4aa7a7fa808044831bd 100644
--- a/core/lostpassword/templates/lostpassword.php
+++ b/core/lostpassword/templates/lostpassword.php
@@ -1,17 +1,24 @@
-
+
diff --git a/core/templates/filepicker.html b/core/templates/filepicker.html
new file mode 100644
index 0000000000000000000000000000000000000000..e761fbdb567bb89623465c146a2bb786835f3eb0
--- /dev/null
+++ b/core/templates/filepicker.html
@@ -0,0 +1,10 @@
+