diff options
Diffstat (limited to 'apps/files')
-rw-r--r-- | apps/files/ajax/delete.php | 2 | ||||
-rw-r--r-- | apps/files/ajax/download.php | 2 | ||||
-rw-r--r-- | apps/files/ajax/getstoragestats.php | 2 | ||||
-rw-r--r-- | apps/files/ajax/list.php | 4 | ||||
-rw-r--r-- | apps/files/ajax/mimeicon.php | 2 | ||||
-rw-r--r-- | apps/files/ajax/move.php | 4 | ||||
-rw-r--r-- | apps/files/ajax/newfile.php | 4 | ||||
-rw-r--r-- | apps/files/ajax/newfolder.php | 4 | ||||
-rw-r--r-- | apps/files/ajax/rename.php | 4 | ||||
-rw-r--r-- | apps/files/ajax/scan.php | 2 | ||||
-rw-r--r-- | apps/files/ajax/upload.php | 4 | ||||
-rw-r--r-- | apps/files/appinfo/app.php | 2 | ||||
-rw-r--r-- | apps/files/js/filelist.js | 2 | ||||
-rw-r--r-- | apps/files/l10n/bn_BD.php | 1 | ||||
-rw-r--r-- | apps/files/l10n/et_EE.php | 1 | ||||
-rw-r--r-- | apps/files/l10n/he.php | 1 | ||||
-rw-r--r-- | apps/files/l10n/hu_HU.php | 12 | ||||
-rw-r--r-- | apps/files/l10n/nn_NO.php | 1 | ||||
-rw-r--r-- | apps/files/l10n/pt_PT.php | 2 | ||||
-rw-r--r-- | apps/files/l10n/zh_TW.php | 1 |
20 files changed, 32 insertions, 25 deletions
diff --git a/apps/files/ajax/delete.php b/apps/files/ajax/delete.php index aed53d5db5a..323b70706ce 100644 --- a/apps/files/ajax/delete.php +++ b/apps/files/ajax/delete.php @@ -2,7 +2,7 @@ OCP\JSON::checkLoggedIn(); OCP\JSON::callCheck(); -\OC::$session->close(); +\OC::$server->getSession()->close(); // Get data diff --git a/apps/files/ajax/download.php b/apps/files/ajax/download.php index 4b4a7f8948d..b2e144c4b8f 100644 --- a/apps/files/ajax/download.php +++ b/apps/files/ajax/download.php @@ -23,7 +23,7 @@ // Check if we are a user OCP\User::checkLoggedIn(); -\OC::$session->close(); +\OC::$server->getSession()->close(); $files = $_GET["files"]; $dir = $_GET["dir"]; diff --git a/apps/files/ajax/getstoragestats.php b/apps/files/ajax/getstoragestats.php index dd8af39bada..4ab5b9a779c 100644 --- a/apps/files/ajax/getstoragestats.php +++ b/apps/files/ajax/getstoragestats.php @@ -7,7 +7,7 @@ if (isset($_GET['dir'])) { } OCP\JSON::checkLoggedIn(); -\OC::$session->close(); +\OC::$server->getSession()->close(); // send back json OCP\JSON::success(array('data' => \OCA\Files\Helper::buildFileStorageStatistics($dir))); diff --git a/apps/files/ajax/list.php b/apps/files/ajax/list.php index b4641343ed4..16e48a2c2af 100644 --- a/apps/files/ajax/list.php +++ b/apps/files/ajax/list.php @@ -1,8 +1,8 @@ <?php OCP\JSON::checkLoggedIn(); -\OC::$session->close(); -$l = OC_L10N::get('files'); +\OC::$server->getSession()->close(); +$l = \OC::$server->getL10N('files'); // Load the files $dir = isset($_GET['dir']) ? $_GET['dir'] : ''; diff --git a/apps/files/ajax/mimeicon.php b/apps/files/ajax/mimeicon.php index 6557ff941ac..fdbcc441a78 100644 --- a/apps/files/ajax/mimeicon.php +++ b/apps/files/ajax/mimeicon.php @@ -1,4 +1,4 @@ <?php -\OC::$session->close(); +\OC::$server->getSession()->close(); print OC_Helper::mimetypeIcon($_GET['mime']); diff --git a/apps/files/ajax/move.php b/apps/files/ajax/move.php index 0a8dbc24a65..3a07554ad00 100644 --- a/apps/files/ajax/move.php +++ b/apps/files/ajax/move.php @@ -2,14 +2,14 @@ OCP\JSON::checkLoggedIn(); OCP\JSON::callCheck(); -\OC::$session->close(); +\OC::$server->getSession()->close(); // Get data $dir = stripslashes($_POST["dir"]); $file = stripslashes($_POST["file"]); $target = stripslashes(rawurldecode($_POST["target"])); -$l = OC_L10N::get('files'); +$l = \OC::$server->getL10N('files'); if(\OC\Files\Filesystem::file_exists($target . '/' . $file)) { OCP\JSON::error(array("data" => array( "message" => $l->t("Could not move %s - File with this name already exists", array($file)) ))); diff --git a/apps/files/ajax/newfile.php b/apps/files/ajax/newfile.php index 9cfe51a6218..606576760ec 100644 --- a/apps/files/ajax/newfile.php +++ b/apps/files/ajax/newfile.php @@ -7,7 +7,7 @@ if(!OC_User::isLoggedIn()) { exit; } -\OC::$session->close(); +\OC::$server->getSession()->close(); // Get the params $dir = isset( $_REQUEST['dir'] ) ? '/'.trim($_REQUEST['dir'], '/\\') : ''; @@ -46,7 +46,7 @@ function progress($notification_code, $severity, $message, $message_code, $bytes } } -$l10n = \OC_L10n::get('files'); +$l10n = \OC::$server->getL10N('files'); $result = array( 'success' => false, diff --git a/apps/files/ajax/newfolder.php b/apps/files/ajax/newfolder.php index 89c241189d7..ea7a10c2ab9 100644 --- a/apps/files/ajax/newfolder.php +++ b/apps/files/ajax/newfolder.php @@ -5,13 +5,13 @@ OCP\JSON::checkLoggedIn(); OCP\JSON::callCheck(); -\OC::$session->close(); +\OC::$server->getSession()->close(); // Get the params $dir = isset( $_POST['dir'] ) ? stripslashes($_POST['dir']) : ''; $foldername = isset( $_POST['foldername'] ) ? stripslashes($_POST['foldername']) : ''; -$l10n = \OC_L10n::get('files'); +$l10n = \OC::$server->getL10N('files'); $result = array( 'success' => false, diff --git a/apps/files/ajax/rename.php b/apps/files/ajax/rename.php index fa3ddace63d..00c8a1e44db 100644 --- a/apps/files/ajax/rename.php +++ b/apps/files/ajax/rename.php @@ -23,11 +23,11 @@ OCP\JSON::checkLoggedIn(); OCP\JSON::callCheck(); -\OC::$session->close(); +\OC::$server->getSession()->close(); $files = new \OCA\Files\App( \OC\Files\Filesystem::getView(), - \OC_L10n::get('files') + \OC::$server->getL10N('files') ); $result = $files->rename( $_GET["dir"], diff --git a/apps/files/ajax/scan.php b/apps/files/ajax/scan.php index d5d88483801..3ec7f9394b1 100644 --- a/apps/files/ajax/scan.php +++ b/apps/files/ajax/scan.php @@ -1,6 +1,6 @@ <?php set_time_limit(0); //scanning can take ages -\OC::$session->close(); +\OC::$server->getSession()->close(); $force = (isset($_GET['force']) and ($_GET['force'] === 'true')); $dir = isset($_GET['dir']) ? $_GET['dir'] : ''; diff --git a/apps/files/ajax/upload.php b/apps/files/ajax/upload.php index b737d5f8710..b960e02ced7 100644 --- a/apps/files/ajax/upload.php +++ b/apps/files/ajax/upload.php @@ -10,7 +10,7 @@ OCP\JSON::setContentTypeHeader('text/plain'); $allowedPermissions = OCP\PERMISSION_ALL; $errorCode = null; -$l = OC_L10N::get('files'); +$l = \OC::$server->getL10N('files'); if (empty($_POST['dirToken'])) { // The standard case, files are uploaded through logged in users :) OCP\JSON::checkLoggedIn(); @@ -68,7 +68,7 @@ if (empty($_POST['dirToken'])) { OCP\JSON::callCheck(); if (!\OCP\App::isEnabled('files_encryption')) { // encryption app need to create keys later, so can't close too early - \OC::$session->close(); + \OC::$server->getSession()->close(); } diff --git a/apps/files/appinfo/app.php b/apps/files/appinfo/app.php index 9af36c682fd..3567bc26def 100644 --- a/apps/files/appinfo/app.php +++ b/apps/files/appinfo/app.php @@ -1,6 +1,6 @@ <?php -$l = OC_L10N::get('files'); +$l = \OC::$server->getL10N('files'); OCP\App::registerAdmin('files', 'admin'); diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index 3cbc25fc24b..fd11a80248d 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -703,7 +703,7 @@ "class": "modified", "title": formatDate(mtime), "style": 'color:rgb('+modifiedColor+','+modifiedColor+','+modifiedColor+')' - }).text( relative_modified_date(mtime / 1000) )); + }).text(OC.Util.relativeModifiedDate(mtime))); tr.find('.filesize').text(simpleSize); tr.append(td); return tr; diff --git a/apps/files/l10n/bn_BD.php b/apps/files/l10n/bn_BD.php index b2eec2a830c..7e7b8461720 100644 --- a/apps/files/l10n/bn_BD.php +++ b/apps/files/l10n/bn_BD.php @@ -15,6 +15,7 @@ $TRANSLATIONS = array( "Failed to write to disk" => "ডিস্কে লিখতে ব্যর্থ", "Invalid directory." => "ভুল ডিরেক্টরি", "Files" => "ফাইল", +"All files" => "সব ফাইল", "Upload cancelled." => "আপলোড বাতিল করা হয়েছে।", "File upload is in progress. Leaving the page now will cancel the upload." => "ফাইল আপলোড চলমান। এই পৃষ্ঠা পরিত্যাগ করলে আপলোড বাতিল করা হবে।", "{new_name} already exists" => "{new_name} টি বিদ্যমান", diff --git a/apps/files/l10n/et_EE.php b/apps/files/l10n/et_EE.php index 91ea214445a..46246047ac9 100644 --- a/apps/files/l10n/et_EE.php +++ b/apps/files/l10n/et_EE.php @@ -68,6 +68,7 @@ $TRANSLATIONS = array( "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." => "Vigane Krüpteerimisrakendi privaatvõti . Palun uuenda oma privaatse võtme parool oma personaasete seadete all taastamaks ligipääsu oma krüpteeritud failidele.", "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.", "{dirs} and {files}" => "{dirs} ja {files}", +"%s could not be renamed as it has been deleted" => "%s ei saa ümber nimetada, kuna see on kustutatud", "%s could not be renamed" => "%s ümbernimetamine ebaõnnestus", "Upload (max. %s)" => "Üleslaadimine (max. %s)", "File handling" => "Failide käsitlemine", diff --git a/apps/files/l10n/he.php b/apps/files/l10n/he.php index 77dd4516199..5eae5e46f27 100644 --- a/apps/files/l10n/he.php +++ b/apps/files/l10n/he.php @@ -43,6 +43,7 @@ $TRANSLATIONS = array( "WebDAV" => "WebDAV", "New" => "חדש", "Text file" => "קובץ טקסט", +"New folder" => "תיקייה חדשה", "Folder" => "תיקייה", "From link" => "מקישור", "Nothing in here. Upload something!" => "אין כאן שום דבר. אולי ברצונך להעלות משהו?", diff --git a/apps/files/l10n/hu_HU.php b/apps/files/l10n/hu_HU.php index b44cd02a8af..85c439ecab1 100644 --- a/apps/files/l10n/hu_HU.php +++ b/apps/files/l10n/hu_HU.php @@ -11,14 +11,14 @@ $TRANSLATIONS = array( "The target folder has been moved or deleted." => "A célmappa törlődött, vagy áthelyezésre került.", "The name %s is already used in the folder %s. Please choose a different name." => "A %s név már létezik a %s mappában. Kérem válasszon másik nevet!", "Not a valid source" => "A kiinduló állomány érvénytelen", -"Server is not allowed to open URLs, please check the server configuration" => "A kiszolgálón nincs engedélyezve URL-ek megnyitása, kérem ellenőrizze a beállításokat", -"The file exceeds your quota by %s" => "A fájl meghaladja kvótádat %s-kal", +"Server is not allowed to open URLs, please check the server configuration" => "A kiszolgálón nincs engedélyezve URL-ek megnyitása, kérem ellenőrizze a beállításokat!", +"The file exceeds your quota by %s" => "A fájl ennyivel meghaladja a kvótáját: %s", "Error while downloading %s to %s" => "Hiba történt miközben %s-t letöltöttük %s-be", "Error when creating the file" => "Hiba történt az állomány létrehozásakor", "Folder name cannot be empty." => "A mappa neve nem maradhat kitöltetlenül", "Error when creating the folder" => "Hiba történt a mappa létrehozásakor", "Unable to set upload directory." => "Nem található a mappa, ahova feltölteni szeretne.", -"Invalid Token" => "Hibás mappacím", +"Invalid Token" => "Hibás token", "No file was uploaded. Unknown error" => "Nem történt feltöltés. Ismeretlen hiba", "There is no error, the file uploaded with success" => "A fájlt sikerült feltölteni", "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "A feltöltött fájl mérete meghaladja a php.ini állományban megadott upload_max_filesize paraméter értékét.", @@ -31,13 +31,13 @@ $TRANSLATIONS = array( "Upload failed. Could not find uploaded file" => "A feltöltés nem sikerült. Nem található a feltöltendő állomány.", "Upload failed. Could not get file info." => "A feltöltés nem sikerült. Az állományt leíró információk nem érhetők el.", "Invalid directory." => "Érvénytelen mappa.", -"Files" => "Fájlok", +"Files" => "Fájlkezelő", "All files" => "Az összes állomány", "Unable to upload {filename} as it is a directory or has 0 bytes" => "A(z) {filename} állomány nem tölthető fel, mert ez vagy egy mappa, vagy pedig 0 bájtból áll.", "Total file size {size1} exceeds upload limit {size2}" => "A teljes fájlméret: {size1} meghaladja a feltöltési limitet: {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" => "Nincs elég szabad hely. A feltöltés mérete {size1}, de csak ennyi hely van: {size2}.", "Upload cancelled." => "A feltöltést megszakítottuk.", -"Could not get result from server." => "A kiszolgálótól nem kapható meg az eredmény.", +"Could not get result from server." => "A kiszolgálótól nem kapható meg a művelet eredménye.", "File upload is in progress. Leaving the page now will cancel the upload." => "Fájlfeltöltés van folyamatban. Az oldal elhagyása megszakítja a feltöltést.", "URL cannot be empty" => "Az URL-cím nem maradhat kitöltetlenül", "{new_name} already exists" => "{new_name} már létezik", @@ -79,7 +79,7 @@ $TRANSLATIONS = array( "WebDAV" => "WebDAV", "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Ezt a címet használja, ha <a href=\"%s\" target=\"_blank\">WebDAV-on keresztül szeretné elérni a fájljait</a>", "New" => "Új", -"New text file" => "Új szöveges file", +"New text file" => "Új szövegfájl", "Text file" => "Szövegfájl", "New folder" => "Új mappa", "Folder" => "Mappa", diff --git a/apps/files/l10n/nn_NO.php b/apps/files/l10n/nn_NO.php index f610ee902d5..502c313aa06 100644 --- a/apps/files/l10n/nn_NO.php +++ b/apps/files/l10n/nn_NO.php @@ -1,5 +1,6 @@ <?php $TRANSLATIONS = array( +"Unknown error" => "Ukjend feil", "Could not move %s - File with this name already exists" => "Klarte ikkje flytta %s – det finst allereie ei fil med dette namnet", "Could not move %s" => "Klarte ikkje flytta %s", "File name cannot be empty." => "Filnamnet kan ikkje vera tomt.", diff --git a/apps/files/l10n/pt_PT.php b/apps/files/l10n/pt_PT.php index 1fcf85fc856..dfa599e10ac 100644 --- a/apps/files/l10n/pt_PT.php +++ b/apps/files/l10n/pt_PT.php @@ -12,6 +12,7 @@ $TRANSLATIONS = array( "The name %s is already used in the folder %s. Please choose a different name." => "O nome %s já está em uso na pasta %s. Por favor escolha um nome diferente.", "Not a valid source" => "Não é uma fonte válida", "Server is not allowed to open URLs, please check the server configuration" => "O servidor não consegue abrir URLs, por favor verifique a configuração do servidor", +"The file exceeds your quota by %s" => "O ficheiro excede a sua quota por %s", "Error while downloading %s to %s" => "Erro ao transferir %s para %s", "Error when creating the file" => "Erro ao criar o ficheiro", "Folder name cannot be empty." => "O nome da pasta não pode estar vazio.", @@ -68,6 +69,7 @@ $TRANSLATIONS = array( "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." => "Chave privada inválida da Aplicação de Encriptação. Por favor atualize a sua senha de chave privada nas definições pessoais, para recuperar o acesso aos seus ficheiros encriptados.", "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "A encriptação foi desactivada mas os seus ficheiros continuam encriptados. Por favor consulte as suas definições pessoais para desencriptar os ficheiros.", "{dirs} and {files}" => "{dirs} e {files}", +"%s could not be renamed as it has been deleted" => "Não foi possível renomear %s devido a ter sido eliminado", "%s could not be renamed" => "%s não pode ser renomeada", "Upload (max. %s)" => "Enviar (max. %s)", "File handling" => "Manuseamento do ficheiro", diff --git a/apps/files/l10n/zh_TW.php b/apps/files/l10n/zh_TW.php index 39ec148fba0..e269cca3168 100644 --- a/apps/files/l10n/zh_TW.php +++ b/apps/files/l10n/zh_TW.php @@ -12,6 +12,7 @@ $TRANSLATIONS = array( "The name %s is already used in the folder %s. Please choose a different name." => "%s 已經被使用於資料夾 %s ,請換一個名字", "Not a valid source" => "不是有效的來源", "Server is not allowed to open URLs, please check the server configuration" => "伺服器上不允許開啓 URL ,請檢查伺服器設定", +"The file exceeds your quota by %s" => "這個檔案大小超出配額 %s", "Error while downloading %s to %s" => "下載 %s 到 %s 失敗", "Error when creating the file" => "建立檔案失敗", "Folder name cannot be empty." => "資料夾名稱不能留空", |