diff options
770 files changed, 28683 insertions, 5420 deletions
diff --git a/apps/files/ajax/list.php b/apps/files/ajax/list.php index 2d76b685018..bae3628402f 100644 --- a/apps/files/ajax/list.php +++ b/apps/files/ajax/list.php @@ -17,8 +17,11 @@ $baseUrl = OCP\Util::linkTo('files', 'index.php') . '?dir='; $permissions = $dirInfo->getPermissions(); +$sortAttribute = isset( $_GET['sort'] ) ? $_GET['sort'] : 'name'; +$sortDirection = isset( $_GET['sortdirection'] ) ? ($_GET['sortdirection'] === 'desc') : false; + // make filelist -$files = \OCA\Files\Helper::getFiles($dir); +$files = \OCA\Files\Helper::getFiles($dir, $sortAttribute, $sortDirection); $data['directory'] = $dir; $data['files'] = \OCA\Files\Helper::formatFileInfos($files); diff --git a/apps/files/appinfo/update.php b/apps/files/appinfo/update.php deleted file mode 100644 index f920f842166..00000000000 --- a/apps/files/appinfo/update.php +++ /dev/null @@ -1,46 +0,0 @@ -<?php - -// fix webdav properties,add namespace in front of the property, update for OC4.5 -$installedVersion=OCP\Config::getAppValue('files', 'installed_version'); -if (version_compare($installedVersion, '1.1.6', '<')) { - $concat = OC_DB::getConnection()->getDatabasePlatform()-> - getConcatExpression( '\'{DAV:}\'', '`propertyname`' ); - $query = OC_DB::prepare(' - UPDATE `*PREFIX*properties` - SET `propertyname` = ' . $concat . ' - WHERE `propertyname` NOT LIKE \'{%\' - '); - $query->execute(); -} - -//update from OC 3 - -//try to remove remaining files. -//Give a warning if not possible - -$filesToRemove = array( - 'ajax', - 'appinfo', - 'css', - 'js', - 'l10n', - 'templates', - 'admin.php', - 'download.php', - 'index.php', - 'settings.php' -); - -foreach($filesToRemove as $file) { - $filepath = OC::$SERVERROOT . '/files/' . $file; - if(!file_exists($filepath)) { - continue; - } - $success = OCP\Files::rmdirr($filepath); - if($success === false) { - //probably not sufficient privileges, give up and give a message. - OCP\Util::writeLog('files', 'Could not clean /files/ directory.' - .' Please remove everything except webdav.php from ' . OC::$SERVERROOT . '/files/', OCP\Util::ERROR); - break; - } -} diff --git a/apps/files/css/files.css b/apps/files/css/files.css index 533050691d5..3dc5ef5a396 100644 --- a/apps/files/css/files.css +++ b/apps/files/css/files.css @@ -83,7 +83,7 @@ min-width: 688px; /* 768 (mobile break) - 80 (nav width) */ } -#filestable tbody tr { background-color:#fff; height:40px; } +#filestable tbody tr { background-color:#fff; height:51px; } #filestable tbody tr:hover, tbody tr:active { background-color: rgb(240,240,240); } @@ -116,10 +116,29 @@ tr:hover span.extension { table tr.mouseOver td { background-color:#eee; } table th { height:24px; padding:0 8px; color:#999; } -table th .name { - position: absolute; - left: 55px; - top: 15px; +table th .columntitle { + display: inline-block; + padding: 15px; + width: 100%; + height: 50px; + box-sizing: border-box; + -moz-box-sizing: border-box; + vertical-align: middle; +} +table th .columntitle.name { + padding-left: 5px; + margin-left: 50px; + max-width: 300px; +} +/* hover effect on sortable column */ +table th a.columntitle:hover { + background-color: #F0F0F0; +} +table th .sort-indicator { + width: 10px; + height: 8px; + margin-left: 10px; + display: inline-block; } table th, table td { border-bottom:1px solid #ddd; text-align:left; font-weight:normal; } table td { @@ -139,8 +158,11 @@ table th#headerName { } table th#headerSize, table td.filesize { min-width: 48px; - padding: 0 16px; text-align: right; + padding: 0; +} +table table td.filesize { + padding: 0 16px; } table th#headerDate, table td.date { -moz-box-sizing: border-box; @@ -197,10 +219,6 @@ table td.filename input.filename { table td.filename a, table td.login, table td.logout, table td.download, table td.upload, table td.create, table td.delete { padding:3px 8px 8px 3px; } table td.filename .nametext, .uploadtext, .modified { float:left; padding:14px 0; } -#modified { - position: absolute; - top: 15px; -} .modified { position: relative; padding-left: 8px; diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js index 963fc647828..67775b22c54 100644 --- a/apps/files/js/file-upload.js +++ b/apps/files/js/file-upload.js @@ -18,7 +18,7 @@ * - TODO music upload button */ -/* global OC, t, n */ +/* global Files, FileList, jQuery, oc_requesttoken, humanFileSize, getUniqueName */ /** * Function that will allow us to know if Ajax uploads are supported @@ -65,7 +65,7 @@ OC.Upload = { */ cancelUploads:function() { this.log('canceling uploads'); - jQuery.each(this._uploads,function(i, jqXHR) { + jQuery.each(this._uploads, function(i, jqXHR) { jqXHR.abort(); }); this._uploads = []; @@ -83,7 +83,7 @@ OC.Upload = { isProcessing:function() { var count = 0; - jQuery.each(this._uploads,function(i, data) { + jQuery.each(this._uploads, function(i, data) { if (data.state() === 'pending') { count++; } @@ -205,14 +205,16 @@ OC.Upload = { */ add: function(e, data) { OC.Upload.log('add', e, data); - var that = $(this); - var freeSpace; + var that = $(this), freeSpace; - // we need to collect all data upload objects before starting the upload so we can check their existence - // and set individual conflict actions. unfortunately there is only one variable that we can use to identify - // the selection a data upload is part of, so we have to collect them in data.originalFiles - // turning singleFileUploads off is not an option because we want to gracefully handle server errors like - // already exists + // we need to collect all data upload objects before + // starting the upload so we can check their existence + // and set individual conflict actions. Unfortunately, + // there is only one variable that we can use to identify + // the selection a data upload is part of, so we have to + // collect them in data.originalFiles turning + // singleFileUploads off is not an option because we want + // to gracefully handle server errors like 'already exists' // create a container where we can store the data objects if ( ! data.originalFiles.selection ) { @@ -244,14 +246,15 @@ OC.Upload = { // in case folder drag and drop is not supported file will point to a directory // http://stackoverflow.com/a/20448357 - if (!file.type && file.size%4096 === 0 && file.size <= 102400) { + if ( ! file.type && file.size%4096 === 0 && file.size <= 102400) { try { - reader = new FileReader(); - reader.readAsBinaryString(f); + var reader = new FileReader(); + reader.readAsBinaryString(file); } catch (NS_ERROR_FILE_ACCESS_DENIED) { //file is a directory data.textStatus = 'dirorzero'; - data.errorThrown = t('files', 'Unable to upload {filename} as it is a directory or has 0 bytes', + data.errorThrown = t('files', + 'Unable to upload {filename} as it is a directory or has 0 bytes', {filename: file.name} ); } @@ -263,7 +266,8 @@ OC.Upload = { // check PHP upload limit if (selection.totalBytes > $('#upload_limit').val()) { data.textStatus = 'sizeexceedlimit'; - data.errorThrown = t('files', 'Total file size {size1} exceeds upload limit {size2}', { + data.errorThrown = t('files', + 'Total file size {size1} exceeds upload limit {size2}', { 'size1': humanFileSize(selection.totalBytes), 'size2': humanFileSize($('#upload_limit').val()) }); @@ -273,7 +277,8 @@ OC.Upload = { freeSpace = $('#free_space').val(); if (freeSpace >= 0 && selection.totalBytes > freeSpace) { data.textStatus = 'notenoughspace'; - data.errorThrown = t('files', 'Not enough free space, you are uploading {size1} but only {size2} is left', { + data.errorThrown = t('files', + 'Not enough free space, you are uploading {size1} but only {size2} is left', { 'size1': humanFileSize(selection.totalBytes), 'size2': humanFileSize($('#free_space').val()) }); @@ -384,31 +389,29 @@ OC.Upload = { //fetch response from iframe response = data.result[0].body.innerText; } - var result=$.parseJSON(response); + var result = $.parseJSON(response); delete data.jqXHR; + var fu = $(this).data('blueimp-fileupload') || $(this).data('fileupload'); + if (result.status === 'error' && result.data && result.data.message){ data.textStatus = 'servererror'; data.errorThrown = result.data.message; - var fu = $(this).data('blueimp-fileupload') || $(this).data('fileupload'); fu._trigger('fail', e, data); } else if (typeof result[0] === 'undefined') { data.textStatus = 'servererror'; data.errorThrown = t('files', 'Could not get result from server.'); - var fu = $(this).data('blueimp-fileupload') || $(this).data('fileupload'); fu._trigger('fail', e, data); } else if (result[0].status === 'existserror') { //show "file already exists" dialog var original = result[0]; var replacement = data.files[0]; - var fu = $(this).data('blueimp-fileupload') || $(this).data('fileupload'); OC.dialogs.fileexists(data, original, replacement, OC.Upload, fu); } else if (result[0].status !== 'success') { //delete data.jqXHR; data.textStatus = 'servererror'; data.errorThrown = result[0].data.message; // error message has been translated on server - var fu = $(this).data('blueimp-fileupload') || $(this).data('fileupload'); fu._trigger('fail', e, data); } }, @@ -440,7 +443,7 @@ OC.Upload = { fileupload.on('fileuploadstart', function(e, data) { OC.Upload.log('progress handle fileuploadstart', e, data); $('#uploadprogresswrapper input.stop').show(); - $('#uploadprogressbar').progressbar({value:0}); + $('#uploadprogressbar').progressbar({value: 0}); $('#uploadprogressbar').fadeIn(); }); fileupload.on('fileuploadprogress', function(e, data) { @@ -509,7 +512,7 @@ OC.Upload = { $('#new li').each(function(i,element) { if ($(element).children('p').length === 0) { $(element).children('form').remove(); - $(element).append('<p>'+$(element).data('text')+'</p>'); + $(element).append('<p>' + $(element).data('text') + '</p>'); } }); }); @@ -527,16 +530,16 @@ OC.Upload = { $('#new .error').tipsy('hide'); - $('#new li').each(function(i,element) { + $('#new li').each(function(i, element) { if ($(element).children('p').length === 0) { $(element).children('form').remove(); - $(element).append('<p>'+$(element).data('text')+'</p>'); + $(element).append('<p>' + $(element).data('text') + '</p>'); } }); - var type=$(this).data('type'); - var text=$(this).children('p').text(); - $(this).data('text',text); + var type = $(this).data('type'); + var text = $(this).children('p').text(); + $(this).data('text', text); $(this).children('p').remove(); // add input field @@ -553,7 +556,7 @@ OC.Upload = { var filename = input.val(); if (type === 'web' && filename.length === 0) { throw t('files', 'URL cannot be empty'); - } else if (type !== 'web' && !Files.isFileNameValid(filename)) { + } else if (type !== 'web' && ! Files.isFileNameValid(filename)) { // Files.isFileNameValid(filename) throws an exception itself } else if (FileList.inList(filename)) { throw t('files', '{new_name} already exists', {new_name: filename}); @@ -603,7 +606,10 @@ OC.Upload = { case 'file': $.post( OC.filePath('files', 'ajax', 'newfile.php'), - {dir:$('#dir').val(), filename:name}, + { + dir: $('#dir').val(), + filename: name + }, function(result) { if (result.status === 'success') { FileList.add(result.data, {hidden: hidden, animate: true}); @@ -616,7 +622,10 @@ OC.Upload = { case 'folder': $.post( OC.filePath('files','ajax','newfolder.php'), - {dir:$('#dir').val(), foldername:name}, + { + dir: $('#dir').val(), + foldername: name + }, function(result) { if (result.status === 'success') { FileList.add(result.data, {hidden: hidden, animate: true}); @@ -627,39 +636,46 @@ OC.Upload = { ); break; case 'web': - if (name.substr(0,8) !== 'https://' && name.substr(0,7) !== 'http://') { + if (name.substr(0, 8) !== 'https://' && name.substr(0, 7) !== 'http://') { name = 'http://' + name; } - var localName=name; - if (localName.substr(localName.length-1,1)==='/') {//strip / - localName=localName.substr(0,localName.length-1); + var localName = name; + if (localName.substr(localName.length-1, 1) === '/') {//strip / + localName = localName.substr(0, localName.length-1); } - if (localName.indexOf('/')) {//use last part of url - localName=localName.split('/').pop(); + if (localName.indexOf('/')) { //use last part of url + localName = localName.split('/').pop(); } else { //or the domain - localName=(localName.match(/:\/\/(.[^\/]+)/)[1]).replace('www.',''); + localName = (localName.match(/:\/\/(.[^\/]+)/)[1]).replace('www.', ''); } localName = getUniqueName(localName); //IE < 10 does not fire the necessary events for the progress bar. if ($('html.lte9').length === 0) { - $('#uploadprogressbar').progressbar({value:0}); + $('#uploadprogressbar').progressbar({value: 0}); $('#uploadprogressbar').fadeIn(); } - var eventSource=new OC.EventSource(OC.filePath('files','ajax','newfile.php'),{dir:$('#dir').val(),source:name,filename:localName}); - eventSource.listen('progress',function(progress) { + var eventSource = new OC.EventSource( + OC.filePath('files', 'ajax', 'newfile.php'), + { + dir: $('#dir').val(), + source: name, + filename: localName + } + ); + eventSource.listen('progress', function(progress) { //IE < 10 does not fire the necessary events for the progress bar. if ($('html.lte9').length === 0) { $('#uploadprogressbar').progressbar('value',progress); } }); - eventSource.listen('success',function(data) { + eventSource.listen('success', function(data) { var file = data; $('#uploadprogressbar').fadeOut(); FileList.add(file, {hidden: hidden, animate: true}); }); - eventSource.listen('error',function(error) { + eventSource.listen('error', function(error) { $('#uploadprogressbar').fadeOut(); var message = (error && error.message) || t('core', 'Error fetching URL'); OC.Notification.show(message); @@ -670,12 +686,12 @@ OC.Upload = { }); break; } - var li=form.parent(); + var li = form.parent(); form.remove(); /* workaround for IE 9&10 click event trap, 2 lines: */ $('input').first().focus(); $('#content').focus(); - li.append('<p>'+li.data('text')+'</p>'); + li.append('<p>' + li.data('text') + '</p>'); $('#new>a').click(); } catch (error) { input.attr('title', error); diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index 8896a8e23a8..73a441368bb 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -11,6 +11,9 @@ /* global OC, t, n, FileList, FileActions, Files, FileSummary, BreadCrumb */ /* global dragOptions, folderDropOptions */ window.FileList = { + SORT_INDICATOR_ASC_CLASS: 'icon-triangle-s', + SORT_INDICATOR_DESC_CLASS: 'icon-triangle-n', + appName: t('files', 'Files'), isEmpty: true, useUndo:true, @@ -45,18 +48,19 @@ window.FileList = { _selectionSummary: null, /** - * Compare two file info objects, sorting by - * folders first, then by name. + * Sort attribute */ - _fileInfoCompare: function(fileInfo1, fileInfo2) { - if (fileInfo1.type === 'dir' && fileInfo2.type !== 'dir') { - return -1; - } - if (fileInfo1.type !== 'dir' && fileInfo2.type === 'dir') { - return 1; - } - return fileInfo1.name.localeCompare(fileInfo2.name); - }, + _sort: 'name', + + /** + * Sort direction: 'asc' or 'desc' + */ + _sortDirection: 'asc', + + /** + * Sort comparator function for the current sort + */ + _sortComparator: null, /** * Initialize the file list and its components @@ -76,6 +80,8 @@ window.FileList = { this.fileSummary = this._createSummary(); + this.setSort('name', 'asc'); + this.breadcrumb = new BreadCrumb({ onClick: this._onClickBreadCrumb, onDrop: _.bind(this._onDropOnBreadCrumb, this), @@ -86,6 +92,8 @@ window.FileList = { $('#controls').prepend(this.breadcrumb.$el); + this.$el.find('thead th .columntitle').click(_.bind(this._onClickHeader, this)); + $(window).resize(function() { // TODO: debounce this ? var width = $(this).width(); @@ -237,6 +245,27 @@ window.FileList = { }, /** + * Event handler when clicking on a table header + */ + _onClickHeader: function(e) { + var $target = $(e.target); + var sort; + if (!$target.is('a')) { + $target = $target.closest('a'); + } + sort = $target.attr('data-sort'); + if (sort) { + if (this._sort === sort) { + this.setSort(sort, (this._sortDirection === 'desc')?'asc':'desc'); + } + else { + this.setSort(sort, 'asc'); + } + this.reload(); + } + }, + + /** * Event handler when clicking on a bread crumb */ _onClickBreadCrumb: function(e) { @@ -685,8 +714,6 @@ window.FileList = { previousDir: currentDir } )); - this._selectedFiles = {}; - this._selectionSummary.clear(); this.reload(); }, linkTo: function(dir) { @@ -723,9 +750,33 @@ window.FileList = { this.breadcrumb.setDirectory(this.getCurrentDirectory()); }, /** + * Sets the current sorting and refreshes the list + * + * @param sort sort attribute name + * @param direction sort direction, one of "asc" or "desc" + */ + setSort: function(sort, direction) { + var comparator = this.Comparators[sort] || this.Comparators.name; + this._sort = sort; + this._sortDirection = (direction === 'desc')?'desc':'asc'; + this._sortComparator = comparator; + if (direction === 'desc') { + this._sortComparator = function(fileInfo1, fileInfo2) { + return -comparator(fileInfo1, fileInfo2); + }; + } + this.$el.find('thead th .sort-indicator') + .removeClass(this.SORT_INDICATOR_ASC_CLASS + ' ' + this.SORT_INDICATOR_DESC_CLASS); + this.$el.find('thead th.column-' + sort + ' .sort-indicator') + .addClass(direction === 'desc' ? this.SORT_INDICATOR_DESC_CLASS : this.SORT_INDICATOR_ASC_CLASS); + }, + /** * @brief Reloads the file list using ajax call */ reload: function() { + this._selectedFiles = {}; + this._selectionSummary.clear(); + this.$el.find('#select_all').prop('checked', false); FileList.showMask(); if (FileList._reloadCall) { FileList._reloadCall.abort(); @@ -733,7 +784,9 @@ window.FileList = { FileList._reloadCall = $.ajax({ url: Files.getAjaxUrl('list'), data: { - dir : $('#dir').val() + dir: $('#dir').val(), + sort: FileList._sort, + sortdirection: FileList._sortDirection }, error: function(result) { FileList.reloadCallback(result); @@ -859,7 +912,7 @@ window.FileList = { */ _findInsertionIndex: function(fileData) { var index = 0; - while (index < this.files.length && this._fileInfoCompare(fileData, this.files[index]) > 0) { + while (index < this.files.length && this._sortComparator(fileData, this.files[index]) > 0) { index++; } return index; @@ -924,7 +977,7 @@ window.FileList = { OC.dialogs.alert(t('files', 'Error moving file'), t('files', 'Error')); } $td.css('background-image', oldBackgroundImage); - }); + }); }); }, @@ -1221,15 +1274,15 @@ window.FileList = { updateSelectionSummary: function() { var summary = this._selectionSummary.summary; if (summary.totalFiles === 0 && summary.totalDirs === 0) { - $('#headerName span.name').text(t('files','Name')); - $('#headerSize').text(t('files','Size')); - $('#modified').text(t('files','Modified')); + $('#headerName a.name>span:first').text(t('files','Name')); + $('#headerSize a>span:first').text(t('files','Size')); + $('#modified a>span:first').text(t('files','Modified')); $('table').removeClass('multiselect'); $('.selectedActions').addClass('hidden'); } else { $('.selectedActions').removeClass('hidden'); - $('#headerSize').text(OC.Util.humanFileSize(summary.totalSize)); + $('#headerSize a>span:first').text(OC.Util.humanFileSize(summary.totalSize)); var selection = ''; if (summary.totalDirs > 0) { selection += n('files', '%n folder', '%n folders', summary.totalDirs); @@ -1240,8 +1293,8 @@ window.FileList = { if (summary.totalFiles > 0) { selection += n('files', '%n file', '%n files', summary.totalFiles); } - $('#headerName span.name').text(selection); - $('#modified').text(''); + $('#headerName a.name>span:first').text(selection); + $('#modified a>span:first').text(''); $('table').addClass('multiselect'); } }, @@ -1545,3 +1598,49 @@ $(document).ready(function() { }, 0); }); +/** + * Sort comparators. + */ +FileList.Comparators = { + /** + * Compares two file infos by name, making directories appear + * first. + * + * @param fileInfo1 file info + * @param fileInfo2 file info + * @return -1 if the first file must appear before the second one, + * 0 if they are identify, 1 otherwise. + */ + name: function(fileInfo1, fileInfo2) { + if (fileInfo1.type === 'dir' && fileInfo2.type !== 'dir') { + return -1; + } + if (fileInfo1.type !== 'dir' && fileInfo2.type === 'dir') { + return 1; + } + return fileInfo1.name.localeCompare(fileInfo2.name); + }, + /** + * Compares two file infos by size. + * + * @param fileInfo1 file info + * @param fileInfo2 file info + * @return -1 if the first file must appear before the second one, + * 0 if they are identify, 1 otherwise. + */ + size: function(fileInfo1, fileInfo2) { + return fileInfo1.size - fileInfo2.size; + }, + /** + * Compares two file infos by timestamp. + * + * @param fileInfo1 file info + * @param fileInfo2 file info + * @return -1 if the first file must appear before the second one, + * 0 if they are identify, 1 otherwise. + */ + mtime: function(fileInfo1, fileInfo2) { + return fileInfo1.mtime - fileInfo2.mtime; + } +}; + diff --git a/apps/files/l10n/ast.php b/apps/files/l10n/ast.php index a2568ae7631..7dfeaf8cde7 100644 --- a/apps/files/l10n/ast.php +++ b/apps/files/l10n/ast.php @@ -22,6 +22,7 @@ $TRANSLATIONS = array( "Save" => "Guardar", "New folder" => "Nueva carpeta", "Folder" => "Carpeta", +"Deleted files" => "Ficheros desaniciaos", "Cancel upload" => "Encaboxar xuba", "Download" => "Descargar", "Delete" => "Desaniciar" diff --git a/apps/files/l10n/ca.php b/apps/files/l10n/ca.php index 6226168175a..94ad8cbb122 100644 --- a/apps/files/l10n/ca.php +++ b/apps/files/l10n/ca.php @@ -44,6 +44,7 @@ $TRANSLATIONS = array( "Rename" => "Reanomena", "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.", "Pending" => "Pendent", +"Error moving file." => "Error en moure el fitxer.", "Error moving file" => "Error en moure el fitxer", "Error" => "Error", "Could not rename file" => "No es pot canviar el nom de fitxer", diff --git a/apps/files/l10n/es_CO.php b/apps/files/l10n/es_CO.php new file mode 100644 index 00000000000..0157af093e9 --- /dev/null +++ b/apps/files/l10n/es_CO.php @@ -0,0 +1,7 @@ +<?php +$TRANSLATIONS = array( +"_%n folder_::_%n folders_" => array("",""), +"_%n file_::_%n files_" => array("",""), +"_Uploading %n file_::_Uploading %n files_" => array("","") +); +$PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files/l10n/es_EC.php b/apps/files/l10n/es_EC.php new file mode 100644 index 00000000000..0157af093e9 --- /dev/null +++ b/apps/files/l10n/es_EC.php @@ -0,0 +1,7 @@ +<?php +$TRANSLATIONS = array( +"_%n folder_::_%n folders_" => array("",""), +"_%n file_::_%n files_" => array("",""), +"_Uploading %n file_::_Uploading %n files_" => array("","") +); +$PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files/l10n/es_PE.php b/apps/files/l10n/es_PE.php new file mode 100644 index 00000000000..0157af093e9 --- /dev/null +++ b/apps/files/l10n/es_PE.php @@ -0,0 +1,7 @@ +<?php +$TRANSLATIONS = array( +"_%n folder_::_%n folders_" => array("",""), +"_%n file_::_%n files_" => array("",""), +"_Uploading %n file_::_Uploading %n files_" => array("","") +); +$PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files/l10n/es_UY.php b/apps/files/l10n/es_UY.php new file mode 100644 index 00000000000..0157af093e9 --- /dev/null +++ b/apps/files/l10n/es_UY.php @@ -0,0 +1,7 @@ +<?php +$TRANSLATIONS = array( +"_%n folder_::_%n folders_" => array("",""), +"_%n file_::_%n files_" => array("",""), +"_Uploading %n file_::_Uploading %n files_" => array("","") +); +$PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files/l10n/km.php b/apps/files/l10n/km.php index 08b29304c1b..d6394241e12 100644 --- a/apps/files/l10n/km.php +++ b/apps/files/l10n/km.php @@ -1,17 +1,37 @@ <?php $TRANSLATIONS = array( +"File name cannot be empty." => "ឈ្មោះ​ឯកសារ​មិន​អាច​នៅ​ទទáŸâ€‹áž”ាន​ឡើយ។", +"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "ឈ្មោះ​មិន​ážáŸ’រឹម​ážáŸ’រូវ, មិន​អនុញ្ញាហ'\\', '/', '<', '>', ':', '\"', '|', '?' áž“áž·áž„ '*' áž‘áŸáŸ”", "Files" => "ឯកសារ", +"Upload cancelled." => "បាន​បោះបង់​ការ​ផ្ទុក​ឡើង។", +"{new_name} already exists" => "មាន​ឈ្មោះ {new_name} រួច​ហើយ", "Share" => "ចែក​រំលែក", +"Delete permanently" => "លុប​ជា​អចិន្ážáŸ’រៃយáŸ", +"Rename" => "ប្ដូរ​ឈ្មោះ", +"Your download is being prepared. This might take some time if the files are big." => "ការ​ទាញយក​របស់​អ្នក​កំពុង​ážáŸ’រូវ​បាន​រៀបចំ​ហើយ។ áž“áŸáŸ‡â€‹áž¢áž¶áž…​ចំណាយ​ពáŸáž›â€‹áž˜áž½áž™â€‹ážŸáŸ†áž‘ុះ ប្រសិន​បើ​ឯកសារ​ធំ។", +"Pending" => "កំពុង​រង់ចាំ", "Error" => "កំហុស", "Name" => "ឈ្មោះ", "Size" => "ទំហំ", +"Modified" => "បាន​កែ​ប្រែ", "_%n folder_::_%n folders_" => array(""), "_%n file_::_%n files_" => array(""), "_Uploading %n file_::_Uploading %n files_" => array(""), +"Maximum upload size" => "ទំហំ​ផ្ទុកឡើង​ជា​អážáž·áž”រមា", +"Enable ZIP-download" => "បើក​ការ​ទាញយក​ជា ZIP", +"0 is unlimited" => "0 គឺ​មិន​កំណážáŸ‹", +"Maximum input size for ZIP files" => "ទំហំ​ចូល​ជា​អážáž·áž”រមា​សម្រាប់​ឯកសារ ZIP", "Save" => "រក្សាទុក", +"New" => "ážáŸ’មី", +"Text file" => "ឯកសារ​អក្សរ", "New folder" => "ážážâ€‹ážáŸ’មី", "Folder" => "ážáž", +"From link" => "ពី​ážáŸ†ážŽ", +"Deleted files" => "បាន​លុប​ឯកសារ", +"Cancel upload" => "បោះបង់​ការ​ផ្ទុកឡើង", +"Nothing in here. Upload something!" => "គ្មាន​អ្វី​នៅ​ទីនáŸáŸ‡â€‹áž‘áŸáŸ” ផ្ទុក​ឡើង​អ្វី​មួយ!", "Download" => "ទាញយក", -"Delete" => "លុប" +"Delete" => "លុប", +"Upload too large" => "ផ្ទុក​ឡើង​ធំ​ពáŸáž€" ); $PLURAL_FORMS = "nplurals=1; plural=0;"; diff --git a/apps/files/l10n/pt_PT.php b/apps/files/l10n/pt_PT.php index c6d2767fb81..2abe7c68536 100644 --- a/apps/files/l10n/pt_PT.php +++ b/apps/files/l10n/pt_PT.php @@ -3,7 +3,9 @@ $TRANSLATIONS = array( "Could not move %s - File with this name already exists" => "Não pôde mover o ficheiro %s - Já existe um ficheiro com esse nome", "Could not move %s" => "Não foi possÃvel move o ficheiro %s", "File name cannot be empty." => "O nome do ficheiro não pode estar vazio.", +"\"%s\" is an invalid file name." => "\"%s\" é um nome de ficheiro inválido.", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nome Inválido, os caracteres '\\', '/', '<', '>', ':', '\"', '|', '?' e '*' não são permitidos.", +"The target folder has been moved or deleted." => "A pasta de destino foi movida ou eliminada.", "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", @@ -27,6 +29,8 @@ $TRANSLATIONS = array( "Invalid directory." => "Directório Inválido", "Files" => "Ficheiros", "Unable to upload {filename} as it is a directory or has 0 bytes" => "Incapaz de enviar {filename}, dado que é uma pasta, ou tem 0 bytes", +"Total file size {size1} exceeds upload limit {size2}" => "O tamanho total do ficheiro {size1} excede o limite de carregamento {size2}", +"Not enough free space, you are uploading {size1} but only {size2} is left" => "Não existe espaço suficiente. Está a enviar {size1} mas apenas existe {size2} disponÃvel", "Upload cancelled." => "Envio cancelado.", "Could not get result from server." => "Não foi possÃvel obter o resultado do servidor.", "File upload is in progress. Leaving the page now will cancel the upload." => "Envio de ficheiro em progresso. Irá cancelar o envio se sair da página agora.", @@ -40,6 +44,7 @@ $TRANSLATIONS = array( "Rename" => "Renomear", "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.", "Pending" => "Pendente", +"Error moving file." => "Erro a mover o ficheiro.", "Error moving file" => "Erro ao mover o ficheiro", "Error" => "Erro", "Could not rename file" => "Não pôde renomear o ficheiro", @@ -50,6 +55,7 @@ $TRANSLATIONS = array( "_%n folder_::_%n folders_" => array("%n pasta","%n pastas"), "_%n file_::_%n files_" => array("%n ficheiro","%n ficheiros"), "_Uploading %n file_::_Uploading %n files_" => array("A carregar %n ficheiro","A carregar %n ficheiros"), +"\"{name}\" is an invalid file name." => "\"{name}\" é um nome de ficheiro inválido.", "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}%)", "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "A Aplicação de Encriptação está ativada, mas as suas chaves não inicializaram. Por favor termine e inicie a sessão novamente", @@ -57,6 +63,7 @@ $TRANSLATIONS = array( "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" => "%s não pode ser renomeada", +"Upload (max. %s)" => "Enviar (max. %s)", "File handling" => "Manuseamento de ficheiros", "Maximum upload size" => "Tamanho máximo de envio", "max. possible: " => "max. possivel: ", diff --git a/apps/files/lib/helper.php b/apps/files/lib/helper.php index 0ae87d12fbf..7e0f47bf84f 100644 --- a/apps/files/lib/helper.php +++ b/apps/files/lib/helper.php @@ -1,7 +1,16 @@ <?php +/** + * Copyright (c) 2014 Vincent Petry <pvince81@owncloud.com> + * This file is licensed under the Affero General Public License version 3 or + * later. + * See the COPYING-README file. + */ namespace OCA\Files; +/** + * Helper class for manipulating file information + */ class Helper { public static function buildFileStorageStatistics($dir) { @@ -9,12 +18,12 @@ class Helper $storageInfo = \OC_Helper::getStorageInfo($dir); $l = new \OC_L10N('files'); - $maxUploadFilesize = \OCP\Util::maxUploadFilesize($dir, $storageInfo['free']); - $maxHumanFilesize = \OCP\Util::humanFileSize($maxUploadFilesize); - $maxHumanFilesize = $l->t('Upload (max. %s)', array($maxHumanFilesize)); + $maxUploadFileSize = \OCP\Util::maxUploadFilesize($dir, $storageInfo['free']); + $maxHumanFileSize = \OCP\Util::humanFileSize($maxUploadFileSize); + $maxHumanFileSize = $l->t('Upload (max. %s)', array($maxHumanFileSize)); - return array('uploadMaxFilesize' => $maxUploadFilesize, - 'maxHumanFilesize' => $maxHumanFilesize, + return array('uploadMaxFilesize' => $maxUploadFileSize, + 'maxHumanFilesize' => $maxHumanFileSize, 'freeSpace' => $storageInfo['free'], 'usedSpacePercent' => (int)$storageInfo['relative']); } @@ -27,7 +36,6 @@ class Helper */ public static function determineIcon($file) { if($file['type'] === 'dir') { - $dir = $file['directory']; $icon = \OC_Helper::mimetypeIcon('dir'); $absPath = $file->getPath(); $mount = \OC\Files\Filesystem::getMountManager()->find($absPath); @@ -57,7 +65,7 @@ class Helper * @param \OCP\Files\FileInfo $b file * @return int -1 if $a must come before $b, 1 otherwise */ - public static function fileCmp($a, $b) { + public static function compareFileNames($a, $b) { $aType = $a->getType(); $bType = $b->getType(); if ($aType === 'dir' and $bType !== 'dir') { @@ -70,6 +78,32 @@ class Helper } /** + * Comparator function to sort files by date + * + * @param \OCP\Files\FileInfo $a file + * @param \OCP\Files\FileInfo $b file + * @return int -1 if $a must come before $b, 1 otherwise + */ + public static function compareTimestamp($a, $b) { + $aTime = $a->getMTime(); + $bTime = $b->getMTime(); + return $aTime - $bTime; + } + + /** + * Comparator function to sort files by size + * + * @param \OCP\Files\FileInfo $a file + * @param \OCP\Files\FileInfo $b file + * @return int -1 if $a must come before $b, 1 otherwise + */ + public static function compareSize($a, $b) { + $aSize = $a->getSize(); + $bSize = $b->getSize(); + return $aSize - $bSize; + } + + /** * Formats the file info to be returned as JSON to the client. * * @param \OCP\Files\FileInfo $i @@ -120,12 +154,35 @@ class Helper * returns it as a sorted array of FileInfo. * * @param string $dir path to the directory + * @param string $sortAttribute attribute to sort on + * @param bool $sortDescending true for descending sort, false otherwise * @return \OCP\Files\FileInfo[] files */ - public static function getFiles($dir) { + public static function getFiles($dir, $sortAttribute = 'name', $sortDescending = false) { $content = \OC\Files\Filesystem::getDirectoryContent($dir); - usort($content, array('\OCA\Files\Helper', 'fileCmp')); - return $content; + return self::sortFiles($content, $sortAttribute, $sortDescending); + } + + /** + * Sort the given file info array + * + * @param \OCP\Files\FileInfo[] files to sort + * @param string $sortAttribute attribute to sort on + * @param bool $sortDescending true for descending sort, false otherwise + * @return \OCP\Files\FileInfo[] sorted files + */ + public static function sortFiles($files, $sortAttribute = 'name', $sortDescending = false) { + $sortFunc = 'compareFileNames'; + if ($sortAttribute === 'mtime') { + $sortFunc = 'compareTimestamp'; + } else if ($sortAttribute === 'size') { + $sortFunc = 'compareSize'; + } + usort($files, array('\OCA\Files\Helper', $sortFunc)); + if ($sortDescending) { + $files = array_reverse($files); + } + return $files; } } diff --git a/apps/files/templates/index.php b/apps/files/templates/index.php index 42263c880a7..9c593a9341d 100644 --- a/apps/files/templates/index.php +++ b/apps/files/templates/index.php @@ -1,3 +1,4 @@ +<?php /** @var $l OC_L10N */ ?> <div id="controls"> <div class="actions creatable hidden"> <?php if(!isset($_['dirToken'])):?> @@ -60,11 +61,11 @@ <table id="filestable" data-allow-public-upload="<?php p($_['publicUploadEnabled'])?>" data-preview-x="36" data-preview-y="36"> <thead> <tr> - <th class="hidden" id='headerName'> + <th id='headerName' class="hidden column-name"> <div id="headerName-container"> <input type="checkbox" id="select_all" /> <label for="select_all"></label> - <span class="name"><?php p($l->t( 'Name' )); ?></span> + <a class="name sort columntitle" data-sort="name"><span><?php p($l->t( 'Name' )); ?></span><span class="sort-indicator"></span></a> <span id="selectedActionsList" class="selectedActions"> <?php if($_['allowZipDownload']) : ?> <a href="" class="download"> @@ -76,9 +77,11 @@ </span> </div> </th> - <th class="hidden" id="headerSize"><?php p($l->t('Size')); ?></th> - <th class="hidden" id="headerDate"> - <span id="modified"><?php p($l->t( 'Modified' )); ?></span> + <th id="headerSize" class="hidden column-size"> + <a class="size sort columntitle" data-sort="size"><span><?php p($l->t('Size')); ?></span><span class="sort-indicator"></span></a> + </th> + <th id="headerDate" class="hidden column-mtime"> + <a id="modified" class="columntitle" data-sort="mtime"><span><?php p($l->t( 'Modified' )); ?></span><span class="sort-indicator"></span></a> <?php if ($_['permissions'] & OCP\PERMISSION_DELETE): ?> <span class="selectedActions"><a href="" class="delete-selected"> <?php p($l->t('Delete'))?> diff --git a/apps/files/tests/helper.php b/apps/files/tests/helper.php new file mode 100644 index 00000000000..9b3603cd563 --- /dev/null +++ b/apps/files/tests/helper.php @@ -0,0 +1,98 @@ +<?php +/** + * Copyright (c) 2014 Vincent Petry <pvince81@owncloud.com> + * This file is licensed under the Affero General Public License version 3 or + * later. + * See the COPYING-README file. + */ + +require_once __DIR__ . '/../lib/helper.php'; + +use OCA\Files; + +/** + * Class Test_Files_Helper + */ +class Test_Files_Helper extends \PHPUnit_Framework_TestCase { + + private function makeFileInfo($name, $size, $mtime, $isDir = false) { + return new \OC\Files\FileInfo( + '/', + null, + '/', + array( + 'name' => $name, + 'size' => $size, + 'mtime' => $mtime, + 'type' => $isDir ? 'dir' : 'file', + 'mimetype' => $isDir ? 'httpd/unix-directory' : 'application/octet-stream' + ) + ); + } + + /** + * Returns a file list for testing + */ + private function getTestFileList() { + return array( + self::makeFileInfo('a.txt', 4, 1000), + self::makeFileInfo('q.txt', 5, 150), + self::makeFileInfo('subdir2', 87, 128, true), + self::makeFileInfo('b.txt', 166, 800), + self::makeFileInfo('o.txt', 12, 100), + self::makeFileInfo('subdir', 88, 125, true), + ); + } + + function sortDataProvider() { + return array( + array( + 'name', + false, + array('subdir', 'subdir2', 'a.txt', 'b.txt', 'o.txt', 'q.txt'), + ), + array( + 'name', + true, + array('q.txt', 'o.txt', 'b.txt', 'a.txt', 'subdir2', 'subdir'), + ), + array( + 'size', + false, + array('a.txt', 'q.txt', 'o.txt', 'subdir2', 'subdir', 'b.txt'), + ), + array( + 'size', + true, + array('b.txt', 'subdir', 'subdir2', 'o.txt', 'q.txt', 'a.txt'), + ), + array( + 'mtime', + false, + array('o.txt', 'subdir', 'subdir2', 'q.txt', 'b.txt', 'a.txt'), + ), + array( + 'mtime', + true, + array('a.txt', 'b.txt', 'q.txt', 'subdir2', 'subdir', 'o.txt'), + ), + ); + } + + /** + * @dataProvider sortDataProvider + */ + public function testSortByName($sort, $sortDescending, $expectedOrder) { + $files = self::getTestFileList(); + $files = \OCA\Files\Helper::sortFiles($files, $sort, $sortDescending); + $fileNames = array(); + foreach ($files as $fileInfo) { + $fileNames[] = $fileInfo->getName(); + } + $this->assertEquals( + $expectedOrder, + $fileNames + ); + } + +} diff --git a/apps/files/tests/js/filelistSpec.js b/apps/files/tests/js/filelistSpec.js index 7a2b56d559a..edb9e15e9bc 100644 --- a/apps/files/tests/js/filelistSpec.js +++ b/apps/files/tests/js/filelistSpec.js @@ -77,13 +77,17 @@ describe('FileList tests', function() { // dummy table // TODO: at some point this will be rendered by the FileList class itself! '<table id="filestable">' + - '<thead><tr><th id="headerName" class="hidden">' + + '<thead><tr>' + + '<th id="headerName" class="hidden column-name">' + '<input type="checkbox" id="select_all">' + - '<span class="name">Name</span>' + + '<a class="name columntitle" data-sort="name"><span>Name</span><span class="sort-indicator"></span></a>' + '<span class="selectedActions hidden">' + '<a href class="download">Download</a>' + '<a href class="delete-selected">Delete</a></span>' + - '</th></tr></thead>' + + '</th>' + + '<th class="hidden column-size"><a class="columntitle" data-sort="size"><span class="sort-indicator"></span></a></th>' + + '<th class="hidden column-mtime"><a class="columntitle" data-sort="mtime"><span class="sort-indicator"></span></a></th>' + + '</tr></thead>' + '<tbody id="fileList"></tbody>' + '<tfoot></tfoot>' + '</table>' + @@ -940,7 +944,7 @@ describe('FileList tests', function() { expect(fakeServer.requests.length).toEqual(1); var url = fakeServer.requests[0].url; var query = url.substr(url.indexOf('?') + 1); - expect(OC.parseQueryString(query)).toEqual({'dir': '/subdir'}); + expect(OC.parseQueryString(query)).toEqual({'dir': '/subdir', sort: 'name', sortdirection: 'asc'}); fakeServer.respond(); expect($('#fileList tr').length).toEqual(4); expect(FileList.findFileEl('One.txt').length).toEqual(1); @@ -951,7 +955,7 @@ describe('FileList tests', function() { expect(fakeServer.requests.length).toEqual(1); var url = fakeServer.requests[0].url; var query = url.substr(url.indexOf('?') + 1); - expect(OC.parseQueryString(query)).toEqual({'dir': '/anothersubdir'}); + expect(OC.parseQueryString(query)).toEqual({'dir': '/anothersubdir', sort: 'name', sortdirection: 'asc'}); fakeServer.respond(); }); it('switches to root dir when current directory does not exist', function() { @@ -1260,7 +1264,7 @@ describe('FileList tests', function() { expect(_.pluck(FileList.getSelectedFiles(), 'name').length).toEqual(42); }); it('Selecting files updates selection summary', function() { - var $summary = $('#headerName span.name'); + var $summary = $('#headerName a.name>span:first'); expect($summary.text()).toEqual('Name'); FileList.findFileEl('One.txt').find('input:checkbox').click(); FileList.findFileEl('Three.pdf').find('input:checkbox').click(); @@ -1268,7 +1272,7 @@ describe('FileList tests', function() { expect($summary.text()).toEqual('1 folder & 2 files'); }); it('Unselecting files hides selection summary', function() { - var $summary = $('#headerName span.name'); + var $summary = $('#headerName a.name>span:first'); FileList.findFileEl('One.txt').find('input:checkbox').click().click(); expect($summary.text()).toEqual('Name'); }); @@ -1431,5 +1435,150 @@ describe('FileList tests', function() { }); }); }); + it('resets the file selection on reload', function() { + FileList.$el.find('#select_all').click(); + FileList.reload(); + expect(FileList.$el.find('#select_all').prop('checked')).toEqual(false); + expect(FileList.getSelectedFiles()).toEqual([]); + }); + }); + describe('Sorting files', function() { + it('Sorts by name by default', function() { + FileList.reload(); + expect(fakeServer.requests.length).toEqual(1); + var url = fakeServer.requests[0].url; + var query = OC.parseQueryString(url.substr(url.indexOf('?') + 1)); + expect(query.sort).toEqual('name'); + expect(query.sortdirection).toEqual('asc'); + }); + it('Reloads file list with a different sort when clicking on column header of unsorted column', function() { + FileList.$el.find('.column-size .columntitle').click(); + expect(fakeServer.requests.length).toEqual(1); + var url = fakeServer.requests[0].url; + var query = OC.parseQueryString(url.substr(url.indexOf('?') + 1)); + expect(query.sort).toEqual('size'); + expect(query.sortdirection).toEqual('asc'); + }); + it('Toggles sort direction when clicking on already sorted column', function() { + FileList.$el.find('.column-name .columntitle').click(); + expect(fakeServer.requests.length).toEqual(1); + var url = fakeServer.requests[0].url; + var query = OC.parseQueryString(url.substr(url.indexOf('?') + 1)); + expect(query.sort).toEqual('name'); + expect(query.sortdirection).toEqual('desc'); + }); + it('Toggles the sort indicator when clicking on a column header', function() { + var ASC_CLASS = FileList.SORT_INDICATOR_ASC_CLASS; + var DESC_CLASS = FileList.SORT_INDICATOR_DESC_CLASS; + FileList.$el.find('.column-size .columntitle').click(); + // moves triangle to size column + expect( + FileList.$el.find('.column-name .sort-indicator').hasClass(ASC_CLASS + ' ' + DESC_CLASS) + ).toEqual(false); + expect( + FileList.$el.find('.column-size .sort-indicator').hasClass(ASC_CLASS) + ).toEqual(true); + + // click again on size column, reverses direction + FileList.$el.find('.column-size .columntitle').click(); + expect( + FileList.$el.find('.column-size .sort-indicator').hasClass(DESC_CLASS) + ).toEqual(true); + + // click again on size column, reverses direction + FileList.$el.find('.column-size .columntitle').click(); + expect( + FileList.$el.find('.column-size .sort-indicator').hasClass(ASC_CLASS) + ).toEqual(true); + + // click on mtime column, moves indicator there + FileList.$el.find('.column-mtime .columntitle').click(); + expect( + FileList.$el.find('.column-size .sort-indicator').hasClass(ASC_CLASS + ' ' + DESC_CLASS) + ).toEqual(false); + expect( + FileList.$el.find('.column-mtime .sort-indicator').hasClass(ASC_CLASS) + ).toEqual(true); + }); + it('Uses correct sort comparator when inserting files', function() { + testFiles.sort(FileList.Comparators.size); + // this will make it reload the testFiles with the correct sorting + FileList.$el.find('.column-size .columntitle').click(); + expect(fakeServer.requests.length).toEqual(1); + fakeServer.requests[0].respond( + 200, + { 'Content-Type': 'application/json' }, + JSON.stringify({ + status: 'success', + data: { + files: testFiles, + permissions: 31 + } + }) + ); + var newFileData = { + id: 999, + type: 'file', + name: 'new file.txt', + mimetype: 'text/plain', + size: 40001, + etag: '999' + }; + FileList.add(newFileData); + expect(FileList.files.length).toEqual(5); + expect(FileList.$fileList.find('tr').length).toEqual(5); + expect(FileList.findFileEl('One.txt').index()).toEqual(0); + expect(FileList.findFileEl('somedir').index()).toEqual(1); + expect(FileList.findFileEl('Two.jpg').index()).toEqual(2); + expect(FileList.findFileEl('new file.txt').index()).toEqual(3); + expect(FileList.findFileEl('Three.pdf').index()).toEqual(4); + }); + it('Uses correct reversed sort comparator when inserting files', function() { + testFiles.sort(FileList.Comparators.size); + testFiles.reverse(); + // this will make it reload the testFiles with the correct sorting + FileList.$el.find('.column-size .columntitle').click(); + expect(fakeServer.requests.length).toEqual(1); + fakeServer.requests[0].respond( + 200, + { 'Content-Type': 'application/json' }, + JSON.stringify({ + status: 'success', + data: { + files: testFiles, + permissions: 31 + } + }) + ); + // reverse sort + FileList.$el.find('.column-size .columntitle').click(); + fakeServer.requests[1].respond( + 200, + { 'Content-Type': 'application/json' }, + JSON.stringify({ + status: 'success', + data: { + files: testFiles, + permissions: 31 + } + }) + ); + var newFileData = { + id: 999, + type: 'file', + name: 'new file.txt', + mimetype: 'text/plain', + size: 40001, + etag: '999' + }; + FileList.add(newFileData); + expect(FileList.files.length).toEqual(5); + expect(FileList.$fileList.find('tr').length).toEqual(5); + expect(FileList.findFileEl('One.txt').index()).toEqual(4); + expect(FileList.findFileEl('somedir').index()).toEqual(3); + expect(FileList.findFileEl('Two.jpg').index()).toEqual(2); + expect(FileList.findFileEl('new file.txt').index()).toEqual(1); + expect(FileList.findFileEl('Three.pdf').index()).toEqual(0); + }); }); }); diff --git a/apps/files/triggerupdate.php b/apps/files/triggerupdate.php index a37b9823add..3f85da9913b 100644 --- a/apps/files/triggerupdate.php +++ b/apps/files/triggerupdate.php @@ -6,7 +6,7 @@ if (OC::$CLI) { if (count($argv) === 2) { $file = $argv[1]; list(, $user) = explode('/', $file); - OCP\JSON::checkUserExists($owner); + OCP\JSON::checkUserExists($user); OC_Util::setupFS($user); $view = new \OC\Files\View(''); /** diff --git a/apps/files_encryption/ajax/changeRecoveryPassword.php b/apps/files_encryption/ajax/changeRecoveryPassword.php index 945f054ea84..f020e52607d 100644 --- a/apps/files_encryption/ajax/changeRecoveryPassword.php +++ b/apps/files_encryption/ajax/changeRecoveryPassword.php @@ -23,7 +23,7 @@ $oldPassword = $_POST['oldPassword']; $newPassword = $_POST['newPassword']; $view = new \OC\Files\View('/'); -$util = new \OCA\Encryption\Util(new \OC_FilesystemView('/'), \OCP\User::getUser()); +$util = new \OCA\Encryption\Util(new \OC\Files\View('/'), \OCP\User::getUser()); $proxyStatus = \OC_FileProxy::$enabled; \OC_FileProxy::$enabled = false; diff --git a/apps/files_encryption/ajax/getMigrationStatus.php b/apps/files_encryption/ajax/getMigrationStatus.php index 7c9e0dcc51c..a8828401934 100644 --- a/apps/files_encryption/ajax/getMigrationStatus.php +++ b/apps/files_encryption/ajax/getMigrationStatus.php @@ -18,7 +18,7 @@ $migrationStatus = Util::MIGRATION_COMPLETED; if ($loginname !== '' && $password !== '') { $username = \OCP\User::checkPassword($loginname, $password); if ($username) { - $util = new Util(new \OC_FilesystemView('/'), $username); + $util = new Util(new \OC\Files\View('/'), $username); $migrationStatus = $util->getMigrationStatus(); } } diff --git a/apps/files_encryption/ajax/userrecovery.php b/apps/files_encryption/ajax/userrecovery.php index d6c94bde81e..81ca1459a91 100644 --- a/apps/files_encryption/ajax/userrecovery.php +++ b/apps/files_encryption/ajax/userrecovery.php @@ -19,7 +19,7 @@ if ( ) { $userId = \OCP\USER::getUser(); - $view = new \OC_FilesystemView('/'); + $view = new \OC\Files\View('/'); $util = new \OCA\Encryption\Util($view, $userId); // Save recovery preference to DB diff --git a/apps/files_encryption/appinfo/app.php b/apps/files_encryption/appinfo/app.php index 21de421c195..104e8568caa 100644 --- a/apps/files_encryption/appinfo/app.php +++ b/apps/files_encryption/appinfo/app.php @@ -40,7 +40,7 @@ if (!OC_Config::getValue('maintenance', false)) { \OC_Util::setupFS(); } - $view = new OC_FilesystemView('/'); + $view = new OC\Files\View('/'); $sessionReady = OCA\Encryption\Helper::checkRequirements(); if($sessionReady) { diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php index 5f0494e62ca..c9ffeb454a1 100644 --- a/apps/files_encryption/hooks/hooks.php +++ b/apps/files_encryption/hooks/hooks.php @@ -48,7 +48,7 @@ class Hooks { $l = new \OC_L10N('files_encryption');
- $view = new \OC_FilesystemView('/');
+ $view = new \OC\Files\View('/');
// ensure filesystem is loaded
if(!\OC\Files\Filesystem::$loaded) {
@@ -93,7 +93,7 @@ class Hooks { // If migration not yet done
if ($ready) {
- $userView = new \OC_FilesystemView('/' . $params['uid']);
+ $userView = new \OC\Files\View('/' . $params['uid']);
// Set legacy encryption key if it exists, to support
// depreciated encryption system
@@ -142,7 +142,7 @@ class Hooks { public static function postCreateUser($params) {
if (\OCP\App::isEnabled('files_encryption')) {
- $view = new \OC_FilesystemView('/');
+ $view = new \OC\Files\View('/');
$util = new Util($view, $params['uid']);
Helper::setupUser($util, $params['password']);
}
@@ -155,7 +155,7 @@ class Hooks { public static function postDeleteUser($params) {
if (\OCP\App::isEnabled('files_encryption')) {
- $view = new \OC_FilesystemView('/');
+ $view = new \OC\Files\View('/');
// cleanup public key
$publicKey = '/public-keys/' . $params['uid'] . '.public.key';
@@ -196,7 +196,7 @@ class Hooks { // the necessary keys)
if (Crypt::mode() === 'server') {
- $view = new \OC_FilesystemView('/');
+ $view = new \OC\Files\View('/');
if ($params['uid'] === \OCP\User::getUser()) {
@@ -308,7 +308,7 @@ class Hooks { if ($params['itemType'] === 'file' || $params['itemType'] === 'folder') {
- $view = new \OC_FilesystemView('/');
+ $view = new \OC\Files\View('/');
$session = new \OCA\Encryption\Session($view);
$userId = \OCP\User::getUser();
$util = new Util($view, $userId);
@@ -350,7 +350,7 @@ class Hooks { if ($params['itemType'] === 'file' || $params['itemType'] === 'folder') {
- $view = new \OC_FilesystemView('/');
+ $view = new \OC\Files\View('/');
$userId = \OCP\User::getUser();
$util = new Util($view, $userId);
$path = \OC\Files\Filesystem::getPath($params['fileSource']);
@@ -403,7 +403,7 @@ class Hooks { */
public static function preRename($params) {
$user = \OCP\User::getUser();
- $view = new \OC_FilesystemView('/');
+ $view = new \OC\Files\View('/');
$util = new Util($view, $user);
list($ownerOld, $pathOld) = $util->getUidAndFilename($params['oldpath']);
@@ -437,7 +437,7 @@ class Hooks { $proxyStatus = \OC_FileProxy::$enabled;
\OC_FileProxy::$enabled = false;
- $view = new \OC_FilesystemView('/');
+ $view = new \OC\Files\View('/');
$session = new \OCA\Encryption\Session($view);
$userId = \OCP\User::getUser();
$util = new Util($view, $userId);
@@ -610,7 +610,7 @@ class Hooks { return true;
}
- $util = new Util(new \OC_FilesystemView('/'), \OCP\USER::getUser());
+ $util = new Util(new \OC\Files\View('/'), \OCP\USER::getUser());
list($owner, $ownerPath) = $util->getUidAndFilename($path);
self::$deleteFiles[$params[\OC\Files\Filesystem::signal_param_path]] = array(
diff --git a/apps/files_encryption/l10n/ast.php b/apps/files_encryption/l10n/ast.php index 7e08e073095..8b51ec775db 100644 --- a/apps/files_encryption/l10n/ast.php +++ b/apps/files_encryption/l10n/ast.php @@ -1,13 +1,44 @@ <?php $TRANSLATIONS = array( -"Password successfully changed." => "Contraseña camudada esitosamente.", -"Could not change the password. Maybe the old password was not correct." => "Nun pue camudase la contraseña. Quiciabes la contraseña vieya nun fore correuta.", -"personal settings" => "axustes personales", +"Recovery key successfully enabled" => "Habilitóse la recuperación de ficheros", +"Could not enable recovery key. Please check your recovery key password!" => "Nun pudo habilitase la clave de recuperación. Por favor comprueba la contraseña.", +"Recovery key successfully disabled" => "Clave de recuperación deshabilitada", +"Could not disable recovery key. Please check your recovery key password!" => "Nun pudo deshabilitase la clave de recuperación. Por favor comprueba la contraseña!", +"Password successfully changed." => "Camudóse la contraseña", +"Could not change the password. Maybe the old password was not correct." => "Nun pudo camudase la contraseña. Comprueba que la contraseña actual seya correuta.", +"Private key password successfully updated." => "Contraseña de clave privada anovada correchamente.", +"Could not update the private key password. Maybe the old password was not correct." => "Nun pudo camudase la contraseña. Pue que la contraseña antigua nun seya correuta.", +"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "¡L'aplicación de cifráu nun s'anició! Seique se restableciera mentanto la sesión. Por favor intenta zarrar la sesión y volver a aniciala p'aniciar l'aplicación de cifráu.", +"Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "¡La clave privada nun ye válida! Seique la contraseña se camudase dende fuera de %s (Ex:El to direutoriu corporativu). Pues anovar la contraseña de la clave privada nes tos opciones personales pa recuperar l'accesu a los ficheros.", +"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." => "Nun pudo descifrase esti ficheru, dablemente seya un ficheru compartÃu. Solicita al propietariu del mesmu que vuelva a compartilu contigo.", +"Unknown error please check your system settings or contact your administrator" => "Fallu desconocÃu. Verifica la configuración del sistema o ponte en contautu col alministrador", +"Missing requirements." => "Requisitos incompletos.", +"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." => "Por favor, asegúrate de que PHP 5.3.3 o postreru ta instaláu y que la estensión OpenSSL de PHP ta habilitada y configurada correutamente. Pel momentu, l'aplicación de cifráu deshabilitóse.", +"Following users are not set up for encryption:" => "Los siguientes usuarios nun se configuraron pal cifráu:", +"Initial encryption started... This can take some time. Please wait." => "Cifráu aniciáu..... Esto pue llevar un tiempu. Por favor espera.", +"Initial encryption running... Please try again later." => "Cifráu inicial en cursu... Inténtalo dempués.", +"Go directly to your " => "Dir direutamente a", +"personal settings" => "opciones personales", "Encryption" => "Cifráu", -"Enabled" => "Habilitáu", +"Enable recovery key (allow to recover users files in case of password loss):" => "Habilitar la clave de recuperación (permite recuperar los ficheros del usuariu en casu de perda de la contraseña);", +"Recovery key password" => "Contraseña de clave de recuperación", +"Repeat Recovery key password" => "Repeti la contraseña de clave de recuperación", +"Enabled" => "Habilitar", "Disabled" => "Deshabilitáu", -"Change Password" => "Camudar conseña", -" If you don't remember your old password you can ask your administrator to recover your files." => "Si nun recuerdes la to contraseña vieya pues entrugar al to alministrador pa recuperar los tos ficheros.", -"Could not update file recovery" => "Nun pue anovase'l ficheru de recuperación" +"Change recovery key password:" => "Camudar la contraseña de la clave de recuperación", +"Old Recovery key password" => "Clave de recuperación vieya", +"New Recovery key password" => "Clave de recuperación nueva", +"Repeat New Recovery key password" => "Repetir la clave de recuperación nueva", +"Change Password" => "Camudar contraseña", +"Your private key password no longer match your log-in password:" => "La to contraseña de clave privada yá nun concasa cola contraseña d'accesu:", +"Set your old private key password to your current log-in password." => "Afitar la contraseña de la to clave privada vieya a la to contraseña actual d'accesu.", +" If you don't remember your old password you can ask your administrator to recover your files." => "Si nun recuerdes la contraseña vieya, pues pidir a alministrador que te recupere los ficheros.", +"Old log-in password" => "Contraseña d'accesu vieya", +"Current log-in password" => "Contraseña d'accesu actual", +"Update Private Key Password" => "Anovar Contraseña de Clave Privada", +"Enable password recovery:" => "Habilitar la recuperación de contraseña:", +"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Habilitar esta opción va permitite volver a tener accesu a los ficheros cifraos en casu de perda de contraseña", +"File recovery settings updated" => "Opciones de recuperación de ficheros anovada", +"Could not update file recovery" => "Nun pudo anovase la recuperación de ficheros" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files_encryption/lib/crypt.php b/apps/files_encryption/lib/crypt.php index a4f7bd35497..7d86eb72ed1 100755 --- a/apps/files_encryption/lib/crypt.php +++ b/apps/files_encryption/lib/crypt.php @@ -254,7 +254,7 @@ class Crypt { * @brief Concatenate encrypted data with its IV and padding
* @param string $content content to be concatenated
* @param string $iv IV to be concatenated
- * @returns string concatenated content
+ * @return string concatenated content
*/
private static function concatIv($content, $iv) {
@@ -267,7 +267,7 @@ class Crypt { /**
* @brief Split concatenated data and IV into respective parts
* @param string $catFile concatenated data to be split
- * @returns array keys: encrypted, iv
+ * @return array keys: encrypted, iv
*/
private static function splitIv($catFile) {
@@ -330,7 +330,7 @@ class Crypt { * @internal param string $source
* @internal param string $target
* @internal param string $key the decryption key
- * @returns string decrypted content
+ * @return string decrypted content
*
* This function decrypts a file
*/
@@ -362,7 +362,7 @@ class Crypt { * @brief Decrypt private key and check if the result is a valid keyfile
* @param string $encryptedKey encrypted keyfile
* @param string $passphrase to decrypt keyfile
- * @returns encrypted private key or false
+ * @return encrypted private key or false
*
* This function decrypts a file
*/
@@ -389,7 +389,7 @@ class Crypt { * @brief Create asymmetrically encrypted keyfile content using a generated key
* @param string $plainContent content to be encrypted
* @param array $publicKeys array keys must be the userId of corresponding user
- * @returns array keys: keys (array, key = userId), data
+ * @return array keys: keys (array, key = userId), data
* @note symmetricDecryptFileContent() can decrypt files created using this method
*/
public static function multiKeyEncrypt($plainContent, array $publicKeys) {
@@ -440,7 +440,7 @@ class Crypt { * @param $privateKey
* @return false|string
* @internal param string $plainContent content to be encrypted
- * @returns string $plainContent decrypted string
+ * @return string $plainContent decrypted string
* @note symmetricDecryptFileContent() can be used to decrypt files created using this method
*
* This function decrypts a file
@@ -498,7 +498,7 @@ class Crypt { /**
* @brief Generate a pseudo random 256-bit ASCII key, used as file key
- * @returns $key Generated key
+ * @return $key Generated key
*/
public static function generateKey() {
diff --git a/apps/files_encryption/lib/helper.php b/apps/files_encryption/lib/helper.php index 8cbbe8a45a6..c3a31ff9fbc 100755 --- a/apps/files_encryption/lib/helper.php +++ b/apps/files_encryption/lib/helper.php @@ -153,7 +153,7 @@ class Helper { $return = true; } else { // get recovery key and check the password - $util = new \OCA\Encryption\Util(new \OC_FilesystemView('/'), \OCP\User::getUser()); + $util = new \OCA\Encryption\Util(new \OC\Files\View('/'), \OCP\User::getUser()); $return = $util->checkRecoveryPassword($recoveryPassword); if ($return) { $appConfig->setValue('files_encryption', 'recoveryAdminEnabled', 1); @@ -214,7 +214,7 @@ class Helper { * @return bool */ public static function adminDisableRecovery($recoveryPassword) { - $util = new Util(new \OC_FilesystemView('/'), \OCP\User::getUser()); + $util = new Util(new \OC\Files\View('/'), \OCP\User::getUser()); $return = $util->checkRecoveryPassword($recoveryPassword); if ($return) { @@ -332,7 +332,7 @@ class Helper { * @param \OC\Files\View $view */ public static function mkdirr($path, $view) { - $dirname = \OC_Filesystem::normalizePath(dirname($path)); + $dirname = \OC\Files\Filesystem::normalizePath(dirname($path)); $dirParts = explode('/', $dirname); $dir = ""; foreach ($dirParts as $part) { diff --git a/apps/files_encryption/lib/keymanager.php b/apps/files_encryption/lib/keymanager.php index cb9f5e64af3..5aa8a6ab06e 100755 --- a/apps/files_encryption/lib/keymanager.php +++ b/apps/files_encryption/lib/keymanager.php @@ -32,12 +32,12 @@ class Keymanager { /** * @brief retrieve the ENCRYPTED private key from a user * - * @param \OC_FilesystemView $view + * @param \OC\Files\View $view * @param string $user * @return string private key or false (hopefully) * @note the key returned by this method must be decrypted before use */ - public static function getPrivateKey(\OC_FilesystemView $view, $user) { + public static function getPrivateKey(\OC\Files\View $view, $user) { $path = '/' . $user . '/' . 'files_encryption' . '/' . $user . '.private.key'; $key = false; @@ -56,11 +56,11 @@ class Keymanager { /** * @brief retrieve public key for a specified user - * @param \OC_FilesystemView $view + * @param \OC\Files\View $view * @param $userId * @return string public key or false */ - public static function getPublicKey(\OC_FilesystemView $view, $userId) { + public static function getPublicKey(\OC\Files\View $view, $userId) { $proxyStatus = \OC_FileProxy::$enabled; \OC_FileProxy::$enabled = false; @@ -75,11 +75,11 @@ class Keymanager { /** * @brief Retrieve a user's public and private key - * @param \OC_FilesystemView $view + * @param \OC\Files\View $view * @param $userId * @return array keys: privateKey, publicKey */ - public static function getUserKeys(\OC_FilesystemView $view, $userId) { + public static function getUserKeys(\OC\Files\View $view, $userId) { return array( 'publicKey' => self::getPublicKey($view, $userId), @@ -90,11 +90,11 @@ class Keymanager { /** * @brief Retrieve public keys for given users - * @param \OC_FilesystemView $view + * @param \OC\Files\View $view * @param array $userIds * @return array of public keys for the specified users */ - public static function getPublicKeys(\OC_FilesystemView $view, array $userIds) { + public static function getPublicKeys(\OC\Files\View $view, array $userIds) { $keys = array(); @@ -111,7 +111,7 @@ class Keymanager { /** * @brief store file encryption key * - * @param \OC_FilesystemView $view + * @param \OC\Files\View $view * @param \OCA\Encryption\Util $util * @param string $path relative path of the file, including filename * @param string $catfile keyfile content @@ -119,7 +119,7 @@ class Keymanager { * @note The keyfile is not encrypted here. Client code must * asymmetrically encrypt the keyfile before passing it to this method */ - public static function setFileKey(\OC_FilesystemView $view, $util, $path, $catfile) { + public static function setFileKey(\OC\Files\View $view, $util, $path, $catfile) { $proxyStatus = \OC_FileProxy::$enabled; \OC_FileProxy::$enabled = false; @@ -168,7 +168,7 @@ class Keymanager { /** * @brief retrieve keyfile for an encrypted file - * @param \OC_FilesystemView $view + * @param \OC\Files\View $view * @param \OCA\Encryption\Util $util * @param string|false $filePath * @internal param \OCA\Encryption\file $string name @@ -212,7 +212,7 @@ class Keymanager { /** * @brief Delete a keyfile * - * @param \OC_FilesystemView $view + * @param \OC\Files\View $view * @param string $path path of the file the key belongs to * @param string $userId the user to whom the file belongs * @return bool Outcome of unlink operation @@ -276,7 +276,7 @@ class Keymanager { $user = \OCP\User::getUser(); - $view = new \OC_FilesystemView('/' . $user . '/files_encryption'); + $view = new \OC\Files\View('/' . $user . '/files_encryption'); $proxyStatus = \OC_FileProxy::$enabled; \OC_FileProxy::$enabled = false; @@ -295,14 +295,14 @@ class Keymanager { /** * @brief store share key * - * @param \OC_FilesystemView $view + * @param \OC\Files\View $view * @param string $path where the share key is stored * @param $shareKey * @return bool true/false * @note The keyfile is not encrypted here. Client code must * asymmetrically encrypt the keyfile before passing it to this method */ - private static function setShareKey(\OC_FilesystemView $view, $path, $shareKey) { + private static function setShareKey(\OC\Files\View $view, $path, $shareKey) { $proxyStatus = \OC_FileProxy::$enabled; \OC_FileProxy::$enabled = false; @@ -320,13 +320,13 @@ class Keymanager { /** * @brief store multiple share keys for a single file - * @param \OC_FilesystemView $view + * @param \OC\Files\View $view * @param \OCA\Encryption\Util $util * @param string $path * @param array $shareKeys * @return bool */ - public static function setShareKeys(\OC_FilesystemView $view, $util, $path, array $shareKeys) { + public static function setShareKeys(\OC\Files\View $view, $util, $path, array $shareKeys) { // $shareKeys must be an array with the following format: // [userId] => [encrypted key] @@ -366,7 +366,7 @@ class Keymanager { /** * @brief retrieve shareKey for an encrypted file - * @param \OC_FilesystemView $view + * @param \OC\Files\View $view * @param string $userId * @param \OCA\Encryption\Util $util * @param string $filePath @@ -374,7 +374,7 @@ class Keymanager { * @note The sharekey returned is encrypted. Decryption * of the keyfile must be performed by client code */ - public static function getShareKey(\OC_FilesystemView $view, $userId, $util, $filePath) { + public static function getShareKey(\OC\Files\View $view, $userId, $util, $filePath) { // try reusing key file if part file $proxyStatus = \OC_FileProxy::$enabled; @@ -407,7 +407,7 @@ class Keymanager { /** * @brief delete all share keys of a given file - * @param \OC_FilesystemView $view + * @param \OC\Files\View $view * @param string $userId owner of the file * @param string $filePath path to the file, relative to the owners file dir */ @@ -447,7 +447,7 @@ class Keymanager { /** * @brief Delete a single user's shareKey for a single file */ - public static function delShareKey(\OC_FilesystemView $view, $userIds, $filePath) { + public static function delShareKey(\OC\Files\View $view, $userIds, $filePath) { $proxyStatus = \OC_FileProxy::$enabled; \OC_FileProxy::$enabled = false; @@ -516,7 +516,7 @@ class Keymanager { * @param string|boolean $path * @param string $basePath */ - public static function keySetPreparation(\OC_FilesystemView $view, $path, $basePath, $userId) { + public static function keySetPreparation(\OC\Files\View $view, $path, $basePath, $userId) { $targetPath = ltrim($path, '/'); diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php index 7be82c313e4..919853107a8 100644 --- a/apps/files_encryption/lib/proxy.php +++ b/apps/files_encryption/lib/proxy.php @@ -65,7 +65,7 @@ class Proxy extends \OC_FileProxy { return false; } - $view = new \OC_FilesystemView(''); + $view = new \OC\Files\View(''); $util = new Util($view, $userId); // for write operation we always encrypt the files, for read operations @@ -90,7 +90,7 @@ class Proxy extends \OC_FileProxy { if (!is_resource($data)) { // get root view - $view = new \OC_FilesystemView('/'); + $view = new \OC\Files\View('/'); // get relative path $relativePath = \OCA\Encryption\Helper::stripUserFilesPath($path); @@ -101,7 +101,7 @@ class Proxy extends \OC_FileProxy { // create random cache folder $cacheFolder = rand(); - $path_slices = explode('/', \OC_Filesystem::normalizePath($path)); + $path_slices = explode('/', \OC\Files\Filesystem::normalizePath($path)); $path_slices[2] = "cache/".$cacheFolder; $tmpPath = implode('/', $path_slices); @@ -125,7 +125,7 @@ class Proxy extends \OC_FileProxy { // in the post proxy $tmpFileInfo = $view->getFileInfo($tmpPath); if ( isset($tmpFileInfo['size']) ) { - self::$unencryptedSizes[\OC_Filesystem::normalizePath($path)] = $tmpFileInfo['size']; + self::$unencryptedSizes[\OC\Files\Filesystem::normalizePath($path)] = $tmpFileInfo['size']; } // remove our temp file @@ -150,9 +150,9 @@ class Proxy extends \OC_FileProxy { * @return mixed */ public function postFile_put_contents($path, $result) { - $normalizedPath = \OC_Filesystem::normalizePath($path); + $normalizedPath = \OC\Files\Filesystem::normalizePath($path); if ( isset(self::$unencryptedSizes[$normalizedPath]) ) { - $view = new \OC_FilesystemView('/'); + $view = new \OC\Files\View('/'); $view->putFileInfo($normalizedPath, array('encrypted' => true, 'unencrypted_size' => self::$unencryptedSizes[$normalizedPath])); unset(self::$unencryptedSizes[$normalizedPath]); @@ -168,7 +168,7 @@ class Proxy extends \OC_FileProxy { public function postFile_get_contents($path, $data) { $plainData = null; - $view = new \OC_FilesystemView('/'); + $view = new \OC\Files\View('/'); // init session $session = new \OCA\Encryption\Session($view); @@ -291,7 +291,7 @@ class Proxy extends \OC_FileProxy { */ public function postFileSize($path, $size) { - $view = new \OC_FilesystemView('/'); + $view = new \OC\Files\View('/'); $userId = Helper::getUser($path); $util = new Util($view, $userId); diff --git a/apps/files_encryption/lib/session.php b/apps/files_encryption/lib/session.php index 3daaa06425f..dea27d7a186 100644 --- a/apps/files_encryption/lib/session.php +++ b/apps/files_encryption/lib/session.php @@ -37,7 +37,7 @@ class Session { /** * @brief if session is started, check if ownCloud key pair is set up, if not create it - * @param \OC_FilesystemView $view + * @param \OC\Files\View $view * * @note The ownCloud key pair is used to allow public link sharing even if encryption is enabled */ @@ -145,7 +145,7 @@ class Session { /** * @brief Gets status if we already tried to initialize the encryption app - * @returns init status INIT_SUCCESSFUL, INIT_EXECUTED, NOT_INOITIALIZED + * @return init status INIT_SUCCESSFUL, INIT_EXECUTED, NOT_INOITIALIZED * * @note this doesn not indicate of the init was successful, we just remeber the try! */ @@ -159,7 +159,7 @@ class Session { /** * @brief Gets user or public share private key from session - * @returns string $privateKey The user's plaintext private key + * @return string $privateKey The user's plaintext private key * */ public function getPrivateKey() { @@ -190,7 +190,7 @@ class Session { /** * @brief Gets public share private key from session - * @returns string $privateKey + * @return string $privateKey * */ public function getPublicSharePrivateKey() { @@ -217,7 +217,7 @@ class Session { /** * @brief Gets user legacy key from session - * @returns string $legacyKey The user's plaintext legacy key + * @return string $legacyKey The user's plaintext legacy key * */ public function getLegacyKey() { diff --git a/apps/files_encryption/lib/stream.php b/apps/files_encryption/lib/stream.php index df5de558867..8b575174e2e 100644 --- a/apps/files_encryption/lib/stream.php +++ b/apps/files_encryption/lib/stream.php @@ -91,7 +91,7 @@ class Stream { $this->newFile = false; if (!isset($this->rootView)) { - $this->rootView = new \OC_FilesystemView('/'); + $this->rootView = new \OC\Files\View('/'); } $this->session = new \OCA\Encryption\Session($this->rootView); diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php index 6372ab31b6e..b96e4590507 100644 --- a/apps/files_encryption/lib/util.php +++ b/apps/files_encryption/lib/util.php @@ -26,7 +26,7 @@ namespace OCA\Encryption; /** * @brief Class for utilities relating to encrypted file storage system - * @param \OC_FilesystemView $view expected to have OC '/' as root path + * @param \OC\Files\View $view expected to have OC '/' as root path * @param string $userId ID of the logged in user * @param int $client indicating status of client side encryption. Currently * unused, likely to become obsolete shortly @@ -38,7 +38,7 @@ class Util { const MIGRATION_IN_PROGRESS = -1; // migration is running const MIGRATION_OPEN = 0; // user still needs to be migrated - private $view; // OC_FilesystemView object for filesystem operations + private $view; // OC\Files\View object for filesystem operations private $userId; // ID of the user we use to encrypt/decrypt files private $keyId; // ID of the key we want to manipulate private $client; // Client side encryption mode flag @@ -53,7 +53,7 @@ class Util { private $isPublic; /** - * @param \OC_FilesystemView $view + * @param \OC\Files\View $view * @param $userId * @param bool $client */ @@ -788,8 +788,8 @@ class Util { } if ($successful) { - $this->view->deleteAll($this->keyfilesPath); - $this->view->deleteAll($this->shareKeysPath); + $this->view->rename($this->keyfilesPath, $this->keyfilesPath . '.backup'); + $this->view->rename($this->shareKeysPath, $this->shareKeysPath . '.backup'); } \OC_FileProxy::$enabled = true; @@ -1361,7 +1361,7 @@ class Util { return array( $fileOwnerUid, - \OC_Filesystem::normalizePath($filename) + \OC\Files\Filesystem::normalizePath($filename) ); } } @@ -1522,7 +1522,7 @@ class Util { if ($item['type'] === 'dir') { $this->addRecoveryKeys($filePath . '/'); } else { - $session = new \OCA\Encryption\Session(new \OC_FilesystemView('/')); + $session = new \OCA\Encryption\Session(new \OC\Files\View('/')); $sharingEnabled = \OCP\Share::isEnabled(); // remove '.key' extension from path e.g. 'file.txt.key' to 'file.txt' $file = substr($filePath, 0, -4); diff --git a/apps/files_encryption/settings-personal.php b/apps/files_encryption/settings-personal.php index 09e9df05352..e9875518f67 100644 --- a/apps/files_encryption/settings-personal.php +++ b/apps/files_encryption/settings-personal.php @@ -12,7 +12,7 @@ $tmpl = new OCP\Template('files_encryption', 'settings-personal');
$user = \OCP\USER::getUser();
-$view = new \OC_FilesystemView('/');
+$view = new \OC\Files\View('/');
$util = new \OCA\Encryption\Util($view, $user);
$session = new \OCA\Encryption\Session($view);
diff --git a/apps/files_encryption/tests/crypt.php b/apps/files_encryption/tests/crypt.php index 123943ea26a..83c2ab30b8e 100755 --- a/apps/files_encryption/tests/crypt.php +++ b/apps/files_encryption/tests/crypt.php @@ -34,7 +34,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase { public $dataUrl; public $dataShort; /** - * @var OC_FilesystemView + * @var OC\Files\View */ public $view; public $legacyEncryptedData; @@ -79,7 +79,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase { $this->genPublicKey = $keypair['publicKey']; $this->genPrivateKey = $keypair['privateKey']; - $this->view = new \OC_FilesystemView('/'); + $this->view = new \OC\Files\View('/'); // remember files_trashbin state $this->stateFilesTrashbin = OC_App::isEnabled('files_trashbin'); @@ -157,7 +157,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase { $filename = 'tmp-' . uniqid() . '.test'; - $util = new Encryption\Util(new \OC_FilesystemView(), $this->userId); + $util = new Encryption\Util(new \OC\Files\View(), $this->userId); $cryptedFile = file_put_contents('crypt:///' . $this->userId . '/files/'. $filename, $this->dataShort); @@ -216,7 +216,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase { // Generate a a random filename $filename = 'tmp-' . uniqid() . '.test'; - $util = new Encryption\Util(new \OC_FilesystemView(), $this->userId); + $util = new Encryption\Util(new \OC\Files\View(), $this->userId); // Save long data as encrypted file using stream wrapper $cryptedFile = file_put_contents('crypt:///' . $this->userId . '/files/' . $filename, $this->dataLong . $this->dataLong); diff --git a/apps/files_encryption/tests/hooks.php b/apps/files_encryption/tests/hooks.php index 047084ca2c1..ee534f708c2 100644 --- a/apps/files_encryption/tests/hooks.php +++ b/apps/files_encryption/tests/hooks.php @@ -40,7 +40,7 @@ class Test_Encryption_Hooks extends \PHPUnit_Framework_TestCase { const TEST_ENCRYPTION_HOOKS_USER2 = "test-encryption-hooks-user2"; /** - * @var \OC_FilesystemView + * @var \OC\Files\View */ public $user1View; // view on /data/user1/files public $user2View; // view on /data/user2/files @@ -83,9 +83,9 @@ class Test_Encryption_Hooks extends \PHPUnit_Framework_TestCase { \OC_User::setUserId(\Test_Encryption_Hooks::TEST_ENCRYPTION_HOOKS_USER1); // init filesystem view - $this->user1View = new \OC_FilesystemView('/'. \Test_Encryption_Hooks::TEST_ENCRYPTION_HOOKS_USER1 . '/files'); - $this->user2View = new \OC_FilesystemView('/'. \Test_Encryption_Hooks::TEST_ENCRYPTION_HOOKS_USER2 . '/files'); - $this->rootView = new \OC_FilesystemView('/'); + $this->user1View = new \OC\Files\View('/'. \Test_Encryption_Hooks::TEST_ENCRYPTION_HOOKS_USER1 . '/files'); + $this->user2View = new \OC\Files\View('/'. \Test_Encryption_Hooks::TEST_ENCRYPTION_HOOKS_USER2 . '/files'); + $this->rootView = new \OC\Files\View('/'); // init short data $this->data = 'hats'; diff --git a/apps/files_encryption/tests/keymanager.php b/apps/files_encryption/tests/keymanager.php index 0caf12e91a3..2bd2ddc8e68 100644 --- a/apps/files_encryption/tests/keymanager.php +++ b/apps/files_encryption/tests/keymanager.php @@ -29,7 +29,7 @@ class Test_Encryption_Keymanager extends \PHPUnit_Framework_TestCase { public $pass; public $stateFilesTrashbin; /** - * @var OC_FilesystemView + * @var OC\Files\View */ public $view; public $randomKey; @@ -68,7 +68,7 @@ class Test_Encryption_Keymanager extends \PHPUnit_Framework_TestCase { $this->genPublicKey = $keypair['publicKey']; $this->genPrivateKey = $keypair['privateKey']; - $this->view = new \OC_FilesystemView('/'); + $this->view = new \OC\Files\View('/'); \OC_User::setUserId(\Test_Encryption_Keymanager::TEST_USER); $this->userId = \Test_Encryption_Keymanager::TEST_USER; @@ -257,4 +257,4 @@ class TestProtectedKeymanagerMethods extends \OCA\Encryption\Keymanager { public static function testGetFilenameFromShareKey($sharekey) { return self::getFilenameFromShareKey($sharekey); } -}
\ No newline at end of file +} diff --git a/apps/files_encryption/tests/proxy.php b/apps/files_encryption/tests/proxy.php index 647ee955eb1..533aaa376b9 100644 --- a/apps/files_encryption/tests/proxy.php +++ b/apps/files_encryption/tests/proxy.php @@ -42,7 +42,7 @@ class Test_Encryption_Proxy extends \PHPUnit_Framework_TestCase { public $userId; public $pass; /** - * @var \OC_FilesystemView + * @var \OC\Files\View */ public $view; // view in /data/user/files public $rootView; // view on /data/user @@ -75,8 +75,8 @@ class Test_Encryption_Proxy extends \PHPUnit_Framework_TestCase { $this->pass = \Test_Encryption_Proxy::TEST_ENCRYPTION_PROXY_USER1; // init filesystem view - $this->view = new \OC_FilesystemView('/'. \Test_Encryption_Proxy::TEST_ENCRYPTION_PROXY_USER1 . '/files'); - $this->rootView = new \OC_FilesystemView('/'. \Test_Encryption_Proxy::TEST_ENCRYPTION_PROXY_USER1 ); + $this->view = new \OC\Files\View('/'. \Test_Encryption_Proxy::TEST_ENCRYPTION_PROXY_USER1 . '/files'); + $this->rootView = new \OC\Files\View('/'. \Test_Encryption_Proxy::TEST_ENCRYPTION_PROXY_USER1 ); // init short data $this->data = 'hats'; diff --git a/apps/files_encryption/tests/share.php b/apps/files_encryption/tests/share.php index 512671c5767..f75092f5436 100755 --- a/apps/files_encryption/tests/share.php +++ b/apps/files_encryption/tests/share.php @@ -48,7 +48,7 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase { public $filename; public $dataShort; /** - * @var OC_FilesystemView + * @var OC\Files\View */ public $view; public $folder1; @@ -92,7 +92,7 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase { function setUp() { $this->dataShort = 'hats'; - $this->view = new \OC_FilesystemView('/'); + $this->view = new \OC\Files\View('/'); $this->folder1 = '/folder1'; $this->subfolder = '/subfolder1'; @@ -669,7 +669,7 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase { // login as admin \Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1); - $util = new \OCA\Encryption\Util(new \OC_FilesystemView('/'), \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1); + $util = new \OCA\Encryption\Util(new \OC\Files\View('/'), \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1); // check if recovery password match $this->assertTrue($util->checkRecoveryPassword('test123')); @@ -777,7 +777,7 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase { // login as user2 \Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2); - $util = new \OCA\Encryption\Util(new \OC_FilesystemView('/'), \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2); + $util = new \OCA\Encryption\Util(new \OC\Files\View('/'), \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2); // enable recovery for admin $this->assertTrue($util->setRecoveryForUser(1)); diff --git a/apps/files_encryption/tests/stream.php b/apps/files_encryption/tests/stream.php index fed2e7d89d1..f742cd3f8e9 100644 --- a/apps/files_encryption/tests/stream.php +++ b/apps/files_encryption/tests/stream.php @@ -42,7 +42,7 @@ class Test_Encryption_Stream extends \PHPUnit_Framework_TestCase { public $userId; public $pass; /** - * @var \OC_FilesystemView + * @var \OC\Files\View */ public $view; public $dataShort; @@ -71,7 +71,7 @@ class Test_Encryption_Stream extends \PHPUnit_Framework_TestCase { $this->pass = \Test_Encryption_Stream::TEST_ENCRYPTION_STREAM_USER1; // init filesystem view - $this->view = new \OC_FilesystemView('/'); + $this->view = new \OC\Files\View('/'); // init short data $this->dataShort = 'hats'; diff --git a/apps/files_encryption/tests/trashbin.php b/apps/files_encryption/tests/trashbin.php index 2f9ecfd9d5d..e36293ba81e 100755 --- a/apps/files_encryption/tests/trashbin.php +++ b/apps/files_encryption/tests/trashbin.php @@ -43,7 +43,7 @@ class Test_Encryption_Trashbin extends \PHPUnit_Framework_TestCase { public $userId; public $pass; /** - * @var \OC_FilesystemView + * @var \OC\Files\View */ public $view; public $dataShort; @@ -81,7 +81,7 @@ class Test_Encryption_Trashbin extends \PHPUnit_Framework_TestCase { $this->pass = \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1; // init filesystem view - $this->view = new \OC_FilesystemView('/'); + $this->view = new \OC\Files\View('/'); // init short data $this->dataShort = 'hats'; diff --git a/apps/files_encryption/tests/util.php b/apps/files_encryption/tests/util.php index 88ded7ec40a..11961f27675 100755 --- a/apps/files_encryption/tests/util.php +++ b/apps/files_encryption/tests/util.php @@ -29,7 +29,7 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase { public $publicKeyDir; public $pass; /** - * @var OC_FilesystemView + * @var OC\Files\View */ public $view; public $keyfilesPath; @@ -92,7 +92,7 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase { $this->privateKeyPath = $this->encryptionDir . '/' . $this->userId . '.private.key'; // e.g. data/admin/admin.private.key - $this->view = new \OC_FilesystemView('/'); + $this->view = new \OC\Files\View('/'); $this->util = new Encryption\Util($this->view, $this->userId); @@ -205,7 +205,7 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase { function testIsLegacyUser() { \Test_Encryption_Util::loginHelper(\Test_Encryption_Util::TEST_ENCRYPTION_UTIL_LEGACY_USER); - $userView = new \OC_FilesystemView('/' . \Test_Encryption_Util::TEST_ENCRYPTION_UTIL_LEGACY_USER); + $userView = new \OC\Files\View('/' . \Test_Encryption_Util::TEST_ENCRYPTION_UTIL_LEGACY_USER); // Disable encryption proxy to prevent recursive calls $proxyStatus = \OC_FileProxy::$enabled; @@ -384,7 +384,7 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase { $params = array('uid' => \OCP\User::getUser(), 'password' => \OCP\User::getUser()); - $view = new OC_FilesystemView('/'); + $view = new OC\Files\View('/'); $util = new \OCA\Encryption\Util($view, \OCP\User::getUser()); $result = $util->initEncryption($params); @@ -413,8 +413,16 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase { // file should no longer be encrypted $this->assertEquals(0, $fileInfoUnencrypted['encrypted']); + // check if the keys where moved to the backup location + $this->assertTrue($this->view->is_dir($this->userId . '/files_encryption/keyfiles.backup')); + $this->assertTrue($this->view->file_exists($this->userId . '/files_encryption/keyfiles.backup/' . $filename . '.key')); + $this->assertTrue($this->view->is_dir($this->userId . '/files_encryption/share-keys.backup')); + $this->assertTrue($this->view->file_exists($this->userId . '/files_encryption/share-keys.backup/' . $filename . '.' . $user . '.shareKey')); + // cleanup $this->view->unlink($this->userId . '/files/' . $filename); + $this->view->deleteAll($this->userId . '/files_encryption/keyfiles.backup'); + $this->view->deleteAll($this->userId . '/files_encryption/share-keys.backup'); OC_App::enable('files_encryption'); } @@ -485,8 +493,11 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase { $this->assertFalse($this->view->is_dir($this->userId . '/files_encryption/keyfiles/')); $this->assertFalse($this->view->is_dir($this->userId . '/files_encryption/share-keys/')); + //cleanup $this->view->unlink($this->userId . '/files/' . $file1); $this->view->unlink($this->userId . '/files/' . $file2); + $this->view->deleteAll($this->userId . '/files_encryption/keyfiles.backup'); + $this->view->deleteAll($this->userId . '/files_encryption/share-keys.backup'); } @@ -496,8 +507,8 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase { function testEncryptLegacyFiles() { \Test_Encryption_Util::loginHelper(\Test_Encryption_Util::TEST_ENCRYPTION_UTIL_LEGACY_USER); - $userView = new \OC_FilesystemView('/' . \Test_Encryption_Util::TEST_ENCRYPTION_UTIL_LEGACY_USER); - $view = new \OC_FilesystemView('/' . \Test_Encryption_Util::TEST_ENCRYPTION_UTIL_LEGACY_USER . '/files'); + $userView = new \OC\Files\View('/' . \Test_Encryption_Util::TEST_ENCRYPTION_UTIL_LEGACY_USER); + $view = new \OC\Files\View('/' . \Test_Encryption_Util::TEST_ENCRYPTION_UTIL_LEGACY_USER . '/files'); // Disable encryption proxy to prevent recursive calls $proxyStatus = \OC_FileProxy::$enabled; diff --git a/apps/files_encryption/tests/webdav.php b/apps/files_encryption/tests/webdav.php index 1fe4c13d59e..bdd3d51897b 100755 --- a/apps/files_encryption/tests/webdav.php +++ b/apps/files_encryption/tests/webdav.php @@ -43,7 +43,7 @@ class Test_Encryption_Webdav extends \PHPUnit_Framework_TestCase { public $userId; public $pass; /** - * @var \OC_FilesystemView + * @var \OC\Files\View */ public $view; public $dataShort; @@ -82,7 +82,7 @@ class Test_Encryption_Webdav extends \PHPUnit_Framework_TestCase { $this->pass = \Test_Encryption_Webdav::TEST_ENCRYPTION_WEBDAV_USER1; // init filesystem view - $this->view = new \OC_FilesystemView('/'); + $this->view = new \OC\Files\View('/'); // init short data $this->dataShort = 'hats'; diff --git a/apps/files_external/l10n/ast.php b/apps/files_external/l10n/ast.php index add49819154..5ab3a00d4cd 100644 --- a/apps/files_external/l10n/ast.php +++ b/apps/files_external/l10n/ast.php @@ -2,16 +2,68 @@ $TRANSLATIONS = array( "Local" => "Llocal", "Location" => "Llocalización", +"Amazon S3" => "Amazon S3", +"Key" => "Clave", +"Secret" => "Secretu", +"Bucket" => "Depósitu", +"Amazon S3 and compliant" => "Amazon S3 y compatibilidá", +"Access Key" => "Clave d'accesu", +"Secret Key" => "Clave Secreta", +"Hostname (optional)" => "Nome d'equipu (opcional)", +"Port (optional)" => "Puertu (opcional)", +"Region (optional)" => "Rexón (opcional)", +"Enable SSL" => "Habilitar SSL", +"Enable Path Style" => "Habilitar Estilu de ruta", +"App key" => "App principal", +"App secret" => "App secreta", "URL" => "URL", "Username" => "Nome d'usuariu", "Password" => "Contraseña", +"Root" => "RaÃz", +"Secure ftps://" => "Secure ftps://", +"Client ID" => "ID de veceru", +"Client secret" => "Veceru secretu", +"OpenStack Object Storage" => "OpenStack Object Storage", +"Username (required)" => "Nome d'usuariu (necesariu)", +"Bucket (required)" => "Depósitu (necesariu)", +"Region (optional for OpenStack Object Storage)" => "Rexón (opcional pa OpenStack Object Storage)", +"API Key (required for Rackspace Cloud Files)" => "Clave API (necesaria pa Rackspace Cloud Files)", +"Tenantname (required for OpenStack Object Storage)" => "Nome d'inquilÃn (necesariu pa OpenStack Object Storage)", +"Password (required for OpenStack Object Storage)" => "Contraseña (necesaria pa OpenStack Object Storage)", +"Service Name (required for OpenStack Object Storage)" => "Nome de Serviciu (necesariu pa OpenStack Object Storage)", +"URL of identity endpoint (required for OpenStack Object Storage)" => "URL d'identidá de puntu final (necesariu pa OpenStack Object Storage)", +"Timeout of HTTP requests in seconds (optional)" => "Tiempu d'espera de peticiones HTTP en segundos (opcional)", "Share" => "Compartir", +"SMB / CIFS using OC login" => "SMB / CIFS usando accesu OC", +"Username as share" => "Nome d'usuariu como Compartición", +"Secure https://" => "Secure https://", +"Remote subfolder" => "Subcarpeta remota", +"Access granted" => "Accesu concedÃu", +"Error configuring Dropbox storage" => "Fallu configurando l'almacenamientu de Dropbox", +"Grant access" => "Conceder accesu", +"Please provide a valid Dropbox app key and secret." => "Por favor, proporciona una clave válida de l'app Dropbox y una clave secreta.", +"Error configuring Google Drive storage" => "Fallu configurando l'almacenamientu de Google Drive", "Saved" => "Guardáu", +"<b>Note:</b> " => "<b>Nota:</b> ", +" and " => "y", +"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Nota:</b> El soporte de cURL en PHP nun ta activáu o instaláu. Nun pue montase %s. PÃdi-y al alministrador de sistema que lu instale.", +"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Nota:</b> El soporte de FTP en PHP nun ta activáu o instaláu. Nun pue montase %s. PÃdi-y al alministrador de sistema que lu instale.", +"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Nota:</b> \"%s\" nun ta instaláu. Nun pue montase %s. PÃdi-y al alministrador de sistema que lu instale.", +"External Storage" => "Almacenamientu esternu", "Folder name" => "Nome de la carpeta", +"External storage" => "Almacenamientu esternu", "Configuration" => "Configuración", "Options" => "Opciones", +"Available for" => "Disponible pa", +"Add storage" => "Amestar almacenamientu", +"No user or group" => "Nengún usuariu o grupu", +"All Users" => "Tolos usuarios", "Groups" => "Grupos", "Users" => "Usuarios", -"Delete" => "Desaniciar" +"Delete" => "Desaniciar", +"Enable User External Storage" => "Habilitar almacenamientu esterno d'usuariu", +"Allow users to mount the following external storage" => "Permitir a los usuarios montar el siguiente almacenamientu esternu", +"SSL root certificates" => "Certificaos raÃz SSL", +"Import Root Certificate" => "Importar certificáu raÃz" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files_external/l10n/el.php b/apps/files_external/l10n/el.php index 351468a36dc..cc28d074a0a 100644 --- a/apps/files_external/l10n/el.php +++ b/apps/files_external/l10n/el.php @@ -2,9 +2,12 @@ $TRANSLATIONS = array( "Local" => "Τοπικός", "Location" => "Τοποθεσία", +"Key" => "Κλειδί", +"Secret" => "Μυστικό", "URL" => "URL", "Username" => "Όνομα χÏήστη", "Password" => "Κωδικός Ï€Ïόσβασης", +"Client ID" => "ID πελάτη", "Username (required)" => "Όνομα χÏήστη (απαιτείται)", "Share" => "ΔιαμοιÏάστε", "Access granted" => "Î Ïοσβαση παÏασχÎθηκε", @@ -19,6 +22,7 @@ $TRANSLATIONS = array( "External storage" => "ΕξωτεÏική αποθήκευση", "Configuration" => "Ρυθμίσεις", "Options" => "ΕπιλογÎÏ‚", +"Available for" => "ΔιαθÎσιμο για", "Add storage" => "Î Ïοσθηκη αποθηκευσης", "No user or group" => "Μη διαθÎσιμος χÏήστης ή ομάδα", "All Users" => "Όλοι οι ΧÏήστες", diff --git a/apps/files_external/l10n/ja.php b/apps/files_external/l10n/ja.php index 4ac746caa00..17337f28ba2 100644 --- a/apps/files_external/l10n/ja.php +++ b/apps/files_external/l10n/ja.php @@ -2,21 +2,59 @@ $TRANSLATIONS = array( "Local" => "ãƒãƒ¼ã‚«ãƒ«", "Location" => "ä½ç½®", +"Amazon S3" => "Amazon S3", +"Key" => "ã‚ー", +"Secret" => "シークレットã‚ー", +"Bucket" => "ãƒã‚±ãƒƒãƒˆå", +"Amazon S3 and compliant" => "Amazon S3 ã¨äº’æ›ã‚¹ãƒˆãƒ¬ãƒ¼ã‚¸", +"Access Key" => "アクセスã‚ー", +"Secret Key" => "シークレットã‚ー", +"Hostname (optional)" => "ホストå (オプション)", +"Port (optional)" => "ãƒãƒ¼ãƒˆ (オプション)", +"Region (optional)" => "リージョン (オプション)", +"Enable SSL" => "SSLを有効", +"Enable Path Style" => "パス形å¼ã‚’有効", +"App key" => "アプリã‚ー", +"App secret" => "アプリシークレット", "URL" => "URL", "Username" => "ユーザーå", "Password" => "パスワード", +"Root" => "ルート", +"Secure ftps://" => "Secure ftps://", +"Client ID" => "クライアントID", +"Client secret" => "クライアント秘密ã‚ー", +"OpenStack Object Storage" => "OpenStack Object Storage", +"Username (required)" => "ユーザーå (å¿…é ˆ)", +"Bucket (required)" => "ãƒã‚±ãƒƒãƒˆ (å¿…é ˆ)", +"Region (optional for OpenStack Object Storage)" => "リージョン (OpenStack Object Storage用ã®ã‚ªãƒ—ション)", +"API Key (required for Rackspace Cloud Files)" => "APIã‚ー (Rackspace Cloud Filesã«å¿…é ˆ)", +"Tenantname (required for OpenStack Object Storage)" => "テナントå (OpenStack Object Storage用ã«å¿…è¦)", +"Password (required for OpenStack Object Storage)" => "パスワード (OpenStack Object Storage用ã«å¿…è¦)", +"Service Name (required for OpenStack Object Storage)" => "サービスå (OpenStack Object Storage用ã«å¿…è¦)", +"URL of identity endpoint (required for OpenStack Object Storage)" => "è˜åˆ¥ç”¨ã‚¨ãƒ³ãƒ‰ãƒã‚¤ãƒ³ãƒˆURL (OpenStack Object Storage用ã«å¿…è¦)", +"Timeout of HTTP requests in seconds (optional)" => "HTTPリクエストã®ã‚¿ã‚¤ãƒ アウト秒数 (オプション)", "Share" => "共有", +"SMB / CIFS using OC login" => "owncloudãƒã‚°ã‚¤ãƒ³ã§ SMB/CIFSを使用", +"Username as share" => "共有å", +"Secure https://" => "ã‚»ã‚ュア https://", +"Remote subfolder" => "リモートサブフォルダ", "Access granted" => "アクセスã¯è¨±å¯ã•ã‚Œã¾ã—ãŸ", "Error configuring Dropbox storage" => "Dropboxストレージã®è¨å®šã‚¨ãƒ©ãƒ¼", "Grant access" => "アクセスを許å¯", "Please provide a valid Dropbox app key and secret." => "有効ãªDropboxアプリã®ã‚ーã¨ãƒ‘スワードを入力ã—ã¦ãã ã•ã„。", "Error configuring Google Drive storage" => "Googleドライブストレージã®è¨å®šã‚¨ãƒ©ãƒ¼", "Saved" => "ä¿å˜ã•ã‚Œã¾ã—ãŸ", +"<b>Note:</b> " => "<b>注æ„:</b> ", +" and " => "ã¨", +"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>注æ„:</b> PHPã«cURLã®ã‚¨ã‚¯ã‚¹ãƒ†ãƒ³ã‚·ãƒ§ãƒ³ãŒå…¥ã£ã¦ã„ãªã„ã‹ã€æœ‰åŠ¹ã§ã¯ã‚ã‚Šã¾ã›ã‚“。%s をマウントã™ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“。ã“ã®ã‚·ã‚¹ãƒ†ãƒ ã®ç®¡ç†è€…ã«ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã‚’ãŠé¡˜ã„ã—ã¦ãã ã•ã„。", +"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>注æ„:</b> PHPã«FTPã®ã‚¨ã‚¯ã‚¹ãƒ†ãƒ³ã‚·ãƒ§ãƒ³ãŒå…¥ã£ã¦ã„ãªã„ã‹ã€æœ‰åŠ¹ã§ã¯ã‚ã‚Šã¾ã›ã‚“。%s をマウントã™ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“。ã“ã®ã‚·ã‚¹ãƒ†ãƒ ã®ç®¡ç†è€…ã«ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã‚’ãŠé¡˜ã„ã—ã¦ãã ã•ã„。", +"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>注æ„:</b> \"%s\" ãŒã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¦ã„ã¾ã›ã‚“。%sをマウントã§ãã¾ã›ã‚“。ã“ã®ã‚·ã‚¹ãƒ†ãƒ ã®ç®¡ç†è€…ã«ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã‚’ãŠé¡˜ã„ã—ã¦ãã ã•ã„。", "External Storage" => "外部ストレージ", "Folder name" => "フォルダーå", "External storage" => "外部ストレージ", "Configuration" => "è¨å®š", "Options" => "オプション", +"Available for" => "以下ãŒåˆ©ç”¨å¯èƒ½", "Add storage" => "ã‚¹ãƒˆãƒ¬ãƒ¼ã‚¸ã‚’è¿½åŠ ", "No user or group" => "ユーザーもã—ãã¯ã‚°ãƒ«ãƒ¼ãƒ—ãŒã‚ã‚Šã¾ã›ã‚“", "All Users" => "ã™ã¹ã¦ã®ãƒ¦ãƒ¼ã‚¶ãƒ¼", diff --git a/apps/files_external/l10n/km.php b/apps/files_external/l10n/km.php index aac63370245..24cd4cb6e6b 100644 --- a/apps/files_external/l10n/km.php +++ b/apps/files_external/l10n/km.php @@ -5,6 +5,7 @@ $TRANSLATIONS = array( "Username" => "ឈ្មោះ​អ្នកប្រើ", "Password" => "ពាក្យសម្ងាážáŸ‹", "Share" => "ចែក​រំលែក", +"Saved" => "បាន​រក្សាទុក", "Folder name" => "ឈ្មោះ​ážáž", "Options" => "ជម្រើស", "Groups" => "ក្រុ", diff --git a/apps/files_external/l10n/ru.php b/apps/files_external/l10n/ru.php index be1307a9e6b..f8037d1cdfa 100644 --- a/apps/files_external/l10n/ru.php +++ b/apps/files_external/l10n/ru.php @@ -1,5 +1,6 @@ <?php $TRANSLATIONS = array( +"Local" => "Локально", "Location" => "МеÑтоположение", "URL" => "СÑылка", "Username" => "Ð˜Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ", diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php index 15fbda927e0..9906b7670a8 100755 --- a/apps/files_external/lib/config.php +++ b/apps/files_external/lib/config.php @@ -400,19 +400,11 @@ class OC_Mount_Config { 'options' => self::encryptPasswords($classOptions)) ) ); + $mountPoints = self::readData($isPersonal ? OCP\User::getUser() : NULL); - // Merge the new mount point into the current mount points - if (isset($mountPoints[$mountType])) { - if (isset($mountPoints[$mountType][$applicable])) { - $mountPoints[$mountType][$applicable] - = array_merge($mountPoints[$mountType][$applicable], $mount[$applicable]); - } else { - $mountPoints[$mountType] = array_merge($mountPoints[$mountType], $mount); - } - } else { - $mountPoints[$mountType] = $mount; - } + $mountPoints = self::mergeMountPoints($mountPoints, $mount, $mountType); self::writeData($isPersonal ? OCP\User::getUser() : NULL, $mountPoints); + return self::getBackendStatus($class, $classOptions, $isPersonal); } @@ -690,6 +682,28 @@ class OC_Mount_Config { } /** + * Merges mount points + * @param array $data Existing mount points + * @param array $mountPoint New mount point + * @param string $mountType + * @return array + */ + private static function mergeMountPoints($data, $mountPoint, $mountType) { + $applicable = key($mountPoint); + if (isset($data[$mountType])) { + if (isset($data[$mountType][$applicable])) { + $data[$mountType][$applicable] + = array_merge($data[$mountType][$applicable], $mountPoint[$applicable]); + } else { + $data[$mountType] = array_merge($data[$mountType], $mountPoint); + } + } else { + $data[$mountType] = $mountPoint; + } + return $data; + } + + /** * Returns the encryption cipher */ private static function getCipher() { diff --git a/apps/files_sharing/ajax/list.php b/apps/files_sharing/ajax/list.php index 4b645496253..82bacb3d38d 100644 --- a/apps/files_sharing/ajax/list.php +++ b/apps/files_sharing/ajax/list.php @@ -20,11 +20,6 @@ * */ -// only need filesystem apps -$RUNTIME_APPTYPES=array('filesystem'); - -// Init owncloud - if(!\OC_App::isEnabled('files_sharing')){ exit; } @@ -47,6 +42,9 @@ if (isset($_GET['dir'])) { $relativePath = $_GET['dir']; } +$sortAttribute = isset( $_GET['sort'] ) ? $_GET['sort'] : 'name'; +$sortDirection = isset( $_GET['sortdirection'] ) ? ($_GET['sortdirection'] === 'desc') : false; + $data = \OCA\Files_Sharing\Helper::setupFromToken($token, $relativePath, $password); $linkItem = $data['linkItem']; @@ -64,7 +62,7 @@ $data = array(); $baseUrl = OCP\Util::linkTo('files_sharing', 'index.php') . '?t=' . urlencode($token) . '&dir='; // make filelist -$files = \OCA\Files\Helper::getFiles($dir); +$files = \OCA\Files\Helper::getFiles($dir, $sortAttribute, $sortDirection); $formattedFiles = array(); foreach ($files as $file) { diff --git a/apps/files_sharing/l10n/ast.php b/apps/files_sharing/l10n/ast.php index 2dd8b0e1f64..fa3704ea6ba 100644 --- a/apps/files_sharing/l10n/ast.php +++ b/apps/files_sharing/l10n/ast.php @@ -4,12 +4,12 @@ $TRANSLATIONS = array( "This share is password-protected" => "Esta compartición tien contraseña protexida", "The password is wrong. Try again." => "La contraseña ye incorreuta. Inténtalo otra vegada.", "Password" => "Contraseña", -"Sorry, this link doesn’t seem to work anymore." => "SentÃmoslo, esti enllaz paez que ya nun furrula.", +"Sorry, this link doesn’t seem to work anymore." => "SentÃmoslo, esti enllaz paez que yá nun furrula.", "Reasons might be:" => "Les razones pueden ser: ", -"the item was removed" => "esti elementu ta desaniciáu", -"the link expired" => "l'enllaz finó", +"the item was removed" => "desanicióse l'elementu", +"the link expired" => "l'enllaz caducó", "sharing is disabled" => "compartir ta desactiváu", -"For more info, please ask the person who sent this link." => "Para más información, entruga-y a la persona qu'unvió esti enllaz", +"For more info, please ask the person who sent this link." => "Pa más información, entrúga-y a la persona qu'unvió esti enllaz", "Download" => "Baxar", "Download %s" => "Descargar %s", "Direct link" => "Enllaz direutu" diff --git a/apps/files_sharing/lib/api.php b/apps/files_sharing/lib/api.php index 438d3cc4ba3..d554d68c6bd 100644 --- a/apps/files_sharing/lib/api.php +++ b/apps/files_sharing/lib/api.php @@ -196,7 +196,7 @@ class Api { } /** - * @breif create a new share + * @brief create a new share * @param array $params * @return \OC_OCS_Result */ diff --git a/apps/files_sharing/lib/sharedstorage.php b/apps/files_sharing/lib/sharedstorage.php index d4a817fca34..d1ca60ff6ac 100644 --- a/apps/files_sharing/lib/sharedstorage.php +++ b/apps/files_sharing/lib/sharedstorage.php @@ -36,7 +36,7 @@ class Shared extends \OC\Files\Storage\Common { } /** - * @breif get id of the mount point + * @brief get id of the mount point * @return string */ public function getId() { @@ -44,7 +44,7 @@ class Shared extends \OC\Files\Storage\Common { } /** - * @breif get file cache of the shared item source + * @brief get file cache of the shared item source * @return string */ public function getSourceId() { diff --git a/apps/files_sharing/tests/base.php b/apps/files_sharing/tests/base.php index 495dca072c7..11bbcb133f5 100644 --- a/apps/files_sharing/tests/base.php +++ b/apps/files_sharing/tests/base.php @@ -39,7 +39,7 @@ abstract class Test_Files_Sharing_Base extends \PHPUnit_Framework_TestCase { public $filename; public $data; /** - * @var OC_FilesystemView + * @var OC\Files\View */ public $view; public $folder; @@ -68,7 +68,7 @@ abstract class Test_Files_Sharing_Base extends \PHPUnit_Framework_TestCase { self::loginHelper(self::TEST_FILES_SHARING_API_USER1); $this->data = 'foobar'; - $this->view = new \OC_FilesystemView('/' . self::TEST_FILES_SHARING_API_USER1 . '/files'); + $this->view = new \OC\Files\View('/' . self::TEST_FILES_SHARING_API_USER1 . '/files'); // remember files_encryption state $this->stateFilesEncryption = \OC_App::isEnabled('files_encryption'); diff --git a/apps/files_sharing/tests/cache.php b/apps/files_sharing/tests/cache.php index 1af73c558d5..4e63a1844c6 100644 --- a/apps/files_sharing/tests/cache.php +++ b/apps/files_sharing/tests/cache.php @@ -25,7 +25,7 @@ require_once __DIR__ . '/base.php'; class Test_Files_Sharing_Cache extends Test_Files_Sharing_Base { /** - * @var OC_FilesystemView + * @var OC\Files\View */ public $user2View; diff --git a/apps/files_trashbin/ajax/list.php b/apps/files_trashbin/ajax/list.php index 89a55114524..e1f52e814bb 100644 --- a/apps/files_trashbin/ajax/list.php +++ b/apps/files_trashbin/ajax/list.php @@ -4,11 +4,13 @@ OCP\JSON::checkLoggedIn(); // Load the files $dir = isset( $_GET['dir'] ) ? $_GET['dir'] : ''; +$sortAttribute = isset( $_GET['sort'] ) ? $_GET['sort'] : 'name'; +$sortDirection = isset( $_GET['sortdirection'] ) ? ($_GET['sortdirection'] === 'desc') : false; $data = array(); // make filelist try { - $files = \OCA\Files_Trashbin\Helper::getTrashFiles($dir); + $files = \OCA\Files_Trashbin\Helper::getTrashFiles($dir, $sortAttribute, $sortDirection); } catch (Exception $e) { header("HTTP/1.0 404 Not Found"); exit(); diff --git a/apps/files_trashbin/js/filelist.js b/apps/files_trashbin/js/filelist.js index 3bb3a92b60d..00fc7e16b88 100644 --- a/apps/files_trashbin/js/filelist.js +++ b/apps/files_trashbin/js/filelist.js @@ -80,6 +80,7 @@ FileList.initialize = function() { var result = oldInit.apply(this, arguments); $('.undelete').click('click', FileList._onClickRestoreSelected); + this.setSort('mtime', 'desc'); return result; }; diff --git a/apps/files_trashbin/l10n/ast.php b/apps/files_trashbin/l10n/ast.php index 688e1ce3d8f..6721e146e77 100644 --- a/apps/files_trashbin/l10n/ast.php +++ b/apps/files_trashbin/l10n/ast.php @@ -2,11 +2,13 @@ $TRANSLATIONS = array( "Couldn't delete %s permanently" => "Nun pudo desaniciase %s dafechu", "Couldn't restore %s" => "Nun pudo restaurase %s", +"Deleted files" => "Ficheros desaniciaos", "Error" => "Fallu", +"Restore" => "Restaurar", "Deleted Files" => "Ficheros desaniciaos", +"restored" => "recuperóse", "Nothing in here. Your trash bin is empty!" => "Nun hai un res equÃ. La papelera ta balera!", "Name" => "Nome", -"Restore" => "Restaurar", "Deleted" => "Desaniciáu", "Delete" => "Desaniciar" ); diff --git a/apps/files_trashbin/l10n/km.php b/apps/files_trashbin/l10n/km.php index 1df805de2d6..53e395f6ac6 100644 --- a/apps/files_trashbin/l10n/km.php +++ b/apps/files_trashbin/l10n/km.php @@ -1,8 +1,9 @@ <?php $TRANSLATIONS = array( +"Deleted files" => "បាន​លុប​ឯកសារ", "Error" => "កំហុស", -"Name" => "ឈ្មោះ", "Restore" => "ស្ដារ​មក​វិញ", +"Name" => "ឈ្មោះ", "Delete" => "លុប" ); $PLURAL_FORMS = "nplurals=1; plural=0;"; diff --git a/apps/files_trashbin/l10n/tr.php b/apps/files_trashbin/l10n/tr.php index ff4227e38c7..ec9dd393b88 100644 --- a/apps/files_trashbin/l10n/tr.php +++ b/apps/files_trashbin/l10n/tr.php @@ -4,11 +4,11 @@ $TRANSLATIONS = array( "Couldn't restore %s" => "%s geri yüklenemedi", "Deleted files" => "SilinmiÅŸ dosyalar", "Error" => "Hata", +"Restore" => "Geri yükle", "Deleted Files" => "Silinen Dosyalar", "restored" => "geri yüklendi", "Nothing in here. Your trash bin is empty!" => "Burada hiçbir ÅŸey yok. Çöp kutunuz tamamen boÅŸ!", "Name" => "Ä°sim", -"Restore" => "Geri yükle", "Deleted" => "Silindi", "Delete" => "Sil" ); diff --git a/apps/files_trashbin/lib/helper.php b/apps/files_trashbin/lib/helper.php index e6ca73520a6..c98d57586d3 100644 --- a/apps/files_trashbin/lib/helper.php +++ b/apps/files_trashbin/lib/helper.php @@ -8,11 +8,14 @@ class Helper { /** * Retrieves the contents of a trash bin directory. + * * @param string $dir path to the directory inside the trashbin * or empty to retrieve the root of the trashbin + * @param string $sortAttribute attribute to sort on or empty to disable sorting + * @param bool $sortDescending true for descending sort, false otherwise * @return \OCP\Files\FileInfo[] */ - public static function getTrashFiles($dir){ + public static function getTrashFiles($dir, $sortAttribute = '', $sortDescending = false){ $result = array(); $timestamp = null; $user = \OCP\User::getUser(); @@ -57,8 +60,9 @@ class Helper closedir($dirContent); } - usort($result, array('\OCA\Files\Helper', 'fileCmp')); - + if ($sortAttribute !== '') { + return \OCA\Files\Helper::sortFiles($result, $sortAttribute, $sortDescending); + } return $result; } diff --git a/apps/files_trashbin/lib/trashbin.php b/apps/files_trashbin/lib/trashbin.php index 173eb2164cf..e2f220051c7 100644 --- a/apps/files_trashbin/lib/trashbin.php +++ b/apps/files_trashbin/lib/trashbin.php @@ -216,7 +216,7 @@ class Trashbin { list($owner, $ownerPath) = self::getUidAndFilename($file_path); - $util = new \OCA\Encryption\Util(new \OC_FilesystemView('/'), $user); + $util = new \OCA\Encryption\Util(new \OC\Files\View('/'), $user); // disable proxy to prevent recursive calls $proxyStatus = \OC_FileProxy::$enabled; @@ -441,7 +441,7 @@ class Trashbin { list($owner, $ownerPath) = self::getUidAndFilename($target); - $util = new \OCA\Encryption\Util(new \OC_FilesystemView('/'), $user); + $util = new \OCA\Encryption\Util(new \OC\Files\View('/'), $user); if ($util->isSystemWideMountPoint($ownerPath)) { $baseDir = '/files_encryption/'; @@ -498,7 +498,7 @@ class Trashbin { $rootView->rename($ownerShareKey, $baseDir . '/share-keys/' . $ownerPath . '.' . $user . '.shareKey'); // try to re-share if file is shared - $filesystemView = new \OC_FilesystemView('/'); + $filesystemView = new \OC\Files\View('/'); $session = new \OCA\Encryption\Session($filesystemView); $util = new \OCA\Encryption\Util($filesystemView, $user); diff --git a/apps/files_trashbin/templates/index.php b/apps/files_trashbin/templates/index.php index 323e7495535..7c673c317e0 100644 --- a/apps/files_trashbin/templates/index.php +++ b/apps/files_trashbin/templates/index.php @@ -1,3 +1,4 @@ +<?php /** @var $l OC_L10N */ ?> <div id="controls"> <div id="file_action_panel"></div> </div> @@ -5,29 +6,29 @@ <div id="emptycontent" class="hidden"><?php p($l->t('Nothing in here. Your trash bin is empty!'))?></div> -<input type="hidden" id="permissions" value="0"></input> -<input type="hidden" id="disableSharing" data-status="<?php p($_['disableSharing']); ?>"></input> +<input type="hidden" id="permissions" value="0"> +<input type="hidden" id="disableSharing" data-status="<?php p($_['disableSharing']); ?>"> <input type="hidden" name="dir" value="<?php p($_['dir']) ?>" id="dir"> <table id="filestable"> <thead> <tr> - <th id='headerName'> + <th id='headerName' class="hidden column-name"> <div id="headerName-container"> - <input type="checkbox" id="select_all" /> - <label for="select_all"></label> - <span class='name'><?php p($l->t( 'Name' )); ?></span> - <span class='selectedActions'> + <input type="checkbox" id="select_all" /> + <label for="select_all"></label> + <a class="name sort columntitle" data-sort="name"><span><?php p($l->t( 'Name' )); ?></span><span class="sort-indicator"></span></a> + <span id="selectedActionsList" class='selectedActions'> <a href="" class="undelete"> <img class="svg" alt="<?php p($l->t( 'Restore' )); ?>" src="<?php print_unescaped(OCP\image_path("core", "actions/history.svg")); ?>" /> <?php p($l->t('Restore'))?> </a> - </span> + </span> </div> </th> - <th id="headerDate"> - <span id="modified"><?php p($l->t( 'Deleted' )); ?></span> + <th id="headerDate" class="hidden column-mtime"> + <a id="modified" class="columntitle" data-sort="mtime"><span><?php p($l->t( 'Deleted' )); ?></span><span class="sort-indicator"></span></a> <span class="selectedActions"> <a href="" class="delete-selected"> <?php p($l->t('Delete'))?> diff --git a/apps/files_versions/lib/versions.php b/apps/files_versions/lib/versions.php index 290264a90cc..e97510dead8 100644 --- a/apps/files_versions/lib/versions.php +++ b/apps/files_versions/lib/versions.php @@ -265,7 +265,7 @@ class Storage { * @param string $uid user id from the owner of the file * @param string $filename file to find versions of, relative to the user files dir * @param string $userFullPath - * @returns array versions newest version first + * @return array versions newest version first */ public static function getVersions($uid, $filename, $userFullPath = '') { $versions = array(); @@ -579,7 +579,7 @@ class Storage { * @param \OC\Files\View $view view on data/user/ */ private static function createMissingDirectories($filename, $view) { - $dirname = \OC_Filesystem::normalizePath(dirname($filename)); + $dirname = \OC\Files\Filesystem::normalizePath(dirname($filename)); $dirParts = explode('/', $dirname); $dir = "/files_versions"; foreach ($dirParts as $part) { diff --git a/apps/user_ldap/l10n/ast.php b/apps/user_ldap/l10n/ast.php index ad37405ca70..f793847b231 100644 --- a/apps/user_ldap/l10n/ast.php +++ b/apps/user_ldap/l10n/ast.php @@ -23,6 +23,7 @@ $TRANSLATIONS = array( "_%s user found_::_%s users found_" => array("%s usuariu alcontráu","%s usuarios alcontraos"), "Could not find the desired feature" => "Nun pudo alcontrase la carauterÃstica deseyada", "Save" => "Guardar", +"Help" => "Ayuda", "groups found" => "grupos alcontraos", "Users login with this attribute:" => "Aniciu de sesión d'usuarios con esti atributu:", "LDAP Username:" => "Nome d'usuariu LDAP", diff --git a/apps/user_ldap/l10n/es_CO.php b/apps/user_ldap/l10n/es_CO.php new file mode 100644 index 00000000000..3a1e002311c --- /dev/null +++ b/apps/user_ldap/l10n/es_CO.php @@ -0,0 +1,6 @@ +<?php +$TRANSLATIONS = array( +"_%s group found_::_%s groups found_" => array("",""), +"_%s user found_::_%s users found_" => array("","") +); +$PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/user_ldap/l10n/es_EC.php b/apps/user_ldap/l10n/es_EC.php new file mode 100644 index 00000000000..3a1e002311c --- /dev/null +++ b/apps/user_ldap/l10n/es_EC.php @@ -0,0 +1,6 @@ +<?php +$TRANSLATIONS = array( +"_%s group found_::_%s groups found_" => array("",""), +"_%s user found_::_%s users found_" => array("","") +); +$PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/user_ldap/l10n/es_PE.php b/apps/user_ldap/l10n/es_PE.php new file mode 100644 index 00000000000..3a1e002311c --- /dev/null +++ b/apps/user_ldap/l10n/es_PE.php @@ -0,0 +1,6 @@ +<?php +$TRANSLATIONS = array( +"_%s group found_::_%s groups found_" => array("",""), +"_%s user found_::_%s users found_" => array("","") +); +$PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/user_ldap/l10n/es_UY.php b/apps/user_ldap/l10n/es_UY.php new file mode 100644 index 00000000000..3a1e002311c --- /dev/null +++ b/apps/user_ldap/l10n/es_UY.php @@ -0,0 +1,6 @@ +<?php +$TRANSLATIONS = array( +"_%s group found_::_%s groups found_" => array("",""), +"_%s user found_::_%s users found_" => array("","") +); +$PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/user_ldap/l10n/ja.php b/apps/user_ldap/l10n/ja.php index 19804721642..3b479350478 100644 --- a/apps/user_ldap/l10n/ja.php +++ b/apps/user_ldap/l10n/ja.php @@ -90,6 +90,8 @@ $TRANSLATIONS = array( "Group-Member association" => "グループã¨ãƒ¡ãƒ³ãƒãƒ¼ã®é–¢é€£ä»˜ã‘", "Nested Groups" => "ãƒã‚¹ãƒˆåŒ–ブãƒãƒƒã‚¯", "When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" => "オンã«åˆ‡ã‚Šæ›¿ãˆãŸã‚‰ã€ã‚°ãƒ«ãƒ¼ãƒ—ã‚’å«ã‚€ã‚°ãƒ«ãƒ¼ãƒ—ãŒã‚µãƒãƒ¼ãƒˆã•ã‚Œã¾ã™ã€‚(グループメンãƒãƒ¼ã®å±žæ€§ãŒDNã‚’å«ã‚€å ´åˆã®ã¿æœ‰åŠ¹ã§ã™ã€‚)", +"Paging chunksize" => "ページ分割サイズ", +"Chunksize used for paged LDAP searches that may return bulky results like user or group enumeration. (Setting it 0 disables paged LDAP searches in those situations.)" => "ページ分割サイズã¯ã€LDAP検索時ã«ãƒ¦ãƒ¼ã‚¶ãƒ¼ã‚„グループã®ãƒªã‚¹ãƒˆä¸€è¦§ãƒ‡ãƒ¼ã‚¿ã‚’一括ã§è¿”ã™ãƒ‡ãƒ¼ã‚¿é‡ã‚’指定ã—ã¾ã™ã€‚(è¨å®šãŒ0ã®å ´åˆã«ã¯ã€LDAP検索ã®åˆ†å‰²è»¢é€ã¯ç„¡åŠ¹)", "Special Attributes" => "特殊属性", "Quota Field" => "クォータフィールド", "Quota Default" => "クォータã®ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆ", diff --git a/apps/user_ldap/l10n/km.php b/apps/user_ldap/l10n/km.php index ad3cc4882c1..ff9ddc539f8 100644 --- a/apps/user_ldap/l10n/km.php +++ b/apps/user_ldap/l10n/km.php @@ -15,6 +15,7 @@ $TRANSLATIONS = array( "Help" => "ជំនួយ", "Add Server Configuration" => "បន្ážáŸ‚ម​ការ​កំណážáŸ‹â€‹ážšáž…នាសម្ពáŸáž“្ធ​ម៉ាស៊ីន​បម្រើ", "Host" => "ម៉ាស៊ីន​ផ្ទុក", -"Password" => "ពាក្យសម្ងាážáŸ‹" +"Password" => "ពាក្យសម្ងាážáŸ‹", +"Continue" => "បន្áž" ); $PLURAL_FORMS = "nplurals=1; plural=0;"; diff --git a/apps/user_ldap/l10n/pt_PT.php b/apps/user_ldap/l10n/pt_PT.php index 368eee1f12d..21065b65679 100644 --- a/apps/user_ldap/l10n/pt_PT.php +++ b/apps/user_ldap/l10n/pt_PT.php @@ -94,9 +94,11 @@ $TRANSLATIONS = array( "By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder. It is also a part of remote URLs, for instance for all *DAV services. With this setting, the default behavior can be overridden. To achieve a similar behavior as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users." => "Por padrão o nome de utilizador interno vai ser criado através do atributo UUID. Desta forma é assegurado que o nome é único e os caracteres não necessitam de serem convertidos. O nome interno tem a restrição de que apenas estes caracteres são permitidos: [ a-zA-Z0-9_.@- ]. Outros caracteres são substituÃdos pela sua correspondência ASCII ou simplesmente omitidos. Mesmo assim, quando for detetado uma colisão irá ser acrescentado um número. O nome interno é usado para identificar o utilizador internamente. É também o nome utilizado para a pasta inicial no ownCloud. É também parte de URLs remotos, como por exemplo os serviços *DAV. Com esta definição, o comportamento padrão é pode ser sobreposto. Para obter o mesmo comportamento antes do ownCloud 5 introduza o atributo do nome no campo seguinte. Deixe vazio para obter o comportamento padrão. As alterações apenas serão feitas para utilizadores mapeados (adicionados) LDAP.", "Internal Username Attribute:" => "Atributo do nome de utilizador interno", "Override UUID detection" => "Passar a detecção do UUID", +"By default, the UUID attribute is automatically detected. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users and groups." => "Por defeito, o ownCloud detecta automaticamente o atributo UUID. Este atributo é usado para identificar inequivocamente grupos e utilizadores LDAP. Igualmente, o nome de utilizador interno é criado com base no UUID, se o contrário não for especificado. Pode sobrepor esta definição colocando um atributo à sua escolha. Tenha em atenção que esse atributo deve ser válido tanto para grupos como para utilizadores, e que é único. Deixe em branco para optar pelo comportamento por defeito. Estas alteração apenas terão efeito em novos utilizadores e grupos mapeados (adicionados).", "UUID Attribute for Users:" => "Atributo UUID para utilizadores:", "UUID Attribute for Groups:" => "Atributo UUID para grupos:", "Username-LDAP User Mapping" => "Mapeamento do utilizador LDAP", +"Usernames are used to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found. The internal username is used all over. Clearing the mappings will have leftovers everywhere. Clearing the mappings is not configuration sensitive, it affects all LDAP configurations! Never clear the mappings in a production environment, only in a testing or experimental stage." => "O ownCloud usa nomes de utilizadores para guardar e atribuir (meta) dados. Para identificar com precisão os utilizadores, cada utilizador de LDAP tem um nome de utilizador interno. Isto requer um mapeamento entre o utilizador LDAP e o utilizador ownCloud. Adicionalmente, o DN é colocado em cache para reduzir a interação com LDAP, porém não é usado para identificação. Se o DN muda, essas alterações serão vistas pelo ownCloud. O nome interno do ownCloud é usado em todo o lado, no ownCloud. Limpar os mapeamentos deixará vestÃgios em todo o lado. A limpeza dos mapeamentos não é sensÃvel à configuração, pois afeta todas as configurações de LDAP! Nunca limpe os mapeamentos num ambiente de produção, apenas o faça numa fase de testes ou experimental.", "Clear Username-LDAP User Mapping" => "Limpar mapeamento do utilizador-LDAP", "Clear Groupname-LDAP Group Mapping" => "Limpar o mapeamento do nome de grupo LDAP" ); diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php index 712407505fb..c721703bce5 100644 --- a/apps/user_ldap/lib/access.php +++ b/apps/user_ldap/lib/access.php @@ -23,6 +23,10 @@ namespace OCA\user_ldap\lib; +/** + * Class Access + * @package OCA\user_ldap\lib + */ class Access extends LDAPUtility { public $connection; //never ever check this var directly, always use getPagedSearchResultState @@ -30,24 +34,30 @@ class Access extends LDAPUtility { protected $cookies = array(); + /** + * @param Connection $connection + * @param ILDAPWrapper $ldap + */ public function __construct(Connection $connection, ILDAPWrapper $ldap) { parent::__construct($ldap); $this->connection = $connection; } + /** + * @return bool + */ private function checkConnection() { return ($this->connection instanceof Connection); } /** * @brief reads a given attribute for an LDAP record identified by a DN - * @param $dn the record in question - * @param $attr the attribute that shall be retrieved + * @param string $dn the record in question + * @param string $attr the attribute that shall be retrieved * if empty, just check the record's existence - * @returns an array of values on success or an empty + * @param string $filter + * @return array|false an array of values on success or an empty * array if $attr is empty, false otherwise - * - * Reads an attribute from an LDAP entry or check if entry exists */ public function readAttribute($dn, $attr, $filter = 'objectClass=*') { if(!$this->checkConnection()) { @@ -105,7 +115,7 @@ class Access extends LDAPUtility { } /** - * @brief checks wether the given attribute`s valua is probably a DN + * @brief checks whether the given attributes value is probably a DN * @param string $attr the attribute in question * @return boolean if so true, otherwise false */ @@ -120,8 +130,8 @@ class Access extends LDAPUtility { /** * @brief sanitizes a DN received from the LDAP server - * @param $dn the DN in question - * @return the sanitized DN + * @param array $dn the DN in question + * @return array the sanitized DN */ private function sanitizeDN($dn) { //treating multiple base DNs @@ -163,7 +173,8 @@ class Access extends LDAPUtility { /** * gives back the database table for the query - * @param boolean $isUser + * @param bool $isUser + * @return string */ private function getMapTable($isUser) { if($isUser) { @@ -176,9 +187,7 @@ class Access extends LDAPUtility { /** * @brief returns the LDAP DN for the given internal ownCloud name of the group * @param string $name the ownCloud name in question - * @returns string with the LDAP DN on success, otherwise false - * - * returns the LDAP DN for the given internal ownCloud name of the group + * @return string with the LDAP DN on success, otherwise false */ public function groupname2dn($name) { $dn = $this->ocname2dn($name, false); @@ -192,10 +201,8 @@ class Access extends LDAPUtility { /** * @brief returns the LDAP DN for the given internal ownCloud name of the user - * @param $name the ownCloud name in question - * @returns string with the LDAP DN on success, otherwise false - * - * returns the LDAP DN for the given internal ownCloud name of the user + * @param string $name the ownCloud name in question + * @return string with the LDAP DN on success, otherwise false */ public function username2dn($name) { $dn = $this->ocname2dn($name, true); @@ -210,11 +217,9 @@ class Access extends LDAPUtility { /** * @brief returns the LDAP DN for the given internal ownCloud name - * @param $name the ownCloud name in question + * @param string $name the ownCloud name in question * @param boolean $isUser is it a user? otherwise group - * @returns string with the LDAP DN on success, otherwise false - * - * returns the LDAP DN for the given internal ownCloud name + * @return string with the LDAP DN on success, otherwise false */ private function ocname2dn($name, $isUser) { $table = $this->getMapTable($isUser); @@ -230,15 +235,12 @@ class Access extends LDAPUtility { } /** - * @brief returns the internal ownCloud name for the given LDAP DN of the group - * @param $dn the dn of the group object - * @param $ldapname optional, the display name of the object - * @returns string with with the name to use in ownCloud, false on DN outside of search DN - * - * returns the internal ownCloud name for the given LDAP DN of the - * group, false on DN outside of search DN or failure + * @brief returns the internal ownCloud name for the given LDAP DN of the group, false on DN outside of search DN or failure + * @param string $dn the dn of the group object + * @param string $ldapName optional, the display name of the object + * @return string with the name to use in ownCloud, false on DN outside of search DN */ - public function dn2groupname($dn, $ldapname = null) { + public function dn2groupname($dn, $ldapName = null) { //To avoid bypassing the base DN settings under certain circumstances //with the group support, check whether the provided DN matches one of //the given Bases @@ -246,18 +248,16 @@ class Access extends LDAPUtility { return false; } - return $this->dn2ocname($dn, $ldapname, false); + return $this->dn2ocname($dn, $ldapName, false); } /** - * @brief returns the internal ownCloud name for the given LDAP DN of the user - * @param $dn the dn of the user object - * @param $ldapname optional, the display name of the object - * @returns string with with the name to use in ownCloud - * - * returns the internal ownCloud name for the given LDAP DN of the user, false on DN outside of search DN or failure + * @brief returns the internal ownCloud name for the given LDAP DN of the user, false on DN outside of search DN or failure + * @param string $dn the dn of the user object + * @param string $ldapName optional, the display name of the object + * @return string with with the name to use in ownCloud */ - public function dn2username($dn, $ldapname = null) { + public function dn2username($dn, $ldapName = null) { //To avoid bypassing the base DN settings under certain circumstances //with the group support, check whether the provided DN matches one of //the given Bases @@ -265,19 +265,17 @@ class Access extends LDAPUtility { return false; } - return $this->dn2ocname($dn, $ldapname, true); + return $this->dn2ocname($dn, $ldapName, true); } /** - * @brief returns an internal ownCloud name for the given LDAP DN - * @param $dn the dn of the user object - * @param $ldapname optional, the display name of the object - * @param $isUser optional, wether it is a user object (otherwise group assumed) - * @returns string with with the name to use in ownCloud - * - * returns the internal ownCloud name for the given LDAP DN of the user, false on DN outside of search DN + * @brief returns an internal ownCloud name for the given LDAP DN, false on DN outside of search DN + * @param string $dn the dn of the user object + * @param string $ldapName optional, the display name of the object + * @param bool $isUser optional, whether it is a user object (otherwise group assumed) + * @return string with with the name to use in ownCloud */ - public function dn2ocname($dn, $ldapname = null, $isUser = true) { + public function dn2ocname($dn, $ldapName = null, $isUser = true) { $table = $this->getMapTable($isUser); if($isUser) { $fncFindMappedName = 'findMappedUser'; @@ -288,9 +286,9 @@ class Access extends LDAPUtility { } //let's try to retrieve the ownCloud name from the mappings table - $ocname = $this->$fncFindMappedName($dn); - if($ocname) { - return $ocname; + $ocName = $this->$fncFindMappedName($dn); + if($ocName) { + return $ocName; } //second try: get the UUID and check if it is known. Then, update the DN and return the name. @@ -317,13 +315,13 @@ class Access extends LDAPUtility { return false; } - if(is_null($ldapname)) { - $ldapname = $this->readAttribute($dn, $nameAttribute); - if(!isset($ldapname[0]) && empty($ldapname[0])) { + if(is_null($ldapName)) { + $ldapName = $this->readAttribute($dn, $nameAttribute); + if(!isset($ldapName[0]) && empty($ldapName[0])) { \OCP\Util::writeLog('user_ldap', 'No or empty name for '.$dn.'.', \OCP\Util::INFO); return false; } - $ldapname = $ldapname[0]; + $ldapName = $ldapName[0]; } if($isUser) { @@ -334,27 +332,27 @@ class Access extends LDAPUtility { } else { $username = $uuid; } - $intname = $this->sanitizeUsername($username); + $intName = $this->sanitizeUsername($username); } else { - $intname = $ldapname; + $intName = $ldapName; } //a new user/group! Add it only if it doesn't conflict with other backend's users or existing groups //disabling Cache is required to avoid that the new user is cached as not-existing in fooExists check $originalTTL = $this->connection->ldapCacheTTL; $this->connection->setConfiguration(array('ldapCacheTTL' => 0)); - if(($isUser && !\OCP\User::userExists($intname)) - || (!$isUser && !\OC_Group::groupExists($intname))) { - if($this->mapComponent($dn, $intname, $isUser)) { + if(($isUser && !\OCP\User::userExists($intName)) + || (!$isUser && !\OC_Group::groupExists($intName))) { + if($this->mapComponent($dn, $intName, $isUser)) { $this->connection->setConfiguration(array('ldapCacheTTL' => $originalTTL)); - return $intname; + return $intName; } } $this->connection->setConfiguration(array('ldapCacheTTL' => $originalTTL)); - $altname = $this->createAltInternalOwnCloudName($intname, $isUser); - if($this->mapComponent($dn, $altname, $isUser)) { - return $altname; + $altName = $this->createAltInternalOwnCloudName($intName, $isUser); + if($this->mapComponent($dn, $altName, $isUser)) { + return $altName; } //if everything else did not help.. @@ -364,8 +362,8 @@ class Access extends LDAPUtility { /** * @brief gives back the user names as they are used ownClod internally - * @param $ldapGroups an array with the ldap Users result in style of array ( array ('dn' => foo, 'uid' => bar), ... ) - * @returns an array with the user names to use in ownCloud + * @param array $ldapUsers an array with the ldap Users result in style of array ( array ('dn' => foo, 'uid' => bar), ... ) + * @return array an array with the user names to use in ownCloud * * gives back the user names as they are used ownClod internally */ @@ -375,8 +373,8 @@ class Access extends LDAPUtility { /** * @brief gives back the group names as they are used ownClod internally - * @param $ldapGroups an array with the ldap Groups result in style of array ( array ('dn' => foo, 'cn' => bar), ... ) - * @returns an array with the group names to use in ownCloud + * @param array $ldapGroups an array with the ldap Groups result in style of array ( array ('dn' => foo, 'cn' => bar), ... ) + * @return array an array with the group names to use in ownCloud * * gives back the group names as they are used ownClod internally */ @@ -384,6 +382,10 @@ class Access extends LDAPUtility { return $this->ldap2ownCloudNames($ldapGroups, false); } + /** + * @param $dn + * @return bool|string + */ private function findMappedUser($dn) { static $query = null; if(is_null($query)) { @@ -400,6 +402,10 @@ class Access extends LDAPUtility { return false; } + /** + * @param $dn + * @return bool|string + */ private function findMappedGroup($dn) { static $query = null; if(is_null($query)) { @@ -416,9 +422,10 @@ class Access extends LDAPUtility { return false; } - /** - * @param boolean $isUsers + * @param array $ldapObjects + * @param bool $isUsers + * @return array */ private function ldap2ownCloudNames($ldapObjects, $isUsers) { if($isUsers) { @@ -430,13 +437,13 @@ class Access extends LDAPUtility { foreach($ldapObjects as $ldapObject) { $nameByLDAP = isset($ldapObject[$nameAttribute]) ? $ldapObject[$nameAttribute] : null; - $ocname = $this->dn2ocname($ldapObject['dn'], $nameByLDAP, $isUsers); - if($ocname) { - $ownCloudNames[] = $ocname; + $ocName = $this->dn2ocname($ldapObject['dn'], $nameByLDAP, $isUsers); + if($ocName) { + $ownCloudNames[] = $ocName; if($isUsers) { //cache the user names so it does not need to be retrieved //again later (e.g. sharing dialogue). - $this->cacheUserDisplayName($ocname, $nameByLDAP); + $this->cacheUserDisplayName($ocName, $nameByLDAP); } } continue; @@ -446,18 +453,18 @@ class Access extends LDAPUtility { /** * @brief caches the user display name - * @param string the internal owncloud username - * @param string the display name + * @param string $ocName the internal ownCloud username + * @param string $displayName the display name */ - public function cacheUserDisplayName($ocname, $displayName) { + public function cacheUserDisplayName($ocName, $displayName) { $cacheKeyTrunk = 'getDisplayName'; - $this->connection->writeToCache($cacheKeyTrunk.$ocname, $displayName); + $this->connection->writeToCache($cacheKeyTrunk.$ocName, $displayName); } /** * @brief creates a unique name for internal ownCloud use for users. Don't call it directly. - * @param $name the display name of the object - * @returns string with with the name to use in ownCloud or false if unsuccessful + * @param string $name the display name of the object + * @return string with with the name to use in ownCloud or false if unsuccessful * * Instead of using this method directly, call * createAltInternalOwnCloudName($name, true) @@ -478,8 +485,8 @@ class Access extends LDAPUtility { /** * @brief creates a unique name for internal ownCloud use for groups. Don't call it directly. - * @param $name the display name of the object - * @returns string with with the name to use in ownCloud or false if unsuccessful. + * @param string $name the display name of the object + * @return string with with the name to use in ownCloud or false if unsuccessful. * * Instead of using this method directly, call * createAltInternalOwnCloudName($name, false) @@ -504,17 +511,17 @@ class Access extends LDAPUtility { $lastNo = 1; //will become name_2 } else { natsort($usedNames); - $lastname = array_pop($usedNames); - $lastNo = intval(substr($lastname, strrpos($lastname, '_') + 1)); + $lastName = array_pop($usedNames); + $lastNo = intval(substr($lastName, strrpos($lastName, '_') + 1)); } $altName = $name.'_'.strval($lastNo+1); unset($usedNames); $attempts = 1; while($attempts < 21){ - //Pro forma check to be really sure it is unique - //while loop is just a precaution. If a name is not generated within - //20 attempts, something else is very wrong. Avoids infinite loop. + // Check to be really sure it is unique + // while loop is just a precaution. If a name is not generated within + // 20 attempts, something else is very wrong. Avoids infinite loop. if(!\OC_Group::groupExists($altName)) { return $altName; } @@ -526,9 +533,9 @@ class Access extends LDAPUtility { /** * @brief creates a unique name for internal ownCloud use. - * @param $name the display name of the object + * @param string $name the display name of the object * @param boolean $isUser whether name should be created for a user (true) or a group (false) - * @returns string with with the name to use in ownCloud or false if unsuccessful + * @return string with with the name to use in ownCloud or false if unsuccessful */ private function createAltInternalOwnCloudName($name, $isUser) { $originalTTL = $this->connection->ldapCacheTTL; @@ -545,7 +552,7 @@ class Access extends LDAPUtility { /** * @brief retrieves all known groups from the mappings table - * @returns array with the results + * @return array with the results * * retrieves all known groups from the mappings table */ @@ -555,7 +562,7 @@ class Access extends LDAPUtility { /** * @brief retrieves all known users from the mappings table - * @returns array with the results + * @return array with the results * * retrieves all known users from the mappings table */ @@ -579,19 +586,19 @@ class Access extends LDAPUtility { /** * @brief inserts a new user or group into the mappings table - * @param $dn the record in question - * @param $ocname the name to use in ownCloud - * @param $isUser is it a user or a group? - * @returns true on success, false otherwise + * @param string $dn the record in question + * @param string $ocName the name to use in ownCloud + * @param bool $isUser is it a user or a group? + * @return bool true on success, false otherwise * * inserts a new user or group into the mappings table */ - private function mapComponent($dn, $ocname, $isUser = true) { + private function mapComponent($dn, $ocName, $isUser = true) { $table = $this->getMapTable($isUser); $sqlAdjustment = ''; - $dbtype = \OCP\Config::getSystemValue('dbtype'); - if($dbtype === 'mysql') { + $dbType = \OCP\Config::getSystemValue('dbtype'); + if($dbType === 'mysql') { $sqlAdjustment = 'FROM DUAL'; } @@ -607,9 +614,9 @@ class Access extends LDAPUtility { '); //feed the DB - $insRows = $insert->execute(array($dn, $ocname, + $insRows = $insert->execute(array($dn, $ocName, $this->getUUID($dn, $isUser), $dn, - $ocname)); + $ocName)); if(\OCP\DB::isError($insRows)) { return false; @@ -623,24 +630,31 @@ class Access extends LDAPUtility { } /** - * @param integer $limit - * @param integer $offset + * @param $filter + * @param $attr + * @param int $limit + * @param int $offset + * @return array */ public function fetchListOfUsers($filter, $attr, $limit = null, $offset = null) { return $this->fetchList($this->searchUsers($filter, $attr, $limit, $offset), (count($attr) > 1)); } /** - * @param string $filter - * @param integer $limit - * @param integer $offset + * @param $filter + * @param $attr + * @param int $limit + * @param int $offset + * @return array */ public function fetchListOfGroups($filter, $attr, $limit = null, $offset = null) { return $this->fetchList($this->searchGroups($filter, $attr, $limit, $offset), (count($attr) > 1)); } /** - * @param boolean $manyAttributes + * @param $list + * @param bool $manyAttributes + * @return array */ private function fetchList($list, $manyAttributes) { if(is_array($list)) { @@ -657,11 +671,11 @@ class Access extends LDAPUtility { /** * @brief executes an LDAP search, optimized for Users - * @param $filter the LDAP filter for the search - * @param $attr optional, when a certain attribute shall be filtered out + * @param string $filter the LDAP filter for the search + * @param string $attr optional, when a certain attribute shall be filtered out * @param integer $limit * @param integer $offset - * @returns array with the search result + * @return array with the search result * * Executes an LDAP search */ @@ -671,6 +685,10 @@ class Access extends LDAPUtility { /** * @param string $filter + * @param array $attr + * @param int $limit + * @param int $offset + * @return false|int */ public function countUsers($filter, $attr = array('dn'), $limit = null, $offset = null) { return $this->count($filter, $this->connection->ldapBaseUsers, $attr, $limit, $offset); @@ -679,10 +697,10 @@ class Access extends LDAPUtility { /** * @brief executes an LDAP search, optimized for Groups * @param string $filter the LDAP filter for the search - * @param $attr optional, when a certain attribute shall be filtered out + * @param string $attr optional, when a certain attribute shall be filtered out * @param integer $limit * @param integer $offset - * @returns array with the search result + * @return array with the search result * * Executes an LDAP search */ @@ -692,13 +710,13 @@ class Access extends LDAPUtility { /** * @brief prepares and executes an LDAP search operation - * @param $filter the LDAP filter for the search - * @param $base an array containing the LDAP subtree(s) that shall be searched - * @param $attr optional, array, one or more attributes that shall be + * @param string $filter the LDAP filter for the search + * @param array $base an array containing the LDAP subtree(s) that shall be searched + * @param array $attr optional, array, one or more attributes that shall be * retrieved. Results will according to the order in the array. - * @param $limit optional, maximum results to be counted - * @param $offset optional, a starting point - * @returns array with the search result as first value and pagedSearchOK as + * @param int $limit optional, maximum results to be counted + * @param int $offset optional, a starting point + * @return array|false array with the search result as first value and pagedSearchOK as * second | false if not successful */ private function executeSearch($filter, $base, &$attr = null, $limit = null, $offset = null) { @@ -715,7 +733,7 @@ class Access extends LDAPUtility { return false; } - //check wether paged search should be attempted + //check whether paged search should be attempted $pagedSearchOK = $this->initPagedSearch($filter, $base, $attr, $limit, $offset); $linkResources = array_pad(array(), count($base), $cr); @@ -738,16 +756,16 @@ class Access extends LDAPUtility { /** * @brief processes an LDAP paged search operation - * @param $sr the array containing the LDAP search resources - * @param $filter the LDAP filter for the search - * @param $base an array containing the LDAP subtree(s) that shall be searched - * @param $iFoundItems number of results in the search operation - * @param $limit maximum results to be counted - * @param $offset a starting point - * @param $pagedSearchOK whether a paged search has been executed - * @param boolean $skipHandling required for paged search when cookies to + * @param array $sr the array containing the LDAP search resources + * @param string $filter the LDAP filter for the search + * @param array $base an array containing the LDAP subtree(s) that shall be searched + * @param int $iFoundItems number of results in the search operation + * @param int $limit maximum results to be counted + * @param int $offset a starting point + * @param bool $pagedSearchOK whether a paged search has been executed + * @param bool $skipHandling required for paged search when cookies to * prior results need to be gained - * @returns array with the search result as first value and pagedSearchOK as + * @return array|false array with the search result as first value and pagedSearchOK as * second | false if not successful */ private function processPagedSearchStatus($sr, $filter, $base, $iFoundItems, $limit, $offset, $pagedSearchOK, $skipHandling) { @@ -780,14 +798,14 @@ class Access extends LDAPUtility { /** * @brief executes an LDAP search, but counts the results only * @param string $filter the LDAP filter for the search - * @param $base an array containing the LDAP subtree(s) that shall be searched - * @param $attr optional, array, one or more attributes that shall be + * @param array $base an array containing the LDAP subtree(s) that shall be searched + * @param array $attr optional, array, one or more attributes that shall be * retrieved. Results will according to the order in the array. - * @param $limit optional, maximum results to be counted - * @param $offset optional, a starting point - * @param $skipHandling indicates whether the pages search operation is + * @param int $limit optional, maximum results to be counted + * @param int $offset optional, a starting point + * @param bool $skipHandling indicates whether the pages search operation is * completed - * @returns int | false if the search could not be initialized + * @return int|false Integer or false if the search could not be initialized * */ private function count($filter, $base, $attr = null, $limit = null, $offset = null, $skipHandling = false) { @@ -799,7 +817,7 @@ class Access extends LDAPUtility { $counter = 0; $count = null; - $cr = $this->connection->getConnectionResource(); + $this->connection->getConnectionResource(); do { $continue = false; @@ -821,10 +839,15 @@ class Access extends LDAPUtility { return $counter; } - private function countEntriesInSearchResults($searchResults, $limit, - &$hasHitLimit) { + /** + * @param $searchResults + * @param $limit + * @param $hasHitLimit + * @return int + */ + private function countEntriesInSearchResults($searchResults, $limit, &$hasHitLimit) { $cr = $this->connection->getConnectionResource(); - $count = 0; + $counter = 0; foreach($searchResults as $res) { $count = intval($this->ldap->countEntries($cr, $res)); @@ -838,14 +861,14 @@ class Access extends LDAPUtility { } /** - * @brief executes an LDAP search - * @param $filter the LDAP filter for the search - * @param $base an array containing the LDAP subtree(s) that shall be searched - * @param $attr optional, array, one or more attributes that shall be - * retrieved. Results will according to the order in the array. - * @returns array with the search result - * - * Executes an LDAP search + * @brief Executes an LDAP search + * @param string $filter the LDAP filter for the search + * @param array $base an array containing the LDAP subtree(s) that shall be searched + * @param array $attr optional, array, one or more attributes that shall be + * @param int $limit + * @param int $offset + * @param bool $skipHandling + * @return array with the search result */ private function search($filter, $base, $attr = null, $limit = null, $offset = null, $skipHandling = false) { $search = $this->executeSearch($filter, $base, $attr, $limit, $offset); @@ -873,7 +896,7 @@ class Access extends LDAPUtility { } $findings = array(); - foreach($sr as $key => $res) { + foreach($sr as $res) { $findings = array_merge($findings, $this->ldap->getEntries($cr , $res )); } @@ -889,9 +912,9 @@ class Access extends LDAPUtility { if(!is_null($attr)) { $selection = array(); - $multiarray = false; + $multiArray = false; if(count($attr) > 1) { - $multiarray = true; + $multiArray = true; $i = 0; } foreach($findings as $item) { @@ -900,7 +923,7 @@ class Access extends LDAPUtility { } $item = \OCP\Util::mb_array_change_key_case($item, MB_CASE_LOWER, 'UTF-8'); - if($multiarray) { + if($multiArray) { foreach($attr as $key) { $key = mb_strtolower($key, 'UTF-8'); if(isset($item[$key])) { @@ -931,7 +954,7 @@ class Access extends LDAPUtility { $findings = $selection; } //we slice the findings, when - //a) paged search insuccessful, though attempted + //a) paged search unsuccessful, though attempted //b) no paged search, but limit set if((!$this->getPagedSearchResultState() && $pagedSearchOK) @@ -945,19 +968,23 @@ class Access extends LDAPUtility { return $findings; } + /** + * @param $name + * @return bool|mixed|string + */ public function sanitizeUsername($name) { if($this->connection->ldapIgnoreNamingRules) { return $name; } - // Translitaration - //latin characters to ASCII + // Transliteration + // latin characters to ASCII $name = iconv('UTF-8', 'ASCII//TRANSLIT', $name); - //REPLACEMENTS + // Replacements $name = \OCP\Util::mb_str_replace(' ', '_', $name, 'UTF-8'); - //every remaining unallowed characters will be removed + // Every remaining disallowed characters will be removed $name = preg_replace('/[^a-zA-Z0-9_.@-]/u', '', $name); return $name; @@ -966,7 +993,7 @@ class Access extends LDAPUtility { /** * @brief escapes (user provided) parts for LDAP filter * @param string $input, the provided value - * @return the escaped string + * @return string the escaped string */ public function escapeFilterPart($input) { $search = array('*', '\\', '(', ')'); @@ -977,9 +1004,7 @@ class Access extends LDAPUtility { /** * @brief combines the input filters with AND * @param $filters array, the filters to connect - * @returns the combined filter - * - * Combines Filter arguments with AND + * @return string the combined filter */ public function combineFilterWithAnd($filters) { return $this->combineFilter($filters, '&'); @@ -988,9 +1013,7 @@ class Access extends LDAPUtility { /** * @brief combines the input filters with AND * @param $filters array, the filters to connect - * @returns the combined filter - * - * Combines Filter arguments with AND + * @return string the combined filter */ public function combineFilterWithOr($filters) { return $this->combineFilter($filters, '|'); @@ -1000,9 +1023,7 @@ class Access extends LDAPUtility { * @brief combines the input filters with given operator * @param $filters array, the filters to connect * @param string $operator either & or | - * @returns the combined filter - * - * Combines Filter arguments with AND + * @return string the combined filter */ private function combineFilter($filters, $operator) { $combinedFilter = '('.$operator; @@ -1017,7 +1038,7 @@ class Access extends LDAPUtility { } /** - * @brief creates a filter part for to perfrom search for users + * @brief creates a filter part for to perform search for users * @param string $search the search term * @return string the final filter part to use in LDAP searches */ @@ -1028,7 +1049,7 @@ class Access extends LDAPUtility { } /** - * @brief creates a filter part for to perfrom search for groups + * @brief creates a filter part for to perform search for groups * @param string $search the search term * @return string the final filter part to use in LDAP searches */ @@ -1041,9 +1062,10 @@ class Access extends LDAPUtility { /** * @brief creates a filter part for searches * @param string $search the search term + * @param $searchAttributes * @param string $fallbackAttribute a fallback attribute in case the user * did not define search attributes. Typically the display name attribute. - * @returns string the final filter part to use in LDAP searches + * @return string the final filter part to use in LDAP searches */ private function getFilterPartForSearch($search, $searchAttributes, $fallbackAttribute) { $filter = array(); @@ -1065,7 +1087,9 @@ class Access extends LDAPUtility { } /** + * @param string $name * @param string $password + * @return bool */ public function areCredentialsValid($name, $password) { $name = $this->DNasBaseParameter($name); @@ -1084,9 +1108,10 @@ class Access extends LDAPUtility { /** * @brief auto-detects the directory's UUID attribute - * @param $dn a known DN used to check against - * @param $force the detection should be run, even if it is not set to auto - * @returns true on success, false otherwise + * @param string $dn a known DN used to check against + * @param bool $isUser + * @param bool $force the detection should be run, even if it is not set to auto + * @return bool true on success, false otherwise */ private function detectUuidAttribute($dn, $isUser = true, $force = false) { if($isUser) { @@ -1106,7 +1131,7 @@ class Access extends LDAPUtility { return true; } - //for now, supported attributes are entryUUID, nsuniqueid, objectGUID, ipaUniqueID + // for now, supported attributes are entryUUID, nsuniqueid, objectGUID, ipaUniqueID $testAttributes = array('entryuuid', 'nsuniqueid', 'objectguid', 'guid', 'ipauniqueid'); foreach($testAttributes as $attribute) { @@ -1126,6 +1151,11 @@ class Access extends LDAPUtility { return false; } + /** + * @param $dn + * @param bool $isUser + * @return array|bool|false + */ public function getUUID($dn, $isUser = true) { if($isUser) { $uuidAttr = 'ldapUuidUserAttribute'; @@ -1154,11 +1184,9 @@ class Access extends LDAPUtility { /** * @brief converts a binary ObjectGUID into a string representation - * @param $oguid the ObjectGUID in it's binary form as retrieved from AD - * @returns String - * - * converts a binary ObjectGUID into a string representation - * http://www.php.net/manual/en/function.ldap-get-values-len.php#73198 + * @param string $oguid the ObjectGUID in it's binary form as retrieved from AD + * @return string + * @link http://www.php.net/manual/en/function.ldap-get-values-len.php#73198 */ private function convertObjectGUID2Str($oguid) { $hex_guid = bin2hex($oguid); @@ -1181,12 +1209,9 @@ class Access extends LDAPUtility { } /** - * @brief converts a stored DN so it can be used as base parameter for LDAP queries - * @param $dn the DN - * @returns String - * - * converts a stored DN so it can be used as base parameter for LDAP queries - * internally we store them for usage in LDAP filters + * @brief converts a stored DN so it can be used as base parameter for LDAP queries, internally we store them for usage in LDAP filters + * @param string $dn the DN + * @return string */ private function DNasBaseParameter($dn) { return str_ireplace('\\5c', '\\', $dn); @@ -1194,12 +1219,14 @@ class Access extends LDAPUtility { /** * @brief checks if the given DN is part of the given base DN(s) - * @param $dn the DN + * @param string $dn the DN * @param $bases array containing the allowed base DN or DNs - * @returns Boolean + * @return bool */ private function isDNPartOfBase($dn, $bases) { + $belongsToBase = false; $bases = $this->sanitizeDN($bases); + foreach($bases as $base) { $belongsToBase = true; if(mb_strripos($dn, $base, 0, 'UTF-8') !== (mb_strlen($dn, 'UTF-8')-mb_strlen($base, 'UTF-8'))) { @@ -1214,11 +1241,11 @@ class Access extends LDAPUtility { /** * @brief get a cookie for the next LDAP paged search - * @param $base a string with the base DN for the search - * @param $filter the search filter to identify the correct search - * @param $limit the limit (or 'pageSize'), to identify the correct search well - * @param $offset the offset for the new search to identify the correct search really good - * @returns string containing the key or empty if none is cached + * @param string $base a string with the base DN for the search + * @param string $filter the search filter to identify the correct search + * @param int $limit the limit (or 'pageSize'), to identify the correct search well + * @param int $offset the offset for the new search to identify the correct search really good + * @return string containing the key or empty if none is cached */ private function getPagedResultCookie($base, $filter, $limit, $offset) { if($offset === 0) { @@ -1226,10 +1253,10 @@ class Access extends LDAPUtility { } $offset -= $limit; //we work with cache here - $cachekey = 'lc' . crc32($base) . '-' . crc32($filter) . '-' . intval($limit) . '-' . intval($offset); + $cacheKey = 'lc' . crc32($base) . '-' . crc32($filter) . '-' . intval($limit) . '-' . intval($offset); $cookie = ''; - if(isset($this->cookies[$cachekey])) { - $cookie = $this->cookies[$cachekey]; + if(isset($this->cookies[$cacheKey])) { + $cookie = $this->cookies[$cacheKey]; if(is_null($cookie)) { $cookie = ''; } @@ -1239,22 +1266,22 @@ class Access extends LDAPUtility { /** * @brief set a cookie for LDAP paged search run - * @param $base a string with the base DN for the search - * @param $filter the search filter to identify the correct search - * @param $limit the limit (or 'pageSize'), to identify the correct search well - * @param $offset the offset for the run search to identify the correct search really good - * @param $cookie string containing the cookie returned by ldap_control_paged_result_response + * @param string $base a string with the base DN for the search + * @param string $filter the search filter to identify the correct search + * @param int $limit the limit (or 'pageSize'), to identify the correct search well + * @param int $offset the offset for the run search to identify the correct search really good + * @param string $cookie string containing the cookie returned by ldap_control_paged_result_response * @return void */ private function setPagedResultCookie($base, $filter, $limit, $offset, $cookie) { if(!empty($cookie)) { - $cachekey = 'lc' . crc32($base) . '-' . crc32($filter) . '-' .intval($limit) . '-' . intval($offset); - $this->cookies[$cachekey] = $cookie; + $cacheKey = 'lc' . crc32($base) . '-' . crc32($filter) . '-' .intval($limit) . '-' . intval($offset); + $this->cookies[$cacheKey] = $cookie; } } /** - * @brief check wether the most recent paged search was successful. It flushed the state var. Use it always after a possible paged search. + * @brief Check whether the most recent paged search was successful. It flushed the state var. Use it always after a possible paged search. * @return boolean|null true on success, null or false otherwise */ public function getPagedSearchResultState() { @@ -1263,15 +1290,14 @@ class Access extends LDAPUtility { return $result; } - /** - * @brief prepares a paged search, if possible - * @param $filter the LDAP filter for the search - * @param $bases an array containing the LDAP subtree(s) that shall be searched - * @param $attr optional, when a certain attribute shall be filtered outside - * @param $limit - * @param $offset - * + * @brief Prepares a paged search, if possible + * @param string $filter the LDAP filter for the search + * @param array $bases an array containing the LDAP subtree(s) that shall be searched + * @param array $attr optional, when a certain attribute shall be filtered outside + * @param int $limit + * @param int $offset + * @return bool|true */ private function initPagedSearch($filter, $bases, $attr, $limit, $offset) { $pagedSearchOK = false; @@ -1287,8 +1313,9 @@ class Access extends LDAPUtility { $cookie = $this->getPagedResultCookie($base, $filter, $limit, $offset); if(empty($cookie) && ($offset > 0)) { // no cookie known, although the offset is not 0. Maybe cache run out. We need - // to start all over *sigh* (btw, Dear Reader, did you need LDAP paged + // to start all over *sigh* (btw, Dear Reader, did you know LDAP paged // searching was designed by MSFT?) + // Lukas: No, but thanks to reading that source I finally know! $reOffset = ($offset - $limit) < 0 ? 0 : $offset - $limit; //a bit recursive, $offset of 0 is the exit \OCP\Util::writeLog('user_ldap', 'Looking for cookie L/O '.$limit.'/'.$reOffset, \OCP\Util::INFO); diff --git a/apps/user_ldap/lib/backendutility.php b/apps/user_ldap/lib/backendutility.php index 815757a1a11..8ad26246c6b 100644 --- a/apps/user_ldap/lib/backendutility.php +++ b/apps/user_ldap/lib/backendutility.php @@ -30,7 +30,7 @@ abstract class BackendUtility { /** * @brief constructor, make sure the subclasses call this one! - * @param $access an instance of Access for LDAP interaction + * @param Access $access an instance of Access for LDAP interaction */ public function __construct(Access $access) { $this->access = $access; diff --git a/apps/user_ldap/lib/configuration.php b/apps/user_ldap/lib/configuration.php index c9ed1e648a2..a9d65963ad5 100644 --- a/apps/user_ldap/lib/configuration.php +++ b/apps/user_ldap/lib/configuration.php @@ -81,25 +81,37 @@ class Configuration { ); /** - * @param string $configPrefix + * @param $configPrefix + * @param bool $autoRead */ - public function __construct($configPrefix, $autoread = true) { + public function __construct($configPrefix, $autoRead = true) { $this->configPrefix = $configPrefix; - if($autoread) { + if($autoRead) { $this->readConfiguration(); } } + /** + * @param $name + * @return mixed|void + */ public function __get($name) { if(isset($this->config[$name])) { return $this->config[$name]; } } + /** + * @param $name + * @param $value + */ public function __set($name, $value) { $this->setConfiguration(array($name => $value)); } + /** + * @return array + */ public function getConfiguration() { return $this->config; } @@ -110,7 +122,7 @@ class Configuration { * must call saveConfiguration afterwards. * @param $config array that holds the config parameters in an associated * array - * @param &$applied optional; array where the set fields will be given to + * @param array &$applied optional; array where the set fields will be given to * @return false|null */ public function setConfiguration($config, &$applied = null) { @@ -119,11 +131,11 @@ class Configuration { } $cta = $this->getConfigTranslationArray(); - foreach($config as $inputkey => $val) { - if(strpos($inputkey, '_') !== false && array_key_exists($inputkey, $cta)) { - $key = $cta[$inputkey]; - } elseif(array_key_exists($inputkey, $this->config)) { - $key = $inputkey; + foreach($config as $inputKey => $val) { + if(strpos($inputKey, '_') !== false && array_key_exists($inputKey, $cta)) { + $key = $cta[$inputKey]; + } elseif(array_key_exists($inputKey, $this->config)) { + $key = $inputKey; } else { continue; } @@ -150,7 +162,7 @@ class Configuration { } $this->$setMethod($key, $val); if(is_array($applied)) { - $applied[] = $inputkey; + $applied[] = $inputKey; } } @@ -164,7 +176,7 @@ class Configuration { //some are determined continue; } - $dbkey = $cta[$key]; + $dbKey = $cta[$key]; switch($key) { case 'ldapBase': case 'ldapBaseUsers': @@ -180,7 +192,7 @@ class Configuration { break; case 'ldapIgnoreNamingRules': $readMethod = 'getSystemValue'; - $dbkey = $key; + $dbKey = $key; break; case 'ldapAgentPassword': $readMethod = 'getPwd'; @@ -193,7 +205,7 @@ class Configuration { $readMethod = 'getValue'; break; } - $this->config[$key] = $this->$readMethod($dbkey); + $this->config[$key] = $this->$readMethod($dbKey); } $this->configRead = true; } @@ -237,8 +249,12 @@ class Configuration { } } - protected function getMultiLine($varname) { - $value = $this->getValue($varname); + /** + * @param $varName + * @return array|string + */ + protected function getMultiLine($varName) { + $value = $this->getValue($varName); if(empty($value)) { $value = ''; } else { @@ -248,7 +264,11 @@ class Configuration { return $value; } - protected function setMultiLine($varname, $value) { + /** + * @param $varName + * @param $value + */ + protected function setMultiLine($varName, $value) { if(empty($value)) { $value = ''; } else if (!is_array($value)) { @@ -258,44 +278,69 @@ class Configuration { } } - $this->setValue($varname, $value); + $this->setValue($varName, $value); } - protected function getPwd($varname) { - return base64_decode($this->getValue($varname)); + /** + * @param $varName + * @return string + */ + protected function getPwd($varName) { + return base64_decode($this->getValue($varName)); } - protected function getLcValue($varname) { - return mb_strtolower($this->getValue($varname), 'UTF-8'); + /** + * @param $varName + * @return string + */ + protected function getLcValue($varName) { + return mb_strtolower($this->getValue($varName), 'UTF-8'); } - protected function getSystemValue($varname) { + /** + * @param $varName + * @return string + */ + protected function getSystemValue($varName) { //FIXME: if another system value is added, softcode the default value - return \OCP\Config::getSystemValue($varname, false); + return \OCP\Config::getSystemValue($varName, false); } - protected function getValue($varname) { + /** + * @param $varName + * @return string + */ + protected function getValue($varName) { static $defaults; if(is_null($defaults)) { $defaults = $this->getDefaults(); } return \OCP\Config::getAppValue('user_ldap', - $this->configPrefix.$varname, - $defaults[$varname]); + $this->configPrefix.$varName, + $defaults[$varName]); } - protected function setValue($varname, $value) { - $this->config[$varname] = $value; + /** + * @param $varName + * @param $value + */ + protected function setValue($varName, $value) { + $this->config[$varName] = $value; } - protected function saveValue($varname, $value) { + /** + * @param $varName + * @param $value + * @return bool + */ + protected function saveValue($varName, $value) { return \OCP\Config::setAppValue('user_ldap', - $this->configPrefix.$varname, + $this->configPrefix.$varName, $value); } /** - * @returns an associative array with the default values. Keys are correspond + * @return array an associative array with the default values. Keys are correspond * to config-value entries in the database table */ public function getDefaults() { @@ -350,7 +395,7 @@ class Configuration { } /** - * @return returns an array that maps internal variable names to database fields + * @return array that maps internal variable names to database fields */ public function getConfigTranslationArray() { //TODO: merge them into one representation diff --git a/apps/user_ldap/lib/connection.php b/apps/user_ldap/lib/connection.php index 173c4ebcc23..847a984bb4d 100644 --- a/apps/user_ldap/lib/connection.php +++ b/apps/user_ldap/lib/connection.php @@ -43,8 +43,9 @@ class Connection extends LDAPUtility { /** * @brief Constructor - * @param $configPrefix a string with the prefix for the configkey column (appconfig table) - * @param $configID a string with the value for the appid column (appconfig table) or null for on-the-fly connections + * @param ILDAPWrapper $ldap + * @param string $configPrefix a string with the prefix for the configkey column (appconfig table) + * @param string $configID a string with the value for the appid column (appconfig table) or null for on-the-fly connections */ public function __construct(ILDAPWrapper $ldap, $configPrefix = '', $configID = 'user_ldap') { parent::__construct($ldap); @@ -56,7 +57,7 @@ class Connection extends LDAPUtility { if($memcache->isAvailable()) { $this->cache = $memcache->create(); } else { - $this->cache = \OC_Cache::getGlobalCache(); + $this->cache = \OC\Cache::getGlobalCache(); } $this->hasPagedResultSupport = $this->ldap->hasPagedResultSupport(); @@ -82,6 +83,10 @@ class Connection extends LDAPUtility { !is_null($this->configID)); } + /** + * @param $name + * @return bool|mixed|void + */ public function __get($name) { if(!$this->configured) { $this->readConfiguration(); @@ -94,6 +99,10 @@ class Connection extends LDAPUtility { return $this->configuration->$name; } + /** + * @param $name + * @param $value + */ public function __set($name, $value) { $this->doNotValidate = false; $before = $this->configuration->$name; @@ -109,9 +118,7 @@ class Connection extends LDAPUtility { /** * @brief initializes the LDAP backend - * @param $force read the config settings no matter what - * - * initializes the LDAP backend + * @param bool $force read the config settings no matter what */ public function init($force = false) { $this->readConfiguration($force); @@ -119,7 +126,7 @@ class Connection extends LDAPUtility { } /** - * Returns the LDAP handler + * @brief Returns the LDAP handler */ public function getConnectionResource() { if(!$this->ldapConnectionRes) { @@ -135,7 +142,8 @@ class Connection extends LDAPUtility { } /** - * @param string|null $key + * @param $key + * @return string */ private function getCacheKey($key) { $prefix = 'LDAP-'.$this->configID.'-'.$this->configPrefix.'-'; @@ -146,7 +154,8 @@ class Connection extends LDAPUtility { } /** - * @param string $key + * @param $key + * @return mixed|null */ public function getFromCache($key) { if(!$this->configured) { @@ -165,7 +174,8 @@ class Connection extends LDAPUtility { } /** - * @param string $key + * @param $key + * @return bool */ public function isCached($key) { if(!$this->configured) { @@ -179,7 +189,8 @@ class Connection extends LDAPUtility { } /** - * @param string $key + * @param $key + * @param $value */ public function writeToCache($key, $value) { if(!$this->configured) { @@ -200,7 +211,7 @@ class Connection extends LDAPUtility { /** * @brief Caches the general LDAP configuration. - * @param $force optional. true, if the re-read should be forced. defaults + * @param bool $force optional. true, if the re-read should be forced. defaults * to false. * @return null */ @@ -214,7 +225,7 @@ class Connection extends LDAPUtility { /** * @brief set LDAP configuration with values delivered by an array, not read from configuration * @param $config array that holds the config parameters in an associated array - * @param &$setParameters optional; array where the set fields will be given to + * @param array &$setParameters optional; array where the set fields will be given to * @return boolean true if config validates, false otherwise. Check with $setParameters for detailed success on single parameters */ public function setConfiguration($config, &$setParameters = null) { @@ -326,9 +337,9 @@ class Connection extends LDAPUtility { } //make sure empty search attributes are saved as simple, empty array - $sakeys = array('ldapAttributesForUserSearch', + $saKeys = array('ldapAttributesForUserSearch', 'ldapAttributesForGroupSearch'); - foreach($sakeys as $key) { + foreach($saKeys as $key) { $val = $this->configuration->$key; if(is_array($val) && count($val) === 1 && empty($val[0])) { $this->configuration->$key = array(); @@ -345,6 +356,9 @@ class Connection extends LDAPUtility { } } + /** + * @return bool + */ private function doCriticalValidation() { $configurationOK = true; $errorStr = 'Configuration Error (prefix '. @@ -420,7 +434,7 @@ class Connection extends LDAPUtility { /** * @brief Validates the user specified configuration - * @returns true if configuration seems OK, false otherwise + * @return bool true if configuration seems OK, false otherwise */ private function validateConfiguration() { @@ -435,8 +449,8 @@ class Connection extends LDAPUtility { // necessary, but advisable. If left empty, give an info message $this->doSoftValidation(); - //second step: critical checks. If left empty or filled wrong, set as - //unconfigured and give a warning. + //second step: critical checks. If left empty or filled wrong, mark as + //not configured and give a warning. return $this->doCriticalValidation(); } @@ -508,12 +522,17 @@ class Connection extends LDAPUtility { } } + /** + * @param $host + * @param $port + * @return false|void + */ private function doConnect($host, $port) { if(empty($host)) { return false; } if(strpos($host, '://') !== false) { - //ldap_connect ignores port paramater when URLs are passed + //ldap_connect ignores port parameter when URLs are passed $host .= ':' . $port; } $this->ldapConnectionRes = $this->ldap->connect($host, $port); diff --git a/apps/user_ldap/lib/helper.php b/apps/user_ldap/lib/helper.php index b5955cb2abb..5641db48a32 100644 --- a/apps/user_ldap/lib/helper.php +++ b/apps/user_ldap/lib/helper.php @@ -27,7 +27,7 @@ class Helper { /** * @brief returns prefixes for each saved LDAP/AD server configuration. - * @param bool optional, whether only active configuration shall be + * @param bool $activeConfigurations optional, whether only active configuration shall be * retrieved, defaults to false * @return array with a list of the available prefixes * @@ -80,7 +80,7 @@ class Helper { /** * * @brief determines the host for every configured connection - * @return an array with configprefix as keys + * @return array an array with configprefix as keys * */ static public function getServerConfigurationHosts() { @@ -107,7 +107,7 @@ class Helper { /** * @brief deletes a given saved LDAP/AD server configuration. - * @param string the configuration prefix of the config to delete + * @param string $prefix the configuration prefix of the config to delete * @return bool true on success, false otherwise */ static public function deleteServerConfiguration($prefix) { @@ -148,7 +148,7 @@ class Helper { * Truncate's the given mapping table * * @param string $mapping either 'user' or 'group' - * @return boolean true on success, false otherwise + * @return bool true on success, false otherwise */ static public function clearMapping($mapping) { if($mapping === 'user') { @@ -177,8 +177,8 @@ class Helper { /** * @brief extractsthe domain from a given URL - * @param $url the URL - * @return mixed, domain as string on success, false otherwise + * @param string $url the URL + * @return string|false domain as string on success, false otherwise */ static public function getDomainFromURL($url) { $uinfo = parse_url($url); diff --git a/apps/user_ldap/lib/ildapwrapper.php b/apps/user_ldap/lib/ildapwrapper.php index 017d5549690..146ada125bb 100644 --- a/apps/user_ldap/lib/ildapwrapper.php +++ b/apps/user_ldap/lib/ildapwrapper.php @@ -30,9 +30,9 @@ interface ILDAPWrapper { /** * @brief Bind to LDAP directory * @param resource $link LDAP link resource - * @param $dn an RDN to log in with - * @param $password the password - * @return true on success, false otherwise + * @param string $dn an RDN to log in with + * @param string $password the password + * @return bool true on success, false otherwise * * with $dn and $password as null a anonymous bind is attempted. */ @@ -40,28 +40,28 @@ interface ILDAPWrapper { /** * @brief connect to an LDAP server - * @param $host The host to connect to - * @param $port The port to connect to - * @return a link resource on success, otherwise false + * @param string $host The host to connect to + * @param string $port The port to connect to + * @return mixed a link resource on success, otherwise false */ public function connect($host, $port); /** * @brief Send LDAP pagination control - * @param $link LDAP link resource - * @param $pagesize number of results per page - * @param boolean $isCritical Indicates whether the pagination is critical of not. - * @param $cookie structure sent by LDAP server + * @param resource $link LDAP link resource + * @param int $pageSize number of results per page + * @param bool $isCritical Indicates whether the pagination is critical of not. + * @param array $cookie structure sent by LDAP server * @return true on success, false otherwise */ - public function controlPagedResult($link, $pagesize, $isCritical, $cookie); + public function controlPagedResult($link, $pageSize, $isCritical, $cookie); /** * @brief Retrieve the LDAP pagination cookie * @param $link LDAP link resource * @param $result LDAP result resource - * @param $cookie structure sent by LDAP server - * @return boolean on success, false otherwise + * @param array $cookie structure sent by LDAP server + * @return bool true on success, false otherwise * * Corresponds to ldap_control_paged_result_response */ @@ -69,101 +69,101 @@ interface ILDAPWrapper { /** * @brief Count the number of entries in a search - * @param $link LDAP link resource - * @param $result LDAP result resource - * @return mixed, number of results on success, false otherwise + * @param resource $link LDAP link resource + * @param resource $result LDAP result resource + * @return int|false number of results on success, false otherwise */ public function countEntries($link, $result); /** * @brief Return the LDAP error number of the last LDAP command - * @param $link LDAP link resource - * @return error message as string + * @param resource $link LDAP link resource + * @return string error message as string */ public function errno($link); /** * @brief Return the LDAP error message of the last LDAP command - * @param $link LDAP link resource - * @return error code as integer + * @param resource $link LDAP link resource + * @return int error code as integer */ public function error($link); /** * @brief Return first result id - * @param $link LDAP link resource - * @param $result LDAP result resource - * @return an LDAP search result resource + * @param resource $link LDAP link resource + * @param resource $result LDAP result resource + * @return Resource an LDAP search result resource * */ public function firstEntry($link, $result); /** * @brief Get attributes from a search result entry - * @param $link LDAP link resource - * @param $result LDAP result resource + * @param resource $link LDAP link resource + * @param resource $result LDAP result resource * @return array containing the results, false on error * */ public function getAttributes($link, $result); /** * @brief Get the DN of a result entry - * @param $link LDAP link resource - * @param $result LDAP result resource + * @param resource $link LDAP link resource + * @param resource $result LDAP result resource * @return string containing the DN, false on error */ public function getDN($link, $result); /** * @brief Get all result entries - * @param $link LDAP link resource - * @param $result LDAP result resource + * @param resource $link LDAP link resource + * @param resource $result LDAP result resource * @return array containing the results, false on error */ public function getEntries($link, $result); /** * @brief Return next result id - * @param $link LDAP link resource + * @param resource $link LDAP link resource * @param resource $result LDAP entry result resource - * @return an LDAP search result resource + * @return resource an LDAP search result resource * */ public function nextEntry($link, $result); /** * @brief Read an entry - * @param $link LDAP link resource - * @param $baseDN The DN of the entry to read from - * @param $filter An LDAP filter - * @param $attr array of the attributes to read - * @return an LDAP search result resource + * @param resource $link LDAP link resource + * @param array $baseDN The DN of the entry to read from + * @param string $filter An LDAP filter + * @param array $attr array of the attributes to read + * @return resource an LDAP search result resource */ public function read($link, $baseDN, $filter, $attr); /** * @brief Search LDAP tree - * @param $link LDAP link resource - * @param $baseDN The DN of the entry to read from - * @param $filter An LDAP filter - * @param $attr array of the attributes to read - * @param $attrsonly optional, 1 if only attribute types shall be returned - * @param $limit optional, limits the result entries - * @return an LDAP search result resource, false on error + * @param resource $link LDAP link resource + * @param string $baseDN The DN of the entry to read from + * @param string $filter An LDAP filter + * @param array $attr array of the attributes to read + * @param int $attrsOnly optional, 1 if only attribute types shall be returned + * @param int $limit optional, limits the result entries + * @return resource|false an LDAP search result resource, false on error */ - public function search($link, $baseDN, $filter, $attr, $attrsonly = 0, $limit = 0); + public function search($link, $baseDN, $filter, $attr, $attrsOnly = 0, $limit = 0); /** * @brief Sets the value of the specified option to be $value - * @param $link LDAP link resource - * @param $option a defined LDAP Server option - * @param integer $value the new value for the option - * @return true on success, false otherwise + * @param resource $link LDAP link resource + * @param string $option a defined LDAP Server option + * @param int $value the new value for the option + * @return bool true on success, false otherwise */ public function setOption($link, $option, $value); /** * @brief establish Start TLS - * @param $link LDAP link resource - * @return true on success, false otherwise + * @param resource|$link LDAP link resource + * @return bool true on success, false otherwise */ public function startTls($link); @@ -171,35 +171,35 @@ interface ILDAPWrapper { * @brief Sort the result of a LDAP search * @param $link LDAP link resource * @param $result LDAP result resource - * @param $sortfilter attribute to use a key in sort + * @param string $sortFilter attribute to use a key in sort */ - public function sort($link, $result, $sortfilter); + public function sort($link, $result, $sortFilter); /** * @brief Unbind from LDAP directory * @param resource $link LDAP link resource - * @return true on success, false otherwise + * @return bool true on success, false otherwise */ public function unbind($link); - //additional required methods in owncloud + //additional required methods in ownCloud /** * @brief Checks whether the server supports LDAP - * @return boolean if it the case, false otherwise + * @return bool true if it the case, false otherwise * */ public function areLDAPFunctionsAvailable(); /** * @brief Checks whether PHP supports LDAP Paged Results - * @return boolean if it the case, false otherwise + * @return bool true if it the case, false otherwise * */ public function hasPagedResultSupport(); /** * @brief Checks whether the submitted parameter is a resource - * @param $resource the resource variable to check - * @return boolean if it is a resource, false otherwise + * @param resource $resource the resource variable to check + * @return bool true if it is a resource, false otherwise */ public function isResource($resource); diff --git a/apps/user_ldap/lib/jobs.php b/apps/user_ldap/lib/jobs.php index 9b108da6331..49c77719721 100644 --- a/apps/user_ldap/lib/jobs.php +++ b/apps/user_ldap/lib/jobs.php @@ -33,6 +33,9 @@ class Jobs extends \OC\BackgroundJob\TimedJob { $this->interval = self::getRefreshInterval(); } + /** + * @param $argument + */ public function run($argument){ Jobs::updateGroups(); } @@ -57,11 +60,17 @@ class Jobs extends \OC\BackgroundJob\TimedJob { \OCP\Util::writeLog('user_ldap', 'bgJ "updateGroups" – Finished.', \OCP\Util::DEBUG); } + /** + * @return int + */ static private function getRefreshInterval() { //defaults to every hour return \OCP\Config::getAppValue('user_ldap', 'bgjRefreshInterval', 3600); } + /** + * @param $groups + */ static private function handleKnownGroups($groups) { \OCP\Util::writeLog('user_ldap', 'bgJ "updateGroups" – Dealing with known Groups.', \OCP\Util::DEBUG); $query = \OCP\DB::prepare(' @@ -97,6 +106,9 @@ class Jobs extends \OC\BackgroundJob\TimedJob { \OCP\Util::DEBUG); } + /** + * @param $createdGroups + */ static private function handleCreatedGroups($createdGroups) { \OCP\Util::writeLog('user_ldap', 'bgJ "updateGroups" – dealing with created Groups.', \OCP\Util::DEBUG); $query = \OCP\DB::prepare(' @@ -116,6 +128,9 @@ class Jobs extends \OC\BackgroundJob\TimedJob { \OCP\Util::DEBUG); } + /** + * @param $removedGroups + */ static private function handleRemovedGroups($removedGroups) { \OCP\Util::writeLog('user_ldap', 'bgJ "updateGroups" – dealing with removed groups.', \OCP\Util::DEBUG); $query = \OCP\DB::prepare(' @@ -134,6 +149,9 @@ class Jobs extends \OC\BackgroundJob\TimedJob { \OCP\Util::DEBUG); } + /** + * @return \OCA\user_ldap\GROUP_LDAP|\OCA\user_ldap\Group_Proxy + */ static private function getGroupBE() { if(!is_null(self::$groupBE)) { return self::$groupBE; @@ -152,6 +170,9 @@ class Jobs extends \OC\BackgroundJob\TimedJob { return self::$groupBE; } + /** + * @return array + */ static private function getKnownGroups() { if(is_array(self::$groupsFromDB)) { return self::$groupsFromDB; diff --git a/apps/user_ldap/lib/ldap.php b/apps/user_ldap/lib/ldap.php index d1ca91045b2..9962d1267b8 100644 --- a/apps/user_ldap/lib/ldap.php +++ b/apps/user_ldap/lib/ldap.php @@ -27,14 +27,31 @@ class LDAP implements ILDAPWrapper { protected $curFunc = ''; protected $curArgs = array(); + /** + * @param resource $link + * @param string $dn + * @param string $password + * @return bool|mixed + */ public function bind($link, $dn, $password) { return $this->invokeLDAPMethod('bind', $link, $dn, $password); } + /** + * @param string $host + * @param string $port + * @return mixed + */ public function connect($host, $port) { return $this->invokeLDAPMethod('connect', $host, $port); } + /** + * @param LDAP $link + * @param LDAP $result + * @param $cookie + * @return bool|LDAP + */ public function controlPagedResultResponse($link, $result, &$cookie) { $this->preFunctionCall('ldap_control_paged_result_response', array($link, $result, $cookie)); @@ -44,64 +61,144 @@ class LDAP implements ILDAPWrapper { return $result; } - public function controlPagedResult($link, $pagesize, $isCritical, $cookie) { - return $this->invokeLDAPMethod('control_paged_result', $link, $pagesize, + /** + * @param LDAP $link + * @param int $pageSize + * @param bool $isCritical + * @param array $cookie + * @return mixed|true + */ + public function controlPagedResult($link, $pageSize, $isCritical, $cookie) { + return $this->invokeLDAPMethod('control_paged_result', $link, $pageSize, $isCritical, $cookie); } + /** + * @param LDAP $link + * @param LDAP $result + * @return mixed + */ public function countEntries($link, $result) { return $this->invokeLDAPMethod('count_entries', $link, $result); } + /** + * @param LDAP $link + * @return mixed|string + */ public function errno($link) { return $this->invokeLDAPMethod('errno', $link); } + /** + * @param LDAP $link + * @return int|mixed + */ public function error($link) { return $this->invokeLDAPMethod('error', $link); } + /** + * @param LDAP $link + * @param LDAP $result + * @return mixed + */ public function firstEntry($link, $result) { return $this->invokeLDAPMethod('first_entry', $link, $result); } + /** + * @param LDAP $link + * @param LDAP $result + * @return array|mixed + */ public function getAttributes($link, $result) { return $this->invokeLDAPMethod('get_attributes', $link, $result); } + /** + * @param LDAP $link + * @param LDAP $result + * @return mixed|string + */ public function getDN($link, $result) { return $this->invokeLDAPMethod('get_dn', $link, $result); } + /** + * @param LDAP $link + * @param LDAP $result + * @return array|mixed + */ public function getEntries($link, $result) { return $this->invokeLDAPMethod('get_entries', $link, $result); } + /** + * @param LDAP $link + * @param resource $result + * @return mixed|an + */ public function nextEntry($link, $result) { return $this->invokeLDAPMethod('next_entry', $link, $result); } + /** + * @param LDAP $link + * @param string $baseDN + * @param string $filter + * @param array $attr + * @return mixed + */ public function read($link, $baseDN, $filter, $attr) { return $this->invokeLDAPMethod('read', $link, $baseDN, $filter, $attr); } - public function search($link, $baseDN, $filter, $attr, $attrsonly = 0, $limit = 0) { - return $this->invokeLDAPMethod('search', $link, $baseDN, $filter, - $attr, $attrsonly, $limit); + /** + * @param LDAP $link + * @param string $baseDN + * @param string $filter + * @param array $attr + * @param int $attrsOnly + * @param int $limit + * @return mixed + */ + public function search($link, $baseDN, $filter, $attr, $attrsOnly = 0, $limit = 0) { + return $this->invokeLDAPMethod('search', $link, $baseDN, $filter, $attr, $attrsOnly, $limit); } + /** + * @param LDAP $link + * @param string $option + * @param int $value + * @return bool|mixed + */ public function setOption($link, $option, $value) { return $this->invokeLDAPMethod('set_option', $link, $option, $value); } - public function sort($link, $result, $sortfilter) { - return $this->invokeLDAPMethod('sort', $link, $result, $sortfilter); + /** + * @param LDAP $link + * @param LDAP $result + * @param string $sortFilter + * @return mixed + */ + public function sort($link, $result, $sortFilter) { + return $this->invokeLDAPMethod('sort', $link, $result, $sortFilter); } + /** + * @param LDAP $link + * @return mixed|true + */ public function startTls($link) { return $this->invokeLDAPMethod('start_tls', $link); } + /** + * @param resource $link + * @return bool|mixed + */ public function unbind($link) { return $this->invokeLDAPMethod('unbind', $link); } @@ -126,13 +223,16 @@ class LDAP implements ILDAPWrapper { /** * @brief Checks whether the submitted parameter is a resource - * @param $resource the resource variable to check - * @return boolean if it is a resource, false otherwise + * @param Resource $resource the resource variable to check + * @return bool true if it is a resource, false otherwise */ public function isResource($resource) { return is_resource($resource); } + /** + * @return mixed + */ private function invokeLDAPMethod() { $arguments = func_get_args(); $func = 'ldap_' . array_shift($arguments); @@ -148,6 +248,7 @@ class LDAP implements ILDAPWrapper { /** * @param string $functionName + * @param $args */ private function preFunctionCall($functionName, $args) { $this->curFunc = $functionName; @@ -181,4 +282,4 @@ class LDAP implements ILDAPWrapper { $this->curFunc = ''; $this->curArgs = array(); } -}
\ No newline at end of file +} diff --git a/apps/user_ldap/lib/ldaputility.php b/apps/user_ldap/lib/ldaputility.php index 7fffd9c88d1..0d942f3b6ae 100644 --- a/apps/user_ldap/lib/ldaputility.php +++ b/apps/user_ldap/lib/ldaputility.php @@ -28,7 +28,7 @@ abstract class LDAPUtility { /** * @brief constructor, make sure the subclasses call this one! - * @param $ldapWrapper an instance of an ILDAPWrapper + * @param ILDAPWrapper $ldapWrapper an instance of an ILDAPWrapper */ public function __construct(ILDAPWrapper $ldapWrapper) { $this->ldap = $ldapWrapper; diff --git a/apps/user_ldap/lib/proxy.php b/apps/user_ldap/lib/proxy.php index 0eb294eb7a0..50e8071a584 100644 --- a/apps/user_ldap/lib/proxy.php +++ b/apps/user_ldap/lib/proxy.php @@ -29,16 +29,26 @@ abstract class Proxy { static private $accesses = array(); private $ldap = null; + /** + * @param ILDAPWrapper $ldap + */ public function __construct(ILDAPWrapper $ldap) { $this->ldap = $ldap; - $this->cache = \OC_Cache::getGlobalCache(); + $this->cache = \OC\Cache::getGlobalCache(); } + /** + * @param $configPrefix + */ private function addAccess($configPrefix) { $connector = new Connection($this->ldap, $configPrefix); self::$accesses[$configPrefix] = new Access($connector, $this->ldap); } + /** + * @param $configPrefix + * @return mixed + */ protected function getAccess($configPrefix) { if(!isset(self::$accesses[$configPrefix])) { $this->addAccess($configPrefix); @@ -46,30 +56,45 @@ abstract class Proxy { return self::$accesses[$configPrefix]; } + /** + * @param $uid + * @return string + */ protected function getUserCacheKey($uid) { return 'user-'.$uid.'-lastSeenOn'; } + /** + * @param $gid + * @return string + */ protected function getGroupCacheKey($gid) { return 'group-'.$gid.'-lastSeenOn'; } /** - * @param boolean $passOnWhen - * @param string $method + * @param $id + * @param $method + * @param $parameters + * @param bool $passOnWhen + * @return mixed */ abstract protected function callOnLastSeenOn($id, $method, $parameters, $passOnWhen); /** - * @param string $method + * @param $id + * @param $method + * @param $parameters + * @return mixed */ abstract protected function walkBackends($id, $method, $parameters); /** * @brief Takes care of the request to the User backend - * @param $uid string, the uid connected to the request + * @param $id * @param string $method string, the method of the user backend that shall be called - * @param $parameters an array of parameters to be passed + * @param array $parameters an array of parameters to be passed + * @param bool $passOnWhen * @return mixed, the result of the specified method */ protected function handleRequest($id, $method, $parameters, $passOnWhen = false) { @@ -81,7 +106,8 @@ abstract class Proxy { } /** - * @param string|null $key + * @param $key + * @return string */ private function getCacheKey($key) { $prefix = 'LDAP-Proxy-'; @@ -92,7 +118,8 @@ abstract class Proxy { } /** - * @param string $key + * @param $key + * @return mixed|null */ public function getFromCache($key) { if(!$this->isCached($key)) { @@ -104,7 +131,8 @@ abstract class Proxy { } /** - * @param string $key + * @param $key + * @return bool */ public function isCached($key) { $key = $this->getCacheKey($key); @@ -112,7 +140,8 @@ abstract class Proxy { } /** - * @param string $key + * @param $key + * @param $value */ public function writeToCache($key, $value) { $key = $this->getCacheKey($key); diff --git a/apps/user_ldap/lib/wizard.php b/apps/user_ldap/lib/wizard.php index 8406b2d42a5..8d944c9a957 100644 --- a/apps/user_ldap/lib/wizard.php +++ b/apps/user_ldap/lib/wizard.php @@ -45,8 +45,8 @@ class Wizard extends LDAPUtility { /** * @brief Constructor - * @param $configuration an instance of Configuration - * @param $ldap an instance of ILDAPWrapper + * @param Configuration $configuration an instance of Configuration + * @param ILDAPWrapper $ldap an instance of ILDAPWrapper */ public function __construct(Configuration $configuration, ILDAPWrapper $ldap) { parent::__construct($ldap); @@ -63,6 +63,10 @@ class Wizard extends LDAPUtility { } } + /** + * @return WizardResult + * @throws \Exception + */ public function countGroups() { if(!$this->checkRequirements(array('ldapHost', 'ldapPort', @@ -96,6 +100,10 @@ class Wizard extends LDAPUtility { return $this->result; } + /** + * @return WizardResult + * @throws \Exception + */ public function countUsers() { if(!$this->checkRequirements(array('ldapHost', 'ldapPort', @@ -125,7 +133,10 @@ class Wizard extends LDAPUtility { return $this->result; } - + /** + * @return WizardResult + * @throws \Exception + */ public function determineAttributes() { if(!$this->checkRequirements(array('ldapHost', 'ldapPort', @@ -152,6 +163,7 @@ class Wizard extends LDAPUtility { /** * @brief return the state of the Group Filter Mode + * @return WizardResult */ public function getGroupFilterMode() { $this->getFilterMode('ldapGroupFilterMode'); @@ -160,6 +172,7 @@ class Wizard extends LDAPUtility { /** * @brief return the state of the Login Filter Mode + * @return WizardResult */ public function getLoginFilterMode() { $this->getFilterMode('ldapLoginFilterMode'); @@ -168,6 +181,7 @@ class Wizard extends LDAPUtility { /** * @brief return the state of the User Filter Mode + * @return WizardResult */ public function getUserFilterMode() { $this->getFilterMode('ldapUserFilterMode'); @@ -176,19 +190,20 @@ class Wizard extends LDAPUtility { /** * @brief return the state of the mode of the specified filter - * @param string $confkey string, contains the access key of the Configuration + * @param string $confKey contains the access key of the Configuration */ - private function getFilterMode($confkey) { - $mode = $this->configuration->$confkey; + private function getFilterMode($confKey) { + $mode = $this->configuration->$confKey; if(is_null($mode)) { $mode = $this->LFILTER_MODE_ASSISTED; } - $this->result->addChange($confkey, $mode); + $this->result->addChange($confKey, $mode); } /** * @brief detects the available LDAP attributes - * @returns the instance's WizardResult instance + * @return array The instance's WizardResult instance + * @throws \Exception */ private function getUserAttributes() { if(!$this->checkRequirements(array('ldapHost', @@ -221,7 +236,7 @@ class Wizard extends LDAPUtility { /** * @brief detects the available LDAP groups - * @returns the instance's WizardResult instance + * @return WizardResult the instance's WizardResult instance */ public function determineGroupsForGroups() { return $this->determineGroups('ldap_groupfilter_groups', @@ -231,7 +246,7 @@ class Wizard extends LDAPUtility { /** * @brief detects the available LDAP groups - * @returns the instance's WizardResult instance + * @return WizardResult the instance's WizardResult instance */ public function determineGroupsForUsers() { return $this->determineGroups('ldap_userfilter_groups', @@ -240,11 +255,13 @@ class Wizard extends LDAPUtility { /** * @brief detects the available LDAP groups - * @param string $dbkey - * @param string $confkey - * @returns the instance's WizardResult instance + * @param string $dbKey + * @param string $confKey + * @param bool $testMemberOf + * @return WizardResult the instance's WizardResult instance + * @throws \Exception */ - private function determineGroups($dbkey, $confkey, $testMemberOf = true) { + private function determineGroups($dbKey, $confKey, $testMemberOf = true) { if(!$this->checkRequirements(array('ldapHost', 'ldapPort', 'ldapBase', @@ -256,8 +273,8 @@ class Wizard extends LDAPUtility { throw new \Exception('Could not connect to LDAP'); } - $obclasses = array('posixGroup', 'group', 'zimbraDistributionList', '*'); - $this->determineFeature($obclasses, 'cn', $dbkey, $confkey); + $obClasses = array('posixGroup', 'group', 'zimbraDistributionList', '*'); + $this->determineFeature($obClasses, 'cn', $dbKey, $confKey); if($testMemberOf) { $this->configuration->hasMemberOfFilterSupport = $this->testMemberOf(); @@ -270,6 +287,10 @@ class Wizard extends LDAPUtility { return $this->result; } + /** + * @return bool|WizardResult + * @throws \Exception + */ public function determineGroupMemberAssoc() { if(!$this->checkRequirements(array('ldapHost', 'ldapPort', @@ -289,8 +310,9 @@ class Wizard extends LDAPUtility { } /** - * @brief detects the available object classes - * @returns the instance's WizardResult instance + * @brief Detects the available object classes + * @return WizardResult the instance's WizardResult instance + * @throws \Exception */ public function determineGroupObjectClasses() { if(!$this->checkRequirements(array('ldapHost', @@ -316,7 +338,8 @@ class Wizard extends LDAPUtility { /** * @brief detects the available object classes - * @returns the instance's WizardResult instance + * @return WizardResult + * @throws \Exception */ public function determineUserObjectClasses() { if(!$this->checkRequirements(array('ldapHost', @@ -344,6 +367,10 @@ class Wizard extends LDAPUtility { return $this->result; } + /** + * @return WizardResult + * @throws \Exception + */ public function getGroupFilter() { if(!$this->checkRequirements(array('ldapHost', 'ldapPort', @@ -364,6 +391,10 @@ class Wizard extends LDAPUtility { return $this->result; } + /** + * @return WizardResult + * @throws \Exception + */ public function getUserListFilter() { if(!$this->checkRequirements(array('ldapHost', 'ldapPort', @@ -386,6 +417,10 @@ class Wizard extends LDAPUtility { return $this->result; } + /** + * @return bool|WizardResult + * @throws \Exception + */ public function getUserLoginFilter() { if(!$this->checkRequirements(array('ldapHost', 'ldapPort', @@ -406,7 +441,8 @@ class Wizard extends LDAPUtility { /** * Tries to determine the port, requires given Host, User DN and Password - * @returns mixed WizardResult on success, false otherwise + * @return WizardResult|false WizardResult on success, false otherwise + * @throws \Exception */ public function guessPortAndTLS() { if(!$this->checkRequirements(array('ldapHost', @@ -444,7 +480,7 @@ class Wizard extends LDAPUtility { /** * @brief tries to determine a base dn from User DN or LDAP Host - * @returns mixed WizardResult on success, false otherwise + * @return WizardResult|false WizardResult on success, false otherwise */ public function guessBaseDN() { if(!$this->checkRequirements(array('ldapHost', @@ -486,8 +522,7 @@ class Wizard extends LDAPUtility { * @brief sets the found value for the configuration key in the WizardResult * as well as in the Configuration instance * @param string $key the configuration key - * @param $value the (detected) value - * @return null + * @param string $value the (detected) value * */ private function applyFind($key, $value) { @@ -516,7 +551,8 @@ class Wizard extends LDAPUtility { /** * @brief tries to detect the group member association attribute which is * one of 'uniqueMember', 'memberUid', 'member' - * @return mixed, string with the attribute name, false on error + * @return string|false, string with the attribute name, false on error + * @throws \Exception */ private function detectGroupMemberAssoc() { $possibleAttrs = array('uniqueMember', 'memberUid', 'member', 'unfugasdfasdfdfa'); @@ -535,7 +571,7 @@ class Wizard extends LDAPUtility { } $er = $this->ldap->firstEntry($cr, $rr); while(is_resource($er)) { - $dn = $this->ldap->getDN($cr, $er); + $this->ldap->getDN($cr, $er); $attrs = $this->ldap->getAttributes($cr, $er); $result = array(); for($i = 0; $i < count($possibleAttrs); $i++) { @@ -558,6 +594,7 @@ class Wizard extends LDAPUtility { * @brief Checks whether for a given BaseDN results will be returned * @param string $base the BaseDN to test * @return bool true on success, false otherwise + * @throws \Exception */ private function testBaseDN($base) { $cr = $this->getConnection(); @@ -583,7 +620,8 @@ class Wizard extends LDAPUtility { * @brief Checks whether the server supports memberOf in LDAP Filter. * Requires that groups are determined, thus internally called from within * determineGroups() - * @return bool, true if it does, false otherwise + * @return bool true if it does, false otherwise + * @throws \Exception */ private function testMemberOf() { $cr = $this->getConnection(); @@ -624,7 +662,8 @@ class Wizard extends LDAPUtility { * @param integer $filterType int, for which use case the filter shall be created * can be any of self::LFILTER_USER_LIST, self::LFILTER_LOGIN or * self::LFILTER_GROUP_LIST - * @return mixed, string with the filter on success, false otherwise + * @return string|false string with the filter on success, false otherwise + * @throws \Exception */ private function composeLdapFilter($filterType) { $filter = ''; @@ -765,9 +804,11 @@ class Wizard extends LDAPUtility { /** * Connects and Binds to an LDAP Server - * @param $port the port to connect with - * @param $tls whether startTLS is to be used - * @return + * @param int $port the port to connect with + * @param bool $tls whether startTLS is to be used + * @param bool $ncc + * @return bool + * @throws \Exception */ private function connectAndBind($port = 389, $tls = false, $ncc = false) { if($ncc) { @@ -819,17 +860,17 @@ class Wizard extends LDAPUtility { if($ncc) { throw new \Exception('Certificate cannot be validated.'); } - \OCP\Util::writeLog('user_ldap', 'Wiz: Bind successfull to Port '. $port . ' TLS ' . intval($tls), \OCP\Util::DEBUG); + \OCP\Util::writeLog('user_ldap', 'Wiz: Bind successful to Port '. $port . ' TLS ' . intval($tls), \OCP\Util::DEBUG); return true; } - $errno = $this->ldap->errno($cr); + $errNo = $this->ldap->errno($cr); $error = ldap_error($cr); $this->ldap->unbind($cr); - if($errno === -1 || ($errno === 2 && $ncc)) { + if($errNo === -1 || ($errNo === 2 && $ncc)) { //host, port or TLS wrong return false; - } else if ($errno === 2) { + } else if ($errNo === 2) { return $this->connectAndBind($port, $tls, true); } throw new \Exception($error); @@ -838,8 +879,7 @@ class Wizard extends LDAPUtility { /** * @brief checks whether a valid combination of agent and password has been * provided (either two values or nothing for anonymous connect) - * @return boolean, true if everything is fine, false otherwise - * + * @return bool, true if everything is fine, false otherwise */ private function checkAgentRequirements() { $agent = $this->configuration->ldapAgentName; @@ -850,7 +890,8 @@ class Wizard extends LDAPUtility { } /** - * @param string[] $reqs + * @param array $reqs + * @return bool */ private function checkRequirements($reqs) { $this->checkAgentRequirements(); @@ -874,8 +915,7 @@ class Wizard extends LDAPUtility { * The lower, the faster * @param string $maxF string. if not null, this variable will have the filter that * yields most result entries - * @return mixed, an array with the values on success, false otherwise - * + * @return array|false an array with the values on success, false otherwise */ public function cumulativeSearchOnAttribute($filters, $attr, $lfw = true, $dnReadLimit = 3, &$maxF = null) { $dnRead = array(); @@ -949,7 +989,8 @@ class Wizard extends LDAPUtility { * Configuration class * @param $po boolean, whether the objectClass with most result entries * shall be pre-selected via the result - * @returns array, list of found items. + * @return array, list of found items. + * @throws \Exception */ private function determineFeature($objectclasses, $attr, $dbkey, $confkey, $po = false) { $cr = $this->getConnection(); @@ -1013,7 +1054,7 @@ class Wizard extends LDAPUtility { return self::LRESULT_PROCESSED_INVALID; } - //strtolower on all keys for proper comparison + // strtolower on all keys for proper comparison $result = \OCP\Util::mb_array_change_key_case($result); $attribute = strtolower($attribute); if(isset($result[$attribute])) { @@ -1031,6 +1072,9 @@ class Wizard extends LDAPUtility { } } + /** + * @return bool|mixed + */ private function getConnection() { if(!is_null($this->cr)) { return $this->cr; @@ -1057,6 +1101,9 @@ class Wizard extends LDAPUtility { return false; } + /** + * @return array + */ private function getDefaultLdapPortSettings() { static $settings = array( array('port' => 7636, 'tls' => false), @@ -1069,6 +1116,9 @@ class Wizard extends LDAPUtility { return $settings; } + /** + * @return array + */ private function getPortSettingsToTry() { //389 ↠LDAP / Unencrypted or StartTLS //636 ↠LDAPS / SSL @@ -1096,4 +1146,4 @@ class Wizard extends LDAPUtility { } -}
\ No newline at end of file +} diff --git a/apps/user_ldap/lib/wizardresult.php b/apps/user_ldap/lib/wizardresult.php index 9e0936faa69..5ed16732ca0 100644 --- a/apps/user_ldap/lib/wizardresult.php +++ b/apps/user_ldap/lib/wizardresult.php @@ -28,10 +28,17 @@ class WizardResult { protected $options = array(); protected $markedChange = false; + /** + * @param $key + * @param $value + */ public function addChange($key, $value) { $this->changes[$key] = $value; } + /** + * + */ public function markChange() { $this->markedChange = true; } @@ -47,10 +54,16 @@ class WizardResult { $this->options[$key] = $values; } + /** + * @return bool + */ public function hasChanges() { return (count($this->changes) > 0 || $this->markedChange); } + /** + * @return array + */ public function getResultArray() { $result = array(); $result['changes'] = $this->changes; diff --git a/apps/user_ldap/tests/user_ldap.php b/apps/user_ldap/tests/user_ldap.php index 8c8d85b3c33..cb4c3b316dc 100644 --- a/apps/user_ldap/tests/user_ldap.php +++ b/apps/user_ldap/tests/user_ldap.php @@ -71,7 +71,7 @@ class Test_User_Ldap_Direct extends \PHPUnit_Framework_TestCase { case 'ladyofshadows': return 'dnOfLadyOfShadows'; break; - defautl: + default: return false; } })); diff --git a/core/avatar/controller.php b/core/avatar/controller.php index 22693824461..06efbec3f3c 100644 --- a/core/avatar/controller.php +++ b/core/avatar/controller.php @@ -71,7 +71,7 @@ class Controller { $image = new \OC_Image($newAvatar); if ($image->valid()) { - \OC_Cache::set('tmpavatar', $image->data(), 7200); + \OC\Cache::set('tmpavatar', $image->data(), 7200); \OC_JSON::error(array("data" => "notsquare")); } else { $l = new \OC_L10n('core'); @@ -109,7 +109,7 @@ class Controller { \OC_JSON::checkLoggedIn(); \OC_JSON::callCheck(); - $tmpavatar = \OC_Cache::get('tmpavatar'); + $tmpavatar = \OC\Cache::get('tmpavatar'); if (is_null($tmpavatar)) { $l = new \OC_L10n('core'); \OC_JSON::error(array("data" => array("message" => $l->t("No temporary profile picture available, try again")) )); @@ -136,7 +136,7 @@ class Controller { return; } - $tmpavatar = \OC_Cache::get('tmpavatar'); + $tmpavatar = \OC\Cache::get('tmpavatar'); if (is_null($tmpavatar)) { $l = new \OC_L10n('core'); \OC_JSON::error(array("data" => array("message" => $l->t("No temporary profile picture available, try again")) )); @@ -149,7 +149,7 @@ class Controller { $avatar = new \OC_Avatar($user); $avatar->set($image->data()); // Clean up - \OC_Cache::remove('tmpavatar'); + \OC\Cache::remove('tmpavatar'); \OC_JSON::success(); } catch (\Exception $e) { \OC_JSON::error(array("data" => array("message" => $e->getMessage()) )); diff --git a/core/css/multiselect.css b/core/css/multiselect.css index 8d949e7cdb7..b3393c450d4 100644 --- a/core/css/multiselect.css +++ b/core/css/multiselect.css @@ -50,7 +50,7 @@ ul.multiselectoptions > li input[type='checkbox']:checked+label { div.multiselect, select.multiselect { display: inline-block; - max-width: 400px; + max-width: 200px; min-width: 150px; padding-right: 10px; min-height: 20px; diff --git a/core/css/styles.css b/core/css/styles.css index 26aaa1be944..d21e6bc6907 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -352,9 +352,9 @@ input[type="submit"].enabled { #body-login #header { padding-top: 100px; } -/* Fix background gradient */ #body-login { - background-attachment: fixed; + background-attachment: fixed; /* fix background gradient */ + height: 100%; /* fix sticky footer */ } /* Dark subtle label text */ diff --git a/core/img/places/folder.svg b/core/img/places/folder.svg index edc9e7e208a..7ac5d6ddf5d 100644 --- a/core/img/places/folder.svg +++ b/core/img/places/folder.svg @@ -1,18 +1,17 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> -<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/"> +<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/"> <defs> - <linearGradient id="a" y2="1013.5" gradientUnits="userSpaceOnUse" y1="998.46" x2="209.34" x1="209.34"> + <linearGradient id="a" y2="1013.5" gradientUnits="userSpaceOnUse" x2="209.34" y1="998.46" x1="209.34"> <stop offset="0"/> <stop stop-color="#363636" offset="1"/> </linearGradient> </defs> - <rect style="color:#000000" fill-opacity="0" height="97.986" width="163.31" y="-32.993" x="-62.897"/> <g transform="translate(-7.5118e-7 40)" fill-rule="evenodd"> <g opacity=".6" transform="matrix(.86667 0 0 .86667 -172.04 -903.43)" fill="#fff"> - <path fill="#fff" d="m200.2 998.57c-0.28913 0-0.53125 0.24212-0.53125 0.53125v13.938c0 0.2985 0.23264 0.5312 0.53125 0.5312h15.091c0.2986 0 0.53125-0.2326 0.53125-0.5312l0.0004-8.166c0-0.2891-0.24212-0.5338-0.53125-0.5338h-12.161l-0.0004 6.349c0 0.277-0.30237 0.5637-0.57937 0.5637s-0.57447-0.2867-0.57447-0.5637l0.0004-7.0056c0-0.277 0.23357-0.4974 0.51057-0.4974h2.6507l8.3774 0.0003-0.0004-1.7029c0-0.3272-0.24549-0.6047-0.57258-0.6047h-7.5043v-1.7764c0-0.28915-0.23415-0.53125-0.52328-0.53125z" fill-rule="evenodd"/> + <path fill-rule="evenodd" d="m200.2 998.57c-0.28913 0-0.53125 0.24212-0.53125 0.53125v13.938c0 0.2985 0.23264 0.5312 0.53125 0.5312h15.091c0.2986 0 0.53125-0.2326 0.53125-0.5312l0.0004-8.166c0-0.2891-0.24212-0.5338-0.53125-0.5338h-12.161l-0.0004 6.349c0 0.277-0.30237 0.5637-0.57937 0.5637s-0.57447-0.2867-0.57447-0.5637l0.0004-7.0056c0-0.277 0.23357-0.4974 0.51057-0.4974h2.6507l8.3774 0.0003-0.0004-1.7029c0-0.3272-0.24549-0.6047-0.57258-0.6047h-7.5043v-1.7764c0-0.28915-0.23415-0.53125-0.52328-0.53125z" fill="#fff"/> </g> <g opacity=".7" transform="matrix(.86667 0 0 .86667 -172.04 -904.43)" fill="url(#a)"> - <path fill="url(#a)" d="m200.2 998.57c-0.28913 0-0.53125 0.24212-0.53125 0.53125v13.938c0 0.2985 0.23264 0.5312 0.53125 0.5312h15.091c0.2986 0 0.53125-0.2326 0.53125-0.5312l0.0004-8.166c0-0.2891-0.24212-0.5338-0.53125-0.5338h-12.161l-0.0004 6.349c0 0.277-0.30237 0.5637-0.57937 0.5637s-0.57447-0.2867-0.57447-0.5637l0.0004-7.0056c0-0.277 0.23357-0.4974 0.51057-0.4974h2.6507l8.3774 0.0003-0.0004-1.7029c0-0.3272-0.24549-0.6047-0.57258-0.6047h-7.5043v-1.7764c0-0.28915-0.23415-0.53125-0.52328-0.53125z" fill-rule="evenodd"/> + <path fill-rule="evenodd" d="m200.2 998.57c-0.28913 0-0.53125 0.24212-0.53125 0.53125v13.938c0 0.2985 0.23264 0.5312 0.53125 0.5312h15.091c0.2986 0 0.53125-0.2326 0.53125-0.5312l0.0004-8.166c0-0.2891-0.24212-0.5338-0.53125-0.5338h-12.161l-0.0004 6.349c0 0.277-0.30237 0.5637-0.57937 0.5637s-0.57447-0.2867-0.57447-0.5637l0.0004-7.0056c0-0.277 0.23357-0.4974 0.51057-0.4974h2.6507l8.3774 0.0003-0.0004-1.7029c0-0.3272-0.24549-0.6047-0.57258-0.6047h-7.5043v-1.7764c0-0.28915-0.23415-0.53125-0.52328-0.53125z" fill="url(#a)"/> </g> </g> </svg> diff --git a/core/js/jquery.ocdialog.js b/core/js/jquery.ocdialog.js index 02cd6ac1466..e2433f5f980 100644 --- a/core/js/jquery.ocdialog.js +++ b/core/js/jquery.ocdialog.js @@ -67,8 +67,8 @@ self.parent = self.$dialog.parent().length > 0 ? self.$dialog.parent() : $('body'); var pos = self.parent.position(); self.$dialog.css({ - left: pos.left + (self.parent.width() - self.$dialog.outerWidth())/2, - top: pos.top + (self.parent.height() - self.$dialog.outerHeight())/2 + left: pos.left + ($(window).innerWidth() - self.$dialog.outerWidth())/2, + top: pos.top + ($(window).innerHeight() - self.$dialog.outerHeight())/2 }); }); @@ -160,10 +160,16 @@ } this.parent = this.$dialog.parent().length > 0 ? this.$dialog.parent() : $('body'); content_height = Math.min(content_height, this.parent.height()-20); - this.element.css({ - height: content_height + 'px', - width: this.$dialog.innerWidth()-20 + 'px' - }); + if (content_height> 0) { + this.element.css({ + height: content_height + 'px', + width: this.$dialog.innerWidth()-20 + 'px' + }); + } else { + this.element.css({ + width : this.$dialog.innerWidth() - 20 + 'px' + }); + } }, _createOverlay: function() { if(!this.options.modal) { diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js index 11833f12e2d..f6c17122d7d 100644 --- a/core/js/oc-dialogs.js +++ b/core/js/oc-dialogs.js @@ -19,7 +19,7 @@ * */ -/* global OC, t, alert */ +/* global OC, t, alert, $ */ /** * this class to ease the usage of jquery dialogs @@ -62,6 +62,65 @@ var OCdialogs = { this.message(text, title, 'notice', OCdialogs.YES_NO_BUTTONS, callback, modal); }, /** + * displays prompt dialog + * @param text content of dialog + * @param title dialog title + * @param callback which will be triggered when user presses YES or NO + * (true or false would be passed to callback respectively) + * @param modal make the dialog modal + * @param name name of the input field + * @param password whether the input should be a password input + */ + prompt: function (text, title, callback, modal, name, password) { + $.when(this._getMessageTemplate()).then(function ($tmpl) { + var dialogName = 'oc-dialog-' + OCdialogs.dialogsCounter + '-content'; + var dialogId = '#' + dialogName; + var $dlg = $tmpl.octemplate({ + dialog_name: dialogName, + title : title, + message : text, + type : 'notice' + }); + var input = $('<input/>'); + input.attr('type', password ? 'password' : 'text').attr('id', dialogName + '-input'); + var label = $('<label/>').attr('for', dialogName + '-input').text(name + ': '); + $dlg.append(label); + $dlg.append(input); + if (modal === undefined) { + modal = false; + } + $('body').append($dlg); + var buttonlist = [ + { + text : t('core', 'Yes'), + click : function () { + if (callback !== undefined) { + callback(true, input.val()); + } + $(dialogId).ocdialog('close'); + }, + defaultButton: true + }, + { + text : t('core', 'No'), + click: function () { + if (callback !== undefined) { + callback(false, input.val()); + } + $(dialogId).ocdialog('close'); + } + } + ]; + + $(dialogId).ocdialog({ + closeOnEscape: true, + modal : modal, + buttons : buttonlist + }); + OCdialogs.dialogsCounter++; + }); + }, + /** * show a file picker to pick a file from * @param title dialog title * @param callback which will be triggered when user presses Choose diff --git a/core/js/share.js b/core/js/share.js index d5a6c7eca3f..9ceca85bff7 100644 --- a/core/js/share.js +++ b/core/js/share.js @@ -359,8 +359,8 @@ OC.Share={ } }) .data("ui-autocomplete")._renderItem = function( ul, item ) { - return $( "<li>" ) - .append( "<a>" + item.displayname + "<br>" + item.email + "</a>" ) + return $('<li>') + .append('<a>' + escapeHTML(item.displayname) + "<br>" + escapeHTML(item.email) + '</a>' ) .appendTo( ul ); }; } diff --git a/core/l10n/ast.php b/core/l10n/ast.php index c479b96faab..a76eeb6b512 100644 --- a/core/l10n/ast.php +++ b/core/l10n/ast.php @@ -33,9 +33,10 @@ $TRANSLATIONS = array( "_%n month ago_::_%n months ago_" => array("fai %n mes","fai %n meses"), "last year" => "añu caberu", "years ago" => "fai años", -"Choose" => "Esbillar", "Yes" => "SÃ", "No" => "Non", +"Choose" => "Esbillar", +"Ok" => "Aceutar", "_{count} file conflict_::_{count} file conflicts_" => array("",""), "Which files do you want to keep?" => "¿Qué ficheros quies caltener?", "Cancel" => "Encaboxar", @@ -48,10 +49,23 @@ $TRANSLATIONS = array( "Shared" => "CompartÃu", "Share" => "Compartir", "Error" => "Fallu", +"Error while sharing" => "Fallu mientres la compartición", +"Error while unsharing" => "Fallu mientres se dexaba de compartir", +"Error while changing permissions" => "Fallu mientres camudaben los permisos", +"Shared with you and the group {group} by {owner}" => "CompartÃu contigo y col grupu {group} por {owner}", +"Shared with you by {owner}" => "CompartÃu contigo por {owner}", "Share link" => "Compartir enllaz", +"Password protect" => "Protexer con contraseña", "Password" => "Contraseña", +"Email link to person" => "Enlláz de corréu electrónicu a la persona", "Send" => "Unviar", +"Set expiration date" => "Afitar la data de caducidá", +"Expiration date" => "Data de caducidá", +"Share via email:" => "Compartir vÃa corréu electrónicu:", +"No people found" => "Nun s'atoparon persones", "group" => "grupu", +"Resharing is not allowed" => "Recompartir nun ta permitÃu", +"Shared in {item} with {user}" => "CompartÃu en {item} con {user}", "Unshare" => "Dexar de compartir", "notify by email" => "notificar per corréu", "can edit" => "pue editar", @@ -61,22 +75,51 @@ $TRANSLATIONS = array( "delete" => "desaniciar", "share" => "compartir", "Password protected" => "Contraseña protexida", +"Error unsetting expiration date" => "Fallu desafitando la data de caducidá", +"Error setting expiration date" => "Fallu afitando la fecha de caducidá", +"Sending ..." => "Unviando ...", "Email sent" => "Corréu unviáu", "Warning" => "Avisu", +"The object type is not specified." => "El tipu d'oxetu nun ta especificáu.", "Delete" => "Desaniciar", "Add" => "Amestar", "Edit tags" => "Editar etiquetes", +"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "L'anovamientu fÃzose con ésitu. Por favor, informa d'esti problema a la <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">comuña ownCloud</a>.", +"The update was successful. Redirecting you to ownCloud now." => "L'anovamientu fÃzose con ésitu. Redirixiendo agora al to ownCloud.", +"Use the following link to reset your password: {link}" => "Usa'l siguiente enllaz pa restablecer la to contraseña: {link}", +"You will receive a link to reset your password via Email." => "Vas recibir un enllaz vÃa Corréu-e pa restablecer la to contraseña", "Username" => "Nome d'usuariu", "Reset" => "Reaniciar", +"Your password was reset" => "Restablecióse la contraseña", +"To login page" => "Aniciar sesión na páxina", "New password" => "Contraseña nueva", +"Reset password" => "Restablecer contraseña", "For the best results, please consider using a GNU/Linux server instead." => "Pa los meyores resultaos, por favor considera l'usu d'un sirvidor GNU/Linux nel so llugar.", "Personal" => "Personal", "Users" => "Usuarios", +"Apps" => "Aplicaciones", +"Admin" => "Alministrador", +"Help" => "Ayuda", +"Access forbidden" => "Accesu denegáu", +"Cloud not found" => "Ñube non atopada", "Cheers!" => "¡Salú!", "Security Warning" => "Avisu de seguridá", +"No secure random number generator is available, please enable the PHP OpenSSL extension." => "Nun ta disponible'l xenerador de númberos al debalu, por favor activa la estensión PHP OpenSSL.", +"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Ensin un xenerador de númberos al debalu, un atacante podrÃa aldovinar los tokens pa restablecer la contraseña y tomar el control de la cuenta.", +"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "El to direutoriu de datos y ficheros seique ye accesible dende internet por mor qu'el ficheru .htaccess nun furrula.", +"Create an <strong>admin account</strong>" => "Crea una <strong>cuenta d'alministrador</strong>", +"Data folder" => "Carpeta de datos", +"Configure the database" => "Configura la base de datos", "will be used" => "usaráse", +"Database user" => "Usuariu de la base de datos", +"Database password" => "Contraseña de la base de datos", +"Database name" => "Nome de la base de datos", +"Database tablespace" => "Espaciu de tables de la base de datos", +"Database host" => "Agospiador de la base de datos", +"Finish setup" => "Finar la configuración ", "Finishing …" => "Finando ...", "Log out" => "Zarrar sesión", +"Automatic logon rejected!" => "¡Aniciu de sesión automáticu refugáu!", "Lost your password?" => "¿Escaeciesti la to contraseña?", "Log in" => "Aniciar sesión", "Alternative Logins" => "Anicios de sesión alternativos", diff --git a/core/l10n/da.php b/core/l10n/da.php index 9991e3e4907..f7906e168bc 100644 --- a/core/l10n/da.php +++ b/core/l10n/da.php @@ -1,5 +1,6 @@ <?php $TRANSLATIONS = array( +"Expiration date is in the past." => "Udløbsdatoen er overskredet.", "Couldn't send mail to following users: %s " => "Kunne ikke sende mail til følgende brugere: %s", "Turned on maintenance mode" => "Startede vedligeholdelsestilstand", "Turned off maintenance mode" => "standsede vedligeholdelsestilstand", @@ -49,6 +50,7 @@ $TRANSLATIONS = array( "_{count} file conflict_::_{count} file conflicts_" => array("{count} filkonflikt","{count} filkonflikter"), "One file conflict" => "En filkonflikt", "New Files" => "Nye filer", +"Already existing files" => "Allerede eksisterende filer", "Which files do you want to keep?" => "Hvilke filer ønsker du at beholde?", "If you select both versions, the copied file will have a number added to its name." => "Hvis du vælger begge versioner, vil den kopierede fil fÃ¥ tilføjet et nummer til sit navn.", "Cancel" => "Annuller", @@ -121,6 +123,8 @@ $TRANSLATIONS = array( "To login page" => "Til login-side", "New password" => "Nyt kodeord", "Reset password" => "Nulstil kodeord", +"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Mac OS X understøttes ikke og %s vil ikke virke optimalt pÃ¥ denne platform. Anvend pÃ¥ eget ansvar!", +"For the best results, please consider using a GNU/Linux server instead." => "For de bedste resultater, overvej venligst at bruge en GNU/Linux-server i stedet.", "Personal" => "Personligt", "Users" => "Brugere", "Apps" => "Apps", @@ -169,6 +173,7 @@ $TRANSLATIONS = array( "remember" => "husk", "Log in" => "Log ind", "Alternative Logins" => "Alternative logins", +"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" => "Hej med dig,<br><br>Dette er blot for at informere dig om, at %s har delt <strong>%s</strong> med dig.<br><a href=\"%s\">Se det her!</a><br><br>", "This ownCloud instance is currently in single user mode." => "Denne ownCloud instans er lige nu i enkeltbruger tilstand.", "This means only administrators can use the instance." => "Det betyder at det kun er administrator, som kan benytte ownCloud.", "Contact your system administrator if this message persists or appeared unexpectedly." => "Kontakt systemadministratoren, hvis denne meddelelse fortsætter eller optrÃ¥dte uventet.", diff --git a/core/l10n/es.php b/core/l10n/es.php index 53d2a9f4c2b..ca314a8b537 100644 --- a/core/l10n/es.php +++ b/core/l10n/es.php @@ -31,16 +31,16 @@ $TRANSLATIONS = array( "December" => "Diciembre", "Settings" => "Ajustes", "Saving..." => "Guardando...", -"seconds ago" => "segundos antes", -"_%n minute ago_::_%n minutes ago_" => array("Hace %n minuto","Hace %n minutos"), -"_%n hour ago_::_%n hours ago_" => array("Hace %n hora","Hace %n horas"), +"seconds ago" => "hace segundos", +"_%n minute ago_::_%n minutes ago_" => array("Hace %n minuto","hace %n minutos"), +"_%n hour ago_::_%n hours ago_" => array("Hace %n hora","hace %n horas"), "today" => "hoy", "yesterday" => "ayer", -"_%n day ago_::_%n days ago_" => array("Hace %n dÃa","Hace %n dÃas"), +"_%n day ago_::_%n days ago_" => array("Hace %n dÃa","hace %n dÃas"), "last month" => "el mes pasado", -"_%n month ago_::_%n months ago_" => array("Hace %n mes","Hace %n meses"), +"_%n month ago_::_%n months ago_" => array("Hace %n mes","hace %n meses"), "last year" => "el año pasado", -"years ago" => "años antes", +"years ago" => "hace años", "Choose" => "Seleccionar", "Error loading file picker template: {error}" => "Error cargando plantilla del seleccionador de archivos: {error}", "Yes" => "SÃ", diff --git a/core/l10n/es_CO.php b/core/l10n/es_CO.php new file mode 100644 index 00000000000..ffcdde48d47 --- /dev/null +++ b/core/l10n/es_CO.php @@ -0,0 +1,9 @@ +<?php +$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("",""), +"_{count} file conflict_::_{count} file conflicts_" => array("","") +); +$PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/core/l10n/es_EC.php b/core/l10n/es_EC.php new file mode 100644 index 00000000000..ffcdde48d47 --- /dev/null +++ b/core/l10n/es_EC.php @@ -0,0 +1,9 @@ +<?php +$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("",""), +"_{count} file conflict_::_{count} file conflicts_" => array("","") +); +$PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/core/l10n/es_PE.php b/core/l10n/es_PE.php new file mode 100644 index 00000000000..ffcdde48d47 --- /dev/null +++ b/core/l10n/es_PE.php @@ -0,0 +1,9 @@ +<?php +$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("",""), +"_{count} file conflict_::_{count} file conflicts_" => array("","") +); +$PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/core/l10n/es_UY.php b/core/l10n/es_UY.php new file mode 100644 index 00000000000..ffcdde48d47 --- /dev/null +++ b/core/l10n/es_UY.php @@ -0,0 +1,9 @@ +<?php +$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("",""), +"_{count} file conflict_::_{count} file conflicts_" => array("","") +); +$PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/core/l10n/km.php b/core/l10n/km.php index 0eac818c578..76b1492456c 100644 --- a/core/l10n/km.php +++ b/core/l10n/km.php @@ -38,7 +38,17 @@ $TRANSLATIONS = array( "No" => "áž‘áŸ", "Ok" => "ព្រម", "_{count} file conflict_::_{count} file conflicts_" => array(""), +"New Files" => "ឯកសារ​ážáŸ’មី", +"Already existing files" => "មាន​ឯកសារ​នáŸáŸ‡â€‹ážšáž½áž…​ហើយ", "Cancel" => "លើកលែង", +"Continue" => "បន្áž", +"(all selected)" => "(បាន​ជ្រើស​ទាំង​អស់)", +"({count} selected)" => "(បាន​ជ្រើស {count})", +"Very weak password" => "ពាក្យ​សម្ងាážáŸ‹â€‹ážáŸ’សោយ​ណាស់", +"Weak password" => "ពាក្យ​សម្ងាážáŸ‹â€‹ážáŸ’សោយ", +"So-so password" => "ពាក្យ​សម្ងាážáŸ‹â€‹áž’ម្មážáž¶", +"Good password" => "ពាក្យ​សម្ងាážáŸ‹â€‹áž›áŸ’អ", +"Strong password" => "ពាក្យ​សម្ងាážáŸ‹â€‹ážáŸ’លាំង", "Shared" => "បាន​ចែក​រំលែក", "Share" => "ចែក​រំលែក", "Error" => "កំហុស", @@ -49,6 +59,7 @@ $TRANSLATIONS = array( "Shared with you by {owner}" => "បាន​ចែក​រំលែក​ជាមួយ​អ្នក​ដោយ {owner}", "Password protect" => "ការ​ពារ​ដោយ​ពាក្យ​សម្ងាážáŸ‹", "Password" => "ពាក្យសម្ងាážáŸ‹", +"Allow Public Upload" => "អនុញ្ញាážâ€‹áž€áž¶ážšâ€‹áž•áŸ’ទុកឡើង​ជា​សាធារណៈ", "Send" => "ផ្ញើ", "Set expiration date" => "កំណážáŸ‹â€‹áž–áŸáž›â€‹áž•áž»ážâ€‹áž€áŸ†ážŽážáŸ‹", "Expiration date" => "áž–áŸáž›â€‹áž•áž»ážâ€‹áž€áŸ†ážŽážáŸ‹", @@ -71,6 +82,8 @@ $TRANSLATIONS = array( "The object type is not specified." => "មិន​បាន​កំណážáŸ‹â€‹áž”្រភáŸáž‘​វážáŸ’ážáž»áŸ”", "Delete" => "លុប", "Add" => "បញ្ចូល", +"Please reload the page." => "សូម​ផ្ទុក​ទំពáŸážšâ€‹áž“áŸáŸ‡â€‹áž¡áž¾áž„​វិញ។", +"A problem has occurred whilst sending the email, please contact your administrator." => "មាន​កំហុស​បាន​កើážâ€‹áž¡áž¾áž„​នៅ​ពáŸáž›áž›â€‹áž€áŸ†áž–ុង​ផ្ញើ​អ៊ីមែល​ចáŸáž‰, សូម​ទាក់ទង​អភិបាល​របស់​អ្នក។", "Username" => "ឈ្មោះ​អ្នកប្រើ", "Your password was reset" => "ពាក្យ​សម្ងាážáŸ‹â€‹ážšáž”ស់​អ្នក​ážáŸ’រូវ​បាន​កំណážáŸ‹â€‹áž¡áž¾áž„​វិញ", "To login page" => "ទៅ​ទំពáŸážšâ€‹áž…ូល", @@ -83,6 +96,25 @@ $TRANSLATIONS = array( "Help" => "ជំនួយ", "Access forbidden" => "បាន​ហាមឃាážáŸ‹â€‹áž€áž¶ážšâ€‹áž…ូល", "Cloud not found" => "រក​មិន​ឃើញ Cloud", -"Security Warning" => "បម្រាម​សុវážáŸ’ážáž·áž—ាព" +"Security Warning" => "បម្រាម​សុវážáŸ’ážáž·áž—ាព", +"Create an <strong>admin account</strong>" => "បង្កើážâ€‹<strong>គណនី​អភិបាល</strong>", +"Storage & database" => "ឃ្លាំង​ផ្ទុក & មូលដ្ឋាន​ទិន្ននáŸáž™", +"Data folder" => "ážážâ€‹áž‘ិន្ននáŸáž™", +"Configure the database" => "កំណážáŸ‹â€‹ážŸážŽáŸ’ឋាន​មូលដ្ឋាន​ទិន្ននáŸáž™", +"will be used" => "នឹង​ážáŸ’រូវ​បាន​ប្រើ", +"Database user" => "អ្នក​ប្រើ​មូលដ្ឋាន​ទិន្ននáŸáž™", +"Database password" => "ពាក្យ​សម្ងាážáŸ‹â€‹áž˜áž¼áž›ážŠáŸ’ឋាន​ទិន្ននáŸáž™", +"Database name" => "ឈ្មោះ​មូលដ្ឋាន​ទិន្ននáŸáž™", +"Database host" => "ម៉ាស៊ីន​មូលដ្ឋាន​ទិន្ននáŸáž™", +"Finish setup" => "បញ្ចប់​ការ​ដំឡើង", +"Finishing …" => "កំពុង​បញ្ចប់ ...", +"Log out" => "ចាក​ចáŸáž‰", +"Automatic logon rejected!" => "បាន​បដិសáŸáž’​ការ​ចូល​ដោយ​ស្វáŸáž™â€‹áž”្រវážáŸ’ážáž·!", +"Please change your password to secure your account again." => "សូម​ប្ដូរ​ពាក្យ​សម្ងាážáŸ‹â€‹ážšáž”ស់​អ្នក ដើម្បី​ការពារ​គណនី​របស់​អ្នក។", +"Lost your password?" => "បាážáŸ‹â€‹áž–ាក្យ​សម្ងាážáŸ‹â€‹ážšáž”ស់​អ្នក?", +"remember" => "ចងចាំ", +"Log in" => "ចូល", +"Alternative Logins" => "ការ​ចូល​ជំនួស", +"Updating ownCloud to version %s, this may take a while." => "ការ​ធ្វើ​បច្ចុប្បន្នភាព ownCloud ទៅ​កំណែ %s អាច​ចំណាយ​ពáŸáž›â€‹áž˜áž½áž™â€‹ážŸáŸ†áž‘ុះ។" ); $PLURAL_FORMS = "nplurals=1; plural=0;"; diff --git a/core/l10n/nl.php b/core/l10n/nl.php index 43748352a7b..961866fc158 100644 --- a/core/l10n/nl.php +++ b/core/l10n/nl.php @@ -94,7 +94,7 @@ $TRANSLATIONS = array( "delete" => "verwijderen", "share" => "deel", "Password protected" => "Wachtwoord beveiligd", -"Error unsetting expiration date" => "Fout tijdens het verwijderen van de verval datum", +"Error unsetting expiration date" => "Fout tijdens het verwijderen van de vervaldatum", "Error setting expiration date" => "Fout tijdens het instellen van de vervaldatum", "Sending ..." => "Versturen ...", "Email sent" => "E-mail verzonden", @@ -107,19 +107,19 @@ $TRANSLATIONS = array( "Error loading dialog template: {error}" => "Fout bij laden dialoog sjabloon: {error}", "No tags selected for deletion." => "Geen tags geselecteerd voor verwijdering.", "Please reload the page." => "Herlaad deze pagina.", -"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "De update is niet geslaagd. Meld dit probleem aan bij de <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>.", -"The update was successful. Redirecting you to ownCloud now." => "De update is geslaagd. Je wordt teruggeleid naar je eigen ownCloud.", +"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "De update is niet geslaagd. Meld dit probleem bij de <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>.", +"The update was successful. Redirecting you to ownCloud now." => "De update is geslaagd. U wordt teruggeleid naar uw eigen ownCloud.", "%s password reset" => "%s wachtwoord reset", "A problem has occurred whilst sending the email, please contact your administrator." => "Er ontstond een probleem bij het versturen van het e-mailbericht, neem contact op met uw beheerder.", -"Use the following link to reset your password: {link}" => "Gebruik de volgende link om je wachtwoord te resetten: {link}", -"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "De link voor het resetten van je wachtwoord is verzonden naar je e-mailadres.<br>Als je dat bericht niet snel ontvangen hebt, controleer dan uw spambakje.<br>Als het daar ook niet is, vraag dan je beheerder om te helpen.", -"Request failed!<br>Did you make sure your email/username was right?" => "Aanvraag mislukt!<br>Weet je zeker dat je gebruikersnaam en/of wachtwoord goed waren?", -"You will receive a link to reset your password via Email." => "Je ontvangt een link om je wachtwoord opnieuw in te stellen via e-mail.", +"Use the following link to reset your password: {link}" => "Gebruik de volgende link om uw wachtwoord te resetten: {link}", +"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "De link voor het resetten van uw wachtwoord is verzonden naar uw e-mailadres.<br>Als u dat bericht niet snel ontvangen hebt, controleer dan uw spammap.<br>Als het daar ook niet is, vraag dan uw beheerder om hulp.", +"Request failed!<br>Did you make sure your email/username was right?" => "Aanvraag mislukt!<br>Weet u zeker dat uw gebruikersnaam en/of wachtwoord goed waren?", +"You will receive a link to reset your password via Email." => "U ontvangt een link om uw wachtwoord opnieuw in te stellen via e-mail.", "Username" => "Gebruikersnaam", -"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?" => "Je bestanden zijn versleuteld. Als je geen recoverykey hebt ingeschakeld is er geen manier om je data terug te krijgen indien je je wachtwoord reset!\nAls je niet weet wat te doen, neem dan alsjeblieft contact op met je administrator eer je doorgaat.\nWil je echt doorgaan?", +"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?" => "Uw bestanden zijn versleuteld. Als u geen recoverykey hebt ingeschakeld is er geen manier om uw data terug te krijgen na het resetten van uw wachtwoord.\nAls u niet weet wat u moet doen, neem dan alstublieft contact op met uw systeembeheerder voordat u doorgaat.\nWil u echt doorgaan?", "Yes, I really want to reset my password now" => "Ja, ik wil mijn wachtwoord nu echt resetten", "Reset" => "Reset", -"Your password was reset" => "Je wachtwoord is gewijzigd", +"Your password was reset" => "Uw wachtwoord is gewijzigd", "To login page" => "Naar de login-pagina", "New password" => "Nieuw wachtwoord", "Reset password" => "Reset wachtwoord", @@ -139,15 +139,15 @@ $TRANSLATIONS = array( "Error unfavoriting" => "Fout bij verwijderen favorietstatus", "Access forbidden" => "Toegang verboden", "Cloud not found" => "Cloud niet gevonden", -"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Hallo daar,\n\neven een berichtje dat %s %s met u deelde.\nBekijk het: %s\n\n", +"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Hallo,\n\n%s deelt %s met u.\nBekijk het: %s\n\n", "The share will expire on %s." => "De share vervalt op %s.", "Cheers!" => "Proficiat!", "Security Warning" => "Beveiligingswaarschuwing", -"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Je PHP-versie is kwetsbaar voor de NULL byte aanval (CVE-2006-7243)", +"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Uw PHP-versie is kwetsbaar voor de NULL byte aanval (CVE-2006-7243)", "Please update your PHP installation to use %s securely." => "Werk uw PHP installatie bij om %s veilig te kunnen gebruiken.", "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Er kon geen willekeurig nummer worden gegenereerd. Zet de PHP OpenSSL-extentie aan.", "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Zonder random nummer generator is het mogelijk voor een aanvaller om de resettokens van wachtwoorden te voorspellen. Dit kan leiden tot het inbreken op uw account.", -"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Je gegevensdirectory en bestanden zijn vermoedelijk bereikbaar vanaf het internet omdat het .htaccess-bestand niet werkt.", +"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Uw gegevensdirectory en bestanden zijn vermoedelijk bereikbaar vanaf het internet omdat het .htaccess-bestand niet functioneert.", "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Bekijk de <a href=\"%s\" target=\"_blank\">documentatie</a> voor Informatie over het correct configureren van uw server.", "Create an <strong>admin account</strong>" => "Maak een <strong>beheerdersaccount</strong> aan", "Storage & database" => "Opslag & database", @@ -161,19 +161,19 @@ $TRANSLATIONS = array( "Database host" => "Databaseserver", "Finish setup" => "Installatie afronden", "Finishing …" => "Afronden ...", -"This application requires JavaScript to be enabled for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and re-load this interface." => "Deze applicatie heeft een werkend JavaScript nodig. <a href=\"http://enable-javascript.com/\" target=\"_blank\">activeer JavaScript</a> en herlaad deze interface.", +"This application requires JavaScript to be enabled for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and re-load this interface." => "Deze applicatie heeft JavaScript nodig om correct te functioneren. <a href=\"http://enable-javascript.com/\" target=\"_blank\">Activeer JavaScript</a> en herlaad deze interface.", "%s is available. Get more information on how to update." => "%s is beschikbaar. Verkrijg meer informatie over het bijwerken.", "Log out" => "Afmelden", "Automatic logon rejected!" => "Automatische aanmelding geweigerd!", -"If you did not change your password recently, your account may be compromised!" => "Als 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.", +"If you did not change your password recently, your account may be compromised!" => "Als u uw wachtwoord niet onlangs heeft aangepast, kan uw account overgenomen zijn!", +"Please change your password to secure your account again." => "Wijzig uw wachtwoord zodat uw account weer beveiligd is.", "Server side authentication failed!" => "Authenticatie bij de server mislukte!", "Please contact your administrator." => "Neem contact op met uw systeembeheerder.", "Lost your password?" => "Wachtwoord vergeten?", "remember" => "onthoud gegevens", -"Log in" => "Meld je aan", +"Log in" => "Meld u aan", "Alternative Logins" => "Alternatieve inlogs", -"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" => "Hallo daar,<br><br>we willen even laten weten dat %s <strong>%s</strong> met u heeft gedeeld.<br><a href=\"%s\">Bekijk het!</a><br><br>", +"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" => "Hallo,<br><br>%s deelt <strong>%s</strong> met u.<br><a href=\"%s\">Bekijk het!</a><br><br>", "This ownCloud instance is currently in single user mode." => "Deze ownCloud werkt momenteel in enkele gebruiker modus.", "This means only administrators can use the instance." => "Dat betekent dat alleen beheerders deze installatie kunnen gebruiken.", "Contact your system administrator if this message persists or appeared unexpectedly." => "Beem contact op met uw systeembeheerder als deze melding aanhoudt of plotseling verscheen.", diff --git a/core/l10n/pt_PT.php b/core/l10n/pt_PT.php index 52362cc10cd..8c5d3fd5a6a 100644 --- a/core/l10n/pt_PT.php +++ b/core/l10n/pt_PT.php @@ -1,5 +1,6 @@ <?php $TRANSLATIONS = array( +"Expiration date is in the past." => "A data de expiração é no passado.", "Couldn't send mail to following users: %s " => "Não conseguiu enviar correio aos seguintes utilizadores: %s", "Turned on maintenance mode" => "Activado o modo de manutenção", "Turned off maintenance mode" => "Desactivado o modo de manutenção", @@ -172,6 +173,7 @@ $TRANSLATIONS = array( "remember" => "lembrar", "Log in" => "Entrar", "Alternative Logins" => "Contas de acesso alternativas", +"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" => "Olá,<br><br>apenas para informar que %s partilhou <strong>%s</strong> consigo.<br><a href=\"%s\">Consulte aqui!</a><br><br>", "This ownCloud instance is currently in single user mode." => "Esta instância do ownCloud está actualmente configurada no modo de utilizador único.", "This means only administrators can use the instance." => "Isto significa que apenas os administradores podem usar a instância.", "Contact your system administrator if this message persists or appeared unexpectedly." => "Contacte o seu administrador de sistema se esta mensagem continuar a aparecer ou apareceu inesperadamente.", diff --git a/l10n/ach/settings.po b/l10n/ach/settings.po index df5507bffcf..b78298d0ec7 100644 --- a/l10n/ach/settings.po +++ b/l10n/ach/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-26 01:54-0400\n" -"PO-Revision-Date: 2014-04-26 05:54+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Acoli (http://www.transifex.com/projects/p/owncloud/language/ach/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "" @@ -98,6 +98,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -114,6 +124,16 @@ msgstr "" msgid "Unable to delete user" msgstr "" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "" @@ -225,34 +245,42 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "" @@ -298,7 +326,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "" @@ -623,11 +651,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -791,18 +819,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "" diff --git a/l10n/ady/settings.po b/l10n/ady/settings.po index 4117495a19a..1091fe195d3 100644 --- a/l10n/ady/settings.po +++ b/l10n/ady/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-26 01:54-0400\n" -"PO-Revision-Date: 2014-04-26 05:54+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Adyghe (http://www.transifex.com/projects/p/owncloud/language/ady/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "" @@ -98,6 +98,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -114,6 +124,16 @@ msgstr "" msgid "Unable to delete user" msgstr "" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "" @@ -225,34 +245,42 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "" @@ -298,7 +326,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "" @@ -623,11 +651,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -791,18 +819,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "" diff --git a/l10n/af_ZA/core.po b/l10n/af_ZA/core.po index 888f2caf321..febcf060b82 100644 --- a/l10n/af_ZA/core.po +++ b/l10n/af_ZA/core.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:10+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: kalliet <kst@fam-tank.net>\n" "Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/af_ZA/files_external.po b/l10n/af_ZA/files_external.po index 3f4e2806dbe..a391d017f65 100644 --- a/l10n/af_ZA/files_external.po +++ b/l10n/af_ZA/files_external.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:10+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n" "MIME-Version: 1.0\n" @@ -197,29 +197,29 @@ msgstr "" msgid "Saved" msgstr "" -#: lib/config.php:598 +#: lib/config.php:597 msgid "<b>Note:</b> " msgstr "" -#: lib/config.php:608 +#: lib/config.php:607 msgid " and " msgstr "" -#: lib/config.php:630 +#: lib/config.php:629 #, php-format msgid "" "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting " "of %s is not possible. Please ask your system administrator to install it." msgstr "" -#: lib/config.php:632 +#: lib/config.php:631 #, php-format msgid "" "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of" " %s is not possible. Please ask your system administrator to install it." msgstr "" -#: lib/config.php:634 +#: lib/config.php:633 #, php-format msgid "" "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please" diff --git a/l10n/af_ZA/files_sharing.po b/l10n/af_ZA/files_sharing.po index 09700e06a1f..bb437c8dba8 100644 --- a/l10n/af_ZA/files_sharing.po +++ b/l10n/af_ZA/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-03 01:55-0400\n" -"PO-Revision-Date: 2014-05-03 05:55+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n" "MIME-Version: 1.0\n" @@ -61,11 +61,11 @@ msgstr "" msgid "Download" msgstr "" -#: templates/public.php:53 +#: templates/public.php:52 #, php-format msgid "Download %s" msgstr "" -#: templates/public.php:57 +#: templates/public.php:56 msgid "Direct link" msgstr "" diff --git a/l10n/af_ZA/settings.po b/l10n/af_ZA/settings.po index 2718964e661..3f32827eff8 100644 --- a/l10n/af_ZA/settings.po +++ b/l10n/af_ZA/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "" @@ -98,6 +98,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -114,6 +124,16 @@ msgstr "" msgid "Unable to delete user" msgstr "" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "" @@ -225,34 +245,42 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "So-so wagwoord" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "" @@ -298,7 +326,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "" @@ -623,11 +651,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -791,18 +819,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "" diff --git a/l10n/af_ZA/user_ldap.po b/l10n/af_ZA/user_ldap.po index 8348fbfab8b..9bad2da0ddc 100644 --- a/l10n/af_ZA/user_ldap.po +++ b/l10n/af_ZA/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/ak/settings.po b/l10n/ak/settings.po index 300b60d574a..09116dd0e53 100644 --- a/l10n/ak/settings.po +++ b/l10n/ak/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-26 01:54-0400\n" -"PO-Revision-Date: 2014-04-26 05:54+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Akan (http://www.transifex.com/projects/p/owncloud/language/ak/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "" @@ -98,6 +98,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -114,6 +124,16 @@ msgstr "" msgid "Unable to delete user" msgstr "" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "" @@ -225,34 +245,42 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "" @@ -298,7 +326,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "" @@ -623,11 +651,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -791,18 +819,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "" diff --git a/l10n/am_ET/settings.po b/l10n/am_ET/settings.po index 95550014716..df1a06cb32b 100644 --- a/l10n/am_ET/settings.po +++ b/l10n/am_ET/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-26 01:54-0400\n" -"PO-Revision-Date: 2014-04-26 05:54+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Amharic (Ethiopia) (http://www.transifex.com/projects/p/owncloud/language/am_ET/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "" @@ -98,6 +98,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -114,6 +124,16 @@ msgstr "" msgid "Unable to delete user" msgstr "" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "" @@ -225,34 +245,42 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "" @@ -298,7 +326,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "" @@ -623,11 +651,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -791,18 +819,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "" diff --git a/l10n/ar/core.po b/l10n/ar/core.po index 3c4eeae9ff8..6a6bdb49e50 100644 --- a/l10n/ar/core.po +++ b/l10n/ar/core.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 13:26+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: m3tz.gh <moataz-net@hotmail.com>\n" "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/ar/files_external.po b/l10n/ar/files_external.po index f37fb88d7fb..c8bf84e444e 100644 --- a/l10n/ar/files_external.po +++ b/l10n/ar/files_external.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n" "MIME-Version: 1.0\n" @@ -198,29 +198,29 @@ msgstr "" msgid "Saved" msgstr "ØÙظ" -#: lib/config.php:598 +#: lib/config.php:597 msgid "<b>Note:</b> " msgstr "" -#: lib/config.php:608 +#: lib/config.php:607 msgid " and " msgstr "" -#: lib/config.php:630 +#: lib/config.php:629 #, php-format msgid "" "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting " "of %s is not possible. Please ask your system administrator to install it." msgstr "" -#: lib/config.php:632 +#: lib/config.php:631 #, php-format msgid "" "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of" " %s is not possible. Please ask your system administrator to install it." msgstr "" -#: lib/config.php:634 +#: lib/config.php:633 #, php-format msgid "" "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please" diff --git a/l10n/ar/files_sharing.po b/l10n/ar/files_sharing.po index df94e842cb9..33e3b7bf72a 100644 --- a/l10n/ar/files_sharing.po +++ b/l10n/ar/files_sharing.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-04 01:55-0400\n" -"PO-Revision-Date: 2014-05-03 06:12+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n" "MIME-Version: 1.0\n" @@ -62,11 +62,11 @@ msgstr "لمزيد من المعلومات، يرجى سؤال الشخص الذ msgid "Download" msgstr "تØميل" -#: templates/public.php:53 +#: templates/public.php:52 #, php-format msgid "Download %s" msgstr "تØميل %s" -#: templates/public.php:57 +#: templates/public.php:56 msgid "Direct link" msgstr "رابط مباشر" diff --git a/l10n/ar/settings.po b/l10n/ar/settings.po index 60a5c421f71..fd0c1b248fd 100644 --- a/l10n/ar/settings.po +++ b/l10n/ar/settings.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n" "MIME-Version: 1.0\n" @@ -54,7 +54,7 @@ msgstr "" msgid "Send mode" msgstr "وضعية الإرسال" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "التشÙير" @@ -101,6 +101,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "تم ØÙظ البريد الإلكتروني" @@ -117,6 +127,16 @@ msgstr "Ùشل إزالة المجموعة" msgid "Unable to delete user" msgstr "Ùشل إزالة المستخدم" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "تم تغيير اللغة" @@ -228,34 +248,42 @@ msgstr "Øدث" msgid "Updated" msgstr "تم التØديث بنجاØ" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "اختر صورة المل٠الشخصي " -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "كلمة السر ضعيÙØ© جدا" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "كلمة السر ضعيÙØ©" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "كلمة السر جيدة" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "كلمة السر قوية" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "ÙÙƒ تشÙير الملÙات... يرجى الانتظار, من الممكن ان ياخذ بعض الوقت." +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "تم الØØ°Ù" @@ -301,7 +329,7 @@ msgstr "يجب ادخال كلمة مرور صØÙŠØØ©" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "تØذير: المجلد الرئيسي لـ المستخدم \"{user}\" موجود مسبقا" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "__language_name__" @@ -626,11 +654,11 @@ msgstr "المزيد" msgid "Less" msgstr "أقل" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "إصدار" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -794,18 +822,33 @@ msgid "" "WebDAV</a>" msgstr "استخدم هذا العنوان لـ <a href=\"%s\" target=\"_blank\">الدخول الى ملÙاتك عن طريق WebDAV</a>" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "البرنامج المشÙر لم يعد Ù…Ùعل, يرجى ÙÙƒ التشÙير عن كل ملÙاتك" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "كلمه سر الدخول" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "ÙÙƒ تشÙير جميع الملÙات " +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "اسم الدخول" diff --git a/l10n/ar/user_ldap.po b/l10n/ar/user_ldap.po index e80c82e269f..a4b993f7ba8 100644 --- a/l10n/ar/user_ldap.po +++ b/l10n/ar/user_ldap.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/ast/core.po b/l10n/ast/core.po index ed5c3b53966..c542ca0e846 100644 --- a/l10n/ast/core.po +++ b/l10n/ast/core.po @@ -3,13 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# dixebra <davidlopezcastanon@gmail.com>, 2014 +# Iñigo Varela <ivarela@softastur.org>, 2014 # Tornes Llume <l.lumex03.tornes@gmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:02+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-13 19:41+0000\n" "Last-Translator: Iñigo Varela <ivarela@softastur.org>\n" "Language-Team: Asturian (http://www.transifex.com/projects/p/owncloud/language/ast/)\n" "MIME-Version: 1.0\n" @@ -191,75 +193,75 @@ msgstr "añu caberu" msgid "years ago" msgstr "fai años" -#: js/oc-dialogs.js:125 -msgid "Choose" -msgstr "Esbillar" - -#: js/oc-dialogs.js:151 -msgid "Error loading file picker template: {error}" -msgstr "" - -#: js/oc-dialogs.js:177 +#: js/oc-dialogs.js:95 js/oc-dialogs.js:236 msgid "Yes" msgstr "SÃ" -#: js/oc-dialogs.js:187 +#: js/oc-dialogs.js:105 js/oc-dialogs.js:246 msgid "No" msgstr "Non" -#: js/oc-dialogs.js:204 -msgid "Ok" +#: js/oc-dialogs.js:184 +msgid "Choose" +msgstr "Esbillar" + +#: js/oc-dialogs.js:210 +msgid "Error loading file picker template: {error}" msgstr "" -#: js/oc-dialogs.js:224 +#: js/oc-dialogs.js:263 +msgid "Ok" +msgstr "Aceutar" + +#: js/oc-dialogs.js:283 msgid "Error loading message template: {error}" msgstr "" -#: js/oc-dialogs.js:352 +#: js/oc-dialogs.js:411 msgid "{count} file conflict" msgid_plural "{count} file conflicts" msgstr[0] "" msgstr[1] "" -#: js/oc-dialogs.js:366 +#: js/oc-dialogs.js:425 msgid "One file conflict" msgstr "" -#: js/oc-dialogs.js:372 +#: js/oc-dialogs.js:431 msgid "New Files" msgstr "" -#: js/oc-dialogs.js:373 +#: js/oc-dialogs.js:432 msgid "Already existing files" msgstr "" -#: js/oc-dialogs.js:375 +#: js/oc-dialogs.js:434 msgid "Which files do you want to keep?" msgstr "¿Qué ficheros quies caltener?" -#: js/oc-dialogs.js:376 +#: js/oc-dialogs.js:435 msgid "" "If you select both versions, the copied file will have a number added to its" " name." msgstr "" -#: js/oc-dialogs.js:384 +#: js/oc-dialogs.js:443 msgid "Cancel" msgstr "Encaboxar" -#: js/oc-dialogs.js:394 +#: js/oc-dialogs.js:453 msgid "Continue" msgstr "Continuar" -#: js/oc-dialogs.js:441 js/oc-dialogs.js:454 +#: js/oc-dialogs.js:500 js/oc-dialogs.js:513 msgid "(all selected)" msgstr "" -#: js/oc-dialogs.js:444 js/oc-dialogs.js:458 +#: js/oc-dialogs.js:503 js/oc-dialogs.js:517 msgid "({count} selected)" msgstr "" -#: js/oc-dialogs.js:466 +#: js/oc-dialogs.js:525 msgid "Error loading file exists template" msgstr "" @@ -298,23 +300,23 @@ msgstr "Fallu" #: js/share.js:160 js/share.js:790 msgid "Error while sharing" -msgstr "" +msgstr "Fallu mientres la compartición" #: js/share.js:171 msgid "Error while unsharing" -msgstr "" +msgstr "Fallu mientres se dexaba de compartir" #: js/share.js:178 msgid "Error while changing permissions" -msgstr "" +msgstr "Fallu mientres camudaben los permisos" #: js/share.js:188 msgid "Shared with you and the group {group} by {owner}" -msgstr "" +msgstr "CompartÃu contigo y col grupu {group} por {owner}" #: js/share.js:190 msgid "Shared with you by {owner}" -msgstr "" +msgstr "CompartÃu contigo por {owner}" #: js/share.js:214 msgid "Share with user or group …" @@ -326,7 +328,7 @@ msgstr "Compartir enllaz" #: js/share.js:223 msgid "Password protect" -msgstr "" +msgstr "Protexer con contraseña" #: js/share.js:225 templates/installation.php:60 templates/login.php:40 msgid "Password" @@ -338,7 +340,7 @@ msgstr "" #: js/share.js:234 msgid "Email link to person" -msgstr "" +msgstr "Enlláz de corréu electrónicu a la persona" #: js/share.js:235 msgid "Send" @@ -346,19 +348,19 @@ msgstr "Unviar" #: js/share.js:240 msgid "Set expiration date" -msgstr "" +msgstr "Afitar la data de caducidá" #: js/share.js:241 msgid "Expiration date" -msgstr "" +msgstr "Data de caducidá" #: js/share.js:277 msgid "Share via email:" -msgstr "" +msgstr "Compartir vÃa corréu electrónicu:" #: js/share.js:280 msgid "No people found" -msgstr "" +msgstr "Nun s'atoparon persones" #: js/share.js:324 js/share.js:385 msgid "group" @@ -366,11 +368,11 @@ msgstr "grupu" #: js/share.js:357 msgid "Resharing is not allowed" -msgstr "" +msgstr "Recompartir nun ta permitÃu" #: js/share.js:401 msgid "Shared in {item} with {user}" -msgstr "" +msgstr "CompartÃu en {item} con {user}" #: js/share.js:423 msgid "Unshare" @@ -410,15 +412,15 @@ msgstr "Contraseña protexida" #: js/share.js:734 msgid "Error unsetting expiration date" -msgstr "" +msgstr "Fallu desafitando la data de caducidá" #: js/share.js:752 msgid "Error setting expiration date" -msgstr "" +msgstr "Fallu afitando la fecha de caducidá" #: js/share.js:777 msgid "Sending ..." -msgstr "" +msgstr "Unviando ..." #: js/share.js:788 msgid "Email sent" @@ -430,7 +432,7 @@ msgstr "Avisu" #: js/tags.js:4 msgid "The object type is not specified." -msgstr "" +msgstr "El tipu d'oxetu nun ta especificáu." #: js/tags.js:13 msgid "Enter new" @@ -465,11 +467,11 @@ msgid "" "The update was unsuccessful. Please report this issue to the <a " "href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud " "community</a>." -msgstr "" +msgstr "L'anovamientu fÃzose con ésitu. Por favor, informa d'esti problema a la <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">comuña ownCloud</a>." #: js/update.js:21 msgid "The update was successful. Redirecting you to ownCloud now." -msgstr "" +msgstr "L'anovamientu fÃzose con ésitu. Redirixiendo agora al to ownCloud." #: lostpassword/controller.php:70 #, php-format @@ -484,7 +486,7 @@ msgstr "" #: lostpassword/templates/email.php:2 msgid "Use the following link to reset your password: {link}" -msgstr "" +msgstr "Usa'l siguiente enllaz pa restablecer la to contraseña: {link}" #: lostpassword/templates/lostpassword.php:7 msgid "" @@ -499,7 +501,7 @@ msgstr "" #: lostpassword/templates/lostpassword.php:18 msgid "You will receive a link to reset your password via Email." -msgstr "" +msgstr "Vas recibir un enllaz vÃa Corréu-e pa restablecer la to contraseña" #: lostpassword/templates/lostpassword.php:21 templates/installation.php:53 #: templates/login.php:32 @@ -524,11 +526,11 @@ msgstr "Reaniciar" #: lostpassword/templates/resetpassword.php:4 msgid "Your password was reset" -msgstr "" +msgstr "Restablecióse la contraseña" #: lostpassword/templates/resetpassword.php:5 msgid "To login page" -msgstr "" +msgstr "Aniciar sesión na páxina" #: lostpassword/templates/resetpassword.php:8 msgid "New password" @@ -536,7 +538,7 @@ msgstr "Contraseña nueva" #: lostpassword/templates/resetpassword.php:11 msgid "Reset password" -msgstr "" +msgstr "Restablecer contraseña" #: setup/controller.php:140 #, php-format @@ -560,15 +562,15 @@ msgstr "Usuarios" #: strings.php:7 templates/layout.user.php:116 msgid "Apps" -msgstr "" +msgstr "Aplicaciones" #: strings.php:8 msgid "Admin" -msgstr "" +msgstr "Alministrador" #: strings.php:9 msgid "Help" -msgstr "" +msgstr "Ayuda" #: tags/controller.php:22 msgid "Error loading tags" @@ -600,11 +602,11 @@ msgstr "" #: templates/403.php:12 msgid "Access forbidden" -msgstr "" +msgstr "Accesu denegáu" #: templates/404.php:15 msgid "Cloud not found" -msgstr "" +msgstr "Ñube non atopada" #: templates/altmail.php:2 #, php-format @@ -643,19 +645,19 @@ msgstr "" msgid "" "No secure random number generator is available, please enable the PHP " "OpenSSL extension." -msgstr "" +msgstr "Nun ta disponible'l xenerador de númberos al debalu, por favor activa la estensión PHP OpenSSL." #: templates/installation.php:34 msgid "" "Without a secure random number generator an attacker may be able to predict " "password reset tokens and take over your account." -msgstr "" +msgstr "Ensin un xenerador de númberos al debalu, un atacante podrÃa aldovinar los tokens pa restablecer la contraseña y tomar el control de la cuenta." #: templates/installation.php:40 msgid "" "Your data directory and files are probably accessible from the internet " "because the .htaccess file does not work." -msgstr "" +msgstr "El to direutoriu de datos y ficheros seique ye accesible dende internet por mor qu'el ficheru .htaccess nun furrula." #: templates/installation.php:42 #, php-format @@ -666,7 +668,7 @@ msgstr "" #: templates/installation.php:48 msgid "Create an <strong>admin account</strong>" -msgstr "" +msgstr "Crea una <strong>cuenta d'alministrador</strong>" #: templates/installation.php:70 msgid "Storage & database" @@ -674,11 +676,11 @@ msgstr "" #: templates/installation.php:77 msgid "Data folder" -msgstr "" +msgstr "Carpeta de datos" #: templates/installation.php:90 msgid "Configure the database" -msgstr "" +msgstr "Configura la base de datos" #: templates/installation.php:94 msgid "will be used" @@ -686,27 +688,27 @@ msgstr "usaráse" #: templates/installation.php:109 msgid "Database user" -msgstr "" +msgstr "Usuariu de la base de datos" #: templates/installation.php:118 msgid "Database password" -msgstr "" +msgstr "Contraseña de la base de datos" #: templates/installation.php:123 msgid "Database name" -msgstr "" +msgstr "Nome de la base de datos" #: templates/installation.php:132 msgid "Database tablespace" -msgstr "" +msgstr "Espaciu de tables de la base de datos" #: templates/installation.php:140 msgid "Database host" -msgstr "" +msgstr "Agospiador de la base de datos" #: templates/installation.php:150 msgid "Finish setup" -msgstr "" +msgstr "Finar la configuración " #: templates/installation.php:150 msgid "Finishing …" @@ -730,7 +732,7 @@ msgstr "Zarrar sesión" #: templates/login.php:9 msgid "Automatic logon rejected!" -msgstr "" +msgstr "¡Aniciu de sesión automáticu refugáu!" #: templates/login.php:10 msgid "" diff --git a/l10n/ast/files.po b/l10n/ast/files.po index 6c5b2620c0a..0189fb5d4f9 100644 --- a/l10n/ast/files.po +++ b/l10n/ast/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-04 01:55-0400\n" -"PO-Revision-Date: 2014-05-03 06:11+0000\n" +"POT-Creation-Date: 2014-05-12 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 16:10+0000\n" "Last-Translator: I Robot\n" "Language-Team: Asturian (http://www.transifex.com/projects/p/owncloud/language/ast/)\n" "MIME-Version: 1.0\n" @@ -143,49 +143,49 @@ msgstr "" msgid "Files" msgstr "Ficheros" -#: js/file-upload.js:254 +#: js/file-upload.js:257 msgid "Unable to upload {filename} as it is a directory or has 0 bytes" msgstr "" -#: js/file-upload.js:266 +#: js/file-upload.js:270 msgid "Total file size {size1} exceeds upload limit {size2}" msgstr "" -#: js/file-upload.js:276 +#: js/file-upload.js:281 msgid "" "Not enough free space, you are uploading {size1} but only {size2} is left" msgstr "" -#: js/file-upload.js:353 +#: js/file-upload.js:358 msgid "Upload cancelled." msgstr "" -#: js/file-upload.js:398 +#: js/file-upload.js:404 msgid "Could not get result from server." msgstr "" -#: js/file-upload.js:490 +#: js/file-upload.js:493 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "" -#: js/file-upload.js:555 +#: js/file-upload.js:558 msgid "URL cannot be empty" msgstr "" -#: js/file-upload.js:559 js/filelist.js:963 +#: js/file-upload.js:562 js/filelist.js:963 msgid "{new_name} already exists" msgstr "" -#: js/file-upload.js:611 +#: js/file-upload.js:617 msgid "Could not create file" msgstr "" -#: js/file-upload.js:624 +#: js/file-upload.js:633 msgid "Could not create folder" msgstr "" -#: js/file-upload.js:664 +#: js/file-upload.js:680 msgid "Error fetching URL" msgstr "" @@ -364,7 +364,7 @@ msgstr "" #: templates/index.php:40 msgid "Deleted files" -msgstr "" +msgstr "Ficheros desaniciaos" #: templates/index.php:45 msgid "Cancel upload" diff --git a/l10n/ast/files_encryption.po b/l10n/ast/files_encryption.po index d15eae833fc..46a698266f2 100644 --- a/l10n/ast/files_encryption.po +++ b/l10n/ast/files_encryption.po @@ -4,12 +4,13 @@ # # Translators: # Tornes Llume <l.lumex03.tornes@gmail.com>, 2014 +# Tornes Llume <l.lumex03.tornes@gmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-28 01:55-0400\n" -"PO-Revision-Date: 2014-04-27 10:52+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-13 19:25+0000\n" "Last-Translator: Iñigo Varela <ivarela@softastur.org>\n" "Language-Team: Asturian (http://www.transifex.com/projects/p/owncloud/language/ast/)\n" "MIME-Version: 1.0\n" @@ -20,46 +21,46 @@ msgstr "" #: ajax/adminrecovery.php:29 msgid "Recovery key successfully enabled" -msgstr "" +msgstr "Habilitóse la recuperación de ficheros" #: ajax/adminrecovery.php:34 msgid "" "Could not enable recovery key. Please check your recovery key password!" -msgstr "" +msgstr "Nun pudo habilitase la clave de recuperación. Por favor comprueba la contraseña." #: ajax/adminrecovery.php:48 msgid "Recovery key successfully disabled" -msgstr "" +msgstr "Clave de recuperación deshabilitada" #: ajax/adminrecovery.php:53 msgid "" "Could not disable recovery key. Please check your recovery key password!" -msgstr "" +msgstr "Nun pudo deshabilitase la clave de recuperación. Por favor comprueba la contraseña!" #: ajax/changeRecoveryPassword.php:49 msgid "Password successfully changed." -msgstr "Contraseña camudada esitosamente." +msgstr "Camudóse la contraseña" #: ajax/changeRecoveryPassword.php:51 msgid "Could not change the password. Maybe the old password was not correct." -msgstr "Nun pue camudase la contraseña. Quiciabes la contraseña vieya nun fore correuta." +msgstr "Nun pudo camudase la contraseña. Comprueba que la contraseña actual seya correuta." #: ajax/updatePrivateKeyPassword.php:52 msgid "Private key password successfully updated." -msgstr "" +msgstr "Contraseña de clave privada anovada correchamente." #: ajax/updatePrivateKeyPassword.php:54 msgid "" "Could not update the private key password. Maybe the old password was not " "correct." -msgstr "" +msgstr "Nun pudo camudase la contraseña. Pue que la contraseña antigua nun seya correuta." #: files/error.php:12 msgid "" "Encryption app not initialized! Maybe the encryption app was re-enabled " "during your session. Please try to log out and log back in to initialize the" " encryption app." -msgstr "" +msgstr "¡L'aplicación de cifráu nun s'anició! Seique se restableciera mentanto la sesión. Por favor intenta zarrar la sesión y volver a aniciala p'aniciar l'aplicación de cifráu." #: files/error.php:16 #, php-format @@ -67,50 +68,50 @@ msgid "" "Your private key is not valid! Likely your password was changed outside of " "%s (e.g. your corporate directory). You can update your private key password" " in your personal settings to recover access to your encrypted files." -msgstr "" +msgstr "¡La clave privada nun ye válida! Seique la contraseña se camudase dende fuera de %s (Ex:El to direutoriu corporativu). Pues anovar la contraseña de la clave privada nes tos opciones personales pa recuperar l'accesu a los ficheros." #: files/error.php:19 msgid "" "Can not decrypt this file, probably this is a shared file. Please ask the " "file owner to reshare the file with you." -msgstr "" +msgstr "Nun pudo descifrase esti ficheru, dablemente seya un ficheru compartÃu. Solicita al propietariu del mesmu que vuelva a compartilu contigo." #: files/error.php:22 files/error.php:27 msgid "" "Unknown error please check your system settings or contact your " "administrator" -msgstr "" +msgstr "Fallu desconocÃu. Verifica la configuración del sistema o ponte en contautu col alministrador" #: hooks/hooks.php:64 msgid "Missing requirements." -msgstr "" +msgstr "Requisitos incompletos." #: hooks/hooks.php:65 msgid "" "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." -msgstr "" +msgstr "Por favor, asegúrate de que PHP 5.3.3 o postreru ta instaláu y que la estensión OpenSSL de PHP ta habilitada y configurada correutamente. Pel momentu, l'aplicación de cifráu deshabilitóse." #: hooks/hooks.php:295 msgid "Following users are not set up for encryption:" -msgstr "" +msgstr "Los siguientes usuarios nun se configuraron pal cifráu:" #: js/detect-migration.js:21 msgid "Initial encryption started... This can take some time. Please wait." -msgstr "" +msgstr "Cifráu aniciáu..... Esto pue llevar un tiempu. Por favor espera." #: js/detect-migration.js:25 msgid "Initial encryption running... Please try again later." -msgstr "" +msgstr "Cifráu inicial en cursu... Inténtalo dempués." #: templates/invalid_private_key.php:8 msgid "Go directly to your " -msgstr "" +msgstr "Dir direutamente a" #: templates/invalid_private_key.php:8 msgid "personal settings" -msgstr "axustes personales" +msgstr "opciones personales" #: templates/settings-admin.php:2 templates/settings-personal.php:2 msgid "Encryption" @@ -119,19 +120,19 @@ msgstr "Cifráu" #: templates/settings-admin.php:5 msgid "" "Enable recovery key (allow to recover users files in case of password loss):" -msgstr "" +msgstr "Habilitar la clave de recuperación (permite recuperar los ficheros del usuariu en casu de perda de la contraseña);" #: templates/settings-admin.php:9 msgid "Recovery key password" -msgstr "" +msgstr "Contraseña de clave de recuperación" #: templates/settings-admin.php:12 msgid "Repeat Recovery key password" -msgstr "" +msgstr "Repeti la contraseña de clave de recuperación" #: templates/settings-admin.php:19 templates/settings-personal.php:50 msgid "Enabled" -msgstr "Habilitáu" +msgstr "Habilitar" #: templates/settings-admin.php:27 templates/settings-personal.php:58 msgid "Disabled" @@ -139,64 +140,64 @@ msgstr "Deshabilitáu" #: templates/settings-admin.php:32 msgid "Change recovery key password:" -msgstr "" +msgstr "Camudar la contraseña de la clave de recuperación" #: templates/settings-admin.php:38 msgid "Old Recovery key password" -msgstr "" +msgstr "Clave de recuperación vieya" #: templates/settings-admin.php:45 msgid "New Recovery key password" -msgstr "" +msgstr "Clave de recuperación nueva" #: templates/settings-admin.php:51 msgid "Repeat New Recovery key password" -msgstr "" +msgstr "Repetir la clave de recuperación nueva" #: templates/settings-admin.php:56 msgid "Change Password" -msgstr "Camudar conseña" +msgstr "Camudar contraseña" #: templates/settings-personal.php:8 msgid "Your private key password no longer match your log-in password:" -msgstr "" +msgstr "La to contraseña de clave privada yá nun concasa cola contraseña d'accesu:" #: templates/settings-personal.php:11 msgid "Set your old private key password to your current log-in password." -msgstr "" +msgstr "Afitar la contraseña de la to clave privada vieya a la to contraseña actual d'accesu." #: templates/settings-personal.php:13 msgid "" " If you don't remember your old password you can ask your administrator to " "recover your files." -msgstr "Si nun recuerdes la to contraseña vieya pues entrugar al to alministrador pa recuperar los tos ficheros." +msgstr "Si nun recuerdes la contraseña vieya, pues pidir a alministrador que te recupere los ficheros." #: templates/settings-personal.php:21 msgid "Old log-in password" -msgstr "" +msgstr "Contraseña d'accesu vieya" #: templates/settings-personal.php:27 msgid "Current log-in password" -msgstr "" +msgstr "Contraseña d'accesu actual" #: templates/settings-personal.php:32 msgid "Update Private Key Password" -msgstr "" +msgstr "Anovar Contraseña de Clave Privada" #: templates/settings-personal.php:41 msgid "Enable password recovery:" -msgstr "" +msgstr "Habilitar la recuperación de contraseña:" #: templates/settings-personal.php:43 msgid "" "Enabling this option will allow you to reobtain access to your encrypted " "files in case of password loss" -msgstr "" +msgstr "Habilitar esta opción va permitite volver a tener accesu a los ficheros cifraos en casu de perda de contraseña" #: templates/settings-personal.php:59 msgid "File recovery settings updated" -msgstr "" +msgstr "Opciones de recuperación de ficheros anovada" #: templates/settings-personal.php:60 msgid "Could not update file recovery" -msgstr "Nun pue anovase'l ficheru de recuperación" +msgstr "Nun pudo anovase la recuperación de ficheros" diff --git a/l10n/ast/files_external.po b/l10n/ast/files_external.po index ef3f54478c3..d153f7209c3 100644 --- a/l10n/ast/files_external.po +++ b/l10n/ast/files_external.po @@ -7,9 +7,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" -"Last-Translator: I Robot\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-13 19:11+0000\n" +"Last-Translator: Iñigo Varela <ivarela@softastur.org>\n" "Language-Team: Asturian (http://www.transifex.com/projects/p/owncloud/language/ast/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -27,59 +27,59 @@ msgstr "Llocalización" #: appinfo/app.php:39 msgid "Amazon S3" -msgstr "" +msgstr "Amazon S3" #: appinfo/app.php:41 msgid "Key" -msgstr "" +msgstr "Clave" #: appinfo/app.php:42 msgid "Secret" -msgstr "" +msgstr "Secretu" #: appinfo/app.php:43 appinfo/app.php:51 msgid "Bucket" -msgstr "" +msgstr "Depósitu" #: appinfo/app.php:47 msgid "Amazon S3 and compliant" -msgstr "" +msgstr "Amazon S3 y compatibilidá" #: appinfo/app.php:49 msgid "Access Key" -msgstr "" +msgstr "Clave d'accesu" #: appinfo/app.php:50 msgid "Secret Key" -msgstr "" +msgstr "Clave Secreta" #: appinfo/app.php:52 msgid "Hostname (optional)" -msgstr "" +msgstr "Nome d'equipu (opcional)" #: appinfo/app.php:53 msgid "Port (optional)" -msgstr "" +msgstr "Puertu (opcional)" #: appinfo/app.php:54 msgid "Region (optional)" -msgstr "" +msgstr "Rexón (opcional)" #: appinfo/app.php:55 msgid "Enable SSL" -msgstr "" +msgstr "Habilitar SSL" #: appinfo/app.php:56 msgid "Enable Path Style" -msgstr "" +msgstr "Habilitar Estilu de ruta" #: appinfo/app.php:63 msgid "App key" -msgstr "" +msgstr "App principal" #: appinfo/app.php:64 msgid "App secret" -msgstr "" +msgstr "App secreta" #: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121 #: appinfo/app.php:131 appinfo/app.php:141 appinfo/app.php:151 @@ -99,59 +99,59 @@ msgstr "Contraseña" #: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124 #: appinfo/app.php:134 appinfo/app.php:154 msgid "Root" -msgstr "" +msgstr "RaÃz" #: appinfo/app.php:77 msgid "Secure ftps://" -msgstr "" +msgstr "Secure ftps://" #: appinfo/app.php:84 msgid "Client ID" -msgstr "" +msgstr "ID de veceru" #: appinfo/app.php:85 msgid "Client secret" -msgstr "" +msgstr "Veceru secretu" #: appinfo/app.php:92 msgid "OpenStack Object Storage" -msgstr "" +msgstr "OpenStack Object Storage" #: appinfo/app.php:94 msgid "Username (required)" -msgstr "" +msgstr "Nome d'usuariu (necesariu)" #: appinfo/app.php:95 msgid "Bucket (required)" -msgstr "" +msgstr "Depósitu (necesariu)" #: appinfo/app.php:96 msgid "Region (optional for OpenStack Object Storage)" -msgstr "" +msgstr "Rexón (opcional pa OpenStack Object Storage)" #: appinfo/app.php:97 msgid "API Key (required for Rackspace Cloud Files)" -msgstr "" +msgstr "Clave API (necesaria pa Rackspace Cloud Files)" #: appinfo/app.php:98 msgid "Tenantname (required for OpenStack Object Storage)" -msgstr "" +msgstr "Nome d'inquilÃn (necesariu pa OpenStack Object Storage)" #: appinfo/app.php:99 msgid "Password (required for OpenStack Object Storage)" -msgstr "" +msgstr "Contraseña (necesaria pa OpenStack Object Storage)" #: appinfo/app.php:100 msgid "Service Name (required for OpenStack Object Storage)" -msgstr "" +msgstr "Nome de Serviciu (necesariu pa OpenStack Object Storage)" #: appinfo/app.php:101 msgid "URL of identity endpoint (required for OpenStack Object Storage)" -msgstr "" +msgstr "URL d'identidá de puntu final (necesariu pa OpenStack Object Storage)" #: appinfo/app.php:102 msgid "Timeout of HTTP requests in seconds (optional)" -msgstr "" +msgstr "Tiempu d'espera de peticiones HTTP en segundos (opcional)" #: appinfo/app.php:114 appinfo/app.php:123 msgid "Share" @@ -159,76 +159,76 @@ msgstr "Compartir" #: appinfo/app.php:119 msgid "SMB / CIFS using OC login" -msgstr "" +msgstr "SMB / CIFS usando accesu OC" #: appinfo/app.php:122 msgid "Username as share" -msgstr "" +msgstr "Nome d'usuariu como Compartición" #: appinfo/app.php:135 appinfo/app.php:145 msgid "Secure https://" -msgstr "" +msgstr "Secure https://" #: appinfo/app.php:144 msgid "Remote subfolder" -msgstr "" +msgstr "Subcarpeta remota" #: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40 msgid "Access granted" -msgstr "" +msgstr "Accesu concedÃu" #: js/dropbox.js:33 js/dropbox.js:97 js/dropbox.js:103 msgid "Error configuring Dropbox storage" -msgstr "" +msgstr "Fallu configurando l'almacenamientu de Dropbox" #: js/dropbox.js:68 js/google.js:89 msgid "Grant access" -msgstr "" +msgstr "Conceder accesu" #: js/dropbox.js:102 msgid "Please provide a valid Dropbox app key and secret." -msgstr "" +msgstr "Por favor, proporciona una clave válida de l'app Dropbox y una clave secreta." #: js/google.js:45 js/google.js:122 msgid "Error configuring Google Drive storage" -msgstr "" +msgstr "Fallu configurando l'almacenamientu de Google Drive" #: js/settings.js:318 js/settings.js:325 msgid "Saved" msgstr "Guardáu" -#: lib/config.php:598 +#: lib/config.php:589 msgid "<b>Note:</b> " -msgstr "" +msgstr "<b>Nota:</b> " -#: lib/config.php:608 +#: lib/config.php:599 msgid " and " -msgstr "" +msgstr "y" -#: lib/config.php:630 +#: lib/config.php:621 #, php-format msgid "" "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting " "of %s is not possible. Please ask your system administrator to install it." -msgstr "" +msgstr "<b>Nota:</b> El soporte de cURL en PHP nun ta activáu o instaláu. Nun pue montase %s. PÃdi-y al alministrador de sistema que lu instale." -#: lib/config.php:632 +#: lib/config.php:623 #, php-format msgid "" "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of" " %s is not possible. Please ask your system administrator to install it." -msgstr "" +msgstr "<b>Nota:</b> El soporte de FTP en PHP nun ta activáu o instaláu. Nun pue montase %s. PÃdi-y al alministrador de sistema que lu instale." -#: lib/config.php:634 +#: lib/config.php:625 #, php-format msgid "" "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please" " ask your system administrator to install it." -msgstr "" +msgstr "<b>Nota:</b> \"%s\" nun ta instaláu. Nun pue montase %s. PÃdi-y al alministrador de sistema que lu instale." #: templates/settings.php:2 msgid "External Storage" -msgstr "" +msgstr "Almacenamientu esternu" #: templates/settings.php:8 templates/settings.php:27 msgid "Folder name" @@ -236,7 +236,7 @@ msgstr "Nome de la carpeta" #: templates/settings.php:9 msgid "External storage" -msgstr "" +msgstr "Almacenamientu esternu" #: templates/settings.php:10 msgid "Configuration" @@ -248,19 +248,19 @@ msgstr "Opciones" #: templates/settings.php:12 msgid "Available for" -msgstr "" +msgstr "Disponible pa" #: templates/settings.php:32 msgid "Add storage" -msgstr "" +msgstr "Amestar almacenamientu" #: templates/settings.php:92 msgid "No user or group" -msgstr "" +msgstr "Nengún usuariu o grupu" #: templates/settings.php:95 msgid "All Users" -msgstr "" +msgstr "Tolos usuarios" #: templates/settings.php:97 msgid "Groups" @@ -277,16 +277,16 @@ msgstr "Desaniciar" #: templates/settings.php:132 msgid "Enable User External Storage" -msgstr "" +msgstr "Habilitar almacenamientu esterno d'usuariu" #: templates/settings.php:135 msgid "Allow users to mount the following external storage" -msgstr "" +msgstr "Permitir a los usuarios montar el siguiente almacenamientu esternu" #: templates/settings.php:150 msgid "SSL root certificates" -msgstr "" +msgstr "Certificaos raÃz SSL" #: templates/settings.php:168 msgid "Import Root Certificate" -msgstr "" +msgstr "Importar certificáu raÃz" diff --git a/l10n/ast/files_sharing.po b/l10n/ast/files_sharing.po index 5c9f363f389..b57be381bc6 100644 --- a/l10n/ast/files_sharing.po +++ b/l10n/ast/files_sharing.po @@ -4,13 +4,14 @@ # # Translators: # dixebra <davidlopezcastanon@gmail.com>, 2014 +# Iñigo Varela <ivarela@softastur.org>, 2014 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-09 01:55-0400\n" -"PO-Revision-Date: 2014-05-08 18:11+0000\n" -"Last-Translator: dixebra <davidlopezcastanon@gmail.com>\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" +"Last-Translator: Iñigo Varela <ivarela@softastur.org>\n" "Language-Team: Asturian (http://www.transifex.com/projects/p/owncloud/language/ast/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -36,7 +37,7 @@ msgstr "Contraseña" #: templates/part.404.php:3 msgid "Sorry, this link doesn’t seem to work anymore." -msgstr "SentÃmoslo, esti enllaz paez que ya nun furrula." +msgstr "SentÃmoslo, esti enllaz paez que yá nun furrula." #: templates/part.404.php:4 msgid "Reasons might be:" @@ -44,11 +45,11 @@ msgstr "Les razones pueden ser: " #: templates/part.404.php:6 msgid "the item was removed" -msgstr "esti elementu ta desaniciáu" +msgstr "desanicióse l'elementu" #: templates/part.404.php:7 msgid "the link expired" -msgstr "l'enllaz finó" +msgstr "l'enllaz caducó" #: templates/part.404.php:8 msgid "sharing is disabled" @@ -56,7 +57,7 @@ msgstr "compartir ta desactiváu" #: templates/part.404.php:10 msgid "For more info, please ask the person who sent this link." -msgstr "Para más información, entruga-y a la persona qu'unvió esti enllaz" +msgstr "Pa más información, entrúga-y a la persona qu'unvió esti enllaz" #: templates/public.php:21 msgid "Download" diff --git a/l10n/ast/files_trashbin.po b/l10n/ast/files_trashbin.po index 5e51f4759a0..3f7349d157a 100644 --- a/l10n/ast/files_trashbin.po +++ b/l10n/ast/files_trashbin.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-22 01:54-0400\n" -"PO-Revision-Date: 2014-04-21 16:38+0000\n" +"POT-Creation-Date: 2014-05-12 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 16:10+0000\n" "Last-Translator: Iñigo Varela <ivarela@softastur.org>\n" "Language-Team: Asturian (http://www.transifex.com/projects/p/owncloud/language/ast/)\n" "MIME-Version: 1.0\n" @@ -30,19 +30,23 @@ msgstr "Nun pudo restaurase %s" #: js/filelist.js:3 msgid "Deleted files" -msgstr "" +msgstr "Ficheros desaniciaos" -#: js/trash.js:33 js/trash.js:124 js/trash.js:173 +#: js/filelist.js:88 js/filelist.js:132 js/filelist.js:181 msgid "Error" msgstr "Fallu" -#: js/trash.js:264 +#: js/trash.js:48 templates/index.php:22 templates/index.php:24 +msgid "Restore" +msgstr "Restaurar" + +#: js/trash.js:107 msgid "Deleted Files" msgstr "Ficheros desaniciaos" #: lib/trashbin.php:861 lib/trashbin.php:863 msgid "restored" -msgstr "" +msgstr "recuperóse" #: templates/index.php:6 msgid "Nothing in here. Your trash bin is empty!" @@ -52,10 +56,6 @@ msgstr "Nun hai un res equÃ. La papelera ta balera!" msgid "Name" msgstr "Nome" -#: templates/index.php:22 templates/index.php:24 -msgid "Restore" -msgstr "Restaurar" - #: templates/index.php:30 msgid "Deleted" msgstr "Desaniciáu" diff --git a/l10n/ast/lib.po b/l10n/ast/lib.po index 1ccb0bb404a..e061eb02dbe 100644 --- a/l10n/ast/lib.po +++ b/l10n/ast/lib.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-28 01:55-0400\n" -"PO-Revision-Date: 2014-04-28 05:55+0000\n" +"POT-Creation-Date: 2014-05-12 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 15:20+0000\n" "Last-Translator: I Robot\n" "Language-Team: Asturian (http://www.transifex.com/projects/p/owncloud/language/ast/)\n" "MIME-Version: 1.0\n" @@ -18,11 +18,11 @@ msgstr "" "Language: ast\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: base.php:723 +#: base.php:713 msgid "You are accessing the server from an untrusted domain." msgstr "" -#: base.php:724 +#: base.php:714 msgid "" "Please contact your administrator. If you are an administrator of this " "instance, configure the \"trusted_domain\" setting in config/config.php. An " @@ -42,7 +42,7 @@ msgstr "" #: private/app.php:353 msgid "Help" -msgstr "" +msgstr "Ayuda" #: private/app.php:366 msgid "Personal" @@ -77,23 +77,23 @@ msgstr "Imaxe inválida" msgid "web services under your control" msgstr "" -#: private/files.php:232 +#: private/files.php:235 msgid "ZIP download is turned off." msgstr "" -#: private/files.php:233 +#: private/files.php:236 msgid "Files need to be downloaded one by one." msgstr "" -#: private/files.php:234 private/files.php:261 +#: private/files.php:237 private/files.php:264 msgid "Back to Files" msgstr "" -#: private/files.php:259 +#: private/files.php:262 msgid "Selected files too large to generate zip file." msgstr "" -#: private/files.php:260 +#: private/files.php:263 msgid "" "Please download the files separately in smaller chunks or kindly ask your " "administrator." @@ -279,13 +279,13 @@ msgstr "Afitar nome d'usuariu p'almin" msgid "Set an admin password." msgstr "Afitar contraseña p'almin" -#: private/setup.php:202 +#: private/setup.php:164 msgid "" "Your web server is not yet properly setup to allow files synchronization " "because the WebDAV interface seems to be broken." msgstr "El sirvidor web entá nun ta configurado pa permitir la sincronización de ficheros yá que la interface WebDAV paez nun tar funcionando." -#: private/setup.php:203 +#: private/setup.php:165 #, php-format msgid "Please double check the <a href='%s'>installation guides</a>." msgstr "" @@ -343,63 +343,63 @@ msgstr "" msgid "Share type %s is not valid for %s" msgstr "" -#: private/share/share.php:773 +#: private/share/share.php:774 #, php-format msgid "" "Setting permissions for %s failed, because the permissions exceed " "permissions granted to %s" msgstr "" -#: private/share/share.php:834 +#: private/share/share.php:835 #, php-format msgid "Setting permissions for %s failed, because the item was not found" msgstr "" -#: private/share/share.php:940 +#: private/share/share.php:941 #, php-format msgid "Sharing backend %s must implement the interface OCP\\Share_Backend" msgstr "" -#: private/share/share.php:947 +#: private/share/share.php:948 #, php-format msgid "Sharing backend %s not found" msgstr "" -#: private/share/share.php:953 +#: private/share/share.php:954 #, php-format msgid "Sharing backend for %s not found" msgstr "" -#: private/share/share.php:1367 +#: private/share/share.php:1368 #, php-format msgid "Sharing %s failed, because the user %s is the original sharer" msgstr "" -#: private/share/share.php:1376 +#: private/share/share.php:1377 #, php-format msgid "" "Sharing %s failed, because the permissions exceed permissions granted to %s" msgstr "" -#: private/share/share.php:1391 +#: private/share/share.php:1392 #, php-format msgid "Sharing %s failed, because resharing is not allowed" msgstr "" -#: private/share/share.php:1403 +#: private/share/share.php:1404 #, php-format msgid "" "Sharing %s failed, because the sharing backend for %s could not find its " "source" msgstr "" -#: private/share/share.php:1417 +#: private/share/share.php:1418 #, php-format msgid "" "Sharing %s failed, because the file could not be found in the file cache" msgstr "" -#: private/tags.php:193 +#: private/tags.php:183 #, php-format msgid "Could not find category \"%s\"" msgstr "Nun pudo alcontrase la estaya \"%s.\"" diff --git a/l10n/ast/settings.po b/l10n/ast/settings.po index 06874ae745e..c30a8f04709 100644 --- a/l10n/ast/settings.po +++ b/l10n/ast/settings.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" -"Last-Translator: Iñigo Varela <ivarela@softastur.org>\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" +"Last-Translator: I Robot\n" "Language-Team: Asturian (http://www.transifex.com/projects/p/owncloud/language/ast/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -52,7 +52,7 @@ msgstr "Tienes de configurar la direición de corréu-e enantes de poder unviar msgid "Send mode" msgstr "Mou d'unviu" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "Cifráu" @@ -99,6 +99,16 @@ msgstr "Nun pudieron descifrase sus ficheros. Revisa'l owncloud.log o consulta c msgid "Couldn't decrypt your files, check your password and try again" msgstr "Nun pudieron descifrase los ficheros. Revisa la contraseña ya inténtalo dempués" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "Corréu-e guardáu" @@ -115,6 +125,16 @@ msgstr "Nun pudo desaniciase'l grupu" msgid "Unable to delete user" msgstr "Nun pudo desaniciase l'usuariu" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "Camudóse la llingua" @@ -226,34 +246,42 @@ msgstr "Anovar" msgid "Updated" msgstr "Anováu" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "Esbillar una imaxe de perfil" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "Contraseña mui feble" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "Contraseña feble" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "Contraseña pasable" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "Contraseña bona" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "Contraseña mui bona" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "Descifrando ficheros... Espera por favor, esto pue llevar daqué de tiempu." +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "desaniciáu" @@ -299,7 +327,7 @@ msgstr "Tien d'apurrise una contraseña válida" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "Avisu: el direutoriu d'aniciu pal usuariu \"{user}\" yá esiste." -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "Asturianu" @@ -624,11 +652,11 @@ msgstr "Más" msgid "Less" msgstr "Menos" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "Versión" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -792,18 +820,33 @@ msgid "" "WebDAV</a>" msgstr "Usa esta direición pa <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">acceder a los ficheros a traviés de WebDAV</a>" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "L'aplicación de cifráu yá nun ta activada, descifra tolos ficheros" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "Contraseña d'accesu" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "Descifrar ficheros" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "Nome d'usuariu" diff --git a/l10n/ast/user_ldap.po b/l10n/ast/user_ldap.po index a4964110eef..39f3d980f17 100644 --- a/l10n/ast/user_ldap.po +++ b/l10n/ast/user_ldap.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-08 01:55-0400\n" -"PO-Revision-Date: 2014-05-07 11:10+0000\n" +"POT-Creation-Date: 2014-05-12 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 15:20+0000\n" "Last-Translator: dixebra <davidlopezcastanon@gmail.com>\n" "Language-Team: Asturian (http://www.transifex.com/projects/p/owncloud/language/ast/)\n" "MIME-Version: 1.0\n" @@ -161,7 +161,7 @@ msgstr "" #: templates/part.settingcontrols.php:10 templates/part.wizardcontrols.php:14 msgid "Help" -msgstr "" +msgstr "Ayuda" #: templates/part.wizard-groupfilter.php:4 #, php-format diff --git a/l10n/az/settings.po b/l10n/az/settings.po index cd3448207bd..a250f264cc2 100644 --- a/l10n/az/settings.po +++ b/l10n/az/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-26 01:54-0400\n" -"PO-Revision-Date: 2014-04-26 05:54+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Azerbaijani (http://www.transifex.com/projects/p/owncloud/language/az/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "" @@ -98,6 +98,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -114,6 +124,16 @@ msgstr "" msgid "Unable to delete user" msgstr "" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "" @@ -225,34 +245,42 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "" @@ -298,7 +326,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "" @@ -623,11 +651,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -791,18 +819,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "" diff --git a/l10n/be/core.po b/l10n/be/core.po index 7b3d997c5f3..032a82dadb8 100644 --- a/l10n/be/core.po +++ b/l10n/be/core.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-23 01:54-0400\n" -"PO-Revision-Date: 2014-04-23 05:54+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:01+0000\n" "Last-Translator: I Robot\n" "Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n" "MIME-Version: 1.0\n" @@ -135,19 +135,19 @@ msgstr "ЛіÑтапад" msgid "December" msgstr "Снежань" -#: js/js.js:489 +#: js/js.js:483 msgid "Settings" msgstr "Ðалады" -#: js/js.js:589 +#: js/js.js:583 msgid "Saving..." msgstr "" -#: js/js.js:1246 +#: js/js.js:1240 msgid "seconds ago" msgstr "Секунд таму" -#: js/js.js:1247 +#: js/js.js:1241 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" @@ -155,7 +155,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: js/js.js:1248 +#: js/js.js:1242 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" @@ -163,15 +163,15 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: js/js.js:1249 +#: js/js.js:1243 msgid "today" msgstr "СённÑ" -#: js/js.js:1250 +#: js/js.js:1244 msgid "yesterday" msgstr "Ўчора" -#: js/js.js:1251 +#: js/js.js:1245 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" @@ -179,11 +179,11 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: js/js.js:1252 +#: js/js.js:1246 msgid "last month" msgstr "У мінулым меÑÑцы" -#: js/js.js:1253 +#: js/js.js:1247 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" @@ -191,11 +191,11 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: js/js.js:1254 +#: js/js.js:1248 msgid "last year" msgstr "У мінулым годзе" -#: js/js.js:1255 +#: js/js.js:1249 msgid "years ago" msgstr "Гадоў таму" diff --git a/l10n/be/settings.po b/l10n/be/settings.po index 8e0a3d7a13b..84c808cc31e 100644 --- a/l10n/be/settings.po +++ b/l10n/be/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-26 01:54-0400\n" -"PO-Revision-Date: 2014-04-26 05:54+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "" @@ -98,6 +98,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -114,6 +124,16 @@ msgstr "" msgid "Unable to delete user" msgstr "" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "" @@ -225,34 +245,42 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "" @@ -298,7 +326,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "" @@ -623,11 +651,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -791,18 +819,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "" diff --git a/l10n/bg_BG/core.po b/l10n/bg_BG/core.po index 97b80bd6075..a1cb68bac2f 100644 --- a/l10n/bg_BG/core.po +++ b/l10n/bg_BG/core.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:02+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:01+0000\n" "Last-Translator: I Robot\n" "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/bg_BG/files_external.po b/l10n/bg_BG/files_external.po index 9e609163498..1fe5a4489f3 100644 --- a/l10n/bg_BG/files_external.po +++ b/l10n/bg_BG/files_external.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n" "MIME-Version: 1.0\n" @@ -197,29 +197,29 @@ msgstr "" msgid "Saved" msgstr "" -#: lib/config.php:598 +#: lib/config.php:597 msgid "<b>Note:</b> " msgstr "" -#: lib/config.php:608 +#: lib/config.php:607 msgid " and " msgstr "" -#: lib/config.php:630 +#: lib/config.php:629 #, php-format msgid "" "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting " "of %s is not possible. Please ask your system administrator to install it." msgstr "" -#: lib/config.php:632 +#: lib/config.php:631 #, php-format msgid "" "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of" " %s is not possible. Please ask your system administrator to install it." msgstr "" -#: lib/config.php:634 +#: lib/config.php:633 #, php-format msgid "" "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please" diff --git a/l10n/bg_BG/files_sharing.po b/l10n/bg_BG/files_sharing.po index e29402aa9a6..40795c5f883 100644 --- a/l10n/bg_BG/files_sharing.po +++ b/l10n/bg_BG/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-04 01:55-0400\n" -"PO-Revision-Date: 2014-05-03 06:11+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n" "MIME-Version: 1.0\n" @@ -61,11 +61,11 @@ msgstr "" msgid "Download" msgstr "ИзтеглÑне" -#: templates/public.php:53 +#: templates/public.php:52 #, php-format msgid "Download %s" msgstr "" -#: templates/public.php:57 +#: templates/public.php:56 msgid "Direct link" msgstr "" diff --git a/l10n/bg_BG/settings.po b/l10n/bg_BG/settings.po index a8902fc4d78..e7d3b622681 100644 --- a/l10n/bg_BG/settings.po +++ b/l10n/bg_BG/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "Криптиране" @@ -98,6 +98,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "Email адреÑа е запиÑан" @@ -114,6 +124,16 @@ msgstr "Ðевъзможно изтриване на група" msgid "Unable to delete user" msgstr "Ðевъзможно изтриване на потребител" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "Езикът е променен" @@ -225,34 +245,42 @@ msgstr "ОбновÑване" msgid "Updated" msgstr "Обновено" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "изтрито" @@ -298,7 +326,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "__language_name__" @@ -623,11 +651,11 @@ msgstr "Още" msgid "Less" msgstr "По-малко" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "ВерÑиÑ" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -791,18 +819,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "Потребител" diff --git a/l10n/bg_BG/user_ldap.po b/l10n/bg_BG/user_ldap.po index 26eb9f1f7c3..2a7b6189b18 100644 --- a/l10n/bg_BG/user_ldap.po +++ b/l10n/bg_BG/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/bn_BD/core.po b/l10n/bn_BD/core.po index 1efcd1d974f..983df4f6068 100644 --- a/l10n/bn_BD/core.po +++ b/l10n/bn_BD/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:02+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:01+0000\n" "Last-Translator: I Robot\n" "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/bn_BD/files_external.po b/l10n/bn_BD/files_external.po index b2d2bfa4d91..e3220078d88 100644 --- a/l10n/bn_BD/files_external.po +++ b/l10n/bn_BD/files_external.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:10+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n" "MIME-Version: 1.0\n" @@ -197,29 +197,29 @@ msgstr "Google Drive সংরকà§à¦·à¦£à¦¾à¦—ার নিরà§à¦§à¦¾à¦°à¦£ msgid "Saved" msgstr "" -#: lib/config.php:598 +#: lib/config.php:597 msgid "<b>Note:</b> " msgstr "" -#: lib/config.php:608 +#: lib/config.php:607 msgid " and " msgstr "" -#: lib/config.php:630 +#: lib/config.php:629 #, php-format msgid "" "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting " "of %s is not possible. Please ask your system administrator to install it." msgstr "" -#: lib/config.php:632 +#: lib/config.php:631 #, php-format msgid "" "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of" " %s is not possible. Please ask your system administrator to install it." msgstr "" -#: lib/config.php:634 +#: lib/config.php:633 #, php-format msgid "" "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please" diff --git a/l10n/bn_BD/files_sharing.po b/l10n/bn_BD/files_sharing.po index b5d789be46d..c35c6f7ce3c 100644 --- a/l10n/bn_BD/files_sharing.po +++ b/l10n/bn_BD/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-04 01:55-0400\n" -"PO-Revision-Date: 2014-05-03 06:11+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n" "MIME-Version: 1.0\n" @@ -61,11 +61,11 @@ msgstr "" msgid "Download" msgstr "ডাউনলোড" -#: templates/public.php:53 +#: templates/public.php:52 #, php-format msgid "Download %s" msgstr "" -#: templates/public.php:57 +#: templates/public.php:56 msgid "Direct link" msgstr "" diff --git a/l10n/bn_BD/settings.po b/l10n/bn_BD/settings.po index c70a0887dfe..d9db22642ac 100644 --- a/l10n/bn_BD/settings.po +++ b/l10n/bn_BD/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "সংকেতায়ন" @@ -98,6 +98,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "ই-মেইল সংরকà§à¦·à¦¨ করা হয়েছে" @@ -114,6 +124,16 @@ msgstr "গোষà§à¦ ী মà§à¦›à§‡ ফেলা সমà§à¦à¦¬ হলো à msgid "Unable to delete user" msgstr "বà§à¦¯à¦¬à¦¹à¦¾à¦°à¦•à¦¾à¦°à§€ মà§à¦›à§‡ ফেলা সমà§à¦à¦¬ হলো না " +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "à¦à¦¾à¦·à¦¾ পরিবরà§à¦¤à¦¨ করা হয়েছে" @@ -225,34 +245,42 @@ msgstr "পরিবরà§à¦§à¦¨" msgid "Updated" msgstr "" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "" @@ -298,7 +326,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "__language_name__" @@ -623,11 +651,11 @@ msgstr "বেশী" msgid "Less" msgstr "কম" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "à¦à¦¾à¦°à§à¦¸à¦¨" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -791,18 +819,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "পà§à¦°à¦¬à§‡à¦¶" diff --git a/l10n/bn_BD/user_ldap.po b/l10n/bn_BD/user_ldap.po index f68937abab5..8ca55ce1282 100644 --- a/l10n/bn_BD/user_ldap.po +++ b/l10n/bn_BD/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/bs/settings.po b/l10n/bs/settings.po index 484b7e50b12..7b70e2e5ffc 100644 --- a/l10n/bs/settings.po +++ b/l10n/bs/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-26 01:54-0400\n" -"PO-Revision-Date: 2014-04-26 05:54+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Bosnian (http://www.transifex.com/projects/p/owncloud/language/bs/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "" @@ -98,6 +98,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -114,6 +124,16 @@ msgstr "" msgid "Unable to delete user" msgstr "" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "" @@ -225,34 +245,42 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "" @@ -298,7 +326,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "" @@ -623,11 +651,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -791,18 +819,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "" diff --git a/l10n/ca/core.po b/l10n/ca/core.po index 8a30a5a1a47..2ad8047f142 100644 --- a/l10n/ca/core.po +++ b/l10n/ca/core.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:02+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/ca/files.po b/l10n/ca/files.po index dda159f5b59..ca3a5ac9c64 100644 --- a/l10n/ca/files.po +++ b/l10n/ca/files.po @@ -7,13 +7,14 @@ # jmontane <joan@montane.cat>, 2013 # Josep Tomà s <jtomas.binsoft@gmail.com>, 2013 # mickymadsystems <micky@madsystems.cat>, 2014 +# black_star <peredelgrau@hotmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-04 01:55-0400\n" -"PO-Revision-Date: 2014-05-03 06:11+0000\n" -"Last-Translator: I Robot\n" +"POT-Creation-Date: 2014-05-10 01:55-0400\n" +"PO-Revision-Date: 2014-05-09 10:10+0000\n" +"Last-Translator: black_star <peredelgrau@hotmail.com>\n" "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -217,7 +218,7 @@ msgstr "Pendent" #: js/filelist.js:916 msgid "Error moving file." -msgstr "" +msgstr "Error en moure el fitxer." #: js/filelist.js:924 msgid "Error moving file" diff --git a/l10n/ca/files_external.po b/l10n/ca/files_external.po index 6a090c364b9..ed7a96a7ffe 100644 --- a/l10n/ca/files_external.po +++ b/l10n/ca/files_external.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n" "MIME-Version: 1.0\n" @@ -199,29 +199,29 @@ msgstr "Error en configurar l'emmagatzemament Google Drive" msgid "Saved" msgstr "Desat" -#: lib/config.php:598 +#: lib/config.php:597 msgid "<b>Note:</b> " msgstr "<b>Nota:</b> " -#: lib/config.php:608 +#: lib/config.php:607 msgid " and " msgstr "i" -#: lib/config.php:630 +#: lib/config.php:629 #, php-format msgid "" "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting " "of %s is not possible. Please ask your system administrator to install it." msgstr "<b>Nota:</b> El suport cURL no està activat o instal·lat a PHP. No es pot muntar %s. Demaneu a l'administrador del sistema que l'instal·li." -#: lib/config.php:632 +#: lib/config.php:631 #, php-format msgid "" "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of" " %s is not possible. Please ask your system administrator to install it." msgstr "<b>Nota:</b> El suport FTP per PHP no està activat o no està instal·lat. No es pot muntar %s. Demaneu a l'administrador del sistema que l'instal·li." -#: lib/config.php:634 +#: lib/config.php:633 #, php-format msgid "" "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please" diff --git a/l10n/ca/files_sharing.po b/l10n/ca/files_sharing.po index f5f95b8297a..454e7d1f3f4 100644 --- a/l10n/ca/files_sharing.po +++ b/l10n/ca/files_sharing.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-04 01:55-0400\n" -"PO-Revision-Date: 2014-05-03 06:11+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n" "MIME-Version: 1.0\n" @@ -62,11 +62,11 @@ msgstr "Per més informació contacteu amb qui us ha enviat l'enllaç." msgid "Download" msgstr "Baixa" -#: templates/public.php:53 +#: templates/public.php:52 #, php-format msgid "Download %s" msgstr "Baixa %s" -#: templates/public.php:57 +#: templates/public.php:56 msgid "Direct link" msgstr "Enllaç directe" diff --git a/l10n/ca/settings.po b/l10n/ca/settings.po index 8c9eeec16ef..05c24986f05 100644 --- a/l10n/ca/settings.po +++ b/l10n/ca/settings.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n" "MIME-Version: 1.0\n" @@ -54,7 +54,7 @@ msgstr "Heu d'establir un nom d'usuari abans de poder enviar correus de prova." msgid "Send mode" msgstr "Mode d'enviament" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "Xifrat" @@ -101,6 +101,16 @@ msgstr "No es poden desencriptar els fitxers. Comproveu owncloud.log o demaneu-h msgid "Couldn't decrypt your files, check your password and try again" msgstr "No s'han pogut desencriptar els fitxers, comproveu la contrasenya i proveu-ho de nou" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "S'ha desat el correu electrònic" @@ -117,6 +127,16 @@ msgstr "No es pot eliminar el grup" msgid "Unable to delete user" msgstr "No es pot eliminar l'usuari" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "S'ha canviat l'idioma" @@ -228,34 +248,42 @@ msgstr "Actualitza" msgid "Updated" msgstr "Actualitzada" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "Seleccioneu una imatge de perfil" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "Contrasenya massa feble" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "Contrasenya feble" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "Contrasenya passable" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "Contrasenya bona" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "Contrasenya forta" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "Desencriptant fitxers... Espereu, això pot trigar una estona." +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "esborrat" @@ -301,7 +329,7 @@ msgstr "Heu de facilitar una contrasenya và lida" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "AvÃs: la carpeta Home per l'usuari \"{user}\" ja existeix" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "Català " @@ -626,11 +654,11 @@ msgstr "Més" msgid "Less" msgstr "Menys" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "Versió" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -794,18 +822,33 @@ msgid "" "WebDAV</a>" msgstr "Useu aquesta adreça per <a href=\"%s\" target=\"_blank\">accedir als fitxers via WebDAV</a>" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "L'aplicació d'encriptació ja no està activada, desencripteu tots els vostres fitxers" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "Contrasenya d'accés" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "Desencripta tots els fitxers" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "Nom d'accés" diff --git a/l10n/ca/user_ldap.po b/l10n/ca/user_ldap.po index 977b1376282..b628e1514fe 100644 --- a/l10n/ca/user_ldap.po +++ b/l10n/ca/user_ldap.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: rogerc\n" "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/cs_CZ/core.po b/l10n/cs_CZ/core.po index c7095624f70..e660a76136e 100644 --- a/l10n/cs_CZ/core.po +++ b/l10n/cs_CZ/core.po @@ -16,8 +16,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:02+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: pstast <petr@stastny.eu>\n" "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/cs_CZ/files_external.po b/l10n/cs_CZ/files_external.po index 8b7a3e6e128..91298180150 100644 --- a/l10n/cs_CZ/files_external.po +++ b/l10n/cs_CZ/files_external.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-07 01:55-0400\n" -"PO-Revision-Date: 2014-05-05 15:09+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: svetlemodry <jaroslav@lichtblau.cz>\n" "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n" "MIME-Version: 1.0\n" @@ -200,29 +200,29 @@ msgstr "Chyba pÅ™i nastavenà úložiÅ¡tÄ› Google Drive" msgid "Saved" msgstr "Uloženo" -#: lib/config.php:598 +#: lib/config.php:597 msgid "<b>Note:</b> " msgstr "<b>Poznámka:</b>" -#: lib/config.php:608 +#: lib/config.php:607 msgid " and " msgstr "a" -#: lib/config.php:630 +#: lib/config.php:629 #, php-format msgid "" "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting " "of %s is not possible. Please ask your system administrator to install it." msgstr "<b>Poznámka:</b> cURL podpora v PHP nenà povolena nebo nainstalována. Nenà možné pÅ™ipojenà %s. ProsÃm požádejte svého správce systému aÅ¥ ji nainstaluje." -#: lib/config.php:632 +#: lib/config.php:631 #, php-format msgid "" "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of" " %s is not possible. Please ask your system administrator to install it." msgstr "<b>Poznámka:</b> FTP podpora v PHP nenà povolena nebo nainstalována. Nenà možné pÅ™ipojenà %s. ProsÃm požádejte svého správce systému aÅ¥ ji nainstaluje." -#: lib/config.php:634 +#: lib/config.php:633 #, php-format msgid "" "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please" diff --git a/l10n/cs_CZ/files_sharing.po b/l10n/cs_CZ/files_sharing.po index 9240e00c8ce..a0b084e7c08 100644 --- a/l10n/cs_CZ/files_sharing.po +++ b/l10n/cs_CZ/files_sharing.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-04 01:55-0400\n" -"PO-Revision-Date: 2014-05-03 06:11+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n" "MIME-Version: 1.0\n" @@ -64,11 +64,11 @@ msgstr "Pro vÃce informacà kontaktujte osobu, která vám zaslala tento odkaz. msgid "Download" msgstr "Stáhnout" -#: templates/public.php:53 +#: templates/public.php:52 #, php-format msgid "Download %s" msgstr "Stáhnout %s" -#: templates/public.php:57 +#: templates/public.php:56 msgid "Direct link" msgstr "PÅ™Ãmý odkaz" diff --git a/l10n/cs_CZ/lib.po b/l10n/cs_CZ/lib.po index bf0b927b40a..a6b5e286d5a 100644 --- a/l10n/cs_CZ/lib.po +++ b/l10n/cs_CZ/lib.po @@ -3,7 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Honza K. <honza889@gmail.com>, 2013 +# Honza K. <honza889@gmail.com>, 2013-2014 # liska_, 2013 # svetlemodry <jaroslav@lichtblau.cz>, 2014 # xmorave2 <josef.moravec@gmail.com>, 2014 @@ -14,9 +14,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-28 01:55-0400\n" -"PO-Revision-Date: 2014-04-28 05:55+0000\n" -"Last-Translator: I Robot\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-10 21:40+0000\n" +"Last-Translator: Honza K. <honza889@gmail.com>\n" "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -24,16 +24,16 @@ msgstr "" "Language: cs_CZ\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -#: base.php:723 +#: base.php:713 msgid "You are accessing the server from an untrusted domain." msgstr "PÅ™istupujete na server z nedůvÄ›ryhodné domény." -#: base.php:724 +#: base.php:714 msgid "" "Please contact your administrator. If you are an administrator of this " "instance, configure the \"trusted_domain\" setting in config/config.php. An " "example configuration is provided in config/config.sample.php." -msgstr "" +msgstr "Kontaktujte prosÃm správce. Pokud jste správce této instalace, nastavte \"trusted_domain\" v souboru config/config.php. PÅ™Ãklad konfigurace najdete v souboru config/config.sample.php." #: private/app.php:236 #, php-format @@ -83,23 +83,23 @@ msgstr "Chybný obrázek" msgid "web services under your control" msgstr "webové služby pod VaÅ¡Ã kontrolou" -#: private/files.php:232 +#: private/files.php:235 msgid "ZIP download is turned off." msgstr "Stahovánà v ZIPu je vypnuto." -#: private/files.php:233 +#: private/files.php:236 msgid "Files need to be downloaded one by one." msgstr "Soubory musà být stahovány jednotlivÄ›." -#: private/files.php:234 private/files.php:261 +#: private/files.php:237 private/files.php:264 msgid "Back to Files" msgstr "ZpÄ›t k souborům" -#: private/files.php:259 +#: private/files.php:262 msgid "Selected files too large to generate zip file." msgstr "Vybrané soubory jsou pÅ™ÃliÅ¡ velké pro vytvoÅ™enà ZIP souboru." -#: private/files.php:260 +#: private/files.php:263 msgid "" "Please download the files separately in smaller chunks or kindly ask your " "administrator." @@ -285,13 +285,13 @@ msgstr "Zadejte uživatelské jméno správce." msgid "Set an admin password." msgstr "Zadejte heslo správce." -#: private/setup.php:202 +#: private/setup.php:164 msgid "" "Your web server is not yet properly setup to allow files synchronization " "because the WebDAV interface seems to be broken." msgstr "Váš webový server nenà správnÄ› nastaven pro umožnÄ›nà synchronizace, rozhranà WebDAV se zdá být rozbité." -#: private/setup.php:203 +#: private/setup.php:165 #, php-format msgid "Please double check the <a href='%s'>installation guides</a>." msgstr "Zkonzultujte, prosÃm, <a href='%s'>průvodce instalacÃ</a>." @@ -347,65 +347,65 @@ msgstr "SdÃlenà položky %s selhalo, protože sdÃlenà pomocà linků nenà p #: private/share/share.php:636 #, php-format msgid "Share type %s is not valid for %s" -msgstr "" +msgstr "SdÃlenà typu %s nenà korektnà pro %s" -#: private/share/share.php:773 +#: private/share/share.php:774 #, php-format msgid "" "Setting permissions for %s failed, because the permissions exceed " "permissions granted to %s" msgstr "" -#: private/share/share.php:834 +#: private/share/share.php:835 #, php-format msgid "Setting permissions for %s failed, because the item was not found" msgstr "Nastavenà práv pro %s selhalo, protože položka nebyla nalezena" -#: private/share/share.php:940 +#: private/share/share.php:941 #, php-format msgid "Sharing backend %s must implement the interface OCP\\Share_Backend" msgstr "" -#: private/share/share.php:947 +#: private/share/share.php:948 #, php-format msgid "Sharing backend %s not found" msgstr "" -#: private/share/share.php:953 +#: private/share/share.php:954 #, php-format msgid "Sharing backend for %s not found" msgstr "" -#: private/share/share.php:1367 +#: private/share/share.php:1368 #, php-format msgid "Sharing %s failed, because the user %s is the original sharer" msgstr "" -#: private/share/share.php:1376 +#: private/share/share.php:1377 #, php-format msgid "" "Sharing %s failed, because the permissions exceed permissions granted to %s" msgstr "" -#: private/share/share.php:1391 +#: private/share/share.php:1392 #, php-format msgid "Sharing %s failed, because resharing is not allowed" msgstr "" -#: private/share/share.php:1403 +#: private/share/share.php:1404 #, php-format msgid "" "Sharing %s failed, because the sharing backend for %s could not find its " "source" msgstr "" -#: private/share/share.php:1417 +#: private/share/share.php:1418 #, php-format msgid "" "Sharing %s failed, because the file could not be found in the file cache" msgstr "" -#: private/tags.php:193 +#: private/tags.php:183 #, php-format msgid "Could not find category \"%s\"" msgstr "Nelze nalézt kategorii \"%s\"" diff --git a/l10n/cs_CZ/settings.po b/l10n/cs_CZ/settings.po index 6cd52880203..2676c5ec817 100644 --- a/l10n/cs_CZ/settings.po +++ b/l10n/cs_CZ/settings.po @@ -15,9 +15,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" -"Last-Translator: pstast <petr@stastny.eu>\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" +"Last-Translator: I Robot\n" "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -59,7 +59,7 @@ msgstr "Pro možnost odeslánà zkuÅ¡ebnÃch e-mailů musÃte nejprve nastavit s msgid "Send mode" msgstr "Mód odesÃlánÃ" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "Å ifrovánÃ" @@ -106,6 +106,16 @@ msgstr "Nebylo možno deÅ¡ifrovat soubory, zkontroluje prosÃm owncloud.log nebo msgid "Couldn't decrypt your files, check your password and try again" msgstr "Nebylo možno deÅ¡ifrovat soubory, zkontrolujte své heslo a zkuste znovu" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "E-mail uložen" @@ -122,6 +132,16 @@ msgstr "Nelze smazat skupinu" msgid "Unable to delete user" msgstr "Nelze smazat uživatele" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "Jazyk byl zmÄ›nÄ›n" @@ -233,34 +253,42 @@ msgstr "Aktualizovat" msgid "Updated" msgstr "Aktualizováno" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "Vyberte profilový obrázek" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "Velmi slabé heslo" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "Slabé heslo" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "StÅ™ednÄ› silné heslo" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "Dobré heslo" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "Silné heslo" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "ProbÃhá deÅ¡ifrovánà souborů... ÄŒekejte prosÃm, tato operace může trvat nÄ›jakou dobu." +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "smazáno" @@ -306,7 +334,7 @@ msgstr "MusÃte zadat platné heslo" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "VarovánÃ: Osobnà složka uživatele \"{user}\" již existuje." -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "ÄŒesky" @@ -631,11 +659,11 @@ msgstr "VÃce" msgid "Less" msgstr "MénÄ›" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "Verze" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -799,18 +827,33 @@ msgid "" "WebDAV</a>" msgstr "Použijte <a href=\"%s\" target=\"_blank\">tuto adresu pro pÅ™Ãstup k vaÅ¡im souborům pÅ™es WebDAV</a>" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "Å ifrovacà aplikace již nenà spuÅ¡tÄ›na, deÅ¡ifrujte prosÃm vÅ¡echny své soubory" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "PÅ™ihlaÅ¡ovacà heslo" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "OdÅ¡ifrovat vÅ¡echny soubory" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "PÅ™ihlaÅ¡ovacà jméno" diff --git a/l10n/cs_CZ/user_ldap.po b/l10n/cs_CZ/user_ldap.po index d89662a4cbe..4c74e08d148 100644 --- a/l10n/cs_CZ/user_ldap.po +++ b/l10n/cs_CZ/user_ldap.po @@ -14,8 +14,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: pstast <petr@stastny.eu>\n" "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/cy_GB/core.po b/l10n/cy_GB/core.po index cf15ec3d6e5..4a16f6e3584 100644 --- a/l10n/cy_GB/core.po +++ b/l10n/cy_GB/core.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:02+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/cy_GB/files_external.po b/l10n/cy_GB/files_external.po index 969a74b589d..734b706919c 100644 --- a/l10n/cy_GB/files_external.po +++ b/l10n/cy_GB/files_external.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n" "MIME-Version: 1.0\n" @@ -197,29 +197,29 @@ msgstr "" msgid "Saved" msgstr "" -#: lib/config.php:598 +#: lib/config.php:597 msgid "<b>Note:</b> " msgstr "" -#: lib/config.php:608 +#: lib/config.php:607 msgid " and " msgstr "" -#: lib/config.php:630 +#: lib/config.php:629 #, php-format msgid "" "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting " "of %s is not possible. Please ask your system administrator to install it." msgstr "" -#: lib/config.php:632 +#: lib/config.php:631 #, php-format msgid "" "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of" " %s is not possible. Please ask your system administrator to install it." msgstr "" -#: lib/config.php:634 +#: lib/config.php:633 #, php-format msgid "" "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please" diff --git a/l10n/cy_GB/files_sharing.po b/l10n/cy_GB/files_sharing.po index 673e5d52df7..261dfedcd38 100644 --- a/l10n/cy_GB/files_sharing.po +++ b/l10n/cy_GB/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-04 01:55-0400\n" -"PO-Revision-Date: 2014-05-03 06:11+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n" "MIME-Version: 1.0\n" @@ -61,11 +61,11 @@ msgstr "" msgid "Download" msgstr "Llwytho i lawr" -#: templates/public.php:53 +#: templates/public.php:52 #, php-format msgid "Download %s" msgstr "" -#: templates/public.php:57 +#: templates/public.php:56 msgid "Direct link" msgstr "" diff --git a/l10n/cy_GB/settings.po b/l10n/cy_GB/settings.po index 5302bb93371..ad83204354b 100644 --- a/l10n/cy_GB/settings.po +++ b/l10n/cy_GB/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "Amgryptiad" @@ -98,6 +98,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -114,6 +124,16 @@ msgstr "" msgid "Unable to delete user" msgstr "" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "" @@ -225,34 +245,42 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "" @@ -298,7 +326,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "" @@ -623,11 +651,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -791,18 +819,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "Mewngofnodi" diff --git a/l10n/cy_GB/user_ldap.po b/l10n/cy_GB/user_ldap.po index 7547c26d0a8..48e4810eeff 100644 --- a/l10n/cy_GB/user_ldap.po +++ b/l10n/cy_GB/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/da/core.po b/l10n/da/core.po index 392f412154c..4760ef92e4c 100644 --- a/l10n/da/core.po +++ b/l10n/da/core.po @@ -14,9 +14,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:02+0000\n" -"Last-Translator: I Robot\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" +"Last-Translator: Sappe\n" "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -26,7 +26,7 @@ msgstr "" #: ajax/share.php:87 msgid "Expiration date is in the past." -msgstr "" +msgstr "Udløbsdatoen er overskredet." #: ajax/share.php:119 ajax/share.php:161 #, php-format @@ -237,7 +237,7 @@ msgstr "Nye filer" #: js/oc-dialogs.js:373 msgid "Already existing files" -msgstr "" +msgstr "Allerede eksisterende filer" #: js/oc-dialogs.js:375 msgid "Which files do you want to keep?" @@ -549,12 +549,12 @@ msgstr "Nulstil kodeord" msgid "" "Mac OS X is not supported and %s will not work properly on this platform. " "Use it at your own risk! " -msgstr "" +msgstr "Mac OS X understøttes ikke og %s vil ikke virke optimalt pÃ¥ denne platform. Anvend pÃ¥ eget ansvar!" #: setup/controller.php:144 msgid "" "For the best results, please consider using a GNU/Linux server instead." -msgstr "" +msgstr "For de bedste resultater, overvej venligst at bruge en GNU/Linux-server i stedet." #: strings.php:5 msgid "Personal" @@ -777,7 +777,7 @@ msgstr "Alternative logins" msgid "" "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> " "with you.<br><a href=\"%s\">View it!</a><br><br>" -msgstr "" +msgstr "Hej med dig,<br><br>Dette er blot for at informere dig om, at %s har delt <strong>%s</strong> med dig.<br><a href=\"%s\">Se det her!</a><br><br>" #: templates/singleuser.user.php:3 msgid "This ownCloud instance is currently in single user mode." diff --git a/l10n/da/files_external.po b/l10n/da/files_external.po index 33fc22a67d7..126d897e265 100644 --- a/l10n/da/files_external.po +++ b/l10n/da/files_external.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-07 01:55-0400\n" -"PO-Revision-Date: 2014-05-05 15:22+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: Sappe\n" "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n" "MIME-Version: 1.0\n" @@ -199,29 +199,29 @@ msgstr "Fejl ved konfiguration af Google Drive plads" msgid "Saved" msgstr "Gemt" -#: lib/config.php:598 +#: lib/config.php:597 msgid "<b>Note:</b> " msgstr "<b>Note:</b> " -#: lib/config.php:608 +#: lib/config.php:607 msgid " and " msgstr "og" -#: lib/config.php:630 +#: lib/config.php:629 #, php-format msgid "" "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting " "of %s is not possible. Please ask your system administrator to install it." msgstr "" -#: lib/config.php:632 +#: lib/config.php:631 #, php-format msgid "" "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of" " %s is not possible. Please ask your system administrator to install it." msgstr "" -#: lib/config.php:634 +#: lib/config.php:633 #, php-format msgid "" "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please" diff --git a/l10n/da/files_sharing.po b/l10n/da/files_sharing.po index 7164ebffa75..e8cec57dc9d 100644 --- a/l10n/da/files_sharing.po +++ b/l10n/da/files_sharing.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-04 01:55-0400\n" -"PO-Revision-Date: 2014-05-03 06:12+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n" "MIME-Version: 1.0\n" @@ -64,11 +64,11 @@ msgstr "For yderligere information, kontakt venligst personen der sendte linket. msgid "Download" msgstr "Download" -#: templates/public.php:53 +#: templates/public.php:52 #, php-format msgid "Download %s" msgstr "Download %s" -#: templates/public.php:57 +#: templates/public.php:56 msgid "Direct link" msgstr "Direkte link" diff --git a/l10n/da/settings.po b/l10n/da/settings.po index 275d131bddf..5152ab2ff5d 100644 --- a/l10n/da/settings.po +++ b/l10n/da/settings.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n" "MIME-Version: 1.0\n" @@ -55,7 +55,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "Kryptering" @@ -102,6 +102,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "Email adresse gemt" @@ -118,6 +128,16 @@ msgstr "Gruppen kan ikke slettes" msgid "Unable to delete user" msgstr "Bruger kan ikke slettes" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "Sprog ændret" @@ -229,34 +249,42 @@ msgstr "Opdater" msgid "Updated" msgstr "Opdateret" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "Vælg et profilbillede" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "Meget svagt kodeord" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "Svagt kodeord" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "Jævnt kodeord" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "Godt kodeord" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "Stærkt kodeord" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "Dekryptere filer... Vent venligst, dette kan tage lang tid. " +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "Slettet" @@ -302,7 +330,7 @@ msgstr "En gyldig adgangskode skal angives" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "Advarsel: Hjemmemappen for bruger \"{user}\" findes allerede" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "Dansk" @@ -533,11 +561,11 @@ msgstr "" #: templates/admin.php:263 msgid "Expire after " -msgstr "" +msgstr "Udløber efter" #: templates/admin.php:266 msgid "days" -msgstr "" +msgstr "dage" #: templates/admin.php:269 msgid "Enforce expiration date" @@ -627,11 +655,11 @@ msgstr "Mere" msgid "Less" msgstr "Mindre" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "Version" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -795,18 +823,33 @@ msgid "" "WebDAV</a>" msgstr "Brug denne adresse for at <a href=\"%s\" target=\"_blank\">tilgÃ¥ dine filer via WebDAV</a>" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "Krypteringsprogrammet er ikke længere aktiveret. Dekrypter venligst alle dine filer" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "Log-in kodeord" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "Dekrypter alle Filer " +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "Loginnavn" diff --git a/l10n/da/user_ldap.po b/l10n/da/user_ldap.po index bacbb9759de..99c42277e71 100644 --- a/l10n/da/user_ldap.po +++ b/l10n/da/user_ldap.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/de/core.po b/l10n/de/core.po index ad9ad8eb4b7..365fd59580e 100644 --- a/l10n/de/core.po +++ b/l10n/de/core.po @@ -18,8 +18,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:02+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:01+0000\n" "Last-Translator: I Robot\n" "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/de/files_external.po b/l10n/de/files_external.po index 630916b5375..28e34796424 100644 --- a/l10n/de/files_external.po +++ b/l10n/de/files_external.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 11:00+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n" "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n" "MIME-Version: 1.0\n" @@ -200,29 +200,29 @@ msgstr "Fehler beim Einrichten von Google Drive" msgid "Saved" msgstr "Gespeichert" -#: lib/config.php:598 +#: lib/config.php:597 msgid "<b>Note:</b> " msgstr "<b>Hinweis:</b> " -#: lib/config.php:608 +#: lib/config.php:607 msgid " and " msgstr "und" -#: lib/config.php:630 +#: lib/config.php:629 #, php-format msgid "" "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting " "of %s is not possible. Please ask your system administrator to install it." msgstr "<b>Hinweis:</b> Die cURL-Unterstützung von PHP ist nicht aktiviert oder installiert. Das Hinzufügen von %s ist nicht möglich. Bitte wende Dich zur Installation an Deinen Systemadministrator." -#: lib/config.php:632 +#: lib/config.php:631 #, php-format msgid "" "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of" " %s is not possible. Please ask your system administrator to install it." msgstr "<b>Hinweis:</b> Die FTP Unterstützung von PHP ist nicht aktiviert oder installiert. Das Hinzufügen von %s ist nicht möglich. Bitte wende Dich sich zur Installation an Deinen Systemadministrator." -#: lib/config.php:634 +#: lib/config.php:633 #, php-format msgid "" "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please" diff --git a/l10n/de/files_sharing.po b/l10n/de/files_sharing.po index 02a5233df72..117b0d5c9e4 100644 --- a/l10n/de/files_sharing.po +++ b/l10n/de/files_sharing.po @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-04 01:55-0400\n" -"PO-Revision-Date: 2014-05-03 06:11+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n" "MIME-Version: 1.0\n" @@ -66,11 +66,11 @@ msgstr "Für mehr Informationen, frage bitte die Person, die Dir diesen Link ges msgid "Download" msgstr "Herunterladen" -#: templates/public.php:53 +#: templates/public.php:52 #, php-format msgid "Download %s" msgstr "Download %s" -#: templates/public.php:57 +#: templates/public.php:56 msgid "Direct link" msgstr "Direkter Link" diff --git a/l10n/de/settings.po b/l10n/de/settings.po index 7fc5e00ed48..0c7ad937610 100644 --- a/l10n/de/settings.po +++ b/l10n/de/settings.po @@ -16,9 +16,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" -"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" +"Last-Translator: I Robot\n" "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -60,7 +60,7 @@ msgstr "Du musst zunächst deine Benutzer-E-Mail-Adresse setzen, bevor du Test-E msgid "Send mode" msgstr "Sende-Modus" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "Verschlüsselung" @@ -107,6 +107,16 @@ msgstr "Dateien konnten nicht entschlüsselt werden, prüfe bitte Dein owncloud. msgid "Couldn't decrypt your files, check your password and try again" msgstr "Dateien konnten nicht entschlüsselt werden, bitte prüfe Dein Passwort und versuche es erneut." +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "E-Mail Adresse gespeichert" @@ -123,6 +133,16 @@ msgstr "Gruppe konnte nicht gelöscht werden" msgid "Unable to delete user" msgstr "Benutzer konnte nicht gelöscht werden" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "Sprache geändert" @@ -234,34 +254,42 @@ msgstr "Aktualisierung durchführen" msgid "Updated" msgstr "Aktualisiert" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "Wähle ein Profilbild" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "Sehr schwaches Passwort" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "Schwaches Passwort" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "Durchschnittliches Passwort" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "Gutes Passwort" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "Starkes Passwort" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "Entschlüssle Dateien ... Bitte warten, denn dieser Vorgang kann einige Zeit beanspruchen." +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "gelöscht" @@ -307,7 +335,7 @@ msgstr "Es muss ein gültiges Passwort angegeben werden" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "Warnung: Das Benutzerverzeichnis für den Benutzer \"{user}\" existiert bereits" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "Deutsch (Persönlich)" @@ -632,11 +660,11 @@ msgstr "Mehr" msgid "Less" msgstr "Weniger" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "Version" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -800,18 +828,33 @@ msgid "" "WebDAV</a>" msgstr "Verwenden Sie diese Adresse, um <a href=\"%s\" target=\"_blank\">via WebDAV auf Ihre Dateien zuzugreifen</a>" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "Die Verschlüsselungsanwendung ist nicht länger aktiviert, bitte entschlüsseln Sie alle ihre Daten." -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "Login-Passwort" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "Alle Dateien entschlüsseln" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "Loginname" diff --git a/l10n/de/user_ldap.po b/l10n/de/user_ldap.po index 108da686858..7a093e6d64c 100644 --- a/l10n/de/user_ldap.po +++ b/l10n/de/user_ldap.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n" "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/de_AT/core.po b/l10n/de_AT/core.po index 77891888998..6f30c08d86e 100644 --- a/l10n/de_AT/core.po +++ b/l10n/de_AT/core.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:02+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: German (Austria) (http://www.transifex.com/projects/p/owncloud/language/de_AT/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/de_AT/files_external.po b/l10n/de_AT/files_external.po index cb76434f02f..975119e6ab0 100644 --- a/l10n/de_AT/files_external.po +++ b/l10n/de_AT/files_external.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: German (Austria) (http://www.transifex.com/projects/p/owncloud/language/de_AT/)\n" "MIME-Version: 1.0\n" @@ -197,29 +197,29 @@ msgstr "" msgid "Saved" msgstr "" -#: lib/config.php:598 +#: lib/config.php:597 msgid "<b>Note:</b> " msgstr "" -#: lib/config.php:608 +#: lib/config.php:607 msgid " and " msgstr "" -#: lib/config.php:630 +#: lib/config.php:629 #, php-format msgid "" "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting " "of %s is not possible. Please ask your system administrator to install it." msgstr "" -#: lib/config.php:632 +#: lib/config.php:631 #, php-format msgid "" "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of" " %s is not possible. Please ask your system administrator to install it." msgstr "" -#: lib/config.php:634 +#: lib/config.php:633 #, php-format msgid "" "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please" diff --git a/l10n/de_AT/files_sharing.po b/l10n/de_AT/files_sharing.po index 272d331dc13..936be9ea73e 100644 --- a/l10n/de_AT/files_sharing.po +++ b/l10n/de_AT/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-04 01:55-0400\n" -"PO-Revision-Date: 2014-05-03 06:11+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: German (Austria) (http://www.transifex.com/projects/p/owncloud/language/de_AT/)\n" "MIME-Version: 1.0\n" @@ -61,11 +61,11 @@ msgstr "" msgid "Download" msgstr "Herunterladen" -#: templates/public.php:53 +#: templates/public.php:52 #, php-format msgid "Download %s" msgstr "" -#: templates/public.php:57 +#: templates/public.php:56 msgid "Direct link" msgstr "" diff --git a/l10n/de_AT/settings.po b/l10n/de_AT/settings.po index 086f1193a06..b43ef756d29 100644 --- a/l10n/de_AT/settings.po +++ b/l10n/de_AT/settings.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: German (Austria) (http://www.transifex.com/projects/p/owncloud/language/de_AT/)\n" "MIME-Version: 1.0\n" @@ -52,7 +52,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "" @@ -99,6 +99,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -115,6 +125,16 @@ msgstr "" msgid "Unable to delete user" msgstr "" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "" @@ -226,34 +246,42 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "" @@ -299,7 +327,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "Deutsch (Österreich)" @@ -624,11 +652,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -792,18 +820,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "" diff --git a/l10n/de_AT/user_ldap.po b/l10n/de_AT/user_ldap.po index 4343cca5ab4..1426e0bd3e4 100644 --- a/l10n/de_AT/user_ldap.po +++ b/l10n/de_AT/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: German (Austria) (http://www.transifex.com/projects/p/owncloud/language/de_AT/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/de_CH/core.po b/l10n/de_CH/core.po index fc8c5d4d726..bbd30b27c79 100644 --- a/l10n/de_CH/core.po +++ b/l10n/de_CH/core.po @@ -17,8 +17,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:02+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/owncloud/language/de_CH/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/de_CH/files_external.po b/l10n/de_CH/files_external.po index 150bd2e2e06..d1a9b2e0fb3 100644 --- a/l10n/de_CH/files_external.po +++ b/l10n/de_CH/files_external.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/owncloud/language/de_CH/)\n" "MIME-Version: 1.0\n" @@ -198,29 +198,29 @@ msgstr "Fehler beim Einrichten von Google Drive" msgid "Saved" msgstr "" -#: lib/config.php:598 +#: lib/config.php:597 msgid "<b>Note:</b> " msgstr "" -#: lib/config.php:608 +#: lib/config.php:607 msgid " and " msgstr "" -#: lib/config.php:630 +#: lib/config.php:629 #, php-format msgid "" "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting " "of %s is not possible. Please ask your system administrator to install it." msgstr "" -#: lib/config.php:632 +#: lib/config.php:631 #, php-format msgid "" "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of" " %s is not possible. Please ask your system administrator to install it." msgstr "" -#: lib/config.php:634 +#: lib/config.php:633 #, php-format msgid "" "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please" diff --git a/l10n/de_CH/files_sharing.po b/l10n/de_CH/files_sharing.po index e188bd274fd..135f8fb5091 100644 --- a/l10n/de_CH/files_sharing.po +++ b/l10n/de_CH/files_sharing.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-04 01:55-0400\n" -"PO-Revision-Date: 2014-05-03 06:11+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/owncloud/language/de_CH/)\n" "MIME-Version: 1.0\n" @@ -64,11 +64,11 @@ msgstr "Für mehr Informationen, fragen Sie bitte die Person, die Ihnen diesen L msgid "Download" msgstr "Herunterladen" -#: templates/public.php:53 +#: templates/public.php:52 #, php-format msgid "Download %s" msgstr "" -#: templates/public.php:57 +#: templates/public.php:56 msgid "Direct link" msgstr "" diff --git a/l10n/de_CH/settings.po b/l10n/de_CH/settings.po index 3734cf7fa64..def8f77e25e 100644 --- a/l10n/de_CH/settings.po +++ b/l10n/de_CH/settings.po @@ -16,8 +16,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/owncloud/language/de_CH/)\n" "MIME-Version: 1.0\n" @@ -60,7 +60,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "Verschlüsselung" @@ -107,6 +107,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "E-Mail-Adresse gespeichert" @@ -123,6 +133,16 @@ msgstr "Die Gruppe konnte nicht gelöscht werden" msgid "Unable to delete user" msgstr "Der Benutzer konnte nicht gelöscht werden" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "Sprache geändert" @@ -234,34 +254,42 @@ msgstr "Update durchführen" msgid "Updated" msgstr "Aktualisiert" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "Entschlüssel Dateien ... Bitte warten Sie, denn dieser Vorgang kann einige Zeit beanspruchen." +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "gelöscht" @@ -307,7 +335,7 @@ msgstr "Es muss ein gültiges Passwort angegeben werden" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "Deutsch (Schweiz)" @@ -632,11 +660,11 @@ msgstr "Mehr" msgid "Less" msgstr "Weniger" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "Version" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -800,18 +828,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "Login-Passwort" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "Alle Dateien entschlüsseln" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "Loginname" diff --git a/l10n/de_CH/user_ldap.po b/l10n/de_CH/user_ldap.po index 79a318b0a96..286a2066b92 100644 --- a/l10n/de_CH/user_ldap.po +++ b/l10n/de_CH/user_ldap.po @@ -15,8 +15,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/owncloud/language/de_CH/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/de_DE/core.po b/l10n/de_DE/core.po index afc46ebcaff..ae80f46c392 100644 --- a/l10n/de_DE/core.po +++ b/l10n/de_DE/core.po @@ -18,8 +18,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:02+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:01+0000\n" "Last-Translator: I Robot\n" "Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/de_DE/files_external.po b/l10n/de_DE/files_external.po index 77abf7fb2d4..251c43dee3e 100644 --- a/l10n/de_DE/files_external.po +++ b/l10n/de_DE/files_external.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 11:00+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n" "Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n" "MIME-Version: 1.0\n" @@ -201,29 +201,29 @@ msgstr "Fehler beim Einrichten von Google Drive" msgid "Saved" msgstr "Gespeichert" -#: lib/config.php:598 +#: lib/config.php:597 msgid "<b>Note:</b> " msgstr "<b>Hinweis:</b> " -#: lib/config.php:608 +#: lib/config.php:607 msgid " and " msgstr "und" -#: lib/config.php:630 +#: lib/config.php:629 #, php-format msgid "" "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting " "of %s is not possible. Please ask your system administrator to install it." msgstr "<b>Hinweis:</b> Die cURL-Unterstützung von PHP ist nicht aktiviert oder installiert. Das Hinzufügen von %s ist nicht möglich. Bitte wenden Sie sich zur Installation an Ihren Systemadministrator." -#: lib/config.php:632 +#: lib/config.php:631 #, php-format msgid "" "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of" " %s is not possible. Please ask your system administrator to install it." msgstr "<b>Hinweis:</b> Die FTP Unterstützung von PHP ist nicht aktiviert oder installiert. Das Hinzufügen von %s ist nicht möglich. Bitte wenden Sie sich zur Installation an Ihren Systemadministrator." -#: lib/config.php:634 +#: lib/config.php:633 #, php-format msgid "" "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please" diff --git a/l10n/de_DE/files_sharing.po b/l10n/de_DE/files_sharing.po index 2275194ef42..7db89711ebb 100644 --- a/l10n/de_DE/files_sharing.po +++ b/l10n/de_DE/files_sharing.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-04 01:55-0400\n" -"PO-Revision-Date: 2014-05-03 06:11+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n" "MIME-Version: 1.0\n" @@ -65,11 +65,11 @@ msgstr "Für mehr Informationen, fragen Sie bitte die Person, die Ihnen diesen L msgid "Download" msgstr "Herunterladen" -#: templates/public.php:53 +#: templates/public.php:52 #, php-format msgid "Download %s" msgstr "Download %s" -#: templates/public.php:57 +#: templates/public.php:56 msgid "Direct link" msgstr "Direkte Verlinkung" diff --git a/l10n/de_DE/settings.po b/l10n/de_DE/settings.po index cbf6cc2844d..e35588609c4 100644 --- a/l10n/de_DE/settings.po +++ b/l10n/de_DE/settings.po @@ -17,9 +17,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" -"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" +"Last-Translator: I Robot\n" "Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -61,7 +61,7 @@ msgstr "Sie müssen Ihre Benutzer-E-Mail-Adresse setzen, bevor Sie Test-E-Mails msgid "Send mode" msgstr "Sende-Modus" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "Verschlüsselung" @@ -108,6 +108,16 @@ msgstr "Dateien konnten nicht entschlüsselt werden, prüfen Sie bitte Ihre ownc msgid "Couldn't decrypt your files, check your password and try again" msgstr "Dateien konnten nicht entschlüsselt werden, bitte prüfen Sie Ihr Passwort und versuchen Sie es erneut." +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "E-Mail-Adresse gespeichert" @@ -124,6 +134,16 @@ msgstr "Die Gruppe konnte nicht gelöscht werden" msgid "Unable to delete user" msgstr "Der Benutzer konnte nicht gelöscht werden" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "Sprache geändert" @@ -235,34 +255,42 @@ msgstr "Update durchführen" msgid "Updated" msgstr "Aktualisiert" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "Wählen Sie ein Profilbild" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "Sehr schwaches Passwort" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "Schwaches Passwort" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "Passables Passwort" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "Gutes Passwort" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "Starkes Passwort" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "Entschlüssle Dateien ... Bitte warten Sie, denn dieser Vorgang kann einige Zeit beanspruchen." +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "gelöscht" @@ -308,7 +336,7 @@ msgstr "Es muss ein gültiges Passwort angegeben werden" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "Warnung: Das Benutzerverzeichnis für den Benutzer \"{user}\" existiert bereits" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "Deutsch (Förmlich: Sie)" @@ -633,11 +661,11 @@ msgstr "Mehr" msgid "Less" msgstr "Weniger" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "Version" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -801,18 +829,33 @@ msgid "" "WebDAV</a>" msgstr "Verwenden Sie diese Adresse, um <a href=\"%s\" target=\"_blank\">via WebDAV auf Ihre Dateien zuzugreifen</a>" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "Die Verschlüsselungsanwendung ist nicht länger aktiv, bitte entschlüsseln Sie alle ihre Daten" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "Login-Passwort" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "Alle Dateien entschlüsseln" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "Loginname" diff --git a/l10n/de_DE/user_ldap.po b/l10n/de_DE/user_ldap.po index 1510c7e5d12..0f246f75c24 100644 --- a/l10n/de_DE/user_ldap.po +++ b/l10n/de_DE/user_ldap.po @@ -13,8 +13,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n" "Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/el/core.po b/l10n/el/core.po index 26767a32923..419b2ddfd72 100644 --- a/l10n/el/core.po +++ b/l10n/el/core.po @@ -18,8 +18,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:02+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/el/files_external.po b/l10n/el/files_external.po index 3f4e0eff89d..b8f4de69103 100644 --- a/l10n/el/files_external.po +++ b/l10n/el/files_external.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# thea_rad <inactive+thea_rad@transifex.com>, 2014 # ggoniotakis <ioannis.goniotakis@gmail.com>, 2014 # pe_ppe <peppe@cs.uoi.gr>, 2014 # KAT.RAT12 <spanish.katerina@gmail.com>, 2013 @@ -10,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-01 01:55-0400\n" -"PO-Revision-Date: 2014-04-30 11:30+0000\n" -"Last-Translator: ggoniotakis <ioannis.goniotakis@gmail.com>\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" +"Last-Translator: thea_rad <inactive+thea_rad@transifex.com>\n" "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -34,11 +35,11 @@ msgstr "" #: appinfo/app.php:41 msgid "Key" -msgstr "" +msgstr "Κλειδί" #: appinfo/app.php:42 msgid "Secret" -msgstr "" +msgstr "Μυστικό" #: appinfo/app.php:43 appinfo/app.php:51 msgid "Bucket" @@ -110,7 +111,7 @@ msgstr "" #: appinfo/app.php:84 msgid "Client ID" -msgstr "" +msgstr "ID πελάτη" #: appinfo/app.php:85 msgid "Client secret" @@ -200,29 +201,29 @@ msgstr "Σφάλμα Ïυθμίζωντας αποθήκευση Google Drive " msgid "Saved" msgstr "ΑποθηκεÏτηκαν" -#: lib/config.php:598 +#: lib/config.php:597 msgid "<b>Note:</b> " msgstr "" -#: lib/config.php:608 +#: lib/config.php:607 msgid " and " msgstr "και" -#: lib/config.php:630 +#: lib/config.php:629 #, php-format msgid "" "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting " "of %s is not possible. Please ask your system administrator to install it." msgstr "" -#: lib/config.php:632 +#: lib/config.php:631 #, php-format msgid "" "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of" " %s is not possible. Please ask your system administrator to install it." msgstr "" -#: lib/config.php:634 +#: lib/config.php:633 #, php-format msgid "" "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please" @@ -251,7 +252,7 @@ msgstr "ΕπιλογÎÏ‚" #: templates/settings.php:12 msgid "Available for" -msgstr "" +msgstr "ΔιαθÎσιμο για" #: templates/settings.php:32 msgid "Add storage" diff --git a/l10n/el/files_sharing.po b/l10n/el/files_sharing.po index 10343be4fc4..975eb5d01d9 100644 --- a/l10n/el/files_sharing.po +++ b/l10n/el/files_sharing.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-04 01:55-0400\n" -"PO-Revision-Date: 2014-05-03 06:12+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n" "MIME-Version: 1.0\n" @@ -64,11 +64,11 @@ msgstr "Για πεÏισσότεÏες πληÏοφοÏίες, παÏακαλώ msgid "Download" msgstr "Λήψη" -#: templates/public.php:53 +#: templates/public.php:52 #, php-format msgid "Download %s" msgstr "Λήψη %s" -#: templates/public.php:57 +#: templates/public.php:56 msgid "Direct link" msgstr "Άμεσος σÏνδεσμος" diff --git a/l10n/el/settings.po b/l10n/el/settings.po index 72773b070cd..0b1b8f0f0be 100644 --- a/l10n/el/settings.po +++ b/l10n/el/settings.po @@ -16,8 +16,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n" "MIME-Version: 1.0\n" @@ -60,7 +60,7 @@ msgstr "Î ÏÎπει να οÏίσετε το email του χÏήστη Ï€Ïιν msgid "Send mode" msgstr "Κατάσταση αποστολής" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "ΚÏυπτογÏάφηση" @@ -107,6 +107,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "Το email αποθηκεÏτηκε " @@ -123,6 +133,16 @@ msgstr "Αδυναμία διαγÏαφής ομάδας" msgid "Unable to delete user" msgstr "Αδυναμία διαγÏαφής χÏήστη" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "Η γλώσσα άλλαξε" @@ -234,34 +254,42 @@ msgstr "ΕνημÎÏωση" msgid "Updated" msgstr "ΕνημεÏώθηκε" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "Επιλογή εικόνας Ï€Ïοφίλ" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "Î Î¿Î»Ï Î±Î´Ïναμο συνθηματικό" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "ΑδÏναμο συνθηματικό" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "ÎœÎÏ„Ïιο συνθηματικό" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "Καλό συνθηματικό" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "Δυνατό συνθηματικό" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "ΑποκÏυπτογÏάφηση αÏχείων... ΠαÏακαλώ πεÏιμÎνετε, αυτό μποÏεί να πάÏει κάποιο χÏόνο." +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "διαγÏάφηκε" @@ -307,7 +335,7 @@ msgstr "Î ÏÎπει να δοθεί ÎγκυÏο συνθηματικό" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "Î Ïοειδοποίηση: Ο μητÏικός κατάλογος του χÏήστη \"{user}\" υπάÏχει ήδη" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "__όνομα_γλώσσας__" @@ -530,7 +558,7 @@ msgstr "ΕπιτÏÎπονται ειδοποιήσεις ηλεκτÏονικο #: templates/admin.php:254 msgid "Allow users to send mail notification for shared files" -msgstr "" +msgstr "ΕπιτÏÎψτε στους χÏήστες να στÎλνουν ειδοποιήσεις μÎσω ηλεκτÏÎ¿Î½Î¹ÎºÎ¿Ï Ï„Î±Ï‡Ï…Î´Ïομείου για κοινόχÏηστα αÏχεία" #: templates/admin.php:262 msgid "Set default expiration date" @@ -542,7 +570,7 @@ msgstr "" #: templates/admin.php:266 msgid "days" -msgstr "" +msgstr "ημÎÏες" #: templates/admin.php:269 msgid "Enforce expiration date" @@ -632,11 +660,11 @@ msgstr "ΠεÏισσότεÏα" msgid "Less" msgstr "ΛιγότεÏα" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "Έκδοση" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -800,18 +828,33 @@ msgid "" "WebDAV</a>" msgstr "ΧÏησιμοποιήστε αυτήν την διεÏθυνση για να αποκτήσετε <a href=\"%s\" target=\"_blank\">Ï€Ïόσβαση στα αÏχεία σας μÎσω WebDAV</a>" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "Η εφαÏμογή κÏυπτογÏάφησης δεν είναι πλÎον ενεÏγοποιημÎνη, παÏακαλώ αποκÏυπτογÏαφήστε όλα τα αÏχεία σας" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "Συνθηματικό εισόδου" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "ΑποκÏυπτογÏάφηση όλων των ΑÏχείων" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "Όνομα ΣÏνδεσης" diff --git a/l10n/el/user_ldap.po b/l10n/el/user_ldap.po index 17250f70bab..1e36ac4fa1c 100644 --- a/l10n/el/user_ldap.po +++ b/l10n/el/user_ldap.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/en@pirate/core.po b/l10n/en@pirate/core.po index 451338c4140..c30342ea728 100644 --- a/l10n/en@pirate/core.po +++ b/l10n/en@pirate/core.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:02+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/en@pirate/files_external.po b/l10n/en@pirate/files_external.po index 2b68139e501..899c448cefb 100644 --- a/l10n/en@pirate/files_external.po +++ b/l10n/en@pirate/files_external.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n" "MIME-Version: 1.0\n" @@ -197,29 +197,29 @@ msgstr "" msgid "Saved" msgstr "" -#: lib/config.php:598 +#: lib/config.php:597 msgid "<b>Note:</b> " msgstr "" -#: lib/config.php:608 +#: lib/config.php:607 msgid " and " msgstr "" -#: lib/config.php:630 +#: lib/config.php:629 #, php-format msgid "" "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting " "of %s is not possible. Please ask your system administrator to install it." msgstr "" -#: lib/config.php:632 +#: lib/config.php:631 #, php-format msgid "" "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of" " %s is not possible. Please ask your system administrator to install it." msgstr "" -#: lib/config.php:634 +#: lib/config.php:633 #, php-format msgid "" "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please" diff --git a/l10n/en@pirate/files_sharing.po b/l10n/en@pirate/files_sharing.po index 1a0792dafc6..383a876d9b7 100644 --- a/l10n/en@pirate/files_sharing.po +++ b/l10n/en@pirate/files_sharing.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-04 01:55-0400\n" -"PO-Revision-Date: 2014-05-03 06:12+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n" "MIME-Version: 1.0\n" @@ -62,11 +62,11 @@ msgstr "" msgid "Download" msgstr "Download" -#: templates/public.php:53 +#: templates/public.php:52 #, php-format msgid "Download %s" msgstr "" -#: templates/public.php:57 +#: templates/public.php:56 msgid "Direct link" msgstr "" diff --git a/l10n/en@pirate/settings.po b/l10n/en@pirate/settings.po index 249e5c1756f..499be02a591 100644 --- a/l10n/en@pirate/settings.po +++ b/l10n/en@pirate/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "" @@ -98,6 +98,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -114,6 +124,16 @@ msgstr "" msgid "Unable to delete user" msgstr "" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "" @@ -225,34 +245,42 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "" @@ -298,7 +326,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "" @@ -623,11 +651,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -791,18 +819,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "" diff --git a/l10n/en@pirate/user_ldap.po b/l10n/en@pirate/user_ldap.po index d009ac6f533..e365edad4b9 100644 --- a/l10n/en@pirate/user_ldap.po +++ b/l10n/en@pirate/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/en_GB/core.po b/l10n/en_GB/core.po index 293b14da5c3..a05c8107e39 100644 --- a/l10n/en_GB/core.po +++ b/l10n/en_GB/core.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:02+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/en_GB/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/en_GB/files_external.po b/l10n/en_GB/files_external.po index f809cd6fec8..1038e694742 100644 --- a/l10n/en_GB/files_external.po +++ b/l10n/en_GB/files_external.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 17:30+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: mnestis <transifex@mnestis.net>\n" "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/en_GB/)\n" "MIME-Version: 1.0\n" @@ -198,29 +198,29 @@ msgstr "Error configuring Google Drive storage" msgid "Saved" msgstr "Saved" -#: lib/config.php:598 +#: lib/config.php:597 msgid "<b>Note:</b> " msgstr "<b>Note:</b> " -#: lib/config.php:608 +#: lib/config.php:607 msgid " and " msgstr " and " -#: lib/config.php:630 +#: lib/config.php:629 #, php-format msgid "" "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting " "of %s is not possible. Please ask your system administrator to install it." msgstr "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." -#: lib/config.php:632 +#: lib/config.php:631 #, php-format msgid "" "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of" " %s is not possible. Please ask your system administrator to install it." msgstr "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." -#: lib/config.php:634 +#: lib/config.php:633 #, php-format msgid "" "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please" diff --git a/l10n/en_GB/files_sharing.po b/l10n/en_GB/files_sharing.po index a64162837a5..d79515f7023 100644 --- a/l10n/en_GB/files_sharing.po +++ b/l10n/en_GB/files_sharing.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-04 01:55-0400\n" -"PO-Revision-Date: 2014-05-03 06:12+0000\n" -"Last-Translator: I Robot\n" +"POT-Creation-Date: 2014-05-13 01:55-0400\n" +"PO-Revision-Date: 2014-05-12 11:15+0000\n" +"Last-Translator: mnestis <transifex@mnestis.net>\n" "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/en_GB/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -62,11 +62,11 @@ msgstr "For more info, please ask the person who sent this link." msgid "Download" msgstr "Download" -#: templates/public.php:53 +#: templates/public.php:52 #, php-format msgid "Download %s" msgstr "Download %s" -#: templates/public.php:57 +#: templates/public.php:56 msgid "Direct link" msgstr "Direct link" diff --git a/l10n/en_GB/settings.po b/l10n/en_GB/settings.po index d1cd7905e20..3b7c741141a 100644 --- a/l10n/en_GB/settings.po +++ b/l10n/en_GB/settings.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" -"Last-Translator: mnestis <transifex@mnestis.net>\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" +"Last-Translator: I Robot\n" "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/en_GB/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -52,7 +52,7 @@ msgstr "You need to set your user email before being able to send test emails." msgid "Send mode" msgstr "Send mode" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "Encryption" @@ -99,6 +99,16 @@ msgstr "Couldn't decrypt your files, please check your owncloud.log or ask your msgid "Couldn't decrypt your files, check your password and try again" msgstr "Couldn't decrypt your files, check your password and try again" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "Email saved" @@ -115,6 +125,16 @@ msgstr "Unable to delete group" msgid "Unable to delete user" msgstr "Unable to delete user" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "Language changed" @@ -226,34 +246,42 @@ msgstr "Update" msgid "Updated" msgstr "Updated" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "Select a profile picture" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "Very weak password" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "Weak password" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "So-so password" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "Good password" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "Strong password" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "Decrypting files... Please wait, this can take some time." +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "deleted" @@ -299,7 +327,7 @@ msgstr "A valid password must be provided" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "Warning: Home directory for user \"{user}\" already exists" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "English (British English)" @@ -624,11 +652,11 @@ msgstr "More" msgid "Less" msgstr "Less" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "Version" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -792,18 +820,33 @@ msgid "" "WebDAV</a>" msgstr "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "The encryption app is no longer enabled, please decrypt all your files" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "Log-in password" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "Decrypt all Files" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "Login Name" diff --git a/l10n/en_GB/user_ldap.po b/l10n/en_GB/user_ldap.po index 77f55301f80..39d2ec0fdf3 100644 --- a/l10n/en_GB/user_ldap.po +++ b/l10n/en_GB/user_ldap.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: mnestis <transifex@mnestis.net>\n" "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/en_GB/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/en_NZ/settings.po b/l10n/en_NZ/settings.po index 2d4a57c17ea..ffa919a6af4 100644 --- a/l10n/en_NZ/settings.po +++ b/l10n/en_NZ/settings.po @@ -7,9 +7,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-01 01:55-0400\n" -"PO-Revision-Date: 2013-04-26 08:00+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" +"Last-Translator: I Robot\n" "Language-Team: English (New Zealand) (http://www.transifex.com/projects/p/owncloud/language/en_NZ/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "" @@ -98,6 +98,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -114,6 +124,16 @@ msgstr "" msgid "Unable to delete user" msgstr "" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "" @@ -225,34 +245,42 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "" @@ -298,7 +326,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "" @@ -623,11 +651,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -791,18 +819,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "" diff --git a/l10n/eo/core.po b/l10n/eo/core.po index 87c2fbf530d..ff1ba90e2e2 100644 --- a/l10n/eo/core.po +++ b/l10n/eo/core.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:02+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/eo/files_external.po b/l10n/eo/files_external.po index 8f19c66f9db..acfa2b837b8 100644 --- a/l10n/eo/files_external.po +++ b/l10n/eo/files_external.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n" "MIME-Version: 1.0\n" @@ -197,29 +197,29 @@ msgstr "Eraro dum agordado de la memorservo Google Drive" msgid "Saved" msgstr "" -#: lib/config.php:598 +#: lib/config.php:597 msgid "<b>Note:</b> " msgstr "" -#: lib/config.php:608 +#: lib/config.php:607 msgid " and " msgstr "" -#: lib/config.php:630 +#: lib/config.php:629 #, php-format msgid "" "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting " "of %s is not possible. Please ask your system administrator to install it." msgstr "" -#: lib/config.php:632 +#: lib/config.php:631 #, php-format msgid "" "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of" " %s is not possible. Please ask your system administrator to install it." msgstr "" -#: lib/config.php:634 +#: lib/config.php:633 #, php-format msgid "" "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please" diff --git a/l10n/eo/files_sharing.po b/l10n/eo/files_sharing.po index b2c7e207da6..9a162557779 100644 --- a/l10n/eo/files_sharing.po +++ b/l10n/eo/files_sharing.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-04 01:55-0400\n" -"PO-Revision-Date: 2014-05-03 06:11+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n" "MIME-Version: 1.0\n" @@ -62,11 +62,11 @@ msgstr "Por plia informo, bonvolu peti al la persono, kiu sendis ĉi tiun ligilo msgid "Download" msgstr "ElÅuti" -#: templates/public.php:53 +#: templates/public.php:52 #, php-format msgid "Download %s" msgstr "" -#: templates/public.php:57 +#: templates/public.php:56 msgid "Direct link" msgstr "Direkta ligilo" diff --git a/l10n/eo/settings.po b/l10n/eo/settings.po index 4e36b0057b4..6c9c1ef9995 100644 --- a/l10n/eo/settings.po +++ b/l10n/eo/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "Ĉifrado" @@ -98,6 +98,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "La retpoÅtadreso konserviÄis" @@ -114,6 +124,16 @@ msgstr "Ne eblis forigi la grupon" msgid "Unable to delete user" msgstr "Ne eblis forigi la uzanton" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "La lingvo estas ÅanÄita" @@ -225,34 +245,42 @@ msgstr "Äœisdatigi" msgid "Updated" msgstr "" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "forigita" @@ -298,7 +326,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "Esperanto" @@ -623,11 +651,11 @@ msgstr "Pli" msgid "Less" msgstr "Malpli" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "Eldono" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -791,18 +819,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "Ensaluti" diff --git a/l10n/eo/user_ldap.po b/l10n/eo/user_ldap.po index d26b55c5400..d7c0ae78715 100644 --- a/l10n/eo/user_ldap.po +++ b/l10n/eo/user_ldap.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/es/core.po b/l10n/es/core.po index 992ba029446..bb89a591716 100644 --- a/l10n/es/core.po +++ b/l10n/es/core.po @@ -6,7 +6,7 @@ # Art O. Pal <artopal@fastmail.fm>, 2013-2014 # ggam <ggam@brainleakage.com>, 2013 # I Robot, 2013 -# juanman <juanma@kde.org.ar>, 2013 +# juanman <juanma@kde.org.ar>, 2013-2014 # msoko <sokolovitch@yahoo.com>, 2013 # pablomillaquen <pablomillaquen@gmail.com>, 2013 # Raul Fernandez Garcia <raulfg3@gmail.com>, 2013 @@ -21,9 +21,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:02+0000\n" -"Last-Translator: I Robot\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" +"Last-Translator: juanman <juanma@kde.org.ar>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -158,19 +158,19 @@ msgstr "Guardando..." #: js/js.js:1240 msgid "seconds ago" -msgstr "segundos antes" +msgstr "hace segundos" #: js/js.js:1241 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "Hace %n minuto" -msgstr[1] "Hace %n minutos" +msgstr[1] "hace %n minutos" #: js/js.js:1242 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "Hace %n hora" -msgstr[1] "Hace %n horas" +msgstr[1] "hace %n horas" #: js/js.js:1243 msgid "today" @@ -184,7 +184,7 @@ msgstr "ayer" msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "Hace %n dÃa" -msgstr[1] "Hace %n dÃas" +msgstr[1] "hace %n dÃas" #: js/js.js:1246 msgid "last month" @@ -194,7 +194,7 @@ msgstr "el mes pasado" msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "Hace %n mes" -msgstr[1] "Hace %n meses" +msgstr[1] "hace %n meses" #: js/js.js:1248 msgid "last year" @@ -202,7 +202,7 @@ msgstr "el año pasado" #: js/js.js:1249 msgid "years ago" -msgstr "años antes" +msgstr "hace años" #: js/oc-dialogs.js:125 msgid "Choose" diff --git a/l10n/es/files_external.po b/l10n/es/files_external.po index 69ff3f8d78d..63eaad0a01e 100644 --- a/l10n/es/files_external.po +++ b/l10n/es/files_external.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-01 01:55-0400\n" -"PO-Revision-Date: 2014-04-30 11:50+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: mreyesca <mreyesca@luthcueit.onmicrosoft.com>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n" "MIME-Version: 1.0\n" @@ -200,29 +200,29 @@ msgstr "Error configurando el almacenamiento de Google Drive" msgid "Saved" msgstr "Guardado" -#: lib/config.php:598 +#: lib/config.php:597 msgid "<b>Note:</b> " msgstr "<b>Nota:</b> " -#: lib/config.php:608 +#: lib/config.php:607 msgid " and " msgstr "y" -#: lib/config.php:630 +#: lib/config.php:629 #, php-format msgid "" "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting " "of %s is not possible. Please ask your system administrator to install it." msgstr "<b>Nota:</b> El soporte de cURL en PHP no está activado o instalado. No se puede montar %s. PÃdale al administrador de sistema que lo instale." -#: lib/config.php:632 +#: lib/config.php:631 #, php-format msgid "" "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of" " %s is not possible. Please ask your system administrator to install it." msgstr "<b>Nota:</b> El soporte de FTP en PHP no está activado o instalado. No se puede montar %s. PÃdale al administrador de sistema que lo instale." -#: lib/config.php:634 +#: lib/config.php:633 #, php-format msgid "" "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please" diff --git a/l10n/es/files_sharing.po b/l10n/es/files_sharing.po index 1d9b8f9f779..2cb549e8208 100644 --- a/l10n/es/files_sharing.po +++ b/l10n/es/files_sharing.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-04 01:55-0400\n" -"PO-Revision-Date: 2014-05-03 06:11+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n" "MIME-Version: 1.0\n" @@ -65,11 +65,11 @@ msgstr "Para mayor información, contacte a la persona que le envió el enlace." msgid "Download" msgstr "Descargar" -#: templates/public.php:53 +#: templates/public.php:52 #, php-format msgid "Download %s" msgstr "Descargar %s" -#: templates/public.php:57 +#: templates/public.php:56 msgid "Direct link" msgstr "Enlace directo" diff --git a/l10n/es/lib.po b/l10n/es/lib.po index ee9073a531a..09abaa94d29 100644 --- a/l10n/es/lib.po +++ b/l10n/es/lib.po @@ -16,8 +16,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-01 01:55-0400\n" -"PO-Revision-Date: 2014-04-30 11:30+0000\n" +"POT-Creation-Date: 2014-05-10 01:55-0400\n" +"PO-Revision-Date: 2014-05-09 07:00+0000\n" "Last-Translator: mreyesca <mreyesca@luthcueit.onmicrosoft.com>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n" "MIME-Version: 1.0\n" @@ -26,11 +26,11 @@ msgstr "" "Language: es\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: base.php:712 +#: base.php:713 msgid "You are accessing the server from an untrusted domain." msgstr "Está accediendo al servidor desde un dominio inseguro." -#: base.php:713 +#: base.php:714 msgid "" "Please contact your administrator. If you are an administrator of this " "instance, configure the \"trusted_domain\" setting in config/config.php. An " @@ -85,23 +85,23 @@ msgstr "Imagen inválida" msgid "web services under your control" msgstr "Servicios web bajo su control" -#: private/files.php:232 +#: private/files.php:235 msgid "ZIP download is turned off." msgstr "La descarga en ZIP está desactivada." -#: private/files.php:233 +#: private/files.php:236 msgid "Files need to be downloaded one by one." msgstr "Los archivos deben ser descargados uno por uno." -#: private/files.php:234 private/files.php:261 +#: private/files.php:237 private/files.php:264 msgid "Back to Files" msgstr "Volver a Archivos" -#: private/files.php:259 +#: private/files.php:262 msgid "Selected files too large to generate zip file." msgstr "Los archivos seleccionados son demasiado grandes para generar el archivo zip." -#: private/files.php:260 +#: private/files.php:263 msgid "" "Please download the files separately in smaller chunks or kindly ask your " "administrator." @@ -351,63 +351,63 @@ msgstr "Compartiendo %s ha fallado, ya que compartir con enlaces no está permit msgid "Share type %s is not valid for %s" msgstr "Compartir tipo %s no es válido para %s" -#: private/share/share.php:773 +#: private/share/share.php:774 #, php-format msgid "" "Setting permissions for %s failed, because the permissions exceed " "permissions granted to %s" msgstr "Configuración de permisos para %s ha fallado, ya que los permisos superan los permisos dados a %s" -#: private/share/share.php:834 +#: private/share/share.php:835 #, php-format msgid "Setting permissions for %s failed, because the item was not found" msgstr "Configuración de permisos para %s ha fallado, ya que el elemento no fue encontrado" -#: private/share/share.php:940 +#: private/share/share.php:941 #, php-format msgid "Sharing backend %s must implement the interface OCP\\Share_Backend" msgstr "El motor compartido %s debe implementar la interfaz OCP\\Share_Backend" -#: private/share/share.php:947 +#: private/share/share.php:948 #, php-format msgid "Sharing backend %s not found" msgstr "El motor compartido %s no se ha encontrado" -#: private/share/share.php:953 +#: private/share/share.php:954 #, php-format msgid "Sharing backend for %s not found" msgstr "Motor compartido para %s no encontrado" -#: private/share/share.php:1367 +#: private/share/share.php:1368 #, php-format msgid "Sharing %s failed, because the user %s is the original sharer" msgstr "Compartiendo %s ha fallado, ya que el usuario %s es el compartidor original" -#: private/share/share.php:1376 +#: private/share/share.php:1377 #, php-format msgid "" "Sharing %s failed, because the permissions exceed permissions granted to %s" msgstr "Compartiendo %s ha fallado, ya que los permisos superan los permisos otorgados a %s" -#: private/share/share.php:1391 +#: private/share/share.php:1392 #, php-format msgid "Sharing %s failed, because resharing is not allowed" msgstr "Compartiendo %s ha fallado, ya que volver a compartir no está permitido" -#: private/share/share.php:1403 +#: private/share/share.php:1404 #, php-format msgid "" "Sharing %s failed, because the sharing backend for %s could not find its " "source" msgstr "Compartir %s falló porque el motor compartido para %s podrÃa no encontrar su origen" -#: private/share/share.php:1417 +#: private/share/share.php:1418 #, php-format msgid "" "Sharing %s failed, because the file could not be found in the file cache" msgstr "Compartiendo %s ha fallado, ya que el archivo no pudo ser encontrado en el cache de archivo" -#: private/tags.php:193 +#: private/tags.php:183 #, php-format msgid "Could not find category \"%s\"" msgstr "No puede encontrar la categoria \"%s\"" diff --git a/l10n/es/settings.po b/l10n/es/settings.po index 75eb846abd8..3ef0d924efc 100644 --- a/l10n/es/settings.po +++ b/l10n/es/settings.po @@ -22,9 +22,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" -"Last-Translator: Art O. Pal <artopal@fastmail.fm>\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" +"Last-Translator: I Robot\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -66,7 +66,7 @@ msgstr "Tiene que configurar su dirección de correo electrónico antes de poder msgid "Send mode" msgstr "Modo de envÃo" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "Cifrado" @@ -113,6 +113,16 @@ msgstr "No se pudo descifrar sus archivos. Revise el owncloud.log o consulte con msgid "Couldn't decrypt your files, check your password and try again" msgstr "No se pudo descifrar sus archivos. Revise su contraseña e inténtelo de nuevo" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "Correo electrónico guardado" @@ -129,6 +139,16 @@ msgstr "No se pudo eliminar el grupo" msgid "Unable to delete user" msgstr "No se pudo eliminar el usuario" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "Idioma cambiado" @@ -240,34 +260,42 @@ msgstr "Actualizar" msgid "Updated" msgstr "Actualizado" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "Seleccionar una imagen de perfil" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "Contraseña muy débil" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "Contraseña débil" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "Contraseña pasable" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "Contraseña buena" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "Contraseña muy buena" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "Descifrando archivos... Espere por favor, esto puede llevar algo de tiempo." +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "eliminado" @@ -313,7 +341,7 @@ msgstr "Se debe proporcionar una contraseña válida" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "Atención: el directorio de inicio para el usuario \"{user}\" ya existe." -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "Castellano" @@ -638,11 +666,11 @@ msgstr "Más" msgid "Less" msgstr "Menos" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "Versión" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -806,18 +834,33 @@ msgid "" "WebDAV</a>" msgstr "Utilice esta dirección para<a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">acceder a sus archivos a través de WebDAV</a>" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "La aplicación de cifrado ya no está activada, descifre todos sus archivos" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "Contraseña de acceso" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "Descifrar archivos" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "Nombre de usuario" diff --git a/l10n/es/user_ldap.po b/l10n/es/user_ldap.po index d0356c5d21a..49e9298e276 100644 --- a/l10n/es/user_ldap.po +++ b/l10n/es/user_ldap.po @@ -18,8 +18,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: plaguna <laguna.sanchez@gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/es_AR/core.po b/l10n/es_AR/core.po index 6686176077b..9b9c52050e3 100644 --- a/l10n/es_AR/core.po +++ b/l10n/es_AR/core.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:02+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/es_AR/files_external.po b/l10n/es_AR/files_external.po index c6c11a01dcb..ce7eddf8b5c 100644 --- a/l10n/es_AR/files_external.po +++ b/l10n/es_AR/files_external.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n" "MIME-Version: 1.0\n" @@ -198,29 +198,29 @@ msgstr "Error al configurar el almacenamiento de Google Drive" msgid "Saved" msgstr "Guardado" -#: lib/config.php:598 +#: lib/config.php:597 msgid "<b>Note:</b> " msgstr "" -#: lib/config.php:608 +#: lib/config.php:607 msgid " and " msgstr "" -#: lib/config.php:630 +#: lib/config.php:629 #, php-format msgid "" "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting " "of %s is not possible. Please ask your system administrator to install it." msgstr "" -#: lib/config.php:632 +#: lib/config.php:631 #, php-format msgid "" "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of" " %s is not possible. Please ask your system administrator to install it." msgstr "" -#: lib/config.php:634 +#: lib/config.php:633 #, php-format msgid "" "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please" diff --git a/l10n/es_AR/files_sharing.po b/l10n/es_AR/files_sharing.po index fb4a0b5bf37..b0acabd3958 100644 --- a/l10n/es_AR/files_sharing.po +++ b/l10n/es_AR/files_sharing.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-04 01:55-0400\n" -"PO-Revision-Date: 2014-05-03 06:11+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n" "MIME-Version: 1.0\n" @@ -63,11 +63,11 @@ msgstr "Para mayor información, contactá a la persona que te mandó el enlace. msgid "Download" msgstr "Descargar" -#: templates/public.php:53 +#: templates/public.php:52 #, php-format msgid "Download %s" msgstr "" -#: templates/public.php:57 +#: templates/public.php:56 msgid "Direct link" msgstr "VÃnculo directo" diff --git a/l10n/es_AR/settings.po b/l10n/es_AR/settings.po index 5ba85ed7399..5bdf707f1d6 100644 --- a/l10n/es_AR/settings.po +++ b/l10n/es_AR/settings.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n" "MIME-Version: 1.0\n" @@ -55,7 +55,7 @@ msgstr "Necesita especificar el usuario de correo electrónico antes de poder en msgid "Send mode" msgstr "Modo de envio" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "Encriptación" @@ -102,6 +102,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "e-mail guardado" @@ -118,6 +128,16 @@ msgstr "No fue posible borrar el grupo" msgid "Unable to delete user" msgstr "No fue posible borrar el usuario" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "Idioma cambiado" @@ -229,34 +249,42 @@ msgstr "Actualizar" msgid "Updated" msgstr "Actualizado" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "Seleccionar una imágen de perfil" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "Contraseña muy débil." -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "Contraseña débil." -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "Contraseña de nivel medio. " -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "Buena contraseña. " -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "Contraseña fuerte." -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "Desencriptando archivos... Por favor espere, esto puede tardar." +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "borrado" @@ -302,7 +330,7 @@ msgstr "Debe ingresar una contraseña válida" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "Advertencia: El directorio Home del usuario \"{user}\" ya existe" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "Castellano (Argentina)" @@ -627,11 +655,11 @@ msgstr "Más" msgid "Less" msgstr "Menos" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "Versión" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -795,18 +823,33 @@ msgid "" "WebDAV</a>" msgstr "Usar esta dirección para <a href=\"%s\" target=\"_blank\">acceder a tus archivos vÃa WebDAV</a>" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "La aplicación de encriptación ya no está habilidata, por favor desencripte todos sus archivos." -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "Clave de acceso" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "Desencriptar todos los archivos" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "Nombre de Usuario" diff --git a/l10n/es_AR/user_ldap.po b/l10n/es_AR/user_ldap.po index 530a107a141..bb40a808548 100644 --- a/l10n/es_AR/user_ldap.po +++ b/l10n/es_AR/user_ldap.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: Javier Victor Mariano Bruno <koryyyy@gmail.com>\n" "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/es_CL/core.po b/l10n/es_CL/core.po index 7db6df1ddba..8bf1d3bba59 100644 --- a/l10n/es_CL/core.po +++ b/l10n/es_CL/core.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:02+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Spanish (Chile) (http://www.transifex.com/projects/p/owncloud/language/es_CL/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/es_CL/files_external.po b/l10n/es_CL/files_external.po index 280c1810741..05cdad5dd37 100644 --- a/l10n/es_CL/files_external.po +++ b/l10n/es_CL/files_external.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Spanish (Chile) (http://www.transifex.com/projects/p/owncloud/language/es_CL/)\n" "MIME-Version: 1.0\n" @@ -197,29 +197,29 @@ msgstr "" msgid "Saved" msgstr "" -#: lib/config.php:598 +#: lib/config.php:597 msgid "<b>Note:</b> " msgstr "" -#: lib/config.php:608 +#: lib/config.php:607 msgid " and " msgstr "" -#: lib/config.php:630 +#: lib/config.php:629 #, php-format msgid "" "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting " "of %s is not possible. Please ask your system administrator to install it." msgstr "" -#: lib/config.php:632 +#: lib/config.php:631 #, php-format msgid "" "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of" " %s is not possible. Please ask your system administrator to install it." msgstr "" -#: lib/config.php:634 +#: lib/config.php:633 #, php-format msgid "" "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please" diff --git a/l10n/es_CL/files_sharing.po b/l10n/es_CL/files_sharing.po index e29e7d54feb..74f45fbb7be 100644 --- a/l10n/es_CL/files_sharing.po +++ b/l10n/es_CL/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-04 01:55-0400\n" -"PO-Revision-Date: 2014-05-03 06:11+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Spanish (Chile) (http://www.transifex.com/projects/p/owncloud/language/es_CL/)\n" "MIME-Version: 1.0\n" @@ -61,11 +61,11 @@ msgstr "" msgid "Download" msgstr "Descargar" -#: templates/public.php:53 +#: templates/public.php:52 #, php-format msgid "Download %s" msgstr "" -#: templates/public.php:57 +#: templates/public.php:56 msgid "Direct link" msgstr "" diff --git a/l10n/es_CL/settings.po b/l10n/es_CL/settings.po index cdd91a9d5cf..48192c10266 100644 --- a/l10n/es_CL/settings.po +++ b/l10n/es_CL/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Spanish (Chile) (http://www.transifex.com/projects/p/owncloud/language/es_CL/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "" @@ -98,6 +98,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -114,6 +124,16 @@ msgstr "" msgid "Unable to delete user" msgstr "" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "" @@ -225,34 +245,42 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "" @@ -298,7 +326,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "" @@ -623,11 +651,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -791,18 +819,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "" diff --git a/l10n/es_CL/user_ldap.po b/l10n/es_CL/user_ldap.po index 69d9e8ceab2..44690878160 100644 --- a/l10n/es_CL/user_ldap.po +++ b/l10n/es_CL/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Spanish (Chile) (http://www.transifex.com/projects/p/owncloud/language/es_CL/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/es_CO/core.po b/l10n/es_CO/core.po new file mode 100644 index 00000000000..d08261ee295 --- /dev/null +++ b/l10n/es_CO/core.po @@ -0,0 +1,805 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: ownCloud\n" +"Report-Msgid-Bugs-To: translations@owncloud.org\n" +"POT-Creation-Date: 2014-05-10 01:55-0400\n" +"PO-Revision-Date: 2013-04-26 08:00+0000\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: Spanish (Colombia) (http://www.transifex.com/projects/p/owncloud/language/es_CO/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: es_CO\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ajax/share.php:87 +msgid "Expiration date is in the past." +msgstr "" + +#: ajax/share.php:119 ajax/share.php:161 +#, php-format +msgid "Couldn't send mail to following users: %s " +msgstr "" + +#: ajax/update.php:10 +msgid "Turned on maintenance mode" +msgstr "" + +#: ajax/update.php:13 +msgid "Turned off maintenance mode" +msgstr "" + +#: ajax/update.php:16 +msgid "Updated database" +msgstr "" + +#: avatar/controller.php:62 +msgid "No image or file provided" +msgstr "" + +#: avatar/controller.php:81 +msgid "Unknown filetype" +msgstr "" + +#: avatar/controller.php:85 +msgid "Invalid image" +msgstr "" + +#: avatar/controller.php:115 avatar/controller.php:142 +msgid "No temporary profile picture available, try again" +msgstr "" + +#: avatar/controller.php:135 +msgid "No crop data provided" +msgstr "" + +#: js/config.php:36 +msgid "Sunday" +msgstr "" + +#: js/config.php:37 +msgid "Monday" +msgstr "" + +#: js/config.php:38 +msgid "Tuesday" +msgstr "" + +#: js/config.php:39 +msgid "Wednesday" +msgstr "" + +#: js/config.php:40 +msgid "Thursday" +msgstr "" + +#: js/config.php:41 +msgid "Friday" +msgstr "" + +#: js/config.php:42 +msgid "Saturday" +msgstr "" + +#: js/config.php:47 +msgid "January" +msgstr "" + +#: js/config.php:48 +msgid "February" +msgstr "" + +#: js/config.php:49 +msgid "March" +msgstr "" + +#: js/config.php:50 +msgid "April" +msgstr "" + +#: js/config.php:51 +msgid "May" +msgstr "" + +#: js/config.php:52 +msgid "June" +msgstr "" + +#: js/config.php:53 +msgid "July" +msgstr "" + +#: js/config.php:54 +msgid "August" +msgstr "" + +#: js/config.php:55 +msgid "September" +msgstr "" + +#: js/config.php:56 +msgid "October" +msgstr "" + +#: js/config.php:57 +msgid "November" +msgstr "" + +#: js/config.php:58 +msgid "December" +msgstr "" + +#: js/js.js:483 +msgid "Settings" +msgstr "" + +#: js/js.js:583 +msgid "Saving..." +msgstr "" + +#: js/js.js:1240 +msgid "seconds ago" +msgstr "" + +#: js/js.js:1241 +msgid "%n minute ago" +msgid_plural "%n minutes ago" +msgstr[0] "" +msgstr[1] "" + +#: js/js.js:1242 +msgid "%n hour ago" +msgid_plural "%n hours ago" +msgstr[0] "" +msgstr[1] "" + +#: js/js.js:1243 +msgid "today" +msgstr "" + +#: js/js.js:1244 +msgid "yesterday" +msgstr "" + +#: js/js.js:1245 +msgid "%n day ago" +msgid_plural "%n days ago" +msgstr[0] "" +msgstr[1] "" + +#: js/js.js:1246 +msgid "last month" +msgstr "" + +#: js/js.js:1247 +msgid "%n month ago" +msgid_plural "%n months ago" +msgstr[0] "" +msgstr[1] "" + +#: js/js.js:1248 +msgid "last year" +msgstr "" + +#: js/js.js:1249 +msgid "years ago" +msgstr "" + +#: js/oc-dialogs.js:125 +msgid "Choose" +msgstr "" + +#: js/oc-dialogs.js:151 +msgid "Error loading file picker template: {error}" +msgstr "" + +#: js/oc-dialogs.js:177 +msgid "Yes" +msgstr "" + +#: js/oc-dialogs.js:187 +msgid "No" +msgstr "" + +#: js/oc-dialogs.js:204 +msgid "Ok" +msgstr "" + +#: js/oc-dialogs.js:224 +msgid "Error loading message template: {error}" +msgstr "" + +#: js/oc-dialogs.js:352 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" + +#: js/oc-dialogs.js:366 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:372 +msgid "New Files" +msgstr "" + +#: js/oc-dialogs.js:373 +msgid "Already existing files" +msgstr "" + +#: js/oc-dialogs.js:375 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:384 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:394 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:441 js/oc-dialogs.js:454 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:444 js/oc-dialogs.js:458 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:466 +msgid "Error loading file exists template" +msgstr "" + +#: js/setup.js:84 +msgid "Very weak password" +msgstr "" + +#: js/setup.js:85 +msgid "Weak password" +msgstr "" + +#: js/setup.js:86 +msgid "So-so password" +msgstr "" + +#: js/setup.js:87 +msgid "Good password" +msgstr "" + +#: js/setup.js:88 +msgid "Strong password" +msgstr "" + +#: js/share.js:51 js/share.js:66 js/share.js:106 +msgid "Shared" +msgstr "" + +#: js/share.js:109 +msgid "Share" +msgstr "" + +#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734 +#: templates/installation.php:10 +msgid "Error" +msgstr "" + +#: js/share.js:160 js/share.js:790 +msgid "Error while sharing" +msgstr "" + +#: js/share.js:171 +msgid "Error while unsharing" +msgstr "" + +#: js/share.js:178 +msgid "Error while changing permissions" +msgstr "" + +#: js/share.js:188 +msgid "Shared with you and the group {group} by {owner}" +msgstr "" + +#: js/share.js:190 +msgid "Shared with you by {owner}" +msgstr "" + +#: js/share.js:214 +msgid "Share with user or group …" +msgstr "" + +#: js/share.js:220 +msgid "Share link" +msgstr "" + +#: js/share.js:223 +msgid "Password protect" +msgstr "" + +#: js/share.js:225 templates/installation.php:60 templates/login.php:40 +msgid "Password" +msgstr "" + +#: js/share.js:230 +msgid "Allow Public Upload" +msgstr "" + +#: js/share.js:234 +msgid "Email link to person" +msgstr "" + +#: js/share.js:235 +msgid "Send" +msgstr "" + +#: js/share.js:240 +msgid "Set expiration date" +msgstr "" + +#: js/share.js:241 +msgid "Expiration date" +msgstr "" + +#: js/share.js:277 +msgid "Share via email:" +msgstr "" + +#: js/share.js:280 +msgid "No people found" +msgstr "" + +#: js/share.js:324 js/share.js:385 +msgid "group" +msgstr "" + +#: js/share.js:357 +msgid "Resharing is not allowed" +msgstr "" + +#: js/share.js:401 +msgid "Shared in {item} with {user}" +msgstr "" + +#: js/share.js:423 +msgid "Unshare" +msgstr "" + +#: js/share.js:431 +msgid "notify by email" +msgstr "" + +#: js/share.js:434 +msgid "can edit" +msgstr "" + +#: js/share.js:436 +msgid "access control" +msgstr "" + +#: js/share.js:439 +msgid "create" +msgstr "" + +#: js/share.js:442 +msgid "update" +msgstr "" + +#: js/share.js:445 +msgid "delete" +msgstr "" + +#: js/share.js:448 +msgid "share" +msgstr "" + +#: js/share.js:721 +msgid "Password protected" +msgstr "" + +#: js/share.js:734 +msgid "Error unsetting expiration date" +msgstr "" + +#: js/share.js:752 +msgid "Error setting expiration date" +msgstr "" + +#: js/share.js:777 +msgid "Sending ..." +msgstr "" + +#: js/share.js:788 +msgid "Email sent" +msgstr "" + +#: js/share.js:812 +msgid "Warning" +msgstr "" + +#: js/tags.js:4 +msgid "The object type is not specified." +msgstr "" + +#: js/tags.js:13 +msgid "Enter new" +msgstr "" + +#: js/tags.js:27 +msgid "Delete" +msgstr "" + +#: js/tags.js:31 +msgid "Add" +msgstr "" + +#: js/tags.js:39 +msgid "Edit tags" +msgstr "" + +#: js/tags.js:57 +msgid "Error loading dialog template: {error}" +msgstr "" + +#: js/tags.js:264 +msgid "No tags selected for deletion." +msgstr "" + +#: js/update.js:8 +msgid "Please reload the page." +msgstr "" + +#: js/update.js:17 +msgid "" +"The update was unsuccessful. Please report this issue to the <a " +"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud " +"community</a>." +msgstr "" + +#: js/update.js:21 +msgid "The update was successful. Redirecting you to ownCloud now." +msgstr "" + +#: lostpassword/controller.php:70 +#, php-format +msgid "%s password reset" +msgstr "" + +#: lostpassword/controller.php:72 +msgid "" +"A problem has occurred whilst sending the email, please contact your " +"administrator." +msgstr "" + +#: lostpassword/templates/email.php:2 +msgid "Use the following link to reset your password: {link}" +msgstr "" + +#: lostpassword/templates/lostpassword.php:7 +msgid "" +"The link to reset your password has been sent to your email.<br>If you do " +"not receive it within a reasonable amount of time, check your spam/junk " +"folders.<br>If it is not there ask your local administrator ." +msgstr "" + +#: lostpassword/templates/lostpassword.php:15 +msgid "Request failed!<br>Did you make sure your email/username was right?" +msgstr "" + +#: lostpassword/templates/lostpassword.php:18 +msgid "You will receive a link to reset your password via Email." +msgstr "" + +#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53 +#: templates/login.php:32 +msgid "Username" +msgstr "" + +#: lostpassword/templates/lostpassword.php:25 +msgid "" +"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?" +msgstr "" + +#: lostpassword/templates/lostpassword.php:27 +msgid "Yes, I really want to reset my password now" +msgstr "" + +#: lostpassword/templates/lostpassword.php:30 +msgid "Reset" +msgstr "" + +#: lostpassword/templates/resetpassword.php:4 +msgid "Your password was reset" +msgstr "" + +#: lostpassword/templates/resetpassword.php:5 +msgid "To login page" +msgstr "" + +#: lostpassword/templates/resetpassword.php:8 +msgid "New password" +msgstr "" + +#: lostpassword/templates/resetpassword.php:11 +msgid "Reset password" +msgstr "" + +#: setup/controller.php:140 +#, php-format +msgid "" +"Mac OS X is not supported and %s will not work properly on this platform. " +"Use it at your own risk! " +msgstr "" + +#: setup/controller.php:144 +msgid "" +"For the best results, please consider using a GNU/Linux server instead." +msgstr "" + +#: strings.php:5 +msgid "Personal" +msgstr "" + +#: strings.php:6 +msgid "Users" +msgstr "" + +#: strings.php:7 templates/layout.user.php:116 +msgid "Apps" +msgstr "" + +#: strings.php:8 +msgid "Admin" +msgstr "" + +#: strings.php:9 +msgid "Help" +msgstr "" + +#: tags/controller.php:22 +msgid "Error loading tags" +msgstr "" + +#: tags/controller.php:48 +msgid "Tag already exists" +msgstr "" + +#: tags/controller.php:64 +msgid "Error deleting tag(s)" +msgstr "" + +#: tags/controller.php:75 +msgid "Error tagging" +msgstr "" + +#: tags/controller.php:86 +msgid "Error untagging" +msgstr "" + +#: tags/controller.php:97 +msgid "Error favoriting" +msgstr "" + +#: tags/controller.php:108 +msgid "Error unfavoriting" +msgstr "" + +#: templates/403.php:12 +msgid "Access forbidden" +msgstr "" + +#: templates/404.php:15 +msgid "Cloud not found" +msgstr "" + +#: templates/altmail.php:2 +#, php-format +msgid "" +"Hey there,\n" +"\n" +"just letting you know that %s shared %s with you.\n" +"View it: %s\n" +"\n" +msgstr "" + +#: templates/altmail.php:4 templates/mail.php:17 +#, php-format +msgid "The share will expire on %s." +msgstr "" + +#: templates/altmail.php:7 templates/mail.php:20 +msgid "Cheers!" +msgstr "" + +#: templates/installation.php:25 templates/installation.php:32 +#: templates/installation.php:39 +msgid "Security Warning" +msgstr "" + +#: templates/installation.php:26 +msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" +msgstr "" + +#: templates/installation.php:27 +#, php-format +msgid "Please update your PHP installation to use %s securely." +msgstr "" + +#: templates/installation.php:33 +msgid "" +"No secure random number generator is available, please enable the PHP " +"OpenSSL extension." +msgstr "" + +#: templates/installation.php:34 +msgid "" +"Without a secure random number generator an attacker may be able to predict " +"password reset tokens and take over your account." +msgstr "" + +#: templates/installation.php:40 +msgid "" +"Your data directory and files are probably accessible from the internet " +"because the .htaccess file does not work." +msgstr "" + +#: templates/installation.php:42 +#, php-format +msgid "" +"For information how to properly configure your server, please see the <a " +"href=\"%s\" target=\"_blank\">documentation</a>." +msgstr "" + +#: templates/installation.php:48 +msgid "Create an <strong>admin account</strong>" +msgstr "" + +#: templates/installation.php:70 +msgid "Storage & database" +msgstr "" + +#: templates/installation.php:77 +msgid "Data folder" +msgstr "" + +#: templates/installation.php:90 +msgid "Configure the database" +msgstr "" + +#: templates/installation.php:94 +msgid "will be used" +msgstr "" + +#: templates/installation.php:109 +msgid "Database user" +msgstr "" + +#: templates/installation.php:118 +msgid "Database password" +msgstr "" + +#: templates/installation.php:123 +msgid "Database name" +msgstr "" + +#: templates/installation.php:132 +msgid "Database tablespace" +msgstr "" + +#: templates/installation.php:140 +msgid "Database host" +msgstr "" + +#: templates/installation.php:150 +msgid "Finish setup" +msgstr "" + +#: templates/installation.php:150 +msgid "Finishing …" +msgstr "" + +#: templates/layout.user.php:40 +msgid "" +"This application requires JavaScript to be enabled for correct operation. " +"Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable " +"JavaScript</a> and re-load this interface." +msgstr "" + +#: templates/layout.user.php:44 +#, php-format +msgid "%s is available. Get more information on how to update." +msgstr "" + +#: templates/layout.user.php:74 templates/singleuser.user.php:8 +msgid "Log out" +msgstr "" + +#: templates/login.php:9 +msgid "Automatic logon rejected!" +msgstr "" + +#: templates/login.php:10 +msgid "" +"If you did not change your password recently, your account may be " +"compromised!" +msgstr "" + +#: templates/login.php:12 +msgid "Please change your password to secure your account again." +msgstr "" + +#: templates/login.php:17 +msgid "Server side authentication failed!" +msgstr "" + +#: templates/login.php:18 +msgid "Please contact your administrator." +msgstr "" + +#: templates/login.php:46 +msgid "Lost your password?" +msgstr "" + +#: templates/login.php:51 +msgid "remember" +msgstr "" + +#: templates/login.php:54 +msgid "Log in" +msgstr "" + +#: templates/login.php:60 +msgid "Alternative Logins" +msgstr "" + +#: templates/mail.php:15 +#, php-format +msgid "" +"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> " +"with you.<br><a href=\"%s\">View it!</a><br><br>" +msgstr "" + +#: templates/singleuser.user.php:3 +msgid "This ownCloud instance is currently in single user mode." +msgstr "" + +#: templates/singleuser.user.php:4 +msgid "This means only administrators can use the instance." +msgstr "" + +#: templates/singleuser.user.php:5 templates/update.user.php:5 +msgid "" +"Contact your system administrator if this message persists or appeared " +"unexpectedly." +msgstr "" + +#: templates/singleuser.user.php:7 templates/update.user.php:6 +msgid "Thank you for your patience." +msgstr "" + +#: templates/update.admin.php:3 +#, php-format +msgid "Updating ownCloud to version %s, this may take a while." +msgstr "" + +#: templates/update.user.php:3 +msgid "" +"This ownCloud instance is currently being updated, which may take a while." +msgstr "" + +#: templates/update.user.php:4 +msgid "Please reload this page after a short time to continue using ownCloud." +msgstr "" diff --git a/l10n/es_CO/files.po b/l10n/es_CO/files.po new file mode 100644 index 00000000000..ba9b87476d6 --- /dev/null +++ b/l10n/es_CO/files.po @@ -0,0 +1,405 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: ownCloud\n" +"Report-Msgid-Bugs-To: translations@owncloud.org\n" +"POT-Creation-Date: 2014-05-10 01:55-0400\n" +"PO-Revision-Date: 2013-04-26 08:00+0000\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: Spanish (Colombia) (http://www.transifex.com/projects/p/owncloud/language/es_CO/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: es_CO\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ajax/move.php:15 +#, php-format +msgid "Could not move %s - File with this name already exists" +msgstr "" + +#: ajax/move.php:25 ajax/move.php:28 +#, php-format +msgid "Could not move %s" +msgstr "" + +#: ajax/newfile.php:58 js/files.js:96 +msgid "File name cannot be empty." +msgstr "" + +#: ajax/newfile.php:63 +#, php-format +msgid "\"%s\" is an invalid file name." +msgstr "" + +#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103 +msgid "" +"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " +"allowed." +msgstr "" + +#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155 +#: lib/app.php:60 +msgid "The target folder has been moved or deleted." +msgstr "" + +#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69 +#, php-format +msgid "" +"The name %s is already used in the folder %s. Please choose a different " +"name." +msgstr "" + +#: ajax/newfile.php:97 +msgid "Not a valid source" +msgstr "" + +#: ajax/newfile.php:102 +msgid "" +"Server is not allowed to open URLs, please check the server configuration" +msgstr "" + +#: ajax/newfile.php:118 +#, php-format +msgid "Error while downloading %s to %s" +msgstr "" + +#: ajax/newfile.php:146 +msgid "Error when creating the file" +msgstr "" + +#: ajax/newfolder.php:22 +msgid "Folder name cannot be empty." +msgstr "" + +#: ajax/newfolder.php:66 +msgid "Error when creating the folder" +msgstr "" + +#: ajax/upload.php:19 ajax/upload.php:57 +msgid "Unable to set upload directory." +msgstr "" + +#: ajax/upload.php:33 +msgid "Invalid Token" +msgstr "" + +#: ajax/upload.php:75 +msgid "No file was uploaded. Unknown error" +msgstr "" + +#: ajax/upload.php:82 +msgid "There is no error, the file uploaded with success" +msgstr "" + +#: ajax/upload.php:83 +msgid "" +"The uploaded file exceeds the upload_max_filesize directive in php.ini: " +msgstr "" + +#: ajax/upload.php:85 +msgid "" +"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in " +"the HTML form" +msgstr "" + +#: ajax/upload.php:86 +msgid "The uploaded file was only partially uploaded" +msgstr "" + +#: ajax/upload.php:87 +msgid "No file was uploaded" +msgstr "" + +#: ajax/upload.php:88 +msgid "Missing a temporary folder" +msgstr "" + +#: ajax/upload.php:89 +msgid "Failed to write to disk" +msgstr "" + +#: ajax/upload.php:107 +msgid "Not enough storage available" +msgstr "" + +#: ajax/upload.php:169 +msgid "Upload failed. Could not find uploaded file" +msgstr "" + +#: ajax/upload.php:179 +msgid "Upload failed. Could not get file info." +msgstr "" + +#: ajax/upload.php:194 +msgid "Invalid directory." +msgstr "" + +#: appinfo/app.php:11 js/filelist.js:14 +msgid "Files" +msgstr "" + +#: js/file-upload.js:254 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" +msgstr "" + +#: js/file-upload.js:266 +msgid "Total file size {size1} exceeds upload limit {size2}" +msgstr "" + +#: js/file-upload.js:276 +msgid "" +"Not enough free space, you are uploading {size1} but only {size2} is left" +msgstr "" + +#: js/file-upload.js:353 +msgid "Upload cancelled." +msgstr "" + +#: js/file-upload.js:398 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:490 +msgid "" +"File upload is in progress. Leaving the page now will cancel the upload." +msgstr "" + +#: js/file-upload.js:555 +msgid "URL cannot be empty" +msgstr "" + +#: js/file-upload.js:559 js/filelist.js:963 +msgid "{new_name} already exists" +msgstr "" + +#: js/file-upload.js:611 +msgid "Could not create file" +msgstr "" + +#: js/file-upload.js:624 +msgid "Could not create folder" +msgstr "" + +#: js/file-upload.js:664 +msgid "Error fetching URL" +msgstr "" + +#: js/fileactions.js:160 +msgid "Share" +msgstr "" + +#: js/fileactions.js:173 +msgid "Delete permanently" +msgstr "" + +#: js/fileactions.js:234 +msgid "Rename" +msgstr "" + +#: js/filelist.js:221 +msgid "" +"Your download is being prepared. This might take some time if the files are " +"big." +msgstr "" + +#: js/filelist.js:502 js/filelist.js:1422 +msgid "Pending" +msgstr "" + +#: js/filelist.js:916 +msgid "Error moving file." +msgstr "" + +#: js/filelist.js:924 +msgid "Error moving file" +msgstr "" + +#: js/filelist.js:924 +msgid "Error" +msgstr "" + +#: js/filelist.js:988 +msgid "Could not rename file" +msgstr "" + +#: js/filelist.js:1122 +msgid "Error deleting file." +msgstr "" + +#: js/filelist.js:1224 templates/index.php:67 +msgid "Name" +msgstr "" + +#: js/filelist.js:1225 templates/index.php:79 +msgid "Size" +msgstr "" + +#: js/filelist.js:1226 templates/index.php:81 +msgid "Modified" +msgstr "" + +#: js/filelist.js:1235 js/filesummary.js:141 js/filesummary.js:168 +msgid "%n folder" +msgid_plural "%n folders" +msgstr[0] "" +msgstr[1] "" + +#: js/filelist.js:1241 js/filesummary.js:142 js/filesummary.js:169 +msgid "%n file" +msgid_plural "%n files" +msgstr[0] "" +msgstr[1] "" + +#: js/filelist.js:1330 js/filelist.js:1369 +msgid "Uploading %n file" +msgid_plural "Uploading %n files" +msgstr[0] "" +msgstr[1] "" + +#: js/files.js:94 +msgid "\"{name}\" is an invalid file name." +msgstr "" + +#: js/files.js:115 +msgid "Your storage is full, files can not be updated or synced anymore!" +msgstr "" + +#: js/files.js:119 +msgid "Your storage is almost full ({usedSpacePercent}%)" +msgstr "" + +#: js/files.js:133 +msgid "" +"Encryption App is enabled but your keys are not initialized, please log-out " +"and log-in again" +msgstr "" + +#: js/files.js:137 +msgid "" +"Invalid private key for Encryption App. Please update your private key " +"password in your personal settings to recover access to your encrypted " +"files." +msgstr "" + +#: js/files.js:141 +msgid "" +"Encryption was disabled but your files are still encrypted. Please go to " +"your personal settings to decrypt your files." +msgstr "" + +#: js/filesummary.js:182 +msgid "{dirs} and {files}" +msgstr "" + +#: lib/app.php:86 +#, php-format +msgid "%s could not be renamed" +msgstr "" + +#: lib/helper.php:14 templates/index.php:22 +#, php-format +msgid "Upload (max. %s)" +msgstr "" + +#: templates/admin.php:4 +msgid "File handling" +msgstr "" + +#: templates/admin.php:6 +msgid "Maximum upload size" +msgstr "" + +#: templates/admin.php:9 +msgid "max. possible: " +msgstr "" + +#: templates/admin.php:14 +msgid "Needed for multi-file and folder downloads." +msgstr "" + +#: templates/admin.php:16 +msgid "Enable ZIP-download" +msgstr "" + +#: templates/admin.php:19 +msgid "0 is unlimited" +msgstr "" + +#: templates/admin.php:21 +msgid "Maximum input size for ZIP files" +msgstr "" + +#: templates/admin.php:25 +msgid "Save" +msgstr "" + +#: templates/index.php:5 +msgid "New" +msgstr "" + +#: templates/index.php:8 +msgid "New text file" +msgstr "" + +#: templates/index.php:9 +msgid "Text file" +msgstr "" + +#: templates/index.php:12 +msgid "New folder" +msgstr "" + +#: templates/index.php:13 +msgid "Folder" +msgstr "" + +#: templates/index.php:16 +msgid "From link" +msgstr "" + +#: templates/index.php:40 +msgid "Deleted files" +msgstr "" + +#: templates/index.php:45 +msgid "Cancel upload" +msgstr "" + +#: templates/index.php:51 +msgid "You don’t have permission to upload or create files here" +msgstr "" + +#: templates/index.php:56 +msgid "Nothing in here. Upload something!" +msgstr "" + +#: templates/index.php:73 +msgid "Download" +msgstr "" + +#: templates/index.php:84 templates/index.php:85 +msgid "Delete" +msgstr "" + +#: templates/index.php:98 +msgid "Upload too large" +msgstr "" + +#: templates/index.php:100 +msgid "" +"The files you are trying to upload exceed the maximum size for file uploads " +"on this server." +msgstr "" + +#: templates/index.php:105 +msgid "Files are being scanned, please wait." +msgstr "" + +#: templates/index.php:108 +msgid "Current scanning" +msgstr "" diff --git a/l10n/es_CO/files_encryption.po b/l10n/es_CO/files_encryption.po new file mode 100644 index 00000000000..38d38dd421c --- /dev/null +++ b/l10n/es_CO/files_encryption.po @@ -0,0 +1,201 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: ownCloud\n" +"Report-Msgid-Bugs-To: translations@owncloud.org\n" +"POT-Creation-Date: 2014-05-10 01:55-0400\n" +"PO-Revision-Date: 2013-04-26 08:01+0000\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: Spanish (Colombia) (http://www.transifex.com/projects/p/owncloud/language/es_CO/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: es_CO\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ajax/adminrecovery.php:29 +msgid "Recovery key successfully enabled" +msgstr "" + +#: ajax/adminrecovery.php:34 +msgid "" +"Could not enable recovery key. Please check your recovery key password!" +msgstr "" + +#: ajax/adminrecovery.php:48 +msgid "Recovery key successfully disabled" +msgstr "" + +#: ajax/adminrecovery.php:53 +msgid "" +"Could not disable recovery key. Please check your recovery key password!" +msgstr "" + +#: ajax/changeRecoveryPassword.php:49 +msgid "Password successfully changed." +msgstr "" + +#: ajax/changeRecoveryPassword.php:51 +msgid "Could not change the password. Maybe the old password was not correct." +msgstr "" + +#: ajax/updatePrivateKeyPassword.php:52 +msgid "Private key password successfully updated." +msgstr "" + +#: ajax/updatePrivateKeyPassword.php:54 +msgid "" +"Could not update the private key password. Maybe the old password was not " +"correct." +msgstr "" + +#: files/error.php:12 +msgid "" +"Encryption app not initialized! Maybe the encryption app was re-enabled " +"during your session. Please try to log out and log back in to initialize the" +" encryption app." +msgstr "" + +#: files/error.php:16 +#, php-format +msgid "" +"Your private key is not valid! Likely your password was changed outside of " +"%s (e.g. your corporate directory). You can update your private key password" +" in your personal settings to recover access to your encrypted files." +msgstr "" + +#: files/error.php:19 +msgid "" +"Can not decrypt this file, probably this is a shared file. Please ask the " +"file owner to reshare the file with you." +msgstr "" + +#: files/error.php:22 files/error.php:27 +msgid "" +"Unknown error please check your system settings or contact your " +"administrator" +msgstr "" + +#: hooks/hooks.php:64 +msgid "Missing requirements." +msgstr "" + +#: hooks/hooks.php:65 +msgid "" +"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." +msgstr "" + +#: hooks/hooks.php:295 +msgid "Following users are not set up for encryption:" +msgstr "" + +#: js/detect-migration.js:21 +msgid "Initial encryption started... This can take some time. Please wait." +msgstr "" + +#: js/detect-migration.js:25 +msgid "Initial encryption running... Please try again later." +msgstr "" + +#: templates/invalid_private_key.php:8 +msgid "Go directly to your " +msgstr "" + +#: templates/invalid_private_key.php:8 +msgid "personal settings" +msgstr "" + +#: templates/settings-admin.php:2 templates/settings-personal.php:2 +msgid "Encryption" +msgstr "" + +#: templates/settings-admin.php:5 +msgid "" +"Enable recovery key (allow to recover users files in case of password loss):" +msgstr "" + +#: templates/settings-admin.php:9 +msgid "Recovery key password" +msgstr "" + +#: templates/settings-admin.php:12 +msgid "Repeat Recovery key password" +msgstr "" + +#: templates/settings-admin.php:19 templates/settings-personal.php:50 +msgid "Enabled" +msgstr "" + +#: templates/settings-admin.php:27 templates/settings-personal.php:58 +msgid "Disabled" +msgstr "" + +#: templates/settings-admin.php:32 +msgid "Change recovery key password:" +msgstr "" + +#: templates/settings-admin.php:38 +msgid "Old Recovery key password" +msgstr "" + +#: templates/settings-admin.php:45 +msgid "New Recovery key password" +msgstr "" + +#: templates/settings-admin.php:51 +msgid "Repeat New Recovery key password" +msgstr "" + +#: templates/settings-admin.php:56 +msgid "Change Password" +msgstr "" + +#: templates/settings-personal.php:8 +msgid "Your private key password no longer match your log-in password:" +msgstr "" + +#: templates/settings-personal.php:11 +msgid "Set your old private key password to your current log-in password." +msgstr "" + +#: templates/settings-personal.php:13 +msgid "" +" If you don't remember your old password you can ask your administrator to " +"recover your files." +msgstr "" + +#: templates/settings-personal.php:21 +msgid "Old log-in password" +msgstr "" + +#: templates/settings-personal.php:27 +msgid "Current log-in password" +msgstr "" + +#: templates/settings-personal.php:32 +msgid "Update Private Key Password" +msgstr "" + +#: templates/settings-personal.php:41 +msgid "Enable password recovery:" +msgstr "" + +#: templates/settings-personal.php:43 +msgid "" +"Enabling this option will allow you to reobtain access to your encrypted " +"files in case of password loss" +msgstr "" + +#: templates/settings-personal.php:59 +msgid "File recovery settings updated" +msgstr "" + +#: templates/settings-personal.php:60 +msgid "Could not update file recovery" +msgstr "" diff --git a/l10n/es_CO/files_external.po b/l10n/es_CO/files_external.po new file mode 100644 index 00000000000..ed63bfd7f4d --- /dev/null +++ b/l10n/es_CO/files_external.po @@ -0,0 +1,292 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: ownCloud\n" +"Report-Msgid-Bugs-To: translations@owncloud.org\n" +"POT-Creation-Date: 2014-05-10 01:55-0400\n" +"PO-Revision-Date: 2013-04-26 08:01+0000\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: Spanish (Colombia) (http://www.transifex.com/projects/p/owncloud/language/es_CO/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: es_CO\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: appinfo/app.php:34 +msgid "Local" +msgstr "" + +#: appinfo/app.php:36 +msgid "Location" +msgstr "" + +#: appinfo/app.php:39 +msgid "Amazon S3" +msgstr "" + +#: appinfo/app.php:41 +msgid "Key" +msgstr "" + +#: appinfo/app.php:42 +msgid "Secret" +msgstr "" + +#: appinfo/app.php:43 appinfo/app.php:51 +msgid "Bucket" +msgstr "" + +#: appinfo/app.php:47 +msgid "Amazon S3 and compliant" +msgstr "" + +#: appinfo/app.php:49 +msgid "Access Key" +msgstr "" + +#: appinfo/app.php:50 +msgid "Secret Key" +msgstr "" + +#: appinfo/app.php:52 +msgid "Hostname (optional)" +msgstr "" + +#: appinfo/app.php:53 +msgid "Port (optional)" +msgstr "" + +#: appinfo/app.php:54 +msgid "Region (optional)" +msgstr "" + +#: appinfo/app.php:55 +msgid "Enable SSL" +msgstr "" + +#: appinfo/app.php:56 +msgid "Enable Path Style" +msgstr "" + +#: appinfo/app.php:63 +msgid "App key" +msgstr "" + +#: appinfo/app.php:64 +msgid "App secret" +msgstr "" + +#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121 +#: appinfo/app.php:131 appinfo/app.php:141 appinfo/app.php:151 +msgid "URL" +msgstr "" + +#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132 +#: appinfo/app.php:142 appinfo/app.php:152 +msgid "Username" +msgstr "" + +#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133 +#: appinfo/app.php:143 appinfo/app.php:153 +msgid "Password" +msgstr "" + +#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124 +#: appinfo/app.php:134 appinfo/app.php:154 +msgid "Root" +msgstr "" + +#: appinfo/app.php:77 +msgid "Secure ftps://" +msgstr "" + +#: appinfo/app.php:84 +msgid "Client ID" +msgstr "" + +#: appinfo/app.php:85 +msgid "Client secret" +msgstr "" + +#: appinfo/app.php:92 +msgid "OpenStack Object Storage" +msgstr "" + +#: appinfo/app.php:94 +msgid "Username (required)" +msgstr "" + +#: appinfo/app.php:95 +msgid "Bucket (required)" +msgstr "" + +#: appinfo/app.php:96 +msgid "Region (optional for OpenStack Object Storage)" +msgstr "" + +#: appinfo/app.php:97 +msgid "API Key (required for Rackspace Cloud Files)" +msgstr "" + +#: appinfo/app.php:98 +msgid "Tenantname (required for OpenStack Object Storage)" +msgstr "" + +#: appinfo/app.php:99 +msgid "Password (required for OpenStack Object Storage)" +msgstr "" + +#: appinfo/app.php:100 +msgid "Service Name (required for OpenStack Object Storage)" +msgstr "" + +#: appinfo/app.php:101 +msgid "URL of identity endpoint (required for OpenStack Object Storage)" +msgstr "" + +#: appinfo/app.php:102 +msgid "Timeout of HTTP requests in seconds (optional)" +msgstr "" + +#: appinfo/app.php:114 appinfo/app.php:123 +msgid "Share" +msgstr "" + +#: appinfo/app.php:119 +msgid "SMB / CIFS using OC login" +msgstr "" + +#: appinfo/app.php:122 +msgid "Username as share" +msgstr "" + +#: appinfo/app.php:135 appinfo/app.php:145 +msgid "Secure https://" +msgstr "" + +#: appinfo/app.php:144 +msgid "Remote subfolder" +msgstr "" + +#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40 +msgid "Access granted" +msgstr "" + +#: js/dropbox.js:33 js/dropbox.js:97 js/dropbox.js:103 +msgid "Error configuring Dropbox storage" +msgstr "" + +#: js/dropbox.js:68 js/google.js:89 +msgid "Grant access" +msgstr "" + +#: js/dropbox.js:102 +msgid "Please provide a valid Dropbox app key and secret." +msgstr "" + +#: js/google.js:45 js/google.js:122 +msgid "Error configuring Google Drive storage" +msgstr "" + +#: js/settings.js:318 js/settings.js:325 +msgid "Saved" +msgstr "" + +#: lib/config.php:597 +msgid "<b>Note:</b> " +msgstr "" + +#: lib/config.php:607 +msgid " and " +msgstr "" + +#: lib/config.php:629 +#, php-format +msgid "" +"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting " +"of %s is not possible. Please ask your system administrator to install it." +msgstr "" + +#: lib/config.php:631 +#, php-format +msgid "" +"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of" +" %s is not possible. Please ask your system administrator to install it." +msgstr "" + +#: lib/config.php:633 +#, php-format +msgid "" +"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please" +" ask your system administrator to install it." +msgstr "" + +#: templates/settings.php:2 +msgid "External Storage" +msgstr "" + +#: templates/settings.php:8 templates/settings.php:27 +msgid "Folder name" +msgstr "" + +#: templates/settings.php:9 +msgid "External storage" +msgstr "" + +#: templates/settings.php:10 +msgid "Configuration" +msgstr "" + +#: templates/settings.php:11 +msgid "Options" +msgstr "" + +#: templates/settings.php:12 +msgid "Available for" +msgstr "" + +#: templates/settings.php:32 +msgid "Add storage" +msgstr "" + +#: templates/settings.php:92 +msgid "No user or group" +msgstr "" + +#: templates/settings.php:95 +msgid "All Users" +msgstr "" + +#: templates/settings.php:97 +msgid "Groups" +msgstr "" + +#: templates/settings.php:105 +msgid "Users" +msgstr "" + +#: templates/settings.php:118 templates/settings.php:119 +#: templates/settings.php:158 templates/settings.php:159 +msgid "Delete" +msgstr "" + +#: templates/settings.php:132 +msgid "Enable User External Storage" +msgstr "" + +#: templates/settings.php:135 +msgid "Allow users to mount the following external storage" +msgstr "" + +#: templates/settings.php:150 +msgid "SSL root certificates" +msgstr "" + +#: templates/settings.php:168 +msgid "Import Root Certificate" +msgstr "" diff --git a/l10n/es_CO/files_sharing.po b/l10n/es_CO/files_sharing.po new file mode 100644 index 00000000000..9388ab8e1d6 --- /dev/null +++ b/l10n/es_CO/files_sharing.po @@ -0,0 +1,71 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: ownCloud\n" +"Report-Msgid-Bugs-To: translations@owncloud.org\n" +"POT-Creation-Date: 2014-05-10 01:55-0400\n" +"PO-Revision-Date: 2013-04-26 08:01+0000\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: Spanish (Colombia) (http://www.transifex.com/projects/p/owncloud/language/es_CO/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: es_CO\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: js/share.js:33 +msgid "Shared by {owner}" +msgstr "" + +#: templates/authenticate.php:4 +msgid "This share is password-protected" +msgstr "" + +#: templates/authenticate.php:7 +msgid "The password is wrong. Try again." +msgstr "" + +#: templates/authenticate.php:10 +msgid "Password" +msgstr "" + +#: templates/part.404.php:3 +msgid "Sorry, this link doesn’t seem to work anymore." +msgstr "" + +#: templates/part.404.php:4 +msgid "Reasons might be:" +msgstr "" + +#: templates/part.404.php:6 +msgid "the item was removed" +msgstr "" + +#: templates/part.404.php:7 +msgid "the link expired" +msgstr "" + +#: templates/part.404.php:8 +msgid "sharing is disabled" +msgstr "" + +#: templates/part.404.php:10 +msgid "For more info, please ask the person who sent this link." +msgstr "" + +#: templates/public.php:21 +msgid "Download" +msgstr "" + +#: templates/public.php:52 +#, php-format +msgid "Download %s" +msgstr "" + +#: templates/public.php:56 +msgid "Direct link" +msgstr "" diff --git a/l10n/es_CO/files_trashbin.po b/l10n/es_CO/files_trashbin.po new file mode 100644 index 00000000000..152e2a6dca6 --- /dev/null +++ b/l10n/es_CO/files_trashbin.po @@ -0,0 +1,64 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: ownCloud\n" +"Report-Msgid-Bugs-To: translations@owncloud.org\n" +"POT-Creation-Date: 2014-05-10 01:55-0400\n" +"PO-Revision-Date: 2013-04-26 08:01+0000\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: Spanish (Colombia) (http://www.transifex.com/projects/p/owncloud/language/es_CO/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: es_CO\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ajax/delete.php:59 +#, php-format +msgid "Couldn't delete %s permanently" +msgstr "" + +#: ajax/undelete.php:64 +#, php-format +msgid "Couldn't restore %s" +msgstr "" + +#: js/filelist.js:3 +msgid "Deleted files" +msgstr "" + +#: js/filelist.js:88 js/filelist.js:132 js/filelist.js:181 +msgid "Error" +msgstr "" + +#: js/trash.js:48 templates/index.php:22 templates/index.php:24 +msgid "Restore" +msgstr "" + +#: js/trash.js:107 +msgid "Deleted Files" +msgstr "" + +#: lib/trashbin.php:861 lib/trashbin.php:863 +msgid "restored" +msgstr "" + +#: templates/index.php:6 +msgid "Nothing in here. Your trash bin is empty!" +msgstr "" + +#: templates/index.php:19 +msgid "Name" +msgstr "" + +#: templates/index.php:30 +msgid "Deleted" +msgstr "" + +#: templates/index.php:33 templates/index.php:34 +msgid "Delete" +msgstr "" diff --git a/l10n/es_CO/files_versions.po b/l10n/es_CO/files_versions.po new file mode 100644 index 00000000000..d050fb2f15c --- /dev/null +++ b/l10n/es_CO/files_versions.po @@ -0,0 +1,43 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: ownCloud\n" +"Report-Msgid-Bugs-To: translations@owncloud.org\n" +"POT-Creation-Date: 2014-05-10 01:55-0400\n" +"PO-Revision-Date: 2013-04-26 08:01+0000\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: Spanish (Colombia) (http://www.transifex.com/projects/p/owncloud/language/es_CO/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: es_CO\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ajax/rollbackVersion.php:13 +#, php-format +msgid "Could not revert: %s" +msgstr "" + +#: js/versions.js:39 +msgid "Versions" +msgstr "" + +#: js/versions.js:61 +msgid "Failed to revert {file} to revision {timestamp}." +msgstr "" + +#: js/versions.js:88 +msgid "More versions..." +msgstr "" + +#: js/versions.js:126 +msgid "No other versions available" +msgstr "" + +#: js/versions.js:156 +msgid "Restore" +msgstr "" diff --git a/l10n/es_CO/lib.po b/l10n/es_CO/lib.po new file mode 100644 index 00000000000..69b2cc5858a --- /dev/null +++ b/l10n/es_CO/lib.po @@ -0,0 +1,470 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: ownCloud\n" +"Report-Msgid-Bugs-To: translations@owncloud.org\n" +"POT-Creation-Date: 2014-05-10 01:55-0400\n" +"PO-Revision-Date: 2013-04-26 08:01+0000\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: Spanish (Colombia) (http://www.transifex.com/projects/p/owncloud/language/es_CO/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: es_CO\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: base.php:713 +msgid "You are accessing the server from an untrusted domain." +msgstr "" + +#: base.php:714 +msgid "" +"Please contact your administrator. If you are an administrator of this " +"instance, configure the \"trusted_domain\" setting in config/config.php. An " +"example configuration is provided in config/config.sample.php." +msgstr "" + +#: private/app.php:236 +#, php-format +msgid "" +"App \"%s\" can't be installed because it is not compatible with this version" +" of ownCloud." +msgstr "" + +#: private/app.php:248 +msgid "No app name specified" +msgstr "" + +#: private/app.php:353 +msgid "Help" +msgstr "" + +#: private/app.php:366 +msgid "Personal" +msgstr "" + +#: private/app.php:377 +msgid "Settings" +msgstr "" + +#: private/app.php:389 +msgid "Users" +msgstr "" + +#: private/app.php:402 +msgid "Admin" +msgstr "" + +#: private/app.php:880 +#, php-format +msgid "Failed to upgrade \"%s\"." +msgstr "" + +#: private/avatar.php:66 +msgid "Unknown filetype" +msgstr "" + +#: private/avatar.php:71 +msgid "Invalid image" +msgstr "" + +#: private/defaults.php:35 +msgid "web services under your control" +msgstr "" + +#: private/files.php:235 +msgid "ZIP download is turned off." +msgstr "" + +#: private/files.php:236 +msgid "Files need to be downloaded one by one." +msgstr "" + +#: private/files.php:237 private/files.php:264 +msgid "Back to Files" +msgstr "" + +#: private/files.php:262 +msgid "Selected files too large to generate zip file." +msgstr "" + +#: private/files.php:263 +msgid "" +"Please download the files separately in smaller chunks or kindly ask your " +"administrator." +msgstr "" + +#: private/installer.php:64 +msgid "No source specified when installing app" +msgstr "" + +#: private/installer.php:71 +msgid "No href specified when installing app from http" +msgstr "" + +#: private/installer.php:76 +msgid "No path specified when installing app from local file" +msgstr "" + +#: private/installer.php:90 +#, php-format +msgid "Archives of type %s are not supported" +msgstr "" + +#: private/installer.php:104 +msgid "Failed to open archive when installing app" +msgstr "" + +#: private/installer.php:126 +msgid "App does not provide an info.xml file" +msgstr "" + +#: private/installer.php:132 +msgid "App can't be installed because of not allowed code in the App" +msgstr "" + +#: private/installer.php:141 +msgid "" +"App can't be installed because it is not compatible with this version of " +"ownCloud" +msgstr "" + +#: private/installer.php:147 +msgid "" +"App can't be installed because it contains the <shipped>true</shipped> tag " +"which is not allowed for non shipped apps" +msgstr "" + +#: private/installer.php:160 +msgid "" +"App can't be installed because the version in info.xml/version is not the " +"same as the version reported from the app store" +msgstr "" + +#: private/installer.php:170 +msgid "App directory already exists" +msgstr "" + +#: private/installer.php:183 +#, php-format +msgid "Can't create app folder. Please fix permissions. %s" +msgstr "" + +#: private/json.php:29 +msgid "Application is not enabled" +msgstr "" + +#: private/json.php:40 private/json.php:62 private/json.php:87 +msgid "Authentication error" +msgstr "" + +#: private/json.php:51 +msgid "Token expired. Please reload page." +msgstr "" + +#: private/json.php:74 +msgid "Unknown user" +msgstr "" + +#: private/search/provider/file.php:18 private/search/provider/file.php:36 +msgid "Files" +msgstr "" + +#: private/search/provider/file.php:27 private/search/provider/file.php:34 +msgid "Text" +msgstr "" + +#: private/search/provider/file.php:30 +msgid "Images" +msgstr "" + +#: private/setup/abstractdatabase.php:26 +#, php-format +msgid "%s enter the database username." +msgstr "" + +#: private/setup/abstractdatabase.php:29 +#, php-format +msgid "%s enter the database name." +msgstr "" + +#: private/setup/abstractdatabase.php:32 +#, php-format +msgid "%s you may not use dots in the database name" +msgstr "" + +#: private/setup/mssql.php:20 +#, php-format +msgid "MS SQL username and/or password not valid: %s" +msgstr "" + +#: private/setup/mssql.php:21 private/setup/mysql.php:13 +#: private/setup/oci.php:114 private/setup/postgresql.php:31 +#: private/setup/postgresql.php:84 +msgid "You need to enter either an existing account or the administrator." +msgstr "" + +#: private/setup/mysql.php:12 +msgid "MySQL/MariaDB username and/or password not valid" +msgstr "" + +#: private/setup/mysql.php:67 private/setup/oci.php:54 +#: private/setup/oci.php:121 private/setup/oci.php:144 +#: private/setup/oci.php:151 private/setup/oci.php:162 +#: private/setup/oci.php:169 private/setup/oci.php:178 +#: private/setup/oci.php:186 private/setup/oci.php:195 +#: private/setup/oci.php:201 private/setup/postgresql.php:103 +#: private/setup/postgresql.php:112 private/setup/postgresql.php:129 +#: private/setup/postgresql.php:139 private/setup/postgresql.php:148 +#, php-format +msgid "DB Error: \"%s\"" +msgstr "" + +#: private/setup/mysql.php:68 private/setup/oci.php:55 +#: private/setup/oci.php:122 private/setup/oci.php:145 +#: private/setup/oci.php:152 private/setup/oci.php:163 +#: private/setup/oci.php:179 private/setup/oci.php:187 +#: private/setup/oci.php:196 private/setup/postgresql.php:104 +#: private/setup/postgresql.php:113 private/setup/postgresql.php:130 +#: private/setup/postgresql.php:140 private/setup/postgresql.php:149 +#, php-format +msgid "Offending command was: \"%s\"" +msgstr "" + +#: private/setup/mysql.php:85 +#, php-format +msgid "MySQL/MariaDB user '%s'@'localhost' exists already." +msgstr "" + +#: private/setup/mysql.php:86 +msgid "Drop this user from MySQL/MariaDB" +msgstr "" + +#: private/setup/mysql.php:91 +#, php-format +msgid "MySQL/MariaDB user '%s'@'%%' already exists" +msgstr "" + +#: private/setup/mysql.php:92 +msgid "Drop this user from MySQL/MariaDB." +msgstr "" + +#: private/setup/oci.php:34 +msgid "Oracle connection could not be established" +msgstr "" + +#: private/setup/oci.php:41 private/setup/oci.php:113 +msgid "Oracle username and/or password not valid" +msgstr "" + +#: private/setup/oci.php:170 private/setup/oci.php:202 +#, php-format +msgid "Offending command was: \"%s\", name: %s, password: %s" +msgstr "" + +#: private/setup/postgresql.php:30 private/setup/postgresql.php:83 +msgid "PostgreSQL username and/or password not valid" +msgstr "" + +#: private/setup.php:28 +msgid "Set an admin username." +msgstr "" + +#: private/setup.php:31 +msgid "Set an admin password." +msgstr "" + +#: private/setup.php:164 +msgid "" +"Your web server is not yet properly setup to allow files synchronization " +"because the WebDAV interface seems to be broken." +msgstr "" + +#: private/setup.php:165 +#, php-format +msgid "Please double check the <a href='%s'>installation guides</a>." +msgstr "" + +#: private/share/mailnotifications.php:72 +#: private/share/mailnotifications.php:118 +#, php-format +msgid "%s shared »%s« with you" +msgstr "" + +#: private/share/share.php:498 +#, php-format +msgid "Sharing %s failed, because the file does not exist" +msgstr "" + +#: private/share/share.php:523 +#, php-format +msgid "Sharing %s failed, because the user %s is the item owner" +msgstr "" + +#: private/share/share.php:529 +#, php-format +msgid "Sharing %s failed, because the user %s does not exist" +msgstr "" + +#: private/share/share.php:538 +#, php-format +msgid "" +"Sharing %s failed, because the user %s is not a member of any groups that %s" +" is a member of" +msgstr "" + +#: private/share/share.php:551 private/share/share.php:579 +#, php-format +msgid "Sharing %s failed, because this item is already shared with %s" +msgstr "" + +#: private/share/share.php:559 +#, php-format +msgid "Sharing %s failed, because the group %s does not exist" +msgstr "" + +#: private/share/share.php:566 +#, php-format +msgid "Sharing %s failed, because %s is not a member of the group %s" +msgstr "" + +#: private/share/share.php:629 +#, php-format +msgid "Sharing %s failed, because sharing with links is not allowed" +msgstr "" + +#: private/share/share.php:636 +#, php-format +msgid "Share type %s is not valid for %s" +msgstr "" + +#: private/share/share.php:774 +#, php-format +msgid "" +"Setting permissions for %s failed, because the permissions exceed " +"permissions granted to %s" +msgstr "" + +#: private/share/share.php:835 +#, php-format +msgid "Setting permissions for %s failed, because the item was not found" +msgstr "" + +#: private/share/share.php:941 +#, php-format +msgid "Sharing backend %s must implement the interface OCP\\Share_Backend" +msgstr "" + +#: private/share/share.php:948 +#, php-format +msgid "Sharing backend %s not found" +msgstr "" + +#: private/share/share.php:954 +#, php-format +msgid "Sharing backend for %s not found" +msgstr "" + +#: private/share/share.php:1368 +#, php-format +msgid "Sharing %s failed, because the user %s is the original sharer" +msgstr "" + +#: private/share/share.php:1377 +#, php-format +msgid "" +"Sharing %s failed, because the permissions exceed permissions granted to %s" +msgstr "" + +#: private/share/share.php:1392 +#, php-format +msgid "Sharing %s failed, because resharing is not allowed" +msgstr "" + +#: private/share/share.php:1404 +#, php-format +msgid "" +"Sharing %s failed, because the sharing backend for %s could not find its " +"source" +msgstr "" + +#: private/share/share.php:1418 +#, php-format +msgid "" +"Sharing %s failed, because the file could not be found in the file cache" +msgstr "" + +#: private/tags.php:183 +#, php-format +msgid "Could not find category \"%s\"" +msgstr "" + +#: private/template/functions.php:134 +msgid "seconds ago" +msgstr "" + +#: private/template/functions.php:135 +msgid "%n minute ago" +msgid_plural "%n minutes ago" +msgstr[0] "" +msgstr[1] "" + +#: private/template/functions.php:136 +msgid "%n hour ago" +msgid_plural "%n hours ago" +msgstr[0] "" +msgstr[1] "" + +#: private/template/functions.php:137 +msgid "today" +msgstr "" + +#: private/template/functions.php:138 +msgid "yesterday" +msgstr "" + +#: private/template/functions.php:140 +msgid "%n day go" +msgid_plural "%n days ago" +msgstr[0] "" +msgstr[1] "" + +#: private/template/functions.php:142 +msgid "last month" +msgstr "" + +#: private/template/functions.php:143 +msgid "%n month ago" +msgid_plural "%n months ago" +msgstr[0] "" +msgstr[1] "" + +#: private/template/functions.php:145 +msgid "last year" +msgstr "" + +#: private/template/functions.php:146 +msgid "years ago" +msgstr "" + +#: private/user/manager.php:232 +msgid "" +"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", " +"\"0-9\", and \"_.@-\"" +msgstr "" + +#: private/user/manager.php:237 +msgid "A valid username must be provided" +msgstr "" + +#: private/user/manager.php:241 +msgid "A valid password must be provided" +msgstr "" + +#: private/user/manager.php:246 +msgid "The username is already being used" +msgstr "" diff --git a/l10n/es_CO/settings.po b/l10n/es_CO/settings.po new file mode 100644 index 00000000000..318732bf0fe --- /dev/null +++ b/l10n/es_CO/settings.po @@ -0,0 +1,901 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: ownCloud\n" +"Report-Msgid-Bugs-To: translations@owncloud.org\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" +"Last-Translator: I Robot\n" +"Language-Team: Spanish (Colombia) (http://www.transifex.com/projects/p/owncloud/language/es_CO/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: es_CO\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: admin/controller.php:66 +#, php-format +msgid "Invalid value supplied for %s" +msgstr "" + +#: admin/controller.php:73 +msgid "Saved" +msgstr "" + +#: admin/controller.php:90 +msgid "test email settings" +msgstr "" + +#: admin/controller.php:91 +msgid "If you received this email, the settings seem to be correct." +msgstr "" + +#: admin/controller.php:94 +msgid "" +"A problem occurred while sending the e-mail. Please revisit your settings." +msgstr "" + +#: admin/controller.php:99 +msgid "Email sent" +msgstr "" + +#: admin/controller.php:101 +msgid "You need to set your user email before being able to send test emails." +msgstr "" + +#: admin/controller.php:116 templates/admin.php:316 +msgid "Send mode" +msgstr "" + +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 +msgid "Encryption" +msgstr "" + +#: admin/controller.php:120 templates/admin.php:353 +msgid "Authentication method" +msgstr "" + +#: ajax/apps/ocs.php:20 +msgid "Unable to load list from App Store" +msgstr "" + +#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 +#: ajax/togglegroups.php:20 changepassword/controller.php:49 +msgid "Authentication error" +msgstr "" + +#: ajax/changedisplayname.php:31 +msgid "Your full name has been changed." +msgstr "" + +#: ajax/changedisplayname.php:34 +msgid "Unable to change full name" +msgstr "" + +#: ajax/creategroup.php:10 +msgid "Group already exists" +msgstr "" + +#: ajax/creategroup.php:19 +msgid "Unable to add group" +msgstr "" + +#: ajax/decryptall.php:31 +msgid "Files decrypted successfully" +msgstr "" + +#: ajax/decryptall.php:33 +msgid "" +"Couldn't decrypt your files, please check your owncloud.log or ask your " +"administrator" +msgstr "" + +#: ajax/decryptall.php:36 +msgid "Couldn't decrypt your files, check your password and try again" +msgstr "" + +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + +#: ajax/lostpassword.php:12 +msgid "Email saved" +msgstr "" + +#: ajax/lostpassword.php:14 +msgid "Invalid email" +msgstr "" + +#: ajax/removegroup.php:13 +msgid "Unable to delete group" +msgstr "" + +#: ajax/removeuser.php:25 +msgid "Unable to delete user" +msgstr "" + +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + +#: ajax/setlanguage.php:15 +msgid "Language changed" +msgstr "" + +#: ajax/setlanguage.php:17 ajax/setlanguage.php:20 +msgid "Invalid request" +msgstr "" + +#: ajax/togglegroups.php:12 +msgid "Admins can't remove themself from the admin group" +msgstr "" + +#: ajax/togglegroups.php:30 +#, php-format +msgid "Unable to add user to group %s" +msgstr "" + +#: ajax/togglegroups.php:36 +#, php-format +msgid "Unable to remove user from group %s" +msgstr "" + +#: ajax/updateapp.php:14 +msgid "Couldn't update app." +msgstr "" + +#: changepassword/controller.php:17 +msgid "Wrong password" +msgstr "" + +#: changepassword/controller.php:36 +msgid "No user supplied" +msgstr "" + +#: changepassword/controller.php:68 +msgid "" +"Please provide an admin recovery password, otherwise all user data will be " +"lost" +msgstr "" + +#: changepassword/controller.php:73 +msgid "" +"Wrong admin recovery password. Please check the password and try again." +msgstr "" + +#: changepassword/controller.php:81 +msgid "" +"Back-end doesn't support password change, but the users encryption key was " +"successfully updated." +msgstr "" + +#: changepassword/controller.php:86 changepassword/controller.php:97 +msgid "Unable to change password" +msgstr "" + +#: js/admin.js:73 +msgid "Sending..." +msgstr "" + +#: js/apps.js:45 templates/help.php:4 +msgid "User Documentation" +msgstr "" + +#: js/apps.js:50 +msgid "Admin Documentation" +msgstr "" + +#: js/apps.js:67 +msgid "Update to {appversion}" +msgstr "" + +#: js/apps.js:73 js/apps.js:106 js/apps.js:134 +msgid "Disable" +msgstr "" + +#: js/apps.js:73 js/apps.js:114 js/apps.js:127 js/apps.js:143 +msgid "Enable" +msgstr "" + +#: js/apps.js:95 +msgid "Please wait...." +msgstr "" + +#: js/apps.js:103 js/apps.js:104 js/apps.js:125 +msgid "Error while disabling app" +msgstr "" + +#: js/apps.js:124 js/apps.js:138 js/apps.js:139 +msgid "Error while enabling app" +msgstr "" + +#: js/apps.js:149 +msgid "Updating...." +msgstr "" + +#: js/apps.js:152 +msgid "Error while updating app" +msgstr "" + +#: js/apps.js:152 +msgid "Error" +msgstr "" + +#: js/apps.js:153 templates/apps.php:55 +msgid "Update" +msgstr "" + +#: js/apps.js:156 +msgid "Updated" +msgstr "" + +#: js/personal.js:256 +msgid "Select a profile picture" +msgstr "" + +#: js/personal.js:287 +msgid "Very weak password" +msgstr "" + +#: js/personal.js:288 +msgid "Weak password" +msgstr "" + +#: js/personal.js:289 +msgid "So-so password" +msgstr "" + +#: js/personal.js:290 +msgid "Good password" +msgstr "" + +#: js/personal.js:291 +msgid "Strong password" +msgstr "" + +#: js/personal.js:310 +msgid "Decrypting files... Please wait, this can take some time." +msgstr "" + +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + +#: js/users.js:47 +msgid "deleted" +msgstr "" + +#: js/users.js:47 +msgid "undo" +msgstr "" + +#: js/users.js:79 +msgid "Unable to remove user" +msgstr "" + +#: js/users.js:101 templates/users.php:24 templates/users.php:88 +#: templates/users.php:116 +msgid "Groups" +msgstr "" + +#: js/users.js:105 templates/users.php:90 templates/users.php:128 +msgid "Group Admin" +msgstr "" + +#: js/users.js:127 templates/users.php:168 +msgid "Delete" +msgstr "" + +#: js/users.js:310 +msgid "add group" +msgstr "" + +#: js/users.js:486 +msgid "A valid username must be provided" +msgstr "" + +#: js/users.js:487 js/users.js:493 js/users.js:508 +msgid "Error creating user" +msgstr "" + +#: js/users.js:492 +msgid "A valid password must be provided" +msgstr "" + +#: js/users.js:516 +msgid "Warning: Home directory for user \"{user}\" already exists" +msgstr "" + +#: personal.php:50 personal.php:51 +msgid "__language_name__" +msgstr "" + +#: templates/admin.php:8 +msgid "Everything (fatal issues, errors, warnings, info, debug)" +msgstr "" + +#: templates/admin.php:9 +msgid "Info, warnings, errors and fatal issues" +msgstr "" + +#: templates/admin.php:10 +msgid "Warnings, errors and fatal issues" +msgstr "" + +#: templates/admin.php:11 +msgid "Errors and fatal issues" +msgstr "" + +#: templates/admin.php:12 +msgid "Fatal issues only" +msgstr "" + +#: templates/admin.php:16 templates/admin.php:23 +msgid "None" +msgstr "" + +#: templates/admin.php:17 +msgid "Login" +msgstr "" + +#: templates/admin.php:18 +msgid "Plain" +msgstr "" + +#: templates/admin.php:19 +msgid "NT LAN Manager" +msgstr "" + +#: templates/admin.php:24 +msgid "SSL" +msgstr "" + +#: templates/admin.php:25 +msgid "TLS" +msgstr "" + +#: templates/admin.php:47 templates/admin.php:61 +msgid "Security Warning" +msgstr "" + +#: templates/admin.php:50 +#, php-format +msgid "" +"You are accessing %s via HTTP. We strongly suggest you configure your server" +" to require using HTTPS instead." +msgstr "" + +#: templates/admin.php:64 +msgid "" +"Your data directory and your files are probably accessible from the " +"internet. The .htaccess file is not working. We strongly suggest that you " +"configure your webserver in a way that the data directory is no longer " +"accessible or you move the data directory outside the webserver document " +"root." +msgstr "" + +#: templates/admin.php:75 +msgid "Setup Warning" +msgstr "" + +#: templates/admin.php:78 +msgid "" +"Your web server is not yet properly setup to allow files synchronization " +"because the WebDAV interface seems to be broken." +msgstr "" + +#: templates/admin.php:79 +#, php-format +msgid "Please double check the <a href=\"%s\">installation guides</a>." +msgstr "" + +#: templates/admin.php:90 +msgid "Module 'fileinfo' missing" +msgstr "" + +#: templates/admin.php:93 +msgid "" +"The PHP module 'fileinfo' is missing. We strongly recommend to enable this " +"module to get best results with mime-type detection." +msgstr "" + +#: templates/admin.php:104 +msgid "Your PHP version is outdated" +msgstr "" + +#: templates/admin.php:107 +msgid "" +"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or " +"newer because older versions are known to be broken. It is possible that " +"this installation is not working correctly." +msgstr "" + +#: templates/admin.php:118 +msgid "Locale not working" +msgstr "" + +#: templates/admin.php:123 +msgid "System locale can not be set to a one which supports UTF-8." +msgstr "" + +#: templates/admin.php:127 +msgid "" +"This means that there might be problems with certain characters in file " +"names." +msgstr "" + +#: templates/admin.php:131 +#, php-format +msgid "" +"We strongly suggest to install the required packages on your system to " +"support one of the following locales: %s." +msgstr "" + +#: templates/admin.php:143 +msgid "Internet connection not working" +msgstr "" + +#: templates/admin.php:146 +msgid "" +"This server has no working internet connection. This means that some of the " +"features like mounting of external storage, notifications about updates or " +"installation of 3rd party apps don´t work. Accessing files from remote and " +"sending of notification emails might also not work. We suggest to enable " +"internet connection for this server if you want to have all features." +msgstr "" + +#: templates/admin.php:160 +msgid "Cron" +msgstr "" + +#: templates/admin.php:167 +#, php-format +msgid "Last cron was executed at %s." +msgstr "" + +#: templates/admin.php:170 +#, php-format +msgid "" +"Last cron was executed at %s. This is more than an hour ago, something seems" +" wrong." +msgstr "" + +#: templates/admin.php:174 +msgid "Cron was not executed yet!" +msgstr "" + +#: templates/admin.php:184 +msgid "Execute one task with each page loaded" +msgstr "" + +#: templates/admin.php:192 +msgid "" +"cron.php is registered at a webcron service to call cron.php every 15 " +"minutes over http." +msgstr "" + +#: templates/admin.php:200 +msgid "Use systems cron service to call the cron.php file every 15 minutes." +msgstr "" + +#: templates/admin.php:205 +msgid "Sharing" +msgstr "" + +#: templates/admin.php:211 +msgid "Enable Share API" +msgstr "" + +#: templates/admin.php:212 +msgid "Allow apps to use the Share API" +msgstr "" + +#: templates/admin.php:219 +msgid "Allow links" +msgstr "" + +#: templates/admin.php:220 +msgid "Allow users to share items to the public with links" +msgstr "" + +#: templates/admin.php:227 +msgid "Allow public uploads" +msgstr "" + +#: templates/admin.php:228 +msgid "" +"Allow users to enable others to upload into their publicly shared folders" +msgstr "" + +#: templates/admin.php:235 +msgid "Allow resharing" +msgstr "" + +#: templates/admin.php:236 +msgid "Allow users to share items shared with them again" +msgstr "" + +#: templates/admin.php:243 +msgid "Allow users to share with anyone" +msgstr "" + +#: templates/admin.php:246 +msgid "Allow users to only share with users in their groups" +msgstr "" + +#: templates/admin.php:253 +msgid "Allow mail notification" +msgstr "" + +#: templates/admin.php:254 +msgid "Allow users to send mail notification for shared files" +msgstr "" + +#: templates/admin.php:262 +msgid "Set default expiration date" +msgstr "" + +#: templates/admin.php:263 +msgid "Expire after " +msgstr "" + +#: templates/admin.php:266 +msgid "days" +msgstr "" + +#: templates/admin.php:269 +msgid "Enforce expiration date" +msgstr "" + +#: templates/admin.php:270 +msgid "Expire shares by default after N days" +msgstr "" + +#: templates/admin.php:278 +msgid "Security" +msgstr "" + +#: templates/admin.php:291 +msgid "Enforce HTTPS" +msgstr "" + +#: templates/admin.php:293 +#, php-format +msgid "Forces the clients to connect to %s via an encrypted connection." +msgstr "" + +#: templates/admin.php:299 +#, php-format +msgid "" +"Please connect to your %s via HTTPS to enable or disable the SSL " +"enforcement." +msgstr "" + +#: templates/admin.php:311 +msgid "Email Server" +msgstr "" + +#: templates/admin.php:313 +msgid "This is used for sending out notifications." +msgstr "" + +#: templates/admin.php:344 +msgid "From address" +msgstr "" + +#: templates/admin.php:366 +msgid "Authentication required" +msgstr "" + +#: templates/admin.php:370 +msgid "Server address" +msgstr "" + +#: templates/admin.php:374 +msgid "Port" +msgstr "" + +#: templates/admin.php:379 +msgid "Credentials" +msgstr "" + +#: templates/admin.php:380 +msgid "SMTP Username" +msgstr "" + +#: templates/admin.php:383 +msgid "SMTP Password" +msgstr "" + +#: templates/admin.php:387 +msgid "Test email settings" +msgstr "" + +#: templates/admin.php:388 +msgid "Send email" +msgstr "" + +#: templates/admin.php:393 +msgid "Log" +msgstr "" + +#: templates/admin.php:394 +msgid "Log level" +msgstr "" + +#: templates/admin.php:426 +msgid "More" +msgstr "" + +#: templates/admin.php:427 +msgid "Less" +msgstr "" + +#: templates/admin.php:433 templates/personal.php:202 +msgid "Version" +msgstr "" + +#: templates/admin.php:437 templates/personal.php:205 +msgid "" +"Developed by the <a href=\"http://ownCloud.org/contact\" " +"target=\"_blank\">ownCloud community</a>, the <a " +"href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is " +"licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" " +"target=\"_blank\"><abbr title=\"Affero General Public " +"License\">AGPL</abbr></a>." +msgstr "" + +#: templates/apps.php:14 +msgid "Add your App" +msgstr "" + +#: templates/apps.php:31 +msgid "More Apps" +msgstr "" + +#: templates/apps.php:38 +msgid "Select an App" +msgstr "" + +#: templates/apps.php:43 +msgid "Documentation:" +msgstr "" + +#: templates/apps.php:49 +msgid "See application page at apps.owncloud.com" +msgstr "" + +#: templates/apps.php:51 +msgid "See application website" +msgstr "" + +#: templates/apps.php:53 +msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" +msgstr "" + +#: templates/help.php:6 +msgid "Administrator Documentation" +msgstr "" + +#: templates/help.php:9 +msgid "Online Documentation" +msgstr "" + +#: templates/help.php:11 +msgid "Forum" +msgstr "" + +#: templates/help.php:14 +msgid "Bugtracker" +msgstr "" + +#: templates/help.php:17 +msgid "Commercial Support" +msgstr "" + +#: templates/personal.php:8 +msgid "Get the apps to sync your files" +msgstr "" + +#: templates/personal.php:19 +msgid "Show First Run Wizard again" +msgstr "" + +#: templates/personal.php:27 +#, php-format +msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>" +msgstr "" + +#: templates/personal.php:38 templates/users.php:21 templates/users.php:87 +msgid "Password" +msgstr "" + +#: templates/personal.php:39 +msgid "Your password was changed" +msgstr "" + +#: templates/personal.php:40 +msgid "Unable to change your password" +msgstr "" + +#: templates/personal.php:42 +msgid "Current password" +msgstr "" + +#: templates/personal.php:45 +msgid "New password" +msgstr "" + +#: templates/personal.php:49 +msgid "Change password" +msgstr "" + +#: templates/personal.php:61 templates/users.php:86 +msgid "Full Name" +msgstr "" + +#: templates/personal.php:76 +msgid "Email" +msgstr "" + +#: templates/personal.php:78 +msgid "Your email address" +msgstr "" + +#: templates/personal.php:81 +msgid "" +"Fill in an email address to enable password recovery and receive " +"notifications" +msgstr "" + +#: templates/personal.php:89 +msgid "Profile picture" +msgstr "" + +#: templates/personal.php:94 +msgid "Upload new" +msgstr "" + +#: templates/personal.php:96 +msgid "Select new from Files" +msgstr "" + +#: templates/personal.php:97 +msgid "Remove image" +msgstr "" + +#: templates/personal.php:98 +msgid "Either png or jpg. Ideally square but you will be able to crop it." +msgstr "" + +#: templates/personal.php:100 +msgid "Your avatar is provided by your original account." +msgstr "" + +#: templates/personal.php:104 +msgid "Cancel" +msgstr "" + +#: templates/personal.php:105 +msgid "Choose as profile image" +msgstr "" + +#: templates/personal.php:111 templates/personal.php:112 +msgid "Language" +msgstr "" + +#: templates/personal.php:131 +msgid "Help translate" +msgstr "" + +#: templates/personal.php:137 +msgid "WebDAV" +msgstr "" + +#: templates/personal.php:139 +#, php-format +msgid "" +"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via " +"WebDAV</a>" +msgstr "" + +#: templates/personal.php:156 +msgid "The encryption app is no longer enabled, please decrypt all your files" +msgstr "" + +#: templates/personal.php:162 +msgid "Log-in password" +msgstr "" + +#: templates/personal.php:167 +msgid "Decrypt all Files" +msgstr "" + +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + +#: templates/users.php:19 +msgid "Login Name" +msgstr "" + +#: templates/users.php:28 +msgid "Create" +msgstr "" + +#: templates/users.php:34 +msgid "Admin Recovery Password" +msgstr "" + +#: templates/users.php:35 templates/users.php:36 +msgid "" +"Enter the recovery password in order to recover the users files during " +"password change" +msgstr "" + +#: templates/users.php:40 +msgid "Default Storage" +msgstr "" + +#: templates/users.php:42 templates/users.php:137 +msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" +msgstr "" + +#: templates/users.php:46 templates/users.php:146 +msgid "Unlimited" +msgstr "" + +#: templates/users.php:64 templates/users.php:161 +msgid "Other" +msgstr "" + +#: templates/users.php:85 +msgid "Username" +msgstr "" + +#: templates/users.php:92 +msgid "Storage" +msgstr "" + +#: templates/users.php:106 +msgid "change full name" +msgstr "" + +#: templates/users.php:110 +msgid "set new password" +msgstr "" + +#: templates/users.php:141 +msgid "Default" +msgstr "" diff --git a/l10n/es_CO/user_ldap.po b/l10n/es_CO/user_ldap.po new file mode 100644 index 00000000000..1d388d6e53a --- /dev/null +++ b/l10n/es_CO/user_ldap.po @@ -0,0 +1,534 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: ownCloud\n" +"Report-Msgid-Bugs-To: translations@owncloud.org\n" +"POT-Creation-Date: 2014-05-10 01:55-0400\n" +"PO-Revision-Date: 2013-04-26 08:02+0000\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: Spanish (Colombia) (http://www.transifex.com/projects/p/owncloud/language/es_CO/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: es_CO\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ajax/clearMappings.php:34 +msgid "Failed to clear the mappings." +msgstr "" + +#: ajax/deleteConfiguration.php:34 +msgid "Failed to delete the server configuration" +msgstr "" + +#: ajax/testConfiguration.php:39 +msgid "The configuration is valid and the connection could be established!" +msgstr "" + +#: ajax/testConfiguration.php:42 +msgid "" +"The configuration is valid, but the Bind failed. Please check the server " +"settings and credentials." +msgstr "" + +#: ajax/testConfiguration.php:46 +msgid "" +"The configuration is invalid. Please have a look at the logs for further " +"details." +msgstr "" + +#: ajax/wizard.php:32 +msgid "No action specified" +msgstr "" + +#: ajax/wizard.php:38 +msgid "No configuration specified" +msgstr "" + +#: ajax/wizard.php:81 +msgid "No data specified" +msgstr "" + +#: ajax/wizard.php:89 +#, php-format +msgid " Could not set configuration %s" +msgstr "" + +#: js/settings.js:67 +msgid "Deletion failed" +msgstr "" + +#: js/settings.js:83 +msgid "Take over settings from recent server configuration?" +msgstr "" + +#: js/settings.js:84 +msgid "Keep settings?" +msgstr "" + +#: js/settings.js:99 +msgid "Cannot add server configuration" +msgstr "" + +#: js/settings.js:127 +msgid "mappings cleared" +msgstr "" + +#: js/settings.js:128 +msgid "Success" +msgstr "" + +#: js/settings.js:133 +msgid "Error" +msgstr "" + +#: js/settings.js:780 +msgid "Configuration OK" +msgstr "" + +#: js/settings.js:789 +msgid "Configuration incorrect" +msgstr "" + +#: js/settings.js:798 +msgid "Configuration incomplete" +msgstr "" + +#: js/settings.js:815 js/settings.js:824 +msgid "Select groups" +msgstr "" + +#: js/settings.js:818 js/settings.js:827 +msgid "Select object classes" +msgstr "" + +#: js/settings.js:821 +msgid "Select attributes" +msgstr "" + +#: js/settings.js:848 +msgid "Connection test succeeded" +msgstr "" + +#: js/settings.js:855 +msgid "Connection test failed" +msgstr "" + +#: js/settings.js:864 +msgid "Do you really want to delete the current Server Configuration?" +msgstr "" + +#: js/settings.js:865 +msgid "Confirm Deletion" +msgstr "" + +#: lib/wizard.php:79 lib/wizard.php:93 +#, php-format +msgid "%s group found" +msgid_plural "%s groups found" +msgstr[0] "" +msgstr[1] "" + +#: lib/wizard.php:122 +#, php-format +msgid "%s user found" +msgid_plural "%s users found" +msgstr[0] "" +msgstr[1] "" + +#: lib/wizard.php:784 lib/wizard.php:796 +msgid "Invalid Host" +msgstr "" + +#: lib/wizard.php:984 +msgid "Could not find the desired feature" +msgstr "" + +#: templates/part.settingcontrols.php:2 +msgid "Save" +msgstr "" + +#: templates/part.settingcontrols.php:4 +msgid "Test Configuration" +msgstr "" + +#: templates/part.settingcontrols.php:10 templates/part.wizardcontrols.php:14 +msgid "Help" +msgstr "" + +#: templates/part.wizard-groupfilter.php:4 +#, php-format +msgid "Groups meeting these criteria are available in %s:" +msgstr "" + +#: templates/part.wizard-groupfilter.php:8 +#: templates/part.wizard-userfilter.php:8 +msgid "only those object classes:" +msgstr "" + +#: templates/part.wizard-groupfilter.php:17 +#: templates/part.wizard-userfilter.php:17 +msgid "only from those groups:" +msgstr "" + +#: templates/part.wizard-groupfilter.php:25 +#: templates/part.wizard-loginfilter.php:32 +#: templates/part.wizard-userfilter.php:25 +msgid "Edit raw filter instead" +msgstr "" + +#: templates/part.wizard-groupfilter.php:30 +#: templates/part.wizard-loginfilter.php:37 +#: templates/part.wizard-userfilter.php:30 +msgid "Raw LDAP filter" +msgstr "" + +#: templates/part.wizard-groupfilter.php:31 +#, php-format +msgid "" +"The filter specifies which LDAP groups shall have access to the %s instance." +msgstr "" + +#: templates/part.wizard-groupfilter.php:38 +msgid "groups found" +msgstr "" + +#: templates/part.wizard-loginfilter.php:4 +msgid "Users login with this attribute:" +msgstr "" + +#: templates/part.wizard-loginfilter.php:8 +msgid "LDAP Username:" +msgstr "" + +#: templates/part.wizard-loginfilter.php:16 +msgid "LDAP Email Address:" +msgstr "" + +#: templates/part.wizard-loginfilter.php:24 +msgid "Other Attributes:" +msgstr "" + +#: templates/part.wizard-loginfilter.php:38 +#, php-format +msgid "" +"Defines the filter to apply, when login is attempted. %%uid replaces the " +"username in the login action. Example: \"uid=%%uid\"" +msgstr "" + +#: templates/part.wizard-server.php:18 +msgid "Add Server Configuration" +msgstr "" + +#: templates/part.wizard-server.php:30 +msgid "Host" +msgstr "" + +#: templates/part.wizard-server.php:31 +msgid "" +"You can omit the protocol, except you require SSL. Then start with ldaps://" +msgstr "" + +#: templates/part.wizard-server.php:36 +msgid "Port" +msgstr "" + +#: templates/part.wizard-server.php:44 +msgid "User DN" +msgstr "" + +#: templates/part.wizard-server.php:45 +msgid "" +"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." +msgstr "" + +#: templates/part.wizard-server.php:52 +msgid "Password" +msgstr "" + +#: templates/part.wizard-server.php:53 +msgid "For anonymous access, leave DN and Password empty." +msgstr "" + +#: templates/part.wizard-server.php:60 +msgid "One Base DN per line" +msgstr "" + +#: templates/part.wizard-server.php:61 +msgid "You can specify Base DN for users and groups in the Advanced tab" +msgstr "" + +#: templates/part.wizard-userfilter.php:4 +#, php-format +msgid "Limit %s access to users meeting these criteria:" +msgstr "" + +#: templates/part.wizard-userfilter.php:31 +#, php-format +msgid "" +"The filter specifies which LDAP users shall have access to the %s instance." +msgstr "" + +#: templates/part.wizard-userfilter.php:38 +msgid "users found" +msgstr "" + +#: templates/part.wizardcontrols.php:5 +msgid "Back" +msgstr "" + +#: templates/part.wizardcontrols.php:8 +msgid "Continue" +msgstr "" + +#: templates/settings.php:11 +msgid "" +"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may" +" experience unexpected behavior. Please ask your system administrator to " +"disable one of them." +msgstr "" + +#: templates/settings.php:14 +msgid "" +"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not " +"work. Please ask your system administrator to install it." +msgstr "" + +#: templates/settings.php:20 +msgid "Connection Settings" +msgstr "" + +#: templates/settings.php:22 +msgid "Configuration Active" +msgstr "" + +#: templates/settings.php:22 +msgid "When unchecked, this configuration will be skipped." +msgstr "" + +#: templates/settings.php:23 +msgid "Backup (Replica) Host" +msgstr "" + +#: templates/settings.php:23 +msgid "" +"Give an optional backup host. It must be a replica of the main LDAP/AD " +"server." +msgstr "" + +#: templates/settings.php:24 +msgid "Backup (Replica) Port" +msgstr "" + +#: templates/settings.php:25 +msgid "Disable Main Server" +msgstr "" + +#: templates/settings.php:25 +msgid "Only connect to the replica server." +msgstr "" + +#: templates/settings.php:26 +msgid "Case insensitive LDAP server (Windows)" +msgstr "" + +#: templates/settings.php:27 +msgid "Turn off SSL certificate validation." +msgstr "" + +#: templates/settings.php:27 +#, php-format +msgid "" +"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." +msgstr "" + +#: templates/settings.php:28 +msgid "Cache Time-To-Live" +msgstr "" + +#: templates/settings.php:28 +msgid "in seconds. A change empties the cache." +msgstr "" + +#: templates/settings.php:30 +msgid "Directory Settings" +msgstr "" + +#: templates/settings.php:32 +msgid "User Display Name Field" +msgstr "" + +#: templates/settings.php:32 +msgid "The LDAP attribute to use to generate the user's display name." +msgstr "" + +#: templates/settings.php:33 +msgid "Base User Tree" +msgstr "" + +#: templates/settings.php:33 +msgid "One User Base DN per line" +msgstr "" + +#: templates/settings.php:34 +msgid "User Search Attributes" +msgstr "" + +#: templates/settings.php:34 templates/settings.php:37 +msgid "Optional; one attribute per line" +msgstr "" + +#: templates/settings.php:35 +msgid "Group Display Name Field" +msgstr "" + +#: templates/settings.php:35 +msgid "The LDAP attribute to use to generate the groups's display name." +msgstr "" + +#: templates/settings.php:36 +msgid "Base Group Tree" +msgstr "" + +#: templates/settings.php:36 +msgid "One Group Base DN per line" +msgstr "" + +#: templates/settings.php:37 +msgid "Group Search Attributes" +msgstr "" + +#: templates/settings.php:38 +msgid "Group-Member association" +msgstr "" + +#: templates/settings.php:39 +msgid "Nested Groups" +msgstr "" + +#: templates/settings.php:39 +msgid "" +"When switched on, groups that contain groups are supported. (Only works if " +"the group member attribute contains DNs.)" +msgstr "" + +#: templates/settings.php:40 +msgid "Paging chunksize" +msgstr "" + +#: templates/settings.php:40 +msgid "" +"Chunksize used for paged LDAP searches that may return bulky results like " +"user or group enumeration. (Setting it 0 disables paged LDAP searches in " +"those situations.)" +msgstr "" + +#: templates/settings.php:42 +msgid "Special Attributes" +msgstr "" + +#: templates/settings.php:44 +msgid "Quota Field" +msgstr "" + +#: templates/settings.php:45 +msgid "Quota Default" +msgstr "" + +#: templates/settings.php:45 +msgid "in bytes" +msgstr "" + +#: templates/settings.php:46 +msgid "Email Field" +msgstr "" + +#: templates/settings.php:47 +msgid "User Home Folder Naming Rule" +msgstr "" + +#: templates/settings.php:47 +msgid "" +"Leave empty for user name (default). Otherwise, specify an LDAP/AD " +"attribute." +msgstr "" + +#: templates/settings.php:53 +msgid "Internal Username" +msgstr "" + +#: templates/settings.php:54 +msgid "" +"By default the internal username will be created from the UUID attribute. It" +" makes sure that the username is unique and characters do not need to be " +"converted. The internal username has the restriction that only these " +"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced " +"with their ASCII correspondence or simply omitted. On collisions a number " +"will be added/increased. The internal username is used to identify a user " +"internally. It is also the default name for the user home folder. It is also" +" a part of remote URLs, for instance for all *DAV services. With this " +"setting, the default behavior can be overridden. To achieve a similar " +"behavior as before ownCloud 5 enter the user display name attribute in the " +"following field. Leave it empty for default behavior. Changes will have " +"effect only on newly mapped (added) LDAP users." +msgstr "" + +#: templates/settings.php:55 +msgid "Internal Username Attribute:" +msgstr "" + +#: templates/settings.php:56 +msgid "Override UUID detection" +msgstr "" + +#: templates/settings.php:57 +msgid "" +"By default, the UUID attribute is automatically detected. The UUID attribute" +" is used to doubtlessly identify LDAP users and groups. Also, the internal " +"username will be created based on the UUID, if not specified otherwise " +"above. You can override the setting and pass an attribute of your choice. " +"You must make sure that the attribute of your choice can be fetched for both" +" users and groups and it is unique. Leave it empty for default behavior. " +"Changes will have effect only on newly mapped (added) LDAP users and groups." +msgstr "" + +#: templates/settings.php:58 +msgid "UUID Attribute for Users:" +msgstr "" + +#: templates/settings.php:59 +msgid "UUID Attribute for Groups:" +msgstr "" + +#: templates/settings.php:60 +msgid "Username-LDAP User Mapping" +msgstr "" + +#: templates/settings.php:61 +msgid "" +"Usernames are used to store and assign (meta) data. In order to precisely " +"identify and recognize users, each LDAP user will have a internal username. " +"This requires a mapping from username to LDAP user. The created username is " +"mapped to the UUID of the LDAP user. Additionally the DN is cached as well " +"to reduce LDAP interaction, but it is not used for identification. If the DN" +" changes, the changes will be found. The internal username is used all over." +" Clearing the mappings will have leftovers everywhere. Clearing the mappings" +" is not configuration sensitive, it affects all LDAP configurations! Never " +"clear the mappings in a production environment, only in a testing or " +"experimental stage." +msgstr "" + +#: templates/settings.php:62 +msgid "Clear Username-LDAP User Mapping" +msgstr "" + +#: templates/settings.php:62 +msgid "Clear Groupname-LDAP Group Mapping" +msgstr "" diff --git a/l10n/es_CO/user_webdavauth.po b/l10n/es_CO/user_webdavauth.po new file mode 100644 index 00000000000..71497a4268d --- /dev/null +++ b/l10n/es_CO/user_webdavauth.po @@ -0,0 +1,33 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: ownCloud\n" +"Report-Msgid-Bugs-To: translations@owncloud.org\n" +"POT-Creation-Date: 2014-05-10 01:55-0400\n" +"PO-Revision-Date: 2012-11-09 09:06+0000\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: Spanish (Colombia) (http://www.transifex.com/projects/p/owncloud/language/es_CO/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: es_CO\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: templates/settings.php:2 +msgid "WebDAV Authentication" +msgstr "" + +#: templates/settings.php:3 +msgid "Address: " +msgstr "" + +#: templates/settings.php:6 +msgid "" +"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." +msgstr "" diff --git a/l10n/es_CR/settings.po b/l10n/es_CR/settings.po index 2720f550634..22ab9f64d31 100644 --- a/l10n/es_CR/settings.po +++ b/l10n/es_CR/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-26 01:54-0400\n" -"PO-Revision-Date: 2014-04-26 05:54+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Spanish (Costa Rica) (http://www.transifex.com/projects/p/owncloud/language/es_CR/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "" @@ -98,6 +98,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -114,6 +124,16 @@ msgstr "" msgid "Unable to delete user" msgstr "" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "" @@ -225,34 +245,42 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "" @@ -298,7 +326,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "" @@ -623,11 +651,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -791,18 +819,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "" diff --git a/l10n/es_EC/core.po b/l10n/es_EC/core.po new file mode 100644 index 00000000000..14c6cc87588 --- /dev/null +++ b/l10n/es_EC/core.po @@ -0,0 +1,805 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: ownCloud\n" +"Report-Msgid-Bugs-To: translations@owncloud.org\n" +"POT-Creation-Date: 2014-05-10 01:55-0400\n" +"PO-Revision-Date: 2013-04-26 08:00+0000\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: Spanish (Ecuador) (http://www.transifex.com/projects/p/owncloud/language/es_EC/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: es_EC\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ajax/share.php:87 +msgid "Expiration date is in the past." +msgstr "" + +#: ajax/share.php:119 ajax/share.php:161 +#, php-format +msgid "Couldn't send mail to following users: %s " +msgstr "" + +#: ajax/update.php:10 +msgid "Turned on maintenance mode" +msgstr "" + +#: ajax/update.php:13 +msgid "Turned off maintenance mode" +msgstr "" + +#: ajax/update.php:16 +msgid "Updated database" +msgstr "" + +#: avatar/controller.php:62 +msgid "No image or file provided" +msgstr "" + +#: avatar/controller.php:81 +msgid "Unknown filetype" +msgstr "" + +#: avatar/controller.php:85 +msgid "Invalid image" +msgstr "" + +#: avatar/controller.php:115 avatar/controller.php:142 +msgid "No temporary profile picture available, try again" +msgstr "" + +#: avatar/controller.php:135 +msgid "No crop data provided" +msgstr "" + +#: js/config.php:36 +msgid "Sunday" +msgstr "" + +#: js/config.php:37 +msgid "Monday" +msgstr "" + +#: js/config.php:38 +msgid "Tuesday" +msgstr "" + +#: js/config.php:39 +msgid "Wednesday" +msgstr "" + +#: js/config.php:40 +msgid "Thursday" +msgstr "" + +#: js/config.php:41 +msgid "Friday" +msgstr "" + +#: js/config.php:42 +msgid "Saturday" +msgstr "" + +#: js/config.php:47 +msgid "January" +msgstr "" + +#: js/config.php:48 +msgid "February" +msgstr "" + +#: js/config.php:49 +msgid "March" +msgstr "" + +#: js/config.php:50 +msgid "April" +msgstr "" + +#: js/config.php:51 +msgid "May" +msgstr "" + +#: js/config.php:52 +msgid "June" +msgstr "" + +#: js/config.php:53 +msgid "July" +msgstr "" + +#: js/config.php:54 +msgid "August" +msgstr "" + +#: js/config.php:55 +msgid "September" +msgstr "" + +#: js/config.php:56 +msgid "October" +msgstr "" + +#: js/config.php:57 +msgid "November" +msgstr "" + +#: js/config.php:58 +msgid "December" +msgstr "" + +#: js/js.js:483 +msgid "Settings" +msgstr "" + +#: js/js.js:583 +msgid "Saving..." +msgstr "" + +#: js/js.js:1240 +msgid "seconds ago" +msgstr "" + +#: js/js.js:1241 +msgid "%n minute ago" +msgid_plural "%n minutes ago" +msgstr[0] "" +msgstr[1] "" + +#: js/js.js:1242 +msgid "%n hour ago" +msgid_plural "%n hours ago" +msgstr[0] "" +msgstr[1] "" + +#: js/js.js:1243 +msgid "today" +msgstr "" + +#: js/js.js:1244 +msgid "yesterday" +msgstr "" + +#: js/js.js:1245 +msgid "%n day ago" +msgid_plural "%n days ago" +msgstr[0] "" +msgstr[1] "" + +#: js/js.js:1246 +msgid "last month" +msgstr "" + +#: js/js.js:1247 +msgid "%n month ago" +msgid_plural "%n months ago" +msgstr[0] "" +msgstr[1] "" + +#: js/js.js:1248 +msgid "last year" +msgstr "" + +#: js/js.js:1249 +msgid "years ago" +msgstr "" + +#: js/oc-dialogs.js:125 +msgid "Choose" +msgstr "" + +#: js/oc-dialogs.js:151 +msgid "Error loading file picker template: {error}" +msgstr "" + +#: js/oc-dialogs.js:177 +msgid "Yes" +msgstr "" + +#: js/oc-dialogs.js:187 +msgid "No" +msgstr "" + +#: js/oc-dialogs.js:204 +msgid "Ok" +msgstr "" + +#: js/oc-dialogs.js:224 +msgid "Error loading message template: {error}" +msgstr "" + +#: js/oc-dialogs.js:352 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" + +#: js/oc-dialogs.js:366 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:372 +msgid "New Files" +msgstr "" + +#: js/oc-dialogs.js:373 +msgid "Already existing files" +msgstr "" + +#: js/oc-dialogs.js:375 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:384 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:394 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:441 js/oc-dialogs.js:454 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:444 js/oc-dialogs.js:458 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:466 +msgid "Error loading file exists template" +msgstr "" + +#: js/setup.js:84 +msgid "Very weak password" +msgstr "" + +#: js/setup.js:85 +msgid "Weak password" +msgstr "" + +#: js/setup.js:86 +msgid "So-so password" +msgstr "" + +#: js/setup.js:87 +msgid "Good password" +msgstr "" + +#: js/setup.js:88 +msgid "Strong password" +msgstr "" + +#: js/share.js:51 js/share.js:66 js/share.js:106 +msgid "Shared" +msgstr "" + +#: js/share.js:109 +msgid "Share" +msgstr "" + +#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734 +#: templates/installation.php:10 +msgid "Error" +msgstr "" + +#: js/share.js:160 js/share.js:790 +msgid "Error while sharing" +msgstr "" + +#: js/share.js:171 +msgid "Error while unsharing" +msgstr "" + +#: js/share.js:178 +msgid "Error while changing permissions" +msgstr "" + +#: js/share.js:188 +msgid "Shared with you and the group {group} by {owner}" +msgstr "" + +#: js/share.js:190 +msgid "Shared with you by {owner}" +msgstr "" + +#: js/share.js:214 +msgid "Share with user or group …" +msgstr "" + +#: js/share.js:220 +msgid "Share link" +msgstr "" + +#: js/share.js:223 +msgid "Password protect" +msgstr "" + +#: js/share.js:225 templates/installation.php:60 templates/login.php:40 +msgid "Password" +msgstr "" + +#: js/share.js:230 +msgid "Allow Public Upload" +msgstr "" + +#: js/share.js:234 +msgid "Email link to person" +msgstr "" + +#: js/share.js:235 +msgid "Send" +msgstr "" + +#: js/share.js:240 +msgid "Set expiration date" +msgstr "" + +#: js/share.js:241 +msgid "Expiration date" +msgstr "" + +#: js/share.js:277 +msgid "Share via email:" +msgstr "" + +#: js/share.js:280 +msgid "No people found" +msgstr "" + +#: js/share.js:324 js/share.js:385 +msgid "group" +msgstr "" + +#: js/share.js:357 +msgid "Resharing is not allowed" +msgstr "" + +#: js/share.js:401 +msgid "Shared in {item} with {user}" +msgstr "" + +#: js/share.js:423 +msgid "Unshare" +msgstr "" + +#: js/share.js:431 +msgid "notify by email" +msgstr "" + +#: js/share.js:434 +msgid "can edit" +msgstr "" + +#: js/share.js:436 +msgid "access control" +msgstr "" + +#: js/share.js:439 +msgid "create" +msgstr "" + +#: js/share.js:442 +msgid "update" +msgstr "" + +#: js/share.js:445 +msgid "delete" +msgstr "" + +#: js/share.js:448 +msgid "share" +msgstr "" + +#: js/share.js:721 +msgid "Password protected" +msgstr "" + +#: js/share.js:734 +msgid "Error unsetting expiration date" +msgstr "" + +#: js/share.js:752 +msgid "Error setting expiration date" +msgstr "" + +#: js/share.js:777 +msgid "Sending ..." +msgstr "" + +#: js/share.js:788 +msgid "Email sent" +msgstr "" + +#: js/share.js:812 +msgid "Warning" +msgstr "" + +#: js/tags.js:4 +msgid "The object type is not specified." +msgstr "" + +#: js/tags.js:13 +msgid "Enter new" +msgstr "" + +#: js/tags.js:27 +msgid "Delete" +msgstr "" + +#: js/tags.js:31 +msgid "Add" +msgstr "" + +#: js/tags.js:39 +msgid "Edit tags" +msgstr "" + +#: js/tags.js:57 +msgid "Error loading dialog template: {error}" +msgstr "" + +#: js/tags.js:264 +msgid "No tags selected for deletion." +msgstr "" + +#: js/update.js:8 +msgid "Please reload the page." +msgstr "" + +#: js/update.js:17 +msgid "" +"The update was unsuccessful. Please report this issue to the <a " +"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud " +"community</a>." +msgstr "" + +#: js/update.js:21 +msgid "The update was successful. Redirecting you to ownCloud now." +msgstr "" + +#: lostpassword/controller.php:70 +#, php-format +msgid "%s password reset" +msgstr "" + +#: lostpassword/controller.php:72 +msgid "" +"A problem has occurred whilst sending the email, please contact your " +"administrator." +msgstr "" + +#: lostpassword/templates/email.php:2 +msgid "Use the following link to reset your password: {link}" +msgstr "" + +#: lostpassword/templates/lostpassword.php:7 +msgid "" +"The link to reset your password has been sent to your email.<br>If you do " +"not receive it within a reasonable amount of time, check your spam/junk " +"folders.<br>If it is not there ask your local administrator ." +msgstr "" + +#: lostpassword/templates/lostpassword.php:15 +msgid "Request failed!<br>Did you make sure your email/username was right?" +msgstr "" + +#: lostpassword/templates/lostpassword.php:18 +msgid "You will receive a link to reset your password via Email." +msgstr "" + +#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53 +#: templates/login.php:32 +msgid "Username" +msgstr "" + +#: lostpassword/templates/lostpassword.php:25 +msgid "" +"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?" +msgstr "" + +#: lostpassword/templates/lostpassword.php:27 +msgid "Yes, I really want to reset my password now" +msgstr "" + +#: lostpassword/templates/lostpassword.php:30 +msgid "Reset" +msgstr "" + +#: lostpassword/templates/resetpassword.php:4 +msgid "Your password was reset" +msgstr "" + +#: lostpassword/templates/resetpassword.php:5 +msgid "To login page" +msgstr "" + +#: lostpassword/templates/resetpassword.php:8 +msgid "New password" +msgstr "" + +#: lostpassword/templates/resetpassword.php:11 +msgid "Reset password" +msgstr "" + +#: setup/controller.php:140 +#, php-format +msgid "" +"Mac OS X is not supported and %s will not work properly on this platform. " +"Use it at your own risk! " +msgstr "" + +#: setup/controller.php:144 +msgid "" +"For the best results, please consider using a GNU/Linux server instead." +msgstr "" + +#: strings.php:5 +msgid "Personal" +msgstr "" + +#: strings.php:6 +msgid "Users" +msgstr "" + +#: strings.php:7 templates/layout.user.php:116 +msgid "Apps" +msgstr "" + +#: strings.php:8 +msgid "Admin" +msgstr "" + +#: strings.php:9 +msgid "Help" +msgstr "" + +#: tags/controller.php:22 +msgid "Error loading tags" +msgstr "" + +#: tags/controller.php:48 +msgid "Tag already exists" +msgstr "" + +#: tags/controller.php:64 +msgid "Error deleting tag(s)" +msgstr "" + +#: tags/controller.php:75 +msgid "Error tagging" +msgstr "" + +#: tags/controller.php:86 +msgid "Error untagging" +msgstr "" + +#: tags/controller.php:97 +msgid "Error favoriting" +msgstr "" + +#: tags/controller.php:108 +msgid "Error unfavoriting" +msgstr "" + +#: templates/403.php:12 +msgid "Access forbidden" +msgstr "" + +#: templates/404.php:15 +msgid "Cloud not found" +msgstr "" + +#: templates/altmail.php:2 +#, php-format +msgid "" +"Hey there,\n" +"\n" +"just letting you know that %s shared %s with you.\n" +"View it: %s\n" +"\n" +msgstr "" + +#: templates/altmail.php:4 templates/mail.php:17 +#, php-format +msgid "The share will expire on %s." +msgstr "" + +#: templates/altmail.php:7 templates/mail.php:20 +msgid "Cheers!" +msgstr "" + +#: templates/installation.php:25 templates/installation.php:32 +#: templates/installation.php:39 +msgid "Security Warning" +msgstr "" + +#: templates/installation.php:26 +msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" +msgstr "" + +#: templates/installation.php:27 +#, php-format +msgid "Please update your PHP installation to use %s securely." +msgstr "" + +#: templates/installation.php:33 +msgid "" +"No secure random number generator is available, please enable the PHP " +"OpenSSL extension." +msgstr "" + +#: templates/installation.php:34 +msgid "" +"Without a secure random number generator an attacker may be able to predict " +"password reset tokens and take over your account." +msgstr "" + +#: templates/installation.php:40 +msgid "" +"Your data directory and files are probably accessible from the internet " +"because the .htaccess file does not work." +msgstr "" + +#: templates/installation.php:42 +#, php-format +msgid "" +"For information how to properly configure your server, please see the <a " +"href=\"%s\" target=\"_blank\">documentation</a>." +msgstr "" + +#: templates/installation.php:48 +msgid "Create an <strong>admin account</strong>" +msgstr "" + +#: templates/installation.php:70 +msgid "Storage & database" +msgstr "" + +#: templates/installation.php:77 +msgid "Data folder" +msgstr "" + +#: templates/installation.php:90 +msgid "Configure the database" +msgstr "" + +#: templates/installation.php:94 +msgid "will be used" +msgstr "" + +#: templates/installation.php:109 +msgid "Database user" +msgstr "" + +#: templates/installation.php:118 +msgid "Database password" +msgstr "" + +#: templates/installation.php:123 +msgid "Database name" +msgstr "" + +#: templates/installation.php:132 +msgid "Database tablespace" +msgstr "" + +#: templates/installation.php:140 +msgid "Database host" +msgstr "" + +#: templates/installation.php:150 +msgid "Finish setup" +msgstr "" + +#: templates/installation.php:150 +msgid "Finishing …" +msgstr "" + +#: templates/layout.user.php:40 +msgid "" +"This application requires JavaScript to be enabled for correct operation. " +"Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable " +"JavaScript</a> and re-load this interface." +msgstr "" + +#: templates/layout.user.php:44 +#, php-format +msgid "%s is available. Get more information on how to update." +msgstr "" + +#: templates/layout.user.php:74 templates/singleuser.user.php:8 +msgid "Log out" +msgstr "" + +#: templates/login.php:9 +msgid "Automatic logon rejected!" +msgstr "" + +#: templates/login.php:10 +msgid "" +"If you did not change your password recently, your account may be " +"compromised!" +msgstr "" + +#: templates/login.php:12 +msgid "Please change your password to secure your account again." +msgstr "" + +#: templates/login.php:17 +msgid "Server side authentication failed!" +msgstr "" + +#: templates/login.php:18 +msgid "Please contact your administrator." +msgstr "" + +#: templates/login.php:46 +msgid "Lost your password?" +msgstr "" + +#: templates/login.php:51 +msgid "remember" +msgstr "" + +#: templates/login.php:54 +msgid "Log in" +msgstr "" + +#: templates/login.php:60 +msgid "Alternative Logins" +msgstr "" + +#: templates/mail.php:15 +#, php-format +msgid "" +"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> " +"with you.<br><a href=\"%s\">View it!</a><br><br>" +msgstr "" + +#: templates/singleuser.user.php:3 +msgid "This ownCloud instance is currently in single user mode." +msgstr "" + +#: templates/singleuser.user.php:4 +msgid "This means only administrators can use the instance." +msgstr "" + +#: templates/singleuser.user.php:5 templates/update.user.php:5 +msgid "" +"Contact your system administrator if this message persists or appeared " +"unexpectedly." +msgstr "" + +#: templates/singleuser.user.php:7 templates/update.user.php:6 +msgid "Thank you for your patience." +msgstr "" + +#: templates/update.admin.php:3 +#, php-format +msgid "Updating ownCloud to version %s, this may take a while." +msgstr "" + +#: templates/update.user.php:3 +msgid "" +"This ownCloud instance is currently being updated, which may take a while." +msgstr "" + +#: templates/update.user.php:4 +msgid "Please reload this page after a short time to continue using ownCloud." +msgstr "" diff --git a/l10n/es_EC/files.po b/l10n/es_EC/files.po new file mode 100644 index 00000000000..d012c385048 --- /dev/null +++ b/l10n/es_EC/files.po @@ -0,0 +1,405 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: ownCloud\n" +"Report-Msgid-Bugs-To: translations@owncloud.org\n" +"POT-Creation-Date: 2014-05-10 01:55-0400\n" +"PO-Revision-Date: 2013-04-26 08:00+0000\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: Spanish (Ecuador) (http://www.transifex.com/projects/p/owncloud/language/es_EC/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: es_EC\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ajax/move.php:15 +#, php-format +msgid "Could not move %s - File with this name already exists" +msgstr "" + +#: ajax/move.php:25 ajax/move.php:28 +#, php-format +msgid "Could not move %s" +msgstr "" + +#: ajax/newfile.php:58 js/files.js:96 +msgid "File name cannot be empty." +msgstr "" + +#: ajax/newfile.php:63 +#, php-format +msgid "\"%s\" is an invalid file name." +msgstr "" + +#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103 +msgid "" +"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " +"allowed." +msgstr "" + +#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155 +#: lib/app.php:60 +msgid "The target folder has been moved or deleted." +msgstr "" + +#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69 +#, php-format +msgid "" +"The name %s is already used in the folder %s. Please choose a different " +"name." +msgstr "" + +#: ajax/newfile.php:97 +msgid "Not a valid source" +msgstr "" + +#: ajax/newfile.php:102 +msgid "" +"Server is not allowed to open URLs, please check the server configuration" +msgstr "" + +#: ajax/newfile.php:118 +#, php-format +msgid "Error while downloading %s to %s" +msgstr "" + +#: ajax/newfile.php:146 +msgid "Error when creating the file" +msgstr "" + +#: ajax/newfolder.php:22 +msgid "Folder name cannot be empty." +msgstr "" + +#: ajax/newfolder.php:66 +msgid "Error when creating the folder" +msgstr "" + +#: ajax/upload.php:19 ajax/upload.php:57 +msgid "Unable to set upload directory." +msgstr "" + +#: ajax/upload.php:33 +msgid "Invalid Token" +msgstr "" + +#: ajax/upload.php:75 +msgid "No file was uploaded. Unknown error" +msgstr "" + +#: ajax/upload.php:82 +msgid "There is no error, the file uploaded with success" +msgstr "" + +#: ajax/upload.php:83 +msgid "" +"The uploaded file exceeds the upload_max_filesize directive in php.ini: " +msgstr "" + +#: ajax/upload.php:85 +msgid "" +"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in " +"the HTML form" +msgstr "" + +#: ajax/upload.php:86 +msgid "The uploaded file was only partially uploaded" +msgstr "" + +#: ajax/upload.php:87 +msgid "No file was uploaded" +msgstr "" + +#: ajax/upload.php:88 +msgid "Missing a temporary folder" +msgstr "" + +#: ajax/upload.php:89 +msgid "Failed to write to disk" +msgstr "" + +#: ajax/upload.php:107 +msgid "Not enough storage available" +msgstr "" + +#: ajax/upload.php:169 +msgid "Upload failed. Could not find uploaded file" +msgstr "" + +#: ajax/upload.php:179 +msgid "Upload failed. Could not get file info." +msgstr "" + +#: ajax/upload.php:194 +msgid "Invalid directory." +msgstr "" + +#: appinfo/app.php:11 js/filelist.js:14 +msgid "Files" +msgstr "" + +#: js/file-upload.js:254 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" +msgstr "" + +#: js/file-upload.js:266 +msgid "Total file size {size1} exceeds upload limit {size2}" +msgstr "" + +#: js/file-upload.js:276 +msgid "" +"Not enough free space, you are uploading {size1} but only {size2} is left" +msgstr "" + +#: js/file-upload.js:353 +msgid "Upload cancelled." +msgstr "" + +#: js/file-upload.js:398 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:490 +msgid "" +"File upload is in progress. Leaving the page now will cancel the upload." +msgstr "" + +#: js/file-upload.js:555 +msgid "URL cannot be empty" +msgstr "" + +#: js/file-upload.js:559 js/filelist.js:963 +msgid "{new_name} already exists" +msgstr "" + +#: js/file-upload.js:611 +msgid "Could not create file" +msgstr "" + +#: js/file-upload.js:624 +msgid "Could not create folder" +msgstr "" + +#: js/file-upload.js:664 +msgid "Error fetching URL" +msgstr "" + +#: js/fileactions.js:160 +msgid "Share" +msgstr "" + +#: js/fileactions.js:173 +msgid "Delete permanently" +msgstr "" + +#: js/fileactions.js:234 +msgid "Rename" +msgstr "" + +#: js/filelist.js:221 +msgid "" +"Your download is being prepared. This might take some time if the files are " +"big." +msgstr "" + +#: js/filelist.js:502 js/filelist.js:1422 +msgid "Pending" +msgstr "" + +#: js/filelist.js:916 +msgid "Error moving file." +msgstr "" + +#: js/filelist.js:924 +msgid "Error moving file" +msgstr "" + +#: js/filelist.js:924 +msgid "Error" +msgstr "" + +#: js/filelist.js:988 +msgid "Could not rename file" +msgstr "" + +#: js/filelist.js:1122 +msgid "Error deleting file." +msgstr "" + +#: js/filelist.js:1224 templates/index.php:67 +msgid "Name" +msgstr "" + +#: js/filelist.js:1225 templates/index.php:79 +msgid "Size" +msgstr "" + +#: js/filelist.js:1226 templates/index.php:81 +msgid "Modified" +msgstr "" + +#: js/filelist.js:1235 js/filesummary.js:141 js/filesummary.js:168 +msgid "%n folder" +msgid_plural "%n folders" +msgstr[0] "" +msgstr[1] "" + +#: js/filelist.js:1241 js/filesummary.js:142 js/filesummary.js:169 +msgid "%n file" +msgid_plural "%n files" +msgstr[0] "" +msgstr[1] "" + +#: js/filelist.js:1330 js/filelist.js:1369 +msgid "Uploading %n file" +msgid_plural "Uploading %n files" +msgstr[0] "" +msgstr[1] "" + +#: js/files.js:94 +msgid "\"{name}\" is an invalid file name." +msgstr "" + +#: js/files.js:115 +msgid "Your storage is full, files can not be updated or synced anymore!" +msgstr "" + +#: js/files.js:119 +msgid "Your storage is almost full ({usedSpacePercent}%)" +msgstr "" + +#: js/files.js:133 +msgid "" +"Encryption App is enabled but your keys are not initialized, please log-out " +"and log-in again" +msgstr "" + +#: js/files.js:137 +msgid "" +"Invalid private key for Encryption App. Please update your private key " +"password in your personal settings to recover access to your encrypted " +"files." +msgstr "" + +#: js/files.js:141 +msgid "" +"Encryption was disabled but your files are still encrypted. Please go to " +"your personal settings to decrypt your files." +msgstr "" + +#: js/filesummary.js:182 +msgid "{dirs} and {files}" +msgstr "" + +#: lib/app.php:86 +#, php-format +msgid "%s could not be renamed" +msgstr "" + +#: lib/helper.php:14 templates/index.php:22 +#, php-format +msgid "Upload (max. %s)" +msgstr "" + +#: templates/admin.php:4 +msgid "File handling" +msgstr "" + +#: templates/admin.php:6 +msgid "Maximum upload size" +msgstr "" + +#: templates/admin.php:9 +msgid "max. possible: " +msgstr "" + +#: templates/admin.php:14 +msgid "Needed for multi-file and folder downloads." +msgstr "" + +#: templates/admin.php:16 +msgid "Enable ZIP-download" +msgstr "" + +#: templates/admin.php:19 +msgid "0 is unlimited" +msgstr "" + +#: templates/admin.php:21 +msgid "Maximum input size for ZIP files" +msgstr "" + +#: templates/admin.php:25 +msgid "Save" +msgstr "" + +#: templates/index.php:5 +msgid "New" +msgstr "" + +#: templates/index.php:8 +msgid "New text file" +msgstr "" + +#: templates/index.php:9 +msgid "Text file" +msgstr "" + +#: templates/index.php:12 +msgid "New folder" +msgstr "" + +#: templates/index.php:13 +msgid "Folder" +msgstr "" + +#: templates/index.php:16 +msgid "From link" +msgstr "" + +#: templates/index.php:40 +msgid "Deleted files" +msgstr "" + +#: templates/index.php:45 +msgid "Cancel upload" +msgstr "" + +#: templates/index.php:51 +msgid "You don’t have permission to upload or create files here" +msgstr "" + +#: templates/index.php:56 +msgid "Nothing in here. Upload something!" +msgstr "" + +#: templates/index.php:73 +msgid "Download" +msgstr "" + +#: templates/index.php:84 templates/index.php:85 +msgid "Delete" +msgstr "" + +#: templates/index.php:98 +msgid "Upload too large" +msgstr "" + +#: templates/index.php:100 +msgid "" +"The files you are trying to upload exceed the maximum size for file uploads " +"on this server." +msgstr "" + +#: templates/index.php:105 +msgid "Files are being scanned, please wait." +msgstr "" + +#: templates/index.php:108 +msgid "Current scanning" +msgstr "" diff --git a/l10n/es_EC/files_encryption.po b/l10n/es_EC/files_encryption.po new file mode 100644 index 00000000000..82fdfa92eee --- /dev/null +++ b/l10n/es_EC/files_encryption.po @@ -0,0 +1,201 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: ownCloud\n" +"Report-Msgid-Bugs-To: translations@owncloud.org\n" +"POT-Creation-Date: 2014-05-10 01:55-0400\n" +"PO-Revision-Date: 2013-04-26 08:01+0000\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: Spanish (Ecuador) (http://www.transifex.com/projects/p/owncloud/language/es_EC/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: es_EC\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ajax/adminrecovery.php:29 +msgid "Recovery key successfully enabled" +msgstr "" + +#: ajax/adminrecovery.php:34 +msgid "" +"Could not enable recovery key. Please check your recovery key password!" +msgstr "" + +#: ajax/adminrecovery.php:48 +msgid "Recovery key successfully disabled" +msgstr "" + +#: ajax/adminrecovery.php:53 +msgid "" +"Could not disable recovery key. Please check your recovery key password!" +msgstr "" + +#: ajax/changeRecoveryPassword.php:49 +msgid "Password successfully changed." +msgstr "" + +#: ajax/changeRecoveryPassword.php:51 +msgid "Could not change the password. Maybe the old password was not correct." +msgstr "" + +#: ajax/updatePrivateKeyPassword.php:52 +msgid "Private key password successfully updated." +msgstr "" + +#: ajax/updatePrivateKeyPassword.php:54 +msgid "" +"Could not update the private key password. Maybe the old password was not " +"correct." +msgstr "" + +#: files/error.php:12 +msgid "" +"Encryption app not initialized! Maybe the encryption app was re-enabled " +"during your session. Please try to log out and log back in to initialize the" +" encryption app." +msgstr "" + +#: files/error.php:16 +#, php-format +msgid "" +"Your private key is not valid! Likely your password was changed outside of " +"%s (e.g. your corporate directory). You can update your private key password" +" in your personal settings to recover access to your encrypted files." +msgstr "" + +#: files/error.php:19 +msgid "" +"Can not decrypt this file, probably this is a shared file. Please ask the " +"file owner to reshare the file with you." +msgstr "" + +#: files/error.php:22 files/error.php:27 +msgid "" +"Unknown error please check your system settings or contact your " +"administrator" +msgstr "" + +#: hooks/hooks.php:64 +msgid "Missing requirements." +msgstr "" + +#: hooks/hooks.php:65 +msgid "" +"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." +msgstr "" + +#: hooks/hooks.php:295 +msgid "Following users are not set up for encryption:" +msgstr "" + +#: js/detect-migration.js:21 +msgid "Initial encryption started... This can take some time. Please wait." +msgstr "" + +#: js/detect-migration.js:25 +msgid "Initial encryption running... Please try again later." +msgstr "" + +#: templates/invalid_private_key.php:8 +msgid "Go directly to your " +msgstr "" + +#: templates/invalid_private_key.php:8 +msgid "personal settings" +msgstr "" + +#: templates/settings-admin.php:2 templates/settings-personal.php:2 +msgid "Encryption" +msgstr "" + +#: templates/settings-admin.php:5 +msgid "" +"Enable recovery key (allow to recover users files in case of password loss):" +msgstr "" + +#: templates/settings-admin.php:9 +msgid "Recovery key password" +msgstr "" + +#: templates/settings-admin.php:12 +msgid "Repeat Recovery key password" +msgstr "" + +#: templates/settings-admin.php:19 templates/settings-personal.php:50 +msgid "Enabled" +msgstr "" + +#: templates/settings-admin.php:27 templates/settings-personal.php:58 +msgid "Disabled" +msgstr "" + +#: templates/settings-admin.php:32 +msgid "Change recovery key password:" +msgstr "" + +#: templates/settings-admin.php:38 +msgid "Old Recovery key password" +msgstr "" + +#: templates/settings-admin.php:45 +msgid "New Recovery key password" +msgstr "" + +#: templates/settings-admin.php:51 +msgid "Repeat New Recovery key password" +msgstr "" + +#: templates/settings-admin.php:56 +msgid "Change Password" +msgstr "" + +#: templates/settings-personal.php:8 +msgid "Your private key password no longer match your log-in password:" +msgstr "" + +#: templates/settings-personal.php:11 +msgid "Set your old private key password to your current log-in password." +msgstr "" + +#: templates/settings-personal.php:13 +msgid "" +" If you don't remember your old password you can ask your administrator to " +"recover your files." +msgstr "" + +#: templates/settings-personal.php:21 +msgid "Old log-in password" +msgstr "" + +#: templates/settings-personal.php:27 +msgid "Current log-in password" +msgstr "" + +#: templates/settings-personal.php:32 +msgid "Update Private Key Password" +msgstr "" + +#: templates/settings-personal.php:41 +msgid "Enable password recovery:" +msgstr "" + +#: templates/settings-personal.php:43 +msgid "" +"Enabling this option will allow you to reobtain access to your encrypted " +"files in case of password loss" +msgstr "" + +#: templates/settings-personal.php:59 +msgid "File recovery settings updated" +msgstr "" + +#: templates/settings-personal.php:60 +msgid "Could not update file recovery" +msgstr "" diff --git a/l10n/es_EC/files_external.po b/l10n/es_EC/files_external.po new file mode 100644 index 00000000000..3f128bc3c43 --- /dev/null +++ b/l10n/es_EC/files_external.po @@ -0,0 +1,292 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: ownCloud\n" +"Report-Msgid-Bugs-To: translations@owncloud.org\n" +"POT-Creation-Date: 2014-05-10 01:55-0400\n" +"PO-Revision-Date: 2013-04-26 08:01+0000\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: Spanish (Ecuador) (http://www.transifex.com/projects/p/owncloud/language/es_EC/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: es_EC\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: appinfo/app.php:34 +msgid "Local" +msgstr "" + +#: appinfo/app.php:36 +msgid "Location" +msgstr "" + +#: appinfo/app.php:39 +msgid "Amazon S3" +msgstr "" + +#: appinfo/app.php:41 +msgid "Key" +msgstr "" + +#: appinfo/app.php:42 +msgid "Secret" +msgstr "" + +#: appinfo/app.php:43 appinfo/app.php:51 +msgid "Bucket" +msgstr "" + +#: appinfo/app.php:47 +msgid "Amazon S3 and compliant" +msgstr "" + +#: appinfo/app.php:49 +msgid "Access Key" +msgstr "" + +#: appinfo/app.php:50 +msgid "Secret Key" +msgstr "" + +#: appinfo/app.php:52 +msgid "Hostname (optional)" +msgstr "" + +#: appinfo/app.php:53 +msgid "Port (optional)" +msgstr "" + +#: appinfo/app.php:54 +msgid "Region (optional)" +msgstr "" + +#: appinfo/app.php:55 +msgid "Enable SSL" +msgstr "" + +#: appinfo/app.php:56 +msgid "Enable Path Style" +msgstr "" + +#: appinfo/app.php:63 +msgid "App key" +msgstr "" + +#: appinfo/app.php:64 +msgid "App secret" +msgstr "" + +#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121 +#: appinfo/app.php:131 appinfo/app.php:141 appinfo/app.php:151 +msgid "URL" +msgstr "" + +#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132 +#: appinfo/app.php:142 appinfo/app.php:152 +msgid "Username" +msgstr "" + +#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133 +#: appinfo/app.php:143 appinfo/app.php:153 +msgid "Password" +msgstr "" + +#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124 +#: appinfo/app.php:134 appinfo/app.php:154 +msgid "Root" +msgstr "" + +#: appinfo/app.php:77 +msgid "Secure ftps://" +msgstr "" + +#: appinfo/app.php:84 +msgid "Client ID" +msgstr "" + +#: appinfo/app.php:85 +msgid "Client secret" +msgstr "" + +#: appinfo/app.php:92 +msgid "OpenStack Object Storage" +msgstr "" + +#: appinfo/app.php:94 +msgid "Username (required)" +msgstr "" + +#: appinfo/app.php:95 +msgid "Bucket (required)" +msgstr "" + +#: appinfo/app.php:96 +msgid "Region (optional for OpenStack Object Storage)" +msgstr "" + +#: appinfo/app.php:97 +msgid "API Key (required for Rackspace Cloud Files)" +msgstr "" + +#: appinfo/app.php:98 +msgid "Tenantname (required for OpenStack Object Storage)" +msgstr "" + +#: appinfo/app.php:99 +msgid "Password (required for OpenStack Object Storage)" +msgstr "" + +#: appinfo/app.php:100 +msgid "Service Name (required for OpenStack Object Storage)" +msgstr "" + +#: appinfo/app.php:101 +msgid "URL of identity endpoint (required for OpenStack Object Storage)" +msgstr "" + +#: appinfo/app.php:102 +msgid "Timeout of HTTP requests in seconds (optional)" +msgstr "" + +#: appinfo/app.php:114 appinfo/app.php:123 +msgid "Share" +msgstr "" + +#: appinfo/app.php:119 +msgid "SMB / CIFS using OC login" +msgstr "" + +#: appinfo/app.php:122 +msgid "Username as share" +msgstr "" + +#: appinfo/app.php:135 appinfo/app.php:145 +msgid "Secure https://" +msgstr "" + +#: appinfo/app.php:144 +msgid "Remote subfolder" +msgstr "" + +#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40 +msgid "Access granted" +msgstr "" + +#: js/dropbox.js:33 js/dropbox.js:97 js/dropbox.js:103 +msgid "Error configuring Dropbox storage" +msgstr "" + +#: js/dropbox.js:68 js/google.js:89 +msgid "Grant access" +msgstr "" + +#: js/dropbox.js:102 +msgid "Please provide a valid Dropbox app key and secret." +msgstr "" + +#: js/google.js:45 js/google.js:122 +msgid "Error configuring Google Drive storage" +msgstr "" + +#: js/settings.js:318 js/settings.js:325 +msgid "Saved" +msgstr "" + +#: lib/config.php:597 +msgid "<b>Note:</b> " +msgstr "" + +#: lib/config.php:607 +msgid " and " +msgstr "" + +#: lib/config.php:629 +#, php-format +msgid "" +"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting " +"of %s is not possible. Please ask your system administrator to install it." +msgstr "" + +#: lib/config.php:631 +#, php-format +msgid "" +"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of" +" %s is not possible. Please ask your system administrator to install it." +msgstr "" + +#: lib/config.php:633 +#, php-format +msgid "" +"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please" +" ask your system administrator to install it." +msgstr "" + +#: templates/settings.php:2 +msgid "External Storage" +msgstr "" + +#: templates/settings.php:8 templates/settings.php:27 +msgid "Folder name" +msgstr "" + +#: templates/settings.php:9 +msgid "External storage" +msgstr "" + +#: templates/settings.php:10 +msgid "Configuration" +msgstr "" + +#: templates/settings.php:11 +msgid "Options" +msgstr "" + +#: templates/settings.php:12 +msgid "Available for" +msgstr "" + +#: templates/settings.php:32 +msgid "Add storage" +msgstr "" + +#: templates/settings.php:92 +msgid "No user or group" +msgstr "" + +#: templates/settings.php:95 +msgid "All Users" +msgstr "" + +#: templates/settings.php:97 +msgid "Groups" +msgstr "" + +#: templates/settings.php:105 +msgid "Users" +msgstr "" + +#: templates/settings.php:118 templates/settings.php:119 +#: templates/settings.php:158 templates/settings.php:159 +msgid "Delete" +msgstr "" + +#: templates/settings.php:132 +msgid "Enable User External Storage" +msgstr "" + +#: templates/settings.php:135 +msgid "Allow users to mount the following external storage" +msgstr "" + +#: templates/settings.php:150 +msgid "SSL root certificates" +msgstr "" + +#: templates/settings.php:168 +msgid "Import Root Certificate" +msgstr "" diff --git a/l10n/es_EC/files_sharing.po b/l10n/es_EC/files_sharing.po new file mode 100644 index 00000000000..1f4120b72ce --- /dev/null +++ b/l10n/es_EC/files_sharing.po @@ -0,0 +1,71 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: ownCloud\n" +"Report-Msgid-Bugs-To: translations@owncloud.org\n" +"POT-Creation-Date: 2014-05-10 01:55-0400\n" +"PO-Revision-Date: 2013-04-26 08:01+0000\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: Spanish (Ecuador) (http://www.transifex.com/projects/p/owncloud/language/es_EC/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: es_EC\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: js/share.js:33 +msgid "Shared by {owner}" +msgstr "" + +#: templates/authenticate.php:4 +msgid "This share is password-protected" +msgstr "" + +#: templates/authenticate.php:7 +msgid "The password is wrong. Try again." +msgstr "" + +#: templates/authenticate.php:10 +msgid "Password" +msgstr "" + +#: templates/part.404.php:3 +msgid "Sorry, this link doesn’t seem to work anymore." +msgstr "" + +#: templates/part.404.php:4 +msgid "Reasons might be:" +msgstr "" + +#: templates/part.404.php:6 +msgid "the item was removed" +msgstr "" + +#: templates/part.404.php:7 +msgid "the link expired" +msgstr "" + +#: templates/part.404.php:8 +msgid "sharing is disabled" +msgstr "" + +#: templates/part.404.php:10 +msgid "For more info, please ask the person who sent this link." +msgstr "" + +#: templates/public.php:21 +msgid "Download" +msgstr "" + +#: templates/public.php:52 +#, php-format +msgid "Download %s" +msgstr "" + +#: templates/public.php:56 +msgid "Direct link" +msgstr "" diff --git a/l10n/es_EC/files_trashbin.po b/l10n/es_EC/files_trashbin.po new file mode 100644 index 00000000000..8241a411704 --- /dev/null +++ b/l10n/es_EC/files_trashbin.po @@ -0,0 +1,64 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: ownCloud\n" +"Report-Msgid-Bugs-To: translations@owncloud.org\n" +"POT-Creation-Date: 2014-05-10 01:55-0400\n" +"PO-Revision-Date: 2013-04-26 08:01+0000\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: Spanish (Ecuador) (http://www.transifex.com/projects/p/owncloud/language/es_EC/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: es_EC\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ajax/delete.php:59 +#, php-format +msgid "Couldn't delete %s permanently" +msgstr "" + +#: ajax/undelete.php:64 +#, php-format +msgid "Couldn't restore %s" +msgstr "" + +#: js/filelist.js:3 +msgid "Deleted files" +msgstr "" + +#: js/filelist.js:88 js/filelist.js:132 js/filelist.js:181 +msgid "Error" +msgstr "" + +#: js/trash.js:48 templates/index.php:22 templates/index.php:24 +msgid "Restore" +msgstr "" + +#: js/trash.js:107 +msgid "Deleted Files" +msgstr "" + +#: lib/trashbin.php:861 lib/trashbin.php:863 +msgid "restored" +msgstr "" + +#: templates/index.php:6 +msgid "Nothing in here. Your trash bin is empty!" +msgstr "" + +#: templates/index.php:19 +msgid "Name" +msgstr "" + +#: templates/index.php:30 +msgid "Deleted" +msgstr "" + +#: templates/index.php:33 templates/index.php:34 +msgid "Delete" +msgstr "" diff --git a/l10n/es_EC/files_versions.po b/l10n/es_EC/files_versions.po new file mode 100644 index 00000000000..1aedfd7f793 --- /dev/null +++ b/l10n/es_EC/files_versions.po @@ -0,0 +1,43 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: ownCloud\n" +"Report-Msgid-Bugs-To: translations@owncloud.org\n" +"POT-Creation-Date: 2014-05-10 01:55-0400\n" +"PO-Revision-Date: 2013-04-26 08:01+0000\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: Spanish (Ecuador) (http://www.transifex.com/projects/p/owncloud/language/es_EC/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: es_EC\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ajax/rollbackVersion.php:13 +#, php-format +msgid "Could not revert: %s" +msgstr "" + +#: js/versions.js:39 +msgid "Versions" +msgstr "" + +#: js/versions.js:61 +msgid "Failed to revert {file} to revision {timestamp}." +msgstr "" + +#: js/versions.js:88 +msgid "More versions..." +msgstr "" + +#: js/versions.js:126 +msgid "No other versions available" +msgstr "" + +#: js/versions.js:156 +msgid "Restore" +msgstr "" diff --git a/l10n/es_EC/lib.po b/l10n/es_EC/lib.po new file mode 100644 index 00000000000..6f50a5b654f --- /dev/null +++ b/l10n/es_EC/lib.po @@ -0,0 +1,470 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: ownCloud\n" +"Report-Msgid-Bugs-To: translations@owncloud.org\n" +"POT-Creation-Date: 2014-05-10 01:55-0400\n" +"PO-Revision-Date: 2013-04-26 08:01+0000\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: Spanish (Ecuador) (http://www.transifex.com/projects/p/owncloud/language/es_EC/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: es_EC\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: base.php:713 +msgid "You are accessing the server from an untrusted domain." +msgstr "" + +#: base.php:714 +msgid "" +"Please contact your administrator. If you are an administrator of this " +"instance, configure the \"trusted_domain\" setting in config/config.php. An " +"example configuration is provided in config/config.sample.php." +msgstr "" + +#: private/app.php:236 +#, php-format +msgid "" +"App \"%s\" can't be installed because it is not compatible with this version" +" of ownCloud." +msgstr "" + +#: private/app.php:248 +msgid "No app name specified" +msgstr "" + +#: private/app.php:353 +msgid "Help" +msgstr "" + +#: private/app.php:366 +msgid "Personal" +msgstr "" + +#: private/app.php:377 +msgid "Settings" +msgstr "" + +#: private/app.php:389 +msgid "Users" +msgstr "" + +#: private/app.php:402 +msgid "Admin" +msgstr "" + +#: private/app.php:880 +#, php-format +msgid "Failed to upgrade \"%s\"." +msgstr "" + +#: private/avatar.php:66 +msgid "Unknown filetype" +msgstr "" + +#: private/avatar.php:71 +msgid "Invalid image" +msgstr "" + +#: private/defaults.php:35 +msgid "web services under your control" +msgstr "" + +#: private/files.php:235 +msgid "ZIP download is turned off." +msgstr "" + +#: private/files.php:236 +msgid "Files need to be downloaded one by one." +msgstr "" + +#: private/files.php:237 private/files.php:264 +msgid "Back to Files" +msgstr "" + +#: private/files.php:262 +msgid "Selected files too large to generate zip file." +msgstr "" + +#: private/files.php:263 +msgid "" +"Please download the files separately in smaller chunks or kindly ask your " +"administrator." +msgstr "" + +#: private/installer.php:64 +msgid "No source specified when installing app" +msgstr "" + +#: private/installer.php:71 +msgid "No href specified when installing app from http" +msgstr "" + +#: private/installer.php:76 +msgid "No path specified when installing app from local file" +msgstr "" + +#: private/installer.php:90 +#, php-format +msgid "Archives of type %s are not supported" +msgstr "" + +#: private/installer.php:104 +msgid "Failed to open archive when installing app" +msgstr "" + +#: private/installer.php:126 +msgid "App does not provide an info.xml file" +msgstr "" + +#: private/installer.php:132 +msgid "App can't be installed because of not allowed code in the App" +msgstr "" + +#: private/installer.php:141 +msgid "" +"App can't be installed because it is not compatible with this version of " +"ownCloud" +msgstr "" + +#: private/installer.php:147 +msgid "" +"App can't be installed because it contains the <shipped>true</shipped> tag " +"which is not allowed for non shipped apps" +msgstr "" + +#: private/installer.php:160 +msgid "" +"App can't be installed because the version in info.xml/version is not the " +"same as the version reported from the app store" +msgstr "" + +#: private/installer.php:170 +msgid "App directory already exists" +msgstr "" + +#: private/installer.php:183 +#, php-format +msgid "Can't create app folder. Please fix permissions. %s" +msgstr "" + +#: private/json.php:29 +msgid "Application is not enabled" +msgstr "" + +#: private/json.php:40 private/json.php:62 private/json.php:87 +msgid "Authentication error" +msgstr "" + +#: private/json.php:51 +msgid "Token expired. Please reload page." +msgstr "" + +#: private/json.php:74 +msgid "Unknown user" +msgstr "" + +#: private/search/provider/file.php:18 private/search/provider/file.php:36 +msgid "Files" +msgstr "" + +#: private/search/provider/file.php:27 private/search/provider/file.php:34 +msgid "Text" +msgstr "" + +#: private/search/provider/file.php:30 +msgid "Images" +msgstr "" + +#: private/setup/abstractdatabase.php:26 +#, php-format +msgid "%s enter the database username." +msgstr "" + +#: private/setup/abstractdatabase.php:29 +#, php-format +msgid "%s enter the database name." +msgstr "" + +#: private/setup/abstractdatabase.php:32 +#, php-format +msgid "%s you may not use dots in the database name" +msgstr "" + +#: private/setup/mssql.php:20 +#, php-format +msgid "MS SQL username and/or password not valid: %s" +msgstr "" + +#: private/setup/mssql.php:21 private/setup/mysql.php:13 +#: private/setup/oci.php:114 private/setup/postgresql.php:31 +#: private/setup/postgresql.php:84 +msgid "You need to enter either an existing account or the administrator." +msgstr "" + +#: private/setup/mysql.php:12 +msgid "MySQL/MariaDB username and/or password not valid" +msgstr "" + +#: private/setup/mysql.php:67 private/setup/oci.php:54 +#: private/setup/oci.php:121 private/setup/oci.php:144 +#: private/setup/oci.php:151 private/setup/oci.php:162 +#: private/setup/oci.php:169 private/setup/oci.php:178 +#: private/setup/oci.php:186 private/setup/oci.php:195 +#: private/setup/oci.php:201 private/setup/postgresql.php:103 +#: private/setup/postgresql.php:112 private/setup/postgresql.php:129 +#: private/setup/postgresql.php:139 private/setup/postgresql.php:148 +#, php-format +msgid "DB Error: \"%s\"" +msgstr "" + +#: private/setup/mysql.php:68 private/setup/oci.php:55 +#: private/setup/oci.php:122 private/setup/oci.php:145 +#: private/setup/oci.php:152 private/setup/oci.php:163 +#: private/setup/oci.php:179 private/setup/oci.php:187 +#: private/setup/oci.php:196 private/setup/postgresql.php:104 +#: private/setup/postgresql.php:113 private/setup/postgresql.php:130 +#: private/setup/postgresql.php:140 private/setup/postgresql.php:149 +#, php-format +msgid "Offending command was: \"%s\"" +msgstr "" + +#: private/setup/mysql.php:85 +#, php-format +msgid "MySQL/MariaDB user '%s'@'localhost' exists already." +msgstr "" + +#: private/setup/mysql.php:86 +msgid "Drop this user from MySQL/MariaDB" +msgstr "" + +#: private/setup/mysql.php:91 +#, php-format +msgid "MySQL/MariaDB user '%s'@'%%' already exists" +msgstr "" + +#: private/setup/mysql.php:92 +msgid "Drop this user from MySQL/MariaDB." +msgstr "" + +#: private/setup/oci.php:34 +msgid "Oracle connection could not be established" +msgstr "" + +#: private/setup/oci.php:41 private/setup/oci.php:113 +msgid "Oracle username and/or password not valid" +msgstr "" + +#: private/setup/oci.php:170 private/setup/oci.php:202 +#, php-format +msgid "Offending command was: \"%s\", name: %s, password: %s" +msgstr "" + +#: private/setup/postgresql.php:30 private/setup/postgresql.php:83 +msgid "PostgreSQL username and/or password not valid" +msgstr "" + +#: private/setup.php:28 +msgid "Set an admin username." +msgstr "" + +#: private/setup.php:31 +msgid "Set an admin password." +msgstr "" + +#: private/setup.php:164 +msgid "" +"Your web server is not yet properly setup to allow files synchronization " +"because the WebDAV interface seems to be broken." +msgstr "" + +#: private/setup.php:165 +#, php-format +msgid "Please double check the <a href='%s'>installation guides</a>." +msgstr "" + +#: private/share/mailnotifications.php:72 +#: private/share/mailnotifications.php:118 +#, php-format +msgid "%s shared »%s« with you" +msgstr "" + +#: private/share/share.php:498 +#, php-format +msgid "Sharing %s failed, because the file does not exist" +msgstr "" + +#: private/share/share.php:523 +#, php-format +msgid "Sharing %s failed, because the user %s is the item owner" +msgstr "" + +#: private/share/share.php:529 +#, php-format +msgid "Sharing %s failed, because the user %s does not exist" +msgstr "" + +#: private/share/share.php:538 +#, php-format +msgid "" +"Sharing %s failed, because the user %s is not a member of any groups that %s" +" is a member of" +msgstr "" + +#: private/share/share.php:551 private/share/share.php:579 +#, php-format +msgid "Sharing %s failed, because this item is already shared with %s" +msgstr "" + +#: private/share/share.php:559 +#, php-format +msgid "Sharing %s failed, because the group %s does not exist" +msgstr "" + +#: private/share/share.php:566 +#, php-format +msgid "Sharing %s failed, because %s is not a member of the group %s" +msgstr "" + +#: private/share/share.php:629 +#, php-format +msgid "Sharing %s failed, because sharing with links is not allowed" +msgstr "" + +#: private/share/share.php:636 +#, php-format +msgid "Share type %s is not valid for %s" +msgstr "" + +#: private/share/share.php:774 +#, php-format +msgid "" +"Setting permissions for %s failed, because the permissions exceed " +"permissions granted to %s" +msgstr "" + +#: private/share/share.php:835 +#, php-format +msgid "Setting permissions for %s failed, because the item was not found" +msgstr "" + +#: private/share/share.php:941 +#, php-format +msgid "Sharing backend %s must implement the interface OCP\\Share_Backend" +msgstr "" + +#: private/share/share.php:948 +#, php-format +msgid "Sharing backend %s not found" +msgstr "" + +#: private/share/share.php:954 +#, php-format +msgid "Sharing backend for %s not found" +msgstr "" + +#: private/share/share.php:1368 +#, php-format +msgid "Sharing %s failed, because the user %s is the original sharer" +msgstr "" + +#: private/share/share.php:1377 +#, php-format +msgid "" +"Sharing %s failed, because the permissions exceed permissions granted to %s" +msgstr "" + +#: private/share/share.php:1392 +#, php-format +msgid "Sharing %s failed, because resharing is not allowed" +msgstr "" + +#: private/share/share.php:1404 +#, php-format +msgid "" +"Sharing %s failed, because the sharing backend for %s could not find its " +"source" +msgstr "" + +#: private/share/share.php:1418 +#, php-format +msgid "" +"Sharing %s failed, because the file could not be found in the file cache" +msgstr "" + +#: private/tags.php:183 +#, php-format +msgid "Could not find category \"%s\"" +msgstr "" + +#: private/template/functions.php:134 +msgid "seconds ago" +msgstr "" + +#: private/template/functions.php:135 +msgid "%n minute ago" +msgid_plural "%n minutes ago" +msgstr[0] "" +msgstr[1] "" + +#: private/template/functions.php:136 +msgid "%n hour ago" +msgid_plural "%n hours ago" +msgstr[0] "" +msgstr[1] "" + +#: private/template/functions.php:137 +msgid "today" +msgstr "" + +#: private/template/functions.php:138 +msgid "yesterday" +msgstr "" + +#: private/template/functions.php:140 +msgid "%n day go" +msgid_plural "%n days ago" +msgstr[0] "" +msgstr[1] "" + +#: private/template/functions.php:142 +msgid "last month" +msgstr "" + +#: private/template/functions.php:143 +msgid "%n month ago" +msgid_plural "%n months ago" +msgstr[0] "" +msgstr[1] "" + +#: private/template/functions.php:145 +msgid "last year" +msgstr "" + +#: private/template/functions.php:146 +msgid "years ago" +msgstr "" + +#: private/user/manager.php:232 +msgid "" +"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", " +"\"0-9\", and \"_.@-\"" +msgstr "" + +#: private/user/manager.php:237 +msgid "A valid username must be provided" +msgstr "" + +#: private/user/manager.php:241 +msgid "A valid password must be provided" +msgstr "" + +#: private/user/manager.php:246 +msgid "The username is already being used" +msgstr "" diff --git a/l10n/es_EC/settings.po b/l10n/es_EC/settings.po new file mode 100644 index 00000000000..c12f94eaa40 --- /dev/null +++ b/l10n/es_EC/settings.po @@ -0,0 +1,901 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: ownCloud\n" +"Report-Msgid-Bugs-To: translations@owncloud.org\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" +"Last-Translator: I Robot\n" +"Language-Team: Spanish (Ecuador) (http://www.transifex.com/projects/p/owncloud/language/es_EC/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: es_EC\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: admin/controller.php:66 +#, php-format +msgid "Invalid value supplied for %s" +msgstr "" + +#: admin/controller.php:73 +msgid "Saved" +msgstr "" + +#: admin/controller.php:90 +msgid "test email settings" +msgstr "" + +#: admin/controller.php:91 +msgid "If you received this email, the settings seem to be correct." +msgstr "" + +#: admin/controller.php:94 +msgid "" +"A problem occurred while sending the e-mail. Please revisit your settings." +msgstr "" + +#: admin/controller.php:99 +msgid "Email sent" +msgstr "" + +#: admin/controller.php:101 +msgid "You need to set your user email before being able to send test emails." +msgstr "" + +#: admin/controller.php:116 templates/admin.php:316 +msgid "Send mode" +msgstr "" + +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 +msgid "Encryption" +msgstr "" + +#: admin/controller.php:120 templates/admin.php:353 +msgid "Authentication method" +msgstr "" + +#: ajax/apps/ocs.php:20 +msgid "Unable to load list from App Store" +msgstr "" + +#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 +#: ajax/togglegroups.php:20 changepassword/controller.php:49 +msgid "Authentication error" +msgstr "" + +#: ajax/changedisplayname.php:31 +msgid "Your full name has been changed." +msgstr "" + +#: ajax/changedisplayname.php:34 +msgid "Unable to change full name" +msgstr "" + +#: ajax/creategroup.php:10 +msgid "Group already exists" +msgstr "" + +#: ajax/creategroup.php:19 +msgid "Unable to add group" +msgstr "" + +#: ajax/decryptall.php:31 +msgid "Files decrypted successfully" +msgstr "" + +#: ajax/decryptall.php:33 +msgid "" +"Couldn't decrypt your files, please check your owncloud.log or ask your " +"administrator" +msgstr "" + +#: ajax/decryptall.php:36 +msgid "Couldn't decrypt your files, check your password and try again" +msgstr "" + +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + +#: ajax/lostpassword.php:12 +msgid "Email saved" +msgstr "" + +#: ajax/lostpassword.php:14 +msgid "Invalid email" +msgstr "" + +#: ajax/removegroup.php:13 +msgid "Unable to delete group" +msgstr "" + +#: ajax/removeuser.php:25 +msgid "Unable to delete user" +msgstr "" + +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + +#: ajax/setlanguage.php:15 +msgid "Language changed" +msgstr "" + +#: ajax/setlanguage.php:17 ajax/setlanguage.php:20 +msgid "Invalid request" +msgstr "" + +#: ajax/togglegroups.php:12 +msgid "Admins can't remove themself from the admin group" +msgstr "" + +#: ajax/togglegroups.php:30 +#, php-format +msgid "Unable to add user to group %s" +msgstr "" + +#: ajax/togglegroups.php:36 +#, php-format +msgid "Unable to remove user from group %s" +msgstr "" + +#: ajax/updateapp.php:14 +msgid "Couldn't update app." +msgstr "" + +#: changepassword/controller.php:17 +msgid "Wrong password" +msgstr "" + +#: changepassword/controller.php:36 +msgid "No user supplied" +msgstr "" + +#: changepassword/controller.php:68 +msgid "" +"Please provide an admin recovery password, otherwise all user data will be " +"lost" +msgstr "" + +#: changepassword/controller.php:73 +msgid "" +"Wrong admin recovery password. Please check the password and try again." +msgstr "" + +#: changepassword/controller.php:81 +msgid "" +"Back-end doesn't support password change, but the users encryption key was " +"successfully updated." +msgstr "" + +#: changepassword/controller.php:86 changepassword/controller.php:97 +msgid "Unable to change password" +msgstr "" + +#: js/admin.js:73 +msgid "Sending..." +msgstr "" + +#: js/apps.js:45 templates/help.php:4 +msgid "User Documentation" +msgstr "" + +#: js/apps.js:50 +msgid "Admin Documentation" +msgstr "" + +#: js/apps.js:67 +msgid "Update to {appversion}" +msgstr "" + +#: js/apps.js:73 js/apps.js:106 js/apps.js:134 +msgid "Disable" +msgstr "" + +#: js/apps.js:73 js/apps.js:114 js/apps.js:127 js/apps.js:143 +msgid "Enable" +msgstr "" + +#: js/apps.js:95 +msgid "Please wait...." +msgstr "" + +#: js/apps.js:103 js/apps.js:104 js/apps.js:125 +msgid "Error while disabling app" +msgstr "" + +#: js/apps.js:124 js/apps.js:138 js/apps.js:139 +msgid "Error while enabling app" +msgstr "" + +#: js/apps.js:149 +msgid "Updating...." +msgstr "" + +#: js/apps.js:152 +msgid "Error while updating app" +msgstr "" + +#: js/apps.js:152 +msgid "Error" +msgstr "" + +#: js/apps.js:153 templates/apps.php:55 +msgid "Update" +msgstr "" + +#: js/apps.js:156 +msgid "Updated" +msgstr "" + +#: js/personal.js:256 +msgid "Select a profile picture" +msgstr "" + +#: js/personal.js:287 +msgid "Very weak password" +msgstr "" + +#: js/personal.js:288 +msgid "Weak password" +msgstr "" + +#: js/personal.js:289 +msgid "So-so password" +msgstr "" + +#: js/personal.js:290 +msgid "Good password" +msgstr "" + +#: js/personal.js:291 +msgid "Strong password" +msgstr "" + +#: js/personal.js:310 +msgid "Decrypting files... Please wait, this can take some time." +msgstr "" + +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + +#: js/users.js:47 +msgid "deleted" +msgstr "" + +#: js/users.js:47 +msgid "undo" +msgstr "" + +#: js/users.js:79 +msgid "Unable to remove user" +msgstr "" + +#: js/users.js:101 templates/users.php:24 templates/users.php:88 +#: templates/users.php:116 +msgid "Groups" +msgstr "" + +#: js/users.js:105 templates/users.php:90 templates/users.php:128 +msgid "Group Admin" +msgstr "" + +#: js/users.js:127 templates/users.php:168 +msgid "Delete" +msgstr "" + +#: js/users.js:310 +msgid "add group" +msgstr "" + +#: js/users.js:486 +msgid "A valid username must be provided" +msgstr "" + +#: js/users.js:487 js/users.js:493 js/users.js:508 +msgid "Error creating user" +msgstr "" + +#: js/users.js:492 +msgid "A valid password must be provided" +msgstr "" + +#: js/users.js:516 +msgid "Warning: Home directory for user \"{user}\" already exists" +msgstr "" + +#: personal.php:50 personal.php:51 +msgid "__language_name__" +msgstr "" + +#: templates/admin.php:8 +msgid "Everything (fatal issues, errors, warnings, info, debug)" +msgstr "" + +#: templates/admin.php:9 +msgid "Info, warnings, errors and fatal issues" +msgstr "" + +#: templates/admin.php:10 +msgid "Warnings, errors and fatal issues" +msgstr "" + +#: templates/admin.php:11 +msgid "Errors and fatal issues" +msgstr "" + +#: templates/admin.php:12 +msgid "Fatal issues only" +msgstr "" + +#: templates/admin.php:16 templates/admin.php:23 +msgid "None" +msgstr "" + +#: templates/admin.php:17 +msgid "Login" +msgstr "" + +#: templates/admin.php:18 +msgid "Plain" +msgstr "" + +#: templates/admin.php:19 +msgid "NT LAN Manager" +msgstr "" + +#: templates/admin.php:24 +msgid "SSL" +msgstr "" + +#: templates/admin.php:25 +msgid "TLS" +msgstr "" + +#: templates/admin.php:47 templates/admin.php:61 +msgid "Security Warning" +msgstr "" + +#: templates/admin.php:50 +#, php-format +msgid "" +"You are accessing %s via HTTP. We strongly suggest you configure your server" +" to require using HTTPS instead." +msgstr "" + +#: templates/admin.php:64 +msgid "" +"Your data directory and your files are probably accessible from the " +"internet. The .htaccess file is not working. We strongly suggest that you " +"configure your webserver in a way that the data directory is no longer " +"accessible or you move the data directory outside the webserver document " +"root." +msgstr "" + +#: templates/admin.php:75 +msgid "Setup Warning" +msgstr "" + +#: templates/admin.php:78 +msgid "" +"Your web server is not yet properly setup to allow files synchronization " +"because the WebDAV interface seems to be broken." +msgstr "" + +#: templates/admin.php:79 +#, php-format +msgid "Please double check the <a href=\"%s\">installation guides</a>." +msgstr "" + +#: templates/admin.php:90 +msgid "Module 'fileinfo' missing" +msgstr "" + +#: templates/admin.php:93 +msgid "" +"The PHP module 'fileinfo' is missing. We strongly recommend to enable this " +"module to get best results with mime-type detection." +msgstr "" + +#: templates/admin.php:104 +msgid "Your PHP version is outdated" +msgstr "" + +#: templates/admin.php:107 +msgid "" +"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or " +"newer because older versions are known to be broken. It is possible that " +"this installation is not working correctly." +msgstr "" + +#: templates/admin.php:118 +msgid "Locale not working" +msgstr "" + +#: templates/admin.php:123 +msgid "System locale can not be set to a one which supports UTF-8." +msgstr "" + +#: templates/admin.php:127 +msgid "" +"This means that there might be problems with certain characters in file " +"names." +msgstr "" + +#: templates/admin.php:131 +#, php-format +msgid "" +"We strongly suggest to install the required packages on your system to " +"support one of the following locales: %s." +msgstr "" + +#: templates/admin.php:143 +msgid "Internet connection not working" +msgstr "" + +#: templates/admin.php:146 +msgid "" +"This server has no working internet connection. This means that some of the " +"features like mounting of external storage, notifications about updates or " +"installation of 3rd party apps don´t work. Accessing files from remote and " +"sending of notification emails might also not work. We suggest to enable " +"internet connection for this server if you want to have all features." +msgstr "" + +#: templates/admin.php:160 +msgid "Cron" +msgstr "" + +#: templates/admin.php:167 +#, php-format +msgid "Last cron was executed at %s." +msgstr "" + +#: templates/admin.php:170 +#, php-format +msgid "" +"Last cron was executed at %s. This is more than an hour ago, something seems" +" wrong." +msgstr "" + +#: templates/admin.php:174 +msgid "Cron was not executed yet!" +msgstr "" + +#: templates/admin.php:184 +msgid "Execute one task with each page loaded" +msgstr "" + +#: templates/admin.php:192 +msgid "" +"cron.php is registered at a webcron service to call cron.php every 15 " +"minutes over http." +msgstr "" + +#: templates/admin.php:200 +msgid "Use systems cron service to call the cron.php file every 15 minutes." +msgstr "" + +#: templates/admin.php:205 +msgid "Sharing" +msgstr "" + +#: templates/admin.php:211 +msgid "Enable Share API" +msgstr "" + +#: templates/admin.php:212 +msgid "Allow apps to use the Share API" +msgstr "" + +#: templates/admin.php:219 +msgid "Allow links" +msgstr "" + +#: templates/admin.php:220 +msgid "Allow users to share items to the public with links" +msgstr "" + +#: templates/admin.php:227 +msgid "Allow public uploads" +msgstr "" + +#: templates/admin.php:228 +msgid "" +"Allow users to enable others to upload into their publicly shared folders" +msgstr "" + +#: templates/admin.php:235 +msgid "Allow resharing" +msgstr "" + +#: templates/admin.php:236 +msgid "Allow users to share items shared with them again" +msgstr "" + +#: templates/admin.php:243 +msgid "Allow users to share with anyone" +msgstr "" + +#: templates/admin.php:246 +msgid "Allow users to only share with users in their groups" +msgstr "" + +#: templates/admin.php:253 +msgid "Allow mail notification" +msgstr "" + +#: templates/admin.php:254 +msgid "Allow users to send mail notification for shared files" +msgstr "" + +#: templates/admin.php:262 +msgid "Set default expiration date" +msgstr "" + +#: templates/admin.php:263 +msgid "Expire after " +msgstr "" + +#: templates/admin.php:266 +msgid "days" +msgstr "" + +#: templates/admin.php:269 +msgid "Enforce expiration date" +msgstr "" + +#: templates/admin.php:270 +msgid "Expire shares by default after N days" +msgstr "" + +#: templates/admin.php:278 +msgid "Security" +msgstr "" + +#: templates/admin.php:291 +msgid "Enforce HTTPS" +msgstr "" + +#: templates/admin.php:293 +#, php-format +msgid "Forces the clients to connect to %s via an encrypted connection." +msgstr "" + +#: templates/admin.php:299 +#, php-format +msgid "" +"Please connect to your %s via HTTPS to enable or disable the SSL " +"enforcement." +msgstr "" + +#: templates/admin.php:311 +msgid "Email Server" +msgstr "" + +#: templates/admin.php:313 +msgid "This is used for sending out notifications." +msgstr "" + +#: templates/admin.php:344 +msgid "From address" +msgstr "" + +#: templates/admin.php:366 +msgid "Authentication required" +msgstr "" + +#: templates/admin.php:370 +msgid "Server address" +msgstr "" + +#: templates/admin.php:374 +msgid "Port" +msgstr "" + +#: templates/admin.php:379 +msgid "Credentials" +msgstr "" + +#: templates/admin.php:380 +msgid "SMTP Username" +msgstr "" + +#: templates/admin.php:383 +msgid "SMTP Password" +msgstr "" + +#: templates/admin.php:387 +msgid "Test email settings" +msgstr "" + +#: templates/admin.php:388 +msgid "Send email" +msgstr "" + +#: templates/admin.php:393 +msgid "Log" +msgstr "" + +#: templates/admin.php:394 +msgid "Log level" +msgstr "" + +#: templates/admin.php:426 +msgid "More" +msgstr "" + +#: templates/admin.php:427 +msgid "Less" +msgstr "" + +#: templates/admin.php:433 templates/personal.php:202 +msgid "Version" +msgstr "" + +#: templates/admin.php:437 templates/personal.php:205 +msgid "" +"Developed by the <a href=\"http://ownCloud.org/contact\" " +"target=\"_blank\">ownCloud community</a>, the <a " +"href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is " +"licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" " +"target=\"_blank\"><abbr title=\"Affero General Public " +"License\">AGPL</abbr></a>." +msgstr "" + +#: templates/apps.php:14 +msgid "Add your App" +msgstr "" + +#: templates/apps.php:31 +msgid "More Apps" +msgstr "" + +#: templates/apps.php:38 +msgid "Select an App" +msgstr "" + +#: templates/apps.php:43 +msgid "Documentation:" +msgstr "" + +#: templates/apps.php:49 +msgid "See application page at apps.owncloud.com" +msgstr "" + +#: templates/apps.php:51 +msgid "See application website" +msgstr "" + +#: templates/apps.php:53 +msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" +msgstr "" + +#: templates/help.php:6 +msgid "Administrator Documentation" +msgstr "" + +#: templates/help.php:9 +msgid "Online Documentation" +msgstr "" + +#: templates/help.php:11 +msgid "Forum" +msgstr "" + +#: templates/help.php:14 +msgid "Bugtracker" +msgstr "" + +#: templates/help.php:17 +msgid "Commercial Support" +msgstr "" + +#: templates/personal.php:8 +msgid "Get the apps to sync your files" +msgstr "" + +#: templates/personal.php:19 +msgid "Show First Run Wizard again" +msgstr "" + +#: templates/personal.php:27 +#, php-format +msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>" +msgstr "" + +#: templates/personal.php:38 templates/users.php:21 templates/users.php:87 +msgid "Password" +msgstr "" + +#: templates/personal.php:39 +msgid "Your password was changed" +msgstr "" + +#: templates/personal.php:40 +msgid "Unable to change your password" +msgstr "" + +#: templates/personal.php:42 +msgid "Current password" +msgstr "" + +#: templates/personal.php:45 +msgid "New password" +msgstr "" + +#: templates/personal.php:49 +msgid "Change password" +msgstr "" + +#: templates/personal.php:61 templates/users.php:86 +msgid "Full Name" +msgstr "" + +#: templates/personal.php:76 +msgid "Email" +msgstr "" + +#: templates/personal.php:78 +msgid "Your email address" +msgstr "" + +#: templates/personal.php:81 +msgid "" +"Fill in an email address to enable password recovery and receive " +"notifications" +msgstr "" + +#: templates/personal.php:89 +msgid "Profile picture" +msgstr "" + +#: templates/personal.php:94 +msgid "Upload new" +msgstr "" + +#: templates/personal.php:96 +msgid "Select new from Files" +msgstr "" + +#: templates/personal.php:97 +msgid "Remove image" +msgstr "" + +#: templates/personal.php:98 +msgid "Either png or jpg. Ideally square but you will be able to crop it." +msgstr "" + +#: templates/personal.php:100 +msgid "Your avatar is provided by your original account." +msgstr "" + +#: templates/personal.php:104 +msgid "Cancel" +msgstr "" + +#: templates/personal.php:105 +msgid "Choose as profile image" +msgstr "" + +#: templates/personal.php:111 templates/personal.php:112 +msgid "Language" +msgstr "" + +#: templates/personal.php:131 +msgid "Help translate" +msgstr "" + +#: templates/personal.php:137 +msgid "WebDAV" +msgstr "" + +#: templates/personal.php:139 +#, php-format +msgid "" +"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via " +"WebDAV</a>" +msgstr "" + +#: templates/personal.php:156 +msgid "The encryption app is no longer enabled, please decrypt all your files" +msgstr "" + +#: templates/personal.php:162 +msgid "Log-in password" +msgstr "" + +#: templates/personal.php:167 +msgid "Decrypt all Files" +msgstr "" + +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + +#: templates/users.php:19 +msgid "Login Name" +msgstr "" + +#: templates/users.php:28 +msgid "Create" +msgstr "" + +#: templates/users.php:34 +msgid "Admin Recovery Password" +msgstr "" + +#: templates/users.php:35 templates/users.php:36 +msgid "" +"Enter the recovery password in order to recover the users files during " +"password change" +msgstr "" + +#: templates/users.php:40 +msgid "Default Storage" +msgstr "" + +#: templates/users.php:42 templates/users.php:137 +msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" +msgstr "" + +#: templates/users.php:46 templates/users.php:146 +msgid "Unlimited" +msgstr "" + +#: templates/users.php:64 templates/users.php:161 +msgid "Other" +msgstr "" + +#: templates/users.php:85 +msgid "Username" +msgstr "" + +#: templates/users.php:92 +msgid "Storage" +msgstr "" + +#: templates/users.php:106 +msgid "change full name" +msgstr "" + +#: templates/users.php:110 +msgid "set new password" +msgstr "" + +#: templates/users.php:141 +msgid "Default" +msgstr "" diff --git a/l10n/es_EC/user_ldap.po b/l10n/es_EC/user_ldap.po new file mode 100644 index 00000000000..2f2e6dd659e --- /dev/null +++ b/l10n/es_EC/user_ldap.po @@ -0,0 +1,534 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: ownCloud\n" +"Report-Msgid-Bugs-To: translations@owncloud.org\n" +"POT-Creation-Date: 2014-05-10 01:55-0400\n" +"PO-Revision-Date: 2013-04-26 08:02+0000\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: Spanish (Ecuador) (http://www.transifex.com/projects/p/owncloud/language/es_EC/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: es_EC\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ajax/clearMappings.php:34 +msgid "Failed to clear the mappings." +msgstr "" + +#: ajax/deleteConfiguration.php:34 +msgid "Failed to delete the server configuration" +msgstr "" + +#: ajax/testConfiguration.php:39 +msgid "The configuration is valid and the connection could be established!" +msgstr "" + +#: ajax/testConfiguration.php:42 +msgid "" +"The configuration is valid, but the Bind failed. Please check the server " +"settings and credentials." +msgstr "" + +#: ajax/testConfiguration.php:46 +msgid "" +"The configuration is invalid. Please have a look at the logs for further " +"details." +msgstr "" + +#: ajax/wizard.php:32 +msgid "No action specified" +msgstr "" + +#: ajax/wizard.php:38 +msgid "No configuration specified" +msgstr "" + +#: ajax/wizard.php:81 +msgid "No data specified" +msgstr "" + +#: ajax/wizard.php:89 +#, php-format +msgid " Could not set configuration %s" +msgstr "" + +#: js/settings.js:67 +msgid "Deletion failed" +msgstr "" + +#: js/settings.js:83 +msgid "Take over settings from recent server configuration?" +msgstr "" + +#: js/settings.js:84 +msgid "Keep settings?" +msgstr "" + +#: js/settings.js:99 +msgid "Cannot add server configuration" +msgstr "" + +#: js/settings.js:127 +msgid "mappings cleared" +msgstr "" + +#: js/settings.js:128 +msgid "Success" +msgstr "" + +#: js/settings.js:133 +msgid "Error" +msgstr "" + +#: js/settings.js:780 +msgid "Configuration OK" +msgstr "" + +#: js/settings.js:789 +msgid "Configuration incorrect" +msgstr "" + +#: js/settings.js:798 +msgid "Configuration incomplete" +msgstr "" + +#: js/settings.js:815 js/settings.js:824 +msgid "Select groups" +msgstr "" + +#: js/settings.js:818 js/settings.js:827 +msgid "Select object classes" +msgstr "" + +#: js/settings.js:821 +msgid "Select attributes" +msgstr "" + +#: js/settings.js:848 +msgid "Connection test succeeded" +msgstr "" + +#: js/settings.js:855 +msgid "Connection test failed" +msgstr "" + +#: js/settings.js:864 +msgid "Do you really want to delete the current Server Configuration?" +msgstr "" + +#: js/settings.js:865 +msgid "Confirm Deletion" +msgstr "" + +#: lib/wizard.php:79 lib/wizard.php:93 +#, php-format +msgid "%s group found" +msgid_plural "%s groups found" +msgstr[0] "" +msgstr[1] "" + +#: lib/wizard.php:122 +#, php-format +msgid "%s user found" +msgid_plural "%s users found" +msgstr[0] "" +msgstr[1] "" + +#: lib/wizard.php:784 lib/wizard.php:796 +msgid "Invalid Host" +msgstr "" + +#: lib/wizard.php:984 +msgid "Could not find the desired feature" +msgstr "" + +#: templates/part.settingcontrols.php:2 +msgid "Save" +msgstr "" + +#: templates/part.settingcontrols.php:4 +msgid "Test Configuration" +msgstr "" + +#: templates/part.settingcontrols.php:10 templates/part.wizardcontrols.php:14 +msgid "Help" +msgstr "" + +#: templates/part.wizard-groupfilter.php:4 +#, php-format +msgid "Groups meeting these criteria are available in %s:" +msgstr "" + +#: templates/part.wizard-groupfilter.php:8 +#: templates/part.wizard-userfilter.php:8 +msgid "only those object classes:" +msgstr "" + +#: templates/part.wizard-groupfilter.php:17 +#: templates/part.wizard-userfilter.php:17 +msgid "only from those groups:" +msgstr "" + +#: templates/part.wizard-groupfilter.php:25 +#: templates/part.wizard-loginfilter.php:32 +#: templates/part.wizard-userfilter.php:25 +msgid "Edit raw filter instead" +msgstr "" + +#: templates/part.wizard-groupfilter.php:30 +#: templates/part.wizard-loginfilter.php:37 +#: templates/part.wizard-userfilter.php:30 +msgid "Raw LDAP filter" +msgstr "" + +#: templates/part.wizard-groupfilter.php:31 +#, php-format +msgid "" +"The filter specifies which LDAP groups shall have access to the %s instance." +msgstr "" + +#: templates/part.wizard-groupfilter.php:38 +msgid "groups found" +msgstr "" + +#: templates/part.wizard-loginfilter.php:4 +msgid "Users login with this attribute:" +msgstr "" + +#: templates/part.wizard-loginfilter.php:8 +msgid "LDAP Username:" +msgstr "" + +#: templates/part.wizard-loginfilter.php:16 +msgid "LDAP Email Address:" +msgstr "" + +#: templates/part.wizard-loginfilter.php:24 +msgid "Other Attributes:" +msgstr "" + +#: templates/part.wizard-loginfilter.php:38 +#, php-format +msgid "" +"Defines the filter to apply, when login is attempted. %%uid replaces the " +"username in the login action. Example: \"uid=%%uid\"" +msgstr "" + +#: templates/part.wizard-server.php:18 +msgid "Add Server Configuration" +msgstr "" + +#: templates/part.wizard-server.php:30 +msgid "Host" +msgstr "" + +#: templates/part.wizard-server.php:31 +msgid "" +"You can omit the protocol, except you require SSL. Then start with ldaps://" +msgstr "" + +#: templates/part.wizard-server.php:36 +msgid "Port" +msgstr "" + +#: templates/part.wizard-server.php:44 +msgid "User DN" +msgstr "" + +#: templates/part.wizard-server.php:45 +msgid "" +"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." +msgstr "" + +#: templates/part.wizard-server.php:52 +msgid "Password" +msgstr "" + +#: templates/part.wizard-server.php:53 +msgid "For anonymous access, leave DN and Password empty." +msgstr "" + +#: templates/part.wizard-server.php:60 +msgid "One Base DN per line" +msgstr "" + +#: templates/part.wizard-server.php:61 +msgid "You can specify Base DN for users and groups in the Advanced tab" +msgstr "" + +#: templates/part.wizard-userfilter.php:4 +#, php-format +msgid "Limit %s access to users meeting these criteria:" +msgstr "" + +#: templates/part.wizard-userfilter.php:31 +#, php-format +msgid "" +"The filter specifies which LDAP users shall have access to the %s instance." +msgstr "" + +#: templates/part.wizard-userfilter.php:38 +msgid "users found" +msgstr "" + +#: templates/part.wizardcontrols.php:5 +msgid "Back" +msgstr "" + +#: templates/part.wizardcontrols.php:8 +msgid "Continue" +msgstr "" + +#: templates/settings.php:11 +msgid "" +"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may" +" experience unexpected behavior. Please ask your system administrator to " +"disable one of them." +msgstr "" + +#: templates/settings.php:14 +msgid "" +"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not " +"work. Please ask your system administrator to install it." +msgstr "" + +#: templates/settings.php:20 +msgid "Connection Settings" +msgstr "" + +#: templates/settings.php:22 +msgid "Configuration Active" +msgstr "" + +#: templates/settings.php:22 +msgid "When unchecked, this configuration will be skipped." +msgstr "" + +#: templates/settings.php:23 +msgid "Backup (Replica) Host" +msgstr "" + +#: templates/settings.php:23 +msgid "" +"Give an optional backup host. It must be a replica of the main LDAP/AD " +"server." +msgstr "" + +#: templates/settings.php:24 +msgid "Backup (Replica) Port" +msgstr "" + +#: templates/settings.php:25 +msgid "Disable Main Server" +msgstr "" + +#: templates/settings.php:25 +msgid "Only connect to the replica server." +msgstr "" + +#: templates/settings.php:26 +msgid "Case insensitive LDAP server (Windows)" +msgstr "" + +#: templates/settings.php:27 +msgid "Turn off SSL certificate validation." +msgstr "" + +#: templates/settings.php:27 +#, php-format +msgid "" +"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." +msgstr "" + +#: templates/settings.php:28 +msgid "Cache Time-To-Live" +msgstr "" + +#: templates/settings.php:28 +msgid "in seconds. A change empties the cache." +msgstr "" + +#: templates/settings.php:30 +msgid "Directory Settings" +msgstr "" + +#: templates/settings.php:32 +msgid "User Display Name Field" +msgstr "" + +#: templates/settings.php:32 +msgid "The LDAP attribute to use to generate the user's display name." +msgstr "" + +#: templates/settings.php:33 +msgid "Base User Tree" +msgstr "" + +#: templates/settings.php:33 +msgid "One User Base DN per line" +msgstr "" + +#: templates/settings.php:34 +msgid "User Search Attributes" +msgstr "" + +#: templates/settings.php:34 templates/settings.php:37 +msgid "Optional; one attribute per line" +msgstr "" + +#: templates/settings.php:35 +msgid "Group Display Name Field" +msgstr "" + +#: templates/settings.php:35 +msgid "The LDAP attribute to use to generate the groups's display name." +msgstr "" + +#: templates/settings.php:36 +msgid "Base Group Tree" +msgstr "" + +#: templates/settings.php:36 +msgid "One Group Base DN per line" +msgstr "" + +#: templates/settings.php:37 +msgid "Group Search Attributes" +msgstr "" + +#: templates/settings.php:38 +msgid "Group-Member association" +msgstr "" + +#: templates/settings.php:39 +msgid "Nested Groups" +msgstr "" + +#: templates/settings.php:39 +msgid "" +"When switched on, groups that contain groups are supported. (Only works if " +"the group member attribute contains DNs.)" +msgstr "" + +#: templates/settings.php:40 +msgid "Paging chunksize" +msgstr "" + +#: templates/settings.php:40 +msgid "" +"Chunksize used for paged LDAP searches that may return bulky results like " +"user or group enumeration. (Setting it 0 disables paged LDAP searches in " +"those situations.)" +msgstr "" + +#: templates/settings.php:42 +msgid "Special Attributes" +msgstr "" + +#: templates/settings.php:44 +msgid "Quota Field" +msgstr "" + +#: templates/settings.php:45 +msgid "Quota Default" +msgstr "" + +#: templates/settings.php:45 +msgid "in bytes" +msgstr "" + +#: templates/settings.php:46 +msgid "Email Field" +msgstr "" + +#: templates/settings.php:47 +msgid "User Home Folder Naming Rule" +msgstr "" + +#: templates/settings.php:47 +msgid "" +"Leave empty for user name (default). Otherwise, specify an LDAP/AD " +"attribute." +msgstr "" + +#: templates/settings.php:53 +msgid "Internal Username" +msgstr "" + +#: templates/settings.php:54 +msgid "" +"By default the internal username will be created from the UUID attribute. It" +" makes sure that the username is unique and characters do not need to be " +"converted. The internal username has the restriction that only these " +"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced " +"with their ASCII correspondence or simply omitted. On collisions a number " +"will be added/increased. The internal username is used to identify a user " +"internally. It is also the default name for the user home folder. It is also" +" a part of remote URLs, for instance for all *DAV services. With this " +"setting, the default behavior can be overridden. To achieve a similar " +"behavior as before ownCloud 5 enter the user display name attribute in the " +"following field. Leave it empty for default behavior. Changes will have " +"effect only on newly mapped (added) LDAP users." +msgstr "" + +#: templates/settings.php:55 +msgid "Internal Username Attribute:" +msgstr "" + +#: templates/settings.php:56 +msgid "Override UUID detection" +msgstr "" + +#: templates/settings.php:57 +msgid "" +"By default, the UUID attribute is automatically detected. The UUID attribute" +" is used to doubtlessly identify LDAP users and groups. Also, the internal " +"username will be created based on the UUID, if not specified otherwise " +"above. You can override the setting and pass an attribute of your choice. " +"You must make sure that the attribute of your choice can be fetched for both" +" users and groups and it is unique. Leave it empty for default behavior. " +"Changes will have effect only on newly mapped (added) LDAP users and groups." +msgstr "" + +#: templates/settings.php:58 +msgid "UUID Attribute for Users:" +msgstr "" + +#: templates/settings.php:59 +msgid "UUID Attribute for Groups:" +msgstr "" + +#: templates/settings.php:60 +msgid "Username-LDAP User Mapping" +msgstr "" + +#: templates/settings.php:61 +msgid "" +"Usernames are used to store and assign (meta) data. In order to precisely " +"identify and recognize users, each LDAP user will have a internal username. " +"This requires a mapping from username to LDAP user. The created username is " +"mapped to the UUID of the LDAP user. Additionally the DN is cached as well " +"to reduce LDAP interaction, but it is not used for identification. If the DN" +" changes, the changes will be found. The internal username is used all over." +" Clearing the mappings will have leftovers everywhere. Clearing the mappings" +" is not configuration sensitive, it affects all LDAP configurations! Never " +"clear the mappings in a production environment, only in a testing or " +"experimental stage." +msgstr "" + +#: templates/settings.php:62 +msgid "Clear Username-LDAP User Mapping" +msgstr "" + +#: templates/settings.php:62 +msgid "Clear Groupname-LDAP Group Mapping" +msgstr "" diff --git a/l10n/es_EC/user_webdavauth.po b/l10n/es_EC/user_webdavauth.po new file mode 100644 index 00000000000..a92cd9987b4 --- /dev/null +++ b/l10n/es_EC/user_webdavauth.po @@ -0,0 +1,33 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: ownCloud\n" +"Report-Msgid-Bugs-To: translations@owncloud.org\n" +"POT-Creation-Date: 2014-05-10 01:55-0400\n" +"PO-Revision-Date: 2012-11-09 09:06+0000\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: Spanish (Ecuador) (http://www.transifex.com/projects/p/owncloud/language/es_EC/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: es_EC\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: templates/settings.php:2 +msgid "WebDAV Authentication" +msgstr "" + +#: templates/settings.php:3 +msgid "Address: " +msgstr "" + +#: templates/settings.php:6 +msgid "" +"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." +msgstr "" diff --git a/l10n/es_MX/core.po b/l10n/es_MX/core.po index a9031a00f03..f677d8b4d86 100644 --- a/l10n/es_MX/core.po +++ b/l10n/es_MX/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:02+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/owncloud/language/es_MX/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/es_MX/files_external.po b/l10n/es_MX/files_external.po index 78ec228d90e..91c3f3945dd 100644 --- a/l10n/es_MX/files_external.po +++ b/l10n/es_MX/files_external.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/owncloud/language/es_MX/)\n" "MIME-Version: 1.0\n" @@ -197,29 +197,29 @@ msgstr "Error configurando el almacenamiento de Google Drive" msgid "Saved" msgstr "" -#: lib/config.php:598 +#: lib/config.php:597 msgid "<b>Note:</b> " msgstr "" -#: lib/config.php:608 +#: lib/config.php:607 msgid " and " msgstr "" -#: lib/config.php:630 +#: lib/config.php:629 #, php-format msgid "" "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting " "of %s is not possible. Please ask your system administrator to install it." msgstr "" -#: lib/config.php:632 +#: lib/config.php:631 #, php-format msgid "" "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of" " %s is not possible. Please ask your system administrator to install it." msgstr "" -#: lib/config.php:634 +#: lib/config.php:633 #, php-format msgid "" "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please" diff --git a/l10n/es_MX/files_sharing.po b/l10n/es_MX/files_sharing.po index 6b0ac7a443f..5f42f5454a7 100644 --- a/l10n/es_MX/files_sharing.po +++ b/l10n/es_MX/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-04 01:55-0400\n" -"PO-Revision-Date: 2014-05-03 06:12+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/owncloud/language/es_MX/)\n" "MIME-Version: 1.0\n" @@ -61,11 +61,11 @@ msgstr "Para mayor información, contacte a la persona que le envió el enlace." msgid "Download" msgstr "Descargar" -#: templates/public.php:53 +#: templates/public.php:52 #, php-format msgid "Download %s" msgstr "" -#: templates/public.php:57 +#: templates/public.php:56 msgid "Direct link" msgstr "Enlace directo" diff --git a/l10n/es_MX/settings.po b/l10n/es_MX/settings.po index 12b609a9970..a9128ba63af 100644 --- a/l10n/es_MX/settings.po +++ b/l10n/es_MX/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/owncloud/language/es_MX/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "Cifrado" @@ -98,6 +98,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "Correo electrónico guardado" @@ -114,6 +124,16 @@ msgstr "No se pudo eliminar el grupo" msgid "Unable to delete user" msgstr "No se pudo eliminar el usuario" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "Idioma cambiado" @@ -225,34 +245,42 @@ msgstr "Actualizar" msgid "Updated" msgstr "Actualizado" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "Seleccionar una imagen de perfil" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "Descifrando archivos... Espere por favor, esto puede llevar algo de tiempo." +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "eliminado" @@ -298,7 +326,7 @@ msgstr "Se debe proporcionar una contraseña válida" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "Atención: el directorio de inicio para el usuario \"{user}\" ya existe." -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "Español (México)" @@ -623,11 +651,11 @@ msgstr "Más" msgid "Less" msgstr "Menos" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "Versión" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -791,18 +819,33 @@ msgid "" "WebDAV</a>" msgstr "Utilice esta dirección para <a href=\"%s\" target=\"_blank\">acceder a sus archivos vÃa WebDAV</a>" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "La aplicación de cifrado ya no está activada, descifre todos sus archivos" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "Contraseña de acceso" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "Descifrar archivos" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "Nombre de usuario" diff --git a/l10n/es_MX/user_ldap.po b/l10n/es_MX/user_ldap.po index 82d2c95131a..047699817a9 100644 --- a/l10n/es_MX/user_ldap.po +++ b/l10n/es_MX/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/owncloud/language/es_MX/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/es_PE/core.po b/l10n/es_PE/core.po new file mode 100644 index 00000000000..624902a6f45 --- /dev/null +++ b/l10n/es_PE/core.po @@ -0,0 +1,805 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: ownCloud\n" +"Report-Msgid-Bugs-To: translations@owncloud.org\n" +"POT-Creation-Date: 2014-05-10 01:55-0400\n" +"PO-Revision-Date: 2013-04-26 08:00+0000\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: Spanish (Peru) (http://www.transifex.com/projects/p/owncloud/language/es_PE/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: es_PE\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ajax/share.php:87 +msgid "Expiration date is in the past." +msgstr "" + +#: ajax/share.php:119 ajax/share.php:161 +#, php-format +msgid "Couldn't send mail to following users: %s " +msgstr "" + +#: ajax/update.php:10 +msgid "Turned on maintenance mode" +msgstr "" + +#: ajax/update.php:13 +msgid "Turned off maintenance mode" +msgstr "" + +#: ajax/update.php:16 +msgid "Updated database" +msgstr "" + +#: avatar/controller.php:62 +msgid "No image or file provided" +msgstr "" + +#: avatar/controller.php:81 +msgid "Unknown filetype" +msgstr "" + +#: avatar/controller.php:85 +msgid "Invalid image" +msgstr "" + +#: avatar/controller.php:115 avatar/controller.php:142 +msgid "No temporary profile picture available, try again" +msgstr "" + +#: avatar/controller.php:135 +msgid "No crop data provided" +msgstr "" + +#: js/config.php:36 +msgid "Sunday" +msgstr "" + +#: js/config.php:37 +msgid "Monday" +msgstr "" + +#: js/config.php:38 +msgid "Tuesday" +msgstr "" + +#: js/config.php:39 +msgid "Wednesday" +msgstr "" + +#: js/config.php:40 +msgid "Thursday" +msgstr "" + +#: js/config.php:41 +msgid "Friday" +msgstr "" + +#: js/config.php:42 +msgid "Saturday" +msgstr "" + +#: js/config.php:47 +msgid "January" +msgstr "" + +#: js/config.php:48 +msgid "February" +msgstr "" + +#: js/config.php:49 +msgid "March" +msgstr "" + +#: js/config.php:50 +msgid "April" +msgstr "" + +#: js/config.php:51 +msgid "May" +msgstr "" + +#: js/config.php:52 +msgid "June" +msgstr "" + +#: js/config.php:53 +msgid "July" +msgstr "" + +#: js/config.php:54 +msgid "August" +msgstr "" + +#: js/config.php:55 +msgid "September" +msgstr "" + +#: js/config.php:56 +msgid "October" +msgstr "" + +#: js/config.php:57 +msgid "November" +msgstr "" + +#: js/config.php:58 +msgid "December" +msgstr "" + +#: js/js.js:483 +msgid "Settings" +msgstr "" + +#: js/js.js:583 +msgid "Saving..." +msgstr "" + +#: js/js.js:1240 +msgid "seconds ago" +msgstr "" + +#: js/js.js:1241 +msgid "%n minute ago" +msgid_plural "%n minutes ago" +msgstr[0] "" +msgstr[1] "" + +#: js/js.js:1242 +msgid "%n hour ago" +msgid_plural "%n hours ago" +msgstr[0] "" +msgstr[1] "" + +#: js/js.js:1243 +msgid "today" +msgstr "" + +#: js/js.js:1244 +msgid "yesterday" +msgstr "" + +#: js/js.js:1245 +msgid "%n day ago" +msgid_plural "%n days ago" +msgstr[0] "" +msgstr[1] "" + +#: js/js.js:1246 +msgid "last month" +msgstr "" + +#: js/js.js:1247 +msgid "%n month ago" +msgid_plural "%n months ago" +msgstr[0] "" +msgstr[1] "" + +#: js/js.js:1248 +msgid "last year" +msgstr "" + +#: js/js.js:1249 +msgid "years ago" +msgstr "" + +#: js/oc-dialogs.js:125 +msgid "Choose" +msgstr "" + +#: js/oc-dialogs.js:151 +msgid "Error loading file picker template: {error}" +msgstr "" + +#: js/oc-dialogs.js:177 +msgid "Yes" +msgstr "" + +#: js/oc-dialogs.js:187 +msgid "No" +msgstr "" + +#: js/oc-dialogs.js:204 +msgid "Ok" +msgstr "" + +#: js/oc-dialogs.js:224 +msgid "Error loading message template: {error}" +msgstr "" + +#: js/oc-dialogs.js:352 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" + +#: js/oc-dialogs.js:366 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:372 +msgid "New Files" +msgstr "" + +#: js/oc-dialogs.js:373 +msgid "Already existing files" +msgstr "" + +#: js/oc-dialogs.js:375 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:384 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:394 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:441 js/oc-dialogs.js:454 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:444 js/oc-dialogs.js:458 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:466 +msgid "Error loading file exists template" +msgstr "" + +#: js/setup.js:84 +msgid "Very weak password" +msgstr "" + +#: js/setup.js:85 +msgid "Weak password" +msgstr "" + +#: js/setup.js:86 +msgid "So-so password" +msgstr "" + +#: js/setup.js:87 +msgid "Good password" +msgstr "" + +#: js/setup.js:88 +msgid "Strong password" +msgstr "" + +#: js/share.js:51 js/share.js:66 js/share.js:106 +msgid "Shared" +msgstr "" + +#: js/share.js:109 +msgid "Share" +msgstr "" + +#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734 +#: templates/installation.php:10 +msgid "Error" +msgstr "" + +#: js/share.js:160 js/share.js:790 +msgid "Error while sharing" +msgstr "" + +#: js/share.js:171 +msgid "Error while unsharing" +msgstr "" + +#: js/share.js:178 +msgid "Error while changing permissions" +msgstr "" + +#: js/share.js:188 +msgid "Shared with you and the group {group} by {owner}" +msgstr "" + +#: js/share.js:190 +msgid "Shared with you by {owner}" +msgstr "" + +#: js/share.js:214 +msgid "Share with user or group …" +msgstr "" + +#: js/share.js:220 +msgid "Share link" +msgstr "" + +#: js/share.js:223 +msgid "Password protect" +msgstr "" + +#: js/share.js:225 templates/installation.php:60 templates/login.php:40 +msgid "Password" +msgstr "" + +#: js/share.js:230 +msgid "Allow Public Upload" +msgstr "" + +#: js/share.js:234 +msgid "Email link to person" +msgstr "" + +#: js/share.js:235 +msgid "Send" +msgstr "" + +#: js/share.js:240 +msgid "Set expiration date" +msgstr "" + +#: js/share.js:241 +msgid "Expiration date" +msgstr "" + +#: js/share.js:277 +msgid "Share via email:" +msgstr "" + +#: js/share.js:280 +msgid "No people found" +msgstr "" + +#: js/share.js:324 js/share.js:385 +msgid "group" +msgstr "" + +#: js/share.js:357 +msgid "Resharing is not allowed" +msgstr "" + +#: js/share.js:401 +msgid "Shared in {item} with {user}" +msgstr "" + +#: js/share.js:423 +msgid "Unshare" +msgstr "" + +#: js/share.js:431 +msgid "notify by email" +msgstr "" + +#: js/share.js:434 +msgid "can edit" +msgstr "" + +#: js/share.js:436 +msgid "access control" +msgstr "" + +#: js/share.js:439 +msgid "create" +msgstr "" + +#: js/share.js:442 +msgid "update" +msgstr "" + +#: js/share.js:445 +msgid "delete" +msgstr "" + +#: js/share.js:448 +msgid "share" +msgstr "" + +#: js/share.js:721 +msgid "Password protected" +msgstr "" + +#: js/share.js:734 +msgid "Error unsetting expiration date" +msgstr "" + +#: js/share.js:752 +msgid "Error setting expiration date" +msgstr "" + +#: js/share.js:777 +msgid "Sending ..." +msgstr "" + +#: js/share.js:788 +msgid "Email sent" +msgstr "" + +#: js/share.js:812 +msgid "Warning" +msgstr "" + +#: js/tags.js:4 +msgid "The object type is not specified." +msgstr "" + +#: js/tags.js:13 +msgid "Enter new" +msgstr "" + +#: js/tags.js:27 +msgid "Delete" +msgstr "" + +#: js/tags.js:31 +msgid "Add" +msgstr "" + +#: js/tags.js:39 +msgid "Edit tags" +msgstr "" + +#: js/tags.js:57 +msgid "Error loading dialog template: {error}" +msgstr "" + +#: js/tags.js:264 +msgid "No tags selected for deletion." +msgstr "" + +#: js/update.js:8 +msgid "Please reload the page." +msgstr "" + +#: js/update.js:17 +msgid "" +"The update was unsuccessful. Please report this issue to the <a " +"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud " +"community</a>." +msgstr "" + +#: js/update.js:21 +msgid "The update was successful. Redirecting you to ownCloud now." +msgstr "" + +#: lostpassword/controller.php:70 +#, php-format +msgid "%s password reset" +msgstr "" + +#: lostpassword/controller.php:72 +msgid "" +"A problem has occurred whilst sending the email, please contact your " +"administrator." +msgstr "" + +#: lostpassword/templates/email.php:2 +msgid "Use the following link to reset your password: {link}" +msgstr "" + +#: lostpassword/templates/lostpassword.php:7 +msgid "" +"The link to reset your password has been sent to your email.<br>If you do " +"not receive it within a reasonable amount of time, check your spam/junk " +"folders.<br>If it is not there ask your local administrator ." +msgstr "" + +#: lostpassword/templates/lostpassword.php:15 +msgid "Request failed!<br>Did you make sure your email/username was right?" +msgstr "" + +#: lostpassword/templates/lostpassword.php:18 +msgid "You will receive a link to reset your password via Email." +msgstr "" + +#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53 +#: templates/login.php:32 +msgid "Username" +msgstr "" + +#: lostpassword/templates/lostpassword.php:25 +msgid "" +"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?" +msgstr "" + +#: lostpassword/templates/lostpassword.php:27 +msgid "Yes, I really want to reset my password now" +msgstr "" + +#: lostpassword/templates/lostpassword.php:30 +msgid "Reset" +msgstr "" + +#: lostpassword/templates/resetpassword.php:4 +msgid "Your password was reset" +msgstr "" + +#: lostpassword/templates/resetpassword.php:5 +msgid "To login page" +msgstr "" + +#: lostpassword/templates/resetpassword.php:8 +msgid "New password" +msgstr "" + +#: lostpassword/templates/resetpassword.php:11 +msgid "Reset password" +msgstr "" + +#: setup/controller.php:140 +#, php-format +msgid "" +"Mac OS X is not supported and %s will not work properly on this platform. " +"Use it at your own risk! " +msgstr "" + +#: setup/controller.php:144 +msgid "" +"For the best results, please consider using a GNU/Linux server instead." +msgstr "" + +#: strings.php:5 +msgid "Personal" +msgstr "" + +#: strings.php:6 +msgid "Users" +msgstr "" + +#: strings.php:7 templates/layout.user.php:116 +msgid "Apps" +msgstr "" + +#: strings.php:8 +msgid "Admin" +msgstr "" + +#: strings.php:9 +msgid "Help" +msgstr "" + +#: tags/controller.php:22 +msgid "Error loading tags" +msgstr "" + +#: tags/controller.php:48 +msgid "Tag already exists" +msgstr "" + +#: tags/controller.php:64 +msgid "Error deleting tag(s)" +msgstr "" + +#: tags/controller.php:75 +msgid "Error tagging" +msgstr "" + +#: tags/controller.php:86 +msgid "Error untagging" +msgstr "" + +#: tags/controller.php:97 +msgid "Error favoriting" +msgstr "" + +#: tags/controller.php:108 +msgid "Error unfavoriting" +msgstr "" + +#: templates/403.php:12 +msgid "Access forbidden" +msgstr "" + +#: templates/404.php:15 +msgid "Cloud not found" +msgstr "" + +#: templates/altmail.php:2 +#, php-format +msgid "" +"Hey there,\n" +"\n" +"just letting you know that %s shared %s with you.\n" +"View it: %s\n" +"\n" +msgstr "" + +#: templates/altmail.php:4 templates/mail.php:17 +#, php-format +msgid "The share will expire on %s." +msgstr "" + +#: templates/altmail.php:7 templates/mail.php:20 +msgid "Cheers!" +msgstr "" + +#: templates/installation.php:25 templates/installation.php:32 +#: templates/installation.php:39 +msgid "Security Warning" +msgstr "" + +#: templates/installation.php:26 +msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" +msgstr "" + +#: templates/installation.php:27 +#, php-format +msgid "Please update your PHP installation to use %s securely." +msgstr "" + +#: templates/installation.php:33 +msgid "" +"No secure random number generator is available, please enable the PHP " +"OpenSSL extension." +msgstr "" + +#: templates/installation.php:34 +msgid "" +"Without a secure random number generator an attacker may be able to predict " +"password reset tokens and take over your account." +msgstr "" + +#: templates/installation.php:40 +msgid "" +"Your data directory and files are probably accessible from the internet " +"because the .htaccess file does not work." +msgstr "" + +#: templates/installation.php:42 +#, php-format +msgid "" +"For information how to properly configure your server, please see the <a " +"href=\"%s\" target=\"_blank\">documentation</a>." +msgstr "" + +#: templates/installation.php:48 +msgid "Create an <strong>admin account</strong>" +msgstr "" + +#: templates/installation.php:70 +msgid "Storage & database" +msgstr "" + +#: templates/installation.php:77 +msgid "Data folder" +msgstr "" + +#: templates/installation.php:90 +msgid "Configure the database" +msgstr "" + +#: templates/installation.php:94 +msgid "will be used" +msgstr "" + +#: templates/installation.php:109 +msgid "Database user" +msgstr "" + +#: templates/installation.php:118 +msgid "Database password" +msgstr "" + +#: templates/installation.php:123 +msgid "Database name" +msgstr "" + +#: templates/installation.php:132 +msgid "Database tablespace" +msgstr "" + +#: templates/installation.php:140 +msgid "Database host" +msgstr "" + +#: templates/installation.php:150 +msgid "Finish setup" +msgstr "" + +#: templates/installation.php:150 +msgid "Finishing …" +msgstr "" + +#: templates/layout.user.php:40 +msgid "" +"This application requires JavaScript to be enabled for correct operation. " +"Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable " +"JavaScript</a> and re-load this interface." +msgstr "" + +#: templates/layout.user.php:44 +#, php-format +msgid "%s is available. Get more information on how to update." +msgstr "" + +#: templates/layout.user.php:74 templates/singleuser.user.php:8 +msgid "Log out" +msgstr "" + +#: templates/login.php:9 +msgid "Automatic logon rejected!" +msgstr "" + +#: templates/login.php:10 +msgid "" +"If you did not change your password recently, your account may be " +"compromised!" +msgstr "" + +#: templates/login.php:12 +msgid "Please change your password to secure your account again." +msgstr "" + +#: templates/login.php:17 +msgid "Server side authentication failed!" +msgstr "" + +#: templates/login.php:18 +msgid "Please contact your administrator." +msgstr "" + +#: templates/login.php:46 +msgid "Lost your password?" +msgstr "" + +#: templates/login.php:51 +msgid "remember" +msgstr "" + +#: templates/login.php:54 +msgid "Log in" +msgstr "" + +#: templates/login.php:60 +msgid "Alternative Logins" +msgstr "" + +#: templates/mail.php:15 +#, php-format +msgid "" +"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> " +"with you.<br><a href=\"%s\">View it!</a><br><br>" +msgstr "" + +#: templates/singleuser.user.php:3 +msgid "This ownCloud instance is currently in single user mode." +msgstr "" + +#: templates/singleuser.user.php:4 +msgid "This means only administrators can use the instance." +msgstr "" + +#: templates/singleuser.user.php:5 templates/update.user.php:5 +msgid "" +"Contact your system administrator if this message persists or appeared " +"unexpectedly." +msgstr "" + +#: templates/singleuser.user.php:7 templates/update.user.php:6 +msgid "Thank you for your patience." +msgstr "" + +#: templates/update.admin.php:3 +#, php-format +msgid "Updating ownCloud to version %s, this may take a while." +msgstr "" + +#: templates/update.user.php:3 +msgid "" +"This ownCloud instance is currently being updated, which may take a while." +msgstr "" + +#: templates/update.user.php:4 +msgid "Please reload this page after a short time to continue using ownCloud." +msgstr "" diff --git a/l10n/es_PE/files.po b/l10n/es_PE/files.po new file mode 100644 index 00000000000..15fa496855e --- /dev/null +++ b/l10n/es_PE/files.po @@ -0,0 +1,405 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: ownCloud\n" +"Report-Msgid-Bugs-To: translations@owncloud.org\n" +"POT-Creation-Date: 2014-05-10 01:55-0400\n" +"PO-Revision-Date: 2013-04-26 08:00+0000\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: Spanish (Peru) (http://www.transifex.com/projects/p/owncloud/language/es_PE/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: es_PE\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ajax/move.php:15 +#, php-format +msgid "Could not move %s - File with this name already exists" +msgstr "" + +#: ajax/move.php:25 ajax/move.php:28 +#, php-format +msgid "Could not move %s" +msgstr "" + +#: ajax/newfile.php:58 js/files.js:96 +msgid "File name cannot be empty." +msgstr "" + +#: ajax/newfile.php:63 +#, php-format +msgid "\"%s\" is an invalid file name." +msgstr "" + +#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103 +msgid "" +"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " +"allowed." +msgstr "" + +#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155 +#: lib/app.php:60 +msgid "The target folder has been moved or deleted." +msgstr "" + +#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69 +#, php-format +msgid "" +"The name %s is already used in the folder %s. Please choose a different " +"name." +msgstr "" + +#: ajax/newfile.php:97 +msgid "Not a valid source" +msgstr "" + +#: ajax/newfile.php:102 +msgid "" +"Server is not allowed to open URLs, please check the server configuration" +msgstr "" + +#: ajax/newfile.php:118 +#, php-format +msgid "Error while downloading %s to %s" +msgstr "" + +#: ajax/newfile.php:146 +msgid "Error when creating the file" +msgstr "" + +#: ajax/newfolder.php:22 +msgid "Folder name cannot be empty." +msgstr "" + +#: ajax/newfolder.php:66 +msgid "Error when creating the folder" +msgstr "" + +#: ajax/upload.php:19 ajax/upload.php:57 +msgid "Unable to set upload directory." +msgstr "" + +#: ajax/upload.php:33 +msgid "Invalid Token" +msgstr "" + +#: ajax/upload.php:75 +msgid "No file was uploaded. Unknown error" +msgstr "" + +#: ajax/upload.php:82 +msgid "There is no error, the file uploaded with success" +msgstr "" + +#: ajax/upload.php:83 +msgid "" +"The uploaded file exceeds the upload_max_filesize directive in php.ini: " +msgstr "" + +#: ajax/upload.php:85 +msgid "" +"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in " +"the HTML form" +msgstr "" + +#: ajax/upload.php:86 +msgid "The uploaded file was only partially uploaded" +msgstr "" + +#: ajax/upload.php:87 +msgid "No file was uploaded" +msgstr "" + +#: ajax/upload.php:88 +msgid "Missing a temporary folder" +msgstr "" + +#: ajax/upload.php:89 +msgid "Failed to write to disk" +msgstr "" + +#: ajax/upload.php:107 +msgid "Not enough storage available" +msgstr "" + +#: ajax/upload.php:169 +msgid "Upload failed. Could not find uploaded file" +msgstr "" + +#: ajax/upload.php:179 +msgid "Upload failed. Could not get file info." +msgstr "" + +#: ajax/upload.php:194 +msgid "Invalid directory." +msgstr "" + +#: appinfo/app.php:11 js/filelist.js:14 +msgid "Files" +msgstr "" + +#: js/file-upload.js:254 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" +msgstr "" + +#: js/file-upload.js:266 +msgid "Total file size {size1} exceeds upload limit {size2}" +msgstr "" + +#: js/file-upload.js:276 +msgid "" +"Not enough free space, you are uploading {size1} but only {size2} is left" +msgstr "" + +#: js/file-upload.js:353 +msgid "Upload cancelled." +msgstr "" + +#: js/file-upload.js:398 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:490 +msgid "" +"File upload is in progress. Leaving the page now will cancel the upload." +msgstr "" + +#: js/file-upload.js:555 +msgid "URL cannot be empty" +msgstr "" + +#: js/file-upload.js:559 js/filelist.js:963 +msgid "{new_name} already exists" +msgstr "" + +#: js/file-upload.js:611 +msgid "Could not create file" +msgstr "" + +#: js/file-upload.js:624 +msgid "Could not create folder" +msgstr "" + +#: js/file-upload.js:664 +msgid "Error fetching URL" +msgstr "" + +#: js/fileactions.js:160 +msgid "Share" +msgstr "" + +#: js/fileactions.js:173 +msgid "Delete permanently" +msgstr "" + +#: js/fileactions.js:234 +msgid "Rename" +msgstr "" + +#: js/filelist.js:221 +msgid "" +"Your download is being prepared. This might take some time if the files are " +"big." +msgstr "" + +#: js/filelist.js:502 js/filelist.js:1422 +msgid "Pending" +msgstr "" + +#: js/filelist.js:916 +msgid "Error moving file." +msgstr "" + +#: js/filelist.js:924 +msgid "Error moving file" +msgstr "" + +#: js/filelist.js:924 +msgid "Error" +msgstr "" + +#: js/filelist.js:988 +msgid "Could not rename file" +msgstr "" + +#: js/filelist.js:1122 +msgid "Error deleting file." +msgstr "" + +#: js/filelist.js:1224 templates/index.php:67 +msgid "Name" +msgstr "" + +#: js/filelist.js:1225 templates/index.php:79 +msgid "Size" +msgstr "" + +#: js/filelist.js:1226 templates/index.php:81 +msgid "Modified" +msgstr "" + +#: js/filelist.js:1235 js/filesummary.js:141 js/filesummary.js:168 +msgid "%n folder" +msgid_plural "%n folders" +msgstr[0] "" +msgstr[1] "" + +#: js/filelist.js:1241 js/filesummary.js:142 js/filesummary.js:169 +msgid "%n file" +msgid_plural "%n files" +msgstr[0] "" +msgstr[1] "" + +#: js/filelist.js:1330 js/filelist.js:1369 +msgid "Uploading %n file" +msgid_plural "Uploading %n files" +msgstr[0] "" +msgstr[1] "" + +#: js/files.js:94 +msgid "\"{name}\" is an invalid file name." +msgstr "" + +#: js/files.js:115 +msgid "Your storage is full, files can not be updated or synced anymore!" +msgstr "" + +#: js/files.js:119 +msgid "Your storage is almost full ({usedSpacePercent}%)" +msgstr "" + +#: js/files.js:133 +msgid "" +"Encryption App is enabled but your keys are not initialized, please log-out " +"and log-in again" +msgstr "" + +#: js/files.js:137 +msgid "" +"Invalid private key for Encryption App. Please update your private key " +"password in your personal settings to recover access to your encrypted " +"files." +msgstr "" + +#: js/files.js:141 +msgid "" +"Encryption was disabled but your files are still encrypted. Please go to " +"your personal settings to decrypt your files." +msgstr "" + +#: js/filesummary.js:182 +msgid "{dirs} and {files}" +msgstr "" + +#: lib/app.php:86 +#, php-format +msgid "%s could not be renamed" +msgstr "" + +#: lib/helper.php:14 templates/index.php:22 +#, php-format +msgid "Upload (max. %s)" +msgstr "" + +#: templates/admin.php:4 +msgid "File handling" +msgstr "" + +#: templates/admin.php:6 +msgid "Maximum upload size" +msgstr "" + +#: templates/admin.php:9 +msgid "max. possible: " +msgstr "" + +#: templates/admin.php:14 +msgid "Needed for multi-file and folder downloads." +msgstr "" + +#: templates/admin.php:16 +msgid "Enable ZIP-download" +msgstr "" + +#: templates/admin.php:19 +msgid "0 is unlimited" +msgstr "" + +#: templates/admin.php:21 +msgid "Maximum input size for ZIP files" +msgstr "" + +#: templates/admin.php:25 +msgid "Save" +msgstr "" + +#: templates/index.php:5 +msgid "New" +msgstr "" + +#: templates/index.php:8 +msgid "New text file" +msgstr "" + +#: templates/index.php:9 +msgid "Text file" +msgstr "" + +#: templates/index.php:12 +msgid "New folder" +msgstr "" + +#: templates/index.php:13 +msgid "Folder" +msgstr "" + +#: templates/index.php:16 +msgid "From link" +msgstr "" + +#: templates/index.php:40 +msgid "Deleted files" +msgstr "" + +#: templates/index.php:45 +msgid "Cancel upload" +msgstr "" + +#: templates/index.php:51 +msgid "You don’t have permission to upload or create files here" +msgstr "" + +#: templates/index.php:56 +msgid "Nothing in here. Upload something!" +msgstr "" + +#: templates/index.php:73 +msgid "Download" +msgstr "" + +#: templates/index.php:84 templates/index.php:85 +msgid "Delete" +msgstr "" + +#: templates/index.php:98 +msgid "Upload too large" +msgstr "" + +#: templates/index.php:100 +msgid "" +"The files you are trying to upload exceed the maximum size for file uploads " +"on this server." +msgstr "" + +#: templates/index.php:105 +msgid "Files are being scanned, please wait." +msgstr "" + +#: templates/index.php:108 +msgid "Current scanning" +msgstr "" diff --git a/l10n/es_PE/files_encryption.po b/l10n/es_PE/files_encryption.po new file mode 100644 index 00000000000..b2e26fe7854 --- /dev/null +++ b/l10n/es_PE/files_encryption.po @@ -0,0 +1,201 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: ownCloud\n" +"Report-Msgid-Bugs-To: translations@owncloud.org\n" +"POT-Creation-Date: 2014-05-10 01:55-0400\n" +"PO-Revision-Date: 2013-04-26 08:01+0000\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: Spanish (Peru) (http://www.transifex.com/projects/p/owncloud/language/es_PE/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: es_PE\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ajax/adminrecovery.php:29 +msgid "Recovery key successfully enabled" +msgstr "" + +#: ajax/adminrecovery.php:34 +msgid "" +"Could not enable recovery key. Please check your recovery key password!" +msgstr "" + +#: ajax/adminrecovery.php:48 +msgid "Recovery key successfully disabled" +msgstr "" + +#: ajax/adminrecovery.php:53 +msgid "" +"Could not disable recovery key. Please check your recovery key password!" +msgstr "" + +#: ajax/changeRecoveryPassword.php:49 +msgid "Password successfully changed." +msgstr "" + +#: ajax/changeRecoveryPassword.php:51 +msgid "Could not change the password. Maybe the old password was not correct." +msgstr "" + +#: ajax/updatePrivateKeyPassword.php:52 +msgid "Private key password successfully updated." +msgstr "" + +#: ajax/updatePrivateKeyPassword.php:54 +msgid "" +"Could not update the private key password. Maybe the old password was not " +"correct." +msgstr "" + +#: files/error.php:12 +msgid "" +"Encryption app not initialized! Maybe the encryption app was re-enabled " +"during your session. Please try to log out and log back in to initialize the" +" encryption app." +msgstr "" + +#: files/error.php:16 +#, php-format +msgid "" +"Your private key is not valid! Likely your password was changed outside of " +"%s (e.g. your corporate directory). You can update your private key password" +" in your personal settings to recover access to your encrypted files." +msgstr "" + +#: files/error.php:19 +msgid "" +"Can not decrypt this file, probably this is a shared file. Please ask the " +"file owner to reshare the file with you." +msgstr "" + +#: files/error.php:22 files/error.php:27 +msgid "" +"Unknown error please check your system settings or contact your " +"administrator" +msgstr "" + +#: hooks/hooks.php:64 +msgid "Missing requirements." +msgstr "" + +#: hooks/hooks.php:65 +msgid "" +"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." +msgstr "" + +#: hooks/hooks.php:295 +msgid "Following users are not set up for encryption:" +msgstr "" + +#: js/detect-migration.js:21 +msgid "Initial encryption started... This can take some time. Please wait." +msgstr "" + +#: js/detect-migration.js:25 +msgid "Initial encryption running... Please try again later." +msgstr "" + +#: templates/invalid_private_key.php:8 +msgid "Go directly to your " +msgstr "" + +#: templates/invalid_private_key.php:8 +msgid "personal settings" +msgstr "" + +#: templates/settings-admin.php:2 templates/settings-personal.php:2 +msgid "Encryption" +msgstr "" + +#: templates/settings-admin.php:5 +msgid "" +"Enable recovery key (allow to recover users files in case of password loss):" +msgstr "" + +#: templates/settings-admin.php:9 +msgid "Recovery key password" +msgstr "" + +#: templates/settings-admin.php:12 +msgid "Repeat Recovery key password" +msgstr "" + +#: templates/settings-admin.php:19 templates/settings-personal.php:50 +msgid "Enabled" +msgstr "" + +#: templates/settings-admin.php:27 templates/settings-personal.php:58 +msgid "Disabled" +msgstr "" + +#: templates/settings-admin.php:32 +msgid "Change recovery key password:" +msgstr "" + +#: templates/settings-admin.php:38 +msgid "Old Recovery key password" +msgstr "" + +#: templates/settings-admin.php:45 +msgid "New Recovery key password" +msgstr "" + +#: templates/settings-admin.php:51 +msgid "Repeat New Recovery key password" +msgstr "" + +#: templates/settings-admin.php:56 +msgid "Change Password" +msgstr "" + +#: templates/settings-personal.php:8 +msgid "Your private key password no longer match your log-in password:" +msgstr "" + +#: templates/settings-personal.php:11 +msgid "Set your old private key password to your current log-in password." +msgstr "" + +#: templates/settings-personal.php:13 +msgid "" +" If you don't remember your old password you can ask your administrator to " +"recover your files." +msgstr "" + +#: templates/settings-personal.php:21 +msgid "Old log-in password" +msgstr "" + +#: templates/settings-personal.php:27 +msgid "Current log-in password" +msgstr "" + +#: templates/settings-personal.php:32 +msgid "Update Private Key Password" +msgstr "" + +#: templates/settings-personal.php:41 +msgid "Enable password recovery:" +msgstr "" + +#: templates/settings-personal.php:43 +msgid "" +"Enabling this option will allow you to reobtain access to your encrypted " +"files in case of password loss" +msgstr "" + +#: templates/settings-personal.php:59 +msgid "File recovery settings updated" +msgstr "" + +#: templates/settings-personal.php:60 +msgid "Could not update file recovery" +msgstr "" diff --git a/l10n/es_PE/files_external.po b/l10n/es_PE/files_external.po new file mode 100644 index 00000000000..e283a6be670 --- /dev/null +++ b/l10n/es_PE/files_external.po @@ -0,0 +1,292 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: ownCloud\n" +"Report-Msgid-Bugs-To: translations@owncloud.org\n" +"POT-Creation-Date: 2014-05-10 01:55-0400\n" +"PO-Revision-Date: 2013-04-26 08:01+0000\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: Spanish (Peru) (http://www.transifex.com/projects/p/owncloud/language/es_PE/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: es_PE\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: appinfo/app.php:34 +msgid "Local" +msgstr "" + +#: appinfo/app.php:36 +msgid "Location" +msgstr "" + +#: appinfo/app.php:39 +msgid "Amazon S3" +msgstr "" + +#: appinfo/app.php:41 +msgid "Key" +msgstr "" + +#: appinfo/app.php:42 +msgid "Secret" +msgstr "" + +#: appinfo/app.php:43 appinfo/app.php:51 +msgid "Bucket" +msgstr "" + +#: appinfo/app.php:47 +msgid "Amazon S3 and compliant" +msgstr "" + +#: appinfo/app.php:49 +msgid "Access Key" +msgstr "" + +#: appinfo/app.php:50 +msgid "Secret Key" +msgstr "" + +#: appinfo/app.php:52 +msgid "Hostname (optional)" +msgstr "" + +#: appinfo/app.php:53 +msgid "Port (optional)" +msgstr "" + +#: appinfo/app.php:54 +msgid "Region (optional)" +msgstr "" + +#: appinfo/app.php:55 +msgid "Enable SSL" +msgstr "" + +#: appinfo/app.php:56 +msgid "Enable Path Style" +msgstr "" + +#: appinfo/app.php:63 +msgid "App key" +msgstr "" + +#: appinfo/app.php:64 +msgid "App secret" +msgstr "" + +#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121 +#: appinfo/app.php:131 appinfo/app.php:141 appinfo/app.php:151 +msgid "URL" +msgstr "" + +#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132 +#: appinfo/app.php:142 appinfo/app.php:152 +msgid "Username" +msgstr "" + +#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133 +#: appinfo/app.php:143 appinfo/app.php:153 +msgid "Password" +msgstr "" + +#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124 +#: appinfo/app.php:134 appinfo/app.php:154 +msgid "Root" +msgstr "" + +#: appinfo/app.php:77 +msgid "Secure ftps://" +msgstr "" + +#: appinfo/app.php:84 +msgid "Client ID" +msgstr "" + +#: appinfo/app.php:85 +msgid "Client secret" +msgstr "" + +#: appinfo/app.php:92 +msgid "OpenStack Object Storage" +msgstr "" + +#: appinfo/app.php:94 +msgid "Username (required)" +msgstr "" + +#: appinfo/app.php:95 +msgid "Bucket (required)" +msgstr "" + +#: appinfo/app.php:96 +msgid "Region (optional for OpenStack Object Storage)" +msgstr "" + +#: appinfo/app.php:97 +msgid "API Key (required for Rackspace Cloud Files)" +msgstr "" + +#: appinfo/app.php:98 +msgid "Tenantname (required for OpenStack Object Storage)" +msgstr "" + +#: appinfo/app.php:99 +msgid "Password (required for OpenStack Object Storage)" +msgstr "" + +#: appinfo/app.php:100 +msgid "Service Name (required for OpenStack Object Storage)" +msgstr "" + +#: appinfo/app.php:101 +msgid "URL of identity endpoint (required for OpenStack Object Storage)" +msgstr "" + +#: appinfo/app.php:102 +msgid "Timeout of HTTP requests in seconds (optional)" +msgstr "" + +#: appinfo/app.php:114 appinfo/app.php:123 +msgid "Share" +msgstr "" + +#: appinfo/app.php:119 +msgid "SMB / CIFS using OC login" +msgstr "" + +#: appinfo/app.php:122 +msgid "Username as share" +msgstr "" + +#: appinfo/app.php:135 appinfo/app.php:145 +msgid "Secure https://" +msgstr "" + +#: appinfo/app.php:144 +msgid "Remote subfolder" +msgstr "" + +#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40 +msgid "Access granted" +msgstr "" + +#: js/dropbox.js:33 js/dropbox.js:97 js/dropbox.js:103 +msgid "Error configuring Dropbox storage" +msgstr "" + +#: js/dropbox.js:68 js/google.js:89 +msgid "Grant access" +msgstr "" + +#: js/dropbox.js:102 +msgid "Please provide a valid Dropbox app key and secret." +msgstr "" + +#: js/google.js:45 js/google.js:122 +msgid "Error configuring Google Drive storage" +msgstr "" + +#: js/settings.js:318 js/settings.js:325 +msgid "Saved" +msgstr "" + +#: lib/config.php:597 +msgid "<b>Note:</b> " +msgstr "" + +#: lib/config.php:607 +msgid " and " +msgstr "" + +#: lib/config.php:629 +#, php-format +msgid "" +"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting " +"of %s is not possible. Please ask your system administrator to install it." +msgstr "" + +#: lib/config.php:631 +#, php-format +msgid "" +"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of" +" %s is not possible. Please ask your system administrator to install it." +msgstr "" + +#: lib/config.php:633 +#, php-format +msgid "" +"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please" +" ask your system administrator to install it." +msgstr "" + +#: templates/settings.php:2 +msgid "External Storage" +msgstr "" + +#: templates/settings.php:8 templates/settings.php:27 +msgid "Folder name" +msgstr "" + +#: templates/settings.php:9 +msgid "External storage" +msgstr "" + +#: templates/settings.php:10 +msgid "Configuration" +msgstr "" + +#: templates/settings.php:11 +msgid "Options" +msgstr "" + +#: templates/settings.php:12 +msgid "Available for" +msgstr "" + +#: templates/settings.php:32 +msgid "Add storage" +msgstr "" + +#: templates/settings.php:92 +msgid "No user or group" +msgstr "" + +#: templates/settings.php:95 +msgid "All Users" +msgstr "" + +#: templates/settings.php:97 +msgid "Groups" +msgstr "" + +#: templates/settings.php:105 +msgid "Users" +msgstr "" + +#: templates/settings.php:118 templates/settings.php:119 +#: templates/settings.php:158 templates/settings.php:159 +msgid "Delete" +msgstr "" + +#: templates/settings.php:132 +msgid "Enable User External Storage" +msgstr "" + +#: templates/settings.php:135 +msgid "Allow users to mount the following external storage" +msgstr "" + +#: templates/settings.php:150 +msgid "SSL root certificates" +msgstr "" + +#: templates/settings.php:168 +msgid "Import Root Certificate" +msgstr "" diff --git a/l10n/es_PE/files_sharing.po b/l10n/es_PE/files_sharing.po new file mode 100644 index 00000000000..a6a1137866a --- /dev/null +++ b/l10n/es_PE/files_sharing.po @@ -0,0 +1,71 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: ownCloud\n" +"Report-Msgid-Bugs-To: translations@owncloud.org\n" +"POT-Creation-Date: 2014-05-10 01:55-0400\n" +"PO-Revision-Date: 2013-04-26 08:01+0000\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: Spanish (Peru) (http://www.transifex.com/projects/p/owncloud/language/es_PE/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: es_PE\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: js/share.js:33 +msgid "Shared by {owner}" +msgstr "" + +#: templates/authenticate.php:4 +msgid "This share is password-protected" +msgstr "" + +#: templates/authenticate.php:7 +msgid "The password is wrong. Try again." +msgstr "" + +#: templates/authenticate.php:10 +msgid "Password" +msgstr "" + +#: templates/part.404.php:3 +msgid "Sorry, this link doesn’t seem to work anymore." +msgstr "" + +#: templates/part.404.php:4 +msgid "Reasons might be:" +msgstr "" + +#: templates/part.404.php:6 +msgid "the item was removed" +msgstr "" + +#: templates/part.404.php:7 +msgid "the link expired" +msgstr "" + +#: templates/part.404.php:8 +msgid "sharing is disabled" +msgstr "" + +#: templates/part.404.php:10 +msgid "For more info, please ask the person who sent this link." +msgstr "" + +#: templates/public.php:21 +msgid "Download" +msgstr "" + +#: templates/public.php:52 +#, php-format +msgid "Download %s" +msgstr "" + +#: templates/public.php:56 +msgid "Direct link" +msgstr "" diff --git a/l10n/es_PE/files_trashbin.po b/l10n/es_PE/files_trashbin.po new file mode 100644 index 00000000000..b18f4eb5a23 --- /dev/null +++ b/l10n/es_PE/files_trashbin.po @@ -0,0 +1,64 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: ownCloud\n" +"Report-Msgid-Bugs-To: translations@owncloud.org\n" +"POT-Creation-Date: 2014-05-10 01:55-0400\n" +"PO-Revision-Date: 2013-04-26 08:01+0000\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: Spanish (Peru) (http://www.transifex.com/projects/p/owncloud/language/es_PE/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: es_PE\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ajax/delete.php:59 +#, php-format +msgid "Couldn't delete %s permanently" +msgstr "" + +#: ajax/undelete.php:64 +#, php-format +msgid "Couldn't restore %s" +msgstr "" + +#: js/filelist.js:3 +msgid "Deleted files" +msgstr "" + +#: js/filelist.js:88 js/filelist.js:132 js/filelist.js:181 +msgid "Error" +msgstr "" + +#: js/trash.js:48 templates/index.php:22 templates/index.php:24 +msgid "Restore" +msgstr "" + +#: js/trash.js:107 +msgid "Deleted Files" +msgstr "" + +#: lib/trashbin.php:861 lib/trashbin.php:863 +msgid "restored" +msgstr "" + +#: templates/index.php:6 +msgid "Nothing in here. Your trash bin is empty!" +msgstr "" + +#: templates/index.php:19 +msgid "Name" +msgstr "" + +#: templates/index.php:30 +msgid "Deleted" +msgstr "" + +#: templates/index.php:33 templates/index.php:34 +msgid "Delete" +msgstr "" diff --git a/l10n/es_PE/files_versions.po b/l10n/es_PE/files_versions.po new file mode 100644 index 00000000000..2c25cb4b9dd --- /dev/null +++ b/l10n/es_PE/files_versions.po @@ -0,0 +1,43 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: ownCloud\n" +"Report-Msgid-Bugs-To: translations@owncloud.org\n" +"POT-Creation-Date: 2014-05-10 01:55-0400\n" +"PO-Revision-Date: 2013-04-26 08:01+0000\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: Spanish (Peru) (http://www.transifex.com/projects/p/owncloud/language/es_PE/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: es_PE\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ajax/rollbackVersion.php:13 +#, php-format +msgid "Could not revert: %s" +msgstr "" + +#: js/versions.js:39 +msgid "Versions" +msgstr "" + +#: js/versions.js:61 +msgid "Failed to revert {file} to revision {timestamp}." +msgstr "" + +#: js/versions.js:88 +msgid "More versions..." +msgstr "" + +#: js/versions.js:126 +msgid "No other versions available" +msgstr "" + +#: js/versions.js:156 +msgid "Restore" +msgstr "" diff --git a/l10n/es_PE/lib.po b/l10n/es_PE/lib.po new file mode 100644 index 00000000000..cc8ea8285a4 --- /dev/null +++ b/l10n/es_PE/lib.po @@ -0,0 +1,470 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: ownCloud\n" +"Report-Msgid-Bugs-To: translations@owncloud.org\n" +"POT-Creation-Date: 2014-05-10 01:55-0400\n" +"PO-Revision-Date: 2013-04-26 08:01+0000\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: Spanish (Peru) (http://www.transifex.com/projects/p/owncloud/language/es_PE/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: es_PE\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: base.php:713 +msgid "You are accessing the server from an untrusted domain." +msgstr "" + +#: base.php:714 +msgid "" +"Please contact your administrator. If you are an administrator of this " +"instance, configure the \"trusted_domain\" setting in config/config.php. An " +"example configuration is provided in config/config.sample.php." +msgstr "" + +#: private/app.php:236 +#, php-format +msgid "" +"App \"%s\" can't be installed because it is not compatible with this version" +" of ownCloud." +msgstr "" + +#: private/app.php:248 +msgid "No app name specified" +msgstr "" + +#: private/app.php:353 +msgid "Help" +msgstr "" + +#: private/app.php:366 +msgid "Personal" +msgstr "" + +#: private/app.php:377 +msgid "Settings" +msgstr "" + +#: private/app.php:389 +msgid "Users" +msgstr "" + +#: private/app.php:402 +msgid "Admin" +msgstr "" + +#: private/app.php:880 +#, php-format +msgid "Failed to upgrade \"%s\"." +msgstr "" + +#: private/avatar.php:66 +msgid "Unknown filetype" +msgstr "" + +#: private/avatar.php:71 +msgid "Invalid image" +msgstr "" + +#: private/defaults.php:35 +msgid "web services under your control" +msgstr "" + +#: private/files.php:235 +msgid "ZIP download is turned off." +msgstr "" + +#: private/files.php:236 +msgid "Files need to be downloaded one by one." +msgstr "" + +#: private/files.php:237 private/files.php:264 +msgid "Back to Files" +msgstr "" + +#: private/files.php:262 +msgid "Selected files too large to generate zip file." +msgstr "" + +#: private/files.php:263 +msgid "" +"Please download the files separately in smaller chunks or kindly ask your " +"administrator." +msgstr "" + +#: private/installer.php:64 +msgid "No source specified when installing app" +msgstr "" + +#: private/installer.php:71 +msgid "No href specified when installing app from http" +msgstr "" + +#: private/installer.php:76 +msgid "No path specified when installing app from local file" +msgstr "" + +#: private/installer.php:90 +#, php-format +msgid "Archives of type %s are not supported" +msgstr "" + +#: private/installer.php:104 +msgid "Failed to open archive when installing app" +msgstr "" + +#: private/installer.php:126 +msgid "App does not provide an info.xml file" +msgstr "" + +#: private/installer.php:132 +msgid "App can't be installed because of not allowed code in the App" +msgstr "" + +#: private/installer.php:141 +msgid "" +"App can't be installed because it is not compatible with this version of " +"ownCloud" +msgstr "" + +#: private/installer.php:147 +msgid "" +"App can't be installed because it contains the <shipped>true</shipped> tag " +"which is not allowed for non shipped apps" +msgstr "" + +#: private/installer.php:160 +msgid "" +"App can't be installed because the version in info.xml/version is not the " +"same as the version reported from the app store" +msgstr "" + +#: private/installer.php:170 +msgid "App directory already exists" +msgstr "" + +#: private/installer.php:183 +#, php-format +msgid "Can't create app folder. Please fix permissions. %s" +msgstr "" + +#: private/json.php:29 +msgid "Application is not enabled" +msgstr "" + +#: private/json.php:40 private/json.php:62 private/json.php:87 +msgid "Authentication error" +msgstr "" + +#: private/json.php:51 +msgid "Token expired. Please reload page." +msgstr "" + +#: private/json.php:74 +msgid "Unknown user" +msgstr "" + +#: private/search/provider/file.php:18 private/search/provider/file.php:36 +msgid "Files" +msgstr "" + +#: private/search/provider/file.php:27 private/search/provider/file.php:34 +msgid "Text" +msgstr "" + +#: private/search/provider/file.php:30 +msgid "Images" +msgstr "" + +#: private/setup/abstractdatabase.php:26 +#, php-format +msgid "%s enter the database username." +msgstr "" + +#: private/setup/abstractdatabase.php:29 +#, php-format +msgid "%s enter the database name." +msgstr "" + +#: private/setup/abstractdatabase.php:32 +#, php-format +msgid "%s you may not use dots in the database name" +msgstr "" + +#: private/setup/mssql.php:20 +#, php-format +msgid "MS SQL username and/or password not valid: %s" +msgstr "" + +#: private/setup/mssql.php:21 private/setup/mysql.php:13 +#: private/setup/oci.php:114 private/setup/postgresql.php:31 +#: private/setup/postgresql.php:84 +msgid "You need to enter either an existing account or the administrator." +msgstr "" + +#: private/setup/mysql.php:12 +msgid "MySQL/MariaDB username and/or password not valid" +msgstr "" + +#: private/setup/mysql.php:67 private/setup/oci.php:54 +#: private/setup/oci.php:121 private/setup/oci.php:144 +#: private/setup/oci.php:151 private/setup/oci.php:162 +#: private/setup/oci.php:169 private/setup/oci.php:178 +#: private/setup/oci.php:186 private/setup/oci.php:195 +#: private/setup/oci.php:201 private/setup/postgresql.php:103 +#: private/setup/postgresql.php:112 private/setup/postgresql.php:129 +#: private/setup/postgresql.php:139 private/setup/postgresql.php:148 +#, php-format +msgid "DB Error: \"%s\"" +msgstr "" + +#: private/setup/mysql.php:68 private/setup/oci.php:55 +#: private/setup/oci.php:122 private/setup/oci.php:145 +#: private/setup/oci.php:152 private/setup/oci.php:163 +#: private/setup/oci.php:179 private/setup/oci.php:187 +#: private/setup/oci.php:196 private/setup/postgresql.php:104 +#: private/setup/postgresql.php:113 private/setup/postgresql.php:130 +#: private/setup/postgresql.php:140 private/setup/postgresql.php:149 +#, php-format +msgid "Offending command was: \"%s\"" +msgstr "" + +#: private/setup/mysql.php:85 +#, php-format +msgid "MySQL/MariaDB user '%s'@'localhost' exists already." +msgstr "" + +#: private/setup/mysql.php:86 +msgid "Drop this user from MySQL/MariaDB" +msgstr "" + +#: private/setup/mysql.php:91 +#, php-format +msgid "MySQL/MariaDB user '%s'@'%%' already exists" +msgstr "" + +#: private/setup/mysql.php:92 +msgid "Drop this user from MySQL/MariaDB." +msgstr "" + +#: private/setup/oci.php:34 +msgid "Oracle connection could not be established" +msgstr "" + +#: private/setup/oci.php:41 private/setup/oci.php:113 +msgid "Oracle username and/or password not valid" +msgstr "" + +#: private/setup/oci.php:170 private/setup/oci.php:202 +#, php-format +msgid "Offending command was: \"%s\", name: %s, password: %s" +msgstr "" + +#: private/setup/postgresql.php:30 private/setup/postgresql.php:83 +msgid "PostgreSQL username and/or password not valid" +msgstr "" + +#: private/setup.php:28 +msgid "Set an admin username." +msgstr "" + +#: private/setup.php:31 +msgid "Set an admin password." +msgstr "" + +#: private/setup.php:164 +msgid "" +"Your web server is not yet properly setup to allow files synchronization " +"because the WebDAV interface seems to be broken." +msgstr "" + +#: private/setup.php:165 +#, php-format +msgid "Please double check the <a href='%s'>installation guides</a>." +msgstr "" + +#: private/share/mailnotifications.php:72 +#: private/share/mailnotifications.php:118 +#, php-format +msgid "%s shared »%s« with you" +msgstr "" + +#: private/share/share.php:498 +#, php-format +msgid "Sharing %s failed, because the file does not exist" +msgstr "" + +#: private/share/share.php:523 +#, php-format +msgid "Sharing %s failed, because the user %s is the item owner" +msgstr "" + +#: private/share/share.php:529 +#, php-format +msgid "Sharing %s failed, because the user %s does not exist" +msgstr "" + +#: private/share/share.php:538 +#, php-format +msgid "" +"Sharing %s failed, because the user %s is not a member of any groups that %s" +" is a member of" +msgstr "" + +#: private/share/share.php:551 private/share/share.php:579 +#, php-format +msgid "Sharing %s failed, because this item is already shared with %s" +msgstr "" + +#: private/share/share.php:559 +#, php-format +msgid "Sharing %s failed, because the group %s does not exist" +msgstr "" + +#: private/share/share.php:566 +#, php-format +msgid "Sharing %s failed, because %s is not a member of the group %s" +msgstr "" + +#: private/share/share.php:629 +#, php-format +msgid "Sharing %s failed, because sharing with links is not allowed" +msgstr "" + +#: private/share/share.php:636 +#, php-format +msgid "Share type %s is not valid for %s" +msgstr "" + +#: private/share/share.php:774 +#, php-format +msgid "" +"Setting permissions for %s failed, because the permissions exceed " +"permissions granted to %s" +msgstr "" + +#: private/share/share.php:835 +#, php-format +msgid "Setting permissions for %s failed, because the item was not found" +msgstr "" + +#: private/share/share.php:941 +#, php-format +msgid "Sharing backend %s must implement the interface OCP\\Share_Backend" +msgstr "" + +#: private/share/share.php:948 +#, php-format +msgid "Sharing backend %s not found" +msgstr "" + +#: private/share/share.php:954 +#, php-format +msgid "Sharing backend for %s not found" +msgstr "" + +#: private/share/share.php:1368 +#, php-format +msgid "Sharing %s failed, because the user %s is the original sharer" +msgstr "" + +#: private/share/share.php:1377 +#, php-format +msgid "" +"Sharing %s failed, because the permissions exceed permissions granted to %s" +msgstr "" + +#: private/share/share.php:1392 +#, php-format +msgid "Sharing %s failed, because resharing is not allowed" +msgstr "" + +#: private/share/share.php:1404 +#, php-format +msgid "" +"Sharing %s failed, because the sharing backend for %s could not find its " +"source" +msgstr "" + +#: private/share/share.php:1418 +#, php-format +msgid "" +"Sharing %s failed, because the file could not be found in the file cache" +msgstr "" + +#: private/tags.php:183 +#, php-format +msgid "Could not find category \"%s\"" +msgstr "" + +#: private/template/functions.php:134 +msgid "seconds ago" +msgstr "" + +#: private/template/functions.php:135 +msgid "%n minute ago" +msgid_plural "%n minutes ago" +msgstr[0] "" +msgstr[1] "" + +#: private/template/functions.php:136 +msgid "%n hour ago" +msgid_plural "%n hours ago" +msgstr[0] "" +msgstr[1] "" + +#: private/template/functions.php:137 +msgid "today" +msgstr "" + +#: private/template/functions.php:138 +msgid "yesterday" +msgstr "" + +#: private/template/functions.php:140 +msgid "%n day go" +msgid_plural "%n days ago" +msgstr[0] "" +msgstr[1] "" + +#: private/template/functions.php:142 +msgid "last month" +msgstr "" + +#: private/template/functions.php:143 +msgid "%n month ago" +msgid_plural "%n months ago" +msgstr[0] "" +msgstr[1] "" + +#: private/template/functions.php:145 +msgid "last year" +msgstr "" + +#: private/template/functions.php:146 +msgid "years ago" +msgstr "" + +#: private/user/manager.php:232 +msgid "" +"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", " +"\"0-9\", and \"_.@-\"" +msgstr "" + +#: private/user/manager.php:237 +msgid "A valid username must be provided" +msgstr "" + +#: private/user/manager.php:241 +msgid "A valid password must be provided" +msgstr "" + +#: private/user/manager.php:246 +msgid "The username is already being used" +msgstr "" diff --git a/l10n/es_PE/settings.po b/l10n/es_PE/settings.po new file mode 100644 index 00000000000..e23dbcbe647 --- /dev/null +++ b/l10n/es_PE/settings.po @@ -0,0 +1,901 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: ownCloud\n" +"Report-Msgid-Bugs-To: translations@owncloud.org\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" +"Last-Translator: I Robot\n" +"Language-Team: Spanish (Peru) (http://www.transifex.com/projects/p/owncloud/language/es_PE/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: es_PE\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: admin/controller.php:66 +#, php-format +msgid "Invalid value supplied for %s" +msgstr "" + +#: admin/controller.php:73 +msgid "Saved" +msgstr "" + +#: admin/controller.php:90 +msgid "test email settings" +msgstr "" + +#: admin/controller.php:91 +msgid "If you received this email, the settings seem to be correct." +msgstr "" + +#: admin/controller.php:94 +msgid "" +"A problem occurred while sending the e-mail. Please revisit your settings." +msgstr "" + +#: admin/controller.php:99 +msgid "Email sent" +msgstr "" + +#: admin/controller.php:101 +msgid "You need to set your user email before being able to send test emails." +msgstr "" + +#: admin/controller.php:116 templates/admin.php:316 +msgid "Send mode" +msgstr "" + +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 +msgid "Encryption" +msgstr "" + +#: admin/controller.php:120 templates/admin.php:353 +msgid "Authentication method" +msgstr "" + +#: ajax/apps/ocs.php:20 +msgid "Unable to load list from App Store" +msgstr "" + +#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 +#: ajax/togglegroups.php:20 changepassword/controller.php:49 +msgid "Authentication error" +msgstr "" + +#: ajax/changedisplayname.php:31 +msgid "Your full name has been changed." +msgstr "" + +#: ajax/changedisplayname.php:34 +msgid "Unable to change full name" +msgstr "" + +#: ajax/creategroup.php:10 +msgid "Group already exists" +msgstr "" + +#: ajax/creategroup.php:19 +msgid "Unable to add group" +msgstr "" + +#: ajax/decryptall.php:31 +msgid "Files decrypted successfully" +msgstr "" + +#: ajax/decryptall.php:33 +msgid "" +"Couldn't decrypt your files, please check your owncloud.log or ask your " +"administrator" +msgstr "" + +#: ajax/decryptall.php:36 +msgid "Couldn't decrypt your files, check your password and try again" +msgstr "" + +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + +#: ajax/lostpassword.php:12 +msgid "Email saved" +msgstr "" + +#: ajax/lostpassword.php:14 +msgid "Invalid email" +msgstr "" + +#: ajax/removegroup.php:13 +msgid "Unable to delete group" +msgstr "" + +#: ajax/removeuser.php:25 +msgid "Unable to delete user" +msgstr "" + +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + +#: ajax/setlanguage.php:15 +msgid "Language changed" +msgstr "" + +#: ajax/setlanguage.php:17 ajax/setlanguage.php:20 +msgid "Invalid request" +msgstr "" + +#: ajax/togglegroups.php:12 +msgid "Admins can't remove themself from the admin group" +msgstr "" + +#: ajax/togglegroups.php:30 +#, php-format +msgid "Unable to add user to group %s" +msgstr "" + +#: ajax/togglegroups.php:36 +#, php-format +msgid "Unable to remove user from group %s" +msgstr "" + +#: ajax/updateapp.php:14 +msgid "Couldn't update app." +msgstr "" + +#: changepassword/controller.php:17 +msgid "Wrong password" +msgstr "" + +#: changepassword/controller.php:36 +msgid "No user supplied" +msgstr "" + +#: changepassword/controller.php:68 +msgid "" +"Please provide an admin recovery password, otherwise all user data will be " +"lost" +msgstr "" + +#: changepassword/controller.php:73 +msgid "" +"Wrong admin recovery password. Please check the password and try again." +msgstr "" + +#: changepassword/controller.php:81 +msgid "" +"Back-end doesn't support password change, but the users encryption key was " +"successfully updated." +msgstr "" + +#: changepassword/controller.php:86 changepassword/controller.php:97 +msgid "Unable to change password" +msgstr "" + +#: js/admin.js:73 +msgid "Sending..." +msgstr "" + +#: js/apps.js:45 templates/help.php:4 +msgid "User Documentation" +msgstr "" + +#: js/apps.js:50 +msgid "Admin Documentation" +msgstr "" + +#: js/apps.js:67 +msgid "Update to {appversion}" +msgstr "" + +#: js/apps.js:73 js/apps.js:106 js/apps.js:134 +msgid "Disable" +msgstr "" + +#: js/apps.js:73 js/apps.js:114 js/apps.js:127 js/apps.js:143 +msgid "Enable" +msgstr "" + +#: js/apps.js:95 +msgid "Please wait...." +msgstr "" + +#: js/apps.js:103 js/apps.js:104 js/apps.js:125 +msgid "Error while disabling app" +msgstr "" + +#: js/apps.js:124 js/apps.js:138 js/apps.js:139 +msgid "Error while enabling app" +msgstr "" + +#: js/apps.js:149 +msgid "Updating...." +msgstr "" + +#: js/apps.js:152 +msgid "Error while updating app" +msgstr "" + +#: js/apps.js:152 +msgid "Error" +msgstr "" + +#: js/apps.js:153 templates/apps.php:55 +msgid "Update" +msgstr "" + +#: js/apps.js:156 +msgid "Updated" +msgstr "" + +#: js/personal.js:256 +msgid "Select a profile picture" +msgstr "" + +#: js/personal.js:287 +msgid "Very weak password" +msgstr "" + +#: js/personal.js:288 +msgid "Weak password" +msgstr "" + +#: js/personal.js:289 +msgid "So-so password" +msgstr "" + +#: js/personal.js:290 +msgid "Good password" +msgstr "" + +#: js/personal.js:291 +msgid "Strong password" +msgstr "" + +#: js/personal.js:310 +msgid "Decrypting files... Please wait, this can take some time." +msgstr "" + +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + +#: js/users.js:47 +msgid "deleted" +msgstr "" + +#: js/users.js:47 +msgid "undo" +msgstr "" + +#: js/users.js:79 +msgid "Unable to remove user" +msgstr "" + +#: js/users.js:101 templates/users.php:24 templates/users.php:88 +#: templates/users.php:116 +msgid "Groups" +msgstr "" + +#: js/users.js:105 templates/users.php:90 templates/users.php:128 +msgid "Group Admin" +msgstr "" + +#: js/users.js:127 templates/users.php:168 +msgid "Delete" +msgstr "" + +#: js/users.js:310 +msgid "add group" +msgstr "" + +#: js/users.js:486 +msgid "A valid username must be provided" +msgstr "" + +#: js/users.js:487 js/users.js:493 js/users.js:508 +msgid "Error creating user" +msgstr "" + +#: js/users.js:492 +msgid "A valid password must be provided" +msgstr "" + +#: js/users.js:516 +msgid "Warning: Home directory for user \"{user}\" already exists" +msgstr "" + +#: personal.php:50 personal.php:51 +msgid "__language_name__" +msgstr "" + +#: templates/admin.php:8 +msgid "Everything (fatal issues, errors, warnings, info, debug)" +msgstr "" + +#: templates/admin.php:9 +msgid "Info, warnings, errors and fatal issues" +msgstr "" + +#: templates/admin.php:10 +msgid "Warnings, errors and fatal issues" +msgstr "" + +#: templates/admin.php:11 +msgid "Errors and fatal issues" +msgstr "" + +#: templates/admin.php:12 +msgid "Fatal issues only" +msgstr "" + +#: templates/admin.php:16 templates/admin.php:23 +msgid "None" +msgstr "" + +#: templates/admin.php:17 +msgid "Login" +msgstr "" + +#: templates/admin.php:18 +msgid "Plain" +msgstr "" + +#: templates/admin.php:19 +msgid "NT LAN Manager" +msgstr "" + +#: templates/admin.php:24 +msgid "SSL" +msgstr "" + +#: templates/admin.php:25 +msgid "TLS" +msgstr "" + +#: templates/admin.php:47 templates/admin.php:61 +msgid "Security Warning" +msgstr "" + +#: templates/admin.php:50 +#, php-format +msgid "" +"You are accessing %s via HTTP. We strongly suggest you configure your server" +" to require using HTTPS instead." +msgstr "" + +#: templates/admin.php:64 +msgid "" +"Your data directory and your files are probably accessible from the " +"internet. The .htaccess file is not working. We strongly suggest that you " +"configure your webserver in a way that the data directory is no longer " +"accessible or you move the data directory outside the webserver document " +"root." +msgstr "" + +#: templates/admin.php:75 +msgid "Setup Warning" +msgstr "" + +#: templates/admin.php:78 +msgid "" +"Your web server is not yet properly setup to allow files synchronization " +"because the WebDAV interface seems to be broken." +msgstr "" + +#: templates/admin.php:79 +#, php-format +msgid "Please double check the <a href=\"%s\">installation guides</a>." +msgstr "" + +#: templates/admin.php:90 +msgid "Module 'fileinfo' missing" +msgstr "" + +#: templates/admin.php:93 +msgid "" +"The PHP module 'fileinfo' is missing. We strongly recommend to enable this " +"module to get best results with mime-type detection." +msgstr "" + +#: templates/admin.php:104 +msgid "Your PHP version is outdated" +msgstr "" + +#: templates/admin.php:107 +msgid "" +"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or " +"newer because older versions are known to be broken. It is possible that " +"this installation is not working correctly." +msgstr "" + +#: templates/admin.php:118 +msgid "Locale not working" +msgstr "" + +#: templates/admin.php:123 +msgid "System locale can not be set to a one which supports UTF-8." +msgstr "" + +#: templates/admin.php:127 +msgid "" +"This means that there might be problems with certain characters in file " +"names." +msgstr "" + +#: templates/admin.php:131 +#, php-format +msgid "" +"We strongly suggest to install the required packages on your system to " +"support one of the following locales: %s." +msgstr "" + +#: templates/admin.php:143 +msgid "Internet connection not working" +msgstr "" + +#: templates/admin.php:146 +msgid "" +"This server has no working internet connection. This means that some of the " +"features like mounting of external storage, notifications about updates or " +"installation of 3rd party apps don´t work. Accessing files from remote and " +"sending of notification emails might also not work. We suggest to enable " +"internet connection for this server if you want to have all features." +msgstr "" + +#: templates/admin.php:160 +msgid "Cron" +msgstr "" + +#: templates/admin.php:167 +#, php-format +msgid "Last cron was executed at %s." +msgstr "" + +#: templates/admin.php:170 +#, php-format +msgid "" +"Last cron was executed at %s. This is more than an hour ago, something seems" +" wrong." +msgstr "" + +#: templates/admin.php:174 +msgid "Cron was not executed yet!" +msgstr "" + +#: templates/admin.php:184 +msgid "Execute one task with each page loaded" +msgstr "" + +#: templates/admin.php:192 +msgid "" +"cron.php is registered at a webcron service to call cron.php every 15 " +"minutes over http." +msgstr "" + +#: templates/admin.php:200 +msgid "Use systems cron service to call the cron.php file every 15 minutes." +msgstr "" + +#: templates/admin.php:205 +msgid "Sharing" +msgstr "" + +#: templates/admin.php:211 +msgid "Enable Share API" +msgstr "" + +#: templates/admin.php:212 +msgid "Allow apps to use the Share API" +msgstr "" + +#: templates/admin.php:219 +msgid "Allow links" +msgstr "" + +#: templates/admin.php:220 +msgid "Allow users to share items to the public with links" +msgstr "" + +#: templates/admin.php:227 +msgid "Allow public uploads" +msgstr "" + +#: templates/admin.php:228 +msgid "" +"Allow users to enable others to upload into their publicly shared folders" +msgstr "" + +#: templates/admin.php:235 +msgid "Allow resharing" +msgstr "" + +#: templates/admin.php:236 +msgid "Allow users to share items shared with them again" +msgstr "" + +#: templates/admin.php:243 +msgid "Allow users to share with anyone" +msgstr "" + +#: templates/admin.php:246 +msgid "Allow users to only share with users in their groups" +msgstr "" + +#: templates/admin.php:253 +msgid "Allow mail notification" +msgstr "" + +#: templates/admin.php:254 +msgid "Allow users to send mail notification for shared files" +msgstr "" + +#: templates/admin.php:262 +msgid "Set default expiration date" +msgstr "" + +#: templates/admin.php:263 +msgid "Expire after " +msgstr "" + +#: templates/admin.php:266 +msgid "days" +msgstr "" + +#: templates/admin.php:269 +msgid "Enforce expiration date" +msgstr "" + +#: templates/admin.php:270 +msgid "Expire shares by default after N days" +msgstr "" + +#: templates/admin.php:278 +msgid "Security" +msgstr "" + +#: templates/admin.php:291 +msgid "Enforce HTTPS" +msgstr "" + +#: templates/admin.php:293 +#, php-format +msgid "Forces the clients to connect to %s via an encrypted connection." +msgstr "" + +#: templates/admin.php:299 +#, php-format +msgid "" +"Please connect to your %s via HTTPS to enable or disable the SSL " +"enforcement." +msgstr "" + +#: templates/admin.php:311 +msgid "Email Server" +msgstr "" + +#: templates/admin.php:313 +msgid "This is used for sending out notifications." +msgstr "" + +#: templates/admin.php:344 +msgid "From address" +msgstr "" + +#: templates/admin.php:366 +msgid "Authentication required" +msgstr "" + +#: templates/admin.php:370 +msgid "Server address" +msgstr "" + +#: templates/admin.php:374 +msgid "Port" +msgstr "" + +#: templates/admin.php:379 +msgid "Credentials" +msgstr "" + +#: templates/admin.php:380 +msgid "SMTP Username" +msgstr "" + +#: templates/admin.php:383 +msgid "SMTP Password" +msgstr "" + +#: templates/admin.php:387 +msgid "Test email settings" +msgstr "" + +#: templates/admin.php:388 +msgid "Send email" +msgstr "" + +#: templates/admin.php:393 +msgid "Log" +msgstr "" + +#: templates/admin.php:394 +msgid "Log level" +msgstr "" + +#: templates/admin.php:426 +msgid "More" +msgstr "" + +#: templates/admin.php:427 +msgid "Less" +msgstr "" + +#: templates/admin.php:433 templates/personal.php:202 +msgid "Version" +msgstr "" + +#: templates/admin.php:437 templates/personal.php:205 +msgid "" +"Developed by the <a href=\"http://ownCloud.org/contact\" " +"target=\"_blank\">ownCloud community</a>, the <a " +"href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is " +"licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" " +"target=\"_blank\"><abbr title=\"Affero General Public " +"License\">AGPL</abbr></a>." +msgstr "" + +#: templates/apps.php:14 +msgid "Add your App" +msgstr "" + +#: templates/apps.php:31 +msgid "More Apps" +msgstr "" + +#: templates/apps.php:38 +msgid "Select an App" +msgstr "" + +#: templates/apps.php:43 +msgid "Documentation:" +msgstr "" + +#: templates/apps.php:49 +msgid "See application page at apps.owncloud.com" +msgstr "" + +#: templates/apps.php:51 +msgid "See application website" +msgstr "" + +#: templates/apps.php:53 +msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" +msgstr "" + +#: templates/help.php:6 +msgid "Administrator Documentation" +msgstr "" + +#: templates/help.php:9 +msgid "Online Documentation" +msgstr "" + +#: templates/help.php:11 +msgid "Forum" +msgstr "" + +#: templates/help.php:14 +msgid "Bugtracker" +msgstr "" + +#: templates/help.php:17 +msgid "Commercial Support" +msgstr "" + +#: templates/personal.php:8 +msgid "Get the apps to sync your files" +msgstr "" + +#: templates/personal.php:19 +msgid "Show First Run Wizard again" +msgstr "" + +#: templates/personal.php:27 +#, php-format +msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>" +msgstr "" + +#: templates/personal.php:38 templates/users.php:21 templates/users.php:87 +msgid "Password" +msgstr "" + +#: templates/personal.php:39 +msgid "Your password was changed" +msgstr "" + +#: templates/personal.php:40 +msgid "Unable to change your password" +msgstr "" + +#: templates/personal.php:42 +msgid "Current password" +msgstr "" + +#: templates/personal.php:45 +msgid "New password" +msgstr "" + +#: templates/personal.php:49 +msgid "Change password" +msgstr "" + +#: templates/personal.php:61 templates/users.php:86 +msgid "Full Name" +msgstr "" + +#: templates/personal.php:76 +msgid "Email" +msgstr "" + +#: templates/personal.php:78 +msgid "Your email address" +msgstr "" + +#: templates/personal.php:81 +msgid "" +"Fill in an email address to enable password recovery and receive " +"notifications" +msgstr "" + +#: templates/personal.php:89 +msgid "Profile picture" +msgstr "" + +#: templates/personal.php:94 +msgid "Upload new" +msgstr "" + +#: templates/personal.php:96 +msgid "Select new from Files" +msgstr "" + +#: templates/personal.php:97 +msgid "Remove image" +msgstr "" + +#: templates/personal.php:98 +msgid "Either png or jpg. Ideally square but you will be able to crop it." +msgstr "" + +#: templates/personal.php:100 +msgid "Your avatar is provided by your original account." +msgstr "" + +#: templates/personal.php:104 +msgid "Cancel" +msgstr "" + +#: templates/personal.php:105 +msgid "Choose as profile image" +msgstr "" + +#: templates/personal.php:111 templates/personal.php:112 +msgid "Language" +msgstr "" + +#: templates/personal.php:131 +msgid "Help translate" +msgstr "" + +#: templates/personal.php:137 +msgid "WebDAV" +msgstr "" + +#: templates/personal.php:139 +#, php-format +msgid "" +"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via " +"WebDAV</a>" +msgstr "" + +#: templates/personal.php:156 +msgid "The encryption app is no longer enabled, please decrypt all your files" +msgstr "" + +#: templates/personal.php:162 +msgid "Log-in password" +msgstr "" + +#: templates/personal.php:167 +msgid "Decrypt all Files" +msgstr "" + +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + +#: templates/users.php:19 +msgid "Login Name" +msgstr "" + +#: templates/users.php:28 +msgid "Create" +msgstr "" + +#: templates/users.php:34 +msgid "Admin Recovery Password" +msgstr "" + +#: templates/users.php:35 templates/users.php:36 +msgid "" +"Enter the recovery password in order to recover the users files during " +"password change" +msgstr "" + +#: templates/users.php:40 +msgid "Default Storage" +msgstr "" + +#: templates/users.php:42 templates/users.php:137 +msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" +msgstr "" + +#: templates/users.php:46 templates/users.php:146 +msgid "Unlimited" +msgstr "" + +#: templates/users.php:64 templates/users.php:161 +msgid "Other" +msgstr "" + +#: templates/users.php:85 +msgid "Username" +msgstr "" + +#: templates/users.php:92 +msgid "Storage" +msgstr "" + +#: templates/users.php:106 +msgid "change full name" +msgstr "" + +#: templates/users.php:110 +msgid "set new password" +msgstr "" + +#: templates/users.php:141 +msgid "Default" +msgstr "" diff --git a/l10n/es_PE/user_ldap.po b/l10n/es_PE/user_ldap.po new file mode 100644 index 00000000000..b7c7ddffd65 --- /dev/null +++ b/l10n/es_PE/user_ldap.po @@ -0,0 +1,534 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: ownCloud\n" +"Report-Msgid-Bugs-To: translations@owncloud.org\n" +"POT-Creation-Date: 2014-05-10 01:55-0400\n" +"PO-Revision-Date: 2013-04-26 08:02+0000\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: Spanish (Peru) (http://www.transifex.com/projects/p/owncloud/language/es_PE/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: es_PE\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ajax/clearMappings.php:34 +msgid "Failed to clear the mappings." +msgstr "" + +#: ajax/deleteConfiguration.php:34 +msgid "Failed to delete the server configuration" +msgstr "" + +#: ajax/testConfiguration.php:39 +msgid "The configuration is valid and the connection could be established!" +msgstr "" + +#: ajax/testConfiguration.php:42 +msgid "" +"The configuration is valid, but the Bind failed. Please check the server " +"settings and credentials." +msgstr "" + +#: ajax/testConfiguration.php:46 +msgid "" +"The configuration is invalid. Please have a look at the logs for further " +"details." +msgstr "" + +#: ajax/wizard.php:32 +msgid "No action specified" +msgstr "" + +#: ajax/wizard.php:38 +msgid "No configuration specified" +msgstr "" + +#: ajax/wizard.php:81 +msgid "No data specified" +msgstr "" + +#: ajax/wizard.php:89 +#, php-format +msgid " Could not set configuration %s" +msgstr "" + +#: js/settings.js:67 +msgid "Deletion failed" +msgstr "" + +#: js/settings.js:83 +msgid "Take over settings from recent server configuration?" +msgstr "" + +#: js/settings.js:84 +msgid "Keep settings?" +msgstr "" + +#: js/settings.js:99 +msgid "Cannot add server configuration" +msgstr "" + +#: js/settings.js:127 +msgid "mappings cleared" +msgstr "" + +#: js/settings.js:128 +msgid "Success" +msgstr "" + +#: js/settings.js:133 +msgid "Error" +msgstr "" + +#: js/settings.js:780 +msgid "Configuration OK" +msgstr "" + +#: js/settings.js:789 +msgid "Configuration incorrect" +msgstr "" + +#: js/settings.js:798 +msgid "Configuration incomplete" +msgstr "" + +#: js/settings.js:815 js/settings.js:824 +msgid "Select groups" +msgstr "" + +#: js/settings.js:818 js/settings.js:827 +msgid "Select object classes" +msgstr "" + +#: js/settings.js:821 +msgid "Select attributes" +msgstr "" + +#: js/settings.js:848 +msgid "Connection test succeeded" +msgstr "" + +#: js/settings.js:855 +msgid "Connection test failed" +msgstr "" + +#: js/settings.js:864 +msgid "Do you really want to delete the current Server Configuration?" +msgstr "" + +#: js/settings.js:865 +msgid "Confirm Deletion" +msgstr "" + +#: lib/wizard.php:79 lib/wizard.php:93 +#, php-format +msgid "%s group found" +msgid_plural "%s groups found" +msgstr[0] "" +msgstr[1] "" + +#: lib/wizard.php:122 +#, php-format +msgid "%s user found" +msgid_plural "%s users found" +msgstr[0] "" +msgstr[1] "" + +#: lib/wizard.php:784 lib/wizard.php:796 +msgid "Invalid Host" +msgstr "" + +#: lib/wizard.php:984 +msgid "Could not find the desired feature" +msgstr "" + +#: templates/part.settingcontrols.php:2 +msgid "Save" +msgstr "" + +#: templates/part.settingcontrols.php:4 +msgid "Test Configuration" +msgstr "" + +#: templates/part.settingcontrols.php:10 templates/part.wizardcontrols.php:14 +msgid "Help" +msgstr "" + +#: templates/part.wizard-groupfilter.php:4 +#, php-format +msgid "Groups meeting these criteria are available in %s:" +msgstr "" + +#: templates/part.wizard-groupfilter.php:8 +#: templates/part.wizard-userfilter.php:8 +msgid "only those object classes:" +msgstr "" + +#: templates/part.wizard-groupfilter.php:17 +#: templates/part.wizard-userfilter.php:17 +msgid "only from those groups:" +msgstr "" + +#: templates/part.wizard-groupfilter.php:25 +#: templates/part.wizard-loginfilter.php:32 +#: templates/part.wizard-userfilter.php:25 +msgid "Edit raw filter instead" +msgstr "" + +#: templates/part.wizard-groupfilter.php:30 +#: templates/part.wizard-loginfilter.php:37 +#: templates/part.wizard-userfilter.php:30 +msgid "Raw LDAP filter" +msgstr "" + +#: templates/part.wizard-groupfilter.php:31 +#, php-format +msgid "" +"The filter specifies which LDAP groups shall have access to the %s instance." +msgstr "" + +#: templates/part.wizard-groupfilter.php:38 +msgid "groups found" +msgstr "" + +#: templates/part.wizard-loginfilter.php:4 +msgid "Users login with this attribute:" +msgstr "" + +#: templates/part.wizard-loginfilter.php:8 +msgid "LDAP Username:" +msgstr "" + +#: templates/part.wizard-loginfilter.php:16 +msgid "LDAP Email Address:" +msgstr "" + +#: templates/part.wizard-loginfilter.php:24 +msgid "Other Attributes:" +msgstr "" + +#: templates/part.wizard-loginfilter.php:38 +#, php-format +msgid "" +"Defines the filter to apply, when login is attempted. %%uid replaces the " +"username in the login action. Example: \"uid=%%uid\"" +msgstr "" + +#: templates/part.wizard-server.php:18 +msgid "Add Server Configuration" +msgstr "" + +#: templates/part.wizard-server.php:30 +msgid "Host" +msgstr "" + +#: templates/part.wizard-server.php:31 +msgid "" +"You can omit the protocol, except you require SSL. Then start with ldaps://" +msgstr "" + +#: templates/part.wizard-server.php:36 +msgid "Port" +msgstr "" + +#: templates/part.wizard-server.php:44 +msgid "User DN" +msgstr "" + +#: templates/part.wizard-server.php:45 +msgid "" +"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." +msgstr "" + +#: templates/part.wizard-server.php:52 +msgid "Password" +msgstr "" + +#: templates/part.wizard-server.php:53 +msgid "For anonymous access, leave DN and Password empty." +msgstr "" + +#: templates/part.wizard-server.php:60 +msgid "One Base DN per line" +msgstr "" + +#: templates/part.wizard-server.php:61 +msgid "You can specify Base DN for users and groups in the Advanced tab" +msgstr "" + +#: templates/part.wizard-userfilter.php:4 +#, php-format +msgid "Limit %s access to users meeting these criteria:" +msgstr "" + +#: templates/part.wizard-userfilter.php:31 +#, php-format +msgid "" +"The filter specifies which LDAP users shall have access to the %s instance." +msgstr "" + +#: templates/part.wizard-userfilter.php:38 +msgid "users found" +msgstr "" + +#: templates/part.wizardcontrols.php:5 +msgid "Back" +msgstr "" + +#: templates/part.wizardcontrols.php:8 +msgid "Continue" +msgstr "" + +#: templates/settings.php:11 +msgid "" +"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may" +" experience unexpected behavior. Please ask your system administrator to " +"disable one of them." +msgstr "" + +#: templates/settings.php:14 +msgid "" +"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not " +"work. Please ask your system administrator to install it." +msgstr "" + +#: templates/settings.php:20 +msgid "Connection Settings" +msgstr "" + +#: templates/settings.php:22 +msgid "Configuration Active" +msgstr "" + +#: templates/settings.php:22 +msgid "When unchecked, this configuration will be skipped." +msgstr "" + +#: templates/settings.php:23 +msgid "Backup (Replica) Host" +msgstr "" + +#: templates/settings.php:23 +msgid "" +"Give an optional backup host. It must be a replica of the main LDAP/AD " +"server." +msgstr "" + +#: templates/settings.php:24 +msgid "Backup (Replica) Port" +msgstr "" + +#: templates/settings.php:25 +msgid "Disable Main Server" +msgstr "" + +#: templates/settings.php:25 +msgid "Only connect to the replica server." +msgstr "" + +#: templates/settings.php:26 +msgid "Case insensitive LDAP server (Windows)" +msgstr "" + +#: templates/settings.php:27 +msgid "Turn off SSL certificate validation." +msgstr "" + +#: templates/settings.php:27 +#, php-format +msgid "" +"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." +msgstr "" + +#: templates/settings.php:28 +msgid "Cache Time-To-Live" +msgstr "" + +#: templates/settings.php:28 +msgid "in seconds. A change empties the cache." +msgstr "" + +#: templates/settings.php:30 +msgid "Directory Settings" +msgstr "" + +#: templates/settings.php:32 +msgid "User Display Name Field" +msgstr "" + +#: templates/settings.php:32 +msgid "The LDAP attribute to use to generate the user's display name." +msgstr "" + +#: templates/settings.php:33 +msgid "Base User Tree" +msgstr "" + +#: templates/settings.php:33 +msgid "One User Base DN per line" +msgstr "" + +#: templates/settings.php:34 +msgid "User Search Attributes" +msgstr "" + +#: templates/settings.php:34 templates/settings.php:37 +msgid "Optional; one attribute per line" +msgstr "" + +#: templates/settings.php:35 +msgid "Group Display Name Field" +msgstr "" + +#: templates/settings.php:35 +msgid "The LDAP attribute to use to generate the groups's display name." +msgstr "" + +#: templates/settings.php:36 +msgid "Base Group Tree" +msgstr "" + +#: templates/settings.php:36 +msgid "One Group Base DN per line" +msgstr "" + +#: templates/settings.php:37 +msgid "Group Search Attributes" +msgstr "" + +#: templates/settings.php:38 +msgid "Group-Member association" +msgstr "" + +#: templates/settings.php:39 +msgid "Nested Groups" +msgstr "" + +#: templates/settings.php:39 +msgid "" +"When switched on, groups that contain groups are supported. (Only works if " +"the group member attribute contains DNs.)" +msgstr "" + +#: templates/settings.php:40 +msgid "Paging chunksize" +msgstr "" + +#: templates/settings.php:40 +msgid "" +"Chunksize used for paged LDAP searches that may return bulky results like " +"user or group enumeration. (Setting it 0 disables paged LDAP searches in " +"those situations.)" +msgstr "" + +#: templates/settings.php:42 +msgid "Special Attributes" +msgstr "" + +#: templates/settings.php:44 +msgid "Quota Field" +msgstr "" + +#: templates/settings.php:45 +msgid "Quota Default" +msgstr "" + +#: templates/settings.php:45 +msgid "in bytes" +msgstr "" + +#: templates/settings.php:46 +msgid "Email Field" +msgstr "" + +#: templates/settings.php:47 +msgid "User Home Folder Naming Rule" +msgstr "" + +#: templates/settings.php:47 +msgid "" +"Leave empty for user name (default). Otherwise, specify an LDAP/AD " +"attribute." +msgstr "" + +#: templates/settings.php:53 +msgid "Internal Username" +msgstr "" + +#: templates/settings.php:54 +msgid "" +"By default the internal username will be created from the UUID attribute. It" +" makes sure that the username is unique and characters do not need to be " +"converted. The internal username has the restriction that only these " +"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced " +"with their ASCII correspondence or simply omitted. On collisions a number " +"will be added/increased. The internal username is used to identify a user " +"internally. It is also the default name for the user home folder. It is also" +" a part of remote URLs, for instance for all *DAV services. With this " +"setting, the default behavior can be overridden. To achieve a similar " +"behavior as before ownCloud 5 enter the user display name attribute in the " +"following field. Leave it empty for default behavior. Changes will have " +"effect only on newly mapped (added) LDAP users." +msgstr "" + +#: templates/settings.php:55 +msgid "Internal Username Attribute:" +msgstr "" + +#: templates/settings.php:56 +msgid "Override UUID detection" +msgstr "" + +#: templates/settings.php:57 +msgid "" +"By default, the UUID attribute is automatically detected. The UUID attribute" +" is used to doubtlessly identify LDAP users and groups. Also, the internal " +"username will be created based on the UUID, if not specified otherwise " +"above. You can override the setting and pass an attribute of your choice. " +"You must make sure that the attribute of your choice can be fetched for both" +" users and groups and it is unique. Leave it empty for default behavior. " +"Changes will have effect only on newly mapped (added) LDAP users and groups." +msgstr "" + +#: templates/settings.php:58 +msgid "UUID Attribute for Users:" +msgstr "" + +#: templates/settings.php:59 +msgid "UUID Attribute for Groups:" +msgstr "" + +#: templates/settings.php:60 +msgid "Username-LDAP User Mapping" +msgstr "" + +#: templates/settings.php:61 +msgid "" +"Usernames are used to store and assign (meta) data. In order to precisely " +"identify and recognize users, each LDAP user will have a internal username. " +"This requires a mapping from username to LDAP user. The created username is " +"mapped to the UUID of the LDAP user. Additionally the DN is cached as well " +"to reduce LDAP interaction, but it is not used for identification. If the DN" +" changes, the changes will be found. The internal username is used all over." +" Clearing the mappings will have leftovers everywhere. Clearing the mappings" +" is not configuration sensitive, it affects all LDAP configurations! Never " +"clear the mappings in a production environment, only in a testing or " +"experimental stage." +msgstr "" + +#: templates/settings.php:62 +msgid "Clear Username-LDAP User Mapping" +msgstr "" + +#: templates/settings.php:62 +msgid "Clear Groupname-LDAP Group Mapping" +msgstr "" diff --git a/l10n/es_PE/user_webdavauth.po b/l10n/es_PE/user_webdavauth.po new file mode 100644 index 00000000000..f489730aaf5 --- /dev/null +++ b/l10n/es_PE/user_webdavauth.po @@ -0,0 +1,33 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: ownCloud\n" +"Report-Msgid-Bugs-To: translations@owncloud.org\n" +"POT-Creation-Date: 2014-05-10 01:55-0400\n" +"PO-Revision-Date: 2012-11-09 09:06+0000\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: Spanish (Peru) (http://www.transifex.com/projects/p/owncloud/language/es_PE/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: es_PE\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: templates/settings.php:2 +msgid "WebDAV Authentication" +msgstr "" + +#: templates/settings.php:3 +msgid "Address: " +msgstr "" + +#: templates/settings.php:6 +msgid "" +"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." +msgstr "" diff --git a/l10n/es_UY/core.po b/l10n/es_UY/core.po new file mode 100644 index 00000000000..e755636d319 --- /dev/null +++ b/l10n/es_UY/core.po @@ -0,0 +1,805 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: ownCloud\n" +"Report-Msgid-Bugs-To: translations@owncloud.org\n" +"POT-Creation-Date: 2014-05-10 01:55-0400\n" +"PO-Revision-Date: 2013-04-26 08:00+0000\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: Spanish (Uruguay) (http://www.transifex.com/projects/p/owncloud/language/es_UY/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: es_UY\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ajax/share.php:87 +msgid "Expiration date is in the past." +msgstr "" + +#: ajax/share.php:119 ajax/share.php:161 +#, php-format +msgid "Couldn't send mail to following users: %s " +msgstr "" + +#: ajax/update.php:10 +msgid "Turned on maintenance mode" +msgstr "" + +#: ajax/update.php:13 +msgid "Turned off maintenance mode" +msgstr "" + +#: ajax/update.php:16 +msgid "Updated database" +msgstr "" + +#: avatar/controller.php:62 +msgid "No image or file provided" +msgstr "" + +#: avatar/controller.php:81 +msgid "Unknown filetype" +msgstr "" + +#: avatar/controller.php:85 +msgid "Invalid image" +msgstr "" + +#: avatar/controller.php:115 avatar/controller.php:142 +msgid "No temporary profile picture available, try again" +msgstr "" + +#: avatar/controller.php:135 +msgid "No crop data provided" +msgstr "" + +#: js/config.php:36 +msgid "Sunday" +msgstr "" + +#: js/config.php:37 +msgid "Monday" +msgstr "" + +#: js/config.php:38 +msgid "Tuesday" +msgstr "" + +#: js/config.php:39 +msgid "Wednesday" +msgstr "" + +#: js/config.php:40 +msgid "Thursday" +msgstr "" + +#: js/config.php:41 +msgid "Friday" +msgstr "" + +#: js/config.php:42 +msgid "Saturday" +msgstr "" + +#: js/config.php:47 +msgid "January" +msgstr "" + +#: js/config.php:48 +msgid "February" +msgstr "" + +#: js/config.php:49 +msgid "March" +msgstr "" + +#: js/config.php:50 +msgid "April" +msgstr "" + +#: js/config.php:51 +msgid "May" +msgstr "" + +#: js/config.php:52 +msgid "June" +msgstr "" + +#: js/config.php:53 +msgid "July" +msgstr "" + +#: js/config.php:54 +msgid "August" +msgstr "" + +#: js/config.php:55 +msgid "September" +msgstr "" + +#: js/config.php:56 +msgid "October" +msgstr "" + +#: js/config.php:57 +msgid "November" +msgstr "" + +#: js/config.php:58 +msgid "December" +msgstr "" + +#: js/js.js:483 +msgid "Settings" +msgstr "" + +#: js/js.js:583 +msgid "Saving..." +msgstr "" + +#: js/js.js:1240 +msgid "seconds ago" +msgstr "" + +#: js/js.js:1241 +msgid "%n minute ago" +msgid_plural "%n minutes ago" +msgstr[0] "" +msgstr[1] "" + +#: js/js.js:1242 +msgid "%n hour ago" +msgid_plural "%n hours ago" +msgstr[0] "" +msgstr[1] "" + +#: js/js.js:1243 +msgid "today" +msgstr "" + +#: js/js.js:1244 +msgid "yesterday" +msgstr "" + +#: js/js.js:1245 +msgid "%n day ago" +msgid_plural "%n days ago" +msgstr[0] "" +msgstr[1] "" + +#: js/js.js:1246 +msgid "last month" +msgstr "" + +#: js/js.js:1247 +msgid "%n month ago" +msgid_plural "%n months ago" +msgstr[0] "" +msgstr[1] "" + +#: js/js.js:1248 +msgid "last year" +msgstr "" + +#: js/js.js:1249 +msgid "years ago" +msgstr "" + +#: js/oc-dialogs.js:125 +msgid "Choose" +msgstr "" + +#: js/oc-dialogs.js:151 +msgid "Error loading file picker template: {error}" +msgstr "" + +#: js/oc-dialogs.js:177 +msgid "Yes" +msgstr "" + +#: js/oc-dialogs.js:187 +msgid "No" +msgstr "" + +#: js/oc-dialogs.js:204 +msgid "Ok" +msgstr "" + +#: js/oc-dialogs.js:224 +msgid "Error loading message template: {error}" +msgstr "" + +#: js/oc-dialogs.js:352 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" + +#: js/oc-dialogs.js:366 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:372 +msgid "New Files" +msgstr "" + +#: js/oc-dialogs.js:373 +msgid "Already existing files" +msgstr "" + +#: js/oc-dialogs.js:375 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:384 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:394 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:441 js/oc-dialogs.js:454 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:444 js/oc-dialogs.js:458 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:466 +msgid "Error loading file exists template" +msgstr "" + +#: js/setup.js:84 +msgid "Very weak password" +msgstr "" + +#: js/setup.js:85 +msgid "Weak password" +msgstr "" + +#: js/setup.js:86 +msgid "So-so password" +msgstr "" + +#: js/setup.js:87 +msgid "Good password" +msgstr "" + +#: js/setup.js:88 +msgid "Strong password" +msgstr "" + +#: js/share.js:51 js/share.js:66 js/share.js:106 +msgid "Shared" +msgstr "" + +#: js/share.js:109 +msgid "Share" +msgstr "" + +#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734 +#: templates/installation.php:10 +msgid "Error" +msgstr "" + +#: js/share.js:160 js/share.js:790 +msgid "Error while sharing" +msgstr "" + +#: js/share.js:171 +msgid "Error while unsharing" +msgstr "" + +#: js/share.js:178 +msgid "Error while changing permissions" +msgstr "" + +#: js/share.js:188 +msgid "Shared with you and the group {group} by {owner}" +msgstr "" + +#: js/share.js:190 +msgid "Shared with you by {owner}" +msgstr "" + +#: js/share.js:214 +msgid "Share with user or group …" +msgstr "" + +#: js/share.js:220 +msgid "Share link" +msgstr "" + +#: js/share.js:223 +msgid "Password protect" +msgstr "" + +#: js/share.js:225 templates/installation.php:60 templates/login.php:40 +msgid "Password" +msgstr "" + +#: js/share.js:230 +msgid "Allow Public Upload" +msgstr "" + +#: js/share.js:234 +msgid "Email link to person" +msgstr "" + +#: js/share.js:235 +msgid "Send" +msgstr "" + +#: js/share.js:240 +msgid "Set expiration date" +msgstr "" + +#: js/share.js:241 +msgid "Expiration date" +msgstr "" + +#: js/share.js:277 +msgid "Share via email:" +msgstr "" + +#: js/share.js:280 +msgid "No people found" +msgstr "" + +#: js/share.js:324 js/share.js:385 +msgid "group" +msgstr "" + +#: js/share.js:357 +msgid "Resharing is not allowed" +msgstr "" + +#: js/share.js:401 +msgid "Shared in {item} with {user}" +msgstr "" + +#: js/share.js:423 +msgid "Unshare" +msgstr "" + +#: js/share.js:431 +msgid "notify by email" +msgstr "" + +#: js/share.js:434 +msgid "can edit" +msgstr "" + +#: js/share.js:436 +msgid "access control" +msgstr "" + +#: js/share.js:439 +msgid "create" +msgstr "" + +#: js/share.js:442 +msgid "update" +msgstr "" + +#: js/share.js:445 +msgid "delete" +msgstr "" + +#: js/share.js:448 +msgid "share" +msgstr "" + +#: js/share.js:721 +msgid "Password protected" +msgstr "" + +#: js/share.js:734 +msgid "Error unsetting expiration date" +msgstr "" + +#: js/share.js:752 +msgid "Error setting expiration date" +msgstr "" + +#: js/share.js:777 +msgid "Sending ..." +msgstr "" + +#: js/share.js:788 +msgid "Email sent" +msgstr "" + +#: js/share.js:812 +msgid "Warning" +msgstr "" + +#: js/tags.js:4 +msgid "The object type is not specified." +msgstr "" + +#: js/tags.js:13 +msgid "Enter new" +msgstr "" + +#: js/tags.js:27 +msgid "Delete" +msgstr "" + +#: js/tags.js:31 +msgid "Add" +msgstr "" + +#: js/tags.js:39 +msgid "Edit tags" +msgstr "" + +#: js/tags.js:57 +msgid "Error loading dialog template: {error}" +msgstr "" + +#: js/tags.js:264 +msgid "No tags selected for deletion." +msgstr "" + +#: js/update.js:8 +msgid "Please reload the page." +msgstr "" + +#: js/update.js:17 +msgid "" +"The update was unsuccessful. Please report this issue to the <a " +"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud " +"community</a>." +msgstr "" + +#: js/update.js:21 +msgid "The update was successful. Redirecting you to ownCloud now." +msgstr "" + +#: lostpassword/controller.php:70 +#, php-format +msgid "%s password reset" +msgstr "" + +#: lostpassword/controller.php:72 +msgid "" +"A problem has occurred whilst sending the email, please contact your " +"administrator." +msgstr "" + +#: lostpassword/templates/email.php:2 +msgid "Use the following link to reset your password: {link}" +msgstr "" + +#: lostpassword/templates/lostpassword.php:7 +msgid "" +"The link to reset your password has been sent to your email.<br>If you do " +"not receive it within a reasonable amount of time, check your spam/junk " +"folders.<br>If it is not there ask your local administrator ." +msgstr "" + +#: lostpassword/templates/lostpassword.php:15 +msgid "Request failed!<br>Did you make sure your email/username was right?" +msgstr "" + +#: lostpassword/templates/lostpassword.php:18 +msgid "You will receive a link to reset your password via Email." +msgstr "" + +#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53 +#: templates/login.php:32 +msgid "Username" +msgstr "" + +#: lostpassword/templates/lostpassword.php:25 +msgid "" +"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?" +msgstr "" + +#: lostpassword/templates/lostpassword.php:27 +msgid "Yes, I really want to reset my password now" +msgstr "" + +#: lostpassword/templates/lostpassword.php:30 +msgid "Reset" +msgstr "" + +#: lostpassword/templates/resetpassword.php:4 +msgid "Your password was reset" +msgstr "" + +#: lostpassword/templates/resetpassword.php:5 +msgid "To login page" +msgstr "" + +#: lostpassword/templates/resetpassword.php:8 +msgid "New password" +msgstr "" + +#: lostpassword/templates/resetpassword.php:11 +msgid "Reset password" +msgstr "" + +#: setup/controller.php:140 +#, php-format +msgid "" +"Mac OS X is not supported and %s will not work properly on this platform. " +"Use it at your own risk! " +msgstr "" + +#: setup/controller.php:144 +msgid "" +"For the best results, please consider using a GNU/Linux server instead." +msgstr "" + +#: strings.php:5 +msgid "Personal" +msgstr "" + +#: strings.php:6 +msgid "Users" +msgstr "" + +#: strings.php:7 templates/layout.user.php:116 +msgid "Apps" +msgstr "" + +#: strings.php:8 +msgid "Admin" +msgstr "" + +#: strings.php:9 +msgid "Help" +msgstr "" + +#: tags/controller.php:22 +msgid "Error loading tags" +msgstr "" + +#: tags/controller.php:48 +msgid "Tag already exists" +msgstr "" + +#: tags/controller.php:64 +msgid "Error deleting tag(s)" +msgstr "" + +#: tags/controller.php:75 +msgid "Error tagging" +msgstr "" + +#: tags/controller.php:86 +msgid "Error untagging" +msgstr "" + +#: tags/controller.php:97 +msgid "Error favoriting" +msgstr "" + +#: tags/controller.php:108 +msgid "Error unfavoriting" +msgstr "" + +#: templates/403.php:12 +msgid "Access forbidden" +msgstr "" + +#: templates/404.php:15 +msgid "Cloud not found" +msgstr "" + +#: templates/altmail.php:2 +#, php-format +msgid "" +"Hey there,\n" +"\n" +"just letting you know that %s shared %s with you.\n" +"View it: %s\n" +"\n" +msgstr "" + +#: templates/altmail.php:4 templates/mail.php:17 +#, php-format +msgid "The share will expire on %s." +msgstr "" + +#: templates/altmail.php:7 templates/mail.php:20 +msgid "Cheers!" +msgstr "" + +#: templates/installation.php:25 templates/installation.php:32 +#: templates/installation.php:39 +msgid "Security Warning" +msgstr "" + +#: templates/installation.php:26 +msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" +msgstr "" + +#: templates/installation.php:27 +#, php-format +msgid "Please update your PHP installation to use %s securely." +msgstr "" + +#: templates/installation.php:33 +msgid "" +"No secure random number generator is available, please enable the PHP " +"OpenSSL extension." +msgstr "" + +#: templates/installation.php:34 +msgid "" +"Without a secure random number generator an attacker may be able to predict " +"password reset tokens and take over your account." +msgstr "" + +#: templates/installation.php:40 +msgid "" +"Your data directory and files are probably accessible from the internet " +"because the .htaccess file does not work." +msgstr "" + +#: templates/installation.php:42 +#, php-format +msgid "" +"For information how to properly configure your server, please see the <a " +"href=\"%s\" target=\"_blank\">documentation</a>." +msgstr "" + +#: templates/installation.php:48 +msgid "Create an <strong>admin account</strong>" +msgstr "" + +#: templates/installation.php:70 +msgid "Storage & database" +msgstr "" + +#: templates/installation.php:77 +msgid "Data folder" +msgstr "" + +#: templates/installation.php:90 +msgid "Configure the database" +msgstr "" + +#: templates/installation.php:94 +msgid "will be used" +msgstr "" + +#: templates/installation.php:109 +msgid "Database user" +msgstr "" + +#: templates/installation.php:118 +msgid "Database password" +msgstr "" + +#: templates/installation.php:123 +msgid "Database name" +msgstr "" + +#: templates/installation.php:132 +msgid "Database tablespace" +msgstr "" + +#: templates/installation.php:140 +msgid "Database host" +msgstr "" + +#: templates/installation.php:150 +msgid "Finish setup" +msgstr "" + +#: templates/installation.php:150 +msgid "Finishing …" +msgstr "" + +#: templates/layout.user.php:40 +msgid "" +"This application requires JavaScript to be enabled for correct operation. " +"Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable " +"JavaScript</a> and re-load this interface." +msgstr "" + +#: templates/layout.user.php:44 +#, php-format +msgid "%s is available. Get more information on how to update." +msgstr "" + +#: templates/layout.user.php:74 templates/singleuser.user.php:8 +msgid "Log out" +msgstr "" + +#: templates/login.php:9 +msgid "Automatic logon rejected!" +msgstr "" + +#: templates/login.php:10 +msgid "" +"If you did not change your password recently, your account may be " +"compromised!" +msgstr "" + +#: templates/login.php:12 +msgid "Please change your password to secure your account again." +msgstr "" + +#: templates/login.php:17 +msgid "Server side authentication failed!" +msgstr "" + +#: templates/login.php:18 +msgid "Please contact your administrator." +msgstr "" + +#: templates/login.php:46 +msgid "Lost your password?" +msgstr "" + +#: templates/login.php:51 +msgid "remember" +msgstr "" + +#: templates/login.php:54 +msgid "Log in" +msgstr "" + +#: templates/login.php:60 +msgid "Alternative Logins" +msgstr "" + +#: templates/mail.php:15 +#, php-format +msgid "" +"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> " +"with you.<br><a href=\"%s\">View it!</a><br><br>" +msgstr "" + +#: templates/singleuser.user.php:3 +msgid "This ownCloud instance is currently in single user mode." +msgstr "" + +#: templates/singleuser.user.php:4 +msgid "This means only administrators can use the instance." +msgstr "" + +#: templates/singleuser.user.php:5 templates/update.user.php:5 +msgid "" +"Contact your system administrator if this message persists or appeared " +"unexpectedly." +msgstr "" + +#: templates/singleuser.user.php:7 templates/update.user.php:6 +msgid "Thank you for your patience." +msgstr "" + +#: templates/update.admin.php:3 +#, php-format +msgid "Updating ownCloud to version %s, this may take a while." +msgstr "" + +#: templates/update.user.php:3 +msgid "" +"This ownCloud instance is currently being updated, which may take a while." +msgstr "" + +#: templates/update.user.php:4 +msgid "Please reload this page after a short time to continue using ownCloud." +msgstr "" diff --git a/l10n/es_UY/files.po b/l10n/es_UY/files.po new file mode 100644 index 00000000000..c073a191c21 --- /dev/null +++ b/l10n/es_UY/files.po @@ -0,0 +1,405 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: ownCloud\n" +"Report-Msgid-Bugs-To: translations@owncloud.org\n" +"POT-Creation-Date: 2014-05-10 01:55-0400\n" +"PO-Revision-Date: 2013-04-26 08:00+0000\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: Spanish (Uruguay) (http://www.transifex.com/projects/p/owncloud/language/es_UY/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: es_UY\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ajax/move.php:15 +#, php-format +msgid "Could not move %s - File with this name already exists" +msgstr "" + +#: ajax/move.php:25 ajax/move.php:28 +#, php-format +msgid "Could not move %s" +msgstr "" + +#: ajax/newfile.php:58 js/files.js:96 +msgid "File name cannot be empty." +msgstr "" + +#: ajax/newfile.php:63 +#, php-format +msgid "\"%s\" is an invalid file name." +msgstr "" + +#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103 +msgid "" +"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " +"allowed." +msgstr "" + +#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155 +#: lib/app.php:60 +msgid "The target folder has been moved or deleted." +msgstr "" + +#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69 +#, php-format +msgid "" +"The name %s is already used in the folder %s. Please choose a different " +"name." +msgstr "" + +#: ajax/newfile.php:97 +msgid "Not a valid source" +msgstr "" + +#: ajax/newfile.php:102 +msgid "" +"Server is not allowed to open URLs, please check the server configuration" +msgstr "" + +#: ajax/newfile.php:118 +#, php-format +msgid "Error while downloading %s to %s" +msgstr "" + +#: ajax/newfile.php:146 +msgid "Error when creating the file" +msgstr "" + +#: ajax/newfolder.php:22 +msgid "Folder name cannot be empty." +msgstr "" + +#: ajax/newfolder.php:66 +msgid "Error when creating the folder" +msgstr "" + +#: ajax/upload.php:19 ajax/upload.php:57 +msgid "Unable to set upload directory." +msgstr "" + +#: ajax/upload.php:33 +msgid "Invalid Token" +msgstr "" + +#: ajax/upload.php:75 +msgid "No file was uploaded. Unknown error" +msgstr "" + +#: ajax/upload.php:82 +msgid "There is no error, the file uploaded with success" +msgstr "" + +#: ajax/upload.php:83 +msgid "" +"The uploaded file exceeds the upload_max_filesize directive in php.ini: " +msgstr "" + +#: ajax/upload.php:85 +msgid "" +"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in " +"the HTML form" +msgstr "" + +#: ajax/upload.php:86 +msgid "The uploaded file was only partially uploaded" +msgstr "" + +#: ajax/upload.php:87 +msgid "No file was uploaded" +msgstr "" + +#: ajax/upload.php:88 +msgid "Missing a temporary folder" +msgstr "" + +#: ajax/upload.php:89 +msgid "Failed to write to disk" +msgstr "" + +#: ajax/upload.php:107 +msgid "Not enough storage available" +msgstr "" + +#: ajax/upload.php:169 +msgid "Upload failed. Could not find uploaded file" +msgstr "" + +#: ajax/upload.php:179 +msgid "Upload failed. Could not get file info." +msgstr "" + +#: ajax/upload.php:194 +msgid "Invalid directory." +msgstr "" + +#: appinfo/app.php:11 js/filelist.js:14 +msgid "Files" +msgstr "" + +#: js/file-upload.js:254 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" +msgstr "" + +#: js/file-upload.js:266 +msgid "Total file size {size1} exceeds upload limit {size2}" +msgstr "" + +#: js/file-upload.js:276 +msgid "" +"Not enough free space, you are uploading {size1} but only {size2} is left" +msgstr "" + +#: js/file-upload.js:353 +msgid "Upload cancelled." +msgstr "" + +#: js/file-upload.js:398 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:490 +msgid "" +"File upload is in progress. Leaving the page now will cancel the upload." +msgstr "" + +#: js/file-upload.js:555 +msgid "URL cannot be empty" +msgstr "" + +#: js/file-upload.js:559 js/filelist.js:963 +msgid "{new_name} already exists" +msgstr "" + +#: js/file-upload.js:611 +msgid "Could not create file" +msgstr "" + +#: js/file-upload.js:624 +msgid "Could not create folder" +msgstr "" + +#: js/file-upload.js:664 +msgid "Error fetching URL" +msgstr "" + +#: js/fileactions.js:160 +msgid "Share" +msgstr "" + +#: js/fileactions.js:173 +msgid "Delete permanently" +msgstr "" + +#: js/fileactions.js:234 +msgid "Rename" +msgstr "" + +#: js/filelist.js:221 +msgid "" +"Your download is being prepared. This might take some time if the files are " +"big." +msgstr "" + +#: js/filelist.js:502 js/filelist.js:1422 +msgid "Pending" +msgstr "" + +#: js/filelist.js:916 +msgid "Error moving file." +msgstr "" + +#: js/filelist.js:924 +msgid "Error moving file" +msgstr "" + +#: js/filelist.js:924 +msgid "Error" +msgstr "" + +#: js/filelist.js:988 +msgid "Could not rename file" +msgstr "" + +#: js/filelist.js:1122 +msgid "Error deleting file." +msgstr "" + +#: js/filelist.js:1224 templates/index.php:67 +msgid "Name" +msgstr "" + +#: js/filelist.js:1225 templates/index.php:79 +msgid "Size" +msgstr "" + +#: js/filelist.js:1226 templates/index.php:81 +msgid "Modified" +msgstr "" + +#: js/filelist.js:1235 js/filesummary.js:141 js/filesummary.js:168 +msgid "%n folder" +msgid_plural "%n folders" +msgstr[0] "" +msgstr[1] "" + +#: js/filelist.js:1241 js/filesummary.js:142 js/filesummary.js:169 +msgid "%n file" +msgid_plural "%n files" +msgstr[0] "" +msgstr[1] "" + +#: js/filelist.js:1330 js/filelist.js:1369 +msgid "Uploading %n file" +msgid_plural "Uploading %n files" +msgstr[0] "" +msgstr[1] "" + +#: js/files.js:94 +msgid "\"{name}\" is an invalid file name." +msgstr "" + +#: js/files.js:115 +msgid "Your storage is full, files can not be updated or synced anymore!" +msgstr "" + +#: js/files.js:119 +msgid "Your storage is almost full ({usedSpacePercent}%)" +msgstr "" + +#: js/files.js:133 +msgid "" +"Encryption App is enabled but your keys are not initialized, please log-out " +"and log-in again" +msgstr "" + +#: js/files.js:137 +msgid "" +"Invalid private key for Encryption App. Please update your private key " +"password in your personal settings to recover access to your encrypted " +"files." +msgstr "" + +#: js/files.js:141 +msgid "" +"Encryption was disabled but your files are still encrypted. Please go to " +"your personal settings to decrypt your files." +msgstr "" + +#: js/filesummary.js:182 +msgid "{dirs} and {files}" +msgstr "" + +#: lib/app.php:86 +#, php-format +msgid "%s could not be renamed" +msgstr "" + +#: lib/helper.php:14 templates/index.php:22 +#, php-format +msgid "Upload (max. %s)" +msgstr "" + +#: templates/admin.php:4 +msgid "File handling" +msgstr "" + +#: templates/admin.php:6 +msgid "Maximum upload size" +msgstr "" + +#: templates/admin.php:9 +msgid "max. possible: " +msgstr "" + +#: templates/admin.php:14 +msgid "Needed for multi-file and folder downloads." +msgstr "" + +#: templates/admin.php:16 +msgid "Enable ZIP-download" +msgstr "" + +#: templates/admin.php:19 +msgid "0 is unlimited" +msgstr "" + +#: templates/admin.php:21 +msgid "Maximum input size for ZIP files" +msgstr "" + +#: templates/admin.php:25 +msgid "Save" +msgstr "" + +#: templates/index.php:5 +msgid "New" +msgstr "" + +#: templates/index.php:8 +msgid "New text file" +msgstr "" + +#: templates/index.php:9 +msgid "Text file" +msgstr "" + +#: templates/index.php:12 +msgid "New folder" +msgstr "" + +#: templates/index.php:13 +msgid "Folder" +msgstr "" + +#: templates/index.php:16 +msgid "From link" +msgstr "" + +#: templates/index.php:40 +msgid "Deleted files" +msgstr "" + +#: templates/index.php:45 +msgid "Cancel upload" +msgstr "" + +#: templates/index.php:51 +msgid "You don’t have permission to upload or create files here" +msgstr "" + +#: templates/index.php:56 +msgid "Nothing in here. Upload something!" +msgstr "" + +#: templates/index.php:73 +msgid "Download" +msgstr "" + +#: templates/index.php:84 templates/index.php:85 +msgid "Delete" +msgstr "" + +#: templates/index.php:98 +msgid "Upload too large" +msgstr "" + +#: templates/index.php:100 +msgid "" +"The files you are trying to upload exceed the maximum size for file uploads " +"on this server." +msgstr "" + +#: templates/index.php:105 +msgid "Files are being scanned, please wait." +msgstr "" + +#: templates/index.php:108 +msgid "Current scanning" +msgstr "" diff --git a/l10n/es_UY/files_encryption.po b/l10n/es_UY/files_encryption.po new file mode 100644 index 00000000000..a2ea551480b --- /dev/null +++ b/l10n/es_UY/files_encryption.po @@ -0,0 +1,201 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: ownCloud\n" +"Report-Msgid-Bugs-To: translations@owncloud.org\n" +"POT-Creation-Date: 2014-05-10 01:55-0400\n" +"PO-Revision-Date: 2013-04-26 08:01+0000\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: Spanish (Uruguay) (http://www.transifex.com/projects/p/owncloud/language/es_UY/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: es_UY\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ajax/adminrecovery.php:29 +msgid "Recovery key successfully enabled" +msgstr "" + +#: ajax/adminrecovery.php:34 +msgid "" +"Could not enable recovery key. Please check your recovery key password!" +msgstr "" + +#: ajax/adminrecovery.php:48 +msgid "Recovery key successfully disabled" +msgstr "" + +#: ajax/adminrecovery.php:53 +msgid "" +"Could not disable recovery key. Please check your recovery key password!" +msgstr "" + +#: ajax/changeRecoveryPassword.php:49 +msgid "Password successfully changed." +msgstr "" + +#: ajax/changeRecoveryPassword.php:51 +msgid "Could not change the password. Maybe the old password was not correct." +msgstr "" + +#: ajax/updatePrivateKeyPassword.php:52 +msgid "Private key password successfully updated." +msgstr "" + +#: ajax/updatePrivateKeyPassword.php:54 +msgid "" +"Could not update the private key password. Maybe the old password was not " +"correct." +msgstr "" + +#: files/error.php:12 +msgid "" +"Encryption app not initialized! Maybe the encryption app was re-enabled " +"during your session. Please try to log out and log back in to initialize the" +" encryption app." +msgstr "" + +#: files/error.php:16 +#, php-format +msgid "" +"Your private key is not valid! Likely your password was changed outside of " +"%s (e.g. your corporate directory). You can update your private key password" +" in your personal settings to recover access to your encrypted files." +msgstr "" + +#: files/error.php:19 +msgid "" +"Can not decrypt this file, probably this is a shared file. Please ask the " +"file owner to reshare the file with you." +msgstr "" + +#: files/error.php:22 files/error.php:27 +msgid "" +"Unknown error please check your system settings or contact your " +"administrator" +msgstr "" + +#: hooks/hooks.php:64 +msgid "Missing requirements." +msgstr "" + +#: hooks/hooks.php:65 +msgid "" +"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." +msgstr "" + +#: hooks/hooks.php:295 +msgid "Following users are not set up for encryption:" +msgstr "" + +#: js/detect-migration.js:21 +msgid "Initial encryption started... This can take some time. Please wait." +msgstr "" + +#: js/detect-migration.js:25 +msgid "Initial encryption running... Please try again later." +msgstr "" + +#: templates/invalid_private_key.php:8 +msgid "Go directly to your " +msgstr "" + +#: templates/invalid_private_key.php:8 +msgid "personal settings" +msgstr "" + +#: templates/settings-admin.php:2 templates/settings-personal.php:2 +msgid "Encryption" +msgstr "" + +#: templates/settings-admin.php:5 +msgid "" +"Enable recovery key (allow to recover users files in case of password loss):" +msgstr "" + +#: templates/settings-admin.php:9 +msgid "Recovery key password" +msgstr "" + +#: templates/settings-admin.php:12 +msgid "Repeat Recovery key password" +msgstr "" + +#: templates/settings-admin.php:19 templates/settings-personal.php:50 +msgid "Enabled" +msgstr "" + +#: templates/settings-admin.php:27 templates/settings-personal.php:58 +msgid "Disabled" +msgstr "" + +#: templates/settings-admin.php:32 +msgid "Change recovery key password:" +msgstr "" + +#: templates/settings-admin.php:38 +msgid "Old Recovery key password" +msgstr "" + +#: templates/settings-admin.php:45 +msgid "New Recovery key password" +msgstr "" + +#: templates/settings-admin.php:51 +msgid "Repeat New Recovery key password" +msgstr "" + +#: templates/settings-admin.php:56 +msgid "Change Password" +msgstr "" + +#: templates/settings-personal.php:8 +msgid "Your private key password no longer match your log-in password:" +msgstr "" + +#: templates/settings-personal.php:11 +msgid "Set your old private key password to your current log-in password." +msgstr "" + +#: templates/settings-personal.php:13 +msgid "" +" If you don't remember your old password you can ask your administrator to " +"recover your files." +msgstr "" + +#: templates/settings-personal.php:21 +msgid "Old log-in password" +msgstr "" + +#: templates/settings-personal.php:27 +msgid "Current log-in password" +msgstr "" + +#: templates/settings-personal.php:32 +msgid "Update Private Key Password" +msgstr "" + +#: templates/settings-personal.php:41 +msgid "Enable password recovery:" +msgstr "" + +#: templates/settings-personal.php:43 +msgid "" +"Enabling this option will allow you to reobtain access to your encrypted " +"files in case of password loss" +msgstr "" + +#: templates/settings-personal.php:59 +msgid "File recovery settings updated" +msgstr "" + +#: templates/settings-personal.php:60 +msgid "Could not update file recovery" +msgstr "" diff --git a/l10n/es_UY/files_external.po b/l10n/es_UY/files_external.po new file mode 100644 index 00000000000..58551ec9b96 --- /dev/null +++ b/l10n/es_UY/files_external.po @@ -0,0 +1,292 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: ownCloud\n" +"Report-Msgid-Bugs-To: translations@owncloud.org\n" +"POT-Creation-Date: 2014-05-10 01:55-0400\n" +"PO-Revision-Date: 2013-04-26 08:01+0000\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: Spanish (Uruguay) (http://www.transifex.com/projects/p/owncloud/language/es_UY/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: es_UY\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: appinfo/app.php:34 +msgid "Local" +msgstr "" + +#: appinfo/app.php:36 +msgid "Location" +msgstr "" + +#: appinfo/app.php:39 +msgid "Amazon S3" +msgstr "" + +#: appinfo/app.php:41 +msgid "Key" +msgstr "" + +#: appinfo/app.php:42 +msgid "Secret" +msgstr "" + +#: appinfo/app.php:43 appinfo/app.php:51 +msgid "Bucket" +msgstr "" + +#: appinfo/app.php:47 +msgid "Amazon S3 and compliant" +msgstr "" + +#: appinfo/app.php:49 +msgid "Access Key" +msgstr "" + +#: appinfo/app.php:50 +msgid "Secret Key" +msgstr "" + +#: appinfo/app.php:52 +msgid "Hostname (optional)" +msgstr "" + +#: appinfo/app.php:53 +msgid "Port (optional)" +msgstr "" + +#: appinfo/app.php:54 +msgid "Region (optional)" +msgstr "" + +#: appinfo/app.php:55 +msgid "Enable SSL" +msgstr "" + +#: appinfo/app.php:56 +msgid "Enable Path Style" +msgstr "" + +#: appinfo/app.php:63 +msgid "App key" +msgstr "" + +#: appinfo/app.php:64 +msgid "App secret" +msgstr "" + +#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121 +#: appinfo/app.php:131 appinfo/app.php:141 appinfo/app.php:151 +msgid "URL" +msgstr "" + +#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132 +#: appinfo/app.php:142 appinfo/app.php:152 +msgid "Username" +msgstr "" + +#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133 +#: appinfo/app.php:143 appinfo/app.php:153 +msgid "Password" +msgstr "" + +#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124 +#: appinfo/app.php:134 appinfo/app.php:154 +msgid "Root" +msgstr "" + +#: appinfo/app.php:77 +msgid "Secure ftps://" +msgstr "" + +#: appinfo/app.php:84 +msgid "Client ID" +msgstr "" + +#: appinfo/app.php:85 +msgid "Client secret" +msgstr "" + +#: appinfo/app.php:92 +msgid "OpenStack Object Storage" +msgstr "" + +#: appinfo/app.php:94 +msgid "Username (required)" +msgstr "" + +#: appinfo/app.php:95 +msgid "Bucket (required)" +msgstr "" + +#: appinfo/app.php:96 +msgid "Region (optional for OpenStack Object Storage)" +msgstr "" + +#: appinfo/app.php:97 +msgid "API Key (required for Rackspace Cloud Files)" +msgstr "" + +#: appinfo/app.php:98 +msgid "Tenantname (required for OpenStack Object Storage)" +msgstr "" + +#: appinfo/app.php:99 +msgid "Password (required for OpenStack Object Storage)" +msgstr "" + +#: appinfo/app.php:100 +msgid "Service Name (required for OpenStack Object Storage)" +msgstr "" + +#: appinfo/app.php:101 +msgid "URL of identity endpoint (required for OpenStack Object Storage)" +msgstr "" + +#: appinfo/app.php:102 +msgid "Timeout of HTTP requests in seconds (optional)" +msgstr "" + +#: appinfo/app.php:114 appinfo/app.php:123 +msgid "Share" +msgstr "" + +#: appinfo/app.php:119 +msgid "SMB / CIFS using OC login" +msgstr "" + +#: appinfo/app.php:122 +msgid "Username as share" +msgstr "" + +#: appinfo/app.php:135 appinfo/app.php:145 +msgid "Secure https://" +msgstr "" + +#: appinfo/app.php:144 +msgid "Remote subfolder" +msgstr "" + +#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40 +msgid "Access granted" +msgstr "" + +#: js/dropbox.js:33 js/dropbox.js:97 js/dropbox.js:103 +msgid "Error configuring Dropbox storage" +msgstr "" + +#: js/dropbox.js:68 js/google.js:89 +msgid "Grant access" +msgstr "" + +#: js/dropbox.js:102 +msgid "Please provide a valid Dropbox app key and secret." +msgstr "" + +#: js/google.js:45 js/google.js:122 +msgid "Error configuring Google Drive storage" +msgstr "" + +#: js/settings.js:318 js/settings.js:325 +msgid "Saved" +msgstr "" + +#: lib/config.php:597 +msgid "<b>Note:</b> " +msgstr "" + +#: lib/config.php:607 +msgid " and " +msgstr "" + +#: lib/config.php:629 +#, php-format +msgid "" +"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting " +"of %s is not possible. Please ask your system administrator to install it." +msgstr "" + +#: lib/config.php:631 +#, php-format +msgid "" +"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of" +" %s is not possible. Please ask your system administrator to install it." +msgstr "" + +#: lib/config.php:633 +#, php-format +msgid "" +"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please" +" ask your system administrator to install it." +msgstr "" + +#: templates/settings.php:2 +msgid "External Storage" +msgstr "" + +#: templates/settings.php:8 templates/settings.php:27 +msgid "Folder name" +msgstr "" + +#: templates/settings.php:9 +msgid "External storage" +msgstr "" + +#: templates/settings.php:10 +msgid "Configuration" +msgstr "" + +#: templates/settings.php:11 +msgid "Options" +msgstr "" + +#: templates/settings.php:12 +msgid "Available for" +msgstr "" + +#: templates/settings.php:32 +msgid "Add storage" +msgstr "" + +#: templates/settings.php:92 +msgid "No user or group" +msgstr "" + +#: templates/settings.php:95 +msgid "All Users" +msgstr "" + +#: templates/settings.php:97 +msgid "Groups" +msgstr "" + +#: templates/settings.php:105 +msgid "Users" +msgstr "" + +#: templates/settings.php:118 templates/settings.php:119 +#: templates/settings.php:158 templates/settings.php:159 +msgid "Delete" +msgstr "" + +#: templates/settings.php:132 +msgid "Enable User External Storage" +msgstr "" + +#: templates/settings.php:135 +msgid "Allow users to mount the following external storage" +msgstr "" + +#: templates/settings.php:150 +msgid "SSL root certificates" +msgstr "" + +#: templates/settings.php:168 +msgid "Import Root Certificate" +msgstr "" diff --git a/l10n/es_UY/files_sharing.po b/l10n/es_UY/files_sharing.po new file mode 100644 index 00000000000..845923caf5b --- /dev/null +++ b/l10n/es_UY/files_sharing.po @@ -0,0 +1,71 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: ownCloud\n" +"Report-Msgid-Bugs-To: translations@owncloud.org\n" +"POT-Creation-Date: 2014-05-10 01:55-0400\n" +"PO-Revision-Date: 2013-04-26 08:01+0000\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: Spanish (Uruguay) (http://www.transifex.com/projects/p/owncloud/language/es_UY/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: es_UY\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: js/share.js:33 +msgid "Shared by {owner}" +msgstr "" + +#: templates/authenticate.php:4 +msgid "This share is password-protected" +msgstr "" + +#: templates/authenticate.php:7 +msgid "The password is wrong. Try again." +msgstr "" + +#: templates/authenticate.php:10 +msgid "Password" +msgstr "" + +#: templates/part.404.php:3 +msgid "Sorry, this link doesn’t seem to work anymore." +msgstr "" + +#: templates/part.404.php:4 +msgid "Reasons might be:" +msgstr "" + +#: templates/part.404.php:6 +msgid "the item was removed" +msgstr "" + +#: templates/part.404.php:7 +msgid "the link expired" +msgstr "" + +#: templates/part.404.php:8 +msgid "sharing is disabled" +msgstr "" + +#: templates/part.404.php:10 +msgid "For more info, please ask the person who sent this link." +msgstr "" + +#: templates/public.php:21 +msgid "Download" +msgstr "" + +#: templates/public.php:52 +#, php-format +msgid "Download %s" +msgstr "" + +#: templates/public.php:56 +msgid "Direct link" +msgstr "" diff --git a/l10n/es_UY/files_trashbin.po b/l10n/es_UY/files_trashbin.po new file mode 100644 index 00000000000..7378a666c6f --- /dev/null +++ b/l10n/es_UY/files_trashbin.po @@ -0,0 +1,64 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: ownCloud\n" +"Report-Msgid-Bugs-To: translations@owncloud.org\n" +"POT-Creation-Date: 2014-05-10 01:55-0400\n" +"PO-Revision-Date: 2013-04-26 08:01+0000\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: Spanish (Uruguay) (http://www.transifex.com/projects/p/owncloud/language/es_UY/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: es_UY\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ajax/delete.php:59 +#, php-format +msgid "Couldn't delete %s permanently" +msgstr "" + +#: ajax/undelete.php:64 +#, php-format +msgid "Couldn't restore %s" +msgstr "" + +#: js/filelist.js:3 +msgid "Deleted files" +msgstr "" + +#: js/filelist.js:88 js/filelist.js:132 js/filelist.js:181 +msgid "Error" +msgstr "" + +#: js/trash.js:48 templates/index.php:22 templates/index.php:24 +msgid "Restore" +msgstr "" + +#: js/trash.js:107 +msgid "Deleted Files" +msgstr "" + +#: lib/trashbin.php:861 lib/trashbin.php:863 +msgid "restored" +msgstr "" + +#: templates/index.php:6 +msgid "Nothing in here. Your trash bin is empty!" +msgstr "" + +#: templates/index.php:19 +msgid "Name" +msgstr "" + +#: templates/index.php:30 +msgid "Deleted" +msgstr "" + +#: templates/index.php:33 templates/index.php:34 +msgid "Delete" +msgstr "" diff --git a/l10n/es_UY/files_versions.po b/l10n/es_UY/files_versions.po new file mode 100644 index 00000000000..db193084164 --- /dev/null +++ b/l10n/es_UY/files_versions.po @@ -0,0 +1,43 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: ownCloud\n" +"Report-Msgid-Bugs-To: translations@owncloud.org\n" +"POT-Creation-Date: 2014-05-10 01:55-0400\n" +"PO-Revision-Date: 2013-04-26 08:01+0000\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: Spanish (Uruguay) (http://www.transifex.com/projects/p/owncloud/language/es_UY/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: es_UY\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ajax/rollbackVersion.php:13 +#, php-format +msgid "Could not revert: %s" +msgstr "" + +#: js/versions.js:39 +msgid "Versions" +msgstr "" + +#: js/versions.js:61 +msgid "Failed to revert {file} to revision {timestamp}." +msgstr "" + +#: js/versions.js:88 +msgid "More versions..." +msgstr "" + +#: js/versions.js:126 +msgid "No other versions available" +msgstr "" + +#: js/versions.js:156 +msgid "Restore" +msgstr "" diff --git a/l10n/es_UY/lib.po b/l10n/es_UY/lib.po new file mode 100644 index 00000000000..53c4f2462d2 --- /dev/null +++ b/l10n/es_UY/lib.po @@ -0,0 +1,470 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: ownCloud\n" +"Report-Msgid-Bugs-To: translations@owncloud.org\n" +"POT-Creation-Date: 2014-05-10 01:55-0400\n" +"PO-Revision-Date: 2013-04-26 08:01+0000\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: Spanish (Uruguay) (http://www.transifex.com/projects/p/owncloud/language/es_UY/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: es_UY\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: base.php:713 +msgid "You are accessing the server from an untrusted domain." +msgstr "" + +#: base.php:714 +msgid "" +"Please contact your administrator. If you are an administrator of this " +"instance, configure the \"trusted_domain\" setting in config/config.php. An " +"example configuration is provided in config/config.sample.php." +msgstr "" + +#: private/app.php:236 +#, php-format +msgid "" +"App \"%s\" can't be installed because it is not compatible with this version" +" of ownCloud." +msgstr "" + +#: private/app.php:248 +msgid "No app name specified" +msgstr "" + +#: private/app.php:353 +msgid "Help" +msgstr "" + +#: private/app.php:366 +msgid "Personal" +msgstr "" + +#: private/app.php:377 +msgid "Settings" +msgstr "" + +#: private/app.php:389 +msgid "Users" +msgstr "" + +#: private/app.php:402 +msgid "Admin" +msgstr "" + +#: private/app.php:880 +#, php-format +msgid "Failed to upgrade \"%s\"." +msgstr "" + +#: private/avatar.php:66 +msgid "Unknown filetype" +msgstr "" + +#: private/avatar.php:71 +msgid "Invalid image" +msgstr "" + +#: private/defaults.php:35 +msgid "web services under your control" +msgstr "" + +#: private/files.php:235 +msgid "ZIP download is turned off." +msgstr "" + +#: private/files.php:236 +msgid "Files need to be downloaded one by one." +msgstr "" + +#: private/files.php:237 private/files.php:264 +msgid "Back to Files" +msgstr "" + +#: private/files.php:262 +msgid "Selected files too large to generate zip file." +msgstr "" + +#: private/files.php:263 +msgid "" +"Please download the files separately in smaller chunks or kindly ask your " +"administrator." +msgstr "" + +#: private/installer.php:64 +msgid "No source specified when installing app" +msgstr "" + +#: private/installer.php:71 +msgid "No href specified when installing app from http" +msgstr "" + +#: private/installer.php:76 +msgid "No path specified when installing app from local file" +msgstr "" + +#: private/installer.php:90 +#, php-format +msgid "Archives of type %s are not supported" +msgstr "" + +#: private/installer.php:104 +msgid "Failed to open archive when installing app" +msgstr "" + +#: private/installer.php:126 +msgid "App does not provide an info.xml file" +msgstr "" + +#: private/installer.php:132 +msgid "App can't be installed because of not allowed code in the App" +msgstr "" + +#: private/installer.php:141 +msgid "" +"App can't be installed because it is not compatible with this version of " +"ownCloud" +msgstr "" + +#: private/installer.php:147 +msgid "" +"App can't be installed because it contains the <shipped>true</shipped> tag " +"which is not allowed for non shipped apps" +msgstr "" + +#: private/installer.php:160 +msgid "" +"App can't be installed because the version in info.xml/version is not the " +"same as the version reported from the app store" +msgstr "" + +#: private/installer.php:170 +msgid "App directory already exists" +msgstr "" + +#: private/installer.php:183 +#, php-format +msgid "Can't create app folder. Please fix permissions. %s" +msgstr "" + +#: private/json.php:29 +msgid "Application is not enabled" +msgstr "" + +#: private/json.php:40 private/json.php:62 private/json.php:87 +msgid "Authentication error" +msgstr "" + +#: private/json.php:51 +msgid "Token expired. Please reload page." +msgstr "" + +#: private/json.php:74 +msgid "Unknown user" +msgstr "" + +#: private/search/provider/file.php:18 private/search/provider/file.php:36 +msgid "Files" +msgstr "" + +#: private/search/provider/file.php:27 private/search/provider/file.php:34 +msgid "Text" +msgstr "" + +#: private/search/provider/file.php:30 +msgid "Images" +msgstr "" + +#: private/setup/abstractdatabase.php:26 +#, php-format +msgid "%s enter the database username." +msgstr "" + +#: private/setup/abstractdatabase.php:29 +#, php-format +msgid "%s enter the database name." +msgstr "" + +#: private/setup/abstractdatabase.php:32 +#, php-format +msgid "%s you may not use dots in the database name" +msgstr "" + +#: private/setup/mssql.php:20 +#, php-format +msgid "MS SQL username and/or password not valid: %s" +msgstr "" + +#: private/setup/mssql.php:21 private/setup/mysql.php:13 +#: private/setup/oci.php:114 private/setup/postgresql.php:31 +#: private/setup/postgresql.php:84 +msgid "You need to enter either an existing account or the administrator." +msgstr "" + +#: private/setup/mysql.php:12 +msgid "MySQL/MariaDB username and/or password not valid" +msgstr "" + +#: private/setup/mysql.php:67 private/setup/oci.php:54 +#: private/setup/oci.php:121 private/setup/oci.php:144 +#: private/setup/oci.php:151 private/setup/oci.php:162 +#: private/setup/oci.php:169 private/setup/oci.php:178 +#: private/setup/oci.php:186 private/setup/oci.php:195 +#: private/setup/oci.php:201 private/setup/postgresql.php:103 +#: private/setup/postgresql.php:112 private/setup/postgresql.php:129 +#: private/setup/postgresql.php:139 private/setup/postgresql.php:148 +#, php-format +msgid "DB Error: \"%s\"" +msgstr "" + +#: private/setup/mysql.php:68 private/setup/oci.php:55 +#: private/setup/oci.php:122 private/setup/oci.php:145 +#: private/setup/oci.php:152 private/setup/oci.php:163 +#: private/setup/oci.php:179 private/setup/oci.php:187 +#: private/setup/oci.php:196 private/setup/postgresql.php:104 +#: private/setup/postgresql.php:113 private/setup/postgresql.php:130 +#: private/setup/postgresql.php:140 private/setup/postgresql.php:149 +#, php-format +msgid "Offending command was: \"%s\"" +msgstr "" + +#: private/setup/mysql.php:85 +#, php-format +msgid "MySQL/MariaDB user '%s'@'localhost' exists already." +msgstr "" + +#: private/setup/mysql.php:86 +msgid "Drop this user from MySQL/MariaDB" +msgstr "" + +#: private/setup/mysql.php:91 +#, php-format +msgid "MySQL/MariaDB user '%s'@'%%' already exists" +msgstr "" + +#: private/setup/mysql.php:92 +msgid "Drop this user from MySQL/MariaDB." +msgstr "" + +#: private/setup/oci.php:34 +msgid "Oracle connection could not be established" +msgstr "" + +#: private/setup/oci.php:41 private/setup/oci.php:113 +msgid "Oracle username and/or password not valid" +msgstr "" + +#: private/setup/oci.php:170 private/setup/oci.php:202 +#, php-format +msgid "Offending command was: \"%s\", name: %s, password: %s" +msgstr "" + +#: private/setup/postgresql.php:30 private/setup/postgresql.php:83 +msgid "PostgreSQL username and/or password not valid" +msgstr "" + +#: private/setup.php:28 +msgid "Set an admin username." +msgstr "" + +#: private/setup.php:31 +msgid "Set an admin password." +msgstr "" + +#: private/setup.php:164 +msgid "" +"Your web server is not yet properly setup to allow files synchronization " +"because the WebDAV interface seems to be broken." +msgstr "" + +#: private/setup.php:165 +#, php-format +msgid "Please double check the <a href='%s'>installation guides</a>." +msgstr "" + +#: private/share/mailnotifications.php:72 +#: private/share/mailnotifications.php:118 +#, php-format +msgid "%s shared »%s« with you" +msgstr "" + +#: private/share/share.php:498 +#, php-format +msgid "Sharing %s failed, because the file does not exist" +msgstr "" + +#: private/share/share.php:523 +#, php-format +msgid "Sharing %s failed, because the user %s is the item owner" +msgstr "" + +#: private/share/share.php:529 +#, php-format +msgid "Sharing %s failed, because the user %s does not exist" +msgstr "" + +#: private/share/share.php:538 +#, php-format +msgid "" +"Sharing %s failed, because the user %s is not a member of any groups that %s" +" is a member of" +msgstr "" + +#: private/share/share.php:551 private/share/share.php:579 +#, php-format +msgid "Sharing %s failed, because this item is already shared with %s" +msgstr "" + +#: private/share/share.php:559 +#, php-format +msgid "Sharing %s failed, because the group %s does not exist" +msgstr "" + +#: private/share/share.php:566 +#, php-format +msgid "Sharing %s failed, because %s is not a member of the group %s" +msgstr "" + +#: private/share/share.php:629 +#, php-format +msgid "Sharing %s failed, because sharing with links is not allowed" +msgstr "" + +#: private/share/share.php:636 +#, php-format +msgid "Share type %s is not valid for %s" +msgstr "" + +#: private/share/share.php:774 +#, php-format +msgid "" +"Setting permissions for %s failed, because the permissions exceed " +"permissions granted to %s" +msgstr "" + +#: private/share/share.php:835 +#, php-format +msgid "Setting permissions for %s failed, because the item was not found" +msgstr "" + +#: private/share/share.php:941 +#, php-format +msgid "Sharing backend %s must implement the interface OCP\\Share_Backend" +msgstr "" + +#: private/share/share.php:948 +#, php-format +msgid "Sharing backend %s not found" +msgstr "" + +#: private/share/share.php:954 +#, php-format +msgid "Sharing backend for %s not found" +msgstr "" + +#: private/share/share.php:1368 +#, php-format +msgid "Sharing %s failed, because the user %s is the original sharer" +msgstr "" + +#: private/share/share.php:1377 +#, php-format +msgid "" +"Sharing %s failed, because the permissions exceed permissions granted to %s" +msgstr "" + +#: private/share/share.php:1392 +#, php-format +msgid "Sharing %s failed, because resharing is not allowed" +msgstr "" + +#: private/share/share.php:1404 +#, php-format +msgid "" +"Sharing %s failed, because the sharing backend for %s could not find its " +"source" +msgstr "" + +#: private/share/share.php:1418 +#, php-format +msgid "" +"Sharing %s failed, because the file could not be found in the file cache" +msgstr "" + +#: private/tags.php:183 +#, php-format +msgid "Could not find category \"%s\"" +msgstr "" + +#: private/template/functions.php:134 +msgid "seconds ago" +msgstr "" + +#: private/template/functions.php:135 +msgid "%n minute ago" +msgid_plural "%n minutes ago" +msgstr[0] "" +msgstr[1] "" + +#: private/template/functions.php:136 +msgid "%n hour ago" +msgid_plural "%n hours ago" +msgstr[0] "" +msgstr[1] "" + +#: private/template/functions.php:137 +msgid "today" +msgstr "" + +#: private/template/functions.php:138 +msgid "yesterday" +msgstr "" + +#: private/template/functions.php:140 +msgid "%n day go" +msgid_plural "%n days ago" +msgstr[0] "" +msgstr[1] "" + +#: private/template/functions.php:142 +msgid "last month" +msgstr "" + +#: private/template/functions.php:143 +msgid "%n month ago" +msgid_plural "%n months ago" +msgstr[0] "" +msgstr[1] "" + +#: private/template/functions.php:145 +msgid "last year" +msgstr "" + +#: private/template/functions.php:146 +msgid "years ago" +msgstr "" + +#: private/user/manager.php:232 +msgid "" +"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", " +"\"0-9\", and \"_.@-\"" +msgstr "" + +#: private/user/manager.php:237 +msgid "A valid username must be provided" +msgstr "" + +#: private/user/manager.php:241 +msgid "A valid password must be provided" +msgstr "" + +#: private/user/manager.php:246 +msgid "The username is already being used" +msgstr "" diff --git a/l10n/es_UY/settings.po b/l10n/es_UY/settings.po new file mode 100644 index 00000000000..01bcab96d7e --- /dev/null +++ b/l10n/es_UY/settings.po @@ -0,0 +1,901 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: ownCloud\n" +"Report-Msgid-Bugs-To: translations@owncloud.org\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" +"Last-Translator: I Robot\n" +"Language-Team: Spanish (Uruguay) (http://www.transifex.com/projects/p/owncloud/language/es_UY/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: es_UY\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: admin/controller.php:66 +#, php-format +msgid "Invalid value supplied for %s" +msgstr "" + +#: admin/controller.php:73 +msgid "Saved" +msgstr "" + +#: admin/controller.php:90 +msgid "test email settings" +msgstr "" + +#: admin/controller.php:91 +msgid "If you received this email, the settings seem to be correct." +msgstr "" + +#: admin/controller.php:94 +msgid "" +"A problem occurred while sending the e-mail. Please revisit your settings." +msgstr "" + +#: admin/controller.php:99 +msgid "Email sent" +msgstr "" + +#: admin/controller.php:101 +msgid "You need to set your user email before being able to send test emails." +msgstr "" + +#: admin/controller.php:116 templates/admin.php:316 +msgid "Send mode" +msgstr "" + +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 +msgid "Encryption" +msgstr "" + +#: admin/controller.php:120 templates/admin.php:353 +msgid "Authentication method" +msgstr "" + +#: ajax/apps/ocs.php:20 +msgid "Unable to load list from App Store" +msgstr "" + +#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 +#: ajax/togglegroups.php:20 changepassword/controller.php:49 +msgid "Authentication error" +msgstr "" + +#: ajax/changedisplayname.php:31 +msgid "Your full name has been changed." +msgstr "" + +#: ajax/changedisplayname.php:34 +msgid "Unable to change full name" +msgstr "" + +#: ajax/creategroup.php:10 +msgid "Group already exists" +msgstr "" + +#: ajax/creategroup.php:19 +msgid "Unable to add group" +msgstr "" + +#: ajax/decryptall.php:31 +msgid "Files decrypted successfully" +msgstr "" + +#: ajax/decryptall.php:33 +msgid "" +"Couldn't decrypt your files, please check your owncloud.log or ask your " +"administrator" +msgstr "" + +#: ajax/decryptall.php:36 +msgid "Couldn't decrypt your files, check your password and try again" +msgstr "" + +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + +#: ajax/lostpassword.php:12 +msgid "Email saved" +msgstr "" + +#: ajax/lostpassword.php:14 +msgid "Invalid email" +msgstr "" + +#: ajax/removegroup.php:13 +msgid "Unable to delete group" +msgstr "" + +#: ajax/removeuser.php:25 +msgid "Unable to delete user" +msgstr "" + +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + +#: ajax/setlanguage.php:15 +msgid "Language changed" +msgstr "" + +#: ajax/setlanguage.php:17 ajax/setlanguage.php:20 +msgid "Invalid request" +msgstr "" + +#: ajax/togglegroups.php:12 +msgid "Admins can't remove themself from the admin group" +msgstr "" + +#: ajax/togglegroups.php:30 +#, php-format +msgid "Unable to add user to group %s" +msgstr "" + +#: ajax/togglegroups.php:36 +#, php-format +msgid "Unable to remove user from group %s" +msgstr "" + +#: ajax/updateapp.php:14 +msgid "Couldn't update app." +msgstr "" + +#: changepassword/controller.php:17 +msgid "Wrong password" +msgstr "" + +#: changepassword/controller.php:36 +msgid "No user supplied" +msgstr "" + +#: changepassword/controller.php:68 +msgid "" +"Please provide an admin recovery password, otherwise all user data will be " +"lost" +msgstr "" + +#: changepassword/controller.php:73 +msgid "" +"Wrong admin recovery password. Please check the password and try again." +msgstr "" + +#: changepassword/controller.php:81 +msgid "" +"Back-end doesn't support password change, but the users encryption key was " +"successfully updated." +msgstr "" + +#: changepassword/controller.php:86 changepassword/controller.php:97 +msgid "Unable to change password" +msgstr "" + +#: js/admin.js:73 +msgid "Sending..." +msgstr "" + +#: js/apps.js:45 templates/help.php:4 +msgid "User Documentation" +msgstr "" + +#: js/apps.js:50 +msgid "Admin Documentation" +msgstr "" + +#: js/apps.js:67 +msgid "Update to {appversion}" +msgstr "" + +#: js/apps.js:73 js/apps.js:106 js/apps.js:134 +msgid "Disable" +msgstr "" + +#: js/apps.js:73 js/apps.js:114 js/apps.js:127 js/apps.js:143 +msgid "Enable" +msgstr "" + +#: js/apps.js:95 +msgid "Please wait...." +msgstr "" + +#: js/apps.js:103 js/apps.js:104 js/apps.js:125 +msgid "Error while disabling app" +msgstr "" + +#: js/apps.js:124 js/apps.js:138 js/apps.js:139 +msgid "Error while enabling app" +msgstr "" + +#: js/apps.js:149 +msgid "Updating...." +msgstr "" + +#: js/apps.js:152 +msgid "Error while updating app" +msgstr "" + +#: js/apps.js:152 +msgid "Error" +msgstr "" + +#: js/apps.js:153 templates/apps.php:55 +msgid "Update" +msgstr "" + +#: js/apps.js:156 +msgid "Updated" +msgstr "" + +#: js/personal.js:256 +msgid "Select a profile picture" +msgstr "" + +#: js/personal.js:287 +msgid "Very weak password" +msgstr "" + +#: js/personal.js:288 +msgid "Weak password" +msgstr "" + +#: js/personal.js:289 +msgid "So-so password" +msgstr "" + +#: js/personal.js:290 +msgid "Good password" +msgstr "" + +#: js/personal.js:291 +msgid "Strong password" +msgstr "" + +#: js/personal.js:310 +msgid "Decrypting files... Please wait, this can take some time." +msgstr "" + +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + +#: js/users.js:47 +msgid "deleted" +msgstr "" + +#: js/users.js:47 +msgid "undo" +msgstr "" + +#: js/users.js:79 +msgid "Unable to remove user" +msgstr "" + +#: js/users.js:101 templates/users.php:24 templates/users.php:88 +#: templates/users.php:116 +msgid "Groups" +msgstr "" + +#: js/users.js:105 templates/users.php:90 templates/users.php:128 +msgid "Group Admin" +msgstr "" + +#: js/users.js:127 templates/users.php:168 +msgid "Delete" +msgstr "" + +#: js/users.js:310 +msgid "add group" +msgstr "" + +#: js/users.js:486 +msgid "A valid username must be provided" +msgstr "" + +#: js/users.js:487 js/users.js:493 js/users.js:508 +msgid "Error creating user" +msgstr "" + +#: js/users.js:492 +msgid "A valid password must be provided" +msgstr "" + +#: js/users.js:516 +msgid "Warning: Home directory for user \"{user}\" already exists" +msgstr "" + +#: personal.php:50 personal.php:51 +msgid "__language_name__" +msgstr "" + +#: templates/admin.php:8 +msgid "Everything (fatal issues, errors, warnings, info, debug)" +msgstr "" + +#: templates/admin.php:9 +msgid "Info, warnings, errors and fatal issues" +msgstr "" + +#: templates/admin.php:10 +msgid "Warnings, errors and fatal issues" +msgstr "" + +#: templates/admin.php:11 +msgid "Errors and fatal issues" +msgstr "" + +#: templates/admin.php:12 +msgid "Fatal issues only" +msgstr "" + +#: templates/admin.php:16 templates/admin.php:23 +msgid "None" +msgstr "" + +#: templates/admin.php:17 +msgid "Login" +msgstr "" + +#: templates/admin.php:18 +msgid "Plain" +msgstr "" + +#: templates/admin.php:19 +msgid "NT LAN Manager" +msgstr "" + +#: templates/admin.php:24 +msgid "SSL" +msgstr "" + +#: templates/admin.php:25 +msgid "TLS" +msgstr "" + +#: templates/admin.php:47 templates/admin.php:61 +msgid "Security Warning" +msgstr "" + +#: templates/admin.php:50 +#, php-format +msgid "" +"You are accessing %s via HTTP. We strongly suggest you configure your server" +" to require using HTTPS instead." +msgstr "" + +#: templates/admin.php:64 +msgid "" +"Your data directory and your files are probably accessible from the " +"internet. The .htaccess file is not working. We strongly suggest that you " +"configure your webserver in a way that the data directory is no longer " +"accessible or you move the data directory outside the webserver document " +"root." +msgstr "" + +#: templates/admin.php:75 +msgid "Setup Warning" +msgstr "" + +#: templates/admin.php:78 +msgid "" +"Your web server is not yet properly setup to allow files synchronization " +"because the WebDAV interface seems to be broken." +msgstr "" + +#: templates/admin.php:79 +#, php-format +msgid "Please double check the <a href=\"%s\">installation guides</a>." +msgstr "" + +#: templates/admin.php:90 +msgid "Module 'fileinfo' missing" +msgstr "" + +#: templates/admin.php:93 +msgid "" +"The PHP module 'fileinfo' is missing. We strongly recommend to enable this " +"module to get best results with mime-type detection." +msgstr "" + +#: templates/admin.php:104 +msgid "Your PHP version is outdated" +msgstr "" + +#: templates/admin.php:107 +msgid "" +"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or " +"newer because older versions are known to be broken. It is possible that " +"this installation is not working correctly." +msgstr "" + +#: templates/admin.php:118 +msgid "Locale not working" +msgstr "" + +#: templates/admin.php:123 +msgid "System locale can not be set to a one which supports UTF-8." +msgstr "" + +#: templates/admin.php:127 +msgid "" +"This means that there might be problems with certain characters in file " +"names." +msgstr "" + +#: templates/admin.php:131 +#, php-format +msgid "" +"We strongly suggest to install the required packages on your system to " +"support one of the following locales: %s." +msgstr "" + +#: templates/admin.php:143 +msgid "Internet connection not working" +msgstr "" + +#: templates/admin.php:146 +msgid "" +"This server has no working internet connection. This means that some of the " +"features like mounting of external storage, notifications about updates or " +"installation of 3rd party apps don´t work. Accessing files from remote and " +"sending of notification emails might also not work. We suggest to enable " +"internet connection for this server if you want to have all features." +msgstr "" + +#: templates/admin.php:160 +msgid "Cron" +msgstr "" + +#: templates/admin.php:167 +#, php-format +msgid "Last cron was executed at %s." +msgstr "" + +#: templates/admin.php:170 +#, php-format +msgid "" +"Last cron was executed at %s. This is more than an hour ago, something seems" +" wrong." +msgstr "" + +#: templates/admin.php:174 +msgid "Cron was not executed yet!" +msgstr "" + +#: templates/admin.php:184 +msgid "Execute one task with each page loaded" +msgstr "" + +#: templates/admin.php:192 +msgid "" +"cron.php is registered at a webcron service to call cron.php every 15 " +"minutes over http." +msgstr "" + +#: templates/admin.php:200 +msgid "Use systems cron service to call the cron.php file every 15 minutes." +msgstr "" + +#: templates/admin.php:205 +msgid "Sharing" +msgstr "" + +#: templates/admin.php:211 +msgid "Enable Share API" +msgstr "" + +#: templates/admin.php:212 +msgid "Allow apps to use the Share API" +msgstr "" + +#: templates/admin.php:219 +msgid "Allow links" +msgstr "" + +#: templates/admin.php:220 +msgid "Allow users to share items to the public with links" +msgstr "" + +#: templates/admin.php:227 +msgid "Allow public uploads" +msgstr "" + +#: templates/admin.php:228 +msgid "" +"Allow users to enable others to upload into their publicly shared folders" +msgstr "" + +#: templates/admin.php:235 +msgid "Allow resharing" +msgstr "" + +#: templates/admin.php:236 +msgid "Allow users to share items shared with them again" +msgstr "" + +#: templates/admin.php:243 +msgid "Allow users to share with anyone" +msgstr "" + +#: templates/admin.php:246 +msgid "Allow users to only share with users in their groups" +msgstr "" + +#: templates/admin.php:253 +msgid "Allow mail notification" +msgstr "" + +#: templates/admin.php:254 +msgid "Allow users to send mail notification for shared files" +msgstr "" + +#: templates/admin.php:262 +msgid "Set default expiration date" +msgstr "" + +#: templates/admin.php:263 +msgid "Expire after " +msgstr "" + +#: templates/admin.php:266 +msgid "days" +msgstr "" + +#: templates/admin.php:269 +msgid "Enforce expiration date" +msgstr "" + +#: templates/admin.php:270 +msgid "Expire shares by default after N days" +msgstr "" + +#: templates/admin.php:278 +msgid "Security" +msgstr "" + +#: templates/admin.php:291 +msgid "Enforce HTTPS" +msgstr "" + +#: templates/admin.php:293 +#, php-format +msgid "Forces the clients to connect to %s via an encrypted connection." +msgstr "" + +#: templates/admin.php:299 +#, php-format +msgid "" +"Please connect to your %s via HTTPS to enable or disable the SSL " +"enforcement." +msgstr "" + +#: templates/admin.php:311 +msgid "Email Server" +msgstr "" + +#: templates/admin.php:313 +msgid "This is used for sending out notifications." +msgstr "" + +#: templates/admin.php:344 +msgid "From address" +msgstr "" + +#: templates/admin.php:366 +msgid "Authentication required" +msgstr "" + +#: templates/admin.php:370 +msgid "Server address" +msgstr "" + +#: templates/admin.php:374 +msgid "Port" +msgstr "" + +#: templates/admin.php:379 +msgid "Credentials" +msgstr "" + +#: templates/admin.php:380 +msgid "SMTP Username" +msgstr "" + +#: templates/admin.php:383 +msgid "SMTP Password" +msgstr "" + +#: templates/admin.php:387 +msgid "Test email settings" +msgstr "" + +#: templates/admin.php:388 +msgid "Send email" +msgstr "" + +#: templates/admin.php:393 +msgid "Log" +msgstr "" + +#: templates/admin.php:394 +msgid "Log level" +msgstr "" + +#: templates/admin.php:426 +msgid "More" +msgstr "" + +#: templates/admin.php:427 +msgid "Less" +msgstr "" + +#: templates/admin.php:433 templates/personal.php:202 +msgid "Version" +msgstr "" + +#: templates/admin.php:437 templates/personal.php:205 +msgid "" +"Developed by the <a href=\"http://ownCloud.org/contact\" " +"target=\"_blank\">ownCloud community</a>, the <a " +"href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is " +"licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" " +"target=\"_blank\"><abbr title=\"Affero General Public " +"License\">AGPL</abbr></a>." +msgstr "" + +#: templates/apps.php:14 +msgid "Add your App" +msgstr "" + +#: templates/apps.php:31 +msgid "More Apps" +msgstr "" + +#: templates/apps.php:38 +msgid "Select an App" +msgstr "" + +#: templates/apps.php:43 +msgid "Documentation:" +msgstr "" + +#: templates/apps.php:49 +msgid "See application page at apps.owncloud.com" +msgstr "" + +#: templates/apps.php:51 +msgid "See application website" +msgstr "" + +#: templates/apps.php:53 +msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" +msgstr "" + +#: templates/help.php:6 +msgid "Administrator Documentation" +msgstr "" + +#: templates/help.php:9 +msgid "Online Documentation" +msgstr "" + +#: templates/help.php:11 +msgid "Forum" +msgstr "" + +#: templates/help.php:14 +msgid "Bugtracker" +msgstr "" + +#: templates/help.php:17 +msgid "Commercial Support" +msgstr "" + +#: templates/personal.php:8 +msgid "Get the apps to sync your files" +msgstr "" + +#: templates/personal.php:19 +msgid "Show First Run Wizard again" +msgstr "" + +#: templates/personal.php:27 +#, php-format +msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>" +msgstr "" + +#: templates/personal.php:38 templates/users.php:21 templates/users.php:87 +msgid "Password" +msgstr "" + +#: templates/personal.php:39 +msgid "Your password was changed" +msgstr "" + +#: templates/personal.php:40 +msgid "Unable to change your password" +msgstr "" + +#: templates/personal.php:42 +msgid "Current password" +msgstr "" + +#: templates/personal.php:45 +msgid "New password" +msgstr "" + +#: templates/personal.php:49 +msgid "Change password" +msgstr "" + +#: templates/personal.php:61 templates/users.php:86 +msgid "Full Name" +msgstr "" + +#: templates/personal.php:76 +msgid "Email" +msgstr "" + +#: templates/personal.php:78 +msgid "Your email address" +msgstr "" + +#: templates/personal.php:81 +msgid "" +"Fill in an email address to enable password recovery and receive " +"notifications" +msgstr "" + +#: templates/personal.php:89 +msgid "Profile picture" +msgstr "" + +#: templates/personal.php:94 +msgid "Upload new" +msgstr "" + +#: templates/personal.php:96 +msgid "Select new from Files" +msgstr "" + +#: templates/personal.php:97 +msgid "Remove image" +msgstr "" + +#: templates/personal.php:98 +msgid "Either png or jpg. Ideally square but you will be able to crop it." +msgstr "" + +#: templates/personal.php:100 +msgid "Your avatar is provided by your original account." +msgstr "" + +#: templates/personal.php:104 +msgid "Cancel" +msgstr "" + +#: templates/personal.php:105 +msgid "Choose as profile image" +msgstr "" + +#: templates/personal.php:111 templates/personal.php:112 +msgid "Language" +msgstr "" + +#: templates/personal.php:131 +msgid "Help translate" +msgstr "" + +#: templates/personal.php:137 +msgid "WebDAV" +msgstr "" + +#: templates/personal.php:139 +#, php-format +msgid "" +"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via " +"WebDAV</a>" +msgstr "" + +#: templates/personal.php:156 +msgid "The encryption app is no longer enabled, please decrypt all your files" +msgstr "" + +#: templates/personal.php:162 +msgid "Log-in password" +msgstr "" + +#: templates/personal.php:167 +msgid "Decrypt all Files" +msgstr "" + +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + +#: templates/users.php:19 +msgid "Login Name" +msgstr "" + +#: templates/users.php:28 +msgid "Create" +msgstr "" + +#: templates/users.php:34 +msgid "Admin Recovery Password" +msgstr "" + +#: templates/users.php:35 templates/users.php:36 +msgid "" +"Enter the recovery password in order to recover the users files during " +"password change" +msgstr "" + +#: templates/users.php:40 +msgid "Default Storage" +msgstr "" + +#: templates/users.php:42 templates/users.php:137 +msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" +msgstr "" + +#: templates/users.php:46 templates/users.php:146 +msgid "Unlimited" +msgstr "" + +#: templates/users.php:64 templates/users.php:161 +msgid "Other" +msgstr "" + +#: templates/users.php:85 +msgid "Username" +msgstr "" + +#: templates/users.php:92 +msgid "Storage" +msgstr "" + +#: templates/users.php:106 +msgid "change full name" +msgstr "" + +#: templates/users.php:110 +msgid "set new password" +msgstr "" + +#: templates/users.php:141 +msgid "Default" +msgstr "" diff --git a/l10n/es_UY/user_ldap.po b/l10n/es_UY/user_ldap.po new file mode 100644 index 00000000000..f25bfb85e57 --- /dev/null +++ b/l10n/es_UY/user_ldap.po @@ -0,0 +1,534 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: ownCloud\n" +"Report-Msgid-Bugs-To: translations@owncloud.org\n" +"POT-Creation-Date: 2014-05-10 01:55-0400\n" +"PO-Revision-Date: 2013-04-26 08:02+0000\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: Spanish (Uruguay) (http://www.transifex.com/projects/p/owncloud/language/es_UY/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: es_UY\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ajax/clearMappings.php:34 +msgid "Failed to clear the mappings." +msgstr "" + +#: ajax/deleteConfiguration.php:34 +msgid "Failed to delete the server configuration" +msgstr "" + +#: ajax/testConfiguration.php:39 +msgid "The configuration is valid and the connection could be established!" +msgstr "" + +#: ajax/testConfiguration.php:42 +msgid "" +"The configuration is valid, but the Bind failed. Please check the server " +"settings and credentials." +msgstr "" + +#: ajax/testConfiguration.php:46 +msgid "" +"The configuration is invalid. Please have a look at the logs for further " +"details." +msgstr "" + +#: ajax/wizard.php:32 +msgid "No action specified" +msgstr "" + +#: ajax/wizard.php:38 +msgid "No configuration specified" +msgstr "" + +#: ajax/wizard.php:81 +msgid "No data specified" +msgstr "" + +#: ajax/wizard.php:89 +#, php-format +msgid " Could not set configuration %s" +msgstr "" + +#: js/settings.js:67 +msgid "Deletion failed" +msgstr "" + +#: js/settings.js:83 +msgid "Take over settings from recent server configuration?" +msgstr "" + +#: js/settings.js:84 +msgid "Keep settings?" +msgstr "" + +#: js/settings.js:99 +msgid "Cannot add server configuration" +msgstr "" + +#: js/settings.js:127 +msgid "mappings cleared" +msgstr "" + +#: js/settings.js:128 +msgid "Success" +msgstr "" + +#: js/settings.js:133 +msgid "Error" +msgstr "" + +#: js/settings.js:780 +msgid "Configuration OK" +msgstr "" + +#: js/settings.js:789 +msgid "Configuration incorrect" +msgstr "" + +#: js/settings.js:798 +msgid "Configuration incomplete" +msgstr "" + +#: js/settings.js:815 js/settings.js:824 +msgid "Select groups" +msgstr "" + +#: js/settings.js:818 js/settings.js:827 +msgid "Select object classes" +msgstr "" + +#: js/settings.js:821 +msgid "Select attributes" +msgstr "" + +#: js/settings.js:848 +msgid "Connection test succeeded" +msgstr "" + +#: js/settings.js:855 +msgid "Connection test failed" +msgstr "" + +#: js/settings.js:864 +msgid "Do you really want to delete the current Server Configuration?" +msgstr "" + +#: js/settings.js:865 +msgid "Confirm Deletion" +msgstr "" + +#: lib/wizard.php:79 lib/wizard.php:93 +#, php-format +msgid "%s group found" +msgid_plural "%s groups found" +msgstr[0] "" +msgstr[1] "" + +#: lib/wizard.php:122 +#, php-format +msgid "%s user found" +msgid_plural "%s users found" +msgstr[0] "" +msgstr[1] "" + +#: lib/wizard.php:784 lib/wizard.php:796 +msgid "Invalid Host" +msgstr "" + +#: lib/wizard.php:984 +msgid "Could not find the desired feature" +msgstr "" + +#: templates/part.settingcontrols.php:2 +msgid "Save" +msgstr "" + +#: templates/part.settingcontrols.php:4 +msgid "Test Configuration" +msgstr "" + +#: templates/part.settingcontrols.php:10 templates/part.wizardcontrols.php:14 +msgid "Help" +msgstr "" + +#: templates/part.wizard-groupfilter.php:4 +#, php-format +msgid "Groups meeting these criteria are available in %s:" +msgstr "" + +#: templates/part.wizard-groupfilter.php:8 +#: templates/part.wizard-userfilter.php:8 +msgid "only those object classes:" +msgstr "" + +#: templates/part.wizard-groupfilter.php:17 +#: templates/part.wizard-userfilter.php:17 +msgid "only from those groups:" +msgstr "" + +#: templates/part.wizard-groupfilter.php:25 +#: templates/part.wizard-loginfilter.php:32 +#: templates/part.wizard-userfilter.php:25 +msgid "Edit raw filter instead" +msgstr "" + +#: templates/part.wizard-groupfilter.php:30 +#: templates/part.wizard-loginfilter.php:37 +#: templates/part.wizard-userfilter.php:30 +msgid "Raw LDAP filter" +msgstr "" + +#: templates/part.wizard-groupfilter.php:31 +#, php-format +msgid "" +"The filter specifies which LDAP groups shall have access to the %s instance." +msgstr "" + +#: templates/part.wizard-groupfilter.php:38 +msgid "groups found" +msgstr "" + +#: templates/part.wizard-loginfilter.php:4 +msgid "Users login with this attribute:" +msgstr "" + +#: templates/part.wizard-loginfilter.php:8 +msgid "LDAP Username:" +msgstr "" + +#: templates/part.wizard-loginfilter.php:16 +msgid "LDAP Email Address:" +msgstr "" + +#: templates/part.wizard-loginfilter.php:24 +msgid "Other Attributes:" +msgstr "" + +#: templates/part.wizard-loginfilter.php:38 +#, php-format +msgid "" +"Defines the filter to apply, when login is attempted. %%uid replaces the " +"username in the login action. Example: \"uid=%%uid\"" +msgstr "" + +#: templates/part.wizard-server.php:18 +msgid "Add Server Configuration" +msgstr "" + +#: templates/part.wizard-server.php:30 +msgid "Host" +msgstr "" + +#: templates/part.wizard-server.php:31 +msgid "" +"You can omit the protocol, except you require SSL. Then start with ldaps://" +msgstr "" + +#: templates/part.wizard-server.php:36 +msgid "Port" +msgstr "" + +#: templates/part.wizard-server.php:44 +msgid "User DN" +msgstr "" + +#: templates/part.wizard-server.php:45 +msgid "" +"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." +msgstr "" + +#: templates/part.wizard-server.php:52 +msgid "Password" +msgstr "" + +#: templates/part.wizard-server.php:53 +msgid "For anonymous access, leave DN and Password empty." +msgstr "" + +#: templates/part.wizard-server.php:60 +msgid "One Base DN per line" +msgstr "" + +#: templates/part.wizard-server.php:61 +msgid "You can specify Base DN for users and groups in the Advanced tab" +msgstr "" + +#: templates/part.wizard-userfilter.php:4 +#, php-format +msgid "Limit %s access to users meeting these criteria:" +msgstr "" + +#: templates/part.wizard-userfilter.php:31 +#, php-format +msgid "" +"The filter specifies which LDAP users shall have access to the %s instance." +msgstr "" + +#: templates/part.wizard-userfilter.php:38 +msgid "users found" +msgstr "" + +#: templates/part.wizardcontrols.php:5 +msgid "Back" +msgstr "" + +#: templates/part.wizardcontrols.php:8 +msgid "Continue" +msgstr "" + +#: templates/settings.php:11 +msgid "" +"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may" +" experience unexpected behavior. Please ask your system administrator to " +"disable one of them." +msgstr "" + +#: templates/settings.php:14 +msgid "" +"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not " +"work. Please ask your system administrator to install it." +msgstr "" + +#: templates/settings.php:20 +msgid "Connection Settings" +msgstr "" + +#: templates/settings.php:22 +msgid "Configuration Active" +msgstr "" + +#: templates/settings.php:22 +msgid "When unchecked, this configuration will be skipped." +msgstr "" + +#: templates/settings.php:23 +msgid "Backup (Replica) Host" +msgstr "" + +#: templates/settings.php:23 +msgid "" +"Give an optional backup host. It must be a replica of the main LDAP/AD " +"server." +msgstr "" + +#: templates/settings.php:24 +msgid "Backup (Replica) Port" +msgstr "" + +#: templates/settings.php:25 +msgid "Disable Main Server" +msgstr "" + +#: templates/settings.php:25 +msgid "Only connect to the replica server." +msgstr "" + +#: templates/settings.php:26 +msgid "Case insensitive LDAP server (Windows)" +msgstr "" + +#: templates/settings.php:27 +msgid "Turn off SSL certificate validation." +msgstr "" + +#: templates/settings.php:27 +#, php-format +msgid "" +"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." +msgstr "" + +#: templates/settings.php:28 +msgid "Cache Time-To-Live" +msgstr "" + +#: templates/settings.php:28 +msgid "in seconds. A change empties the cache." +msgstr "" + +#: templates/settings.php:30 +msgid "Directory Settings" +msgstr "" + +#: templates/settings.php:32 +msgid "User Display Name Field" +msgstr "" + +#: templates/settings.php:32 +msgid "The LDAP attribute to use to generate the user's display name." +msgstr "" + +#: templates/settings.php:33 +msgid "Base User Tree" +msgstr "" + +#: templates/settings.php:33 +msgid "One User Base DN per line" +msgstr "" + +#: templates/settings.php:34 +msgid "User Search Attributes" +msgstr "" + +#: templates/settings.php:34 templates/settings.php:37 +msgid "Optional; one attribute per line" +msgstr "" + +#: templates/settings.php:35 +msgid "Group Display Name Field" +msgstr "" + +#: templates/settings.php:35 +msgid "The LDAP attribute to use to generate the groups's display name." +msgstr "" + +#: templates/settings.php:36 +msgid "Base Group Tree" +msgstr "" + +#: templates/settings.php:36 +msgid "One Group Base DN per line" +msgstr "" + +#: templates/settings.php:37 +msgid "Group Search Attributes" +msgstr "" + +#: templates/settings.php:38 +msgid "Group-Member association" +msgstr "" + +#: templates/settings.php:39 +msgid "Nested Groups" +msgstr "" + +#: templates/settings.php:39 +msgid "" +"When switched on, groups that contain groups are supported. (Only works if " +"the group member attribute contains DNs.)" +msgstr "" + +#: templates/settings.php:40 +msgid "Paging chunksize" +msgstr "" + +#: templates/settings.php:40 +msgid "" +"Chunksize used for paged LDAP searches that may return bulky results like " +"user or group enumeration. (Setting it 0 disables paged LDAP searches in " +"those situations.)" +msgstr "" + +#: templates/settings.php:42 +msgid "Special Attributes" +msgstr "" + +#: templates/settings.php:44 +msgid "Quota Field" +msgstr "" + +#: templates/settings.php:45 +msgid "Quota Default" +msgstr "" + +#: templates/settings.php:45 +msgid "in bytes" +msgstr "" + +#: templates/settings.php:46 +msgid "Email Field" +msgstr "" + +#: templates/settings.php:47 +msgid "User Home Folder Naming Rule" +msgstr "" + +#: templates/settings.php:47 +msgid "" +"Leave empty for user name (default). Otherwise, specify an LDAP/AD " +"attribute." +msgstr "" + +#: templates/settings.php:53 +msgid "Internal Username" +msgstr "" + +#: templates/settings.php:54 +msgid "" +"By default the internal username will be created from the UUID attribute. It" +" makes sure that the username is unique and characters do not need to be " +"converted. The internal username has the restriction that only these " +"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced " +"with their ASCII correspondence or simply omitted. On collisions a number " +"will be added/increased. The internal username is used to identify a user " +"internally. It is also the default name for the user home folder. It is also" +" a part of remote URLs, for instance for all *DAV services. With this " +"setting, the default behavior can be overridden. To achieve a similar " +"behavior as before ownCloud 5 enter the user display name attribute in the " +"following field. Leave it empty for default behavior. Changes will have " +"effect only on newly mapped (added) LDAP users." +msgstr "" + +#: templates/settings.php:55 +msgid "Internal Username Attribute:" +msgstr "" + +#: templates/settings.php:56 +msgid "Override UUID detection" +msgstr "" + +#: templates/settings.php:57 +msgid "" +"By default, the UUID attribute is automatically detected. The UUID attribute" +" is used to doubtlessly identify LDAP users and groups. Also, the internal " +"username will be created based on the UUID, if not specified otherwise " +"above. You can override the setting and pass an attribute of your choice. " +"You must make sure that the attribute of your choice can be fetched for both" +" users and groups and it is unique. Leave it empty for default behavior. " +"Changes will have effect only on newly mapped (added) LDAP users and groups." +msgstr "" + +#: templates/settings.php:58 +msgid "UUID Attribute for Users:" +msgstr "" + +#: templates/settings.php:59 +msgid "UUID Attribute for Groups:" +msgstr "" + +#: templates/settings.php:60 +msgid "Username-LDAP User Mapping" +msgstr "" + +#: templates/settings.php:61 +msgid "" +"Usernames are used to store and assign (meta) data. In order to precisely " +"identify and recognize users, each LDAP user will have a internal username. " +"This requires a mapping from username to LDAP user. The created username is " +"mapped to the UUID of the LDAP user. Additionally the DN is cached as well " +"to reduce LDAP interaction, but it is not used for identification. If the DN" +" changes, the changes will be found. The internal username is used all over." +" Clearing the mappings will have leftovers everywhere. Clearing the mappings" +" is not configuration sensitive, it affects all LDAP configurations! Never " +"clear the mappings in a production environment, only in a testing or " +"experimental stage." +msgstr "" + +#: templates/settings.php:62 +msgid "Clear Username-LDAP User Mapping" +msgstr "" + +#: templates/settings.php:62 +msgid "Clear Groupname-LDAP Group Mapping" +msgstr "" diff --git a/l10n/es_UY/user_webdavauth.po b/l10n/es_UY/user_webdavauth.po new file mode 100644 index 00000000000..d6d6f0b54a4 --- /dev/null +++ b/l10n/es_UY/user_webdavauth.po @@ -0,0 +1,33 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: ownCloud\n" +"Report-Msgid-Bugs-To: translations@owncloud.org\n" +"POT-Creation-Date: 2014-05-10 01:55-0400\n" +"PO-Revision-Date: 2012-11-09 09:06+0000\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: Spanish (Uruguay) (http://www.transifex.com/projects/p/owncloud/language/es_UY/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: es_UY\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: templates/settings.php:2 +msgid "WebDAV Authentication" +msgstr "" + +#: templates/settings.php:3 +msgid "Address: " +msgstr "" + +#: templates/settings.php:6 +msgid "" +"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." +msgstr "" diff --git a/l10n/et_EE/core.po b/l10n/et_EE/core.po index 831f23117af..2407bdd6c83 100644 --- a/l10n/et_EE/core.po +++ b/l10n/et_EE/core.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:02+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: pisike.sipelgas <pisike.sipelgas@gmail.com>\n" "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/et_EE/files_external.po b/l10n/et_EE/files_external.po index 63023e87098..c13e1f1f7b1 100644 --- a/l10n/et_EE/files_external.po +++ b/l10n/et_EE/files_external.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n" "MIME-Version: 1.0\n" @@ -199,29 +199,29 @@ msgstr "Viga Google Drive'i salvestusruumi seadistamisel" msgid "Saved" msgstr "Salvestatud" -#: lib/config.php:598 +#: lib/config.php:597 msgid "<b>Note:</b> " msgstr "<b>Märkus:</b>" -#: lib/config.php:608 +#: lib/config.php:607 msgid " and " msgstr "ja" -#: lib/config.php:630 +#: lib/config.php:629 #, php-format msgid "" "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting " "of %s is not possible. Please ask your system administrator to install it." msgstr "<b>Märkus:</b> cURL tugi puudub PHP paigalduses. FTP %s hoidla ühendamine pole võimalik. Palu oma süsteemihalduril paigaldata cURL tugi." -#: lib/config.php:632 +#: lib/config.php:631 #, php-format msgid "" "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of" " %s is not possible. Please ask your system administrator to install it." msgstr "<b>Märkus:</b> FTP tugi puudub PHP paigalduses. FTP %s hoidla ühendamine pole võimalik. Palu oma süsteemihalduril paigaldata FTP tugi." -#: lib/config.php:634 +#: lib/config.php:633 #, php-format msgid "" "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please" diff --git a/l10n/et_EE/files_sharing.po b/l10n/et_EE/files_sharing.po index 3a275271ccc..db936bfcdf1 100644 --- a/l10n/et_EE/files_sharing.po +++ b/l10n/et_EE/files_sharing.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-04 01:55-0400\n" -"PO-Revision-Date: 2014-05-03 06:12+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n" "MIME-Version: 1.0\n" @@ -63,11 +63,11 @@ msgstr "Täpsema info saamiseks palun pöördu lingi saatnud isiku poole." msgid "Download" msgstr "Lae alla" -#: templates/public.php:53 +#: templates/public.php:52 #, php-format msgid "Download %s" msgstr "Laadi alla %s" -#: templates/public.php:57 +#: templates/public.php:56 msgid "Direct link" msgstr "Otsene link" diff --git a/l10n/et_EE/settings.po b/l10n/et_EE/settings.po index 878c48b3baa..145b0f1635f 100644 --- a/l10n/et_EE/settings.po +++ b/l10n/et_EE/settings.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n" "MIME-Version: 1.0\n" @@ -53,7 +53,7 @@ msgstr "Pead seadistama oma e-postienne kui on võimalik saata test-kirju." msgid "Send mode" msgstr "Saatmise viis" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "Krüpteerimine" @@ -100,6 +100,16 @@ msgstr "Ei suutnud faile dekrüpteerida, palun kontrolli oma owncloud.log-i või msgid "Couldn't decrypt your files, check your password and try again" msgstr "Ei suutnud failde dekrüpteerida, kontrolli parooli ja proovi uuesti" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "Kiri on salvestatud" @@ -116,6 +126,16 @@ msgstr "Grupi kustutamine ebaõnnestus" msgid "Unable to delete user" msgstr "Kasutaja kustutamine ebaõnnestus" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "Keel on muudetud" @@ -227,34 +247,42 @@ msgstr "Uuenda" msgid "Updated" msgstr "Uuendatud" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "Vali profiili pilt" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "Väga nõrk parool" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "Nõrk parool" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "Enam-vähem sobiv parool" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "Hea parool" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "Väga hea parool" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "Dekrüpteerin faile... Palun oota, see võib võtta veidi aega." +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "kustutatud" @@ -300,7 +328,7 @@ msgstr "Sisesta nõuetele vastav parool" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "Hoiatus: kasutaja \"{user}\" kodukataloog on juba olemas" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "Eesti" @@ -625,11 +653,11 @@ msgstr "Rohkem" msgid "Less" msgstr "Vähem" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "Versioon" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -793,18 +821,33 @@ msgid "" "WebDAV</a>" msgstr "Kasuta seda aadressi <a href=\"%s\" target=\"_blank\">oma failidele ligipääsuks WebDAV kaudu</a>" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "Küpteeringu rakend pole lubatud, dekrüpteeri kõik oma failid" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "Sisselogimise parool" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "Dekrüpteeri kõik failid" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "Kasutajanimi" diff --git a/l10n/et_EE/user_ldap.po b/l10n/et_EE/user_ldap.po index b156623c15d..3355f56d98c 100644 --- a/l10n/et_EE/user_ldap.po +++ b/l10n/et_EE/user_ldap.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: pisike.sipelgas <pisike.sipelgas@gmail.com>\n" "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/eu/core.po b/l10n/eu/core.po index 68a196b4f55..8c08bca7114 100644 --- a/l10n/eu/core.po +++ b/l10n/eu/core.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-09 01:55-0400\n" -"PO-Revision-Date: 2014-05-08 07:50+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: Hey_neken <mikel@olasagasti.info>\n" "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/eu/files_external.po b/l10n/eu/files_external.po index f8a852c20a2..a8dfe5fd265 100644 --- a/l10n/eu/files_external.po +++ b/l10n/eu/files_external.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-07 01:55-0400\n" -"PO-Revision-Date: 2014-05-06 20:41+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: asieriko <asieriko@gmail.com>\n" "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n" "MIME-Version: 1.0\n" @@ -199,29 +199,29 @@ msgstr "Errore bat egon da Google Drive biltegiratzea konfiguratzean" msgid "Saved" msgstr "Gordeta" -#: lib/config.php:598 +#: lib/config.php:597 msgid "<b>Note:</b> " msgstr "<b>Oharra:</b>" -#: lib/config.php:608 +#: lib/config.php:607 msgid " and " msgstr "eta" -#: lib/config.php:630 +#: lib/config.php:629 #, php-format msgid "" "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting " "of %s is not possible. Please ask your system administrator to install it." msgstr "" -#: lib/config.php:632 +#: lib/config.php:631 #, php-format msgid "" "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of" " %s is not possible. Please ask your system administrator to install it." msgstr "" -#: lib/config.php:634 +#: lib/config.php:633 #, php-format msgid "" "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please" diff --git a/l10n/eu/files_sharing.po b/l10n/eu/files_sharing.po index cf8dabeffd5..05d012c9675 100644 --- a/l10n/eu/files_sharing.po +++ b/l10n/eu/files_sharing.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-07 01:55-0400\n" -"PO-Revision-Date: 2014-05-06 20:30+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: asieriko <asieriko@gmail.com>\n" "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/eu/settings.po b/l10n/eu/settings.po index 9d1c0cbb730..962746ae2da 100644 --- a/l10n/eu/settings.po +++ b/l10n/eu/settings.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-07 01:55-0400\n" -"PO-Revision-Date: 2014-05-06 20:41+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n" "MIME-Version: 1.0\n" @@ -54,7 +54,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "Enkriptazioa" @@ -101,6 +101,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "Eposta gorde da" @@ -117,6 +127,16 @@ msgstr "Ezin izan da taldea ezabatu" msgid "Unable to delete user" msgstr "Ezin izan da erabiltzailea ezabatu" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "Hizkuntza aldatuta" @@ -228,34 +248,42 @@ msgstr "Eguneratu" msgid "Updated" msgstr "Eguneratuta" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "Profil argazkia aukeratu" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "ezabatuta" @@ -301,7 +329,7 @@ msgstr "Baliozko pasahitza eman behar da" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "Abisua: \"{user}\" erabiltzailearen Home karpeta dagoeneko exisititzen da" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "Euskera" @@ -626,11 +654,11 @@ msgstr "Gehiago" msgid "Less" msgstr "Gutxiago" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "Bertsioa" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -794,18 +822,33 @@ msgid "" "WebDAV</a>" msgstr "<a href=\"%s\" target=\"_blank\">helbidea erabili zure fitxategiak WebDAV bidez eskuratzeko</a>" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "Enkriptazio aplikazioa ez dago jada gaiturik, mesedez desenkriptatu zure fitxategi guztiak." -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "Saioa hasteko pasahitza" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "Desenkripattu fitxategi guztiak" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "Sarrera Izena" diff --git a/l10n/eu/user_ldap.po b/l10n/eu/user_ldap.po index 8f64a914310..8067be2ae4d 100644 --- a/l10n/eu/user_ldap.po +++ b/l10n/eu/user_ldap.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/eu_ES/settings.po b/l10n/eu_ES/settings.po index ce42674fd78..9b588cb92d1 100644 --- a/l10n/eu_ES/settings.po +++ b/l10n/eu_ES/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-26 01:54-0400\n" -"PO-Revision-Date: 2014-04-26 05:54+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/owncloud/language/eu_ES/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "" @@ -98,6 +98,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -114,6 +124,16 @@ msgstr "" msgid "Unable to delete user" msgstr "" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "" @@ -225,34 +245,42 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "" @@ -298,7 +326,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "" @@ -623,11 +651,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -791,18 +819,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "" diff --git a/l10n/fa/core.po b/l10n/fa/core.po index b07c52a0f28..ba263522ce7 100644 --- a/l10n/fa/core.po +++ b/l10n/fa/core.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:02+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/fa/files_external.po b/l10n/fa/files_external.po index cb18f4be7df..bd7c31e23e8 100644 --- a/l10n/fa/files_external.po +++ b/l10n/fa/files_external.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n" "MIME-Version: 1.0\n" @@ -198,29 +198,29 @@ msgstr "خطا به هنگام تنظیم Ùضای Google Drive" msgid "Saved" msgstr "" -#: lib/config.php:598 +#: lib/config.php:597 msgid "<b>Note:</b> " msgstr "" -#: lib/config.php:608 +#: lib/config.php:607 msgid " and " msgstr "" -#: lib/config.php:630 +#: lib/config.php:629 #, php-format msgid "" "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting " "of %s is not possible. Please ask your system administrator to install it." msgstr "" -#: lib/config.php:632 +#: lib/config.php:631 #, php-format msgid "" "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of" " %s is not possible. Please ask your system administrator to install it." msgstr "" -#: lib/config.php:634 +#: lib/config.php:633 #, php-format msgid "" "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please" diff --git a/l10n/fa/files_sharing.po b/l10n/fa/files_sharing.po index 4629b775c16..f4af5069c9a 100644 --- a/l10n/fa/files_sharing.po +++ b/l10n/fa/files_sharing.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-04 01:55-0400\n" -"PO-Revision-Date: 2014-05-03 06:12+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n" "MIME-Version: 1.0\n" @@ -62,11 +62,11 @@ msgstr "" msgid "Download" msgstr "دانلود" -#: templates/public.php:53 +#: templates/public.php:52 #, php-format msgid "Download %s" msgstr "" -#: templates/public.php:57 +#: templates/public.php:56 msgid "Direct link" msgstr "" diff --git a/l10n/fa/settings.po b/l10n/fa/settings.po index 5599402145f..48968e563ee 100644 --- a/l10n/fa/settings.po +++ b/l10n/fa/settings.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n" "MIME-Version: 1.0\n" @@ -54,7 +54,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "رمزگذاری" @@ -101,6 +101,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "ایمیل ذخیره شد" @@ -117,6 +127,16 @@ msgstr "Øذ٠گروه امکان پذیر نیست" msgid "Unable to delete user" msgstr "Øذ٠کاربر امکان پذیر نیست" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "زبان تغییر کرد" @@ -228,34 +248,42 @@ msgstr "به روز رسانی" msgid "Updated" msgstr "بروز رسانی انجام شد" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "انتخاب تصویر پروÙایل" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "در Øال بازگشایی رمز Ùایل‌ها... لطÙاً صبر نمایید. این امر ممکن است مدتی زمان ببرد." +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "Øذ٠شده" @@ -301,7 +329,7 @@ msgstr "رمز عبور صØÛŒØ Ø¨Ø§ÛŒØ¯ وارد شود" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "اخطار: پوشه‌ی خانه برای کاربر \"{user}\" در Øال Øاضر وجود دارد" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "__language_name__" @@ -626,11 +654,11 @@ msgstr "بیش‌تر" msgid "Less" msgstr "کم‌تر" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "نسخه" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -794,18 +822,33 @@ msgid "" "WebDAV</a>" msgstr "از این آدرس استÙاده کنید تا <a href=\"%s\" target=\"_blank\">بتوانید به Ùایل‌های خود توسط WebDAV دسترسی پیدا کنید</a>" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "رمز ورود" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "تمام Ùایلها رمزگشایی شود" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "نام کاربری" diff --git a/l10n/fa/user_ldap.po b/l10n/fa/user_ldap.po index c72973ce0b2..96bd939c827 100644 --- a/l10n/fa/user_ldap.po +++ b/l10n/fa/user_ldap.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/fi_FI/core.po b/l10n/fi_FI/core.po index 277f6de7866..ab2ca35f0cf 100644 --- a/l10n/fi_FI/core.po +++ b/l10n/fi_FI/core.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:02+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/fi_FI/files_external.po b/l10n/fi_FI/files_external.po index a46743cda15..9e69e04be70 100644 --- a/l10n/fi_FI/files_external.po +++ b/l10n/fi_FI/files_external.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n" "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n" "MIME-Version: 1.0\n" @@ -198,29 +198,29 @@ msgstr "Virhe Google Drive levyn asetuksia tehtäessä" msgid "Saved" msgstr "Tallennettu" -#: lib/config.php:598 +#: lib/config.php:597 msgid "<b>Note:</b> " msgstr "<b>Huomio:</b> " -#: lib/config.php:608 +#: lib/config.php:607 msgid " and " msgstr "ja" -#: lib/config.php:630 +#: lib/config.php:629 #, php-format msgid "" "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting " "of %s is not possible. Please ask your system administrator to install it." msgstr "<b>Huomio:</b> PHP:n cURL-tuki ei ole käytössä tai sitä ei ole asennettu. Kohteen %s liittäminen ei ole mahdollista. Pyydä järjestelmän ylläpitäjää ottamaan cURL-tuki käyttöön." -#: lib/config.php:632 +#: lib/config.php:631 #, php-format msgid "" "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of" " %s is not possible. Please ask your system administrator to install it." msgstr "<b>Huomio:</b> PHP:n FTP-tuki ei ole käytössä tai sitä ei ole asennettu. Kohteen %s liittäminen ei ole mahdollista. Pyydä järjestelmän ylläpitäjää ottamaan FTP-tuki käyttöön." -#: lib/config.php:634 +#: lib/config.php:633 #, php-format msgid "" "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please" diff --git a/l10n/fi_FI/files_sharing.po b/l10n/fi_FI/files_sharing.po index 0e5f159e745..80a6e8f4a26 100644 --- a/l10n/fi_FI/files_sharing.po +++ b/l10n/fi_FI/files_sharing.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-04 01:55-0400\n" -"PO-Revision-Date: 2014-05-03 06:12+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n" "MIME-Version: 1.0\n" @@ -62,11 +62,11 @@ msgstr "Kysy lisätietoja henkilöltä, jolta sait linkin." msgid "Download" msgstr "Lataa" -#: templates/public.php:53 +#: templates/public.php:52 #, php-format msgid "Download %s" msgstr "Lataa %s" -#: templates/public.php:57 +#: templates/public.php:56 msgid "Direct link" msgstr "Suora linkki" diff --git a/l10n/fi_FI/settings.po b/l10n/fi_FI/settings.po index df0802f9aae..d08fd530c05 100644 --- a/l10n/fi_FI/settings.po +++ b/l10n/fi_FI/settings.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 09:59+0000\n" -"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" +"Last-Translator: I Robot\n" "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -52,7 +52,7 @@ msgstr "Aseta sähköpostiosoite, jotta voit testata sähköpostin toimivuutta." msgid "Send mode" msgstr "Lähetystila" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "Salaus" @@ -99,6 +99,16 @@ msgstr "Tiedostojen salauksen purkaminen epäonnistui. Tarkista owncloud.log-tie msgid "Couldn't decrypt your files, check your password and try again" msgstr "Tiedostojen salauksen purkaminen epäonnistui. Tarkista salasanasi ja yritä uudelleen" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "Sähköposti tallennettu" @@ -115,6 +125,16 @@ msgstr "Ryhmän poisto epäonnistui" msgid "Unable to delete user" msgstr "Käyttäjän poisto epäonnistui" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "Kieli on vaihdettu" @@ -226,34 +246,42 @@ msgstr "Päivitä" msgid "Updated" msgstr "Päivitetty" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "Valitse profiilikuva" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "Erittäin heikko salasana" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "Heikko salasana" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "Kohtalainen salasana" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "Hyvä salasana" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "Vahva salasana" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "Puretaan tiedostojen salausta... Odota, tämä voi kestää jonkin aikaa." +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "poistettu" @@ -299,7 +327,7 @@ msgstr "Anna kelvollinen salasana" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "Varoitus: käyttäjällä \"{user}\" on jo olemassa kotikansio" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "_kielen_nimi_" @@ -624,11 +652,11 @@ msgstr "Enemmän" msgid "Less" msgstr "Vähemmän" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "Versio" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -792,18 +820,33 @@ msgid "" "WebDAV</a>" msgstr "Käytä tätä osoitetta <a href=\"%s\" target=\"_blank\">käyttääksesi tiedostojasi WebDAVin kautta</a>" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "Salaussovellus ei ole enää käytössä, joten pura kaikkien tiedostojesi salaus" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "Kirjautumissalasana" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "Pura kaikkien tiedostojen salaus" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "Kirjautumisnimi" diff --git a/l10n/fi_FI/user_ldap.po b/l10n/fi_FI/user_ldap.po index fc226db0955..bc398f5266e 100644 --- a/l10n/fi_FI/user_ldap.po +++ b/l10n/fi_FI/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 09:59+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/fr/core.po b/l10n/fr/core.po index ff8ddd4492c..f9a37f63862 100644 --- a/l10n/fr/core.po +++ b/l10n/fr/core.po @@ -15,8 +15,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:02+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/fr/files_external.po b/l10n/fr/files_external.po index b0df2811d38..2997ac39137 100644 --- a/l10n/fr/files_external.po +++ b/l10n/fr/files_external.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 11:49+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: ptit_boogy <ptit.boogy@gmail.com>\n" "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n" "MIME-Version: 1.0\n" @@ -200,29 +200,29 @@ msgstr "Erreur lors de la configuration du support de stockage Google Drive" msgid "Saved" msgstr "Sauvegarder" -#: lib/config.php:598 +#: lib/config.php:597 msgid "<b>Note:</b> " msgstr "<b>Attention :</b>" -#: lib/config.php:608 +#: lib/config.php:607 msgid " and " msgstr "et" -#: lib/config.php:630 +#: lib/config.php:629 #, php-format msgid "" "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting " "of %s is not possible. Please ask your system administrator to install it." msgstr "<b>Attention :</b> Le support de cURL de PHP n'est pas activé ou installé. Le montage de %s n'est pas possible. Contactez votre administrateur système pour l'installer." -#: lib/config.php:632 +#: lib/config.php:631 #, php-format msgid "" "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of" " %s is not possible. Please ask your system administrator to install it." msgstr "<b>Attention : </b> Le support FTP de PHP n'est pas activé ou installé. Le montage de %s n'est pas possible. Contactez votre administrateur système pour l'installer." -#: lib/config.php:634 +#: lib/config.php:633 #, php-format msgid "" "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please" diff --git a/l10n/fr/files_sharing.po b/l10n/fr/files_sharing.po index cc538116e13..f1f702ad5ed 100644 --- a/l10n/fr/files_sharing.po +++ b/l10n/fr/files_sharing.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-04 01:55-0400\n" -"PO-Revision-Date: 2014-05-03 06:12+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n" "MIME-Version: 1.0\n" @@ -65,11 +65,11 @@ msgstr "Pour plus d'informations, veuillez contacter la personne qui a envoyé c msgid "Download" msgstr "Télécharger" -#: templates/public.php:53 +#: templates/public.php:52 #, php-format msgid "Download %s" msgstr "Télécharger %s" -#: templates/public.php:57 +#: templates/public.php:56 msgid "Direct link" msgstr "Lien direct" diff --git a/l10n/fr/settings.po b/l10n/fr/settings.po index 244790b6b21..110a55e4ae0 100644 --- a/l10n/fr/settings.po +++ b/l10n/fr/settings.po @@ -19,9 +19,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-01 01:55-0400\n" -"PO-Revision-Date: 2014-04-30 06:40+0000\n" -"Last-Translator: ptit_boogy <ptit.boogy@gmail.com>\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" +"Last-Translator: I Robot\n" "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -63,7 +63,7 @@ msgstr "Vous devez configurer votre e-mail d'utilisateur avant de pouvoir envoye msgid "Send mode" msgstr "Mode d'envoi" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "Chiffrement" @@ -110,6 +110,16 @@ msgstr "Impossible de décrypter vos fichiers, veuillez vérifier votre owncloud msgid "Couldn't decrypt your files, check your password and try again" msgstr "Impossible de décrypter vos fichiers, vérifiez votre mot de passe et essayez à nouveau" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "E-mail sauvegardé" @@ -126,6 +136,16 @@ msgstr "Impossible de supprimer le groupe" msgid "Unable to delete user" msgstr "Impossible de supprimer l'utilisateur" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "Langue changée" @@ -237,34 +257,42 @@ msgstr "Mettre à jour" msgid "Updated" msgstr "Mise à jour effectuée avec succès" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "Selectionner une photo de profil " -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "Mot de passe de très faible sécurité" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "Mot de passe de faible sécurité" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "Mot de passe de sécurité tout juste acceptable" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "Mot de passe de sécurité suffisante" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "Mot de passe de forte sécurité" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "Déchiffrement en cours... Cela peut prendre un certain temps." +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "supprimé" @@ -310,7 +338,7 @@ msgstr "Un mot de passe valide doit être saisi" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "Attention : Le dossier Home pour l'utilisateur \"{user}\" existe déjà " -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "Français" @@ -635,11 +663,11 @@ msgstr "Plus" msgid "Less" msgstr "Moins" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "Version" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -803,18 +831,33 @@ msgid "" "WebDAV</a>" msgstr "Utiliser cette adresse pour <a href=\"%s\" target=\"_blank\"> accéder à vos fichiers par WebDAV</a>" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "L'app de chiffrement n’est plus activée, veuillez déchiffrer tous vos fichiers" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "Mot de passe de connexion" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "Déchiffrer tous les fichiers" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "Nom d'utilisateur" diff --git a/l10n/fr/user_ldap.po b/l10n/fr/user_ldap.po index 8b9bc24183c..caa3665f5b4 100644 --- a/l10n/fr/user_ldap.po +++ b/l10n/fr/user_ldap.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: RyDroid <rydroid_trans@yahoo.fr>\n" "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/fr_CA/settings.po b/l10n/fr_CA/settings.po index 951ff58a54c..5db75bf8c1f 100644 --- a/l10n/fr_CA/settings.po +++ b/l10n/fr_CA/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-26 01:54-0400\n" -"PO-Revision-Date: 2014-04-26 05:54+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: French (Canada) (http://www.transifex.com/projects/p/owncloud/language/fr_CA/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "" @@ -98,6 +98,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -114,6 +124,16 @@ msgstr "" msgid "Unable to delete user" msgstr "" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "" @@ -225,34 +245,42 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "" @@ -298,7 +326,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "" @@ -623,11 +651,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -791,18 +819,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "" diff --git a/l10n/gl/core.po b/l10n/gl/core.po index d1a58fca05c..8a0e9a4c294 100644 --- a/l10n/gl/core.po +++ b/l10n/gl/core.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 09:59+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/gl/files_external.po b/l10n/gl/files_external.po index bce563e0943..e50d62889c5 100644 --- a/l10n/gl/files_external.po +++ b/l10n/gl/files_external.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 09:59+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: mbouzada <mbouzada@gmail.com>\n" "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n" "MIME-Version: 1.0\n" @@ -198,29 +198,29 @@ msgstr "Produciuse un erro ao configurar o almacenamento en Google Drive" msgid "Saved" msgstr "Gardado" -#: lib/config.php:598 +#: lib/config.php:597 msgid "<b>Note:</b> " msgstr "<b>Nota:</b> " -#: lib/config.php:608 +#: lib/config.php:607 msgid " and " msgstr "e" -#: lib/config.php:630 +#: lib/config.php:629 #, php-format msgid "" "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting " "of %s is not possible. Please ask your system administrator to install it." msgstr "<b>Nota:</b> A compatibilidade de cURL en PHP non está activada, ou non está instalado. Non é posÃbel a montaxe de %s. Consulte co administrador do sistema como instalalo." -#: lib/config.php:632 +#: lib/config.php:631 #, php-format msgid "" "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of" " %s is not possible. Please ask your system administrator to install it." msgstr "<b>Nota:</b> A compatibilidade de FTP en PHP non está activada, ou non está instalado. Non é posÃbel a montaxe de %s. Consulte co administrador do sistema como instalalo." -#: lib/config.php:634 +#: lib/config.php:633 #, php-format msgid "" "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please" diff --git a/l10n/gl/files_sharing.po b/l10n/gl/files_sharing.po index f51fc31940f..aa751ae3dfb 100644 --- a/l10n/gl/files_sharing.po +++ b/l10n/gl/files_sharing.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-04 01:55-0400\n" -"PO-Revision-Date: 2014-05-03 06:12+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n" "MIME-Version: 1.0\n" @@ -63,11 +63,11 @@ msgstr "Para obter máis información, pregúntelle á persoa que lle enviou a l msgid "Download" msgstr "Descargar" -#: templates/public.php:53 +#: templates/public.php:52 #, php-format msgid "Download %s" msgstr "Descargar %s" -#: templates/public.php:57 +#: templates/public.php:56 msgid "Direct link" msgstr "Ligazón directa" diff --git a/l10n/gl/settings.po b/l10n/gl/settings.po index 1a4f0d205f5..6316b5a4d03 100644 --- a/l10n/gl/settings.po +++ b/l10n/gl/settings.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 09:59+0000\n" -"Last-Translator: mbouzada <mbouzada@gmail.com>\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" +"Last-Translator: I Robot\n" "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -53,7 +53,7 @@ msgstr "É necesario configurar o correo do usuario antes de poder enviar mensax msgid "Send mode" msgstr "Modo de envÃo" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "Cifrado" @@ -100,6 +100,16 @@ msgstr "Non foi posÃbel descifrar os seus ficheiros. revise o ficheiro de rexis msgid "Couldn't decrypt your files, check your password and try again" msgstr "Non foi posÃbel descifrar os seus ficheiros. revise o seu contrasinal e ténteo de novo" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "Correo gardado" @@ -116,6 +126,16 @@ msgstr "Non é posÃbel eliminar o grupo." msgid "Unable to delete user" msgstr "Non é posÃbel eliminar o usuario" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "O idioma cambiou" @@ -227,34 +247,42 @@ msgstr "Actualizar" msgid "Updated" msgstr "Actualizado" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "Seleccione unha imaxe para o perfil" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "Contrasinal moi feble" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "Contrasinal feble" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "Contrasinal non moi aló" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "Bo contrasinal" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "Contrasinal forte" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "Descifrando ficheiros... isto pode levar un anaco." +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "eliminado" @@ -300,7 +328,7 @@ msgstr "Debe fornecer un contrasinal" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "Aviso: O directorio persoal para o usuario «{user}» xa existe" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "Galego" @@ -625,11 +653,11 @@ msgstr "Máis" msgid "Less" msgstr "Menos" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "Versión" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -793,18 +821,33 @@ msgid "" "WebDAV</a>" msgstr "Empregue esta ligazón <a href=\"%s\" target=\"_blank\">para acceder aos sus ficheiros mediante WebDAV</a>" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "O aplicativo de cifrado non está activado, descifre todos os ficheiros" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "Contrasinal de acceso" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "Descifrar todos os ficheiros" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "Nome de acceso" diff --git a/l10n/gl/user_ldap.po b/l10n/gl/user_ldap.po index 8a61171fc30..4b1feb89848 100644 --- a/l10n/gl/user_ldap.po +++ b/l10n/gl/user_ldap.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 09:59+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: mbouzada <mbouzada@gmail.com>\n" "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/he/core.po b/l10n/he/core.po index 0c1bcd3e2b9..7a38476adfc 100644 --- a/l10n/he/core.po +++ b/l10n/he/core.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:02+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/he/files_external.po b/l10n/he/files_external.po index f108a6be95f..d928b0e7b00 100644 --- a/l10n/he/files_external.po +++ b/l10n/he/files_external.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n" "MIME-Version: 1.0\n" @@ -197,29 +197,29 @@ msgstr "×ירעה שגי××” בעת הגדרת ×חסון ב־Google Drive" msgid "Saved" msgstr "" -#: lib/config.php:598 +#: lib/config.php:597 msgid "<b>Note:</b> " msgstr "" -#: lib/config.php:608 +#: lib/config.php:607 msgid " and " msgstr "" -#: lib/config.php:630 +#: lib/config.php:629 #, php-format msgid "" "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting " "of %s is not possible. Please ask your system administrator to install it." msgstr "" -#: lib/config.php:632 +#: lib/config.php:631 #, php-format msgid "" "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of" " %s is not possible. Please ask your system administrator to install it." msgstr "" -#: lib/config.php:634 +#: lib/config.php:633 #, php-format msgid "" "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please" diff --git a/l10n/he/files_sharing.po b/l10n/he/files_sharing.po index 6d584900a50..789a4cc5ff4 100644 --- a/l10n/he/files_sharing.po +++ b/l10n/he/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-04 01:55-0400\n" -"PO-Revision-Date: 2014-05-03 06:11+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n" "MIME-Version: 1.0\n" @@ -61,11 +61,11 @@ msgstr "" msgid "Download" msgstr "הורדה" -#: templates/public.php:53 +#: templates/public.php:52 #, php-format msgid "Download %s" msgstr "" -#: templates/public.php:57 +#: templates/public.php:56 msgid "Direct link" msgstr "" diff --git a/l10n/he/settings.po b/l10n/he/settings.po index 25c79823311..713c768cdb6 100644 --- a/l10n/he/settings.po +++ b/l10n/he/settings.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n" "MIME-Version: 1.0\n" @@ -52,7 +52,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "×”×¦×¤× ×”" @@ -99,6 +99,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "הדו×״ל × ×©×ž×¨" @@ -115,6 +125,16 @@ msgstr "×œ× × ×™×ª×Ÿ למחוק ×ת הקבוצה" msgid "Unable to delete user" msgstr "×œ× × ×™×ª×Ÿ למחוק ×ת המשתמש" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "שפה ×”×©×ª× ×ª×”" @@ -226,34 +246,42 @@ msgstr "עדכון" msgid "Updated" msgstr "מעודכן" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "× ×ž×—×§" @@ -299,7 +327,7 @@ msgstr "יש לספק ססמה ×ª×§× ×™×ª" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "עברית" @@ -624,11 +652,11 @@ msgstr "יותר" msgid "Less" msgstr "פחות" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "גרס×" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -792,18 +820,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "×©× ×›× ×™×¡×”" diff --git a/l10n/he/user_ldap.po b/l10n/he/user_ldap.po index 8b3b7cf4ecf..a6229644845 100644 --- a/l10n/he/user_ldap.po +++ b/l10n/he/user_ldap.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/hi/core.po b/l10n/hi/core.po index 4473eb226f6..466aa3fb2ee 100644 --- a/l10n/hi/core.po +++ b/l10n/hi/core.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:02+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/hi/files_external.po b/l10n/hi/files_external.po index 04f3394a004..77d87c1f283 100644 --- a/l10n/hi/files_external.po +++ b/l10n/hi/files_external.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n" "MIME-Version: 1.0\n" @@ -197,29 +197,29 @@ msgstr "" msgid "Saved" msgstr "" -#: lib/config.php:598 +#: lib/config.php:597 msgid "<b>Note:</b> " msgstr "" -#: lib/config.php:608 +#: lib/config.php:607 msgid " and " msgstr "" -#: lib/config.php:630 +#: lib/config.php:629 #, php-format msgid "" "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting " "of %s is not possible. Please ask your system administrator to install it." msgstr "" -#: lib/config.php:632 +#: lib/config.php:631 #, php-format msgid "" "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of" " %s is not possible. Please ask your system administrator to install it." msgstr "" -#: lib/config.php:634 +#: lib/config.php:633 #, php-format msgid "" "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please" diff --git a/l10n/hi/files_sharing.po b/l10n/hi/files_sharing.po index 30d97d9bab6..0b20669aece 100644 --- a/l10n/hi/files_sharing.po +++ b/l10n/hi/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-03 01:55-0400\n" -"PO-Revision-Date: 2014-05-03 05:55+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n" "MIME-Version: 1.0\n" @@ -61,11 +61,11 @@ msgstr "" msgid "Download" msgstr "" -#: templates/public.php:53 +#: templates/public.php:52 #, php-format msgid "Download %s" msgstr "" -#: templates/public.php:57 +#: templates/public.php:56 msgid "Direct link" msgstr "" diff --git a/l10n/hi/settings.po b/l10n/hi/settings.po index a9baff8ff4c..d6f29585089 100644 --- a/l10n/hi/settings.po +++ b/l10n/hi/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "" @@ -98,6 +98,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -114,6 +124,16 @@ msgstr "" msgid "Unable to delete user" msgstr "" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "" @@ -225,34 +245,42 @@ msgstr "अदà¥à¤¯à¤¤à¤¨" msgid "Updated" msgstr "" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "" @@ -298,7 +326,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "" @@ -623,11 +651,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -791,18 +819,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "" diff --git a/l10n/hi/user_ldap.po b/l10n/hi/user_ldap.po index 160ec120ad8..940faf5c6fe 100644 --- a/l10n/hi/user_ldap.po +++ b/l10n/hi/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/hi_IN/settings.po b/l10n/hi_IN/settings.po index 148419f9261..638580cdb7e 100644 --- a/l10n/hi_IN/settings.po +++ b/l10n/hi_IN/settings.po @@ -7,9 +7,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2013-04-26 08:00+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" +"Last-Translator: I Robot\n" "Language-Team: Hindi (India) (http://www.transifex.com/projects/p/owncloud/language/hi_IN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "" @@ -98,6 +98,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -114,6 +124,16 @@ msgstr "" msgid "Unable to delete user" msgstr "" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "" @@ -225,34 +245,42 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "" @@ -298,7 +326,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "" @@ -623,11 +651,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -791,18 +819,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "" diff --git a/l10n/hr/core.po b/l10n/hr/core.po index 451dd20c3d2..71a6ffff171 100644 --- a/l10n/hr/core.po +++ b/l10n/hr/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:02+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/hr/files_external.po b/l10n/hr/files_external.po index 9c56b0b0cd8..cc96b2ae056 100644 --- a/l10n/hr/files_external.po +++ b/l10n/hr/files_external.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:10+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n" "MIME-Version: 1.0\n" @@ -197,29 +197,29 @@ msgstr "" msgid "Saved" msgstr "" -#: lib/config.php:598 +#: lib/config.php:597 msgid "<b>Note:</b> " msgstr "" -#: lib/config.php:608 +#: lib/config.php:607 msgid " and " msgstr "" -#: lib/config.php:630 +#: lib/config.php:629 #, php-format msgid "" "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting " "of %s is not possible. Please ask your system administrator to install it." msgstr "" -#: lib/config.php:632 +#: lib/config.php:631 #, php-format msgid "" "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of" " %s is not possible. Please ask your system administrator to install it." msgstr "" -#: lib/config.php:634 +#: lib/config.php:633 #, php-format msgid "" "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please" diff --git a/l10n/hr/files_sharing.po b/l10n/hr/files_sharing.po index 61ea14d6465..f48c260468a 100644 --- a/l10n/hr/files_sharing.po +++ b/l10n/hr/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-04 01:55-0400\n" -"PO-Revision-Date: 2014-05-03 06:12+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n" "MIME-Version: 1.0\n" @@ -61,11 +61,11 @@ msgstr "" msgid "Download" msgstr "Preuzimanje" -#: templates/public.php:53 +#: templates/public.php:52 #, php-format msgid "Download %s" msgstr "" -#: templates/public.php:57 +#: templates/public.php:56 msgid "Direct link" msgstr "" diff --git a/l10n/hr/settings.po b/l10n/hr/settings.po index 2adeb872451..4efb1c3b409 100644 --- a/l10n/hr/settings.po +++ b/l10n/hr/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "" @@ -98,6 +98,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "Email spremljen" @@ -114,6 +124,16 @@ msgstr "" msgid "Unable to delete user" msgstr "" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "Jezik promijenjen" @@ -225,34 +245,42 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "izbrisano" @@ -298,7 +326,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "__ime_jezika__" @@ -623,11 +651,11 @@ msgstr "viÅ¡e" msgid "Less" msgstr "" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -791,18 +819,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "Prijava" diff --git a/l10n/hr/user_ldap.po b/l10n/hr/user_ldap.po index d109f42db8b..604b9f95eb7 100644 --- a/l10n/hr/user_ldap.po +++ b/l10n/hr/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/hu_HU/core.po b/l10n/hu_HU/core.po index d59e9bcc35c..5e59b299f93 100644 --- a/l10n/hu_HU/core.po +++ b/l10n/hu_HU/core.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:02+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:01+0000\n" "Last-Translator: aries1980 <feher.janos@mindworks.hu>\n" "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/hu_HU/files_external.po b/l10n/hu_HU/files_external.po index ffa1c9e20c2..ca7bfe83d6b 100644 --- a/l10n/hu_HU/files_external.po +++ b/l10n/hu_HU/files_external.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n" "MIME-Version: 1.0\n" @@ -198,29 +198,29 @@ msgstr "A Google Drive tárolót nem sikerült beállÃtani" msgid "Saved" msgstr "Elmentve" -#: lib/config.php:598 +#: lib/config.php:597 msgid "<b>Note:</b> " msgstr "" -#: lib/config.php:608 +#: lib/config.php:607 msgid " and " msgstr "" -#: lib/config.php:630 +#: lib/config.php:629 #, php-format msgid "" "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting " "of %s is not possible. Please ask your system administrator to install it." msgstr "" -#: lib/config.php:632 +#: lib/config.php:631 #, php-format msgid "" "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of" " %s is not possible. Please ask your system administrator to install it." msgstr "" -#: lib/config.php:634 +#: lib/config.php:633 #, php-format msgid "" "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please" diff --git a/l10n/hu_HU/files_sharing.po b/l10n/hu_HU/files_sharing.po index 5f7118543ea..5e18df9e110 100644 --- a/l10n/hu_HU/files_sharing.po +++ b/l10n/hu_HU/files_sharing.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-04 01:55-0400\n" -"PO-Revision-Date: 2014-05-03 06:11+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n" "MIME-Version: 1.0\n" @@ -62,11 +62,11 @@ msgstr "További információért forduljon ahhoz, aki ezt a linket küldte Önn msgid "Download" msgstr "Letöltés" -#: templates/public.php:53 +#: templates/public.php:52 #, php-format msgid "Download %s" msgstr "" -#: templates/public.php:57 +#: templates/public.php:56 msgid "Direct link" msgstr "Közvetlen link" diff --git a/l10n/hu_HU/settings.po b/l10n/hu_HU/settings.po index c35c140aea7..5fc29a27b06 100644 --- a/l10n/hu_HU/settings.po +++ b/l10n/hu_HU/settings.po @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" -"Last-Translator: ebela <bela@dandre.hu>\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" +"Last-Translator: I Robot\n" "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -55,7 +55,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "TitkosÃtás" @@ -102,6 +102,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "Email mentve" @@ -118,6 +128,16 @@ msgstr "A csoport nem törölhetÅ‘" msgid "Unable to delete user" msgstr "A felhasználó nem törölhetÅ‘" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "A nyelv megváltozott" @@ -229,34 +249,42 @@ msgstr "FrissÃtés" msgid "Updated" msgstr "FrissÃtve" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "Válassz profil képet" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "Nagyon gyenge jelszó" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "Gyenge jelszó" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "Nem túl jó jelszó" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "Jó jelszó" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "ErÅ‘s jelszó" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "File-ok kititkosÃtása folyamatban... Kérlek várj, ez hosszabb ideig is eltarthat ..." +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "törölve" @@ -302,7 +330,7 @@ msgstr "Érvényes jelszót kell megadnia" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "Figyelmeztetés: A felhasználó \"{user}\" kezdÅ‘ könyvtára már létezett" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "__language_name__" @@ -627,11 +655,11 @@ msgstr "Több" msgid "Less" msgstr "Kevesebb" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "Verzió" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -795,18 +823,33 @@ msgid "" "WebDAV</a>" msgstr "Ezt a cÃmet használd, hogy <a href=\"%s\" target=\"_blank\">hozzáférj a fileokhoz WebDAV-on keresztül</a>" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "A titkosÃtó alkalmazás továbbiakban nem lesz engedélyezve, szüntesd meg a titkosÃtását a file-jaidnak." -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "Bejelentkezési jelszó" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "KititkosÃtja az összes file-t" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "Bejelentkezési név" diff --git a/l10n/hu_HU/user_ldap.po b/l10n/hu_HU/user_ldap.po index 7c9c530c63a..649c0426d9b 100644 --- a/l10n/hu_HU/user_ldap.po +++ b/l10n/hu_HU/user_ldap.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: ebela <bela@dandre.hu>\n" "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/hy/settings.po b/l10n/hy/settings.po index b80e564d9e5..9349848ce19 100644 --- a/l10n/hy/settings.po +++ b/l10n/hy/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-26 01:54-0400\n" -"PO-Revision-Date: 2014-04-26 05:54+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "" @@ -98,6 +98,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -114,6 +124,16 @@ msgstr "" msgid "Unable to delete user" msgstr "" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "" @@ -225,34 +245,42 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "" @@ -298,7 +326,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "" @@ -623,11 +651,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -791,18 +819,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "" diff --git a/l10n/ia/core.po b/l10n/ia/core.po index 7e373705a73..af29b28bc7b 100644 --- a/l10n/ia/core.po +++ b/l10n/ia/core.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:02+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: giogio <g.sora@tiscali.it>\n" "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/ia/files_external.po b/l10n/ia/files_external.po index ee4c065513e..ff59fc01440 100644 --- a/l10n/ia/files_external.po +++ b/l10n/ia/files_external.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:10+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n" "MIME-Version: 1.0\n" @@ -197,29 +197,29 @@ msgstr "" msgid "Saved" msgstr "" -#: lib/config.php:598 +#: lib/config.php:597 msgid "<b>Note:</b> " msgstr "" -#: lib/config.php:608 +#: lib/config.php:607 msgid " and " msgstr "" -#: lib/config.php:630 +#: lib/config.php:629 #, php-format msgid "" "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting " "of %s is not possible. Please ask your system administrator to install it." msgstr "" -#: lib/config.php:632 +#: lib/config.php:631 #, php-format msgid "" "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of" " %s is not possible. Please ask your system administrator to install it." msgstr "" -#: lib/config.php:634 +#: lib/config.php:633 #, php-format msgid "" "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please" diff --git a/l10n/ia/files_sharing.po b/l10n/ia/files_sharing.po index f8132fbbea4..e6abbef3c81 100644 --- a/l10n/ia/files_sharing.po +++ b/l10n/ia/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-04 01:55-0400\n" -"PO-Revision-Date: 2014-05-03 06:12+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n" "MIME-Version: 1.0\n" @@ -61,11 +61,11 @@ msgstr "" msgid "Download" msgstr "Discargar" -#: templates/public.php:53 +#: templates/public.php:52 #, php-format msgid "Download %s" msgstr "" -#: templates/public.php:57 +#: templates/public.php:56 msgid "Direct link" msgstr "" diff --git a/l10n/ia/settings.po b/l10n/ia/settings.po index 60002004a15..c348558a387 100644 --- a/l10n/ia/settings.po +++ b/l10n/ia/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "" @@ -98,6 +98,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -114,6 +124,16 @@ msgstr "" msgid "Unable to delete user" msgstr "" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "Linguage cambiate" @@ -225,34 +245,42 @@ msgstr "Actualisar" msgid "Updated" msgstr "" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "Contrasigno multo debile" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "Contrasigno debile" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "Contrasigno passabile" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "Contrasigno bon" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "Contrasigno forte" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "" @@ -298,7 +326,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "Interlingua" @@ -623,11 +651,11 @@ msgstr "Plus" msgid "Less" msgstr "" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -791,18 +819,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "" diff --git a/l10n/ia/user_ldap.po b/l10n/ia/user_ldap.po index 881569c39a0..68b77da82da 100644 --- a/l10n/ia/user_ldap.po +++ b/l10n/ia/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/id/core.po b/l10n/id/core.po index 35d7feab662..90d9937ee1d 100644 --- a/l10n/id/core.po +++ b/l10n/id/core.po @@ -3,14 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# arifpedia <arifpedia@gmail.com>, 2014 +# Arif Budiman <arifpedia@gmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-07 01:55-0400\n" -"PO-Revision-Date: 2014-05-07 03:50+0000\n" -"Last-Translator: arifpedia <arifpedia@gmail.com>\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" +"Last-Translator: Arif Budiman <arifpedia@gmail.com>\n" "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff --git a/l10n/id/files_external.po b/l10n/id/files_external.po index fc14f55814c..df945da4470 100644 --- a/l10n/id/files_external.po +++ b/l10n/id/files_external.po @@ -3,14 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# arifpedia <arifpedia@gmail.com>, 2014 +# Arif Budiman <arifpedia@gmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-07 01:55-0400\n" -"PO-Revision-Date: 2014-05-07 03:40+0000\n" -"Last-Translator: arifpedia <arifpedia@gmail.com>\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" +"Last-Translator: Arif Budiman <arifpedia@gmail.com>\n" "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -198,29 +198,29 @@ msgstr "Kesalahan dalam mengkonfigurasi penyimpanan Google Drive" msgid "Saved" msgstr "Disimpan" -#: lib/config.php:598 +#: lib/config.php:597 msgid "<b>Note:</b> " msgstr "<b>Catatan:</b> " -#: lib/config.php:608 +#: lib/config.php:607 msgid " and " msgstr "dan" -#: lib/config.php:630 +#: lib/config.php:629 #, php-format msgid "" "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting " "of %s is not possible. Please ask your system administrator to install it." msgstr "<b>Catatan:</b> Dukungan cURL di PHP tidak diaktifkan atau belum diinstal. Mengaitkan %s tidak dimungkinkan. Silakan tanyakan ke administrator sistem Anda untuk menginstalnya." -#: lib/config.php:632 +#: lib/config.php:631 #, php-format msgid "" "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of" " %s is not possible. Please ask your system administrator to install it." msgstr "<b>Catatan:</b> Dukungan FTP di PHP tidak diaktifkan atau belum diinstal. Mengaitkan %s tidak dimungkinkan. Silakan tanyakan ke administrator sistem Anda untuk menginstalnya." -#: lib/config.php:634 +#: lib/config.php:633 #, php-format msgid "" "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please" diff --git a/l10n/id/files_sharing.po b/l10n/id/files_sharing.po index e6b078bd4d9..5beed755f14 100644 --- a/l10n/id/files_sharing.po +++ b/l10n/id/files_sharing.po @@ -3,13 +3,13 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# arifpedia <arifpedia@gmail.com>, 2014 +# Arif Budiman <arifpedia@gmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-04 01:55-0400\n" -"PO-Revision-Date: 2014-05-03 06:12+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n" "MIME-Version: 1.0\n" @@ -62,11 +62,11 @@ msgstr "Untuk info lebih lanjut, silakan tanyakan orang yang mengirim tautan ini msgid "Download" msgstr "Unduh" -#: templates/public.php:53 +#: templates/public.php:52 #, php-format msgid "Download %s" msgstr "" -#: templates/public.php:57 +#: templates/public.php:56 msgid "Direct link" msgstr "Tautan langsung" diff --git a/l10n/id/settings.po b/l10n/id/settings.po index 8570da0d8a1..9907425200a 100644 --- a/l10n/id/settings.po +++ b/l10n/id/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-07 01:55-0400\n" -"PO-Revision-Date: 2014-05-07 03:50+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "Enkripsi" @@ -98,6 +98,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "Email disimpan" @@ -114,6 +124,16 @@ msgstr "Tidak dapat menghapus grup" msgid "Unable to delete user" msgstr "Tidak dapat menghapus pengguna" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "Bahasa telah diubah" @@ -225,34 +245,42 @@ msgstr "Perbarui" msgid "Updated" msgstr "Diperbarui" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "Pilih foto profil" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "Sandi sangat lemah" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "Sandi lemah" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "Sandi lumayan" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "Sandi baik" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "Sandi kuat" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "Mendeskripsi berkas... Modon tunggu, ini memerlukan beberapa saat." +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "dihapus" @@ -298,7 +326,7 @@ msgstr "Tuliskan sandi yang valid" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "Peringatan: Direktori home untuk pengguna \"{user}\" sudah ada" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "__language_name__" @@ -623,11 +651,11 @@ msgstr "Lainnya" msgid "Less" msgstr "Ciutkan" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "Versi" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -791,18 +819,33 @@ msgid "" "WebDAV</a>" msgstr "Gunakan alamat ini untuk <a href=\"%s\" target=\"_blank\">mengakses Berkas via WebDAV</a>" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "Aplikasi enkripsi tidak lagi diaktifkan, silahkan mendekripsi semua file Anda" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "Sandi masuk" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "Deskripsi semua Berkas" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "Nama Masuk" diff --git a/l10n/id/user_ldap.po b/l10n/id/user_ldap.po index 7a4940ce045..3a10a0b7048 100644 --- a/l10n/id/user_ldap.po +++ b/l10n/id/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/is/core.po b/l10n/is/core.po index 0d0ed23d7e1..49dc7a7d8b9 100644 --- a/l10n/is/core.po +++ b/l10n/is/core.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:02+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/is/files_external.po b/l10n/is/files_external.po index 9cdd97ec494..46428e308d6 100644 --- a/l10n/is/files_external.po +++ b/l10n/is/files_external.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n" "MIME-Version: 1.0\n" @@ -197,29 +197,29 @@ msgstr "Villa kom upp við að setja upp Google Drive gagnasvæði" msgid "Saved" msgstr "" -#: lib/config.php:598 +#: lib/config.php:597 msgid "<b>Note:</b> " msgstr "" -#: lib/config.php:608 +#: lib/config.php:607 msgid " and " msgstr "" -#: lib/config.php:630 +#: lib/config.php:629 #, php-format msgid "" "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting " "of %s is not possible. Please ask your system administrator to install it." msgstr "" -#: lib/config.php:632 +#: lib/config.php:631 #, php-format msgid "" "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of" " %s is not possible. Please ask your system administrator to install it." msgstr "" -#: lib/config.php:634 +#: lib/config.php:633 #, php-format msgid "" "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please" diff --git a/l10n/is/files_sharing.po b/l10n/is/files_sharing.po index 8d4cb5b66fb..4aea7c4a4ec 100644 --- a/l10n/is/files_sharing.po +++ b/l10n/is/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-04 01:55-0400\n" -"PO-Revision-Date: 2014-05-03 06:11+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n" "MIME-Version: 1.0\n" @@ -61,11 +61,11 @@ msgstr "" msgid "Download" msgstr "Niðurhal" -#: templates/public.php:53 +#: templates/public.php:52 #, php-format msgid "Download %s" msgstr "" -#: templates/public.php:57 +#: templates/public.php:56 msgid "Direct link" msgstr "" diff --git a/l10n/is/settings.po b/l10n/is/settings.po index 73cc3e937f9..7a6d59fb95c 100644 --- a/l10n/is/settings.po +++ b/l10n/is/settings.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n" "MIME-Version: 1.0\n" @@ -52,7 +52,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "Dulkóðun" @@ -99,6 +99,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "Netfang vistað" @@ -115,6 +125,16 @@ msgstr "Ekki tókst að eyða hóp" msgid "Unable to delete user" msgstr "Ekki tókst að eyða notenda" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "Tungumáli breytt" @@ -226,34 +246,42 @@ msgstr "Uppfæra" msgid "Updated" msgstr "Uppfært" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "eytt" @@ -299,7 +327,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "__nafn_tungumáls__" @@ -624,11 +652,11 @@ msgstr "Meira" msgid "Less" msgstr "Minna" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "Útgáfa" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -792,18 +820,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "" diff --git a/l10n/is/user_ldap.po b/l10n/is/user_ldap.po index dde31d960e7..95481ba5dff 100644 --- a/l10n/is/user_ldap.po +++ b/l10n/is/user_ldap.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/it/core.po b/l10n/it/core.po index e4f73d2a38c..0667701841a 100644 --- a/l10n/it/core.po +++ b/l10n/it/core.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:02+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/it/files_external.po b/l10n/it/files_external.po index 4a79114b3aa..b8638c6e4f2 100644 --- a/l10n/it/files_external.po +++ b/l10n/it/files_external.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-02 01:55-0400\n" -"PO-Revision-Date: 2014-05-01 11:10+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n" "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n" "MIME-Version: 1.0\n" @@ -201,29 +201,29 @@ msgstr "Errore durante la configurazione dell'archivio Google Drive" msgid "Saved" msgstr "Salvato" -#: lib/config.php:598 +#: lib/config.php:597 msgid "<b>Note:</b> " msgstr "<b>Nota:</b>" -#: lib/config.php:608 +#: lib/config.php:607 msgid " and " msgstr "e" -#: lib/config.php:630 +#: lib/config.php:629 #, php-format msgid "" "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting " "of %s is not possible. Please ask your system administrator to install it." msgstr "<b>Nota:</b> il supporto a cURL di PHP non è abilitato o installato. Impossibile montare %s. Chiedi al tuo amministratore di sistema di installarlo." -#: lib/config.php:632 +#: lib/config.php:631 #, php-format msgid "" "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of" " %s is not possible. Please ask your system administrator to install it." msgstr "<b>Nota:</b> il supporto a FTP in PHP non è abilitato o installato. Impossibile montare %s. Chiedi al tuo amministratore di sistema di installarlo." -#: lib/config.php:634 +#: lib/config.php:633 #, php-format msgid "" "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please" diff --git a/l10n/it/files_sharing.po b/l10n/it/files_sharing.po index c9db889bbd7..35015cf3aeb 100644 --- a/l10n/it/files_sharing.po +++ b/l10n/it/files_sharing.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-05 01:55-0400\n" -"PO-Revision-Date: 2014-05-04 06:54+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n" "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n" "MIME-Version: 1.0\n" @@ -63,11 +63,11 @@ msgstr "Per ulteriori informazioni, chiedi alla persona che ti ha inviato il col msgid "Download" msgstr "Scarica" -#: templates/public.php:53 +#: templates/public.php:52 #, php-format msgid "Download %s" msgstr "Scarica %s" -#: templates/public.php:57 +#: templates/public.php:56 msgid "Direct link" msgstr "Collegamento diretto" diff --git a/l10n/it/settings.po b/l10n/it/settings.po index 67a0bd8b7a4..a75f1045cc3 100644 --- a/l10n/it/settings.po +++ b/l10n/it/settings.po @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" -"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" +"Last-Translator: I Robot\n" "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -55,7 +55,7 @@ msgstr "Devi impostare l'indirizzo del tuo utente prima di poter provare l'invio msgid "Send mode" msgstr "Modalità di invio" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "Cifratura" @@ -102,6 +102,16 @@ msgstr "Impossibile decifrare i tuoi file, controlla il file owncloud.log o chie msgid "Couldn't decrypt your files, check your password and try again" msgstr "Impossibile decifrare i tuoi file, controlla la password e prova ancora" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "Email salvata" @@ -118,6 +128,16 @@ msgstr "Impossibile eliminare il gruppo" msgid "Unable to delete user" msgstr "Impossibile eliminare l'utente" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "Lingua modificata" @@ -229,34 +249,42 @@ msgstr "Aggiorna" msgid "Updated" msgstr "Aggiornato" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "Seleziona un'immagine del profilo" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "Password molto debole" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "Password debole" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "Password così-così" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "Password buona" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "Password forte" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "Decifratura dei file in corso... Attendi, potrebbe richiedere del tempo." +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "eliminati" @@ -302,7 +330,7 @@ msgstr "Deve essere fornita una password valida" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "Avviso: la cartella home dell'utente \"{user}\" esiste già " -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "Italiano" @@ -627,11 +655,11 @@ msgstr "Altro" msgid "Less" msgstr "Meno" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "Versione" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -795,18 +823,33 @@ msgid "" "WebDAV</a>" msgstr "Utilizza questo indirizzo per <a href=\"%s\" target=\"_blank\">accedere ai tuoi file con WebDAV</a>" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "L'applicazione di cifratura non è più abilitata, decifra tutti i tuoi file" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "Password di accesso" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "Decifra tutti i file" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "Nome utente" diff --git a/l10n/it/user_ldap.po b/l10n/it/user_ldap.po index f50e1bca7aa..6e6f8595c07 100644 --- a/l10n/it/user_ldap.po +++ b/l10n/it/user_ldap.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n" "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/ja/core.po b/l10n/ja/core.po index 39952e303db..a23b394786d 100644 --- a/l10n/ja/core.po +++ b/l10n/ja/core.po @@ -14,8 +14,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-01 01:55-0400\n" -"PO-Revision-Date: 2014-04-30 18:30+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: mikako\n" "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/ja/files_external.po b/l10n/ja/files_external.po index 810209b31cb..2a82402e961 100644 --- a/l10n/ja/files_external.po +++ b/l10n/ja/files_external.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-01 01:55-0400\n" -"PO-Revision-Date: 2014-04-30 18:50+0000\n" -"Last-Translator: I Robot\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" +"Last-Translator: tt yn <tetuyano+transi@gmail.com>\n" "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -30,59 +30,59 @@ msgstr "ä½ç½®" #: appinfo/app.php:39 msgid "Amazon S3" -msgstr "" +msgstr "Amazon S3" #: appinfo/app.php:41 msgid "Key" -msgstr "" +msgstr "ã‚ー" #: appinfo/app.php:42 msgid "Secret" -msgstr "" +msgstr "シークレットã‚ー" #: appinfo/app.php:43 appinfo/app.php:51 msgid "Bucket" -msgstr "" +msgstr "ãƒã‚±ãƒƒãƒˆå" #: appinfo/app.php:47 msgid "Amazon S3 and compliant" -msgstr "" +msgstr "Amazon S3 ã¨äº’æ›ã‚¹ãƒˆãƒ¬ãƒ¼ã‚¸" #: appinfo/app.php:49 msgid "Access Key" -msgstr "" +msgstr "アクセスã‚ー" #: appinfo/app.php:50 msgid "Secret Key" -msgstr "" +msgstr "シークレットã‚ー" #: appinfo/app.php:52 msgid "Hostname (optional)" -msgstr "" +msgstr "ホストå (オプション)" #: appinfo/app.php:53 msgid "Port (optional)" -msgstr "" +msgstr "ãƒãƒ¼ãƒˆ (オプション)" #: appinfo/app.php:54 msgid "Region (optional)" -msgstr "" +msgstr "リージョン (オプション)" #: appinfo/app.php:55 msgid "Enable SSL" -msgstr "" +msgstr "SSLを有効" #: appinfo/app.php:56 msgid "Enable Path Style" -msgstr "" +msgstr "パス形å¼ã‚’有効" #: appinfo/app.php:63 msgid "App key" -msgstr "" +msgstr "アプリã‚ー" #: appinfo/app.php:64 msgid "App secret" -msgstr "" +msgstr "アプリシークレット" #: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121 #: appinfo/app.php:131 appinfo/app.php:141 appinfo/app.php:151 @@ -102,59 +102,59 @@ msgstr "パスワード" #: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124 #: appinfo/app.php:134 appinfo/app.php:154 msgid "Root" -msgstr "" +msgstr "ルート" #: appinfo/app.php:77 msgid "Secure ftps://" -msgstr "" +msgstr "Secure ftps://" #: appinfo/app.php:84 msgid "Client ID" -msgstr "" +msgstr "クライアントID" #: appinfo/app.php:85 msgid "Client secret" -msgstr "" +msgstr "クライアント秘密ã‚ー" #: appinfo/app.php:92 msgid "OpenStack Object Storage" -msgstr "" +msgstr "OpenStack Object Storage" #: appinfo/app.php:94 msgid "Username (required)" -msgstr "" +msgstr "ユーザーå (å¿…é ˆ)" #: appinfo/app.php:95 msgid "Bucket (required)" -msgstr "" +msgstr "ãƒã‚±ãƒƒãƒˆ (å¿…é ˆ)" #: appinfo/app.php:96 msgid "Region (optional for OpenStack Object Storage)" -msgstr "" +msgstr "リージョン (OpenStack Object Storage用ã®ã‚ªãƒ—ション)" #: appinfo/app.php:97 msgid "API Key (required for Rackspace Cloud Files)" -msgstr "" +msgstr "APIã‚ー (Rackspace Cloud Filesã«å¿…é ˆ)" #: appinfo/app.php:98 msgid "Tenantname (required for OpenStack Object Storage)" -msgstr "" +msgstr "テナントå (OpenStack Object Storage用ã«å¿…è¦)" #: appinfo/app.php:99 msgid "Password (required for OpenStack Object Storage)" -msgstr "" +msgstr "パスワード (OpenStack Object Storage用ã«å¿…è¦)" #: appinfo/app.php:100 msgid "Service Name (required for OpenStack Object Storage)" -msgstr "" +msgstr "サービスå (OpenStack Object Storage用ã«å¿…è¦)" #: appinfo/app.php:101 msgid "URL of identity endpoint (required for OpenStack Object Storage)" -msgstr "" +msgstr "è˜åˆ¥ç”¨ã‚¨ãƒ³ãƒ‰ãƒã‚¤ãƒ³ãƒˆURL (OpenStack Object Storage用ã«å¿…è¦)" #: appinfo/app.php:102 msgid "Timeout of HTTP requests in seconds (optional)" -msgstr "" +msgstr "HTTPリクエストã®ã‚¿ã‚¤ãƒ アウト秒数 (オプション)" #: appinfo/app.php:114 appinfo/app.php:123 msgid "Share" @@ -162,19 +162,19 @@ msgstr "共有" #: appinfo/app.php:119 msgid "SMB / CIFS using OC login" -msgstr "" +msgstr "owncloudãƒã‚°ã‚¤ãƒ³ã§ SMB/CIFSを使用" #: appinfo/app.php:122 msgid "Username as share" -msgstr "" +msgstr "共有å" #: appinfo/app.php:135 appinfo/app.php:145 msgid "Secure https://" -msgstr "" +msgstr "ã‚»ã‚ュア https://" #: appinfo/app.php:144 msgid "Remote subfolder" -msgstr "" +msgstr "リモートサブフォルダ" #: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40 msgid "Access granted" @@ -200,34 +200,34 @@ msgstr "Googleドライブストレージã®è¨å®šã‚¨ãƒ©ãƒ¼" msgid "Saved" msgstr "ä¿å˜ã•ã‚Œã¾ã—ãŸ" -#: lib/config.php:598 +#: lib/config.php:597 msgid "<b>Note:</b> " -msgstr "" +msgstr "<b>注æ„:</b> " -#: lib/config.php:608 +#: lib/config.php:607 msgid " and " -msgstr "" +msgstr "ã¨" -#: lib/config.php:630 +#: lib/config.php:629 #, php-format msgid "" "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting " "of %s is not possible. Please ask your system administrator to install it." -msgstr "" +msgstr "<b>注æ„:</b> PHPã«cURLã®ã‚¨ã‚¯ã‚¹ãƒ†ãƒ³ã‚·ãƒ§ãƒ³ãŒå…¥ã£ã¦ã„ãªã„ã‹ã€æœ‰åŠ¹ã§ã¯ã‚ã‚Šã¾ã›ã‚“。%s をマウントã™ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“。ã“ã®ã‚·ã‚¹ãƒ†ãƒ ã®ç®¡ç†è€…ã«ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã‚’ãŠé¡˜ã„ã—ã¦ãã ã•ã„。" -#: lib/config.php:632 +#: lib/config.php:631 #, php-format msgid "" "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of" " %s is not possible. Please ask your system administrator to install it." -msgstr "" +msgstr "<b>注æ„:</b> PHPã«FTPã®ã‚¨ã‚¯ã‚¹ãƒ†ãƒ³ã‚·ãƒ§ãƒ³ãŒå…¥ã£ã¦ã„ãªã„ã‹ã€æœ‰åŠ¹ã§ã¯ã‚ã‚Šã¾ã›ã‚“。%s をマウントã™ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“。ã“ã®ã‚·ã‚¹ãƒ†ãƒ ã®ç®¡ç†è€…ã«ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã‚’ãŠé¡˜ã„ã—ã¦ãã ã•ã„。" -#: lib/config.php:634 +#: lib/config.php:633 #, php-format msgid "" "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please" " ask your system administrator to install it." -msgstr "" +msgstr "<b>注æ„:</b> \"%s\" ãŒã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¦ã„ã¾ã›ã‚“。%sをマウントã§ãã¾ã›ã‚“。ã“ã®ã‚·ã‚¹ãƒ†ãƒ ã®ç®¡ç†è€…ã«ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã‚’ãŠé¡˜ã„ã—ã¦ãã ã•ã„。" #: templates/settings.php:2 msgid "External Storage" @@ -251,7 +251,7 @@ msgstr "オプション" #: templates/settings.php:12 msgid "Available for" -msgstr "" +msgstr "以下ãŒåˆ©ç”¨å¯èƒ½" #: templates/settings.php:32 msgid "Add storage" diff --git a/l10n/ja/files_sharing.po b/l10n/ja/files_sharing.po index 32abbb51eba..86e2d6ad34b 100644 --- a/l10n/ja/files_sharing.po +++ b/l10n/ja/files_sharing.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-04 01:55-0400\n" -"PO-Revision-Date: 2014-05-03 06:12+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n" "MIME-Version: 1.0\n" @@ -64,11 +64,11 @@ msgstr "ä¸æ˜Žãªç‚¹ã¯ã€ã“ã¡ã‚‰ã®ãƒªãƒ³ã‚¯ã®æ供者ã«ç¢ºèªã‚’ãŠé¡˜ã„ msgid "Download" msgstr "ダウンãƒãƒ¼ãƒ‰" -#: templates/public.php:53 +#: templates/public.php:52 #, php-format msgid "Download %s" msgstr "%s をダウンãƒãƒ¼ãƒ‰" -#: templates/public.php:57 +#: templates/public.php:56 msgid "Direct link" msgstr "リンク" diff --git a/l10n/ja/lib.po b/l10n/ja/lib.po index 80633caf3c2..406c8ef9e3a 100644 --- a/l10n/ja/lib.po +++ b/l10n/ja/lib.po @@ -8,14 +8,14 @@ # Koichi MATSUMOTO <mzch@me.com>, 2013 # kuromabo <md81bird@hitaki.net>, 2014 # mikako, 2014 -# tt yn <tetuyano+transi@gmail.com>, 2013 +# tt yn <tetuyano+transi@gmail.com>, 2013-2014 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-01 01:55-0400\n" -"PO-Revision-Date: 2014-04-30 19:00+0000\n" -"Last-Translator: mikako\n" +"POT-Creation-Date: 2014-05-10 01:55-0400\n" +"PO-Revision-Date: 2014-05-10 03:40+0000\n" +"Last-Translator: tt yn <tetuyano+transi@gmail.com>\n" "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -23,16 +23,16 @@ msgstr "" "Language: ja_JP\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: base.php:712 +#: base.php:713 msgid "You are accessing the server from an untrusted domain." msgstr "ã‚ãªãŸã¯ã‚µãƒ¼ãƒã«ã€ä¿¡ç”¨ãŒä»˜ä¸Žã•ã‚Œã¦ã„ãªã„ドメインã‹ã‚‰ã‚¢ã‚¯ã‚»ã‚¹ã—ã¦ã„ã¾ã™ã€‚" -#: base.php:713 +#: base.php:714 msgid "" "Please contact your administrator. If you are an administrator of this " "instance, configure the \"trusted_domain\" setting in config/config.php. An " "example configuration is provided in config/config.sample.php." -msgstr "" +msgstr "管ç†è€…ã«é€£çµ¡ã—ã¦ãã ã•ã„。ã“ã®ã‚µãƒ¼ãƒãƒ¼ã®ç®¡ç†è€…ã®å ´åˆã¯ã€\"trusted_domain\" ã®è¨å®šã‚’ config/config.php ã«è¨å®šã—ã¦ãã ã•ã„。config/config.sample.php ã«ã‚µãƒ³ãƒ—ルã®è¨å®šæ–¹æ³•ãŒè¨˜è¼‰ã—ã¦ã‚ã‚Šã¾ã™ã€‚" #: private/app.php:236 #, php-format @@ -82,23 +82,23 @@ msgstr "無効ãªç”»åƒ" msgid "web services under your control" msgstr "管ç†ä¸‹ã®ã‚¦ã‚§ãƒ–サービス" -#: private/files.php:232 +#: private/files.php:235 msgid "ZIP download is turned off." msgstr "ZIPダウンãƒãƒ¼ãƒ‰ã¯ç„¡åŠ¹ã§ã™ã€‚" -#: private/files.php:233 +#: private/files.php:236 msgid "Files need to be downloaded one by one." msgstr "ファイルã¯1ã¤ãšã¤ãƒ€ã‚¦ãƒ³ãƒãƒ¼ãƒ‰ã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚" -#: private/files.php:234 private/files.php:261 +#: private/files.php:237 private/files.php:264 msgid "Back to Files" msgstr "ファイルã«æˆ»ã‚‹" -#: private/files.php:259 +#: private/files.php:262 msgid "Selected files too large to generate zip file." msgstr "é¸æŠžã—ãŸãƒ•ã‚¡ã‚¤ãƒ«ã¯ZIPファイルã®ç”Ÿæˆã«ã¯å¤§ãã™ãŽã¾ã™ã€‚" -#: private/files.php:260 +#: private/files.php:263 msgid "" "Please download the files separately in smaller chunks or kindly ask your " "administrator." @@ -309,102 +309,102 @@ msgstr "%s ã®å…±æœ‰ã«å¤±æ•—ã—ã¾ã—ãŸã€‚ãã®ã‚ˆã†ãªãƒ•ã‚¡ã‚¤ãƒ«ã¯å˜åœ¨ #: private/share/share.php:523 #, php-format msgid "Sharing %s failed, because the user %s is the item owner" -msgstr "" +msgstr "%s ã®å…±æœ‰ã«å¤±æ•—ã—ã¾ã—ãŸã€‚ユーザー %s ãŒã‚¢ã‚¤ãƒ†ãƒ 所有者ã§ã™ã€‚" #: private/share/share.php:529 #, php-format msgid "Sharing %s failed, because the user %s does not exist" -msgstr "" +msgstr "%s ã®å…±æœ‰ã«å¤±æ•—ã—ã¾ã—ãŸã€‚ユーザー %s ãŒå˜åœ¨ã—ã¾ã›ã‚“。" #: private/share/share.php:538 #, php-format msgid "" "Sharing %s failed, because the user %s is not a member of any groups that %s" " is a member of" -msgstr "" +msgstr "%s ã®å…±æœ‰ã«å¤±æ•—ã—ã¾ã—ãŸã€‚ユーザー %s ã¯ã©ã®ã‚°ãƒ«ãƒ¼ãƒ—ã«ã‚‚属ã—ã¦ã„ã¾ã›ã‚“。%s ã¯ã€??ã®ãƒ¡ãƒ³ãƒãƒ¼ã§ã™ã€‚" #: private/share/share.php:551 private/share/share.php:579 #, php-format msgid "Sharing %s failed, because this item is already shared with %s" -msgstr "" +msgstr "%s ã®å…±æœ‰ã«å¤±æ•—ã—ã¾ã—ãŸã€‚ã“ã®ã‚¢ã‚¤ãƒ†ãƒ ã¯æ—¢ã« %s ã§å…±æœ‰ã•ã‚Œã¦ã„ã¾ã™ã€‚" #: private/share/share.php:559 #, php-format msgid "Sharing %s failed, because the group %s does not exist" -msgstr "" +msgstr "%s ã®å…±æœ‰ã«å¤±æ•—ã—ã¾ã—ãŸã€‚グループ %s ã¯å˜åœ¨ã—ã¾ã›ã‚“。" #: private/share/share.php:566 #, php-format msgid "Sharing %s failed, because %s is not a member of the group %s" -msgstr "" +msgstr "%s ã®å…±æœ‰ã«å¤±æ•—ã—ã¾ã—ãŸã€‚%s ã¯ã€ã‚°ãƒ«ãƒ¼ãƒ— %s ã®ãƒ¡ãƒ³ãƒãƒ¼ã§ã¯ã‚ã‚Šã¾ã›ã‚“。" #: private/share/share.php:629 #, php-format msgid "Sharing %s failed, because sharing with links is not allowed" -msgstr "" +msgstr "%s ã®å…±æœ‰ã«å¤±æ•—ã—ã¾ã—ãŸã€‚リンクã§ã®å…±æœ‰ã¯è¨±å¯ã•ã‚Œã¦ã„ã¾ã›ã‚“。" #: private/share/share.php:636 #, php-format msgid "Share type %s is not valid for %s" -msgstr "" +msgstr "%s ã®å…±æœ‰æ–¹æ³•ã¯ã€%s ã«ã¯é©ç”¨ã§ãã¾ã›ã‚“。" -#: private/share/share.php:773 +#: private/share/share.php:774 #, php-format msgid "" "Setting permissions for %s failed, because the permissions exceed " "permissions granted to %s" -msgstr "" +msgstr "%s ã®æ¨©é™è¨å®šã«å¤±æ•—ã—ã¾ã—ãŸã€‚%s ã«è¨±å¯ã•ã‚Œã¦ã„る権é™ã‚’越ãˆã¦ã„ã¾ã™ã€‚" -#: private/share/share.php:834 +#: private/share/share.php:835 #, php-format msgid "Setting permissions for %s failed, because the item was not found" -msgstr "" +msgstr "%s ã®æ¨©é™è¨å®šã«å¤±æ•—ã—ã¾ã—ãŸã€‚アイテムãŒå˜åœ¨ã—ã¾ã›ã‚“。" -#: private/share/share.php:940 +#: private/share/share.php:941 #, php-format msgid "Sharing backend %s must implement the interface OCP\\Share_Backend" -msgstr "" +msgstr "%s ã®ãƒãƒƒã‚¯ã‚¨ãƒ³ãƒ‰ã®å…±æœ‰ã«ã¯ã€OCP\\Share_Backend　インターフェースを実装ã—ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“。" -#: private/share/share.php:947 +#: private/share/share.php:948 #, php-format msgid "Sharing backend %s not found" msgstr "共有ãƒãƒƒã‚¯ã‚¨ãƒ³ãƒ‰ %s ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“" -#: private/share/share.php:953 +#: private/share/share.php:954 #, php-format msgid "Sharing backend for %s not found" msgstr "%s ã®ãŸã‚ã®å…±æœ‰ãƒãƒƒã‚¯ã‚¨ãƒ³ãƒ‰ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“" -#: private/share/share.php:1367 +#: private/share/share.php:1368 #, php-format msgid "Sharing %s failed, because the user %s is the original sharer" msgstr "%s ã®å…±æœ‰ã«å¤±æ•—ã—ã¾ã—ãŸã€‚ユーザ %s ãŒå…ƒã€…ã®å…±æœ‰è€…ã§ã‚ã‚‹ã‹ã‚‰ã§ã™ã€‚" -#: private/share/share.php:1376 +#: private/share/share.php:1377 #, php-format msgid "" "Sharing %s failed, because the permissions exceed permissions granted to %s" msgstr "%s ã®å…±æœ‰ã«å¤±æ•—ã—ã¾ã—ãŸã€‚%s ã«ä»˜ä¸Žã•ã‚Œã¦ã„る許å¯ã‚’超ãˆã¦ã„ã‚‹ã‹ã‚‰ã§ã™ã€‚" -#: private/share/share.php:1391 +#: private/share/share.php:1392 #, php-format msgid "Sharing %s failed, because resharing is not allowed" msgstr "%s ã®å…±æœ‰ã«å¤±æ•—ã—ã¾ã—ãŸã€‚å†å…±æœ‰ãŒè¨±ã•ã‚Œã¦ã„ãªã„ã‹ã‚‰ã§ã™ã€‚" -#: private/share/share.php:1403 +#: private/share/share.php:1404 #, php-format msgid "" "Sharing %s failed, because the sharing backend for %s could not find its " "source" -msgstr "" +msgstr "%s ã®å…±æœ‰ã«å¤±æ•—ã—ã¾ã—ãŸã€‚%s ã®ãƒãƒƒã‚¯ã‚¨ãƒ³ãƒ‰å…±æœ‰ã«å¿…è¦ãªã‚½ãƒ¼ã‚¹ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—ãŸã€‚" -#: private/share/share.php:1417 +#: private/share/share.php:1418 #, php-format msgid "" "Sharing %s failed, because the file could not be found in the file cache" -msgstr "" +msgstr "%s ã®å…±æœ‰ã«å¤±æ•—ã—ã¾ã—ãŸã€‚ファイルã‚ャッシュã«ãƒ•ã‚¡ã‚¤ãƒ«ãŒã‚ã‚Šã¾ã›ã‚“ã§ã—ãŸã€‚" -#: private/tags.php:193 +#: private/tags.php:183 #, php-format msgid "Could not find category \"%s\"" msgstr "カテゴリ \"%s\" ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—ãŸ" @@ -457,7 +457,7 @@ msgstr "å¹´å‰" msgid "" "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", " "\"0-9\", and \"_.@-\"" -msgstr "" +msgstr "ユーザーåã§åˆ©ç”¨ã§ãã‚‹æ–‡å—列ã¯ã€æ¬¡ã®ã‚‚ã®ã§ã™ï¼š \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" #: private/user/manager.php:237 msgid "A valid username must be provided" diff --git a/l10n/ja/settings.po b/l10n/ja/settings.po index a6dd12ff68c..91700405a8e 100644 --- a/l10n/ja/settings.po +++ b/l10n/ja/settings.po @@ -13,9 +13,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-01 01:55-0400\n" -"PO-Revision-Date: 2014-04-30 18:30+0000\n" -"Last-Translator: mikako\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" +"Last-Translator: I Robot\n" "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -57,7 +57,7 @@ msgstr "ユーザーメールをè¨å®šã—ã¦åˆã‚ã¦ã€ãƒ†ã‚¹ãƒˆãƒ¡ãƒ¼ãƒ«ã‚’é€ msgid "Send mode" msgstr "é€ä¿¡ãƒ¢ãƒ¼ãƒ‰" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "æš—å·åŒ–" @@ -104,6 +104,16 @@ msgstr "ファイルを復å·åŒ–ã™ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“ã§ã—ãŸã€‚ownclo msgid "Couldn't decrypt your files, check your password and try again" msgstr "ファイルを復å·åŒ–ã™ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“ã§ã—ãŸã€‚パスワードを確èªã®ã†ãˆå†è©¦è¡Œã—ã¦ãã ã•ã„。" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "メールアドレスをä¿å˜ã—ã¾ã—ãŸ" @@ -120,6 +130,16 @@ msgstr "グループを削除ã§ãã¾ã›ã‚“" msgid "Unable to delete user" msgstr "ユーザーを削除ã§ãã¾ã›ã‚“" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "言語ãŒå¤‰æ›´ã•ã‚Œã¾ã—ãŸ" @@ -231,34 +251,42 @@ msgstr "アップデート" msgid "Updated" msgstr "アップデート済ã¿" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "プãƒãƒ•ã‚¡ã‚¤ãƒ«ç”»åƒã‚’é¸æŠž" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "éžå¸¸ã«å¼±ã„パスワード" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "å¼±ã„パスワード" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "ã¾ãšã¾ãšã®ãƒ‘スワード" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "良好ãªãƒ‘スワード" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "å¼·ã„パスワード" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "ファイルを複åˆä¸... ã—ã°ã‚‰ããŠå¾…ã¡ãã ã•ã„ã€ã“ã®å‡¦ç†ã«ã¯å°‘ã—時間ãŒã‹ã‹ã‚‹ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“。" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "削除" @@ -304,7 +332,7 @@ msgstr "有効ãªãƒ‘スワードを指定ã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "è¦å‘Š: ユーザー \"{user}\" ã®ãƒ›ãƒ¼ãƒ ディレクトリã¯ã™ã§ã«å˜åœ¨ã—ã¾ã™" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "Japanese (日本語)" @@ -629,11 +657,11 @@ msgstr "ã‚‚ã£ã¨è¦‹ã‚‹" msgid "Less" msgstr "é–‰ã˜ã‚‹" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "ãƒãƒ¼ã‚¸ãƒ§ãƒ³" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -797,18 +825,33 @@ msgid "" "WebDAV</a>" msgstr "<a href=\"%s\" target=\"_blank\">WebDAV 経由ã§ãƒ•ã‚¡ã‚¤ãƒ«ã«ã‚¢ã‚¯ã‚»ã‚¹</a> ã™ã‚‹ã«ã¯ã“ã®ã‚¢ãƒ‰ãƒ¬ã‚¹ã‚’利用ã—ã¦ãã ã•ã„" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "æš—å·åŒ–アプリã¯ã‚‚ã¯ã‚„有効ã§ã¯ã‚ã‚Šã¾ã›ã‚“ã€ã™ã¹ã¦ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’複åˆã—ã¦ãã ã•ã„" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "ãƒã‚°ã‚¤ãƒ³ãƒ‘スワード" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "ã™ã¹ã¦ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’複åˆã™ã‚‹" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "ãƒã‚°ã‚¤ãƒ³å" diff --git a/l10n/ja/user_ldap.po b/l10n/ja/user_ldap.po index e3c1343a4e5..fa51f8f824d 100644 --- a/l10n/ja/user_ldap.po +++ b/l10n/ja/user_ldap.po @@ -7,14 +7,14 @@ # plazmism <gomidori@live.jp>, 2013-2014 # kuromabo <md81bird@hitaki.net>, 2014 # mikako, 2014 -# tt yn <tetuyano+transi@gmail.com>, 2013 +# tt yn <tetuyano+transi@gmail.com>, 2013-2014 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-01 01:55-0400\n" -"PO-Revision-Date: 2014-04-30 18:30+0000\n" -"Last-Translator: mikako\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" +"Last-Translator: tt yn <tetuyano+transi@gmail.com>\n" "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -424,14 +424,14 @@ msgstr "オンã«åˆ‡ã‚Šæ›¿ãˆãŸã‚‰ã€ã‚°ãƒ«ãƒ¼ãƒ—ã‚’å«ã‚€ã‚°ãƒ«ãƒ¼ãƒ—ãŒã‚µãƒ #: templates/settings.php:40 msgid "Paging chunksize" -msgstr "" +msgstr "ページ分割サイズ" #: templates/settings.php:40 msgid "" "Chunksize used for paged LDAP searches that may return bulky results like " "user or group enumeration. (Setting it 0 disables paged LDAP searches in " "those situations.)" -msgstr "" +msgstr "ページ分割サイズã¯ã€LDAP検索時ã«ãƒ¦ãƒ¼ã‚¶ãƒ¼ã‚„グループã®ãƒªã‚¹ãƒˆä¸€è¦§ãƒ‡ãƒ¼ã‚¿ã‚’一括ã§è¿”ã™ãƒ‡ãƒ¼ã‚¿é‡ã‚’指定ã—ã¾ã™ã€‚(è¨å®šãŒ0ã®å ´åˆã«ã¯ã€LDAP検索ã®åˆ†å‰²è»¢é€ã¯ç„¡åŠ¹)" #: templates/settings.php:42 msgid "Special Attributes" diff --git a/l10n/jv/settings.po b/l10n/jv/settings.po index b110d3bb887..5b267e2b34c 100644 --- a/l10n/jv/settings.po +++ b/l10n/jv/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-26 01:54-0400\n" -"PO-Revision-Date: 2014-04-26 05:54+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Javanese (http://www.transifex.com/projects/p/owncloud/language/jv/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "" @@ -98,6 +98,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -114,6 +124,16 @@ msgstr "" msgid "Unable to delete user" msgstr "" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "" @@ -225,34 +245,42 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "" @@ -298,7 +326,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "" @@ -623,11 +651,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -791,18 +819,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "" diff --git a/l10n/ka_GE/core.po b/l10n/ka_GE/core.po index 85690d9056a..eb209f9ebd6 100644 --- a/l10n/ka_GE/core.po +++ b/l10n/ka_GE/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:02+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/ka_GE/files_external.po b/l10n/ka_GE/files_external.po index 8b34d45ece8..ef84cef227c 100644 --- a/l10n/ka_GE/files_external.po +++ b/l10n/ka_GE/files_external.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n" "MIME-Version: 1.0\n" @@ -197,29 +197,29 @@ msgstr "შეცდáƒáƒ›áƒ Google Drive სáƒáƒªáƒáƒ•áƒ˜áƒ¡ კáƒáƒœáƒ¤áƒ˜ msgid "Saved" msgstr "" -#: lib/config.php:598 +#: lib/config.php:597 msgid "<b>Note:</b> " msgstr "" -#: lib/config.php:608 +#: lib/config.php:607 msgid " and " msgstr "" -#: lib/config.php:630 +#: lib/config.php:629 #, php-format msgid "" "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting " "of %s is not possible. Please ask your system administrator to install it." msgstr "" -#: lib/config.php:632 +#: lib/config.php:631 #, php-format msgid "" "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of" " %s is not possible. Please ask your system administrator to install it." msgstr "" -#: lib/config.php:634 +#: lib/config.php:633 #, php-format msgid "" "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please" diff --git a/l10n/ka_GE/files_sharing.po b/l10n/ka_GE/files_sharing.po index 60eddfd228a..f2222433859 100644 --- a/l10n/ka_GE/files_sharing.po +++ b/l10n/ka_GE/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-04 01:55-0400\n" -"PO-Revision-Date: 2014-05-03 06:12+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n" "MIME-Version: 1.0\n" @@ -61,11 +61,11 @@ msgstr "" msgid "Download" msgstr "ჩáƒáƒ›áƒáƒ¢áƒ•áƒ˜áƒ თვáƒ" -#: templates/public.php:53 +#: templates/public.php:52 #, php-format msgid "Download %s" msgstr "" -#: templates/public.php:57 +#: templates/public.php:56 msgid "Direct link" msgstr "" diff --git a/l10n/ka_GE/settings.po b/l10n/ka_GE/settings.po index 825e4120d44..4041ae62e9d 100644 --- a/l10n/ka_GE/settings.po +++ b/l10n/ka_GE/settings.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n" "MIME-Version: 1.0\n" @@ -52,7 +52,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "ენკრიპციáƒ" @@ -99,6 +99,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "იმეილი შენáƒáƒ®áƒ£áƒšáƒ˜áƒ" @@ -115,6 +125,16 @@ msgstr "ჯგუფის წáƒáƒ¨áƒšáƒ ვერმáƒáƒ®áƒ”რხდáƒ" msgid "Unable to delete user" msgstr "მáƒáƒ›áƒ®áƒ›áƒáƒ ებლის წáƒáƒ¨áƒšáƒ ვერმáƒáƒ®áƒ”რხდáƒ" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "ენრშეცვლილიáƒ" @@ -226,34 +246,42 @@ msgstr "გáƒáƒœáƒáƒ®áƒšáƒ”ბáƒ" msgid "Updated" msgstr "გáƒáƒœáƒáƒ®áƒšáƒ”ბულიáƒ" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "წáƒáƒ¨áƒšáƒ˜áƒšáƒ˜" @@ -299,7 +327,7 @@ msgstr "უნდრმიუთითáƒáƒ— áƒáƒ სებული პáƒáƒ msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "__language_name__" @@ -624,11 +652,11 @@ msgstr "უფრრმეტი" msgid "Less" msgstr "უფრრნáƒáƒ™áƒšáƒ”ბი" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "ვერსიáƒ" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -792,18 +820,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "მáƒáƒ›áƒ®áƒ›áƒáƒ ებლის სáƒáƒ®áƒ”ლი" diff --git a/l10n/ka_GE/user_ldap.po b/l10n/ka_GE/user_ldap.po index 67ebf990ba5..d8b4ca196cc 100644 --- a/l10n/ka_GE/user_ldap.po +++ b/l10n/ka_GE/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/km/core.po b/l10n/km/core.po index 16bb7ca0831..0bd6c1bc9db 100644 --- a/l10n/km/core.po +++ b/l10n/km/core.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:02+0000\n" -"Last-Translator: I Robot\n" +"POT-Creation-Date: 2014-05-12 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 14:00+0000\n" +"Last-Translator: សុវិចិážáŸ’ážš Sovichet áž‘áŸáž– Tep\n" "Language-Team: Khmer (http://www.transifex.com/projects/p/owncloud/language/km/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -222,11 +222,11 @@ msgstr "" #: js/oc-dialogs.js:372 msgid "New Files" -msgstr "" +msgstr "ឯកសារ​ážáŸ’មី" #: js/oc-dialogs.js:373 msgid "Already existing files" -msgstr "" +msgstr "មាន​ឯកសារ​នáŸáŸ‡â€‹ážšáž½áž…​ហើយ" #: js/oc-dialogs.js:375 msgid "Which files do you want to keep?" @@ -244,15 +244,15 @@ msgstr "លើកលែង" #: js/oc-dialogs.js:394 msgid "Continue" -msgstr "" +msgstr "បន្áž" #: js/oc-dialogs.js:441 js/oc-dialogs.js:454 msgid "(all selected)" -msgstr "" +msgstr "(បាន​ជ្រើស​ទាំង​អស់)" #: js/oc-dialogs.js:444 js/oc-dialogs.js:458 msgid "({count} selected)" -msgstr "" +msgstr "(បាន​ជ្រើស {count})" #: js/oc-dialogs.js:466 msgid "Error loading file exists template" @@ -260,23 +260,23 @@ msgstr "" #: js/setup.js:84 msgid "Very weak password" -msgstr "" +msgstr "ពាក្យ​សម្ងាážáŸ‹â€‹ážáŸ’សោយ​ណាស់" #: js/setup.js:85 msgid "Weak password" -msgstr "" +msgstr "ពាក្យ​សម្ងាážáŸ‹â€‹ážáŸ’សោយ" #: js/setup.js:86 msgid "So-so password" -msgstr "" +msgstr "ពាក្យ​សម្ងាážáŸ‹â€‹áž’ម្មážáž¶" #: js/setup.js:87 msgid "Good password" -msgstr "" +msgstr "ពាក្យ​សម្ងាážáŸ‹â€‹áž›áŸ’អ" #: js/setup.js:88 msgid "Strong password" -msgstr "" +msgstr "ពាក្យ​សម្ងាážáŸ‹â€‹ážáŸ’លាំង" #: js/share.js:51 js/share.js:66 js/share.js:106 msgid "Shared" @@ -329,7 +329,7 @@ msgstr "ពាក្យសម្ងាážáŸ‹" #: js/share.js:230 msgid "Allow Public Upload" -msgstr "" +msgstr "អនុញ្ញាážâ€‹áž€áž¶ážšâ€‹áž•áŸ’ទុកឡើង​ជា​សាធារណៈ" #: js/share.js:234 msgid "Email link to person" @@ -453,7 +453,7 @@ msgstr "" #: js/update.js:8 msgid "Please reload the page." -msgstr "" +msgstr "សូម​ផ្ទុក​ទំពáŸážšâ€‹áž“áŸáŸ‡â€‹áž¡áž¾áž„​វិញ។" #: js/update.js:17 msgid "" @@ -475,7 +475,7 @@ msgstr "" msgid "" "A problem has occurred whilst sending the email, please contact your " "administrator." -msgstr "" +msgstr "មាន​កំហុស​បាន​កើážâ€‹áž¡áž¾áž„​នៅ​ពáŸáž›áž›â€‹áž€áŸ†áž–ុង​ផ្ញើ​អ៊ីមែល​ចáŸáž‰, សូម​ទាក់ទង​អភិបាល​របស់​អ្នក។" #: lostpassword/templates/email.php:2 msgid "Use the following link to reset your password: {link}" @@ -661,35 +661,35 @@ msgstr "" #: templates/installation.php:48 msgid "Create an <strong>admin account</strong>" -msgstr "" +msgstr "បង្កើážâ€‹<strong>គណនី​អភិបាល</strong>" #: templates/installation.php:70 msgid "Storage & database" -msgstr "" +msgstr "ឃ្លាំង​ផ្ទុក & មូលដ្ឋាន​ទិន្ននáŸáž™" #: templates/installation.php:77 msgid "Data folder" -msgstr "" +msgstr "ážážâ€‹áž‘ិន្ននáŸáž™" #: templates/installation.php:90 msgid "Configure the database" -msgstr "" +msgstr "កំណážáŸ‹â€‹ážŸážŽáŸ’ឋាន​មូលដ្ឋាន​ទិន្ននáŸáž™" #: templates/installation.php:94 msgid "will be used" -msgstr "" +msgstr "នឹង​ážáŸ’រូវ​បាន​ប្រើ" #: templates/installation.php:109 msgid "Database user" -msgstr "" +msgstr "អ្នក​ប្រើ​មូលដ្ឋាន​ទិន្ននáŸáž™" #: templates/installation.php:118 msgid "Database password" -msgstr "" +msgstr "ពាក្យ​សម្ងាážáŸ‹â€‹áž˜áž¼áž›ážŠáŸ’ឋាន​ទិន្ននáŸáž™" #: templates/installation.php:123 msgid "Database name" -msgstr "" +msgstr "ឈ្មោះ​មូលដ្ឋាន​ទិន្ននáŸáž™" #: templates/installation.php:132 msgid "Database tablespace" @@ -697,15 +697,15 @@ msgstr "" #: templates/installation.php:140 msgid "Database host" -msgstr "" +msgstr "ម៉ាស៊ីន​មូលដ្ឋាន​ទិន្ននáŸáž™" #: templates/installation.php:150 msgid "Finish setup" -msgstr "" +msgstr "បញ្ចប់​ការ​ដំឡើង" #: templates/installation.php:150 msgid "Finishing …" -msgstr "" +msgstr "កំពុង​បញ្ចប់ ..." #: templates/layout.user.php:40 msgid "" @@ -721,11 +721,11 @@ msgstr "" #: templates/layout.user.php:74 templates/singleuser.user.php:8 msgid "Log out" -msgstr "" +msgstr "ចាក​ចáŸáž‰" #: templates/login.php:9 msgid "Automatic logon rejected!" -msgstr "" +msgstr "បាន​បដិសáŸáž’​ការ​ចូល​ដោយ​ស្វáŸáž™â€‹áž”្រវážáŸ’ážáž·!" #: templates/login.php:10 msgid "" @@ -735,7 +735,7 @@ msgstr "" #: templates/login.php:12 msgid "Please change your password to secure your account again." -msgstr "" +msgstr "សូម​ប្ដូរ​ពាក្យ​សម្ងាážáŸ‹â€‹ážšáž”ស់​អ្នក ដើម្បី​ការពារ​គណនី​របស់​អ្នក។" #: templates/login.php:17 msgid "Server side authentication failed!" @@ -747,19 +747,19 @@ msgstr "" #: templates/login.php:46 msgid "Lost your password?" -msgstr "" +msgstr "បាážáŸ‹â€‹áž–ាក្យ​សម្ងាážáŸ‹â€‹ážšáž”ស់​អ្នក?" #: templates/login.php:51 msgid "remember" -msgstr "" +msgstr "ចងចាំ" #: templates/login.php:54 msgid "Log in" -msgstr "" +msgstr "ចូល" #: templates/login.php:60 msgid "Alternative Logins" -msgstr "" +msgstr "ការ​ចូល​ជំនួស" #: templates/mail.php:15 #, php-format @@ -789,7 +789,7 @@ msgstr "" #: templates/update.admin.php:3 #, php-format msgid "Updating ownCloud to version %s, this may take a while." -msgstr "" +msgstr "ការ​ធ្វើ​បច្ចុប្បន្នភាព ownCloud ទៅ​កំណែ %s អាច​ចំណាយ​ពáŸáž›â€‹áž˜áž½áž™â€‹ážŸáŸ†áž‘ុះ។" #: templates/update.user.php:3 msgid "" diff --git a/l10n/km/files.po b/l10n/km/files.po index c64208f9662..f24f3f14a80 100644 --- a/l10n/km/files.po +++ b/l10n/km/files.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# សុវិចិážáŸ’ážš Sovichet áž‘áŸáž– Tep, 2014 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-04 01:55-0400\n" -"PO-Revision-Date: 2014-05-03 06:11+0000\n" -"Last-Translator: I Robot\n" +"POT-Creation-Date: 2014-05-12 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 14:10+0000\n" +"Last-Translator: សុវិចិážáŸ’ážš Sovichet áž‘áŸáž– Tep\n" "Language-Team: Khmer (http://www.transifex.com/projects/p/owncloud/language/km/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -29,7 +30,7 @@ msgstr "" #: ajax/newfile.php:58 js/files.js:96 msgid "File name cannot be empty." -msgstr "" +msgstr "ឈ្មោះ​ឯកសារ​មិន​អាច​នៅ​ទទáŸâ€‹áž”ាន​ឡើយ។" #: ajax/newfile.php:63 #, php-format @@ -40,7 +41,7 @@ msgstr "" msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." -msgstr "" +msgstr "ឈ្មោះ​មិន​ážáŸ’រឹម​ážáŸ’រូវ, មិន​អនុញ្ញាហ'\\', '/', '<', '>', ':', '\"', '|', '?' áž“áž·áž„ '*' áž‘áŸáŸ”" #: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155 #: lib/app.php:60 @@ -143,49 +144,49 @@ msgstr "" msgid "Files" msgstr "ឯកសារ" -#: js/file-upload.js:254 +#: js/file-upload.js:257 msgid "Unable to upload {filename} as it is a directory or has 0 bytes" msgstr "" -#: js/file-upload.js:266 +#: js/file-upload.js:270 msgid "Total file size {size1} exceeds upload limit {size2}" msgstr "" -#: js/file-upload.js:276 +#: js/file-upload.js:281 msgid "" "Not enough free space, you are uploading {size1} but only {size2} is left" msgstr "" -#: js/file-upload.js:353 +#: js/file-upload.js:358 msgid "Upload cancelled." -msgstr "" +msgstr "បាន​បោះបង់​ការ​ផ្ទុក​ឡើង។" -#: js/file-upload.js:398 +#: js/file-upload.js:404 msgid "Could not get result from server." msgstr "" -#: js/file-upload.js:490 +#: js/file-upload.js:493 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "" -#: js/file-upload.js:555 +#: js/file-upload.js:558 msgid "URL cannot be empty" msgstr "" -#: js/file-upload.js:559 js/filelist.js:963 +#: js/file-upload.js:562 js/filelist.js:963 msgid "{new_name} already exists" -msgstr "" +msgstr "មាន​ឈ្មោះ {new_name} រួច​ហើយ" -#: js/file-upload.js:611 +#: js/file-upload.js:617 msgid "Could not create file" msgstr "" -#: js/file-upload.js:624 +#: js/file-upload.js:633 msgid "Could not create folder" msgstr "" -#: js/file-upload.js:664 +#: js/file-upload.js:680 msgid "Error fetching URL" msgstr "" @@ -195,21 +196,21 @@ msgstr "ចែក​រំលែក" #: js/fileactions.js:173 msgid "Delete permanently" -msgstr "" +msgstr "លុប​ជា​អចិន្ážáŸ’រៃយáŸ" #: js/fileactions.js:234 msgid "Rename" -msgstr "" +msgstr "ប្ដូរ​ឈ្មោះ" #: js/filelist.js:221 msgid "" "Your download is being prepared. This might take some time if the files are " "big." -msgstr "" +msgstr "ការ​ទាញយក​របស់​អ្នក​កំពុង​ážáŸ’រូវ​បាន​រៀបចំ​ហើយ។ áž“áŸáŸ‡â€‹áž¢áž¶áž…​ចំណាយ​ពáŸáž›â€‹áž˜áž½áž™â€‹ážŸáŸ†áž‘ុះ ប្រសិន​បើ​ឯកសារ​ធំ។" #: js/filelist.js:502 js/filelist.js:1422 msgid "Pending" -msgstr "" +msgstr "កំពុង​រង់ចាំ" #: js/filelist.js:916 msgid "Error moving file." @@ -241,7 +242,7 @@ msgstr "ទំហំ" #: js/filelist.js:1226 templates/index.php:81 msgid "Modified" -msgstr "" +msgstr "បាន​កែ​ប្រែ" #: js/filelist.js:1235 js/filesummary.js:141 js/filesummary.js:168 msgid "%n folder" @@ -309,7 +310,7 @@ msgstr "" #: templates/admin.php:6 msgid "Maximum upload size" -msgstr "" +msgstr "ទំហំ​ផ្ទុកឡើង​ជា​អážáž·áž”រមា" #: templates/admin.php:9 msgid "max. possible: " @@ -321,15 +322,15 @@ msgstr "" #: templates/admin.php:16 msgid "Enable ZIP-download" -msgstr "" +msgstr "បើក​ការ​ទាញយក​ជា ZIP" #: templates/admin.php:19 msgid "0 is unlimited" -msgstr "" +msgstr "0 គឺ​មិន​កំណážáŸ‹" #: templates/admin.php:21 msgid "Maximum input size for ZIP files" -msgstr "" +msgstr "ទំហំ​ចូល​ជា​អážáž·áž”រមា​សម្រាប់​ឯកសារ ZIP" #: templates/admin.php:25 msgid "Save" @@ -337,7 +338,7 @@ msgstr "រក្សាទុក" #: templates/index.php:5 msgid "New" -msgstr "" +msgstr "ážáŸ’មី" #: templates/index.php:8 msgid "New text file" @@ -345,7 +346,7 @@ msgstr "" #: templates/index.php:9 msgid "Text file" -msgstr "" +msgstr "ឯកសារ​អក្សរ" #: templates/index.php:12 msgid "New folder" @@ -357,15 +358,15 @@ msgstr "ážáž" #: templates/index.php:16 msgid "From link" -msgstr "" +msgstr "ពី​ážáŸ†ážŽ" #: templates/index.php:40 msgid "Deleted files" -msgstr "" +msgstr "បាន​លុប​ឯកសារ" #: templates/index.php:45 msgid "Cancel upload" -msgstr "" +msgstr "បោះបង់​ការ​ផ្ទុកឡើង" #: templates/index.php:51 msgid "You don’t have permission to upload or create files here" @@ -373,7 +374,7 @@ msgstr "" #: templates/index.php:56 msgid "Nothing in here. Upload something!" -msgstr "" +msgstr "គ្មាន​អ្វី​នៅ​ទីនáŸáŸ‡â€‹áž‘áŸáŸ” ផ្ទុក​ឡើង​អ្វី​មួយ!" #: templates/index.php:73 msgid "Download" @@ -385,7 +386,7 @@ msgstr "លុប" #: templates/index.php:98 msgid "Upload too large" -msgstr "" +msgstr "ផ្ទុក​ឡើង​ធំ​ពáŸáž€" #: templates/index.php:100 msgid "" diff --git a/l10n/km/files_external.po b/l10n/km/files_external.po index 14b936bdb4a..539462b278d 100644 --- a/l10n/km/files_external.po +++ b/l10n/km/files_external.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-12 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 14:00+0000\n" "Last-Translator: I Robot\n" "Language-Team: Khmer (http://www.transifex.com/projects/p/owncloud/language/km/)\n" "MIME-Version: 1.0\n" @@ -195,31 +195,31 @@ msgstr "" #: js/settings.js:318 js/settings.js:325 msgid "Saved" -msgstr "" +msgstr "បាន​រក្សាទុក" -#: lib/config.php:598 +#: lib/config.php:597 msgid "<b>Note:</b> " msgstr "" -#: lib/config.php:608 +#: lib/config.php:607 msgid " and " msgstr "" -#: lib/config.php:630 +#: lib/config.php:629 #, php-format msgid "" "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting " "of %s is not possible. Please ask your system administrator to install it." msgstr "" -#: lib/config.php:632 +#: lib/config.php:631 #, php-format msgid "" "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of" " %s is not possible. Please ask your system administrator to install it." msgstr "" -#: lib/config.php:634 +#: lib/config.php:633 #, php-format msgid "" "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please" diff --git a/l10n/km/files_sharing.po b/l10n/km/files_sharing.po index 542b4301873..2ceabd273f0 100644 --- a/l10n/km/files_sharing.po +++ b/l10n/km/files_sharing.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-04 01:55-0400\n" -"PO-Revision-Date: 2014-05-03 06:11+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Khmer (http://www.transifex.com/projects/p/owncloud/language/km/)\n" "MIME-Version: 1.0\n" @@ -62,11 +62,11 @@ msgstr "" msgid "Download" msgstr "ទាញយក" -#: templates/public.php:53 +#: templates/public.php:52 #, php-format msgid "Download %s" msgstr "" -#: templates/public.php:57 +#: templates/public.php:56 msgid "Direct link" msgstr "" diff --git a/l10n/km/files_trashbin.po b/l10n/km/files_trashbin.po index a1b7649d1a0..13bc8ae1a64 100644 --- a/l10n/km/files_trashbin.po +++ b/l10n/km/files_trashbin.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-16 01:55-0400\n" -"PO-Revision-Date: 2014-04-16 05:41+0000\n" +"POT-Creation-Date: 2014-05-12 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 14:10+0000\n" "Last-Translator: I Robot\n" "Language-Team: Khmer (http://www.transifex.com/projects/p/owncloud/language/km/)\n" "MIME-Version: 1.0\n" @@ -29,17 +29,21 @@ msgstr "" #: js/filelist.js:3 msgid "Deleted files" -msgstr "" +msgstr "បាន​លុប​ឯកសារ" -#: js/trash.js:33 js/trash.js:124 js/trash.js:173 +#: js/filelist.js:88 js/filelist.js:132 js/filelist.js:181 msgid "Error" msgstr "កំហុស" -#: js/trash.js:264 +#: js/trash.js:48 templates/index.php:22 templates/index.php:24 +msgid "Restore" +msgstr "ស្ដារ​មក​វិញ" + +#: js/trash.js:107 msgid "Deleted Files" msgstr "" -#: lib/trashbin.php:859 lib/trashbin.php:861 +#: lib/trashbin.php:861 lib/trashbin.php:863 msgid "restored" msgstr "" @@ -51,10 +55,6 @@ msgstr "" msgid "Name" msgstr "ឈ្មោះ" -#: templates/index.php:22 templates/index.php:24 -msgid "Restore" -msgstr "ស្ដារ​មក​វិញ" - #: templates/index.php:30 msgid "Deleted" msgstr "" diff --git a/l10n/km/settings.po b/l10n/km/settings.po index 604ed997d3d..ae5ebac02c7 100644 --- a/l10n/km/settings.po +++ b/l10n/km/settings.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Khmer (http://www.transifex.com/projects/p/owncloud/language/km/)\n" "MIME-Version: 1.0\n" @@ -26,20 +26,20 @@ msgstr "" #: admin/controller.php:73 msgid "Saved" -msgstr "" +msgstr "បាន​រក្សាទុក" #: admin/controller.php:90 msgid "test email settings" -msgstr "" +msgstr "សាក​ល្បង​ការ​កំណážáŸ‹â€‹áž¢áŸŠáž¸áž˜áŸ‚áž›" #: admin/controller.php:91 msgid "If you received this email, the settings seem to be correct." -msgstr "" +msgstr "ប្រសិន​បើ​អ្នក​ទទួល​បាន​អ៊ីមែល​នáŸáŸ‡ មាន​នáŸáž™â€‹ážáž¶â€‹áž€áž¶ážšâ€‹áž€áŸ†ážŽážáŸ‹â€‹áž‚ឺ​បាន​ážáŸ’រឹមម​ážáŸ’រូវ​ហើយ។" #: admin/controller.php:94 msgid "" "A problem occurred while sending the e-mail. Please revisit your settings." -msgstr "" +msgstr "មាន​កំហុស​កើážâ€‹áž¡áž¾áž„​នៅ​ពáŸáž›â€‹áž€áŸ†áž–ុង​ផ្ញើ​អ៊ីមែល​ចáŸáž‰áŸ” សូម​មើល​ការ​កំណážáŸ‹â€‹ážšáž”ស់​អ្នក​ម្ដង​ទៀážáŸ”" #: admin/controller.php:99 msgid "Email sent" @@ -47,13 +47,13 @@ msgstr "បាន​ផ្ញើ​អ៊ីមែល" #: admin/controller.php:101 msgid "You need to set your user email before being able to send test emails." -msgstr "" +msgstr "អ្នក​ážáŸ’រូវ​ážáŸ‚​កំណážáŸ‹â€‹áž¢áŸŠáž¸áž˜áŸ‚ល​របស់​អ្នក​មុន​នឹង​អាច​ផ្ញើ​អ៊ីមែល​សាកល្បង​បាន។" #: admin/controller.php:116 templates/admin.php:316 msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "កូដនីយកម្ម" @@ -100,6 +100,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "បាន​រក្សា​ទុក​អ៊ីមែល" @@ -116,6 +126,16 @@ msgstr "មិន​អាច​លុប​ក្រុម​បាន" msgid "Unable to delete user" msgstr "មិន​អាច​លុប​អ្នក​ប្រើ​បាន" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "បាន​ប្ដូរ​ភាសា" @@ -144,7 +164,7 @@ msgstr "មិន​អាច​ធ្វើ​បច្ចុប្បន្ន #: changepassword/controller.php:17 msgid "Wrong password" -msgstr "" +msgstr "ážáž»ážŸâ€‹áž–ាក្យ​សម្ងាážáŸ‹" #: changepassword/controller.php:36 msgid "No user supplied" @@ -173,7 +193,7 @@ msgstr "" #: js/admin.js:73 msgid "Sending..." -msgstr "" +msgstr "កំពុង​ផ្ញើ..." #: js/apps.js:45 templates/help.php:4 msgid "User Documentation" @@ -181,7 +201,7 @@ msgstr "ឯកសារ​សម្រាប់​អ្នក​ប្រើប #: js/apps.js:50 msgid "Admin Documentation" -msgstr "" +msgstr "កម្រង​ឯកសារ​អភិបាល" #: js/apps.js:67 msgid "Update to {appversion}" @@ -227,34 +247,42 @@ msgstr "ធ្វើ​បច្ចុប្បន្នភាព" msgid "Updated" msgstr "បាន​ធ្វើ​បច្ចុប្បន្នភាព" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" -msgstr "" +msgstr "ជ្រើស​រូបភាព​ប្រវážáŸ’ážáž·ážšáž¼áž”" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" -msgstr "" +msgstr "ពាក្យ​សម្ងាážáŸ‹â€‹ážáŸ’សោយ​ណាស់" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" -msgstr "" +msgstr "ពាក្យ​សម្ងាážáŸ‹â€‹ážáŸ’សោយ" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" -msgstr "" +msgstr "ពាក្យ​សម្ងាážáŸ‹â€‹áž’ម្មážáž¶" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" -msgstr "" +msgstr "ពាក្យ​សម្ងាážáŸ‹â€‹áž›áŸ’អ" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" -msgstr "" +msgstr "ពាក្យ​សម្ងាážáŸ‹â€‹ážáŸ’លាំង" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "បាន​លុប" @@ -300,7 +328,7 @@ msgstr "ážáŸ’រូវ​ផ្ដល់​ពាក្យ​សម្ងាហmsgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "__language_name__" @@ -326,7 +354,7 @@ msgstr "" #: templates/admin.php:16 templates/admin.php:23 msgid "None" -msgstr "" +msgstr "គ្មាន" #: templates/admin.php:17 msgid "Login" @@ -342,11 +370,11 @@ msgstr "" #: templates/admin.php:24 msgid "SSL" -msgstr "" +msgstr "SSL" #: templates/admin.php:25 msgid "TLS" -msgstr "" +msgstr "TLS" #: templates/admin.php:47 templates/admin.php:61 msgid "Security Warning" @@ -494,7 +522,7 @@ msgstr "អនុញ្ញាážâ€‹áž²áŸ’យ​អ្នក​ប្រើ​ច #: templates/admin.php:227 msgid "Allow public uploads" -msgstr "" +msgstr "អនុញ្ញាážâ€‹áž€áž¶ážšâ€‹áž•áŸ’ទុក​ឡើង​ជា​សាធារណៈ" #: templates/admin.php:228 msgid "" @@ -567,7 +595,7 @@ msgstr "" #: templates/admin.php:311 msgid "Email Server" -msgstr "" +msgstr "ម៉ាស៊ីន​បម្រើ​អ៊ីមែល" #: templates/admin.php:313 msgid "This is used for sending out notifications." @@ -575,7 +603,7 @@ msgstr "" #: templates/admin.php:344 msgid "From address" -msgstr "" +msgstr "ពី​អាសយដ្ឋាន" #: templates/admin.php:366 msgid "Authentication required" @@ -607,7 +635,7 @@ msgstr "" #: templates/admin.php:388 msgid "Send email" -msgstr "" +msgstr "ផ្ញើ​អ៊ីមែល" #: templates/admin.php:393 msgid "Log" @@ -625,11 +653,11 @@ msgstr "ច្រើន​ទៀáž" msgid "Less" msgstr "ážáž·áž…" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "កំណែ" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -706,11 +734,11 @@ msgstr "ពាក្យសម្ងាážáŸ‹" #: templates/personal.php:39 msgid "Your password was changed" -msgstr "" +msgstr "ពាក្យ​សម្ងាážáŸ‹â€‹ážšáž”ស់​អ្នក​ážáŸ’រូវ​បាន​ប្ដូរ" #: templates/personal.php:40 msgid "Unable to change your password" -msgstr "" +msgstr "មិន​អាច​ប្ដូរ​ពាក្យ​សម្ងាážáŸ‹â€‹ážšáž”ស់​អ្នក​បាន​ទáŸ" #: templates/personal.php:42 msgid "Current password" @@ -744,19 +772,19 @@ msgstr "" #: templates/personal.php:89 msgid "Profile picture" -msgstr "" +msgstr "រូបភាព​ប្រវážáŸ’ážáž·ážšáž¼áž”" #: templates/personal.php:94 msgid "Upload new" -msgstr "" +msgstr "ផ្ទុកឡើង​ážáŸ’មី" #: templates/personal.php:96 msgid "Select new from Files" -msgstr "" +msgstr "ជ្រើស​ážáŸ’មី​ពី​ឯកសារ" #: templates/personal.php:97 msgid "Remove image" -msgstr "" +msgstr "ដក​រូបភាព​ចáŸáž‰" #: templates/personal.php:98 msgid "Either png or jpg. Ideally square but you will be able to crop it." @@ -793,18 +821,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" -msgstr "" +msgstr "ពាក្យ​សម្ងាážáŸ‹â€‹áž…ូល​គណនី" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "ចូល" @@ -825,7 +868,7 @@ msgstr "" #: templates/users.php:40 msgid "Default Storage" -msgstr "" +msgstr "ឃ្លាំង​ផ្ទុក​លំនាំ​ដើម" #: templates/users.php:42 templates/users.php:137 msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" @@ -833,7 +876,7 @@ msgstr "" #: templates/users.php:46 templates/users.php:146 msgid "Unlimited" -msgstr "" +msgstr "មិន​កំណážáŸ‹" #: templates/users.php:64 templates/users.php:161 msgid "Other" @@ -845,7 +888,7 @@ msgstr "ឈ្មោះ​អ្នកប្រើ" #: templates/users.php:92 msgid "Storage" -msgstr "" +msgstr "ឃ្លាំង​ផ្ទុក" #: templates/users.php:106 msgid "change full name" @@ -853,8 +896,8 @@ msgstr "" #: templates/users.php:110 msgid "set new password" -msgstr "" +msgstr "កំណážáŸ‹â€‹áž–ាក្យ​សម្ងាážáŸ‹â€‹ážáŸ’មី" #: templates/users.php:141 msgid "Default" -msgstr "" +msgstr "លំនាំ​ដើម" diff --git a/l10n/km/user_ldap.po b/l10n/km/user_ldap.po index 95c01b84d5b..63e0f49af6d 100644 --- a/l10n/km/user_ldap.po +++ b/l10n/km/user_ldap.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-12 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 14:00+0000\n" "Last-Translator: I Robot\n" "Language-Team: Khmer (http://www.transifex.com/projects/p/owncloud/language/km/)\n" "MIME-Version: 1.0\n" @@ -284,7 +284,7 @@ msgstr "" #: templates/part.wizardcontrols.php:8 msgid "Continue" -msgstr "" +msgstr "បន្áž" #: templates/settings.php:11 msgid "" diff --git a/l10n/kn/settings.po b/l10n/kn/settings.po index b2914c0adc0..4d74debd3de 100644 --- a/l10n/kn/settings.po +++ b/l10n/kn/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-26 01:54-0400\n" -"PO-Revision-Date: 2014-04-26 05:54+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "" @@ -98,6 +98,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -114,6 +124,16 @@ msgstr "" msgid "Unable to delete user" msgstr "" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "" @@ -225,34 +245,42 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "" @@ -298,7 +326,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "" @@ -623,11 +651,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -791,18 +819,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "" diff --git a/l10n/ko/core.po b/l10n/ko/core.po index a929126a0fe..b8a8e3882dc 100644 --- a/l10n/ko/core.po +++ b/l10n/ko/core.po @@ -14,8 +14,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:02+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/ko/files_external.po b/l10n/ko/files_external.po index c598e0b35bf..bd64fdcbbe5 100644 --- a/l10n/ko/files_external.po +++ b/l10n/ko/files_external.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-07 01:55-0400\n" -"PO-Revision-Date: 2014-05-05 15:17+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: ì±…ì½ëŠ”달팽 <bjh13579@gmail.com>\n" "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n" "MIME-Version: 1.0\n" @@ -199,29 +199,29 @@ msgstr "Google ë“œë¼ì´ë¸Œ ì €ìž¥ì†Œ ì„¤ì • 오류" msgid "Saved" msgstr "ì €ìž¥ë¨" -#: lib/config.php:598 +#: lib/config.php:597 msgid "<b>Note:</b> " msgstr "" -#: lib/config.php:608 +#: lib/config.php:607 msgid " and " msgstr "" -#: lib/config.php:630 +#: lib/config.php:629 #, php-format msgid "" "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting " "of %s is not possible. Please ask your system administrator to install it." msgstr "" -#: lib/config.php:632 +#: lib/config.php:631 #, php-format msgid "" "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of" " %s is not possible. Please ask your system administrator to install it." msgstr "" -#: lib/config.php:634 +#: lib/config.php:633 #, php-format msgid "" "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please" diff --git a/l10n/ko/files_sharing.po b/l10n/ko/files_sharing.po index 5084a6a3430..8ff6d87393c 100644 --- a/l10n/ko/files_sharing.po +++ b/l10n/ko/files_sharing.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-04 01:55-0400\n" -"PO-Revision-Date: 2014-05-03 06:11+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n" "MIME-Version: 1.0\n" @@ -64,11 +64,11 @@ msgstr "ìžì„¸í•œ ì •ë³´ëŠ” ë§í¬ë¥¼ 보낸 사람ì—게 문ì˜í•˜ì‹ì‹œì˜¤." msgid "Download" msgstr "다운로드" -#: templates/public.php:53 +#: templates/public.php:52 #, php-format msgid "Download %s" msgstr "" -#: templates/public.php:57 +#: templates/public.php:56 msgid "Direct link" msgstr "ì§ì ‘ ë§í¬" diff --git a/l10n/ko/settings.po b/l10n/ko/settings.po index 9779b2905a2..49cd5ae7c08 100644 --- a/l10n/ko/settings.po +++ b/l10n/ko/settings.po @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-07 01:55-0400\n" -"PO-Revision-Date: 2014-05-05 15:17+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n" "MIME-Version: 1.0\n" @@ -56,7 +56,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "암호화" @@ -103,6 +103,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "ì´ë©”ì¼ ì €ìž¥ë¨" @@ -119,6 +129,16 @@ msgstr "ê·¸ë£¹ì„ ì‚ì œí• ìˆ˜ ì—†ìŒ" msgid "Unable to delete user" msgstr "사용ìžë¥¼ ì‚ì œí• ìˆ˜ ì—†ìŒ." +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "언어가 변경ë¨" @@ -230,34 +250,42 @@ msgstr "ì—…ë°ì´íŠ¸" msgid "Updated" msgstr "ì—…ë°ì´íŠ¸ë¨" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "프로필 사진 ì„ íƒ" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "매우 약한 암호" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "약한 암호" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "ê·¸ì € 그런 암호" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "ì¢‹ì€ ì•”í˜¸" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "ê°•ë ¥í•œ 암호" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "íŒŒì¼ ë³µí˜¸í™” 중... ì‹œê°„ì´ ê±¸ë¦´ ìˆ˜ë„ ìžˆìœ¼ë‹ˆ ê¸°ë‹¤ë ¤ 주ì‹ì‹œì˜¤." +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "ì‚ì œë¨" @@ -303,7 +331,7 @@ msgstr "올바른 암호를 ìž…ë ¥í•´ì•¼ 함" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "ê²½ê³ : ì‚¬ìš©ìž \"{user}\"ì˜ í™ˆ ë””ë ‰í„°ë¦¬ê°€ ì´ë¯¸ 존재합니다" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "í•œêµì–´" @@ -628,11 +656,11 @@ msgstr "ë” ì¤‘ìš”í•¨" msgid "Less" msgstr "ëœ ì¤‘ìš”í•¨" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "ë²„ì „" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -796,18 +824,33 @@ msgid "" "WebDAV</a>" msgstr "WebDAVë¡œ 파ì¼ì— ì ‘ê·¼í•˜ë ¤ë©´ <a href=\"%s\" target=\"_blank\">ì´ ì£¼ì†Œë¥¼ 사용하ì‹ì‹œì˜¤</a>" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "암호화 ì•±ì´ ë¹„í™œì„±í™”ë˜ì—ˆìŠµë‹ˆë‹¤. ëª¨ë“ íŒŒì¼ì„ 복호화해야 합니다." -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "ë¡œê·¸ì¸ ì•”í˜¸" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "ëª¨ë“ íŒŒì¼ ë³µí˜¸í™”" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "ë¡œê·¸ì¸ ì´ë¦„" diff --git a/l10n/ko/user_ldap.po b/l10n/ko/user_ldap.po index 25bb9527c8c..4872fc45a10 100644 --- a/l10n/ko/user_ldap.po +++ b/l10n/ko/user_ldap.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/ku_IQ/core.po b/l10n/ku_IQ/core.po index 4c2e3e5d925..8b5c5762c8e 100644 --- a/l10n/ku_IQ/core.po +++ b/l10n/ku_IQ/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:02+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/ku_IQ/files_external.po b/l10n/ku_IQ/files_external.po index 7baea72403e..27e55051f80 100644 --- a/l10n/ku_IQ/files_external.po +++ b/l10n/ku_IQ/files_external.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n" "MIME-Version: 1.0\n" @@ -197,29 +197,29 @@ msgstr "" msgid "Saved" msgstr "" -#: lib/config.php:598 +#: lib/config.php:597 msgid "<b>Note:</b> " msgstr "" -#: lib/config.php:608 +#: lib/config.php:607 msgid " and " msgstr "" -#: lib/config.php:630 +#: lib/config.php:629 #, php-format msgid "" "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting " "of %s is not possible. Please ask your system administrator to install it." msgstr "" -#: lib/config.php:632 +#: lib/config.php:631 #, php-format msgid "" "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of" " %s is not possible. Please ask your system administrator to install it." msgstr "" -#: lib/config.php:634 +#: lib/config.php:633 #, php-format msgid "" "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please" diff --git a/l10n/ku_IQ/files_sharing.po b/l10n/ku_IQ/files_sharing.po index 1c858219950..3d1f00d5442 100644 --- a/l10n/ku_IQ/files_sharing.po +++ b/l10n/ku_IQ/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-04 01:55-0400\n" -"PO-Revision-Date: 2014-05-03 06:12+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n" "MIME-Version: 1.0\n" @@ -61,11 +61,11 @@ msgstr "" msgid "Download" msgstr "داگرتن" -#: templates/public.php:53 +#: templates/public.php:52 #, php-format msgid "Download %s" msgstr "" -#: templates/public.php:57 +#: templates/public.php:56 msgid "Direct link" msgstr "" diff --git a/l10n/ku_IQ/settings.po b/l10n/ku_IQ/settings.po index aed4989ac6e..7b95bc53250 100644 --- a/l10n/ku_IQ/settings.po +++ b/l10n/ku_IQ/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "نهێنیکردن" @@ -98,6 +98,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -114,6 +124,16 @@ msgstr "" msgid "Unable to delete user" msgstr "" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "" @@ -225,34 +245,42 @@ msgstr "نوێکردنه‌وه" msgid "Updated" msgstr "" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "" @@ -298,7 +326,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "" @@ -623,11 +651,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -791,18 +819,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "چوونەژوورەوە" diff --git a/l10n/ku_IQ/user_ldap.po b/l10n/ku_IQ/user_ldap.po index fe975ee667d..df7aac2e22c 100644 --- a/l10n/ku_IQ/user_ldap.po +++ b/l10n/ku_IQ/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/lb/core.po b/l10n/lb/core.po index 72fd09a4f2c..61ad5ec9c7b 100644 --- a/l10n/lb/core.po +++ b/l10n/lb/core.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:02+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/lb/files_external.po b/l10n/lb/files_external.po index 99992791ce5..334d6bb94ce 100644 --- a/l10n/lb/files_external.po +++ b/l10n/lb/files_external.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:10+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n" "MIME-Version: 1.0\n" @@ -197,29 +197,29 @@ msgstr "" msgid "Saved" msgstr "" -#: lib/config.php:598 +#: lib/config.php:597 msgid "<b>Note:</b> " msgstr "" -#: lib/config.php:608 +#: lib/config.php:607 msgid " and " msgstr "" -#: lib/config.php:630 +#: lib/config.php:629 #, php-format msgid "" "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting " "of %s is not possible. Please ask your system administrator to install it." msgstr "" -#: lib/config.php:632 +#: lib/config.php:631 #, php-format msgid "" "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of" " %s is not possible. Please ask your system administrator to install it." msgstr "" -#: lib/config.php:634 +#: lib/config.php:633 #, php-format msgid "" "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please" diff --git a/l10n/lb/files_sharing.po b/l10n/lb/files_sharing.po index b721953d2f1..da450f66a35 100644 --- a/l10n/lb/files_sharing.po +++ b/l10n/lb/files_sharing.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-04 01:55-0400\n" -"PO-Revision-Date: 2014-05-03 06:11+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n" "MIME-Version: 1.0\n" @@ -62,11 +62,11 @@ msgstr "" msgid "Download" msgstr "Download" -#: templates/public.php:53 +#: templates/public.php:52 #, php-format msgid "Download %s" msgstr "" -#: templates/public.php:57 +#: templates/public.php:56 msgid "Direct link" msgstr "" diff --git a/l10n/lb/settings.po b/l10n/lb/settings.po index 69abfb6e00e..0a5221ae1e4 100644 --- a/l10n/lb/settings.po +++ b/l10n/lb/settings.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n" "MIME-Version: 1.0\n" @@ -52,7 +52,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "" @@ -99,6 +99,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "E-mail gespäichert" @@ -115,6 +125,16 @@ msgstr "Onmeiglech d'Grup ze läschen." msgid "Unable to delete user" msgstr "Onmeiglech User zu läschen." +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "Sprooch huet geännert" @@ -226,34 +246,42 @@ msgstr "Update" msgid "Updated" msgstr "" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "geläscht" @@ -299,7 +327,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "__language_name__" @@ -624,11 +652,11 @@ msgstr "Méi" msgid "Less" msgstr "Manner" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -792,18 +820,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "Login" diff --git a/l10n/lb/user_ldap.po b/l10n/lb/user_ldap.po index 387f494f464..6971cb0989c 100644 --- a/l10n/lb/user_ldap.po +++ b/l10n/lb/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/lt_LT/core.po b/l10n/lt_LT/core.po index 952a242a031..35124645f04 100644 --- a/l10n/lt_LT/core.po +++ b/l10n/lt_LT/core.po @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:02+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/lt_LT/files_external.po b/l10n/lt_LT/files_external.po index d37d063a0fb..3f8bf0269d3 100644 --- a/l10n/lt_LT/files_external.po +++ b/l10n/lt_LT/files_external.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n" "MIME-Version: 1.0\n" @@ -198,29 +198,29 @@ msgstr "Klaida nustatinÄ—jant Google Drive talpyklÄ…" msgid "Saved" msgstr "" -#: lib/config.php:598 +#: lib/config.php:597 msgid "<b>Note:</b> " msgstr "" -#: lib/config.php:608 +#: lib/config.php:607 msgid " and " msgstr "" -#: lib/config.php:630 +#: lib/config.php:629 #, php-format msgid "" "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting " "of %s is not possible. Please ask your system administrator to install it." msgstr "" -#: lib/config.php:632 +#: lib/config.php:631 #, php-format msgid "" "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of" " %s is not possible. Please ask your system administrator to install it." msgstr "" -#: lib/config.php:634 +#: lib/config.php:633 #, php-format msgid "" "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please" diff --git a/l10n/lt_LT/files_sharing.po b/l10n/lt_LT/files_sharing.po index aff746d830e..acc3188171a 100644 --- a/l10n/lt_LT/files_sharing.po +++ b/l10n/lt_LT/files_sharing.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-04 01:55-0400\n" -"PO-Revision-Date: 2014-05-03 06:11+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n" "MIME-Version: 1.0\n" @@ -64,11 +64,11 @@ msgstr "DÄ—l tikslesnÄ—s informacijos susisiekite su asmeniu atsiuntusiu nuorodÄ msgid "Download" msgstr "Atsisiųsti" -#: templates/public.php:53 +#: templates/public.php:52 #, php-format msgid "Download %s" msgstr "" -#: templates/public.php:57 +#: templates/public.php:56 msgid "Direct link" msgstr "TiesioginÄ— nuoroda" diff --git a/l10n/lt_LT/settings.po b/l10n/lt_LT/settings.po index b5a31cb84ba..f6b1c5492d7 100644 --- a/l10n/lt_LT/settings.po +++ b/l10n/lt_LT/settings.po @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n" "MIME-Version: 1.0\n" @@ -56,7 +56,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "Å ifravimas" @@ -103,6 +103,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "El. paÅ¡tas iÅ¡saugotas" @@ -119,6 +129,16 @@ msgstr "Nepavyko iÅ¡trinti grupÄ—s" msgid "Unable to delete user" msgstr "Nepavyko iÅ¡trinti vartotojo" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "Kalba pakeista" @@ -230,34 +250,42 @@ msgstr "Atnaujinti" msgid "Updated" msgstr "Atnaujinta" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "PažymÄ—kite profilio paveikslÄ—lį" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "IÅ¡Å¡ifruojami failai... PraÅ¡ome palaukti, tai gali užtrukti." +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "iÅ¡trinta" @@ -303,7 +331,7 @@ msgstr "Slaptažodis turi bÅ«ti tinkamas" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "Ä®spÄ—jimas: Vartotojo \"{user}\" namų aplankas jau egzistuoja" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "Kalba" @@ -628,11 +656,11 @@ msgstr "Daugiau" msgid "Less" msgstr "Mažiau" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "Versija" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -796,18 +824,33 @@ msgid "" "WebDAV</a>" msgstr "Naudokite šį adresÄ…, kad <a href=\"%s\" target=\"_blank\">pasiektumÄ—te savo failus per WebDAV</a>" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "Prisijungimo slaptažodis" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "IÅ¡Å¡ifruoti visus failus" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "Vartotojo vardas" diff --git a/l10n/lt_LT/user_ldap.po b/l10n/lt_LT/user_ldap.po index 52c6a7418ad..750692d401a 100644 --- a/l10n/lt_LT/user_ldap.po +++ b/l10n/lt_LT/user_ldap.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/lv/core.po b/l10n/lv/core.po index dca8b09ceca..269ea921332 100644 --- a/l10n/lv/core.po +++ b/l10n/lv/core.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:02+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/lv/files_external.po b/l10n/lv/files_external.po index 47d9f19c6fd..033e210d0f0 100644 --- a/l10n/lv/files_external.po +++ b/l10n/lv/files_external.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n" "MIME-Version: 1.0\n" @@ -198,29 +198,29 @@ msgstr "Kļūda, konfigurÄ“jot Google Drive krÄtuvi" msgid "Saved" msgstr "" -#: lib/config.php:598 +#: lib/config.php:597 msgid "<b>Note:</b> " msgstr "" -#: lib/config.php:608 +#: lib/config.php:607 msgid " and " msgstr "" -#: lib/config.php:630 +#: lib/config.php:629 #, php-format msgid "" "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting " "of %s is not possible. Please ask your system administrator to install it." msgstr "" -#: lib/config.php:632 +#: lib/config.php:631 #, php-format msgid "" "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of" " %s is not possible. Please ask your system administrator to install it." msgstr "" -#: lib/config.php:634 +#: lib/config.php:633 #, php-format msgid "" "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please" diff --git a/l10n/lv/files_sharing.po b/l10n/lv/files_sharing.po index f8368d733c1..8a8a8a22956 100644 --- a/l10n/lv/files_sharing.po +++ b/l10n/lv/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-04 01:55-0400\n" -"PO-Revision-Date: 2014-05-03 06:12+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n" "MIME-Version: 1.0\n" @@ -61,11 +61,11 @@ msgstr "" msgid "Download" msgstr "LejupielÄdÄ“t" -#: templates/public.php:53 +#: templates/public.php:52 #, php-format msgid "Download %s" msgstr "" -#: templates/public.php:57 +#: templates/public.php:56 msgid "Direct link" msgstr "" diff --git a/l10n/lv/settings.po b/l10n/lv/settings.po index dcbc92544ec..2d4e7f783cc 100644 --- a/l10n/lv/settings.po +++ b/l10n/lv/settings.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n" "MIME-Version: 1.0\n" @@ -52,7 +52,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "Å ifrÄ“Å¡ana" @@ -99,6 +99,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "E-pasts tika saglabÄts" @@ -115,6 +125,16 @@ msgstr "Nevar izdzÄ“st grupu" msgid "Unable to delete user" msgstr "Nevar izdzÄ“st lietotÄju" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "Valoda tika nomainÄ«ta" @@ -226,34 +246,42 @@ msgstr "AtjauninÄt" msgid "Updated" msgstr "AtjauninÄta" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "AtÅ¡ifrÄ“ju failus... Uzgaidiet tas var ilgt kÄdu laiku." +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "izdzests" @@ -299,7 +327,7 @@ msgstr "JÄnorÄda derÄ«ga parole" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "__valodas_nosaukums__" @@ -624,11 +652,11 @@ msgstr "VairÄk" msgid "Less" msgstr "MazÄk" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "Versija" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -792,18 +820,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "PieslÄ“gÅ¡anÄs parole" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "AtÅ¡ifrÄ“t visus failus" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "IerakstÄ«Å¡anÄs vÄrds" diff --git a/l10n/lv/user_ldap.po b/l10n/lv/user_ldap.po index 2834b8846a2..0cf5929b190 100644 --- a/l10n/lv/user_ldap.po +++ b/l10n/lv/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/mk/core.po b/l10n/mk/core.po index 1514e6d523d..ac2a4863d35 100644 --- a/l10n/mk/core.po +++ b/l10n/mk/core.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:02+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:01+0000\n" "Last-Translator: I Robot\n" "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/mk/files_external.po b/l10n/mk/files_external.po index fb8b8b320e9..e5f5e0dc218 100644 --- a/l10n/mk/files_external.po +++ b/l10n/mk/files_external.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n" "MIME-Version: 1.0\n" @@ -197,29 +197,29 @@ msgstr "Грешка при конфигурација на Google Drive" msgid "Saved" msgstr "" -#: lib/config.php:598 +#: lib/config.php:597 msgid "<b>Note:</b> " msgstr "" -#: lib/config.php:608 +#: lib/config.php:607 msgid " and " msgstr "" -#: lib/config.php:630 +#: lib/config.php:629 #, php-format msgid "" "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting " "of %s is not possible. Please ask your system administrator to install it." msgstr "" -#: lib/config.php:632 +#: lib/config.php:631 #, php-format msgid "" "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of" " %s is not possible. Please ask your system administrator to install it." msgstr "" -#: lib/config.php:634 +#: lib/config.php:633 #, php-format msgid "" "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please" diff --git a/l10n/mk/files_sharing.po b/l10n/mk/files_sharing.po index e2db790c644..0e87f28ba0d 100644 --- a/l10n/mk/files_sharing.po +++ b/l10n/mk/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-04 01:55-0400\n" -"PO-Revision-Date: 2014-05-03 06:11+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n" "MIME-Version: 1.0\n" @@ -61,11 +61,11 @@ msgstr "" msgid "Download" msgstr "Преземи" -#: templates/public.php:53 +#: templates/public.php:52 #, php-format msgid "Download %s" msgstr "" -#: templates/public.php:57 +#: templates/public.php:56 msgid "Direct link" msgstr "" diff --git a/l10n/mk/settings.po b/l10n/mk/settings.po index d95df2458f1..b8ed6cc23ee 100644 --- a/l10n/mk/settings.po +++ b/l10n/mk/settings.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n" "MIME-Version: 1.0\n" @@ -52,7 +52,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "Енкрипција" @@ -99,6 +99,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "ЕлектронÑката пошта е Ñнимена" @@ -115,6 +125,16 @@ msgstr "Ðеможе да избришам група" msgid "Unable to delete user" msgstr "Ðеможам да избришам кориÑник" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "Јазикот е Ñменет" @@ -226,34 +246,42 @@ msgstr "Ðжурирај" msgid "Updated" msgstr "Ðадграден" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "Одбери фотографија за профилот" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "избришан" @@ -299,7 +327,7 @@ msgstr "Мора да Ñе обезбеди валидна лозинка" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "__language_name__" @@ -624,11 +652,11 @@ msgstr "Повеќе" msgid "Less" msgstr "Помалку" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "Верзија" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -792,18 +820,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "Лозинка за најавување" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "Дешифрирај ги Ñите датотеки" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "Име за најава" diff --git a/l10n/mk/user_ldap.po b/l10n/mk/user_ldap.po index 3540c3e664c..83912cb320e 100644 --- a/l10n/mk/user_ldap.po +++ b/l10n/mk/user_ldap.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/ml/settings.po b/l10n/ml/settings.po index 9c4432176ca..44fbe3297cb 100644 --- a/l10n/ml/settings.po +++ b/l10n/ml/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-26 01:54-0400\n" -"PO-Revision-Date: 2014-04-26 05:54+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Malayalam (http://www.transifex.com/projects/p/owncloud/language/ml/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "" @@ -98,6 +98,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -114,6 +124,16 @@ msgstr "" msgid "Unable to delete user" msgstr "" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "" @@ -225,34 +245,42 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "" @@ -298,7 +326,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "" @@ -623,11 +651,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -791,18 +819,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "" diff --git a/l10n/ml_IN/settings.po b/l10n/ml_IN/settings.po index 0e584edd601..b58d48f248a 100644 --- a/l10n/ml_IN/settings.po +++ b/l10n/ml_IN/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-26 01:54-0400\n" -"PO-Revision-Date: 2014-04-26 05:54+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Malayalam (India) (http://www.transifex.com/projects/p/owncloud/language/ml_IN/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "" @@ -98,6 +98,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -114,6 +124,16 @@ msgstr "" msgid "Unable to delete user" msgstr "" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "" @@ -225,34 +245,42 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "" @@ -298,7 +326,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "" @@ -623,11 +651,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -791,18 +819,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "" diff --git a/l10n/mn/settings.po b/l10n/mn/settings.po index 5b2d9dcaf46..42583be4d37 100644 --- a/l10n/mn/settings.po +++ b/l10n/mn/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-26 01:54-0400\n" -"PO-Revision-Date: 2014-04-26 05:54+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Mongolian (http://www.transifex.com/projects/p/owncloud/language/mn/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "" @@ -98,6 +98,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -114,6 +124,16 @@ msgstr "" msgid "Unable to delete user" msgstr "" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "" @@ -225,34 +245,42 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "" @@ -298,7 +326,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "" @@ -623,11 +651,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -791,18 +819,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "" diff --git a/l10n/ms_MY/core.po b/l10n/ms_MY/core.po index 26b822f3855..8557c2acf1d 100644 --- a/l10n/ms_MY/core.po +++ b/l10n/ms_MY/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:02+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/ms_MY/files_external.po b/l10n/ms_MY/files_external.po index 5b27738bc97..ca182f0ce29 100644 --- a/l10n/ms_MY/files_external.po +++ b/l10n/ms_MY/files_external.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:10+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n" "MIME-Version: 1.0\n" @@ -197,29 +197,29 @@ msgstr "" msgid "Saved" msgstr "" -#: lib/config.php:598 +#: lib/config.php:597 msgid "<b>Note:</b> " msgstr "" -#: lib/config.php:608 +#: lib/config.php:607 msgid " and " msgstr "" -#: lib/config.php:630 +#: lib/config.php:629 #, php-format msgid "" "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting " "of %s is not possible. Please ask your system administrator to install it." msgstr "" -#: lib/config.php:632 +#: lib/config.php:631 #, php-format msgid "" "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of" " %s is not possible. Please ask your system administrator to install it." msgstr "" -#: lib/config.php:634 +#: lib/config.php:633 #, php-format msgid "" "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please" diff --git a/l10n/ms_MY/files_sharing.po b/l10n/ms_MY/files_sharing.po index 16aae3a399e..6eb142f93b6 100644 --- a/l10n/ms_MY/files_sharing.po +++ b/l10n/ms_MY/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-04 01:55-0400\n" -"PO-Revision-Date: 2014-05-03 06:11+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n" "MIME-Version: 1.0\n" @@ -61,11 +61,11 @@ msgstr "" msgid "Download" msgstr "Muat turun" -#: templates/public.php:53 +#: templates/public.php:52 #, php-format msgid "Download %s" msgstr "" -#: templates/public.php:57 +#: templates/public.php:56 msgid "Direct link" msgstr "" diff --git a/l10n/ms_MY/settings.po b/l10n/ms_MY/settings.po index 47f87095856..177b5c92c09 100644 --- a/l10n/ms_MY/settings.po +++ b/l10n/ms_MY/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "" @@ -98,6 +98,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "Emel disimpan" @@ -114,6 +124,16 @@ msgstr "" msgid "Unable to delete user" msgstr "" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "Bahasa diubah" @@ -225,34 +245,42 @@ msgstr "Kemaskini" msgid "Updated" msgstr "" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "dihapus" @@ -298,7 +326,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "_nama_bahasa_" @@ -623,11 +651,11 @@ msgstr "Lanjutan" msgid "Less" msgstr "" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -791,18 +819,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "Log masuk" diff --git a/l10n/ms_MY/user_ldap.po b/l10n/ms_MY/user_ldap.po index 56dbadc8b64..be1b3a27600 100644 --- a/l10n/ms_MY/user_ldap.po +++ b/l10n/ms_MY/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/my_MM/core.po b/l10n/my_MM/core.po index 57da0a700ef..fb60c87ff17 100644 --- a/l10n/my_MM/core.po +++ b/l10n/my_MM/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:02+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/my_MM/files_external.po b/l10n/my_MM/files_external.po index 1a4e8bcfac2..13331de1a10 100644 --- a/l10n/my_MM/files_external.po +++ b/l10n/my_MM/files_external.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n" "MIME-Version: 1.0\n" @@ -197,29 +197,29 @@ msgstr "" msgid "Saved" msgstr "" -#: lib/config.php:598 +#: lib/config.php:597 msgid "<b>Note:</b> " msgstr "" -#: lib/config.php:608 +#: lib/config.php:607 msgid " and " msgstr "" -#: lib/config.php:630 +#: lib/config.php:629 #, php-format msgid "" "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting " "of %s is not possible. Please ask your system administrator to install it." msgstr "" -#: lib/config.php:632 +#: lib/config.php:631 #, php-format msgid "" "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of" " %s is not possible. Please ask your system administrator to install it." msgstr "" -#: lib/config.php:634 +#: lib/config.php:633 #, php-format msgid "" "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please" diff --git a/l10n/my_MM/files_sharing.po b/l10n/my_MM/files_sharing.po index 8664c543ee4..7e19305cb79 100644 --- a/l10n/my_MM/files_sharing.po +++ b/l10n/my_MM/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-04 01:55-0400\n" -"PO-Revision-Date: 2014-05-03 06:11+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n" "MIME-Version: 1.0\n" @@ -61,11 +61,11 @@ msgstr "" msgid "Download" msgstr "ဒေါင်းလုá€á€º" -#: templates/public.php:53 +#: templates/public.php:52 #, php-format msgid "Download %s" msgstr "" -#: templates/public.php:57 +#: templates/public.php:56 msgid "Direct link" msgstr "" diff --git a/l10n/my_MM/settings.po b/l10n/my_MM/settings.po index fdc7a2cb400..0687b5c027b 100644 --- a/l10n/my_MM/settings.po +++ b/l10n/my_MM/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "" @@ -98,6 +98,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -114,6 +124,16 @@ msgstr "" msgid "Unable to delete user" msgstr "" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "" @@ -225,34 +245,42 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "" @@ -298,7 +326,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "" @@ -623,11 +651,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -791,18 +819,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "" diff --git a/l10n/my_MM/user_ldap.po b/l10n/my_MM/user_ldap.po index a720ea8b9cd..c2bb822b898 100644 --- a/l10n/my_MM/user_ldap.po +++ b/l10n/my_MM/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/nb_NO/core.po b/l10n/nb_NO/core.po index 84e452107ff..60be9f1a051 100644 --- a/l10n/nb_NO/core.po +++ b/l10n/nb_NO/core.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:02+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Norwegian BokmÃ¥l (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/nb_NO/files_external.po b/l10n/nb_NO/files_external.po index 0a858716ef0..9a7e719a1bc 100644 --- a/l10n/nb_NO/files_external.po +++ b/l10n/nb_NO/files_external.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-01 01:55-0400\n" -"PO-Revision-Date: 2014-04-30 11:40+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: dizzi90 <dizzi90@gmail.com>\n" "Language-Team: Norwegian BokmÃ¥l (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n" "MIME-Version: 1.0\n" @@ -199,29 +199,29 @@ msgstr "Feil med konfigurering av Google Drive" msgid "Saved" msgstr "Lagret" -#: lib/config.php:598 +#: lib/config.php:597 msgid "<b>Note:</b> " msgstr "<b>Notat:</b> " -#: lib/config.php:608 +#: lib/config.php:607 msgid " and " msgstr "og" -#: lib/config.php:630 +#: lib/config.php:629 #, php-format msgid "" "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting " "of %s is not possible. Please ask your system administrator to install it." msgstr "<b>Merk:</b> Støtte for cURL i PHP er ikke aktivert eller installert. Montering av %s er ikke mulig. Be systemadministratoren om Ã¥ installere det." -#: lib/config.php:632 +#: lib/config.php:631 #, php-format msgid "" "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of" " %s is not possible. Please ask your system administrator to install it." msgstr "<b>Merk:</b> FTP støtte i PHP er ikke slÃ¥tt pÃ¥ eller innstallert. Kan ikke montere %s. Ta kontakt med din systemadministrator for Ã¥ installere det." -#: lib/config.php:634 +#: lib/config.php:633 #, php-format msgid "" "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please" diff --git a/l10n/nb_NO/files_sharing.po b/l10n/nb_NO/files_sharing.po index 65c7005a429..ccfe56e2a58 100644 --- a/l10n/nb_NO/files_sharing.po +++ b/l10n/nb_NO/files_sharing.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-04 01:55-0400\n" -"PO-Revision-Date: 2014-05-03 06:12+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Norwegian BokmÃ¥l (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n" "MIME-Version: 1.0\n" @@ -63,11 +63,11 @@ msgstr "For mer informasjon, spør personen som sendte lenken." msgid "Download" msgstr "Last ned" -#: templates/public.php:53 +#: templates/public.php:52 #, php-format msgid "Download %s" msgstr "" -#: templates/public.php:57 +#: templates/public.php:56 msgid "Direct link" msgstr "Direkte lenke" diff --git a/l10n/nb_NO/settings.po b/l10n/nb_NO/settings.po index 67a8d3f2b1e..f237d066e17 100644 --- a/l10n/nb_NO/settings.po +++ b/l10n/nb_NO/settings.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Norwegian BokmÃ¥l (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n" "MIME-Version: 1.0\n" @@ -55,7 +55,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "Kryptering" @@ -102,6 +102,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "Epost lagret" @@ -118,6 +128,16 @@ msgstr "Kan ikke slette gruppe" msgid "Unable to delete user" msgstr "Kan ikke slette bruker" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "SprÃ¥k endret" @@ -229,34 +249,42 @@ msgstr "Oppdater" msgid "Updated" msgstr "Oppdatert" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "Velg et profilbilde" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "Veldig svakt passord" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "Svakt passord" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "Bra passord" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "Sterkt passord" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "Dekrypterer filer... Vennligst vent, dette kan ta litt tid." +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "slettet" @@ -302,7 +330,7 @@ msgstr "Oppgi et gyldig passord" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "Advarsel: Hjemmemappe for bruker \"{user}\" eksisterer allerede" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "__language_name__" @@ -627,11 +655,11 @@ msgstr "Mer" msgid "Less" msgstr "Mindre" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "Versjon" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -795,18 +823,33 @@ msgid "" "WebDAV</a>" msgstr "Bruk denne adressen for Ã¥ <a href=\"%s\" target=\"_blank\">aksessere filene dine via WebDAV</a>" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "Krypterings-appen er ikke aktiv lenger. Vennligst dekrypter alle filene dine" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "Innloggingspassord" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "Dekrypter alle filer" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "Logginn navn" diff --git a/l10n/nb_NO/user_ldap.po b/l10n/nb_NO/user_ldap.po index 3c1e77798f9..b901f157957 100644 --- a/l10n/nb_NO/user_ldap.po +++ b/l10n/nb_NO/user_ldap.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Norwegian BokmÃ¥l (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/nds/settings.po b/l10n/nds/settings.po index aca2bdf5836..10ee5ff5823 100644 --- a/l10n/nds/settings.po +++ b/l10n/nds/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-26 01:54-0400\n" -"PO-Revision-Date: 2014-04-26 05:54+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Low German (http://www.transifex.com/projects/p/owncloud/language/nds/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "" @@ -98,6 +98,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -114,6 +124,16 @@ msgstr "" msgid "Unable to delete user" msgstr "" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "" @@ -225,34 +245,42 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "" @@ -298,7 +326,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "" @@ -623,11 +651,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -791,18 +819,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "" diff --git a/l10n/ne/settings.po b/l10n/ne/settings.po index c232c9c8c40..34e7295ff7a 100644 --- a/l10n/ne/settings.po +++ b/l10n/ne/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-26 01:54-0400\n" -"PO-Revision-Date: 2014-04-26 05:54+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "" @@ -98,6 +98,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -114,6 +124,16 @@ msgstr "" msgid "Unable to delete user" msgstr "" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "" @@ -225,34 +245,42 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "" @@ -298,7 +326,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "" @@ -623,11 +651,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -791,18 +819,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "" diff --git a/l10n/nl/core.po b/l10n/nl/core.po index 6f77db706fa..ff7a56a481c 100644 --- a/l10n/nl/core.po +++ b/l10n/nl/core.po @@ -4,15 +4,15 @@ # # Translators: # André Koot <meneer@tken.net>, 2013-2014 -# kwillems <kwillems@zonnet.nl>, 2013 +# kwillems <kwillems@zonnet.nl>, 2013-2014 # Jorcee <mail@jordyc.nl>, 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 09:59+0000\n" -"Last-Translator: I Robot\n" +"POT-Creation-Date: 2014-05-12 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 19:10+0000\n" +"Last-Translator: kwillems <kwillems@zonnet.nl>\n" "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -412,7 +412,7 @@ msgstr "Wachtwoord beveiligd" #: js/share.js:734 msgid "Error unsetting expiration date" -msgstr "Fout tijdens het verwijderen van de verval datum" +msgstr "Fout tijdens het verwijderen van de vervaldatum" #: js/share.js:752 msgid "Error setting expiration date" @@ -467,11 +467,11 @@ msgid "" "The update was unsuccessful. Please report this issue to the <a " "href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud " "community</a>." -msgstr "De update is niet geslaagd. Meld dit probleem aan bij de <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." +msgstr "De update is niet geslaagd. Meld dit probleem bij de <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." #: js/update.js:21 msgid "The update was successful. Redirecting you to ownCloud now." -msgstr "De update is geslaagd. Je wordt teruggeleid naar je eigen ownCloud." +msgstr "De update is geslaagd. U wordt teruggeleid naar uw eigen ownCloud." #: lostpassword/controller.php:70 #, php-format @@ -486,22 +486,22 @@ msgstr "Er ontstond een probleem bij het versturen van het e-mailbericht, neem c #: lostpassword/templates/email.php:2 msgid "Use the following link to reset your password: {link}" -msgstr "Gebruik de volgende link om je wachtwoord te resetten: {link}" +msgstr "Gebruik de volgende link om uw wachtwoord te resetten: {link}" #: lostpassword/templates/lostpassword.php:7 msgid "" "The link to reset your password has been sent to your email.<br>If you do " "not receive it within a reasonable amount of time, check your spam/junk " "folders.<br>If it is not there ask your local administrator ." -msgstr "De link voor het resetten van je wachtwoord is verzonden naar je e-mailadres.<br>Als je dat bericht niet snel ontvangen hebt, controleer dan uw spambakje.<br>Als het daar ook niet is, vraag dan je beheerder om te helpen." +msgstr "De link voor het resetten van uw wachtwoord is verzonden naar uw e-mailadres.<br>Als u dat bericht niet snel ontvangen hebt, controleer dan uw spammap.<br>Als het daar ook niet is, vraag dan uw beheerder om hulp." #: lostpassword/templates/lostpassword.php:15 msgid "Request failed!<br>Did you make sure your email/username was right?" -msgstr "Aanvraag mislukt!<br>Weet je zeker dat je gebruikersnaam en/of wachtwoord goed waren?" +msgstr "Aanvraag mislukt!<br>Weet u zeker dat uw gebruikersnaam en/of wachtwoord goed waren?" #: lostpassword/templates/lostpassword.php:18 msgid "You will receive a link to reset your password via Email." -msgstr "Je ontvangt een link om je wachtwoord opnieuw in te stellen via e-mail." +msgstr "U ontvangt een link om uw wachtwoord opnieuw in te stellen via e-mail." #: lostpassword/templates/lostpassword.php:21 templates/installation.php:53 #: templates/login.php:32 @@ -514,7 +514,7 @@ msgid "" "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?" -msgstr "Je bestanden zijn versleuteld. Als je geen recoverykey hebt ingeschakeld is er geen manier om je data terug te krijgen indien je je wachtwoord reset!\nAls je niet weet wat te doen, neem dan alsjeblieft contact op met je administrator eer je doorgaat.\nWil je echt doorgaan?" +msgstr "Uw bestanden zijn versleuteld. Als u geen recoverykey hebt ingeschakeld is er geen manier om uw data terug te krijgen na het resetten van uw wachtwoord.\nAls u niet weet wat u moet doen, neem dan alstublieft contact op met uw systeembeheerder voordat u doorgaat.\nWil u echt doorgaan?" #: lostpassword/templates/lostpassword.php:27 msgid "Yes, I really want to reset my password now" @@ -526,7 +526,7 @@ msgstr "Reset" #: lostpassword/templates/resetpassword.php:4 msgid "Your password was reset" -msgstr "Je wachtwoord is gewijzigd" +msgstr "Uw wachtwoord is gewijzigd" #: lostpassword/templates/resetpassword.php:5 msgid "To login page" @@ -616,7 +616,7 @@ msgid "" "just letting you know that %s shared %s with you.\n" "View it: %s\n" "\n" -msgstr "Hallo daar,\n\neven een berichtje dat %s %s met u deelde.\nBekijk het: %s\n\n" +msgstr "Hallo,\n\n%s deelt %s met u.\nBekijk het: %s\n\n" #: templates/altmail.php:4 templates/mail.php:17 #, php-format @@ -634,7 +634,7 @@ msgstr "Beveiligingswaarschuwing" #: templates/installation.php:26 msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" -msgstr "Je PHP-versie is kwetsbaar voor de NULL byte aanval (CVE-2006-7243)" +msgstr "Uw PHP-versie is kwetsbaar voor de NULL byte aanval (CVE-2006-7243)" #: templates/installation.php:27 #, php-format @@ -657,7 +657,7 @@ msgstr "Zonder random nummer generator is het mogelijk voor een aanvaller om de msgid "" "Your data directory and files are probably accessible from the internet " "because the .htaccess file does not work." -msgstr "Je gegevensdirectory en bestanden zijn vermoedelijk bereikbaar vanaf het internet omdat het .htaccess-bestand niet werkt." +msgstr "Uw gegevensdirectory en bestanden zijn vermoedelijk bereikbaar vanaf het internet omdat het .htaccess-bestand niet functioneert." #: templates/installation.php:42 #, php-format @@ -719,7 +719,7 @@ msgid "" "This application requires JavaScript to be enabled for correct operation. " "Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable " "JavaScript</a> and re-load this interface." -msgstr "Deze applicatie heeft een werkend JavaScript nodig. <a href=\"http://enable-javascript.com/\" target=\"_blank\">activeer JavaScript</a> en herlaad deze interface." +msgstr "Deze applicatie heeft JavaScript nodig om correct te functioneren. <a href=\"http://enable-javascript.com/\" target=\"_blank\">Activeer JavaScript</a> en herlaad deze interface." #: templates/layout.user.php:44 #, php-format @@ -738,11 +738,11 @@ msgstr "Automatische aanmelding geweigerd!" msgid "" "If you did not change your password recently, your account may be " "compromised!" -msgstr "Als je je wachtwoord niet onlangs heeft aangepast, kan je account overgenomen zijn!" +msgstr "Als u uw wachtwoord niet onlangs heeft aangepast, kan uw account overgenomen zijn!" #: templates/login.php:12 msgid "Please change your password to secure your account again." -msgstr "Wijzig je wachtwoord zodat je account weer beveiligd is." +msgstr "Wijzig uw wachtwoord zodat uw account weer beveiligd is." #: templates/login.php:17 msgid "Server side authentication failed!" @@ -762,7 +762,7 @@ msgstr "onthoud gegevens" #: templates/login.php:54 msgid "Log in" -msgstr "Meld je aan" +msgstr "Meld u aan" #: templates/login.php:60 msgid "Alternative Logins" @@ -773,7 +773,7 @@ msgstr "Alternatieve inlogs" msgid "" "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> " "with you.<br><a href=\"%s\">View it!</a><br><br>" -msgstr "Hallo daar,<br><br>we willen even laten weten dat %s <strong>%s</strong> met u heeft gedeeld.<br><a href=\"%s\">Bekijk het!</a><br><br>" +msgstr "Hallo,<br><br>%s deelt <strong>%s</strong> met u.<br><a href=\"%s\">Bekijk het!</a><br><br>" #: templates/singleuser.user.php:3 msgid "This ownCloud instance is currently in single user mode." diff --git a/l10n/nl/files_external.po b/l10n/nl/files_external.po index bf470c0837e..3bf1de09782 100644 --- a/l10n/nl/files_external.po +++ b/l10n/nl/files_external.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 09:59+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: André Koot <meneer@tken.net>\n" "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n" "MIME-Version: 1.0\n" @@ -198,29 +198,29 @@ msgstr "Fout tijdens het configureren van Google Drive opslag" msgid "Saved" msgstr "Bewaard" -#: lib/config.php:598 +#: lib/config.php:597 msgid "<b>Note:</b> " msgstr "<b>Let op:</b> " -#: lib/config.php:608 +#: lib/config.php:607 msgid " and " msgstr "en" -#: lib/config.php:630 +#: lib/config.php:629 #, php-format msgid "" "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting " "of %s is not possible. Please ask your system administrator to install it." msgstr "<b>Let op:</b> Curl ondersteuning in PHP is niet geactiveerd of geïnstalleerd. Mounten van %s is niet mogelijk. Vraag uw systeembeheerder dit te installeren." -#: lib/config.php:632 +#: lib/config.php:631 #, php-format msgid "" "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of" " %s is not possible. Please ask your system administrator to install it." msgstr "<b>Let op:</b> FTP ondersteuning in PHP is niet geactiveerd of geïnstalleerd. Mounten van %s is niet mogelijk. Vraag uw beheerder dit te installeren." -#: lib/config.php:634 +#: lib/config.php:633 #, php-format msgid "" "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please" diff --git a/l10n/nl/files_sharing.po b/l10n/nl/files_sharing.po index 7355d565606..99482488b99 100644 --- a/l10n/nl/files_sharing.po +++ b/l10n/nl/files_sharing.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-04 01:55-0400\n" -"PO-Revision-Date: 2014-05-03 06:12+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n" "MIME-Version: 1.0\n" @@ -63,11 +63,11 @@ msgstr "Voor meer informatie, neem contact op met de persoon die u deze link hee msgid "Download" msgstr "Downloaden" -#: templates/public.php:53 +#: templates/public.php:52 #, php-format msgid "Download %s" msgstr "Download %s" -#: templates/public.php:57 +#: templates/public.php:56 msgid "Direct link" msgstr "Directe link" diff --git a/l10n/nl/settings.po b/l10n/nl/settings.po index 8295ce6a75d..fa483d9f6bc 100644 --- a/l10n/nl/settings.po +++ b/l10n/nl/settings.po @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 09:59+0000\n" -"Last-Translator: André Koot <meneer@tken.net>\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" +"Last-Translator: I Robot\n" "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -55,7 +55,7 @@ msgstr "U moet uw e-mailadres instellen voordat u testberichten kunt versturen." msgid "Send mode" msgstr "Verstuurmodus" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "Versleuteling" @@ -102,6 +102,16 @@ msgstr "Kon uw bestanden niet ontsleutelem. Controleer uw owncloud logs of vraag msgid "Couldn't decrypt your files, check your password and try again" msgstr "Kon uw bestanden niet ontsleutelen. Controleer uw wachtwoord en probeer het opnieuw" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "E-mail bewaard" @@ -118,6 +128,16 @@ msgstr "Niet in staat om groep te verwijderen" msgid "Unable to delete user" msgstr "Niet in staat om gebruiker te verwijderen" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "Taal aangepast" @@ -229,34 +249,42 @@ msgstr "Bijwerken" msgid "Updated" msgstr "Bijgewerkt" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "Kies een profielafbeelding" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "Zeer zwak wachtwoord" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "Zwak wachtwoord" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "Matig wachtwoord" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "Goed wachtwoord" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "Sterk wachtwoord" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "Bestanden worden gedecodeerd... Even geduld alstublieft, dit kan even duren." +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "verwijderd" @@ -302,7 +330,7 @@ msgstr "Er moet een geldig wachtwoord worden opgegeven" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "Waarschuwing: Home directory voor gebruiker \"{user}\" bestaat al" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "Nederlands" @@ -627,11 +655,11 @@ msgstr "Meer" msgid "Less" msgstr "Minder" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "Versie" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -795,18 +823,33 @@ msgid "" "WebDAV</a>" msgstr "Gebruik deze link <a href=\"%s\" target=\"_blank\">om uw bestanden via WebDAV te benaderen</a>" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "De crypto app is niet langer geactiveerd, u moet alle bestanden decrypten." -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "Inlog-wachtwoord" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "Decodeer alle bestanden" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "Inlognaam" diff --git a/l10n/nl/user_ldap.po b/l10n/nl/user_ldap.po index 37b6230cbfb..3bf3618ac59 100644 --- a/l10n/nl/user_ldap.po +++ b/l10n/nl/user_ldap.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 09:59+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: André Koot <meneer@tken.net>\n" "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/nn_NO/core.po b/l10n/nn_NO/core.po index 7ea8af05931..a29ddf9b453 100644 --- a/l10n/nn_NO/core.po +++ b/l10n/nn_NO/core.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-01 01:55-0400\n" -"PO-Revision-Date: 2014-04-30 14:20+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: brekkjen <leif.brekke@oppstryn.no>\n" "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/nn_NO/files_external.po b/l10n/nn_NO/files_external.po index f2cf1bf5c7a..cb1ebff0aef 100644 --- a/l10n/nn_NO/files_external.po +++ b/l10n/nn_NO/files_external.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-01 01:55-0400\n" -"PO-Revision-Date: 2014-04-30 14:10+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n" "MIME-Version: 1.0\n" @@ -197,29 +197,29 @@ msgstr "" msgid "Saved" msgstr "" -#: lib/config.php:598 +#: lib/config.php:597 msgid "<b>Note:</b> " msgstr "" -#: lib/config.php:608 +#: lib/config.php:607 msgid " and " msgstr "" -#: lib/config.php:630 +#: lib/config.php:629 #, php-format msgid "" "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting " "of %s is not possible. Please ask your system administrator to install it." msgstr "" -#: lib/config.php:632 +#: lib/config.php:631 #, php-format msgid "" "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of" " %s is not possible. Please ask your system administrator to install it." msgstr "" -#: lib/config.php:634 +#: lib/config.php:633 #, php-format msgid "" "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please" diff --git a/l10n/nn_NO/files_sharing.po b/l10n/nn_NO/files_sharing.po index 36b39a6c212..c9d03bc9c38 100644 --- a/l10n/nn_NO/files_sharing.po +++ b/l10n/nn_NO/files_sharing.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-04 01:55-0400\n" -"PO-Revision-Date: 2014-05-03 06:11+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n" "MIME-Version: 1.0\n" @@ -62,11 +62,11 @@ msgstr "Spør den som sende deg lenkje om du vil ha meir informasjon." msgid "Download" msgstr "Last ned" -#: templates/public.php:53 +#: templates/public.php:52 #, php-format msgid "Download %s" msgstr "" -#: templates/public.php:57 +#: templates/public.php:56 msgid "Direct link" msgstr "" diff --git a/l10n/nn_NO/settings.po b/l10n/nn_NO/settings.po index f2823c996ba..730f8b73e35 100644 --- a/l10n/nn_NO/settings.po +++ b/l10n/nn_NO/settings.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n" "MIME-Version: 1.0\n" @@ -54,7 +54,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "Kryptering" @@ -101,6 +101,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "E-postadresse lagra" @@ -117,6 +127,16 @@ msgstr "Klarte ikkje Ã¥ sletta gruppa" msgid "Unable to delete user" msgstr "Klarte ikkje sletta brukaren" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "SprÃ¥k endra" @@ -228,34 +248,42 @@ msgstr "Oppdater" msgid "Updated" msgstr "Oppdatert" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "Vel eit profilbilete" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "Dekrypterer filer … Ver venleg og vent, dette kan ta ei stund." +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "sletta" @@ -301,7 +329,7 @@ msgstr "Du mÃ¥ oppgje eit gyldig passord" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "Nynorsk" @@ -626,11 +654,11 @@ msgstr "Meir" msgid "Less" msgstr "Mindre" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "UtgÃ¥ve" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -794,18 +822,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "Innloggingspassord" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "Dekrypter alle filene" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "Innloggingsnamn" diff --git a/l10n/nn_NO/user_ldap.po b/l10n/nn_NO/user_ldap.po index f8501e7e953..f5f690285c6 100644 --- a/l10n/nn_NO/user_ldap.po +++ b/l10n/nn_NO/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/nqo/settings.po b/l10n/nqo/settings.po index 57d51e38919..de9c8620490 100644 --- a/l10n/nqo/settings.po +++ b/l10n/nqo/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-26 01:54-0400\n" -"PO-Revision-Date: 2014-04-26 05:54+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: N'ko (http://www.transifex.com/projects/p/owncloud/language/nqo/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "" @@ -98,6 +98,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -114,6 +124,16 @@ msgstr "" msgid "Unable to delete user" msgstr "" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "" @@ -225,34 +245,42 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "" @@ -298,7 +326,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "" @@ -623,11 +651,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -791,18 +819,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "" diff --git a/l10n/oc/core.po b/l10n/oc/core.po index db505501bd7..60b1fbec3d6 100644 --- a/l10n/oc/core.po +++ b/l10n/oc/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:02+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:01+0000\n" "Last-Translator: I Robot\n" "Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/oc/files_external.po b/l10n/oc/files_external.po index d2376966940..4eba8f4e4f9 100644 --- a/l10n/oc/files_external.po +++ b/l10n/oc/files_external.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:10+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n" "MIME-Version: 1.0\n" @@ -197,29 +197,29 @@ msgstr "" msgid "Saved" msgstr "" -#: lib/config.php:598 +#: lib/config.php:597 msgid "<b>Note:</b> " msgstr "" -#: lib/config.php:608 +#: lib/config.php:607 msgid " and " msgstr "" -#: lib/config.php:630 +#: lib/config.php:629 #, php-format msgid "" "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting " "of %s is not possible. Please ask your system administrator to install it." msgstr "" -#: lib/config.php:632 +#: lib/config.php:631 #, php-format msgid "" "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of" " %s is not possible. Please ask your system administrator to install it." msgstr "" -#: lib/config.php:634 +#: lib/config.php:633 #, php-format msgid "" "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please" diff --git a/l10n/oc/files_sharing.po b/l10n/oc/files_sharing.po index a59c0fca574..416cf4d3df7 100644 --- a/l10n/oc/files_sharing.po +++ b/l10n/oc/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-04 01:55-0400\n" -"PO-Revision-Date: 2014-05-03 06:11+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n" "MIME-Version: 1.0\n" @@ -61,11 +61,11 @@ msgstr "" msgid "Download" msgstr "Avalcarga" -#: templates/public.php:53 +#: templates/public.php:52 #, php-format msgid "Download %s" msgstr "" -#: templates/public.php:57 +#: templates/public.php:56 msgid "Direct link" msgstr "" diff --git a/l10n/oc/settings.po b/l10n/oc/settings.po index 469dc4fbdb6..7d6fc040cc2 100644 --- a/l10n/oc/settings.po +++ b/l10n/oc/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "" @@ -98,6 +98,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "Corrièl enregistrat" @@ -114,6 +124,16 @@ msgstr "Pas capable d'escafar un grop" msgid "Unable to delete user" msgstr "Pas capable d'escafar un usancièr" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "Lengas cambiadas" @@ -225,34 +245,42 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "escafat" @@ -298,7 +326,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "__language_name__" @@ -623,11 +651,11 @@ msgstr "Mai d'aquò" msgid "Less" msgstr "" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -791,18 +819,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "Login" diff --git a/l10n/oc/user_ldap.po b/l10n/oc/user_ldap.po index c7403807c87..ea9ed47d049 100644 --- a/l10n/oc/user_ldap.po +++ b/l10n/oc/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/or_IN/settings.po b/l10n/or_IN/settings.po index e3510389e2d..4daa5cf3696 100644 --- a/l10n/or_IN/settings.po +++ b/l10n/or_IN/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-26 01:54-0400\n" -"PO-Revision-Date: 2014-04-26 05:54+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Oriya (India) (http://www.transifex.com/projects/p/owncloud/language/or_IN/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "" @@ -98,6 +98,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -114,6 +124,16 @@ msgstr "" msgid "Unable to delete user" msgstr "" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "" @@ -225,34 +245,42 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "" @@ -298,7 +326,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "" @@ -623,11 +651,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -791,18 +819,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "" diff --git a/l10n/pa/core.po b/l10n/pa/core.po index 2de3d0bd464..29fbeb57210 100644 --- a/l10n/pa/core.po +++ b/l10n/pa/core.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:02+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Panjabi (Punjabi) (http://www.transifex.com/projects/p/owncloud/language/pa/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/pa/files_external.po b/l10n/pa/files_external.po index 66a3b40acf1..2494869e963 100644 --- a/l10n/pa/files_external.po +++ b/l10n/pa/files_external.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Panjabi (Punjabi) (http://www.transifex.com/projects/p/owncloud/language/pa/)\n" "MIME-Version: 1.0\n" @@ -197,29 +197,29 @@ msgstr "" msgid "Saved" msgstr "" -#: lib/config.php:598 +#: lib/config.php:597 msgid "<b>Note:</b> " msgstr "" -#: lib/config.php:608 +#: lib/config.php:607 msgid " and " msgstr "" -#: lib/config.php:630 +#: lib/config.php:629 #, php-format msgid "" "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting " "of %s is not possible. Please ask your system administrator to install it." msgstr "" -#: lib/config.php:632 +#: lib/config.php:631 #, php-format msgid "" "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of" " %s is not possible. Please ask your system administrator to install it." msgstr "" -#: lib/config.php:634 +#: lib/config.php:633 #, php-format msgid "" "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please" diff --git a/l10n/pa/files_sharing.po b/l10n/pa/files_sharing.po index fccb1b02ec6..0ebf7dc049e 100644 --- a/l10n/pa/files_sharing.po +++ b/l10n/pa/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-04 01:55-0400\n" -"PO-Revision-Date: 2014-05-03 06:11+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Panjabi (Punjabi) (http://www.transifex.com/projects/p/owncloud/language/pa/)\n" "MIME-Version: 1.0\n" @@ -61,11 +61,11 @@ msgstr "" msgid "Download" msgstr "ਡਾਊਨਲੋਡ" -#: templates/public.php:53 +#: templates/public.php:52 #, php-format msgid "Download %s" msgstr "" -#: templates/public.php:57 +#: templates/public.php:56 msgid "Direct link" msgstr "" diff --git a/l10n/pa/settings.po b/l10n/pa/settings.po index 62937ff7f60..80103573854 100644 --- a/l10n/pa/settings.po +++ b/l10n/pa/settings.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Panjabi (Punjabi) (http://www.transifex.com/projects/p/owncloud/language/pa/)\n" "MIME-Version: 1.0\n" @@ -52,7 +52,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "" @@ -99,6 +99,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -115,6 +125,16 @@ msgstr "" msgid "Unable to delete user" msgstr "" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "à¨à¨¾à¨¶à¨¾ ਬਦਲੀ" @@ -226,34 +246,42 @@ msgstr "" msgid "Updated" msgstr "ਅੱਪਡੇਟ ਕੀਤਾ" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "ਹਟਾਈ" @@ -299,7 +327,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "__à¨à¨¾à¨¶à¨¾_ਨਾਂ__" @@ -624,11 +652,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -792,18 +820,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "ਲਾਗਇਨ" diff --git a/l10n/pa/user_ldap.po b/l10n/pa/user_ldap.po index 4054753ff7a..ed8eefdd364 100644 --- a/l10n/pa/user_ldap.po +++ b/l10n/pa/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Panjabi (Punjabi) (http://www.transifex.com/projects/p/owncloud/language/pa/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/pl/core.po b/l10n/pl/core.po index 4b8db80a320..892d91630e6 100644 --- a/l10n/pl/core.po +++ b/l10n/pl/core.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:02+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:01+0000\n" "Last-Translator: I Robot\n" "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/pl/files_external.po b/l10n/pl/files_external.po index 713b5fae66f..55c63616a21 100644 --- a/l10n/pl/files_external.po +++ b/l10n/pl/files_external.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-07 01:55-0400\n" -"PO-Revision-Date: 2014-05-05 15:09+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: bobie <maciej.przybecki@gmail.com>\n" "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n" "MIME-Version: 1.0\n" @@ -199,29 +199,29 @@ msgstr "WystÄ…piÅ‚ bÅ‚Ä…d podczas konfigurowania zasobu Google Drive" msgid "Saved" msgstr "Zapisano" -#: lib/config.php:598 +#: lib/config.php:597 msgid "<b>Note:</b> " msgstr "<b>Uwaga:</b> " -#: lib/config.php:608 +#: lib/config.php:607 msgid " and " msgstr "oraz" -#: lib/config.php:630 +#: lib/config.php:629 #, php-format msgid "" "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting " "of %s is not possible. Please ask your system administrator to install it." msgstr "<b>Uwaga:</b> Wsparcie dla cURL w PHP nie zostaÅ‚o wÅ‚Ä…czone lub zainstalowane. Zamontowanie %s nie jest możliwe. ProszÄ™ poproÅ› Twojego administratora o zainstalowanie go." -#: lib/config.php:632 +#: lib/config.php:631 #, php-format msgid "" "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of" " %s is not possible. Please ask your system administrator to install it." msgstr "<b>Uwaga:</b> Wsparcie dla FTP w PHP nie zostaÅ‚o wÅ‚Ä…czone lub zainstalowane. Zamontowanie %s nie jest możliwe. ProszÄ™ poproÅ› Twojego administratora o zainstalowanie go." -#: lib/config.php:634 +#: lib/config.php:633 #, php-format msgid "" "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please" diff --git a/l10n/pl/files_sharing.po b/l10n/pl/files_sharing.po index e87dd22a17c..9d3c98ca99a 100644 --- a/l10n/pl/files_sharing.po +++ b/l10n/pl/files_sharing.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-04 01:55-0400\n" -"PO-Revision-Date: 2014-05-03 06:11+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n" "MIME-Version: 1.0\n" @@ -63,11 +63,11 @@ msgstr "Aby uzyskać wiÄ™cej informacji proszÄ™ poprosić osobÄ™, która wysÅ‚aÅ msgid "Download" msgstr "Pobierz" -#: templates/public.php:53 +#: templates/public.php:52 #, php-format msgid "Download %s" msgstr "Pobierz %s" -#: templates/public.php:57 +#: templates/public.php:56 msgid "Direct link" msgstr "BezpoÅ›redni link" diff --git a/l10n/pl/settings.po b/l10n/pl/settings.po index 3dc0a860518..1a022185f4f 100644 --- a/l10n/pl/settings.po +++ b/l10n/pl/settings.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" -"Last-Translator: bobie <maciej.przybecki@gmail.com>\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" +"Last-Translator: I Robot\n" "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -54,7 +54,7 @@ msgstr "Musisz najpierw ustawić użytkownika e-mail, aby móc wysyÅ‚ać wiadomo msgid "Send mode" msgstr "Tryb wysyÅ‚ki" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "Szyfrowanie" @@ -101,6 +101,16 @@ msgstr "Nie można zdeszyfrować Twoich plików, proszÄ™ sprawdzić owncloud.log msgid "Couldn't decrypt your files, check your password and try again" msgstr "Nie można zdeszyfrować Twoich plików, sprawdź swoje hasÅ‚o i spróbuj ponownie" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "E-mail zapisany" @@ -117,6 +127,16 @@ msgstr "Nie można usunąć grupy" msgid "Unable to delete user" msgstr "Nie można usunąć użytkownika" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "Zmieniono jÄ™zyk" @@ -228,34 +248,42 @@ msgstr "Aktualizuj" msgid "Updated" msgstr "Zaktualizowano" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "Wybierz zdjÄ™cie profilu" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "Bardzo sÅ‚abe hasÅ‚o" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "SÅ‚abe hasÅ‚o" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "MaÅ‚o skomplikowane hasÅ‚o" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "Dobre hasÅ‚o" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "Mocne hasÅ‚o" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "Odszyfrowuje pliki... ProszÄ™ czekać, to może zająć jakiÅ› czas." +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "usuniÄ™to" @@ -301,7 +329,7 @@ msgstr "Należy podać prawidÅ‚owe hasÅ‚o" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "Ostrzeżenie: Katalog domowy dla użytkownika \"{user}\" już istnieje" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "polski" @@ -626,11 +654,11 @@ msgstr "WiÄ™cej" msgid "Less" msgstr "Mniej" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "Wersja" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -794,18 +822,33 @@ msgid "" "WebDAV</a>" msgstr "Użyj tego adresu do <a href=\"%s\" target=\"_blank\">dostÄ™pu do twoich plików przez WebDAV</a>" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "Aplikacja szyfrowanie nie jest wÅ‚Ä…czona, odszyfruj wszystkie plik" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "HasÅ‚o logowania" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "Odszyfruj wszystkie pliki" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "Login" diff --git a/l10n/pl/user_ldap.po b/l10n/pl/user_ldap.po index 2f3583fa73b..e3a49c4eebf 100644 --- a/l10n/pl/user_ldap.po +++ b/l10n/pl/user_ldap.po @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: bobie <maciej.przybecki@gmail.com>\n" "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/pt_BR/core.po b/l10n/pt_BR/core.po index 66acbaea8a8..b2764626145 100644 --- a/l10n/pt_BR/core.po +++ b/l10n/pt_BR/core.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:02+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/pt_BR/files_external.po b/l10n/pt_BR/files_external.po index 8ce0c3c1317..10036725192 100644 --- a/l10n/pt_BR/files_external.po +++ b/l10n/pt_BR/files_external.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-01 01:55-0400\n" -"PO-Revision-Date: 2014-04-30 23:40+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: Flávio Veras <flaviove@gmail.com>\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n" "MIME-Version: 1.0\n" @@ -198,29 +198,29 @@ msgstr "Erro ao configurar armazenamento do Google Drive" msgid "Saved" msgstr "Salvo" -#: lib/config.php:598 +#: lib/config.php:597 msgid "<b>Note:</b> " msgstr "<b>Nota:</b>" -#: lib/config.php:608 +#: lib/config.php:607 msgid " and " msgstr "e" -#: lib/config.php:630 +#: lib/config.php:629 #, php-format msgid "" "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting " "of %s is not possible. Please ask your system administrator to install it." msgstr "<b>Nota:</b> O suporte cURL do PHP não está habilitado ou instalado. Montagem de %s não é possÃvel. Por favor, solicite ao seu administrador do sistema para instalá-lo." -#: lib/config.php:632 +#: lib/config.php:631 #, php-format msgid "" "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of" " %s is not possible. Please ask your system administrator to install it." msgstr "<b>Nota:</b> O suporte FTP no PHP não está habilitado ou instalado. Montagem de %s não é possÃvel. Por favor, solicite ao seu administrador do sistema para instalá-lo." -#: lib/config.php:634 +#: lib/config.php:633 #, php-format msgid "" "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please" diff --git a/l10n/pt_BR/files_sharing.po b/l10n/pt_BR/files_sharing.po index aaca3b457d3..7d203b0ce17 100644 --- a/l10n/pt_BR/files_sharing.po +++ b/l10n/pt_BR/files_sharing.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-04 01:55-0400\n" -"PO-Revision-Date: 2014-05-03 06:11+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n" "MIME-Version: 1.0\n" @@ -62,11 +62,11 @@ msgstr "Para mais informações, por favor, pergunte a pessoa que enviou este li msgid "Download" msgstr "Baixar" -#: templates/public.php:53 +#: templates/public.php:52 #, php-format msgid "Download %s" msgstr "Baixar %s" -#: templates/public.php:57 +#: templates/public.php:56 msgid "Direct link" msgstr "Link direto" diff --git a/l10n/pt_BR/settings.po b/l10n/pt_BR/settings.po index 7ece5b7d90e..8e84befbc0a 100644 --- a/l10n/pt_BR/settings.po +++ b/l10n/pt_BR/settings.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" -"Last-Translator: Flávio Veras <flaviove@gmail.com>\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" +"Last-Translator: I Robot\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -54,7 +54,7 @@ msgstr "Você precisa configurar seu e-mail de usuário antes de ser capaz de en msgid "Send mode" msgstr "Modo enviar" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "Criptografia" @@ -101,6 +101,16 @@ msgstr "Não foi possÃvel descriptografar os arquivos, verifique a sua owncloud msgid "Couldn't decrypt your files, check your password and try again" msgstr "Não foi possÃvel descriptografar os arquivos, verifique sua senha e tente novamente" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "E-mail salvo" @@ -117,6 +127,16 @@ msgstr "Não foi possÃvel remover grupo" msgid "Unable to delete user" msgstr "Não foi possÃvel remover usuário" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "Idioma alterado" @@ -228,34 +248,42 @@ msgstr "Atualizar" msgid "Updated" msgstr "Atualizado" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "Selecione uma imagem para o perfil" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "Senha muito fraca" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "Senha fraca" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "So-so senha" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "Boa senha" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "Senha forte" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "Decriptando arquivos... Por favor aguarde, isso pode levar algum tempo." +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "excluÃdo" @@ -301,7 +329,7 @@ msgstr "Forneça uma senha válida" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "Aviso: O diretório home para o usuário \"{user}\" já existe" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "Português (Brasil)" @@ -626,11 +654,11 @@ msgstr "Mais" msgid "Less" msgstr "Menos" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "Versão" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -794,18 +822,33 @@ msgid "" "WebDAV</a>" msgstr "Use este endereço <a href=\"%s\" target=\"_blank\">para ter acesso a seus Arquivos via WebDAV</a>" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "O aplicativo de criptografia não está habilitado, por favor descriptar todos os seus arquivos" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "Senha de login" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "Decripti todos os Arquivos" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "Nome de Login" diff --git a/l10n/pt_BR/user_ldap.po b/l10n/pt_BR/user_ldap.po index 0077cf235ee..fe79a1254a8 100644 --- a/l10n/pt_BR/user_ldap.po +++ b/l10n/pt_BR/user_ldap.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: Flávio Veras <flaviove@gmail.com>\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/pt_PT/core.po b/l10n/pt_PT/core.po index 5223d1be3dd..df2a4ff9469 100644 --- a/l10n/pt_PT/core.po +++ b/l10n/pt_PT/core.po @@ -15,9 +15,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-09 01:55-0400\n" -"PO-Revision-Date: 2014-05-08 12:00+0000\n" -"Last-Translator: sccosta <sonia.peres.costa@gmail.com>\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" +"Last-Translator: Helder Meneses <helder.meneses@gmail.com>\n" "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -27,7 +27,7 @@ msgstr "" #: ajax/share.php:87 msgid "Expiration date is in the past." -msgstr "" +msgstr "A data de expiração é no passado." #: ajax/share.php:119 ajax/share.php:161 #, php-format @@ -778,7 +778,7 @@ msgstr "Contas de acesso alternativas" msgid "" "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> " "with you.<br><a href=\"%s\">View it!</a><br><br>" -msgstr "" +msgstr "Olá,<br><br>apenas para informar que %s partilhou <strong>%s</strong> consigo.<br><a href=\"%s\">Consulte aqui!</a><br><br>" #: templates/singleuser.user.php:3 msgid "This ownCloud instance is currently in single user mode." diff --git a/l10n/pt_PT/files.po b/l10n/pt_PT/files.po index 44781168011..430d21411b2 100644 --- a/l10n/pt_PT/files.po +++ b/l10n/pt_PT/files.po @@ -6,14 +6,15 @@ # bmgmatias <bmgmatias@gmail.com>, 2013 # Carlos <crolidge@gmail.com>, 2014 # FernandoMASilva, 2013 -# Helder Meneses <helder.meneses@gmail.com>, 2013 +# Helder Meneses <helder.meneses@gmail.com>, 2013-2014 +# Drew Melim <nokostya.translation@gmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-04 01:55-0400\n" -"PO-Revision-Date: 2014-05-03 06:11+0000\n" -"Last-Translator: I Robot\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-10 14:40+0000\n" +"Last-Translator: Drew Melim <nokostya.translation@gmail.com>\n" "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -38,7 +39,7 @@ msgstr "O nome do ficheiro não pode estar vazio." #: ajax/newfile.php:63 #, php-format msgid "\"%s\" is an invalid file name." -msgstr "" +msgstr "\"%s\" é um nome de ficheiro inválido." #: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103 msgid "" @@ -49,7 +50,7 @@ msgstr "Nome Inválido, os caracteres '\\', '/', '<', '>', ':', '\"', '|', '?' e #: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155 #: lib/app.php:60 msgid "The target folder has been moved or deleted." -msgstr "" +msgstr "A pasta de destino foi movida ou eliminada." #: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69 #, php-format @@ -147,49 +148,49 @@ msgstr "Directório Inválido" msgid "Files" msgstr "Ficheiros" -#: js/file-upload.js:254 +#: js/file-upload.js:257 msgid "Unable to upload {filename} as it is a directory or has 0 bytes" msgstr "Incapaz de enviar {filename}, dado que é uma pasta, ou tem 0 bytes" -#: js/file-upload.js:266 +#: js/file-upload.js:270 msgid "Total file size {size1} exceeds upload limit {size2}" -msgstr "" +msgstr "O tamanho total do ficheiro {size1} excede o limite de carregamento {size2}" -#: js/file-upload.js:276 +#: js/file-upload.js:281 msgid "" "Not enough free space, you are uploading {size1} but only {size2} is left" -msgstr "" +msgstr "Não existe espaço suficiente. Está a enviar {size1} mas apenas existe {size2} disponÃvel" -#: js/file-upload.js:353 +#: js/file-upload.js:358 msgid "Upload cancelled." msgstr "Envio cancelado." -#: js/file-upload.js:398 +#: js/file-upload.js:404 msgid "Could not get result from server." msgstr "Não foi possÃvel obter o resultado do servidor." -#: js/file-upload.js:490 +#: js/file-upload.js:493 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Envio de ficheiro em progresso. Irá cancelar o envio se sair da página agora." -#: js/file-upload.js:555 +#: js/file-upload.js:558 msgid "URL cannot be empty" msgstr "URL não pode estar vazio" -#: js/file-upload.js:559 js/filelist.js:963 +#: js/file-upload.js:562 js/filelist.js:963 msgid "{new_name} already exists" msgstr "O nome {new_name} já existe" -#: js/file-upload.js:611 +#: js/file-upload.js:617 msgid "Could not create file" msgstr "Não pôde criar ficheiro" -#: js/file-upload.js:624 +#: js/file-upload.js:633 msgid "Could not create folder" msgstr "Não pôde criar pasta" -#: js/file-upload.js:664 +#: js/file-upload.js:680 msgid "Error fetching URL" msgstr "Erro ao obter URL" @@ -217,7 +218,7 @@ msgstr "Pendente" #: js/filelist.js:916 msgid "Error moving file." -msgstr "" +msgstr "Erro a mover o ficheiro." #: js/filelist.js:924 msgid "Error moving file" @@ -267,7 +268,7 @@ msgstr[1] "A carregar %n ficheiros" #: js/files.js:94 msgid "\"{name}\" is an invalid file name." -msgstr "" +msgstr "\"{name}\" é um nome de ficheiro inválido." #: js/files.js:115 msgid "Your storage is full, files can not be updated or synced anymore!" @@ -308,7 +309,7 @@ msgstr "%s não pode ser renomeada" #: lib/helper.php:14 templates/index.php:22 #, php-format msgid "Upload (max. %s)" -msgstr "" +msgstr "Enviar (max. %s)" #: templates/admin.php:4 msgid "File handling" diff --git a/l10n/pt_PT/files_external.po b/l10n/pt_PT/files_external.po index 53766e4d33c..b3a689aa718 100644 --- a/l10n/pt_PT/files_external.po +++ b/l10n/pt_PT/files_external.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-03 01:55-0400\n" -"PO-Revision-Date: 2014-05-02 17:10+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: Drew Melim <nokostya.translation@gmail.com>\n" "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n" "MIME-Version: 1.0\n" @@ -201,29 +201,29 @@ msgstr "Erro ao configurar o armazenamento do Google Drive" msgid "Saved" msgstr "Guardado" -#: lib/config.php:598 +#: lib/config.php:597 msgid "<b>Note:</b> " msgstr "<b>Aviso:</b> " -#: lib/config.php:608 +#: lib/config.php:607 msgid " and " msgstr "e" -#: lib/config.php:630 +#: lib/config.php:629 #, php-format msgid "" "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting " "of %s is not possible. Please ask your system administrator to install it." msgstr "<b>Aviso:</b> O suporte cURL no PHP não está activo ou instalado. Não é possÃvel montar %s. Peça ao seu administrador para instalar." -#: lib/config.php:632 +#: lib/config.php:631 #, php-format msgid "" "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of" " %s is not possible. Please ask your system administrator to install it." msgstr "<b>Aviso:</b> O suporte FTP no PHP não está activo ou instalado. Não é possÃvel montar %s. Peça ao seu administrador para instalar." -#: lib/config.php:634 +#: lib/config.php:633 #, php-format msgid "" "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please" diff --git a/l10n/pt_PT/files_sharing.po b/l10n/pt_PT/files_sharing.po index 16d45991839..56ea5584c62 100644 --- a/l10n/pt_PT/files_sharing.po +++ b/l10n/pt_PT/files_sharing.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-04 01:55-0400\n" -"PO-Revision-Date: 2014-05-03 06:11+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n" "MIME-Version: 1.0\n" @@ -65,11 +65,11 @@ msgstr "Para mais informações, por favor questione a pessoa que lhe enviou est msgid "Download" msgstr "Transferir" -#: templates/public.php:53 +#: templates/public.php:52 #, php-format msgid "Download %s" msgstr "Download %s" -#: templates/public.php:57 +#: templates/public.php:56 msgid "Direct link" msgstr "Link direto" diff --git a/l10n/pt_PT/lib.po b/l10n/pt_PT/lib.po index 541c093bdbe..59028dc8e56 100644 --- a/l10n/pt_PT/lib.po +++ b/l10n/pt_PT/lib.po @@ -3,7 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Helder Meneses <helder.meneses@gmail.com>, 2013 +# Helder Meneses <helder.meneses@gmail.com>, 2013-2014 # jmruas <jmruas@gmail.com>, 2014 # Drew Melim <nokostya.translation@gmail.com>, 2014 # PapiMigas Migas <papimigas@gmail.com>, 2013 @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-07 01:55-0400\n" -"PO-Revision-Date: 2014-05-05 15:09+0000\n" -"Last-Translator: Drew Melim <nokostya.translation@gmail.com>\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-13 20:37+0000\n" +"Last-Translator: Helder Meneses <helder.meneses@gmail.com>\n" "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -21,11 +21,11 @@ msgstr "" "Language: pt_PT\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: base.php:713 +#: base.php:685 msgid "You are accessing the server from an untrusted domain." msgstr "" -#: base.php:714 +#: base.php:686 msgid "" "Please contact your administrator. If you are an administrator of this " "instance, configure the \"trusted_domain\" setting in config/config.php. An " @@ -293,8 +293,8 @@ msgstr "O seu servidor web não está configurado correctamente para autorizar s msgid "Please double check the <a href='%s'>installation guides</a>." msgstr "Por favor verifique <a href='%s'>installation guides</a>." -#: private/share/mailnotifications.php:72 -#: private/share/mailnotifications.php:118 +#: private/share/mailnotifications.php:91 +#: private/share/mailnotifications.php:137 #, php-format msgid "%s shared »%s« with you" msgstr "%s partilhado »%s« consigo" @@ -307,7 +307,7 @@ msgstr "" #: private/share/share.php:523 #, php-format msgid "Sharing %s failed, because the user %s is the item owner" -msgstr "" +msgstr "A partilha %s falhou, porque o utilizador %s é o proprietário" #: private/share/share.php:529 #, php-format @@ -346,63 +346,63 @@ msgstr "" msgid "Share type %s is not valid for %s" msgstr "" -#: private/share/share.php:773 +#: private/share/share.php:774 #, php-format msgid "" "Setting permissions for %s failed, because the permissions exceed " "permissions granted to %s" msgstr "" -#: private/share/share.php:834 +#: private/share/share.php:835 #, php-format msgid "Setting permissions for %s failed, because the item was not found" msgstr "" -#: private/share/share.php:940 +#: private/share/share.php:942 #, php-format msgid "Sharing backend %s must implement the interface OCP\\Share_Backend" msgstr "" -#: private/share/share.php:947 +#: private/share/share.php:949 #, php-format msgid "Sharing backend %s not found" msgstr "" -#: private/share/share.php:953 +#: private/share/share.php:955 #, php-format msgid "Sharing backend for %s not found" msgstr "" -#: private/share/share.php:1367 +#: private/share/share.php:1370 #, php-format msgid "Sharing %s failed, because the user %s is the original sharer" msgstr "" -#: private/share/share.php:1376 +#: private/share/share.php:1379 #, php-format msgid "" "Sharing %s failed, because the permissions exceed permissions granted to %s" msgstr "" -#: private/share/share.php:1391 +#: private/share/share.php:1394 #, php-format msgid "Sharing %s failed, because resharing is not allowed" msgstr "" -#: private/share/share.php:1403 +#: private/share/share.php:1406 #, php-format msgid "" "Sharing %s failed, because the sharing backend for %s could not find its " "source" msgstr "" -#: private/share/share.php:1417 +#: private/share/share.php:1420 #, php-format msgid "" "Sharing %s failed, because the file could not be found in the file cache" msgstr "" -#: private/tags.php:193 +#: private/tags.php:183 #, php-format msgid "Could not find category \"%s\"" msgstr "Não foi encontrado a categoria \"%s\"" @@ -459,7 +459,7 @@ msgstr "anos atrás" msgid "" "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", " "\"0-9\", and \"_.@-\"" -msgstr "" +msgstr "Apenas os seguintes caracteres são permitidos no nome de utilizador: \"a-z\", \"A-Z\", \"0-9\", e \"_.@-\"" #: private/user/manager.php:237 msgid "A valid username must be provided" @@ -471,4 +471,4 @@ msgstr "Uma password válida deve ser fornecida" #: private/user/manager.php:246 msgid "The username is already being used" -msgstr "" +msgstr "O nome de utilizador já está a ser usado" diff --git a/l10n/pt_PT/settings.po b/l10n/pt_PT/settings.po index f757d3a424d..47dc787e8a3 100644 --- a/l10n/pt_PT/settings.po +++ b/l10n/pt_PT/settings.po @@ -14,9 +14,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-03 01:55-0400\n" -"PO-Revision-Date: 2014-05-02 17:00+0000\n" -"Last-Translator: Helder Meneses <helder.meneses@gmail.com>\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" +"Last-Translator: I Robot\n" "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -58,7 +58,7 @@ msgstr "" msgid "Send mode" msgstr "Modo de envio" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "Encriptação" @@ -105,6 +105,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "Email guardado" @@ -121,6 +131,16 @@ msgstr "ImpossÃvel apagar grupo" msgid "Unable to delete user" msgstr "ImpossÃvel apagar utilizador" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "Idioma alterado" @@ -232,34 +252,42 @@ msgstr "Actualizar" msgid "Updated" msgstr "Actualizado" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "Seleccione uma fotografia de perfil" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "Password muito fraca" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "Password fraca" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "Password aceitável" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "Password Forte" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "Password muito forte" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "A desencriptar os ficheiros... Por favor aguarde, esta operação pode demorar algum tempo." +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "apagado" @@ -305,7 +333,7 @@ msgstr "Uma password válida deve ser fornecida" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "Atenção: a pasta pessoal do utilizador \"{user}\" já existe" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "__language_name__" @@ -630,11 +658,11 @@ msgstr "Mais" msgid "Less" msgstr "Menos" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "Versão" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -798,18 +826,33 @@ msgid "" "WebDAV</a>" msgstr "Utilize esta ligação para <a href=\"%s\" target=\"_blank\">aceder aos seus ficheiros via WebDAV</a>" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "A aplicação de encriptação já não está ativa, por favor desincripte todos os seus ficheiros" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "Password de entrada" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "Desencriptar todos os ficheiros" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "Nome de utilizador" diff --git a/l10n/pt_PT/user_ldap.po b/l10n/pt_PT/user_ldap.po index dc35cbcb13f..25306576a42 100644 --- a/l10n/pt_PT/user_ldap.po +++ b/l10n/pt_PT/user_ldap.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-07 01:55-0400\n" -"PO-Revision-Date: 2014-05-06 11:21+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-13 20:38+0000\n" "Last-Translator: Helder Meneses <helder.meneses@gmail.com>\n" "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n" "MIME-Version: 1.0\n" @@ -130,25 +130,25 @@ msgstr "Deseja realmente apagar as configurações de servidor actuais?" msgid "Confirm Deletion" msgstr "Confirmar a operação de apagar" -#: lib/wizard.php:79 lib/wizard.php:93 +#: lib/wizard.php:83 lib/wizard.php:97 #, php-format msgid "%s group found" msgid_plural "%s groups found" msgstr[0] "%s grupo encontrado" msgstr[1] "%s grupos encontrados" -#: lib/wizard.php:122 +#: lib/wizard.php:130 #, php-format msgid "%s user found" msgid_plural "%s users found" msgstr[0] "%s utilizador encontrado" msgstr[1] "%s utilizadores encontrados" -#: lib/wizard.php:784 lib/wizard.php:796 +#: lib/wizard.php:825 lib/wizard.php:837 msgid "Invalid Host" msgstr "Hospedeiro Inválido" -#: lib/wizard.php:984 +#: lib/wizard.php:1025 msgid "Could not find the desired feature" msgstr "Não se encontrou a função desejada" @@ -501,7 +501,7 @@ msgid "" "You must make sure that the attribute of your choice can be fetched for both" " users and groups and it is unique. Leave it empty for default behavior. " "Changes will have effect only on newly mapped (added) LDAP users and groups." -msgstr "" +msgstr "Por defeito, o ownCloud detecta automaticamente o atributo UUID. Este atributo é usado para identificar inequivocamente grupos e utilizadores LDAP. Igualmente, o nome de utilizador interno é criado com base no UUID, se o contrário não for especificado. Pode sobrepor esta definição colocando um atributo à sua escolha. Tenha em atenção que esse atributo deve ser válido tanto para grupos como para utilizadores, e que é único. Deixe em branco para optar pelo comportamento por defeito. Estas alteração apenas terão efeito em novos utilizadores e grupos mapeados (adicionados)." #: templates/settings.php:58 msgid "UUID Attribute for Users:" @@ -527,7 +527,7 @@ msgid "" " is not configuration sensitive, it affects all LDAP configurations! Never " "clear the mappings in a production environment, only in a testing or " "experimental stage." -msgstr "" +msgstr "O ownCloud usa nomes de utilizadores para guardar e atribuir (meta) dados. Para identificar com precisão os utilizadores, cada utilizador de LDAP tem um nome de utilizador interno. Isto requer um mapeamento entre o utilizador LDAP e o utilizador ownCloud. Adicionalmente, o DN é colocado em cache para reduzir a interação com LDAP, porém não é usado para identificação. Se o DN muda, essas alterações serão vistas pelo ownCloud. O nome interno do ownCloud é usado em todo o lado, no ownCloud. Limpar os mapeamentos deixará vestÃgios em todo o lado. A limpeza dos mapeamentos não é sensÃvel à configuração, pois afeta todas as configurações de LDAP! Nunca limpe os mapeamentos num ambiente de produção, apenas o faça numa fase de testes ou experimental." #: templates/settings.php:62 msgid "Clear Username-LDAP User Mapping" diff --git a/l10n/ro/core.po b/l10n/ro/core.po index be89b0d9e38..0b46a4f7ddc 100644 --- a/l10n/ro/core.po +++ b/l10n/ro/core.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:02+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/ro/files_external.po b/l10n/ro/files_external.po index ba3cd1c3988..deb5151ca45 100644 --- a/l10n/ro/files_external.po +++ b/l10n/ro/files_external.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n" "MIME-Version: 1.0\n" @@ -198,29 +198,29 @@ msgstr "Eroare la configurarea mediului de stocare Google Drive" msgid "Saved" msgstr "Salvat" -#: lib/config.php:598 +#: lib/config.php:597 msgid "<b>Note:</b> " msgstr "" -#: lib/config.php:608 +#: lib/config.php:607 msgid " and " msgstr "" -#: lib/config.php:630 +#: lib/config.php:629 #, php-format msgid "" "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting " "of %s is not possible. Please ask your system administrator to install it." msgstr "" -#: lib/config.php:632 +#: lib/config.php:631 #, php-format msgid "" "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of" " %s is not possible. Please ask your system administrator to install it." msgstr "" -#: lib/config.php:634 +#: lib/config.php:633 #, php-format msgid "" "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please" diff --git a/l10n/ro/files_sharing.po b/l10n/ro/files_sharing.po index 3f48febdbc9..089843a10c6 100644 --- a/l10n/ro/files_sharing.po +++ b/l10n/ro/files_sharing.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-04 01:55-0400\n" -"PO-Revision-Date: 2014-05-03 06:12+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n" "MIME-Version: 1.0\n" @@ -62,11 +62,11 @@ msgstr "" msgid "Download" msgstr "Descarcă" -#: templates/public.php:53 +#: templates/public.php:52 #, php-format msgid "Download %s" msgstr "" -#: templates/public.php:57 +#: templates/public.php:56 msgid "Direct link" msgstr "" diff --git a/l10n/ro/settings.po b/l10n/ro/settings.po index 1b527b4d333..d5209cd8530 100644 --- a/l10n/ro/settings.po +++ b/l10n/ro/settings.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n" "MIME-Version: 1.0\n" @@ -54,7 +54,7 @@ msgstr "" msgid "Send mode" msgstr "Modul de expediere" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "ÃŽncriptare" @@ -101,6 +101,16 @@ msgstr "Nu s-a puput decripta fiÈ™ierele tale, verifică owncloud.log sau între msgid "Couldn't decrypt your files, check your password and try again" msgstr "Nu s-a puput decripta fiÈ™ierele tale, verifică parola È™i încearcă din nou" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "E-mail salvat" @@ -117,6 +127,16 @@ msgstr "Nu s-a putut È™terge grupul" msgid "Unable to delete user" msgstr "Nu s-a putut È™terge utilizatorul" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "Limba a fost schimbată" @@ -228,34 +248,42 @@ msgstr "Actualizare" msgid "Updated" msgstr "Actualizat" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "Selectează o imagine de profil" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "Parolă foarte slabă" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "Parolă slabă" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "Decriptare fiÈ™iere... Te rog aÈ™teaptă, poate dura ceva timp." +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "È™ters" @@ -301,7 +329,7 @@ msgstr "Trebuie să furnizaÅ£i o parolă validă" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "Avertizare: Dosarul Acasă pentru utilizatorul \"{user}\" deja există" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "_language_name_" @@ -626,11 +654,11 @@ msgstr "Mai mult" msgid "Less" msgstr "Mai puÈ›in" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "Versiunea" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -794,18 +822,33 @@ msgid "" "WebDAV</a>" msgstr "FoloseÈ™te această adresă <a href=\"%s\" target=\"_blank\">pentru acces la fiÈ™ierele tale folosind WebDAV</a>" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "Parolă" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "Decriptează toate fiÈ™ierele" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "Autentificare" diff --git a/l10n/ro/user_ldap.po b/l10n/ro/user_ldap.po index f6baa0ba106..23a44941dd9 100644 --- a/l10n/ro/user_ldap.po +++ b/l10n/ro/user_ldap.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-07 01:55-0400\n" -"PO-Revision-Date: 2014-05-05 15:09+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: lauraberindei <lauraagavriloae@yahoo.com>\n" "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/ru/core.po b/l10n/ru/core.po index bf156dce36a..93559385469 100644 --- a/l10n/ru/core.po +++ b/l10n/ru/core.po @@ -24,8 +24,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:02+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:01+0000\n" "Last-Translator: I Robot\n" "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/ru/files_external.po b/l10n/ru/files_external.po index 4fe3bf83865..e173b2f284e 100644 --- a/l10n/ru/files_external.po +++ b/l10n/ru/files_external.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n" "MIME-Version: 1.0\n" @@ -20,7 +20,7 @@ msgstr "" #: appinfo/app.php:34 msgid "Local" -msgstr "" +msgstr "Локально" #: appinfo/app.php:36 msgid "Location" @@ -198,29 +198,29 @@ msgstr "Ошибка при наÑтройке хранилища Google Drive" msgid "Saved" msgstr "Сохранено" -#: lib/config.php:598 +#: lib/config.php:597 msgid "<b>Note:</b> " msgstr "" -#: lib/config.php:608 +#: lib/config.php:607 msgid " and " msgstr "" -#: lib/config.php:630 +#: lib/config.php:629 #, php-format msgid "" "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting " "of %s is not possible. Please ask your system administrator to install it." msgstr "" -#: lib/config.php:632 +#: lib/config.php:631 #, php-format msgid "" "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of" " %s is not possible. Please ask your system administrator to install it." msgstr "" -#: lib/config.php:634 +#: lib/config.php:633 #, php-format msgid "" "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please" diff --git a/l10n/ru/files_sharing.po b/l10n/ru/files_sharing.po index d500a5fa96d..ea340e487f5 100644 --- a/l10n/ru/files_sharing.po +++ b/l10n/ru/files_sharing.po @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-09 01:55-0400\n" -"PO-Revision-Date: 2014-05-08 19:20+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: jekader <jekader@gmail.com>\n" "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/ru/lib.po b/l10n/ru/lib.po index 935533a1a5f..0e3c4757a3d 100644 --- a/l10n/ru/lib.po +++ b/l10n/ru/lib.po @@ -5,6 +5,7 @@ # Translators: # Alexander Shashkevych <alex@stunpix.com>, 2013 # jekader <jekader@gmail.com>, 2013 +# tukos <kalyuzhniy@gmail.com>, 2014 # eurekafag <rkfg@rkfg.me>, 2013 # sk.avenger <sk.avenger@adygnet.ru>, 2013 # unixoid <victor.ashirov@gmail.com>, 2013 @@ -14,9 +15,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-28 01:55-0400\n" -"PO-Revision-Date: 2014-04-28 05:55+0000\n" -"Last-Translator: I Robot\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 04:20+0000\n" +"Last-Translator: tukos <kalyuzhniy@gmail.com>\n" "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -24,11 +25,11 @@ msgstr "" "Language: ru\n" "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);\n" -#: base.php:723 +#: base.php:685 msgid "You are accessing the server from an untrusted domain." msgstr "" -#: base.php:724 +#: base.php:686 msgid "" "Please contact your administrator. If you are an administrator of this " "instance, configure the \"trusted_domain\" setting in config/config.php. An " @@ -83,23 +84,23 @@ msgstr "Изображение повреждено" msgid "web services under your control" msgstr "веб-ÑервиÑÑ‹ под вашим управлением" -#: private/files.php:232 +#: private/files.php:235 msgid "ZIP download is turned off." msgstr "ZIP-Ñкачивание отключено." -#: private/files.php:233 +#: private/files.php:236 msgid "Files need to be downloaded one by one." msgstr "Файлы должны быть загружены по одному." -#: private/files.php:234 private/files.php:261 +#: private/files.php:237 private/files.php:264 msgid "Back to Files" msgstr "Ðазад к файлам" -#: private/files.php:259 +#: private/files.php:262 msgid "Selected files too large to generate zip file." msgstr "Выбранные файлы Ñлишком велики, чтобы Ñоздать zip файл." -#: private/files.php:260 +#: private/files.php:263 msgid "" "Please download the files separately in smaller chunks or kindly ask your " "administrator." @@ -175,7 +176,7 @@ msgstr "Токен проÑрочен. Перезагрузите Ñтраниц #: private/json.php:74 msgid "Unknown user" -msgstr "" +msgstr "ÐеизвеÑтный пользователь" #: private/search/provider/file.php:18 private/search/provider/file.php:36 msgid "Files" @@ -217,7 +218,7 @@ msgstr "Ð’Ñ‹ должны войти или в ÑущеÑтвующий акка #: private/setup/mysql.php:12 msgid "MySQL/MariaDB username and/or password not valid" -msgstr "" +msgstr " Ð˜Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¸/или пароль MySQL/MariaDB не дейÑтвительны." #: private/setup/mysql.php:67 private/setup/oci.php:54 #: private/setup/oci.php:121 private/setup/oci.php:144 @@ -245,20 +246,20 @@ msgstr "Ð’Ñ‹Ð·Ñ‹Ð²Ð°ÐµÐ¼Ð°Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° была: \"%s\"" #: private/setup/mysql.php:85 #, php-format msgid "MySQL/MariaDB user '%s'@'localhost' exists already." -msgstr "" +msgstr "Пользователь MySQL '%s'@'localhost' уже ÑущеÑтвует." #: private/setup/mysql.php:86 msgid "Drop this user from MySQL/MariaDB" -msgstr "" +msgstr "Удалить данного учаÑтника из MySQL/MariaDB" #: private/setup/mysql.php:91 #, php-format msgid "MySQL/MariaDB user '%s'@'%%' already exists" -msgstr "" +msgstr "Пользователь MySQL '%s'@'%%' уже ÑущеÑтвует." #: private/setup/mysql.php:92 msgid "Drop this user from MySQL/MariaDB." -msgstr "" +msgstr "Удалить данного учаÑтника из MySQL/MariaDB." #: private/setup/oci.php:34 msgid "Oracle connection could not be established" @@ -285,19 +286,19 @@ msgstr "УÑтановить Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð´Ð»Ñ admin." msgid "Set an admin password." msgstr "Ñтановит пароль Ð´Ð»Ñ admin." -#: private/setup.php:202 +#: private/setup.php:164 msgid "" "Your web server is not yet properly setup to allow files synchronization " "because the WebDAV interface seems to be broken." msgstr "Ваш веб Ñервер до Ñих пор не наÑтроен правильно Ð´Ð»Ñ Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾Ñти Ñинхронизации файлов, похоже что проблема в неиÑправноÑти интерфейÑа WebDAV." -#: private/setup.php:203 +#: private/setup.php:165 #, php-format msgid "Please double check the <a href='%s'>installation guides</a>." msgstr "ПожалуйÑта, дважды проÑмотрите <a href='%s'>инÑтрукции по уÑтановке</a>." -#: private/share/mailnotifications.php:72 -#: private/share/mailnotifications.php:118 +#: private/share/mailnotifications.php:91 +#: private/share/mailnotifications.php:137 #, php-format msgid "%s shared »%s« with you" msgstr "%s поделилÑÑ Â»%s« Ñ Ð²Ð°Ð¼Ð¸" @@ -310,12 +311,12 @@ msgstr "" #: private/share/share.php:523 #, php-format msgid "Sharing %s failed, because the user %s is the item owner" -msgstr "" +msgstr "Ðе удалоÑÑŒ уÑтановить общий доÑтуп Ð´Ð»Ñ %s, пользователь %s уже ÑвлÑетÑÑ Ð²Ð»Ð°Ð´ÐµÐ»ÑŒÑ†ÐµÐ¼" #: private/share/share.php:529 #, php-format msgid "Sharing %s failed, because the user %s does not exist" -msgstr "" +msgstr "Ðе удалоÑÑŒ уÑтановить общий доÑтуп Ð´Ð»Ñ %s, пользователь %s не ÑущеÑтвует." #: private/share/share.php:538 #, php-format @@ -327,85 +328,85 @@ msgstr "" #: private/share/share.php:551 private/share/share.php:579 #, php-format msgid "Sharing %s failed, because this item is already shared with %s" -msgstr "" +msgstr "Ðе удалоÑÑŒ уÑтановить общий доÑтуп Ð´Ð»Ñ %s ,в виду того что, объект уже находитьÑÑ Ð² общем доÑтупе Ñ %s" #: private/share/share.php:559 #, php-format msgid "Sharing %s failed, because the group %s does not exist" -msgstr "" +msgstr "Ðе удалоÑÑŒ уÑтановить общий доÑтуп Ð´Ð»Ñ %s, группа %s не ÑущеÑтвует." #: private/share/share.php:566 #, php-format msgid "Sharing %s failed, because %s is not a member of the group %s" -msgstr "" +msgstr "Ðе удалоÑÑŒ уÑтановить общий доÑтуп Ð´Ð»Ñ %s, %s не ÑвлÑетÑÑ Ñ‡Ð»ÐµÐ½Ð¾Ð¼ группы %s" #: private/share/share.php:629 #, php-format msgid "Sharing %s failed, because sharing with links is not allowed" -msgstr "" +msgstr "Ðе удалоÑÑŒ уÑтановить общий доÑтуп Ð´Ð»Ñ %s, потому что обмен Ñо ÑÑылками не допуÑкаетÑÑ" #: private/share/share.php:636 #, php-format msgid "Share type %s is not valid for %s" -msgstr "" +msgstr "Такой втд общего доÑтупа как %s не допуÑтим Ð´Ð»Ñ %s" -#: private/share/share.php:773 +#: private/share/share.php:774 #, php-format msgid "" "Setting permissions for %s failed, because the permissions exceed " "permissions granted to %s" -msgstr "" +msgstr "ÐаÑтройка прав доÑтупа Ð´Ð»Ñ %s невозможна, поÑкольку права доÑтупа превышают предоÑтавленные права доÑтупа %s" -#: private/share/share.php:834 +#: private/share/share.php:835 #, php-format msgid "Setting permissions for %s failed, because the item was not found" -msgstr "" +msgstr "Ðе удалоÑÑŒ произвеÑти наÑтройку прав доÑтупа Ð´Ð»Ñ %s , Ñлемент не был найден." -#: private/share/share.php:940 +#: private/share/share.php:942 #, php-format msgid "Sharing backend %s must implement the interface OCP\\Share_Backend" msgstr "" -#: private/share/share.php:947 +#: private/share/share.php:949 #, php-format msgid "Sharing backend %s not found" msgstr "" -#: private/share/share.php:953 +#: private/share/share.php:955 #, php-format msgid "Sharing backend for %s not found" msgstr "" -#: private/share/share.php:1367 +#: private/share/share.php:1370 #, php-format msgid "Sharing %s failed, because the user %s is the original sharer" msgstr "" -#: private/share/share.php:1376 +#: private/share/share.php:1379 #, php-format msgid "" "Sharing %s failed, because the permissions exceed permissions granted to %s" msgstr "" -#: private/share/share.php:1391 +#: private/share/share.php:1394 #, php-format msgid "Sharing %s failed, because resharing is not allowed" msgstr "" -#: private/share/share.php:1403 +#: private/share/share.php:1406 #, php-format msgid "" "Sharing %s failed, because the sharing backend for %s could not find its " "source" msgstr "" -#: private/share/share.php:1417 +#: private/share/share.php:1420 #, php-format msgid "" "Sharing %s failed, because the file could not be found in the file cache" msgstr "" -#: private/tags.php:193 +#: private/tags.php:183 #, php-format msgid "Could not find category \"%s\"" msgstr "ÐšÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ñ \"%s\" не найдена" @@ -466,7 +467,7 @@ msgstr "неÑколько лет назад" msgid "" "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", " "\"0-9\", and \"_.@-\"" -msgstr "" +msgstr "Только Ñледующие Ñимволы допуÑкаютÑÑ Ð² имени пользователÑ: \"a-z\", \"A-Z\", \"0-9\", и \"_.@-\"" #: private/user/manager.php:237 msgid "A valid username must be provided" @@ -478,4 +479,4 @@ msgstr "Укажите валидный пароль" #: private/user/manager.php:246 msgid "The username is already being used" -msgstr "" +msgstr "Ð˜Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ ÑƒÐ¶Ðµ иÑпользуетÑÑ" diff --git a/l10n/ru/settings.po b/l10n/ru/settings.po index e87df00e1fc..340f4912913 100644 --- a/l10n/ru/settings.po +++ b/l10n/ru/settings.po @@ -24,9 +24,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" -"Last-Translator: Denis Plastinin <denispal@gmail.com>\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" +"Last-Translator: I Robot\n" "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -68,7 +68,7 @@ msgstr "Ð’Ñ‹ должны наÑтроить Ñвой e-mail пользоватРmsgid "Send mode" msgstr "Отправить Ñообщение" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "Шифрование" @@ -115,6 +115,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "Email Ñохранен" @@ -131,6 +141,16 @@ msgstr "Ðевозможно удалить группу" msgid "Unable to delete user" msgstr "Ðевозможно удалить пользователÑ" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "Язык изменён" @@ -242,34 +262,42 @@ msgstr "Обновить" msgid "Updated" msgstr "Обновлено" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "Выберите картинку профилÑ" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "Очень Ñлабый пароль" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "Слабый пароль" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "Так Ñебе пароль" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "Хороший пароль" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "УÑтойчивый к взлому пароль" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "РаÑшифровка файлов... ПожалуйÑта, подождите, Ñто может занÑÑ‚ÑŒ некоторое времÑ." +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "удален" @@ -315,7 +343,7 @@ msgstr "Укажите валидный пароль" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "Предупреждение: домашнÑÑ Ð¿Ð°Ð¿ÐºÐ° Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ \"{user}\" уже ÑущеÑтвует" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "РуÑÑкий " @@ -640,11 +668,11 @@ msgstr "Больше" msgid "Less" msgstr "Меньше" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "ВерÑиÑ" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -808,18 +836,33 @@ msgid "" "WebDAV</a>" msgstr "ИÑпользуйте Ñтот адреÑÑ Ð´Ð»Ñ <a href=\"%s\" target=\"_blank\">доÑтупа к вашим файлам через WebDAV</a>" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "Приложение Ð´Ð»Ñ ÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð²Ñ‹ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¾, пожалуйÑта, раÑшифруйте ваши файлы" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "Пароль входа" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "СнÑÑ‚ÑŒ шифрование Ñо вÑех файлов" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "Ð˜Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ" diff --git a/l10n/ru/user_ldap.po b/l10n/ru/user_ldap.po index a62b55aa5c9..9be7270d4c9 100644 --- a/l10n/ru/user_ldap.po +++ b/l10n/ru/user_ldap.po @@ -18,8 +18,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-09 01:55-0400\n" -"PO-Revision-Date: 2014-05-08 19:30+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: jekader <jekader@gmail.com>\n" "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/si_LK/core.po b/l10n/si_LK/core.po index 17ca0d4e775..99822bb92cf 100644 --- a/l10n/si_LK/core.po +++ b/l10n/si_LK/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:02+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:01+0000\n" "Last-Translator: I Robot\n" "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/si_LK/files_external.po b/l10n/si_LK/files_external.po index 92f51a59eb8..2c1d5d4974d 100644 --- a/l10n/si_LK/files_external.po +++ b/l10n/si_LK/files_external.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n" "MIME-Version: 1.0\n" @@ -197,29 +197,29 @@ msgstr "Google Drive ගබඩà·à·€ වින්â€à¶ºà·à·ƒ කිරීමේ msgid "Saved" msgstr "" -#: lib/config.php:598 +#: lib/config.php:597 msgid "<b>Note:</b> " msgstr "" -#: lib/config.php:608 +#: lib/config.php:607 msgid " and " msgstr "" -#: lib/config.php:630 +#: lib/config.php:629 #, php-format msgid "" "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting " "of %s is not possible. Please ask your system administrator to install it." msgstr "" -#: lib/config.php:632 +#: lib/config.php:631 #, php-format msgid "" "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of" " %s is not possible. Please ask your system administrator to install it." msgstr "" -#: lib/config.php:634 +#: lib/config.php:633 #, php-format msgid "" "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please" diff --git a/l10n/si_LK/files_sharing.po b/l10n/si_LK/files_sharing.po index d6fd9a25766..8688d68c79e 100644 --- a/l10n/si_LK/files_sharing.po +++ b/l10n/si_LK/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-04 01:55-0400\n" -"PO-Revision-Date: 2014-05-03 06:11+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n" "MIME-Version: 1.0\n" @@ -61,11 +61,11 @@ msgstr "" msgid "Download" msgstr "බà·à¶±à·Šà¶±" -#: templates/public.php:53 +#: templates/public.php:52 #, php-format msgid "Download %s" msgstr "" -#: templates/public.php:57 +#: templates/public.php:56 msgid "Direct link" msgstr "" diff --git a/l10n/si_LK/settings.po b/l10n/si_LK/settings.po index 9dfb9732ce1..e985bc24165 100644 --- a/l10n/si_LK/settings.po +++ b/l10n/si_LK/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "ගුප්චකේà¶à¶±à¶º" @@ -98,6 +98,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "වි-à¶à·à¶´à·‘ල සුරකින ලදී" @@ -114,6 +124,16 @@ msgstr "කණ්ඩà·à¶ºà¶¸ මà·à¶šà·“මට නොහà·à¶š" msgid "Unable to delete user" msgstr "පරිà·à·“ලකය෠මà·à¶šà·“මට නොහà·à¶š" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "භà·à·‚à·à·€ à·à·€à¶±à·ƒà·Š කිරීම" @@ -225,34 +245,42 @@ msgstr "යà·à·€à¶à·Šà¶šà·à¶½ කිරීම" msgid "Updated" msgstr "" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "" @@ -298,7 +326,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "" @@ -623,11 +651,11 @@ msgstr "à·€à·à¶©à·’" msgid "Less" msgstr "අඩු" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -791,18 +819,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "ප්â€à¶»à·€à·’à·à·Šà¶§à¶º" diff --git a/l10n/si_LK/user_ldap.po b/l10n/si_LK/user_ldap.po index d52baea5c3f..2882eede5aa 100644 --- a/l10n/si_LK/user_ldap.po +++ b/l10n/si_LK/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/sk/settings.po b/l10n/sk/settings.po index b9f2f2eb06c..69c7a59282c 100644 --- a/l10n/sk/settings.po +++ b/l10n/sk/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-26 01:54-0400\n" -"PO-Revision-Date: 2014-04-26 05:54+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "" @@ -98,6 +98,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -114,6 +124,16 @@ msgstr "" msgid "Unable to delete user" msgstr "" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "" @@ -225,34 +245,42 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "" @@ -298,7 +326,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "" @@ -623,11 +651,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -791,18 +819,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "" diff --git a/l10n/sk_SK/core.po b/l10n/sk_SK/core.po index ad37637a507..6cb073ce6ea 100644 --- a/l10n/sk_SK/core.po +++ b/l10n/sk_SK/core.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-03 01:55-0400\n" -"PO-Revision-Date: 2014-05-02 09:36+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: mhh <marian.hvolka@stuba.sk>\n" "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/sk_SK/files_external.po b/l10n/sk_SK/files_external.po index 196571e630e..88872343636 100644 --- a/l10n/sk_SK/files_external.po +++ b/l10n/sk_SK/files_external.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n" "MIME-Version: 1.0\n" @@ -198,29 +198,29 @@ msgstr "Chyba pri konfigurácii úložiska Google drive" msgid "Saved" msgstr "Uložené" -#: lib/config.php:598 +#: lib/config.php:597 msgid "<b>Note:</b> " msgstr "<b>Poznámka:</b> " -#: lib/config.php:608 +#: lib/config.php:607 msgid " and " msgstr "a" -#: lib/config.php:630 +#: lib/config.php:629 #, php-format msgid "" "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting " "of %s is not possible. Please ask your system administrator to install it." msgstr "<b>Poznámka:</b> cURL podpora v PHP nie je zapnutá alebo nainÅ¡talovaná. Pripojenie %s nie je možné. Požiadajte správcu systému, aby ju nainÅ¡taloval." -#: lib/config.php:632 +#: lib/config.php:631 #, php-format msgid "" "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of" " %s is not possible. Please ask your system administrator to install it." msgstr "<b>Poznámka:</b> FTP podpora v PHP nie je zapnutá alebo nainÅ¡talovaná. Pripojenie %s nie je možné. Požiadajte správcu systému, aby ju nainÅ¡taloval." -#: lib/config.php:634 +#: lib/config.php:633 #, php-format msgid "" "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please" diff --git a/l10n/sk_SK/files_sharing.po b/l10n/sk_SK/files_sharing.po index e7583031b5c..0fc2848f35e 100644 --- a/l10n/sk_SK/files_sharing.po +++ b/l10n/sk_SK/files_sharing.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-04 01:55-0400\n" -"PO-Revision-Date: 2014-05-03 06:11+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n" "MIME-Version: 1.0\n" @@ -62,11 +62,11 @@ msgstr "Pre viac informácià kontaktujte osobu, ktorá vám poslala tento odkaz msgid "Download" msgstr "SÅ¥ahovanie" -#: templates/public.php:53 +#: templates/public.php:52 #, php-format msgid "Download %s" msgstr "StiahnuÅ¥ %s" -#: templates/public.php:57 +#: templates/public.php:56 msgid "Direct link" msgstr "Priama linka" diff --git a/l10n/sk_SK/settings.po b/l10n/sk_SK/settings.po index 0f278975758..aa8af7fe801 100644 --- a/l10n/sk_SK/settings.po +++ b/l10n/sk_SK/settings.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n" "MIME-Version: 1.0\n" @@ -53,7 +53,7 @@ msgstr "MusÃte nastaviÅ¥ svoj po​​užÃvateľský email, než budete môcÅ¥ msgid "Send mode" msgstr "Mód odosielania" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "Å ifrovanie" @@ -100,6 +100,16 @@ msgstr "Nemožno deÅ¡ifrovaÅ¥ vaÅ¡e súbory, skontrolujte svoj owncloud.log aleb msgid "Couldn't decrypt your files, check your password and try again" msgstr "Nemožno deÅ¡ifrovaÅ¥ vaÅ¡e súbory, skontrolujte svoje heslo a skúste to znova" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "Email uložený" @@ -116,6 +126,16 @@ msgstr "Nie je možné odstrániÅ¥ skupinu" msgid "Unable to delete user" msgstr "Nie je možné odstrániÅ¥ použÃvateľa" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "Jazyk zmenený" @@ -227,34 +247,42 @@ msgstr "AktualizovaÅ¥" msgid "Updated" msgstr "Aktualizované" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "VybraÅ¥ avatara" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "Veľmi slabé heslo" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "Slabé heslo" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "Priemerné heslo" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "Dobré heslo" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "Silné heslo" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "DeÅ¡ifrujem súbory ... PoÄkajte prosÃm, môže to chvÃľu trvaÅ¥." +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "zmazané" @@ -300,7 +328,7 @@ msgstr "MusÃte zadaÅ¥ platné heslo" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "Upozornenie: Domovský prieÄinok použÃvateľa \"{user}\" už existuje" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "Slovensky" @@ -625,11 +653,11 @@ msgstr "Viac" msgid "Less" msgstr "Menej" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "Verzia" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -793,18 +821,33 @@ msgid "" "WebDAV</a>" msgstr "Použite túto linku <a href=\"%s\" target=\"_blank\">pre prÃstup k vaÅ¡im súborom cez WebDAV</a>" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "Å ifrovacia aplikácia už nie je spustená, deÅ¡ifrujte vÅ¡etky svoje súbory." -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "Prihlasovacie heslo" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "DeÅ¡ifrovaÅ¥ vÅ¡etky súbory" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "Prihlasovacie meno" diff --git a/l10n/sk_SK/user_ldap.po b/l10n/sk_SK/user_ldap.po index b1e19e7bbd4..7358a60552c 100644 --- a/l10n/sk_SK/user_ldap.po +++ b/l10n/sk_SK/user_ldap.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-03 01:55-0400\n" -"PO-Revision-Date: 2014-05-02 14:14+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: mhh <marian.hvolka@stuba.sk>\n" "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/sl/core.po b/l10n/sl/core.po index 818fe0b423a..684da2d982d 100644 --- a/l10n/sl/core.po +++ b/l10n/sl/core.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:02+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/sl/files_external.po b/l10n/sl/files_external.po index fca3d7d7ea6..f57f30bfce6 100644 --- a/l10n/sl/files_external.po +++ b/l10n/sl/files_external.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-09 01:55-0400\n" -"PO-Revision-Date: 2014-05-08 19:20+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: mateju <>\n" "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/sl/files_sharing.po b/l10n/sl/files_sharing.po index 8ed4467b4ab..110d71d9018 100644 --- a/l10n/sl/files_sharing.po +++ b/l10n/sl/files_sharing.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-09 01:55-0400\n" -"PO-Revision-Date: 2014-05-08 19:26+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: mateju <>\n" "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/sl/settings.po b/l10n/sl/settings.po index 0882d0d7e96..11b2961b24b 100644 --- a/l10n/sl/settings.po +++ b/l10n/sl/settings.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n" "MIME-Version: 1.0\n" @@ -53,7 +53,7 @@ msgstr "" msgid "Send mode" msgstr "NaÄin poÅ¡iljanja" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "Å ifriranje" @@ -100,6 +100,16 @@ msgstr "Datotek ni mogoÄe odÅ¡ifrirati. Preverite dnevnik owncloud.log ali pa s msgid "Couldn't decrypt your files, check your password and try again" msgstr "Datotek ni mogoÄe odÅ¡ifrirati. Preverite geslo in poskusite znova." +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "Elektronski naslov je shranjen" @@ -116,6 +126,16 @@ msgstr "Skupine ni mogoÄe izbrisati" msgid "Unable to delete user" msgstr "Uporabnika ni mogoÄe izbrisati" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "Jezik je spremenjen" @@ -227,34 +247,42 @@ msgstr "Posodobi" msgid "Updated" msgstr "Posodobljeno" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "Izbor slike profila" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "Zelo Å¡ibko geslo" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "Å ibko geslo" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "Slabo geslo" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "Dobro geslo" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "OdliÄno geslo" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "Poteka odÅ¡ifriranje datotek ... Opravilo je lahko dolgotrajno." +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "izbrisano" @@ -300,7 +328,7 @@ msgstr "Navedeno mora biti veljavno geslo" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "Opozorilo: osebna mapa uporabnika \"{user}\" že obstaja" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "SlovenÅ¡Äina" @@ -625,11 +653,11 @@ msgstr "VeÄ" msgid "Less" msgstr "Manj" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "RazliÄica" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -793,18 +821,33 @@ msgid "" "WebDAV</a>" msgstr "Uporabite naslov <a href=\"%s\" target=\"_blank\"> za dostop do datotek rpeko sistema WebDAV</a>." -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "Program za Å¡ifriranje ni veÄ omogoÄen. OdÅ¡ifrirati je treba vse datoteke." -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "Prijavno geslo" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "OdÅ¡ifriraj vse datoteke" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "Prijavno ime" diff --git a/l10n/sl/user_ldap.po b/l10n/sl/user_ldap.po index 710490b5d03..a3f095a0c88 100644 --- a/l10n/sl/user_ldap.po +++ b/l10n/sl/user_ldap.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/sq/core.po b/l10n/sq/core.po index 91349d9cd16..e10af3f69b2 100644 --- a/l10n/sq/core.po +++ b/l10n/sq/core.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:02+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:01+0000\n" "Last-Translator: I Robot\n" "Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/sq/files_external.po b/l10n/sq/files_external.po index 3f6fcc5ba8f..e0b97c06390 100644 --- a/l10n/sq/files_external.po +++ b/l10n/sq/files_external.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n" "MIME-Version: 1.0\n" @@ -197,29 +197,29 @@ msgstr "" msgid "Saved" msgstr "" -#: lib/config.php:598 +#: lib/config.php:597 msgid "<b>Note:</b> " msgstr "" -#: lib/config.php:608 +#: lib/config.php:607 msgid " and " msgstr "" -#: lib/config.php:630 +#: lib/config.php:629 #, php-format msgid "" "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting " "of %s is not possible. Please ask your system administrator to install it." msgstr "" -#: lib/config.php:632 +#: lib/config.php:631 #, php-format msgid "" "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of" " %s is not possible. Please ask your system administrator to install it." msgstr "" -#: lib/config.php:634 +#: lib/config.php:633 #, php-format msgid "" "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please" diff --git a/l10n/sq/files_sharing.po b/l10n/sq/files_sharing.po index c929692b714..e98c2b091c2 100644 --- a/l10n/sq/files_sharing.po +++ b/l10n/sq/files_sharing.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-04 01:55-0400\n" -"PO-Revision-Date: 2014-05-03 06:11+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n" "MIME-Version: 1.0\n" @@ -63,11 +63,11 @@ msgstr "Për më shumë informacione, ju lutem pyesni personin që iu dërgoi kà msgid "Download" msgstr "Shkarko" -#: templates/public.php:53 +#: templates/public.php:52 #, php-format msgid "Download %s" msgstr "" -#: templates/public.php:57 +#: templates/public.php:56 msgid "Direct link" msgstr "Lidhje direkte" diff --git a/l10n/sq/settings.po b/l10n/sq/settings.po index 740d66c817b..483e403c42c 100644 --- a/l10n/sq/settings.po +++ b/l10n/sq/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "" @@ -98,6 +98,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "Email u ruajt" @@ -114,6 +124,16 @@ msgstr "E pamundur të fshihet grupi" msgid "Unable to delete user" msgstr "E pamundur të fshihet përdoruesi" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "Gjuha u ndryshua" @@ -225,34 +245,42 @@ msgstr "Përditësim" msgid "Updated" msgstr "I përditësuar" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "fshirë" @@ -298,7 +326,7 @@ msgstr "Duhet të jepni një fjalëkalim te vlefshëm" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "Shqip" @@ -623,11 +651,11 @@ msgstr "Më tepër" msgid "Less" msgstr "M'pak" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "Versioni" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -791,18 +819,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "Emri i Përdoruesit" diff --git a/l10n/sq/user_ldap.po b/l10n/sq/user_ldap.po index 66a82a0dafa..335275a449b 100644 --- a/l10n/sq/user_ldap.po +++ b/l10n/sq/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/sr/core.po b/l10n/sr/core.po index 0fa6842d909..ae51327796a 100644 --- a/l10n/sr/core.po +++ b/l10n/sr/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:02+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/sr/files_external.po b/l10n/sr/files_external.po index 1e0db66f61d..018383dae8b 100644 --- a/l10n/sr/files_external.po +++ b/l10n/sr/files_external.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:10+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n" "MIME-Version: 1.0\n" @@ -197,29 +197,29 @@ msgstr "" msgid "Saved" msgstr "" -#: lib/config.php:598 +#: lib/config.php:597 msgid "<b>Note:</b> " msgstr "" -#: lib/config.php:608 +#: lib/config.php:607 msgid " and " msgstr "" -#: lib/config.php:630 +#: lib/config.php:629 #, php-format msgid "" "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting " "of %s is not possible. Please ask your system administrator to install it." msgstr "" -#: lib/config.php:632 +#: lib/config.php:631 #, php-format msgid "" "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of" " %s is not possible. Please ask your system administrator to install it." msgstr "" -#: lib/config.php:634 +#: lib/config.php:633 #, php-format msgid "" "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please" diff --git a/l10n/sr/files_sharing.po b/l10n/sr/files_sharing.po index 7ec0e15f341..d303fcfb81a 100644 --- a/l10n/sr/files_sharing.po +++ b/l10n/sr/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-04 01:55-0400\n" -"PO-Revision-Date: 2014-05-03 06:11+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n" "MIME-Version: 1.0\n" @@ -61,11 +61,11 @@ msgstr "" msgid "Download" msgstr "Преузми" -#: templates/public.php:53 +#: templates/public.php:52 #, php-format msgid "Download %s" msgstr "" -#: templates/public.php:57 +#: templates/public.php:56 msgid "Direct link" msgstr "" diff --git a/l10n/sr/settings.po b/l10n/sr/settings.po index b6da915058c..d5ebcbcd963 100644 --- a/l10n/sr/settings.po +++ b/l10n/sr/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "Шифровање" @@ -98,6 +98,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "Е-порука Ñачувана" @@ -114,6 +124,16 @@ msgstr "Ðе могу да уклоним групу" msgid "Unable to delete user" msgstr "Ðе могу да уклоним кориÑника" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "Језик је промењен" @@ -225,34 +245,42 @@ msgstr "Ðжурирај" msgid "Updated" msgstr "Ðжурирано" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "обриÑано" @@ -298,7 +326,7 @@ msgstr "Морате унети иÑправну лозинку" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "__language_name__" @@ -623,11 +651,11 @@ msgstr "Више" msgid "Less" msgstr "Мање" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "Верзија" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -791,18 +819,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "КориÑничко име" diff --git a/l10n/sr/user_ldap.po b/l10n/sr/user_ldap.po index 9ee48009333..568ce37fc5e 100644 --- a/l10n/sr/user_ldap.po +++ b/l10n/sr/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/sr@latin/core.po b/l10n/sr@latin/core.po index f43faf21534..cf95dddc752 100644 --- a/l10n/sr@latin/core.po +++ b/l10n/sr@latin/core.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:02+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/sr@latin/files_external.po b/l10n/sr@latin/files_external.po index 0e7bea5bbe7..c8e6a4a66e9 100644 --- a/l10n/sr@latin/files_external.po +++ b/l10n/sr@latin/files_external.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:10+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n" "MIME-Version: 1.0\n" @@ -197,29 +197,29 @@ msgstr "" msgid "Saved" msgstr "" -#: lib/config.php:598 +#: lib/config.php:597 msgid "<b>Note:</b> " msgstr "" -#: lib/config.php:608 +#: lib/config.php:607 msgid " and " msgstr "" -#: lib/config.php:630 +#: lib/config.php:629 #, php-format msgid "" "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting " "of %s is not possible. Please ask your system administrator to install it." msgstr "" -#: lib/config.php:632 +#: lib/config.php:631 #, php-format msgid "" "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of" " %s is not possible. Please ask your system administrator to install it." msgstr "" -#: lib/config.php:634 +#: lib/config.php:633 #, php-format msgid "" "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please" diff --git a/l10n/sr@latin/files_sharing.po b/l10n/sr@latin/files_sharing.po index c32964116c6..93da175cedb 100644 --- a/l10n/sr@latin/files_sharing.po +++ b/l10n/sr@latin/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-04 01:55-0400\n" -"PO-Revision-Date: 2014-05-03 06:11+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n" "MIME-Version: 1.0\n" @@ -61,11 +61,11 @@ msgstr "" msgid "Download" msgstr "Preuzmi" -#: templates/public.php:53 +#: templates/public.php:52 #, php-format msgid "Download %s" msgstr "" -#: templates/public.php:57 +#: templates/public.php:56 msgid "Direct link" msgstr "" diff --git a/l10n/sr@latin/settings.po b/l10n/sr@latin/settings.po index c53bde2cddb..4304815e19e 100644 --- a/l10n/sr@latin/settings.po +++ b/l10n/sr@latin/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "" @@ -98,6 +98,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -114,6 +124,16 @@ msgstr "" msgid "Unable to delete user" msgstr "" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "Jezik je izmenjen" @@ -225,34 +245,42 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "" @@ -298,7 +326,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "" @@ -623,11 +651,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -791,18 +819,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "" diff --git a/l10n/sr@latin/user_ldap.po b/l10n/sr@latin/user_ldap.po index cc13196c21b..0c22027a8e8 100644 --- a/l10n/sr@latin/user_ldap.po +++ b/l10n/sr@latin/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/su/settings.po b/l10n/su/settings.po index b33b3f24895..e076843db1d 100644 --- a/l10n/su/settings.po +++ b/l10n/su/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-26 01:54-0400\n" -"PO-Revision-Date: 2014-04-26 05:54+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Sundanese (http://www.transifex.com/projects/p/owncloud/language/su/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "" @@ -98,6 +98,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -114,6 +124,16 @@ msgstr "" msgid "Unable to delete user" msgstr "" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "" @@ -225,34 +245,42 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "" @@ -298,7 +326,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "" @@ -623,11 +651,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -791,18 +819,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "" diff --git a/l10n/sv/core.po b/l10n/sv/core.po index 0d91b8ae31f..461f01649ab 100644 --- a/l10n/sv/core.po +++ b/l10n/sv/core.po @@ -16,8 +16,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:02+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: enoch85 <enoch85@gmail.com>\n" "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/sv/files_external.po b/l10n/sv/files_external.po index 1c70c523753..0ec3bbede16 100644 --- a/l10n/sv/files_external.po +++ b/l10n/sv/files_external.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n" "MIME-Version: 1.0\n" @@ -201,29 +201,29 @@ msgstr "Fel vid konfigurering av Google Drive" msgid "Saved" msgstr "Sparad" -#: lib/config.php:598 +#: lib/config.php:597 msgid "<b>Note:</b> " msgstr "<b> OBS: </ b>" -#: lib/config.php:608 +#: lib/config.php:607 msgid " and " msgstr "och" -#: lib/config.php:630 +#: lib/config.php:629 #, php-format msgid "" "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting " "of %s is not possible. Please ask your system administrator to install it." msgstr "<b> OBS: </ b> cURL stöd i PHP inte är aktiverat eller installeras. Montering av %s är inte möjlig. Be din systemadministratör att installera det." -#: lib/config.php:632 +#: lib/config.php:631 #, php-format msgid "" "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of" " %s is not possible. Please ask your system administrator to install it." msgstr "<b> OBS: </ b> Den FTP-stöd i PHP inte är aktiverat eller installeras. Montering av %s är inte möjlig. Be din systemadministratör att installera det." -#: lib/config.php:634 +#: lib/config.php:633 #, php-format msgid "" "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please" diff --git a/l10n/sv/files_sharing.po b/l10n/sv/files_sharing.po index 9d1259ee7c3..68ab8865420 100644 --- a/l10n/sv/files_sharing.po +++ b/l10n/sv/files_sharing.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-04 01:55-0400\n" -"PO-Revision-Date: 2014-05-03 06:12+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n" "MIME-Version: 1.0\n" @@ -65,11 +65,11 @@ msgstr "För mer information, kontakta den person som skickade den här länken. msgid "Download" msgstr "Ladda ner" -#: templates/public.php:53 +#: templates/public.php:52 #, php-format msgid "Download %s" msgstr "Ladda ner %s" -#: templates/public.php:57 +#: templates/public.php:56 msgid "Direct link" msgstr "Direkt länk" diff --git a/l10n/sv/settings.po b/l10n/sv/settings.po index 740ae25e56c..a139b7007df 100644 --- a/l10n/sv/settings.po +++ b/l10n/sv/settings.po @@ -20,8 +20,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n" "MIME-Version: 1.0\n" @@ -64,7 +64,7 @@ msgstr "Du behöver ställa in din användares e-postadress före du kan skicka msgid "Send mode" msgstr "Sändningsläge" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "Kryptering" @@ -111,6 +111,16 @@ msgstr "Det gick inte att dekryptera dina filer, kontrollera din owncloud.log el msgid "Couldn't decrypt your files, check your password and try again" msgstr "Det gick inte att dekryptera filerna, kontrollera ditt lösenord och försök igen" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "E-post sparad" @@ -127,6 +137,16 @@ msgstr "Kan inte radera grupp" msgid "Unable to delete user" msgstr "Kan inte radera användare" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "SprÃ¥k ändrades" @@ -238,34 +258,42 @@ msgstr "Uppdatera" msgid "Updated" msgstr "Uppdaterad" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "Välj en profilbild" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "Väldigt svagt lösenord" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "Svagt lösenord" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "Okej lösenord" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "Bra lösenord" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "Starkt lösenord" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "Dekrypterar filer... Vänligen vänta, detta kan ta en stund." +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "raderad" @@ -311,7 +339,7 @@ msgstr "Ett giltigt lösenord mÃ¥ste anges" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "Varning: Hem katalogen för varje användare \"{användare}\" finns redan" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "__language_name__" @@ -636,11 +664,11 @@ msgstr "Mer" msgid "Less" msgstr "Mindre" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "Version" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -804,18 +832,33 @@ msgid "" "WebDAV</a>" msgstr "Använd denna adress till <a href=\"%s\" target=\"_blank\">nÃ¥ dina Filer via WebDAV</a>" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "Krypteringsapplikationen är inte längre aktiverad, vänligen dekryptera alla dina filer" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "Inloggningslösenord" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "Dekryptera alla filer" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "Inloggningsnamn" diff --git a/l10n/sv/user_ldap.po b/l10n/sv/user_ldap.po index c54d109cc9a..eb6ae7cb2b0 100644 --- a/l10n/sv/user_ldap.po +++ b/l10n/sv/user_ldap.po @@ -17,8 +17,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: henrikhjelm <mailto@henrikhjelm.se>\n" "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/sw_KE/settings.po b/l10n/sw_KE/settings.po index 9ab7ca5f0ad..178d0a25d36 100644 --- a/l10n/sw_KE/settings.po +++ b/l10n/sw_KE/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-26 01:54-0400\n" -"PO-Revision-Date: 2014-04-26 05:54+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "" @@ -98,6 +98,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -114,6 +124,16 @@ msgstr "" msgid "Unable to delete user" msgstr "" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "" @@ -225,34 +245,42 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "" @@ -298,7 +326,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "" @@ -623,11 +651,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -791,18 +819,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "" diff --git a/l10n/ta_IN/settings.po b/l10n/ta_IN/settings.po index 2bfa5979306..f6bfb6d656e 100644 --- a/l10n/ta_IN/settings.po +++ b/l10n/ta_IN/settings.po @@ -7,9 +7,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-01 01:55-0400\n" -"PO-Revision-Date: 2013-04-26 08:00+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" +"Last-Translator: I Robot\n" "Language-Team: Tamil (India) (http://www.transifex.com/projects/p/owncloud/language/ta_IN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "" @@ -98,6 +98,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -114,6 +124,16 @@ msgstr "" msgid "Unable to delete user" msgstr "" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "" @@ -225,34 +245,42 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "" @@ -298,7 +326,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "" @@ -623,11 +651,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -791,18 +819,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "" diff --git a/l10n/ta_LK/core.po b/l10n/ta_LK/core.po index 18eb823a9f0..b786fa52ef5 100644 --- a/l10n/ta_LK/core.po +++ b/l10n/ta_LK/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:02+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/ta_LK/files_external.po b/l10n/ta_LK/files_external.po index 5daa52be8bd..b433eabc4ee 100644 --- a/l10n/ta_LK/files_external.po +++ b/l10n/ta_LK/files_external.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n" "MIME-Version: 1.0\n" @@ -197,29 +197,29 @@ msgstr "Google இயகà¯à®• சேமிபà¯à®ªà®•à®¤à¯à®¤à¯ˆ தகமை msgid "Saved" msgstr "" -#: lib/config.php:598 +#: lib/config.php:597 msgid "<b>Note:</b> " msgstr "" -#: lib/config.php:608 +#: lib/config.php:607 msgid " and " msgstr "" -#: lib/config.php:630 +#: lib/config.php:629 #, php-format msgid "" "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting " "of %s is not possible. Please ask your system administrator to install it." msgstr "" -#: lib/config.php:632 +#: lib/config.php:631 #, php-format msgid "" "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of" " %s is not possible. Please ask your system administrator to install it." msgstr "" -#: lib/config.php:634 +#: lib/config.php:633 #, php-format msgid "" "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please" diff --git a/l10n/ta_LK/files_sharing.po b/l10n/ta_LK/files_sharing.po index ca4ae0af9aa..87be2e3233e 100644 --- a/l10n/ta_LK/files_sharing.po +++ b/l10n/ta_LK/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-04 01:55-0400\n" -"PO-Revision-Date: 2014-05-03 06:12+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n" "MIME-Version: 1.0\n" @@ -61,11 +61,11 @@ msgstr "" msgid "Download" msgstr "பதிவிறகà¯à®•à¯à®•" -#: templates/public.php:53 +#: templates/public.php:52 #, php-format msgid "Download %s" msgstr "" -#: templates/public.php:57 +#: templates/public.php:56 msgid "Direct link" msgstr "" diff --git a/l10n/ta_LK/settings.po b/l10n/ta_LK/settings.po index efb53ddde84..8a59e664b22 100644 --- a/l10n/ta_LK/settings.po +++ b/l10n/ta_LK/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "மறைகà¯à®•à¯à®±à®¿à®¯à¯€à®Ÿà¯" @@ -98,6 +98,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "மினà¯à®©à®žà¯à®šà®²à¯ சேமிகà¯à®•à®ªà¯à®ªà®Ÿà¯à®Ÿà®¤à¯" @@ -114,6 +124,16 @@ msgstr "கà¯à®´à¯à®µà¯ˆ நீகà¯à®• à®®à¯à®Ÿà®¿à®¯à®¾à®¤à¯" msgid "Unable to delete user" msgstr "பயனாளரை நீகà¯à®• à®®à¯à®Ÿà®¿à®¯à®¾à®¤à¯" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "மொழி மாறà¯à®±à®ªà¯à®ªà®Ÿà¯à®Ÿà®¤à¯" @@ -225,34 +245,42 @@ msgstr "இறà¯à®±à¯ˆà®ªà¯à®ªà®Ÿà¯à®¤à¯à®¤à®²à¯" msgid "Updated" msgstr "" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "" @@ -298,7 +326,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "_மொழி_பெயரà¯_" @@ -623,11 +651,11 @@ msgstr "மேலதிக" msgid "Less" msgstr "கà¯à®±à¯ˆà®µà®¾à®©" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -791,18 +819,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "பà¯à®•à¯à®ªà®¤à®¿à®•à¯ˆ" diff --git a/l10n/ta_LK/user_ldap.po b/l10n/ta_LK/user_ldap.po index 1592ce84a9b..adaef17832f 100644 --- a/l10n/ta_LK/user_ldap.po +++ b/l10n/ta_LK/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/te/core.po b/l10n/te/core.po index bfe1e59fce8..ce244803295 100644 --- a/l10n/te/core.po +++ b/l10n/te/core.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:02+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/te/files_external.po b/l10n/te/files_external.po index 44c9d8c6957..11b6e7f58ee 100644 --- a/l10n/te/files_external.po +++ b/l10n/te/files_external.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n" "MIME-Version: 1.0\n" @@ -197,29 +197,29 @@ msgstr "" msgid "Saved" msgstr "" -#: lib/config.php:598 +#: lib/config.php:597 msgid "<b>Note:</b> " msgstr "" -#: lib/config.php:608 +#: lib/config.php:607 msgid " and " msgstr "" -#: lib/config.php:630 +#: lib/config.php:629 #, php-format msgid "" "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting " "of %s is not possible. Please ask your system administrator to install it." msgstr "" -#: lib/config.php:632 +#: lib/config.php:631 #, php-format msgid "" "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of" " %s is not possible. Please ask your system administrator to install it." msgstr "" -#: lib/config.php:634 +#: lib/config.php:633 #, php-format msgid "" "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please" diff --git a/l10n/te/files_sharing.po b/l10n/te/files_sharing.po index 5cfac634fcb..2dc93abd2e8 100644 --- a/l10n/te/files_sharing.po +++ b/l10n/te/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-03 01:55-0400\n" -"PO-Revision-Date: 2014-05-03 05:55+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n" "MIME-Version: 1.0\n" @@ -61,11 +61,11 @@ msgstr "" msgid "Download" msgstr "" -#: templates/public.php:53 +#: templates/public.php:52 #, php-format msgid "Download %s" msgstr "" -#: templates/public.php:57 +#: templates/public.php:56 msgid "Direct link" msgstr "" diff --git a/l10n/te/settings.po b/l10n/te/settings.po index cb101ffa919..95f442bdbcd 100644 --- a/l10n/te/settings.po +++ b/l10n/te/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "" @@ -98,6 +98,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -114,6 +124,16 @@ msgstr "" msgid "Unable to delete user" msgstr "" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "" @@ -225,34 +245,42 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "" @@ -298,7 +326,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "" @@ -623,11 +651,11 @@ msgstr "మరినà±à°¨à°¿" msgid "Less" msgstr "" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -791,18 +819,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "" diff --git a/l10n/te/user_ldap.po b/l10n/te/user_ldap.po index 79af6e1f351..74e62d8f136 100644 --- a/l10n/te/user_ldap.po +++ b/l10n/te/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot index 441efd5a8c3..f7851091949 100644 --- a/l10n/templates/core.pot +++ b/l10n/templates/core.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-09 01:55-0400\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -191,75 +191,75 @@ msgstr "" msgid "years ago" msgstr "" -#: js/oc-dialogs.js:125 -msgid "Choose" +#: js/oc-dialogs.js:95 js/oc-dialogs.js:236 +msgid "Yes" msgstr "" -#: js/oc-dialogs.js:151 -msgid "Error loading file picker template: {error}" +#: js/oc-dialogs.js:105 js/oc-dialogs.js:246 +msgid "No" msgstr "" -#: js/oc-dialogs.js:177 -msgid "Yes" +#: js/oc-dialogs.js:184 +msgid "Choose" msgstr "" -#: js/oc-dialogs.js:187 -msgid "No" +#: js/oc-dialogs.js:210 +msgid "Error loading file picker template: {error}" msgstr "" -#: js/oc-dialogs.js:204 +#: js/oc-dialogs.js:263 msgid "Ok" msgstr "" -#: js/oc-dialogs.js:224 +#: js/oc-dialogs.js:283 msgid "Error loading message template: {error}" msgstr "" -#: js/oc-dialogs.js:352 +#: js/oc-dialogs.js:411 msgid "{count} file conflict" msgid_plural "{count} file conflicts" msgstr[0] "" msgstr[1] "" -#: js/oc-dialogs.js:366 +#: js/oc-dialogs.js:425 msgid "One file conflict" msgstr "" -#: js/oc-dialogs.js:372 +#: js/oc-dialogs.js:431 msgid "New Files" msgstr "" -#: js/oc-dialogs.js:373 +#: js/oc-dialogs.js:432 msgid "Already existing files" msgstr "" -#: js/oc-dialogs.js:375 +#: js/oc-dialogs.js:434 msgid "Which files do you want to keep?" msgstr "" -#: js/oc-dialogs.js:376 +#: js/oc-dialogs.js:435 msgid "" "If you select both versions, the copied file will have a number added to its " "name." msgstr "" -#: js/oc-dialogs.js:384 +#: js/oc-dialogs.js:443 msgid "Cancel" msgstr "" -#: js/oc-dialogs.js:394 +#: js/oc-dialogs.js:453 msgid "Continue" msgstr "" -#: js/oc-dialogs.js:441 js/oc-dialogs.js:454 +#: js/oc-dialogs.js:500 js/oc-dialogs.js:513 msgid "(all selected)" msgstr "" -#: js/oc-dialogs.js:444 js/oc-dialogs.js:458 +#: js/oc-dialogs.js:503 js/oc-dialogs.js:517 msgid "({count} selected)" msgstr "" -#: js/oc-dialogs.js:466 +#: js/oc-dialogs.js:525 msgid "Error loading file exists template" msgstr "" diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot index c32c8532035..1932b17d7fa 100644 --- a/l10n/templates/files.pot +++ b/l10n/templates/files.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-09 01:55-0400\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -139,53 +139,53 @@ msgstr "" msgid "Invalid directory." msgstr "" -#: appinfo/app.php:11 js/filelist.js:14 +#: appinfo/app.php:11 js/filelist.js:17 msgid "Files" msgstr "" -#: js/file-upload.js:254 +#: js/file-upload.js:257 msgid "Unable to upload {filename} as it is a directory or has 0 bytes" msgstr "" -#: js/file-upload.js:266 +#: js/file-upload.js:270 msgid "Total file size {size1} exceeds upload limit {size2}" msgstr "" -#: js/file-upload.js:276 +#: js/file-upload.js:281 msgid "" "Not enough free space, you are uploading {size1} but only {size2} is left" msgstr "" -#: js/file-upload.js:353 +#: js/file-upload.js:358 msgid "Upload cancelled." msgstr "" -#: js/file-upload.js:398 +#: js/file-upload.js:404 msgid "Could not get result from server." msgstr "" -#: js/file-upload.js:490 +#: js/file-upload.js:493 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "" -#: js/file-upload.js:555 +#: js/file-upload.js:558 msgid "URL cannot be empty" msgstr "" -#: js/file-upload.js:559 js/filelist.js:963 +#: js/file-upload.js:562 js/filelist.js:1016 msgid "{new_name} already exists" msgstr "" -#: js/file-upload.js:611 +#: js/file-upload.js:617 msgid "Could not create file" msgstr "" -#: js/file-upload.js:624 +#: js/file-upload.js:633 msgid "Could not create folder" msgstr "" -#: js/file-upload.js:664 +#: js/file-upload.js:680 msgid "Error fetching URL" msgstr "" @@ -201,61 +201,61 @@ msgstr "" msgid "Rename" msgstr "" -#: js/filelist.js:221 +#: js/filelist.js:229 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "" -#: js/filelist.js:502 js/filelist.js:1422 +#: js/filelist.js:531 js/filelist.js:1475 msgid "Pending" msgstr "" -#: js/filelist.js:916 +#: js/filelist.js:969 msgid "Error moving file." msgstr "" -#: js/filelist.js:924 +#: js/filelist.js:977 msgid "Error moving file" msgstr "" -#: js/filelist.js:924 +#: js/filelist.js:977 msgid "Error" msgstr "" -#: js/filelist.js:988 +#: js/filelist.js:1041 msgid "Could not rename file" msgstr "" -#: js/filelist.js:1122 +#: js/filelist.js:1175 msgid "Error deleting file." msgstr "" -#: js/filelist.js:1224 templates/index.php:67 +#: js/filelist.js:1277 templates/index.php:68 msgid "Name" msgstr "" -#: js/filelist.js:1225 templates/index.php:79 +#: js/filelist.js:1278 templates/index.php:81 msgid "Size" msgstr "" -#: js/filelist.js:1226 templates/index.php:81 +#: js/filelist.js:1279 templates/index.php:84 msgid "Modified" msgstr "" -#: js/filelist.js:1235 js/filesummary.js:141 js/filesummary.js:168 +#: js/filelist.js:1288 js/filesummary.js:141 js/filesummary.js:168 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:1241 js/filesummary.js:142 js/filesummary.js:169 +#: js/filelist.js:1294 js/filesummary.js:142 js/filesummary.js:169 msgid "%n file" msgid_plural "%n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:1330 js/filelist.js:1369 +#: js/filelist.js:1383 js/filelist.js:1422 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" @@ -300,7 +300,7 @@ msgstr "" msgid "%s could not be renamed" msgstr "" -#: lib/helper.php:14 templates/index.php:22 +#: lib/helper.php:23 templates/index.php:23 #, php-format msgid "Upload (max. %s)" msgstr "" @@ -337,68 +337,68 @@ msgstr "" msgid "Save" msgstr "" -#: templates/index.php:5 +#: templates/index.php:6 msgid "New" msgstr "" -#: templates/index.php:8 +#: templates/index.php:9 msgid "New text file" msgstr "" -#: templates/index.php:9 +#: templates/index.php:10 msgid "Text file" msgstr "" -#: templates/index.php:12 +#: templates/index.php:13 msgid "New folder" msgstr "" -#: templates/index.php:13 +#: templates/index.php:14 msgid "Folder" msgstr "" -#: templates/index.php:16 +#: templates/index.php:17 msgid "From link" msgstr "" -#: templates/index.php:40 +#: templates/index.php:41 msgid "Deleted files" msgstr "" -#: templates/index.php:45 +#: templates/index.php:46 msgid "Cancel upload" msgstr "" -#: templates/index.php:51 +#: templates/index.php:52 msgid "You don’t have permission to upload or create files here" msgstr "" -#: templates/index.php:56 +#: templates/index.php:57 msgid "Nothing in here. Upload something!" msgstr "" -#: templates/index.php:73 +#: templates/index.php:74 msgid "Download" msgstr "" -#: templates/index.php:84 templates/index.php:85 +#: templates/index.php:87 templates/index.php:88 msgid "Delete" msgstr "" -#: templates/index.php:98 +#: templates/index.php:101 msgid "Upload too large" msgstr "" -#: templates/index.php:100 +#: templates/index.php:103 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "" -#: templates/index.php:105 +#: templates/index.php:108 msgid "Files are being scanned, please wait." msgstr "" -#: templates/index.php:108 +#: templates/index.php:111 msgid "Current scanning" msgstr "" diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot index 00d7ffec9bb..2866e6567d8 100644 --- a/l10n/templates/files_encryption.pot +++ b/l10n/templates/files_encryption.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-09 01:55-0400\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot index 495c2416ac5..8b2dd31dc57 100644 --- a/l10n/templates/files_external.pot +++ b/l10n/templates/files_external.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-09 01:55-0400\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -197,29 +197,29 @@ msgstr "" msgid "Saved" msgstr "" -#: lib/config.php:597 +#: lib/config.php:589 msgid "<b>Note:</b> " msgstr "" -#: lib/config.php:607 +#: lib/config.php:599 msgid " and " msgstr "" -#: lib/config.php:629 +#: lib/config.php:621 #, php-format msgid "" "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting " "of %s is not possible. Please ask your system administrator to install it." msgstr "" -#: lib/config.php:631 +#: lib/config.php:623 #, php-format msgid "" "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of " "%s is not possible. Please ask your system administrator to install it." msgstr "" -#: lib/config.php:633 +#: lib/config.php:625 #, php-format msgid "" "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please " diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot index 927cedb807e..e0cf9c3d7f6 100644 --- a/l10n/templates/files_sharing.pot +++ b/l10n/templates/files_sharing.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-09 01:55-0400\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/l10n/templates/files_trashbin.pot b/l10n/templates/files_trashbin.pot index e4f9f841578..bad146a524f 100644 --- a/l10n/templates/files_trashbin.pot +++ b/l10n/templates/files_trashbin.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-09 01:55-0400\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -31,11 +31,11 @@ msgstr "" msgid "Deleted files" msgstr "" -#: js/filelist.js:88 js/filelist.js:132 js/filelist.js:181 +#: js/filelist.js:89 js/filelist.js:133 js/filelist.js:182 msgid "Error" msgstr "" -#: js/trash.js:48 templates/index.php:22 templates/index.php:24 +#: js/trash.js:48 templates/index.php:23 templates/index.php:25 msgid "Restore" msgstr "" @@ -47,18 +47,18 @@ msgstr "" msgid "restored" msgstr "" -#: templates/index.php:6 +#: templates/index.php:7 msgid "Nothing in here. Your trash bin is empty!" msgstr "" -#: templates/index.php:19 +#: templates/index.php:20 msgid "Name" msgstr "" -#: templates/index.php:30 +#: templates/index.php:31 msgid "Deleted" msgstr "" -#: templates/index.php:33 templates/index.php:34 +#: templates/index.php:34 templates/index.php:35 msgid "Delete" msgstr "" diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot index 5f34a2dff45..5b5130a4247 100644 --- a/l10n/templates/files_versions.pot +++ b/l10n/templates/files_versions.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-09 01:55-0400\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot index b346ce67d65..b099836864c 100644 --- a/l10n/templates/lib.pot +++ b/l10n/templates/lib.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-09 01:55-0400\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -18,11 +18,11 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" -#: base.php:713 +#: base.php:685 msgid "You are accessing the server from an untrusted domain." msgstr "" -#: base.php:714 +#: base.php:686 msgid "" "Please contact your administrator. If you are an administrator of this " "instance, configure the \"trusted_domain\" setting in config/config.php. An " @@ -290,8 +290,8 @@ msgstr "" msgid "Please double check the <a href='%s'>installation guides</a>." msgstr "" -#: private/share/mailnotifications.php:72 -#: private/share/mailnotifications.php:118 +#: private/share/mailnotifications.php:91 +#: private/share/mailnotifications.php:137 #, php-format msgid "%s shared »%s« with you" msgstr "" @@ -355,51 +355,51 @@ msgstr "" msgid "Setting permissions for %s failed, because the item was not found" msgstr "" -#: private/share/share.php:941 +#: private/share/share.php:942 #, php-format msgid "Sharing backend %s must implement the interface OCP\\Share_Backend" msgstr "" -#: private/share/share.php:948 +#: private/share/share.php:949 #, php-format msgid "Sharing backend %s not found" msgstr "" -#: private/share/share.php:954 +#: private/share/share.php:955 #, php-format msgid "Sharing backend for %s not found" msgstr "" -#: private/share/share.php:1368 +#: private/share/share.php:1370 #, php-format msgid "Sharing %s failed, because the user %s is the original sharer" msgstr "" -#: private/share/share.php:1377 +#: private/share/share.php:1379 #, php-format msgid "" "Sharing %s failed, because the permissions exceed permissions granted to %s" msgstr "" -#: private/share/share.php:1392 +#: private/share/share.php:1394 #, php-format msgid "Sharing %s failed, because resharing is not allowed" msgstr "" -#: private/share/share.php:1404 +#: private/share/share.php:1406 #, php-format msgid "" "Sharing %s failed, because the sharing backend for %s could not find its " "source" msgstr "" -#: private/share/share.php:1418 +#: private/share/share.php:1420 #, php-format msgid "" "Sharing %s failed, because the file could not be found in the file cache" msgstr "" -#: private/tags.php:193 +#: private/tags.php:183 #, php-format msgid "Could not find category \"%s\"" msgstr "" diff --git a/l10n/templates/private.pot b/l10n/templates/private.pot index f329fe8828a..bad5160c970 100644 --- a/l10n/templates/private.pot +++ b/l10n/templates/private.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-09 01:55-0400\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -272,7 +272,7 @@ msgstr "" msgid "Please double check the <a href='%s'>installation guides</a>." msgstr "" -#: share/mailnotifications.php:72 share/mailnotifications.php:118 +#: share/mailnotifications.php:91 share/mailnotifications.php:137 #, php-format msgid "%s shared »%s« with you" msgstr "" @@ -336,51 +336,51 @@ msgstr "" msgid "Setting permissions for %s failed, because the item was not found" msgstr "" -#: share/share.php:941 +#: share/share.php:942 #, php-format msgid "Sharing backend %s must implement the interface OCP\\Share_Backend" msgstr "" -#: share/share.php:948 +#: share/share.php:949 #, php-format msgid "Sharing backend %s not found" msgstr "" -#: share/share.php:954 +#: share/share.php:955 #, php-format msgid "Sharing backend for %s not found" msgstr "" -#: share/share.php:1368 +#: share/share.php:1370 #, php-format msgid "Sharing %s failed, because the user %s is the original sharer" msgstr "" -#: share/share.php:1377 +#: share/share.php:1379 #, php-format msgid "" "Sharing %s failed, because the permissions exceed permissions granted to %s" msgstr "" -#: share/share.php:1392 +#: share/share.php:1394 #, php-format msgid "Sharing %s failed, because resharing is not allowed" msgstr "" -#: share/share.php:1404 +#: share/share.php:1406 #, php-format msgid "" "Sharing %s failed, because the sharing backend for %s could not find its " "source" msgstr "" -#: share/share.php:1418 +#: share/share.php:1420 #, php-format msgid "" "Sharing %s failed, because the file could not be found in the file cache" msgstr "" -#: tags.php:193 +#: tags.php:183 #, php-format msgid "Could not find category \"%s\"" msgstr "" diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot index 1ee5b274196..94de0818fa2 100644 --- a/l10n/templates/settings.pot +++ b/l10n/templates/settings.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-09 01:55-0400\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "" @@ -98,6 +98,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your owncloud." +"log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -114,6 +124,16 @@ msgstr "" msgid "Unable to delete user" msgstr "" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask " +"your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "" @@ -224,34 +244,42 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "" @@ -297,7 +325,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "" @@ -621,11 +649,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank" "\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" " @@ -789,18 +817,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong " +"you can restore the keys. Only delete them permanently if you are sure that " +"all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "" diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot index e553d254343..040dfb2653a 100644 --- a/l10n/templates/user_ldap.pot +++ b/l10n/templates/user_ldap.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-09 01:55-0400\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -127,25 +127,25 @@ msgstr "" msgid "Confirm Deletion" msgstr "" -#: lib/wizard.php:79 lib/wizard.php:93 +#: lib/wizard.php:83 lib/wizard.php:97 #, php-format msgid "%s group found" msgid_plural "%s groups found" msgstr[0] "" msgstr[1] "" -#: lib/wizard.php:122 +#: lib/wizard.php:130 #, php-format msgid "%s user found" msgid_plural "%s users found" msgstr[0] "" msgstr[1] "" -#: lib/wizard.php:784 lib/wizard.php:796 +#: lib/wizard.php:825 lib/wizard.php:837 msgid "Invalid Host" msgstr "" -#: lib/wizard.php:984 +#: lib/wizard.php:1025 msgid "Could not find the desired feature" msgstr "" diff --git a/l10n/templates/user_webdavauth.pot b/l10n/templates/user_webdavauth.pot index d754998a5a0..d85a5b5d2a8 100644 --- a/l10n/templates/user_webdavauth.pot +++ b/l10n/templates/user_webdavauth.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-09 01:55-0400\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/l10n/th_TH/core.po b/l10n/th_TH/core.po index 99a8a23d835..397e0208497 100644 --- a/l10n/th_TH/core.po +++ b/l10n/th_TH/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:02+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/th_TH/files_external.po b/l10n/th_TH/files_external.po index 89074afb964..5e24aa14923 100644 --- a/l10n/th_TH/files_external.po +++ b/l10n/th_TH/files_external.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n" "MIME-Version: 1.0\n" @@ -197,29 +197,29 @@ msgstr "เà¸à¸´à¸”ข้à¸à¸œà¸´à¸”พลาดในà¸à¸²à¸£à¸à¸³à¸«à¸™à¸” msgid "Saved" msgstr "" -#: lib/config.php:598 +#: lib/config.php:597 msgid "<b>Note:</b> " msgstr "" -#: lib/config.php:608 +#: lib/config.php:607 msgid " and " msgstr "" -#: lib/config.php:630 +#: lib/config.php:629 #, php-format msgid "" "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting " "of %s is not possible. Please ask your system administrator to install it." msgstr "" -#: lib/config.php:632 +#: lib/config.php:631 #, php-format msgid "" "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of" " %s is not possible. Please ask your system administrator to install it." msgstr "" -#: lib/config.php:634 +#: lib/config.php:633 #, php-format msgid "" "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please" diff --git a/l10n/th_TH/files_sharing.po b/l10n/th_TH/files_sharing.po index 7fc9831193a..50ad345bc6b 100644 --- a/l10n/th_TH/files_sharing.po +++ b/l10n/th_TH/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-04 01:55-0400\n" -"PO-Revision-Date: 2014-05-03 06:12+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n" "MIME-Version: 1.0\n" @@ -61,11 +61,11 @@ msgstr "" msgid "Download" msgstr "ดาวน์โหลด" -#: templates/public.php:53 +#: templates/public.php:52 #, php-format msgid "Download %s" msgstr "" -#: templates/public.php:57 +#: templates/public.php:56 msgid "Direct link" msgstr "" diff --git a/l10n/th_TH/settings.po b/l10n/th_TH/settings.po index 387c7f2e62b..da72e440926 100644 --- a/l10n/th_TH/settings.po +++ b/l10n/th_TH/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "à¸à¸²à¸£à¹€à¸‚้ารหัส" @@ -98,6 +98,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "à¸à¸µà¹€à¸¡à¸¥à¸–ูà¸à¸šà¸±à¸™à¸—ึà¸à¹à¸¥à¹‰à¸§" @@ -114,6 +124,16 @@ msgstr "ไม่สามารถลบà¸à¸¥à¸¸à¹ˆà¸¡à¹„ด้" msgid "Unable to delete user" msgstr "ไม่สามารถลบผู้ใช้งานได้" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "เปลี่ยนภาษาเรียบร้à¸à¸¢à¹à¸¥à¹‰à¸§" @@ -225,34 +245,42 @@ msgstr "à¸à¸±à¸žà¹€à¸”ท" msgid "Updated" msgstr "à¸à¸±à¸žà¹€à¸”ทà¹à¸¥à¹‰à¸§" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "ลบà¹à¸¥à¹‰à¸§" @@ -298,7 +326,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "ภาษาไทย" @@ -623,11 +651,11 @@ msgstr "มาà¸" msgid "Less" msgstr "น้à¸à¸¢" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "รุ่น" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -791,18 +819,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "ชื่à¸à¸—ี่ใช้สำหรับเข้าสู่ระบบ" diff --git a/l10n/th_TH/user_ldap.po b/l10n/th_TH/user_ldap.po index 7f859f04020..97d9f543d39 100644 --- a/l10n/th_TH/user_ldap.po +++ b/l10n/th_TH/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/tr/core.po b/l10n/tr/core.po index 9bd3356e966..d70404da9dc 100644 --- a/l10n/tr/core.po +++ b/l10n/tr/core.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:02+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/tr/files.po b/l10n/tr/files.po index dae3ef74fe5..57a7342013a 100644 --- a/l10n/tr/files.po +++ b/l10n/tr/files.po @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-04 01:55-0400\n" -"PO-Revision-Date: 2014-05-03 06:11+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-10 15:11+0000\n" "Last-Translator: volkangezer <volkangezer@gmail.com>\n" "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n" "MIME-Version: 1.0\n" @@ -148,49 +148,49 @@ msgstr "Geçersiz dizin." msgid "Files" msgstr "Dosyalar" -#: js/file-upload.js:254 +#: js/file-upload.js:257 msgid "Unable to upload {filename} as it is a directory or has 0 bytes" msgstr "Bir dizin veya 0 bayt olduÄŸundan {filename} yüklenemedi" -#: js/file-upload.js:266 +#: js/file-upload.js:270 msgid "Total file size {size1} exceeds upload limit {size2}" msgstr "Toplam dosya boyutu {size1}, {size2} gönderme sınırını aşıyor" -#: js/file-upload.js:276 +#: js/file-upload.js:281 msgid "" "Not enough free space, you are uploading {size1} but only {size2} is left" msgstr "Yeterince boÅŸ alan yok. GönderdiÄŸiniz boyut {size1} ancak {size2} alan mevcut" -#: js/file-upload.js:353 +#: js/file-upload.js:358 msgid "Upload cancelled." msgstr "Yükleme iptal edildi." -#: js/file-upload.js:398 +#: js/file-upload.js:404 msgid "Could not get result from server." msgstr "Sunucudan sonuç alınamadı." -#: js/file-upload.js:490 +#: js/file-upload.js:493 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Dosya yükleme iÅŸlemi sürüyor. Åžimdi sayfadan ayrılırsanız iÅŸleminiz iptal olur." -#: js/file-upload.js:555 +#: js/file-upload.js:558 msgid "URL cannot be empty" msgstr "URL boÅŸ olamaz" -#: js/file-upload.js:559 js/filelist.js:963 +#: js/file-upload.js:562 js/filelist.js:963 msgid "{new_name} already exists" msgstr "{new_name} zaten mevcut" -#: js/file-upload.js:611 +#: js/file-upload.js:617 msgid "Could not create file" msgstr "Dosya oluÅŸturulamadı" -#: js/file-upload.js:624 +#: js/file-upload.js:633 msgid "Could not create folder" msgstr "Klasör oluÅŸturulamadı" -#: js/file-upload.js:664 +#: js/file-upload.js:680 msgid "Error fetching URL" msgstr "Adres getirilirken hata" diff --git a/l10n/tr/files_external.po b/l10n/tr/files_external.po index 617e793777f..70f3538a82e 100644 --- a/l10n/tr/files_external.po +++ b/l10n/tr/files_external.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 17:20+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: volkangezer <volkangezer@gmail.com>\n" "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n" "MIME-Version: 1.0\n" @@ -198,29 +198,29 @@ msgstr "Google Drive depo yapılandırma hatası" msgid "Saved" msgstr "Kaydedildi" -#: lib/config.php:598 +#: lib/config.php:597 msgid "<b>Note:</b> " msgstr "<b>Not:</b> " -#: lib/config.php:608 +#: lib/config.php:607 msgid " and " msgstr "ve" -#: lib/config.php:630 +#: lib/config.php:629 #, php-format msgid "" "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting " "of %s is not possible. Please ask your system administrator to install it." msgstr "<b>Not:</b> PHP'de cURL desteÄŸi etkin veya kurulu deÄŸil. %s baÄŸlaması mümkün olmayacak. Lütfen kurulumu için sistem yöneticilerinizle iletiÅŸime geçin." -#: lib/config.php:632 +#: lib/config.php:631 #, php-format msgid "" "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of" " %s is not possible. Please ask your system administrator to install it." msgstr "<b>Not:</b> PHP'de FTP desteÄŸi etkin veya kurulu deÄŸil. %s baÄŸlaması mümkün olmayacak. Lütfen kurulumu için sistem yöneticilerinizle iletiÅŸime geçin." -#: lib/config.php:634 +#: lib/config.php:633 #, php-format msgid "" "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please" diff --git a/l10n/tr/files_sharing.po b/l10n/tr/files_sharing.po index 6aa07efe05f..223eeef9a7b 100644 --- a/l10n/tr/files_sharing.po +++ b/l10n/tr/files_sharing.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-07 01:55-0400\n" -"PO-Revision-Date: 2014-05-05 15:09+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: volkangezer <volkangezer@gmail.com>\n" "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/tr/files_trashbin.po b/l10n/tr/files_trashbin.po index e3d0ae59b84..38c96995a98 100644 --- a/l10n/tr/files_trashbin.po +++ b/l10n/tr/files_trashbin.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-16 01:55-0400\n" -"PO-Revision-Date: 2014-04-16 05:41+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-10 15:11+0000\n" "Last-Translator: volkangezer <volkangezer@gmail.com>\n" "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n" "MIME-Version: 1.0\n" @@ -33,15 +33,19 @@ msgstr "%s geri yüklenemedi" msgid "Deleted files" msgstr "SilinmiÅŸ dosyalar" -#: js/trash.js:33 js/trash.js:124 js/trash.js:173 +#: js/filelist.js:88 js/filelist.js:132 js/filelist.js:181 msgid "Error" msgstr "Hata" -#: js/trash.js:264 +#: js/trash.js:48 templates/index.php:22 templates/index.php:24 +msgid "Restore" +msgstr "Geri yükle" + +#: js/trash.js:107 msgid "Deleted Files" msgstr "Silinen Dosyalar" -#: lib/trashbin.php:859 lib/trashbin.php:861 +#: lib/trashbin.php:861 lib/trashbin.php:863 msgid "restored" msgstr "geri yüklendi" @@ -53,10 +57,6 @@ msgstr "Burada hiçbir ÅŸey yok. Çöp kutunuz tamamen boÅŸ!" msgid "Name" msgstr "Ä°sim" -#: templates/index.php:22 templates/index.php:24 -msgid "Restore" -msgstr "Geri yükle" - #: templates/index.php:30 msgid "Deleted" msgstr "Silindi" diff --git a/l10n/tr/settings.po b/l10n/tr/settings.po index fb67c9f0683..2cbcdca3f30 100644 --- a/l10n/tr/settings.po +++ b/l10n/tr/settings.po @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" -"Last-Translator: volkangezer <volkangezer@gmail.com>\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" +"Last-Translator: I Robot\n" "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -55,7 +55,7 @@ msgstr "Sınama e-postaları göndermeden önce kullanıcı e-postasını ayarla msgid "Send mode" msgstr "Gönderme kipi" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "Åžifreleme" @@ -102,6 +102,16 @@ msgstr "Dosyalarınızın ÅŸifresi kaldırılamadı, lütfen owncloud.log dosyas msgid "Couldn't decrypt your files, check your password and try again" msgstr "Dosyalarınızın ÅŸifresi kaldırılamadı, parolanızı denetleyip yeniden deneyin." +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "E-posta kaydedildi" @@ -118,6 +128,16 @@ msgstr "Grup silinemiyor" msgid "Unable to delete user" msgstr "Kullanıcı silinemiyor" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "Dil deÄŸiÅŸtirildi" @@ -229,34 +249,42 @@ msgstr "Güncelleme" msgid "Updated" msgstr "Güncellendi" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "Bir profil fotoÄŸrafı seçin" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "Çok güçsüz parola" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "Güçsüz parola" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "Normal parola" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "Ä°yi parola" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "Güçlü parola" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "Dosyaların ÅŸifresi çözülüyor... Lütfen bekleyin, bu biraz zaman alabilir." +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "silinen:" @@ -302,7 +330,7 @@ msgstr "Geçerli bir parola mutlaka saÄŸlanmalı" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "Uyarı: \"{user}\" kullanıcısı için zaten bir Ev dizini mevcut" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "Türkçe" @@ -627,11 +655,11 @@ msgstr "Daha fazla" msgid "Less" msgstr "Az" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "Sürüm" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -795,18 +823,33 @@ msgid "" "WebDAV</a>" msgstr "<a href=\"%s\" target=\"_blank\">Dosyalarınıza WebDAV aracılığıyla eriÅŸmek için</a> bu adresi kullanın" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "Åžifreleme uygulaması artık etkin deÄŸil, tüm dosyalarınızın ÅŸifrelemesini kaldırın" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "Oturum açma parolası" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "Tüm dosyaların ÅŸifresini çöz" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "GiriÅŸ Adı" diff --git a/l10n/tr/user_ldap.po b/l10n/tr/user_ldap.po index 7a60a60484c..d086924543f 100644 --- a/l10n/tr/user_ldap.po +++ b/l10n/tr/user_ldap.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: volkangezer <volkangezer@gmail.com>\n" "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/tzm/settings.po b/l10n/tzm/settings.po index 5b930052877..d34209d7023 100644 --- a/l10n/tzm/settings.po +++ b/l10n/tzm/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-26 01:54-0400\n" -"PO-Revision-Date: 2014-04-26 05:54+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Central Atlas Tamazight (http://www.transifex.com/projects/p/owncloud/language/tzm/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "" @@ -98,6 +98,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -114,6 +124,16 @@ msgstr "" msgid "Unable to delete user" msgstr "" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "" @@ -225,34 +245,42 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "" @@ -298,7 +326,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "" @@ -623,11 +651,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -791,18 +819,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "" diff --git a/l10n/ug/core.po b/l10n/ug/core.po index b29af2437cb..1dddf22f20c 100644 --- a/l10n/ug/core.po +++ b/l10n/ug/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:02+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Uighur (http://www.transifex.com/projects/p/owncloud/language/ug/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/ug/files_external.po b/l10n/ug/files_external.po index c0088640273..de031b42f6a 100644 --- a/l10n/ug/files_external.po +++ b/l10n/ug/files_external.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Uighur (http://www.transifex.com/projects/p/owncloud/language/ug/)\n" "MIME-Version: 1.0\n" @@ -197,29 +197,29 @@ msgstr "" msgid "Saved" msgstr "" -#: lib/config.php:598 +#: lib/config.php:597 msgid "<b>Note:</b> " msgstr "" -#: lib/config.php:608 +#: lib/config.php:607 msgid " and " msgstr "" -#: lib/config.php:630 +#: lib/config.php:629 #, php-format msgid "" "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting " "of %s is not possible. Please ask your system administrator to install it." msgstr "" -#: lib/config.php:632 +#: lib/config.php:631 #, php-format msgid "" "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of" " %s is not possible. Please ask your system administrator to install it." msgstr "" -#: lib/config.php:634 +#: lib/config.php:633 #, php-format msgid "" "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please" diff --git a/l10n/ug/files_sharing.po b/l10n/ug/files_sharing.po index 8ba9c5f68fc..f12130e0fd8 100644 --- a/l10n/ug/files_sharing.po +++ b/l10n/ug/files_sharing.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-04 01:55-0400\n" -"PO-Revision-Date: 2014-05-03 06:11+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Uighur (http://www.transifex.com/projects/p/owncloud/language/ug/)\n" "MIME-Version: 1.0\n" @@ -62,11 +62,11 @@ msgstr "" msgid "Download" msgstr "چۈشۈر" -#: templates/public.php:53 +#: templates/public.php:52 #, php-format msgid "Download %s" msgstr "" -#: templates/public.php:57 +#: templates/public.php:56 msgid "Direct link" msgstr "" diff --git a/l10n/ug/settings.po b/l10n/ug/settings.po index 3bbdfffec80..d6d482e80d9 100644 --- a/l10n/ug/settings.po +++ b/l10n/ug/settings.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Uighur (http://www.transifex.com/projects/p/owncloud/language/ug/)\n" "MIME-Version: 1.0\n" @@ -52,7 +52,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "شىÙىرلاش" @@ -99,6 +99,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "تورخەت ساقلاندى" @@ -115,6 +125,16 @@ msgstr "گۇرۇپپىنى ئۆچۈرەلمىدى" msgid "Unable to delete user" msgstr "ئىشلەتكۈچىنى ئۆچۈرەلمىدى" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "تىل ئۆزگەردى" @@ -226,34 +246,42 @@ msgstr "ÙŠÛÚىلا" msgid "Updated" msgstr "ÙŠÛÚىلاندى" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "ئۆچۈرۈلگەن" @@ -299,7 +327,7 @@ msgstr "چوقۇم ئىناۋەتلىك ئىم تەمىنلەش ÙƒÛرەك" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "ئۇيغۇرچە" @@ -624,11 +652,11 @@ msgstr "تÛخىمۇ ÙƒÛ†Ù¾" msgid "Less" msgstr "ئاز" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "نەشرى" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -792,18 +820,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "تىزىمغا كىرىش ئاتى" diff --git a/l10n/ug/user_ldap.po b/l10n/ug/user_ldap.po index f818facabb8..64150bdcd9d 100644 --- a/l10n/ug/user_ldap.po +++ b/l10n/ug/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Uighur (http://www.transifex.com/projects/p/owncloud/language/ug/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/uk/core.po b/l10n/uk/core.po index 438ccebc017..6626023df6a 100644 --- a/l10n/uk/core.po +++ b/l10n/uk/core.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:02+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: azdk94 <azdk94@gmail.com>\n" "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/uk/files_external.po b/l10n/uk/files_external.po index 2632a66d4bd..82650385ed6 100644 --- a/l10n/uk/files_external.po +++ b/l10n/uk/files_external.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n" "MIME-Version: 1.0\n" @@ -198,29 +198,29 @@ msgstr "Помилка при налаштуванні Ñховища Google Dri msgid "Saved" msgstr "" -#: lib/config.php:598 +#: lib/config.php:597 msgid "<b>Note:</b> " msgstr "" -#: lib/config.php:608 +#: lib/config.php:607 msgid " and " msgstr "" -#: lib/config.php:630 +#: lib/config.php:629 #, php-format msgid "" "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting " "of %s is not possible. Please ask your system administrator to install it." msgstr "" -#: lib/config.php:632 +#: lib/config.php:631 #, php-format msgid "" "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of" " %s is not possible. Please ask your system administrator to install it." msgstr "" -#: lib/config.php:634 +#: lib/config.php:633 #, php-format msgid "" "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please" diff --git a/l10n/uk/files_sharing.po b/l10n/uk/files_sharing.po index 2599a0ff2f3..69ca114f3c9 100644 --- a/l10n/uk/files_sharing.po +++ b/l10n/uk/files_sharing.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-04 01:55-0400\n" -"PO-Revision-Date: 2014-05-03 06:12+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n" "MIME-Version: 1.0\n" @@ -62,11 +62,11 @@ msgstr "Ð”Ð»Ñ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ð½Ð½Ñ Ð´Ð¾Ð´Ð°Ñ‚ÐºÐ¾Ð²Ð¾Ñ— інформації, Ð±Ñ msgid "Download" msgstr "Завантажити" -#: templates/public.php:53 +#: templates/public.php:52 #, php-format msgid "Download %s" msgstr "" -#: templates/public.php:57 +#: templates/public.php:56 msgid "Direct link" msgstr "ПрÑме поÑиланнÑ" diff --git a/l10n/uk/settings.po b/l10n/uk/settings.po index 3a29ee985c1..16a78a603da 100644 --- a/l10n/uk/settings.po +++ b/l10n/uk/settings.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n" "MIME-Version: 1.0\n" @@ -52,7 +52,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "ШифруваннÑ" @@ -99,6 +99,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "ÐдреÑу збережено" @@ -115,6 +125,16 @@ msgstr "Ðе вдалоÑÑ Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ групу" msgid "Unable to delete user" msgstr "Ðе вдалоÑÑ Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ кориÑтувача" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "Мова змінена" @@ -226,34 +246,42 @@ msgstr "Оновити" msgid "Updated" msgstr "Оновлено" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "Дуже Ñлабкий пароль" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "Слабкий пароль" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "Добрий пароль" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "Ðадійний пароль" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "видалені" @@ -299,7 +327,7 @@ msgstr "Потрібно задати вірний пароль" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "__language_name__" @@ -624,11 +652,11 @@ msgstr "Більше" msgid "Less" msgstr "Менше" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "ВерÑÑ–Ñ" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -792,18 +820,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "Ім'Ñ Ð›Ð¾Ð³Ñ–Ð½Ñƒ" diff --git a/l10n/uk/user_ldap.po b/l10n/uk/user_ldap.po index e31b3db44da..5fe2fc97829 100644 --- a/l10n/uk/user_ldap.po +++ b/l10n/uk/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/ur/settings.po b/l10n/ur/settings.po index 56b4ba0d041..073cff5ba22 100644 --- a/l10n/ur/settings.po +++ b/l10n/ur/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-26 01:54-0400\n" -"PO-Revision-Date: 2014-04-26 05:54+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Urdu (http://www.transifex.com/projects/p/owncloud/language/ur/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "" @@ -98,6 +98,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -114,6 +124,16 @@ msgstr "" msgid "Unable to delete user" msgstr "" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "" @@ -225,34 +245,42 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "" @@ -298,7 +326,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "" @@ -623,11 +651,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -791,18 +819,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "" diff --git a/l10n/ur_PK/core.po b/l10n/ur_PK/core.po index 2303d335124..bd93f5eacd2 100644 --- a/l10n/ur_PK/core.po +++ b/l10n/ur_PK/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:02+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/ur_PK/files_external.po b/l10n/ur_PK/files_external.po index 4b691dc6ce8..fc27388dc91 100644 --- a/l10n/ur_PK/files_external.po +++ b/l10n/ur_PK/files_external.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n" "MIME-Version: 1.0\n" @@ -197,29 +197,29 @@ msgstr "" msgid "Saved" msgstr "" -#: lib/config.php:598 +#: lib/config.php:597 msgid "<b>Note:</b> " msgstr "" -#: lib/config.php:608 +#: lib/config.php:607 msgid " and " msgstr "" -#: lib/config.php:630 +#: lib/config.php:629 #, php-format msgid "" "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting " "of %s is not possible. Please ask your system administrator to install it." msgstr "" -#: lib/config.php:632 +#: lib/config.php:631 #, php-format msgid "" "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of" " %s is not possible. Please ask your system administrator to install it." msgstr "" -#: lib/config.php:634 +#: lib/config.php:633 #, php-format msgid "" "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please" diff --git a/l10n/ur_PK/files_sharing.po b/l10n/ur_PK/files_sharing.po index 3b23bdb9fb4..9ebbf368417 100644 --- a/l10n/ur_PK/files_sharing.po +++ b/l10n/ur_PK/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-03 01:55-0400\n" -"PO-Revision-Date: 2014-05-03 05:55+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n" "MIME-Version: 1.0\n" @@ -61,11 +61,11 @@ msgstr "" msgid "Download" msgstr "" -#: templates/public.php:53 +#: templates/public.php:52 #, php-format msgid "Download %s" msgstr "" -#: templates/public.php:57 +#: templates/public.php:56 msgid "Direct link" msgstr "" diff --git a/l10n/ur_PK/settings.po b/l10n/ur_PK/settings.po index 51d23499335..4d782fd7e4f 100644 --- a/l10n/ur_PK/settings.po +++ b/l10n/ur_PK/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "" @@ -98,6 +98,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -114,6 +124,16 @@ msgstr "" msgid "Unable to delete user" msgstr "" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "" @@ -225,34 +245,42 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "" @@ -298,7 +326,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "" @@ -623,11 +651,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -791,18 +819,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "" diff --git a/l10n/ur_PK/user_ldap.po b/l10n/ur_PK/user_ldap.po index 28fab0f59ab..a5d990a11e8 100644 --- a/l10n/ur_PK/user_ldap.po +++ b/l10n/ur_PK/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/uz/settings.po b/l10n/uz/settings.po index e4130ccd539..53b0b5905d7 100644 --- a/l10n/uz/settings.po +++ b/l10n/uz/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-26 01:54-0400\n" -"PO-Revision-Date: 2014-04-26 05:54+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Uzbek (http://www.transifex.com/projects/p/owncloud/language/uz/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "" @@ -98,6 +98,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -114,6 +124,16 @@ msgstr "" msgid "Unable to delete user" msgstr "" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "" @@ -225,34 +245,42 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "" @@ -298,7 +326,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "" @@ -623,11 +651,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -791,18 +819,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "" diff --git a/l10n/vi/core.po b/l10n/vi/core.po index cf63ab90b6d..4308d09f21c 100644 --- a/l10n/vi/core.po +++ b/l10n/vi/core.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:02+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/vi/files_external.po b/l10n/vi/files_external.po index d97ecc737f6..638525bff74 100644 --- a/l10n/vi/files_external.po +++ b/l10n/vi/files_external.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n" "MIME-Version: 1.0\n" @@ -198,29 +198,29 @@ msgstr "Lá»—i cấu hình lÆ°u trữ Google Drive" msgid "Saved" msgstr "" -#: lib/config.php:598 +#: lib/config.php:597 msgid "<b>Note:</b> " msgstr "" -#: lib/config.php:608 +#: lib/config.php:607 msgid " and " msgstr "" -#: lib/config.php:630 +#: lib/config.php:629 #, php-format msgid "" "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting " "of %s is not possible. Please ask your system administrator to install it." msgstr "" -#: lib/config.php:632 +#: lib/config.php:631 #, php-format msgid "" "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of" " %s is not possible. Please ask your system administrator to install it." msgstr "" -#: lib/config.php:634 +#: lib/config.php:633 #, php-format msgid "" "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please" diff --git a/l10n/vi/files_sharing.po b/l10n/vi/files_sharing.po index 7f7c2788a45..20a59f48c3a 100644 --- a/l10n/vi/files_sharing.po +++ b/l10n/vi/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-04 01:55-0400\n" -"PO-Revision-Date: 2014-05-03 06:11+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n" "MIME-Version: 1.0\n" @@ -61,11 +61,11 @@ msgstr "" msgid "Download" msgstr "Tải vá»" -#: templates/public.php:53 +#: templates/public.php:52 #, php-format msgid "Download %s" msgstr "" -#: templates/public.php:57 +#: templates/public.php:56 msgid "Direct link" msgstr "" diff --git a/l10n/vi/settings.po b/l10n/vi/settings.po index 6abb7f79ae8..7b5f228ad5c 100644 --- a/l10n/vi/settings.po +++ b/l10n/vi/settings.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n" "MIME-Version: 1.0\n" @@ -52,7 +52,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "Mã hóa" @@ -99,6 +99,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "LÆ°u email" @@ -115,6 +125,16 @@ msgstr "Không thể xóa nhóm" msgid "Unable to delete user" msgstr "Không thể xóa ngÆ°á»i dùng" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "Ngôn ngữ đã được thay đổi" @@ -226,34 +246,42 @@ msgstr "Cáºp nháºt" msgid "Updated" msgstr "Äã cáºp nháºt" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "đã xóa" @@ -299,7 +327,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "__Ngôn ngữ___" @@ -624,11 +652,11 @@ msgstr "hÆ¡n" msgid "Less" msgstr "Ãt" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "Phiên bản" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -792,18 +820,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "Tên đăng nháºp" diff --git a/l10n/vi/user_ldap.po b/l10n/vi/user_ldap.po index f6971979cf3..82987a2412f 100644 --- a/l10n/vi/user_ldap.po +++ b/l10n/vi/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/zh_CN/core.po b/l10n/zh_CN/core.po index 0b66ae1b48f..c549f6d7fde 100644 --- a/l10n/zh_CN/core.po +++ b/l10n/zh_CN/core.po @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-01 01:55-0400\n" -"PO-Revision-Date: 2014-04-30 20:40+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: Xuetian Weng <wengxt@gmail.com>\n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/zh_CN/files_external.po b/l10n/zh_CN/files_external.po index 30dc6309a2b..8e8bb8bab31 100644 --- a/l10n/zh_CN/files_external.po +++ b/l10n/zh_CN/files_external.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-07 01:55-0400\n" -"PO-Revision-Date: 2014-05-05 18:46+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: Xuetian Weng <wengxt@gmail.com>\n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n" "MIME-Version: 1.0\n" @@ -198,29 +198,29 @@ msgstr "é…ç½®Google Driveå˜å‚¨æ—¶å‡ºé”™" msgid "Saved" msgstr "å·²ä¿å˜" -#: lib/config.php:598 +#: lib/config.php:597 msgid "<b>Note:</b> " msgstr "<b>注æ„：</b>" -#: lib/config.php:608 +#: lib/config.php:607 msgid " and " msgstr "å’Œ" -#: lib/config.php:630 +#: lib/config.php:629 #, php-format msgid "" "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting " "of %s is not possible. Please ask your system administrator to install it." msgstr "" -#: lib/config.php:632 +#: lib/config.php:631 #, php-format msgid "" "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of" " %s is not possible. Please ask your system administrator to install it." msgstr "" -#: lib/config.php:634 +#: lib/config.php:633 #, php-format msgid "" "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please" diff --git a/l10n/zh_CN/files_sharing.po b/l10n/zh_CN/files_sharing.po index ad6ca307a1d..90533e3b869 100644 --- a/l10n/zh_CN/files_sharing.po +++ b/l10n/zh_CN/files_sharing.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-07 01:55-0400\n" -"PO-Revision-Date: 2014-05-05 18:46+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: Xuetian Weng <wengxt@gmail.com>\n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/zh_CN/settings.po b/l10n/zh_CN/settings.po index 2f43034626b..12efd3bf854 100644 --- a/l10n/zh_CN/settings.po +++ b/l10n/zh_CN/settings.po @@ -14,9 +14,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-07 01:55-0400\n" -"PO-Revision-Date: 2014-05-05 18:46+0000\n" -"Last-Translator: Xuetian Weng <wengxt@gmail.com>\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" +"Last-Translator: I Robot\n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -58,7 +58,7 @@ msgstr "在å‘é€æµ‹è¯•é‚®ä»¶é’±æ‚¨éœ€è¦è®¾ç½®æ‚¨çš„用户电å邮件" msgid "Send mode" msgstr "å‘é€æ¨¡å¼" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "åŠ å¯†" @@ -105,6 +105,16 @@ msgstr "æ— æ³•è§£å¯†æ‚¨çš„æ–‡ä»¶ï¼Œè¯·æ£€æŸ¥æ‚¨çš„ owncloud.log 或询问管ç†å msgid "Couldn't decrypt your files, check your password and try again" msgstr "æ— æ³•è§£å¯†æ‚¨çš„æ–‡ä»¶ï¼Œè¯·æ£€æŸ¥å¯†ç 并é‡è¯•ã€‚" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "电å邮件已ä¿å˜" @@ -121,6 +131,16 @@ msgstr "æ— æ³•åˆ é™¤ç»„" msgid "Unable to delete user" msgstr "æ— æ³•åˆ é™¤ç”¨æˆ·" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "è¯è¨€å·²ä¿®æ”¹" @@ -232,34 +252,42 @@ msgstr "æ›´æ–°" msgid "Updated" msgstr "已更新" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "选择头åƒ" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "éžå¸¸å¼±çš„密ç " -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "弱密ç " -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "一般强度的密ç " -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "较强的密ç " -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "强密ç " -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "æ£åœ¨è§£å¯†æ–‡ä»¶... 请ç¨ç‰ï¼Œå¯èƒ½éœ€è¦ä¸€äº›æ—¶é—´ã€‚" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "å·²ç»åˆ 除" @@ -305,7 +333,7 @@ msgstr "å¿…é¡»æä¾›åˆæ³•çš„密ç " msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "è¦å‘Šï¼šç”¨æˆ· \"{user}\" 的家目录已å˜åœ¨" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "简体ä¸æ–‡" @@ -630,11 +658,11 @@ msgstr "更多" msgid "Less" msgstr "æ›´å°‘" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "版本" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -798,18 +826,33 @@ msgid "" "WebDAV</a>" msgstr "ä½¿ç”¨è¿™ä¸ªåœ°å€ <a href=\"%s\" target=\"_blank\">通过 WebDAV 访问您的文件</a>" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "åŠ å¯† app ä¸å†è¢«å¯ç”¨ï¼Œè¯·è§£å¯†æ‚¨æ‰€æœ‰çš„文件" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "登录密ç " -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "解密所有文件" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "登录å称" diff --git a/l10n/zh_CN/user_ldap.po b/l10n/zh_CN/user_ldap.po index e9a23772fba..5d224c5730c 100644 --- a/l10n/zh_CN/user_ldap.po +++ b/l10n/zh_CN/user_ldap.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/zh_HK/core.po b/l10n/zh_HK/core.po index 9d6fe43036d..057f8cd10b8 100644 --- a/l10n/zh_HK/core.po +++ b/l10n/zh_HK/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:02+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/zh_HK/files_external.po b/l10n/zh_HK/files_external.po index dfca5569a7f..60807494afa 100644 --- a/l10n/zh_HK/files_external.po +++ b/l10n/zh_HK/files_external.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n" "MIME-Version: 1.0\n" @@ -197,29 +197,29 @@ msgstr "" msgid "Saved" msgstr "" -#: lib/config.php:598 +#: lib/config.php:597 msgid "<b>Note:</b> " msgstr "" -#: lib/config.php:608 +#: lib/config.php:607 msgid " and " msgstr "" -#: lib/config.php:630 +#: lib/config.php:629 #, php-format msgid "" "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting " "of %s is not possible. Please ask your system administrator to install it." msgstr "" -#: lib/config.php:632 +#: lib/config.php:631 #, php-format msgid "" "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of" " %s is not possible. Please ask your system administrator to install it." msgstr "" -#: lib/config.php:634 +#: lib/config.php:633 #, php-format msgid "" "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please" diff --git a/l10n/zh_HK/files_sharing.po b/l10n/zh_HK/files_sharing.po index e63c3f364cb..ee3a3adbb25 100644 --- a/l10n/zh_HK/files_sharing.po +++ b/l10n/zh_HK/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-04 01:55-0400\n" -"PO-Revision-Date: 2014-05-03 06:11+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n" "MIME-Version: 1.0\n" @@ -61,11 +61,11 @@ msgstr "" msgid "Download" msgstr "下載" -#: templates/public.php:53 +#: templates/public.php:52 #, php-format msgid "Download %s" msgstr "" -#: templates/public.php:57 +#: templates/public.php:56 msgid "Direct link" msgstr "" diff --git a/l10n/zh_HK/settings.po b/l10n/zh_HK/settings.po index 851aae924f4..5c1bd697d69 100644 --- a/l10n/zh_HK/settings.po +++ b/l10n/zh_HK/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "åŠ å¯†" @@ -98,6 +98,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -114,6 +124,16 @@ msgstr "" msgid "Unable to delete user" msgstr "" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "" @@ -225,34 +245,42 @@ msgstr "æ›´æ–°" msgid "Updated" msgstr "" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "" @@ -298,7 +326,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "" @@ -623,11 +651,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -791,18 +819,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "" diff --git a/l10n/zh_HK/user_ldap.po b/l10n/zh_HK/user_ldap.po index bf006d7a13b..c5dc3d39ddf 100644 --- a/l10n/zh_HK/user_ldap.po +++ b/l10n/zh_HK/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/zh_TW/core.po b/l10n/zh_TW/core.po index d9de54c4ddc..a3ed36042a2 100644 --- a/l10n/zh_TW/core.po +++ b/l10n/zh_TW/core.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:02+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/zh_TW/files_external.po b/l10n/zh_TW/files_external.po index 4e1e0cb035e..5fb638dc13d 100644 --- a/l10n/zh_TW/files_external.po +++ b/l10n/zh_TW/files_external.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n" "MIME-Version: 1.0\n" @@ -198,29 +198,29 @@ msgstr "è¨å®š Google Drive 儲å˜æ™‚發生錯誤" msgid "Saved" msgstr "已儲å˜" -#: lib/config.php:598 +#: lib/config.php:597 msgid "<b>Note:</b> " msgstr "" -#: lib/config.php:608 +#: lib/config.php:607 msgid " and " msgstr "" -#: lib/config.php:630 +#: lib/config.php:629 #, php-format msgid "" "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting " "of %s is not possible. Please ask your system administrator to install it." msgstr "" -#: lib/config.php:632 +#: lib/config.php:631 #, php-format msgid "" "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of" " %s is not possible. Please ask your system administrator to install it." msgstr "" -#: lib/config.php:634 +#: lib/config.php:633 #, php-format msgid "" "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please" diff --git a/l10n/zh_TW/files_sharing.po b/l10n/zh_TW/files_sharing.po index d0ea6e1af98..fe02e395624 100644 --- a/l10n/zh_TW/files_sharing.po +++ b/l10n/zh_TW/files_sharing.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-04 01:55-0400\n" -"PO-Revision-Date: 2014-05-03 06:12+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n" "MIME-Version: 1.0\n" @@ -62,11 +62,11 @@ msgstr "è«‹è©¢å•å‘Šè¨´æ‚¨æ¤é€£çµçš„人以çžè§£æ›´å¤š" msgid "Download" msgstr "下載" -#: templates/public.php:53 +#: templates/public.php:52 #, php-format msgid "Download %s" msgstr "" -#: templates/public.php:57 +#: templates/public.php:56 msgid "Direct link" msgstr "" diff --git a/l10n/zh_TW/settings.po b/l10n/zh_TW/settings.po index 2bcab9da34e..b1c3b2a44c2 100644 --- a/l10n/zh_TW/settings.po +++ b/l10n/zh_TW/settings.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n" "MIME-Version: 1.0\n" @@ -53,7 +53,7 @@ msgstr "在準備è¦å¯„出測試郵件時您需è¦è¨å®šæ‚¨çš„使用者郵件。 msgid "Send mode" msgstr "寄é€æ¨¡å¼" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "åŠ å¯†" @@ -100,6 +100,16 @@ msgstr "無法解密您的檔案，請檢查您的 owncloud.log 或是詢å•æ‚¨ç msgid "Couldn't decrypt your files, check your password and try again" msgstr "無法解密您的檔案，確èªæ‚¨çš„密碼並å†é‡è©¦ä¸€æ¬¡" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "Email已儲å˜" @@ -116,6 +126,16 @@ msgstr "群組刪除錯誤" msgid "Unable to delete user" msgstr "使用者刪除錯誤" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "語言已變更" @@ -227,34 +247,42 @@ msgstr "æ›´æ–°" msgid "Updated" msgstr "已更新" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "é¸æ“‡å¤§é è²¼" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "éžå¸¸å¼±çš„密碼" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "弱的密碼" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "普通的密碼" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "好的密碼" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "很強的密碼" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "檔案解密ä¸ï¼Œè«‹ç¨å€™ã€‚" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "已刪除" @@ -300,7 +328,7 @@ msgstr "一定è¦æ供一個有效的密碼" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "è¦å‘Šï¼šä½¿ç”¨è€… {user} 的家目錄已經å˜åœ¨" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "__language_name__" @@ -625,11 +653,11 @@ msgstr "更多" msgid "Less" msgstr "æ›´å°‘" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "版本" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -793,18 +821,33 @@ msgid "" "WebDAV</a>" msgstr "使用這個地å€<a href=\"%s\" target=\"_blank\">來é€éŽ WebDAV å˜å–檔案</a>" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "åŠ å¯†çš„è»Ÿé«”ä¸èƒ½é•·æ™‚間啟用，請解密所有您的檔案" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "登入密碼" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "解密所有檔案" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "登入å稱" diff --git a/l10n/zh_TW/user_ldap.po b/l10n/zh_TW/user_ldap.po index 1d3c8c937dc..8f2029798f4 100644 --- a/l10n/zh_TW/user_ldap.po +++ b/l10n/zh_TW/user_ldap.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2014-04-29 10:03+0000\n" +"POT-Creation-Date: 2014-05-11 01:55-0400\n" +"PO-Revision-Date: 2014-05-11 05:02+0000\n" "Last-Translator: I Robot\n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n" "MIME-Version: 1.0\n" diff --git a/lib/base.php b/lib/base.php index 1f7d0c0da65..f3a15e0355f 100644 --- a/lib/base.php +++ b/lib/base.php @@ -175,7 +175,7 @@ class OC { OC::$SERVERROOT . '/lib/private' . PATH_SEPARATOR . OC::$SERVERROOT . '/config' . PATH_SEPARATOR . OC::$THIRDPARTYROOT . '/3rdparty' . PATH_SEPARATOR . - implode($paths, PATH_SEPARATOR) . PATH_SEPARATOR . + implode(PATH_SEPARATOR, $paths) . PATH_SEPARATOR . get_include_path() . PATH_SEPARATOR . OC::$SERVERROOT ); @@ -212,34 +212,6 @@ class OC { } } - /* - * This function adds some security related headers to all requests served via base.php - * The implementation of this function has to happen here to ensure that all third-party - * components (e.g. SabreDAV) also benefit from this headers. - */ - public static function addSecurityHeaders() { - header('X-XSS-Protection: 1; mode=block'); // Enforce browser based XSS filters - header('X-Content-Type-Options: nosniff'); // Disable sniffing the content type for IE - - // iFrame Restriction Policy - $xFramePolicy = OC_Config::getValue('xframe_restriction', true); - if($xFramePolicy) { - header('X-Frame-Options: Sameorigin'); // Disallow iFraming from other domains - } - - // Content Security Policy - // If you change the standard policy, please also change it in config.sample.php - $policy = OC_Config::getValue('custom_csp_policy', - 'default-src \'self\'; ' - .'script-src \'self\' \'unsafe-eval\'; ' - .'style-src \'self\' \'unsafe-inline\'; ' - .'frame-src *; ' - .'img-src *; ' - .'font-src \'self\' data:; ' - .'media-src *'); - header('Content-Security-Policy:'.$policy); - } - public static function checkSSL() { // redirect to https site if configured if (OC_Config::getValue("forcessl", false)) { @@ -545,7 +517,7 @@ class OC { self::checkConfig(); self::checkInstalled(); self::checkSSL(); - self::addSecurityHeaders(); + OC_Response::addSecurityHeaders(); $errors = OC_Util::checkServer(); if (count($errors) > 0) { @@ -613,7 +585,7 @@ class OC { if (!is_null(self::$REQUESTEDFILE)) { $subdir = OC_App::getAppPath(OC::$REQUESTEDAPP) . '/' . self::$REQUESTEDFILE; $parent = OC_App::getAppPath(OC::$REQUESTEDAPP); - if (!OC_Helper::issubdirectory($subdir, $parent)) { + if (!OC_Helper::isSubDirectory($subdir, $parent)) { self::$REQUESTEDFILE = null; header('HTTP/1.0 404 Not Found'); exit; diff --git a/lib/l10n/ast.php b/lib/l10n/ast.php index 219317c19b9..4eaf734931f 100644 --- a/lib/l10n/ast.php +++ b/lib/l10n/ast.php @@ -1,5 +1,6 @@ <?php $TRANSLATIONS = array( +"Help" => "Ayuda", "Personal" => "Personal", "Settings" => "Axustes", "Users" => "Usuarios", diff --git a/lib/l10n/cs_CZ.php b/lib/l10n/cs_CZ.php index 6fef446d8c4..94d0fbe0697 100644 --- a/lib/l10n/cs_CZ.php +++ b/lib/l10n/cs_CZ.php @@ -1,6 +1,7 @@ <?php $TRANSLATIONS = array( "You are accessing the server from an untrusted domain." => "PÅ™istupujete na server z nedůvÄ›ryhodné domény.", +"Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." => "Kontaktujte prosÃm správce. Pokud jste správce této instalace, nastavte \"trusted_domain\" v souboru config/config.php. PÅ™Ãklad konfigurace najdete v souboru config/config.sample.php.", "App \"%s\" can't be installed because it is not compatible with this version of ownCloud." => "Aplikace \"%s\" nemůže být nainstalována, protože nenà kompatibilnà s touto verzà ownCloud.", "No app name specified" => "Nebyl zadan název aplikace", "Help" => "NápovÄ›da", @@ -65,6 +66,7 @@ $TRANSLATIONS = array( "Sharing %s failed, because the group %s does not exist" => "SdÃlenà položky %s selhalo, protože skupina %s neexistuje", "Sharing %s failed, because %s is not a member of the group %s" => "SdÃlenà položky %s selhalo, protože uživatel %s nenà Älenem skupiny %s", "Sharing %s failed, because sharing with links is not allowed" => "SdÃlenà položky %s selhalo, protože sdÃlenà pomocà linků nenà povoleno", +"Share type %s is not valid for %s" => "SdÃlenà typu %s nenà korektnà pro %s", "Setting permissions for %s failed, because the item was not found" => "Nastavenà práv pro %s selhalo, protože položka nebyla nalezena", "Could not find category \"%s\"" => "Nelze nalézt kategorii \"%s\"", "seconds ago" => "pÅ™ed pár sekundami", diff --git a/lib/l10n/es_CO.php b/lib/l10n/es_CO.php new file mode 100644 index 00000000000..15f78e0bce6 --- /dev/null +++ b/lib/l10n/es_CO.php @@ -0,0 +1,8 @@ +<?php +$TRANSLATIONS = array( +"_%n minute ago_::_%n minutes ago_" => array("",""), +"_%n hour ago_::_%n hours ago_" => array("",""), +"_%n day go_::_%n days ago_" => array("",""), +"_%n month ago_::_%n months ago_" => array("","") +); +$PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/lib/l10n/es_EC.php b/lib/l10n/es_EC.php new file mode 100644 index 00000000000..15f78e0bce6 --- /dev/null +++ b/lib/l10n/es_EC.php @@ -0,0 +1,8 @@ +<?php +$TRANSLATIONS = array( +"_%n minute ago_::_%n minutes ago_" => array("",""), +"_%n hour ago_::_%n hours ago_" => array("",""), +"_%n day go_::_%n days ago_" => array("",""), +"_%n month ago_::_%n months ago_" => array("","") +); +$PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/lib/l10n/es_PE.php b/lib/l10n/es_PE.php new file mode 100644 index 00000000000..15f78e0bce6 --- /dev/null +++ b/lib/l10n/es_PE.php @@ -0,0 +1,8 @@ +<?php +$TRANSLATIONS = array( +"_%n minute ago_::_%n minutes ago_" => array("",""), +"_%n hour ago_::_%n hours ago_" => array("",""), +"_%n day go_::_%n days ago_" => array("",""), +"_%n month ago_::_%n months ago_" => array("","") +); +$PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/lib/l10n/es_UY.php b/lib/l10n/es_UY.php new file mode 100644 index 00000000000..15f78e0bce6 --- /dev/null +++ b/lib/l10n/es_UY.php @@ -0,0 +1,8 @@ +<?php +$TRANSLATIONS = array( +"_%n minute ago_::_%n minutes ago_" => array("",""), +"_%n hour ago_::_%n hours ago_" => array("",""), +"_%n day go_::_%n days ago_" => array("",""), +"_%n month ago_::_%n months ago_" => array("","") +); +$PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/lib/l10n/ja.php b/lib/l10n/ja.php index ec5352242d5..19cdb5f13cd 100644 --- a/lib/l10n/ja.php +++ b/lib/l10n/ja.php @@ -1,6 +1,7 @@ <?php $TRANSLATIONS = array( "You are accessing the server from an untrusted domain." => "ã‚ãªãŸã¯ã‚µãƒ¼ãƒã«ã€ä¿¡ç”¨ãŒä»˜ä¸Žã•ã‚Œã¦ã„ãªã„ドメインã‹ã‚‰ã‚¢ã‚¯ã‚»ã‚¹ã—ã¦ã„ã¾ã™ã€‚", +"Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." => "管ç†è€…ã«é€£çµ¡ã—ã¦ãã ã•ã„。ã“ã®ã‚µãƒ¼ãƒãƒ¼ã®ç®¡ç†è€…ã®å ´åˆã¯ã€\"trusted_domain\" ã®è¨å®šã‚’ config/config.php ã«è¨å®šã—ã¦ãã ã•ã„。config/config.sample.php ã«ã‚µãƒ³ãƒ—ルã®è¨å®šæ–¹æ³•ãŒè¨˜è¼‰ã—ã¦ã‚ã‚Šã¾ã™ã€‚", "App \"%s\" can't be installed because it is not compatible with this version of ownCloud." => " \"%s\" アプリã¯ã€ã“ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã®ownCloudã¨äº’æ›æ€§ãŒãªã„ãŸã‚インストールã§ãã¾ã›ã‚“。", "No app name specified" => "アプリåãŒæœªæŒ‡å®š", "Help" => "ヘルプ", @@ -58,11 +59,24 @@ $TRANSLATIONS = array( "Please double check the <a href='%s'>installation guides</a>." => "<a href='%s'>インストールガイド</a>をよã確èªã—ã¦ãã ã•ã„。", "%s shared »%s« with you" => "%s㌠ã‚ãªãŸã¨ »%s«を共有ã—ã¾ã—ãŸ", "Sharing %s failed, because the file does not exist" => "%s ã®å…±æœ‰ã«å¤±æ•—ã—ã¾ã—ãŸã€‚ãã®ã‚ˆã†ãªãƒ•ã‚¡ã‚¤ãƒ«ã¯å˜åœ¨ã—ãªã„ã‹ã‚‰ã§ã™ã€‚", +"Sharing %s failed, because the user %s is the item owner" => "%s ã®å…±æœ‰ã«å¤±æ•—ã—ã¾ã—ãŸã€‚ユーザー %s ãŒã‚¢ã‚¤ãƒ†ãƒ 所有者ã§ã™ã€‚", +"Sharing %s failed, because the user %s does not exist" => "%s ã®å…±æœ‰ã«å¤±æ•—ã—ã¾ã—ãŸã€‚ユーザー %s ãŒå˜åœ¨ã—ã¾ã›ã‚“。", +"Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" => "%s ã®å…±æœ‰ã«å¤±æ•—ã—ã¾ã—ãŸã€‚ユーザー %s ã¯ã©ã®ã‚°ãƒ«ãƒ¼ãƒ—ã«ã‚‚属ã—ã¦ã„ã¾ã›ã‚“。%s ã¯ã€??ã®ãƒ¡ãƒ³ãƒãƒ¼ã§ã™ã€‚", +"Sharing %s failed, because this item is already shared with %s" => "%s ã®å…±æœ‰ã«å¤±æ•—ã—ã¾ã—ãŸã€‚ã“ã®ã‚¢ã‚¤ãƒ†ãƒ ã¯æ—¢ã« %s ã§å…±æœ‰ã•ã‚Œã¦ã„ã¾ã™ã€‚", +"Sharing %s failed, because the group %s does not exist" => "%s ã®å…±æœ‰ã«å¤±æ•—ã—ã¾ã—ãŸã€‚グループ %s ã¯å˜åœ¨ã—ã¾ã›ã‚“。", +"Sharing %s failed, because %s is not a member of the group %s" => "%s ã®å…±æœ‰ã«å¤±æ•—ã—ã¾ã—ãŸã€‚%s ã¯ã€ã‚°ãƒ«ãƒ¼ãƒ— %s ã®ãƒ¡ãƒ³ãƒãƒ¼ã§ã¯ã‚ã‚Šã¾ã›ã‚“。", +"Sharing %s failed, because sharing with links is not allowed" => "%s ã®å…±æœ‰ã«å¤±æ•—ã—ã¾ã—ãŸã€‚リンクã§ã®å…±æœ‰ã¯è¨±å¯ã•ã‚Œã¦ã„ã¾ã›ã‚“。", +"Share type %s is not valid for %s" => "%s ã®å…±æœ‰æ–¹æ³•ã¯ã€%s ã«ã¯é©ç”¨ã§ãã¾ã›ã‚“。", +"Setting permissions for %s failed, because the permissions exceed permissions granted to %s" => "%s ã®æ¨©é™è¨å®šã«å¤±æ•—ã—ã¾ã—ãŸã€‚%s ã«è¨±å¯ã•ã‚Œã¦ã„る権é™ã‚’越ãˆã¦ã„ã¾ã™ã€‚", +"Setting permissions for %s failed, because the item was not found" => "%s ã®æ¨©é™è¨å®šã«å¤±æ•—ã—ã¾ã—ãŸã€‚アイテムãŒå˜åœ¨ã—ã¾ã›ã‚“。", +"Sharing backend %s must implement the interface OCP\\Share_Backend" => "%s ã®ãƒãƒƒã‚¯ã‚¨ãƒ³ãƒ‰ã®å…±æœ‰ã«ã¯ã€OCP\\Share_Backend　インターフェースを実装ã—ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“。", "Sharing backend %s not found" => "共有ãƒãƒƒã‚¯ã‚¨ãƒ³ãƒ‰ %s ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“", "Sharing backend for %s not found" => "%s ã®ãŸã‚ã®å…±æœ‰ãƒãƒƒã‚¯ã‚¨ãƒ³ãƒ‰ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“", "Sharing %s failed, because the user %s is the original sharer" => "%s ã®å…±æœ‰ã«å¤±æ•—ã—ã¾ã—ãŸã€‚ユーザ %s ãŒå…ƒã€…ã®å…±æœ‰è€…ã§ã‚ã‚‹ã‹ã‚‰ã§ã™ã€‚", "Sharing %s failed, because the permissions exceed permissions granted to %s" => "%s ã®å…±æœ‰ã«å¤±æ•—ã—ã¾ã—ãŸã€‚%s ã«ä»˜ä¸Žã•ã‚Œã¦ã„る許å¯ã‚’超ãˆã¦ã„ã‚‹ã‹ã‚‰ã§ã™ã€‚", "Sharing %s failed, because resharing is not allowed" => "%s ã®å…±æœ‰ã«å¤±æ•—ã—ã¾ã—ãŸã€‚å†å…±æœ‰ãŒè¨±ã•ã‚Œã¦ã„ãªã„ã‹ã‚‰ã§ã™ã€‚", +"Sharing %s failed, because the sharing backend for %s could not find its source" => "%s ã®å…±æœ‰ã«å¤±æ•—ã—ã¾ã—ãŸã€‚%s ã®ãƒãƒƒã‚¯ã‚¨ãƒ³ãƒ‰å…±æœ‰ã«å¿…è¦ãªã‚½ãƒ¼ã‚¹ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—ãŸã€‚", +"Sharing %s failed, because the file could not be found in the file cache" => "%s ã®å…±æœ‰ã«å¤±æ•—ã—ã¾ã—ãŸã€‚ファイルã‚ャッシュã«ãƒ•ã‚¡ã‚¤ãƒ«ãŒã‚ã‚Šã¾ã›ã‚“ã§ã—ãŸã€‚", "Could not find category \"%s\"" => "カテゴリ \"%s\" ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—ãŸ", "seconds ago" => "数秒å‰", "_%n minute ago_::_%n minutes ago_" => array("%n 分å‰"), @@ -74,6 +88,7 @@ $TRANSLATIONS = array( "_%n month ago_::_%n months ago_" => array("%nヶ月å‰"), "last year" => "1å¹´å‰", "years ago" => "å¹´å‰", +"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" => "ユーザーåã§åˆ©ç”¨ã§ãã‚‹æ–‡å—列ã¯ã€æ¬¡ã®ã‚‚ã®ã§ã™ï¼š \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"", "A valid username must be provided" => "有効ãªãƒ¦ãƒ¼ã‚¶ãƒ¼åを指定ã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™", "A valid password must be provided" => "有効ãªãƒ‘スワードを指定ã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™", "The username is already being used" => "ユーザåã¯ã™ã§ã«ä½¿ã‚ã‚Œã¦ã„ã¾ã™" diff --git a/lib/l10n/pt_PT.php b/lib/l10n/pt_PT.php index ad424933331..73e76588dd6 100644 --- a/lib/l10n/pt_PT.php +++ b/lib/l10n/pt_PT.php @@ -56,6 +56,7 @@ $TRANSLATIONS = array( "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "O seu servidor web não está configurado correctamente para autorizar sincronização de ficheiros, pois o interface WebDAV parece estar com problemas.", "Please double check the <a href='%s'>installation guides</a>." => "Por favor verifique <a href='%s'>installation guides</a>.", "%s shared »%s« with you" => "%s partilhado »%s« consigo", +"Sharing %s failed, because the user %s is the item owner" => "A partilha %s falhou, porque o utilizador %s é o proprietário", "Could not find category \"%s\"" => "Não foi encontrado a categoria \"%s\"", "seconds ago" => "Minutos atrás", "_%n minute ago_::_%n minutes ago_" => array("","%n minutos atrás"), @@ -67,7 +68,9 @@ $TRANSLATIONS = array( "_%n month ago_::_%n months ago_" => array("","%n meses atrás"), "last year" => "ano passado", "years ago" => "anos atrás", +"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" => "Apenas os seguintes caracteres são permitidos no nome de utilizador: \"a-z\", \"A-Z\", \"0-9\", e \"_.@-\"", "A valid username must be provided" => "Um nome de utilizador válido deve ser fornecido", -"A valid password must be provided" => "Uma password válida deve ser fornecida" +"A valid password must be provided" => "Uma password válida deve ser fornecida", +"The username is already being used" => "O nome de utilizador já está a ser usado" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/lib/l10n/ru.php b/lib/l10n/ru.php index 2611fcf7a6b..38532d0b3bc 100644 --- a/lib/l10n/ru.php +++ b/lib/l10n/ru.php @@ -31,6 +31,7 @@ $TRANSLATIONS = array( "Application is not enabled" => "Приложение не разрешено", "Authentication error" => "Ошибка аутентификации", "Token expired. Please reload page." => "Токен проÑрочен. Перезагрузите Ñтраницу.", +"Unknown user" => "ÐеизвеÑтный пользователь", "Files" => "Файлы", "Text" => "ТекÑÑ‚", "Images" => "ИзображениÑ", @@ -39,8 +40,13 @@ $TRANSLATIONS = array( "%s you may not use dots in the database name" => "%s Ð’Ñ‹ не можете иÑпользовать точки в имени базы данных", "MS SQL username and/or password not valid: %s" => "Ð˜Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¸/или пароль MS SQL не подходит: %s", "You need to enter either an existing account or the administrator." => "Ð’Ñ‹ должны войти или в ÑущеÑтвующий аккаунт или под админиÑтратором.", +"MySQL/MariaDB username and/or password not valid" => " Ð˜Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¸/или пароль MySQL/MariaDB не дейÑтвительны.", "DB Error: \"%s\"" => "Ошибка БД: \"%s\"", "Offending command was: \"%s\"" => "Ð’Ñ‹Ð·Ñ‹Ð²Ð°ÐµÐ¼Ð°Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° была: \"%s\"", +"MySQL/MariaDB user '%s'@'localhost' exists already." => "Пользователь MySQL '%s'@'localhost' уже ÑущеÑтвует.", +"Drop this user from MySQL/MariaDB" => "Удалить данного учаÑтника из MySQL/MariaDB", +"MySQL/MariaDB user '%s'@'%%' already exists" => "Пользователь MySQL '%s'@'%%' уже ÑущеÑтвует.", +"Drop this user from MySQL/MariaDB." => "Удалить данного учаÑтника из MySQL/MariaDB.", "Oracle connection could not be established" => "Ñоединение Ñ Oracle не может быть уÑтановлено", "Oracle username and/or password not valid" => "Ðеверное Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¸/или пароль Oracle", "Offending command was: \"%s\", name: %s, password: %s" => "Ð’Ñ‹Ð·Ñ‹Ð²Ð°ÐµÐ¼Ð°Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° была: \"%s\", имÑ: %s, пароль: %s", @@ -50,6 +56,15 @@ $TRANSLATIONS = array( "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Ваш веб Ñервер до Ñих пор не наÑтроен правильно Ð´Ð»Ñ Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾Ñти Ñинхронизации файлов, похоже что проблема в неиÑправноÑти интерфейÑа WebDAV.", "Please double check the <a href='%s'>installation guides</a>." => "ПожалуйÑта, дважды проÑмотрите <a href='%s'>инÑтрукции по уÑтановке</a>.", "%s shared »%s« with you" => "%s поделилÑÑ Â»%s« Ñ Ð²Ð°Ð¼Ð¸", +"Sharing %s failed, because the user %s is the item owner" => "Ðе удалоÑÑŒ уÑтановить общий доÑтуп Ð´Ð»Ñ %s, пользователь %s уже ÑвлÑетÑÑ Ð²Ð»Ð°Ð´ÐµÐ»ÑŒÑ†ÐµÐ¼", +"Sharing %s failed, because the user %s does not exist" => "Ðе удалоÑÑŒ уÑтановить общий доÑтуп Ð´Ð»Ñ %s, пользователь %s не ÑущеÑтвует.", +"Sharing %s failed, because this item is already shared with %s" => "Ðе удалоÑÑŒ уÑтановить общий доÑтуп Ð´Ð»Ñ %s ,в виду того что, объект уже находитьÑÑ Ð² общем доÑтупе Ñ %s", +"Sharing %s failed, because the group %s does not exist" => "Ðе удалоÑÑŒ уÑтановить общий доÑтуп Ð´Ð»Ñ %s, группа %s не ÑущеÑтвует.", +"Sharing %s failed, because %s is not a member of the group %s" => "Ðе удалоÑÑŒ уÑтановить общий доÑтуп Ð´Ð»Ñ %s, %s не ÑвлÑетÑÑ Ñ‡Ð»ÐµÐ½Ð¾Ð¼ группы %s", +"Sharing %s failed, because sharing with links is not allowed" => "Ðе удалоÑÑŒ уÑтановить общий доÑтуп Ð´Ð»Ñ %s, потому что обмен Ñо ÑÑылками не допуÑкаетÑÑ", +"Share type %s is not valid for %s" => "Такой втд общего доÑтупа как %s не допуÑтим Ð´Ð»Ñ %s", +"Setting permissions for %s failed, because the permissions exceed permissions granted to %s" => "ÐаÑтройка прав доÑтупа Ð´Ð»Ñ %s невозможна, поÑкольку права доÑтупа превышают предоÑтавленные права доÑтупа %s", +"Setting permissions for %s failed, because the item was not found" => "Ðе удалоÑÑŒ произвеÑти наÑтройку прав доÑтупа Ð´Ð»Ñ %s , Ñлемент не был найден.", "Could not find category \"%s\"" => "ÐšÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ñ \"%s\" не найдена", "seconds ago" => "неÑколько Ñекунд назад", "_%n minute ago_::_%n minutes ago_" => array("%n минута назад","%n минуты назад","%n минут назад"), @@ -61,7 +76,9 @@ $TRANSLATIONS = array( "_%n month ago_::_%n months ago_" => array("%n меÑÑц назад","%n меÑÑца назад","%n меÑÑцев назад"), "last year" => "в прошлом году", "years ago" => "неÑколько лет назад", +"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" => "Только Ñледующие Ñимволы допуÑкаютÑÑ Ð² имени пользователÑ: \"a-z\", \"A-Z\", \"0-9\", и \"_.@-\"", "A valid username must be provided" => "Укажите правильное Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ", -"A valid password must be provided" => "Укажите валидный пароль" +"A valid password must be provided" => "Укажите валидный пароль", +"The username is already being used" => "Ð˜Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ ÑƒÐ¶Ðµ иÑпользуетÑÑ" ); $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/lib/private/app.php b/lib/private/app.php index 2f55b54b328..a35248f2552 100644 --- a/lib/private/app.php +++ b/lib/private/app.php @@ -307,7 +307,7 @@ class OC_App{ /** * @brief Get the navigation entries for the $app * @param string $app app - * @return array of the $data added with addNavigationEntry + * @return array an array of the $data added with addNavigationEntry * * Warning: destroys the existing entries */ @@ -660,7 +660,7 @@ class OC_App{ /** * @brief: get a list of all apps in the apps folder - * @return array or app names (string IDs) + * @return array an array of app names (string IDs) * @todo: change the name of this method to getInstalledApps, which is more accurate */ public static function getAllApps() { diff --git a/lib/private/appconfig.php b/lib/private/appconfig.php index 0cd6b3bc35b..5fba7514de0 100644 --- a/lib/private/appconfig.php +++ b/lib/private/appconfig.php @@ -90,7 +90,7 @@ class AppConfig implements \OCP\IAppConfig { /** * @brief Get all apps using the config - * @return array with app ids + * @return array an array of app ids * * This function returns a list of all apps that have at least one * entry in the appconfig table. @@ -109,7 +109,7 @@ class AppConfig implements \OCP\IAppConfig { /** * @brief Get the available keys for an app * @param string $app the app we are looking for - * @return array with key names + * @return array an array of key names * * This function gets all keys of an app. Please note that the values are * not returned. diff --git a/lib/private/appframework/app.php b/lib/private/appframework/app.php index 3b13194862d..baf52d02054 100644 --- a/lib/private/appframework/app.php +++ b/lib/private/appframework/app.php @@ -4,7 +4,7 @@ * ownCloud - App Framework * * @author Bernhard Posselt - * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com + * @copyright 2012 Bernhard Posselt <dev@bernhard-posselt.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE diff --git a/lib/private/appframework/core/api.php b/lib/private/appframework/core/api.php index e7269373bb0..5f2035389b7 100644 --- a/lib/private/appframework/core/api.php +++ b/lib/private/appframework/core/api.php @@ -4,7 +4,7 @@ * ownCloud - App Framework * * @author Bernhard Posselt - * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com + * @copyright 2012 Bernhard Posselt <dev@bernhard-posselt.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE @@ -136,7 +136,7 @@ class API implements IApi{ * @brief Emits a signal. To get data from the slot use references! * @param string $signalClass class name of emitter * @param string $signalName name of signal - * @param array $params defautl: array() array with additional data + * @param array $params default: array() array with additional data * @return bool, true if slots exists or false if not */ public function emitHook($signalClass, $signalName, $params = array()) { diff --git a/lib/private/appframework/db/db.php b/lib/private/appframework/db/db.php new file mode 100644 index 00000000000..fc77a38f814 --- /dev/null +++ b/lib/private/appframework/db/db.php @@ -0,0 +1,57 @@ +<?php + +/** + * ownCloud - App Framework + * + * @author Bernhard Posselt + * @copyright 2012 Bernhard Posselt dev@bernhard-posselt.com + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE + * License as published by the Free Software Foundation; either + * version 3 of the License, or any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU AFFERO GENERAL PUBLIC LICENSE for more details. + * + * You should have received a copy of the GNU Affero General Public + * License along with this library. If not, see <http://www.gnu.org/licenses/>. + * + */ + +namespace OC\AppFramework\Db; + +use \OCP\IDb; + + +/** + * Small Facade for being able to inject the database connection for tests + */ +class Db implements IDb { + + + /** + * Used to abstract the owncloud database access away + * @param string $sql the sql query with ? placeholder for params + * @param int $limit the maximum number of rows + * @param int $offset from which row we want to start + * @return \OC_DB_StatementWrapper prepared SQL query + */ + public function prepareQuery($sql, $limit=null, $offset=null){ + return \OCP\DB::prepare($sql, $limit, $offset); + } + + + /** + * Used to get the id of the just inserted element + * @param string $tableName the name of the table where we inserted the item + * @return int the id of the inserted element + */ + public function getInsertId($tableName){ + return \OCP\DB::insertid($tableName); + } + + +} diff --git a/lib/private/appframework/dependencyinjection/dicontainer.php b/lib/private/appframework/dependencyinjection/dicontainer.php index e478225a53d..ee492b8a9e5 100644 --- a/lib/private/appframework/dependencyinjection/dicontainer.php +++ b/lib/private/appframework/dependencyinjection/dicontainer.php @@ -4,7 +4,7 @@ * ownCloud - App Framework * * @author Bernhard Posselt - * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com + * @copyright 2012 Bernhard Posselt <dev@bernhard-posselt.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE @@ -30,8 +30,10 @@ use OC\AppFramework\Http\Dispatcher; use OC\AppFramework\Core\API; use OC\AppFramework\Middleware\MiddlewareDispatcher; use OC\AppFramework\Middleware\Security\SecurityMiddleware; +use OC\AppFramework\Middleware\Security\CORSMiddleware; use OC\AppFramework\Utility\SimpleContainer; use OC\AppFramework\Utility\TimeFactory; +use OC\AppFramework\Utility\ControllerMethodReflector; use OCP\AppFramework\IApi; use OCP\AppFramework\IAppContainer; use OCP\AppFramework\Middleware; @@ -80,7 +82,12 @@ class DIContainer extends SimpleContainer implements IAppContainer{ }); $this['Dispatcher'] = $this->share(function($c) { - return new Dispatcher($c['Protocol'], $c['MiddlewareDispatcher']); + return new Dispatcher( + $c['Protocol'], + $c['MiddlewareDispatcher'], + $c['ControllerMethodReflector'], + $c['Request'] + ); }); @@ -89,13 +96,25 @@ class DIContainer extends SimpleContainer implements IAppContainer{ */ $app = $this; $this['SecurityMiddleware'] = $this->share(function($c) use ($app){ - return new SecurityMiddleware($app, $c['Request']); + return new SecurityMiddleware( + $app, + $c['Request'], + $c['ControllerMethodReflector'] + ); + }); + + $this['CORSMiddleware'] = $this->share(function($c) { + return new CORSMiddleware( + $c['Request'], + $c['ControllerMethodReflector'] + ); }); $middleWares = &$this->middleWares; $this['MiddlewareDispatcher'] = $this->share(function($c) use (&$middleWares) { $dispatcher = new MiddlewareDispatcher(); $dispatcher->registerMiddleware($c['SecurityMiddleware']); + $dispatcher->registerMiddleware($c['CORSMiddleware']); foreach($middleWares as $middleWare) { $dispatcher->registerMiddleware($c[$middleWare]); @@ -112,6 +131,9 @@ class DIContainer extends SimpleContainer implements IAppContainer{ return new TimeFactory(); }); + $this['ControllerMethodReflector'] = $this->share(function($c) { + return new ControllerMethodReflector(); + }); } @@ -168,8 +190,8 @@ class DIContainer extends SimpleContainer implements IAppContainer{ } /** - * @param $message - * @param $level + * @param string $message + * @param string $level * @return mixed */ function log($message, $level) { diff --git a/lib/private/appframework/http.php b/lib/private/appframework/http.php index 65d926105f1..2b1387af715 100644 --- a/lib/private/appframework/http.php +++ b/lib/private/appframework/http.php @@ -4,7 +4,7 @@ * ownCloud - App Framework * * @author Bernhard Posselt, Thomas Tanghus, Bart Visscher - * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com + * @copyright 2012 Bernhard Posselt <dev@bernhard-posselt.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE @@ -33,7 +33,7 @@ class Http extends BaseHttp { protected $headers; /** - * @param $_SERVER $server + * @param array $server $_SERVER * @param string $protocolVersion the http version to use defaults to HTTP/1.1 */ public function __construct($server, $protocolVersion='HTTP/1.1') { diff --git a/lib/private/appframework/http/dispatcher.php b/lib/private/appframework/http/dispatcher.php index a2afb53f0fa..442e33ee726 100644 --- a/lib/private/appframework/http/dispatcher.php +++ b/lib/private/appframework/http/dispatcher.php @@ -4,7 +4,7 @@ * ownCloud - App Framework * * @author Bernhard Posselt, Thomas Tanghus, Bart Visscher - * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com + * @copyright 2012 Bernhard Posselt <dev@bernhard-posselt.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE @@ -26,7 +26,11 @@ namespace OC\AppFramework\Http; use \OC\AppFramework\Middleware\MiddlewareDispatcher; use \OC\AppFramework\Http; +use \OC\AppFramework\Utility\ControllerMethodReflector; + use OCP\AppFramework\Controller; +use OCP\AppFramework\Http\Response; +use OCP\IRequest; /** @@ -36,17 +40,25 @@ class Dispatcher { private $middlewareDispatcher; private $protocol; - + private $reflector; + private $request; /** * @param Http $protocol the http protocol with contains all status headers * @param MiddlewareDispatcher $middlewareDispatcher the dispatcher which * runs the middleware + * @param ControllerMethodReflector the reflector that is used to inject + * the arguments for the controller + * @param IRequest $request the incoming request */ public function __construct(Http $protocol, - MiddlewareDispatcher $middlewareDispatcher) { + MiddlewareDispatcher $middlewareDispatcher, + ControllerMethodReflector $reflector, + IRequest $request) { $this->protocol = $protocol; $this->middlewareDispatcher = $middlewareDispatcher; + $this->reflector = $reflector; + $this->request = $request; } @@ -63,10 +75,13 @@ class Dispatcher { $out = array(null, array(), null); try { + // prefill reflector with everything thats needed for the + // middlewares + $this->reflector->reflect($controller, $methodName); $this->middlewareDispatcher->beforeController($controller, $methodName); - $response = $controller->$methodName(); + $response = $this->executeController($controller, $methodName); // if an exception appears, the middleware checks if it can handle the // exception and creates a response. If no response is created, it is @@ -98,4 +113,70 @@ class Dispatcher { } + /** + * Uses the reflected parameters, types and request parameters to execute + * the controller + * @param Controller $controller the controller to be executed + * @param string $methodName the method on the controller that should be executed + * @return Response + */ + private function executeController($controller, $methodName) { + $arguments = array(); + + // valid types that will be casted + $types = array('int', 'integer', 'bool', 'boolean', 'float'); + + foreach($this->reflector->getParameters() as $param => $default) { + + // try to get the parameter from the request object and cast + // it to the type annotated in the @param annotation + $value = $this->request->getParam($param, $default); + $type = $this->reflector->getType($param); + + // if this is submitted using GET or a POST form, 'false' should be + // converted to false + if(($type === 'bool' || $type === 'boolean') && + $value === 'false' && + ( + $this->request->method === 'GET' || + strpos($this->request->getHeader('Content-Type'), + 'application/x-www-form-urlencoded') !== false + ) + ) { + $value = false; + + } elseif(in_array($type, $types)) { + settype($value, $type); + } + + $arguments[] = $value; + } + + $response = call_user_func_array(array($controller, $methodName), $arguments); + + // format response if not of type response + if(!($response instanceof Response)) { + + // get format from the url format or request format parameter + $format = $this->request->getParam('format'); + + // if none is given try the first Accept header + if($format === null) { + $header = $this->request->getHeader('Accept'); + $formats = explode(',', $header); + + if($header !== null && count($formats) > 0) { + $accept = strtolower(trim($formats[0])); + $format = str_replace('application/', '', $accept); + } else { + $format = 'json'; + } + } + + $response = $controller->buildResponse($response, $format); + } + + return $response; + } + } diff --git a/lib/private/appframework/http/request.php b/lib/private/appframework/http/request.php index 643fa685adc..8b68ca486ff 100644 --- a/lib/private/appframework/http/request.php +++ b/lib/private/appframework/http/request.php @@ -3,7 +3,9 @@ * ownCloud - Request * * @author Thomas Tanghus + * @author Bernhard Posselt * @copyright 2013 Thomas Tanghus (thomas@tanghus.net) + * @copyright 2014 Bernhard Posselt <dev@bernhard-posselt.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE diff --git a/lib/private/appframework/middleware/middlewaredispatcher.php b/lib/private/appframework/middleware/middlewaredispatcher.php index 598743e523f..dcb63a8e552 100644 --- a/lib/private/appframework/middleware/middlewaredispatcher.php +++ b/lib/private/appframework/middleware/middlewaredispatcher.php @@ -4,7 +4,7 @@ * ownCloud - App Framework * * @author Bernhard Posselt - * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com + * @copyright 2012 Bernhard Posselt <dev@bernhard-posselt.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE diff --git a/lib/private/appframework/middleware/security/corsmiddleware.php b/lib/private/appframework/middleware/security/corsmiddleware.php new file mode 100644 index 00000000000..dca3996ea2e --- /dev/null +++ b/lib/private/appframework/middleware/security/corsmiddleware.php @@ -0,0 +1,75 @@ +<?php +/** + * ownCloud - App Framework + * + * This file is licensed under the Affero General Public License version 3 or + * later. See the COPYING file. + * + * @author Bernhard Posselt <dev@bernhard-posselt.com> + * @copyright Bernhard Posselt 2014 + */ + +namespace OC\AppFramework\Middleware\Security; + +use OC\AppFramework\Utility\ControllerMethodReflector; +use OCP\IRequest; +use OCP\AppFramework\Http\Response; +use OCP\AppFramework\Middleware; + +/** + * This middleware sets the correct CORS headers on a response if the + * controller has the @CORS annotation. This is needed for webapps that want + * to access an API and dont run on the same domain, see + * https://developer.mozilla.org/en-US/docs/Web/HTTP/Access_control_CORS + */ +class CORSMiddleware extends Middleware { + + private $request; + private $reflector; + + /** + * @param IRequest $request + * @param ControllerMethodReflector $reflector + */ + public function __construct(IRequest $request, + ControllerMethodReflector $reflector) { + $this->request = $request; + $this->reflector = $reflector; + } + + + /** + * This is being run after a successful controllermethod call and allows + * the manipulation of a Response object. The middleware is run in reverse order + * + * @param Controller $controller the controller that is being called + * @param string $methodName the name of the method that will be called on + * the controller + * @param Response $response the generated response from the controller + * @return Response a Response object + */ + public function afterController($controller, $methodName, Response $response){ + // only react if its a CORS request and if the request sends origin and + + if(isset($this->request->server['HTTP_ORIGIN']) && + $this->reflector->hasAnnotation('CORS')) { + + // allow credentials headers must not be true or CSRF is possible + // otherwise + foreach($response->getHeaders() as $header => $value ) { + if(strtolower($header) === 'access-control-allow-credentials' && + strtolower(trim($value)) === 'true') { + $msg = 'Access-Control-Allow-Credentials must not be '. + 'set to true in order to prevent CSRF'; + throw new SecurityException($msg); + } + } + + $origin = $this->request->server['HTTP_ORIGIN']; + $response->addHeader('Access-Control-Allow-Origin', $origin); + } + return $response; + } + + +} diff --git a/lib/private/appframework/middleware/security/securityexception.php b/lib/private/appframework/middleware/security/securityexception.php index e551675acdf..df37d5e3275 100644 --- a/lib/private/appframework/middleware/security/securityexception.php +++ b/lib/private/appframework/middleware/security/securityexception.php @@ -4,7 +4,7 @@ * ownCloud - App Framework * * @author Bernhard Posselt - * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com + * @copyright 2012 Bernhard Posselt <dev@bernhard-posselt.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE diff --git a/lib/private/appframework/middleware/security/securitymiddleware.php b/lib/private/appframework/middleware/security/securitymiddleware.php index 0f160d224ad..d7e398fe445 100644 --- a/lib/private/appframework/middleware/security/securitymiddleware.php +++ b/lib/private/appframework/middleware/security/securitymiddleware.php @@ -4,7 +4,7 @@ * ownCloud - App Framework * * @author Bernhard Posselt - * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com + * @copyright 2012 Bernhard Posselt <dev@bernhard-posselt.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE @@ -25,7 +25,7 @@ namespace OC\AppFramework\Middleware\Security; use OC\AppFramework\Http; -use OC\AppFramework\Utility\MethodAnnotationReader; +use OC\AppFramework\Utility\ControllerMethodReflector; use OCP\AppFramework\Http\RedirectResponse; use OCP\AppFramework\Middleware; use OCP\AppFramework\Http\Response; @@ -53,12 +53,20 @@ class SecurityMiddleware extends Middleware { private $request; /** + * @var OC\AppFramework\Utility\ControllerMethodReflector + */ + private $reflector; + + /** * @param IAppContainer $app * @param IRequest $request + * @param ControllerMethodReflector $reflector */ - public function __construct(IAppContainer $app, IRequest $request){ + public function __construct(IAppContainer $app, IRequest $request, + ControllerMethodReflector $reflector){ $this->app = $app; $this->request = $request; + $this->reflector = $reflector; } @@ -72,28 +80,25 @@ class SecurityMiddleware extends Middleware { */ public function beforeController($controller, $methodName){ - // get annotations from comments - $annotationReader = new MethodAnnotationReader($controller, $methodName); - // this will set the current navigation entry of the app, use this only // for normal HTML requests and not for AJAX requests $this->app->getServer()->getNavigationManager()->setActiveEntry($this->app->getAppName()); // security checks - $isPublicPage = $annotationReader->hasAnnotation('PublicPage'); + $isPublicPage = $this->reflector->hasAnnotation('PublicPage'); if(!$isPublicPage) { if(!$this->app->isLoggedIn()) { throw new SecurityException('Current user is not logged in', Http::STATUS_UNAUTHORIZED); } - if(!$annotationReader->hasAnnotation('NoAdminRequired')) { + if(!$this->reflector->hasAnnotation('NoAdminRequired')) { if(!$this->app->isAdminUser()) { throw new SecurityException('Logged in user must be an admin', Http::STATUS_FORBIDDEN); } } } - if(!$annotationReader->hasAnnotation('NoCSRFRequired')) { + if(!$this->reflector->hasAnnotation('NoCSRFRequired')) { if(!$this->request->passesCSRFCheck()) { throw new SecurityException('CSRF check failed', Http::STATUS_PRECONDITION_FAILED); } diff --git a/lib/private/appframework/routing/routeconfig.php b/lib/private/appframework/routing/routeconfig.php index a3bbde6af53..91ea7778d08 100644 --- a/lib/private/appframework/routing/routeconfig.php +++ b/lib/private/appframework/routing/routeconfig.php @@ -61,7 +61,7 @@ class RouteConfig { /** * Creates one route base on the give configuration - * @param $routes + * @param array $routes * @throws \UnexpectedValueException */ private function processSimpleRoutes($routes) @@ -105,7 +105,7 @@ class RouteConfig { * - update * - destroy * - * @param $routes + * @param array $routes */ private function processResources($routes) { @@ -151,7 +151,7 @@ class RouteConfig { /** * Based on a given route name the controller name is generated - * @param $controller + * @param string $controller * @return string */ private function buildControllerName($controller) @@ -161,7 +161,7 @@ class RouteConfig { /** * Based on the action part of the route name the controller method name is generated - * @param $action + * @param string $action * @return string */ private function buildActionName($action) { @@ -170,7 +170,7 @@ class RouteConfig { /** * Generates the id used in the url part o the route url - * @param $resource + * @param string $resource * @return string */ private function buildResourceId($resource) { @@ -179,7 +179,7 @@ class RouteConfig { /** * Underscored strings are converted to camel case strings - * @param $str string + * @param string $str * @return string */ private function underScoreToCamelCase($str) { diff --git a/lib/private/appframework/utility/methodannotationreader.php b/lib/private/appframework/utility/controllermethodreflector.php index 42060a08529..a1519c72809 100644 --- a/lib/private/appframework/utility/methodannotationreader.php +++ b/lib/private/appframework/utility/controllermethodreflector.php @@ -4,7 +4,7 @@ * ownCloud - App Framework * * @author Bernhard Posselt - * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com + * @copyright 2014 Bernhard Posselt <dev@bernhard-posselt.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE @@ -28,23 +28,68 @@ namespace OC\AppFramework\Utility; /** * Reads and parses annotations from doc comments */ -class MethodAnnotationReader { +class ControllerMethodReflector { private $annotations; + private $types; + private $parameters; + + public function __construct() { + $this->types = array(); + $this->parameters = array(); + $this->annotations = array(); + } + /** * @param object $object an object or classname - * @param string $method the method which we want to inspect for annotations + * @param string $method the method which we want to inspect */ - public function __construct($object, $method){ - $this->annotations = array(); - + public function reflect($object, $method){ $reflection = new \ReflectionMethod($object, $method); $docs = $reflection->getDocComment(); // extract everything prefixed by @ and first letter uppercase preg_match_all('/@([A-Z]\w+)/', $docs, $matches); $this->annotations = $matches[1]; + + // extract type parameter information + preg_match_all('/@param (?<type>\w+) \$(?<var>\w+)/', $docs, $matches); + $this->types = array_combine($matches['var'], $matches['type']); + + // get method parameters + foreach ($reflection->getParameters() as $param) { + if($param->isOptional()) { + $default = $param->getDefaultValue(); + } else { + $default = null; + } + $this->parameters[$param->name] = $default; + } + } + + + /** + * Inspects the PHPDoc parameters for types + * @param string $parameter the parameter whose type comments should be + * parsed + * @return string|null type in the type parameters (@param int $something) + * would return int or null if not existing + */ + public function getType($parameter) { + if(array_key_exists($parameter, $this->types)) { + return $this->types[$parameter]; + } else { + return null; + } + } + + + /** + * @return array the arguments of the method with key => default value + */ + public function getParameters() { + return $this->parameters; } diff --git a/lib/private/appframework/utility/timefactory.php b/lib/private/appframework/utility/timefactory.php index 2c3dd6cf5e3..a9b07a356e3 100644 --- a/lib/private/appframework/utility/timefactory.php +++ b/lib/private/appframework/utility/timefactory.php @@ -4,7 +4,7 @@ * ownCloud - App Framework * * @author Bernhard Posselt - * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com + * @copyright 2012 Bernhard Posselt <dev@bernhard-posselt.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE diff --git a/lib/private/archive/tar.php b/lib/private/archive/tar.php index cbdb565ba35..21a995d9e50 100644 --- a/lib/private/archive/tar.php +++ b/lib/private/archive/tar.php @@ -154,7 +154,7 @@ class OC_Archive_TAR extends OC_Archive{ } /** * get the last modified time of a file in the archive - * @param string path + * @param string $path * @return int */ function mtime($path) { diff --git a/lib/private/avatar.php b/lib/private/avatar.php index e97f55eecaf..45959798476 100644 --- a/lib/private/avatar.php +++ b/lib/private/avatar.php @@ -16,7 +16,7 @@ class OC_Avatar implements \OCP\IAvatar { /** * @brief constructor - * @param $user string user to do avatar-management with + * @param string $user user to do avatar-management with */ public function __construct ($user) { $this->view = new \OC\Files\View('/'.$user); @@ -24,7 +24,7 @@ class OC_Avatar implements \OCP\IAvatar { /** * @brief get the users avatar - * @param $size integer size in px of the avatar, avatars are square, defaults to 64 + * @param int $size size in px of the avatar, avatars are square, defaults to 64 * @return boolean|\OC_Image containing the avatar or false if there's no image */ public function get ($size = 64) { @@ -44,7 +44,7 @@ class OC_Avatar implements \OCP\IAvatar { /** * @brief sets the users avatar - * @param $data mixed OC_Image, imagedata or path to set a new avatar + * @param \OC_Image|resource|string $data OC_Image, imagedata or path to set a new avatar * @throws Exception if the provided file is not a jpg or png image * @throws Exception if the provided image is not valid * @throws \OC\NotSquareException if the image is not square diff --git a/lib/private/avatarmanager.php b/lib/private/avatarmanager.php index 3ca46868ea6..f462e6ac5fd 100644 --- a/lib/private/avatarmanager.php +++ b/lib/private/avatarmanager.php @@ -17,7 +17,7 @@ class AvatarManager implements IAvatarManager { /** * @brief return a user specific instance of \OCP\IAvatar * @see \OCP\IAvatar - * @param $user string the ownCloud user id + * @param string $user the ownCloud user id * @return \OCP\IAvatar */ function getAvatar($user) { diff --git a/lib/private/backgroundjob/joblist.php b/lib/private/backgroundjob/joblist.php index 26c90269349..9fa13c25851 100644 --- a/lib/private/backgroundjob/joblist.php +++ b/lib/private/backgroundjob/joblist.php @@ -31,7 +31,7 @@ class JobList implements IJobList { } /** - * @param \Test\BackgroundJob\TestJob $job + * @param Job|string $job * @param mixed $argument */ public function add($job, $argument = null) { @@ -48,7 +48,7 @@ class JobList implements IJobList { } /** - * @param Job $job + * @param Job|string $job * @param mixed $argument */ public function remove($job, $argument = null) { @@ -70,7 +70,7 @@ class JobList implements IJobList { /** * check if a job is in the list * - * @param $job + * @param Job|string $job * @param mixed $argument * @return bool */ @@ -126,7 +126,7 @@ class JobList implements IJobList { /** * @param int $id - * @return Job + * @return Job|null */ public function getById($id) { $query = $this->conn->prepare('SELECT `id`, `class`, `last_run`, `argument` FROM `*PREFIX*jobs` WHERE `id` = ?'); diff --git a/lib/private/cache/file.php b/lib/private/cache/file.php index feee9cc32b6..4e7c065678e 100644 --- a/lib/private/cache/file.php +++ b/lib/private/cache/file.php @@ -48,7 +48,7 @@ class File { /** * Returns the size of the stored/cached data * - * @param $key + * @param string $key * @return int */ public function size($key) { diff --git a/lib/private/config.php b/lib/private/config.php index 6701ca0532b..4242682af3d 100644 --- a/lib/private/config.php +++ b/lib/private/config.php @@ -65,7 +65,7 @@ class Config { /** * @brief Lists all available config keys - * @return array with key names + * @return array an array of key names * * This function returns all keys saved in config.php. Please note that it * does not return the values. @@ -77,8 +77,8 @@ class Config { /** * @brief Gets a value from config.php * @param string $key key - * @param array|bool|string|null $default = null default value - * @return string the value or $default + * @param mixed $default = null default value + * @return mixed the value or $default * * This function gets the value from config.php. If it does not exist, * $default will be returned. @@ -94,7 +94,7 @@ class Config { /** * @brief Sets a value * @param string $key key - * @param string $value value + * @param mixed $value value * * This function sets the value and writes the config.php. * diff --git a/lib/private/connector/sabre/auth.php b/lib/private/connector/sabre/auth.php index 5577273df8c..9ebf5fc05cf 100644 --- a/lib/private/connector/sabre/auth.php +++ b/lib/private/connector/sabre/auth.php @@ -69,6 +69,8 @@ class OC_Connector_Sabre_Auth extends Sabre_DAV_Auth_Backend_AbstractBasic { * even if there are no HTTP Basic Auth headers. * In other case, just fallback to the parent implementation. * + * @param Sabre_DAV_Server $server + * @param $realm * @return bool */ public function authenticate(Sabre_DAV_Server $server, $realm) { diff --git a/lib/private/connector/sabre/file.php b/lib/private/connector/sabre/file.php index 66b50a87552..ab9d3e47d0e 100644 --- a/lib/private/connector/sabre/file.php +++ b/lib/private/connector/sabre/file.php @@ -123,7 +123,7 @@ class OC_Connector_Sabre_File extends OC_Connector_Sabre_Node implements Sabre_D /** * Returns the data * - * @return string | resource + * @return string|resource */ public function get() { diff --git a/lib/private/connector/sabre/filesplugin.php b/lib/private/connector/sabre/filesplugin.php index 65231040fb5..f8495b40524 100644 --- a/lib/private/connector/sabre/filesplugin.php +++ b/lib/private/connector/sabre/filesplugin.php @@ -73,7 +73,7 @@ class OC_Connector_Sabre_FilesPlugin extends Sabre_DAV_ServerPlugin } /** - * @param $filePath + * @param string $filePath * @param Sabre_DAV_INode $node * @throws Sabre_DAV_Exception_BadRequest */ diff --git a/lib/private/connector/sabre/quotaplugin.php b/lib/private/connector/sabre/quotaplugin.php index 1e73e1645c3..c9b8336b57b 100644 --- a/lib/private/connector/sabre/quotaplugin.php +++ b/lib/private/connector/sabre/quotaplugin.php @@ -97,7 +97,7 @@ class OC_Connector_Sabre_QuotaPlugin extends Sabre_DAV_ServerPlugin { } /** - * @param $parentUri + * @param string $parentUri * @return mixed */ public function getFreeSpace($parentUri) { diff --git a/lib/private/contactsmanager.php b/lib/private/contactsmanager.php index 4299d88017a..26264d4e988 100644 --- a/lib/private/contactsmanager.php +++ b/lib/private/contactsmanager.php @@ -31,7 +31,7 @@ namespace OC { * @param string $pattern which should match within the $searchProperties * @param array $searchProperties defines the properties within the query pattern should match * @param array $options - for future use. One should always have options! - * @return array of contacts which are arrays of key-value-pairs + * @return array an array of contacts which are arrays of key-value-pairs */ public function search($pattern, $searchProperties = array(), $options = array()) { $result = array(); @@ -72,7 +72,7 @@ namespace OC { * * @param array $properties this array if key-value-pairs defines a contact * @param string $address_book_key identifier of the address book in which the contact shall be created or updated - * @return array representing the contact just created or updated + * @return array an array representing the contact just created or updated */ public function createOrUpdate($properties, $address_book_key) { diff --git a/lib/private/db.php b/lib/private/db.php index 322a13642ae..52bf570d1d0 100644 --- a/lib/private/db.php +++ b/lib/private/db.php @@ -401,7 +401,7 @@ class OC_DB { /** * @brief replaces the ownCloud tables with a new set - * @param $file string path to the MDB2 xml db export file + * @param string $file path to the MDB2 xml db export file */ public static function replaceDB( $file ) { $schemaManager = self::getMDB2SchemaManager(); diff --git a/lib/private/db/connectionwrapper.php b/lib/private/db/connectionwrapper.php index c2cfc21d204..132e76666ab 100644 --- a/lib/private/db/connectionwrapper.php +++ b/lib/private/db/connectionwrapper.php @@ -41,8 +41,8 @@ class ConnectionWrapper implements \OCP\IDBConnection { /** * Insert a row if a matching row doesn't exists. - * @param string The table name (will replace *PREFIX*) to perform the replace on. - * @param array + * @param string $table The table name (will replace *PREFIX*) to perform the replace on. + * @param array $input * * The input array if in the form: * diff --git a/lib/private/db/mdb2schemamanager.php b/lib/private/db/mdb2schemamanager.php index aaf2ea543b9..d98197445e9 100644 --- a/lib/private/db/mdb2schemamanager.php +++ b/lib/private/db/mdb2schemamanager.php @@ -126,7 +126,7 @@ class MDB2SchemaManager { /** * @brief replaces the ownCloud tables with a new set - * @param $file string path to the MDB2 xml db export file + * @param string $file path to the MDB2 xml db export file */ public function replaceDB( $file ) { $apps = \OC_App::getAllApps(); diff --git a/lib/private/db/mdb2schemareader.php b/lib/private/db/mdb2schemareader.php index 1c16d03eab2..597650985fa 100644 --- a/lib/private/db/mdb2schemareader.php +++ b/lib/private/db/mdb2schemareader.php @@ -66,7 +66,7 @@ class MDB2SchemaReader { } /** - * @param\Doctrine\DBAL\Schema\Schema $schema + * @param \Doctrine\DBAL\Schema\Schema $schema * @param \SimpleXMLElement $xml * @throws \DomainException */ @@ -303,7 +303,7 @@ class MDB2SchemaReader { } /** - * @param \SimpleXMLElement | string $xml + * @param \SimpleXMLElement|string $xml * @return bool */ private function asBool($xml) { diff --git a/lib/private/db/statementwrapper.php b/lib/private/db/statementwrapper.php index 492209b883b..70d1f985a41 100644 --- a/lib/private/db/statementwrapper.php +++ b/lib/private/db/statementwrapper.php @@ -41,7 +41,7 @@ class OC_DB_StatementWrapper { * make execute return the result instead of a bool * * @param array $input - * @return \OC_DB_StatementWrapper | int + * @return \OC_DB_StatementWrapper|int */ public function execute($input=array()) { if(OC_Config::getValue( "log_query", false)) { diff --git a/lib/private/defaults.php b/lib/private/defaults.php index fca798568c5..663c327a3b0 100644 --- a/lib/private/defaults.php +++ b/lib/private/defaults.php @@ -185,7 +185,7 @@ class OC_Defaults { /** * Returns mail header color - * @return mail header color + * @return string */ public function getMailHeaderColor() { if ($this->themeExist('getMailHeaderColor')) { diff --git a/lib/private/fileproxy.php b/lib/private/fileproxy.php index 88976c1b8e5..2835e974642 100644 --- a/lib/private/fileproxy.php +++ b/lib/private/fileproxy.php @@ -47,7 +47,7 @@ class OC_FileProxy{ /** * fallback function when a proxy operation is not implemented * @param string $function the name of the proxy operation - * @param mixed + * @param mixed $arguments * * this implements a dummy proxy for all operations */ diff --git a/lib/private/files.php b/lib/private/files.php index c435f8d1684..7c437a16a98 100644 --- a/lib/private/files.php +++ b/lib/private/files.php @@ -225,7 +225,7 @@ class OC_Files { * checks if the selected files are within the size constraint. If not, outputs an error page. * * @param string $dir - * @param array | string $files + * @param array|string $files */ static function validateZipDownload($dir, $files) { if (!OC_Config::getValue('allowZipDownload', true)) { diff --git a/lib/private/files/cache/cache.php b/lib/private/files/cache/cache.php index c4f03b4d9ef..3e4f6dfb132 100644 --- a/lib/private/files/cache/cache.php +++ b/lib/private/files/cache/cache.php @@ -109,7 +109,7 @@ class Cache { * get the stored metadata of a file or folder * * @param string/int $file - * @return array | false + * @return array|false */ public function get($file) { if (is_string($file) or $file == '') { @@ -450,7 +450,7 @@ class Cache { * search for files matching $pattern * * @param string $pattern - * @return array of file data + * @return array an array of file data */ public function search($pattern) { @@ -597,7 +597,7 @@ class Cache { * get the path of a file on this storage by it's id * * @param int $id - * @return string | null + * @return string|null */ public function getPathById($id) { $sql = 'SELECT `path` FROM `*PREFIX*filecache` WHERE `fileid` = ? AND `storage` = ?'; @@ -640,7 +640,7 @@ class Cache { /** * normalize the given path - * @param $path + * @param string $path * @return string */ public function normalize($path) { diff --git a/lib/private/files/cache/scanner.php b/lib/private/files/cache/scanner.php index c0bdde06a75..51454a71458 100644 --- a/lib/private/files/cache/scanner.php +++ b/lib/private/files/cache/scanner.php @@ -61,7 +61,7 @@ class Scanner extends BasicEmitter { * * * * @param string $path - * @return array with metadata of the file + * @return array an array of metadata of the file */ public function getData($path) { if (!$this->storage->isReadable($path)) { @@ -88,7 +88,7 @@ class Scanner extends BasicEmitter { * @param string $file * @param int $reuseExisting * @param bool $parentExistsInCache - * @return array with metadata of the scanned file + * @return array an array of metadata of the scanned file */ public function scanFile($file, $reuseExisting = 0, $parentExistsInCache = false) { if (!self::isPartialFile($file) @@ -174,7 +174,7 @@ class Scanner extends BasicEmitter { * @param string $path * @param bool $recursive * @param int $reuse - * @return array with the meta data of the scanned file or folder + * @return array an array of the meta data of the scanned file or folder */ public function scan($path, $recursive = self::SCAN_RECURSIVE, $reuse = -1) { if ($reuse === -1) { @@ -273,7 +273,7 @@ class Scanner extends BasicEmitter { * @brief check if the file should be ignored when scanning * NOTE: files with a '.part' extension are ignored as well! * prevents unfinished put requests to be scanned - * @param String $file + * @param string $file * @return boolean */ public static function isPartialFile($file) { diff --git a/lib/private/files/cache/updater.php b/lib/private/files/cache/updater.php index 199ce5dee78..95f77a81fa2 100644 --- a/lib/private/files/cache/updater.php +++ b/lib/private/files/cache/updater.php @@ -17,7 +17,7 @@ class Updater { * resolve a path to a storage and internal path * * @param string $path the relative path - * @return array consisting of the storage and the internal path + * @return array an array consisting of the storage and the internal path */ static public function resolvePath($path) { $view = \OC\Files\Filesystem::getView(); diff --git a/lib/private/files/cache/watcher.php b/lib/private/files/cache/watcher.php index 48aa6f853ce..599752a6eff 100644 --- a/lib/private/files/cache/watcher.php +++ b/lib/private/files/cache/watcher.php @@ -55,7 +55,7 @@ class Watcher { * check $path for updates * * @param string $path - * @return boolean | array true if path was updated, otherwise the cached data is returned + * @return boolean|array true if path was updated, otherwise the cached data is returned */ public function checkUpdate($path) { if ($this->watchPolicy === self::CHECK_ALWAYS or ($this->watchPolicy === self::CHECK_ONCE and array_search($path, $this->checkedPaths) === false)) { diff --git a/lib/private/files/fileinfo.php b/lib/private/files/fileinfo.php index d6940f50bf1..b64c5d4e112 100644 --- a/lib/private/files/fileinfo.php +++ b/lib/private/files/fileinfo.php @@ -147,7 +147,7 @@ class FileInfo implements \OCP\Files\FileInfo, \ArrayAccess { } /** - * @return \OCP\Files\FileInfo::TYPE_FILE | \OCP\Files\FileInfo::TYPE_FOLDER + * @return \OCP\Files\FileInfo::TYPE_FILE|\OCP\Files\FileInfo::TYPE_FOLDER */ public function getType() { if (isset($this->data['type'])) { diff --git a/lib/private/files/filesystem.php b/lib/private/files/filesystem.php index 52df1bec611..22d15840c32 100644 --- a/lib/private/files/filesystem.php +++ b/lib/private/files/filesystem.php @@ -245,7 +245,7 @@ class Filesystem { } /** - * @param $id + * @param string $id * @return Mount\Mount[] */ public static function getMountByStorageId($id) { @@ -256,7 +256,7 @@ class Filesystem { } /** - * @param $id + * @param int $id * @return Mount\Mount[] */ public static function getMountByNumericId($id) { @@ -270,7 +270,7 @@ class Filesystem { * resolve a path to a storage and internal path * * @param string $path - * @return array consisting of the storage and the internal path + * @return array an array consisting of the storage and the internal path */ static public function resolvePath($path) { if (!self::$mounts) { diff --git a/lib/private/files/mapper.php b/lib/private/files/mapper.php index 833d4bd8d1c..666719da12d 100644 --- a/lib/private/files/mapper.php +++ b/lib/private/files/mapper.php @@ -97,8 +97,8 @@ class Mapper } /** - * @param $path - * @param $root + * @param string $path + * @param string $root * @return false|string */ public function stripRootFolder($path, $root) { diff --git a/lib/private/files/mount/manager.php b/lib/private/files/mount/manager.php index 91460b72730..db1f4600c74 100644 --- a/lib/private/files/mount/manager.php +++ b/lib/private/files/mount/manager.php @@ -33,7 +33,7 @@ class Manager { /** * Find the mount for $path * - * @param $path + * @param string $path * @return Mount */ public function find($path) { @@ -61,7 +61,7 @@ class Manager { /** * Find all mounts in $path * - * @param $path + * @param string $path * @return Mount[] */ public function findIn($path) { @@ -112,7 +112,7 @@ class Manager { /** * Find mounts by numeric storage id * - * @param string $id + * @param int $id * @return Mount[] */ public function findByNumericId($id) { diff --git a/lib/private/files/mount/mount.php b/lib/private/files/mount/mount.php index 08d5ddf348b..256630726d2 100644 --- a/lib/private/files/mount/mount.php +++ b/lib/private/files/mount/mount.php @@ -28,7 +28,7 @@ class Mount { private $loader; /** - * @param string | \OC\Files\Storage\Storage $storage + * @param string|\OC\Files\Storage\Storage $storage * @param string $mountpoint * @param array $arguments (optional)\ * @param \OC\Files\Storage\Loader $loader diff --git a/lib/private/files/node/folder.php b/lib/private/files/node/folder.php index d9e0ddc2d61..1af34fc2be6 100644 --- a/lib/private/files/node/folder.php +++ b/lib/private/files/node/folder.php @@ -296,7 +296,7 @@ class Folder extends Node implements \OCP\Files\Folder { } /** - * @param $id + * @param int $id * @return \OC\Files\Node\Node[] */ public function getById($id) { diff --git a/lib/private/files/storage/common.php b/lib/private/files/storage/common.php index 8a263d4ce1e..fef33cabd87 100644 --- a/lib/private/files/storage/common.php +++ b/lib/private/files/storage/common.php @@ -317,7 +317,7 @@ abstract class Common implements \OC\Files\Storage\Storage { * clean a path, i.e. remove all redundant '.' and '..' * making sure that it can't point to higher than '/' * - * @param $path The path to clean + * @param string $path The path to clean * @return string cleaned path */ public function cleanPath($path) { @@ -347,7 +347,7 @@ abstract class Common implements \OC\Files\Storage\Storage { /** * get the free space in the storage * - * @param $path + * @param string $path * @return int */ public function free_space($path) { diff --git a/lib/private/files/storage/wrapper/quota.php b/lib/private/files/storage/wrapper/quota.php index a878b2c5cf6..c57c797f87a 100644 --- a/lib/private/files/storage/wrapper/quota.php +++ b/lib/private/files/storage/wrapper/quota.php @@ -30,7 +30,7 @@ class Quota extends Wrapper { } /** - * @return quota value + * @return int quota value */ public function getQuota() { return $this->quota; diff --git a/lib/private/files/stream/oc.php b/lib/private/files/stream/oc.php index 88e7e062df9..c206b41f55e 100644 --- a/lib/private/files/stream/oc.php +++ b/lib/private/files/stream/oc.php @@ -18,7 +18,15 @@ class OC { static private $rootView; private $path; + + /** + * @var resource + */ private $dirSource; + + /** + * @var resource + */ private $fileSource; private $meta; diff --git a/lib/private/files/type/templatemanager.php b/lib/private/files/type/templatemanager.php index cd1536d2732..e693e7079a5 100644 --- a/lib/private/files/type/templatemanager.php +++ b/lib/private/files/type/templatemanager.php @@ -19,7 +19,7 @@ class TemplateManager { * get the path of the template for a mimetype * * @param string $mimetype - * @return string | null + * @return string|null */ public function getTemplatePath($mimetype) { if (isset($this->templates[$mimetype])) { diff --git a/lib/private/files/view.php b/lib/private/files/view.php index 47fc04c937d..3b99bd12b8a 100644 --- a/lib/private/files/view.php +++ b/lib/private/files/view.php @@ -11,7 +11,7 @@ * working with files within that view (e.g. read, write, delete, etc.). Each * view is restricted to a set of directories via a virtual root. The default view * uses the currently logged in user's data directory as root (parts of - * OC_Filesystem are merely a wrapper for OC_FilesystemView). + * OC_Filesystem are merely a wrapper for OC\Files\View). * * Apps that need to access files outside of the user data folders (to modify files * belonging to a user other than the one currently logged in, for example) should @@ -37,7 +37,7 @@ class View { } public function getAbsolutePath($path = '/') { - if (!$path) { + if ($path === '') { $path = '/'; } if ($path[0] !== '/') { @@ -109,7 +109,7 @@ class View { * resolve a path to a storage and internal path * * @param string $path - * @return array consisting of the storage and the internal path + * @return array an array consisting of the storage and the internal path */ public function resolvePath($path) { $a = $this->getAbsolutePath($path); @@ -168,6 +168,10 @@ class View { } } + /** + * @param string $path + * @return resource + */ public function opendir($path) { return $this->basicOperation('opendir', $path, array('read')); } @@ -552,6 +556,11 @@ class View { } } + /** + * @param string $path + * @param string $mode + * @return resource + */ public function fopen($path, $mode) { $hooks = array(); switch ($mode) { @@ -796,7 +805,7 @@ class View { * @param string $path * @param boolean $includeMountPoints whether to add mountpoint sizes, * defaults to true - * @return \OC\Files\FileInfo | false + * @return \OC\Files\FileInfo|false */ public function getFileInfo($path, $includeMountPoints = true) { $data = array(); @@ -991,7 +1000,7 @@ class View { * change file metadata * * @param string $path - * @param array | \OCP\Files\FileInfo $data + * @param array|\OCP\Files\FileInfo $data * @return int * * returns the fileid of the updated file diff --git a/lib/private/geo.php b/lib/private/geo.php index cd62511f0c1..a0ad2b799ab 100644 --- a/lib/private/geo.php +++ b/lib/private/geo.php @@ -8,8 +8,8 @@ class OC_Geo{ /** * @brief returns the closest timezone to coordinates - * @param $latitude - * @param $longitude + * @param float $latitude + * @param float $longitude * @return mixed Closest timezone */ public static function timezone($latitude, $longitude) { diff --git a/lib/private/group.php b/lib/private/group.php index ea6384bae3e..845b3655bab 100644 --- a/lib/private/group.php +++ b/lib/private/group.php @@ -58,7 +58,7 @@ class OC_Group { /** * @brief set the group backend - * @param \OC_Group_Backend $backend The backend to use for user managment + * @param \OC_Group_Backend $backend The backend to use for user managment * @return bool */ public static function useBackend($backend) { @@ -179,7 +179,7 @@ class OC_Group { /** * @brief Get all groups a user belongs to * @param string $uid Name of the user - * @return array with group names + * @return array an array of group names * * This function fetches all groups a user belongs to. It does not check * if the user exists at all. @@ -203,7 +203,7 @@ class OC_Group { * @param string $search * @param int|null $limit * @param int|null $offset - * @returns array with group names + * @return array an array of group names * * Returns a list with all groups */ @@ -232,7 +232,7 @@ class OC_Group { * @param string $search * @param int $limit * @param int $offset - * @returns array with user ids + * @return array an array of user ids */ public static function usersInGroup($gid, $search = '', $limit = -1, $offset = 0) { $group = self::getManager()->get($gid); @@ -254,7 +254,7 @@ class OC_Group { * @param string $search * @param int $limit * @param int $offset - * @return array with user ids + * @return array an array of user ids */ public static function usersInGroups($gids, $search = '', $limit = -1, $offset = 0) { $users = array(); @@ -271,7 +271,7 @@ class OC_Group { * @param string $search * @param int $limit * @param int $offset - * @returns array with display names (value) and user ids(key) + * @return array an array of display names (value) and user ids(key) */ public static function displayNamesInGroup($gid, $search = '', $limit = -1, $offset = 0) { return self::getManager()->displayNamesInGroup($gid, $search, $limit, $offset); @@ -283,7 +283,7 @@ class OC_Group { * @param string $search * @param int $limit * @param int $offset - * @return array with display names (Key) user ids (value) + * @return array an array of display names (Key) user ids (value) */ public static function displayNamesInGroups($gids, $search = '', $limit = -1, $offset = 0) { $displayNames = array(); diff --git a/lib/private/group/backend.php b/lib/private/group/backend.php index cc61fce1615..38522d0c43c 100644 --- a/lib/private/group/backend.php +++ b/lib/private/group/backend.php @@ -69,7 +69,7 @@ abstract class OC_Group_Backend implements OC_Group_Interface { /** * @brief Check if backend implements actions * @param int $actions bitwise-or'ed actions - * @return boolean + * @return bool * * Returns the supported actions as int to be * compared with OC_GROUP_BACKEND_CREATE_GROUP etc. @@ -93,7 +93,7 @@ abstract class OC_Group_Backend implements OC_Group_Interface { /** * @brief Get all groups a user belongs to * @param string $uid Name of the user - * @return array with group names + * @return array an array of group names * * This function fetches all groups a user belongs to. It does not check * if the user exists at all. @@ -107,7 +107,7 @@ abstract class OC_Group_Backend implements OC_Group_Interface { * @param string $search * @param int $limit * @param int $offset - * @return array with group names + * @return array an array of group names * * Returns a list with all groups */ @@ -131,7 +131,7 @@ abstract class OC_Group_Backend implements OC_Group_Interface { * @param string $search * @param int $limit * @param int $offset - * @return array with user ids + * @return array an array of user ids */ public function usersInGroup($gid, $search = '', $limit = -1, $offset = 0) { return array(); diff --git a/lib/private/group/database.php b/lib/private/group/database.php index df0d84d0d2a..91baa3140cc 100644 --- a/lib/private/group/database.php +++ b/lib/private/group/database.php @@ -140,7 +140,7 @@ class OC_Group_Database extends OC_Group_Backend { /** * @brief Get all groups a user belongs to * @param string $uid Name of the user - * @return array with group names + * @return array an array of group names * * This function fetches all groups a user belongs to. It does not check * if the user exists at all. @@ -163,7 +163,7 @@ class OC_Group_Database extends OC_Group_Backend { * @param string $search * @param int $limit * @param int $offset - * @return array with group names + * @return array an array of group names * * Returns a list with all groups */ @@ -197,7 +197,7 @@ class OC_Group_Database extends OC_Group_Backend { * @param string $search * @param int $limit * @param int $offset - * @return array with user ids + * @return array an array of user ids */ public function usersInGroup($gid, $search = '', $limit = null, $offset = null) { $stmt = OC_DB::prepare('SELECT `uid` FROM `*PREFIX*group_user` WHERE `gid` = ? AND `uid` LIKE ?', @@ -215,9 +215,8 @@ class OC_Group_Database extends OC_Group_Backend { * @brief get the number of all users matching the search string in a group * @param string $gid * @param string $search - * @param int $limit - * @param int $offset - * @return int | false + * @return int|false + * @throws DatabaseException */ public function countUsersInGroup($gid, $search = '') { $stmt = OC_DB::prepare('SELECT COUNT(`uid`) AS `count` FROM `*PREFIX*group_user` WHERE `gid` = ? AND `uid` LIKE ?'); diff --git a/lib/private/group/dummy.php b/lib/private/group/dummy.php index 94cbb607ad1..75bab31a337 100644 --- a/lib/private/group/dummy.php +++ b/lib/private/group/dummy.php @@ -29,9 +29,9 @@ class OC_Group_Dummy extends OC_Group_Backend { /** * @brief Try to create a new group * @param string $gid The name of the group to create - * @returns true/false + * @return bool * - * Trys to create a new group. If the group name already exists, false will + * Tries to create a new group. If the group name already exists, false will * be returned. */ public function createGroup($gid) { @@ -45,8 +45,8 @@ class OC_Group_Dummy extends OC_Group_Backend { /** * @brief delete a group - * @param $gid gid of the group to delete - * @returns true/false + * @param string $gid gid of the group to delete + * @return bool * * Deletes a group and removes it from the group_user-table */ @@ -61,9 +61,9 @@ class OC_Group_Dummy extends OC_Group_Backend { /** * @brief is user in group? - * @param $uid uid of the user - * @param $gid gid of the group - * @returns true/false + * @param string $uid uid of the user + * @param string $gid gid of the group + * @return bool * * Checks whether the user is member of a group or not. */ @@ -77,9 +77,9 @@ class OC_Group_Dummy extends OC_Group_Backend { /** * @brief Add a user to a group - * @param $uid Name of the user to add to group - * @param $gid Name of the group in which add the user - * @returns true/false + * @param string $uid Name of the user to add to group + * @param string $gid Name of the group in which add the user + * @return bool * * Adds a user to a group. */ @@ -98,9 +98,9 @@ class OC_Group_Dummy extends OC_Group_Backend { /** * @brief Removes a user from a group - * @param $uid NameUSER of the user to remove from group - * @param $gid Name of the group from which remove the user - * @returns true/false + * @param string $uid Name of the user to remove from group + * @param string $gid Name of the group from which remove the user + * @return bool * * removes the user from a group. */ @@ -118,8 +118,8 @@ class OC_Group_Dummy extends OC_Group_Backend { /** * @brief Get all groups a user belongs to - * @param $uid Name of the user - * @returns array with group names + * @param string $uid Name of the user + * @return array an array of group names * * This function fetches all groups a user belongs to. It does not check * if the user exists at all. @@ -136,18 +136,23 @@ class OC_Group_Dummy extends OC_Group_Backend { } /** - * @brief get a list of all groups - * @returns array with group names - * - * Returns a list with all groups + * @brief Get a list of all groups + * @param string $search + * @param int $limit + * @param int $offset + * @return array an array of group names */ public function getGroups($search = '', $limit = -1, $offset = 0) { return array_keys($this->groups); } /** - * @brief get a list of all users in a group - * @returns array with user ids + * @brief Get a list of all users in a group + * @param string $gid + * @param string $search + * @param int $limit + * @param int $offset + * @return array an array of user IDs */ public function usersInGroup($gid, $search = '', $limit = -1, $offset = 0) { if(isset($this->groups[$gid])) { @@ -159,7 +164,11 @@ class OC_Group_Dummy extends OC_Group_Backend { /** * @brief get the number of all users in a group - * @returns int | bool + * @param string $gid + * @param string $search + * @param int $limit + * @param int $offset + * @return int */ public function countUsersInGroup($gid, $search = '', $limit = -1, $offset = 0) { if(isset($this->groups[$gid])) { diff --git a/lib/private/group/example.php b/lib/private/group/example.php index 3519b9ed92f..76c9ce2433d 100644 --- a/lib/private/group/example.php +++ b/lib/private/group/example.php @@ -28,18 +28,18 @@ abstract class OC_Group_Example { /** * @brief Try to create a new group - * @param $gid The name of the group to create - * @returns true/false + * @param string $gid The name of the group to create + * @return bool * - * Trys to create a new group. If the group name already exists, false will + * Tries to create a new group. If the group name already exists, false will * be returned. */ abstract public static function createGroup($gid); /** * @brief delete a group - * @param $gid gid of the group to delete - * @returns true/false + * @param string $gid gid of the group to delete + * @return bool * * Deletes a group and removes it from the group_user-table */ @@ -47,9 +47,9 @@ abstract class OC_Group_Example { /** * @brief is user in group? - * @param $uid uid of the user - * @param $gid gid of the group - * @returns true/false + * @param string $uid uid of the user + * @param string $gid gid of the group + * @return bool * * Checks whether the user is member of a group or not. */ @@ -57,9 +57,9 @@ abstract class OC_Group_Example { /** * @brief Add a user to a group - * @param $uid Name of the user to add to group - * @param $gid Name of the group in which add the user - * @returns true/false + * @param string $uid Name of the user to add to group + * @param string $gid Name of the group in which add the user + * @return bool * * Adds a user to a group. */ @@ -67,9 +67,9 @@ abstract class OC_Group_Example { /** * @brief Removes a user from a group - * @param $uid NameUSER of the user to remove from group - * @param $gid Name of the group from which remove the user - * @returns true/false + * @param string $uid Name of the user to remove from group + * @param string $gid Name of the group from which remove the user + * @return bool * * removes the user from a group. */ @@ -77,8 +77,8 @@ abstract class OC_Group_Example { /** * @brief Get all groups a user belongs to - * @param $uid Name of the user - * @returns array with group names + * @param string $uid Name of the user + * @return array an array of group names * * This function fetches all groups a user belongs to. It does not check * if the user exists at all. @@ -87,14 +87,15 @@ abstract class OC_Group_Example { /** * @brief get a list of all groups - * @returns array with group names - * - * Returns a list with all groups + * @param string $search + * @param int $limit + * @param int $offset + * @return array an array of group names */ abstract public static function getGroups($search = '', $limit = -1, $offset = 0); /** - * check if a group exists + * @brief Check if a group exists * @param string $gid * @return bool */ @@ -102,8 +103,11 @@ abstract class OC_Group_Example { /** * @brief get a list of all users in a group - * @returns array with user ids + * @param string $gid + * @param string $search + * @param int $limit + * @param int $offset + * @return array an array of user ids */ abstract public static function usersInGroup($gid, $search = '', $limit = -1, $offset = 0); - } diff --git a/lib/private/group/group.php b/lib/private/group/group.php index 7593bb68d1a..69641854dc5 100644 --- a/lib/private/group/group.php +++ b/lib/private/group/group.php @@ -26,7 +26,7 @@ class Group { private $usersLoaded; /** - * @var \OC_Group_Backend[] | \OC_Group_Database[] $backend + * @var \OC_Group_Backend[]|\OC_Group_Database[] $backend */ private $backends; @@ -184,7 +184,7 @@ class Group { * returns the number of users matching the search string * * @param string $search - * @return int | bool + * @return int|bool */ public function count($search) { $users = false; diff --git a/lib/private/group/interface.php b/lib/private/group/interface.php index 4ef3663837f..74d288d42c0 100644 --- a/lib/private/group/interface.php +++ b/lib/private/group/interface.php @@ -45,7 +45,7 @@ interface OC_Group_Interface { /** * @brief Get all groups a user belongs to * @param string $uid Name of the user - * @return array with group names + * @return array an array of group names * * This function fetches all groups a user belongs to. It does not check * if the user exists at all. @@ -57,7 +57,7 @@ interface OC_Group_Interface { * @param string $search * @param int $limit * @param int $offset - * @return array with group names + * @return array an array of group names * * Returns a list with all groups */ @@ -76,7 +76,7 @@ interface OC_Group_Interface { * @param string $search * @param int $limit * @param int $offset - * @return array with user ids + * @return array an array of user ids */ public function usersInGroup($gid, $search = '', $limit = -1, $offset = 0); diff --git a/lib/private/group/manager.php b/lib/private/group/manager.php index d31225e3c2e..f03f7004132 100644 --- a/lib/private/group/manager.php +++ b/lib/private/group/manager.php @@ -28,7 +28,7 @@ use OC\Hooks\PublicEmitter; */ class Manager extends PublicEmitter { /** - * @var \OC_Group_Backend[] | \OC_Group_Database[] $backends + * @var \OC_Group_Backend[]|\OC_Group_Database[] $backends */ private $backends = array(); @@ -165,7 +165,7 @@ class Manager extends PublicEmitter { * @param string $search * @param int $limit * @param int $offset - * @return array with display names (value) and user ids (key) + * @return array an array of display names (value) and user ids (key) */ public function displayNamesInGroup($gid, $search = '', $limit = -1, $offset = 0) { $group = $this->get($gid); diff --git a/lib/private/helper.php b/lib/private/helper.php index 64da1f6fb12..12d82f6fb45 100644 --- a/lib/private/helper.php +++ b/lib/private/helper.php @@ -32,11 +32,11 @@ class OC_Helper { /** * @brief Creates an url using a defined route - * @param $route + * @param string $route * @param array $parameters * @return * @internal param array $args with param=>value, will be appended to the returned url - * @returns string the url + * @return string the url * * Returns a url to the given app and file. */ @@ -495,7 +495,7 @@ class OC_Helper { /** * detect if a given program is found in the search PATH * - * @param $name + * @param string $name * @param bool $path * @internal param string $program name * @internal param string $optional search path, defaults to $PATH @@ -670,8 +670,8 @@ class OC_Helper { /** * Adds a suffix to the name in case the file exists * - * @param $path - * @param $filename + * @param string $path + * @param string $filename * @return string */ public static function buildNotExistingFileName($path, $filename) { @@ -682,8 +682,8 @@ class OC_Helper { /** * Adds a suffix to the name in case the file exists * - * @param $path - * @param $filename + * @param string $path + * @param string $filename * @return string */ public static function buildNotExistingFileNameForView($path, $filename, \OC\Files\View $view) { @@ -732,10 +732,22 @@ class OC_Helper { * @param string $parent * @return bool */ - public static function issubdirectory($sub, $parent) { - if (strpos(realpath($sub), realpath($parent)) === 0) { + public static function isSubDirectory($sub, $parent) { + $realpathSub = realpath($sub); + $realpathParent = realpath($parent); + + // realpath() may return false in case the directory does not exist + // since we can not be sure how different PHP versions may behave here + // we do an additional check whether realpath returned false + if($realpathSub === false || $realpathParent === false) { + return false; + } + + // Check whether $sub is a subdirectory of $parent + if (strpos($realpathSub, $realpathParent) === 0) { return true; } + return false; } @@ -763,7 +775,7 @@ class OC_Helper { /** * @brief replaces a copy of string delimited by the start and (optionally) length parameters with the string given in replacement. * - * @param $string + * @param string $string * @param string $replacement The replacement string. * @param int $start If start is positive, the replacing will begin at the start'th offset into string. If start is negative, the replacing will begin at the start'th character from the end of string. * @param int $length Length of the part to be replaced diff --git a/lib/private/hook.php b/lib/private/hook.php index b63b442c31b..b715db2d16c 100644 --- a/lib/private/hook.php +++ b/lib/private/hook.php @@ -45,7 +45,7 @@ class OC_Hook{ * @brief emits a signal * @param string $signalclass class name of emitter * @param string $signalname name of signal - * @param array $params defautl: array() array with additional data + * @param mixed $params default: array() array with additional data * @return bool, true if slots exists or false if not * * Emits a signal. To get data from the slot use references! diff --git a/lib/private/image.php b/lib/private/image.php index 14aa64d12da..341bfaaf818 100644 --- a/lib/private/image.php +++ b/lib/private/image.php @@ -424,7 +424,7 @@ class OC_Image { * @brief Loads an image from an open file handle. * It is the responsibility of the caller to position the pointer at the correct place and to close the handle again. * @param resource $handle - * @return An image resource or false on error + * @return resource|false An image resource or false on error */ public function loadFromFileHandle($handle) { OC_Log::write('core', __METHOD__.'(): Trying', OC_Log::DEBUG); diff --git a/lib/private/installer.php b/lib/private/installer.php index 64e8e3a5e7a..9417c32bc89 100644 --- a/lib/private/installer.php +++ b/lib/private/installer.php @@ -221,7 +221,7 @@ class OC_Installer{ /** * @brief checks whether or not an app is installed * @param string $app app - * @returns true/false + * @return bool * * Checks whether or not an app is installed, i.e. registered in apps table. */ @@ -313,7 +313,7 @@ class OC_Installer{ /** * @brief Removes an app * @param string $name name of the application to remove - * @param $options array with options + * @param array $options options * @return boolean|null * * This function removes an app. $options is an associative array. The diff --git a/lib/private/l10n.php b/lib/private/l10n.php index d6680d63445..c9d9e8131b1 100644 --- a/lib/private/l10n.php +++ b/lib/private/l10n.php @@ -134,10 +134,10 @@ class OC_L10N implements \OCP\IL10N { $i18ndir = self::findI18nDir($app); // Localization is in /l10n, Texts are in $i18ndir // (Just no need to define date/time format etc. twice) - if((OC_Helper::issubdirectory($i18ndir.$lang.'.php', OC::$SERVERROOT.'/core/l10n/') - || OC_Helper::issubdirectory($i18ndir.$lang.'.php', OC::$SERVERROOT.'/lib/l10n/') - || OC_Helper::issubdirectory($i18ndir.$lang.'.php', OC::$SERVERROOT.'/settings') - || OC_Helper::issubdirectory($i18ndir.$lang.'.php', OC_App::getAppPath($app).'/l10n/') + if((OC_Helper::isSubDirectory($i18ndir.$lang.'.php', OC::$SERVERROOT.'/core/l10n/') + || OC_Helper::isSubDirectory($i18ndir.$lang.'.php', OC::$SERVERROOT.'/lib/l10n/') + || OC_Helper::isSubDirectory($i18ndir.$lang.'.php', OC::$SERVERROOT.'/settings') + || OC_Helper::isSubDirectory($i18ndir.$lang.'.php', OC_App::getAppPath($app).'/l10n/') ) && file_exists($i18ndir.$lang.'.php')) { // Include the file, save the data from $CONFIG @@ -162,7 +162,7 @@ class OC_L10N implements \OCP\IL10N { } } - if(file_exists(OC::$SERVERROOT.'/core/l10n/l10n-'.$lang.'.php') && OC_Helper::issubdirectory(OC::$SERVERROOT.'/core/l10n/l10n-'.$lang.'.php', OC::$SERVERROOT.'/core/l10n/')) { + if(file_exists(OC::$SERVERROOT.'/core/l10n/l10n-'.$lang.'.php') && OC_Helper::isSubDirectory(OC::$SERVERROOT.'/core/l10n/l10n-'.$lang.'.php', OC::$SERVERROOT.'/core/l10n/')) { // Include the file, save the data from $CONFIG include OC::$SERVERROOT.'/core/l10n/l10n-'.$lang.'.php'; if(isset($LOCALIZATIONS) && is_array($LOCALIZATIONS)) { @@ -183,7 +183,7 @@ class OC_L10N implements \OCP\IL10N { * * Parts of the code is copied from Habari: * https://github.com/habari/system/blob/master/classes/locale.php - * @param $string string + * @param string $string * @return string */ protected function createPluralFormFunction($string){ @@ -278,7 +278,7 @@ class OC_L10N implements \OCP\IL10N { /** * @brief getTranslations - * @returns array Fetch all translations + * @return array Fetch all translations * * Returns an associative array with all translations */ @@ -289,7 +289,7 @@ class OC_L10N implements \OCP\IL10N { /** * @brief getPluralFormString - * @returns string containing the gettext "Plural-Forms"-string + * @return string containing the gettext "Plural-Forms"-string * * Returns a string like "nplurals=2; plural=(n != 1);" */ @@ -300,7 +300,7 @@ class OC_L10N implements \OCP\IL10N { /** * @brief getPluralFormFunction - * @returns string the plural form function + * @return string the plural form function * * returned function accepts the argument $n */ @@ -314,7 +314,7 @@ class OC_L10N implements \OCP\IL10N { /** * @brief get localizations - * @returns array Fetch all localizations + * @return array Fetch all localizations * * Returns an associative array with all localizations */ @@ -327,7 +327,7 @@ class OC_L10N implements \OCP\IL10N { * @brief Localization * @param string $type Type of localization * @param array|int|string $data parameters for this localization - * @returns String or false + * @return String or false * * Returns the localized data. * @@ -381,7 +381,7 @@ class OC_L10N implements \OCP\IL10N { /** * @brief Choose a language * @param array $text Associative Array with possible strings - * @returns String + * @return String * * $text is an array 'de' => 'hallo welt', 'en' => 'hello world', ... * @@ -404,7 +404,7 @@ class OC_L10N implements \OCP\IL10N { /** * @brief find the best language * @param array|string $app details below - * @returns string language + * @return string language * * If $app is an array, ownCloud assumes that these are the available * languages. Otherwise ownCloud tries to find the files in the l10n @@ -477,7 +477,7 @@ class OC_L10N implements \OCP\IL10N { /** * @brief find the l10n directory * @param string $app App that needs to be translated - * @returns directory + * @return directory */ protected static function findI18nDir($app) { // find the i18n dir @@ -497,7 +497,7 @@ class OC_L10N implements \OCP\IL10N { /** * @brief find all available languages for an app * @param string $app App that needs to be translated - * @returns array an array of available languages + * @return array an array of available languages */ public static function findAvailableLanguages($app=null) { $available=array('en');//english is always available @@ -517,7 +517,7 @@ class OC_L10N implements \OCP\IL10N { /** * @param string $app * @param string $lang - * @returns bool + * @return bool */ public static function languageExists($app, $lang) { if ($lang == 'en') {//english is always available diff --git a/lib/private/l10n/factory.php b/lib/private/l10n/factory.php index 8c65f368171..d0c3799b9c2 100644 --- a/lib/private/l10n/factory.php +++ b/lib/private/l10n/factory.php @@ -20,8 +20,8 @@ class Factory { /** * get an L10N instance - * @param $app string - * @param $lang string|null + * @param string $app + * @param string|null $lang * @return \OC_L10N */ public function get($app) { diff --git a/lib/private/legacy/appconfig.php b/lib/private/legacy/appconfig.php index cb5cef7e350..209f42ffe38 100644 --- a/lib/private/legacy/appconfig.php +++ b/lib/private/legacy/appconfig.php @@ -35,7 +35,7 @@ class OC_Appconfig { /** * @brief Get all apps using the config - * @return array with app ids + * @return array an array of app ids * * This function returns a list of all apps that have at least one * entry in the appconfig table. @@ -47,7 +47,7 @@ class OC_Appconfig { /** * @brief Get the available keys for an app * @param string $app the app we are looking for - * @return array with key names + * @return array an array of key names * * This function gets all keys of an app. Please note that the values are * not returned. diff --git a/lib/private/legacy/cache.php b/lib/private/legacy/cache.php deleted file mode 100644 index f915eb516b1..00000000000 --- a/lib/private/legacy/cache.php +++ /dev/null @@ -1,10 +0,0 @@ -<?php -/** - * Copyright (c) 2013 Thomas Tanghus (thomas@tanghus.net) - * This file is licensed under the Affero General Public License version 3 or - * later. - * See the COPYING-README file. - */ - -class OC_Cache extends \OC\Cache { -}
\ No newline at end of file diff --git a/lib/private/legacy/cache/fileglobalgc.php b/lib/private/legacy/cache/fileglobalgc.php deleted file mode 100644 index 385f6406673..00000000000 --- a/lib/private/legacy/cache/fileglobalgc.php +++ /dev/null @@ -1,4 +0,0 @@ -<?php - -class OC_Cache_FileGlobalGC extends OC\Cache\FileGlobalGC{ -} diff --git a/lib/private/legacy/config.php b/lib/private/legacy/config.php index 6c2103179ab..76a53d3f627 100644 --- a/lib/private/legacy/config.php +++ b/lib/private/legacy/config.php @@ -51,7 +51,7 @@ class OC_Config { /** * @brief Lists all available config keys - * @return array with key names + * @return array an array of key names * * This function returns all keys saved in config.php. Please note that it * does not return the values. diff --git a/lib/private/legacy/filesystem.php b/lib/private/legacy/filesystem.php deleted file mode 100644 index 34f92b357ca..00000000000 --- a/lib/private/legacy/filesystem.php +++ /dev/null @@ -1,415 +0,0 @@ -<?php - -/** - * Copyright (c) 2012 Robin Appelman <icewind@owncloud.com> - * This file is licensed under the Affero General Public License version 3 or - * later. - * See the COPYING-README file. - */ - -/** - * Class for abstraction of filesystem functions - * This class won't call any filesystem functions for itself but but will pass them to the correct OC_Filestorage object - * this class should also handle all the file permission related stuff - * - * Hooks provided: - * read(path) - * write(path, &run) - * post_write(path) - * create(path, &run) (when a file is created, both create and write will be emitted in that order) - * post_create(path) - * delete(path, &run) - * post_delete(path) - * rename(oldpath,newpath, &run) - * post_rename(oldpath,newpath) - * copy(oldpath,newpath, &run) (if the newpath doesn't exists yes, copy, create and write will be emitted in that order) - * post_rename(oldpath,newpath) - * - * the &run parameter can be set to false to prevent the operation from occurring - */ - -/** - * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem - */ -class OC_Filesystem { - /** - * get the mountpoint of the storage object for a path - * ( note: because a storage is not always mounted inside the fakeroot, the - * returned mountpoint is relative to the absolute root of the filesystem - * and doesn't take the chroot into account ) - * - * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem - * @param string $path - * @return string - */ - static public function getMountPoint($path) { - return \OC\Files\Filesystem::getMountPoint($path); - } - - /** - * resolve a path to a storage and internal path - * - * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem - * @param string $path - * @return array consisting of the storage and the internal path - */ - static public function resolvePath($path) { - return \OC\Files\Filesystem::resolvePath($path); - } - - /** - * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem - */ - static public function init($user, $root) { - return \OC\Files\Filesystem::init($user, $root); - } - - /** - * get the default filesystem view - * - * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem - * @return \OC\Files\View - */ - static public function getView() { - return \OC\Files\Filesystem::getView(); - } - - /** - * tear down the filesystem, removing all storage providers - * - * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem - */ - static public function tearDown() { - \OC\Files\Filesystem::tearDown(); - } - - /** - * @brief get the relative path of the root data directory for the current user - * @return string - * - * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem - * Returns path like /admin/files - */ - static public function getRoot() { - return \OC\Files\Filesystem::getRoot(); - } - - /** - * clear all mounts and storage backends - * - * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem - */ - public static function clearMounts() { - \OC\Files\Filesystem::clearMounts(); - } - - /** - * mount an \OC\Files\Storage\Storage in our virtual filesystem - * - * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem - * @param \OC\Files\Storage\Storage $class - * @param array $arguments - * @param string $mountpoint - */ - static public function mount($class, $arguments, $mountpoint) { - \OC\Files\Filesystem::mount($class, $arguments, $mountpoint); - } - - /** - * return the path to a local version of the file - * we need this because we can't know if a file is stored local or not from - * outside the filestorage and for some purposes a local file is needed - * - * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem - * @param string $path - * @return string - */ - static public function getLocalFile($path) { - return \OC\Files\Filesystem::getLocalFile($path); - } - - /** - * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem - * @param string $path - * @return string - */ - static public function getLocalFolder($path) { - return \OC\Files\Filesystem::getLocalFolder($path); - } - - /** - * return path to file which reflects one visible in browser - * - * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem - * @param string $path - * @return string - */ - static public function getLocalPath($path) { - return \OC\Files\Filesystem::getLocalPath($path); - } - - /** - * check if the requested path is valid - * - * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem - * @param string $path - * @return bool - */ - static public function isValidPath($path) { - return \OC\Files\Filesystem::isValidPath($path); - } - - /** - * checks if a file is blacklisted for storage in the filesystem - * Listens to write and rename hooks - * - * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem - * @param array $data from hook - */ - static public function isBlacklisted($data) { - \OC\Files\Filesystem::isBlacklisted($data); - } - - /** - * following functions are equivalent to their php builtin equivalents for arguments/return values. - * - * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem - */ - static public function mkdir($path) { - return \OC\Files\Filesystem::mkdir($path); - } - - /** - * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem - */ - static public function rmdir($path) { - return \OC\Files\Filesystem::rmdir($path); - } - - /** - * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem - */ - static public function opendir($path) { - return \OC\Files\Filesystem::opendir($path); - } - - /** - * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem - */ - static public function readdir($path) { - return \OC\Files\Filesystem::readdir($path); - } - - /** - * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem - */ - static public function is_dir($path) { - return \OC\Files\Filesystem::is_dir($path); - } - - /** - * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem - */ - static public function is_file($path) { - return \OC\Files\Filesystem::is_file($path); - } - - /** - * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem - */ - static public function stat($path) { - return \OC\Files\Filesystem::stat($path); - } - - /** - * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem - */ - static public function filetype($path) { - return \OC\Files\Filesystem::filetype($path); - } - - /** - * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem - */ - static public function filesize($path) { - return \OC\Files\Filesystem::filesize($path); - } - - /** - * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem - */ - static public function readfile($path) { - return \OC\Files\Filesystem::readfile($path); - } - - /** - * @deprecated Replaced by isReadable() as part of CRUDS - */ - static public function is_readable($path) { - return \OC\Files\Filesystem::isReadable($path); - } - - /** - * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem - */ - static public function isCreatable($path) { - return \OC\Files\Filesystem::isCreatable($path); - } - - /** - * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem - */ - static public function isReadable($path) { - return \OC\Files\Filesystem::isReadable($path); - } - - /** - * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem - */ - static public function isUpdatable($path) { - return \OC\Files\Filesystem::isUpdatable($path); - } - - /** - * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem - */ - static public function isDeletable($path) { - return \OC\Files\Filesystem::isDeletable($path); - } - - /** - * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem - */ - static public function isSharable($path) { - return \OC\Files\Filesystem::isSharable($path); - } - - /** - * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem - */ - static public function file_exists($path) { - return \OC\Files\Filesystem::file_exists($path); - } - - /** - * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem - */ - static public function filemtime($path) { - return \OC\Files\Filesystem::filemtime($path); - } - - /** - * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem - */ - static public function touch($path, $mtime = null) { - return \OC\Files\Filesystem::touch($path, $mtime); - } - - /** - * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem - */ - static public function file_get_contents($path) { - return \OC\Files\Filesystem::file_get_contents($path); - } - - /** - * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem - */ - static public function file_put_contents($path, $data) { - return \OC\Files\Filesystem::file_put_contents($path, $data); - } - - /** - * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem - */ - static public function unlink($path) { - return \OC\Files\Filesystem::unlink($path); - } - - /** - * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem - */ - static public function rename($path1, $path2) { - return \OC\Files\Filesystem::rename($path1, $path2); - } - - /** - * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem - */ - static public function copy($path1, $path2) { - return \OC\Files\Filesystem::copy($path1, $path2); - } - - /** - * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem - */ - static public function fopen($path, $mode) { - return \OC\Files\Filesystem::fopen($path, $mode); - } - - /** - * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem - */ - static public function toTmpFile($path) { - return \OC\Files\Filesystem::toTmpFile($path); - } - - /** - * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem - */ - static public function fromTmpFile($tmpFile, $path) { - return \OC\Files\Filesystem::fromTmpFile($tmpFile, $path); - } - - /** - * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem - */ - static public function getMimeType($path) { - return \OC\Files\Filesystem::getMimeType($path); - } - - /** - * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem - */ - static public function hash($type, $path, $raw = false) { - return \OC\Files\Filesystem::hash($type, $path, $raw); - } - - /** - * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem - */ - static public function free_space($path = '/') { - return \OC\Files\Filesystem::free_space($path); - } - - /** - * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem - */ - static public function search($query) { - return \OC\Files\Filesystem::search($query); - } - - /** - * check if a file or folder has been updated since $time - * - * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem - * @param string $path - * @param int $time - * @return bool - */ - static public function hasUpdated($path, $time) { - return \OC\Files\Filesystem::hasUpdated($path, $time); - } - - /** - * normalize a path - * - * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem - * @param string $path - * @param bool $stripTrailingSlash - * @return string - */ - public static function normalizePath($path, $stripTrailingSlash = true) { - return \OC\Files\Filesystem::normalizePath($path, $stripTrailingSlash); - } -} diff --git a/lib/private/legacy/filesystemview.php b/lib/private/legacy/filesystemview.php deleted file mode 100644 index d6bca62e06a..00000000000 --- a/lib/private/legacy/filesystemview.php +++ /dev/null @@ -1,9 +0,0 @@ -<?php - -/** - * Copyright (c) 2012 Robin Appelman <icewind@owncloud.com> - * This file is licensed under the Affero General Public License version 3 or - * later. - * See the COPYING-README file. */ - -class OC_FilesystemView extends \OC\Files\View {} diff --git a/lib/private/legacy/preferences.php b/lib/private/legacy/preferences.php index fcde12796ca..eed6730a529 100644 --- a/lib/private/legacy/preferences.php +++ b/lib/private/legacy/preferences.php @@ -29,7 +29,7 @@ class OC_Preferences{ public static $object; /** * @brief Get all users using the preferences - * @return array with user ids + * @return array an array of user ids * * This function returns a list of all users that have at least one entry * in the preferences table. @@ -54,7 +54,7 @@ class OC_Preferences{ * @brief Get the available keys for an app * @param string $user user * @param string $app the app we are looking for - * @return array with key names + * @return array an array of key names * * This function gets all keys of an app of an user. Please note that the * values are not returned. diff --git a/lib/private/log.php b/lib/private/log.php index e0b9fe3c696..98465ec40ea 100644 --- a/lib/private/log.php +++ b/lib/private/log.php @@ -8,6 +8,8 @@ namespace OC; +use \OCP\ILogger; + /** * logging utilities * @@ -18,8 +20,24 @@ namespace OC; * MonoLog is an example implementing this interface. */ -class Log { - private $logClass; +class Log implements ILogger { + + private $logger; + + /** + * @param string $logger The logger that should be used + */ + public function __construct($logger=null) { + // FIXME: Add this for backwards compatibility, should be fixed at some point probably + if($logger === null) { + $this->logger = 'OC_Log_'.ucfirst(\OC_Config::getValue('log_type', 'owncloud')); + call_user_func(array($this->logger, 'init')); + } else { + $this->logger = $logger; + } + + } + /** * System is unusable. @@ -112,10 +130,6 @@ class Log { $this->log(\OC_Log::DEBUG, $message, $context); } - public function __construct() { - $this->logClass = 'OC_Log_'.ucfirst(\OC_Config::getValue('log_type', 'owncloud')); - call_user_func(array($this->logClass, 'init')); - } /** * Logs with an arbitrary level. @@ -130,7 +144,16 @@ class Log { } else { $app = 'no app in context'; } - $logClass=$this->logClass; - $logClass::write($app, $message, $level); + // interpolate $message as defined in PSR-3 + $replace = array(); + foreach ($context as $key => $val) { + $replace['{' . $key . '}'] = $val; + } + + // interpolate replacement values into the message and return + $message = strtr($message, $replace); + + $logger = $this->logger; + $logger::write($app, $message, $level); } } diff --git a/lib/private/memcache/memcached.php b/lib/private/memcache/memcached.php index 075828eebad..cd8e2e8d0b6 100644 --- a/lib/private/memcache/memcached.php +++ b/lib/private/memcache/memcached.php @@ -57,7 +57,7 @@ class Memcached extends Cache { public function hasKey($key) { self::$cache->get($this->getNamespace() . $key); - return self::$cache->getResultCode() !== \Memcached::RES_NOTFOUND; + return self::$cache->getResultCode() === \Memcached::RES_SUCCESS; } public function remove($key) { diff --git a/lib/private/migrate.php b/lib/private/migrate.php index 5bcc11b061b..98c825aafd8 100644 --- a/lib/private/migrate.php +++ b/lib/private/migrate.php @@ -333,7 +333,7 @@ class OC_Migrate{ /** * @brief tries to extract the import zip - * @param $path string path to the zip + * @param string $path path to the zip * @return string path to extract location (with a trailing slash) or false on failure */ static private function extractZip( $path ) { @@ -536,9 +536,9 @@ class OC_Migrate{ /** * @brief imports a new user * @param string $db string path to migration.db - * @param $info object of migration info + * @param object $info object of migration info * @param string|null|int $uid uid to use - * @return array of apps with import statuses, or false on failure. + * @return array an array of apps with import statuses, or false on failure. */ public static function importAppData( $db, $info, $uid=null ) { // Check if the db exists diff --git a/lib/private/migration/content.php b/lib/private/migration/content.php index b0e7a4e9528..d3b2fe836a4 100644 --- a/lib/private/migration/content.php +++ b/lib/private/migration/content.php @@ -35,7 +35,7 @@ class OC_Migration_Content{ /** * @brief sets up the * @param ZipArchive $zip ZipArchive object - * @param $db a database object (required for exporttype user) + * @param object $db a database object (required for exporttype user) * @return bool|null */ public function __construct( $zip, $db=null ) { @@ -45,11 +45,9 @@ class OC_Migration_Content{ } - // @brief prepares the db - // @param $query the sql query to prepare - /** - * @param string $query + * @brief prepares the db + * @param string $query the sql query to prepare */ public function prepare( $query ) { @@ -88,7 +86,7 @@ class OC_Migration_Content{ /** * @brief copys rows to migration.db from the main database - * @param $options array of options. + * @param array $options array of options. * @return bool */ public function copyRows( $options ) { @@ -131,7 +129,7 @@ class OC_Migration_Content{ /** * @brief saves a sql data set into migration.db * @param OC_DB_StatementWrapper $data a sql data set returned from self::prepare()->query() - * @param $options array of copyRows options + * @param array $options array of copyRows options * @return void */ private function insertData( $data, $options ) { @@ -170,8 +168,8 @@ class OC_Migration_Content{ /** * @brief adds a directory to the zip object * @param boolean|string $dir string path of the directory to add - * @param $recursive bool - * @param $internaldir string path of folder to add dir to in zip + * @param bool $recursive + * @param string $internaldir path of folder to add dir to in zip * @return bool */ public function addDir( $dir, $recursive=true, $internaldir='' ) { diff --git a/lib/private/navigationmanager.php b/lib/private/navigationmanager.php index 1f657b9ad80..d7111af03cf 100644 --- a/lib/private/navigationmanager.php +++ b/lib/private/navigationmanager.php @@ -30,7 +30,7 @@ class NavigationManager implements \OCP\INavigationManager { /** * @brief returns all the added Menu entries - * @return array of the added entries + * @return array an array of the added entries */ public function getAll() { return $this->entries; diff --git a/lib/private/ocs.php b/lib/private/ocs.php index 211e8222145..aeb3d259b30 100644 --- a/lib/private/ocs.php +++ b/lib/private/ocs.php @@ -213,8 +213,8 @@ class OC_OCS { } /** - * @param $writer - * @param $data + * @param resource $writer + * @param array $data * @param string $node */ public static function toXml($writer, $data, $node) { diff --git a/lib/private/ocs/cloud.php b/lib/private/ocs/cloud.php index c8bb9425f1a..3ced0af8ee1 100644 --- a/lib/private/ocs/cloud.php +++ b/lib/private/ocs/cloud.php @@ -57,8 +57,8 @@ class OC_OCS_Cloud { * </quota> * </data> * - * @param $parameters object should contain parameter 'userid' which identifies - * the user from whom the information will be returned + * @param array $parameters should contain parameter 'userid' which identifies + * the user from whom the information will be returned */ public static function getUser($parameters) { $return = array(); diff --git a/lib/private/ocs/result.php b/lib/private/ocs/result.php index 0e3b85d5905..567fe7f87fe 100644 --- a/lib/private/ocs/result.php +++ b/lib/private/ocs/result.php @@ -26,7 +26,7 @@ class OC_OCS_Result{ /** * create the OCS_Result object - * @param $data mixed the data to return + * @param mixed $data the data to return */ public function __construct($data=null, $code=100, $message=null) { if ($data === null) { @@ -42,7 +42,7 @@ class OC_OCS_Result{ /** * optionally set the total number of items available - * @param $items int + * @param int $items */ public function setTotalItems(int $items) { $this->items = $items; @@ -50,7 +50,7 @@ class OC_OCS_Result{ /** * optionally set the the number of items per page - * @param $items int + * @param int $items */ public function setItemsPerPage(int $items) { $this->perPage = $items; diff --git a/lib/private/ocsclient.php b/lib/private/ocsclient.php index b0480caf028..fb8282747eb 100644 --- a/lib/private/ocsclient.php +++ b/lib/private/ocsclient.php @@ -30,7 +30,7 @@ class OC_OCSClient{ /** * @brief Get the url of the OCS AppStore server. - * @returns string of the AppStore server + * @return string of the AppStore server * * This function returns the url of the OCS AppStore server. It´s possible * to set it in the config file or it will fallback to the default @@ -48,7 +48,7 @@ class OC_OCSClient{ /** * @brief Get the content of an OCS url call. - * @returns string of the response + * @return string of the response * This function calls an OCS server and returns the response. It also sets a sane timeout * @param string $url */ @@ -59,7 +59,7 @@ class OC_OCSClient{ /** * @brief Get all the categories from the OCS server - * @returns array with category ids + * @return array an array of category ids * @note returns NULL if config value appstoreenabled is set to false * This function returns a list of all the application categories on the OCS server */ @@ -92,10 +92,10 @@ class OC_OCSClient{ /** * @brief Get all the applications from the OCS server - * @returns array with application data + * @return array an array of application data * * This function returns a list of all the applications on the OCS server - * @param $categories + * @param array|string $categories * @param int $page * @param string $filter */ @@ -150,7 +150,7 @@ class OC_OCSClient{ /** * @brief Get an the applications from the OCS server * @param string $id - * @returns array with application data + * @return array an array of application data * * This function returns an applications from the OCS server */ @@ -192,7 +192,7 @@ class OC_OCSClient{ /** * @brief Get the download url for an application from the OCS server - * @returns array with application data + * @return array an array of application data * * This function returns an download url for an applications from the OCS server * @param string $id diff --git a/lib/private/preferences.php b/lib/private/preferences.php index d45e6e77089..3cadb6a2e97 100644 --- a/lib/private/preferences.php +++ b/lib/private/preferences.php @@ -69,7 +69,7 @@ class Preferences { /** * @brief Get all users using the preferences - * @return array with user ids + * @return array an array of user ids * * This function returns a list of all users that have at least one entry * in the preferences table. @@ -125,7 +125,7 @@ class Preferences { * @brief Get the available keys for an app * @param string $user user * @param string $app the app we are looking for - * @return array with key names + * @return array an array of key names * * This function gets all keys of an app of an user. Please note that the * values are not returned. diff --git a/lib/private/preview.php b/lib/private/preview.php index 2964b83c508..eb932470a47 100755 --- a/lib/private/preview.php +++ b/lib/private/preview.php @@ -191,7 +191,7 @@ class Preview { /** * @brief set the path of the file you want a thumbnail from * @param string $file - * @return $this + * @return \OC\Preview $this */ public function setFile($file) { $this->file = $file; @@ -217,7 +217,7 @@ class Preview { * @brief set the the max width of the preview * @param int $maxX * @throws \Exception - * @return $this + * @return \OC\Preview $this */ public function setMaxX($maxX = 1) { if ($maxX <= 0) { @@ -238,7 +238,7 @@ class Preview { * @brief set the the max height of the preview * @param int $maxY * @throws \Exception - * @return $this + * @return \OC\Preview $this */ public function setMaxY($maxY = 1) { if ($maxY <= 0) { @@ -258,7 +258,7 @@ class Preview { /** * @brief set whether or not scalingup is enabled * @param bool $scalingUp - * @return $this + * @return \OC\Preview $this */ public function setScalingup($scalingUp) { if ($this->getMaxScaleFactor() === 1) { @@ -382,7 +382,7 @@ class Preview { /** * @brief get possible bigger thumbnails of the given image * @param int $fileId fileId of the original image - * @return array of paths to bigger thumbnails + * @return array an array of paths to bigger thumbnails */ private function getPossibleThumbnails($fileId) { @@ -750,7 +750,7 @@ class Preview { } /** - * @param $fileId + * @param int $fileId * @return string */ private function buildCachePath($fileId) { diff --git a/lib/private/preview/image.php b/lib/private/preview/image.php index 59aaa27ef34..cec5d7c0170 100644 --- a/lib/private/preview/image.php +++ b/lib/private/preview/image.php @@ -22,12 +22,13 @@ class Image extends Provider { } $image = new \OC_Image(); - //check if file is encrypted + if($fileInfo['encrypted'] === true) { - $image->loadFromData(stream_get_contents($fileview->fopen($path, 'r'))); - }else{ - $image->loadFromFile($fileview->getLocalFile($path)); + $fileName = $fileview->toTmpFile($path); + } else { + $fileName = $fileview->getLocalFile($path); } + $image->loadFromFile($fileName); return $image->valid() ? $image : false; } diff --git a/lib/private/request.php b/lib/private/request.php index 90f7488eea5..cf9a316b851 100755 --- a/lib/private/request.php +++ b/lib/private/request.php @@ -18,7 +18,7 @@ class OC_Request { /** * @brief Check overwrite condition * @param string $type - * @returns bool + * @return bool */ private static function isOverwriteCondition($type = '') { $regex = '/' . OC_Config::getValue('overwritecondaddr', '') . '/'; @@ -49,7 +49,7 @@ class OC_Request { /** * @brief Returns the unverified server host from the headers without checking * whether it is a trusted domain - * @returns string the server host + * @return string the server host * * Returns the server host, even if the website uses one or more * reverse proxies @@ -89,7 +89,7 @@ class OC_Request { /** * @brief Returns the server host from the headers, or the first configured * trusted domain if the host isn't in the trusted list - * @returns string the server host + * @return string the server host * * Returns the server host, even if the website uses one or more * reverse proxies @@ -121,7 +121,7 @@ class OC_Request { /** * @brief Returns the server protocol - * @returns string the server protocol + * @return string the server protocol * * Returns the server protocol. It respects reverse proxy servers and load balancers */ @@ -143,7 +143,7 @@ class OC_Request { /** * @brief Returns the request uri - * @returns string the request uri + * @return string the request uri * * Returns the request uri, even if the website uses one or more * reverse proxies diff --git a/lib/private/response.php b/lib/private/response.php index 1aa5e629b8b..f976925fb2e 100644 --- a/lib/private/response.php +++ b/lib/private/response.php @@ -93,7 +93,7 @@ class OC_Response { /** * @brief Set reponse expire time - * @param $expires date-time when the response expires + * @param string|DateTime $expires date-time when the response expires * string for DateInterval from now * DateTime object when to expire response */ @@ -113,7 +113,7 @@ class OC_Response { /** * Checks and set ETag header, when the request matches sends a * 'not modified' response - * @param $etag token to use for modification check + * @param string $etag token to use for modification check */ static public function setETagHeader($etag) { if (empty($etag)) { @@ -131,7 +131,7 @@ class OC_Response { /** * Checks and set Last-Modified header, when the request matches sends a * 'not modified' response - * @param $lastModified time when the reponse was last modified + * @param int|DateTime|string $lastModified time when the reponse was last modified */ static public function setLastModifiedHeader($lastModified) { if (empty($lastModified)) { @@ -186,4 +186,36 @@ class OC_Response { self::setStatus(self::STATUS_NOT_FOUND); } } + + /* + * This function adds some security related headers to all requests served via base.php + * The implementation of this function has to happen here to ensure that all third-party + * components (e.g. SabreDAV) also benefit from this headers. + */ + public static function addSecurityHeaders() { + header('X-XSS-Protection: 1; mode=block'); // Enforce browser based XSS filters + header('X-Content-Type-Options: nosniff'); // Disable sniffing the content type for IE + + // iFrame Restriction Policy + $xFramePolicy = OC_Config::getValue('xframe_restriction', true); + if ($xFramePolicy) { + header('X-Frame-Options: Sameorigin'); // Disallow iFraming from other domains + } + + // Content Security Policy + // If you change the standard policy, please also change it in config.sample.php + $policy = OC_Config::getValue('custom_csp_policy', + 'default-src \'self\'; ' + . 'script-src \'self\' \'unsafe-eval\'; ' + . 'style-src \'self\' \'unsafe-inline\'; ' + . 'frame-src *; ' + . 'img-src *; ' + . 'font-src \'self\' data:; ' + . 'media-src *'); + header('Content-Security-Policy:' . $policy); + + // https://developers.google.com/webmasters/control-crawl-index/docs/robots_meta_tag + header('X-Robots-Tag: none'); + } + } diff --git a/lib/private/route/route.php b/lib/private/route/route.php index df80facf9c1..87030ad7853 100644 --- a/lib/private/route/route.php +++ b/lib/private/route/route.php @@ -124,7 +124,7 @@ class Route extends SymfonyRoute implements IRoute { /** * The action to execute when this route matches, includes a file like * it is called directly - * @param $file + * @param string $file * @return void */ public function actionInclude($file) { diff --git a/lib/private/route/router.php b/lib/private/route/router.php index f7900362bec..a72ac2bb3f1 100644 --- a/lib/private/route/router.php +++ b/lib/private/route/router.php @@ -90,7 +90,7 @@ class Router implements IRouter { $files[] = 'settings/routes.php'; $files[] = 'core/routes.php'; $files[] = 'ocs/routes.php'; - $this->cacheKey = \OC_Cache::generateCacheKeyFromFiles($files); + $this->cacheKey = \OC\Cache::generateCacheKeyFromFiles($files); } return $this->cacheKey; } @@ -239,7 +239,7 @@ class Router implements IRouter { /** * To isolate the variable scope used inside the $file it is required in it's own method - * @param $file + * @param string $file */ private function requireRouteFile($file) { require_once $file; diff --git a/lib/private/server.php b/lib/private/server.php index 4c29092cf44..fd8c2c38ad0 100644 --- a/lib/private/server.php +++ b/lib/private/server.php @@ -3,6 +3,7 @@ namespace OC; use OC\AppFramework\Http\Request; +use OC\AppFramework\Db\Db; use OC\AppFramework\Utility\SimpleContainer; use OC\Cache\UserCache; use OC\DB\ConnectionWrapper; @@ -30,9 +31,9 @@ class Server extends SimpleContainer implements IServerContainer { } if (\OC::$session->exists('requesttoken')) { - $requesttoken = \OC::$session->get('requesttoken'); + $requestToken = \OC::$session->get('requesttoken'); } else { - $requesttoken = false; + $requestToken = false; } if (defined('PHPUNIT_RUN') && PHPUNIT_RUN @@ -54,7 +55,7 @@ class Server extends SimpleContainer implements IServerContainer { ? $_SERVER['REQUEST_METHOD'] : null, 'urlParams' => $urlParams, - 'requesttoken' => $requesttoken, + 'requesttoken' => $requestToken, ), $stream ); }); @@ -158,6 +159,14 @@ class Server extends SimpleContainer implements IServerContainer { $this->registerService('AvatarManager', function($c) { return new AvatarManager(); }); + $this->registerService('Logger', function($c) { + /** @var $c SimpleContainer */ + $logClass = $c->query('AllConfig')->getSystemValue('log_type', 'owncloud'); + $logger = 'OC_Log_' . ucfirst($logClass); + call_user_func(array($logger, 'init')); + + return new Log($logger); + }); $this->registerService('JobList', function ($c) { /** * @var Server $c @@ -177,6 +186,9 @@ class Server extends SimpleContainer implements IServerContainer { } return $router; }); + $this['Db'] = $this->share(function($c){ + return new Db(); + }); } /** @@ -325,14 +337,14 @@ class Server extends SimpleContainer implements IServerContainer { } /** - * @return \OC\URLGenerator + * @return \OCP\IURLGenerator */ function getURLGenerator() { return $this->query('URLGenerator'); } /** - * @return \OC\Helper + * @return \OCP\IHelper */ function getHelper() { return $this->query('AppHelper'); @@ -393,6 +405,15 @@ class Server extends SimpleContainer implements IServerContainer { } /** + * Returns a logger instance + * + * @return \OCP\ILogger + */ + function getLogger() { + return $this->query('Logger'); + } + + /** * Returns a router for generating and matching urls * * @return \OCP\Route\IRouter @@ -400,4 +421,13 @@ class Server extends SimpleContainer implements IServerContainer { function getRouter(){ return $this->query('Router'); } + + + /** + * Returns an instance of the db facade + * @return \OCP\IDb + */ + function getDb() { + return $this->query('Db'); + } } diff --git a/lib/private/share/helper.php b/lib/private/share/helper.php index 515ec85909a..bc83d569840 100644 --- a/lib/private/share/helper.php +++ b/lib/private/share/helper.php @@ -25,13 +25,14 @@ class Helper extends \OC\Share\Constants { /** * Generate a unique target for the item - * @param string Item type - * @param string Item source - * @param int SHARE_TYPE_USER, SHARE_TYPE_GROUP, or SHARE_TYPE_LINK - * @param string User or group the item is being shared with - * @param string User that is the owner of shared item - * @param string The suggested target originating from a reshare (optional) - * @param int The id of the parent group share (optional) + * @param string $itemType + * @param string $itemSource + * @param int $shareType SHARE_TYPE_USER, SHARE_TYPE_GROUP, or SHARE_TYPE_LINK + * @param string $shareWith User or group the item is being shared with + * @param string $uidOwner User that is the owner of shared item + * @param string $suggestedTarget The suggested target originating from a reshare (optional) + * @param int $groupParent The id of the parent group share (optional) + * @throws \Exception * @return string Item target */ public static function generateTarget($itemType, $itemSource, $shareType, $shareWith, $uidOwner, @@ -142,9 +143,9 @@ class Helper extends \OC\Share\Constants { /** * Delete all reshares of an item - * @param int Id of item to delete - * @param bool If true, exclude the parent from the delete (optional) - * @param string The user that the parent was shared with (optinal) + * @param int $parent Id of item to delete + * @param bool $excludeParent If true, exclude the parent from the delete (optional) + * @param string $uidOwner The user that the parent was shared with (optional) */ public static function delete($parent, $excludeParent = false, $uidOwner = null) { $ids = array($parent); diff --git a/lib/private/share/hooks.php b/lib/private/share/hooks.php index a33c71eedd2..9ac64d888ea 100644 --- a/lib/private/share/hooks.php +++ b/lib/private/share/hooks.php @@ -22,9 +22,9 @@ namespace OC\Share; class Hooks extends \OC\Share\Constants { - /** + /** * Function that is called after a user is deleted. Cleans up the shares of that user. - * @param array arguments + * @param array $arguments */ public static function post_deleteUser($arguments) { // Delete any items shared with the deleted user @@ -42,7 +42,7 @@ class Hooks extends \OC\Share\Constants { /** * Function that is called after a user is added to a group. * TODO what does it do? - * @param array arguments + * @param array $arguments */ public static function post_addToGroup($arguments) { // Find the group shares and check if the user needs a unique target @@ -76,7 +76,7 @@ class Hooks extends \OC\Share\Constants { /** * Function that is called after a user is removed from a group. Shares are cleaned up. - * @param array arguments + * @param array $arguments */ public static function post_removeFromGroup($arguments) { $sql = 'SELECT `id`, `share_type` FROM `*PREFIX*share`' @@ -95,7 +95,7 @@ class Hooks extends \OC\Share\Constants { /** * Function that is called after a group is removed. Cleans up the shares to that group. - * @param array arguments + * @param array $arguments */ public static function post_deleteGroup($arguments) { $sql = 'SELECT `id` FROM `*PREFIX*share` WHERE `share_type` = ? AND `share_with` = ?'; diff --git a/lib/private/share/mailnotifications.php b/lib/private/share/mailnotifications.php index 4799db52330..ca0dff6562d 100644 --- a/lib/private/share/mailnotifications.php +++ b/lib/private/share/mailnotifications.php @@ -21,11 +21,30 @@ namespace OC\Share; +use DateTime; + class MailNotifications { - private $senderId; // sender userId - private $from; // sender email address + /** + * sender userId + * @var null|string + */ + private $senderId; + + /** + * sender email address + * @var string + */ + private $from; + + /** + * @var string + */ private $senderDisplayName; + + /** + * @var \OC_L10N + */ private $l; /** @@ -50,8 +69,8 @@ class MailNotifications { * @brief inform users if a file was shared with them * * @param array $recipientList list of recipients - * @param type $itemSource shared item source - * @param type $itemType shared item type + * @param string $itemSource shared item source + * @param string $itemType shared item type * @return array list of user to whom the mail send operation failed */ public function sendInternalShareMail($recipientList, $itemSource, $itemType) { @@ -136,7 +155,7 @@ class MailNotifications { * @param string $filename the shared file * @param string $link link to the shared file * @param int $expiration expiration date (timestamp) - * @return array with the html mail body and the plain text mail body + * @return array an array of the html mail body and the plain text mail body */ private function createMailBody($filename, $link, $expiration) { diff --git a/lib/private/share/searchresultsorter.php b/lib/private/share/searchresultsorter.php index 76abbf30846..91709902fff 100644 --- a/lib/private/share/searchresultsorter.php +++ b/lib/private/share/searchresultsorter.php @@ -18,8 +18,8 @@ class SearchResultSorter { * @param string $search the search term as was given by the user * @param string $key the array key containing the value that should be compared * against - * @param $encoding optional, encoding to use, defaults to UTF-8 - * @param $log optional, an \OC\Log instance + * @param string $encoding optional, encoding to use, defaults to UTF-8 + * @param \OC\Log $log optional */ public function __construct($search, $key, \OC\Log $log = null, $encoding = 'UTF-8') { $this->encoding = $encoding; diff --git a/lib/private/share/share.php b/lib/private/share/share.php index 6f8830e73f2..a8537a916fb 100644 --- a/lib/private/share/share.php +++ b/lib/private/share/share.php @@ -254,13 +254,13 @@ class Share extends \OC\Share\Constants { /** * Get the items of item type shared with a user - * @param string Item type - * @param sting user id for which user we want the shares - * @param int Format (optional) Format type must be defined by the backend - * @param mixed Parameters (optional) - * @param int Number of items to return (optional) Returns all by default - * @param boolean include collections (optional) - * @return Return depends on format + * @param string $itemType + * @param string $user id for which user we want the shares + * @param int $format (optional) Format type must be defined by the backend + * @param mixed $parameters (optional) + * @param int $limit Number of items to return (optional) Returns all by default + * @param boolean $includeCollections (optional) + * @return mixed Return depends on format */ public static function getItemsSharedWithUser($itemType, $user, $format = self::FORMAT_NONE, $parameters = null, $limit = -1, $includeCollections = false) { @@ -352,7 +352,7 @@ class Share extends \OC\Share\Constants { * @param string $itemType * @param string $itemSource * @param string $uidOwner Owner of link - * @return Item + * @return array */ public static function getItemSharedWithByLink($itemType, $itemSource, $uidOwner) { return self::getItems($itemType, $itemSource, self::SHARE_TYPE_LINK, null, $uidOwner, self::FORMAT_NONE, @@ -362,7 +362,7 @@ class Share extends \OC\Share\Constants { /** * Based on the given token the share information will be returned - password protected shares will be verified * @param string $token - * @return array | boolean false will be returned in case the token is unknown or unauthorized + * @return array|boolean false will be returned in case the token is unknown or unauthorized */ public static function getShareByToken($token, $checkPasswordProtection = true) { $query = \OC_DB::prepare('SELECT * FROM `*PREFIX*share` WHERE `token` = ?', 1); @@ -388,8 +388,8 @@ class Share extends \OC\Share\Constants { /** * resolves reshares down to the last real share - * @param $linkItem - * @return $fileOwner + * @param array $linkItem + * @return array file owner */ public static function resolveReShare($linkItem) { @@ -446,7 +446,7 @@ class Share extends \OC\Share\Constants { * @param string $uidOwner * @param boolean $includeCollections * @param boolean $checkExpireDate - * @return Return array of users + * @return array Return array of users */ public static function getUsersItemShared($itemType, $itemSource, $uidOwner, $includeCollections = false, $checkExpireDate = true) { @@ -926,6 +926,7 @@ class Share extends \OC\Share\Constants { /** * Get the backend class for the specified item type * @param string $itemType + * @throws \Exception * @return \OCP\Share_Backend */ public static function getBackend($itemType) { @@ -1000,10 +1001,10 @@ class Share extends \OC\Share\Constants { /** * Get shared items from the database * @param string $itemType - * @param string Item source or target (optional) + * @param string $item Item source or target (optional) * @param int $shareType SHARE_TYPE_USER, SHARE_TYPE_GROUP, SHARE_TYPE_LINK, $shareTypeUserAndGroups, or $shareTypeGroupUserUnique * @param string $shareWith User or group the item is being shared with - * @param string uidOwner User that is the owner of shared items (optional) + * @param string $uidOwner User that is the owner of shared items (optional) * @param int $format Format to convert items to with formatItems() (optional) * @param mixed $parameters to pass to formatItems() (optional) * @param int $limit Number of items to return, -1 to return all matches (optional) @@ -1353,6 +1354,7 @@ class Share extends \OC\Share\Constants { * @param boolean|array $parentFolder Parent folder target (optional) * @param string $token (optional) * @param string $itemSourceName name of the source item (optional) + * @throws \Exception * @return boolean Returns true on success or false on failure */ private static function put($itemType, $itemSource, $shareType, $shareWith, $uidOwner, @@ -1641,7 +1643,7 @@ class Share extends \OC\Share\Constants { } /** - * @breif construct select statement + * @brief construct select statement * @param int $format * @param boolean $fileDependent ist it a file/folder share or a generla share * @param string $uidOwner diff --git a/lib/private/subadmin.php b/lib/private/subadmin.php index 5b6072987ad..3e8b73d55b0 100644 --- a/lib/private/subadmin.php +++ b/lib/private/subadmin.php @@ -167,7 +167,7 @@ class OC_SubAdmin{ /** * @brief delete all SubAdmins by uid - * @param $parameters + * @param array $parameters * @return boolean */ public static function post_deleteUser($parameters) { @@ -178,7 +178,7 @@ class OC_SubAdmin{ /** * @brief delete all SubAdmins by gid - * @param $parameters + * @param array $parameters * @return boolean */ public static function post_deleteGroup($parameters) { diff --git a/lib/private/tags.php b/lib/private/tags.php index 06550068f76..0b62caf2dd8 100644 --- a/lib/private/tags.php +++ b/lib/private/tags.php @@ -121,21 +121,7 @@ class Tags implements \OCP\ITags { * @return boolean. */ public function isEmpty() { - $sql = 'SELECT COUNT(*) FROM `' . self::TAG_TABLE . '` ' - . 'WHERE `uid` = ? AND `type` = ?'; - try { - $stmt = \OCP\DB::prepare($sql); - $result = $stmt->execute(array($this->user, $this->type)); - if (\OCP\DB::isError($result)) { - \OCP\Util::writeLog('core', __METHOD__. ', DB error: ' . \OCP\DB::getErrorMessage($result), \OCP\Util::ERROR); - return false; - } - return ((int)$result->fetchOne() === 0); - } catch(\Exception $e) { - \OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(), - \OCP\Util::ERROR); - return false; - } + return count($this->tags) === 0; } /** @@ -184,6 +170,10 @@ class Tags implements \OCP\ITags { $tagId = $tag; } elseif(is_string($tag)) { $tag = trim($tag); + if($tag === '') { + \OCP\Util::writeLog('core', __METHOD__.', Cannot use empty tag names', \OCP\Util::DEBUG); + return false; + } $tagId = $this->array_searchi($tag, $this->tags); } @@ -234,11 +224,15 @@ class Tags implements \OCP\ITags { * Add a new tag. * * @param string $name A string with a name of the tag - * @return false|string the id of the added tag or false if it already exists. + * @return false|string the id of the added tag or false on error. */ public function add($name) { $name = trim($name); + if($name === '') { + \OCP\Util::writeLog('core', __METHOD__.', Cannot add an empty tag', \OCP\Util::DEBUG); + return false; + } if($this->hasTag($name)) { \OCP\Util::writeLog('core', __METHOD__.', name: ' . $name. ' exists already', \OCP\Util::DEBUG); return false; @@ -280,6 +274,12 @@ class Tags implements \OCP\ITags { public function rename($from, $to) { $from = trim($from); $to = trim($to); + + if($to === '' || $from === '') { + \OCP\Util::writeLog('core', __METHOD__.', Cannot use empty tag names', \OCP\Util::DEBUG); + return false; + } + $id = $this->array_searchi($from, $this->tags); if($id === false) { \OCP\Util::writeLog('core', __METHOD__.', tag: ' . $from. ' does not exist', \OCP\Util::DEBUG); @@ -318,6 +318,8 @@ class Tags implements \OCP\ITags { $names = array($names); } $names = array_map('trim', $names); + array_filter($names); + $newones = array(); foreach($names as $name) { if(($this->in_arrayi( @@ -391,7 +393,7 @@ class Tags implements \OCP\ITags { * * For hooking up on post_deleteUser * - * @param array + * @param array $arguments */ public static function post_deleteUser($arguments) { // Find all objectid/tagId pairs. @@ -492,9 +494,9 @@ class Tags implements \OCP\ITags { */ public function addToFavorites($objid) { if(!$this->hasTag(self::TAG_FAVORITE)) { - $this->add(self::TAG_FAVORITE, true); + $this->add(self::TAG_FAVORITE); } - return $this->tagAs($objid, self::TAG_FAVORITE, $this->type); + return $this->tagAs($objid, self::TAG_FAVORITE); } /** @@ -504,7 +506,7 @@ class Tags implements \OCP\ITags { * @return boolean */ public function removeFromFavorites($objid) { - return $this->unTag($objid, self::TAG_FAVORITE, $this->type); + return $this->unTag($objid, self::TAG_FAVORITE); } /** @@ -512,13 +514,17 @@ class Tags implements \OCP\ITags { * * @param int $objid The id of the object * @param string $tag The id or name of the tag - * @return boolean Returns false on database error. + * @return boolean Returns false on error. */ public function tagAs($objid, $tag) { if(is_string($tag) && !is_numeric($tag)) { $tag = trim($tag); + if($tag === '') { + \OCP\Util::writeLog('core', __METHOD__.', Cannot add an empty tag', \OCP\Util::DEBUG); + return false; + } if(!$this->hasTag($tag)) { - $this->add($tag, true); + $this->add($tag); } $tagId = $this->array_searchi($tag, $this->tags); } else { @@ -549,6 +555,10 @@ class Tags implements \OCP\ITags { public function unTag($objid, $tag) { if(is_string($tag) && !is_numeric($tag)) { $tag = trim($tag); + if($tag === '') { + \OCP\Util::writeLog('core', __METHOD__.', Tag name is empty', \OCP\Util::DEBUG); + return false; + } $tagId = $this->array_searchi($tag, $this->tags); } else { $tagId = $tag; @@ -579,6 +589,7 @@ class Tags implements \OCP\ITags { } $names = array_map('trim', $names); + array_filter($names); \OCP\Util::writeLog('core', __METHOD__ . ', before: ' . print_r($this->tags, true), \OCP\Util::DEBUG); diff --git a/lib/private/template/functions.php b/lib/private/template/functions.php index 3c42d441efa..3f5312c0a7b 100644 --- a/lib/private/template/functions.php +++ b/lib/private/template/functions.php @@ -70,8 +70,8 @@ function mimetype_icon( $mimetype ) { /** * @brief make preview_icon available as a simple function * Returns the path to the preview of the image. - * @param $path path of file - * @returns link to the preview + * @param string $path path of file + * @return link to the preview * * For further information have a look at OC_Helper::previewIcon */ diff --git a/lib/private/template/resourcelocator.php b/lib/private/template/resourcelocator.php index 8a3dd5e7fa9..900aa6a8f08 100644 --- a/lib/private/template/resourcelocator.php +++ b/lib/private/template/resourcelocator.php @@ -53,13 +53,9 @@ abstract class ResourceLocator { /* * @brief append the $file resource if exist at $root - * @param $root path to check - * @param $file the filename - * @param $web base for path, default map $root to $webroot - */ - /** - * @param string $file - * @param string|false $webroot + * @param string $root path to check + * @param string $file the filename + * @param string|null $webroot base for path, default map $root to $webroot */ protected function appendIfExist($root, $file, $webroot = null) { if (is_file($root.'/'.$file)) { diff --git a/lib/private/templatelayout.php b/lib/private/templatelayout.php index b7ac02a753d..0672ffc4a3d 100644 --- a/lib/private/templatelayout.php +++ b/lib/private/templatelayout.php @@ -98,7 +98,7 @@ class OC_TemplateLayout extends OC_Template { } /** - * @param $styles + * @param array $styles * @return array */ static public function findStylesheetFiles($styles) { @@ -116,7 +116,7 @@ class OC_TemplateLayout extends OC_Template { } /** - * @param $scripts + * @param array $scripts * @return array */ static public function findJavascriptFiles($scripts) { @@ -175,7 +175,7 @@ class OC_TemplateLayout extends OC_Template { } /** - * @param $files + * @param array $files * @return string */ private static function hashScriptNames($files) diff --git a/lib/private/updater.php b/lib/private/updater.php index 7b09f580176..d8694ac6ed5 100644 --- a/lib/private/updater.php +++ b/lib/private/updater.php @@ -35,7 +35,7 @@ class Updater extends BasicEmitter { /** * Check if a new version is available * @param string $updaterUrl the url to check, i.e. 'http://apps.owncloud.com/updater.php' - * @return array | bool + * @return array|bool */ public function check($updaterUrl) { diff --git a/lib/private/urlgenerator.php b/lib/private/urlgenerator.php index a56b0fe3378..b37ef89d40d 100644 --- a/lib/private/urlgenerator.php +++ b/lib/private/urlgenerator.php @@ -30,7 +30,7 @@ class URLGenerator implements IURLGenerator { /** * @brief Creates an url using a defined route - * @param $route + * @param string $route * @param array $parameters * @internal param array $args with param=>value, will be appended to the returned url * @return string the url diff --git a/lib/private/user.php b/lib/private/user.php index 7106d664aca..90aac88cdc8 100644 --- a/lib/private/user.php +++ b/lib/private/user.php @@ -77,7 +77,7 @@ class OC_User { /** * @brief gets available backends * @deprecated - * @returns array of backends + * @return array an array of backends * * Returns the names of all backends. */ @@ -88,7 +88,7 @@ class OC_User { /** * @brief gets used backends * @deprecated - * @returns array of backends + * @return array an array of backends * * Returns the names of all used backends. */ @@ -98,7 +98,7 @@ class OC_User { /** * @brief Adds the backend to the list of used backends - * @param string | OC_User_Backend $backend default: database The backend to use for user management + * @param string|OC_User_Interface $backend default: database The backend to use for user management * @return bool * * Set the User Authentication Module @@ -321,7 +321,7 @@ class OC_User { /** * @brief Check if the user is logged in - * @returns bool + * @return bool * * Checks if the user is logged in */ @@ -517,7 +517,7 @@ class OC_User { /** * @brief Get a list of all users - * @returns array with all uids + * @return array an array of all uids * * Get a list of all users. * @param string $search diff --git a/lib/private/user/backend.php b/lib/private/user/backend.php index f4e5618e04a..8d2f0e935de 100644 --- a/lib/private/user/backend.php +++ b/lib/private/user/backend.php @@ -103,7 +103,7 @@ abstract class OC_User_Backend implements OC_User_Interface { /** * @brief Get a list of all users - * @returns array with all uids + * @return array an array of all uids * * Get a list of all users. */ @@ -140,7 +140,7 @@ abstract class OC_User_Backend implements OC_User_Interface { /** * @brief Get a list of all display names - * @returns array with all displayNames (value) and the corresponding uids (key) + * @return array an array of all displayNames (value) and the corresponding uids (key) * * Get a list of all display names and user ids. */ diff --git a/lib/private/user/database.php b/lib/private/user/database.php index dec38464f98..747895a8a95 100644 --- a/lib/private/user/database.php +++ b/lib/private/user/database.php @@ -57,9 +57,9 @@ class OC_User_Database extends OC_User_Backend { /** * @brief Create a new user - * @param $uid The username of the user to create - * @param $password The password of the new user - * @returns true/false + * @param string $uid The username of the user to create + * @param string $password The password of the new user + * @return bool * * Creates a new user. Basic checking of username is done in OC_User * itself, not in its subclasses. @@ -79,8 +79,8 @@ class OC_User_Database extends OC_User_Backend { /** * @brief delete a user - * @param $uid The username of the user to delete - * @returns true/false + * @param string $uid The username of the user to delete + * @return bool * * Deletes a user */ @@ -98,9 +98,9 @@ class OC_User_Database extends OC_User_Backend { /** * @brief Set password - * @param $uid The username - * @param $password The new password - * @returns true/false + * @param string $uid The username + * @param string $password The new password + * @return bool * * Change the password of a user */ @@ -119,9 +119,9 @@ class OC_User_Database extends OC_User_Backend { /** * @brief Set display name - * @param $uid The username - * @param $displayName The new display name - * @returns true/false + * @param string $uid The username + * @param string $displayName The new display name + * @return bool * * Change the display name of a user */ @@ -139,7 +139,7 @@ class OC_User_Database extends OC_User_Backend { /** * @brief get display name of the user - * @param $uid user ID of the user + * @param string $uid user ID of the user * @return string display name */ public function getDisplayName($uid) { @@ -149,7 +149,7 @@ class OC_User_Database extends OC_User_Backend { /** * @brief Get a list of all display names - * @returns array with all displayNames (value) and the correspondig uids (key) + * @return array an array of all displayNames (value) and the correspondig uids (key) * * Get a list of all display names and user ids. */ @@ -169,9 +169,9 @@ class OC_User_Database extends OC_User_Backend { /** * @brief Check if the password is correct - * @param $uid The username - * @param $password The password - * @returns string + * @param string $uid The username + * @param string $password The password + * @return string * * Check if the password is correct without logging in the user * returns the user id or false @@ -203,7 +203,7 @@ class OC_User_Database extends OC_User_Backend { /** * @brief Load an user in the cache * @param string $uid the username - * @returns boolean + * @return boolean */ private function loadUser($uid) { if (empty($this->cache[$uid])) { @@ -226,7 +226,7 @@ class OC_User_Database extends OC_User_Backend { /** * @brief Get a list of all users - * @returns array with all uids + * @return array an array of all uids * * Get a list of all users. */ @@ -273,7 +273,7 @@ class OC_User_Database extends OC_User_Backend { /** * counts the users in the database * - * @return int | bool + * @return int|bool */ public function countUsers() { $query = OC_DB::prepare('SELECT COUNT(*) FROM `*PREFIX*users`'); diff --git a/lib/private/user/dummy.php b/lib/private/user/dummy.php index 2fb51d02de3..d2ada37c80f 100644 --- a/lib/private/user/dummy.php +++ b/lib/private/user/dummy.php @@ -127,7 +127,7 @@ class OC_User_Dummy extends OC_User_Backend { /** * counts the users in the database * - * @return int | bool + * @return int|bool */ public function countUsers() { return 0; diff --git a/lib/private/user/example.php b/lib/private/user/example.php index b2d0dc25410..4bf3652330e 100644 --- a/lib/private/user/example.php +++ b/lib/private/user/example.php @@ -28,9 +28,9 @@ abstract class OC_User_Example extends OC_User_Backend { /** * @brief Create a new user - * @param $uid The username of the user to create - * @param $password The password of the new user - * @returns true/false + * @param string $uid The username of the user to create + * @param string $password The password of the new user + * @return bool * * Creates a new user. Basic checking of username is done in OC_User * itself, not in its subclasses. @@ -39,9 +39,9 @@ abstract class OC_User_Example extends OC_User_Backend { /** * @brief Set password - * @param $uid The username - * @param $password The new password - * @returns true/false + * @param string $uid The username + * @param string $password The new password + * @return bool * * Change the password of a user */ @@ -49,9 +49,9 @@ abstract class OC_User_Example extends OC_User_Backend { /** * @brief Check if the password is correct - * @param $uid The username - * @param $password The password - * @returns string + * @param string $uid The username + * @param string $password The password + * @return string * * Check if the password is correct without logging in the user * returns the user id or false @@ -60,8 +60,8 @@ abstract class OC_User_Example extends OC_User_Backend { /** * @brief get the user's home directory - * @param $uid The username - * @returns string + * @param string $uid The username + * @return string * * get the user's home directory * returns the path or false diff --git a/lib/private/user/http.php b/lib/private/user/http.php index a0394521012..67f7156b498 100644 --- a/lib/private/user/http.php +++ b/lib/private/user/http.php @@ -27,7 +27,7 @@ class OC_User_HTTP extends OC_User_Backend { /** * split http://user@host/path into a user and url part - * @param string path + * @param string $url * @return array */ private function parseUrl($url) { @@ -46,7 +46,7 @@ class OC_User_HTTP extends OC_User_Backend { /** * check if an url is a valid login - * @param string url + * @param string $url * @return boolean */ private function matchUrl($url) { @@ -55,9 +55,9 @@ class OC_User_HTTP extends OC_User_Backend { /** * @brief Check if the password is correct - * @param $uid The username - * @param $password The password - * @returns string + * @param string $uid The username + * @param string $password The password + * @return string * * Check if the password is correct without logging in the user * returns the user id or false diff --git a/lib/private/user/interface.php b/lib/private/user/interface.php index cdcab3e5d00..e130e5b569c 100644 --- a/lib/private/user/interface.php +++ b/lib/private/user/interface.php @@ -26,27 +26,23 @@ interface OC_User_Interface { /** * @brief Check if backend implements actions * @param $actions bitwise-or'ed actions - * @returns boolean + * @return boolean * * Returns the supported actions as int to be * compared with OC_USER_BACKEND_CREATE_USER etc. - * @return boolean */ public function implementsActions($actions); /** * @brief delete a user - * @param $uid The username of the user to delete - * @returns true/false - * - * Deletes a user - * @return boolean + * @param string $uid The username of the user to delete + * @return bool */ public function deleteUser($uid); /** * @brief Get a list of all users - * @returns array with all uids + * @return array an array of all uids * * Get a list of all users. */ @@ -61,14 +57,14 @@ interface OC_User_Interface { /** * @brief get display name of the user - * @param $uid user ID of the user - * @return display name + * @param string $uid user ID of the user + * @return string display name */ public function getDisplayName($uid); /** * @brief Get a list of all display names - * @returns array with all displayNames (value) and the corresponding uids (key) + * @return array an array of all displayNames (value) and the corresponding uids (key) * * Get a list of all display names and user ids. */ diff --git a/lib/private/user/manager.php b/lib/private/user/manager.php index 6f6fd80a8ef..0fcf1ceb6ab 100644 --- a/lib/private/user/manager.php +++ b/lib/private/user/manager.php @@ -26,7 +26,7 @@ use OC\Hooks\PublicEmitter; */ class Manager extends PublicEmitter { /** - * @var \OC_User_Backend[] $backends + * @var \OC_User_Interface[] $backends */ private $backends = array(); @@ -57,7 +57,7 @@ class Manager extends PublicEmitter { /** * register a user backend * - * @param \OC_User_Backend $backend + * @param \OC_User_Interface $backend */ public function registerBackend($backend) { $this->backends[] = $backend; @@ -66,7 +66,7 @@ class Manager extends PublicEmitter { /** * remove a user backend * - * @param \OC_User_Backend $backend + * @param \OC_User_Interface $backend */ public function removeBackend($backend) { $this->cachedUsers = array(); @@ -105,7 +105,7 @@ class Manager extends PublicEmitter { * get or construct the user object * * @param string $uid - * @param \OC_User_Backend $backend + * @param \OC_User_Interface $backend * @return \OC\User\User */ protected function getUserObject($uid, $backend) { @@ -222,7 +222,7 @@ class Manager extends PublicEmitter { * @param string $uid * @param string $password * @throws \Exception - * @return bool | \OC\User\User the created user of false + * @return bool|\OC\User\User the created user of false */ public function createUser($uid, $password) { $l = \OC_L10N::get('lib'); @@ -261,7 +261,7 @@ class Manager extends PublicEmitter { /** * returns how many users per backend exist (if supported by backend) * - * @return array with backend class as key and count number as value + * @return array an array of backend class as key and count number as value */ public function countUsers() { $userCountStatistics = array(); diff --git a/lib/private/user/session.php b/lib/private/user/session.php index 1740bad5abe..3d10b134b83 100644 --- a/lib/private/user/session.php +++ b/lib/private/user/session.php @@ -82,7 +82,7 @@ class Session implements Emitter, \OCP\IUserSession { /** * set the currently active user * - * @param \OC\User\User $user + * @param \OC\User\User|null $user */ public function setUser($user) { if (is_null($user)) { @@ -115,7 +115,7 @@ class Session implements Emitter, \OCP\IUserSession { /** * set the login name * - * @param string $loginName for the logged in user + * @param string|null $loginName for the logged in user */ public function setLoginName($loginName) { if (is_null($loginName)) { @@ -191,7 +191,7 @@ class Session implements Emitter, \OCP\IUserSession { $expires = time() + \OC_Config::getValue('remember_login_cookie_lifetime', 60 * 60 * 24 * 15); setcookie("oc_username", $username, $expires, \OC::$WEBROOT, '', $secure_cookie); setcookie("oc_token", $token, $expires, \OC::$WEBROOT, '', $secure_cookie, true); - setcookie("oc_remember_login", true, $expires, \OC::$WEBROOT, '', $secure_cookie); + setcookie("oc_remember_login", "1", $expires, \OC::$WEBROOT, '', $secure_cookie); } /** diff --git a/lib/private/user/user.php b/lib/private/user/user.php index ef5364cbf7b..229cbf68ff1 100644 --- a/lib/private/user/user.php +++ b/lib/private/user/user.php @@ -23,7 +23,7 @@ class User { private $displayName; /** - * @var \OC_User_Backend $backend + * @var \OC_User_Interface $backend */ private $backend; @@ -33,7 +33,7 @@ class User { private $enabled; /** - * @var Emitter | Manager $emitter + * @var Emitter|Manager $emitter */ private $emitter; @@ -49,7 +49,7 @@ class User { /** * @param string $uid - * @param \OC_User_Backend $backend + * @param \OC_User_Interface $backend * @param \OC\Hooks\Emitter $emitter * @param \OC\AllConfig $config */ diff --git a/lib/private/util.php b/lib/private/util.php index e2005d31c38..f76ee7b338a 100755 --- a/lib/private/util.php +++ b/lib/private/util.php @@ -551,6 +551,27 @@ class OC_Util { } /** + * @brief check if a backup from the encryption keys exists + * @return boolean + */ + public static function backupKeysExists() { + //check if encryption was enabled in the past + $backupExists = false; + if (OC_App::isEnabled('files_encryption') === false) { + $view = new OC\Files\View('/' . OCP\User::getUser()); + $backupPath = '/files_encryption/keyfiles.backup'; + if ($view->is_dir($backupPath)) { + $dircontent = $view->getDirectoryContent($backupPath); + if (!empty($dircontent)) { + $backupExists = true; + } + } + } + + return $backupExists; + } + + /** * @brief Check for correct file permissions of data directory * @param string $dataDirectory * @return array arrays with error messages and hints @@ -797,8 +818,8 @@ class OC_Util { * This function is used to sanitize HTML and should be applied on any * string or array of strings before displaying it on a web page. * - * @param string|array of strings - * @return array with sanitized strings or a single sanitized string, depends on the input parameter. + * @param string|array &$value + * @return string|array an array of sanitized strings or a single sanitized string, depends on the input parameter. */ public static function sanitizeHTML( &$value ) { if (is_array($value)) { @@ -837,7 +858,7 @@ class OC_Util { if (!\OC_Config::getValue("check_for_working_htaccess", true)) { return true; } - + // testdata $fileName = '/htaccesstest.txt'; $testContent = 'testcontent'; @@ -1007,8 +1028,8 @@ class OC_Util { /** * @brief Generates a cryptographic secure pseudo-random string - * @param Int $length of the random string - * @return String + * @param int $length of the random string + * @return string * Please also update secureRNGAvailable if you change something here */ public static function generateRandomBytes($length = 30) { @@ -1082,7 +1103,7 @@ class OC_Util { curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1); curl_setopt($curl, CURLOPT_CONNECTTIMEOUT, 10); curl_setopt($curl, CURLOPT_URL, $url); - + curl_setopt($curl, CURLOPT_USERAGENT, "ownCloud Server Crawler"); if(OC_Config::getValue('proxy', '') != '') { @@ -1091,17 +1112,16 @@ class OC_Util { if(OC_Config::getValue('proxyuserpwd', '') != '') { curl_setopt($curl, CURLOPT_PROXYUSERPWD, OC_Config::getValue('proxyuserpwd')); } - - if (ini_get('open_basedir') === '' && ini_get('safe_mode' === 'Off')) { + + if (ini_get('open_basedir') === '' && ini_get('safe_mode') === 'Off') { curl_setopt($curl, CURLOPT_FOLLOWLOCATION, true); curl_setopt($curl, CURLOPT_MAXREDIRS, $max_redirects); $data = curl_exec($curl); } else { curl_setopt($curl, CURLOPT_FOLLOWLOCATION, false); $mr = $max_redirects; - if ($mr > 0) { + if ($mr > 0) { $newURL = curl_getinfo($curl, CURLINFO_EFFECTIVE_URL); - $rcurl = curl_copy_handle($curl); curl_setopt($rcurl, CURLOPT_HEADER, true); curl_setopt($rcurl, CURLOPT_NOBODY, true); @@ -1125,9 +1145,9 @@ class OC_Util { curl_close($rcurl); if ($mr > 0) { curl_setopt($curl, CURLOPT_URL, $newURL); - } + } } - + if($mr == 0 && $max_redirects > 0) { $data = false; } else { @@ -1267,7 +1287,7 @@ class OC_Util { /** * Returns whether the given file name is valid - * @param $file string file name to check + * @param string $file file name to check * @return bool true if the file name is valid, false otherwise */ public static function isValidFileName($file) { diff --git a/lib/private/vobject.php b/lib/private/vobject.php index a3e9f7ef790..e472429b23e 100644 --- a/lib/private/vobject.php +++ b/lib/private/vobject.php @@ -25,28 +25,28 @@ */ class OC_VObject{ /** @var Sabre\VObject\Component */ - protected $vobject; + protected $vObject; /** - * @returns Sabre\VObject\Component + * @return Sabre\VObject\Component */ public function getVObject() { - return $this->vobject; + return $this->vObject; } /** * @brief Parses the VObject * @param string $data VObject as string - * @returns Sabre\VObject\Reader|null + * @return Sabre\VObject\Reader|null */ public static function parse($data) { try { Sabre\VObject\Property::$classMap['LAST-MODIFIED'] = 'Sabre\VObject\Property\DateTime'; - $vobject = Sabre\VObject\Reader::read($data); - if ($vobject instanceof Sabre\VObject\Component) { - $vobject = new OC_VObject($vobject); + $vObject = Sabre\VObject\Reader::read($data); + if ($vObject instanceof Sabre\VObject\Component) { + $vObject = new OC_VObject($vObject); } - return $vobject; + return $vObject; } catch (Exception $e) { OC_Log::write('vobject', $e->getMessage(), OC_Log::ERROR); return null; @@ -89,26 +89,26 @@ class OC_VObject{ /** * Constructor - * @param Sabre\VObject\Component or string + * @param Sabre\VObject\Component|string $vobject_or_name */ public function __construct($vobject_or_name) { if (is_object($vobject_or_name)) { - $this->vobject = $vobject_or_name; + $this->vObject = $vobject_or_name; } else { - $this->vobject = new Sabre\VObject\Component($vobject_or_name); + $this->vObject = new Sabre\VObject\Component($vobject_or_name); } } /** * @todo Write documentation - * @param $item + * @param \OC_VObject|\Sabre\VObject\Component $item * @param null $itemValue */ public function add($item, $itemValue = null) { if ($item instanceof OC_VObject) { $item = $item->getVObject(); } - $this->vobject->add($item, $itemValue); + $this->vObject->add($item, $itemValue); } /** @@ -116,7 +116,7 @@ class OC_VObject{ * @param object $name of property * @param object $value of property * @param array|object $parameters of property - * @returns Sabre\VObject\Property newly created + * @return Sabre\VObject\Property newly created */ public function addProperty($name, $value, $parameters=array()) { if(is_array($value)) { @@ -127,26 +127,26 @@ class OC_VObject{ $property->parameters[] = new Sabre\VObject\Parameter($name, $value); } - $this->vobject->add($property); + $this->vObject->add($property); return $property; } public function setUID() { $uid = substr(md5(rand().time()), 0, 10); - $this->vobject->add('UID', $uid); + $this->vObject->add('UID', $uid); } /** * @todo Write documentation - * @param mixed $name + * @param mixed $name * @param string $string */ public function setString($name, $string) { if ($string != '') { $string = strtr($string, array("\r\n"=>"\n")); - $this->vobject->__set($name, $string); + $this->vObject->__set($name, $string); }else{ - $this->vobject->__unset($name); + $this->vObject->__unset($name); } } @@ -167,31 +167,31 @@ class OC_VObject{ if ($datetime instanceof DateTime) { $datetime_element = new Sabre\VObject\Property\DateTime($name); $datetime_element->setDateTime($datetime, $dateType); - $this->vobject->__set($name, $datetime_element); + $this->vObject->__set($name, $datetime_element); }else{ - $this->vobject->__unset($name); + $this->vObject->__unset($name); } } /** * @todo Write documentation - * @param $name + * @param string $name * @return string */ public function getAsString($name) { - return $this->vobject->__isset($name) ? - $this->vobject->__get($name)->value : + return $this->vObject->__isset($name) ? + $this->vObject->__get($name)->value : ''; } /** * @todo Write documentation - * @param $name + * @param string $name * @return array */ public function getAsArray($name) { $values = array(); - if ($this->vobject->__isset($name)) { + if ($this->vObject->__isset($name)) { $values = explode(',', $this->getAsString($name)); $values = array_map('trim', $values); } @@ -200,14 +200,14 @@ class OC_VObject{ /** * @todo Write documentation - * @param $name + * @param string $name * @return array|OC_VObject|\Sabre\VObject\Property */ public function &__get($name) { if ($name == 'children') { - return $this->vobject->children; + return $this->vObject->children; } - $return = $this->vobject->__get($name); + $return = $this->vObject->__get($name); if ($return instanceof Sabre\VObject\Component) { $return = new OC_VObject($return); } @@ -220,7 +220,7 @@ class OC_VObject{ * @param string $value */ public function __set($name, $value) { - return $this->vobject->__set($name, $value); + return $this->vObject->__set($name, $value); } /** @@ -228,7 +228,7 @@ class OC_VObject{ * @param string $name */ public function __unset($name) { - return $this->vobject->__unset($name); + return $this->vObject->__unset($name); } /** @@ -237,16 +237,16 @@ class OC_VObject{ * @return bool */ public function __isset($name) { - return $this->vobject->__isset($name); + return $this->vObject->__isset($name); } /** * @todo Write documentation - * @param $function - * @param $arguments + * @param callable $function + * @param array $arguments * @return mixed */ public function __call($function, $arguments) { - return call_user_func_array(array($this->vobject, $function), $arguments); + return call_user_func_array(array($this->vObject, $function), $arguments); } } diff --git a/lib/public/app.php b/lib/public/app.php index 96162299ec4..bef4e96ae02 100644 --- a/lib/public/app.php +++ b/lib/public/app.php @@ -36,7 +36,7 @@ namespace OCP; class App { /** * Makes ownCloud aware of this app - * @param array with all information + * @param array $data with all information * @return boolean * * @deprecated This method is deprecated. Do not call it anymore. @@ -49,7 +49,7 @@ class App { /** * Adds an entry to the navigation - * @param array containing the data + * @param array $data containing the data * @return boolean * * This function adds a new entry to the navigation visible to users. $data @@ -70,7 +70,7 @@ class App { /** * Marks a navigation entry as active - * @param string id of the entry + * @param string $id id of the entry * @return boolean * * This function sets a navigation entry as active and removes the 'active' @@ -83,8 +83,8 @@ class App { /** * Register a Configuration Screen that should appear in the personal settings section. - * @param $app string appid - * @param $page string page to be included + * @param string $app appid + * @param string $page page to be included * @return void */ public static function registerPersonal( $app, $page ) { diff --git a/lib/public/appframework/apicontroller.php b/lib/public/appframework/apicontroller.php new file mode 100644 index 00000000000..5272f3ed529 --- /dev/null +++ b/lib/public/appframework/apicontroller.php @@ -0,0 +1,93 @@ +<?php +/** + * ownCloud - App Framework + * + * @author Bernhard Posselt + * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE + * License as published by the Free Software Foundation; either + * version 3 of the License, or any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU AFFERO GENERAL PUBLIC LICENSE for more details. + * + * You should have received a copy of the GNU Affero General Public + * License along with this library. If not, see <http://www.gnu.org/licenses/>. + * + */ + +/** + * Public interface of ownCloud for apps to use. + * AppFramework\Controller class + */ + +namespace OCP\AppFramework; + +use OCP\AppFramework\Http\Response; +use OCP\IRequest; + + +/** + * Base class to inherit your controllers from that are used for RESTful APIs + */ +abstract class ApiController extends Controller { + + private $corsMethods; + private $corsAllowedHeaders; + private $corsMaxAge; + + /** + * constructor of the controller + * @param string $appName the name of the app + * @param IRequest $request an instance of the request + * @param string $corsMethods: comma seperated string of HTTP verbs which + * should be allowed for websites or webapps when calling your API, defaults to + * 'PUT, POST, GET, DELETE, PATCH' + * @param string $corsAllowedHeaders: comma seperated string of HTTP headers + * which should be allowed for websites or webapps when calling your API, + * defaults to 'Authorization, Content-Type, Accept' + * @param int $corsMaxAge number in seconds how long a preflighted OPTIONS + * request should be cached, defaults to 1728000 seconds + */ + public function __construct($appName, + IRequest $request, + $corsMethods='PUT, POST, GET, DELETE, PATCH', + $corsAllowedHeaders='Authorization, Content-Type, Accept', + $corsMaxAge=1728000){ + parent::__construct($appName, $request); + $this->corsMethods = $corsMethods; + $this->corsAllowedHeaders = $corsAllowedHeaders; + $this->corsMaxAge = $corsMaxAge; + } + + + /** + * This method implements a preflighted cors response for you that you can + * link to for the options request + * + * @NoAdminRequired + * @NoCSRFRequired + * @PublicPage + */ + public function preflightedCors() { + if(isset($this->request->server['HTTP_ORIGIN'])) { + $origin = $this->request->server['HTTP_ORIGIN']; + } else { + $origin = '*'; + } + + $response = new Response(); + $response->addHeader('Access-Control-Allow-Origin', $origin); + $response->addHeader('Access-Control-Allow-Methods', $this->corsMethods); + $response->addHeader('Access-Control-Max-Age', $this->corsMaxAge); + $response->addHeader('Access-Control-Allow-Headers', $this->corsAllowedHeaders); + $response->addHeader('Access-Control-Allow-Credentials', 'false'); + return $response; + } + + +} diff --git a/lib/public/appframework/controller.php b/lib/public/appframework/controller.php index 758f0a80083..50b5ed3a80d 100644 --- a/lib/public/appframework/controller.php +++ b/lib/public/appframework/controller.php @@ -3,7 +3,7 @@ * ownCloud - App Framework * * @author Bernhard Posselt - * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com + * @copyright 2012, 2014 Bernhard Posselt <dev@bernhard-posselt.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE @@ -28,7 +28,8 @@ namespace OCP\AppFramework; use OCP\AppFramework\Http\TemplateResponse; -use OCP\AppFramework\IAppContainer; +use OCP\AppFramework\Http\JSONResponse; +use OCP\AppFramework\Http\IResponseSerializer; use OCP\IRequest; @@ -49,19 +50,86 @@ abstract class Controller { */ protected $request; + private $serializer; + private $responders; + /** * constructor of the controller * @param string $appName the name of the app * @param IRequest $request an instance of the request + * @param string $corsMethods: comma seperated string of HTTP verbs which + * should be allowed for websites or webapps when calling your API, defaults to + * 'PUT, POST, GET, DELETE, PATCH' + * @param string $corsAllowedHeaders: comma seperated string of HTTP headers + * which should be allowed for websites or webapps when calling your API, + * defaults to 'Authorization, Content-Type, Accept' + * @param int $corsMaxAge number in seconds how long a preflighted OPTIONS + * request should be cached, defaults to 1728000 seconds */ - public function __construct($appName, IRequest $request){ + public function __construct($appName, + IRequest $request){ $this->appName = $appName; $this->request = $request; + + // default responders + $this->responders = array( + 'json' => function ($response) { + return new JSONResponse($response); + } + ); + } + + + /** + * Registers a serializer that is executed before a formatter is being + * called, useful for turning any data into PHP arrays that can be used + * by a JSONResponse for instance + * @param IResponseSerializer $serializer + */ + protected function registerSerializer(IResponseSerializer $serializer) { + $this->serializer = $serializer; + } + + + /** + * Registers a formatter for a type + * @param string $format + * @param \Closure $responder + */ + protected function registerResponder($format, \Closure $responder) { + $this->responders[$format] = $responder; + } + + + /** + * Serializes and formats a response + * @param mixed $response the value that was returned from a controller and + * is not a Response instance + * @param string $format the format for which a formatter has been registered + * @throws \DomainException if format does not match a registered formatter + * @return Response + */ + public function buildResponse($response, $format='json') { + if(array_key_exists($format, $this->responders)) { + + if ($this->serializer) { + $response = $this->serializer->serialize($response); + } + + $responder = $this->responders[$format]; + + return $responder($response); + + } else { + throw new \DomainException('No responder registered for format ' . + $format . '!'); + } } /** * Lets you access post and get parameters by the index + * @deprecated write your parameters as method arguments instead * @param string $key the key which you want to access in the URL Parameter * placeholder, $_POST or $_GET array. * The priority how they're returned is the following: @@ -79,6 +147,7 @@ abstract class Controller { /** * Returns all params that were received, be it from the request * (as GET or POST) or throuh the URL by the route + * @deprecated use $this->request instead * @return array the array with all parameters */ public function getParams() { @@ -88,6 +157,7 @@ abstract class Controller { /** * Returns the method of the request + * @deprecated use $this->request instead * @return string the method of the request (POST, GET, etc) */ public function method() { @@ -97,6 +167,7 @@ abstract class Controller { /** * Shortcut for accessing an uploaded file through the $_FILES array + * @deprecated use $this->request instead * @param string $key the key that will be taken from the $_FILES array * @return array the file in the $_FILES element */ @@ -107,6 +178,7 @@ abstract class Controller { /** * Shortcut for getting env variables + * @deprecated use $this->request instead * @param string $key the key that will be taken from the $_ENV array * @return array the value in the $_ENV element */ @@ -117,6 +189,7 @@ abstract class Controller { /** * Shortcut for getting cookie variables + * @deprecated use $this->request instead * @param string $key the key that will be taken from the $_COOKIE array * @return array the value in the $_COOKIE element */ @@ -127,6 +200,7 @@ abstract class Controller { /** * Shortcut for rendering a template + * @deprecated return a template response instead * @param string $templateName the name of the template * @param array $params the template parameters in key => value structure * @param string $renderAs user renders a full page, blank only your template diff --git a/tests/lib/appframework/utility/MethodAnnotationReaderTest.php b/lib/public/appframework/db/doesnotexistexception.php index c68812aa5c7..5861e74f6c8 100644 --- a/tests/lib/appframework/utility/MethodAnnotationReaderTest.php +++ b/lib/public/appframework/db/doesnotexistexception.php @@ -4,7 +4,7 @@ * ownCloud - App Framework * * @author Bernhard Posselt - * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com + * @copyright 2012 Bernhard Posselt dev@bernhard-posselt.com * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE @@ -22,34 +22,21 @@ */ -namespace OC\AppFramework\Utility; +namespace OCP\AppFramework\Db; -class MethodAnnotationReaderTest extends \PHPUnit_Framework_TestCase { - - - /** - * @Annotation - */ - public function testReadAnnotation(){ - $reader = new MethodAnnotationReader('\OC\AppFramework\Utility\MethodAnnotationReaderTest', - 'testReadAnnotation'); - - $this->assertTrue($reader->hasAnnotation('Annotation')); - } - +/** + * This is returned or should be returned when a find request does not find an + * entry in the database + */ +class DoesNotExistException extends \Exception { /** - * @Annotation - * @param test + * Constructor + * @param string $msg the error message */ - public function testReadAnnotationNoLowercase(){ - $reader = new MethodAnnotationReader('\OC\AppFramework\Utility\MethodAnnotationReaderTest', - 'testReadAnnotationNoLowercase'); - - $this->assertTrue($reader->hasAnnotation('Annotation')); - $this->assertFalse($reader->hasAnnotation('param')); + public function __construct($msg){ + parent::__construct($msg); } - -} +}
\ No newline at end of file diff --git a/lib/public/appframework/db/entity.php b/lib/public/appframework/db/entity.php new file mode 100644 index 00000000000..8ab42bd9153 --- /dev/null +++ b/lib/public/appframework/db/entity.php @@ -0,0 +1,236 @@ +<?php + +/** +* ownCloud - App Framework +* +* @author Bernhard Posselt +* @copyright 2012 Bernhard Posselt dev@bernhard-posselt.com +* +* This library is free software; you can redistribute it and/or +* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE +* License as published by the Free Software Foundation; either +* version 3 of the License, or any later version. +* +* This library is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU AFFERO GENERAL PUBLIC LICENSE for more details. +* +* You should have received a copy of the GNU Affero General Public +* License along with this library. If not, see <http://www.gnu.org/licenses/>. +* +*/ + +namespace OCP\AppFramework\Db; + + +/** + * @method integer getId() + * @method void setId(integer $id) + */ +abstract class Entity { + + public $id; + + private $_updatedFields = array(); + private $_fieldTypes = array('id' => 'integer'); + + + /** + * Simple alternative constructor for building entities from a request + * @param array $params the array which was obtained via $this->params('key') + * in the controller + * @return Entity + */ + public static function fromParams(array $params) { + $instance = new static(); + + foreach($params as $key => $value) { + $method = 'set' . ucfirst($key); + $instance->$method($value); + } + + return $instance; + } + + + /** + * Maps the keys of the row array to the attributes + * @param array $row the row to map onto the entity + */ + public static function fromRow(array $row){ + $instance = new static(); + + foreach($row as $key => $value){ + $prop = ucfirst($instance->columnToProperty($key)); + $setter = 'set' . $prop; + $instance->$setter($value); + } + + $instance->resetUpdatedFields(); + + return $instance; + } + + + /** + * @return an array with attribute and type + */ + public function getFieldTypes() { + return $this->_fieldTypes; + } + + + /** + * Marks the entity as clean needed for setting the id after the insertion + */ + public function resetUpdatedFields(){ + $this->_updatedFields = array(); + } + + + protected function setter($name, $args) { + // setters should only work for existing attributes + if(property_exists($this, $name)){ + if($this->$name === $args[0]) { + return; + } + $this->markFieldUpdated($name); + + // if type definition exists, cast to correct type + if($args[0] !== null && array_key_exists($name, $this->_fieldTypes)) { + settype($args[0], $this->_fieldTypes[$name]); + } + $this->$name = $args[0]; + + } else { + throw new \BadFunctionCallException($name . + ' is not a valid attribute'); + } + } + + + protected function getter($name) { + // getters should only work for existing attributes + if(property_exists($this, $name)){ + return $this->$name; + } else { + throw new \BadFunctionCallException($name . + ' is not a valid attribute'); + } + } + + + /** + * Each time a setter is called, push the part after set + * into an array: for instance setId will save Id in the + * updated fields array so it can be easily used to create the + * getter method + */ + public function __call($methodName, $args){ + $attr = lcfirst( substr($methodName, 3) ); + + if(strpos($methodName, 'set') === 0){ + $this->setter($attr, $args); + } elseif(strpos($methodName, 'get') === 0) { + return $this->getter($attr); + } else { + throw new \BadFunctionCallException($methodName . + ' does not exist'); + } + + } + + + /** + * Mark am attribute as updated + * @param string $attribute the name of the attribute + */ + protected function markFieldUpdated($attribute){ + $this->_updatedFields[$attribute] = true; + } + + + /** + * Transform a database columnname to a property + * @param string $columnName the name of the column + * @return string the property name + */ + public function columnToProperty($columnName){ + $parts = explode('_', $columnName); + $property = null; + + foreach($parts as $part){ + if($property === null){ + $property = $part; + } else { + $property .= ucfirst($part); + } + } + + return $property; + } + + + /** + * Transform a property to a database column name + * @param string $property the name of the property + * @return string the column name + */ + public function propertyToColumn($property){ + $parts = preg_split('/(?=[A-Z])/', $property); + $column = null; + + foreach($parts as $part){ + if($column === null){ + $column = $part; + } else { + $column .= '_' . lcfirst($part); + } + } + + return $column; + } + + + /** + * @return array array of updated fields for update query + */ + public function getUpdatedFields(){ + return $this->_updatedFields; + } + + + /** + * Adds type information for a field so that its automatically casted to + * that value once its being returned from the database + * @param string $fieldName the name of the attribute + * @param string $type the type which will be used to call settype() + */ + protected function addType($fieldName, $type){ + $this->_fieldTypes[$fieldName] = $type; + } + + + /** + * Slugify the value of a given attribute + * Warning: This doesn't result in a unique value + * @param string $attributeName the name of the attribute, which value should be slugified + * @return string slugified value + */ + public function slugify($attributeName){ + // toSlug should only work for existing attributes + if(property_exists($this, $attributeName)){ + $value = $this->$attributeName; + // replace everything except alphanumeric with a single '-' + $value = preg_replace('/[^A-Za-z0-9]+/', '-', $value); + $value = strtolower($value); + // trim '-' + return trim($value, '-'); + } else { + throw new \BadFunctionCallException($attributeName . + ' is not a valid attribute'); + } + } + +} diff --git a/lib/public/appframework/db/mapper.php b/lib/public/appframework/db/mapper.php new file mode 100644 index 00000000000..21ccb686221 --- /dev/null +++ b/lib/public/appframework/db/mapper.php @@ -0,0 +1,291 @@ +<?php + +/** + * ownCloud - App Framework + * + * @author Bernhard Posselt + * @author Morris Jobke + * @copyright 2012 Bernhard Posselt dev@bernhard-posselt.com + * @copyright 2013 Morris Jobke morris.jobke@gmail.com + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE + * License as published by the Free Software Foundation; either + * version 3 of the License, or any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU AFFERO GENERAL PUBLIC LICENSE for more details. + * + * You should have received a copy of the GNU Affero General Public + * License along with this library. If not, see <http://www.gnu.org/licenses/>. + * + */ + + +namespace OCP\AppFramework\Db; + +use \OCP\IDb; + + +/** + * Simple parent class for inheriting your data access layer from. This class + * may be subject to change in the future + */ +abstract class Mapper { + + protected $tableName; + protected $entityClass; + protected $db; + + /** + * @param IDb $db Instance of the Db abstraction layer + * @param string $tableName the name of the table. set this to allow entity + * @param string $entityClass the name of the entity that the sql should be + * mapped to queries without using sql + */ + public function __construct(IDb $db, $tableName, $entityClass=null){ + $this->db = $db; + $this->tableName = '*PREFIX*' . $tableName; + + // if not given set the entity name to the class without the mapper part + // cache it here for later use since reflection is slow + if($entityClass === null) { + $this->entityClass = str_replace('Mapper', '', get_class($this)); + } else { + $this->entityClass = $entityClass; + } + } + + + /** + * @return string the table name + */ + public function getTableName(){ + return $this->tableName; + } + + + /** + * Deletes an entity from the table + * @param Entity $entity the entity that should be deleted + */ + public function delete(Entity $entity){ + $sql = 'DELETE FROM `' . $this->tableName . '` WHERE `id` = ?'; + $this->execute($sql, array($entity->getId())); + } + + + /** + * Creates a new entry in the db from an entity + * @param Entity $entity the entity that should be created + * @return Entity the saved entity with the set id + */ + public function insert(Entity $entity){ + // get updated fields to save, fields have to be set using a setter to + // be saved + $properties = $entity->getUpdatedFields(); + $values = ''; + $columns = ''; + $params = array(); + + // build the fields + $i = 0; + foreach($properties as $property => $updated) { + $column = $entity->propertyToColumn($property); + $getter = 'get' . ucfirst($property); + + $columns .= '`' . $column . '`'; + $values .= '?'; + + // only append colon if there are more entries + if($i < count($properties)-1){ + $columns .= ','; + $values .= ','; + } + + array_push($params, $entity->$getter()); + $i++; + + } + + $sql = 'INSERT INTO `' . $this->tableName . '`(' . + $columns . ') VALUES(' . $values . ')'; + + $this->execute($sql, $params); + + $entity->setId((int) $this->db->getInsertId($this->tableName)); + return $entity; + } + + + + /** + * Updates an entry in the db from an entity + * @throws \InvalidArgumentException if entity has no id + * @param Entity $entity the entity that should be created + */ + public function update(Entity $entity){ + // if entity wasn't changed it makes no sense to run a db query + $properties = $entity->getUpdatedFields(); + if(count($properties) === 0) { + return $entity; + } + + // entity needs an id + $id = $entity->getId(); + if($id === null){ + throw new \InvalidArgumentException( + 'Entity which should be updated has no id'); + } + + // get updated fields to save, fields have to be set using a setter to + // be saved + // dont update the id field + unset($properties['id']); + + $columns = ''; + $params = array(); + + // build the fields + $i = 0; + foreach($properties as $property => $updated) { + + $column = $entity->propertyToColumn($property); + $getter = 'get' . ucfirst($property); + + $columns .= '`' . $column . '` = ?'; + + // only append colon if there are more entries + if($i < count($properties)-1){ + $columns .= ','; + } + + array_push($params, $entity->$getter()); + $i++; + } + + $sql = 'UPDATE `' . $this->tableName . '` SET ' . + $columns . ' WHERE `id` = ?'; + array_push($params, $id); + + $this->execute($sql, $params); + } + + + /** + * Runs an sql query + * @param string $sql the prepare string + * @param array $params the params which should replace the ? in the sql query + * @param int $limit the maximum number of rows + * @param int $offset from which row we want to start + * @return \PDOStatement the database query result + */ + protected function execute($sql, array $params=array(), $limit=null, $offset=null){ + $query = $this->db->prepareQuery($sql, $limit, $offset); + + $index = 1; // bindParam is 1 indexed + foreach($params as $param) { + + switch (gettype($param)) { + case 'integer': + $pdoConstant = \PDO::PARAM_INT; + break; + + case 'boolean': + $pdoConstant = \PDO::PARAM_BOOL; + break; + + default: + $pdoConstant = \PDO::PARAM_STR; + break; + } + + $query->bindValue($index, $param, $pdoConstant); + + $index++; + } + + return $query->execute(); + } + + + /** + * Returns an db result and throws exceptions when there are more or less + * results + * @see findEntity + * @param string $sql the sql query + * @param array $params the parameters of the sql query + * @param int $limit the maximum number of rows + * @param int $offset from which row we want to start + * @throws DoesNotExistException if the item does not exist + * @throws MultipleObjectsReturnedException if more than one item exist + * @return array the result as row + */ + protected function findOneQuery($sql, array $params=array(), $limit=null, $offset=null){ + $result = $this->execute($sql, $params, $limit, $offset); + $row = $result->fetchRow(); + + if($row === false || $row === null){ + throw new DoesNotExistException('No matching entry found'); + } + $row2 = $result->fetchRow(); + //MDB2 returns null, PDO and doctrine false when no row is available + if( ! ($row2 === false || $row2 === null )) { + throw new MultipleObjectsReturnedException('More than one result'); + } else { + return $row; + } + } + + + /** + * Creates an entity from a row. Automatically determines the entity class + * from the current mapper name (MyEntityMapper -> MyEntity) + * @param array $row the row which should be converted to an entity + * @return Entity the entity + */ + protected function mapRowToEntity($row) { + return call_user_func($this->entityClass .'::fromRow', $row); + } + + + /** + * Runs a sql query and returns an array of entities + * @param string $sql the prepare string + * @param array $params the params which should replace the ? in the sql query + * @param int $limit the maximum number of rows + * @param int $offset from which row we want to start + * @return array all fetched entities + */ + protected function findEntities($sql, array $params=array(), $limit=null, $offset=null) { + $result = $this->execute($sql, $params, $limit, $offset); + + $entities = array(); + + while($row = $result->fetchRow()){ + $entities[] = $this->mapRowToEntity($row); + } + + return $entities; + } + + + /** + * Returns an db result and throws exceptions when there are more or less + * results + * @param string $sql the sql query + * @param array $params the parameters of the sql query + * @param int $limit the maximum number of rows + * @param int $offset from which row we want to start + * @throws DoesNotExistException if the item does not exist + * @throws MultipleObjectsReturnedException if more than one item exist + * @return Entity the entity + */ + protected function findEntity($sql, array $params=array(), $limit=null, $offset=null){ + return $this->mapRowToEntity($this->findOneQuery($sql, $params, $limit, $offset)); + } + + +} diff --git a/lib/public/appframework/db/multipleobjectsreturnedexception.php b/lib/public/appframework/db/multipleobjectsreturnedexception.php new file mode 100644 index 00000000000..51d8d6bc7e1 --- /dev/null +++ b/lib/public/appframework/db/multipleobjectsreturnedexception.php @@ -0,0 +1,42 @@ +<?php + +/** + * ownCloud - App Framework + * + * @author Bernhard Posselt + * @copyright 2012 Bernhard Posselt dev@bernhard-posselt.com + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE + * License as published by the Free Software Foundation; either + * version 3 of the License, or any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU AFFERO GENERAL PUBLIC LICENSE for more details. + * + * You should have received a copy of the GNU Affero General Public + * License along with this library. If not, see <http://www.gnu.org/licenses/>. + * + */ + + +namespace OCP\AppFramework\Db; + + +/** + * This is returned or should be returned when a find request finds more than one + * row + */ +class MultipleObjectsReturnedException extends \Exception { + + /** + * Constructor + * @param string $msg the error message + */ + public function __construct($msg){ + parent::__construct($msg); + } + +}
\ No newline at end of file diff --git a/lib/public/appframework/http.php b/lib/public/appframework/http.php index 60f314202cc..c6e2ff8846f 100644 --- a/lib/public/appframework/http.php +++ b/lib/public/appframework/http.php @@ -3,7 +3,7 @@ * ownCloud - App Framework * * @author Bernhard Posselt, Thomas Tanghus, Bart Visscher - * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com + * @copyright 2012 Bernhard Posselt <dev@bernhard-posselt.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE diff --git a/lib/public/appframework/http/downloadresponse.php b/lib/public/appframework/http/downloadresponse.php index d3c2818e828..6b61490341e 100644 --- a/lib/public/appframework/http/downloadresponse.php +++ b/lib/public/appframework/http/downloadresponse.php @@ -4,7 +4,7 @@ * ownCloud - App Framework * * @author Bernhard Posselt - * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com + * @copyright 2012 Bernhard Posselt <dev@bernhard-posselt.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE diff --git a/lib/public/appframework/http/iresponseserializer.php b/lib/public/appframework/http/iresponseserializer.php new file mode 100644 index 00000000000..c16e106df34 --- /dev/null +++ b/lib/public/appframework/http/iresponseserializer.php @@ -0,0 +1,27 @@ +<?php +/** + * ownCloud - App Framework + * + * @author Bernhard Posselt + * @copyright 2012 Bernhard Posselt <dev@bernhard-posselt.com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE + * License as published by the Free Software Foundation; either + * version 3 of the License, or any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU AFFERO GENERAL PUBLIC LICENSE for more details. + * + * You should have received a copy of the GNU Affero General Public + * License along with this library. If not, see <http://www.gnu.org/licenses/>. + * + */ + +namespace OCP\AppFramework\Http; + +interface IResponseSerializer { + function serialize($response); +}
\ No newline at end of file diff --git a/lib/public/appframework/http/jsonresponse.php b/lib/public/appframework/http/jsonresponse.php index 6d029b7464a..c6360e0a0f5 100644 --- a/lib/public/appframework/http/jsonresponse.php +++ b/lib/public/appframework/http/jsonresponse.php @@ -3,7 +3,7 @@ * ownCloud - App Framework * * @author Bernhard Posselt - * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com + * @copyright 2012 Bernhard Posselt <dev@bernhard-posselt.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE diff --git a/lib/public/appframework/http/redirectresponse.php b/lib/public/appframework/http/redirectresponse.php index 416e1533635..a1b482c6b3b 100644 --- a/lib/public/appframework/http/redirectresponse.php +++ b/lib/public/appframework/http/redirectresponse.php @@ -4,7 +4,7 @@ * ownCloud - App Framework * * @author Bernhard Posselt - * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com + * @copyright 2012 Bernhard Posselt <dev@bernhard-posselt.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE diff --git a/lib/public/appframework/http/response.php b/lib/public/appframework/http/response.php index 45402d9b3b3..20e936bb860 100644 --- a/lib/public/appframework/http/response.php +++ b/lib/public/appframework/http/response.php @@ -3,7 +3,7 @@ * ownCloud - App Framework * * @author Bernhard Posselt, Thomas Tanghus, Bart Visscher - * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com + * @copyright 2012 Bernhard Posselt <dev@bernhard-posselt.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE @@ -92,6 +92,10 @@ class Response { * @return Response Reference to this object */ public function addHeader($name, $value) { + $name = trim($name); // always remove leading and trailing whitespace + // to be able to reliably check for security + // headers + if(is_null($value)) { unset($this->headers[$name]); } else { diff --git a/lib/public/appframework/http/templateresponse.php b/lib/public/appframework/http/templateresponse.php index f5baf788ada..02589f4e2a4 100644 --- a/lib/public/appframework/http/templateresponse.php +++ b/lib/public/appframework/http/templateresponse.php @@ -3,7 +3,7 @@ * ownCloud - App Framework * * @author Bernhard Posselt - * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com + * @copyright 2012 Bernhard Posselt <dev@bernhard-posselt.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE @@ -61,12 +61,16 @@ class TemplateResponse extends Response { * constructor of TemplateResponse * @param string $appName the name of the app to load the template from * @param string $templateName the name of the template + * @param array $params an array of parameters which should be passed to the + * template + * @param string $renderAs how the page should be rendered, defaults to user */ - public function __construct($appName, $templateName) { + public function __construct($appName, $templateName, array $params=array(), + $renderAs='user') { $this->templateName = $templateName; $this->appName = $appName; - $this->params = array(); - $this->renderAs = 'user'; + $this->params = $params; + $this->renderAs = $renderAs; } diff --git a/lib/public/appframework/iapi.php b/lib/public/appframework/iapi.php index c4aeea2d4e5..9af251be850 100644 --- a/lib/public/appframework/iapi.php +++ b/lib/public/appframework/iapi.php @@ -3,7 +3,7 @@ * ownCloud - App Framework * * @author Bernhard Posselt - * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com + * @copyright 2012 Bernhard Posselt <dev@bernhard-posselt.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE diff --git a/lib/public/appframework/middleware.php b/lib/public/appframework/middleware.php index 24f31939935..2e1111e9d5d 100644 --- a/lib/public/appframework/middleware.php +++ b/lib/public/appframework/middleware.php @@ -3,7 +3,7 @@ * ownCloud - App Framework * * @author Bernhard Posselt - * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com + * @copyright 2012 Bernhard Posselt <dev@bernhard-posselt.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE diff --git a/lib/public/backgroundjob.php b/lib/public/backgroundjob.php index 03b94403b47..562228e1e52 100644 --- a/lib/public/backgroundjob.php +++ b/lib/public/backgroundjob.php @@ -94,7 +94,7 @@ class BackgroundJob { /** * @deprecated * gets all regular tasks - * @return associative array + * @return array * * key is string "$klass-$method", value is array( $klass, $method ) */ @@ -115,7 +115,7 @@ class BackgroundJob { * @deprecated * Gets one queued task * @param int $id ID of the task - * @return BackgroundJob\IJob array + * @return BackgroundJob\IJob|null */ public static function findQueuedTask($id) { $jobList = \OC::$server->getJobList(); @@ -125,7 +125,7 @@ class BackgroundJob { /** * @deprecated * Gets all queued tasks - * @return array with associative arrays + * @return array an array of associative arrays */ public static function allQueuedTasks() { $jobList = \OC::$server->getJobList(); @@ -145,7 +145,7 @@ class BackgroundJob { * @deprecated * Gets all queued tasks of a specific app * @param string $app app name - * @return array with associative arrays + * @return array an array of associative arrays */ public static function queuedTaskWhereAppIs($app) { $jobList = \OC::$server->getJobList(); diff --git a/lib/public/backgroundjob/ijoblist.php b/lib/public/backgroundjob/ijoblist.php index c9b546605b8..366b0e37368 100644 --- a/lib/public/backgroundjob/ijoblist.php +++ b/lib/public/backgroundjob/ijoblist.php @@ -12,7 +12,7 @@ interface IJobList { /** * Add a job to the list * - * @param \OCP\BackgroundJob\IJob |string $job + * @param \OCP\BackgroundJob\IJob|string $job * @param mixed $argument The argument to be passed to $job->run() when the job is exectured * @param string $job * @return void @@ -22,7 +22,7 @@ interface IJobList { /** * Remove a job from the list * - * @param IJob $job + * @param \OCP\BackgroundJob\IJob|string $job * @param mixed $argument * @return void */ @@ -31,7 +31,7 @@ interface IJobList { /** * check if a job is in the list * - * @param $job + * @param \OCP\BackgroundJob\IJob|string $job * @param mixed $argument * @return bool */ diff --git a/lib/public/contacts.php b/lib/public/contacts.php index 1b61d7aa4ff..fb88c13bd1b 100644 --- a/lib/public/contacts.php +++ b/lib/public/contacts.php @@ -87,7 +87,7 @@ namespace OCP { * @param string $pattern which should match within the $searchProperties * @param array $searchProperties defines the properties within the query pattern should match * @param array $options - for future use. One should always have options! - * @return array of contacts which are arrays of key-value-pairs + * @return array an array of contacts which are arrays of key-value-pairs */ public static function search($pattern, $searchProperties = array(), $options = array()) { $cm = \OC::$server->getContactsManager(); @@ -98,7 +98,7 @@ namespace OCP { * This function can be used to delete the contact identified by the given id * * @param object $id the unique identifier to a contact - * @param $address_book_key + * @param string $address_book_key * @return bool successful or not */ public static function delete($id, $address_book_key) { @@ -111,12 +111,12 @@ namespace OCP { * Otherwise the contact will be updated by replacing the entire data set. * * @param array $properties this array if key-value-pairs defines a contact - * @param $address_book_key string to identify the address book in which the contact shall be created or updated - * @return array representing the contact just created or updated + * @param string $address_book_key identifier of the address book in which the contact shall be created or updated + * @return array an array representing the contact just created or updated */ public static function createOrUpdate($properties, $address_book_key) { $cm = \OC::$server->getContactsManager(); - return $cm->search($properties, $address_book_key); + return $cm->createOrUpdate($properties, $address_book_key); } /** diff --git a/lib/public/contacts/imanager.php b/lib/public/contacts/imanager.php index 005b71f298b..32559220091 100644 --- a/lib/public/contacts/imanager.php +++ b/lib/public/contacts/imanager.php @@ -88,7 +88,7 @@ namespace OCP\Contacts { * @param string $pattern which should match within the $searchProperties * @param array $searchProperties defines the properties within the query pattern should match * @param array $options - for future use. One should always have options! - * @return array of contacts which are arrays of key-value-pairs + * @return array an array of contacts which are arrays of key-value-pairs */ function search($pattern, $searchProperties = array(), $options = array()); @@ -107,7 +107,7 @@ namespace OCP\Contacts { * * @param array $properties this array if key-value-pairs defines a contact * @param string $address_book_key identifier of the address book in which the contact shall be created or updated - * @return array representing the contact just created or updated + * @return array an array representing the contact just created or updated */ function createOrUpdate($properties, $address_book_key); diff --git a/lib/public/db.php b/lib/public/db.php index cb876b4d1f9..ba3a4724ce0 100644 --- a/lib/public/db.php +++ b/lib/public/db.php @@ -50,7 +50,7 @@ class DB { /** * Insert a row if a matching row doesn't exists. * @param string $table The optional table name (will replace *PREFIX*) and add sequence suffix - * @param $input array + * @param array $input * * The input array if in the form: * diff --git a/lib/public/files/fileinfo.php b/lib/public/files/fileinfo.php index 37162e09336..bf0c31918cb 100644 --- a/lib/public/files/fileinfo.php +++ b/lib/public/files/fileinfo.php @@ -104,7 +104,7 @@ interface FileInfo { /** * Check whether this is a file or a folder * - * @return \OCP\Files\FileInfo::TYPE_FILE | \OCP\Files\FileInfo::TYPE_FOLDER + * @return \OCP\Files\FileInfo::TYPE_FILE|\OCP\Files\FileInfo::TYPE_FOLDER */ public function getType(); diff --git a/lib/public/iaddressbook.php b/lib/public/iaddressbook.php index dcfe08012e6..70309e8c57a 100644 --- a/lib/public/iaddressbook.php +++ b/lib/public/iaddressbook.php @@ -45,7 +45,7 @@ namespace OCP { * @param string $pattern which should match within the $searchProperties * @param array $searchProperties defines the properties within the query pattern should match * @param array $options - for future use. One should always have options! - * @return array of contacts which are arrays of key-value-pairs + * @return array an array of contacts which are arrays of key-value-pairs */ public function search($pattern, $searchProperties, $options); // // dummy results @@ -56,7 +56,7 @@ namespace OCP { /** * @param array $properties this array if key-value-pairs defines a contact - * @return array representing the contact just created or updated + * @return array an array representing the contact just created or updated */ public function createOrUpdate($properties); // // dummy diff --git a/lib/public/iappconfig.php b/lib/public/iappconfig.php index 2b014df2e42..16c0752f073 100644 --- a/lib/public/iappconfig.php +++ b/lib/public/iappconfig.php @@ -45,7 +45,7 @@ interface IAppConfig { /** * @brief Get the available keys for an app * @param string $app the app we are looking for - * @return array with key names + * @return array an array of key names * * This function gets all keys of an app. Please note that the values are * not returned. @@ -74,7 +74,7 @@ interface IAppConfig { /** * @brief Get all apps using the config - * @return array with app ids + * @return array an array of app ids * * This function returns a list of all apps that have at least one * entry in the appconfig table. diff --git a/lib/public/iavatar.php b/lib/public/iavatar.php index 43fa32556de..fc7e8e79fed 100644 --- a/lib/public/iavatar.php +++ b/lib/public/iavatar.php @@ -15,7 +15,7 @@ interface IAvatar { /** * @brief get the users avatar - * @param $size integer size in px of the avatar, avatars are square, defaults to 64 + * @param int $size size in px of the avatar, avatars are square, defaults to 64 * @return boolean|\OC_Image containing the avatar or false if there's no image */ function get($size = 64); diff --git a/lib/public/iavatarmanager.php b/lib/public/iavatarmanager.php index 9b185ae0467..b09b456a0da 100644 --- a/lib/public/iavatarmanager.php +++ b/lib/public/iavatarmanager.php @@ -16,7 +16,7 @@ interface IAvatarManager { /** * @brief return a user specific instance of \OCP\IAvatar * @see \OCP\IAvatar - * @param $user string the ownCloud user id + * @param string $user the ownCloud user id * @return \OCP\IAvatar */ function getAvatar($user); diff --git a/lib/public/idb.php b/lib/public/idb.php new file mode 100644 index 00000000000..82a8a681500 --- /dev/null +++ b/lib/public/idb.php @@ -0,0 +1,51 @@ +<?php + +/** + * ownCloud - App Framework + * + * @author Bernhard Posselt + * @copyright 2012 Bernhard Posselt dev@bernhard-posselt.com + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE + * License as published by the Free Software Foundation; either + * version 3 of the License, or any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU AFFERO GENERAL PUBLIC LICENSE for more details. + * + * You should have received a copy of the GNU Affero General Public + * License along with this library. If not, see <http://www.gnu.org/licenses/>. + * + */ + +namespace OCP; + + +/** + * Small Facade for being able to inject the database connection for tests + */ +interface IDb { + + + /** + * Used to abstract the owncloud database access away + * @param string $sql the sql query with ? placeholder for params + * @param int $limit the maximum number of rows + * @param int $offset from which row we want to start + * @return \OC_DB_StatementWrapper prepared SQL query + */ + public function prepareQuery($sql, $limit=null, $offset=null); + + + /** + * Used to get the id of the just inserted element + * @param string $tableName the name of the table where we inserted the item + * @return int the id of the inserted element + */ + public function getInsertId($tableName); + + +} diff --git a/lib/public/idbconnection.php b/lib/public/idbconnection.php index 656b5e7e5b2..3e6624e07e9 100644 --- a/lib/public/idbconnection.php +++ b/lib/public/idbconnection.php @@ -52,8 +52,8 @@ interface IDBConnection { /** * Insert a row if a matching row doesn't exists. - * @param string The table name (will replace *PREFIX*) to perform the replace on. - * @param array + * @param string $table The table name (will replace *PREFIX*) to perform the replace on. + * @param array $input * * The input array if in the form: * diff --git a/lib/public/il10n.php b/lib/public/il10n.php index 1388274c21a..c228be6a0a3 100644 --- a/lib/public/il10n.php +++ b/lib/public/il10n.php @@ -53,7 +53,7 @@ interface IL10N { * Localization * @param string $type Type of localization * @param array $data parameters for this localization - * @return String or false + * @return string|false * * Returns the localized data. * diff --git a/lib/public/ilogger.php b/lib/public/ilogger.php new file mode 100644 index 00000000000..ad0fcd05a1d --- /dev/null +++ b/lib/public/ilogger.php @@ -0,0 +1,101 @@ +<?php +/** + * Copyright (c) 2014 Bernhard Posselt <dev@bernhard-posselt.com> + * This file is licensed under the Affero General Public License version 3 or + * later. + * See the COPYING-README file. + */ + +namespace OCP; + +/** + * Interface ILogger + * @package OCP + * + * This logger interface follows the design guidelines of PSR-3 + * https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-3-logger-interface.md#3-psrlogloggerinterface + */ +interface ILogger { + /** + * System is unusable. + * + * @param string $message + * @param array $context + * @return null + */ + function emergency($message, array $context = array()); + + /** + * Action must be taken immediately. + * + * @param string $message + * @param array $context + * @return null + */ + function alert($message, array $context = array()); + + /** + * Critical conditions. + * + * @param string $message + * @param array $context + * @return null + */ + function critical($message, array $context = array()); + + /** + * Runtime errors that do not require immediate action but should typically + * be logged and monitored. + * + * @param string $message + * @param array $context + * @return null + */ + function error($message, array $context = array()); + + /** + * Exceptional occurrences that are not errors. + * + * @param string $message + * @param array $context + * @return null + */ + function warning($message, array $context = array()); + + /** + * Normal but significant events. + * + * @param string $message + * @param array $context + * @return null + */ + function notice($message, array $context = array()); + + /** + * Interesting events. + * + * @param string $message + * @param array $context + * @return null + */ + function info($message, array $context = array()); + + /** + * Detailed debug information. + * + * @param string $message + * @param array $context + * @return null + */ + function debug($message, array $context = array()); + + /** + * Logs with an arbitrary level. + * + * @param mixed $level + * @param string $message + * @param array $context + * @return mixed + */ + function log($level, $message, array $context = array()); +} diff --git a/lib/public/iservercontainer.php b/lib/public/iservercontainer.php index 600d81d83af..22176c36b8a 100644 --- a/lib/public/iservercontainer.php +++ b/lib/public/iservercontainer.php @@ -113,6 +113,14 @@ interface IServerContainer { */ function getConfig(); + + /** + * Returns an instance of the db facade + * @return \OCP\IDb + */ + function getDb(); + + /** * Returns the app config manager * diff --git a/lib/public/itags.php b/lib/public/itags.php index f8ebaa668f1..1cba07e9b53 100644 --- a/lib/public/itags.php +++ b/lib/public/itags.php @@ -62,7 +62,7 @@ interface ITags { * ['id' => 1, 'name' = 'Second tag'], * ] * - * @returns array + * @return array */ public function getTags(); diff --git a/lib/public/route/iroute.php b/lib/public/route/iroute.php index d5610e762a8..f511e7af720 100644 --- a/lib/public/route/iroute.php +++ b/lib/public/route/iroute.php @@ -26,7 +26,7 @@ interface IRoute { * The action to execute when this route matches, includes a file like * it is called directly * - * @param $file + * @param string $file * @return void */ public function actionInclude($file); diff --git a/lib/public/share.php b/lib/public/share.php index b21b3a7b963..33c5069ac57 100644 --- a/lib/public/share.php +++ b/lib/public/share.php @@ -92,13 +92,13 @@ class Share extends \OC\Share\Constants { /** * Get the items of item type shared with a user - * @param string Item type - * @param sting user id for which user we want the shares - * @param int Format (optional) Format type must be defined by the backend - * @param mixed Parameters (optional) - * @param int Number of items to return (optional) Returns all by default - * @param bool include collections (optional) - * @return Return depends on format + * @param string $itemType + * @param string $user for which user we want the shares + * @param int $format (optional) Format type must be defined by the backend + * @param mixed $parameters (optional) + * @param int $limit Number of items to return (optional) Returns all by default + * @param bool $includeCollections (optional) + * @return mixed Return depends on format */ public static function getItemsSharedWithUser($itemType, $user, $format = self::FORMAT_NONE, $parameters = null, $limit = -1, $includeCollections = false) { @@ -111,8 +111,8 @@ class Share extends \OC\Share\Constants { * @param string $itemType * @param string $itemTarget * @param int $format (optional) Format type must be defined by the backend - * @param mixed Parameters (optional) - * @param bool include collections (optional) + * @param mixed $parameters (optional) + * @param bool $includeCollections (optional) * @return mixed Return depends on format */ public static function getItemSharedWith($itemType, $itemTarget, $format = self::FORMAT_NONE, @@ -160,7 +160,7 @@ class Share extends \OC\Share\Constants { /** * Based on the given token the share information will be returned - password protected shares will be verified * @param string $token - * @return array | bool false will be returned in case the token is unknown or unauthorized + * @return array|bool false will be returned in case the token is unknown or unauthorized */ public static function getShareByToken($token, $checkPasswordProtection = true) { return \OC\Share\Share::getShareByToken($token, $checkPasswordProtection); @@ -168,8 +168,8 @@ class Share extends \OC\Share\Constants { /** * resolves reshares down to the last real share - * @param $linkItem - * @return $fileOwner + * @param array $linkItem + * @return array file owner */ public static function resolveReShare($linkItem) { return \OC\Share\Share::resolveReShare($linkItem); @@ -213,7 +213,7 @@ class Share extends \OC\Share\Constants { * @param string $uidOwner * @param bool $includeCollections * @param bool $checkExpireDate - * @return Return array of users + * @return array Return array of users */ public static function getUsersItemShared($itemType, $itemSource, $uidOwner, $includeCollections = false, $checkExpireDate = true) { return \OC\Share\Share::getUsersItemShared($itemType, $itemSource, $uidOwner, $includeCollections, $checkExpireDate); diff --git a/lib/public/template.php b/lib/public/template.php index 6cc984b12d5..b1264e0c3ad 100644 --- a/lib/public/template.php +++ b/lib/public/template.php @@ -33,8 +33,8 @@ namespace OCP; /** * Make OC_Helper::imagePath available as a simple function - * @param string app - * @param string image + * @param string $app + * @param string $image * @return string to the image * * @see OC_Helper::imagePath @@ -46,7 +46,7 @@ function image_path( $app, $image ) { /** * Make OC_Helper::mimetypeIcon available as a simple function - * @param string mimetype + * @param string $mimetype * @return string to the image of this file type. */ function mimetype_icon( $mimetype ) { @@ -55,7 +55,7 @@ function mimetype_icon( $mimetype ) { /** * Make preview_icon available as a simple function - * @param string path of file + * @param string $path path to file * @return string to the preview of the image */ function preview_icon( $path ) { @@ -76,7 +76,7 @@ function publicPreview_icon ( $path, $token ) { /** * Make OC_Helper::humanFileSize available as a simple function * Example: 2048 to 2 kB. - * @param int size in bytes + * @param int $size in bytes * @return string size as string */ function human_file_size( $bytes ) { @@ -86,8 +86,8 @@ function human_file_size( $bytes ) { /** * Return the relative date in relation to today. Returns something like "last hour" or "two month ago" - * @param int unix timestamp - * @param boolean date only + * @param int $timestamp unix timestamp + * @param boolean $dateOnly * @return OC_L10N_String human readable interpretation of the timestamp */ function relative_modified_date( $timestamp, $dateOnly = false ) { @@ -98,7 +98,7 @@ function relative_modified_date( $timestamp, $dateOnly = false ) { /** * Return a human readable outout for a file size. * @deprecated human_file_size() instead - * @param integer size of a file in byte + * @param integer $bytes size of a file in byte * @return string human readable interpretation of a file size */ function simple_file_size($bytes) { @@ -108,9 +108,9 @@ function simple_file_size($bytes) { /** * Generate html code for an options block. - * @param $options the options - * @param $selected which one is selected? - * @param array the parameters + * @param array $options the options + * @param mixed $selected which one is selected? + * @param array $params the parameters * @return string html options */ function html_select_options($options, $selected, $params=array()) { diff --git a/lib/public/user.php b/lib/public/user.php index 7bac938b838..925410d37d5 100644 --- a/lib/public/user.php +++ b/lib/public/user.php @@ -45,10 +45,10 @@ class User { /** * Get a list of all users - * @param string search pattern - * @param integer $limit - * @param integer $offset - * @return array with all uids + * @param string $search search pattern + * @param int|null $limit + * @param int|null $offset + * @return array an array of all uids */ public static function getUsers( $search = '', $limit = null, $offset = null ) { return \OC_User::getUsers( $search, $limit, $offset ); @@ -56,7 +56,7 @@ class User { /** * Get the user display name of the user currently logged in. - * @param string user id or null for current user + * @param string|null $user user id or null for current user * @return string display name */ public static function getDisplayName( $user = null ) { @@ -65,10 +65,10 @@ class User { /** * Get a list of all display names and user ids. - * @param string search pattern - * @param int limit - * @param int offset - * @return array with all display names (value) and the correspondig uids (key) + * @param string $search search pattern + * @param int|null $limit + * @param int|null $offset + * @return array an array of all display names (value) and the correspondig uids (key) */ public static function getDisplayNames( $search = '', $limit = null, $offset = null ) { return \OC_User::getDisplayNames( $search, $limit, $offset ); diff --git a/lib/public/util.php b/lib/public/util.php index 3b0fc09f7e5..8aeb03aef8e 100644 --- a/lib/public/util.php +++ b/lib/public/util.php @@ -203,7 +203,7 @@ class Util { /** * Creates an url using a defined route - * @param $route + * @param string $route * @param array $parameters * @internal param array $args with param=>value, will be appended to the returned url * @return string the url @@ -293,7 +293,7 @@ class Util { /** * Returns the script name, even if the website uses one or more reverse proxies - * @returns string the script name + * @return string the script name */ public static function getScriptName() { return(\OC_Request::scriptName()); @@ -380,8 +380,8 @@ class Util { * This function is used to sanitize HTML and should be applied on any * string or array of strings before displaying it on a web page. * - * @param string|array of strings - * @return array with sanitized strings or a single sinitized string, depends on the input parameter. + * @param string|array $value + * @return string|array an array of sanitized strings or a single sinitized string, depends on the input parameter. */ public static function sanitizeHTML( $value ) { return(\OC_Util::sanitizeHTML($value)); @@ -458,7 +458,7 @@ class Util { * * @param string $dir the current folder where the user currently operates * @param int $free the number of bytes free on the storage holding $dir, if not set this will be received from the storage directly - * @return number of bytes representing + * @return int number of bytes representing */ public static function maxUploadFilesize($dir, $free = null) { return \OC_Helper::maxUploadFilesize($dir, $free); @@ -476,7 +476,7 @@ class Util { /** * Calculate PHP upload limit * - * @return number of bytes representing + * @return int number of bytes representing */ public static function uploadLimit() { return \OC_Helper::uploadLimit(); @@ -484,7 +484,7 @@ class Util { /** * Returns whether the given file name is valid - * @param $file string file name to check + * @param string $file file name to check * @return bool true if the file name is valid, false otherwise */ public static function isValidFileName($file) { @@ -493,8 +493,8 @@ class Util { /** * @brief Generates a cryptographic secure pseudo-random string - * @param Int $length of the random string - * @return String + * @param int $length of the random string + * @return string */ public static function generateRandomBytes($length = 30) { return \OC_Util::generateRandomBytes($length); diff --git a/settings/ajax/decryptall.php b/settings/ajax/decryptall.php index d12df230d41..55685f778d1 100644 --- a/settings/ajax/decryptall.php +++ b/settings/ajax/decryptall.php @@ -10,7 +10,7 @@ OC_App::loadApp('files_encryption'); $params = array('uid' => \OCP\User::getUser(), 'password' => $_POST['password']); -$view = new OC_FilesystemView('/'); +$view = new OC\Files\View('/'); $util = new \OCA\Encryption\Util($view, \OCP\User::getUser()); $l = \OC_L10N::get('settings'); diff --git a/settings/ajax/deletekeys.php b/settings/ajax/deletekeys.php new file mode 100644 index 00000000000..1f84452e117 --- /dev/null +++ b/settings/ajax/deletekeys.php @@ -0,0 +1,17 @@ +<?php + +OCP\JSON::checkLoggedIn(); +OCP\JSON::callCheck(); + +$l = \OC_L10N::get('settings'); +$user = \OC_User::getUser(); +$view = new \OC\Files\View('/' . $user . '/files_encryption'); + +$keyfilesDeleted = $view->deleteAll('keyfiles.backup'); +$sharekeysDeleted = $view->deleteAll('share-keys.backup'); + +if ($keyfilesDeleted && $sharekeysDeleted) { + \OCP\JSON::success(array('data' => array('message' => $l->t('Encryption keys deleted permanently')))); +} else { + \OCP\JSON::error(array('data' => array('message' => $l->t('Couldn\'t permanently delete your encryption keys, please check your owncloud.log or ask your administrator')))); +} diff --git a/settings/ajax/restorekeys.php b/settings/ajax/restorekeys.php new file mode 100644 index 00000000000..68e19c90457 --- /dev/null +++ b/settings/ajax/restorekeys.php @@ -0,0 +1,24 @@ +<?php + +OCP\JSON::checkLoggedIn(); +OCP\JSON::callCheck(); + +$l = \OC_L10N::get('settings'); +$user = \OC_User::getUser(); +$view = new \OC\Files\View('/' . $user . '/files_encryption'); + +$keyfilesRestored = $view->rename('keyfiles.backup', 'keyfiles'); +$sharekeysRestored = $view->rename('share-keys.backup' , 'share-keys'); + +if ($keyfilesRestored && $sharekeysRestored) { + \OCP\JSON::success(array('data' => array('message' => $l->t('Backups restored successfully')))); +} else { + // if one of the move operation was succesful we remove the files back to have a consistent state + if($keyfilesRestored) { + $view->rename('keyfiles', 'keyfiles.backup'); + } + if($sharekeysRestored) { + $view->rename('share-keys' , 'share-keys.backup'); + } + \OCP\JSON::error(array('data' => array('message' => $l->t('Couldn\'t restore your encryption keys, please check your owncloud.log or ask your administrator')))); +} diff --git a/settings/changepassword/controller.php b/settings/changepassword/controller.php index 9f1e7329964..052715555e5 100644 --- a/settings/changepassword/controller.php +++ b/settings/changepassword/controller.php @@ -52,7 +52,7 @@ class Controller { if (\OC_App::isEnabled('files_encryption')) { //handle the recovery case - $util = new \OCA\Encryption\Util(new \OC_FilesystemView('/'), $username); + $util = new \OCA\Encryption\Util(new \OC\Files\View('/'), $username); $recoveryAdminEnabled = \OC_Appconfig::getValue('files_encryption', 'recoveryAdminEnabled'); $validRecoveryPassword = false; diff --git a/settings/js/personal.js b/settings/js/personal.js index c1f1ef7466b..f297e3c1b1a 100644 --- a/settings/js/personal.js +++ b/settings/js/personal.js @@ -212,17 +212,30 @@ $(document).ready(function(){ OC.Encryption.decryptAll(privateKeyPassword); }); + + $('button:button[name="submitRestoreKeys"]').click(function() { + $('#restoreBackupKeys button:button[name="submitDeleteKeys"]').prop("disabled", true); + $('#restoreBackupKeys button:button[name="submitRestoreKeys"]').prop("disabled", true); + OC.Encryption.restoreKeys(); + }); + + $('button:button[name="submitDeleteKeys"]').click(function() { + $('#restoreBackupKeys button:button[name="submitDeleteKeys"]').prop("disabled", true); + $('#restoreBackupKeys button:button[name="submitRestoreKeys"]').prop("disabled", true); + OC.Encryption.deleteKeys(); + }); + $('#decryptAll input:password[name="privateKeyPassword"]').keyup(function(event) { var privateKeyPassword = $('#decryptAll input:password[id="privateKeyPassword"]').val(); if (privateKeyPassword !== '' ) { - $('#decryptAll button:button[name="submitDecryptAll"]').removeAttr("disabled"); + $('#decryptAll button:button[name="submitDecryptAll"]').prop("disabled", false); if(event.which === 13) { $('#decryptAll button:button[name="submitDecryptAll"]').prop("disabled", true); $('#decryptAll input:password[name="privateKeyPassword"]').prop("disabled", true); OC.Encryption.decryptAll(privateKeyPassword); } } else { - $('#decryptAll button:button[name="submitDecryptAll"]').attr("disabled", "true"); + $('#decryptAll button:button[name="submitDecryptAll"]').prop("disabled", true); } }); @@ -294,29 +307,59 @@ $(document).ready(function(){ OC.Encryption = { decryptAll: function(password) { - OC.Encryption.msg.startDecrypting('#decryptAll .msg'); + var message = t('settings', 'Decrypting files... Please wait, this can take some time.'); + OC.Encryption.msg.start('#decryptAll .msg', message); $.post('ajax/decryptall.php', {password:password}, function(data) { if (data.status === "error") { - OC.Encryption.msg.finishedDecrypting('#decryptAll .msg', data); - $('#decryptAll input:password[name="privateKeyPassword"]').removeAttr("disabled"); + OC.Encryption.msg.finished('#decryptAll .msg', data); + $('#decryptAll input:password[name="privateKeyPassword"]').prop("disabled", false); + } else { + OC.Encryption.msg.finished('#decryptAll .msg', data); + } + $('#restoreBackupKeys').removeClass('hidden'); + }); + }, + + deleteKeys: function() { + var message = t('settings', 'Delete encryptin keys permanently.'); + OC.Encryption.msg.start('#restoreBackupKeys .msg', message); + $.post('ajax/deletekeys.php', null, function(data) { + if (data.status === "error") { + OC.Encryption.msg.finished('#restoreBackupKeys .msg', data); + $('#restoreBackupKeys button:button[name="submitDeleteKeys"]').prop("disabled", false); + $('#restoreBackupKeys button:button[name="submitRestoreKeys"]').prop("disabled", false); + } else { + OC.Encryption.msg.finished('#restoreBackupKeys .msg', data); + } + }); + }, + + restoreKeys: function() { + var message = t('settings', 'Restore encryptin keys.'); + OC.Encryption.msg.start('#restoreBackupKeys .msg', message); + $.post('ajax/restorekeys.php', {}, function(data) { + if (data.status === "error") { + OC.Encryption.msg.finished('#restoreBackupKeys .msg', data); + $('#restoreBackupKeys button:button[name="submitDeleteKeys"]').prop("disabled", false); + $('#restoreBackupKeys button:button[name="submitRestoreKeys"]').prop("disabled", false); } else { - OC.Encryption.msg.finishedDecrypting('#decryptAll .msg', data); + OC.Encryption.msg.finished('#restoreBackupKeys .msg', data); } }); } }; OC.Encryption.msg={ - startDecrypting:function(selector){ + start:function(selector, msg){ var spinner = '<img src="'+ OC.imagePath('core', 'loading-small.gif') +'">'; $(selector) - .html( t('settings', 'Decrypting files... Please wait, this can take some time.') + ' ' + spinner ) + .html( msg + ' ' + spinner ) .removeClass('success') .removeClass('error') .stop(true, true) .show(); }, - finishedDecrypting:function(selector, data){ + finished:function(selector, data){ if( data.status === "success" ){ $(selector).html( data.data.message ) .addClass('success') diff --git a/settings/l10n/da.php b/settings/l10n/da.php index 0a755da9fd3..d4f1ae21940 100644 --- a/settings/l10n/da.php +++ b/settings/l10n/da.php @@ -101,6 +101,8 @@ $TRANSLATIONS = array( "Allow users to share with anyone" => "Tillad brugere at dele med alle", "Allow users to only share with users in their groups" => "Tillad brugere at kun dele med brugerne i deres grupper", "Allow mail notification" => "Tillad mail underretninger", +"Expire after " => "Udløber efter", +"days" => "dage", "Security" => "Sikkerhed", "Enforce HTTPS" => "Gennemtving HTTPS", "Forces the clients to connect to %s via an encrypted connection." => "Tving klienten til at forbinde til %s via en kryptetet forbindelse.", diff --git a/settings/l10n/el.php b/settings/l10n/el.php index 1ca97b63da8..9daa0a5e092 100644 --- a/settings/l10n/el.php +++ b/settings/l10n/el.php @@ -111,6 +111,8 @@ $TRANSLATIONS = array( "Allow users to share with anyone" => "ΕπιτÏÎπεται στους χÏήστες ο διαμοιÏασμός με οποιονδήποτε", "Allow users to only share with users in their groups" => "ΕπιτÏÎπεται στους χÏήστες ο διαμοιÏασμός μόνο με χÏήστες της ίδιας ομάδας", "Allow mail notification" => "ΕπιτÏÎπονται ειδοποιήσεις ηλεκτÏÎ¿Î½Î¹ÎºÎ¿Ï Ï„Î±Ï‡Ï…Î´Ïομείου", +"Allow users to send mail notification for shared files" => "ΕπιτÏÎψτε στους χÏήστες να στÎλνουν ειδοποιήσεις μÎσω ηλεκτÏÎ¿Î½Î¹ÎºÎ¿Ï Ï„Î±Ï‡Ï…Î´Ïομείου για κοινόχÏηστα αÏχεία", +"days" => "ημÎÏες", "Security" => "Ασφάλεια", "Enforce HTTPS" => "Επιβολή χÏήσης HTTPS", "Forces the clients to connect to %s via an encrypted connection." => "Επιβάλλει τους πελάτες να συνδÎονται στο %s μÎσω κÏυπτογÏαφημÎνης σÏνδεσης.", diff --git a/settings/l10n/km.php b/settings/l10n/km.php index 679c7cd3901..3db4708be35 100644 --- a/settings/l10n/km.php +++ b/settings/l10n/km.php @@ -1,6 +1,11 @@ <?php $TRANSLATIONS = array( +"Saved" => "បាន​រក្សាទុក", +"test email settings" => "សាក​ល្បង​ការ​កំណážáŸ‹â€‹áž¢áŸŠáž¸áž˜áŸ‚áž›", +"If you received this email, the settings seem to be correct." => "ប្រសិន​បើ​អ្នក​ទទួល​បាន​អ៊ីមែល​នáŸáŸ‡ មាន​នáŸáž™â€‹ážáž¶â€‹áž€áž¶ážšâ€‹áž€áŸ†ážŽážáŸ‹â€‹áž‚ឺ​បាន​ážáŸ’រឹមម​ážáŸ’រូវ​ហើយ។", +"A problem occurred while sending the e-mail. Please revisit your settings." => "មាន​កំហុស​កើážâ€‹áž¡áž¾áž„​នៅ​ពáŸáž›â€‹áž€áŸ†áž–ុង​ផ្ញើ​អ៊ីមែល​ចáŸáž‰áŸ” សូម​មើល​ការ​កំណážáŸ‹â€‹ážšáž”ស់​អ្នក​ម្ដង​ទៀážáŸ”", "Email sent" => "បាន​ផ្ញើ​អ៊ីមែល", +"You need to set your user email before being able to send test emails." => "អ្នក​ážáŸ’រូវ​ážáŸ‚​កំណážáŸ‹â€‹áž¢áŸŠáž¸áž˜áŸ‚ល​របស់​អ្នក​មុន​នឹង​អាច​ផ្ញើ​អ៊ីមែល​សាកល្បង​បាន។", "Encryption" => "កូដនីយកម្ម", "Unable to load list from App Store" => "មិនអាចផ្ទុកបញ្ជីកម្មវិធីពី App Store", "Authentication error" => "កំហុស​ការ​ផ្ទៀង​ផ្ទាážáŸ‹â€‹áž—ាព​ážáŸ’រឹម​ážáŸ’រូវ", @@ -16,7 +21,10 @@ $TRANSLATIONS = array( "Unable to add user to group %s" => "មិន​អាច​បន្ážáŸ‚ម​អ្នក​ប្រើ​ទៅ​ក្រុម %s", "Unable to remove user from group %s" => "មិន​អាច​ដក​អ្នក​ប្រើ​ចáŸáž‰â€‹áž–ី​ក្រុម​ %s", "Couldn't update app." => "មិន​អាច​ធ្វើ​បច្ចុប្បន្នភាព​កម្មវិធី។", +"Wrong password" => "ážáž»ážŸâ€‹áž–ាក្យ​សម្ងាážáŸ‹", +"Sending..." => "កំពុង​ផ្ញើ...", "User Documentation" => "ឯកសារ​សម្រាប់​អ្នក​ប្រើប្រាស់", +"Admin Documentation" => "កម្រង​ឯកសារ​អភិបាល", "Update to {appversion}" => "ធ្វើ​បច្ចុប្បន្នភាព​ទៅ {appversion}", "Disable" => "បិទ", "Enable" => "បើក", @@ -26,6 +34,12 @@ $TRANSLATIONS = array( "Error" => "កំហុស", "Update" => "ធ្វើ​បច្ចុប្បន្នភាព", "Updated" => "បាន​ធ្វើ​បច្ចុប្បន្នភាព", +"Select a profile picture" => "ជ្រើស​រូបភាព​ប្រវážáŸ’ážáž·ážšáž¼áž”", +"Very weak password" => "ពាក្យ​សម្ងាážáŸ‹â€‹ážáŸ’សោយ​ណាស់", +"Weak password" => "ពាក្យ​សម្ងាážáŸ‹â€‹ážáŸ’សោយ", +"So-so password" => "ពាក្យ​សម្ងាážáŸ‹â€‹áž’ម្មážáž¶", +"Good password" => "ពាក្យ​សម្ងាážáŸ‹â€‹áž›áŸ’អ", +"Strong password" => "ពាក្យ​សម្ងាážáŸ‹â€‹ážáŸ’លាំង", "deleted" => "បាន​លុប", "undo" => "មិន​ធ្វើ​វិញ", "Unable to remove user" => "មិន​អាច​ដក​អ្នក​ប្រើ​ចáŸáž‰", @@ -37,7 +51,10 @@ $TRANSLATIONS = array( "Error creating user" => "មាន​កំហុស​ក្នុង​ការ​បង្កើážâ€‹áž¢áŸ’នក​ប្រើ", "A valid password must be provided" => "ážáŸ’រូវ​ផ្ដល់​ពាក្យ​សម្ងាážáŸ‹â€‹áž²áŸ’យ​បាន​ážáŸ’រឹម​ážáŸ’រូវ", "__language_name__" => "__language_name__", +"None" => "គ្មាន", "Login" => "ចូល", +"SSL" => "SSL", +"TLS" => "TLS", "Security Warning" => "បម្រាម​សុវážáŸ’ážáž·áž—ាព", "Setup Warning" => "បម្រាម​ការ​ដំឡើង", "Module 'fileinfo' missing" => "ážáŸ’វះ​ម៉ូឌុល 'fileinfo'", @@ -49,11 +66,15 @@ $TRANSLATIONS = array( "Allow apps to use the Share API" => "អនុញ្ញាážâ€‹áž²áŸ’យ​កម្មវិធី​ប្រើ API ចែក​រំលែក", "Allow links" => "អនុញ្ញាážâ€‹ážáŸ†ážŽ", "Allow users to share items to the public with links" => "អនុញ្ញាážâ€‹áž²áŸ’យ​អ្នក​ប្រើ​ចែក​រំលែក​របស់​ទៅ​សាធារណៈ​ជាមួយ​ážáŸ†ážŽ", +"Allow public uploads" => "អនុញ្ញាážâ€‹áž€áž¶ážšâ€‹áž•áŸ’ទុក​ឡើង​ជា​សាធារណៈ", "Allow resharing" => "អនុញ្ញាážâ€‹áž€áž¶ážšâ€‹áž…ែក​រំលែក​ម្ដង​ទៀáž", "Allow users to share with anyone" => "អនុញ្ញាážâ€‹áž²áŸ’យ​អ្នក​ប្រើ​ចែក​រំលែក​ជាមួយ​នរណា​ម្នាក់", "Security" => "សុវážáŸ’ážáž·áž—ាព", "Enforce HTTPS" => "បង្ážáŸ† HTTPS", +"Email Server" => "ម៉ាស៊ីន​បម្រើ​អ៊ីមែល", +"From address" => "ពី​អាសយដ្ឋាន", "Server address" => "អាសយដ្ឋាន​ម៉ាស៊ីន​បម្រើ", +"Send email" => "ផ្ញើ​អ៊ីមែល", "Log" => "Log", "Log level" => "កម្រិហLog", "More" => "ច្រើន​ទៀáž", @@ -67,18 +88,30 @@ $TRANSLATIONS = array( "Forum" => "ážœáŸáž‘ិកាពិភាក្សា", "Bugtracker" => "Bugtracker", "Password" => "ពាក្យសម្ងាážáŸ‹", +"Your password was changed" => "ពាក្យ​សម្ងាážáŸ‹â€‹ážšáž”ស់​អ្នក​ážáŸ’រូវ​បាន​ប្ដូរ", +"Unable to change your password" => "មិន​អាច​ប្ដូរ​ពាក្យ​សម្ងាážáŸ‹â€‹ážšáž”ស់​អ្នក​បាន​ទáŸ", "Current password" => "ពាក្យសម្ងាážáŸ‹â€‹áž”ច្ចុប្បន្ន", "New password" => "ពាក្យ​សម្ងាážáŸ‹â€‹ážáŸ’មី", "Change password" => "ប្ážáž¼ážšâ€‹áž–ាក្យសម្ងាážáŸ‹", "Email" => "អ៊ីមែល", "Your email address" => "អ៊ីម៉ែល​របស់​អ្នក", +"Profile picture" => "រូបភាព​ប្រវážáŸ’ážáž·ážšáž¼áž”", +"Upload new" => "ផ្ទុកឡើង​ážáŸ’មី", +"Select new from Files" => "ជ្រើស​ážáŸ’មី​ពី​ឯកសារ", +"Remove image" => "ដក​រូបភាព​ចáŸáž‰", "Cancel" => "លើកលែង", "Language" => "ភាសា", "Help translate" => "ជួយ​បក​ប្រែ", "WebDAV" => "WebDAV", +"Log-in password" => "ពាក្យ​សម្ងាážáŸ‹â€‹áž…ូល​គណនី", "Login Name" => "ចូល", "Create" => "បង្កើáž", +"Default Storage" => "ឃ្លាំង​ផ្ទុក​លំនាំ​ដើម", +"Unlimited" => "មិន​កំណážáŸ‹", "Other" => "ផ្សáŸáž„ៗ", -"Username" => "ឈ្មោះ​អ្នកប្រើ" +"Username" => "ឈ្មោះ​អ្នកប្រើ", +"Storage" => "ឃ្លាំង​ផ្ទុក", +"set new password" => "កំណážáŸ‹â€‹áž–ាក្យ​សម្ងាážáŸ‹â€‹ážáŸ’មី", +"Default" => "លំនាំ​ដើម" ); $PLURAL_FORMS = "nplurals=1; plural=0;"; diff --git a/settings/personal.php b/settings/personal.php index 0da14a8c8c4..47b2dc1a46a 100644 --- a/settings/personal.php +++ b/settings/personal.php @@ -33,7 +33,9 @@ $userLang=OC_Preferences::getValue( OC_User::getUser(), 'core', 'lang', OC_L10N: $languageCodes=OC_L10N::findAvailableLanguages(); //check if encryption was enabled in the past -$enableDecryptAll = OC_Util::encryptedFiles(); +$filesStillEncrypted = OC_Util::encryptedFiles(); +$backupKeysExists = OC_Util::backupKeysExists(); +$enableDecryptAll = $filesStillEncrypted || $backupKeysExists; // array of common languages $commonlangcodes = array( @@ -92,6 +94,8 @@ $tmpl->assign('passwordChangeSupported', OC_User::canUserChangePassword(OC_User: $tmpl->assign('displayNameChangeSupported', OC_User::canUserChangeDisplayName(OC_User::getUser())); $tmpl->assign('displayName', OC_User::getDisplayName()); $tmpl->assign('enableDecryptAll' , $enableDecryptAll); +$tmpl->assign('backupKeysExists' , $backupKeysExists); +$tmpl->assign('filesStillEncrypted' , $filesStillEncrypted); $tmpl->assign('enableAvatars', \OC_Config::getValue('enable_avatars', true)); $tmpl->assign('avatarChangeSupported', OC_User::canUserChangeAvatar(OC_User::getUser())); diff --git a/settings/routes.php b/settings/routes.php index a8bb0d981e8..21d406beeca 100644 --- a/settings/routes.php +++ b/settings/routes.php @@ -54,6 +54,10 @@ $this->create('settings_ajax_setlanguage', '/settings/ajax/setlanguage.php') ->actionInclude('settings/ajax/setlanguage.php'); $this->create('settings_ajax_decryptall', '/settings/ajax/decryptall.php') ->actionInclude('settings/ajax/decryptall.php'); +$this->create('settings_ajax_restorekeys', '/settings/ajax/restorekeys.php') + ->actionInclude('settings/ajax/restorekeys.php'); +$this->create('settings_ajax_deletekeys', '/settings/ajax/deletekeys.php') + ->actionInclude('settings/ajax/deletekeys.php'); // apps $this->create('settings_ajax_apps_ocs', '/settings/ajax/apps/ocs.php') ->actionInclude('settings/ajax/apps/ocs.php'); diff --git a/settings/templates/personal.php b/settings/templates/personal.php index cc1fce88c9f..afa3f5d700a 100644 --- a/settings/templates/personal.php +++ b/settings/templates/personal.php @@ -144,10 +144,15 @@ if($_['passwordChangeSupported']) { };?> <?php if($_['enableDecryptAll']): ?> -<div class="section" id="decryptAll"> +<div class="section"> + <h2> <?php p( $l->t( 'Encryption' ) ); ?> </h2> + + <?php if($_['filesStillEncrypted']): ?> + + <div id="decryptAll"> <?php p($l->t( "The encryption app is no longer enabled, please decrypt all your files" )); ?> <p> <input @@ -164,8 +169,34 @@ if($_['passwordChangeSupported']) { <span class="msg"></span> </p> <br /> + </div> + + <?php endif; ?> + + + + <div id="restoreBackupKeys" <?php $_['backupKeysExists'] ? '' : print_unescaped("class='hidden'") ?>> + + <?php p($l->t( "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." )); ?> + <p> + <button + type="button" + name="submitRestoreKeys"><?php p($l->t( "Restore Encryption Keys" )); ?> + </button> + <button + type="button" + name="submitDeleteKeys"><?php p($l->t( "Delete Encryption Keys" )); ?> + </button> + <span class="msg"></span> + + </p> + <br /> + + </div> + + </div> -<?php endif; ?> + <?php endif; ?> <div class="section"> <h2><?php p($l->t('Version'));?></h2> diff --git a/tests/lib/app.php b/tests/lib/app.php index 49f40f089bb..683820cabb6 100644 --- a/tests/lib/app.php +++ b/tests/lib/app.php @@ -1,6 +1,6 @@ <?php /** - * Copyright (c) 2012 Bernhard Posselt <nukeawhale@gmail.com> + * Copyright (c) 2012 Bernhard Posselt <dev@bernhard-posselt.com> * This file is licensed under the Affero General Public License version 3 or * later. * See the COPYING-README file. diff --git a/tests/lib/appframework/AppTest.php b/tests/lib/appframework/AppTest.php index 3628e4ceab2..92fa4838341 100644 --- a/tests/lib/appframework/AppTest.php +++ b/tests/lib/appframework/AppTest.php @@ -4,7 +4,7 @@ * ownCloud - App Framework * * @author Bernhard Posselt - * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com + * @copyright 2012 Bernhard Posselt <dev@bernhard-posselt.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE diff --git a/tests/lib/appframework/controller/ApiControllerTest.php b/tests/lib/appframework/controller/ApiControllerTest.php new file mode 100644 index 00000000000..b772f540ce8 --- /dev/null +++ b/tests/lib/appframework/controller/ApiControllerTest.php @@ -0,0 +1,55 @@ +<?php + +/** + * ownCloud - App Framework + * + * @author Bernhard Posselt + * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE + * License as published by the Free Software Foundation; either + * version 3 of the License, or any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU AFFERO GENERAL PUBLIC LICENSE for more details. + * + * You should have received a copy of the GNU Affero General Public + * License along with this library. If not, see <http://www.gnu.org/licenses/>. + * + */ + + +namespace OCP\AppFramework; + +use OC\AppFramework\Http\Request; +use OCP\AppFramework\Http\TemplateResponse; + + +class ChildApiController extends ApiController {}; + + +class ApiControllerTest extends \PHPUnit_Framework_TestCase { + + + public function testCors() { + $request = new Request( + array('server' => array('HTTP_ORIGIN' => 'test')) + ); + $this->controller = new ChildApiController('app', $request, 'verbs', + 'headers', 100); + + $response = $this->controller->preflightedCors(); + + $headers = $response->getHeaders(); + + $this->assertEquals('test', $headers['Access-Control-Allow-Origin']); + $this->assertEquals('verbs', $headers['Access-Control-Allow-Methods']); + $this->assertEquals('headers', $headers['Access-Control-Allow-Headers']); + $this->assertEquals('false', $headers['Access-Control-Allow-Credentials']); + $this->assertEquals(100, $headers['Access-Control-Max-Age']); + } + +} diff --git a/tests/lib/appframework/controller/ControllerTest.php b/tests/lib/appframework/controller/ControllerTest.php index f17d5f24aa5..3c1716a91d8 100644 --- a/tests/lib/appframework/controller/ControllerTest.php +++ b/tests/lib/appframework/controller/ControllerTest.php @@ -4,7 +4,7 @@ * ownCloud - App Framework * * @author Bernhard Posselt - * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com + * @copyright 2012 Bernhard Posselt <dev@bernhard-posselt.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE @@ -22,14 +22,35 @@ */ -namespace Test\AppFramework\Controller; +namespace OCP\AppFramework; use OC\AppFramework\Http\Request; -use OCP\AppFramework\Controller; use OCP\AppFramework\Http\TemplateResponse; +use OCP\AppFramework\Http\JSONResponse; +use OCP\AppFramework\Http\IResponseSerializer; -class ChildController extends Controller {}; +class ToUpperCaseSerializer implements IResponseSerializer { + public function serialize($response) { + return array(strtoupper($response)); + } +} + +class ChildController extends Controller { + public function custom($in) { + $this->registerResponder('json', function ($response) { + return new JSONResponse(array(strlen($response))); + }); + + return $in; + } + + public function serializer($in) { + $this->registerSerializer(new ToUpperCaseSerializer()); + + return $in; + } +}; class ControllerTest extends \PHPUnit_Framework_TestCase { @@ -129,4 +150,36 @@ class ControllerTest extends \PHPUnit_Framework_TestCase { $this->assertEquals('daheim', $this->controller->env('PATH')); } + + /** + * @expectedException \DomainException + */ + public function testFormatResonseInvalidFormat() { + $this->controller->buildResponse(null, 'test'); + } + + + public function testFormat() { + $response = $this->controller->buildResponse(array('hi'), 'json'); + + $this->assertEquals(array('hi'), $response->getData()); + } + + + public function testCustomFormatter() { + $response = $this->controller->custom('hi'); + $response = $this->controller->buildResponse($response, 'json'); + + $this->assertEquals(array(2), $response->getData()); + } + + + public function testCustomSerializer() { + $response = $this->controller->serializer('hi'); + $response = $this->controller->buildResponse($response, 'json'); + + $this->assertEquals(array('HI'), $response->getData()); + } + + } diff --git a/tests/lib/appframework/db/EntityTest.php b/tests/lib/appframework/db/EntityTest.php new file mode 100644 index 00000000000..9de44b9b3ba --- /dev/null +++ b/tests/lib/appframework/db/EntityTest.php @@ -0,0 +1,223 @@ +<?php + +/** +* ownCloud - App Framework +* +* @author Bernhard Posselt +* @copyright 2012 Bernhard Posselt dev@bernhard-posselt.com +* +* This library is free software; you can redistribute it and/or +* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE +* License as published by the Free Software Foundation; either +* version 3 of the License, or any later version. +* +* This library is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU AFFERO GENERAL PUBLIC LICENSE for more details. +* +* You should have received a copy of the GNU Affero General Public +* License along with this library. If not, see <http://www.gnu.org/licenses/>. +* +*/ + +namespace OCP\AppFramework\Db; + + +/** + * @method integer getId() + * @method void setId(integer $id) + * @method integer getTestId() + * @method void setTestId(integer $id) + * @method string getName() + * @method void setName(string $name) + * @method string getEmail() + * @method void setEmail(string $email) + * @method string getPreName() + * @method void setPreName(string $preName) + */ +class TestEntity extends Entity { + public $name; + public $email; + public $testId; + public $preName; + + public function __construct($name=null){ + $this->addType('testId', 'integer'); + $this->name = $name; + } +}; + + +class EntityTest extends \PHPUnit_Framework_TestCase { + + private $entity; + + protected function setUp(){ + $this->entity = new TestEntity(); + } + + + public function testResetUpdatedFields(){ + $entity = new TestEntity(); + $entity->setId(3); + $entity->resetUpdatedFields(); + + $this->assertEquals(array(), $entity->getUpdatedFields()); + } + + + public function testFromRow(){ + $row = array( + 'pre_name' => 'john', + 'email' => 'john@something.com' + ); + $this->entity = TestEntity::fromRow($row); + + $this->assertEquals($row['pre_name'], $this->entity->getPreName()); + $this->assertEquals($row['email'], $this->entity->getEmail()); + } + + + public function testGetSetId(){ + $id = 3; + $this->entity->setId(3); + + $this->assertEquals($id, $this->entity->getId()); + } + + + public function testColumnToPropertyNoReplacement(){ + $column = 'my'; + $this->assertEquals('my', + $this->entity->columnToProperty($column)); + } + + + public function testColumnToProperty(){ + $column = 'my_attribute'; + $this->assertEquals('myAttribute', + $this->entity->columnToProperty($column)); + } + + + public function testPropertyToColumnNoReplacement(){ + $property = 'my'; + $this->assertEquals('my', + $this->entity->propertyToColumn($property)); + } + + + public function testSetterMarksFieldUpdated(){ + $this->entity->setId(3); + + $this->assertContains('id', $this->entity->getUpdatedFields()); + } + + + public function testCallShouldOnlyWorkForGetterSetter(){ + $this->setExpectedException('\BadFunctionCallException'); + + $this->entity->something(); + } + + + public function testGetterShouldFailIfAttributeNotDefined(){ + $this->setExpectedException('\BadFunctionCallException'); + + $this->entity->getTest(); + } + + + public function testSetterShouldFailIfAttributeNotDefined(){ + $this->setExpectedException('\BadFunctionCallException'); + + $this->entity->setTest(); + } + + + public function testFromRowShouldNotAssignEmptyArray(){ + $row = array(); + $entity2 = new TestEntity(); + + $this->entity = TestEntity::fromRow($row); + $this->assertEquals($entity2, $this->entity); + } + + + public function testIdGetsConvertedToInt(){ + $row = array('id' => '4'); + + $this->entity = TestEntity::fromRow($row); + $this->assertSame(4, $this->entity->getId()); + } + + + public function testSetType(){ + $row = array('testId' => '4'); + + $this->entity = TestEntity::fromRow($row); + $this->assertSame(4, $this->entity->getTestId()); + } + + + public function testFromParams(){ + $params = array( + 'testId' => 4, + 'email' => 'john@doe' + ); + + $entity = TestEntity::fromParams($params); + + $this->assertEquals($params['testId'], $entity->getTestId()); + $this->assertEquals($params['email'], $entity->getEmail()); + $this->assertTrue($entity instanceof TestEntity); + } + + public function testSlugify(){ + $entity = new TestEntity(); + $entity->setName('Slugify this!'); + $this->assertEquals('slugify-this', $entity->slugify('name')); + $entity->setName('°!"§$%&/()=?`´ß\}][{³²#\'+~*-_.:,;<>|äöüÄÖÜSlugify this!'); + $this->assertEquals('slugify-this', $entity->slugify('name')); + } + + + public function testSetterCasts() { + $entity = new TestEntity(); + $entity->setId('3'); + $this->assertSame(3, $entity->getId()); + } + + + public function testSetterDoesNotCastOnNull() { + $entity = new TestEntity(); + $entity->setId(null); + $this->assertSame(null, $entity->getId()); + } + + + public function testGetFieldTypes() { + $entity = new TestEntity(); + $this->assertEquals(array( + 'id' => 'integer', + 'testId' => 'integer' + ), $entity->getFieldTypes()); + } + + + public function testGetItInt() { + $entity = new TestEntity(); + $entity->setId(3); + $this->assertEquals('integer', gettype($entity->getId())); + } + + + public function testFieldsNotMarkedUpdatedIfNothingChanges() { + $entity = new TestEntity('hey'); + $entity->setName('hey'); + $this->assertEquals(0, count($entity->getUpdatedFields())); + } + + +}
\ No newline at end of file diff --git a/tests/lib/appframework/db/MapperTest.php b/tests/lib/appframework/db/MapperTest.php new file mode 100644 index 00000000000..4ddc4ef0422 --- /dev/null +++ b/tests/lib/appframework/db/MapperTest.php @@ -0,0 +1,279 @@ +<?php + +/** + * ownCloud - App Framework + * + * @author Bernhard Posselt + * @copyright 2012 Bernhard Posselt dev@bernhard-posselt.com + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE + * License as published by the Free Software Foundation; either + * version 3 of the License, or any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU AFFERO GENERAL PUBLIC LICENSE for more details. + * + * You should have received a copy of the GNU Affero General Public + * License along with this library. If not, see <http://www.gnu.org/licenses/>. + * + */ + + +namespace OCP\AppFramework\Db; + +use \OCP\IDb; + + +require_once __DIR__ . '/MapperTestUtility.php'; + +/** + * @method integer getId() + * @method void setId(integer $id) + * @method string getEmail() + * @method void setEmail(string $email) + * @method string getPreName() + * @method void setPreName(string $preName) + */ +class Example extends Entity { + public $preName; + public $email; +}; + + +class ExampleMapper extends Mapper { + public function __construct(IDb $db){ parent::__construct($db, 'table'); } + public function find($table, $id){ return $this->findOneQuery($table, $id); } + public function findOneEntity($table, $id){ return $this->findEntity($table, $id); } + public function findAllEntities($table){ return $this->findEntities($table); } + public function mapRow($row){ return $this->mapRowToEntity($row); } +} + + +class MapperTest extends MapperTestUtility { + + private $mapper; + + public function setUp(){ + parent::setUp(); + $this->mapper = new ExampleMapper($this->db); + } + + + public function testMapperShouldSetTableName(){ + $this->assertEquals('*PREFIX*table', $this->mapper->getTableName()); + } + + + public function testFindQuery(){ + $sql = 'hi'; + $params = array('jo'); + $rows = array( + array('hi') + ); + $this->setMapperResult($sql, $params, $rows); + $this->mapper->find($sql, $params); + } + + public function testFindEntity(){ + $sql = 'hi'; + $params = array('jo'); + $rows = array( + array('pre_name' => 'hi') + ); + $this->setMapperResult($sql, $params, $rows); + $this->mapper->findOneEntity($sql, $params); + } + + public function testFindNotFound(){ + $sql = 'hi'; + $params = array('jo'); + $rows = array(); + $this->setMapperResult($sql, $params, $rows); + $this->setExpectedException( + '\OCP\AppFramework\Db\DoesNotExistException'); + $this->mapper->find($sql, $params); + } + + public function testFindEntityNotFound(){ + $sql = 'hi'; + $params = array('jo'); + $rows = array(); + $this->setMapperResult($sql, $params, $rows); + $this->setExpectedException( + '\OCP\AppFramework\Db\DoesNotExistException'); + $this->mapper->findOneEntity($sql, $params); + } + + public function testFindMultiple(){ + $sql = 'hi'; + $params = array('jo'); + $rows = array( + array('jo'), array('ho') + ); + $this->setMapperResult($sql, $params, $rows); + $this->setExpectedException( + '\OCP\AppFramework\Db\MultipleObjectsReturnedException'); + $this->mapper->find($sql, $params); + } + + public function testFindEntityMultiple(){ + $sql = 'hi'; + $params = array('jo'); + $rows = array( + array('jo'), array('ho') + ); + $this->setMapperResult($sql, $params, $rows); + $this->setExpectedException( + '\OCP\AppFramework\Db\MultipleObjectsReturnedException'); + $this->mapper->findOneEntity($sql, $params); + } + + + public function testDelete(){ + $sql = 'DELETE FROM `*PREFIX*table` WHERE `id` = ?'; + $params = array(2); + + $this->setMapperResult($sql, $params); + $entity = new Example(); + $entity->setId($params[0]); + + $this->mapper->delete($entity); + } + + + public function testCreate(){ + $this->db->expects($this->once()) + ->method('getInsertId') + ->with($this->equalTo('*PREFIX*table')) + ->will($this->returnValue(3)); + $this->mapper = new ExampleMapper($this->db); + + $sql = 'INSERT INTO `*PREFIX*table`(`pre_name`,`email`) ' . + 'VALUES(?,?)'; + $params = array('john', 'my@email'); + $entity = new Example(); + $entity->setPreName($params[0]); + $entity->setEmail($params[1]); + + $this->setMapperResult($sql, $params); + + $this->mapper->insert($entity); + } + + + public function testCreateShouldReturnItemWithCorrectInsertId(){ + $this->db->expects($this->once()) + ->method('getInsertId') + ->with($this->equalTo('*PREFIX*table')) + ->will($this->returnValue(3)); + $this->mapper = new ExampleMapper($this->db); + + $sql = 'INSERT INTO `*PREFIX*table`(`pre_name`,`email`) ' . + 'VALUES(?,?)'; + $params = array('john', 'my@email'); + $entity = new Example(); + $entity->setPreName($params[0]); + $entity->setEmail($params[1]); + + $this->setMapperResult($sql, $params); + + $result = $this->mapper->insert($entity); + + $this->assertEquals(3, $result->getId()); + } + + + public function testUpdate(){ + $sql = 'UPDATE `*PREFIX*table` ' . + 'SET ' . + '`pre_name` = ?,'. + '`email` = ? ' . + 'WHERE `id` = ?'; + + $params = array('john', 'my@email', 1); + $entity = new Example(); + $entity->setPreName($params[0]); + $entity->setEmail($params[1]); + $entity->setId($params[2]); + + $this->setMapperResult($sql, $params); + + $this->mapper->update($entity); + } + + + public function testUpdateNoId(){ + $params = array('john', 'my@email'); + $entity = new Example(); + $entity->setPreName($params[0]); + $entity->setEmail($params[1]); + + $this->setExpectedException('InvalidArgumentException'); + + $this->mapper->update($entity); + } + + + public function testUpdateNothingChangedNoQuery(){ + $params = array('john', 'my@email'); + $entity = new Example(); + $entity->setId(3); + $entity->setEmail($params[1]); + $entity->resetUpdatedFields(); + + $this->db->expects($this->never()) + ->method('prepareQuery'); + + $this->mapper->update($entity); + } + + + public function testMapRowToEntity(){ + $entity1 = $this->mapper->mapRow(array('pre_name' => 'test1', 'email' => 'test2')); + $entity2 = new Example(); + $entity2->setPreName('test1'); + $entity2->setEmail('test2'); + $entity2->resetUpdatedFields(); + $this->assertEquals($entity2, $entity1); + } + + public function testFindEntities(){ + $sql = 'hi'; + $rows = array( + array('pre_name' => 'hi') + ); + $entity = new Example(); + $entity->setPreName('hi'); + $entity->resetUpdatedFields(); + $this->setMapperResult($sql, array(), $rows); + $result = $this->mapper->findAllEntities($sql); + $this->assertEquals(array($entity), $result); + } + + public function testFindEntitiesNotFound(){ + $sql = 'hi'; + $rows = array(); + $this->setMapperResult($sql, array(), $rows); + $result = $this->mapper->findAllEntities($sql); + $this->assertEquals(array(), $result); + } + + public function testFindEntitiesMultiple(){ + $sql = 'hi'; + $rows = array( + array('pre_name' => 'jo'), array('email' => 'ho') + ); + $entity1 = new Example(); + $entity1->setPreName('jo'); + $entity1->resetUpdatedFields(); + $entity2 = new Example(); + $entity2->setEmail('ho'); + $entity2->resetUpdatedFields(); + $this->setMapperResult($sql, array(), $rows); + $result = $this->mapper->findAllEntities($sql); + $this->assertEquals(array($entity1, $entity2), $result); + } +}
\ No newline at end of file diff --git a/tests/lib/appframework/db/MapperTestUtility.php b/tests/lib/appframework/db/MapperTestUtility.php new file mode 100644 index 00000000000..4c81d4cd27b --- /dev/null +++ b/tests/lib/appframework/db/MapperTestUtility.php @@ -0,0 +1,179 @@ +<?php + +/** + * ownCloud - App Framework + * + * @author Bernhard Posselt + * @copyright 2012 Bernhard Posselt dev@bernhard-posselt.com + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE + * License as published by the Free Software Foundation; either + * version 3 of the License, or any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU AFFERO GENERAL PUBLIC LICENSE for more details. + * + * You should have received a copy of the GNU Affero General Public + * License along with this library. If not, see <http://www.gnu.org/licenses/>. + * + */ + + +namespace OCP\AppFramework\Db; + + +/** + * Simple utility class for testing mappers + */ +abstract class MapperTestUtility extends \PHPUnit_Framework_TestCase { + + + protected $db; + private $query; + private $pdoResult; + private $queryAt; + private $prepareAt; + private $fetchAt; + private $iterators; + + + /** + * Run this function before the actual test to either set or initialize the + * db. After this the db can be accessed by using $this->db + */ + protected function setUp(){ + $this->db = $this->getMockBuilder( + '\OCP\IDb') + ->disableOriginalConstructor() + ->getMock(); + + $this->query = $this->getMock('Query', array('execute', 'bindValue')); + $this->pdoResult = $this->getMock('Result', array('fetchRow')); + $this->queryAt = 0; + $this->prepareAt = 0; + $this->iterators = array(); + $this->fetchAt = 0; + } + + + /** + * Create mocks and set expected results for database queries + * @param string $sql the sql query that you expect to receive + * @param array $arguments the expected arguments for the prepare query + * method + * @param array $returnRows the rows that should be returned for the result + * of the database query. If not provided, it wont be assumed that fetchRow + * will be called on the result + */ + protected function setMapperResult($sql, $arguments=array(), $returnRows=array(), + $limit=null, $offset=null){ + + $this->iterators[] = new ArgumentIterator($returnRows); + + $iterators = $this->iterators; + $fetchAt = $this->fetchAt; + + $this->pdoResult->expects($this->any()) + ->method('fetchRow') + ->will($this->returnCallback( + function() use ($iterators, $fetchAt){ + $iterator = $iterators[$fetchAt]; + $result = $iterator->next(); + + if($result === false) { + $fetchAt++; + } + + return $result; + } + )); + + $index = 1; + foreach($arguments as $argument) { + switch (gettype($argument)) { + case 'integer': + $pdoConstant = \PDO::PARAM_INT; + break; + + case 'NULL': + $pdoConstant = \PDO::PARAM_NULL; + break; + + case 'boolean': + $pdoConstant = \PDO::PARAM_BOOL; + break; + + default: + $pdoConstant = \PDO::PARAM_STR; + break; + } + $this->query->expects($this->at($this->queryAt)) + ->method('bindValue') + ->with($this->equalTo($index), + $this->equalTo($argument), + $this->equalTo($pdoConstant)); + $index++; + $this->queryAt++; + } + + $this->query->expects($this->at($this->queryAt)) + ->method('execute') + ->with() + ->will($this->returnValue($this->pdoResult)); + $this->queryAt++; + + if($limit === null && $offset === null) { + $this->db->expects($this->at($this->prepareAt)) + ->method('prepareQuery') + ->with($this->equalTo($sql)) + ->will(($this->returnValue($this->query))); + } elseif($limit !== null && $offset === null) { + $this->db->expects($this->at($this->prepareAt)) + ->method('prepareQuery') + ->with($this->equalTo($sql), $this->equalTo($limit)) + ->will(($this->returnValue($this->query))); + } elseif($limit === null && $offset !== null) { + $this->db->expects($this->at($this->prepareAt)) + ->method('prepareQuery') + ->with($this->equalTo($sql), + $this->equalTo(null), + $this->equalTo($offset)) + ->will(($this->returnValue($this->query))); + } else { + $this->db->expects($this->at($this->prepareAt)) + ->method('prepareQuery') + ->with($this->equalTo($sql), + $this->equalTo($limit), + $this->equalTo($offset)) + ->will(($this->returnValue($this->query))); + } + $this->prepareAt++; + $this->fetchAt++; + + } + + +} + + +class ArgumentIterator { + + private $arguments; + + public function __construct($arguments){ + $this->arguments = $arguments; + } + + public function next(){ + $result = array_shift($this->arguments); + if($result === null){ + return false; + } else { + return $result; + } + } +} + diff --git a/tests/lib/appframework/dependencyinjection/DIContainerTest.php b/tests/lib/appframework/dependencyinjection/DIContainerTest.php index d1bc900fb28..acc5c2e66d8 100644 --- a/tests/lib/appframework/dependencyinjection/DIContainerTest.php +++ b/tests/lib/appframework/dependencyinjection/DIContainerTest.php @@ -5,8 +5,8 @@ * * @author Bernhard Posselt * @author Morris Jobke - * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com - * @copyright 2013 Morris Jobke morris.jobke@gmail.com + * @copyright 2012 Bernhard Posselt <dev@bernhard-posselt.com> + * @copyright 2013 Morris Jobke <morris.jobke@gmail.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE diff --git a/tests/lib/appframework/http/DispatcherTest.php b/tests/lib/appframework/http/DispatcherTest.php index 9841dcaa1f7..8117eec2075 100644 --- a/tests/lib/appframework/http/DispatcherTest.php +++ b/tests/lib/appframework/http/DispatcherTest.php @@ -4,7 +4,7 @@ * ownCloud - App Framework * * @author Bernhard Posselt - * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com + * @copyright 2012 Bernhard Posselt <dev@bernhard-posselt.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE @@ -25,8 +25,28 @@ namespace OC\AppFramework\Http; use OC\AppFramework\Middleware\MiddlewareDispatcher; +use OC\AppFramework\Utility\ControllerMethodReflector; use OCP\AppFramework\Http; -//require_once(__DIR__ . "/../classloader.php"); +use OCP\AppFramework\Http\JSONResponse; +use OCP\AppFramework\Controller; + + +class TestController extends Controller { + public function __construct($appName, $request) { + parent::__construct($appName, $request); + } + + /** + * @param int $int + * @param bool $bool + */ + public function exec($int, $bool, $test=4, $test2=1) { + $this->registerResponder('text', function($in) { + return new JSONResponse(array('text' => $in)); + }); + return array($int, $bool, $test, $test2); + } +} class DispatcherTest extends \PHPUnit_Framework_TestCase { @@ -39,6 +59,7 @@ class DispatcherTest extends \PHPUnit_Framework_TestCase { private $lastModified; private $etag; private $http; + private $reflector; protected function setUp() { $this->controllerMethod = 'test'; @@ -64,8 +85,17 @@ class DispatcherTest extends \PHPUnit_Framework_TestCase { '\OCP\AppFramework\Controller', array($this->controllerMethod), array($app, $request)); + $this->request = $this->getMockBuilder( + '\OC\AppFramework\Http\Request') + ->disableOriginalConstructor() + ->getMock(); + + $this->reflector = new ControllerMethodReflector(); + $this->dispatcher = new Dispatcher( - $this->http, $this->middlewareDispatcher); + $this->http, $this->middlewareDispatcher, $this->reflector, + $this->request + ); $this->response = $this->getMockBuilder( '\OCP\AppFramework\Http\Response') @@ -81,7 +111,7 @@ class DispatcherTest extends \PHPUnit_Framework_TestCase { * @param string $out * @param string $httpHeaders */ - private function setMiddlewareExpections($out=null, + private function setMiddlewareExpectations($out=null, $httpHeaders=null, $responseHeaders=array(), $ex=false, $catchEx=true) { @@ -159,14 +189,12 @@ class DispatcherTest extends \PHPUnit_Framework_TestCase { ->with($this->equalTo($this->controller), $this->equalTo($this->controllerMethod), $this->equalTo($out)) - ->will($this->returnValue($out)); - - + ->will($this->returnValue($out)); } public function testDispatcherReturnsArrayWith2Entries() { - $this->setMiddlewareExpections(); + $this->setMiddlewareExpectations(); $response = $this->dispatcher->dispatch($this->controller, $this->controllerMethod); @@ -180,7 +208,7 @@ class DispatcherTest extends \PHPUnit_Framework_TestCase { $out = 'yo'; $httpHeaders = 'Http'; $responseHeaders = array('hell' => 'yeah'); - $this->setMiddlewareExpections($out, $httpHeaders, $responseHeaders); + $this->setMiddlewareExpectations($out, $httpHeaders, $responseHeaders); $response = $this->dispatcher->dispatch($this->controller, $this->controllerMethod); @@ -195,7 +223,7 @@ class DispatcherTest extends \PHPUnit_Framework_TestCase { $out = 'yo'; $httpHeaders = 'Http'; $responseHeaders = array('hell' => 'yeah'); - $this->setMiddlewareExpections($out, $httpHeaders, $responseHeaders, true); + $this->setMiddlewareExpectations($out, $httpHeaders, $responseHeaders, true); $response = $this->dispatcher->dispatch($this->controller, $this->controllerMethod); @@ -210,7 +238,7 @@ class DispatcherTest extends \PHPUnit_Framework_TestCase { $out = 'yo'; $httpHeaders = 'Http'; $responseHeaders = array('hell' => 'yeah'); - $this->setMiddlewareExpections($out, $httpHeaders, $responseHeaders, true, false); + $this->setMiddlewareExpectations($out, $httpHeaders, $responseHeaders, true, false); $this->setExpectedException('\Exception'); $response = $this->dispatcher->dispatch($this->controller, @@ -218,4 +246,148 @@ class DispatcherTest extends \PHPUnit_Framework_TestCase { } + + private function dispatcherPassthrough() { + $this->middlewareDispatcher->expects($this->once()) + ->method('beforeController'); + $this->middlewareDispatcher->expects($this->once()) + ->method('afterController') + ->will($this->returnCallback(function($a, $b, $in) { + return $in; + })); + $this->middlewareDispatcher->expects($this->once()) + ->method('beforeOutput') + ->will($this->returnCallback(function($a, $b, $in) { + return $in; + })); + } + + + public function testControllerParametersInjected() { + $this->request = new Request(array( + 'post' => array( + 'int' => '3', + 'bool' => 'false' + ), + 'method' => 'POST' + )); + $this->dispatcher = new Dispatcher( + $this->http, $this->middlewareDispatcher, $this->reflector, + $this->request + ); + $controller = new TestController('app', $this->request); + + // reflector is supposed to be called once + $this->dispatcherPassthrough(); + $response = $this->dispatcher->dispatch($controller, 'exec'); + + $this->assertEquals('[3,true,4,1]', $response[2]); + } + + + public function testControllerParametersInjectedDefaultOverwritten() { + $this->request = new Request(array( + 'post' => array( + 'int' => '3', + 'bool' => 'false', + 'test2' => 7 + ), + 'method' => 'POST' + )); + $this->dispatcher = new Dispatcher( + $this->http, $this->middlewareDispatcher, $this->reflector, + $this->request + ); + $controller = new TestController('app', $this->request); + + // reflector is supposed to be called once + $this->dispatcherPassthrough(); + $response = $this->dispatcher->dispatch($controller, 'exec'); + + $this->assertEquals('[3,true,4,7]', $response[2]); + } + + + + public function testResponseTransformedByUrlFormat() { + $this->request = new Request(array( + 'post' => array( + 'int' => '3', + 'bool' => 'false' + ), + 'urlParams' => array( + 'format' => 'text' + ), + 'method' => 'GET' + )); + $this->dispatcher = new Dispatcher( + $this->http, $this->middlewareDispatcher, $this->reflector, + $this->request + ); + $controller = new TestController('app', $this->request); + + // reflector is supposed to be called once + $this->dispatcherPassthrough(); + $response = $this->dispatcher->dispatch($controller, 'exec'); + + $this->assertEquals('{"text":[3,false,4,1]}', $response[2]); + } + + + public function testResponseTransformedByAcceptHeader() { + $this->request = new Request(array( + 'post' => array( + 'int' => '3', + 'bool' => 'false' + ), + 'server' => array( + 'HTTP_ACCEPT' => 'application/text, test', + 'HTTP_CONTENT_TYPE' => 'application/x-www-form-urlencoded' + ), + 'method' => 'PUT' + )); + $this->dispatcher = new Dispatcher( + $this->http, $this->middlewareDispatcher, $this->reflector, + $this->request + ); + $controller = new TestController('app', $this->request); + + // reflector is supposed to be called once + $this->dispatcherPassthrough(); + $response = $this->dispatcher->dispatch($controller, 'exec'); + + $this->assertEquals('{"text":[3,false,4,1]}', $response[2]); + } + + + public function testResponsePrimarilyTransformedByParameterFormat() { + $this->request = new Request(array( + 'post' => array( + 'int' => '3', + 'bool' => 'false' + ), + 'get' => array( + 'format' => 'text' + ), + 'server' => array( + 'HTTP_ACCEPT' => 'application/json, test' + ), + 'method' => 'POST' + )); + $this->dispatcher = new Dispatcher( + $this->http, $this->middlewareDispatcher, $this->reflector, + $this->request + ); + $controller = new TestController('app', $this->request); + + // reflector is supposed to be called once + $this->dispatcherPassthrough(); + $response = $this->dispatcher->dispatch($controller, 'exec'); + + $this->assertEquals('{"text":[3,true,4,1]}', $response[2]); + } + + + + } diff --git a/tests/lib/appframework/http/DownloadResponseTest.php b/tests/lib/appframework/http/DownloadResponseTest.php index b305c63ad4d..5be16ce3c49 100644 --- a/tests/lib/appframework/http/DownloadResponseTest.php +++ b/tests/lib/appframework/http/DownloadResponseTest.php @@ -4,7 +4,7 @@ * ownCloud - App Framework * * @author Bernhard Posselt - * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com + * @copyright 2012 Bernhard Posselt <dev@bernhard-posselt.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE diff --git a/tests/lib/appframework/http/HttpTest.php b/tests/lib/appframework/http/HttpTest.php index 0bdcee24c99..c62fa43863a 100644 --- a/tests/lib/appframework/http/HttpTest.php +++ b/tests/lib/appframework/http/HttpTest.php @@ -4,7 +4,7 @@ * ownCloud - App Framework * * @author Bernhard Posselt - * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com + * @copyright 2012 Bernhard Posselt <dev@bernhard-posselt.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE diff --git a/tests/lib/appframework/http/JSONResponseTest.php b/tests/lib/appframework/http/JSONResponseTest.php index fbaae1b9227..c0c58ebf761 100644 --- a/tests/lib/appframework/http/JSONResponseTest.php +++ b/tests/lib/appframework/http/JSONResponseTest.php @@ -5,8 +5,8 @@ * * @author Bernhard Posselt * @author Morris Jobke - * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com - * @copyright 2013 Morris Jobke morris.jobke@gmail.com + * @copyright 2012 Bernhard Posselt <dev@bernhard-posselt.com> + * @copyright 2013 Morris Jobke <morris.jobke@gmail.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE diff --git a/tests/lib/appframework/http/RedirectResponseTest.php b/tests/lib/appframework/http/RedirectResponseTest.php index f62b420f4ee..dfd0d7ee7dc 100644 --- a/tests/lib/appframework/http/RedirectResponseTest.php +++ b/tests/lib/appframework/http/RedirectResponseTest.php @@ -4,7 +4,7 @@ * ownCloud - App Framework * * @author Bernhard Posselt - * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com + * @copyright 2012 Bernhard Posselt <dev@bernhard-posselt.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE diff --git a/tests/lib/appframework/http/ResponseTest.php b/tests/lib/appframework/http/ResponseTest.php index 27350725d79..e83fe9e2d84 100644 --- a/tests/lib/appframework/http/ResponseTest.php +++ b/tests/lib/appframework/http/ResponseTest.php @@ -4,7 +4,7 @@ * ownCloud - App Framework * * @author Bernhard Posselt - * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com + * @copyright 2012 Bernhard Posselt <dev@bernhard-posselt.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE @@ -42,7 +42,7 @@ class ResponseTest extends \PHPUnit_Framework_TestCase { public function testAddHeader(){ - $this->childResponse->addHeader('hello', 'world'); + $this->childResponse->addHeader(' hello ', 'world'); $headers = $this->childResponse->getHeaders(); $this->assertEquals('world', $headers['hello']); } diff --git a/tests/lib/appframework/http/TemplateResponseTest.php b/tests/lib/appframework/http/TemplateResponseTest.php index 0b158edff6f..afdcf322b85 100644 --- a/tests/lib/appframework/http/TemplateResponseTest.php +++ b/tests/lib/appframework/http/TemplateResponseTest.php @@ -4,7 +4,7 @@ * ownCloud - App Framework * * @author Bernhard Posselt - * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com + * @copyright 2012 Bernhard Posselt <dev@bernhard-posselt.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE @@ -51,6 +51,22 @@ class TemplateResponseTest extends \PHPUnit_Framework_TestCase { } + public function testSetParamsConstructor(){ + $params = array('hi' => 'yo'); + $this->tpl = new TemplateResponse($this->api, 'home', $params); + + $this->assertEquals(array('hi' => 'yo'), $this->tpl->getParams()); + } + + + public function testSetRenderAsConstructor(){ + $renderAs = 'myrender'; + $this->tpl = new TemplateResponse($this->api, 'home', array(), $renderAs); + + $this->assertEquals($renderAs, $this->tpl->getRenderAs()); + } + + public function testSetParams(){ $params = array('hi' => 'yo'); $this->tpl->setParams($params); @@ -63,36 +79,6 @@ class TemplateResponseTest extends \PHPUnit_Framework_TestCase { $this->assertEquals('home', $this->tpl->getTemplateName()); } - -// public function testRender(){ -// $ocTpl = $this->getMock('Template', array('fetchPage')); -// $ocTpl->expects($this->once()) -// ->method('fetchPage'); -// -// $tpl = new TemplateResponse('core', 'error'); -// -// $tpl->render(); -// } -// -// -// public function testRenderAssignsParams(){ -// $params = array('john' => 'doe'); -// -// $tpl = new TemplateResponse('app', 'home'); -// $tpl->setParams($params); -// -// $tpl->render(); -// } -// -// -// public function testRenderDifferentApp(){ -// -// $tpl = new TemplateResponse('app', 'home', 'app2'); -// -// $tpl->render(); -// } - - public function testGetRenderAs(){ $render = 'myrender'; $this->tpl->renderAs($render); diff --git a/tests/lib/appframework/middleware/MiddlewareDispatcherTest.php b/tests/lib/appframework/middleware/MiddlewareDispatcherTest.php index 935f97d2a6f..b1a58e21289 100644 --- a/tests/lib/appframework/middleware/MiddlewareDispatcherTest.php +++ b/tests/lib/appframework/middleware/MiddlewareDispatcherTest.php @@ -4,7 +4,7 @@ * ownCloud - App Framework * * @author Bernhard Posselt - * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com + * @copyright 2012 Bernhard Posselt <dev@bernhard-posselt.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE diff --git a/tests/lib/appframework/middleware/MiddlewareTest.php b/tests/lib/appframework/middleware/MiddlewareTest.php index 7a93c0d4dda..814efdd8118 100644 --- a/tests/lib/appframework/middleware/MiddlewareTest.php +++ b/tests/lib/appframework/middleware/MiddlewareTest.php @@ -4,7 +4,7 @@ * ownCloud - App Framework * * @author Bernhard Posselt - * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com + * @copyright 2012 Bernhard Posselt <dev@bernhard-posselt.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE diff --git a/tests/lib/appframework/middleware/security/CORSMiddlewareTest.php b/tests/lib/appframework/middleware/security/CORSMiddlewareTest.php new file mode 100644 index 00000000000..79cd3b278af --- /dev/null +++ b/tests/lib/appframework/middleware/security/CORSMiddlewareTest.php @@ -0,0 +1,87 @@ +<?php +/** + * ownCloud - App Framework + * + * This file is licensed under the Affero General Public License version 3 or + * later. See the COPYING file. + * + * @author Bernhard Posselt <dev@bernhard-posselt.com> + * @copyright Bernhard Posselt 2014 + */ + + +namespace OC\AppFramework\Middleware\Security; + +use OC\AppFramework\Http\Request; +use OC\AppFramework\Utility\ControllerMethodReflector; + +use OCP\AppFramework\Http\Response; + + +class CORSMiddlewareTest extends \PHPUnit_Framework_TestCase { + + private $reflector; + + protected function setUp() { + $this->reflector = new ControllerMethodReflector(); + } + + /** + * @CORS + */ + public function testSetCORSAPIHeader() { + $request = new Request( + array('server' => array('HTTP_ORIGIN' => 'test')) + ); + $this->reflector->reflect($this, __FUNCTION__); + $middleware = new CORSMiddleware($request, $this->reflector); + + $response = $middleware->afterController($this, __FUNCTION__, new Response()); + $headers = $response->getHeaders(); + $this->assertEquals('test', $headers['Access-Control-Allow-Origin']); + } + + + public function testNoAnnotationNoCORSHEADER() { + $request = new Request( + array('server' => array('HTTP_ORIGIN' => 'test')) + ); + $middleware = new CORSMiddleware($request, $this->reflector); + + $response = $middleware->afterController($this, __FUNCTION__, new Response()); + $headers = $response->getHeaders(); + $this->assertFalse(array_key_exists('Access-Control-Allow-Origin', $headers)); + } + + + /** + * @CORS + */ + public function testNoOriginHeaderNoCORSHEADER() { + $request = new Request(); + $this->reflector->reflect($this, __FUNCTION__); + $middleware = new CORSMiddleware($request, $this->reflector); + + $response = $middleware->afterController($this, __FUNCTION__, new Response()); + $headers = $response->getHeaders(); + $this->assertFalse(array_key_exists('Access-Control-Allow-Origin', $headers)); + } + + + /** + * @CORS + * @expectedException \OC\AppFramework\Middleware\Security\SecurityException + */ + public function testCorsIgnoredIfWithCredentialsHeaderPresent() { + $request = new Request( + array('server' => array('HTTP_ORIGIN' => 'test')) + ); + $this->reflector->reflect($this, __FUNCTION__); + $middleware = new CORSMiddleware($request, $this->reflector); + + $response = new Response(); + $response->addHeader('AcCess-control-Allow-Credentials ', 'TRUE'); + $response = $middleware->afterController($this, __FUNCTION__, $response); + } + +} diff --git a/tests/lib/appframework/middleware/security/SecurityMiddlewareTest.php b/tests/lib/appframework/middleware/security/SecurityMiddlewareTest.php index 19e8a68c388..6a1bbf72c13 100644 --- a/tests/lib/appframework/middleware/security/SecurityMiddlewareTest.php +++ b/tests/lib/appframework/middleware/security/SecurityMiddlewareTest.php @@ -4,7 +4,7 @@ * ownCloud - App Framework * * @author Bernhard Posselt - * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com + * @copyright 2012 Bernhard Posselt <dev@bernhard-posselt.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE @@ -26,6 +26,7 @@ namespace OC\AppFramework\Middleware\Security; use OC\AppFramework\Http; use OC\AppFramework\Http\Request; +use OC\AppFramework\Utility\ControllerMethodReflector; use OCP\AppFramework\Http\RedirectResponse; use OCP\AppFramework\Http\JSONResponse; @@ -37,14 +38,16 @@ class SecurityMiddlewareTest extends \PHPUnit_Framework_TestCase { private $secException; private $secAjaxException; private $request; + private $reader; public function setUp() { $api = $this->getMock('OC\AppFramework\DependencyInjection\DIContainer', array(), array('test')); $this->controller = $this->getMock('OCP\AppFramework\Controller', array(), array($api, new Request())); + $this->reader = new ControllerMethodReflector(); $this->request = new Request(); - $this->middleware = new SecurityMiddleware($api, $this->request); + $this->middleware = new SecurityMiddleware($api, $this->request, $this->reader); $this->secException = new SecurityException('hey', false); $this->secAjaxException = new SecurityException('hey', true); } @@ -68,7 +71,8 @@ class SecurityMiddlewareTest extends \PHPUnit_Framework_TestCase { $api->expects($this->any())->method('getServer') ->will($this->returnValue($serverMock)); - $sec = new SecurityMiddleware($api, $this->request); + $sec = new SecurityMiddleware($api, $this->request, $this->reader); + $this->reader->reflect('\OC\AppFramework\Middleware\Security\SecurityMiddlewareTest', $method); $sec->beforeController('\OC\AppFramework\Middleware\Security\SecurityMiddlewareTest', $method); } @@ -99,11 +103,12 @@ class SecurityMiddlewareTest extends \PHPUnit_Framework_TestCase { ->will($this->returnValue(true)); } - $sec = new SecurityMiddleware($api, $this->request); + $sec = new SecurityMiddleware($api, $this->request, $this->reader); try { - $sec->beforeController('\OC\AppFramework\Middleware\Security\SecurityMiddlewareTest', - $method); + $controller = '\OC\AppFramework\Middleware\Security\SecurityMiddlewareTest'; + $this->reader->reflect($controller, $method); + $sec->beforeController($controller, $method); } catch (SecurityException $ex){ $this->assertEquals($status, $ex->getCode()); } @@ -184,7 +189,9 @@ class SecurityMiddlewareTest extends \PHPUnit_Framework_TestCase { ->method('isLoggedIn') ->will($this->returnValue(true)); - $sec = new SecurityMiddleware($api, $this->request); + $sec = new SecurityMiddleware($api, $this->request, $this->reader); + $this->reader->reflect('\OC\AppFramework\Middleware\Security\SecurityMiddlewareTest', + 'testNoChecks'); $sec->beforeController('\OC\AppFramework\Middleware\Security\SecurityMiddlewareTest', 'testNoChecks'); } @@ -207,7 +214,7 @@ class SecurityMiddlewareTest extends \PHPUnit_Framework_TestCase { ->will($this->returnValue(true)); } - $sec = new SecurityMiddleware($api, $this->request); + $sec = new SecurityMiddleware($api, $this->request, $this->reader); if($shouldFail){ $this->setExpectedException('\OC\AppFramework\Middleware\Security\SecurityException'); @@ -215,6 +222,7 @@ class SecurityMiddlewareTest extends \PHPUnit_Framework_TestCase { $this->setExpectedException(null); } + $this->reader->reflect('\OC\AppFramework\Middleware\Security\SecurityMiddlewareTest', $method); $sec->beforeController('\OC\AppFramework\Middleware\Security\SecurityMiddlewareTest', $method); } @@ -230,7 +238,8 @@ class SecurityMiddlewareTest extends \PHPUnit_Framework_TestCase { ->method('passesCSRFCheck') ->will($this->returnValue(false)); - $sec = new SecurityMiddleware($api, $request); + $sec = new SecurityMiddleware($api, $request, $this->reader); + $this->reader->reflect('\OC\AppFramework\Middleware\Security\SecurityMiddlewareTest', 'testCsrfCheck'); $sec->beforeController('\OC\AppFramework\Middleware\Security\SecurityMiddlewareTest', 'testCsrfCheck'); } @@ -246,7 +255,8 @@ class SecurityMiddlewareTest extends \PHPUnit_Framework_TestCase { ->method('passesCSRFCheck') ->will($this->returnValue(false)); - $sec = new SecurityMiddleware($api, $request); + $sec = new SecurityMiddleware($api, $request, $this->reader); + $this->reader->reflect('\OC\AppFramework\Middleware\Security\SecurityMiddlewareTest', 'testNoCsrfCheck'); $sec->beforeController('\OC\AppFramework\Middleware\Security\SecurityMiddlewareTest', 'testNoCsrfCheck'); } @@ -261,7 +271,8 @@ class SecurityMiddlewareTest extends \PHPUnit_Framework_TestCase { ->method('passesCSRFCheck') ->will($this->returnValue(true)); - $sec = new SecurityMiddleware($api, $request); + $sec = new SecurityMiddleware($api, $request, $this->reader); + $this->reader->reflect('\OC\AppFramework\Middleware\Security\SecurityMiddlewareTest', 'testFailCsrfCheck'); $sec->beforeController('\OC\AppFramework\Middleware\Security\SecurityMiddlewareTest', 'testFailCsrfCheck'); } @@ -318,7 +329,7 @@ class SecurityMiddlewareTest extends \PHPUnit_Framework_TestCase { $this->request = new Request( array('server' => array('HTTP_ACCEPT' => 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8'))); - $this->middleware = new SecurityMiddleware($api, $this->request); + $this->middleware = new SecurityMiddleware($api, $this->request, $this->reader); $response = $this->middleware->afterException($this->controller, 'test', $this->secException); diff --git a/tests/lib/appframework/utility/ControllerMethodReflectorTest.php b/tests/lib/appframework/utility/ControllerMethodReflectorTest.php new file mode 100644 index 00000000000..8939a203edb --- /dev/null +++ b/tests/lib/appframework/utility/ControllerMethodReflectorTest.php @@ -0,0 +1,115 @@ +<?php + +/** + * ownCloud - App Framework + * + * @author Bernhard Posselt + * @copyright 2012 Bernhard Posselt <dev@bernhard-posselt.com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE + * License as published by the Free Software Foundation; either + * version 3 of the License, or any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU AFFERO GENERAL PUBLIC LICENSE for more details. + * + * You should have received a copy of the GNU Affero General Public + * License along with this library. If not, see <http://www.gnu.org/licenses/>. + * + */ + + +namespace OC\AppFramework\Utility; + + +class ControllerMethodReflectorTest extends \PHPUnit_Framework_TestCase { + + + /** + * @Annotation + */ + public function testReadAnnotation(){ + $reader = new ControllerMethodReflector(); + $reader->reflect( + '\OC\AppFramework\Utility\ControllerMethodReflectorTest', + 'testReadAnnotation' + ); + + $this->assertTrue($reader->hasAnnotation('Annotation')); + } + + + /** + * @Annotation + * @param test + */ + public function testReadAnnotationNoLowercase(){ + $reader = new ControllerMethodReflector(); + $reader->reflect( + '\OC\AppFramework\Utility\ControllerMethodReflectorTest', + 'testReadAnnotationNoLowercase' + ); + + $this->assertTrue($reader->hasAnnotation('Annotation')); + $this->assertFalse($reader->hasAnnotation('param')); + } + + + /** + * @Annotation + * @param int $test + */ + public function testReadTypeIntAnnotations(){ + $reader = new ControllerMethodReflector(); + $reader->reflect( + '\OC\AppFramework\Utility\ControllerMethodReflectorTest', + 'testReadTypeIntAnnotations' + ); + + $this->assertEquals('int', $reader->getType('test')); + } + + + /** + * @Annotation + * @param double $test something special + */ + public function testReadTypeDoubleAnnotations(){ + $reader = new ControllerMethodReflector(); + $reader->reflect( + '\OC\AppFramework\Utility\ControllerMethodReflectorTest', + 'testReadTypeDoubleAnnotations' + ); + + $this->assertEquals('double', $reader->getType('test')); + } + + + public function arguments($arg, $arg2='hi') {} + public function testReflectParameters() { + $reader = new ControllerMethodReflector(); + $reader->reflect( + '\OC\AppFramework\Utility\ControllerMethodReflectorTest', + 'arguments' + ); + + $this->assertEquals(array('arg' => null, 'arg2' => 'hi'), $reader->getParameters()); + } + + + public function arguments2($arg) {} + public function testReflectParameters2() { + $reader = new ControllerMethodReflector(); + $reader->reflect( + '\OC\AppFramework\Utility\ControllerMethodReflectorTest', + 'arguments2' + ); + + $this->assertEquals(array('arg' => null), $reader->getParameters()); + } + + +} diff --git a/tests/lib/files/view.php b/tests/lib/files/view.php index f80dd06e1cb..201eb9ff6cb 100644 --- a/tests/lib/files/view.php +++ b/tests/lib/files/view.php @@ -585,4 +585,24 @@ class View extends \PHPUnit_Framework_TestCase { $info2 = $view->getFileInfo('/test/test'); $this->assertSame($info['etag'], $info2['etag']); } + + /** + * @dataProvider absolutePathProvider + */ + public function testGetAbsolutePath($expectedPath, $relativePath) { + $view = new \OC\Files\View('/files'); + $this->assertEquals($expectedPath, $view->getAbsolutePath($relativePath)); + } + + function absolutePathProvider() { + return array( + array('/files/', ''), + array('/files/0', '0'), + array('/files/false', 'false'), + array('/files/true', 'true'), + array('/files/', '/'), + array('/files/test', 'test'), + array('/files/test', '/test'), + ); + } } diff --git a/tests/lib/group.php b/tests/lib/group.php index 26232187c36..724e723b187 100644 --- a/tests/lib/group.php +++ b/tests/lib/group.php @@ -4,8 +4,8 @@ * * @author Robin Appelman * @author Bernhard Posselt - * @copyright 2012 Robin Appelman icewind@owncloud.com - * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com + * @copyright 2012 Robin Appelman <icewind@owncloud.com> + * @copyright 2012 Bernhard Posselt <dev@bernhard-posselt.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE diff --git a/tests/lib/group/group.php b/tests/lib/group/group.php index 990f8ecc1d5..4d15999a826 100644 --- a/tests/lib/group/group.php +++ b/tests/lib/group/group.php @@ -17,9 +17,10 @@ class Group extends \PHPUnit_Framework_TestCase { */ protected function getUserManager() { $userManager = $this->getMock('\OC\User\Manager'); - $user1 = new User('user1', null); - $user2 = new User('user2', null); - $user3 = new User('user3', null); + $backend = $this->getMock('\OC_User_Backend'); + $user1 = new User('user1', $backend); + $user2 = new User('user2', $backend); + $user3 = new User('user3', $backend); $userManager->expects($this->any()) ->method('get') ->will($this->returnValueMap(array( @@ -79,6 +80,7 @@ class Group extends \PHPUnit_Framework_TestCase { public function testInGroupSingleBackend() { $backend = $this->getMock('OC_Group_Database'); $userManager = $this->getUserManager(); + $userBackend = $this->getMock('\OC_User_Backend'); $group = new \OC\Group\Group('group1', array($backend), $userManager); $backend->expects($this->once()) @@ -86,13 +88,14 @@ class Group extends \PHPUnit_Framework_TestCase { ->with('user1', 'group1') ->will($this->returnValue(true)); - $this->assertTrue($group->inGroup(new User('user1', null))); + $this->assertTrue($group->inGroup(new User('user1', $userBackend))); } public function testInGroupMultipleBackends() { $backend1 = $this->getMock('OC_Group_Database'); $backend2 = $this->getMock('OC_Group_Database'); $userManager = $this->getUserManager(); + $userBackend = $this->getMock('\OC_User_Backend'); $group = new \OC\Group\Group('group1', array($backend1, $backend2), $userManager); $backend1->expects($this->once()) @@ -105,12 +108,13 @@ class Group extends \PHPUnit_Framework_TestCase { ->with('user1', 'group1') ->will($this->returnValue(true)); - $this->assertTrue($group->inGroup(new User('user1', null))); + $this->assertTrue($group->inGroup(new User('user1', $userBackend))); } public function testAddUser() { $backend = $this->getMock('OC_Group_Database'); $userManager = $this->getUserManager(); + $userBackend = $this->getMock('\OC_User_Backend'); $group = new \OC\Group\Group('group1', array($backend), $userManager); $backend->expects($this->once()) @@ -125,12 +129,13 @@ class Group extends \PHPUnit_Framework_TestCase { ->method('addToGroup') ->with('user1', 'group1'); - $group->addUser(new User('user1', null)); + $group->addUser(new User('user1', $userBackend)); } public function testAddUserAlreadyInGroup() { $backend = $this->getMock('OC_Group_Database'); $userManager = $this->getUserManager(); + $userBackend = $this->getMock('\OC_User_Backend'); $group = new \OC\Group\Group('group1', array($backend), $userManager); $backend->expects($this->once()) @@ -144,12 +149,13 @@ class Group extends \PHPUnit_Framework_TestCase { $backend->expects($this->never()) ->method('addToGroup'); - $group->addUser(new User('user1', null)); + $group->addUser(new User('user1', $userBackend)); } public function testRemoveUser() { $backend = $this->getMock('OC_Group_Database'); $userManager = $this->getUserManager(); + $userBackend = $this->getMock('\OC_User_Backend'); $group = new \OC\Group\Group('group1', array($backend), $userManager); $backend->expects($this->once()) @@ -164,12 +170,13 @@ class Group extends \PHPUnit_Framework_TestCase { ->method('removeFromGroup') ->with('user1', 'group1'); - $group->removeUser(new User('user1', null)); + $group->removeUser(new User('user1', $userBackend)); } public function testRemoveUserNotInGroup() { $backend = $this->getMock('OC_Group_Database'); $userManager = $this->getUserManager(); + $userBackend = $this->getMock('\OC_User_Backend'); $group = new \OC\Group\Group('group1', array($backend), $userManager); $backend->expects($this->once()) @@ -183,13 +190,14 @@ class Group extends \PHPUnit_Framework_TestCase { $backend->expects($this->never()) ->method('removeFromGroup'); - $group->removeUser(new User('user1', null)); + $group->removeUser(new User('user1', $userBackend)); } public function testRemoveUserMultipleBackends() { $backend1 = $this->getMock('OC_Group_Database'); $backend2 = $this->getMock('OC_Group_Database'); $userManager = $this->getUserManager(); + $userBackend = $this->getMock('\OC_User_Backend'); $group = new \OC\Group\Group('group1', array($backend1, $backend2), $userManager); $backend1->expects($this->once()) @@ -216,7 +224,7 @@ class Group extends \PHPUnit_Framework_TestCase { ->method('removeFromGroup') ->with('user1', 'group1'); - $group->removeUser(new User('user1', null)); + $group->removeUser(new User('user1', $userBackend)); } public function testSearchUsers() { diff --git a/tests/lib/group/manager.php b/tests/lib/group/manager.php index 9d1f175c109..061c9e7ea34 100644 --- a/tests/lib/group/manager.php +++ b/tests/lib/group/manager.php @@ -294,10 +294,11 @@ class Manager extends \PHPUnit_Framework_TestCase { * @var \OC\User\Manager $userManager */ $userManager = $this->getMock('\OC\User\Manager'); + $userBackend = $this->getMock('\OC_User_Backend'); $manager = new \OC\Group\Manager($userManager); $manager->addBackend($backend); - $groups = $manager->getUserGroups(new User('user1', null)); + $groups = $manager->getUserGroups(new User('user1', $userBackend)); $this->assertEquals(1, count($groups)); $group1 = $groups[0]; $this->assertEquals('group1', $group1->getGID()); @@ -332,11 +333,12 @@ class Manager extends \PHPUnit_Framework_TestCase { * @var \OC\User\Manager $userManager */ $userManager = $this->getMock('\OC\User\Manager'); + $userBackend = $this->getMock('\OC_User_Backend'); $manager = new \OC\Group\Manager($userManager); $manager->addBackend($backend1); $manager->addBackend($backend2); - $groups = $manager->getUserGroups(new User('user1', null)); + $groups = $manager->getUserGroups(new User('user1', $userBackend)); $this->assertEquals(2, count($groups)); $group1 = $groups[0]; $group2 = $groups[1]; @@ -345,10 +347,12 @@ class Manager extends \PHPUnit_Framework_TestCase { } public function testDisplayNamesInGroupMultipleUserBackends() { - $user1 = new User('user1', null); - $user2 = new User('user2', null); - $user3 = new User('user3', null); - $user4 = new User('user33', null); + $userBackend = $this->getMock('\OC_User_Backend'); + + $user1 = new User('user1', $userBackend); + $user2 = new User('user2', $userBackend); + $user3 = new User('user3', $userBackend); + $user4 = new User('user33', $userBackend); /** * @var \PHPUnit_Framework_MockObject_MockObject | \OC_Group_Backend $backend1 @@ -368,6 +372,7 @@ class Manager extends \PHPUnit_Framework_TestCase { * @var \OC\User\Manager $userManager */ $userManager = $this->getMock('\OC\User\Manager'); + $userBackend = $this->getMock('\OC_User_Backend'); $userManager->expects($this->once()) ->method('search') ->with('user3') @@ -375,12 +380,12 @@ class Manager extends \PHPUnit_Framework_TestCase { $userManager->expects($this->any()) ->method('get') - ->will($this->returnCallback(function($uid) { + ->will($this->returnCallback(function($uid) use ($userBackend) { switch($uid) { - case 'user1' : return new User('user1', null); - case 'user2' : return new User('user2', null); - case 'user3' : return new User('user3', null); - case 'user33': return new User('user33', null); + case 'user1' : return new User('user1', $userBackend); + case 'user2' : return new User('user2', $userBackend); + case 'user3' : return new User('user3', $userBackend); + case 'user33': return new User('user33', $userBackend); default: return null; } diff --git a/tests/lib/helper.php b/tests/lib/helper.php index 5663df7c9ae..59db30a73f6 100644 --- a/tests/lib/helper.php +++ b/tests/lib/helper.php @@ -120,15 +120,15 @@ class Test_Helper extends PHPUnit_Framework_TestCase { $this->assertEquals($result, $expected); } - function testIssubdirectory() { - $result = OC_Helper::issubdirectory("./data/", "/anotherDirectory/"); + function testIsSubDirectory() { + $result = OC_Helper::isSubDirectory("./data/", "/anotherDirectory/"); $this->assertFalse($result); - $result = OC_Helper::issubdirectory("./data/", "./data/"); + $result = OC_Helper::isSubDirectory("./data/", "./data/"); $this->assertTrue($result); mkdir("data/TestSubdirectory", 0777); - $result = OC_Helper::issubdirectory("data/TestSubdirectory/", "data"); + $result = OC_Helper::isSubDirectory("data/TestSubdirectory/", "data"); rmdir("data/TestSubdirectory"); $this->assertTrue($result); } diff --git a/tests/lib/logger.php b/tests/lib/logger.php new file mode 100644 index 00000000000..7d5d4049b28 --- /dev/null +++ b/tests/lib/logger.php @@ -0,0 +1,40 @@ +<?php +/** + * Copyright (c) 2014 Thomas Müller <thomas.mueller@tmit.eu> + * This file is licensed under the Affero General Public License version 3 or + * later. + * See the COPYING-README file. + */ + +namespace Test; + +use OC\Log; + +class Logger extends \PHPUnit_Framework_TestCase { + /** + * @var \OCP\ILogger + */ + private $logger; + static private $logs = array(); + + public function setUp() { + self::$logs = array(); + $this->logger = new Log($this); + } + + public function testInterpolation() { + $logger = $this->logger; + $logger->info('{Message {nothing} {user} {foo.bar} a}', array('user' => 'Bob', 'foo.bar' => 'Bar')); + + $expected = array('1 {Message {nothing} Bob Bar a}'); + $this->assertEquals($expected, $this->getLogs()); + } + + private function getLogs() { + return self::$logs; + } + + public static function write($app, $message, $level) { + self::$logs[]= "$level $message"; + } +} diff --git a/tests/lib/tags.php b/tests/lib/tags.php index 97e3734cfda..976b4b4fdc8 100644 --- a/tests/lib/tags.php +++ b/tests/lib/tags.php @@ -130,7 +130,7 @@ class Test_Tags extends PHPUnit_Framework_TestCase { $tagger = $this->tagMgr->load($this->objectType); foreach($objids as $id) { - $tagger->tagAs($id, 'Family'); + $this->assertTrue($tagger->tagAs($id, 'Family')); } $this->assertEquals(1, count($tagger->getTags())); diff --git a/tests/lib/template.php b/tests/lib/template.php index eedf688721d..819d592aacf 100644 --- a/tests/lib/template.php +++ b/tests/lib/template.php @@ -3,7 +3,7 @@ * ownCloud * * @author Bernhard Posselt -* @copyright 2012 Bernhard Posselt nukeawhale@gmail.com +* @copyright 2012 Bernhard Posselt <dev@bernhard-posselt.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE |
