diff --git a/.gitignore b/.gitignore index 43f3cab912..724f2460b0 100644 --- a/.gitignore +++ b/.gitignore @@ -82,6 +82,9 @@ nbproject # Tests /tests/phpunit.xml +# Node Modules +/build/node_modules/ + # Tests - auto-generated files /data-autotest /tests/coverage* diff --git a/3rdparty b/3rdparty index 75a05d76ab..21b466b72c 160000 --- a/3rdparty +++ b/3rdparty @@ -1 +1 @@ -Subproject commit 75a05d76ab86ba7454b4312fd0ff2ca5bd5828cf +Subproject commit 21b466b72cdd4c823c011669593ecef1defb1f3c diff --git a/apps/files/ajax/upload.php b/apps/files/ajax/upload.php index dde5d3c50a..1d03cd89f8 100644 --- a/apps/files/ajax/upload.php +++ b/apps/files/ajax/upload.php @@ -105,16 +105,20 @@ if (strpos($dir, '..') === false) { $meta = \OC\Files\Filesystem::getFileInfo($target); // updated max file size after upload $storageStats = \OCA\files\lib\Helper::buildFileStorageStatistics($dir); - - $result[] = array('status' => 'success', - 'mime' => $meta['mimetype'], - 'size' => $meta['size'], - 'id' => $meta['fileid'], - 'name' => basename($target), - 'originalname' => $files['name'][$i], - 'uploadMaxFilesize' => $maxUploadFileSize, - 'maxHumanFilesize' => $maxHumanFileSize - ); + if ($meta === false) { + OCP\JSON::error(array('data' => array_merge(array('message' => $l->t('Upload failed')), $storageStats))); + exit(); + } else { + $result[] = array('status' => 'success', + 'mime' => $meta['mimetype'], + 'size' => $meta['size'], + 'id' => $meta['fileid'], + 'name' => basename($target), + 'originalname' => $files['name'][$i], + 'uploadMaxFilesize' => $maxUploadFileSize, + 'maxHumanFilesize' => $maxHumanFileSize + ); + } } } OCP\JSON::encodedPrint($result); diff --git a/apps/files/css/files.css b/apps/files/css/files.css index a2cf8398c2..af0cb83581 100644 --- a/apps/files/css/files.css +++ b/apps/files/css/files.css @@ -72,7 +72,7 @@ color:#888; text-shadow:#fff 0 1px 0; } #filestable { position: relative; top:37px; width:100%; } -tbody tr { background-color:#fff; height:2.5em; } +#filestable tbody tr { background-color:#fff; height:2.5em; } tbody tr:hover, tbody tr:active { background-color: rgb(240,240,240); } @@ -94,7 +94,7 @@ table th#headerDate, table td.date { min-width:11em; padding:0 .1em 0 1em; text- /* Multiselect bar */ #filestable.multiselect { top:63px; } -table.multiselect thead { position:fixed; top:82px; z-index:1; -moz-box-sizing: border-box; box-sizing: border-box; left: 0; padding-left: 64px; width:100%; } +table.multiselect thead { position:fixed; top:82px; z-index:1; -moz-box-sizing: border-box; box-sizing: border-box; left: 0; padding-left: 80px; width:100%; } table.multiselect thead th { background-color: rgba(210,210,210,.7); color: #000; @@ -170,7 +170,20 @@ a.action>img { max-height:16px; max-width:16px; vertical-align:text-bottom; } } .summary { - opacity: .5; + -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=30)"; + filter: alpha(opacity=30); + opacity: .3; + height: 70px; +} + +.summary:hover, .summary, table tr.summary td { + background-color: transparent; +} + +.summary td { + padding-top: 8px; + padding-bottom: 8px; + border-bottom: none; } .summary .info { diff --git a/apps/files/index.php b/apps/files/index.php index 94c792303d..e4d8e35385 100644 --- a/apps/files/index.php +++ b/apps/files/index.php @@ -119,7 +119,7 @@ if ($needUpgrade) { $tmpl->printPage(); } else { // information about storage capacities - $storageInfo=OC_Helper::getStorageInfo(); + $storageInfo=OC_Helper::getStorageInfo($dir); $maxUploadFilesize=OCP\Util::maxUploadFilesize($dir); $publicUploadEnabled = \OC_Appconfig::getValue('core', 'shareapi_allow_public_upload', 'yes'); if (OC_App::isEnabled('files_encryption')) { diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js index f262f11f06..1e6ab74fb6 100644 --- a/apps/files/js/file-upload.js +++ b/apps/files/js/file-upload.js @@ -102,6 +102,18 @@ $(document).ready(function() { var result=$.parseJSON(response); if(typeof result[0] !== 'undefined' && result[0].status === 'success') { + var filename = result[0].originalname; + + // delete jqXHR reference + if (typeof data.context !== 'undefined' && data.context.data('type') === 'dir') { + var dirName = data.context.data('file'); + delete uploadingFiles[dirName][filename]; + if ($.assocArraySize(uploadingFiles[dirName]) == 0) { + delete uploadingFiles[dirName]; + } + } else { + delete uploadingFiles[filename]; + } var file = result[0]; } else { data.textStatus = 'servererror'; @@ -109,20 +121,6 @@ $(document).ready(function() { var fu = $(this).data('blueimp-fileupload') || $(this).data('fileupload'); fu._trigger('fail', e, data); } - - var filename = result[0].originalname; - - // delete jqXHR reference - if (typeof data.context !== 'undefined' && data.context.data('type') === 'dir') { - var dirName = data.context.data('file'); - delete uploadingFiles[dirName][filename]; - if ($.assocArraySize(uploadingFiles[dirName]) == 0) { - delete uploadingFiles[dirName]; - } - } else { - delete uploadingFiles[filename]; - } - }, /** * called after last upload diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index 10801af3ea..e11cc70802 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -144,6 +144,7 @@ var FileList={ remove:function(name){ $('tr').filterAttr('data-file',name).find('td.filename').draggable('destroy'); $('tr').filterAttr('data-file',name).remove(); + FileList.updateFileSummary(); if($('tr[data-file]').length==0){ $('#emptyfolder').show(); } @@ -176,6 +177,7 @@ var FileList={ $('#fileList').append(element); } $('#emptyfolder').hide(); + FileList.updateFileSummary(); }, loadingDone:function(name, id){ var mime, tr=$('tr').filterAttr('data-file',name); @@ -391,6 +393,7 @@ var FileList={ }); procesSelection(); checkTrashStatus(); + FileList.updateFileSummary(); } else { $.each(files,function(index,file) { var deleteAction = $('tr').filterAttr('data-file',files[i]).children("td.date").children(".action.delete"); @@ -398,6 +401,111 @@ var FileList={ }); } }); + }, + createFileSummary: function() { + if( $('#fileList tr').length > 0 ) { + var totalDirs = 0; + var totalFiles = 0; + var totalSize = 0; + + // Count types and filesize + $.each($('tr[data-file]'), function(index, value) { + if ($(value).data('type') === 'dir') { + totalDirs++; + } else if ($(value).data('type') === 'file') { + totalFiles++; + } + totalSize += parseInt($(value).data('size')); + }); + + // Get translations + var directoryInfo = n('files', '%n folder', '%n folders', totalDirs); + var fileInfo = n('files', '%n file', '%n files', totalFiles); + + var infoVars = { + dirs: ''+directoryInfo+'', + files: ''+fileInfo+'' + } + + var info = t('files', '{dirs} and {files}', infoVars); + + // don't show the filesize column, if filesize is NaN (e.g. in trashbin) + if (isNaN(totalSize)) { + var fileSize = ''; + } else { + var fileSize = ''+humanFileSize(totalSize)+''; + } + + $('#fileList').append(''+info+''+fileSize+''); + + var $dirInfo = $('.summary .dirinfo'); + var $fileInfo = $('.summary .fileinfo'); + var $connector = $('.summary .connector'); + + // Show only what's necessary, e.g.: no files: don't show "0 files" + if ($dirInfo.html().charAt(0) === "0") { + $dirInfo.hide(); + $connector.hide(); + } + if ($fileInfo.html().charAt(0) === "0") { + $fileInfo.hide(); + $connector.hide(); + } + } + }, + updateFileSummary: function() { + var $summary = $('.summary'); + + // Check if we should remove the summary to show "Upload something" + if ($('#fileList tr').length === 1 && $summary.length === 1) { + $summary.remove(); + } + // If there's no summary create one (createFileSummary checks if there's data) + else if ($summary.length === 0) { + FileList.createFileSummary(); + } + // There's a summary and data -> Update the summary + else if ($('#fileList tr').length > 1 && $summary.length === 1) { + var totalDirs = 0; + var totalFiles = 0; + var totalSize = 0; + $.each($('tr[data-file]'), function(index, value) { + if ($(value).data('type') === 'dir') { + totalDirs++; + } else if ($(value).data('type') === 'file') { + totalFiles++; + } + if ($(value).data('size') !== undefined) { + totalSize += parseInt($(value).data('size')); + } + }); + + var $dirInfo = $('.summary .dirinfo'); + var $fileInfo = $('.summary .fileinfo'); + var $connector = $('.summary .connector'); + + // Substitute old content with new translations + $dirInfo.html(n('files', '%n folder', '%n folders', totalDirs)); + $fileInfo.html(n('files', '%n file', '%n files', totalFiles)); + $('.summary .filesize').html(humanFileSize(totalSize)); + + // Show only what's necessary (may be hidden) + if ($dirInfo.html().charAt(0) === "0") { + $dirInfo.hide(); + $connector.hide(); + } else { + $dirInfo.show(); + } + if ($fileInfo.html().charAt(0) === "0") { + $fileInfo.hide(); + $connector.hide(); + } else { + $fileInfo.show(); + } + if ($dirInfo.html().charAt(0) !== "0" && $fileInfo.html().charAt(0) !== "0") { + $connector.show(); + } + } } }; @@ -599,4 +707,6 @@ $(document).ready(function(){ $(window).unload(function (){ $(window).trigger('beforeunload'); }); + + FileList.createFileSummary(); }); diff --git a/apps/files/l10n/ar.php b/apps/files/l10n/ar.php index 7161e49a96..8346eece88 100644 --- a/apps/files/l10n/ar.php +++ b/apps/files/l10n/ar.php @@ -28,6 +28,8 @@ $TRANSLATIONS = array( "cancel" => "إلغاء", "replaced {new_name} with {old_name}" => "استبدل {new_name} بـ {old_name}", "undo" => "تراجع", +"_%n folder_::_%n folders_" => array("","","","","",""), +"_%n file_::_%n files_" => array("","","","","",""), "_Uploading %n file_::_Uploading %n files_" => array("","","","","",""), "'.' is an invalid file name." => "\".\" اسم ملف غير صحيح.", "File name cannot be empty." => "اسم الملف لا يجوز أن يكون فارغا", @@ -35,12 +37,9 @@ $TRANSLATIONS = array( "Your storage is full, files can not be updated or synced anymore!" => "مساحتك التخزينية ممتلئة, لا يمكم تحديث ملفاتك أو مزامنتها بعد الآن !", "Your storage is almost full ({usedSpacePercent}%)" => "مساحتك التخزينية امتلأت تقريبا ", "Your download is being prepared. This might take some time if the files are big." => "جاري تجهيز عملية التحميل. قد تستغرق بعض الوقت اذا كان حجم الملفات كبير.", -"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "إسم مجلد غير صحيح. استخدام مصطلح \"Shared\" محجوز للنظام", "Name" => "اسم", "Size" => "حجم", "Modified" => "معدل", -"_%n folder_::_%n folders_" => array("","","","","",""), -"_%n file_::_%n files_" => array("","","","","",""), "Upload" => "رفع", "File handling" => "التعامل مع الملف", "Maximum upload size" => "الحد الأقصى لحجم الملفات التي يمكن رفعها", diff --git a/apps/files/l10n/bg_BG.php b/apps/files/l10n/bg_BG.php index 1e2104370b..e7dafd1c43 100644 --- a/apps/files/l10n/bg_BG.php +++ b/apps/files/l10n/bg_BG.php @@ -17,12 +17,12 @@ $TRANSLATIONS = array( "replace" => "препокриване", "cancel" => "отказ", "undo" => "възтановяване", +"_%n folder_::_%n folders_" => array("",""), +"_%n file_::_%n files_" => array("",""), "_Uploading %n file_::_Uploading %n files_" => array("",""), "Name" => "Име", "Size" => "Размер", "Modified" => "Променено", -"_%n folder_::_%n folders_" => array("",""), -"_%n file_::_%n files_" => array("",""), "Upload" => "Качване", "Maximum upload size" => "Максимален размер за качване", "0 is unlimited" => "Ползвайте 0 за без ограничения", @@ -36,7 +36,6 @@ $TRANSLATIONS = array( "Delete" => "Изтриване", "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." => "Файловете се претърсват, изчакайте.", -"file" => "файл" +"Files are being scanned, please wait." => "Файловете се претърсват, изчакайте." ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files/l10n/bn_BD.php b/apps/files/l10n/bn_BD.php index 2f05a3eccf..2265c232a1 100644 --- a/apps/files/l10n/bn_BD.php +++ b/apps/files/l10n/bn_BD.php @@ -27,16 +27,15 @@ $TRANSLATIONS = array( "cancel" => "বাতিল", "replaced {new_name} with {old_name}" => "{new_name} কে {old_name} নামে প্রতিস্থাপন করা হয়েছে", "undo" => "ক্রিয়া প্রত্যাহার", +"_%n folder_::_%n folders_" => array("",""), +"_%n file_::_%n files_" => array("",""), "_Uploading %n file_::_Uploading %n files_" => array("",""), "'.' is an invalid file name." => "টি একটি অননুমোদিত নাম।", "File name cannot be empty." => "ফাইলের নামটি ফাঁকা রাখা যাবে না।", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "নামটি সঠিক নয়, '\\', '/', '<', '>', ':', '\"', '|', '?' এবং '*' অনুমোদিত নয়।", -"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "ফোল্ডারের নামটি সঠিক নয়। 'ভাগাভাগি করা' শুধুমাত্র Owncloud এর জন্য সংরক্ষিত।", "Name" => "রাম", "Size" => "আকার", "Modified" => "পরিবর্তিত", -"_%n folder_::_%n folders_" => array("",""), -"_%n file_::_%n files_" => array("",""), "Upload" => "আপলোড", "File handling" => "ফাইল হ্যার্ডলিং", "Maximum upload size" => "আপলোডের সর্বোচ্চ আকার", diff --git a/apps/files/l10n/ca.php b/apps/files/l10n/ca.php index 3429f572fd..9f90138eeb 100644 --- a/apps/files/l10n/ca.php +++ b/apps/files/l10n/ca.php @@ -32,6 +32,8 @@ $TRANSLATIONS = array( "cancel" => "cancel·la", "replaced {new_name} with {old_name}" => "s'ha substituït {old_name} per {new_name}", "undo" => "desfés", +"_%n folder_::_%n folders_" => array("%n carpeta","%n carpetes"), +"_%n file_::_%n files_" => array("%n fitxer","%n fitxers"), "_Uploading %n file_::_Uploading %n files_" => array("Pujant %n fitxer","Pujant %n fitxers"), "files uploading" => "fitxers pujant", "'.' is an invalid file name." => "'.' és un nom no vàlid per un fitxer.", @@ -41,12 +43,9 @@ $TRANSLATIONS = array( "Your storage is almost full ({usedSpacePercent}%)" => "El vostre espai d'emmagatzemament és gairebé ple ({usedSpacePercent}%)", "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "L'encriptació s'ha desactivat però els vostres fitxers segueixen encriptats. Aneu a la vostra configuració personal per desencriptar els vostres fitxers.", "Your download is being prepared. This might take some time if the files are big." => "S'està preparant la baixada. Pot trigar una estona si els fitxers són grans.", -"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Nom de carpeta no vàlid. L'ús de 'Shared' està reservat per Owncloud", "Name" => "Nom", "Size" => "Mida", "Modified" => "Modificat", -"_%n folder_::_%n folders_" => array("%n carpeta","%n carpetes"), -"_%n file_::_%n files_" => array("%n fitxer","%n fitxers"), "%s could not be renamed" => "%s no es pot canviar el nom", "Upload" => "Puja", "File handling" => "Gestió de fitxers", @@ -72,10 +71,6 @@ $TRANSLATIONS = array( "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Els fitxers que esteu intentant pujar excedeixen la mida màxima de pujada del servidor", "Files are being scanned, please wait." => "S'estan escanejant els fitxers, espereu", "Current scanning" => "Actualment escanejant", -"directory" => "directori", -"directories" => "directoris", -"file" => "fitxer", -"files" => "fitxers", "Upgrading filesystem cache..." => "Actualitzant la memòria de cau del sistema de fitxers..." ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files/l10n/cs_CZ.php b/apps/files/l10n/cs_CZ.php index 1f766de7cf..c46758c7bc 100644 --- a/apps/files/l10n/cs_CZ.php +++ b/apps/files/l10n/cs_CZ.php @@ -32,6 +32,8 @@ $TRANSLATIONS = array( "cancel" => "zrušit", "replaced {new_name} with {old_name}" => "nahrazeno {new_name} s {old_name}", "undo" => "vrátit zpět", +"_%n folder_::_%n folders_" => array("%n složka","%n složky","%n složek"), +"_%n file_::_%n files_" => array("%n soubor","%n soubory","%n souborů"), "_Uploading %n file_::_Uploading %n files_" => array("Nahrávám %n soubor","Nahrávám %n soubory","Nahrávám %n souborů"), "files uploading" => "soubory se odesílají", "'.' is an invalid file name." => "'.' je neplatným názvem souboru.", @@ -39,14 +41,11 @@ $TRANSLATIONS = array( "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Neplatný název, znaky '\\', '/', '<', '>', ':', '\"', '|', '?' a '*' nejsou povoleny.", "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}%)", -"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Šifrování bylo zrušeno, soubory jsou však stále zašifrované. Běžte prosím do osobního nastavení, kde si složky odšifrujete.", +"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Šifrování bylo vypnuto, vaše soubory jsou však stále zašifrované. Běžte prosím do osobního nastavení, kde soubory odšifrujete.", "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.", -"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Neplatný název složky. Pojmenování 'Shared' je rezervováno pro vnitřní potřeby ownCloud", "Name" => "Název", "Size" => "Velikost", "Modified" => "Upraveno", -"_%n folder_::_%n folders_" => array("%n složka","%n složky","%n složek"), -"_%n file_::_%n files_" => array("%n soubor","%n soubory","%n souborů"), "%s could not be renamed" => "%s nemůže být přejmenován", "Upload" => "Odeslat", "File handling" => "Zacházení se soubory", @@ -72,10 +71,6 @@ $TRANSLATIONS = array( "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í", -"directory" => "adresář", -"directories" => "adresáře", -"file" => "soubor", -"files" => "soubory", "Upgrading filesystem cache..." => "Aktualizuji mezipaměť souborového systému..." ); $PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"; diff --git a/apps/files/l10n/cy_GB.php b/apps/files/l10n/cy_GB.php index 01c4613a8c..666e90e9db 100644 --- a/apps/files/l10n/cy_GB.php +++ b/apps/files/l10n/cy_GB.php @@ -29,6 +29,8 @@ $TRANSLATIONS = array( "cancel" => "diddymu", "replaced {new_name} with {old_name}" => "newidiwyd {new_name} yn lle {old_name}", "undo" => "dadwneud", +"_%n folder_::_%n folders_" => array("","","",""), +"_%n file_::_%n files_" => array("","","",""), "_Uploading %n file_::_Uploading %n files_" => array("","","",""), "files uploading" => "ffeiliau'n llwytho i fyny", "'.' is an invalid file name." => "Mae '.' yn enw ffeil annilys.", @@ -37,12 +39,9 @@ $TRANSLATIONS = array( "Your storage is full, files can not be updated or synced anymore!" => "Mae eich storfa'n llawn, ni ellir diweddaru a chydweddu ffeiliau mwyach!", "Your storage is almost full ({usedSpacePercent}%)" => "Mae eich storfa bron a bod yn llawn ({usedSpacePercent}%)", "Your download is being prepared. This might take some time if the files are big." => "Wrthi'n paratoi i lwytho i lawr. Gall gymryd peth amser os yw'r ffeiliau'n fawr.", -"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Enw plygell annilys. Mae'r defnydd o 'Shared' yn cael ei gadw gan Owncloud", "Name" => "Enw", "Size" => "Maint", "Modified" => "Addaswyd", -"_%n folder_::_%n folders_" => array("","","",""), -"_%n file_::_%n files_" => array("","","",""), "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 e10b16be50..36703322f9 100644 --- a/apps/files/l10n/da.php +++ b/apps/files/l10n/da.php @@ -32,6 +32,8 @@ $TRANSLATIONS = array( "cancel" => "fortryd", "replaced {new_name} with {old_name}" => "erstattede {new_name} med {old_name}", "undo" => "fortryd", +"_%n folder_::_%n folders_" => array("%n mappe","%n mapper"), +"_%n file_::_%n files_" => array("%n fil","%n filer"), "_Uploading %n file_::_Uploading %n files_" => array("Uploader %n fil","Uploader %n filer"), "files uploading" => "uploader filer", "'.' is an invalid file name." => "'.' er et ugyldigt filnavn.", @@ -41,12 +43,9 @@ $TRANSLATIONS = array( "Your storage is almost full ({usedSpacePercent}%)" => "Din opbevaringsplads er næsten fyldt op ({usedSpacePercent}%)", "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Krypteringen blev deaktiveret, men dine filer er stadig krypteret. Gå venligst til dine personlige indstillinger for at dekryptere dine filer. ", "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.", -"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Ugyldigt mappenavn. Brug af \"Shared\" er forbeholdt Owncloud", "Name" => "Navn", "Size" => "Størrelse", "Modified" => "Ændret", -"_%n folder_::_%n folders_" => array("%n mappe","%n mapper"), -"_%n file_::_%n files_" => array("%n fil","%n filer"), "%s could not be renamed" => "%s kunne ikke omdøbes", "Upload" => "Upload", "File handling" => "Filhåndtering", @@ -72,10 +71,6 @@ $TRANSLATIONS = array( "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", -"directory" => "mappe", -"directories" => "Mapper", -"file" => "fil", -"files" => "filer", "Upgrading filesystem cache..." => "Opgraderer filsystems cachen..." ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files/l10n/de.php b/apps/files/l10n/de.php index c41d2fb5c1..8d8d30cb6e 100644 --- a/apps/files/l10n/de.php +++ b/apps/files/l10n/de.php @@ -32,6 +32,8 @@ $TRANSLATIONS = array( "cancel" => "abbrechen", "replaced {new_name} with {old_name}" => "{old_name} ersetzt durch {new_name}", "undo" => "rückgängig machen", +"_%n folder_::_%n folders_" => array("%n Ordner","%n Ordner"), +"_%n file_::_%n files_" => array("%n Datei","%n Dateien"), "_Uploading %n file_::_Uploading %n files_" => array("%n Datei wird hochgeladen","%n Dateien werden hochgeladen"), "files uploading" => "Dateien werden hoch geladen", "'.' is an invalid file name." => "'.' ist kein gültiger Dateiname.", @@ -41,12 +43,9 @@ $TRANSLATIONS = array( "Your storage is almost full ({usedSpacePercent}%)" => "Dein Speicher ist fast voll ({usedSpacePercent}%)", "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Die Verschlüsselung wurde deaktiviert, jedoch sind deine Dateien nach wie vor verschlüsselt. Bitte gehe zu deinen persönlichen Einstellungen, um deine Dateien zu entschlüsseln.", "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.", -"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Ungültiger Verzeichnisname. Die Nutzung von \"Shared\" ist ownCloud vorbehalten.", "Name" => "Name", "Size" => "Größe", "Modified" => "Geändert", -"_%n folder_::_%n folders_" => array("%n Ordner","%n Ordner"), -"_%n file_::_%n files_" => array("%n Datei","%n Dateien"), "%s could not be renamed" => "%s konnte nicht umbenannt werden", "Upload" => "Hochladen", "File handling" => "Dateibehandlung", @@ -72,10 +71,6 @@ $TRANSLATIONS = array( "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Die Datei überschreitet die Maximalgröße für Uploads auf diesem Server.", "Files are being scanned, please wait." => "Dateien werden gescannt, bitte warten.", "Current scanning" => "Scanne", -"directory" => "Verzeichnis", -"directories" => "Verzeichnisse", -"file" => "Datei", -"files" => "Dateien", "Upgrading filesystem cache..." => "Dateisystem-Cache wird aktualisiert ..." ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files/l10n/de_DE.php b/apps/files/l10n/de_DE.php index 6d4bf8a4e7..309a885d37 100644 --- a/apps/files/l10n/de_DE.php +++ b/apps/files/l10n/de_DE.php @@ -32,6 +32,8 @@ $TRANSLATIONS = array( "cancel" => "abbrechen", "replaced {new_name} with {old_name}" => "{old_name} wurde ersetzt durch {new_name}", "undo" => "rückgängig machen", +"_%n folder_::_%n folders_" => array("%n Ordner","%n Ordner"), +"_%n file_::_%n files_" => array("%n Datei","%n Dateien"), "_Uploading %n file_::_Uploading %n files_" => array("%n Datei wird hoch geladen","%n Dateien werden hoch geladen"), "files uploading" => "Dateien werden hoch geladen", "'.' is an invalid file name." => "'.' ist kein gültiger Dateiname.", @@ -41,12 +43,9 @@ $TRANSLATIONS = array( "Your storage is almost full ({usedSpacePercent}%)" => "Ihr Speicher ist fast voll ({usedSpacePercent}%)", "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Die Verschlüsselung wurde deaktiviert, jedoch sind Ihre Dateien nach wie vor verschlüsselt. Bitte gehen Sie zu Ihren persönlichen Einstellungen, um Ihre Dateien zu entschlüsseln.", "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.", -"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Ungültiger Verzeichnisname. Die Nutzung von \"Shared\" ist ownCloud vorbehalten", "Name" => "Name", "Size" => "Größe", "Modified" => "Geändert", -"_%n folder_::_%n folders_" => array("%n Ordner","%n Ordner"), -"_%n file_::_%n files_" => array("%n Datei","%n Dateien"), "%s could not be renamed" => "%s konnte nicht umbenannt werden", "Upload" => "Hochladen", "File handling" => "Dateibehandlung", @@ -72,10 +71,6 @@ $TRANSLATIONS = array( "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Die Datei überschreitet die Maximalgröße für Uploads auf diesem Server.", "Files are being scanned, please wait." => "Dateien werden gescannt, bitte warten.", "Current scanning" => "Scanne", -"directory" => "Verzeichnis", -"directories" => "Verzeichnisse", -"file" => "Datei", -"files" => "Dateien", "Upgrading filesystem cache..." => "Dateisystem-Cache wird aktualisiert ..." ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files/l10n/el.php b/apps/files/l10n/el.php index e1d0052bc0..1dca8e41f6 100644 --- a/apps/files/l10n/el.php +++ b/apps/files/l10n/el.php @@ -32,20 +32,20 @@ $TRANSLATIONS = array( "cancel" => "ακύρωση", "replaced {new_name} with {old_name}" => "αντικαταστάθηκε το {new_name} με {old_name}", "undo" => "αναίρεση", -"_Uploading %n file_::_Uploading %n files_" => array("",""), +"_%n folder_::_%n folders_" => array("%n φάκελος","%n φάκελοι"), +"_%n file_::_%n files_" => array("%n αρχείο","%n αρχεία"), +"_Uploading %n file_::_Uploading %n files_" => array("Ανέβασμα %n αρχείου","Ανέβασμα %n αρχείων"), "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}%)", +"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Η κρυπτογράφηση απενεργοποιήθηκε, αλλά τα αρχεία σας είναι ακόμα κρυπτογραφημένα. Παρακαλούμε απενεργοποιήσετε την κρυπτογράφηση αρχείων από τις προσωπικές σας ρυθμίσεις", "Your download is being prepared. This might take some time if the files are big." => "Η λήψη προετοιμάζεται. Αυτό μπορεί να πάρει ώρα εάν τα αρχεία έχουν μεγάλο μέγεθος.", -"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Μη έγκυρο όνομα φακέλου. Η χρήση του 'Κοινόχρηστος' χρησιμοποιείται από ο Owncloud", "Name" => "Όνομα", "Size" => "Μέγεθος", "Modified" => "Τροποποιήθηκε", -"_%n folder_::_%n folders_" => array("",""), -"_%n file_::_%n files_" => array("",""), "%s could not be renamed" => "Αδυναμία μετονομασίας του %s", "Upload" => "Μεταφόρτωση", "File handling" => "Διαχείριση αρχείων", @@ -71,10 +71,6 @@ $TRANSLATIONS = array( "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Τα αρχεία που προσπαθείτε να ανεβάσετε υπερβαίνουν το μέγιστο μέγεθος αποστολής αρχείων σε αυτόν τον διακομιστή.", "Files are being scanned, please wait." => "Τα αρχεία σαρώνονται, παρακαλώ περιμένετε.", "Current scanning" => "Τρέχουσα ανίχνευση", -"directory" => "κατάλογος", -"directories" => "κατάλογοι", -"file" => "αρχείο", -"files" => "αρχεία", "Upgrading filesystem cache..." => "Ενημέρωση της μνήμης cache του συστήματος αρχείων..." ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files/l10n/en@pirate.php b/apps/files/l10n/en@pirate.php index 83351f265f..128f527aef 100644 --- a/apps/files/l10n/en@pirate.php +++ b/apps/files/l10n/en@pirate.php @@ -1,8 +1,8 @@ array("",""), "_%n folder_::_%n folders_" => array("",""), "_%n file_::_%n files_" => array("",""), +"_Uploading %n file_::_Uploading %n files_" => array("",""), "Download" => "Download" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files/l10n/eo.php b/apps/files/l10n/eo.php index 0f404fa29f..2a011ab214 100644 --- a/apps/files/l10n/eo.php +++ b/apps/files/l10n/eo.php @@ -30,6 +30,8 @@ $TRANSLATIONS = array( "cancel" => "nuligi", "replaced {new_name} with {old_name}" => "anstataŭiĝis {new_name} per {old_name}", "undo" => "malfari", +"_%n folder_::_%n folders_" => array("",""), +"_%n file_::_%n files_" => array("",""), "_Uploading %n file_::_Uploading %n files_" => array("",""), "files uploading" => "dosieroj estas alŝutataj", "'.' is an invalid file name." => "'.' ne estas valida dosiernomo.", @@ -38,12 +40,9 @@ $TRANSLATIONS = array( "Your storage is full, files can not be updated or synced anymore!" => "Via memoro plenas, ne plu eblas ĝisdatigi aŭ sinkronigi dosierojn!", "Your storage is almost full ({usedSpacePercent}%)" => "Via memoro preskaŭ plenas ({usedSpacePercent}%)", "Your download is being prepared. This might take some time if the files are big." => "Via elŝuto pretiĝatas. Ĉi tio povas daŭri iom da tempo se la dosieroj grandas.", -"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Nevalida dosierujnomo. Uzo de “Shared” rezervatas de Owncloud.", "Name" => "Nomo", "Size" => "Grando", "Modified" => "Modifita", -"_%n folder_::_%n folders_" => array("",""), -"_%n file_::_%n files_" => array("",""), "Upload" => "Alŝuti", "File handling" => "Dosieradministro", "Maximum upload size" => "Maksimuma alŝutogrando", @@ -68,8 +67,6 @@ $TRANSLATIONS = array( "The files you are trying to upload exceed the maximum size for file uploads on this server." => "La dosieroj, kiujn vi provas alŝuti, transpasas la maksimuman grandon por dosieralŝutoj en ĉi tiu servilo.", "Files are being scanned, please wait." => "Dosieroj estas skanataj, bonvolu atendi.", "Current scanning" => "Nuna skano", -"file" => "dosiero", -"files" => "dosieroj", "Upgrading filesystem cache..." => "Ĝisdatiĝas dosiersistema kaŝmemoro..." ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files/l10n/es.php b/apps/files/l10n/es.php index 2672b16954..1ff1506aaf 100644 --- a/apps/files/l10n/es.php +++ b/apps/files/l10n/es.php @@ -32,6 +32,8 @@ $TRANSLATIONS = array( "cancel" => "cancelar", "replaced {new_name} with {old_name}" => "reemplazado {new_name} con {old_name}", "undo" => "deshacer", +"_%n folder_::_%n folders_" => array("",""), +"_%n file_::_%n files_" => array("",""), "_Uploading %n file_::_Uploading %n files_" => array("",""), "files uploading" => "subiendo archivos", "'.' is an invalid file name." => "'.' no es un nombre de archivo válido.", @@ -40,12 +42,9 @@ $TRANSLATIONS = array( "Your storage is full, files can not be updated or synced anymore!" => "Su almacenamiento está lleno, ¡no se pueden actualizar o sincronizar más!", "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 grandes.", -"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Nombre de carpeta no es válido. El uso de \"Shared\" está reservado por Owncloud", "Name" => "Nombre", "Size" => "Tamaño", "Modified" => "Modificado", -"_%n folder_::_%n folders_" => array("",""), -"_%n file_::_%n files_" => array("",""), "%s could not be renamed" => "%s no se pudo renombrar", "Upload" => "Subir", "File handling" => "Manejo de archivos", @@ -71,10 +70,6 @@ $TRANSLATIONS = array( "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Los archivos que estás intentando subir sobrepasan el tamaño máximo permitido en este servidor.", "Files are being scanned, please wait." => "Los archivos están siendo escaneados, por favor espere.", "Current scanning" => "Escaneo actual", -"directory" => "carpeta", -"directories" => "carpetas", -"file" => "archivo", -"files" => "archivos", "Upgrading filesystem cache..." => "Actualizando caché del sistema de archivos" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files/l10n/es_AR.php b/apps/files/l10n/es_AR.php index 5e94da3c43..dac4d4e4de 100644 --- a/apps/files/l10n/es_AR.php +++ b/apps/files/l10n/es_AR.php @@ -32,6 +32,8 @@ $TRANSLATIONS = array( "cancel" => "cancelar", "replaced {new_name} with {old_name}" => "se reemplazó {new_name} con {old_name}", "undo" => "deshacer", +"_%n folder_::_%n folders_" => array("",""), +"_%n file_::_%n files_" => array("",""), "_Uploading %n file_::_Uploading %n files_" => array("",""), "files uploading" => "Subiendo archivos", "'.' is an invalid file name." => "'.' es un nombre de archivo inválido.", @@ -39,13 +41,11 @@ $TRANSLATIONS = array( "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!" => "El almacenamiento está lleno, los archivos no se pueden seguir actualizando ni sincronizando", "Your storage is almost full ({usedSpacePercent}%)" => "El almacenamiento está casi lleno ({usedSpacePercent}%)", +"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "El proceso de cifrado se ha desactivado, pero los archivos aún están encriptados. Por favor, vaya a la configuración personal para descifrar los archivos.", "Your download is being prepared. This might take some time if the files are big." => "Tu descarga se está preparando. Esto puede demorar si los archivos son muy grandes.", -"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Nombre de carpeta inválido. El uso de 'Shared' está reservado por ownCloud", "Name" => "Nombre", "Size" => "Tamaño", "Modified" => "Modificado", -"_%n folder_::_%n folders_" => array("",""), -"_%n file_::_%n files_" => array("",""), "%s could not be renamed" => "No se pudo renombrar %s", "Upload" => "Subir", "File handling" => "Tratamiento de archivos", @@ -71,10 +71,6 @@ $TRANSLATIONS = array( "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", -"directory" => "directorio", -"directories" => "directorios", -"file" => "archivo", -"files" => "archivos", "Upgrading filesystem cache..." => "Actualizando el cache del sistema de archivos" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files/l10n/et_EE.php b/apps/files/l10n/et_EE.php index 2a5016f380..e1947cb8f7 100644 --- a/apps/files/l10n/et_EE.php +++ b/apps/files/l10n/et_EE.php @@ -32,6 +32,8 @@ $TRANSLATIONS = array( "cancel" => "loobu", "replaced {new_name} with {old_name}" => "asendas nime {old_name} nimega {new_name}", "undo" => "tagasi", +"_%n folder_::_%n folders_" => array("%n kataloog","%n kataloogi"), +"_%n file_::_%n files_" => array("%n fail","%n faili"), "_Uploading %n file_::_Uploading %n files_" => array("Laadin üles %n faili","Laadin üles %n faili"), "files uploading" => "faili üleslaadimisel", "'.' is an invalid file name." => "'.' on vigane failinimi.", @@ -41,12 +43,9 @@ $TRANSLATIONS = array( "Your storage is almost full ({usedSpacePercent}%)" => "Su andmemaht on peaaegu täis ({usedSpacePercent}%)", "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Krüpteering on keelatud, kuid sinu failid on endiselt krüpteeritud. Palun vaata oma personaalseid seadeid oma failide dekrüpteerimiseks.", "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. ", -"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Vigane kataloogi nimi. 'Shared' kasutamine on reserveeritud ownCloud poolt.", "Name" => "Nimi", "Size" => "Suurus", "Modified" => "Muudetud", -"_%n folder_::_%n folders_" => array("%n kataloog","%n kataloogi"), -"_%n file_::_%n files_" => array("%n fail","%n faili"), "%s could not be renamed" => "%s ümbernimetamine ebaõnnestus", "Upload" => "Lae üles", "File handling" => "Failide käsitlemine", @@ -72,10 +71,6 @@ $TRANSLATIONS = array( "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Failid, mida sa proovid üles laadida, ületab serveri poolt üleslaetavatele failidele määratud maksimaalse suuruse.", "Files are being scanned, please wait." => "Faile skannitakse, palun oota.", "Current scanning" => "Praegune skannimine", -"directory" => "kaust", -"directories" => "kaustad", -"file" => "fail", -"files" => "faili", "Upgrading filesystem cache..." => "Failisüsteemi puhvri uuendamine..." ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files/l10n/eu.php b/apps/files/l10n/eu.php index 140261b6c1..6c6e92dda3 100644 --- a/apps/files/l10n/eu.php +++ b/apps/files/l10n/eu.php @@ -32,6 +32,8 @@ $TRANSLATIONS = array( "cancel" => "ezeztatu", "replaced {new_name} with {old_name}" => " {new_name}-k {old_name} ordezkatu du", "undo" => "desegin", +"_%n folder_::_%n folders_" => array("karpeta %n","%n karpeta"), +"_%n file_::_%n files_" => array("fitxategi %n","%n fitxategi"), "_Uploading %n file_::_Uploading %n files_" => array("Fitxategi %n igotzen","%n fitxategi igotzen"), "files uploading" => "fitxategiak igotzen", "'.' is an invalid file name." => "'.' ez da fitxategi izen baliogarria.", @@ -41,12 +43,9 @@ $TRANSLATIONS = array( "Your storage is almost full ({usedSpacePercent}%)" => "Zure biltegiratzea nahiko beterik dago (%{usedSpacePercent})", "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Enkriptazioa desgaitua izan da baina zure fitxategiak oraindik enkriptatuta daude. Mesedez jo zure ezarpen pertsonaletara zure fitxategiak dekodifikatzeko.", "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. ", -"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Baliogabeako karpeta izena. 'Shared' izena Owncloudek erreserbatzen du", "Name" => "Izena", "Size" => "Tamaina", "Modified" => "Aldatuta", -"_%n folder_::_%n folders_" => array("karpeta %n","%n karpeta"), -"_%n file_::_%n files_" => array("fitxategi %n","%n fitxategi"), "%s could not be renamed" => "%s ezin da berrizendatu", "Upload" => "Igo", "File handling" => "Fitxategien kudeaketa", @@ -72,10 +71,6 @@ $TRANSLATIONS = array( "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", -"directory" => "direktorioa", -"directories" => "direktorioak", -"file" => "fitxategia", -"files" => "fitxategiak", "Upgrading filesystem cache..." => "Fitxategi sistemaren katxea eguneratzen..." ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files/l10n/fa.php b/apps/files/l10n/fa.php index 96332921cf..afa04e53ab 100644 --- a/apps/files/l10n/fa.php +++ b/apps/files/l10n/fa.php @@ -32,6 +32,8 @@ $TRANSLATIONS = array( "cancel" => "لغو", "replaced {new_name} with {old_name}" => "{نام_جدید} با { نام_قدیمی} جایگزین شد.", "undo" => "بازگشت", +"_%n folder_::_%n folders_" => array(""), +"_%n file_::_%n files_" => array(""), "_Uploading %n file_::_Uploading %n files_" => array(""), "files uploading" => "بارگذاری فایل ها", "'.' is an invalid file name." => "'.' یک نام پرونده نامعتبر است.", @@ -40,12 +42,9 @@ $TRANSLATIONS = array( "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." => "دانلود شما در حال آماده شدن است. در صورتیکه پرونده ها بزرگ باشند ممکن است مدتی طول بکشد.", -"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "نام پوشه نامعتبر است. استفاده از \" به اشتراک گذاشته شده \" متعلق به سایت Owncloud است.", "Name" => "نام", "Size" => "اندازه", "Modified" => "تاریخ", -"_%n folder_::_%n folders_" => array(""), -"_%n file_::_%n files_" => array(""), "%s could not be renamed" => "%s نمیتواند تغییر نام دهد.", "Upload" => "بارگزاری", "File handling" => "اداره پرونده ها", @@ -71,10 +70,6 @@ $TRANSLATIONS = array( "The files you are trying to upload exceed the maximum size for file uploads on this server." => "فایلها بیش از حد تعیین شده در این سرور هستند\nمترجم:با تغییر فایل php,ini میتوان این محدودیت را برطرف کرد", "Files are being scanned, please wait." => "پرونده ها در حال بازرسی هستند لطفا صبر کنید", "Current scanning" => "بازرسی کنونی", -"directory" => "پوشه", -"directories" => "پوشه ها", -"file" => "پرونده", -"files" => "پرونده ها", "Upgrading filesystem cache..." => "بهبود فایل سیستمی ذخیره گاه..." ); $PLURAL_FORMS = "nplurals=1; plural=0;"; diff --git a/apps/files/l10n/fi_FI.php b/apps/files/l10n/fi_FI.php index b48f44665b..d18ff4f020 100644 --- a/apps/files/l10n/fi_FI.php +++ b/apps/files/l10n/fi_FI.php @@ -28,6 +28,8 @@ $TRANSLATIONS = array( "suggest name" => "ehdota nimeä", "cancel" => "peru", "undo" => "kumoa", +"_%n folder_::_%n folders_" => array("%n kansio","%n kansiota"), +"_%n file_::_%n files_" => array("%n tiedosto","%n tiedostoa"), "_Uploading %n file_::_Uploading %n files_" => array("Lähetetään %n tiedosto","Lähetetään %n tiedostoa"), "'.' is an invalid file name." => "'.' on virheellinen nimi tiedostolle.", "File name cannot be empty." => "Tiedoston nimi ei voi olla tyhjä.", @@ -38,8 +40,6 @@ $TRANSLATIONS = array( "Name" => "Nimi", "Size" => "Koko", "Modified" => "Muokattu", -"_%n folder_::_%n folders_" => array("%n kansio","%n kansiota"), -"_%n file_::_%n files_" => array("%n tiedosto","%n tiedostoa"), "Upload" => "Lähetä", "File handling" => "Tiedostonhallinta", "Maximum upload size" => "Lähetettävän tiedoston suurin sallittu koko", @@ -64,10 +64,6 @@ $TRANSLATIONS = array( "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Lähetettäväksi valitsemasi tiedostot ylittävät palvelimen salliman tiedostokoon rajan.", "Files are being scanned, please wait." => "Tiedostoja tarkistetaan, odota hetki.", "Current scanning" => "Tämänhetkinen tutkinta", -"directory" => "kansio", -"directories" => "kansiota", -"file" => "tiedosto", -"files" => "tiedostoa", "Upgrading filesystem cache..." => "Päivitetään tiedostojärjestelmän välimuistia..." ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files/l10n/fr.php b/apps/files/l10n/fr.php index 6006413449..40bb81296e 100644 --- a/apps/files/l10n/fr.php +++ b/apps/files/l10n/fr.php @@ -32,6 +32,8 @@ $TRANSLATIONS = array( "cancel" => "annuler", "replaced {new_name} with {old_name}" => "{new_name} a été remplacé par {old_name}", "undo" => "annuler", +"_%n folder_::_%n folders_" => array("",""), +"_%n file_::_%n files_" => array("",""), "_Uploading %n file_::_Uploading %n files_" => array("",""), "files uploading" => "fichiers en cours d'envoi", "'.' is an invalid file name." => "'.' n'est pas un nom de fichier valide.", @@ -40,12 +42,9 @@ $TRANSLATIONS = array( "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.", -"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Nom de dossier invalide. L'utilisation du mot 'Shared' est réservée à Owncloud", "Name" => "Nom", "Size" => "Taille", "Modified" => "Modifié", -"_%n folder_::_%n folders_" => array("",""), -"_%n file_::_%n files_" => array("",""), "%s could not be renamed" => "%s ne peut être renommé", "Upload" => "Envoyer", "File handling" => "Gestion des fichiers", @@ -71,10 +70,6 @@ $TRANSLATIONS = array( "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", -"directory" => "dossier", -"directories" => "dossiers", -"file" => "fichier", -"files" => "fichiers", "Upgrading filesystem cache..." => "Mise à niveau du cache du système de fichier" ); $PLURAL_FORMS = "nplurals=2; plural=(n > 1);"; diff --git a/apps/files/l10n/gl.php b/apps/files/l10n/gl.php index 98274ed751..2df738cb15 100644 --- a/apps/files/l10n/gl.php +++ b/apps/files/l10n/gl.php @@ -32,6 +32,8 @@ $TRANSLATIONS = array( "cancel" => "cancelar", "replaced {new_name} with {old_name}" => "substituír {new_name} por {old_name}", "undo" => "desfacer", +"_%n folder_::_%n folders_" => array("%n cartafol","%n cartafoles"), +"_%n file_::_%n files_" => array("%n ficheiro","%n ficheiros"), "_Uploading %n file_::_Uploading %n files_" => array("Cargando %n ficheiro","Cargando %n ficheiros"), "files uploading" => "ficheiros enviándose", "'.' is an invalid file name." => "«.» é un nome de ficheiro incorrecto", @@ -41,12 +43,9 @@ $TRANSLATIONS = array( "Your storage is almost full ({usedSpacePercent}%)" => "O seu espazo de almacenamento está case cheo ({usedSpacePercent}%)", "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "O cifrado foi desactivado, mais os ficheiros están cifrados. Vaia á configuración persoal para descifrar os ficheiros.", "Your download is being prepared. This might take some time if the files are big." => "Está a prepararse a súa descarga. Isto pode levar bastante tempo se os ficheiros son grandes.", -"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Nome de cartafol incorrecto. O uso de «Shared» está reservado por Owncloud", "Name" => "Nome", "Size" => "Tamaño", "Modified" => "Modificado", -"_%n folder_::_%n folders_" => array("%n cartafol","%n cartafoles"), -"_%n file_::_%n files_" => array("%n ficheiro","%n ficheiros"), "%s could not be renamed" => "%s non pode cambiar de nome", "Upload" => "Enviar", "File handling" => "Manexo de ficheiro", @@ -72,10 +71,6 @@ $TRANSLATIONS = array( "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Os ficheiros que tenta enviar exceden do tamaño máximo permitido neste servidor", "Files are being scanned, please wait." => "Estanse analizando os ficheiros. Agarde.", "Current scanning" => "Análise actual", -"directory" => "directorio", -"directories" => "directorios", -"file" => "ficheiro", -"files" => "ficheiros", "Upgrading filesystem cache..." => "Anovando a caché do sistema de ficheiros..." ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files/l10n/he.php b/apps/files/l10n/he.php index ef98e2d218..7141c8442e 100644 --- a/apps/files/l10n/he.php +++ b/apps/files/l10n/he.php @@ -28,14 +28,14 @@ $TRANSLATIONS = array( "cancel" => "ביטול", "replaced {new_name} with {old_name}" => "{new_name} הוחלף ב־{old_name}", "undo" => "ביטול", +"_%n folder_::_%n folders_" => array("",""), +"_%n file_::_%n files_" => array("",""), "_Uploading %n file_::_Uploading %n files_" => array("",""), "files uploading" => "קבצים בהעלאה", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "השם שגוי, אסור להשתמש בתווים '\\', '/', '<', '>', ':', '\"', '|', '?' ו־'*'.", "Name" => "שם", "Size" => "גודל", "Modified" => "זמן שינוי", -"_%n folder_::_%n folders_" => array("",""), -"_%n file_::_%n files_" => array("",""), "Upload" => "העלאה", "File handling" => "טיפול בקבצים", "Maximum upload size" => "גודל העלאה מקסימלי", @@ -57,8 +57,6 @@ $TRANSLATIONS = array( "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" => "הסריקה הנוכחית", -"file" => "קובץ", -"files" => "קבצים" +"Current scanning" => "הסריקה הנוכחית" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files/l10n/hi.php b/apps/files/l10n/hi.php index 7fb5a5b09d..7d2baab607 100644 --- a/apps/files/l10n/hi.php +++ b/apps/files/l10n/hi.php @@ -2,9 +2,9 @@ $TRANSLATIONS = array( "Error" => "त्रुटि", "Share" => "साझा करें", -"_Uploading %n file_::_Uploading %n files_" => array("",""), "_%n folder_::_%n folders_" => array("",""), "_%n file_::_%n files_" => array("",""), +"_Uploading %n file_::_Uploading %n files_" => array("",""), "Save" => "सहेजें" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files/l10n/hr.php b/apps/files/l10n/hr.php index 8f74dea092..57f1ad9700 100644 --- a/apps/files/l10n/hr.php +++ b/apps/files/l10n/hr.php @@ -18,13 +18,13 @@ $TRANSLATIONS = array( "suggest name" => "predloži ime", "cancel" => "odustani", "undo" => "vrati", +"_%n folder_::_%n folders_" => array("","",""), +"_%n file_::_%n files_" => array("","",""), "_Uploading %n file_::_Uploading %n files_" => array("","",""), "files uploading" => "datoteke se učitavaju", "Name" => "Ime", "Size" => "Veličina", "Modified" => "Zadnja promjena", -"_%n folder_::_%n folders_" => array("","",""), -"_%n file_::_%n files_" => array("","",""), "Upload" => "Učitaj", "File handling" => "datoteka za rukovanje", "Maximum upload size" => "Maksimalna veličina prijenosa", @@ -45,8 +45,6 @@ $TRANSLATIONS = array( "Upload too large" => "Prijenos je preobiman", "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Datoteke koje pokušavate prenijeti prelaze maksimalnu veličinu za prijenos datoteka na ovom poslužitelju.", "Files are being scanned, please wait." => "Datoteke se skeniraju, molimo pričekajte.", -"Current scanning" => "Trenutno skeniranje", -"file" => "datoteka", -"files" => "datoteke" +"Current scanning" => "Trenutno skeniranje" ); $PLURAL_FORMS = "nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;"; diff --git a/apps/files/l10n/hu_HU.php b/apps/files/l10n/hu_HU.php index 63efe031da..741964503f 100644 --- a/apps/files/l10n/hu_HU.php +++ b/apps/files/l10n/hu_HU.php @@ -32,6 +32,8 @@ $TRANSLATIONS = array( "cancel" => "mégse", "replaced {new_name} with {old_name}" => "{new_name} fájlt kicseréltük ezzel: {old_name}", "undo" => "visszavonás", +"_%n folder_::_%n folders_" => array("",""), +"_%n file_::_%n files_" => array("",""), "_Uploading %n file_::_Uploading %n files_" => array("",""), "files uploading" => "fájl töltődik föl", "'.' is an invalid file name." => "'.' fájlnév érvénytelen.", @@ -40,12 +42,9 @@ $TRANSLATIONS = array( "Your storage is full, files can not be updated or synced anymore!" => "A tároló tele van, a fájlok nem frissíthetőek vagy szinkronizálhatóak a jövőben.", "Your storage is almost full ({usedSpacePercent}%)" => "A tároló majdnem tele van ({usedSpacePercent}%)", "Your download is being prepared. This might take some time if the files are big." => "Készül a letöltendő állomány. Ez eltarthat egy ideig, ha nagyok a fájlok.", -"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Érvénytelen mappanév. A név használata csak a Owncloud számára lehetséges.", "Name" => "Név", "Size" => "Méret", "Modified" => "Módosítva", -"_%n folder_::_%n folders_" => array("",""), -"_%n file_::_%n files_" => array("",""), "%s could not be renamed" => "%s átnevezése nem sikerült", "Upload" => "Feltöltés", "File handling" => "Fájlkezelés", @@ -71,10 +70,6 @@ $TRANSLATIONS = array( "The files you are trying to upload exceed the maximum size for file uploads on this server." => "A feltöltendő állományok mérete meghaladja a kiszolgálón megengedett maximális méretet.", "Files are being scanned, please wait." => "A fájllista ellenőrzése zajlik, kis türelmet!", "Current scanning" => "Ellenőrzés alatt", -"directory" => "mappa", -"directories" => "mappa", -"file" => "fájl", -"files" => "fájlok", "Upgrading filesystem cache..." => "A fájlrendszer gyorsítótárának frissítése zajlik..." ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files/l10n/hy.php b/apps/files/l10n/hy.php index a419a74cc9..9a5ebb862a 100644 --- a/apps/files/l10n/hy.php +++ b/apps/files/l10n/hy.php @@ -1,8 +1,8 @@ array("",""), "_%n folder_::_%n folders_" => array("",""), "_%n file_::_%n files_" => array("",""), +"_Uploading %n file_::_Uploading %n files_" => array("",""), "Save" => "Պահպանել", "Download" => "Բեռնել", "Delete" => "Ջնջել" diff --git a/apps/files/l10n/ia.php b/apps/files/l10n/ia.php index 202375636a..1560687f6c 100644 --- a/apps/files/l10n/ia.php +++ b/apps/files/l10n/ia.php @@ -6,12 +6,12 @@ $TRANSLATIONS = array( "Files" => "Files", "Error" => "Error", "Share" => "Compartir", +"_%n folder_::_%n folders_" => array("",""), +"_%n file_::_%n files_" => array("",""), "_Uploading %n file_::_Uploading %n files_" => array("",""), "Name" => "Nomine", "Size" => "Dimension", "Modified" => "Modificate", -"_%n folder_::_%n folders_" => array("",""), -"_%n file_::_%n files_" => array("",""), "Upload" => "Incargar", "Maximum upload size" => "Dimension maxime de incargamento", "Save" => "Salveguardar", diff --git a/apps/files/l10n/id.php b/apps/files/l10n/id.php index 0f7aac5a22..ce7cfe5ef4 100644 --- a/apps/files/l10n/id.php +++ b/apps/files/l10n/id.php @@ -29,6 +29,8 @@ $TRANSLATIONS = array( "cancel" => "batalkan", "replaced {new_name} with {old_name}" => "mengganti {new_name} dengan {old_name}", "undo" => "urungkan", +"_%n folder_::_%n folders_" => array(""), +"_%n file_::_%n files_" => array(""), "_Uploading %n file_::_Uploading %n files_" => array(""), "files uploading" => "berkas diunggah", "'.' is an invalid file name." => "'.' bukan nama berkas yang valid.", @@ -37,12 +39,9 @@ $TRANSLATIONS = array( "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.", -"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Nama folder salah. Nama 'Shared' telah digunakan oleh Owncloud.", "Name" => "Nama", "Size" => "Ukuran", "Modified" => "Dimodifikasi", -"_%n folder_::_%n folders_" => array(""), -"_%n file_::_%n files_" => array(""), "Upload" => "Unggah", "File handling" => "Penanganan berkas", "Maximum upload size" => "Ukuran pengunggahan maksimum", @@ -67,8 +66,6 @@ $TRANSLATIONS = array( "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Berkas yang dicoba untuk diunggah melebihi ukuran maksimum pengunggahan berkas di server ini.", "Files are being scanned, please wait." => "Berkas sedang dipindai, silakan tunggu.", "Current scanning" => "Yang sedang dipindai", -"file" => "berkas", -"files" => "berkas-berkas", "Upgrading filesystem cache..." => "Meningkatkan tembolok sistem berkas..." ); $PLURAL_FORMS = "nplurals=1; plural=0;"; diff --git a/apps/files/l10n/is.php b/apps/files/l10n/is.php index aee213691e..2cf195d0a1 100644 --- a/apps/files/l10n/is.php +++ b/apps/files/l10n/is.php @@ -27,16 +27,15 @@ $TRANSLATIONS = array( "cancel" => "hætta við", "replaced {new_name} with {old_name}" => "yfirskrifaði {new_name} með {old_name}", "undo" => "afturkalla", +"_%n folder_::_%n folders_" => array("",""), +"_%n file_::_%n files_" => array("",""), "_Uploading %n file_::_Uploading %n files_" => array("",""), "'.' is an invalid file name." => "'.' er ekki leyfilegt nafn.", "File name cannot be empty." => "Nafn skráar má ekki vera tómt", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ógilt nafn, táknin '\\', '/', '<', '>', ':', '\"', '|', '?' og '*' eru ekki leyfð.", -"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Óleyfilegt nafn á möppu. Nafnið 'Shared' er frátekið fyrir Owncloud", "Name" => "Nafn", "Size" => "Stærð", "Modified" => "Breytt", -"_%n folder_::_%n folders_" => array("",""), -"_%n file_::_%n files_" => array("",""), "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 4332346516..2d53da2160 100644 --- a/apps/files/l10n/it.php +++ b/apps/files/l10n/it.php @@ -32,6 +32,8 @@ $TRANSLATIONS = array( "cancel" => "annulla", "replaced {new_name} with {old_name}" => "sostituito {new_name} con {old_name}", "undo" => "annulla", +"_%n folder_::_%n folders_" => array("%n cartella","%n cartelle"), +"_%n file_::_%n files_" => array("%n file","%n file"), "_Uploading %n file_::_Uploading %n files_" => array("Caricamento di %n file in corso","Caricamento di %n file in corso"), "files uploading" => "caricamento file", "'.' is an invalid file name." => "'.' non è un nome file valido.", @@ -41,12 +43,9 @@ $TRANSLATIONS = array( "Your storage is almost full ({usedSpacePercent}%)" => "Lo spazio di archiviazione è quasi pieno ({usedSpacePercent}%)", "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "La cifratura è stata disabilitata ma i tuoi file sono ancora cifrati. Vai nelle impostazioni personali per decifrare i file.", "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.", -"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Nome della cartella non valido. L'uso di 'Shared' è riservato da ownCloud", "Name" => "Nome", "Size" => "Dimensione", "Modified" => "Modificato", -"_%n folder_::_%n folders_" => array("%n cartella","%n cartelle"), -"_%n file_::_%n files_" => array("%n file","%n file"), "%s could not be renamed" => "%s non può essere rinominato", "Upload" => "Carica", "File handling" => "Gestione file", @@ -72,10 +71,6 @@ $TRANSLATIONS = array( "The files you are trying to upload exceed the maximum size for file uploads on this server." => "I file che stai provando a caricare superano la dimensione massima consentita su questo server.", "Files are being scanned, please wait." => "Scansione dei file in corso, attendi", "Current scanning" => "Scansione corrente", -"directory" => "cartella", -"directories" => "cartelle", -"file" => "file", -"files" => "file", "Upgrading filesystem cache..." => "Aggiornamento della cache del filesystem in corso..." ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files/l10n/ja_JP.php b/apps/files/l10n/ja_JP.php index 2d64212a5f..09675b63f5 100644 --- a/apps/files/l10n/ja_JP.php +++ b/apps/files/l10n/ja_JP.php @@ -32,6 +32,8 @@ $TRANSLATIONS = array( "cancel" => "キャンセル", "replaced {new_name} with {old_name}" => "{old_name} を {new_name} に置換", "undo" => "元に戻す", +"_%n folder_::_%n folders_" => array("%n個のフォルダ"), +"_%n file_::_%n files_" => array("%n個のファイル"), "_Uploading %n file_::_Uploading %n files_" => array("%n 個のファイルをアップロード中"), "files uploading" => "ファイルをアップロード中", "'.' is an invalid file name." => "'.' は無効なファイル名です。", @@ -41,12 +43,9 @@ $TRANSLATIONS = array( "Your storage is almost full ({usedSpacePercent}%)" => "あなたのストレージはほぼ一杯です（{usedSpacePercent}%）", "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "暗号化の機能は無効化されましたが、ファイルはすでに暗号化されています。個人設定からファイルを複合を行ってください。", "Your download is being prepared. This might take some time if the files are big." => "ダウンロードの準備中です。ファイルサイズが大きい場合は少し時間がかかるかもしれません。", -"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "無効なフォルダ名です。'Shared' の利用は ownCloud が予約済みです。", "Name" => "名前", "Size" => "サイズ", "Modified" => "変更", -"_%n folder_::_%n folders_" => array("%n個のフォルダ"), -"_%n file_::_%n files_" => array("%n個のファイル"), "%s could not be renamed" => "%sの名前を変更できませんでした", "Upload" => "アップロード", "File handling" => "ファイル操作", @@ -72,10 +71,6 @@ $TRANSLATIONS = array( "The files you are trying to upload exceed the maximum size for file uploads on this server." => "アップロードしようとしているファイルは、サーバで規定された最大サイズを超えています。", "Files are being scanned, please wait." => "ファイルをスキャンしています、しばらくお待ちください。", "Current scanning" => "スキャン中", -"directory" => "ディレクトリ", -"directories" => "ディレクトリ", -"file" => "ファイル", -"files" => "ファイル", "Upgrading filesystem cache..." => "ファイルシステムキャッシュを更新中..." ); $PLURAL_FORMS = "nplurals=1; plural=0;"; diff --git a/apps/files/l10n/ka.php b/apps/files/l10n/ka.php index 527a2c49b1..544e8168c5 100644 --- a/apps/files/l10n/ka.php +++ b/apps/files/l10n/ka.php @@ -1,9 +1,9 @@ "ფაილები", -"_Uploading %n file_::_Uploading %n files_" => array(""), "_%n folder_::_%n folders_" => array(""), "_%n file_::_%n files_" => array(""), +"_Uploading %n file_::_Uploading %n files_" => array(""), "Download" => "გადმოწერა" ); $PLURAL_FORMS = "nplurals=1; plural=0;"; diff --git a/apps/files/l10n/ka_GE.php b/apps/files/l10n/ka_GE.php index 3205255e39..8fd522aebc 100644 --- a/apps/files/l10n/ka_GE.php +++ b/apps/files/l10n/ka_GE.php @@ -29,6 +29,8 @@ $TRANSLATIONS = array( "cancel" => "უარყოფა", "replaced {new_name} with {old_name}" => "{new_name} შეცვლილია {old_name}–ით", "undo" => "დაბრუნება", +"_%n folder_::_%n folders_" => array(""), +"_%n file_::_%n files_" => array(""), "_Uploading %n file_::_Uploading %n files_" => array(""), "files uploading" => "ფაილები იტვირთება", "'.' is an invalid file name." => "'.' არის დაუშვებელი ფაილის სახელი.", @@ -37,12 +39,9 @@ $TRANSLATIONS = array( "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." => "გადმოწერის მოთხოვნა მუშავდება. ის მოითხოვს გარკვეულ დროს რაგდან ფაილები არის დიდი ზომის.", -"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "დაუშვებელი ფოლდერის სახელი. 'Shared'–ის გამოყენება რეზერვირებულია Owncloud–ის მიერ", "Name" => "სახელი", "Size" => "ზომა", "Modified" => "შეცვლილია", -"_%n folder_::_%n folders_" => array(""), -"_%n file_::_%n files_" => array(""), "Upload" => "ატვირთვა", "File handling" => "ფაილის დამუშავება", "Maximum upload size" => "მაქსიმუმ ატვირთის ზომა", diff --git a/apps/files/l10n/ko.php b/apps/files/l10n/ko.php index 7839ad3bd9..86666c7056 100644 --- a/apps/files/l10n/ko.php +++ b/apps/files/l10n/ko.php @@ -29,6 +29,8 @@ $TRANSLATIONS = array( "cancel" => "취소", "replaced {new_name} with {old_name}" => "{old_name}이(가) {new_name}(으)로 대체됨", "undo" => "되돌리기", +"_%n folder_::_%n folders_" => array(""), +"_%n file_::_%n files_" => array(""), "_Uploading %n file_::_Uploading %n files_" => array(""), "files uploading" => "파일 업로드중", "'.' is an invalid file name." => "'.' 는 올바르지 않은 파일 이름 입니다.", @@ -37,12 +39,9 @@ $TRANSLATIONS = array( "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." => "다운로드가 준비 중입니다. 파일 크기가 크다면 시간이 오래 걸릴 수도 있습니다.", -"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "폴더 이름이 유효하지 않습니다. ", "Name" => "이름", "Size" => "크기", "Modified" => "수정됨", -"_%n folder_::_%n folders_" => array(""), -"_%n file_::_%n files_" => array(""), "Upload" => "업로드", "File handling" => "파일 처리", "Maximum upload size" => "최대 업로드 크기", @@ -67,8 +66,6 @@ $TRANSLATIONS = array( "The files you are trying to upload exceed the maximum size for file uploads on this server." => "이 파일이 서버에서 허용하는 최대 업로드 가능 용량보다 큽니다.", "Files are being scanned, please wait." => "파일을 검색하고 있습니다. 기다려 주십시오.", "Current scanning" => "현재 검색", -"file" => "파일", -"files" => "파일", "Upgrading filesystem cache..." => "파일 시스템 캐시 업그레이드 중..." ); $PLURAL_FORMS = "nplurals=1; plural=0;"; diff --git a/apps/files/l10n/ku_IQ.php b/apps/files/l10n/ku_IQ.php index 81177f9bea..9ec565da44 100644 --- a/apps/files/l10n/ku_IQ.php +++ b/apps/files/l10n/ku_IQ.php @@ -2,10 +2,10 @@ $TRANSLATIONS = array( "URL cannot be empty." => "ناونیشانی به‌سته‌ر نابێت به‌تاڵ بێت.", "Error" => "هه‌ڵه", -"_Uploading %n file_::_Uploading %n files_" => array("",""), -"Name" => "ناو", "_%n folder_::_%n folders_" => array("",""), "_%n file_::_%n files_" => array("",""), +"_Uploading %n file_::_Uploading %n files_" => array("",""), +"Name" => "ناو", "Upload" => "بارکردن", "Save" => "پاشکه‌وتکردن", "Folder" => "بوخچه", diff --git a/apps/files/l10n/lb.php b/apps/files/l10n/lb.php index c57eebd9e7..deefe9caa1 100644 --- a/apps/files/l10n/lb.php +++ b/apps/files/l10n/lb.php @@ -15,12 +15,12 @@ $TRANSLATIONS = array( "replace" => "ersetzen", "cancel" => "ofbriechen", "undo" => "réckgängeg man", +"_%n folder_::_%n folders_" => array("",""), +"_%n file_::_%n files_" => array("",""), "_Uploading %n file_::_Uploading %n files_" => array("",""), "Name" => "Numm", "Size" => "Gréisst", "Modified" => "Geännert", -"_%n folder_::_%n folders_" => array("",""), -"_%n file_::_%n files_" => array("",""), "Upload" => "Eroplueden", "File handling" => "Fichier handling", "Maximum upload size" => "Maximum Upload Gréisst ", @@ -41,8 +41,6 @@ $TRANSLATIONS = array( "Upload too large" => "Upload ze grouss", "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Déi Dateien déi Dir probéiert erop ze lueden sinn méi grouss wei déi Maximal Gréisst déi op dësem Server erlaabt ass.", "Files are being scanned, please wait." => "Fichieren gi gescannt, war weg.", -"Current scanning" => "Momentane Scan", -"file" => "Datei", -"files" => "Dateien" +"Current scanning" => "Momentane Scan" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files/l10n/lt_LT.php b/apps/files/l10n/lt_LT.php index cae9660ab6..3bcc6b8443 100644 --- a/apps/files/l10n/lt_LT.php +++ b/apps/files/l10n/lt_LT.php @@ -30,6 +30,8 @@ $TRANSLATIONS = array( "cancel" => "atšaukti", "replaced {new_name} with {old_name}" => "pakeiskite {new_name} į {old_name}", "undo" => "anuliuoti", +"_%n folder_::_%n folders_" => array("","",""), +"_%n file_::_%n files_" => array("","",""), "_Uploading %n file_::_Uploading %n files_" => array("","",""), "files uploading" => "įkeliami failai", "'.' is an invalid file name." => "'.' yra neleidžiamas failo pavadinime.", @@ -38,12 +40,9 @@ $TRANSLATIONS = array( "Your storage is full, files can not be updated or synced anymore!" => "Jūsų visa vieta serveryje užimta", "Your storage is almost full ({usedSpacePercent}%)" => "Jūsų vieta serveryje beveik visa užimta ({usedSpacePercent}%)", "Your download is being prepared. This might take some time if the files are big." => "Jūsų atsisiuntimas yra paruošiamas. tai gali užtrukti jei atsisiunčiamas didelis failas.", -"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Negalimas aplanko pavadinimas. 'Shared' pavadinimas yra rezervuotas ownCloud", "Name" => "Pavadinimas", "Size" => "Dydis", "Modified" => "Pakeista", -"_%n folder_::_%n folders_" => array("","",""), -"_%n file_::_%n files_" => array("","",""), "Upload" => "Įkelti", "File handling" => "Failų tvarkymas", "Maximum upload size" => "Maksimalus įkeliamo failo dydis", @@ -68,8 +67,6 @@ $TRANSLATIONS = array( "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Bandomų įkelti failų dydis viršija maksimalų, kuris leidžiamas šiame serveryje", "Files are being scanned, please wait." => "Skenuojami failai, prašome palaukti.", "Current scanning" => "Šiuo metu skenuojama", -"file" => "failas", -"files" => "failai", "Upgrading filesystem cache..." => "Atnaujinamas sistemos kešavimas..." ); $PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);"; diff --git a/apps/files/l10n/lv.php b/apps/files/l10n/lv.php index 9367b0f5a6..52cea5305d 100644 --- a/apps/files/l10n/lv.php +++ b/apps/files/l10n/lv.php @@ -32,6 +32,8 @@ $TRANSLATIONS = array( "cancel" => "atcelt", "replaced {new_name} with {old_name}" => "aizvietoja {new_name} ar {old_name}", "undo" => "atsaukt", +"_%n folder_::_%n folders_" => array("%n mapes","%n mape","%n mapes"), +"_%n file_::_%n files_" => array("%n faili","%n fails","%n faili"), "_Uploading %n file_::_Uploading %n files_" => array("%n","Augšupielāde %n failu","Augšupielāde %n failus"), "files uploading" => "fails augšupielādējas", "'.' is an invalid file name." => "'.' ir nederīgs datnes nosaukums.", @@ -41,12 +43,9 @@ $TRANSLATIONS = array( "Your storage is almost full ({usedSpacePercent}%)" => "Jūsu krātuve ir gandrīz pilna ({usedSpacePercent}%)", "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Šifrēšana tika atslēgta, tomēr jūsu faili joprojām ir šifrēti. Atšifrēt failus var Personiskajos uzstādījumos.", "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.", -"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Nederīgs mapes nosaukums. “Koplietots” izmantojums ir rezervēts ownCloud servisam.", "Name" => "Nosaukums", "Size" => "Izmērs", "Modified" => "Mainīts", -"_%n folder_::_%n folders_" => array("%n mapes","%n mape","%n mapes"), -"_%n file_::_%n files_" => array("%n faili","%n fails","%n faili"), "%s could not be renamed" => "%s nevar tikt pārsaukts", "Upload" => "Augšupielādēt", "File handling" => "Datņu pārvaldība", @@ -72,10 +71,6 @@ $TRANSLATIONS = array( "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Augšupielādējamās datnes pārsniedz servera pieļaujamo datņu augšupielādes apjomu", "Files are being scanned, please wait." => "Datnes šobrīd tiek caurskatītas, lūdzu, uzgaidiet.", "Current scanning" => "Šobrīd tiek caurskatīts", -"directory" => "direktorija", -"directories" => "direktorijas", -"file" => "fails", -"files" => "faili", "Upgrading filesystem cache..." => "Uzlabo datņu sistēmas kešatmiņu..." ); $PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);"; diff --git a/apps/files/l10n/mk.php b/apps/files/l10n/mk.php index 20fed43ab2..7a9a8641f8 100644 --- a/apps/files/l10n/mk.php +++ b/apps/files/l10n/mk.php @@ -23,13 +23,13 @@ $TRANSLATIONS = array( "cancel" => "откажи", "replaced {new_name} with {old_name}" => "заменета {new_name} со {old_name}", "undo" => "врати", +"_%n folder_::_%n folders_" => array("",""), +"_%n file_::_%n files_" => array("",""), "_Uploading %n file_::_Uploading %n files_" => array("",""), "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Неправилно име. , '\\', '/', '<', '>', ':', '\"', '|', '?' и '*' не се дозволени.", "Name" => "Име", "Size" => "Големина", "Modified" => "Променето", -"_%n folder_::_%n folders_" => array("",""), -"_%n file_::_%n files_" => array("",""), "Upload" => "Подигни", "File handling" => "Ракување со датотеки", "Maximum upload size" => "Максимална големина за подигање", @@ -51,8 +51,6 @@ $TRANSLATIONS = array( "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" => "Моментално скенирам", -"file" => "датотека", -"files" => "датотеки" +"Current scanning" => "Моментално скенирам" ); $PLURAL_FORMS = "nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;"; diff --git a/apps/files/l10n/ms_MY.php b/apps/files/l10n/ms_MY.php index 86b70faefd..59d0bbfb33 100644 --- a/apps/files/l10n/ms_MY.php +++ b/apps/files/l10n/ms_MY.php @@ -15,12 +15,12 @@ $TRANSLATIONS = array( "Pending" => "Dalam proses", "replace" => "ganti", "cancel" => "Batal", +"_%n folder_::_%n folders_" => array(""), +"_%n file_::_%n files_" => array(""), "_Uploading %n file_::_Uploading %n files_" => array(""), "Name" => "Nama", "Size" => "Saiz", "Modified" => "Dimodifikasi", -"_%n folder_::_%n folders_" => array(""), -"_%n file_::_%n files_" => array(""), "Upload" => "Muat naik", "File handling" => "Pengendalian fail", "Maximum upload size" => "Saiz maksimum muat naik", @@ -40,8 +40,6 @@ $TRANSLATIONS = array( "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", -"file" => "fail", -"files" => "fail" +"Current scanning" => "Imbasan semasa" ); $PLURAL_FORMS = "nplurals=1; plural=0;"; diff --git a/apps/files/l10n/my_MM.php b/apps/files/l10n/my_MM.php index 4dc63ffee2..497ecc0949 100644 --- a/apps/files/l10n/my_MM.php +++ b/apps/files/l10n/my_MM.php @@ -1,9 +1,9 @@ "ဖိုင်များ", -"_Uploading %n file_::_Uploading %n files_" => array(""), "_%n folder_::_%n folders_" => array(""), "_%n file_::_%n files_" => array(""), +"_Uploading %n file_::_Uploading %n files_" => array(""), "Download" => "ဒေါင်းလုတ်" ); $PLURAL_FORMS = "nplurals=1; plural=0;"; diff --git a/apps/files/l10n/nb_NO.php b/apps/files/l10n/nb_NO.php index d76255f522..5c7780825f 100644 --- a/apps/files/l10n/nb_NO.php +++ b/apps/files/l10n/nb_NO.php @@ -32,6 +32,8 @@ $TRANSLATIONS = array( "cancel" => "avbryt", "replaced {new_name} with {old_name}" => "erstattet {new_name} med {old_name}", "undo" => "angre", +"_%n folder_::_%n folders_" => array("%n mappe","%n mapper"), +"_%n file_::_%n files_" => array("%n fil","%n filer"), "_Uploading %n file_::_Uploading %n files_" => array("Laster opp %n fil","Laster opp %n filer"), "files uploading" => "filer lastes opp", "'.' is an invalid file name." => "'.' er et ugyldig filnavn.", @@ -40,12 +42,9 @@ $TRANSLATIONS = array( "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 brukt opp ([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.", -"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Ugyldig mappenavn. Bruk av \"Shared\" er reservert av ownCloud.", "Name" => "Navn", "Size" => "Størrelse", "Modified" => "Endret", -"_%n folder_::_%n folders_" => array("%n mappe","%n mapper"), -"_%n file_::_%n files_" => array("%n fil","%n filer"), "%s could not be renamed" => "Kunne ikke gi nytt navn til %s", "Upload" => "Last opp", "File handling" => "Filhåndtering", @@ -71,10 +70,6 @@ $TRANSLATIONS = array( "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 filer, vennligst vent.", "Current scanning" => "Pågående skanning", -"directory" => "katalog", -"directories" => "kataloger", -"file" => "fil", -"files" => "filer", "Upgrading filesystem cache..." => "Oppgraderer filsystemets mellomlager..." ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files/l10n/nl.php b/apps/files/l10n/nl.php index 6e9ff605f5..a4386992cf 100644 --- a/apps/files/l10n/nl.php +++ b/apps/files/l10n/nl.php @@ -32,6 +32,8 @@ $TRANSLATIONS = array( "cancel" => "annuleren", "replaced {new_name} with {old_name}" => "verving {new_name} met {old_name}", "undo" => "ongedaan maken", +"_%n folder_::_%n folders_" => array("","%n mappen"), +"_%n file_::_%n files_" => array("","%n bestanden"), "_Uploading %n file_::_Uploading %n files_" => array("%n bestand aan het uploaden","%n bestanden aan het uploaden"), "files uploading" => "bestanden aan het uploaden", "'.' is an invalid file name." => "'.' is een ongeldige bestandsnaam.", @@ -41,12 +43,9 @@ $TRANSLATIONS = array( "Your storage is almost full ({usedSpacePercent}%)" => "Uw opslagruimte zit bijna vol ({usedSpacePercent}%)", "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Encryptie is uitgeschakeld maar uw bestanden zijn nog steeds versleuteld. Ga naar uw persoonlijke instellingen om uw bestanden te decoderen.", "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.", -"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Ongeldige mapnaam. Gebruik van'Gedeeld' is voorbehouden aan Owncloud", "Name" => "Naam", "Size" => "Grootte", "Modified" => "Aangepast", -"_%n folder_::_%n folders_" => array("","%n mappen"), -"_%n file_::_%n files_" => array("","%n bestanden"), "%s could not be renamed" => "%s kon niet worden hernoemd", "Upload" => "Uploaden", "File handling" => "Bestand", @@ -72,10 +71,6 @@ $TRANSLATIONS = array( "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", -"directory" => "directory", -"directories" => "directories", -"file" => "bestand", -"files" => "bestanden", "Upgrading filesystem cache..." => "Upgraden bestandssysteem cache..." ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files/l10n/nn_NO.php b/apps/files/l10n/nn_NO.php index 0f0ad31874..84402057a3 100644 --- a/apps/files/l10n/nn_NO.php +++ b/apps/files/l10n/nn_NO.php @@ -30,6 +30,8 @@ $TRANSLATIONS = array( "cancel" => "avbryt", "replaced {new_name} with {old_name}" => "bytte ut {new_name} med {old_name}", "undo" => "angre", +"_%n folder_::_%n folders_" => array("",""), +"_%n file_::_%n files_" => array("",""), "_Uploading %n file_::_Uploading %n files_" => array("",""), "files uploading" => "filer lastar opp", "'.' is an invalid file name." => "«.» er eit ugyldig filnamn.", @@ -38,12 +40,9 @@ $TRANSLATIONS = array( "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.", -"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Ugyldig mappenamn. Mappa «Shared» er reservert av ownCloud", "Name" => "Namn", "Size" => "Storleik", "Modified" => "Endra", -"_%n folder_::_%n folders_" => array("",""), -"_%n file_::_%n files_" => array("",""), "Upload" => "Last opp", "File handling" => "Filhandtering", "Maximum upload size" => "Maksimal opplastingsstorleik", diff --git a/apps/files/l10n/oc.php b/apps/files/l10n/oc.php index 552d72bef5..63e572059b 100644 --- a/apps/files/l10n/oc.php +++ b/apps/files/l10n/oc.php @@ -18,13 +18,13 @@ $TRANSLATIONS = array( "suggest name" => "nom prepausat", "cancel" => "anulla", "undo" => "defar", +"_%n folder_::_%n folders_" => array("",""), +"_%n file_::_%n files_" => array("",""), "_Uploading %n file_::_Uploading %n files_" => array("",""), "files uploading" => "fichièrs al amontcargar", "Name" => "Nom", "Size" => "Talha", "Modified" => "Modificat", -"_%n folder_::_%n folders_" => array("",""), -"_%n file_::_%n files_" => array("",""), "Upload" => "Amontcarga", "File handling" => "Manejament de fichièr", "Maximum upload size" => "Talha maximum d'amontcargament", @@ -45,8 +45,6 @@ $TRANSLATIONS = array( "Upload too large" => "Amontcargament tròp gròs", "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Los fichièrs que sias a amontcargar son tròp pesucs per la talha maxi pel servidor.", "Files are being scanned, please wait." => "Los fiichièrs son a èsser explorats, ", -"Current scanning" => "Exploracion en cors", -"file" => "fichièr", -"files" => "fichièrs" +"Current scanning" => "Exploracion en cors" ); $PLURAL_FORMS = "nplurals=2; plural=(n > 1);"; diff --git a/apps/files/l10n/pl.php b/apps/files/l10n/pl.php index 813d2ee8e7..c55d81cea2 100644 --- a/apps/files/l10n/pl.php +++ b/apps/files/l10n/pl.php @@ -32,6 +32,8 @@ $TRANSLATIONS = array( "cancel" => "anuluj", "replaced {new_name} with {old_name}" => "zastąpiono {new_name} przez {old_name}", "undo" => "cofnij", +"_%n folder_::_%n folders_" => array("","",""), +"_%n file_::_%n files_" => array("","",""), "_Uploading %n file_::_Uploading %n files_" => array("","",""), "files uploading" => "pliki wczytane", "'.' is an invalid file name." => "„.” jest nieprawidłową nazwą pliku.", @@ -40,12 +42,9 @@ $TRANSLATIONS = array( "Your storage is full, files can not be updated or synced anymore!" => "Magazyn jest pełny. Pliki nie mogą zostać zaktualizowane lub zsynchronizowane!", "Your storage is almost full ({usedSpacePercent}%)" => "Twój magazyn jest prawie pełny ({usedSpacePercent}%)", "Your download is being prepared. This might take some time if the files are big." => "Pobieranie jest przygotowywane. Może to zająć trochę czasu jeśli pliki są duże.", -"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Nieprawidłowa nazwa folderu. Korzystanie z nazwy „Shared” jest zarezerwowane dla ownCloud", "Name" => "Nazwa", "Size" => "Rozmiar", "Modified" => "Modyfikacja", -"_%n folder_::_%n folders_" => array("","",""), -"_%n file_::_%n files_" => array("","",""), "%s could not be renamed" => "%s nie można zmienić nazwy", "Upload" => "Wyślij", "File handling" => "Zarządzanie plikami", @@ -71,10 +70,6 @@ $TRANSLATIONS = array( "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Pliki, które próbujesz przesłać, przekraczają maksymalną dopuszczalną wielkość.", "Files are being scanned, please wait." => "Skanowanie plików, proszę czekać.", "Current scanning" => "Aktualnie skanowane", -"directory" => "Katalog", -"directories" => "Katalogi", -"file" => "plik", -"files" => "pliki", "Upgrading filesystem cache..." => "Uaktualnianie plików pamięci podręcznej..." ); $PLURAL_FORMS = "nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"; diff --git a/apps/files/l10n/pt_BR.php b/apps/files/l10n/pt_BR.php index 575df89111..bfe34bab21 100644 --- a/apps/files/l10n/pt_BR.php +++ b/apps/files/l10n/pt_BR.php @@ -32,6 +32,8 @@ $TRANSLATIONS = array( "cancel" => "cancelar", "replaced {new_name} with {old_name}" => "Substituído {old_name} por {new_name} ", "undo" => "desfazer", +"_%n folder_::_%n folders_" => array("",""), +"_%n file_::_%n files_" => array("",""), "_Uploading %n file_::_Uploading %n files_" => array("",""), "files uploading" => "enviando arquivos", "'.' is an invalid file name." => "'.' é um nome de arquivo inválido.", @@ -40,12 +42,9 @@ $TRANSLATIONS = array( "Your storage is full, files can not be updated or synced anymore!" => "Seu armazenamento está cheio, arquivos não podem mais ser atualizados ou sincronizados!", "Your storage is almost full ({usedSpacePercent}%)" => "Seu armazenamento está quase cheio ({usedSpacePercent}%)", "Your download is being prepared. This might take some time if the files are big." => "Seu download está sendo preparado. Isto pode levar algum tempo se os arquivos forem grandes.", -"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Nome de pasta inválido. O uso de 'Shared' é reservado para o Owncloud", "Name" => "Nome", "Size" => "Tamanho", "Modified" => "Modificado", -"_%n folder_::_%n folders_" => array("",""), -"_%n file_::_%n files_" => array("",""), "%s could not be renamed" => "%s não pode ser renomeado", "Upload" => "Upload", "File handling" => "Tratamento de Arquivo", @@ -71,10 +70,6 @@ $TRANSLATIONS = array( "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Os arquivos que você está tentando carregar excedeu o tamanho máximo para arquivos no servidor.", "Files are being scanned, please wait." => "Arquivos sendo escaneados, por favor aguarde.", "Current scanning" => "Scanning atual", -"directory" => "diretório", -"directories" => "diretórios", -"file" => "arquivo", -"files" => "arquivos", "Upgrading filesystem cache..." => "Atualizando cache do sistema de arquivos..." ); $PLURAL_FORMS = "nplurals=2; plural=(n > 1);"; diff --git a/apps/files/l10n/pt_PT.php b/apps/files/l10n/pt_PT.php index 64110f6704..8cd73a9f70 100644 --- a/apps/files/l10n/pt_PT.php +++ b/apps/files/l10n/pt_PT.php @@ -32,6 +32,8 @@ $TRANSLATIONS = array( "cancel" => "cancelar", "replaced {new_name} with {old_name}" => "substituido {new_name} por {old_name}", "undo" => "desfazer", +"_%n folder_::_%n folders_" => array("",""), +"_%n file_::_%n files_" => array("",""), "_Uploading %n file_::_Uploading %n files_" => array("",""), "files uploading" => "A enviar os ficheiros", "'.' is an invalid file name." => "'.' não é um nome de ficheiro válido!", @@ -40,12 +42,9 @@ $TRANSLATIONS = array( "Your storage is full, files can not be updated or synced anymore!" => "O seu armazenamento está cheio, os ficheiros não podem ser sincronizados.", "Your storage is almost full ({usedSpacePercent}%)" => "O seu espaço de armazenamento está quase cheiro ({usedSpacePercent}%)", "Your download is being prepared. This might take some time if the files are big." => "O seu download está a ser preparado. Este processo pode demorar algum tempo se os ficheiros forem grandes.", -"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Nome de pasta inválido. O Uso de 'shared' é reservado para o ownCloud", "Name" => "Nome", "Size" => "Tamanho", "Modified" => "Modificado", -"_%n folder_::_%n folders_" => array("",""), -"_%n file_::_%n files_" => array("",""), "%s could not be renamed" => "%s não pode ser renomeada", "Upload" => "Carregar", "File handling" => "Manuseamento de ficheiros", @@ -71,10 +70,6 @@ $TRANSLATIONS = array( "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", -"directory" => "diretório", -"directories" => "diretórios", -"file" => "ficheiro", -"files" => "ficheiros", "Upgrading filesystem cache..." => "Atualizar cache do sistema de ficheiros..." ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files/l10n/ro.php b/apps/files/l10n/ro.php index 85805cf562..3b5359384a 100644 --- a/apps/files/l10n/ro.php +++ b/apps/files/l10n/ro.php @@ -32,6 +32,8 @@ $TRANSLATIONS = array( "cancel" => "anulare", "replaced {new_name} with {old_name}" => "{new_name} inlocuit cu {old_name}", "undo" => "Anulează ultima acțiune", +"_%n folder_::_%n folders_" => array("","",""), +"_%n file_::_%n files_" => array("","",""), "_Uploading %n file_::_Uploading %n files_" => array("","",""), "files uploading" => "fișiere se încarcă", "'.' is an invalid file name." => "'.' este un nume invalid de fișier.", @@ -40,12 +42,9 @@ $TRANSLATIONS = array( "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.", -"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Invalid folder name. Usage of 'Shared' is reserved by Ownclou", "Name" => "Nume", "Size" => "Dimensiune", "Modified" => "Modificat", -"_%n folder_::_%n folders_" => array("","",""), -"_%n file_::_%n files_" => array("","",""), "%s could not be renamed" => "%s nu a putut fi redenumit", "Upload" => "Încărcare", "File handling" => "Manipulare fișiere", @@ -71,10 +70,6 @@ $TRANSLATIONS = array( "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Fișierul care l-ai încărcat a depășită limita maximă admisă la încărcare pe acest server.", "Files are being scanned, please wait." => "Fișierele sunt scanate, te rog așteptă.", "Current scanning" => "În curs de scanare", -"directory" => "catalog", -"directories" => "cataloage", -"file" => "fișier", -"files" => "fișiere", "Upgrading filesystem cache..." => "Modernizare fisiere de sistem cache.." ); $PLURAL_FORMS = "nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));"; diff --git a/apps/files/l10n/ru.php b/apps/files/l10n/ru.php index fe771d2b57..e0bf97038d 100644 --- a/apps/files/l10n/ru.php +++ b/apps/files/l10n/ru.php @@ -32,6 +32,8 @@ $TRANSLATIONS = array( "cancel" => "отмена", "replaced {new_name} with {old_name}" => "заменено {new_name} на {old_name}", "undo" => "отмена", +"_%n folder_::_%n folders_" => array("%n папка","%n папки","%n папок"), +"_%n file_::_%n files_" => array("%n файл","%n файла","%n файлов"), "_Uploading %n file_::_Uploading %n files_" => array("Закачка %n файла","Закачка %n файлов","Закачка %n файлов"), "files uploading" => "файлы загружаются", "'.' is an invalid file name." => "'.' - неправильное имя файла.", @@ -40,12 +42,9 @@ $TRANSLATIONS = array( "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." => "Загрузка началась. Это может потребовать много времени, если файл большого размера.", -"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Неправильное имя каталога. Имя 'Shared' зарезервировано.", "Name" => "Имя", "Size" => "Размер", "Modified" => "Изменён", -"_%n folder_::_%n folders_" => array("%n папка","%n папки","%n папок"), -"_%n file_::_%n files_" => array("%n файл","%n файла","%n файлов"), "%s could not be renamed" => "%s не может быть переименован", "Upload" => "Загрузка", "File handling" => "Управление файлами", @@ -71,10 +70,6 @@ $TRANSLATIONS = array( "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Файлы, которые вы пытаетесь загрузить, превышают лимит для файлов на этом сервере.", "Files are being scanned, please wait." => "Подождите, файлы сканируются.", "Current scanning" => "Текущее сканирование", -"directory" => "директория", -"directories" => "директории", -"file" => "файл", -"files" => "файлы", "Upgrading filesystem cache..." => "Обновление кэша файловой системы..." ); $PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"; diff --git a/apps/files/l10n/si_LK.php b/apps/files/l10n/si_LK.php index ffb28e0958..7d24370a09 100644 --- a/apps/files/l10n/si_LK.php +++ b/apps/files/l10n/si_LK.php @@ -18,12 +18,12 @@ $TRANSLATIONS = array( "suggest name" => "නමක් යෝජනා කරන්න", "cancel" => "අත් හරින්න", "undo" => "නිෂ්ප්‍රභ කරන්න", +"_%n folder_::_%n folders_" => array("",""), +"_%n file_::_%n files_" => array("",""), "_Uploading %n file_::_Uploading %n files_" => array("",""), "Name" => "නම", "Size" => "ප්‍රමාණය", "Modified" => "වෙනස් කළ", -"_%n folder_::_%n folders_" => array("",""), -"_%n file_::_%n files_" => array("",""), "Upload" => "උඩුගත කරන්න", "File handling" => "ගොනු පරිහරණය", "Maximum upload size" => "උඩුගත කිරීමක උපරිම ප්‍රමාණය", @@ -45,8 +45,6 @@ $TRANSLATIONS = array( "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" => "වර්තමාන පරික්ෂාව", -"file" => "ගොනුව", -"files" => "ගොනු" +"Current scanning" => "වර්තමාන පරික්ෂාව" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files/l10n/sk_SK.php b/apps/files/l10n/sk_SK.php index 41ff4fe25d..e7ade01379 100644 --- a/apps/files/l10n/sk_SK.php +++ b/apps/files/l10n/sk_SK.php @@ -32,6 +32,8 @@ $TRANSLATIONS = array( "cancel" => "zrušiť", "replaced {new_name} with {old_name}" => "prepísaný {new_name} súborom {old_name}", "undo" => "vrátiť", +"_%n folder_::_%n folders_" => array("%n priečinok","%n priečinky","%n priečinkov"), +"_%n file_::_%n files_" => array("%n súbor","%n súbory","%n súborov"), "_Uploading %n file_::_Uploading %n files_" => array("Nahrávam %n súbor","Nahrávam %n súbory","Nahrávam %n súborov"), "files uploading" => "nahrávanie súborov", "'.' is an invalid file name." => "'.' je neplatné meno súboru.", @@ -41,12 +43,9 @@ $TRANSLATIONS = array( "Your storage is almost full ({usedSpacePercent}%)" => "Vaše úložisko je takmer plné ({usedSpacePercent}%)", "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Šifrovanie bolo zakázané, ale vaše súbory sú stále zašifrované. Prosím, choďte do osobného nastavenia pre dešifrovanie súborov.", "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ť.", -"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Neplatné meno priečinka. Používanie mena 'Shared' je vyhradené len pre Owncloud", "Name" => "Názov", "Size" => "Veľkosť", "Modified" => "Upravené", -"_%n folder_::_%n folders_" => array("%n priečinok","%n priečinky","%n priečinkov"), -"_%n file_::_%n files_" => array("%n súbor","%n súbory","%n súborov"), "%s could not be renamed" => "%s nemohol byť premenovaný", "Upload" => "Odoslať", "File handling" => "Nastavenie správania sa k súborom", @@ -72,10 +71,6 @@ $TRANSLATIONS = array( "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é", -"directory" => "priečinok", -"directories" => "priečinky", -"file" => "súbor", -"files" => "súbory", "Upgrading filesystem cache..." => "Aktualizujem medzipamäť súborového systému..." ); $PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"; diff --git a/apps/files/l10n/sl.php b/apps/files/l10n/sl.php index 9922a0be7e..6819ed3a3b 100644 --- a/apps/files/l10n/sl.php +++ b/apps/files/l10n/sl.php @@ -32,6 +32,8 @@ $TRANSLATIONS = array( "cancel" => "prekliči", "replaced {new_name} with {old_name}" => "preimenovano ime {new_name} z imenom {old_name}", "undo" => "razveljavi", +"_%n folder_::_%n folders_" => array("","","",""), +"_%n file_::_%n files_" => array("","","",""), "_Uploading %n file_::_Uploading %n files_" => array("","","",""), "files uploading" => "poteka pošiljanje datotek", "'.' is an invalid file name." => "'.' je neveljavno ime datoteke.", @@ -40,12 +42,9 @@ $TRANSLATIONS = array( "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.", -"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Neveljavno ime mape. Uporaba oznake \"Souporaba\" je zadržan za sistem ownCloud.", "Name" => "Ime", "Size" => "Velikost", "Modified" => "Spremenjeno", -"_%n folder_::_%n folders_" => array("","","",""), -"_%n file_::_%n files_" => array("","","",""), "%s could not be renamed" => "%s ni bilo mogoče preimenovati", "Upload" => "Pošlji", "File handling" => "Upravljanje z datotekami", @@ -71,10 +70,6 @@ $TRANSLATIONS = array( "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Datoteke, ki jih želite poslati, presegajo največjo dovoljeno velikost na strežniku.", "Files are being scanned, please wait." => "Poteka preučevanje datotek, počakajte ...", "Current scanning" => "Trenutno poteka preučevanje", -"directory" => "direktorij", -"directories" => "direktoriji", -"file" => "datoteka", -"files" => "datoteke", "Upgrading filesystem cache..." => "Nadgrajevanje predpomnilnika datotečnega sistema ..." ); $PLURAL_FORMS = "nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);"; diff --git a/apps/files/l10n/sq.php b/apps/files/l10n/sq.php index 34250b56c3..ff09e7b4f9 100644 --- a/apps/files/l10n/sq.php +++ b/apps/files/l10n/sq.php @@ -29,6 +29,8 @@ $TRANSLATIONS = array( "cancel" => "anulo", "replaced {new_name} with {old_name}" => "U zëvëndësua {new_name} me {old_name}", "undo" => "anulo", +"_%n folder_::_%n folders_" => array("",""), +"_%n file_::_%n files_" => array("",""), "_Uploading %n file_::_Uploading %n files_" => array("",""), "files uploading" => "po ngarkoj skedarët", "'.' is an invalid file name." => "'.' është emër i pavlefshëm.", @@ -37,12 +39,9 @@ $TRANSLATIONS = array( "Your storage is full, files can not be updated or synced anymore!" => "Hapësira juaj e memorizimit është plot, nuk mund të ngarkoni apo sinkronizoni më skedarët.", "Your storage is almost full ({usedSpacePercent}%)" => "Hapësira juaj e memorizimit është gati plot ({usedSpacePercent}%)", "Your download is being prepared. This might take some time if the files are big." => "Shkarkimi juaj po përgatitet. Mund të duhet pak kohë nqse skedarët janë të mëdhenj.", -"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Emri i dosjes është i pavlefshëm. Përdorimi i \"Shared\" është i rezervuar nga Owncloud-i.", "Name" => "Emri", "Size" => "Dimensioni", "Modified" => "Modifikuar", -"_%n folder_::_%n folders_" => array("",""), -"_%n file_::_%n files_" => array("",""), "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 d73188d483..b8cf91f4da 100644 --- a/apps/files/l10n/sr.php +++ b/apps/files/l10n/sr.php @@ -29,6 +29,8 @@ $TRANSLATIONS = array( "cancel" => "откажи", "replaced {new_name} with {old_name}" => "замењено {new_name} са {old_name}", "undo" => "опозови", +"_%n folder_::_%n folders_" => array("","",""), +"_%n file_::_%n files_" => array("","",""), "_Uploading %n file_::_Uploading %n files_" => array("","",""), "files uploading" => "датотеке се отпремају", "'.' is an invalid file name." => "Датотека „.“ је неисправног имена.", @@ -37,12 +39,9 @@ $TRANSLATIONS = array( "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." => "Припремам преузимање. Ово може да потраје ако су датотеке велике.", -"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Неисправно име фасцикле. Фасцикла „Shared“ је резервисана за ownCloud.", "Name" => "Име", "Size" => "Величина", "Modified" => "Измењено", -"_%n folder_::_%n folders_" => array("","",""), -"_%n file_::_%n files_" => array("","",""), "Upload" => "Отпреми", "File handling" => "Управљање датотекама", "Maximum upload size" => "Највећа величина датотеке", diff --git a/apps/files/l10n/sr@latin.php b/apps/files/l10n/sr@latin.php index bc7b11b8c5..1965479fe6 100644 --- a/apps/files/l10n/sr@latin.php +++ b/apps/files/l10n/sr@latin.php @@ -6,12 +6,12 @@ $TRANSLATIONS = array( "No file was uploaded" => "Nijedan fajl nije poslat", "Missing a temporary folder" => "Nedostaje privremena fascikla", "Files" => "Fajlovi", +"_%n folder_::_%n folders_" => array("","",""), +"_%n file_::_%n files_" => array("","",""), "_Uploading %n file_::_Uploading %n files_" => array("","",""), "Name" => "Ime", "Size" => "Veličina", "Modified" => "Zadnja izmena", -"_%n folder_::_%n folders_" => array("","",""), -"_%n file_::_%n files_" => array("","",""), "Upload" => "Pošalji", "Maximum upload size" => "Maksimalna veličina pošiljke", "Save" => "Snimi", diff --git a/apps/files/l10n/sv.php b/apps/files/l10n/sv.php index d9010bc0f5..20bf77bb60 100644 --- a/apps/files/l10n/sv.php +++ b/apps/files/l10n/sv.php @@ -32,6 +32,8 @@ $TRANSLATIONS = array( "cancel" => "avbryt", "replaced {new_name} with {old_name}" => "ersatt {new_name} med {old_name}", "undo" => "ångra", +"_%n folder_::_%n folders_" => array("%n mapp","%n mappar"), +"_%n file_::_%n files_" => array("%n fil","%n filer"), "_Uploading %n file_::_Uploading %n files_" => array("Laddar upp %n fil","Laddar upp %n filer"), "files uploading" => "filer laddas upp", "'.' is an invalid file name." => "'.' är ett ogiltigt filnamn.", @@ -41,12 +43,9 @@ $TRANSLATIONS = array( "Your storage is almost full ({usedSpacePercent}%)" => "Ditt lagringsutrymme är nästan fullt ({usedSpacePercent}%)", "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Kryptering inaktiverades men dina filer är fortfarande krypterade. Vänligen gå till sidan för dina personliga inställningar för att dekryptera dina filer.", "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.", -"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Ogiltigt mappnamn. Användande av 'Shared' är reserverat av ownCloud", "Name" => "Namn", "Size" => "Storlek", "Modified" => "Ändrad", -"_%n folder_::_%n folders_" => array("%n mapp","%n mappar"), -"_%n file_::_%n files_" => array("%n fil","%n filer"), "%s could not be renamed" => "%s kunde inte namnändras", "Upload" => "Ladda upp", "File handling" => "Filhantering", @@ -72,10 +71,6 @@ $TRANSLATIONS = array( "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Filerna du försöker ladda upp överstiger den maximala storleken för filöverföringar på servern.", "Files are being scanned, please wait." => "Filer skannas, var god vänta", "Current scanning" => "Aktuell skanning", -"directory" => "mapp", -"directories" => "mappar", -"file" => "fil", -"files" => "filer", "Upgrading filesystem cache..." => "Uppgraderar filsystemets cache..." ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files/l10n/ta_LK.php b/apps/files/l10n/ta_LK.php index eb39218e48..fc52c16daf 100644 --- a/apps/files/l10n/ta_LK.php +++ b/apps/files/l10n/ta_LK.php @@ -22,13 +22,13 @@ $TRANSLATIONS = array( "cancel" => "இரத்து செய்க", "replaced {new_name} with {old_name}" => "{new_name} ஆனது {old_name} இனால் மாற்றப்பட்டது", "undo" => "முன் செயல் நீக்கம் ", +"_%n folder_::_%n folders_" => array("",""), +"_%n file_::_%n files_" => array("",""), "_Uploading %n file_::_Uploading %n files_" => array("",""), "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "செல்லுபடியற்ற பெயர்,'\\', '/', '<', '>', ':', '\"', '|', '?' மற்றும் '*' ஆகியன அனுமதிக்கப்படமாட்டாது.", "Name" => "பெயர்", "Size" => "அளவு", "Modified" => "மாற்றப்பட்டது", -"_%n folder_::_%n folders_" => array("",""), -"_%n file_::_%n files_" => array("",""), "Upload" => "பதிவேற்றுக", "File handling" => "கோப்பு கையாளுதல்", "Maximum upload size" => "பதிவேற்றக்கூடிய ஆகக்கூடிய அளவு ", diff --git a/apps/files/l10n/te.php b/apps/files/l10n/te.php index 5a108274dd..60aabc8a36 100644 --- a/apps/files/l10n/te.php +++ b/apps/files/l10n/te.php @@ -3,11 +3,11 @@ $TRANSLATIONS = array( "Error" => "పొరపాటు", "Delete permanently" => "శాశ్వతంగా తొలగించు", "cancel" => "రద్దుచేయి", +"_%n folder_::_%n folders_" => array("",""), +"_%n file_::_%n files_" => array("",""), "_Uploading %n file_::_Uploading %n files_" => array("",""), "Name" => "పేరు", "Size" => "పరిమాణం", -"_%n folder_::_%n folders_" => array("",""), -"_%n file_::_%n files_" => array("",""), "Save" => "భద్రపరచు", "Folder" => "సంచయం", "Delete" => "తొలగించు" diff --git a/apps/files/l10n/th_TH.php b/apps/files/l10n/th_TH.php index c101398918..b65c0bc705 100644 --- a/apps/files/l10n/th_TH.php +++ b/apps/files/l10n/th_TH.php @@ -28,6 +28,8 @@ $TRANSLATIONS = array( "cancel" => "ยกเลิก", "replaced {new_name} with {old_name}" => "แทนที่ {new_name} ด้วย {old_name} แล้ว", "undo" => "เลิกทำ", +"_%n folder_::_%n folders_" => array(""), +"_%n file_::_%n files_" => array(""), "_Uploading %n file_::_Uploading %n files_" => array(""), "files uploading" => "การอัพโหลดไฟล์", "'.' is an invalid file name." => "'.' เป็นชื่อไฟล์ที่ไม่ถูกต้อง", @@ -36,12 +38,9 @@ $TRANSLATIONS = array( "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." => "กำลังเตรียมดาวน์โหลดข้อมูล หากไฟล์มีขนาดใหญ่ อาจใช้เวลาสักครู่", -"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "ชื่อโฟลเดอร์ไม่ถูกต้อง การใช้งาน 'แชร์' สงวนไว้สำหรับ Owncloud เท่านั้น", "Name" => "ชื่อ", "Size" => "ขนาด", "Modified" => "แก้ไขแล้ว", -"_%n folder_::_%n folders_" => array(""), -"_%n file_::_%n files_" => array(""), "Upload" => "อัพโหลด", "File handling" => "การจัดกาไฟล์", "Maximum upload size" => "ขนาดไฟล์สูงสุดที่อัพโหลดได้", @@ -64,8 +63,6 @@ $TRANSLATIONS = array( "The files you are trying to upload exceed the maximum size for file uploads on this server." => "ไฟล์ที่คุณพยายามที่จะอัพโหลดมีขนาดเกินกว่าขนาดสูงสุดที่กำหนดไว้ให้อัพโหลดได้สำหรับเซิร์ฟเวอร์นี้", "Files are being scanned, please wait." => "ไฟล์กำลังอยู่ระหว่างการสแกน, กรุณารอสักครู่.", "Current scanning" => "ไฟล์ที่กำลังสแกนอยู่ขณะนี้", -"file" => "ไฟล์", -"files" => "ไฟล์", "Upgrading filesystem cache..." => "กำลังอัพเกรดหน่วยความจำแคชของระบบไฟล์..." ); $PLURAL_FORMS = "nplurals=1; plural=0;"; diff --git a/apps/files/l10n/tr.php b/apps/files/l10n/tr.php index 661e8572e8..d317b11d53 100644 --- a/apps/files/l10n/tr.php +++ b/apps/files/l10n/tr.php @@ -32,6 +32,8 @@ $TRANSLATIONS = array( "cancel" => "iptal", "replaced {new_name} with {old_name}" => "{new_name} ismi {old_name} ile değiştirildi", "undo" => "geri al", +"_%n folder_::_%n folders_" => array("%n dizin","%n dizin"), +"_%n file_::_%n files_" => array("%n dosya","%n dosya"), "_Uploading %n file_::_Uploading %n files_" => array("%n dosya yükleniyor","%n dosya yükleniyor"), "files uploading" => "Dosyalar yükleniyor", "'.' is an invalid file name." => "'.' geçersiz dosya adı.", @@ -41,12 +43,9 @@ $TRANSLATIONS = array( "Your storage is almost full ({usedSpacePercent}%)" => "Depolama alanınız neredeyse dolu ({usedSpacePercent}%)", "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Şifreleme işlemi durduruldu ancak dosyalarınız şifreli. Dosyalarınızın şifresini kaldırmak için lütfen kişisel ayarlar kısmına geçiniz.", "Your download is being prepared. This might take some time if the files are big." => "İndirmeniz hazırlanıyor. Dosya büyük ise biraz zaman alabilir.", -"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Geçersiz dizin adı. Shared isminin kullanımı Owncloud tarafından rezerver edilmiştir.", "Name" => "İsim", "Size" => "Boyut", "Modified" => "Değiştirilme", -"_%n folder_::_%n folders_" => array("%n dizin","%n dizin"), -"_%n file_::_%n files_" => array("%n dosya","%n dosya"), "%s could not be renamed" => "%s yeniden adlandırılamadı", "Upload" => "Yükle", "File handling" => "Dosya taşıma", @@ -72,10 +71,6 @@ $TRANSLATIONS = array( "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", -"directory" => "dizin", -"directories" => "dizinler", -"file" => "dosya", -"files" => "dosyalar", "Upgrading filesystem cache..." => "Sistem dosyası önbelleği güncelleniyor" ); $PLURAL_FORMS = "nplurals=2; plural=(n > 1);"; diff --git a/apps/files/l10n/ug.php b/apps/files/l10n/ug.php index 2eceeea44a..920d077e4e 100644 --- a/apps/files/l10n/ug.php +++ b/apps/files/l10n/ug.php @@ -20,13 +20,13 @@ $TRANSLATIONS = array( "suggest name" => "تەۋسىيە ئات", "cancel" => "ۋاز كەچ", "undo" => "يېنىۋال", +"_%n folder_::_%n folders_" => array(""), +"_%n file_::_%n files_" => array(""), "_Uploading %n file_::_Uploading %n files_" => array(""), "files uploading" => "ھۆججەت يۈكلىنىۋاتىدۇ", "Name" => "ئاتى", "Size" => "چوڭلۇقى", "Modified" => "ئۆزگەرتكەن", -"_%n folder_::_%n folders_" => array(""), -"_%n file_::_%n files_" => array(""), "Upload" => "يۈكلە", "Save" => "ساقلا", "New" => "يېڭى", diff --git a/apps/files/l10n/uk.php b/apps/files/l10n/uk.php index f34383d969..79a18231d2 100644 --- a/apps/files/l10n/uk.php +++ b/apps/files/l10n/uk.php @@ -29,6 +29,8 @@ $TRANSLATIONS = array( "cancel" => "відміна", "replaced {new_name} with {old_name}" => "замінено {new_name} на {old_name}", "undo" => "відмінити", +"_%n folder_::_%n folders_" => array("","",""), +"_%n file_::_%n files_" => array("","",""), "_Uploading %n file_::_Uploading %n files_" => array("","",""), "files uploading" => "файли завантажуються", "'.' is an invalid file name." => "'.' це невірне ім'я файлу.", @@ -37,12 +39,9 @@ $TRANSLATIONS = array( "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." => "Ваше завантаження готується. Це може зайняти деякий час, якщо файли завеликі.", -"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Невірне ім'я теки. Використання \"Shared\" зарезервовано Owncloud", "Name" => "Ім'я", "Size" => "Розмір", "Modified" => "Змінено", -"_%n folder_::_%n folders_" => array("","",""), -"_%n file_::_%n files_" => array("","",""), "%s could not be renamed" => "%s не може бути перейменований", "Upload" => "Вивантажити", "File handling" => "Робота з файлами", @@ -68,10 +67,6 @@ $TRANSLATIONS = array( "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Файли,що ви намагаєтесь відвантажити перевищують максимальний дозволений розмір файлів на цьому сервері.", "Files are being scanned, please wait." => "Файли скануються, зачекайте, будь-ласка.", "Current scanning" => "Поточне сканування", -"directory" => "каталог", -"directories" => "каталоги", -"file" => "файл", -"files" => "файли", "Upgrading filesystem cache..." => "Оновлення кеша файлової системи..." ); $PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"; diff --git a/apps/files/l10n/ur_PK.php b/apps/files/l10n/ur_PK.php index 15c24700df..6854c42158 100644 --- a/apps/files/l10n/ur_PK.php +++ b/apps/files/l10n/ur_PK.php @@ -1,9 +1,9 @@ "ایرر", -"_Uploading %n file_::_Uploading %n files_" => array("",""), "_%n folder_::_%n folders_" => array("",""), "_%n file_::_%n files_" => array("",""), +"_Uploading %n file_::_Uploading %n files_" => array("",""), "Unshare" => "شئیرنگ ختم کریں" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files/l10n/vi.php b/apps/files/l10n/vi.php index ae5b152ed0..02b184d218 100644 --- a/apps/files/l10n/vi.php +++ b/apps/files/l10n/vi.php @@ -29,6 +29,8 @@ $TRANSLATIONS = array( "cancel" => "hủy", "replaced {new_name} with {old_name}" => "đã thay thế {new_name} bằng {old_name}", "undo" => "lùi lại", +"_%n folder_::_%n folders_" => array(""), +"_%n file_::_%n files_" => array(""), "_Uploading %n file_::_Uploading %n files_" => array(""), "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ệ", @@ -37,12 +39,9 @@ $TRANSLATIONS = array( "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.", -"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Invalid folder name. Usage of 'Shared' is reserved by Owncloud", "Name" => "Tên", "Size" => "Kích cỡ", "Modified" => "Thay đổi", -"_%n folder_::_%n folders_" => array(""), -"_%n file_::_%n files_" => array(""), "Upload" => "Tải lên", "File handling" => "Xử lý tập tin", "Maximum upload size" => "Kích thước tối đa ", @@ -67,8 +66,6 @@ $TRANSLATIONS = array( "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Các tập tin bạn đang tải lên vượt quá kích thước tối đa cho phép trên máy chủ .", "Files are being scanned, please wait." => "Tập tin đang được quét ,vui lòng chờ.", "Current scanning" => "Hiện tại đang quét", -"file" => "file", -"files" => "files", "Upgrading filesystem cache..." => "Đang nâng cấp bộ nhớ đệm cho tập tin hệ thống..." ); $PLURAL_FORMS = "nplurals=1; plural=0;"; diff --git a/apps/files/l10n/zh_CN.GB2312.php b/apps/files/l10n/zh_CN.GB2312.php deleted file mode 100644 index d031a1e5a5..0000000000 --- a/apps/files/l10n/zh_CN.GB2312.php +++ /dev/null @@ -1,80 +0,0 @@ - "无法移动 %s - 存在同名文件", -"Could not move %s" => "无法移动 %s", -"Unable to set upload directory." => "无法设置上传文件夹", -"Invalid Token" => "非法Token", -"No file was uploaded. Unknown error" => "没有上传文件。未知错误", -"There is no error, the file uploaded with success" => "文件上传成功", -"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "上传的文件超过了php.ini指定的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" => "缺失临时文件夹", -"Failed to write to disk" => "写磁盘失败", -"Not enough storage available" => "容量不足", -"Invalid directory." => "无效文件夹", -"Files" => "文件", -"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." => "文件正在上传。关闭页面会取消上传。", -"URL cannot be empty." => "网址不能为空。", -"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "无效文件夹名。“Shared”已经被系统保留。", -"Error" => "出错", -"Share" => "分享", -"Delete permanently" => "永久删除", -"Rename" => "重命名", -"Pending" => "等待中", -"{new_name} already exists" => "{new_name} 已存在", -"replace" => "替换", -"suggest name" => "推荐名称", -"cancel" => "取消", -"replaced {new_name} with {old_name}" => "已用 {old_name} 替换 {new_name}", -"undo" => "撤销", -"_Uploading %n file_::_Uploading %n files_" => array("正在上传 %n 个文件"), -"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." => "正在下载，可能会花点时间，跟文件大小有关", -"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "不正确文件夹名。Shared是保留名，不能使用。", -"Name" => "名称", -"Size" => "大小", -"Modified" => "修改日期", -"_%n folder_::_%n folders_" => array("%n 个文件夹"), -"_%n file_::_%n files_" => array("%n 个文件"), -"%s could not be renamed" => "不能重命名 %s", -"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" => "来自链接", -"Deleted files" => "已删除的文件", -"Cancel upload" => "取消上传", -"You don’t have write permissions here." => "您没有写入权限。", -"Nothing in here. Upload something!" => "这里没有东西.上传点什么!", -"Download" => "下载", -"Unshare" => "取消分享", -"Delete" => "删除", -"Upload too large" => "上传过大", -"The files you are trying to upload exceed the maximum size for file uploads on this server." => "你正在试图上传的文件超过了此服务器支持的最大的文件大小.", -"Files are being scanned, please wait." => "正在扫描文件,请稍候.", -"Current scanning" => "正在扫描", -"directory" => "文件夹", -"directories" => "文件夹", -"file" => "文件", -"files" => "文件", -"Upgrading filesystem cache..." => "升级系统缓存..." -); -$PLURAL_FORMS = "nplurals=1; plural=0;"; diff --git a/apps/files/l10n/zh_CN.php b/apps/files/l10n/zh_CN.php index 495e9d9d9d..fa2e3403f4 100644 --- a/apps/files/l10n/zh_CN.php +++ b/apps/files/l10n/zh_CN.php @@ -32,6 +32,8 @@ $TRANSLATIONS = array( "cancel" => "取消", "replaced {new_name} with {old_name}" => "已将 {old_name}替换成 {new_name}", "undo" => "撤销", +"_%n folder_::_%n folders_" => array("%n 文件夹"), +"_%n file_::_%n files_" => array("%n个文件"), "_Uploading %n file_::_Uploading %n files_" => array(""), "files uploading" => "文件上传中", "'.' is an invalid file name." => "'.' 是一个无效的文件名。", @@ -40,12 +42,9 @@ $TRANSLATIONS = array( "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." => "下载正在准备中。如果文件较大可能会花费一些时间。", -"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "无效文件夹名。'共享' 是 Owncloud 预留的文件夹名。", "Name" => "名称", "Size" => "大小", "Modified" => "修改日期", -"_%n folder_::_%n folders_" => array("%n 文件夹"), -"_%n file_::_%n files_" => array("%n个文件"), "%s could not be renamed" => "%s 不能被重命名", "Upload" => "上传", "File handling" => "文件处理", @@ -71,8 +70,6 @@ $TRANSLATIONS = array( "The files you are trying to upload exceed the maximum size for file uploads on this server." => "您正尝试上传的文件超过了此服务器可以上传的最大容量限制", "Files are being scanned, please wait." => "文件正在被扫描，请稍候。", "Current scanning" => "当前扫描", -"file" => "文件", -"files" => "文件", "Upgrading filesystem cache..." => "正在更新文件系统缓存..." ); $PLURAL_FORMS = "nplurals=1; plural=0;"; diff --git a/apps/files/l10n/zh_HK.php b/apps/files/l10n/zh_HK.php index a9064fa7f7..febed4fe8f 100644 --- a/apps/files/l10n/zh_HK.php +++ b/apps/files/l10n/zh_HK.php @@ -3,10 +3,10 @@ $TRANSLATIONS = array( "Files" => "文件", "Error" => "錯誤", "Share" => "分享", -"_Uploading %n file_::_Uploading %n files_" => array(""), -"Name" => "名稱", "_%n folder_::_%n folders_" => array(""), "_%n file_::_%n files_" => array(""), +"_Uploading %n file_::_Uploading %n files_" => array(""), +"Name" => "名稱", "Upload" => "上傳", "Save" => "儲存", "Download" => "下載", diff --git a/apps/files/l10n/zh_TW.php b/apps/files/l10n/zh_TW.php index b96b02e5d9..6ba8bf35de 100644 --- a/apps/files/l10n/zh_TW.php +++ b/apps/files/l10n/zh_TW.php @@ -32,20 +32,20 @@ $TRANSLATIONS = array( "cancel" => "取消", "replaced {new_name} with {old_name}" => "使用 {new_name} 取代 {old_name}", "undo" => "復原", -"_Uploading %n file_::_Uploading %n files_" => array(""), +"_%n folder_::_%n folders_" => array("%n 個資料夾"), +"_%n file_::_%n files_" => array("%n 個檔案"), +"_Uploading %n file_::_Uploading %n files_" => array("%n 個檔案正在上傳"), "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}%)", +"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "加密已經被停用，但是您的舊檔案還是處於已加密的狀態，請前往個人設定以解密這些檔案。", "Your download is being prepared. This might take some time if the files are big." => "正在準備您的下載，若您的檔案較大，將會需要更多時間。", -"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "無效的資料夾名稱，'Shared' 的使用被 ownCloud 保留", "Name" => "名稱", "Size" => "大小", "Modified" => "修改", -"_%n folder_::_%n folders_" => array(""), -"_%n file_::_%n files_" => array(""), "%s could not be renamed" => "無法重新命名 %s", "Upload" => "上傳", "File handling" => "檔案處理", @@ -71,10 +71,6 @@ $TRANSLATIONS = array( "The files you are trying to upload exceed the maximum size for file uploads on this server." => "您試圖上傳的檔案已超過伺服器的最大檔案大小限制。", "Files are being scanned, please wait." => "正在掃描檔案，請稍等。", "Current scanning" => "目前掃描", -"directory" => "目錄", -"directories" => "目錄", -"file" => "檔案", -"files" => "檔案", "Upgrading filesystem cache..." => "正在升級檔案系統快取..." ); $PLURAL_FORMS = "nplurals=1; plural=0;"; diff --git a/apps/files/lib/helper.php b/apps/files/lib/helper.php index f2b1f142e9..7135ef9f65 100644 --- a/apps/files/lib/helper.php +++ b/apps/files/lib/helper.php @@ -11,7 +11,7 @@ class Helper $maxHumanFilesize = $l->t('Upload') . ' max. ' . $maxHumanFilesize; // information about storage capacities - $storageInfo = \OC_Helper::getStorageInfo(); + $storageInfo = \OC_Helper::getStorageInfo($dir); return array('uploadMaxFilesize' => $maxUploadFilesize, 'maxHumanFilesize' => $maxHumanFilesize, diff --git a/apps/files/templates/part.list.php b/apps/files/templates/part.list.php index 0c7d693669..3e6f619868 100644 --- a/apps/files/templates/part.list.php +++ b/apps/files/templates/part.list.php @@ -1,14 +1,5 @@ - - - - - - t('directory')); - } else { - p($l->t('directories')); - } - } - if ($totaldirs !== 0 && $totalfiles !== 0) { - p(' & '); - } - if ($totalfiles !== 0) { - p($totalfiles.' '); - if ($totalfiles === 1) { - p($l->t('file')); - } else { - p($l->t('files')); - } - } ?> - - - - - - - "Nemožno zmeniť heslo. Pravdepodobne nebolo staré heslo zadané správne.", "Private key password successfully updated." => "Heslo súkromného kľúča je úspešne aktualizované.", "Could not update the private key password. Maybe the old password was not correct." => "Nemožno aktualizovať heslo súkromného kľúča. Možno nebolo staré heslo správne.", +"Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Váš privátny kľúč je nesprávny! Pravdepodobne bolo zmenené vaše heslo mimo systému ownCloud (napr. váš korporátny adresár). Môžte aktualizovať vaše heslo privátneho kľúča v osobných nastaveniach za účelom obnovenia prístupu k zašifrovaným súborom.", +"Missing requirements." => "Chýbajúce požiadavky.", +"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Prosím uistite sa, že PHP verzie 5.3.3 alebo novšej je nainštalované a tiež, že OpenSSL knižnica spolu z PHP rozšírením je povolená a konfigurovaná správne. Nateraz bola aplikácia šifrovania zablokovaná.", +"Following users are not set up for encryption:" => "Nasledujúci používatelia nie sú nastavení pre šifrovanie:", "Saving..." => "Ukladám...", "Your private key is not valid! Maybe the your password was changed from outside." => "Váš súkromný kľúč je neplatný. Možno bolo Vaše heslo zmenené z vonku.", +"You can unlock your private key in your " => "Môžte odomknúť váš privátny kľúč v", "personal settings" => "osobné nastavenia", "Encryption" => "Šifrovanie", +"Enable recovery key (allow to recover users files in case of password loss):" => "Povoliť obnovovací kľúč (umožňuje obnoviť používateľské súbory v prípade straty hesla):", +"Recovery key password" => "Heslo obnovovacieho kľúča", "Enabled" => "Povolené", "Disabled" => "Zakázané", +"Change recovery key password:" => "Zmeniť heslo obnovovacieho kľúča:", +"Old Recovery key password" => "Staré heslo obnovovacieho kľúča", +"New Recovery key password" => "Nové heslo obnovovacieho kľúča", "Change Password" => "Zmeniť heslo", "Your private key password no longer match your log-in password:" => "Vaše heslo súkromného kľúča je rovnaké ako Vaše prihlasovacie heslo:", "Set your old private key password to your current log-in password." => "Nastavte si staré heslo súkromného kľúča k Vášmu súčasnému prihlasovaciemu heslu.", diff --git a/apps/files_encryption/l10n/zh_CN.GB2312.php b/apps/files_encryption/l10n/zh_CN.GB2312.php deleted file mode 100644 index 0f9f459c77..0000000000 --- a/apps/files_encryption/l10n/zh_CN.GB2312.php +++ /dev/null @@ -1,6 +0,0 @@ - "保存中...", -"Encryption" => "加密" -); -$PLURAL_FORMS = "nplurals=1; plural=0;"; diff --git a/apps/files_external/3rdparty/Dropbox/API.php b/apps/files_external/3rdparty/Dropbox/API.php new file mode 100644 index 0000000000..8cdce678e1 --- /dev/null +++ b/apps/files_external/3rdparty/Dropbox/API.php @@ -0,0 +1,380 @@ +oauth = $oauth; + $this->root = $root; + $this->useSSL = $useSSL; + if (!$this->useSSL) + { + throw new Dropbox_Exception('Dropbox REST API now requires that all requests use SSL'); + } + + } + + /** + * Returns information about the current dropbox account + * + * @return stdclass + */ + public function getAccountInfo() { + + $data = $this->oauth->fetch($this->api_url . 'account/info'); + return json_decode($data['body'],true); + + } + + /** + * Returns a file's contents + * + * @param string $path path + * @param string $root Use this to override the default root path (sandbox/dropbox) + * @return string + */ + public function getFile($path = '', $root = null) { + + if (is_null($root)) $root = $this->root; + $path = str_replace(array('%2F','~'), array('/','%7E'), rawurlencode($path)); + $result = $this->oauth->fetch($this->api_content_url . 'files/' . $root . '/' . ltrim($path,'/')); + return $result['body']; + + } + + /** + * Uploads a new file + * + * @param string $path Target path (including filename) + * @param string $file Either a path to a file or a stream resource + * @param string $root Use this to override the default root path (sandbox/dropbox) + * @return bool + */ + public function putFile($path, $file, $root = null) { + + $directory = dirname($path); + $filename = basename($path); + + if($directory==='.') $directory = ''; + $directory = str_replace(array('%2F','~'), array('/','%7E'), rawurlencode($directory)); +// $filename = str_replace('~', '%7E', rawurlencode($filename)); + if (is_null($root)) $root = $this->root; + + if (is_string($file)) { + + $file = fopen($file,'rb'); + + } elseif (!is_resource($file)) { + throw new Dropbox_Exception('File must be a file-resource or a string'); + } + $result=$this->multipartFetch($this->api_content_url . 'files/' . + $root . '/' . trim($directory,'/'), $file, $filename); + + if(!isset($result["httpStatus"]) || $result["httpStatus"] != 200) + throw new Dropbox_Exception("Uploading file to Dropbox failed"); + + return true; + } + + + /** + * Copies a file or directory from one location to another + * + * This method returns the file information of the newly created file. + * + * @param string $from source path + * @param string $to destination path + * @param string $root Use this to override the default root path (sandbox/dropbox) + * @return stdclass + */ + public function copy($from, $to, $root = null) { + + if (is_null($root)) $root = $this->root; + $response = $this->oauth->fetch($this->api_url . 'fileops/copy', array('from_path' => $from, 'to_path' => $to, 'root' => $root), 'POST'); + + return json_decode($response['body'],true); + + } + + /** + * Creates a new folder + * + * This method returns the information from the newly created directory + * + * @param string $path + * @param string $root Use this to override the default root path (sandbox/dropbox) + * @return stdclass + */ + public function createFolder($path, $root = null) { + + if (is_null($root)) $root = $this->root; + + // Making sure the path starts with a / +// $path = '/' . ltrim($path,'/'); + + $response = $this->oauth->fetch($this->api_url . 'fileops/create_folder', array('path' => $path, 'root' => $root),'POST'); + return json_decode($response['body'],true); + + } + + /** + * Deletes a file or folder. + * + * This method will return the metadata information from the deleted file or folder, if successful. + * + * @param string $path Path to new folder + * @param string $root Use this to override the default root path (sandbox/dropbox) + * @return array + */ + public function delete($path, $root = null) { + + if (is_null($root)) $root = $this->root; + $response = $this->oauth->fetch($this->api_url . 'fileops/delete', array('path' => $path, 'root' => $root), 'POST'); + return json_decode($response['body']); + + } + + /** + * Moves a file or directory to a new location + * + * This method returns the information from the newly created directory + * + * @param mixed $from Source path + * @param mixed $to destination path + * @param string $root Use this to override the default root path (sandbox/dropbox) + * @return stdclass + */ + public function move($from, $to, $root = null) { + + if (is_null($root)) $root = $this->root; + $response = $this->oauth->fetch($this->api_url . 'fileops/move', array('from_path' => rawurldecode($from), 'to_path' => rawurldecode($to), 'root' => $root), 'POST'); + + return json_decode($response['body'],true); + + } + + /** + * Returns file and directory information + * + * @param string $path Path to receive information from + * @param bool $list When set to true, this method returns information from all files in a directory. When set to false it will only return infromation from the specified directory. + * @param string $hash If a hash is supplied, this method simply returns true if nothing has changed since the last request. Good for caching. + * @param int $fileLimit Maximum number of file-information to receive + * @param string $root Use this to override the default root path (sandbox/dropbox) + * @return array|true + */ + public function getMetaData($path, $list = true, $hash = null, $fileLimit = null, $root = null) { + + if (is_null($root)) $root = $this->root; + + $args = array( + 'list' => $list, + ); + + if (!is_null($hash)) $args['hash'] = $hash; + if (!is_null($fileLimit)) $args['file_limit'] = $fileLimit; + + $path = str_replace(array('%2F','~'), array('/','%7E'), rawurlencode($path)); + $response = $this->oauth->fetch($this->api_url . 'metadata/' . $root . '/' . ltrim($path,'/'), $args); + + /* 304 is not modified */ + if ($response['httpStatus']==304) { + return true; + } else { + return json_decode($response['body'],true); + } + + } + + /** + * A way of letting you keep up with changes to files and folders in a user's Dropbox. You can periodically call /delta to get a list of "delta entries", which are instructions on how to update your local state to match the server's state. + * + * This method returns the information from the newly created directory + * + * @param string $cursor A string that is used to keep track of your current state. On the next call pass in this value to return delta entries that have been recorded since the cursor was returned. + * @return stdclass + */ + public function delta($cursor) { + + $arg['cursor'] = $cursor; + + $response = $this->oauth->fetch($this->api_url . 'delta', $arg, 'POST'); + return json_decode($response['body'],true); + + } + + /** + * Returns a thumbnail (as a string) for a file path. + * + * @param string $path Path to file + * @param string $size small, medium or large + * @param string $root Use this to override the default root path (sandbox/dropbox) + * @return string + */ + public function getThumbnail($path, $size = 'small', $root = null) { + + if (is_null($root)) $root = $this->root; + $path = str_replace(array('%2F','~'), array('/','%7E'), rawurlencode($path)); + $response = $this->oauth->fetch($this->api_content_url . 'thumbnails/' . $root . '/' . ltrim($path,'/'),array('size' => $size)); + + return $response['body']; + + } + + /** + * This method is used to generate multipart POST requests for file upload + * + * @param string $uri + * @param array $arguments + * @return bool + */ + protected function multipartFetch($uri, $file, $filename) { + + /* random string */ + $boundary = 'R50hrfBj5JYyfR3vF3wR96GPCC9Fd2q2pVMERvEaOE3D8LZTgLLbRpNwXek3'; + + $headers = array( + 'Content-Type' => 'multipart/form-data; boundary=' . $boundary, + ); + + $body="--" . $boundary . "\r\n"; + $body.="Content-Disposition: form-data; name=file; filename=".rawurldecode($filename)."\r\n"; + $body.="Content-type: application/octet-stream\r\n"; + $body.="\r\n"; + $body.=stream_get_contents($file); + $body.="\r\n"; + $body.="--" . $boundary . "--"; + + // Dropbox requires the filename to also be part of the regular arguments, so it becomes + // part of the signature. + $uri.='?file=' . $filename; + + return $this->oauth->fetch($uri, $body, 'POST', $headers); + + } + + + /** + * Search + * + * Returns metadata for all files and folders that match the search query. + * + * @added by: diszo.sasil + * + * @param string $query + * @param string $root Use this to override the default root path (sandbox/dropbox) + * @param string $path + * @return array + */ + public function search($query = '', $root = null, $path = ''){ + if (is_null($root)) $root = $this->root; + if(!empty($path)){ + $path = str_replace(array('%2F','~'), array('/','%7E'), rawurlencode($path)); + } + $response = $this->oauth->fetch($this->api_url . 'search/' . $root . '/' . ltrim($path,'/'),array('query' => $query)); + return json_decode($response['body'],true); + } + + /** + * Creates and returns a shareable link to files or folders. + * + * Note: Links created by the /shares API call expire after thirty days. + * + * @param type $path + * @param type $root + * @return type + */ + public function share($path, $root = null) { + if (is_null($root)) $root = $this->root; + $path = str_replace(array('%2F','~'), array('/','%7E'), rawurlencode($path)); + $response = $this->oauth->fetch($this->api_url. 'shares/'. $root . '/' . ltrim($path, '/'), array(), 'POST'); + return json_decode($response['body'],true); + + } + + /** + * Returns a link directly to a file. + * Similar to /shares. The difference is that this bypasses the Dropbox webserver, used to provide a preview of the file, so that you can effectively stream the contents of your media. + * + * Note: The /media link expires after four hours, allotting enough time to stream files, but not enough to leave a connection open indefinitely. + * + * @param type $path + * @param type $root + * @return type + */ + public function media($path, $root = null) { + + if (is_null($root)) $root = $this->root; + $path = str_replace(array('%2F','~'), array('/','%7E'), rawurlencode($path)); + $response = $this->oauth->fetch($this->api_url. 'media/'. $root . '/' . ltrim($path, '/'), array(), 'POST'); + return json_decode($response['body'],true); + + } + + /** + * Creates and returns a copy_ref to a file. This reference string can be used to copy that file to another user's Dropbox by passing it in as the from_copy_ref parameter on /fileops/copy. + * + * @param type $path + * @param type $root + * @return type + */ + public function copy_ref($path, $root = null) { + + if (is_null($root)) $root = $this->root; + $path = str_replace(array('%2F','~'), array('/','%7E'), rawurlencode($path)); + $response = $this->oauth->fetch($this->api_url. 'copy_ref/'. $root . '/' . ltrim($path, '/')); + return json_decode($response['body'],true); + + } + + +} diff --git a/apps/files_external/3rdparty/Dropbox/Exception.php b/apps/files_external/3rdparty/Dropbox/Exception.php new file mode 100644 index 0000000000..50cbc4c791 --- /dev/null +++ b/apps/files_external/3rdparty/Dropbox/Exception.php @@ -0,0 +1,15 @@ +oauth_token = $token['token']; + $this->oauth_token_secret = $token['token_secret']; + } else { + $this->oauth_token = $token; + $this->oauth_token_secret = $token_secret; + } + + } + + /** + * Returns the oauth request tokens as an associative array. + * + * The array will contain the elements 'token' and 'token_secret'. + * + * @return array + */ + public function getToken() { + + return array( + 'token' => $this->oauth_token, + 'token_secret' => $this->oauth_token_secret, + ); + + } + + /** + * Returns the authorization url + * + * @param string $callBack Specify a callback url to automatically redirect the user back + * @return string + */ + public function getAuthorizeUrl($callBack = null) { + + // Building the redirect uri + $token = $this->getToken(); + $uri = self::URI_AUTHORIZE . '?oauth_token=' . $token['token']; + if ($callBack) $uri.='&oauth_callback=' . $callBack; + return $uri; + } + + /** + * Fetches a secured oauth url and returns the response body. + * + * @param string $uri + * @param mixed $arguments + * @param string $method + * @param array $httpHeaders + * @return string + */ + public abstract function fetch($uri, $arguments = array(), $method = 'GET', $httpHeaders = array()); + + /** + * Requests the OAuth request token. + * + * @return array + */ + abstract public function getRequestToken(); + + /** + * Requests the OAuth access tokens. + * + * @return array + */ + abstract public function getAccessToken(); + +} diff --git a/apps/files_external/3rdparty/Dropbox/OAuth/Consumer/Dropbox.php b/apps/files_external/3rdparty/Dropbox/OAuth/Consumer/Dropbox.php new file mode 100644 index 0000000000..204a659de0 --- /dev/null +++ b/apps/files_external/3rdparty/Dropbox/OAuth/Consumer/Dropbox.php @@ -0,0 +1,37 @@ +consumerRequest instanceof HTTP_OAuth_Consumer_Request) { + $this->consumerRequest = new HTTP_OAuth_Consumer_Request; + } + + // TODO: Change this and add in code to validate the SSL cert. + // see https://github.com/bagder/curl/blob/master/lib/mk-ca-bundle.pl + $this->consumerRequest->setConfig(array( + 'ssl_verify_peer' => false, + 'ssl_verify_host' => false + )); + + return $this->consumerRequest; + } +} diff --git a/apps/files_external/3rdparty/Dropbox/OAuth/Curl.php b/apps/files_external/3rdparty/Dropbox/OAuth/Curl.php new file mode 100644 index 0000000000..b75b27bb36 --- /dev/null +++ b/apps/files_external/3rdparty/Dropbox/OAuth/Curl.php @@ -0,0 +1,282 @@ +consumerKey = $consumerKey; + $this->consumerSecret = $consumerSecret; + } + + /** + * Fetches a secured oauth url and returns the response body. + * + * @param string $uri + * @param mixed $arguments + * @param string $method + * @param array $httpHeaders + * @return string + */ + public function fetch($uri, $arguments = array(), $method = 'GET', $httpHeaders = array()) { + + $uri=str_replace('http://', 'https://', $uri); // all https, upload makes problems if not + if (is_string($arguments) and strtoupper($method) == 'POST') { + preg_match("/\?file=(.*)$/i", $uri, $matches); + if (isset($matches[1])) { + $uri = str_replace($matches[0], "", $uri); + $filename = $matches[1]; + $httpHeaders=array_merge($httpHeaders,$this->getOAuthHeader($uri, array("file" => $filename), $method)); + } + } else { + $httpHeaders=array_merge($httpHeaders,$this->getOAuthHeader($uri, $arguments, $method)); + } + $ch = curl_init(); + if (strtoupper($method) == 'POST') { + curl_setopt($ch, CURLOPT_URL, $uri); + curl_setopt($ch, CURLOPT_POST, true); +// if (is_array($arguments)) +// $arguments=http_build_query($arguments); + curl_setopt($ch, CURLOPT_POSTFIELDS, $arguments); +// $httpHeaders['Content-Length']=strlen($arguments); + } else { + curl_setopt($ch, CURLOPT_URL, $uri.'?'.http_build_query($arguments)); + curl_setopt($ch, CURLOPT_POST, false); + } + curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); + curl_setopt($ch, CURLOPT_TIMEOUT, 300); + curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, true); + curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 2); +// curl_setopt($ch, CURLOPT_CAINFO, "rootca"); + curl_setopt($ch, CURLOPT_FRESH_CONNECT, true); + //Build header + $headers = array(); + foreach ($httpHeaders as $name => $value) { + $headers[] = "{$name}: $value"; + } + curl_setopt($ch, CURLOPT_HTTPHEADER, $headers); + if (!ini_get('safe_mode') && !ini_get('open_basedir')) + curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true ); + if (function_exists($this->ProgressFunction) and defined('CURLOPT_PROGRESSFUNCTION')) { + curl_setopt($ch, CURLOPT_NOPROGRESS, false); + curl_setopt($ch, CURLOPT_PROGRESSFUNCTION, $this->ProgressFunction); + curl_setopt($ch, CURLOPT_BUFFERSIZE, 512); + } + $response=curl_exec($ch); + $errorno=curl_errno($ch); + $error=curl_error($ch); + $status=curl_getinfo($ch,CURLINFO_HTTP_CODE); + curl_close($ch); + + + if (!empty($errorno)) + throw new Dropbox_Exception_NotFound('Curl error: ('.$errorno.') '.$error."\n"); + + if ($status>=300) { + $body = json_decode($response,true); + switch ($status) { + // Not modified + case 304 : + return array( + 'httpStatus' => 304, + 'body' => null, + ); + break; + case 403 : + throw new Dropbox_Exception_Forbidden('Forbidden. + This could mean a bad OAuth request, or a file or folder already existing at the target location. + ' . $body["error"] . "\n"); + case 404 : + throw new Dropbox_Exception_NotFound('Resource at uri: ' . $uri . ' could not be found. ' . + $body["error"] . "\n"); + case 507 : + throw new Dropbox_Exception_OverQuota('This dropbox is full. ' . + $body["error"] . "\n"); + } + if (!empty($body["error"])) + throw new Dropbox_Exception_RequestToken('Error: ('.$status.') '.$body["error"]."\n"); + } + + return array( + 'body' => $response, + 'httpStatus' => $status + ); + } + + /** + * Returns named array with oauth parameters for further use + * @return array Array with oauth_ parameters + */ + private function getOAuthBaseParams() { + $params['oauth_version'] = '1.0'; + $params['oauth_signature_method'] = 'HMAC-SHA1'; + + $params['oauth_consumer_key'] = $this->consumerKey; + $tokens = $this->getToken(); + if (isset($tokens['token']) && $tokens['token']) { + $params['oauth_token'] = $tokens['token']; + } + $params['oauth_timestamp'] = time(); + $params['oauth_nonce'] = md5(microtime() . mt_rand()); + return $params; + } + + /** + * Creates valid Authorization header for OAuth, based on URI and Params + * + * @param string $uri + * @param array $params + * @param string $method GET or POST, standard is GET + * @param array $oAuthParams optional, pass your own oauth_params here + * @return array Array for request's headers section like + * array('Authorization' => 'OAuth ...'); + */ + private function getOAuthHeader($uri, $params, $method = 'GET', $oAuthParams = null) { + $oAuthParams = $oAuthParams ? $oAuthParams : $this->getOAuthBaseParams(); + + // create baseString to encode for the sent parameters + $baseString = $method . '&'; + $baseString .= $this->oauth_urlencode($uri) . "&"; + + // OAuth header does not include GET-Parameters + $signatureParams = array_merge($params, $oAuthParams); + + // sorting the parameters + ksort($signatureParams); + + $encodedParams = array(); + foreach ($signatureParams as $key => $value) { + $encodedParams[] = $this->oauth_urlencode($key) . '=' . $this->oauth_urlencode($value); + } + + $baseString .= $this->oauth_urlencode(implode('&', $encodedParams)); + + // encode the signature + $tokens = $this->getToken(); + $hash = $this->hash_hmac_sha1($this->consumerSecret.'&'.$tokens['token_secret'], $baseString); + $signature = base64_encode($hash); + + // add signature to oAuthParams + $oAuthParams['oauth_signature'] = $signature; + + $oAuthEncoded = array(); + foreach ($oAuthParams as $key => $value) { + $oAuthEncoded[] = $key . '="' . $this->oauth_urlencode($value) . '"'; + } + + return array('Authorization' => 'OAuth ' . implode(', ', $oAuthEncoded)); + } + + /** + * Requests the OAuth request token. + * + * @return void + */ + public function getRequestToken() { + $result = $this->fetch(self::URI_REQUEST_TOKEN, array(), 'POST'); + if ($result['httpStatus'] == "200") { + $tokens = array(); + parse_str($result['body'], $tokens); + $this->setToken($tokens['oauth_token'], $tokens['oauth_token_secret']); + return $this->getToken(); + } else { + throw new Dropbox_Exception_RequestToken('We were unable to fetch request tokens. This likely means that your consumer key and/or secret are incorrect.'); + } + } + + /** + * Requests the OAuth access tokens. + * + * This method requires the 'unauthorized' request tokens + * and, if successful will set the authorized request tokens. + * + * @return void + */ + public function getAccessToken() { + $result = $this->fetch(self::URI_ACCESS_TOKEN, array(), 'POST'); + if ($result['httpStatus'] == "200") { + $tokens = array(); + parse_str($result['body'], $tokens); + $this->setToken($tokens['oauth_token'], $tokens['oauth_token_secret']); + return $this->getToken(); + } else { + throw new Dropbox_Exception_RequestToken('We were unable to fetch request tokens. This likely means that your consumer key and/or secret are incorrect.'); + } + } + + /** + * Helper function to properly urlencode parameters. + * See http://php.net/manual/en/function.oauth-urlencode.php + * + * @param string $string + * @return string + */ + private function oauth_urlencode($string) { + return str_replace('%E7', '~', rawurlencode($string)); + } + + /** + * Hash function for hmac_sha1; uses native function if available. + * + * @param string $key + * @param string $data + * @return string + */ + private function hash_hmac_sha1($key, $data) { + if (function_exists('hash_hmac') && in_array('sha1', hash_algos())) { + return hash_hmac('sha1', $data, $key, true); + } else { + $blocksize = 64; + $hashfunc = 'sha1'; + if (strlen($key) > $blocksize) { + $key = pack('H*', $hashfunc($key)); + } + + $key = str_pad($key, $blocksize, chr(0x00)); + $ipad = str_repeat(chr(0x36), $blocksize); + $opad = str_repeat(chr(0x5c), $blocksize); + $hash = pack('H*', $hashfunc(( $key ^ $opad ) . pack('H*', $hashfunc(($key ^ $ipad) . $data)))); + + return $hash; + } + } + + +} \ No newline at end of file diff --git a/apps/files_external/3rdparty/Dropbox/README.md b/apps/files_external/3rdparty/Dropbox/README.md new file mode 100644 index 0000000000..54e05db762 --- /dev/null +++ b/apps/files_external/3rdparty/Dropbox/README.md @@ -0,0 +1,31 @@ +Dropbox-php +=========== + +This PHP library allows you to easily integrate dropbox with PHP. + +The following PHP extension is required: + +* json + +The library makes use of OAuth. At the moment you can use either of these libraries: + +[PHP OAuth extension](http://pecl.php.net/package/oauth) +[PEAR's HTTP_OAUTH package](http://pear.php.net/package/http_oauth) + +The extension is recommended, but if you can't install php extensions you should go for the pear package. +Installing +---------- + + pear channel-discover pear.dropbox-php.com + pear install dropbox-php/Dropbox-alpha + +Documentation +------------- +Check out the [documentation](http://www.dropbox-php.com/docs). + +Questions? +---------- + +[Dropbox-php Mailing list](http://groups.google.com/group/dropbox-php) +[Official Dropbox developer forum](http://forums.dropbox.com/forum.php?id=5) + diff --git a/apps/files_external/3rdparty/Dropbox/autoload.php b/apps/files_external/3rdparty/Dropbox/autoload.php new file mode 100644 index 0000000000..5388ea6334 --- /dev/null +++ b/apps/files_external/3rdparty/Dropbox/autoload.php @@ -0,0 +1,29 @@ + +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program 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 General Public License for more details. +# +################################################################### + +define ('SMB4PHP_VERSION', '0.8'); + +################################################################### +# CONFIGURATION SECTION - Change for your needs +################################################################### + +define ('SMB4PHP_SMBCLIENT', 'smbclient'); +define ('SMB4PHP_SMBOPTIONS', 'TCP_NODELAY IPTOS_LOWDELAY SO_KEEPALIVE SO_RCVBUF=8192 SO_SNDBUF=8192'); +define ('SMB4PHP_AUTHMODE', 'arg'); # set to 'env' to use USER enviroment variable + +################################################################### +# SMB - commands that does not need an instance +################################################################### + +$GLOBALS['__smb_cache'] = array ('stat' => array (), 'dir' => array ()); + +class smb { + + function parse_url ($url) { + $pu = parse_url (trim($url)); + foreach (array ('domain', 'user', 'pass', 'host', 'port', 'path') as $i) { + if (! isset($pu[$i])) { + $pu[$i] = ''; + } + } + if (count ($userdomain = explode (';', urldecode ($pu['user']))) > 1) { + @list ($pu['domain'], $pu['user']) = $userdomain; + } + $path = preg_replace (array ('/^\//', '/\/$/'), '', urldecode ($pu['path'])); + list ($pu['share'], $pu['path']) = (preg_match ('/^([^\/]+)\/(.*)/', $path, $regs)) + ? array ($regs[1], preg_replace ('/\//', '\\', $regs[2])) + : array ($path, ''); + $pu['type'] = $pu['path'] ? 'path' : ($pu['share'] ? 'share' : ($pu['host'] ? 'host' : '**error**')); + if (! ($pu['port'] = intval(@$pu['port']))) { + $pu['port'] = 139; + } + + // decode user and password + $pu['user'] = urldecode($pu['user']); + $pu['pass'] = urldecode($pu['pass']); + return $pu; + } + + + function look ($purl) { + return smb::client ('-L ' . escapeshellarg ($purl['host']), $purl); + } + + + function execute ($command, $purl) { + return smb::client ('-d 0 ' + . escapeshellarg ('//' . $purl['host'] . '/' . $purl['share']) + . ' -c ' . escapeshellarg ($command), $purl + ); + } + + function client ($params, $purl) { + + static $regexp = array ( + '^added interface ip=(.*) bcast=(.*) nmask=(.*)$' => 'skip', + 'Anonymous login successful' => 'skip', + '^Domain=\[(.*)\] OS=\[(.*)\] Server=\[(.*)\]$' => 'skip', + '^\tSharename[ ]+Type[ ]+Comment$' => 'shares', + '^\t---------[ ]+----[ ]+-------$' => 'skip', + '^\tServer [ ]+Comment$' => 'servers', + '^\t---------[ ]+-------$' => 'skip', + '^\tWorkgroup[ ]+Master$' => 'workg', + '^\t(.*)[ ]+(Disk|IPC)[ ]+IPC.*$' => 'skip', + '^\tIPC\\\$(.*)[ ]+IPC' => 'skip', + '^\t(.*)[ ]+(Disk)[ ]+(.*)$' => 'share', + '^\t(.*)[ ]+(Printer)[ ]+(.*)$' => 'skip', + '([0-9]+) blocks of size ([0-9]+)\. ([0-9]+) blocks available' => 'skip', + 'Got a positive name query response from ' => 'skip', + '^(session setup failed): (.*)$' => 'error', + '^(.*): ERRSRV - ERRbadpw' => 'error', + '^Error returning browse list: (.*)$' => 'error', + '^tree connect failed: (.*)$' => 'error', + '^(Connection to .* failed)(.*)$' => 'error-connect', + '^NT_STATUS_(.*) ' => 'error', + '^NT_STATUS_(.*)\$' => 'error', + 'ERRDOS - ERRbadpath \((.*).\)' => 'error', + 'cd (.*): (.*)$' => 'error', + '^cd (.*): NT_STATUS_(.*)' => 'error', + '^\t(.*)$' => 'srvorwg', + '^([0-9]+)[ ]+([0-9]+)[ ]+(.*)$' => 'skip', + '^Job ([0-9]+) cancelled' => 'skip', + '^[ ]+(.*)[ ]+([0-9]+)[ ]+(Mon|Tue|Wed|Thu|Fri|Sat|Sun)[ ](Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)[ ]+([0-9]+)[ ]+([0-9]{2}:[0-9]{2}:[0-9]{2})[ ]([0-9]{4})$' => 'files', + '^message start: ERRSRV - (ERRmsgoff)' => 'error' + ); + + if (SMB4PHP_AUTHMODE == 'env') { + putenv("USER={$purl['user']}%{$purl['pass']}"); + $auth = ''; + } else { + $auth = ($purl['user'] <> '' ? (' -U ' . escapeshellarg ($purl['user'] . '%' . $purl['pass'])) : ''); + } + if ($purl['domain'] <> '') { + $auth .= ' -W ' . escapeshellarg ($purl['domain']); + } + $port = ($purl['port'] <> 139 ? ' -p ' . escapeshellarg ($purl['port']) : ''); + $options = '-O ' . escapeshellarg(SMB4PHP_SMBOPTIONS); + + // this put env is necessary to read the output of smbclient correctly + $old_locale = getenv('LC_ALL'); + putenv('LC_ALL=en_US.UTF-8'); + $output = popen (SMB4PHP_SMBCLIENT." -N {$auth} {$options} {$port} {$options} {$params} 2>/dev/null", 'r'); + $info = array (); + $info['info']= array (); + $mode = ''; + while ($line = fgets ($output, 4096)) { + list ($tag, $regs, $i) = array ('skip', array (), array ()); + reset ($regexp); + foreach ($regexp as $r => $t) if (preg_match ('/'.$r.'/', $line, $regs)) { + $tag = $t; + break; + } + switch ($tag) { + case 'skip': continue; + case 'shares': $mode = 'shares'; break; + case 'servers': $mode = 'servers'; break; + case 'workg': $mode = 'workgroups'; break; + case 'share': + list($name, $type) = array ( + trim(substr($line, 1, 15)), + trim(strtolower(substr($line, 17, 10))) + ); + $i = ($type <> 'disk' && preg_match('/^(.*) Disk/', $line, $regs)) + ? array(trim($regs[1]), 'disk') + : array($name, 'disk'); + break; + case 'srvorwg': + list ($name, $master) = array ( + strtolower(trim(substr($line,1,21))), + strtolower(trim(substr($line, 22))) + ); + $i = ($mode == 'servers') ? array ($name, "server") : array ($name, "workgroup", $master); + break; + case 'files': + list ($attr, $name) = preg_match ("/^(.*)[ ]+([D|A|H|S|R]+)$/", trim ($regs[1]), $regs2) + ? array (trim ($regs2[2]), trim ($regs2[1])) + : array ('', trim ($regs[1])); + list ($his, $im) = array ( + explode(':', $regs[6]), 1 + strpos("JanFebMarAprMayJunJulAugSepOctNovDec", $regs[4]) / 3); + $i = ($name <> '.' && $name <> '..') + ? array ( + $name, + (strpos($attr,'D') === FALSE) ? 'file' : 'folder', + 'attr' => $attr, + 'size' => intval($regs[2]), + 'time' => mktime ($his[0], $his[1], $his[2], $im, $regs[5], $regs[7]) + ) + : array(); + break; + case 'error': + if(substr($regs[0],0,22)=='NT_STATUS_NO_SUCH_FILE'){ + return false; + }elseif(substr($regs[0],0,31)=='NT_STATUS_OBJECT_NAME_COLLISION'){ + return false; + }elseif(substr($regs[0],0,31)=='NT_STATUS_OBJECT_PATH_NOT_FOUND'){ + return false; + }elseif(substr($regs[0],0,29)=='NT_STATUS_FILE_IS_A_DIRECTORY'){ + return false; + } + trigger_error($regs[0].' params('.$params.')', E_USER_ERROR); + case 'error-connect': + return false; + } + if ($i) switch ($i[1]) { + case 'file': + case 'folder': $info['info'][$i[0]] = $i; + case 'disk': + case 'server': + case 'workgroup': $info[$i[1]][] = $i[0]; + } + } + pclose($output); + + + // restore previous locale + if ($old_locale===false) { + putenv('LC_ALL'); + } else { + putenv('LC_ALL='.$old_locale); + } + + return $info; + } + + + # stats + + function url_stat ($url, $flags = STREAM_URL_STAT_LINK) { + if ($s = smb::getstatcache($url)) { + return $s; + } + list ($stat, $pu) = array (false, smb::parse_url ($url)); + switch ($pu['type']) { + case 'host': + if ($o = smb::look ($pu)) + $stat = stat ("/tmp"); + else + trigger_error ("url_stat(): list failed for host '{$pu['host']}'", E_USER_WARNING); + break; + case 'share': + if ($o = smb::look ($pu)) { + $found = FALSE; + $lshare = strtolower ($pu['share']); # fix by Eric Leung + foreach ($o['disk'] as $s) if ($lshare == strtolower($s)) { + $found = TRUE; + $stat = stat ("/tmp"); + break; + } + if (! $found) + trigger_error ("url_stat(): disk resource '{$lshare}' not found in '{$pu['host']}'", E_USER_WARNING); + } + break; + case 'path': + if ($o = smb::execute ('dir "'.$pu['path'].'"', $pu)) { + $p = explode('\\', $pu['path']); + $name = $p[count($p)-1]; + if (isset ($o['info'][$name])) { + $stat = smb::addstatcache ($url, $o['info'][$name]); + } else { + trigger_error ("url_stat(): path '{$pu['path']}' not found", E_USER_WARNING); + } + } else { + return false; +// trigger_error ("url_stat(): dir failed for path '{$pu['path']}'", E_USER_WARNING); + } + break; + default: trigger_error ('error in URL', E_USER_ERROR); + } + return $stat; + } + + function addstatcache ($url, $info) { + $url = str_replace('//', '/', $url); + $url = rtrim($url, '/'); + global $__smb_cache; + $is_file = (strpos ($info['attr'],'D') === FALSE); + $s = ($is_file) ? stat ('/etc/passwd') : stat ('/tmp'); + $s[7] = $s['size'] = $info['size']; + $s[8] = $s[9] = $s[10] = $s['atime'] = $s['mtime'] = $s['ctime'] = $info['time']; + return $__smb_cache['stat'][$url] = $s; + } + + function getstatcache ($url) { + $url = str_replace('//', '/', $url); + $url = rtrim($url, '/'); + global $__smb_cache; + return isset ($__smb_cache['stat'][$url]) ? $__smb_cache['stat'][$url] : FALSE; + } + + function clearstatcache ($url='') { + $url = str_replace('//', '/', $url); + $url = rtrim($url, '/'); + global $__smb_cache; + if ($url == '') $__smb_cache['stat'] = array (); else unset ($__smb_cache['stat'][$url]); + } + + + # commands + + function unlink ($url) { + $pu = smb::parse_url($url); + if ($pu['type'] <> 'path') trigger_error('unlink(): error in URL', E_USER_ERROR); + smb::clearstatcache ($url); + smb_stream_wrapper::cleardircache (dirname($url)); + return smb::execute ('del "'.$pu['path'].'"', $pu); + } + + function rename ($url_from, $url_to) { + list ($from, $to) = array (smb::parse_url($url_from), smb::parse_url($url_to)); + if ($from['host'] <> $to['host'] || + $from['share'] <> $to['share'] || + $from['user'] <> $to['user'] || + $from['pass'] <> $to['pass'] || + $from['domain'] <> $to['domain']) { + trigger_error('rename(): FROM & TO must be in same server-share-user-pass-domain', E_USER_ERROR); + } + if ($from['type'] <> 'path' || $to['type'] <> 'path') { + trigger_error('rename(): error in URL', E_USER_ERROR); + } + smb::clearstatcache ($url_from); + return smb::execute ('rename "'.$from['path'].'" "'.$to['path'].'"', $to); + } + + function mkdir ($url, $mode, $options) { + $pu = smb::parse_url($url); + if ($pu['type'] <> 'path') trigger_error('mkdir(): error in URL', E_USER_ERROR); + return smb::execute ('mkdir "'.$pu['path'].'"', $pu)!==false; + } + + function rmdir ($url) { + $pu = smb::parse_url($url); + if ($pu['type'] <> 'path') trigger_error('rmdir(): error in URL', E_USER_ERROR); + smb::clearstatcache ($url); + smb_stream_wrapper::cleardircache (dirname($url)); + return smb::execute ('rmdir "'.$pu['path'].'"', $pu)!==false; + } + +} + +################################################################### +# SMB_STREAM_WRAPPER - class to be registered for smb:// URLs +################################################################### + +class smb_stream_wrapper extends smb { + + # variables + + private $stream, $url, $parsed_url = array (), $mode, $tmpfile; + private $need_flush = FALSE; + private $dir = array (), $dir_index = -1; + + + # directories + + function dir_opendir ($url, $options) { + if ($d = $this->getdircache ($url)) { + $this->dir = $d; + $this->dir_index = 0; + return TRUE; + } + $pu = smb::parse_url ($url); + switch ($pu['type']) { + case 'host': + if ($o = smb::look ($pu)) { + $this->dir = $o['disk']; + $this->dir_index = 0; + } else { + trigger_error ("dir_opendir(): list failed for host '{$pu['host']}'", E_USER_WARNING); + return false; + } + break; + case 'share': + case 'path': + if (is_array($o = smb::execute ('dir "'.$pu['path'].'\*"', $pu))) { + $this->dir = array_keys($o['info']); + $this->dir_index = 0; + $this->adddircache ($url, $this->dir); + if(substr($url,-1,1)=='/'){ + $url=substr($url,0,-1); + } + foreach ($o['info'] as $name => $info) { + smb::addstatcache($url . '/' . $name, $info); + } + } else { + trigger_error ("dir_opendir(): dir failed for path '".$pu['path']."'", E_USER_WARNING); + return false; + } + break; + default: + trigger_error ('dir_opendir(): error in URL', E_USER_ERROR); + return false; + } + return TRUE; + } + + function dir_readdir () { + return ($this->dir_index < count($this->dir)) ? $this->dir[$this->dir_index++] : FALSE; + } + + function dir_rewinddir () { $this->dir_index = 0; } + + function dir_closedir () { $this->dir = array(); $this->dir_index = -1; return TRUE; } + + + # cache + + function adddircache ($url, $content) { + $url = str_replace('//', '/', $url); + $url = rtrim($url, '/'); + global $__smb_cache; + return $__smb_cache['dir'][$url] = $content; + } + + function getdircache ($url) { + $url = str_replace('//', '/', $url); + $url = rtrim($url, '/'); + global $__smb_cache; + return isset ($__smb_cache['dir'][$url]) ? $__smb_cache['dir'][$url] : FALSE; + } + + function cleardircache ($url='') { + $url = str_replace('//', '/', $url); + $url = rtrim($url, '/'); + global $__smb_cache; + if ($url == ''){ + $__smb_cache['dir'] = array (); + }else{ + unset ($__smb_cache['dir'][$url]); + } + } + + + # streams + + function stream_open ($url, $mode, $options, $opened_path) { + $this->url = $url; + $this->mode = $mode; + $this->parsed_url = $pu = smb::parse_url($url); + if ($pu['type'] <> 'path') trigger_error('stream_open(): error in URL', E_USER_ERROR); + switch ($mode) { + case 'r': + case 'r+': + case 'rb': + case 'a': + case 'a+': $this->tmpfile = tempnam('/tmp', 'smb.down.'); + smb::execute ('get "'.$pu['path'].'" "'.$this->tmpfile.'"', $pu); + break; + case 'w': + case 'w+': + case 'wb': + case 'x': + case 'x+': $this->cleardircache(); + $this->tmpfile = tempnam('/tmp', 'smb.up.'); + $this->need_flush=true; + } + $this->stream = fopen ($this->tmpfile, $mode); + return TRUE; + } + + function stream_close () { return fclose($this->stream); } + + function stream_read ($count) { return fread($this->stream, $count); } + + function stream_write ($data) { $this->need_flush = TRUE; return fwrite($this->stream, $data); } + + function stream_eof () { return feof($this->stream); } + + function stream_tell () { return ftell($this->stream); } + + function stream_seek ($offset, $whence=null) { return fseek($this->stream, $offset, $whence); } + + function stream_flush () { + if ($this->mode <> 'r' && $this->need_flush) { + smb::clearstatcache ($this->url); + smb::execute ('put "'.$this->tmpfile.'" "'.$this->parsed_url['path'].'"', $this->parsed_url); + $this->need_flush = FALSE; + } + } + + function stream_stat () { return smb::url_stat ($this->url); } + + function __destruct () { + if ($this->tmpfile <> '') { + if ($this->need_flush) $this->stream_flush (); + unlink ($this->tmpfile); + + } + } + +} + +################################################################### +# Register 'smb' protocol ! +################################################################### + +stream_wrapper_register('smb', 'smb_stream_wrapper') + or die ('Failed to register protocol'); diff --git a/apps/files_external/l10n/zh_CN.GB2312.php b/apps/files_external/l10n/zh_CN.GB2312.php deleted file mode 100644 index 3633de6314..0000000000 --- a/apps/files_external/l10n/zh_CN.GB2312.php +++ /dev/null @@ -1,28 +0,0 @@ - "已授予权限", -"Error configuring Dropbox storage" => "配置 Dropbox 存储出错", -"Grant access" => "授予权限", -"Please provide a valid Dropbox app key and secret." => "请提供一个有效的 Dropbox app key 和 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." => "注意：“SMB客户端”未安装。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" => "外部存储", -"Configuration" => "配置", -"Options" => "选项", -"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" => "导入根证书" -); -$PLURAL_FORMS = "nplurals=1; plural=0;"; diff --git a/apps/files_external/lib/dropbox.php b/apps/files_external/lib/dropbox.php index 081c547888..b6deab6e5a 100755 --- a/apps/files_external/lib/dropbox.php +++ b/apps/files_external/lib/dropbox.php @@ -22,7 +22,7 @@ namespace OC\Files\Storage; -require_once 'Dropbox/autoload.php'; +require_once __DIR__ . '/../3rdparty/Dropbox/autoload.php'; class Dropbox extends \OC\Files\Storage\Common { diff --git a/apps/files_external/lib/smb.php b/apps/files_external/lib/smb.php index dc4e02731f..8e7a28fba1 100644 --- a/apps/files_external/lib/smb.php +++ b/apps/files_external/lib/smb.php @@ -8,7 +8,7 @@ namespace OC\Files\Storage; -require_once 'smb4php/smb.php'; +require_once __DIR__ . '/../3rdparty/smb4php/smb.php'; class SMB extends \OC\Files\Storage\StreamWrapper{ private $password; diff --git a/apps/files_sharing/l10n/zh_CN.GB2312.php b/apps/files_sharing/l10n/zh_CN.GB2312.php deleted file mode 100644 index 5c426672c8..0000000000 --- a/apps/files_sharing/l10n/zh_CN.GB2312.php +++ /dev/null @@ -1,19 +0,0 @@ - "密码错误。请重试。", -"Password" => "密码", -"Submit" => "提交", -"Sorry, this link doesn’t seem to work anymore." => "对不起，这个链接看起来是错误的。", -"Reasons might be:" => "原因可能是:", -"the item was removed" => "项目已经移除", -"the link expired" => "链接已过期", -"sharing is disabled" => "分享已经被禁用", -"For more info, please ask the person who sent this link." => "欲了解更多信息，请联系将此链接发送给你的人。", -"%s shared the folder %s with you" => "%s 与您分享了文件夹 %s", -"%s shared the file %s with you" => "%s 与您分享了文件 %s", -"Download" => "下载", -"Upload" => "上传", -"Cancel upload" => "取消上传", -"No preview available for" => "没有预览可用于" -); -$PLURAL_FORMS = "nplurals=1; plural=0;"; diff --git a/apps/files_sharing/l10n/zh_TW.php b/apps/files_sharing/l10n/zh_TW.php index b950cbf8c9..56d67ea7ce 100644 --- a/apps/files_sharing/l10n/zh_TW.php +++ b/apps/files_sharing/l10n/zh_TW.php @@ -1,7 +1,14 @@ "請檢查您的密碼並再試一次。", "Password" => "密碼", "Submit" => "送出", +"Sorry, this link doesn’t seem to work anymore." => "抱歉，這連結看來已經不能用了。", +"Reasons might be:" => "可能的原因：", +"the item was removed" => "項目已經移除", +"the link expired" => "連結過期", +"sharing is disabled" => "分享功能已停用", +"For more info, please ask the person who sent this link." => "請詢問告訴您此連結的人以瞭解更多", "%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/lib/sharedstorage.php b/apps/files_sharing/lib/sharedstorage.php index 7384b094cb..d91acbbb2b 100644 --- a/apps/files_sharing/lib/sharedstorage.php +++ b/apps/files_sharing/lib/sharedstorage.php @@ -362,9 +362,13 @@ class Shared extends \OC\Files\Storage\Common { case 'xb': case 'a': case 'ab': - if (!$this->isUpdatable($path)) { - return false; - } + $exists = $this->file_exists($path); + if ($exists && !$this->isUpdatable($path)) { + return false; + } + if (!$exists && !$this->isCreatable(dirname($path))) { + return false; + } } $info = array( 'target' => $this->sharedFolder.$path, diff --git a/apps/files_trashbin/js/trash.js b/apps/files_trashbin/js/trash.js index b14a7240cb..40c0bdb382 100644 --- a/apps/files_trashbin/js/trash.js +++ b/apps/files_trashbin/js/trash.js @@ -20,6 +20,7 @@ $(document).ready(function() { OC.dialogs.alert(result.data.message, t('core', 'Error')); } enableActions(); + FileList.updateFileSummary(); }); }); @@ -48,6 +49,7 @@ $(document).ready(function() { OC.dialogs.alert(result.data.message, t('core', 'Error')); } enableActions(); + FileList.updateFileSummary(); }); }); diff --git a/apps/files_trashbin/l10n/el.php b/apps/files_trashbin/l10n/el.php index 759e5299e4..939c7fed61 100644 --- a/apps/files_trashbin/l10n/el.php +++ b/apps/files_trashbin/l10n/el.php @@ -8,8 +8,8 @@ $TRANSLATIONS = array( "Delete permanently" => "Μόνιμη διαγραφή", "Name" => "Όνομα", "Deleted" => "Διαγράφηκε", -"_%n folder_::_%n folders_" => array("",""), -"_%n file_::_%n files_" => array("",""), +"_%n folder_::_%n folders_" => array("","%n φάκελοι"), +"_%n file_::_%n files_" => array("","%n αρχεία"), "restored" => "έγινε επαναφορά", "Nothing in here. Your trash bin is empty!" => "Δεν υπάρχει τίποτα εδώ. Ο κάδος σας είναι άδειος!", "Restore" => "Επαναφορά", diff --git a/apps/files_trashbin/l10n/zh_CN.GB2312.php b/apps/files_trashbin/l10n/zh_CN.GB2312.php deleted file mode 100644 index eaa97bb1b6..0000000000 --- a/apps/files_trashbin/l10n/zh_CN.GB2312.php +++ /dev/null @@ -1,12 +0,0 @@ - "出错", -"Delete permanently" => "永久删除", -"Name" => "名称", -"_%n folder_::_%n folders_" => array("%n 个文件夹"), -"_%n file_::_%n files_" => array("%n 个文件"), -"Restore" => "恢复", -"Delete" => "删除", -"Deleted Files" => "删除的文件" -); -$PLURAL_FORMS = "nplurals=1; plural=0;"; diff --git a/apps/files_trashbin/l10n/zh_TW.php b/apps/files_trashbin/l10n/zh_TW.php index ab6b75c578..2dfc484fc7 100644 --- a/apps/files_trashbin/l10n/zh_TW.php +++ b/apps/files_trashbin/l10n/zh_TW.php @@ -1,17 +1,18 @@ "無法永久刪除 %s", -"Couldn't restore %s" => "無法復原 %s", -"perform restore operation" => "進行復原動作", +"Couldn't restore %s" => "無法還原 %s", +"perform restore operation" => "進行還原動作", "Error" => "錯誤", "delete file permanently" => "永久刪除檔案", "Delete permanently" => "永久刪除", "Name" => "名稱", "Deleted" => "已刪除", -"_%n folder_::_%n folders_" => array(""), -"_%n file_::_%n files_" => array(""), +"_%n folder_::_%n folders_" => array("%n 個資料夾"), +"_%n file_::_%n files_" => array("%n 個檔案"), +"restored" => "已還原", "Nothing in here. Your trash bin is empty!" => "您的垃圾桶是空的！", -"Restore" => "復原", +"Restore" => "還原", "Delete" => "刪除", "Deleted Files" => "已刪除的檔案" ); diff --git a/apps/files_trashbin/lib/trash.php b/apps/files_trashbin/lib/trash.php index 323f25eac2..880832f9af 100644 --- a/apps/files_trashbin/lib/trash.php +++ b/apps/files_trashbin/lib/trash.php @@ -72,11 +72,6 @@ class Trashbin { $mime = $view->getMimeType('files' . $file_path); if ($view->is_dir('files' . $file_path)) { - $dirContent = $view->getDirectoryContent('files' . $file_path); - // no need to move empty folders to the trash bin - if (empty($dirContent)) { - return true; - } $type = 'dir'; } else { $type = 'file'; @@ -689,7 +684,7 @@ class Trashbin { } } } - + /** * clean up the trash bin * @param current size of the trash bin @@ -892,16 +887,17 @@ class Trashbin { //Listen to post write hook \OCP\Util::connectHook('OC_Filesystem', 'post_write', "OCA\Files_Trashbin\Hooks", "post_write_hook"); } - + /** * @brief check if trash bin is empty for a given user * @param string $user */ public static function isEmpty($user) { - $trashSize = self::getTrashbinSize($user); + $view = new \OC\Files\View('/' . $user . '/files_trashbin'); + $content = $view->getDirectoryContent('/files'); - if ($trashSize !== false && $trashSize > 0) { + if ($content) { return false; } diff --git a/apps/files_versions/l10n/zh_CN.GB2312.php b/apps/files_versions/l10n/zh_CN.GB2312.php deleted file mode 100644 index de340d6dc9..0000000000 --- a/apps/files_versions/l10n/zh_CN.GB2312.php +++ /dev/null @@ -1,10 +0,0 @@ - "无法恢复：%s", -"Versions" => "版本", -"Failed to revert {file} to revision {timestamp}." => "无法恢复文件 {file} 到 版本 {timestamp}。", -"More versions..." => "更多版本", -"No other versions available" => "没有其他可用版本", -"Restore" => "恢复" -); -$PLURAL_FORMS = "nplurals=1; plural=0;"; diff --git a/apps/files_versions/l10n/zh_TW.php b/apps/files_versions/l10n/zh_TW.php index 55a3dca3c3..9b8900fd8e 100644 --- a/apps/files_versions/l10n/zh_TW.php +++ b/apps/files_versions/l10n/zh_TW.php @@ -2,6 +2,9 @@ $TRANSLATIONS = array( "Could not revert: %s" => "無法還原：%s", "Versions" => "版本", +"Failed to revert {file} to revision {timestamp}." => "無法還原檔案 {file} 至版本 {timestamp}", +"More versions..." => "更多版本…", +"No other versions available" => "沒有其他版本了", "Restore" => "復原" ); $PLURAL_FORMS = "nplurals=1; plural=0;"; diff --git a/apps/user_ldap/l10n/ca.php b/apps/user_ldap/l10n/ca.php index 338317baad..455ad62d84 100644 --- a/apps/user_ldap/l10n/ca.php +++ b/apps/user_ldap/l10n/ca.php @@ -30,8 +30,11 @@ $TRANSLATIONS = array( "Password" => "Contrasenya", "For anonymous access, leave DN and Password empty." => "Per un accés anònim, deixeu la DN i la contrasenya en blanc.", "User Login Filter" => "Filtre d'inici de sessió d'usuari", +"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" => "Defineix el filtre a aplicar quan s'intenta iniciar la sessió. %%uid reemplaça el nom d'usuari en l'acció d'inici de sessió. Per exemple: \"uid=%%uid\"", "User List Filter" => "Llista de filtres d'usuari", +"Defines the filter to apply, when retrieving users (no placeholders). Example: \"objectClass=person\"" => "Defineix el filtre a aplicar quan es mostren usuaris (no textos variables). Per exemple: \"objectClass=person\"", "Group Filter" => "Filtre de grup", +"Defines the filter to apply, when retrieving groups (no placeholders). Example: \"objectClass=posixGroup\"" => "Defineix el filtre a aplicar quan es mostren grups (no textos variables). Per exemple: \"objectClass=posixGroup\"", "Connection Settings" => "Arranjaments de connexió", "Configuration Active" => "Configuració activa", "When unchecked, this configuration will be skipped." => "Si està desmarcat, aquesta configuració s'ometrà.", @@ -45,6 +48,7 @@ $TRANSLATIONS = array( "Do not use it additionally for LDAPS connections, it will fail." => "No ho useu adicionalment per a conexions LDAPS, fallarà.", "Case insensitve LDAP server (Windows)" => "Servidor LDAP sense distinció entre majúscules i minúscules (Windows)", "Turn off SSL certificate validation." => "Desactiva la validació de certificat SSL.", +"Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "No es recomana, useu-ho només com a prova! Importeu el certificat SSL del servidor LDAP al servidor %s només si la connexió funciona amb aquesta opció.", "Cache Time-To-Live" => "Memòria de cau Time-To-Live", "in seconds. A change empties the cache." => "en segons. Un canvi buidarà la memòria de cau.", "Directory Settings" => "Arranjaments de carpetes", diff --git a/apps/user_ldap/l10n/cs_CZ.php b/apps/user_ldap/l10n/cs_CZ.php index 9f4c31c068..9109a8c710 100644 --- a/apps/user_ldap/l10n/cs_CZ.php +++ b/apps/user_ldap/l10n/cs_CZ.php @@ -30,11 +30,11 @@ $TRANSLATIONS = array( "Password" => "Heslo", "For anonymous access, leave DN and Password empty." => "Pro anonymní přístup ponechte údaje DN and heslo prázdné.", "User Login Filter" => "Filtr přihlášení uživatelů", -"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" => "Určuje použitý filtr, při pokusu o přihlášení. %%uid nahrazuje uživatelské jméno v činnosti přihlášení. Příklad \"uid=%%uid\"", +"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" => "Určuje použitý filtr při pokusu o přihlášení. %%uid nahrazuje uživatelské jméno v činnosti přihlášení. Příklad: \"uid=%%uid\"", "User List Filter" => "Filtr seznamu uživatelů", -"Defines the filter to apply, when retrieving users (no placeholders). Example: \"objectClass=person\"" => "Určuje použitý filtr pro získávaní uživatelů (bez zástupných znaků). Příklad: \"objectClass=person\"", +"Defines the filter to apply, when retrieving users (no placeholders). Example: \"objectClass=person\"" => "Určuje použitý filtr při získávání uživatelů (bez zástupných znaků). Příklad: \"objectClass=person\"", "Group Filter" => "Filtr skupin", -"Defines the filter to apply, when retrieving groups (no placeholders). Example: \"objectClass=posixGroup\"" => "Určuje použitý filtr, pro získávaní skupin (bez zástupných znaků). Příklad: \"objectClass=posixGroup\"", +"Defines the filter to apply, when retrieving groups (no placeholders). Example: \"objectClass=posixGroup\"" => "Určuje použitý filtr při získávání skupin (bez zástupných znaků). Příklad: \"objectClass=posixGroup\"", "Connection Settings" => "Nastavení spojení", "Configuration Active" => "Nastavení aktivní", "When unchecked, this configuration will be skipped." => "Pokud není zaškrtnuto, bude toto nastavení přeskočeno.", diff --git a/apps/user_ldap/l10n/pt_BR.php b/apps/user_ldap/l10n/pt_BR.php index 88006e1b5d..9469146d35 100644 --- a/apps/user_ldap/l10n/pt_BR.php +++ b/apps/user_ldap/l10n/pt_BR.php @@ -30,8 +30,11 @@ $TRANSLATIONS = array( "Password" => "Senha", "For anonymous access, leave DN and Password empty." => "Para acesso anônimo, deixe DN e Senha vazios.", "User Login Filter" => "Filtro de Login de Usuário", +"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" => "Define o filtro a ser aplicado, o login é feito. %%uid substitui o nome do usuário na ação de login. Exemplo: \"uid=%%uid\"", "User List Filter" => "Filtro de Lista de Usuário", +"Defines the filter to apply, when retrieving users (no placeholders). Example: \"objectClass=person\"" => "Define o filtro a ser aplicado, ao recuperar usuários (sem espaços reservados). Exemplo: \"objectClass=person\"", "Group Filter" => "Filtro de Grupo", +"Defines the filter to apply, when retrieving groups (no placeholders). Example: \"objectClass=posixGroup\"" => "Define o filtro a ser aplicado, ao recuperar grupos (sem espaços reservados). Exemplo: \"objectClass=posixGroup\"", "Connection Settings" => "Configurações de Conexão", "Configuration Active" => "Configuração ativa", "When unchecked, this configuration will be skipped." => "Quando não marcada, esta configuração será ignorada.", @@ -45,6 +48,7 @@ $TRANSLATIONS = array( "Do not use it additionally for LDAPS connections, it will fail." => "Não use adicionalmente para conexões LDAPS, pois falhará.", "Case insensitve LDAP server (Windows)" => "Servidor LDAP sensível à caixa alta (Windows)", "Turn off SSL certificate validation." => "Desligar validação de certificado SSL.", +"Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "Não recomendado, use-o somente para teste! Se a conexão só funciona com esta opção, importar o certificado SSL do servidor LDAP em seu servidor %s.", "Cache Time-To-Live" => "Cache Time-To-Live", "in seconds. A change empties the cache." => "em segundos. Uma mudança esvaziará o cache.", "Directory Settings" => "Configurações de Diretório", diff --git a/apps/user_ldap/l10n/sk_SK.php b/apps/user_ldap/l10n/sk_SK.php index c5bb6a8a50..df71a71e93 100644 --- a/apps/user_ldap/l10n/sk_SK.php +++ b/apps/user_ldap/l10n/sk_SK.php @@ -30,8 +30,11 @@ $TRANSLATIONS = array( "Password" => "Heslo", "For anonymous access, leave DN and Password empty." => "Pre anonymný prístup ponechajte údaje DN a Heslo prázdne.", "User Login Filter" => "Filter prihlásenia používateľov", +"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" => "Určuje použitý filter, pri pokuse o prihlásenie. %%uid nahradzuje používateľské meno v činnosti prihlásenia. Napríklad: \"uid=%%uid\"", "User List Filter" => "Filter zoznamov používateľov", +"Defines the filter to apply, when retrieving users (no placeholders). Example: \"objectClass=person\"" => "Definuje použitý filter, pri získavaní používateľov (bez \"placeholderov\"). Napríklad: \"objectClass=osoba\"", "Group Filter" => "Filter skupiny", +"Defines the filter to apply, when retrieving groups (no placeholders). Example: \"objectClass=posixGroup\"" => "Definuje použitý filter, pri získavaní skupín (bez \"placeholderov\"). Napríklad: \"objectClass=posixSkupina\"", "Connection Settings" => "Nastavenie pripojenia", "Configuration Active" => "Nastavenia sú aktívne ", "When unchecked, this configuration will be skipped." => "Ak nie je zaškrtnuté, nastavenie bude preskočené.", @@ -45,6 +48,7 @@ $TRANSLATIONS = array( "Do not use it additionally for LDAPS connections, it will fail." => "Nepoužívajte pre pripojenie LDAPS, zlyhá.", "Case insensitve LDAP server (Windows)" => "LDAP server nerozlišuje veľkosť znakov (Windows)", "Turn off SSL certificate validation." => "Vypnúť overovanie SSL certifikátu.", +"Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "Neodporúčané, použite iba pri testovaní! Pokiaľ spojenie funguje iba z daným nastavením, importujte SSL certifikát LDAP servera do vášho %s servera.", "Cache Time-To-Live" => "Životnosť objektov v cache", "in seconds. A change empties the cache." => "v sekundách. Zmena vyprázdni vyrovnávaciu pamäť.", "Directory Settings" => "Nastavenie priečinka", diff --git a/apps/user_ldap/l10n/sv.php b/apps/user_ldap/l10n/sv.php index c7fb33195d..3288438c09 100644 --- a/apps/user_ldap/l10n/sv.php +++ b/apps/user_ldap/l10n/sv.php @@ -30,8 +30,11 @@ $TRANSLATIONS = array( "Password" => "Lösenord", "For anonymous access, leave DN and Password empty." => "För anonym åtkomst, lämna DN och lösenord tomt.", "User Login Filter" => "Filter logga in användare", +"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" => "Definierar filter som tillämpas vid inloggning. %%uid ersätter användarnamn vid inloggningen. Exempel: \"uid=%%uid\"", "User List Filter" => "Filter lista användare", +"Defines the filter to apply, when retrieving users (no placeholders). Example: \"objectClass=person\"" => "Definierar filter som tillämpas vid sökning efter användare (inga platshållare). Exempel: \"objectClass=person\"", "Group Filter" => "Gruppfilter", +"Defines the filter to apply, when retrieving groups (no placeholders). Example: \"objectClass=posixGroup\"" => "Definierar filter som tillämpas vid sökning efter grupper (inga platshållare). Exempel: \"objectClass=posixGroup\"", "Connection Settings" => "Uppkopplingsinställningar", "Configuration Active" => "Konfiguration aktiv", "When unchecked, this configuration will be skipped." => "Ifall denna är avbockad så kommer konfigurationen att skippas.", @@ -45,6 +48,7 @@ $TRANSLATIONS = array( "Do not use it additionally for LDAPS connections, it will fail." => "Använd inte för LDAPS-anslutningar, det kommer inte att fungera.", "Case insensitve LDAP server (Windows)" => "LDAP-servern är okänslig för gemener och versaler (Windows)", "Turn off SSL certificate validation." => "Stäng av verifiering av SSL-certifikat.", +"Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "Rekommenderas inte, använd endast för test! Om anslutningen bara fungerar med denna inställning behöver du importera LDAP-serverns SSL-certifikat till din %s server.", "Cache Time-To-Live" => "Cache Time-To-Live", "in seconds. A change empties the cache." => "i sekunder. En förändring tömmer cache.", "Directory Settings" => "Mappinställningar", diff --git a/apps/user_ldap/l10n/zh_CN.GB2312.php b/apps/user_ldap/l10n/zh_CN.GB2312.php deleted file mode 100644 index 306b84a588..0000000000 --- a/apps/user_ldap/l10n/zh_CN.GB2312.php +++ /dev/null @@ -1,31 +0,0 @@ - "删除失败", -"Success" => "成功", -"Error" => "出错", -"Host" => "主机", -"You can omit the protocol, except you require SSL. Then start with ldaps://" => "您可以忽略协议，除非您需要 SSL。然后用 ldaps:// 开头", -"Base DN" => "基本判别名", -"You can specify Base DN for users and groups in the Advanced tab" => "您可以在高级选项卡中为用户和群组指定基本判别名", -"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." => "客户机用户的判别名，将用于绑定，例如 uid=agent, dc=example, dc=com。匿名访问请留空判别名和密码。", -"Password" => "密码", -"For anonymous access, leave DN and Password empty." => "匿名访问请留空判别名和密码。", -"User Login Filter" => "用户登录过滤器", -"User List Filter" => "用户列表过滤器", -"Group Filter" => "群组过滤器", -"Port" => "端口", -"Use TLS" => "使用 TLS", -"Case insensitve LDAP server (Windows)" => "大小写不敏感的 LDAP 服务器 (Windows)", -"Turn off SSL certificate validation." => "关闭 SSL 证书校验。", -"in seconds. A change empties the cache." => "以秒计。修改会清空缓存。", -"User Display Name Field" => "用户显示名称字段", -"Base User Tree" => "基本用户树", -"Group Display Name Field" => "群组显示名称字段", -"Base Group Tree" => "基本群组树", -"Group-Member association" => "群组-成员组合", -"in bytes" => "以字节计", -"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "用户名请留空 (默认)。否则，请指定一个 LDAP/AD 属性。", -"Help" => "帮助" -); -$PLURAL_FORMS = "nplurals=1; plural=0;"; diff --git a/apps/user_ldap/l10n/zh_TW.php b/apps/user_ldap/l10n/zh_TW.php index 38bed89574..2cc1ac9933 100644 --- a/apps/user_ldap/l10n/zh_TW.php +++ b/apps/user_ldap/l10n/zh_TW.php @@ -3,56 +3,59 @@ $TRANSLATIONS = array( "Failed to clear the mappings." => "清除映射失敗", "Failed to delete the server configuration" => "刪除伺服器設定時失敗", "The configuration is valid and the connection could be established!" => "設定有效且連線可建立", -"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "設定有效但連線無法建立。請檢查伺服器的設定與認證資料。", -"The configuration is invalid. Please look in the ownCloud log for further details." => "設定無效。更多細節請參閱ownCloud的記錄檔。", +"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "設定有效但連線無法建立，請檢查伺服器設定與認證資料。", +"The configuration is invalid. Please look in the ownCloud log for further details." => "設定無效，更多細節請參閱 ownCloud 的記錄檔。", "Deletion failed" => "移除失敗", -"Take over settings from recent server configuration?" => "要使用最近一次的伺服器設定嗎?", -"Keep settings?" => "維持設定嗎?", +"Take over settings from recent server configuration?" => "要使用最近一次的伺服器設定嗎？", +"Keep settings?" => "維持設定嗎？", "Cannot add server configuration" => "無法新增伺服器設定", "mappings cleared" => "映射已清除", "Success" => "成功", "Error" => "錯誤", "Connection test succeeded" => "連線測試成功", "Connection test failed" => "連線測試失敗", -"Do you really want to delete the current Server Configuration?" => "您真的確定要刪除現在的伺服器設定嗎?", -"Confirm Deletion" => "確認已刪除", -"Warning: The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "警告:沒有安裝 PHP LDAP 模組，後端系統將無法運作。請要求您的系統管理員安裝模組。", +"Do you really want to delete the current Server Configuration?" => "您真的要刪除現在的伺服器設定嗎？", +"Confirm Deletion" => "確認刪除", +"Warning: The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "警告：沒有安裝 PHP LDAP 模組，後端系統將無法運作，請要求您的系統管理員安裝模組。", "Server configuration" => "伺服器設定", "Add Server Configuration" => "新增伺服器設定", "Host" => "主機", -"You can omit the protocol, except you require SSL. Then start with ldaps://" => "若您不需要SSL加密傳輸則可忽略通訊協定。若非如此請從ldaps://開始", -"One Base DN per line" => "一行一個Base DN", -"You can specify Base DN for users and groups in the Advanced tab" => "您可以在進階標籤頁裡面指定使用者及群組的Base DN", +"You can omit the protocol, except you require SSL. Then start with ldaps://" => "若您不需要 SSL 加密連線則不需輸入通訊協定，反之請輸入 ldaps://", +"Base DN" => "Base DN", +"One Base DN per line" => "一行一個 Base DN", +"You can specify Base DN for users and groups in the Advanced tab" => "您可以在進階標籤頁裡面指定使用者及群組的 Base DN", +"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與特定字詞的連結需要完善，例如:uid=agent,dc=example,dc=com。若是匿名連接，則將DN與密碼欄位留白。", "Password" => "密碼", -"For anonymous access, leave DN and Password empty." => "匿名連接時請將DN與密碼欄位留白", -"User Login Filter" => "使用者登入過濾器", -"User List Filter" => "使用者名單篩選器", -"Group Filter" => "群組篩選器", +"For anonymous access, leave DN and Password empty." => "匿名連接時請將 DN 與密碼欄位留白", +"User Login Filter" => "User Login Filter", +"User List Filter" => "User List Filter", +"Group Filter" => "Group Filter", "Connection Settings" => "連線設定", -"Configuration Active" => "設定為主動模式", +"Configuration Active" => "設定使用中", "When unchecked, this configuration will be skipped." => "沒有被勾選時，此設定會被略過。", -"Port" => "連接阜", +"Port" => "連接埠", "Backup (Replica) Host" => "備用主機", -"Give an optional backup host. It must be a replica of the main LDAP/AD server." => "請給定一個可選的備用主機。必須是LDAP/AD中央伺服器的複本。", -"Backup (Replica) Port" => "備用(複本)連接阜", +"Give an optional backup host. It must be a replica of the main LDAP/AD server." => "可以選擇性設定備用主機，必須是 LDAP/AD 中央伺服器的複本。", +"Backup (Replica) Port" => "備用（複本）連接埠", "Disable Main Server" => "停用主伺服器", -"Use TLS" => "使用TLS", -"Case insensitve LDAP server (Windows)" => "不區分大小寫的LDAP伺服器(Windows)", -"Turn off SSL certificate validation." => "關閉 SSL 憑證驗證", +"Use TLS" => "使用 TLS", +"Do not use it additionally for LDAPS connections, it will fail." => "不要同時與 LDAPS 使用，會有問題。", +"Case insensitve LDAP server (Windows)" => "不區分大小寫的 LDAP 伺服器 (Windows)", +"Turn off SSL certificate validation." => "關閉 SSL 憑證檢查", "Cache Time-To-Live" => "快取的存活時間", -"in seconds. A change empties the cache." => "以秒為單位。更變後會清空快取。", -"Directory Settings" => "目錄選項", -"User Display Name Field" => "使用者名稱欄位", -"Base User Tree" => "Base使用者數", -"One User Base DN per line" => "一行一個使用者Base DN", -"User Search Attributes" => "使用者搜索屬性", -"Optional; one attribute per line" => "可選的; 一行一項屬性", +"in seconds. A change empties the cache." => "以秒為單位。變更後會清空快取。", +"Directory Settings" => "目錄設定", +"User Display Name Field" => "使用者顯示名稱欄位", +"Base User Tree" => "Base User Tree", +"One User Base DN per line" => "一行一個使用者 Base DN", +"User Search Attributes" => "User Search Attributes", +"Optional; one attribute per line" => "非必要，一行一項屬性", "Group Display Name Field" => "群組顯示名稱欄位", -"Base Group Tree" => "Base群組樹", -"One Group Base DN per line" => "一行一個群組Base DN", -"Group Search Attributes" => "群組搜索屬性", -"Group-Member association" => "群組成員的關係", +"Base Group Tree" => "Base Group Tree", +"One Group Base DN per line" => "一行一個 Group Base DN", +"Group Search Attributes" => "Group Search Attributes", +"Group-Member association" => "Group-Member association", "Special Attributes" => "特殊屬性", "Quota Field" => "配額欄位", "Quota Default" => "預設配額", diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php index 6f6b8d0f01..52aa39012f 100644 --- a/apps/user_ldap/lib/access.php +++ b/apps/user_ldap/lib/access.php @@ -991,7 +991,7 @@ abstract class Access { * internally we store them for usage in LDAP filters */ private function DNasBaseParameter($dn) { - return str_replace('\\5c', '\\', $dn); + return str_ireplace('\\5c', '\\', $dn); } /** diff --git a/apps/user_webdavauth/l10n/zh_CN.php b/apps/user_webdavauth/l10n/zh_CN.php index 6904604216..a225ea7f57 100644 --- a/apps/user_webdavauth/l10n/zh_CN.php +++ b/apps/user_webdavauth/l10n/zh_CN.php @@ -1,5 +1,7 @@ "WebDAV 认证" +"WebDAV Authentication" => "WebDAV 认证", +"Address: " => "地址：", +"The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "用户的身份将会被发送到此 URL。这个插件检查返回值并且将 HTTP 状态编码 401 和 403 解释为非法身份，其他所有返回值为合法身份。" ); $PLURAL_FORMS = "nplurals=1; plural=0;"; diff --git a/config/config.sample.php b/config/config.sample.php index 24ba541ac5..f5cb33732f 100644 --- a/config/config.sample.php +++ b/config/config.sample.php @@ -141,10 +141,22 @@ $CONFIG = array( /* Loglevel to start logging at. 0=DEBUG, 1=INFO, 2=WARN, 3=ERROR (default is WARN) */ "loglevel" => "", +/* date format to be used while writing to the owncloud logfile */ +'logdateformat' => 'F d, Y H:i:s', + /* Append all database queries and parameters to the log file. (watch out, this option can increase the size of your log file)*/ "log_query" => false, +/* + * Configure the size in bytes log rotation should happen, 0 or false disables the rotation. + * This rotates the current owncloud logfile to a new name, this way the total log usage + * will stay limited and older entries are available for a while longer. The + * total disk usage is twice the configured size. + * WARNING: When you use this, the log entries will eventually be lost. + */ +'log_rotate_size' => false, // 104857600, // 100 MiB + /* Lifetime of the remember login cookie, default is 15 days */ "remember_login_cookie_lifetime" => 60*60*24*15, @@ -189,7 +201,4 @@ $CONFIG = array( 'customclient_desktop' => '', //http://owncloud.org/sync-clients/ 'customclient_android' => '', //https://play.google.com/store/apps/details?id=com.owncloud.android 'customclient_ios' => '', //https://itunes.apple.com/us/app/owncloud/id543672169?mt=8 - -// date format to be used while writing to the owncloud logfile -'logdateformat' => 'F d, Y H:i:s' ); diff --git a/console.php b/console.php index 4aec5bdc24..fbe09d9bb6 100644 --- a/console.php +++ b/console.php @@ -1,3 +1,4 @@ + @@ -20,17 +21,32 @@ if (!OC::$CLI) { exit(0); } +$self = basename($argv[0]); if ($argc <= 1) { - echo "Usage:" . PHP_EOL; - echo " " . basename($argv[0]) . " " . PHP_EOL; - exit(0); + $argv[1] = "help"; } $command = $argv[1]; array_shift($argv); -if ($command === 'files:scan') { - require_once 'apps/files/console/scan.php'; -} else { - echo "Unknown command '$command'" . PHP_EOL; +switch ($command) { + case 'files:scan': + require_once 'apps/files/console/scan.php'; + break; + case 'status': + require_once 'status.php'; + break; + case 'help': + echo "Usage:" . PHP_EOL; + echo " " . $self . " " . PHP_EOL; + echo PHP_EOL; + echo "Available commands:" . PHP_EOL; + echo " files:scan -> rescan filesystem" .PHP_EOL; + echo " status -> show some status information" .PHP_EOL; + echo " help -> show this help screen" .PHP_EOL; + break; + default: + echo "Unknown command '$command'" . PHP_EOL; + echo "For available commands type ". $self . " help" . PHP_EOL; + break; } diff --git a/core/ajax/share.php b/core/ajax/share.php index bdcb61284e..648f0a71bd 100644 --- a/core/ajax/share.php +++ b/core/ajax/share.php @@ -181,10 +181,10 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo // } // } // } + $groups = OC_Group::getGroups($_GET['search']); if ($sharePolicy == 'groups_only') { - $groups = OC_Group::getUserGroups(OC_User::getUser()); - } else { - $groups = OC_Group::getGroups(); + $usergroups = OC_Group::getUserGroups(OC_User::getUser()); + $groups = array_intersect($groups, $usergroups); } $count = 0; $users = array(); @@ -213,15 +213,18 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo } } $count = 0; + + // enable l10n support + $l = OC_L10N::get('core'); + foreach ($groups as $group) { if ($count < 15) { - if (stripos($group, $_GET['search']) !== false - && (!isset($_GET['itemShares']) + if (!isset($_GET['itemShares']) || !isset($_GET['itemShares'][OCP\Share::SHARE_TYPE_GROUP]) || !is_array($_GET['itemShares'][OCP\Share::SHARE_TYPE_GROUP]) - || !in_array($group, $_GET['itemShares'][OCP\Share::SHARE_TYPE_GROUP]))) { + || !in_array($group, $_GET['itemShares'][OCP\Share::SHARE_TYPE_GROUP])) { $shareWith[] = array( - 'label' => $group.' (group)', + 'label' => $group.' ('.$l->t('group').')', 'value' => array( 'shareType' => OCP\Share::SHARE_TYPE_GROUP, 'shareWith' => $group diff --git a/core/ajax/update.php b/core/ajax/update.php index 43ed75b07f..d6af84e95b 100644 --- a/core/ajax/update.php +++ b/core/ajax/update.php @@ -4,25 +4,26 @@ $RUNTIME_NOAPPS = true; require_once '../../lib/base.php'; if (OC::checkUpgrade(false)) { + $l = new \OC_L10N('core'); $eventSource = new OC_EventSource(); $updater = new \OC\Updater(\OC_Log::$object); - $updater->listen('\OC\Updater', 'maintenanceStart', function () use ($eventSource) { - $eventSource->send('success', 'Turned on maintenance mode'); + $updater->listen('\OC\Updater', 'maintenanceStart', function () use ($eventSource, $l) { + $eventSource->send('success', (string)$l->t('Turned on maintenance mode')); }); - $updater->listen('\OC\Updater', 'maintenanceEnd', function () use ($eventSource) { - $eventSource->send('success', 'Turned off maintenance mode'); + $updater->listen('\OC\Updater', 'maintenanceEnd', function () use ($eventSource, $l) { + $eventSource->send('success', (string)$l->t('Turned off maintenance mode')); }); - $updater->listen('\OC\Updater', 'dbUpgrade', function () use ($eventSource) { - $eventSource->send('success', 'Updated database'); + $updater->listen('\OC\Updater', 'dbUpgrade', function () use ($eventSource, $l) { + $eventSource->send('success', (string)$l->t('Updated database')); }); - $updater->listen('\OC\Updater', 'filecacheStart', function () use ($eventSource) { - $eventSource->send('success', 'Updating filecache, this may take really long...'); + $updater->listen('\OC\Updater', 'filecacheStart', function () use ($eventSource, $l) { + $eventSource->send('success', (string)$l->t('Updating filecache, this may take really long...')); }); - $updater->listen('\OC\Updater', 'filecacheDone', function () use ($eventSource) { - $eventSource->send('success', 'Updated filecache'); + $updater->listen('\OC\Updater', 'filecacheDone', function () use ($eventSource, $l) { + $eventSource->send('success', (string)$l->t('Updated filecache')); }); - $updater->listen('\OC\Updater', 'filecacheProgress', function ($out) use ($eventSource) { - $eventSource->send('success', '... ' . $out . '% done ...'); + $updater->listen('\OC\Updater', 'filecacheProgress', function ($out) use ($eventSource, $l) { + $eventSource->send('success', (string)$l->t('... %d%% done ...', array('percent' => $out))); }); $updater->listen('\OC\Updater', 'failure', function ($message) use ($eventSource) { $eventSource->send('failure', $message); diff --git a/core/css/apps.css b/core/css/apps.css new file mode 100644 index 0000000000..445a3b9b59 --- /dev/null +++ b/core/css/apps.css @@ -0,0 +1,236 @@ +/* ---- APP STYLING ---- */ + +#app { + height: 100%; + width: 100%; +} +#app * { + -moz-box-sizing: border-box; box-sizing: border-box; +} + +/* Navigation: folder like structure */ +#app-navigation { + width: 300px; + height: 100%; + float: left; + -moz-box-sizing: border-box; box-sizing: border-box; + background-color: #f8f8f8; + border-right: 1px solid #ccc; +} +#app-navigation > ul { + height: 100%; + overflow: auto; + -moz-box-sizing: border-box; box-sizing: border-box; +} +#app-navigation li { + position: relative; + width: 100%; + -moz-box-sizing: border-box; box-sizing: border-box; + text-shadow: 0 1px 0 rgba(255,255,255,.9); +} +#app-navigation .active, +#app-navigation .active a, +#app-navigation li:hover > a { + background-color: #ddd; + text-shadow: 0 1px 0 rgba(255,255,255,.7); +} + +/* special rules for first-level entries and folders */ +#app-navigation > ul > li { + background-color: #f8f8f8; +} + +#app-navigation .with-icon a { + padding-left: 44px; + background-size: 16px 16px; + background-position: 14px center; + background-repeat: no-repeat; +} + +#app-navigation li > a { + display: block; + width: 100%; + height: 44px; + padding: 12px; + overflow: hidden; + -moz-box-sizing: border-box; box-sizing: border-box; + white-space: nowrap; + text-overflow: ellipsis; + color: #333; +} + +#app-navigation .collapse { + display: none; /* hide collapse button intially */ +} +#app-navigation .collapsible > .collapse { + position: absolute; + height: 44px; + width: 44px; + margin: 0; + padding: 0; + background: none; background-image: url('../img/actions/triangle-s.svg'); + background-size: 16px; background-repeat: no-repeat; background-position: center; + border: none; + border-radius: 0; + outline: none !important; + box-shadow: none; +} +#app-navigation .collapsible:hover > a { + background-image: none; +} +#app-navigation .collapsible:hover > .collapse { + display: block; +} + +#app-navigation .collapsible .collapse { + -moz-transform: rotate(-90deg); + -webkit-transform: rotate(-90deg); + -ms-transform:rotate(-90deg); + -o-transform:rotate(-90deg); + transform: rotate(-90deg); +} +#app-navigation .collapsible.open .collapse { + -moz-transform: rotate(0); + -webkit-transform: rotate(0); + -ms-transform:rotate(0); + -o-transform:rotate(0); + transform: rotate(0); +} + +/* Second level nesting for lists */ +#app-navigation > ul ul { + display: none; +} +#app-navigation > ul ul li > a { + padding-left: 32px; +} +#app-navigation > .with-icon ul li > a { + padding-left: 48px; + background-position: 24px center; +} + +#app-navigation .open { + background-image: linear-gradient(top, rgb(238,238,238) 0%, rgb(245,245,245) 100%); + background-image: -o-linear-gradient(top, rgb(238,238,238) 0%, rgb(245,245,245) 100%); + background-image: -moz-linear-gradient(top, rgb(238,238,238) 0%, rgb(245,245,245) 100%); + background-image: -webkit-linear-gradient(top, rgb(238,238,238) 0%, rgb(245,245,245) 100%); + background-image: -ms-linear-gradient(top, rgb(238,238,238) 0%, rgb(245,245,245) 100%); +} + +#app-navigation > ul .open:hover { + -moz-box-shadow: inset 0 0 3px #ccc; -webkit-box-shadow: inset 0 0 3px #ccc; box-shadow: inset 0 0 3px #ccc; +} + +#app-navigation > ul .open ul { + display: block; +} + + +/* counter and actions */ +#app-navigation .utils { + position: absolute; + right: 0; + top: 0; + bottom: 0; + font-size: 12px; +} + #app-navigation .utils button, + #app-navigation .utils .counter { + width: 44px; + height: 44px; + padding-top: 12px; + } + + +/* drag and drop */ +#app-navigation .drag-and-drop { + -moz-transition: padding-bottom 500ms ease 0s; + -o-transition: padding-bottom 500ms ease 0s; + -webkit-transition: padding-bottom 500ms ease 0s; + -ms-transition: padding-bottom 500ms ease 0s; + transition: padding-bottom 500ms ease 0s; + padding-bottom: 40px; +} +#app-navigation .personalblock > legend { /* TODO @Raydiation: still needed? */ + padding: 10px 0; margin: 0; +} +#app-navigation .error { + color: #dd1144; +} + +#app-navigation .app-navigation-separator { + border-bottom: 1px solid #ddd; +} + + + +/* Part where the content will be loaded into */ +#app-content { + height: 100%; + overflow-y: auto; +} + +/* settings area */ +#app-settings { + position: fixed; + width: 299px; + bottom: 0; + border-top: 1px solid #ccc; +} +#app-settings-header { + background-color: #eee; +} +#app-settings-content { + display: none; + padding: 10px; + background-color: #eee; +} +#app-settings.open #app-settings-content { + display: block; +} + +.settings-button { + display: block; + height: 32px; + width: 100%; + padding: 0; + margin: 0; + background-color: transparent; background-image: url('../img/actions/settings.svg'); + background-position: 10px center; background-repeat: no-repeat; + box-shadow: none; + border: 0; + border-radius: 0; +} +.settings-button:hover { + background-color: #ddd; +} + +/* icons */ +.folder-icon, .delete-icon, .edit-icon, .progress-icon { + background-repeat: no-repeat; + background-position: center; +} +.folder-icon { background-image: url('../img/places/folder.svg'); } +.delete-icon { background-image: url('../img/actions/delete.svg'); } +.delete-icon:hover, .delete-icon:focus { + background-image: url('../img/actions/delete-hover.svg'); +} +.edit-icon { background-image: url('../img/actions/rename.svg'); } +.progress-icon { + background-image: url('../img/loading.gif'); + background-size: 16px; + /* force show the loading icon, not only on hover */ + -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; + filter:alpha(opacity=100); + opacity: 1 !important; + display: inline !important; +} + +/* buttons */ +button.loading { + background-image: url('../img/loading.gif'); + background-position: right 10px center; background-repeat: no-repeat; + background-size: 16px; + padding-right: 30px; +} + diff --git a/core/css/fixes.css b/core/css/fixes.css new file mode 100644 index 0000000000..3df60ad5b5 --- /dev/null +++ b/core/css/fixes.css @@ -0,0 +1,46 @@ +/* ---- BROWSER-SPECIFIC FIXES ---- */ + +/* remove dotted outlines in Firefox */ +::-moz-focus-inner { + border: 0; +} + +.lte8 .delete-icon { background-image: url('../img/actions/delete.png'); } +.lte8 .delete-icon:hover, .delete-icon:focus { + background-image: url('../img/actions/delete-hover.png'); +} + +/* IE8 needs background to be set to same color to make transparency look good. */ +.lte9 #body-login form input[type="text"] { + border: 1px solid lightgrey; /* use border to add 1px line between input fields */ + background-color: white; /* don't change background on hover */ +} +.lte9 #body-login form input[type="password"] { + /* leave out top border for 1px line between input fields*/ + border-left: 1px solid lightgrey; + border-right: 1px solid lightgrey; + border-bottom: 1px solid lightgrey; + background-color: white; /* don't change background on hover */ +} +.lte9 #body-login form label.infield { + background-color: white; /* don't change background on hover */ + -ms-filter: "progid:DXImageTransform.Microsoft.Chroma(color='white')"; +} + +/* disable opacity of info text on gradient + since we cannot set a good backround color to use the filter&background hack as with the input labels */ +.lte9 #body-login p.info { + filter: initial; +} + +/* deactivate show password toggle for IE. Does not work for 8 and 9+ have their own implementation. */ +.ie #show, .ie #show+label { + display: none; + visibility: hidden; +} + +/* fix installation screen rendering issue for IE8+9 */ +.lte9 #body-login { + height: auto !important; +} + diff --git a/core/css/styles.css b/core/css/styles.css index dee0778afb..34e8e8ae41 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -255,9 +255,9 @@ input[name="adminpass-clone"] { padding-left:1.8em; width:11.7em !important; } #body-login input[type="password"], #body-login input[type="email"] { border: 1px solid #323233; - -moz-box-shadow: 0 1px 0 rgba(255,255,255,.15), 0 1px 3px rgba(0,0,0,.25) inset; - -webkit-box-shadow: 0 1px 0 rgba(255,255,255,.15), 0 1px 3px rgba(0,0,0,.25) inset; - box-shadow: 0 1px 0 rgba(255,255,255,.15), 0 1px 3px rgba(0,0,0,.25) inset; + -moz-box-shadow: 0 1px 0 rgba(255,255,255,.15), 0 1px 1px rgba(0,0,0,.25) inset; + -webkit-box-shadow: 0 1px 0 rgba(255,255,255,.15), 0 1px 1px rgba(0,0,0,.25) inset; + box-shadow: 0 1px 0 rgba(255,255,255,.15), 0 1px 1px rgba(0,0,0,.25) inset; } /* Nicely grouping input field sets */ @@ -501,6 +501,9 @@ label.infield { cursor:text !important; top:1.05em; left:.85em; } #navigation:hover { overflow-y: auto; /* show scrollbar only on hover */ } +#apps { + height: 100%; +} #navigation a span { display: block; text-decoration: none; @@ -545,9 +548,24 @@ label.infield { cursor:text !important; top:1.05em; left:.85em; } padding-top: 20px; } +/* Apps management as sticky footer, less obtrusive in the list */ +#navigation .wrapper { + min-height: 100%; + margin: 0 auto -72px; +} +#apps-management, #navigation .push { + height: 70px; +} #apps-management { + -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=60)"; + filter: alpha(opacity=60); opacity: .6; } +#apps-management .icon { + padding-bottom: 0; +} + + /* USER MENU */ @@ -709,286 +727,3 @@ div.crumb:active { opacity:.7; } - - -/* ---- APP STYLING ---- */ -#app { - height: 100%; - width: 100%; -} -#app * { - -moz-box-sizing: border-box; box-sizing: border-box; -} - -/* Navigation: folder like structure */ -#app-navigation { - width: 300px; - height: 100%; - float: left; - -moz-box-sizing: border-box; box-sizing: border-box; - background-color: #f8f8f8; - border-right: 1px solid #ccc; -} -#app-navigation > ul { - height: 100%; - overflow: auto; - -moz-box-sizing: border-box; box-sizing: border-box; -} -#app-navigation li { - position: relative; - width: 100%; - -moz-box-sizing: border-box; box-sizing: border-box; - text-shadow: 0 1px 0 rgba(255,255,255,.9); -} -#app-navigation .active, -#app-navigation .active a, -#app-navigation li:hover > a { - background-color: #ddd; - text-shadow: 0 1px 0 rgba(255,255,255,.7); -} - -/* special rules for first-level entries and folders */ -#app-navigation > ul > li { - background-color: #f8f8f8; -} - -#app-navigation .with-icon a { - padding-left: 44px; - background-size: 16px 16px; - background-position: 14px center; - background-repeat: no-repeat; -} - -#app-navigation li > a { - display: block; - width: 100%; - height: 44px; - padding: 12px; - overflow: hidden; - -moz-box-sizing: border-box; box-sizing: border-box; - white-space: nowrap; - text-overflow: ellipsis; - color: #333; -} - -#app-navigation .collapse { - display: none; /* hide collapse button intially */ -} -#app-navigation .collapsible > .collapse { - position: absolute; - height: 44px; - width: 44px; - margin: 0; - padding: 0; - background: none; background-image: url('../img/actions/triangle-s.svg'); - background-size: 16px; background-repeat: no-repeat; background-position: center; - border: none; - border-radius: 0; - outline: none !important; - box-shadow: none; -} -#app-navigation .collapsible:hover > a { - background-image: none; -} -#app-navigation .collapsible:hover > .collapse { - display: block; -} - -#app-navigation .collapsible .collapse { - -moz-transform: rotate(-90deg); - -webkit-transform: rotate(-90deg); - -ms-transform:rotate(-90deg); - -o-transform:rotate(-90deg); - transform: rotate(-90deg); -} -#app-navigation .collapsible.open .collapse { - -moz-transform: rotate(0); - -webkit-transform: rotate(0); - -ms-transform:rotate(0); - -o-transform:rotate(0); - transform: rotate(0); -} - -/* Second level nesting for lists */ -#app-navigation > ul ul { - display: none; -} -#app-navigation > ul ul li > a { - padding-left: 32px; -} -#app-navigation > .with-icon ul li > a { - padding-left: 48px; - background-position: 24px center; -} - -#app-navigation .open { - background-image: linear-gradient(top, rgb(238,238,238) 0%, rgb(245,245,245) 100%); - background-image: -o-linear-gradient(top, rgb(238,238,238) 0%, rgb(245,245,245) 100%); - background-image: -moz-linear-gradient(top, rgb(238,238,238) 0%, rgb(245,245,245) 100%); - background-image: -webkit-linear-gradient(top, rgb(238,238,238) 0%, rgb(245,245,245) 100%); - background-image: -ms-linear-gradient(top, rgb(238,238,238) 0%, rgb(245,245,245) 100%); -} - -#app-navigation > ul .open:hover { - -moz-box-shadow: inset 0 0 3px #ccc; -webkit-box-shadow: inset 0 0 3px #ccc; box-shadow: inset 0 0 3px #ccc; -} - -#app-navigation > ul .open ul { - display: block; -} - - -/* counter and actions */ -#app-navigation .utils { - position: absolute; - right: 0; - top: 0; - bottom: 0; - font-size: 12px; -} - #app-navigation .utils button, - #app-navigation .utils .counter { - width: 44px; - height: 44px; - padding-top: 12px; - } - - -/* drag and drop */ -#app-navigation .drag-and-drop { - -moz-transition: padding-bottom 500ms ease 0s; - -o-transition: padding-bottom 500ms ease 0s; - -webkit-transition: padding-bottom 500ms ease 0s; - -ms-transition: padding-bottom 500ms ease 0s; - transition: padding-bottom 500ms ease 0s; - padding-bottom: 40px; -} -#app-navigation .personalblock > legend { /* TODO @Raydiation: still needed? */ - padding: 10px 0; margin: 0; -} -#app-navigation .error { - color: #dd1144; -} - -#app-navigation .app-navigation-separator { - border-bottom: 1px solid #ddd; -} - - - -/* Part where the content will be loaded into */ -#app-content { - height: 100%; - overflow-y: auto; -} - -/* settings area */ -#app-settings { - position: fixed; - width: 299px; - bottom: 0; - border-top: 1px solid #ccc; -} -#app-settings-header { - background-color: #eee; -} -#app-settings-content { - display: none; - padding: 10px; - background-color: #eee; -} -#app-settings.open #app-settings-content { - display: block; -} - -.settings-button { - display: block; - height: 32px; - width: 100%; - padding: 0; - margin: 0; - background-color: transparent; background-image: url('../img/actions/settings.svg'); - background-position: 10px center; background-repeat: no-repeat; - box-shadow: none; - border: 0; - border-radius: 0; -} -.settings-button:hover { - background-color: #ddd; -} - -/* icons */ -.folder-icon, .delete-icon, .edit-icon, .progress-icon { - background-repeat: no-repeat; - background-position: center; -} -.folder-icon { background-image: url('../img/places/folder.svg'); } -.delete-icon { background-image: url('../img/actions/delete.svg'); } -.delete-icon:hover, .delete-icon:focus { - background-image: url('../img/actions/delete-hover.svg'); -} -.edit-icon { background-image: url('../img/actions/rename.svg'); } -.progress-icon { - background-image: url('../img/loading.gif'); - background-size: 16px; - /* force show the loading icon, not only on hover */ - -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; - filter:alpha(opacity=100); - opacity: 1 !important; - display: inline !important; -} - -/* buttons */ -button.loading { - background-image: url('../img/loading.gif'); - background-position: right 10px center; background-repeat: no-repeat; - background-size: 16px; - padding-right: 30px; -} - - - - - -/* ---- BROWSER-SPECIFIC FIXES ---- */ - -/* remove dotted outlines in Firefox */ -::-moz-focus-inner { - border: 0; -} -.lte8 .delete-icon { background-image: url('../img/actions/delete.png'); } -.lte8 .delete-icon:hover, .delete-icon:focus { - background-image: url('../img/actions/delete-hover.png'); -} - -/* IE8 needs background to be set to same color to make transparency look good. */ -.lte9 #body-login form input[type="text"] { - border: 1px solid lightgrey; /* use border to add 1px line between input fields */ - background-color: white; /* don't change background on hover */ -} -.lte9 #body-login form input[type="password"] { - /* leave out top border for 1px line between input fields*/ - border-left: 1px solid lightgrey; - border-right: 1px solid lightgrey; - border-bottom: 1px solid lightgrey; - background-color: white; /* don't change background on hover */ -} -.lte9 #body-login form label.infield { - background-color: white; /* don't change background on hover */ - -ms-filter: "progid:DXImageTransform.Microsoft.Chroma(color='white')"; -} -/* disable opacity of info text on gradient - sice we cannot set a good backround color to use the filter&background hack as with the input labels */ -.lte9 #body-login p.info { - filter: initial; -} -/* deactivate show password toggle for IE. Does not work for 8 and 9+ have their own implementation. */ -.ie #show, .ie #show+label { - display: none; - visibility: hidden; -} - -/* fix installation screen rendering issue for IE8+9 */ -.lte9 #body-login { - height: auto !important; -} diff --git a/core/js/js.js b/core/js/js.js index d580b6113e..af4a6d6b33 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -709,7 +709,6 @@ $(document).ready(function(){ }); label.hide(); }; - setShowPassword($('#password'), $('label[for=show]')); setShowPassword($('#adminpass'), $('label[for=show]')); setShowPassword($('#pass2'), $('label[for=personal-show]')); setShowPassword($('#dbpass'), $('label[for=dbpassword]')); @@ -762,6 +761,7 @@ $(document).ready(function(){ $('.password .action').tipsy({gravity:'se', fade:true, live:true}); $('#upload').tipsy({gravity:'w', fade:true}); $('.selectedActions a').tipsy({gravity:'s', fade:true, live:true}); + $('a.action.delete').tipsy({gravity:'e', fade:true, live:true}); $('a.action').tipsy({gravity:'s', fade:true, live:true}); $('td .modified').tipsy({gravity:'s', fade:true, live:true}); diff --git a/core/js/octemplate.js b/core/js/octemplate.js index e69c6cc56e..46ffa97657 100644 --- a/core/js/octemplate.js +++ b/core/js/octemplate.js @@ -60,9 +60,10 @@ var self = this; if(typeof this.options.escapeFunction === 'function') { - for (var key = 0; key < this.vars.length; key++) { - if(typeof this.vars[key] === 'string') { - this.vars[key] = self.options.escapeFunction(this.vars[key]); + var keys = Object.keys(this.vars); + for (var key = 0; key < keys.length; key++) { + if(typeof this.vars[keys[key]] === 'string') { + this.vars[keys[key]] = self.options.escapeFunction(this.vars[keys[key]]); } } } @@ -85,7 +86,7 @@ } }, options: { - escapeFunction: function(str) {return $('').text(str).html();} + escapeFunction: escapeHTML } }; diff --git a/core/js/placeholder.js b/core/js/placeholder.js new file mode 100644 index 0000000000..16543541cb --- /dev/null +++ b/core/js/placeholder.js @@ -0,0 +1,65 @@ +/** + * ownCloud + * + * @author Morris Jobke + * @copyright 2013 Morris Jobke + * + * 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 . + * + */ + +/* + * Adds a background color to the element called on and adds the first character + * of the passed in string. This string is also the seed for the generation of + * the background color. + * + * You have following HTML: + * + *
+ * + * And call this from Javascript: + * + * $('#albumart').placeholder('The Album Title'); + * + * Which will result in: + * + *
T
+ * + */ + +(function ($) { + $.fn.placeholder = function(seed) { + var hash = md5(seed), + maxRange = parseInt('ffffffffff', 16), + red = parseInt(hash.substr(0,10), 16) / maxRange * 256, + green = parseInt(hash.substr(10,10), 16) / maxRange * 256, + blue = parseInt(hash.substr(20,10), 16) / maxRange * 256, + rgb = [Math.floor(red), Math.floor(green), Math.floor(blue)], + height = this.height(); + this.css('background-color', 'rgb(' + rgb.join(',') + ')'); + + // CSS rules + this.css('color', 'rgb(255, 255, 255)'); + this.css('font-weight', 'bold'); + this.css('text-align', 'center'); + + // calculate the height + this.css('line-height', height + 'px'); + this.css('font-size', (height * 0.55) + 'px'); + + if(seed !== null && seed.length) { + this.html(seed[0].toUpperCase()); + } + }; +}(jQuery)); diff --git a/core/l10n/ca.php b/core/l10n/ca.php index abff5bbbdb..c389ad0188 100644 --- a/core/l10n/ca.php +++ b/core/l10n/ca.php @@ -126,7 +126,6 @@ $TRANSLATIONS = array( "Finish setup" => "Acaba la configuració", "%s is available. Get more information on how to update." => "%s està disponible. Obtingueu més informació de com actualitzar.", "Log out" => "Surt", -"More apps" => "Més aplicacions", "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!", "Please change your password to secure your account again." => "Canvieu la contrasenya de nou per assegurar el vostre compte.", diff --git a/core/l10n/cs_CZ.php b/core/l10n/cs_CZ.php index 78614eef0e..d104a9fbe8 100644 --- a/core/l10n/cs_CZ.php +++ b/core/l10n/cs_CZ.php @@ -1,6 +1,12 @@ "%s s vámi sdílí »%s«", +"Turned on maintenance mode" => "Zapnut režim údržby", +"Turned off maintenance mode" => "Vypnut režim údržby", +"Updated database" => "Zaktualizována databáze", +"Updating filecache, this may take really long..." => "Aktualizuji souborovou mezipaměť, toto může trvat opravdu dlouho...", +"Updated filecache" => "Aktualizována souborová mezipaměť", +"... %d%% done ..." => "... %d%% dokončeno ...", "Category type not provided." => "Nezadán typ kategorie.", "No category to add?" => "Žádná kategorie k přidání?", "This category already exists: %s" => "Kategorie již existuje: %s", @@ -126,7 +132,6 @@ $TRANSLATIONS = array( "Finish setup" => "Dokončit nastavení", "%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", -"More apps" => "Více aplikací", "Automatic logon rejected!" => "Automatické přihlášení odmítnuto!", "If you did not change your password recently, your account may be compromised!" => "Pokud jste v nedávné době neměnili své heslo, Váš účet může být kompromitován!", "Please change your password to secure your account again." => "Změňte, prosím, své heslo pro opětovné zabezpečení Vašeho účtu.", diff --git a/core/l10n/da.php b/core/l10n/da.php index 79ccc20d49..5a1fe65f44 100644 --- a/core/l10n/da.php +++ b/core/l10n/da.php @@ -1,6 +1,12 @@ "%s delte »%s« med sig", +"Turned on maintenance mode" => "Startede vedligeholdelsestilstand", +"Turned off maintenance mode" => "standsede vedligeholdelsestilstand", +"Updated database" => "Opdaterede database", +"Updating filecache, this may take really long..." => "Opdatere filcache, dette kan tage rigtigt lang tid...", +"Updated filecache" => "Opdaterede filcache", +"... %d%% done ..." => "... %d%% færdig ...", "Category type not provided." => "Kategori typen ikke er fastsat.", "No category to add?" => "Ingen kategori at tilføje?", "This category already exists: %s" => "Kategorien eksisterer allerede: %s", @@ -126,7 +132,6 @@ $TRANSLATIONS = array( "Finish setup" => "Afslut opsætning", "%s is available. Get more information on how to update." => "%s er tilgængelig. Få mere information om, hvordan du opdaterer.", "Log out" => "Log ud", -"More apps" => "Flere programmer", "Automatic logon rejected!" => "Automatisk login afvist!", "If you did not change your password recently, your account may be compromised!" => "Hvis du ikke har ændret din adgangskode for nylig, har nogen muligvis tiltvunget sig adgang til din konto!", "Please change your password to secure your account again." => "Skift adgangskode for at sikre din konto igen.", diff --git a/core/l10n/de.php b/core/l10n/de.php index 2fe2f56412..655305488f 100644 --- a/core/l10n/de.php +++ b/core/l10n/de.php @@ -1,6 +1,12 @@ "%s teilte »%s« mit Ihnen", +"Turned on maintenance mode" => "Wartungsmodus eingeschaltet", +"Turned off maintenance mode" => "Wartungsmodus ausgeschaltet", +"Updated database" => "Datenbank aktualisiert", +"Updating filecache, this may take really long..." => "Aktualisiere Dateicache, dies könnte eine Weile dauern...", +"Updated filecache" => "Dateicache aktualisiert", +"... %d%% done ..." => "... %d%% erledigt ...", "Category type not provided." => "Kategorie nicht angegeben.", "No category to add?" => "Keine Kategorie hinzuzufügen?", "This category already exists: %s" => "Die Kategorie '%s' existiert bereits.", @@ -126,7 +132,6 @@ $TRANSLATIONS = array( "Finish setup" => "Installation abschließen", "%s is available. Get more information on how to update." => "%s ist verfügbar. Holen Sie weitere Informationen zu Aktualisierungen ein.", "Log out" => "Abmelden", -"More apps" => "Mehr Apps", "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!", "Please change your password to secure your account again." => "Bitte ändere Dein Passwort, um Deinen Account wieder zu schützen.", diff --git a/core/l10n/de_AT.php b/core/l10n/de_AT.php index c0e3e80f0a..93c8e33f3e 100644 --- a/core/l10n/de_AT.php +++ b/core/l10n/de_AT.php @@ -3,7 +3,6 @@ $TRANSLATIONS = array( "_%n minute ago_::_%n minutes ago_" => array("",""), "_%n hour ago_::_%n hours ago_" => array("",""), "_%n day ago_::_%n days ago_" => array("",""), -"_%n month ago_::_%n months ago_" => array("",""), -"More apps" => "Mehr Apps" +"_%n month ago_::_%n months ago_" => array("","") ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/core/l10n/de_CH.php b/core/l10n/de_CH.php index 3e622ace6f..2dde9eb536 100644 --- a/core/l10n/de_CH.php +++ b/core/l10n/de_CH.php @@ -30,13 +30,13 @@ $TRANSLATIONS = array( "December" => "Dezember", "Settings" => "Einstellungen", "seconds ago" => "Gerade eben", -"_%n minute ago_::_%n minutes ago_" => array("",""), -"_%n hour ago_::_%n hours ago_" => array("",""), +"_%n minute ago_::_%n minutes ago_" => array("Vor %n Minute","Vor %n Minuten"), +"_%n hour ago_::_%n hours ago_" => array("Vor %n Stunde","Vor %n Stunden"), "today" => "Heute", "yesterday" => "Gestern", -"_%n day ago_::_%n days ago_" => array("",""), +"_%n day ago_::_%n days ago_" => array("Vor %n Tag","Vor %n Tagen"), "last month" => "Letzten Monat", -"_%n month ago_::_%n months ago_" => array("",""), +"_%n month ago_::_%n months ago_" => array("Vor %n Monat","Vor %n Monaten"), "months ago" => "Vor Monaten", "last year" => "Letztes Jahr", "years ago" => "Vor Jahren", @@ -83,6 +83,7 @@ $TRANSLATIONS = array( "Email sent" => "Email gesendet", "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.", +"%s password reset" => "%s-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?", @@ -125,7 +126,6 @@ $TRANSLATIONS = array( "Finish setup" => "Installation abschliessen", "%s is available. Get more information on how to update." => "%s ist verfügbar. Holen Sie weitere Informationen zu Aktualisierungen ein.", "Log out" => "Abmelden", -"More apps" => "Mehr Apps", "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.", diff --git a/core/l10n/de_DE.php b/core/l10n/de_DE.php index 60f5418727..1311a76d69 100644 --- a/core/l10n/de_DE.php +++ b/core/l10n/de_DE.php @@ -1,6 +1,12 @@ "%s geteilt »%s« mit Ihnen", +"Turned on maintenance mode" => "Wartungsmodus eingeschaltet ", +"Turned off maintenance mode" => "Wartungsmodus ausgeschaltet", +"Updated database" => "Datenbank aktualisiert", +"Updating filecache, this may take really long..." => "Aktualisiere Dateicache, dies könnte eine Weile dauern...", +"Updated filecache" => "Dateicache aktualisiert", +"... %d%% done ..." => "... %d%% erledigt ...", "Category type not provided." => "Kategorie nicht angegeben.", "No category to add?" => "Keine Kategorie hinzuzufügen?", "This category already exists: %s" => "Die nachfolgende Kategorie existiert bereits: %s", @@ -126,7 +132,6 @@ $TRANSLATIONS = array( "Finish setup" => "Installation abschließen", "%s is available. Get more information on how to update." => "%s ist verfügbar. Holen Sie weitere Informationen zu Aktualisierungen ein.", "Log out" => "Abmelden", -"More apps" => "Mehr Apps", "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.", diff --git a/core/l10n/en_GB.php b/core/l10n/en_GB.php new file mode 100644 index 0000000000..3a42872366 --- /dev/null +++ b/core/l10n/en_GB.php @@ -0,0 +1,146 @@ + "%s shared \"%s\" with you", +"group" => "group", +"Turned on maintenance mode" => "Turned on maintenance mode", +"Turned off maintenance mode" => "Turned off maintenance mode", +"Updated database" => "Updated database", +"Updating filecache, this may take really long..." => "Updating filecache, this may take a really long time...", +"Updated filecache" => "Updated filecache", +"... %d%% done ..." => "... %d%% done ...", +"Category type not provided." => "Category type not provided.", +"No category to add?" => "No category to add?", +"This category already exists: %s" => "This category already exists: %s", +"Object type not provided." => "Object type not provided.", +"%s ID not provided." => "%s ID not provided.", +"Error adding %s to favorites." => "Error adding %s to favourites.", +"No categories selected for deletion." => "No categories selected for deletion.", +"Error removing %s from favorites." => "Error removing %s from favourites.", +"Sunday" => "Sunday", +"Monday" => "Monday", +"Tuesday" => "Tuesday", +"Wednesday" => "Wednesday", +"Thursday" => "Thursday", +"Friday" => "Friday", +"Saturday" => "Saturday", +"January" => "January", +"February" => "February", +"March" => "March", +"April" => "April", +"May" => "May", +"June" => "June", +"July" => "July", +"August" => "August", +"September" => "September", +"October" => "October", +"November" => "November", +"December" => "December", +"Settings" => "Settings", +"seconds ago" => "seconds ago", +"_%n minute ago_::_%n minutes ago_" => array("%n minute ago","%n minutes ago"), +"_%n hour ago_::_%n hours ago_" => array("%n hour ago","%n hours ago"), +"today" => "today", +"yesterday" => "yesterday", +"_%n day ago_::_%n days ago_" => array("%n day ago","%n days ago"), +"last month" => "last month", +"_%n month ago_::_%n months ago_" => array("%n month ago","%n months ago"), +"months ago" => "months ago", +"last year" => "last year", +"years ago" => "years ago", +"Choose" => "Choose", +"Error loading file picker template" => "Error loading file picker template", +"Yes" => "Yes", +"No" => "No", +"Ok" => "OK", +"The object type is not specified." => "The object type is not specified.", +"Error" => "Error", +"The app name is not specified." => "The app name is not specified.", +"The required file {file} is not installed!" => "The required file {file} is not installed!", +"Shared" => "Shared", +"Share" => "Share", +"Error while sharing" => "Error whilst sharing", +"Error while unsharing" => "Error whilst unsharing", +"Error while changing permissions" => "Error whilst changing permissions", +"Shared with you and the group {group} by {owner}" => "Shared with you and the group {group} by {owner}", +"Shared with you by {owner}" => "Shared with you by {owner}", +"Share with" => "Share with", +"Share with link" => "Share with link", +"Password protect" => "Password protect", +"Password" => "Password", +"Allow Public Upload" => "Allow Public Upload", +"Email link to person" => "Email link to person", +"Send" => "Send", +"Set expiration date" => "Set expiration date", +"Expiration date" => "Expiration date", +"Share via email:" => "Share via email:", +"No people found" => "No people found", +"Resharing is not allowed" => "Resharing is not allowed", +"Shared in {item} with {user}" => "Shared in {item} with {user}", +"Unshare" => "Unshare", +"can edit" => "can edit", +"access control" => "access control", +"create" => "create", +"update" => "update", +"delete" => "delete", +"share" => "share", +"Password protected" => "Password protected", +"Error unsetting expiration date" => "Error unsetting expiration date", +"Error setting expiration date" => "Error setting expiration date", +"Sending ..." => "Sending ...", +"Email sent" => "Email sent", +"The update was unsuccessful. Please report this issue to the ownCloud community." => "The update was unsuccessful. Please report this issue to the ownCloud community.", +"The update was successful. Redirecting you to ownCloud now." => "The update was successful. Redirecting you to ownCloud now.", +"%s password reset" => "%s password reset", +"Use the following link to reset your password: {link}" => "Use the following link to reset your 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 ." => "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?" => "Request failed!
Did you make sure your email/username was correct?", +"You will receive a link to reset your password via Email." => "You will receive a link to reset your password via Email.", +"Username" => "Username", +"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?", +"Yes, I really want to reset my password now" => "Yes, I really want to reset my password now", +"Request reset" => "Request reset", +"Your password was reset" => "Your password was reset", +"To login page" => "To login page", +"New password" => "New password", +"Reset password" => "Reset password", +"Personal" => "Personal", +"Users" => "Users", +"Apps" => "Apps", +"Admin" => "Admin", +"Help" => "Help", +"Access forbidden" => "Access denied", +"Cloud not found" => "Cloud not found", +"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!", +"Edit categories" => "Edit categories", +"Add" => "Add", +"Security Warning" => "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 %s securely." => "Please update your PHP installation to use %s securely.", +"No secure random number generator is available, please enable the PHP OpenSSL extension." => "No secure random number generator is available, please enable the PHP OpenSSL extension.", +"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." => "Your data directory and files are probably accessible from the internet because the .htaccess file does not work.", +"For information how to properly configure your server, please see the documentation." => "For information how to properly configure your server, please see the documentation.", +"Create an admin account" => "Create an admin account", +"Advanced" => "Advanced", +"Data folder" => "Data folder", +"Configure the database" => "Configure the database", +"will be used" => "will be used", +"Database user" => "Database user", +"Database password" => "Database password", +"Database name" => "Database name", +"Database tablespace" => "Database tablespace", +"Database host" => "Database host", +"Finish setup" => "Finish setup", +"%s is available. Get more information on how to update." => "%s is available. Get more information on how to update.", +"Log out" => "Log out", +"Automatic logon rejected!" => "Automatic logon rejected!", +"If you did not change your password recently, your account may be compromised!" => "If you did not change your password recently, your account may be compromised!", +"Please change your password to secure your account again." => "Please change your password to secure your account again.", +"Lost your password?" => "Lost your password?", +"remember" => "remember", +"Log in" => "Log in", +"Alternative Logins" => "Alternative Logins", +"Hey there,

just letting you know that %s shared »%s« with you.
View it!

Cheers!" => "Hey there,

just letting you know that %s shared \"%s\" with you.
View it!

Cheers!", +"Updating ownCloud to version %s, this may take a while." => "Updating ownCloud to version %s, this may take a while." +); +$PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/core/l10n/et_EE.php b/core/l10n/et_EE.php index a13ed03222..d9d007819d 100644 --- a/core/l10n/et_EE.php +++ b/core/l10n/et_EE.php @@ -1,6 +1,12 @@ "%s jagas sinuga »%s«", +"Turned on maintenance mode" => "Haldusreziimis", +"Turned off maintenance mode" => "Haldusreziim lõpetatud", +"Updated database" => "Uuendatud andmebaas", +"Updating filecache, this may take really long..." => "Uuendan failipuhvrit, see võib kesta väga kaua...", +"Updated filecache" => "Uuendatud failipuhver", +"... %d%% done ..." => "... %d%% tehtud ...", "Category type not provided." => "Kategooria tüüp puudub.", "No category to add?" => "Pole kategooriat, mida lisada?", "This category already exists: %s" => "See kategooria on juba olemas: %s", @@ -126,7 +132,6 @@ $TRANSLATIONS = array( "Finish setup" => "Lõpeta seadistamine", "%s is available. Get more information on how to update." => "%s on saadaval. Vaata lähemalt kuidas uuendada.", "Log out" => "Logi välja", -"More apps" => "Rohkem rakendusi", "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 hiljuti, siis võib su kasutajakonto olla ohustatud!", "Please change your password to secure your account again." => "Palun muuda parooli, et oma kasutajakonto uuesti turvata.", diff --git a/core/l10n/eu.php b/core/l10n/eu.php index 83b8fca1ea..ae241e9387 100644 --- a/core/l10n/eu.php +++ b/core/l10n/eu.php @@ -126,7 +126,6 @@ $TRANSLATIONS = array( "Finish setup" => "Bukatu konfigurazioa", "%s is available. Get more information on how to update." => "%s erabilgarri dago. Eguneratzeaz argibide gehiago eskuratu.", "Log out" => "Saioa bukatu", -"More apps" => "App gehiago", "Automatic logon rejected!" => "Saio hasiera automatikoa ez onartuta!", "If you did not change your password recently, your account may be compromised!" => "Zure pasahitza orain dela gutxi ez baduzu aldatu, zure kontua arriskuan egon daiteke!", "Please change your password to secure your account again." => "Mesedez aldatu zure pasahitza zure kontua berriz segurtatzeko.", diff --git a/core/l10n/fi_FI.php b/core/l10n/fi_FI.php index d3cfe01293..7efeaa1fac 100644 --- a/core/l10n/fi_FI.php +++ b/core/l10n/fi_FI.php @@ -1,6 +1,12 @@ "%s jakoi kohteen »%s« kanssasi", +"Turned on maintenance mode" => "Siirrytty ylläpitotilaan", +"Turned off maintenance mode" => "Ylläpitotila laitettu pois päältä", +"Updated database" => "Tietokanta ajan tasalla", +"Updating filecache, this may take really long..." => "Päivitetään tiedostojen välimuistia, tämä saattaa kestää todella kauan...", +"Updated filecache" => "Tiedostojen välimuisti päivitetty", +"... %d%% done ..." => "... %d%% valmis ...", "Category type not provided." => "Luokan tyyppiä ei määritelty.", "No category to add?" => "Ei lisättävää luokkaa?", "This category already exists: %s" => "Luokka on jo olemassa: %s", @@ -64,6 +70,7 @@ $TRANSLATIONS = array( "Share via email:" => "Jaa sähköpostilla:", "No people found" => "Henkilöitä ei löytynyt", "Resharing is not allowed" => "Jakaminen uudelleen ei ole salittu", +"Shared in {item} with {user}" => "{item} on jaettu {user} kanssa", "Unshare" => "Peru jakaminen", "can edit" => "voi muokata", "access control" => "Pääsyn hallinta", @@ -78,6 +85,7 @@ $TRANSLATIONS = array( "Email sent" => "Sähköposti lähetetty", "The update was unsuccessful. Please report this issue to the ownCloud community." => "Päivitys epäonnistui. Ilmoita ongelmasta ownCloud-yhteisölle.", "The update was successful. Redirecting you to ownCloud now." => "Päivitys onnistui. Selain ohjautuu nyt ownCloudiisi.", +"%s password reset" => "%s salasanan nollaus", "Use the following link to reset your password: {link}" => "Voit palauttaa salasanasi seuraavassa osoitteessa: {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 ." => "Linkki salasanan nollaamiseen on lähetetty sähköpostiisi.
Jos et saa viestiä pian, tarkista roskapostikansiosi.
Jos et löydä viestiä roskapostinkaan seasta, ota yhteys ylläpitäjään.", "Request failed!
Did you make sure your email/username was right?" => "Pyyntö epäonnistui!
Olihan sähköpostiosoitteesi/käyttäjätunnuksesi oikein?", @@ -118,7 +126,6 @@ $TRANSLATIONS = array( "Finish setup" => "Viimeistele asennus", "%s is available. Get more information on how to update." => "%s on saatavilla. Lue lisätietoja, miten päivitys asennetaan.", "Log out" => "Kirjaudu ulos", -"More apps" => "Lisää sovelluksia", "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.", "Please change your password to secure your account again." => "Vaihda salasanasi suojataksesi tilisi uudelleen.", diff --git a/core/l10n/gl.php b/core/l10n/gl.php index 9db68bbbd0..56027e4cf1 100644 --- a/core/l10n/gl.php +++ b/core/l10n/gl.php @@ -1,6 +1,12 @@ "%s compartiu «%s» con vostede", +"Turned on maintenance mode" => "Modo de mantemento activado", +"Turned off maintenance mode" => "Modo de mantemento desactivado", +"Updated database" => "Base de datos actualizada", +"Updating filecache, this may take really long..." => "Actualizando o ficheiro da caché, isto pode levar bastante tempo...", +"Updated filecache" => "Ficheiro da caché actualizado", +"... %d%% done ..." => "... %d%% feito ...", "Category type not provided." => "Non se indicou o tipo de categoría", "No category to add?" => "Sen categoría que engadir?", "This category already exists: %s" => "Esta categoría xa existe: %s", @@ -126,7 +132,6 @@ $TRANSLATIONS = array( "Finish setup" => "Rematar a configuración", "%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", -"More apps" => "Máis aplicativos", "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!", "Please change your password to secure your account again." => "Cambie de novo o seu contrasinal para asegurar a súa conta.", diff --git a/core/l10n/he.php b/core/l10n/he.php index c9c6e1f750..b197a67b11 100644 --- a/core/l10n/he.php +++ b/core/l10n/he.php @@ -122,7 +122,6 @@ $TRANSLATIONS = array( "Finish setup" => "סיום התקנה", "%s is available. Get more information on how to update." => "%s זמינה להורדה. ניתן ללחוץ כדי לקבל מידע נוסף כיצד לעדכן.", "Log out" => "התנתקות", -"More apps" => "יישומים נוספים", "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." => "נא לשנות את הססמה שלך כדי לאבטח את חשבונך מחדש.", diff --git a/core/l10n/it.php b/core/l10n/it.php index 8c09b4e90f..63a7545d89 100644 --- a/core/l10n/it.php +++ b/core/l10n/it.php @@ -1,6 +1,12 @@ "%s ha condiviso «%s» con te", +"Turned on maintenance mode" => "Modalità di manutenzione attivata", +"Turned off maintenance mode" => "Modalità di manutenzione disattivata", +"Updated database" => "Database aggiornato", +"Updating filecache, this may take really long..." => "Aggiornamento della cache dei file in corso, potrebbe richiedere molto tempo...", +"Updated filecache" => "Cache dei file aggiornata", +"... %d%% done ..." => "... %d%% completato ...", "Category type not provided." => "Tipo di categoria non fornito.", "No category to add?" => "Nessuna categoria da aggiungere?", "This category already exists: %s" => "Questa categoria esiste già: %s", @@ -126,7 +132,6 @@ $TRANSLATIONS = array( "Finish setup" => "Termina la configurazione", "%s is available. Get more information on how to update." => "%s è disponibile. Ottieni ulteriori informazioni sull'aggiornamento.", "Log out" => "Esci", -"More apps" => "Altre applicazioni", "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.", "Please change your password to secure your account again." => "Cambia la password per rendere nuovamente sicuro il tuo account.", diff --git a/core/l10n/ja_JP.php b/core/l10n/ja_JP.php index 31d2f92eff..2ab85f13d3 100644 --- a/core/l10n/ja_JP.php +++ b/core/l10n/ja_JP.php @@ -126,7 +126,6 @@ $TRANSLATIONS = array( "Finish setup" => "セットアップを完了します", "%s is available. Get more information on how to update." => "%s が利用可能です。更新方法に関してさらに情報を取得して下さい。", "Log out" => "ログアウト", -"More apps" => "他のアプリ", "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." => "アカウント保護の為、パスワードを再度の変更をお願いいたします。", diff --git a/core/l10n/ko.php b/core/l10n/ko.php index 4c2d33e301..c4b6b9f091 100644 --- a/core/l10n/ko.php +++ b/core/l10n/ko.php @@ -29,13 +29,13 @@ $TRANSLATIONS = array( "December" => "12월", "Settings" => "설정", "seconds ago" => "초 전", -"_%n minute ago_::_%n minutes ago_" => array(""), -"_%n hour ago_::_%n hours ago_" => array(""), +"_%n minute ago_::_%n minutes ago_" => array("%n분 전 "), +"_%n hour ago_::_%n hours ago_" => array("%n시간 전 "), "today" => "오늘", "yesterday" => "어제", -"_%n day ago_::_%n days ago_" => array(""), +"_%n day ago_::_%n days ago_" => array("%n일 전 "), "last month" => "지난 달", -"_%n month ago_::_%n months ago_" => array(""), +"_%n month ago_::_%n months ago_" => array("%n달 전 "), "months ago" => "개월 전", "last year" => "작년", "years ago" => "년 전", diff --git a/core/l10n/lt_LT.php b/core/l10n/lt_LT.php index 00e4748853..5db8f6c21a 100644 --- a/core/l10n/lt_LT.php +++ b/core/l10n/lt_LT.php @@ -1,5 +1,6 @@ "%s pasidalino »%s« su tavimi", "Category type not provided." => "Kategorija nenurodyta.", "No category to add?" => "Nepridėsite jokios kategorijos?", "This category already exists: %s" => "Ši kategorija jau egzistuoja: %s", @@ -29,13 +30,13 @@ $TRANSLATIONS = array( "December" => "Gruodis", "Settings" => "Nustatymai", "seconds ago" => "prieš sekundę", -"_%n minute ago_::_%n minutes ago_" => array("","",""), -"_%n hour ago_::_%n hours ago_" => array("","",""), +"_%n minute ago_::_%n minutes ago_" => array(" prieš %n minutę"," prieš %n minučių"," prieš %n minučių"), +"_%n hour ago_::_%n hours ago_" => array("prieš %n valandą","prieš %n valandų","prieš %n valandų"), "today" => "šiandien", "yesterday" => "vakar", "_%n day ago_::_%n days ago_" => array("","",""), "last month" => "praeitą mėnesį", -"_%n month ago_::_%n months ago_" => array("","",""), +"_%n month ago_::_%n months ago_" => array("prieš %n mėnesį","prieš %n mėnesius","prieš %n mėnesių"), "months ago" => "prieš mėnesį", "last year" => "praeitais metais", "years ago" => "prieš metus", @@ -81,11 +82,13 @@ $TRANSLATIONS = array( "Email sent" => "Laiškas išsiųstas", "The update was unsuccessful. Please report this issue to the ownCloud community." => "Atnaujinimas buvo nesėkmingas. PApie tai prašome pranešti the ownCloud bendruomenei.", "The update was successful. Redirecting you to ownCloud now." => "Atnaujinimas buvo sėkmingas. Nukreipiame į jūsų ownCloud.", +"%s password reset" => "%s slaptažodžio atnaujinimas", "Use the following link to reset your password: {link}" => "Slaptažodio atkūrimui naudokite šią nuorodą: {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 ." => "Nuorodą su jūsų slaptažodžio atkūrimu buvo nusiųsta jums į paštą.
Jei jo negausite per atitinkamą laiką, pasižiūrėkite brukalo aplankale.
Jei jo ir ten nėra, teiraukitės administratoriaus.", "Request failed!
Did you make sure your email/username was right?" => "Klaida!
Ar tikrai jūsų el paštas/vartotojo vardas buvo teisingi?", "You will receive a link to reset your password via Email." => "Elektroniniu paštu gausite nuorodą, su kuria galėsite iš naujo nustatyti slaptažodį.", "Username" => "Prisijungimo vardas", +"Yes, I really want to reset my password now" => "Taip, aš tikrai noriu atnaujinti slaptažodį", "Request reset" => "Prašyti nustatymo iš najo", "Your password was reset" => "Jūsų slaptažodis buvo nustatytas iš naujo", "To login page" => "Į prisijungimo puslapį", diff --git a/core/l10n/lv.php b/core/l10n/lv.php index 6deb5dfda9..ddfc600898 100644 --- a/core/l10n/lv.php +++ b/core/l10n/lv.php @@ -126,7 +126,6 @@ $TRANSLATIONS = array( "Finish setup" => "Pabeigt iestatīšanu", "%s is available. Get more information on how to update." => "%s ir pieejams. Uzziniet vairāk kā atjaunināt.", "Log out" => "Izrakstīties", -"More apps" => "Vairāk programmu", "Automatic logon rejected!" => "Automātiskā ierakstīšanās ir noraidīta!", "If you did not change your password recently, your account may be compromised!" => "Ja neesat pēdējā laikā mainījis paroli, iespējams, ka jūsu konts ir kompromitēts.", "Please change your password to secure your account again." => "Lūdzu, nomainiet savu paroli, lai atkal nodrošinātu savu kontu.", diff --git a/core/l10n/nl.php b/core/l10n/nl.php index 46375756de..6a2d1a03a1 100644 --- a/core/l10n/nl.php +++ b/core/l10n/nl.php @@ -126,7 +126,6 @@ $TRANSLATIONS = array( "Finish setup" => "Installatie afronden", "%s is available. Get more information on how to update." => "%s is beschikbaar. Verkrijg meer informatie over het bijwerken.", "Log out" => "Afmelden", -"More apps" => "Meer applicaties", "Automatic logon rejected!" => "Automatische aanmelding geweigerd!", "If you did not change your password recently, your account may be compromised!" => "Als je je wachtwoord niet onlangs heeft aangepast, kan je account overgenomen zijn!", "Please change your password to secure your account again." => "Wijzig je wachtwoord zodat je account weer beveiligd is.", diff --git a/core/l10n/pl.php b/core/l10n/pl.php index 9be10f535b..1188e55531 100644 --- a/core/l10n/pl.php +++ b/core/l10n/pl.php @@ -125,7 +125,6 @@ $TRANSLATIONS = array( "Finish setup" => "Zakończ konfigurowanie", "%s is available. Get more information on how to update." => "%s jest dostępna. Dowiedz się więcej na temat aktualizacji.", "Log out" => "Wyloguj", -"More apps" => "Więcej aplikacji", "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!", "Please change your password to secure your account again." => "Zmień swoje hasło, aby ponownie zabezpieczyć swoje konto.", diff --git a/core/l10n/pt_BR.php b/core/l10n/pt_BR.php index 8446e5270a..8db5262e94 100644 --- a/core/l10n/pt_BR.php +++ b/core/l10n/pt_BR.php @@ -126,7 +126,6 @@ $TRANSLATIONS = array( "Finish setup" => "Concluir configuração", "%s is available. Get more information on how to update." => "%s está disponível. Obtenha mais informações sobre como atualizar.", "Log out" => "Sair", -"More apps" => "Mais aplicativos", "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!", "Please change your password to secure your account again." => "Por favor troque sua senha para tornar sua conta segura novamente.", diff --git a/core/l10n/ru.php b/core/l10n/ru.php index 8c29c8d26f..503ca579ce 100644 --- a/core/l10n/ru.php +++ b/core/l10n/ru.php @@ -126,7 +126,6 @@ $TRANSLATIONS = array( "Finish setup" => "Завершить установку", "%s is available. Get more information on how to update." => "%s доступно. Получить дополнительную информацию о порядке обновления.", "Log out" => "Выйти", -"More apps" => "Ещё приложения", "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." => "Пожалуйста, смените пароль, чтобы обезопасить свою учетную запись.", diff --git a/core/l10n/sk_SK.php b/core/l10n/sk_SK.php index 5fff18e7d6..82745d617e 100644 --- a/core/l10n/sk_SK.php +++ b/core/l10n/sk_SK.php @@ -1,6 +1,12 @@ "%s s Vami zdieľa »%s«", +"Turned on maintenance mode" => "Mód údržby zapnutý", +"Turned off maintenance mode" => "Mód údržby vypnutý", +"Updated database" => "Databáza aktualizovaná", +"Updating filecache, this may take really long..." => "Aktualizácia \"filecache\", toto môže trvať dlhšie...", +"Updated filecache" => "\"Filecache\" aktualizovaná", +"... %d%% done ..." => "... %d%% dokončených ...", "Category type not provided." => "Neposkytnutý typ kategórie.", "No category to add?" => "Žiadna kategória pre pridanie?", "This category already exists: %s" => "Kategória: %s už existuje.", @@ -126,7 +132,6 @@ $TRANSLATIONS = array( "Finish setup" => "Dokončiť inštaláciu", "%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ť", -"More apps" => "Viac aplikácií", "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ý.", "Please change your password to secure your account again." => "Prosím, zmeňte svoje heslo pre opätovné zabezpečenie Vášho účtu", diff --git a/core/l10n/sv.php b/core/l10n/sv.php index cda76a520b..74d285a35a 100644 --- a/core/l10n/sv.php +++ b/core/l10n/sv.php @@ -1,6 +1,12 @@ "%s delade »%s« med dig", +"Turned on maintenance mode" => "Aktiverade underhållsläge", +"Turned off maintenance mode" => "Deaktiverade underhållsläge", +"Updated database" => "Uppdaterade databasen", +"Updating filecache, this may take really long..." => "Uppdaterar filcache, det kan ta lång tid...", +"Updated filecache" => "Uppdaterade filcache", +"... %d%% done ..." => "... %d%% klart ...", "Category type not provided." => "Kategorityp inte angiven.", "No category to add?" => "Ingen kategori att lägga till?", "This category already exists: %s" => "Denna kategori finns redan: %s", @@ -126,7 +132,6 @@ $TRANSLATIONS = array( "Finish setup" => "Avsluta installation", "%s is available. Get more information on how to update." => "%s är tillgänglig. Få mer information om hur du går tillväga för att uppdatera.", "Log out" => "Logga ut", -"More apps" => "Fler appar", "Automatic logon rejected!" => "Automatisk inloggning inte tillåten!", "If you did not change your password recently, your account may be compromised!" => "Om du inte har ändrat ditt lösenord nyligen så kan ditt konto vara manipulerat!", "Please change your password to secure your account again." => "Ändra genast lösenord för att säkra ditt konto.", diff --git a/core/l10n/tr.php b/core/l10n/tr.php index dde8a1bd97..6dd5405795 100644 --- a/core/l10n/tr.php +++ b/core/l10n/tr.php @@ -126,7 +126,6 @@ $TRANSLATIONS = array( "Finish setup" => "Kurulumu tamamla", "%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", -"More apps" => "Daha fazla Uygulama", "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.", "Please change your password to secure your account again." => "Hesabınızı korumak için lütfen parolanızı değiştirin.", diff --git a/core/l10n/ug.php b/core/l10n/ug.php index 5cbb90d15f..eb16e841c6 100644 --- a/core/l10n/ug.php +++ b/core/l10n/ug.php @@ -45,6 +45,7 @@ $TRANSLATIONS = array( "Help" => "ياردەم", "Edit categories" => "تۈر تەھرىر", "Add" => "قوش", +"Security Warning" => "بىخەتەرلىك ئاگاھلاندۇرۇش", "Advanced" => "ئالىي", "Finish setup" => "تەڭشەك تامام", "Log out" => "تىزىمدىن چىق" diff --git a/core/l10n/zh_CN.GB2312.php b/core/l10n/zh_CN.GB2312.php deleted file mode 100644 index 92f1aef885..0000000000 --- a/core/l10n/zh_CN.GB2312.php +++ /dev/null @@ -1,140 +0,0 @@ - "%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" => "秒前", -"_%n minute ago_::_%n minutes ago_" => array("%n 分钟以前"), -"_%n hour ago_::_%n hours ago_" => array("%n 小时以前"), -"today" => "今天", -"yesterday" => "昨天", -"_%n day ago_::_%n days ago_" => array("%n 天以前"), -"last month" => "上个月", -"_%n month ago_::_%n months ago_" => array("%n 个月以前"), -"months ago" => "月前", -"last year" => "去年", -"years ago" => "年前", -"Choose" => "选择", -"Error loading file picker template" => "加载文件选取模板出错", -"Yes" => "是", -"No" => "否", -"Ok" => "好的", -"The object type is not specified." => "未指定对象类型。", -"Error" => "出错", -"The app name is not specified." => "未指定应用名称。", -"The required file {file} is not installed!" => "未安装所需要的文件 {file} ！", -"Shared" => "已分享", -"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 link" => "分享链接", -"Password protect" => "密码保护", -"Password" => "密码", -"Allow Public Upload" => "允许公众上传", -"Email link to person" => "面向个人的电子邮件链接", -"Send" => "发送", -"Set expiration date" => "设置失效日期", -"Expiration date" => "失效日期", -"Share via email:" => "通过电子邮件分享：", -"No people found" => "查无此人", -"Resharing is not allowed" => "不允许重复分享", -"Shared in {item} with {user}" => "已经与 {user} 在 {item} 中分享", -"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社区报告此问题。", -"The update was successful. Redirecting you to ownCloud now." => "升级成功。现在为您跳转到ownCloud。", -"%s password reset" => "%s 密码重置", -"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." => "你将会收到一个重置密码的链接", -"Username" => "用户名", -"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "您的文件是加密的。如果您还没有启用恢复密钥，在重置了密码后，您的数据讲无法恢复回来。如果您不确定是否这么做，请联系您的管理员在继续这个操作。你却是想继续么？", -"Yes, I really want to reset my password now" => "是的，我想现在重置密码。", -"Request reset" => "要求重置", -"Your password was reset" => "你的密码已经被重置了", -"To login page" => "转至登陆页面", -"New password" => "新密码", -"Reset password" => "重置密码", -"Personal" => "私人", -"Users" => "用户", -"Apps" => "程序", -"Admin" => "管理员", -"Help" => "帮助", -"Access forbidden" => "禁止访问", -"Cloud not found" => "云 没有被找到", -"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "你好！⏎\n⏎\n温馨提示： %s 与您共享了 %s 。⏎\n查看： %s⏎\n⏎\n祝顺利！", -"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 %s securely." => "请安全地升级您的PHP版本到 %s 。", -"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" => "数据存放文件夹", -"Configure the database" => "配置数据库", -"will be used" => "将会使用", -"Database user" => "数据库用户", -"Database password" => "数据库密码", -"Database name" => "数据库用户名", -"Database tablespace" => "数据库表格空间", -"Database host" => "数据库主机", -"Finish setup" => "完成安装", -"%s is available. Get more information on how to update." => "%s 是可用的。获取更多关于升级的信息。", -"Log out" => "注销", -"More apps" => "更多应用", -"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" => "备选登录", -"Hey there,

just letting you know that %s shared »%s« with you.
View it!

Cheers!" => "你好！

温馨提示： %s 与您共享了 %s 。

\n查看： %s

祝顺利！", -"Updating ownCloud to version %s, this may take a while." => "ownCloud正在升级至 %s 版，这可能需要一点时间。" -); -$PLURAL_FORMS = "nplurals=1; plural=0;"; diff --git a/core/l10n/zh_CN.php b/core/l10n/zh_CN.php index a5a63e2485..08d70dfee6 100644 --- a/core/l10n/zh_CN.php +++ b/core/l10n/zh_CN.php @@ -1,6 +1,12 @@ "%s 向您分享了 »%s«", +"Turned on maintenance mode" => "启用维护模式", +"Turned off maintenance mode" => "关闭维护模式", +"Updated database" => "数据库已更新", +"Updating filecache, this may take really long..." => "正在更新文件缓存，这可能需要较长时间...", +"Updated filecache" => "文件缓存已更新", +"... %d%% done ..." => "...已完成 %d%% ...", "Category type not provided." => "未提供分类类型。", "No category to add?" => "没有可添加分类？", "This category already exists: %s" => "此分类已存在：%s", @@ -31,12 +37,12 @@ $TRANSLATIONS = array( "Settings" => "设置", "seconds ago" => "秒前", "_%n minute ago_::_%n minutes ago_" => array("%n 分钟前"), -"_%n hour ago_::_%n hours ago_" => array(""), +"_%n hour ago_::_%n hours ago_" => array("%n 小时前"), "today" => "今天", "yesterday" => "昨天", -"_%n day ago_::_%n days ago_" => array(""), +"_%n day ago_::_%n days ago_" => array("%n 天前"), "last month" => "上月", -"_%n month ago_::_%n months ago_" => array(""), +"_%n month ago_::_%n months ago_" => array("%n 月前"), "months ago" => "月前", "last year" => "去年", "years ago" => "年前", @@ -47,7 +53,7 @@ $TRANSLATIONS = array( "Ok" => "好", "The object type is not specified." => "未指定对象类型。", "Error" => "错误", -"The app name is not specified." => "未指定App名称。", +"The app name is not specified." => "未指定应用名称。", "The required file {file} is not installed!" => "所需文件{file}未安装！", "Shared" => "已共享", "Share" => "分享", @@ -83,6 +89,7 @@ $TRANSLATIONS = array( "Email sent" => "邮件已发送", "The update was unsuccessful. Please report this issue to the ownCloud community." => "更新不成功。请汇报将此问题汇报给 ownCloud 社区。", "The update was successful. Redirecting you to ownCloud now." => "更新成功。正在重定向至 ownCloud。", +"%s password reset" => "重置 %s 的密码", "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?" => "请求失败
您确定您的邮箱/用户名是正确的？", @@ -107,9 +114,11 @@ $TRANSLATIONS = array( "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 %s securely." => "为保证安全使用 %s 请更新您的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" => "数据目录", diff --git a/core/l10n/zh_TW.php b/core/l10n/zh_TW.php index d2cbb7a8fd..fabec7537d 100644 --- a/core/l10n/zh_TW.php +++ b/core/l10n/zh_TW.php @@ -30,13 +30,13 @@ $TRANSLATIONS = array( "December" => "十二月", "Settings" => "設定", "seconds ago" => "幾秒前", -"_%n minute ago_::_%n minutes ago_" => array(""), -"_%n hour ago_::_%n hours ago_" => array(""), +"_%n minute ago_::_%n minutes ago_" => array("%n 分鐘前"), +"_%n hour ago_::_%n hours ago_" => array("%n 小時前"), "today" => "今天", "yesterday" => "昨天", -"_%n day ago_::_%n days ago_" => array(""), +"_%n day ago_::_%n days ago_" => array("%n 天前"), "last month" => "上個月", -"_%n month ago_::_%n months ago_" => array(""), +"_%n month ago_::_%n months ago_" => array("%n 個月前"), "months ago" => "幾個月前", "last year" => "去年", "years ago" => "幾年前", @@ -83,6 +83,7 @@ $TRANSLATIONS = array( "Email sent" => "Email 已寄出", "The update was unsuccessful. Please report this issue to the ownCloud community." => "升級失敗，請將此問題回報 ownCloud 社群。", "The update was successful. Redirecting you to ownCloud now." => "升級成功，正將您重新導向至 ownCloud 。", +"%s password reset" => "%s 密碼重設", "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?" => "請求失敗！
您確定填入的電子郵件地址或是帳號名稱是正確的嗎？", diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php index 3c1114492c..1e0f4a75c3 100644 --- a/core/templates/layout.user.php +++ b/core/templates/layout.user.php @@ -78,6 +78,7 @@