diff --git a/3rdparty/MDB2/Driver/Reverse/oci8.php b/3rdparty/MDB2/Driver/Reverse/oci8.php index c86847fa6b4..d89ad771374 100644 --- a/3rdparty/MDB2/Driver/Reverse/oci8.php +++ b/3rdparty/MDB2/Driver/Reverse/oci8.php @@ -84,12 +84,12 @@ class MDB2_Driver_Reverse_oci8 extends MDB2_Driver_Reverse_Common $owner = $db->dsn['username']; } - $query = 'SELECT column_name name, - data_type "type", - nullable, - data_default "default", - COALESCE(data_precision, data_length) "length", - data_scale "scale" + $query = 'SELECT column_name AS "name", + data_type AS "type", + nullable AS "nullable", + data_default AS "default", + COALESCE(data_precision, data_length) AS "length", + data_scale AS "scale" FROM all_tab_columns WHERE (table_name=? OR table_name=?) AND (owner=? OR owner=?) @@ -146,6 +146,10 @@ class MDB2_Driver_Reverse_oci8 extends MDB2_Driver_Reverse_Common if ($default === 'NULL') { $default = null; } + //ugly hack, but works for the reverse direction + if ($default == "''") { + $default = ''; + } if ((null === $default) && $notnull) { $default = ''; } @@ -221,11 +225,11 @@ class MDB2_Driver_Reverse_oci8 extends MDB2_Driver_Reverse_Common $owner = $db->dsn['username']; } - $query = "SELECT aic.column_name, - aic.column_position, - aic.descend, - aic.table_owner, - alc.constraint_type + $query = 'SELECT aic.column_name AS "column_name", + aic.column_position AS "column_position", + aic.descend AS "descend", + aic.table_owner AS "table_owner", + alc.constraint_type AS "constraint_type" FROM all_ind_columns aic LEFT JOIN all_constraints alc ON aic.index_name = alc.constraint_name @@ -234,7 +238,7 @@ class MDB2_Driver_Reverse_oci8 extends MDB2_Driver_Reverse_Common WHERE (aic.table_name=? OR aic.table_name=?) AND (aic.index_name=? OR aic.index_name=?) AND (aic.table_owner=? OR aic.table_owner=?) - ORDER BY column_position"; + ORDER BY column_position'; $stmt = $db->prepare($query); if (PEAR::isError($stmt)) { return $stmt; @@ -331,9 +335,9 @@ class MDB2_Driver_Reverse_oci8 extends MDB2_Driver_Reverse_Common \'SIMPLE\' "match", CASE alc.deferrable WHEN \'NOT DEFERRABLE\' THEN 0 ELSE 1 END "deferrable", CASE alc.deferred WHEN \'IMMEDIATE\' THEN 0 ELSE 1 END "initiallydeferred", - alc.search_condition, + alc.search_condition AS "search_condition", alc.table_name, - cols.column_name, + cols.column_name AS "column_name", cols.position, r_alc.table_name "references_table", r_cols.column_name "references_field", @@ -509,14 +513,14 @@ class MDB2_Driver_Reverse_oci8 extends MDB2_Driver_Reverse_Common return $db; } - $query = 'SELECT trigger_name, - table_name, - trigger_body, - trigger_type, - triggering_event trigger_event, - description trigger_comment, - 1 trigger_enabled, - when_clause + $query = 'SELECT trigger_name AS "trigger_name", + table_name AS "table_name", + trigger_body AS "trigger_body", + trigger_type AS "trigger_type", + triggering_event AS "trigger_event", + description AS "trigger_comment", + 1 AS "trigger_enabled", + when_clause AS "when_clause" FROM user_triggers WHERE trigger_name = \''. strtoupper($trigger).'\''; $types = array( diff --git a/3rdparty/MDB2/Driver/oci8.php b/3rdparty/MDB2/Driver/oci8.php index 9f4137d610c..a1eefc94d15 100644 --- a/3rdparty/MDB2/Driver/oci8.php +++ b/3rdparty/MDB2/Driver/oci8.php @@ -634,6 +634,59 @@ class MDB2_Driver_oci8 extends MDB2_Driver_Common return $query; } + /** + * Obtain DBMS specific SQL code portion needed to declare a generic type + * field to be used in statement like CREATE TABLE, without the field name + * and type values (ie. just the character set, default value, if the + * field is permitted to be NULL or not, and the collation options). + * + * @param array $field associative array with the name of the properties + * of the field being declared as array indexes. Currently, the types + * of supported field properties are as follows: + * + * default + * Text value to be used as default for this field. + * notnull + * Boolean flag that indicates whether this field is constrained + * to not be set to null. + * charset + * Text value with the default CHARACTER SET for this field. + * collation + * Text value with the default COLLATION for this field. + * @return string DBMS specific SQL code portion that should be used to + * declare the specified field's options. + * @access protected + */ + function _getDeclarationOptions($field) + { + $charset = empty($field['charset']) ? '' : + ' '.$this->_getCharsetFieldDeclaration($field['charset']); + + $notnull = empty($field['notnull']) ? ' NULL' : ' NOT NULL'; + $default = ''; + if (array_key_exists('default', $field)) { + if ($field['default'] === '') { + $db = $this->getDBInstance(); + if (PEAR::isError($db)) { + return $db; + } + $valid_default_values = $this->getValidTypes(); + $field['default'] = $valid_default_values[$field['type']]; + if ($field['default'] === '' && ($db->options['portability'] & MDB2_PORTABILITY_EMPTY_TO_NULL)) { + $field['default'] = ' '; + } + } + if (null !== $field['default']) { + $default = ' DEFAULT ' . $this->quote($field['default'], $field['type']); + } + } + + $collation = empty($field['collation']) ? '' : + ' '.$this->_getCollationFieldDeclaration($field['collation']); + + return $charset.$default.$notnull.$collation; + } + // }}} // {{{ _doQuery() diff --git a/apps/files/ajax/newfile.php b/apps/files/ajax/newfile.php index 4619315ce09..495c8212163 100644 --- a/apps/files/ajax/newfile.php +++ b/apps/files/ajax/newfile.php @@ -67,7 +67,7 @@ if($source) { $result=OC_Filesystem::file_put_contents($target, $sourceStream); if($result) { $mime=OC_Filesystem::getMimetype($target); - $eventSource->send('success', $mime); + $eventSource->send('success', array('mime'=>$mime, 'size'=>OC_Filesystem::filesize($target))); } else { $eventSource->send('error', "Error while downloading ".$source. ' to '.$target); } diff --git a/apps/files/ajax/upload.php b/apps/files/ajax/upload.php index 7709becc6a8..fb3e277a215 100644 --- a/apps/files/ajax/upload.php +++ b/apps/files/ajax/upload.php @@ -49,7 +49,7 @@ if(strpos($dir, '..') === false) { for($i=0;$i<$fileCount;$i++) { $target = OCP\Files::buildNotExistingFileName(stripslashes($dir), $files['name'][$i]); if(is_uploaded_file($files['tmp_name'][$i]) and OC_Filesystem::fromTmpFile($files['tmp_name'][$i], $target)) { - $meta=OC_FileCache_Cached::get($target); + $meta = OC_FileCache::get($target); $result[]=array( "status" => "success", 'mime'=>$meta['mimetype'],'size'=>$meta['size'],'name'=>basename($target)); } } diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index 7ebfd4b68bb..f2b558496e0 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -260,7 +260,6 @@ var FileList={ FileList.prepareDeletion(files); } FileList.lastAction(); - return; } FileList.prepareDeletion(files); // NOTE: Temporary fix to change the text to unshared for files in root of Shared folder diff --git a/apps/files/js/files.js b/apps/files/js/files.js index 101e2bad2e4..aefd6f20bec 100644 --- a/apps/files/js/files.js +++ b/apps/files/js/files.js @@ -253,10 +253,10 @@ $(document).ready(function() { var img = OC.imagePath('core', 'loading.gif'); var tr=$('tr').filterAttr('data-file',dirName); tr.find('td.filename').attr('style','background-image:url('+img+')'); - uploadtext.text('1 file uploading'); + uploadtext.text(t('files', '1 file uploading')); uploadtext.show(); } else { - uploadtext.text(currentUploads + ' files uploading') + uploadtext.text(currentUploads + ' ' + t('files', 'files uploading')); } } } @@ -301,7 +301,7 @@ $(document).ready(function() { uploadtext.text(''); uploadtext.hide(); } else { - uploadtext.text(currentUploads + ' files uploading') + uploadtext.text(currentUploads + ' ' + t('files', 'files uploading')); } }) .error(function(jqXHR, textStatus, errorThrown) { @@ -316,7 +316,7 @@ $(document).ready(function() { uploadtext.text(''); uploadtext.hide(); } else { - uploadtext.text(currentUploads + ' files uploading') + uploadtext.text(currentUploads + ' ' + t('files', 'files uploading')); } $('#notification').hide(); $('#notification').text(t('files', 'Upload cancelled.')); @@ -556,10 +556,12 @@ $(document).ready(function() { eventSource.listen('progress',function(progress){ $('#uploadprogressbar').progressbar('value',progress); }); - eventSource.listen('success',function(mime){ + eventSource.listen('success',function(data){ + var mime=data.mime; + var size=data.size; $('#uploadprogressbar').fadeOut(); var date=new Date(); - FileList.addFile(localName,0,date,false,hidden); + FileList.addFile(localName,size,date,false,hidden); var tr=$('tr').filterAttr('data-file',localName); tr.data('mime',mime); getMimeIcon(mime,function(path){ @@ -661,7 +663,7 @@ function scanFiles(force,dir){ var scannerEventSource=new OC.EventSource(OC.filePath('files','ajax','scan.php'),{force:force,dir:dir}); scanFiles.cancel=scannerEventSource.close.bind(scannerEventSource); scannerEventSource.listen('scanning',function(data){ - $('#scan-count').text(data.count+' files scanned'); + $('#scan-count').text(data.count + ' ' + t('files', 'files scanned')); $('#scan-current').text(data.file+'/'); }); scannerEventSource.listen('success',function(success){ @@ -669,7 +671,7 @@ function scanFiles(force,dir){ if(success){ window.location.reload(); }else{ - alert('error while scanning'); + alert(t('files', 'error while scanning')); } }); } diff --git a/apps/files/l10n/da.php b/apps/files/l10n/da.php index 020f6142ec6..de0df6a26f0 100644 --- a/apps/files/l10n/da.php +++ b/apps/files/l10n/da.php @@ -7,13 +7,16 @@ "Missing a temporary folder" => "Mangler en midlertidig mappe", "Failed to write to disk" => "Fejl ved skrivning til disk.", "Files" => "Filer", +"Unshare" => "Fjern deling", "Delete" => "Slet", "already exists" => "findes allerede", "replace" => "erstat", +"suggest name" => "foreslå navn", "cancel" => "fortryd", "replaced" => "erstattet", "undo" => "fortryd", "with" => "med", +"unshared" => "udelt", "deleted" => "Slettet", "generating ZIP-file, it may take some time." => "genererer ZIP-fil, det kan tage lidt tid.", "Unable to upload your file as it is a directory or has 0 bytes" => "Kunne ikke uploade din fil, da det enten er en mappe eller er tom", @@ -35,6 +38,7 @@ "Enable ZIP-download" => "Muliggør ZIP-download", "0 is unlimited" => "0 er ubegrænset", "Maximum input size for ZIP files" => "Maksimal størrelse på ZIP filer", +"Save" => "Gem", "New" => "Ny", "Text file" => "Tekstfil", "Folder" => "Mappe", diff --git a/apps/files/l10n/de.php b/apps/files/l10n/de.php index 324fae16f08..701c3e877ad 100644 --- a/apps/files/l10n/de.php +++ b/apps/files/l10n/de.php @@ -52,5 +52,5 @@ "Upload too large" => "Upload zu groß", "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Die Datei überschreitet die Maximalgröße für Uploads auf diesem Server.", "Files are being scanned, please wait." => "Dateien werden gescannt, bitte warten.", -"Current scanning" => "Scannen" +"Current scanning" => "Scanne" ); diff --git a/apps/files/l10n/el.php b/apps/files/l10n/el.php index 9f311c6b28e..5b9f11814cf 100644 --- a/apps/files/l10n/el.php +++ b/apps/files/l10n/el.php @@ -7,19 +7,23 @@ "Missing a temporary folder" => "Λείπει ένας προσωρινός φάκελος", "Failed to write to disk" => "Η εγγραφή στο δίσκο απέτυχε", "Files" => "Αρχεία", +"Unshare" => "Διακοπή κοινής χρήσης", "Delete" => "Διαγραφή", "already exists" => "υπάρχει ήδη", "replace" => "αντικατέστησε", +"suggest name" => "συνιστώμενο όνομα", "cancel" => "ακύρωση", "replaced" => "αντικαταστάθηκε", "undo" => "αναίρεση", "with" => "με", +"unshared" => "Διακόπηκε η κοινή χρήση", "deleted" => "διαγράφηκε", "generating ZIP-file, it may take some time." => "παραγωγή αρχείου ZIP, ίσως διαρκέσει αρκετά.", "Unable to upload your file as it is a directory or has 0 bytes" => "Αδυναμία στην μεταφόρτωση του αρχείου σας αφού είναι φάκελος ή έχει 0 bytes", "Upload Error" => "Σφάλμα Μεταφόρτωσης", "Pending" => "Εν αναμονή", "Upload cancelled." => "Η μεταφόρτωση ακυρώθηκε.", +"File upload is in progress. Leaving the page now will cancel the upload." => "Η μεταφόρτωση του αρχείου βρίσκεται σε εξέλιξη. Έξοδος από την σελίδα τώρα θα ακυρώσει την μεταφόρτωση.", "Invalid name, '/' is not allowed." => "Μη έγκυρο όνομα, το '/' δεν επιτρέπεται.", "Size" => "Μέγεθος", "Modified" => "Τροποποιήθηκε", @@ -34,6 +38,7 @@ "Enable ZIP-download" => "Ενεργοποίηση κατεβάσματος ZIP", "0 is unlimited" => "0 για απεριόριστο", "Maximum input size for ZIP files" => "Μέγιστο μέγεθος για αρχεία ZIP", +"Save" => "Αποθήκευση", "New" => "Νέο", "Text file" => "Αρχείο κειμένου", "Folder" => "Φάκελος", diff --git a/apps/files/l10n/fr.php b/apps/files/l10n/fr.php index 929a2ffd4a3..c0f08b118d5 100644 --- a/apps/files/l10n/fr.php +++ b/apps/files/l10n/fr.php @@ -7,6 +7,7 @@ "Missing a temporary folder" => "Il manque un répertoire temporaire", "Failed to write to disk" => "Erreur d'écriture sur le disque", "Files" => "Fichiers", +"Unshare" => "Ne plus partager", "Delete" => "Supprimer", "already exists" => "existe déjà", "replace" => "remplacer", diff --git a/apps/files/l10n/he.php b/apps/files/l10n/he.php index 65d093e3662..e7ab4a524bc 100644 --- a/apps/files/l10n/he.php +++ b/apps/files/l10n/he.php @@ -8,6 +8,7 @@ "Failed to write to disk" => "הכתיבה לכונן נכשלה", "Files" => "קבצים", "Delete" => "מחיקה", +"already exists" => "כבר קיים", "generating ZIP-file, it may take some time." => "יוצר קובץ ZIP, אנא המתן.", "Unable to upload your file as it is a directory or has 0 bytes" => "לא יכול להעלות את הקובץ מכיוון שזו תקיה או שמשקל הקובץ 0 בתים", "Upload Error" => "שגיאת העלאה", diff --git a/apps/files/l10n/pl.php b/apps/files/l10n/pl.php index d3814333aca..289a6139158 100644 --- a/apps/files/l10n/pl.php +++ b/apps/files/l10n/pl.php @@ -7,6 +7,7 @@ "Missing a temporary folder" => "Brak katalogu tymczasowego", "Failed to write to disk" => "Błąd zapisu na dysk", "Files" => "Pliki", +"Unshare" => "Nie udostępniaj", "Delete" => "Usuwa element", "already exists" => "Już istnieje", "replace" => "zastap", @@ -15,6 +16,7 @@ "replaced" => "zastąpione", "undo" => "wróć", "with" => "z", +"unshared" => "Nie udostępnione", "deleted" => "skasuj", "generating ZIP-file, it may take some time." => "Generowanie pliku ZIP, może potrwać pewien czas.", "Unable to upload your file as it is a directory or has 0 bytes" => "Nie można wczytać pliku jeśli jest katalogiem lub ma 0 bajtów", diff --git a/apps/files/l10n/ru_RU.php b/apps/files/l10n/ru_RU.php new file mode 100644 index 00000000000..f43959d4e95 --- /dev/null +++ b/apps/files/l10n/ru_RU.php @@ -0,0 +1,56 @@ + "Ошибка отсутствует, файл загружен успешно.", +"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Размер загруженного файла превышает заданный в директиве upload_max_filesize в php.ini", +"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Размер загруженного", +"The uploaded file was only partially uploaded" => "Загружаемый файл был загружен частично", +"No file was uploaded" => "Файл не был загружен", +"Missing a temporary folder" => "Отсутствует временная папка", +"Failed to write to disk" => "Не удалось записать на диск", +"Files" => "Файлы", +"Unshare" => "Скрыть", +"Delete" => "Удалить", +"already exists" => "уже существует", +"replace" => "отмена", +"suggest name" => "подобрать название", +"cancel" => "отменить", +"replaced" => "заменено", +"undo" => "отменить действие", +"with" => "с", +"unshared" => "скрытый", +"deleted" => "удалено", +"generating ZIP-file, it may take some time." => "Создание ZIP-файла, это может занять некоторое время.", +"Unable to upload your file as it is a directory or has 0 bytes" => "Невозможно загрузить файл,\n так как он имеет нулевой размер или является директорией", +"Upload Error" => "Ошибка загрузки", +"Pending" => "Ожидающий решения", +"Upload cancelled." => "Загрузка отменена", +"File upload is in progress. Leaving the page now will cancel the upload." => "Процесс загрузки файла. Если покинуть страницу сейчас, загрузка будет отменена.", +"Invalid name, '/' is not allowed." => "Неправильное имя, '/' не допускается.", +"Size" => "Размер", +"Modified" => "Изменен", +"folder" => "папка", +"folders" => "папки", +"file" => "файл", +"files" => "файлы", +"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 url" => "Из url", +"Upload" => "Загрузить ", +"Cancel upload" => "Отмена загрузки", +"Nothing in here. Upload something!" => "Здесь ничего нет. Загрузите что-нибудь!", +"Name" => "Имя", +"Share" => "Сделать общим", +"Download" => "Загрузить", +"Upload too large" => "Загрузка слишком велика", +"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Размер файлов, которые Вы пытаетесь загрузить, превышает максимально допустимый размер для загрузки на данный сервер.", +"Files are being scanned, please wait." => "Файлы сканируются, пожалуйста, подождите.", +"Current scanning" => "Текущее сканирование" +); diff --git a/apps/files/l10n/zh_CN.GB2312.php b/apps/files/l10n/zh_CN.GB2312.php index 42063712eac..846f4234de1 100644 --- a/apps/files/l10n/zh_CN.GB2312.php +++ b/apps/files/l10n/zh_CN.GB2312.php @@ -7,19 +7,23 @@ "Missing a temporary folder" => "丢失了一个临时文件夹", "Failed to write to disk" => "写磁盘失败", "Files" => "文件", +"Unshare" => "取消共享", "Delete" => "删除", "already exists" => "已经存在了", "replace" => "替换", +"suggest name" => "推荐名称", "cancel" => "取消", "replaced" => "替换过了", "undo" => "撤销", "with" => "随着", +"unshared" => "已取消共享", "deleted" => "删除", "generating ZIP-file, it may take some time." => "正在生成ZIP文件,这可能需要点时间", "Unable to upload your file as it is a directory or has 0 bytes" => "不能上传你指定的文件,可能因为它是个文件夹或者大小为0", "Upload Error" => "上传错误", "Pending" => "Pending", "Upload cancelled." => "上传取消了", +"File upload is in progress. Leaving the page now will cancel the upload." => "文件正在上传。关闭页面会取消上传。", "Invalid name, '/' is not allowed." => "非法文件名,\"/\"是不被许可的", "Size" => "大小", "Modified" => "修改日期", @@ -34,6 +38,7 @@ "Enable ZIP-download" => "支持ZIP下载", "0 is unlimited" => "0是无限的", "Maximum input size for ZIP files" => "最大的ZIP文件输入大小", +"Save" => "保存", "New" => "新建", "Text file" => "文本文档", "Folder" => "文件夹", diff --git a/apps/files/l10n/zh_CN.php b/apps/files/l10n/zh_CN.php index 3fdb5b6af3e..cd8dbe406a4 100644 --- a/apps/files/l10n/zh_CN.php +++ b/apps/files/l10n/zh_CN.php @@ -7,6 +7,7 @@ "Missing a temporary folder" => "缺少临时目录", "Failed to write to disk" => "写入磁盘失败", "Files" => "文件", +"Unshare" => "取消分享", "Delete" => "删除", "already exists" => "已经存在", "replace" => "替换", @@ -15,6 +16,7 @@ "replaced" => "已经替换", "undo" => "撤销", "with" => "随着", +"unshared" => "已取消分享", "deleted" => "已经删除", "generating ZIP-file, it may take some time." => "正在生成 ZIP 文件,可能需要一些时间", "Unable to upload your file as it is a directory or has 0 bytes" => "无法上传文件,因为它是一个目录或者大小为 0 字节", diff --git a/apps/files_encryption/l10n/da.php b/apps/files_encryption/l10n/da.php new file mode 100644 index 00000000000..144c9f97084 --- /dev/null +++ b/apps/files_encryption/l10n/da.php @@ -0,0 +1,6 @@ + "Kryptering", +"Exclude the following file types from encryption" => "Ekskluder følgende filtyper fra kryptering", +"None" => "Ingen", +"Enable Encryption" => "Aktivér kryptering" +); diff --git a/apps/files_encryption/l10n/zh_CN.GB2312.php b/apps/files_encryption/l10n/zh_CN.GB2312.php new file mode 100644 index 00000000000..297444fcf55 --- /dev/null +++ b/apps/files_encryption/l10n/zh_CN.GB2312.php @@ -0,0 +1,6 @@ + "加密", +"Exclude the following file types from encryption" => "从加密中排除如下文件类型", +"None" => "无", +"Enable Encryption" => "启用加密" +); diff --git a/apps/files_external/js/dropbox.js b/apps/files_external/js/dropbox.js index dd3a1cb1858..6082fdd2cb7 100644 --- a/apps/files_external/js/dropbox.js +++ b/apps/files_external/js/dropbox.js @@ -19,6 +19,7 @@ $(document).ready(function() { if (result && result.status == 'success') { $(token).val(result.access_token); $(token_secret).val(result.access_token_secret); + $(configured).val('true'); OC.MountConfig.saveStorage(tr); $(tr).find('.configuration input').attr('disabled', 'disabled'); $(tr).find('.configuration').append('Access granted'); diff --git a/apps/files_external/l10n/el.php b/apps/files_external/l10n/el.php index 7dcf13b3972..3de151eb751 100644 --- a/apps/files_external/l10n/el.php +++ b/apps/files_external/l10n/el.php @@ -1,10 +1,18 @@ "Εξωτερική αποθήκευση", +"External Storage" => "Εξωτερικό Αποθηκευτικό Μέσο", "Mount point" => "Σημείο προσάρτησης", +"Backend" => "Σύστημα υποστήριξης", "Configuration" => "Ρυθμίσεις", "Options" => "Επιλογές", +"Applicable" => "Εφαρμόσιμο", +"Add mount point" => "Προσθήκη σημείου προσάρτησης", +"None set" => "Κανένα επιλεγμένο", "All Users" => "Όλοι οι χρήστες", "Groups" => "Ομάδες", "Users" => "Χρήστες", -"Delete" => "Διαγραφή" +"Delete" => "Διαγραφή", +"SSL root certificates" => "Πιστοποιητικά SSL root", +"Import Root Certificate" => "Εισαγωγή Πιστοποιητικού Root", +"Enable User External Storage" => "Ενεργοποίηση Εξωτερικού Αποθηκευτικού Χώρου Χρήστη", +"Allow users to mount their own external storage" => "Να επιτρέπεται στους χρήστες να προσαρτούν δικό τους εξωτερικό αποθηκευτικό χώρο" ); diff --git a/apps/files_external/l10n/zh_CN.GB2312.php b/apps/files_external/l10n/zh_CN.GB2312.php new file mode 100644 index 00000000000..6a6d1c6d12f --- /dev/null +++ b/apps/files_external/l10n/zh_CN.GB2312.php @@ -0,0 +1,18 @@ + "外部存储", +"Mount point" => "挂载点", +"Backend" => "后端", +"Configuration" => "配置", +"Options" => "选项", +"Applicable" => "可应用", +"Add mount point" => "添加挂载点", +"None set" => "未设置", +"All Users" => "所有用户", +"Groups" => "群组", +"Users" => "用户", +"Delete" => "删除", +"SSL root certificates" => "SSL 根证书", +"Import Root Certificate" => "导入根证书", +"Enable User External Storage" => "启用用户外部存储", +"Allow users to mount their own external storage" => "允许用户挂载他们的外部存储" +); diff --git a/apps/files_external/settings.php b/apps/files_external/settings.php index b586ce1e8cd..d2be21b7116 100644 --- a/apps/files_external/settings.php +++ b/apps/files_external/settings.php @@ -21,7 +21,9 @@ */ OCP\Util::addScript('files_external', 'settings'); +OCP\Util::addscript('3rdparty', 'chosen/chosen.jquery.min'); OCP\Util::addStyle('files_external', 'settings'); +OCP\Util::addStyle('3rdparty', 'chosen/chosen'); $tmpl = new OCP\Template('files_external', 'settings'); $tmpl->assign('isAdminPage', true, false); $tmpl->assign('mounts', OC_Mount_Config::getSystemMountPoints()); diff --git a/apps/files_sharing/l10n/da.php b/apps/files_sharing/l10n/da.php new file mode 100644 index 00000000000..1fd9f774a96 --- /dev/null +++ b/apps/files_sharing/l10n/da.php @@ -0,0 +1,7 @@ + "Kodeord", +"Submit" => "Send", +"Download" => "Download", +"No preview available for" => "Forhåndsvisning ikke tilgængelig for", +"web services under your control" => "Webtjenester under din kontrol" +); diff --git a/apps/files_sharing/l10n/el.php b/apps/files_sharing/l10n/el.php index 123a008e554..3406c508e61 100644 --- a/apps/files_sharing/l10n/el.php +++ b/apps/files_sharing/l10n/el.php @@ -1,4 +1,7 @@ "Συνθηματικό", -"Submit" => "Καταχώρηση" +"Submit" => "Καταχώρηση", +"Download" => "Λήψη", +"No preview available for" => "Δεν υπάρχει διαθέσιμη προεπισκόπηση για", +"web services under your control" => "υπηρεσίες δικτύου υπό τον έλεγχό σας" ); diff --git a/apps/files_sharing/l10n/zh_CN.GB2312.php b/apps/files_sharing/l10n/zh_CN.GB2312.php new file mode 100644 index 00000000000..fdde2c641f6 --- /dev/null +++ b/apps/files_sharing/l10n/zh_CN.GB2312.php @@ -0,0 +1,7 @@ + "密码", +"Submit" => "提交", +"Download" => "下载", +"No preview available for" => "没有预览可用于", +"web services under your control" => "您控制的网络服务" +); diff --git a/apps/files_versions/l10n/ca.php b/apps/files_versions/l10n/ca.php index b6ddc6feecf..51ff7aba1dd 100644 --- a/apps/files_versions/l10n/ca.php +++ b/apps/files_versions/l10n/ca.php @@ -1,6 +1,5 @@ "Expira totes les versions", "Versions" => "Versions", -"This will delete all existing backup versions of your files" => "Això eliminarà totes les versions de còpia de seguretat dels vostres fitxers", -"Enable Files Versioning" => "Habilita les versions de fitxers" +"This will delete all existing backup versions of your files" => "Això eliminarà totes les versions de còpia de seguretat dels vostres fitxers" ); diff --git a/apps/files_versions/l10n/cs_CZ.php b/apps/files_versions/l10n/cs_CZ.php index 4f33c1915f2..c99c4a27e82 100644 --- a/apps/files_versions/l10n/cs_CZ.php +++ b/apps/files_versions/l10n/cs_CZ.php @@ -2,5 +2,6 @@ "Expire all versions" => "Vypršet všechny verze", "Versions" => "Verze", "This will delete all existing backup versions of your files" => "Odstraní všechny existující zálohované verze Vašich souborů", -"Enable Files Versioning" => "Povolit verzování souborů" +"Files Versioning" => "Verzování souborů", +"Enable" => "Povolit" ); diff --git a/apps/files_versions/l10n/da.php b/apps/files_versions/l10n/da.php new file mode 100644 index 00000000000..6a69fdbe4cc --- /dev/null +++ b/apps/files_versions/l10n/da.php @@ -0,0 +1,5 @@ + "Lad alle versioner udløbe", +"Versions" => "Versioner", +"This will delete all existing backup versions of your files" => "Dette vil slette alle eksisterende backupversioner af dine filer" +); diff --git a/apps/files_versions/l10n/de.php b/apps/files_versions/l10n/de.php index 2c15884d1b5..235e31aedfe 100644 --- a/apps/files_versions/l10n/de.php +++ b/apps/files_versions/l10n/de.php @@ -2,5 +2,6 @@ "Expire all versions" => "Alle Versionen löschen", "Versions" => "Versionen", "This will delete all existing backup versions of your files" => "Dies löscht alle vorhandenen Sicherungsversionen Ihrer Dateien.", -"Enable Files Versioning" => "Datei-Versionierung aktivieren" +"Files Versioning" => "Dateiversionierung", +"Enable" => "Aktivieren" ); diff --git a/apps/files_versions/l10n/el.php b/apps/files_versions/l10n/el.php index 8953c96bd11..24511f37395 100644 --- a/apps/files_versions/l10n/el.php +++ b/apps/files_versions/l10n/el.php @@ -1,4 +1,7 @@ "Λήξη όλων των εκδόσεων", -"Enable Files Versioning" => "Ενεργοποίηση παρακολούθησης εκδόσεων αρχείων" +"Versions" => "Εκδόσεις", +"This will delete all existing backup versions of your files" => "Αυτό θα διαγράψει όλες τις υπάρχουσες εκδόσεις των αντιγράφων ασφαλείας των αρχείων σας", +"Files Versioning" => "Εκδόσεις Αρχείων", +"Enable" => "Ενεργοποίηση" ); diff --git a/apps/files_versions/l10n/eo.php b/apps/files_versions/l10n/eo.php index 2f22b5ac0a5..d0f89c576d4 100644 --- a/apps/files_versions/l10n/eo.php +++ b/apps/files_versions/l10n/eo.php @@ -1,6 +1,5 @@ "Eksvalidigi ĉiujn eldonojn", "Versions" => "Eldonoj", -"This will delete all existing backup versions of your files" => "Ĉi tio forigos ĉiujn estantajn sekurkopiajn eldonojn de viaj dosieroj", -"Enable Files Versioning" => "Kapabligi dosiereldonkontrolon" +"This will delete all existing backup versions of your files" => "Ĉi tio forigos ĉiujn estantajn sekurkopiajn eldonojn de viaj dosieroj" ); diff --git a/apps/files_versions/l10n/es.php b/apps/files_versions/l10n/es.php index 83d7ed0da2c..cff15bce43a 100644 --- a/apps/files_versions/l10n/es.php +++ b/apps/files_versions/l10n/es.php @@ -2,5 +2,6 @@ "Expire all versions" => "Expirar todas las versiones", "Versions" => "Versiones", "This will delete all existing backup versions of your files" => "Esto eliminará todas las versiones guardadas como copia de seguridad de tus archivos", -"Enable Files Versioning" => "Habilitar versionamiento de archivos" +"Files Versioning" => "Versionado de archivos", +"Enable" => "Habilitar" ); diff --git a/apps/files_versions/l10n/et_EE.php b/apps/files_versions/l10n/et_EE.php index cfc48537e09..f1ebd082ad5 100644 --- a/apps/files_versions/l10n/et_EE.php +++ b/apps/files_versions/l10n/et_EE.php @@ -1,6 +1,5 @@ "Kõikide versioonide aegumine", "Versions" => "Versioonid", -"This will delete all existing backup versions of your files" => "See kustutab kõik sinu failidest tehtud varuversiooni", -"Enable Files Versioning" => "Luba failide versioonihaldus" +"This will delete all existing backup versions of your files" => "See kustutab kõik sinu failidest tehtud varuversiooni" ); diff --git a/apps/files_versions/l10n/eu.php b/apps/files_versions/l10n/eu.php index 0f065c1e93c..889e762c6b9 100644 --- a/apps/files_versions/l10n/eu.php +++ b/apps/files_versions/l10n/eu.php @@ -1,6 +1,5 @@ "Iraungi bertsio guztiak", "Versions" => "Bertsioak", -"This will delete all existing backup versions of your files" => "Honek zure fitxategien bertsio guztiak ezabatuko ditu", -"Enable Files Versioning" => "Gaitu fitxategien bertsioak" +"This will delete all existing backup versions of your files" => "Honek zure fitxategien bertsio guztiak ezabatuko ditu" ); diff --git a/apps/files_versions/l10n/fa.php b/apps/files_versions/l10n/fa.php index e2dc6cba63f..98dd415969a 100644 --- a/apps/files_versions/l10n/fa.php +++ b/apps/files_versions/l10n/fa.php @@ -1,4 +1,3 @@ "انقضای تمامی نسخهها", -"Enable Files Versioning" => "فعالکردن پروندههای نسخهبندی" +"Expire all versions" => "انقضای تمامی نسخهها" ); diff --git a/apps/files_versions/l10n/fi_FI.php b/apps/files_versions/l10n/fi_FI.php index 5cfcbf28bd4..bc8aa67dc79 100644 --- a/apps/files_versions/l10n/fi_FI.php +++ b/apps/files_versions/l10n/fi_FI.php @@ -1,6 +1,5 @@ "Vanhenna kaikki versiot", "Versions" => "Versiot", -"This will delete all existing backup versions of your files" => "Tämä poistaa kaikki tiedostojesi olemassa olevat varmuuskopioversiot", -"Enable Files Versioning" => "Käytä tiedostojen versiointia" +"This will delete all existing backup versions of your files" => "Tämä poistaa kaikki tiedostojesi olemassa olevat varmuuskopioversiot" ); diff --git a/apps/files_versions/l10n/fr.php b/apps/files_versions/l10n/fr.php index 965fa02de98..b0e658e8df0 100644 --- a/apps/files_versions/l10n/fr.php +++ b/apps/files_versions/l10n/fr.php @@ -1,6 +1,5 @@ "Supprimer les versions intermédiaires", "Versions" => "Versions", -"This will delete all existing backup versions of your files" => "Cette opération va effacer toutes les versions intermédiaires de vos fichiers (et ne garder que la dernière version en date).", -"Enable Files Versioning" => "Activer le versionnage" +"This will delete all existing backup versions of your files" => "Cette opération va effacer toutes les versions intermédiaires de vos fichiers (et ne garder que la dernière version en date)." ); diff --git a/apps/files_versions/l10n/he.php b/apps/files_versions/l10n/he.php index 097169b2a49..09a013f45a8 100644 --- a/apps/files_versions/l10n/he.php +++ b/apps/files_versions/l10n/he.php @@ -1,6 +1,5 @@ "הפגת תוקף כל הגרסאות", "Versions" => "גרסאות", -"This will delete all existing backup versions of your files" => "פעולה זו תמחק את כל גיבויי הגרסאות הקיימים של הקבצים שלך", -"Enable Files Versioning" => "הפעלת ניהול גרסאות לקבצים" +"This will delete all existing backup versions of your files" => "פעולה זו תמחק את כל גיבויי הגרסאות הקיימים של הקבצים שלך" ); diff --git a/apps/files_versions/l10n/it.php b/apps/files_versions/l10n/it.php index b7b0b9627b1..59f7e759b19 100644 --- a/apps/files_versions/l10n/it.php +++ b/apps/files_versions/l10n/it.php @@ -2,5 +2,6 @@ "Expire all versions" => "Scadenza di tutte le versioni", "Versions" => "Versioni", "This will delete all existing backup versions of your files" => "Ciò eliminerà tutte le versioni esistenti dei tuoi file", -"Enable Files Versioning" => "Abilita controllo di versione" +"Files Versioning" => "Controllo di versione dei file", +"Enable" => "Abilita" ); diff --git a/apps/files_versions/l10n/ja_JP.php b/apps/files_versions/l10n/ja_JP.php index 81d17f56f8f..7a00d0b4dad 100644 --- a/apps/files_versions/l10n/ja_JP.php +++ b/apps/files_versions/l10n/ja_JP.php @@ -1,6 +1,5 @@ "すべてのバージョンを削除する", "Versions" => "バージョン", -"This will delete all existing backup versions of your files" => "これは、あなたのファイルのすべてのバックアップバージョンを削除します", -"Enable Files Versioning" => "ファイルのバージョン管理を有効にする" +"This will delete all existing backup versions of your files" => "これは、あなたのファイルのすべてのバックアップバージョンを削除します" ); diff --git a/apps/files_versions/l10n/lt_LT.php b/apps/files_versions/l10n/lt_LT.php index 5da209f31b9..b3810d06ec7 100644 --- a/apps/files_versions/l10n/lt_LT.php +++ b/apps/files_versions/l10n/lt_LT.php @@ -1,4 +1,3 @@ "Panaikinti visų versijų galiojimą", -"Enable Files Versioning" => "Įjungti failų versijų vedimą" +"Expire all versions" => "Panaikinti visų versijų galiojimą" ); diff --git a/apps/files_versions/l10n/nl.php b/apps/files_versions/l10n/nl.php index da31603ff54..486b4ed45cf 100644 --- a/apps/files_versions/l10n/nl.php +++ b/apps/files_versions/l10n/nl.php @@ -1,6 +1,5 @@ "Alle versies laten verlopen", "Versions" => "Versies", -"This will delete all existing backup versions of your files" => "Dit zal alle bestaande backup versies van uw bestanden verwijderen", -"Enable Files Versioning" => "Activeer file versioning" +"This will delete all existing backup versions of your files" => "Dit zal alle bestaande backup versies van uw bestanden verwijderen" ); diff --git a/apps/files_versions/l10n/pl.php b/apps/files_versions/l10n/pl.php index c25d37611a0..a198792a5bc 100644 --- a/apps/files_versions/l10n/pl.php +++ b/apps/files_versions/l10n/pl.php @@ -1,6 +1,5 @@ "Wygasają wszystkie wersje", "Versions" => "Wersje", -"This will delete all existing backup versions of your files" => "Spowoduje to usunięcie wszystkich istniejących wersji kopii zapasowych plików", -"Enable Files Versioning" => "Włącz wersjonowanie plików" +"This will delete all existing backup versions of your files" => "Spowoduje to usunięcie wszystkich istniejących wersji kopii zapasowych plików" ); diff --git a/apps/files_versions/l10n/pt_BR.php b/apps/files_versions/l10n/pt_BR.php index a90b48fe3a3..102b6d62743 100644 --- a/apps/files_versions/l10n/pt_BR.php +++ b/apps/files_versions/l10n/pt_BR.php @@ -1,4 +1,3 @@ "Expirar todas as versões", -"Enable Files Versioning" => "Habilitar versionamento de arquivos" +"Expire all versions" => "Expirar todas as versões" ); diff --git a/apps/files_versions/l10n/ru.php b/apps/files_versions/l10n/ru.php index 675dd090d30..f91cae90a14 100644 --- a/apps/files_versions/l10n/ru.php +++ b/apps/files_versions/l10n/ru.php @@ -1,6 +1,5 @@ "Просрочить все версии", "Versions" => "Версии", -"This will delete all existing backup versions of your files" => "Очистить список версий ваших файлов", -"Enable Files Versioning" => "Включить ведение версий файлов" +"This will delete all existing backup versions of your files" => "Очистить список версий ваших файлов" ); diff --git a/apps/files_versions/l10n/sl.php b/apps/files_versions/l10n/sl.php index aec6edb3c22..9984bcb5e80 100644 --- a/apps/files_versions/l10n/sl.php +++ b/apps/files_versions/l10n/sl.php @@ -2,5 +2,6 @@ "Expire all versions" => "Zastaraj vse različice", "Versions" => "Različice", "This will delete all existing backup versions of your files" => "To bo izbrisalo vse obstoječe različice varnostnih kopij vaših datotek", -"Enable Files Versioning" => "Omogoči sledenje različicam datotek" +"Files Versioning" => "Sledenje različicam", +"Enable" => "Omogoči" ); diff --git a/apps/files_versions/l10n/sv.php b/apps/files_versions/l10n/sv.php index 5788d8ae197..218bd6ee2ea 100644 --- a/apps/files_versions/l10n/sv.php +++ b/apps/files_versions/l10n/sv.php @@ -2,5 +2,6 @@ "Expire all versions" => "Upphör alla versioner", "Versions" => "Versioner", "This will delete all existing backup versions of your files" => "Detta kommer att radera alla befintliga säkerhetskopior av dina filer", -"Enable Files Versioning" => "Aktivera versionshantering" +"Files Versioning" => "Versionshantering av filer", +"Enable" => "Aktivera" ); diff --git a/apps/files_versions/l10n/th_TH.php b/apps/files_versions/l10n/th_TH.php index 4f26e3bd035..62ab0548f4b 100644 --- a/apps/files_versions/l10n/th_TH.php +++ b/apps/files_versions/l10n/th_TH.php @@ -2,5 +2,6 @@ "Expire all versions" => "หมดอายุทุกรุ่น", "Versions" => "รุ่น", "This will delete all existing backup versions of your files" => "นี่จะเป็นลบทิ้งไฟล์รุ่นที่ทำการสำรองข้อมูลทั้งหมดที่มีอยู่ของคุณทิ้งไป", -"Enable Files Versioning" => "เปิดใช้งานคุณสมบัติการแยกสถานะรุ่นหรือเวอร์ชั่นของไฟล์" +"Files Versioning" => "การกำหนดเวอร์ชั่นของไฟล์", +"Enable" => "เปิดใช้งาน" ); diff --git a/apps/files_versions/l10n/vi.php b/apps/files_versions/l10n/vi.php index 6743395481f..992c0751d0a 100644 --- a/apps/files_versions/l10n/vi.php +++ b/apps/files_versions/l10n/vi.php @@ -1,6 +1,5 @@ "Hết hạn tất cả các phiên bản", "Versions" => "Phiên bản", -"This will delete all existing backup versions of your files" => "Điều này sẽ xóa tất cả các phiên bản sao lưu hiện có ", -"Enable Files Versioning" => "BẬT tập tin phiên bản" +"This will delete all existing backup versions of your files" => "Điều này sẽ xóa tất cả các phiên bản sao lưu hiện có " ); diff --git a/apps/files_versions/l10n/zh_CN.GB2312.php b/apps/files_versions/l10n/zh_CN.GB2312.php new file mode 100644 index 00000000000..43af097a21e --- /dev/null +++ b/apps/files_versions/l10n/zh_CN.GB2312.php @@ -0,0 +1,7 @@ + "作废所有版本", +"Versions" => "版本", +"This will delete all existing backup versions of your files" => "这将删除所有您现有文件的备份版本", +"Files Versioning" => "文件版本", +"Enable" => "启用" +); diff --git a/apps/files_versions/l10n/zh_CN.php b/apps/files_versions/l10n/zh_CN.php index 56a474be89a..1a5caae7dfa 100644 --- a/apps/files_versions/l10n/zh_CN.php +++ b/apps/files_versions/l10n/zh_CN.php @@ -2,5 +2,6 @@ "Expire all versions" => "过期所有版本", "Versions" => "版本", "This will delete all existing backup versions of your files" => "将会删除您的文件的所有备份版本", -"Enable Files Versioning" => "开启文件版本" +"Files Versioning" => "文件版本", +"Enable" => "开启" ); diff --git a/apps/files_versions/lib/versions.php b/apps/files_versions/lib/versions.php index dedd83fc25a..c517eb01ff5 100644 --- a/apps/files_versions/lib/versions.php +++ b/apps/files_versions/lib/versions.php @@ -77,6 +77,7 @@ class Storage { $versionsFolderName=\OCP\Config::getSystemValue('datadirectory') . $this->view->getAbsolutePath(''); //check if source file already exist as version to avoid recursions. + // todo does this check work? if ($users_view->file_exists($filename)) { return false; } @@ -96,6 +97,11 @@ class Storage { } } + // we should have a source file to work with + if (!$files_view->file_exists($filename)) { + return false; + } + // check filesize if($files_view->filesize($filename)>\OCP\Config::getSystemValue('files_versionsmaxfilesize', Storage::DEFAULTMAXFILESIZE)) { return false; @@ -118,7 +124,7 @@ class Storage { if(!file_exists($versionsFolderName.'/'.$info['dirname'])) mkdir($versionsFolderName.'/'.$info['dirname'],0700,true); // store a new version of a file - @$users_view->copy('files'.$filename, 'files_versions'.$filename.'.v'.time()); + $users_view->copy('files'.$filename, 'files_versions'.$filename.'.v'.time()); // expire old revisions if necessary Storage::expire($filename); diff --git a/apps/files_versions/templates/settings.php b/apps/files_versions/templates/settings.php index 8682fc0f499..88063cb075b 100644 --- a/apps/files_versions/templates/settings.php +++ b/apps/files_versions/templates/settings.php @@ -1,5 +1,6 @@
diff --git a/apps/user_ldap/l10n/de.php b/apps/user_ldap/l10n/de.php index 2c178d0b4fd..df676711792 100644 --- a/apps/user_ldap/l10n/de.php +++ b/apps/user_ldap/l10n/de.php @@ -24,7 +24,7 @@ "Do not use it for SSL connections, it will fail." => "Verwenden Sie es nicht für SSL-Verbindungen, es wird fehlschlagen.", "Case insensitve LDAP server (Windows)" => "LDAP-Server (Windows: Groß- und Kleinschreibung bleibt unbeachtet)", "Turn off SSL certificate validation." => "Schalte die SSL-Zertifikatsprüfung aus.", -"If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Falls die Verbindung es erfordert, wird das SSL-Zertifikat des LDAP-Server importiert werden.", +"If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Falls die Verbindung es erfordert, muss das SSL-Zertifikat des LDAP-Server importiert werden.", "Not recommended, use for testing only." => "Nicht empfohlen, nur zu Testzwecken.", "User Display Name Field" => "Feld für den Anzeigenamen des Benutzers", "The LDAP attribute to use to generate the user`s ownCloud name." => "Das LDAP-Attribut für die Generierung des Benutzernamens in ownCloud. ", diff --git a/apps/user_ldap/l10n/zh_CN.GB2312.php b/apps/user_ldap/l10n/zh_CN.GB2312.php new file mode 100644 index 00000000000..8b906aea5ce --- /dev/null +++ b/apps/user_ldap/l10n/zh_CN.GB2312.php @@ -0,0 +1,37 @@ + "主机", +"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" => "用户登录过滤器", +"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "定义尝试登录时要应用的过滤器。用 %%uid 替换登录操作中使用的用户名。", +"use %%uid placeholder, e.g. \"uid=%%uid\"" => "使用 %%uid 占位符,例如 \"uid=%%uid\"", +"User List Filter" => "用户列表过滤器", +"Defines the filter to apply, when retrieving users." => "定义撷取用户时要应用的过滤器。", +"without any placeholder, e.g. \"objectClass=person\"." => "不能使用占位符,例如 \"objectClass=person\"。", +"Group Filter" => "群组过滤器", +"Defines the filter to apply, when retrieving groups." => "定义撷取群组时要应用的过滤器", +"without any placeholder, e.g. \"objectClass=posixGroup\"." => "不能使用占位符,例如 \"objectClass=posixGroup\"。", +"Port" => "端口", +"Base User Tree" => "基本用户树", +"Base Group Tree" => "基本群组树", +"Group-Member association" => "群组-成员组合", +"Use TLS" => "使用 TLS", +"Do not use it for SSL connections, it will fail." => "不要使用它进行 SSL 连接,会失败的。", +"Case insensitve LDAP server (Windows)" => "大小写不敏感的 LDAP 服务器 (Windows)", +"Turn off SSL certificate validation." => "关闭 SSL 证书校验。", +"If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "如果只有使用此选项才能连接,请导入 LDAP 服务器的 SSL 证书到您的 ownCloud 服务器。", +"Not recommended, use for testing only." => "不推荐,仅供测试", +"User Display Name Field" => "用户显示名称字段", +"The LDAP attribute to use to generate the user`s ownCloud name." => "用于生成用户的 ownCloud 名称的 LDAP 属性。", +"Group Display Name Field" => "群组显示名称字段", +"The LDAP attribute to use to generate the groups`s ownCloud name." => "用于生成群组的 ownCloud 名称的 LDAP 属性。", +"in bytes" => "以字节计", +"in seconds. A change empties the cache." => "以秒计。修改会清空缓存。", +"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "用户名请留空 (默认)。否则,请指定一个 LDAP/AD 属性。", +"Help" => "帮助" +); diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php index 089548a69ba..53619ab4c1d 100644 --- a/apps/user_ldap/lib/access.php +++ b/apps/user_ldap/lib/access.php @@ -385,7 +385,7 @@ abstract class Access { $sqlAdjustment = ''; $dbtype = \OCP\Config::getSystemValue('dbtype'); if($dbtype == 'mysql') { - $sqlAdjustment = 'FROM `dual`'; + $sqlAdjustment = 'FROM DUAL'; } $insert = \OCP\DB::prepare(' diff --git a/core/l10n/de.php b/core/l10n/de.php index 611c208fe4d..bcc04496405 100644 --- a/core/l10n/de.php +++ b/core/l10n/de.php @@ -1,5 +1,5 @@ "Applikationsname nicht angegeben", +"Application name not provided." => "Anwendungsname nicht angegeben", "No category to add?" => "Keine Kategorie hinzuzufügen?", "This category already exists: " => "Kategorie existiert bereits:", "Settings" => "Einstellungen", diff --git a/core/l10n/el.php b/core/l10n/el.php index 18a26f892c0..227e981f2b2 100644 --- a/core/l10n/el.php +++ b/core/l10n/el.php @@ -50,6 +50,7 @@ "Database user" => "Χρήστης της βάσης δεδομένων", "Database password" => "Κωδικός πρόσβασης βάσης δεδομένων", "Database name" => "Όνομα βάσης δεδομένων", +"Database tablespace" => "Κενά Πινάκων Βάσης Δεδομένων", "Database host" => "Διακομιστής βάσης δεδομένων", "Finish setup" => "Ολοκλήρωση εγκατάστασης", "web services under your control" => "Υπηρεσίες web υπό τον έλεγχό σας", diff --git a/core/l10n/he.php b/core/l10n/he.php index f0a18103a8f..74b6fe7aa43 100644 --- a/core/l10n/he.php +++ b/core/l10n/he.php @@ -50,6 +50,7 @@ "Database user" => "שם משתמש במסד הנתונים", "Database password" => "ססמת מסד הנתונים", "Database name" => "שם מסד הנתונים", +"Database tablespace" => "מרחב הכתובות של מסד הנתונים", "Database host" => "שרת בסיס נתונים", "Finish setup" => "סיום התקנה", "web services under your control" => "שירותי רשת בשליטתך", diff --git a/core/l10n/ro.php b/core/l10n/ro.php index 484a47727dc..9ec6a048fcf 100644 --- a/core/l10n/ro.php +++ b/core/l10n/ro.php @@ -3,6 +3,24 @@ "No category to add?" => "Nici o categorie de adăugat?", "This category already exists: " => "Această categorie deja există:", "Settings" => "Configurări", +"January" => "Ianuarie", +"February" => "Februarie", +"March" => "Martie", +"April" => "Aprilie", +"May" => "Mai", +"June" => "Iunie", +"July" => "Iulie", +"August" => "August", +"September" => "Septembrie", +"October" => "Octombrie", +"November" => "Noiembrie", +"December" => "Decembrie", +"Cancel" => "Anulare", +"No" => "Nu", +"Yes" => "Da", +"Ok" => "Ok", +"No categories selected for deletion." => "Nici o categorie selectată pentru ștergere.", +"Error" => "Eroare", "ownCloud password reset" => "Resetarea parolei ownCloud ", "Use the following link to reset your password: {link}" => "Folosește următorul link pentru a reseta parola: {link}", "You will receive a link to reset your password via Email." => "Vei primi un mesaj prin care vei putea reseta parola via email", diff --git a/core/l10n/ru_RU.php b/core/l10n/ru_RU.php new file mode 100644 index 00000000000..190ecda9ebb --- /dev/null +++ b/core/l10n/ru_RU.php @@ -0,0 +1,64 @@ + "Имя приложения не предоставлено.", +"No category to add?" => "Нет категории для добавления?", +"This category already exists: " => "Эта категория уже существует:", +"Settings" => "Настройки", +"January" => "Январь", +"February" => "Февраль", +"March" => "Март", +"April" => "Апрель", +"May" => "Май", +"June" => "Июнь", +"July" => "Июль", +"August" => "Август", +"September" => "Сентябрь", +"October" => "Октябрь", +"November" => "Ноябрь", +"December" => "Декабрь", +"Cancel" => "Отмена", +"No" => "Нет", +"Yes" => "Да", +"Ok" => "Да", +"No categories selected for deletion." => "Нет категорий, выбранных для удаления.", +"Error" => "Ошибка", +"ownCloud password reset" => "Переназначение пароля", +"Use the following link to reset your password: {link}" => "Воспользуйтесь следующей ссылкой для переназначения пароля: {link}", +"You will receive a link to reset your password via Email." => "Вы получите ссылку для восстановления пароля по электронной почте.", +"Requested" => "Запрашиваемое", +"Login failed!" => "Войти не удалось!", +"Username" => "Имя пользователя", +"Request reset" => "Сброс запроса", +"Your password was reset" => "Ваш пароль был переустановлен", +"To login page" => "На страницу входа", +"New password" => "Новый пароль", +"Reset password" => "Переназначение пароля", +"Personal" => "Персональный", +"Users" => "Пользователи", +"Apps" => "Приложения", +"Admin" => "Администратор", +"Help" => "Помощь", +"Access forbidden" => "Доступ запрещен", +"Cloud not found" => "Облако не найдено", +"Edit categories" => "Редактирование категорий", +"Add" => "Добавить", +"Create an admin account" => "Создать admin account", +"Password" => "Пароль", +"Advanced" => "Расширенный", +"Data folder" => "Папка данных", +"Configure the database" => "Настроить базу данных", +"will be used" => "будет использоваться", +"Database user" => "Пользователь базы данных", +"Database password" => "Пароль базы данных", +"Database name" => "Имя базы данных", +"Database tablespace" => "Табличная область базы данных", +"Database host" => "Сервер базы данных", +"Finish setup" => "Завершение настройки", +"web services under your control" => "веб-сервисы под Вашим контролем", +"Log out" => "Выйти", +"Lost your password?" => "Забыли пароль?", +"remember" => "запомнить", +"Log in" => "Войти", +"You are logged out." => "Вы вышли из системы.", +"prev" => "предыдущий", +"next" => "следующий" +); diff --git a/core/l10n/zh_CN.GB2312.php b/core/l10n/zh_CN.GB2312.php index 58104df3997..e59a935f394 100644 --- a/core/l10n/zh_CN.GB2312.php +++ b/core/l10n/zh_CN.GB2312.php @@ -50,6 +50,7 @@ "Database user" => "数据库用户", "Database password" => "数据库密码", "Database name" => "数据库用户名", +"Database tablespace" => "数据库表格空间", "Database host" => "数据库主机", "Finish setup" => "完成安装", "web services under your control" => "你控制下的网络服务", diff --git a/db_structure.xml b/db_structure.xml index 2256dff943c..74e2805308a 100644 --- a/db_structure.xml +++ b/db_structure.xml @@ -76,8 +76,7 @@