diff options
Diffstat (limited to 'apps')
525 files changed, 4698 insertions, 1505 deletions
diff --git a/apps/files/ajax/delete.php b/apps/files/ajax/delete.php index 4d4232e872e..1a810f6954c 100644 --- a/apps/files/ajax/delete.php +++ b/apps/files/ajax/delete.php @@ -6,7 +6,7 @@ OCP\JSON::callCheck(); // Get data -$dir = stripslashes($_POST["dir"]); +$dir = isset($_POST['dir']) ? $_POST['dir'] : ''; $allFiles = isset($_POST["allfiles"]) ? $_POST["allfiles"] : false; // delete all files in dir ? @@ -36,7 +36,12 @@ foreach ($files as $file) { } // get array with updated storage stats (e.g. max file size) after upload -$storageStats = \OCA\Files\Helper::buildFileStorageStatistics($dir); +try { + $storageStats = \OCA\Files\Helper::buildFileStorageStatistics($dir); +} catch(\OCP\Files\NotFoundException $e) { + OCP\JSON::error(['data' => ['message' => 'File not found']]); + return; +} if ($success) { OCP\JSON::success(array("data" => array_merge(array("dir" => $dir, "files" => $files), $storageStats))); diff --git a/apps/files/ajax/download.php b/apps/files/ajax/download.php index b2e144c4b8f..368257b95cd 100644 --- a/apps/files/ajax/download.php +++ b/apps/files/ajax/download.php @@ -25,8 +25,8 @@ OCP\User::checkLoggedIn(); \OC::$server->getSession()->close(); -$files = $_GET["files"]; -$dir = $_GET["dir"]; +$files = isset($_GET['files']) ? $_GET['files'] : ''; +$dir = isset($_GET['dir']) ? $_GET['dir'] : ''; $files_list = json_decode($files); // in case we get only a single file diff --git a/apps/files/ajax/move.php b/apps/files/ajax/move.php index 12760d4415f..a9e0d09f176 100644 --- a/apps/files/ajax/move.php +++ b/apps/files/ajax/move.php @@ -5,9 +5,9 @@ OCP\JSON::callCheck(); \OC::$server->getSession()->close(); // Get data -$dir = stripslashes($_POST["dir"]); -$file = stripslashes($_POST["file"]); -$target = stripslashes(rawurldecode($_POST["target"])); +$dir = isset($_POST['dir']) ? $_POST['dir'] : ''; +$file = isset($_POST['file']) ? $_POST['file'] : ''; +$target = isset($_POST['target']) ? rawurldecode($_POST['target']) : ''; $l = \OC::$server->getL10N('files'); diff --git a/apps/files/ajax/newfile.php b/apps/files/ajax/newfile.php index c162237fe92..159a8b5d7a3 100644 --- a/apps/files/ajax/newfile.php +++ b/apps/files/ajax/newfile.php @@ -3,9 +3,8 @@ // Init owncloud global $eventSource; -if(!OC_User::isLoggedIn()) { - exit; -} +\OCP\JSON::checkLoggedIn(); +\OCP\JSON::callCheck(); \OC::$server->getSession()->close(); @@ -17,8 +16,6 @@ $source = isset( $_REQUEST['source'] ) ? trim($_REQUEST['source'], '/\\') : ''; if($source) { $eventSource = \OC::$server->createEventSource(); -} else { - OC_JSON::callCheck(); } function progress($notification_code, $severity, $message, $message_code, $bytes_transferred, $bytes_max) { @@ -81,7 +78,6 @@ if (!\OC\Files\Filesystem::file_exists($dir . '/')) { exit(); } -//TODO why is stripslashes used on foldername in newfolder.php but not here? $target = $dir.'/'.$filename; if (\OC\Files\Filesystem::file_exists($target)) { @@ -139,7 +135,7 @@ if($source) { } } } - $result=\OC\Files\Filesystem::file_put_contents($target, $sourceStream); + $result = \OC\Files\Filesystem::file_put_contents($target, $sourceStream); } if($result) { $meta = \OC\Files\Filesystem::getFileInfo($target); diff --git a/apps/files/ajax/newfolder.php b/apps/files/ajax/newfolder.php index ea7a10c2ab9..fab230717de 100644 --- a/apps/files/ajax/newfolder.php +++ b/apps/files/ajax/newfolder.php @@ -8,8 +8,8 @@ OCP\JSON::callCheck(); \OC::$server->getSession()->close(); // Get the params -$dir = isset( $_POST['dir'] ) ? stripslashes($_POST['dir']) : ''; -$foldername = isset( $_POST['foldername'] ) ? stripslashes($_POST['foldername']) : ''; +$dir = isset($_POST['dir']) ? $_POST['dir'] : ''; +$foldername = isset($_POST['foldername']) ? $_POST['foldername'] : ''; $l10n = \OC::$server->getL10N('files'); @@ -39,8 +39,7 @@ if (!\OC\Files\Filesystem::file_exists($dir . '/')) { exit(); } -//TODO why is stripslashes used on foldername here but not in newfile.php? -$target = $dir . '/' . stripslashes($foldername); +$target = $dir . '/' . $foldername; if (\OC\Files\Filesystem::file_exists($target)) { $result['data'] = array('message' => $l10n->t( diff --git a/apps/files/ajax/upload.php b/apps/files/ajax/upload.php index 7bf6c40e87c..88375f82acb 100644 --- a/apps/files/ajax/upload.php +++ b/apps/files/ajax/upload.php @@ -132,9 +132,9 @@ if (strpos($dir, '..') === false) { // $path needs to be normalized - this failed within drag'n'drop upload to a sub-folder if ($resolution === 'autorename') { // append a number in brackets like 'filename (2).ext' - $target = OCP\Files::buildNotExistingFileName(stripslashes($dir . $relativePath), $files['name'][$i]); + $target = OCP\Files::buildNotExistingFileName($dir . $relativePath, $files['name'][$i]); } else { - $target = \OC\Files\Filesystem::normalizePath(stripslashes($dir . $relativePath).'/'.$files['name'][$i]); + $target = \OC\Files\Filesystem::normalizePath($dir . $relativePath.'/'.$files['name'][$i]); } // relative dir to return to the client diff --git a/apps/files/appinfo/application.php b/apps/files/appinfo/application.php index 13ff60daf89..5203946f827 100644 --- a/apps/files/appinfo/application.php +++ b/apps/files/appinfo/application.php @@ -19,7 +19,6 @@ class Application extends App { parent::__construct('files', $urlParams); $container = $this->getContainer(); - /** * Controllers */ @@ -52,16 +51,5 @@ class Application extends App { $homeFolder ); }); - - /** - * Controllers - */ - $container->registerService('APIController', function (IContainer $c) { - return new ApiController( - $c->query('AppName'), - $c->query('Request'), - $c->query('TagService') - ); - }); } } diff --git a/apps/files/controller/apicontroller.php b/apps/files/controller/apicontroller.php index 902731a0492..1bb07010a27 100644 --- a/apps/files/controller/apicontroller.php +++ b/apps/files/controller/apicontroller.php @@ -67,6 +67,7 @@ class ApiController extends Controller { * * @param string $path path * @param array $tags array of tags + * @return DataResponse */ public function updateFileTags($path, $tags = null) { $result = array(); @@ -75,7 +76,11 @@ class ApiController extends Controller { try { $this->tagService->updateFileTags($path, $tags); } catch (\OCP\Files\NotFoundException $e) { - return new DataResponse($e->getMessage(), Http::STATUS_NOT_FOUND); + return new DataResponse(['message' => $e->getMessage()], Http::STATUS_NOT_FOUND); + } catch (\OCP\Files\StorageNotAvailableException $e) { + return new DataResponse(['message' => $e->getMessage()], Http::STATUS_SERVICE_UNAVAILABLE); + } catch (\Exception $e) { + return new DataResponse(['message' => $e->getMessage()], Http::STATUS_NOT_FOUND); } $result['tags'] = $tags; } @@ -89,6 +94,7 @@ class ApiController extends Controller { * @CORS * * @param array $tagName tag name to filter by + * @return DataResponse */ public function getFilesByTag($tagName) { $files = array(); diff --git a/apps/files/css/files.css b/apps/files/css/files.css index 5b947fa326c..1d6b4ad9e07 100644 --- a/apps/files/css/files.css +++ b/apps/files/css/files.css @@ -13,6 +13,11 @@ } .actions.hidden { display: none; } +.actions.creatable { + position: relative; + z-index: -30; +} + #new { z-index: 1010; float: left; @@ -34,19 +39,21 @@ border-bottom-left-radius: 0; border-bottom-right-radius: 0; border-bottom: none; + background: #f8f8f8; } #new > ul { display: none; position: fixed; min-width: 112px; - z-index: 10; + z-index: -10; padding: 8px; padding-bottom: 0; - margin-top: 14px; + margin-top: 13.5px; margin-left: -1px; text-align: left; background: #f8f8f8; border: 1px solid #ddd; + border: 1px solid rgba(190, 190, 190, 0.901961); border-radius: 5px; border-top-left-radius: 0; box-shadow: 0 2px 7px rgba(170,170,170,.4); @@ -258,11 +265,13 @@ table td.filename .thumbnail { margin-top: 9px; cursor: pointer; float: left; + position: absolute; + z-index: 4; } table td.filename input.filename { width: 70%; margin-top: 9px; - margin-left: 8px; + margin-left: 48px; cursor: text; } .has-favorites table td.filename input.filename { @@ -296,6 +305,10 @@ table td.filename .nametext { max-width: 800px; height: 100%; } +/* IE8 text-overflow: ellipsis support */ +.ie8 table td.filename .nametext { + min-width: 50%; +} .has-favorites #fileList td.filename a.name { left: 50px; margin-right: 50px; @@ -306,6 +319,14 @@ table td.filename .nametext .innernametext { overflow: hidden; position: relative; display: inline-block; + vertical-align: top; +} +/* IE8 text-overflow: ellipsis support */ +.ie8 table td.filename .nametext .innernametext { + white-space: nowrap; + word-wrap: normal; + -ms-text-overflow: ellipsis; + max-width: 47%; } @media only screen and (min-width: 1366px) { @@ -518,9 +539,9 @@ a.action>img { #fileList a.action[data-action="Rename"] { padding: 16px 14px 17px !important; - position: relative; - top: -21px; } + +.ie8 #fileList a.action img, #fileList tr:hover a.action, #fileList a.action.permanent, #fileList tr:focus a.action, @@ -531,6 +552,7 @@ a.action>img { opacity: .5; display:inline; } +.ie8 #fileList a.action:hover img, #fileList tr:hover a.action:hover, #fileList tr:focus a.action:focus, #fileList .name:focus a.action:focus { @@ -625,4 +647,4 @@ table.dragshadow td.size { -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=50)"; filter: alpha(opacity=50); opacity: .5; -}
\ No newline at end of file +} diff --git a/apps/files/css/upload.css b/apps/files/css/upload.css index adf1e9d13f8..bd60f831388 100644 --- a/apps/files/css/upload.css +++ b/apps/files/css/upload.css @@ -8,6 +8,8 @@ margin-left: 3px; overflow: hidden; vertical-align: top; + position: relative; + z-index: -20; } #upload .icon-upload { position: relative; diff --git a/apps/files/index.php b/apps/files/index.php index 767cb156ca2..fe2cd4f5543 100644 --- a/apps/files/index.php +++ b/apps/files/index.php @@ -29,7 +29,6 @@ OCP\User::checkLoggedIn(); OCP\Util::addStyle('files', 'files'); OCP\Util::addStyle('files', 'upload'); OCP\Util::addStyle('files', 'mobile'); -OCP\Util::addTranslations('files'); OCP\Util::addscript('files', 'app'); OCP\Util::addscript('files', 'file-upload'); OCP\Util::addscript('files', 'jquery.iframe-transport'); diff --git a/apps/files/js/favoritesfilelist.js b/apps/files/js/favoritesfilelist.js index 0d555ce609d..4e7db9f17ba 100644 --- a/apps/files/js/favoritesfilelist.js +++ b/apps/files/js/favoritesfilelist.js @@ -28,7 +28,7 @@ $(document).ready(function() { FavoritesFileList.prototype = _.extend({}, OCA.Files.FileList.prototype, /** @lends OCA.Files.FavoritesFileList.prototype */ { id: 'favorites', - appName: 'Favorites', + appName: t('files','Favorites'), _clientSideSort: true, _allowSelection: false, diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js index 9412e510a54..b335f1f6432 100644 --- a/apps/files/js/fileactions.js +++ b/apps/files/js/fileactions.js @@ -247,8 +247,9 @@ html += '<img class="svg" alt="" src="' + img + '" />'; } if (actionSpec.displayName) { - html += '<span> ' + actionSpec.displayName + '</span></a>'; + html += '<span> ' + actionSpec.displayName + '</span>'; } + html += '</a>'; return $(html); }, diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index 1d7252220bf..c5c665cee77 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -323,7 +323,7 @@ */ _onClickFile: function(event) { var $tr = $(event.target).closest('tr'); - if (event.ctrlKey || event.shiftKey) { + if (this._allowSelection && (event.ctrlKey || event.shiftKey)) { event.preventDefault(); if (event.shiftKey) { var $lastTr = $(this._lastChecked); @@ -369,6 +369,8 @@ dir: $tr.attr('data-path') || this.getCurrentDirectory() }); } + // deselect row + $(event.target).closest('a').blur(); } } }, diff --git a/apps/files/js/tagsplugin.js b/apps/files/js/tagsplugin.js index dec6063aa9b..293e25176f3 100644 --- a/apps/files/js/tagsplugin.js +++ b/apps/files/js/tagsplugin.js @@ -40,7 +40,7 @@ } return this._template({ isFavorite: state, - altText: state ? t('core', 'Favorited') : t('core', 'Favorite'), + altText: state ? t('files', 'Favorited') : t('files', 'Favorite'), imgFile: getStarImage(state) }); } @@ -53,6 +53,7 @@ */ function toggleStar($actionEl, state) { $actionEl.find('img').attr('src', getStarImage(state)); + $actionEl.hide().show(0); //force Safari to redraw element on src change $actionEl.toggleClass('permanent', state); } @@ -108,7 +109,9 @@ self.applyFileTags( dir + '/' + fileName, - tags + tags, + $actionEl, + isFavorite ).then(function(result) { // response from server should contain updated tags var newTags = result.tags; @@ -156,8 +159,10 @@ * * @param {String} fileName path to the file or folder to tag * @param {Array.<String>} tagNames array of tag names + * @param {Object} $actionEl element + * @param {boolean} isFavorite Was the item favorited before */ - applyFileTags: function(fileName, tagNames) { + applyFileTags: function(fileName, tagNames, $actionEl, isFavorite) { var encodedPath = OC.encodePath(fileName); while (encodedPath[0] === '/') { encodedPath = encodedPath.substr(1); @@ -170,6 +175,14 @@ }), dataType: 'json', type: 'POST' + }).fail(function(response) { + var message = ''; + // show message if it is available + if(response.responseJSON && response.responseJSON.message) { + message = ': ' + response.responseJSON.message; + } + OC.Notification.showTemporary(t('files', 'An error occurred while trying to update the tags') + message); + toggleStar($actionEl, isFavorite); }); } }; diff --git a/apps/files/l10n/bg_BG.js b/apps/files/l10n/bg_BG.js index b7fc758007c..1d9417b154e 100644 --- a/apps/files/l10n/bg_BG.js +++ b/apps/files/l10n/bg_BG.js @@ -53,7 +53,9 @@ OC.L10N.register( "Disconnect storage" : "Извади дисковото устройство.", "Unshare" : "Премахни Споделяне", "Download" : "Изтегли", + "Select" : "Избери", "Pending" : "Чакащо", + "Unable to determine date" : "Неуспешно установяване на дата", "Error moving file." : "Грешка при местенето на файла.", "Error moving file" : "Грешка при преместването на файла.", "Error" : "Грешка", @@ -72,8 +74,9 @@ OC.L10N.register( "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Програмата за криптиране е включена, но твоите ключове не са зададени, моля отпиши си и се впиши отново.", "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Невалиден личен ключ за Криптиращата Програма. Моля, обнови личния си ключ в Лични настройки, за да възстановиш достъпа до криптираните си файловете.", "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Криптирането е изключено, но файлове ти са все още защитени. Моля, отиди на лични найстройки, за да разшфроваш файловете.", - "_matches '{filter}'_::_match '{filter}'_" : ["",""], + "_matches '{filter}'_::_match '{filter}'_" : ["пасва на '{filter}'","пасват на '{filter}'\n "], "{dirs} and {files}" : "{dirs} и {files}", + "Favorited" : "Отбелязано в любими", "Favorite" : "Любими", "%s could not be renamed as it has been deleted" : "%s не може да бъде преименуван, защото е вече изтрит", "%s could not be renamed" : "%s не може да бъде преименуван.", @@ -93,9 +96,15 @@ OC.L10N.register( "From link" : "От връзка", "Upload" : "Качване", "Cancel upload" : "Отказване на качването", + "No files yet" : "Все още няма файлове", + "Upload some content or sync with your devices!" : "Качи съдържание или синхронизирай с твоите устройства!", + "No entries found in this folder" : "Няма намерени записи в тази папка", + "Select all" : "Избери всички", "Upload too large" : "Прекалено голям файл за качване.", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Файловете, които се опитваш да качиш са по-големи от позволеното на този сървър.", "Files are being scanned, please wait." : "Файловете се сканирват, изчакайте.", - "Currently scanning" : "В момента се търси" + "Currently scanning" : "В момента се търси", + "No favorites" : "Няма любими", + "Files and folders you mark as favorite will show up here" : "Файловете и папките които отбелязваш като любими ще се показват тук" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files/l10n/bg_BG.json b/apps/files/l10n/bg_BG.json index 05871b7f863..d8835e4e55f 100644 --- a/apps/files/l10n/bg_BG.json +++ b/apps/files/l10n/bg_BG.json @@ -51,7 +51,9 @@ "Disconnect storage" : "Извади дисковото устройство.", "Unshare" : "Премахни Споделяне", "Download" : "Изтегли", + "Select" : "Избери", "Pending" : "Чакащо", + "Unable to determine date" : "Неуспешно установяване на дата", "Error moving file." : "Грешка при местенето на файла.", "Error moving file" : "Грешка при преместването на файла.", "Error" : "Грешка", @@ -70,8 +72,9 @@ "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Програмата за криптиране е включена, но твоите ключове не са зададени, моля отпиши си и се впиши отново.", "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Невалиден личен ключ за Криптиращата Програма. Моля, обнови личния си ключ в Лични настройки, за да възстановиш достъпа до криптираните си файловете.", "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Криптирането е изключено, но файлове ти са все още защитени. Моля, отиди на лични найстройки, за да разшфроваш файловете.", - "_matches '{filter}'_::_match '{filter}'_" : ["",""], + "_matches '{filter}'_::_match '{filter}'_" : ["пасва на '{filter}'","пасват на '{filter}'\n "], "{dirs} and {files}" : "{dirs} и {files}", + "Favorited" : "Отбелязано в любими", "Favorite" : "Любими", "%s could not be renamed as it has been deleted" : "%s не може да бъде преименуван, защото е вече изтрит", "%s could not be renamed" : "%s не може да бъде преименуван.", @@ -91,9 +94,15 @@ "From link" : "От връзка", "Upload" : "Качване", "Cancel upload" : "Отказване на качването", + "No files yet" : "Все още няма файлове", + "Upload some content or sync with your devices!" : "Качи съдържание или синхронизирай с твоите устройства!", + "No entries found in this folder" : "Няма намерени записи в тази папка", + "Select all" : "Избери всички", "Upload too large" : "Прекалено голям файл за качване.", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Файловете, които се опитваш да качиш са по-големи от позволеното на този сървър.", "Files are being scanned, please wait." : "Файловете се сканирват, изчакайте.", - "Currently scanning" : "В момента се търси" + "Currently scanning" : "В момента се търси", + "No favorites" : "Няма любими", + "Files and folders you mark as favorite will show up here" : "Файловете и папките които отбелязваш като любими ще се показват тук" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files/l10n/da.js b/apps/files/l10n/da.js index 41f59de71b2..80ca71ef04d 100644 --- a/apps/files/l10n/da.js +++ b/apps/files/l10n/da.js @@ -77,7 +77,7 @@ OC.L10N.register( "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Krypteringen blev deaktiveret, men dine filer er stadig krypteret. Gå venligst til dine personlige indstillinger for at dekryptere dine filer. ", "_matches '{filter}'_::_match '{filter}'_" : ["match '{filter}'","match '{filter}'"], "{dirs} and {files}" : "{dirs} og {files}", - "Favorited" : "Gjort til favorit", + "Favorited" : "Gjort til foretrukken", "Favorite" : "Foretrukken", "%s could not be renamed as it has been deleted" : "%s kunne ikke omdøbes, da den er blevet slettet", "%s could not be renamed" : "%s kunne ikke omdøbes", @@ -104,8 +104,8 @@ OC.L10N.register( "Upload too large" : "Upload er for stor", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Filerne, du prøver at uploade, er større end den maksimale størrelse for fil-upload på denne server.", "Files are being scanned, please wait." : "Filerne bliver indlæst, vent venligst.", - "Currently scanning" : "Indlæser", - "No favorites" : "Ingen favoritter", - "Files and folders you mark as favorite will show up here" : "Filer og mapper som du har markeret som favoritter, vil blive vist her" + "Currently scanning" : "Skanning er i gang", + "No favorites" : "Ingen foretrukne", + "Files and folders you mark as favorite will show up here" : "Filer og mapper som du har markeret som foretrukne, vil blive vist her" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files/l10n/da.json b/apps/files/l10n/da.json index 0b93a3fa8a3..27a70fa59c3 100644 --- a/apps/files/l10n/da.json +++ b/apps/files/l10n/da.json @@ -75,7 +75,7 @@ "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Krypteringen blev deaktiveret, men dine filer er stadig krypteret. Gå venligst til dine personlige indstillinger for at dekryptere dine filer. ", "_matches '{filter}'_::_match '{filter}'_" : ["match '{filter}'","match '{filter}'"], "{dirs} and {files}" : "{dirs} og {files}", - "Favorited" : "Gjort til favorit", + "Favorited" : "Gjort til foretrukken", "Favorite" : "Foretrukken", "%s could not be renamed as it has been deleted" : "%s kunne ikke omdøbes, da den er blevet slettet", "%s could not be renamed" : "%s kunne ikke omdøbes", @@ -102,8 +102,8 @@ "Upload too large" : "Upload er for stor", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Filerne, du prøver at uploade, er større end den maksimale størrelse for fil-upload på denne server.", "Files are being scanned, please wait." : "Filerne bliver indlæst, vent venligst.", - "Currently scanning" : "Indlæser", - "No favorites" : "Ingen favoritter", - "Files and folders you mark as favorite will show up here" : "Filer og mapper som du har markeret som favoritter, vil blive vist her" + "Currently scanning" : "Skanning er i gang", + "No favorites" : "Ingen foretrukne", + "Files and folders you mark as favorite will show up here" : "Filer og mapper som du har markeret som foretrukne, vil blive vist her" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files/l10n/de.js b/apps/files/l10n/de.js index 1559fe5c03a..7fa9cd9af28 100644 --- a/apps/files/l10n/de.js +++ b/apps/files/l10n/de.js @@ -26,7 +26,7 @@ OC.L10N.register( "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "Die hochgeladene Datei überschreitet die upload_max_filesize Vorgabe in php.ini", "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Die Datei ist größer, als die MAX_FILE_SIZE Direktive erlaubt, die im HTML-Formular spezifiziert ist", "The uploaded file was only partially uploaded" : "Die Datei konnte nur teilweise übertragen werden", - "No file was uploaded" : "Keine Datei konnte übertragen werden.", + "No file was uploaded" : "Es wurde keine Datei hochgeladen", "Missing a temporary folder" : "Kein temporärer Ordner vorhanden", "Failed to write to disk" : "Fehler beim Schreiben auf die Festplatte", "Not enough storage available" : "Nicht genug Speicher vorhanden.", @@ -67,7 +67,7 @@ OC.L10N.register( "Modified" : "Geändert", "_%n folder_::_%n folders_" : ["%n Ordner","%n Ordner"], "_%n file_::_%n files_" : ["%n Datei","%n Dateien"], - "You don’t have permission to upload or create files here" : "Du besitzt hier keine Berechtigung, um Dateien hochzuladen oder zu erstellen", + "You don’t have permission to upload or create files here" : "Du hast keine Berechtigung, hier Dateien hochzuladen oder zu erstellen", "_Uploading %n file_::_Uploading %n files_" : ["%n Datei wird hochgeladen","%n Dateien werden hochgeladen"], "\"{name}\" is an invalid file name." : "»{name}« ist kein gültiger Dateiname.", "Your storage is full, files can not be updated or synced anymore!" : "Dein Speicher ist voll, daher können keine Dateien mehr aktualisiert oder synchronisiert werden!", diff --git a/apps/files/l10n/de.json b/apps/files/l10n/de.json index fd9b6260d6d..e37d96abd2e 100644 --- a/apps/files/l10n/de.json +++ b/apps/files/l10n/de.json @@ -24,7 +24,7 @@ "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "Die hochgeladene Datei überschreitet die upload_max_filesize Vorgabe in php.ini", "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Die Datei ist größer, als die MAX_FILE_SIZE Direktive erlaubt, die im HTML-Formular spezifiziert ist", "The uploaded file was only partially uploaded" : "Die Datei konnte nur teilweise übertragen werden", - "No file was uploaded" : "Keine Datei konnte übertragen werden.", + "No file was uploaded" : "Es wurde keine Datei hochgeladen", "Missing a temporary folder" : "Kein temporärer Ordner vorhanden", "Failed to write to disk" : "Fehler beim Schreiben auf die Festplatte", "Not enough storage available" : "Nicht genug Speicher vorhanden.", @@ -65,7 +65,7 @@ "Modified" : "Geändert", "_%n folder_::_%n folders_" : ["%n Ordner","%n Ordner"], "_%n file_::_%n files_" : ["%n Datei","%n Dateien"], - "You don’t have permission to upload or create files here" : "Du besitzt hier keine Berechtigung, um Dateien hochzuladen oder zu erstellen", + "You don’t have permission to upload or create files here" : "Du hast keine Berechtigung, hier Dateien hochzuladen oder zu erstellen", "_Uploading %n file_::_Uploading %n files_" : ["%n Datei wird hochgeladen","%n Dateien werden hochgeladen"], "\"{name}\" is an invalid file name." : "»{name}« ist kein gültiger Dateiname.", "Your storage is full, files can not be updated or synced anymore!" : "Dein Speicher ist voll, daher können keine Dateien mehr aktualisiert oder synchronisiert werden!", diff --git a/apps/files/l10n/de_DE.js b/apps/files/l10n/de_DE.js index 5ea57cdc70c..9d864bf3626 100644 --- a/apps/files/l10n/de_DE.js +++ b/apps/files/l10n/de_DE.js @@ -10,23 +10,23 @@ OC.L10N.register( "File name cannot be empty." : "Der Dateiname darf nicht leer sein.", "\"%s\" is an invalid file name." : "\"%s\" ist kein gültiger Dateiname.", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "Ungültiger Name, '\\', '/', '<', '>', ':', '\"', '|', '?' und '*' sind nicht zulässig.", - "The target folder has been moved or deleted." : "Der Ziel-Ordner wurde verschoben oder gelöscht.", + "The target folder has been moved or deleted." : "Der Zielordner wurde verschoben oder gelöscht.", "The name %s is already used in the folder %s. Please choose a different name." : "Der Name %s wird bereits im Ordner %s benutzt. Bitte wählen Sie einen anderen Namen.", "Not a valid source" : "Keine gültige Quelle", "Server is not allowed to open URLs, please check the server configuration" : "Dem Server ist das Öffnen von URLs nicht erlaubt, bitte die Serverkonfiguration prüfen", "The file exceeds your quota by %s" : "Die Datei überschreitet Ihr Limit um %s", "Error while downloading %s to %s" : "Fehler beim Herunterladen von %s nach %s", "Error when creating the file" : "Fehler beim Erstellen der Datei", - "Folder name cannot be empty." : "Der Ordner-Name darf nicht leer sein.", + "Folder name cannot be empty." : "Der Ordnername darf nicht leer sein.", "Error when creating the folder" : "Fehler beim Erstellen des Ordners", "Unable to set upload directory." : "Das Upload-Verzeichnis konnte nicht gesetzt werden.", "Invalid Token" : "Ungültiges Merkmal", "No file was uploaded. Unknown error" : "Keine Datei hochgeladen. Unbekannter Fehler", "There is no error, the file uploaded with success" : "Es ist kein Fehler aufgetreten. Die Datei wurde erfolgreich hochgeladen.", - "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "Die hochgeladene Datei überschreitet die upload_max_filesize Vorgabe in php.ini", - "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Die Datei ist größer, als die MAX_FILE_SIZE Vorgabe erlaubt, die im HTML-Formular spezifiziert ist", + "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "Die hochgeladene Datei überschreitet die upload_max_filesize-Vorgabe in php.ini", + "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Die Datei ist größer, als die MAX_FILE_SIZE-Vorgabe erlaubt, die im HTML-Formular spezifiziert ist", "The uploaded file was only partially uploaded" : "Die Datei konnte nur teilweise übertragen werden", - "No file was uploaded" : "Keine Datei konnte übertragen werden.", + "No file was uploaded" : "Es wurde keine Datei hochgeladen", "Missing a temporary folder" : "Kein temporärer Ordner vorhanden", "Failed to write to disk" : "Fehler beim Schreiben auf die Festplatte", "Not enough storage available" : "Nicht genug Speicher vorhanden.", @@ -67,9 +67,9 @@ OC.L10N.register( "Modified" : "Geändert", "_%n folder_::_%n folders_" : ["%n Ordner","%n Ordner"], "_%n file_::_%n files_" : ["%n Datei","%n Dateien"], - "You don’t have permission to upload or create files here" : "Sie besitzen hier keine Berechtigung Dateien hochzuladen oder zu erstellen", + "You don’t have permission to upload or create files here" : "Sie haben keine Berechtigung, hier Dateien hochzuladen oder zu erstellen", "_Uploading %n file_::_Uploading %n files_" : ["%n Datei wird hoch geladen","%n Dateien werden hoch geladen"], - "\"{name}\" is an invalid file name." : "»{name}« ist kein gültiger Dateiname.", + "\"{name}\" is an invalid file name." : "„{name}“ ist kein gültiger Dateiname.", "Your storage is full, files can not be updated or synced anymore!" : "Ihr Speicher ist voll, daher können keine Dateien mehr aktualisiert oder synchronisiert werden!", "Your storage is almost full ({usedSpacePercent}%)" : "Ihr Speicher ist fast voll ({usedSpacePercent}%)", "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Verschlüsselungs-App ist aktiviert, aber Ihre Schlüssel sind nicht initialisiert. Bitte melden Sie sich nochmals ab und wieder an.", diff --git a/apps/files/l10n/de_DE.json b/apps/files/l10n/de_DE.json index 2ecb290e61c..bc2fd5acddd 100644 --- a/apps/files/l10n/de_DE.json +++ b/apps/files/l10n/de_DE.json @@ -8,23 +8,23 @@ "File name cannot be empty." : "Der Dateiname darf nicht leer sein.", "\"%s\" is an invalid file name." : "\"%s\" ist kein gültiger Dateiname.", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "Ungültiger Name, '\\', '/', '<', '>', ':', '\"', '|', '?' und '*' sind nicht zulässig.", - "The target folder has been moved or deleted." : "Der Ziel-Ordner wurde verschoben oder gelöscht.", + "The target folder has been moved or deleted." : "Der Zielordner wurde verschoben oder gelöscht.", "The name %s is already used in the folder %s. Please choose a different name." : "Der Name %s wird bereits im Ordner %s benutzt. Bitte wählen Sie einen anderen Namen.", "Not a valid source" : "Keine gültige Quelle", "Server is not allowed to open URLs, please check the server configuration" : "Dem Server ist das Öffnen von URLs nicht erlaubt, bitte die Serverkonfiguration prüfen", "The file exceeds your quota by %s" : "Die Datei überschreitet Ihr Limit um %s", "Error while downloading %s to %s" : "Fehler beim Herunterladen von %s nach %s", "Error when creating the file" : "Fehler beim Erstellen der Datei", - "Folder name cannot be empty." : "Der Ordner-Name darf nicht leer sein.", + "Folder name cannot be empty." : "Der Ordnername darf nicht leer sein.", "Error when creating the folder" : "Fehler beim Erstellen des Ordners", "Unable to set upload directory." : "Das Upload-Verzeichnis konnte nicht gesetzt werden.", "Invalid Token" : "Ungültiges Merkmal", "No file was uploaded. Unknown error" : "Keine Datei hochgeladen. Unbekannter Fehler", "There is no error, the file uploaded with success" : "Es ist kein Fehler aufgetreten. Die Datei wurde erfolgreich hochgeladen.", - "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "Die hochgeladene Datei überschreitet die upload_max_filesize Vorgabe in php.ini", - "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Die Datei ist größer, als die MAX_FILE_SIZE Vorgabe erlaubt, die im HTML-Formular spezifiziert ist", + "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "Die hochgeladene Datei überschreitet die upload_max_filesize-Vorgabe in php.ini", + "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Die Datei ist größer, als die MAX_FILE_SIZE-Vorgabe erlaubt, die im HTML-Formular spezifiziert ist", "The uploaded file was only partially uploaded" : "Die Datei konnte nur teilweise übertragen werden", - "No file was uploaded" : "Keine Datei konnte übertragen werden.", + "No file was uploaded" : "Es wurde keine Datei hochgeladen", "Missing a temporary folder" : "Kein temporärer Ordner vorhanden", "Failed to write to disk" : "Fehler beim Schreiben auf die Festplatte", "Not enough storage available" : "Nicht genug Speicher vorhanden.", @@ -65,9 +65,9 @@ "Modified" : "Geändert", "_%n folder_::_%n folders_" : ["%n Ordner","%n Ordner"], "_%n file_::_%n files_" : ["%n Datei","%n Dateien"], - "You don’t have permission to upload or create files here" : "Sie besitzen hier keine Berechtigung Dateien hochzuladen oder zu erstellen", + "You don’t have permission to upload or create files here" : "Sie haben keine Berechtigung, hier Dateien hochzuladen oder zu erstellen", "_Uploading %n file_::_Uploading %n files_" : ["%n Datei wird hoch geladen","%n Dateien werden hoch geladen"], - "\"{name}\" is an invalid file name." : "»{name}« ist kein gültiger Dateiname.", + "\"{name}\" is an invalid file name." : "„{name}“ ist kein gültiger Dateiname.", "Your storage is full, files can not be updated or synced anymore!" : "Ihr Speicher ist voll, daher können keine Dateien mehr aktualisiert oder synchronisiert werden!", "Your storage is almost full ({usedSpacePercent}%)" : "Ihr Speicher ist fast voll ({usedSpacePercent}%)", "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Verschlüsselungs-App ist aktiviert, aber Ihre Schlüssel sind nicht initialisiert. Bitte melden Sie sich nochmals ab und wieder an.", diff --git a/apps/files/l10n/el.js b/apps/files/l10n/el.js index 6073f6d2783..02cfa856af1 100644 --- a/apps/files/l10n/el.js +++ b/apps/files/l10n/el.js @@ -94,6 +94,7 @@ OC.L10N.register( "From link" : "Από σύνδεσμο", "Upload" : "Μεταφόρτωση", "Cancel upload" : "Ακύρωση μεταφόρτωσης", + "No entries found in this folder" : "Δεν βρέθηκαν καταχωρήσεις σε αυτόν το φάκελο", "Select all" : "Επιλογή όλων", "Upload too large" : "Πολύ μεγάλο αρχείο προς αποστολή", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Τα αρχεία που προσπαθείτε να ανεβάσετε υπερβαίνουν το μέγιστο μέγεθος αποστολής αρχείων σε αυτόν τον διακομιστή.", diff --git a/apps/files/l10n/el.json b/apps/files/l10n/el.json index 9d8a9d0ec8d..5f2ecf6c2a3 100644 --- a/apps/files/l10n/el.json +++ b/apps/files/l10n/el.json @@ -92,6 +92,7 @@ "From link" : "Από σύνδεσμο", "Upload" : "Μεταφόρτωση", "Cancel upload" : "Ακύρωση μεταφόρτωσης", + "No entries found in this folder" : "Δεν βρέθηκαν καταχωρήσεις σε αυτόν το φάκελο", "Select all" : "Επιλογή όλων", "Upload too large" : "Πολύ μεγάλο αρχείο προς αποστολή", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Τα αρχεία που προσπαθείτε να ανεβάσετε υπερβαίνουν το μέγιστο μέγεθος αποστολής αρχείων σε αυτόν τον διακομιστή.", diff --git a/apps/files/l10n/en@pirate.js b/apps/files/l10n/en@pirate.js index 709448d1af3..db9b7b949c9 100644 --- a/apps/files/l10n/en@pirate.js +++ b/apps/files/l10n/en@pirate.js @@ -1,10 +1,10 @@ OC.L10N.register( "files", { + "Download" : "Download", "_%n folder_::_%n folders_" : ["",""], "_%n file_::_%n files_" : ["",""], "_Uploading %n file_::_Uploading %n files_" : ["",""], - "_matches '{filter}'_::_match '{filter}'_" : ["",""], - "Download" : "Download" + "_matches '{filter}'_::_match '{filter}'_" : ["",""] }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files/l10n/en@pirate.json b/apps/files/l10n/en@pirate.json index d5057651887..c7c86950aa0 100644 --- a/apps/files/l10n/en@pirate.json +++ b/apps/files/l10n/en@pirate.json @@ -1,8 +1,8 @@ { "translations": { + "Download" : "Download", "_%n folder_::_%n folders_" : ["",""], "_%n file_::_%n files_" : ["",""], "_Uploading %n file_::_Uploading %n files_" : ["",""], - "_matches '{filter}'_::_match '{filter}'_" : ["",""], - "Download" : "Download" + "_matches '{filter}'_::_match '{filter}'_" : ["",""] },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files/l10n/eu.js b/apps/files/l10n/eu.js index b1f60461345..0db6c61e466 100644 --- a/apps/files/l10n/eu.js +++ b/apps/files/l10n/eu.js @@ -55,11 +55,13 @@ OC.L10N.register( "Download" : "Deskargatu", "Select" : "hautatu", "Pending" : "Zain", + "Unable to determine date" : "Ezin izan da data zehaztu", "Error moving file." : "Errorea fitxategia mugitzean.", "Error moving file" : "Errorea fitxategia mugitzean", "Error" : "Errorea", "Could not rename file" : "Ezin izan da fitxategia berrizendatu", "Error deleting file." : "Errorea fitxategia ezabatzerakoan.", + "No entries in this folder match '{filter}'" : "Karpeta honetan ez dago sarrerarik '{filter}' iragazkiarekin bat egiten dutenak", "Name" : "Izena", "Size" : "Tamaina", "Modified" : "Aldatuta", @@ -75,6 +77,7 @@ OC.L10N.register( "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Enkriptazioa desgaitua izan da baina zure fitxategiak oraindik enkriptatuta daude. Mesedez jo zure ezarpen pertsonaletara zure fitxategiak dekodifikatzeko.", "_matches '{filter}'_::_match '{filter}'_" : ["",""], "{dirs} and {files}" : "{dirs} eta {files}", + "Favorited" : "Gogokoa", "Favorite" : "Gogokoa", "%s could not be renamed as it has been deleted" : "%s ezin izan da berrizendatu ezabatua zegoen eta", "%s could not be renamed" : "%s ezin da berrizendatu", @@ -94,9 +97,15 @@ OC.L10N.register( "From link" : "Estekatik", "Upload" : "Igo", "Cancel upload" : "Ezeztatu igoera", + "No files yet" : "Oraingoz fitxategirik ez", + "Upload some content or sync with your devices!" : "Igo edukiren bat edo sinkronizatu zure gailuekin!", + "No entries found in this folder" : "Ez da sarrerarik aurkitu karpeta honetan", + "Select all" : "Hautatu dena", "Upload too large" : "Igoera handiegia da", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Igotzen saiatzen ari zaren fitxategiak zerbitzari honek igotzeko onartzen duena baino handiagoak dira.", "Files are being scanned, please wait." : "Fitxategiak eskaneatzen ari da, itxoin mezedez.", - "Currently scanning" : "Eskaneatzen une honetan" + "Currently scanning" : "Eskaneatzen une honetan", + "No favorites" : "Gogokorik ez", + "Files and folders you mark as favorite will show up here" : "Gogokotzat markatutako fitxategi eta karpeta hemen agertuko dira" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files/l10n/eu.json b/apps/files/l10n/eu.json index 79b98f6feb8..1529fd880f9 100644 --- a/apps/files/l10n/eu.json +++ b/apps/files/l10n/eu.json @@ -53,11 +53,13 @@ "Download" : "Deskargatu", "Select" : "hautatu", "Pending" : "Zain", + "Unable to determine date" : "Ezin izan da data zehaztu", "Error moving file." : "Errorea fitxategia mugitzean.", "Error moving file" : "Errorea fitxategia mugitzean", "Error" : "Errorea", "Could not rename file" : "Ezin izan da fitxategia berrizendatu", "Error deleting file." : "Errorea fitxategia ezabatzerakoan.", + "No entries in this folder match '{filter}'" : "Karpeta honetan ez dago sarrerarik '{filter}' iragazkiarekin bat egiten dutenak", "Name" : "Izena", "Size" : "Tamaina", "Modified" : "Aldatuta", @@ -73,6 +75,7 @@ "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Enkriptazioa desgaitua izan da baina zure fitxategiak oraindik enkriptatuta daude. Mesedez jo zure ezarpen pertsonaletara zure fitxategiak dekodifikatzeko.", "_matches '{filter}'_::_match '{filter}'_" : ["",""], "{dirs} and {files}" : "{dirs} eta {files}", + "Favorited" : "Gogokoa", "Favorite" : "Gogokoa", "%s could not be renamed as it has been deleted" : "%s ezin izan da berrizendatu ezabatua zegoen eta", "%s could not be renamed" : "%s ezin da berrizendatu", @@ -92,9 +95,15 @@ "From link" : "Estekatik", "Upload" : "Igo", "Cancel upload" : "Ezeztatu igoera", + "No files yet" : "Oraingoz fitxategirik ez", + "Upload some content or sync with your devices!" : "Igo edukiren bat edo sinkronizatu zure gailuekin!", + "No entries found in this folder" : "Ez da sarrerarik aurkitu karpeta honetan", + "Select all" : "Hautatu dena", "Upload too large" : "Igoera handiegia da", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Igotzen saiatzen ari zaren fitxategiak zerbitzari honek igotzeko onartzen duena baino handiagoak dira.", "Files are being scanned, please wait." : "Fitxategiak eskaneatzen ari da, itxoin mezedez.", - "Currently scanning" : "Eskaneatzen une honetan" + "Currently scanning" : "Eskaneatzen une honetan", + "No favorites" : "Gogokorik ez", + "Files and folders you mark as favorite will show up here" : "Gogokotzat markatutako fitxategi eta karpeta hemen agertuko dira" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files/l10n/fr.js b/apps/files/l10n/fr.js index 9bf9fdcd401..4f1efe478b7 100644 --- a/apps/files/l10n/fr.js +++ b/apps/files/l10n/fr.js @@ -98,14 +98,14 @@ OC.L10N.register( "Upload" : "Chargement", "Cancel upload" : "Annuler l'envoi", "No files yet" : "Aucun fichier pour l'instant", - "Upload some content or sync with your devices!" : "Envoyez des fichiers ou synchronisez en depuis vos appareils", + "Upload some content or sync with your devices!" : "Déposez du contenu ou synchronisez vos appareils !", "No entries found in this folder" : "Aucune entrée trouvée dans ce dossier", "Select all" : "Tout sélectionner", "Upload too large" : "Téléversement trop volumineux", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Les fichiers que vous essayez d'envoyer dépassent la taille maximale d'envoi permise par ce serveur.", "Files are being scanned, please wait." : "Les fichiers sont en cours d'analyse, veuillez patienter.", "Currently scanning" : "Analyse en cours", - "No favorites" : "Pas de favori", + "No favorites" : "Aucun favori", "Files and folders you mark as favorite will show up here" : "Les fichiers et dossiers ajoutés à vos favoris apparaîtront ici" }, "nplurals=2; plural=(n > 1);"); diff --git a/apps/files/l10n/fr.json b/apps/files/l10n/fr.json index fd36fda4125..f083369381c 100644 --- a/apps/files/l10n/fr.json +++ b/apps/files/l10n/fr.json @@ -96,14 +96,14 @@ "Upload" : "Chargement", "Cancel upload" : "Annuler l'envoi", "No files yet" : "Aucun fichier pour l'instant", - "Upload some content or sync with your devices!" : "Envoyez des fichiers ou synchronisez en depuis vos appareils", + "Upload some content or sync with your devices!" : "Déposez du contenu ou synchronisez vos appareils !", "No entries found in this folder" : "Aucune entrée trouvée dans ce dossier", "Select all" : "Tout sélectionner", "Upload too large" : "Téléversement trop volumineux", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Les fichiers que vous essayez d'envoyer dépassent la taille maximale d'envoi permise par ce serveur.", "Files are being scanned, please wait." : "Les fichiers sont en cours d'analyse, veuillez patienter.", "Currently scanning" : "Analyse en cours", - "No favorites" : "Pas de favori", + "No favorites" : "Aucun favori", "Files and folders you mark as favorite will show up here" : "Les fichiers et dossiers ajoutés à vos favoris apparaîtront ici" },"pluralForm" :"nplurals=2; plural=(n > 1);" }
\ No newline at end of file diff --git a/apps/files/l10n/gl.js b/apps/files/l10n/gl.js index 134a6b1cb06..98c71ef207c 100644 --- a/apps/files/l10n/gl.js +++ b/apps/files/l10n/gl.js @@ -75,7 +75,7 @@ OC.L10N.register( "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "A aplicación de cifrado está activada, mais as chaves non foron inicializadas, saia da sesión e volva a acceder de novo", "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "A chave privada para a aplicación de cifrado non é correcta. Actualice o contrasinal da súa chave privada nos seus axustes persoais para recuperar o acceso aos seus ficheiros cifrados.", "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "O cifrado foi desactivado, mais os ficheiros están cifrados. Vaia á configuración persoal para descifrar os ficheiros.", - "_matches '{filter}'_::_match '{filter}'_" : ["",""], + "_matches '{filter}'_::_match '{filter}'_" : ["coincidente con «{filter}»","coincidentes con «{filter}»"], "{dirs} and {files}" : "{dirs} e {files}", "Favorited" : "Marcado como favorito", "Favorite" : "Favorito", diff --git a/apps/files/l10n/gl.json b/apps/files/l10n/gl.json index 4eb3c1bc0f3..0d0ba4a269c 100644 --- a/apps/files/l10n/gl.json +++ b/apps/files/l10n/gl.json @@ -73,7 +73,7 @@ "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "A aplicación de cifrado está activada, mais as chaves non foron inicializadas, saia da sesión e volva a acceder de novo", "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "A chave privada para a aplicación de cifrado non é correcta. Actualice o contrasinal da súa chave privada nos seus axustes persoais para recuperar o acceso aos seus ficheiros cifrados.", "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "O cifrado foi desactivado, mais os ficheiros están cifrados. Vaia á configuración persoal para descifrar os ficheiros.", - "_matches '{filter}'_::_match '{filter}'_" : ["",""], + "_matches '{filter}'_::_match '{filter}'_" : ["coincidente con «{filter}»","coincidentes con «{filter}»"], "{dirs} and {files}" : "{dirs} e {files}", "Favorited" : "Marcado como favorito", "Favorite" : "Favorito", diff --git a/apps/files/l10n/hr.js b/apps/files/l10n/hr.js index 7de1684d577..fa89c2bbe68 100644 --- a/apps/files/l10n/hr.js +++ b/apps/files/l10n/hr.js @@ -53,12 +53,15 @@ OC.L10N.register( "Disconnect storage" : "Isključite pohranu", "Unshare" : "Prestanite dijeliti", "Download" : "Preuzimanje", + "Select" : "Selektiraj", "Pending" : "Na čekanju", + "Unable to determine date" : "Nemogucnost odredjivanja datuma", "Error moving file." : "Pogrešno premještanje datoteke", "Error moving file" : "Pogrešno premještanje datoteke", "Error" : "Pogreška", "Could not rename file" : "Datoteku nije moguće preimenovati", "Error deleting file." : "Pogrešno brisanje datoteke", + "No entries in this folder match '{filter}'" : "Nema zapisa u ovom folderu match '{filter}'", "Name" : "Naziv", "Size" : "Veličina", "Modified" : "Promijenjeno", @@ -74,6 +77,7 @@ OC.L10N.register( "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Šifriranje je onemogućeno, ali vaše su datoteke još uvijek šifrirane. Molimo, otiđite u svojeosobne postavke da biste dešifrirali svoje datoteke.", "_matches '{filter}'_::_match '{filter}'_" : ["","",""], "{dirs} and {files}" : "{dirs} i {files}", + "Favorited" : "Favoritovan", "Favorite" : "Favorit", "%s could not be renamed as it has been deleted" : "%s nije moguće preimenovati jer je izbrisan", "%s could not be renamed" : "%s nije moguće preimenovati", @@ -93,9 +97,15 @@ OC.L10N.register( "From link" : "Od veze", "Upload" : "Učitavanje", "Cancel upload" : "Prekini upload", + "No files yet" : "Trenutno bez fajla", + "Upload some content or sync with your devices!" : "Aplodujte neki sadrzaj ili sinkronizirajte sa vasim uredjajem!", + "No entries found in this folder" : "Zapis nije pronadjen u ovom direktorijumu ", + "Select all" : "Selektiraj sve", "Upload too large" : "Unos je prevelik", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Datoteke koje pokušavate učitati premašuju maksimalnu veličinu za unos datoteka na ovom poslužitelju.", "Files are being scanned, please wait." : "Datoteke se provjeravaju, molimo pričekajte.", - "Currently scanning" : "Provjera u tijeku" + "Currently scanning" : "Provjera u tijeku", + "No favorites" : "Nema favorita", + "Files and folders you mark as favorite will show up here" : "Fajlovi i folderi koje oznacite kao favorite ce se prikazati ovdje" }, "nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;"); diff --git a/apps/files/l10n/hr.json b/apps/files/l10n/hr.json index 7b95bd9e989..f77d5927066 100644 --- a/apps/files/l10n/hr.json +++ b/apps/files/l10n/hr.json @@ -51,12 +51,15 @@ "Disconnect storage" : "Isključite pohranu", "Unshare" : "Prestanite dijeliti", "Download" : "Preuzimanje", + "Select" : "Selektiraj", "Pending" : "Na čekanju", + "Unable to determine date" : "Nemogucnost odredjivanja datuma", "Error moving file." : "Pogrešno premještanje datoteke", "Error moving file" : "Pogrešno premještanje datoteke", "Error" : "Pogreška", "Could not rename file" : "Datoteku nije moguće preimenovati", "Error deleting file." : "Pogrešno brisanje datoteke", + "No entries in this folder match '{filter}'" : "Nema zapisa u ovom folderu match '{filter}'", "Name" : "Naziv", "Size" : "Veličina", "Modified" : "Promijenjeno", @@ -72,6 +75,7 @@ "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Šifriranje je onemogućeno, ali vaše su datoteke još uvijek šifrirane. Molimo, otiđite u svojeosobne postavke da biste dešifrirali svoje datoteke.", "_matches '{filter}'_::_match '{filter}'_" : ["","",""], "{dirs} and {files}" : "{dirs} i {files}", + "Favorited" : "Favoritovan", "Favorite" : "Favorit", "%s could not be renamed as it has been deleted" : "%s nije moguće preimenovati jer je izbrisan", "%s could not be renamed" : "%s nije moguće preimenovati", @@ -91,9 +95,15 @@ "From link" : "Od veze", "Upload" : "Učitavanje", "Cancel upload" : "Prekini upload", + "No files yet" : "Trenutno bez fajla", + "Upload some content or sync with your devices!" : "Aplodujte neki sadrzaj ili sinkronizirajte sa vasim uredjajem!", + "No entries found in this folder" : "Zapis nije pronadjen u ovom direktorijumu ", + "Select all" : "Selektiraj sve", "Upload too large" : "Unos je prevelik", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Datoteke koje pokušavate učitati premašuju maksimalnu veličinu za unos datoteka na ovom poslužitelju.", "Files are being scanned, please wait." : "Datoteke se provjeravaju, molimo pričekajte.", - "Currently scanning" : "Provjera u tijeku" + "Currently scanning" : "Provjera u tijeku", + "No favorites" : "Nema favorita", + "Files and folders you mark as favorite will show up here" : "Fajlovi i folderi koje oznacite kao favorite ce se prikazati ovdje" },"pluralForm" :"nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;" }
\ No newline at end of file diff --git a/apps/files/l10n/hu_HU.js b/apps/files/l10n/hu_HU.js index 376bd5d3e13..a43082b0a1c 100644 --- a/apps/files/l10n/hu_HU.js +++ b/apps/files/l10n/hu_HU.js @@ -55,11 +55,13 @@ OC.L10N.register( "Download" : "Letöltés", "Select" : "Kiválaszt", "Pending" : "Folyamatban", + "Unable to determine date" : "Nem lehet meghatározni a dátumot", "Error moving file." : "Hiba történt a fájl áthelyezése közben.", "Error moving file" : "Az állomány áthelyezése nem sikerült.", "Error" : "Hiba", "Could not rename file" : "Az állomány nem nevezhető át", "Error deleting file." : "Hiba a file törlése közben.", + "No entries in this folder match '{filter}'" : "Nincsenek egyező bejegyzések ebben a könyvtárban '{filter}'", "Name" : "Név", "Size" : "Méret", "Modified" : "Módosítva", @@ -73,7 +75,7 @@ OC.L10N.register( "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Az állományok titkosítása engedélyezve van, de az Ön titkos kulcsai nincsenek beállítva. Ezért kérjük, hogy jelentkezzen ki, és lépjen be újra!", "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Az állományok titkosításához használt titkos kulcsa érvénytelen. Kérjük frissítse a titkos kulcs jelszót a személyes beállításokban, hogy ismét hozzáférjen a titkosított állományaihoz!", "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "A titkosítási funkciót kikapcsolták, de az Ön állományai még mindig titkosított állapotban vannak. A személyes beállításoknál tudja a titkosítást feloldani.", - "_matches '{filter}'_::_match '{filter}'_" : ["",""], + "_matches '{filter}'_::_match '{filter}'_" : ["egyezések '{filter}'","egyezés '{filter}'"], "{dirs} and {files}" : "{dirs} és {files}", "Favorited" : "Kedvenc", "Favorite" : "Kedvenc", @@ -96,6 +98,8 @@ OC.L10N.register( "Upload" : "Feltöltés", "Cancel upload" : "A feltöltés megszakítása", "No files yet" : "Még nincsenek fájlok", + "Upload some content or sync with your devices!" : "Tölts fel néhány tartalmat, vagy szinkronizálj az eszközöddel!", + "No entries found in this folder" : "Nincsenek bejegyzések ebben a könyvtárban", "Select all" : "Összes kijelölése", "Upload too large" : "A feltöltés túl nagy", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "A feltöltendő állományok mérete meghaladja a kiszolgálón megengedett maximális méretet.", diff --git a/apps/files/l10n/hu_HU.json b/apps/files/l10n/hu_HU.json index 7719bb5f655..c99f4f1321c 100644 --- a/apps/files/l10n/hu_HU.json +++ b/apps/files/l10n/hu_HU.json @@ -53,11 +53,13 @@ "Download" : "Letöltés", "Select" : "Kiválaszt", "Pending" : "Folyamatban", + "Unable to determine date" : "Nem lehet meghatározni a dátumot", "Error moving file." : "Hiba történt a fájl áthelyezése közben.", "Error moving file" : "Az állomány áthelyezése nem sikerült.", "Error" : "Hiba", "Could not rename file" : "Az állomány nem nevezhető át", "Error deleting file." : "Hiba a file törlése közben.", + "No entries in this folder match '{filter}'" : "Nincsenek egyező bejegyzések ebben a könyvtárban '{filter}'", "Name" : "Név", "Size" : "Méret", "Modified" : "Módosítva", @@ -71,7 +73,7 @@ "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Az állományok titkosítása engedélyezve van, de az Ön titkos kulcsai nincsenek beállítva. Ezért kérjük, hogy jelentkezzen ki, és lépjen be újra!", "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Az állományok titkosításához használt titkos kulcsa érvénytelen. Kérjük frissítse a titkos kulcs jelszót a személyes beállításokban, hogy ismét hozzáférjen a titkosított állományaihoz!", "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "A titkosítási funkciót kikapcsolták, de az Ön állományai még mindig titkosított állapotban vannak. A személyes beállításoknál tudja a titkosítást feloldani.", - "_matches '{filter}'_::_match '{filter}'_" : ["",""], + "_matches '{filter}'_::_match '{filter}'_" : ["egyezések '{filter}'","egyezés '{filter}'"], "{dirs} and {files}" : "{dirs} és {files}", "Favorited" : "Kedvenc", "Favorite" : "Kedvenc", @@ -94,6 +96,8 @@ "Upload" : "Feltöltés", "Cancel upload" : "A feltöltés megszakítása", "No files yet" : "Még nincsenek fájlok", + "Upload some content or sync with your devices!" : "Tölts fel néhány tartalmat, vagy szinkronizálj az eszközöddel!", + "No entries found in this folder" : "Nincsenek bejegyzések ebben a könyvtárban", "Select all" : "Összes kijelölése", "Upload too large" : "A feltöltés túl nagy", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "A feltöltendő állományok mérete meghaladja a kiszolgálón megengedett maximális méretet.", diff --git a/apps/files/l10n/id.js b/apps/files/l10n/id.js index 85353dc496c..2f3544f489d 100644 --- a/apps/files/l10n/id.js +++ b/apps/files/l10n/id.js @@ -13,11 +13,11 @@ OC.L10N.register( "The target folder has been moved or deleted." : "Folder tujuan telah dipindahkan atau dihapus.", "The name %s is already used in the folder %s. Please choose a different name." : "Nama %s sudah digunakan dalam folder %s. Silakan pilih nama yang berbeda.", "Not a valid source" : "Sumber tidak sah", - "Server is not allowed to open URLs, please check the server configuration" : "Server tidak megizinkan untuk membuka URL, mohon periksa konfigurasi server", + "Server is not allowed to open URLs, please check the server configuration" : "Server tidak mengizinkan untuk membuka URL, mohon periksa konfigurasi server", "The file exceeds your quota by %s" : "Berkas melampaui kuota Anda oleh %s", "Error while downloading %s to %s" : "Kesalahan saat mengunduh %s ke %s", "Error when creating the file" : "Kesalahan saat membuat berkas", - "Folder name cannot be empty." : "Nama folder tidak bolh kosong.", + "Folder name cannot be empty." : "Nama folder tidak boleh kosong.", "Error when creating the folder" : "Kesalahan saat membuat folder", "Unable to set upload directory." : "Tidak dapat mengatur folder unggah", "Invalid Token" : "Token tidak sah", @@ -53,12 +53,15 @@ OC.L10N.register( "Disconnect storage" : "Memutuskan penyimpaan", "Unshare" : "Batalkan berbagi", "Download" : "Unduh", + "Select" : "Pilih", "Pending" : "Menunggu", + "Unable to determine date" : "Tidak dapat menentukan tanggal", "Error moving file." : "Kesalahan saat memindahkan berkas.", "Error moving file" : "Kesalahan saat memindahkan berkas", "Error" : "Kesalahan ", "Could not rename file" : "Tidak dapat mengubah nama berkas", "Error deleting file." : "Kesalahan saat menghapus berkas.", + "No entries in this folder match '{filter}'" : "Tidak ada entri di folder ini yang cocok dengan '{filter}'", "Name" : "Nama", "Size" : "Ukuran", "Modified" : "Dimodifikasi", @@ -72,8 +75,9 @@ OC.L10N.register( "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikasi Enskripsi telah diaktifkan tetapi kunci tidak diinisialisasi, silakan log-out dan log-in lagi", "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Kunci privat tidak sah untuk Aplikasi Enskripsi. Silakan perbarui sandi kunci privat anda pada pengaturan pribadi untuk memulihkan akses ke berkas anda yang dienskripsi.", "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Enskripi telah dinonaktifkan tetapi berkas anda tetap dienskripsi. Silakan menuju ke pengaturan pribadi untuk deskrip berkas anda.", - "_matches '{filter}'_::_match '{filter}'_" : [""], + "_matches '{filter}'_::_match '{filter}'_" : ["cocok dengan '{filter}'"], "{dirs} and {files}" : "{dirs} dan {files}", + "Favorited" : "Difavoritkan", "Favorite" : "Favorit", "%s could not be renamed as it has been deleted" : "%s tidak dapat diubah namanya kerena telah dihapus", "%s could not be renamed" : "%s tidak dapat diubah nama", @@ -93,9 +97,15 @@ OC.L10N.register( "From link" : "Dari tautan", "Upload" : "Unggah", "Cancel upload" : "Batal unggah", + "No files yet" : "Masih tidak ada berkas", + "Upload some content or sync with your devices!" : "Unggah beberapa konten dan sinkronisasikan dengan perangkat Anda!", + "No entries found in this folder" : "Tidak ada entri yang ditemukan dalam folder ini", + "Select all" : "Pilih Semua", "Upload too large" : "Yang diunggah terlalu besar", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Berkas yang dicoba untuk diunggah melebihi ukuran maksimum pengunggahan berkas di server ini.", "Files are being scanned, please wait." : "Berkas sedang dipindai, silakan tunggu.", - "Currently scanning" : "Pemindaian terbaru" + "Currently scanning" : "Pemindaian terbaru", + "No favorites" : "Tidak ada favorit", + "Files and folders you mark as favorite will show up here" : "Berkas dan folder yang Anda tandai sebagai favorit akan ditampilkan disini." }, "nplurals=1; plural=0;"); diff --git a/apps/files/l10n/id.json b/apps/files/l10n/id.json index e6c66b0b124..053a1cb3570 100644 --- a/apps/files/l10n/id.json +++ b/apps/files/l10n/id.json @@ -11,11 +11,11 @@ "The target folder has been moved or deleted." : "Folder tujuan telah dipindahkan atau dihapus.", "The name %s is already used in the folder %s. Please choose a different name." : "Nama %s sudah digunakan dalam folder %s. Silakan pilih nama yang berbeda.", "Not a valid source" : "Sumber tidak sah", - "Server is not allowed to open URLs, please check the server configuration" : "Server tidak megizinkan untuk membuka URL, mohon periksa konfigurasi server", + "Server is not allowed to open URLs, please check the server configuration" : "Server tidak mengizinkan untuk membuka URL, mohon periksa konfigurasi server", "The file exceeds your quota by %s" : "Berkas melampaui kuota Anda oleh %s", "Error while downloading %s to %s" : "Kesalahan saat mengunduh %s ke %s", "Error when creating the file" : "Kesalahan saat membuat berkas", - "Folder name cannot be empty." : "Nama folder tidak bolh kosong.", + "Folder name cannot be empty." : "Nama folder tidak boleh kosong.", "Error when creating the folder" : "Kesalahan saat membuat folder", "Unable to set upload directory." : "Tidak dapat mengatur folder unggah", "Invalid Token" : "Token tidak sah", @@ -51,12 +51,15 @@ "Disconnect storage" : "Memutuskan penyimpaan", "Unshare" : "Batalkan berbagi", "Download" : "Unduh", + "Select" : "Pilih", "Pending" : "Menunggu", + "Unable to determine date" : "Tidak dapat menentukan tanggal", "Error moving file." : "Kesalahan saat memindahkan berkas.", "Error moving file" : "Kesalahan saat memindahkan berkas", "Error" : "Kesalahan ", "Could not rename file" : "Tidak dapat mengubah nama berkas", "Error deleting file." : "Kesalahan saat menghapus berkas.", + "No entries in this folder match '{filter}'" : "Tidak ada entri di folder ini yang cocok dengan '{filter}'", "Name" : "Nama", "Size" : "Ukuran", "Modified" : "Dimodifikasi", @@ -70,8 +73,9 @@ "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikasi Enskripsi telah diaktifkan tetapi kunci tidak diinisialisasi, silakan log-out dan log-in lagi", "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Kunci privat tidak sah untuk Aplikasi Enskripsi. Silakan perbarui sandi kunci privat anda pada pengaturan pribadi untuk memulihkan akses ke berkas anda yang dienskripsi.", "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Enskripi telah dinonaktifkan tetapi berkas anda tetap dienskripsi. Silakan menuju ke pengaturan pribadi untuk deskrip berkas anda.", - "_matches '{filter}'_::_match '{filter}'_" : [""], + "_matches '{filter}'_::_match '{filter}'_" : ["cocok dengan '{filter}'"], "{dirs} and {files}" : "{dirs} dan {files}", + "Favorited" : "Difavoritkan", "Favorite" : "Favorit", "%s could not be renamed as it has been deleted" : "%s tidak dapat diubah namanya kerena telah dihapus", "%s could not be renamed" : "%s tidak dapat diubah nama", @@ -91,9 +95,15 @@ "From link" : "Dari tautan", "Upload" : "Unggah", "Cancel upload" : "Batal unggah", + "No files yet" : "Masih tidak ada berkas", + "Upload some content or sync with your devices!" : "Unggah beberapa konten dan sinkronisasikan dengan perangkat Anda!", + "No entries found in this folder" : "Tidak ada entri yang ditemukan dalam folder ini", + "Select all" : "Pilih Semua", "Upload too large" : "Yang diunggah terlalu besar", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Berkas yang dicoba untuk diunggah melebihi ukuran maksimum pengunggahan berkas di server ini.", "Files are being scanned, please wait." : "Berkas sedang dipindai, silakan tunggu.", - "Currently scanning" : "Pemindaian terbaru" + "Currently scanning" : "Pemindaian terbaru", + "No favorites" : "Tidak ada favorit", + "Files and folders you mark as favorite will show up here" : "Berkas dan folder yang Anda tandai sebagai favorit akan ditampilkan disini." },"pluralForm" :"nplurals=1; plural=0;" }
\ No newline at end of file diff --git a/apps/files/l10n/it.js b/apps/files/l10n/it.js index 354bacfdf15..8ec7c4c3478 100644 --- a/apps/files/l10n/it.js +++ b/apps/files/l10n/it.js @@ -75,7 +75,7 @@ OC.L10N.register( "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "L'applicazione di cifratura è abilitata, ma le chiavi non sono state inizializzate, disconnettiti ed effettua nuovamente l'accesso", "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Chiave privata non valida per l'applicazione di cifratura. Aggiorna la password della chiave privata nelle impostazioni personali per ripristinare l'accesso ai tuoi file cifrati.", "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "La cifratura è stata disabilitata ma i tuoi file sono ancora cifrati. Vai nelle impostazioni personali per decifrare i file.", - "_matches '{filter}'_::_match '{filter}'_" : ["",""], + "_matches '{filter}'_::_match '{filter}'_" : ["corrispondono a '{filter}'","corrisponde a '{filter}'"], "{dirs} and {files}" : "{dirs} e {files}", "Favorited" : "Preferiti", "Favorite" : "Preferito", diff --git a/apps/files/l10n/it.json b/apps/files/l10n/it.json index 916d7a3cb13..44dcc27c8a9 100644 --- a/apps/files/l10n/it.json +++ b/apps/files/l10n/it.json @@ -73,7 +73,7 @@ "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "L'applicazione di cifratura è abilitata, ma le chiavi non sono state inizializzate, disconnettiti ed effettua nuovamente l'accesso", "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Chiave privata non valida per l'applicazione di cifratura. Aggiorna la password della chiave privata nelle impostazioni personali per ripristinare l'accesso ai tuoi file cifrati.", "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "La cifratura è stata disabilitata ma i tuoi file sono ancora cifrati. Vai nelle impostazioni personali per decifrare i file.", - "_matches '{filter}'_::_match '{filter}'_" : ["",""], + "_matches '{filter}'_::_match '{filter}'_" : ["corrispondono a '{filter}'","corrisponde a '{filter}'"], "{dirs} and {files}" : "{dirs} e {files}", "Favorited" : "Preferiti", "Favorite" : "Preferito", diff --git a/apps/files/l10n/ja.js b/apps/files/l10n/ja.js index 73acf36ae75..0cb3193c61d 100644 --- a/apps/files/l10n/ja.js +++ b/apps/files/l10n/ja.js @@ -36,7 +36,7 @@ OC.L10N.register( "Files" : "ファイル", "All files" : "すべてのファイル", "Favorites" : "お気に入り", - "Home" : "住居", + "Home" : "ホーム", "Unable to upload {filename} as it is a directory or has 0 bytes" : "ディレクトリもしくは0バイトのため {filename} をアップロードできません", "Total file size {size1} exceeds upload limit {size2}" : "合計ファイルサイズ {size1} はアップロード制限 {size2} を超過しています。", "Not enough free space, you are uploading {size1} but only {size2} is left" : "空き容量が十分でなく、 {size1} をアップロードしていますが、 {size2} しか残っていません。", @@ -61,6 +61,7 @@ OC.L10N.register( "Error" : "エラー", "Could not rename file" : "ファイルの名前変更ができませんでした", "Error deleting file." : "ファイルの削除エラー。", + "No entries in this folder match '{filter}'" : "このフォルダで '{filter}' にマッチするものはありません", "Name" : "名前", "Size" : "サイズ", "Modified" : "更新日時", @@ -74,11 +75,11 @@ OC.L10N.register( "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "暗号化アプリは有効ですが、あなたの暗号化キーは初期化されていません。ログアウトした後に、再度ログインしてください", "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "暗号化アプリの無効なプライベートキーです。あなたの暗号化されたファイルへアクセスするために、個人設定からプライベートキーのパスワードを更新してください。", "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "暗号化の機能は無効化されましたが、ファイルはすでに暗号化されています。個人設定からファイルを複合を行ってください。", - "_matches '{filter}'_::_match '{filter}'_" : [""], + "_matches '{filter}'_::_match '{filter}'_" : [" '{filter}' にマッチ"], "{dirs} and {files}" : "{dirs} と {files}", "Favorited" : "お気に入り済", "Favorite" : "お気に入り", - "%s could not be renamed as it has been deleted" : "%s は削除された為、ファイル名を変更できません", + "%s could not be renamed as it has been deleted" : "%s は削除されたため、ファイル名を変更できません", "%s could not be renamed" : "%sの名前を変更できませんでした", "Upload (max. %s)" : "アップロード ( 最大 %s )", "File handling" : "ファイル操作", diff --git a/apps/files/l10n/ja.json b/apps/files/l10n/ja.json index 586d5244c19..570b63ab5f7 100644 --- a/apps/files/l10n/ja.json +++ b/apps/files/l10n/ja.json @@ -34,7 +34,7 @@ "Files" : "ファイル", "All files" : "すべてのファイル", "Favorites" : "お気に入り", - "Home" : "住居", + "Home" : "ホーム", "Unable to upload {filename} as it is a directory or has 0 bytes" : "ディレクトリもしくは0バイトのため {filename} をアップロードできません", "Total file size {size1} exceeds upload limit {size2}" : "合計ファイルサイズ {size1} はアップロード制限 {size2} を超過しています。", "Not enough free space, you are uploading {size1} but only {size2} is left" : "空き容量が十分でなく、 {size1} をアップロードしていますが、 {size2} しか残っていません。", @@ -59,6 +59,7 @@ "Error" : "エラー", "Could not rename file" : "ファイルの名前変更ができませんでした", "Error deleting file." : "ファイルの削除エラー。", + "No entries in this folder match '{filter}'" : "このフォルダで '{filter}' にマッチするものはありません", "Name" : "名前", "Size" : "サイズ", "Modified" : "更新日時", @@ -72,11 +73,11 @@ "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "暗号化アプリは有効ですが、あなたの暗号化キーは初期化されていません。ログアウトした後に、再度ログインしてください", "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "暗号化アプリの無効なプライベートキーです。あなたの暗号化されたファイルへアクセスするために、個人設定からプライベートキーのパスワードを更新してください。", "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "暗号化の機能は無効化されましたが、ファイルはすでに暗号化されています。個人設定からファイルを複合を行ってください。", - "_matches '{filter}'_::_match '{filter}'_" : [""], + "_matches '{filter}'_::_match '{filter}'_" : [" '{filter}' にマッチ"], "{dirs} and {files}" : "{dirs} と {files}", "Favorited" : "お気に入り済", "Favorite" : "お気に入り", - "%s could not be renamed as it has been deleted" : "%s は削除された為、ファイル名を変更できません", + "%s could not be renamed as it has been deleted" : "%s は削除されたため、ファイル名を変更できません", "%s could not be renamed" : "%sの名前を変更できませんでした", "Upload (max. %s)" : "アップロード ( 最大 %s )", "File handling" : "ファイル操作", diff --git a/apps/files/l10n/jv.js b/apps/files/l10n/jv.js index adbd28854f5..5a6438c3851 100644 --- a/apps/files/l10n/jv.js +++ b/apps/files/l10n/jv.js @@ -1,10 +1,10 @@ OC.L10N.register( "files", { + "Download" : "Njipuk", "_%n folder_::_%n folders_" : ["",""], "_%n file_::_%n files_" : ["",""], "_Uploading %n file_::_Uploading %n files_" : ["",""], - "_matches '{filter}'_::_match '{filter}'_" : ["",""], - "Download" : "Njipuk" + "_matches '{filter}'_::_match '{filter}'_" : ["",""] }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files/l10n/jv.json b/apps/files/l10n/jv.json index 9c2ed5bfbfb..71ada4daa9e 100644 --- a/apps/files/l10n/jv.json +++ b/apps/files/l10n/jv.json @@ -1,8 +1,8 @@ { "translations": { + "Download" : "Njipuk", "_%n folder_::_%n folders_" : ["",""], "_%n file_::_%n files_" : ["",""], "_Uploading %n file_::_Uploading %n files_" : ["",""], - "_matches '{filter}'_::_match '{filter}'_" : ["",""], - "Download" : "Njipuk" + "_matches '{filter}'_::_match '{filter}'_" : ["",""] },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files/l10n/ko.js b/apps/files/l10n/ko.js index c9b880f46ec..d352bacc5ed 100644 --- a/apps/files/l10n/ko.js +++ b/apps/files/l10n/ko.js @@ -1,14 +1,20 @@ OC.L10N.register( "files", { + "Storage not available" : "저장소를 사용할 수 없음", + "Storage invalid" : "저장소가 잘못됨", "Unknown error" : "알 수 없는 오류", "Could not move %s - File with this name already exists" : "항목 %s을(를) 이동시킬 수 없음 - 같은 이름의 파일이 이미 존재함", "Could not move %s" : "항목 %s을(를) 이동시킬 수 없음", + "Permission denied" : "권한 거부됨", "File name cannot be empty." : "파일 이름이 비어 있을 수 없습니다.", + "\"%s\" is an invalid file name." : "\"%s\"은(는) 잘못된 파일 이름입니다.", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "폴더 이름이 올바르지 않습니다. 이름에 문자 '\\', '/', '<', '>', ':', '\"', '|', '? ', '*'는 사용할 수 없습니다.", + "The target folder has been moved or deleted." : "대상 폴더가 이동되거나 삭제되었습니다.", "The name %s is already used in the folder %s. Please choose a different name." : "이름 %s이(가) 폴더 %s에서 이미 사용 중입니다. 다른 이름을 사용하십시오.", "Not a valid source" : "올바르지 않은 원본", "Server is not allowed to open URLs, please check the server configuration" : "서버에서 URL을 열 수 없습니다. 서버 설정을 확인하십시오", + "The file exceeds your quota by %s" : "이 파일은 현재 할당량을 %s만큼 초과합니다", "Error while downloading %s to %s" : "%s을(를) %s(으)로 다운로드하는 중 오류 발생", "Error when creating the file" : "파일 생성 중 오류 발생", "Folder name cannot be empty." : "폴더 이름이 비어있을 수 없습니다.", @@ -28,9 +34,12 @@ OC.L10N.register( "Upload failed. Could not get file info." : "업로드에 실패했습니다. 파일 정보를 가져올 수 없습니다.", "Invalid directory." : "올바르지 않은 디렉터리입니다.", "Files" : "파일", + "All files" : "모든 파일", "Favorites" : "즐겨찾기", "Home" : "가정", "Unable to upload {filename} as it is a directory or has 0 bytes" : "{filename}을(를) 업로드할 수 없습니다. 폴더이거나 0 바이트 파일입니다.", + "Total file size {size1} exceeds upload limit {size2}" : "총 파일 크기 {size1}이(가) 업로드 제한 {size2}을(를) 초과함", + "Not enough free space, you are uploading {size1} but only {size2} is left" : "빈 공간이 부족합니다. 업로드할 파일 크기는 {size1}이지만 현재 {size2}만큼 비었습니다", "Upload cancelled." : "업로드가 취소되었습니다.", "Could not get result from server." : "서버에서 결과를 가져올 수 없습니다.", "File upload is in progress. Leaving the page now will cancel the upload." : "파일 업로드가 진행 중입니다. 이 페이지를 벗어나면 업로드가 취소됩니다.", @@ -41,14 +50,18 @@ OC.L10N.register( "Error fetching URL" : "URL을 가져올 수 없음", "Rename" : "이름 바꾸기", "Delete" : "삭제", + "Disconnect storage" : "저장소 연결 해제", "Unshare" : "공유 해제", "Download" : "다운로드", "Select" : "선택", "Pending" : "대기 중", + "Unable to determine date" : "날짜를 결정할 수 없음", + "Error moving file." : "파일 이동 오류.", "Error moving file" : "파일 이동 오류", "Error" : "오류", "Could not rename file" : "이름을 변경할 수 없음", "Error deleting file." : "파일 삭제 오류.", + "No entries in this folder match '{filter}'" : "이 폴더에 '{filter}'와(과) 일치하는 항목 없음", "Name" : "이름", "Size" : "크기", "Modified" : "수정됨", @@ -56,15 +69,19 @@ OC.L10N.register( "_%n file_::_%n files_" : ["파일 %n개"], "You don’t have permission to upload or create files here" : "여기에 파일을 업로드하거나 만들 권한이 없습니다", "_Uploading %n file_::_Uploading %n files_" : ["파일 %n개 업로드 중"], + "\"{name}\" is an invalid file name." : "\"{name}\"은(는) 잘못된 파일 이름입니다.", "Your storage is full, files can not be updated or synced anymore!" : "저장 공간이 가득 찼습니다. 파일을 업데이트하거나 동기화할 수 없습니다!", "Your storage is almost full ({usedSpacePercent}%)" : "저장 공간이 거의 가득 찼습니다 ({usedSpacePercent}%)", "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "암호화 앱이 활성화되어 있지만 키가 초기화되지 않았습니다. 로그아웃한 후 다시 로그인하십시오", "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "암호화 앱의 개인 키가 잘못되었습니다. 암호화된 파일에 다시 접근하려면 개인 설정에서 개인 키 암호를 업데이트해야 합니다.", "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "암호화는 해제되어 있지만, 파일은 아직 암호화되어 있습니다. 개인 설정에서 파일을 복호화하십시오.", - "_matches '{filter}'_::_match '{filter}'_" : [""], + "_matches '{filter}'_::_match '{filter}'_" : ["'{filter}'와(과) 일치"], "{dirs} and {files}" : "{dirs} 그리고 {files}", + "Favorited" : "책갈피에 추가됨", "Favorite" : "즐겨찾기", + "%s could not be renamed as it has been deleted" : "%s이(가) 삭제되었기 때문에 이름을 변경할 수 없습니다", "%s could not be renamed" : "%s의 이름을 변경할 수 없습니다", + "Upload (max. %s)" : "업로드(최대 %s)", "File handling" : "파일 처리", "Maximum upload size" : "최대 업로드 크기", "max. possible: " : "최대 가능:", @@ -80,8 +97,15 @@ OC.L10N.register( "From link" : "링크에서", "Upload" : "업로드", "Cancel upload" : "업로드 취소", + "No files yet" : "아직 파일 없음", + "Upload some content or sync with your devices!" : "파일을 업로드하거나 장치와 동기화하십시오!", + "No entries found in this folder" : "이 폴더에 항목 없음", + "Select all" : "모두 선택", "Upload too large" : "업로드한 파일이 너무 큼", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "이 파일이 서버에서 허용하는 최대 업로드 가능 용량보다 큽니다.", - "Files are being scanned, please wait." : "파일을 검색하고 있습니다. 기다려 주십시오." + "Files are being scanned, please wait." : "파일을 검색하고 있습니다. 기다려 주십시오.", + "Currently scanning" : "현재 검사 중", + "No favorites" : "책갈피 없음", + "Files and folders you mark as favorite will show up here" : "책갈피에 추가한 파일과 폴더가 여기에 나타납니다" }, "nplurals=1; plural=0;"); diff --git a/apps/files/l10n/ko.json b/apps/files/l10n/ko.json index b15f552dcf8..f12256b681a 100644 --- a/apps/files/l10n/ko.json +++ b/apps/files/l10n/ko.json @@ -1,12 +1,18 @@ { "translations": { + "Storage not available" : "저장소를 사용할 수 없음", + "Storage invalid" : "저장소가 잘못됨", "Unknown error" : "알 수 없는 오류", "Could not move %s - File with this name already exists" : "항목 %s을(를) 이동시킬 수 없음 - 같은 이름의 파일이 이미 존재함", "Could not move %s" : "항목 %s을(를) 이동시킬 수 없음", + "Permission denied" : "권한 거부됨", "File name cannot be empty." : "파일 이름이 비어 있을 수 없습니다.", + "\"%s\" is an invalid file name." : "\"%s\"은(는) 잘못된 파일 이름입니다.", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "폴더 이름이 올바르지 않습니다. 이름에 문자 '\\', '/', '<', '>', ':', '\"', '|', '? ', '*'는 사용할 수 없습니다.", + "The target folder has been moved or deleted." : "대상 폴더가 이동되거나 삭제되었습니다.", "The name %s is already used in the folder %s. Please choose a different name." : "이름 %s이(가) 폴더 %s에서 이미 사용 중입니다. 다른 이름을 사용하십시오.", "Not a valid source" : "올바르지 않은 원본", "Server is not allowed to open URLs, please check the server configuration" : "서버에서 URL을 열 수 없습니다. 서버 설정을 확인하십시오", + "The file exceeds your quota by %s" : "이 파일은 현재 할당량을 %s만큼 초과합니다", "Error while downloading %s to %s" : "%s을(를) %s(으)로 다운로드하는 중 오류 발생", "Error when creating the file" : "파일 생성 중 오류 발생", "Folder name cannot be empty." : "폴더 이름이 비어있을 수 없습니다.", @@ -26,9 +32,12 @@ "Upload failed. Could not get file info." : "업로드에 실패했습니다. 파일 정보를 가져올 수 없습니다.", "Invalid directory." : "올바르지 않은 디렉터리입니다.", "Files" : "파일", + "All files" : "모든 파일", "Favorites" : "즐겨찾기", "Home" : "가정", "Unable to upload {filename} as it is a directory or has 0 bytes" : "{filename}을(를) 업로드할 수 없습니다. 폴더이거나 0 바이트 파일입니다.", + "Total file size {size1} exceeds upload limit {size2}" : "총 파일 크기 {size1}이(가) 업로드 제한 {size2}을(를) 초과함", + "Not enough free space, you are uploading {size1} but only {size2} is left" : "빈 공간이 부족합니다. 업로드할 파일 크기는 {size1}이지만 현재 {size2}만큼 비었습니다", "Upload cancelled." : "업로드가 취소되었습니다.", "Could not get result from server." : "서버에서 결과를 가져올 수 없습니다.", "File upload is in progress. Leaving the page now will cancel the upload." : "파일 업로드가 진행 중입니다. 이 페이지를 벗어나면 업로드가 취소됩니다.", @@ -39,14 +48,18 @@ "Error fetching URL" : "URL을 가져올 수 없음", "Rename" : "이름 바꾸기", "Delete" : "삭제", + "Disconnect storage" : "저장소 연결 해제", "Unshare" : "공유 해제", "Download" : "다운로드", "Select" : "선택", "Pending" : "대기 중", + "Unable to determine date" : "날짜를 결정할 수 없음", + "Error moving file." : "파일 이동 오류.", "Error moving file" : "파일 이동 오류", "Error" : "오류", "Could not rename file" : "이름을 변경할 수 없음", "Error deleting file." : "파일 삭제 오류.", + "No entries in this folder match '{filter}'" : "이 폴더에 '{filter}'와(과) 일치하는 항목 없음", "Name" : "이름", "Size" : "크기", "Modified" : "수정됨", @@ -54,15 +67,19 @@ "_%n file_::_%n files_" : ["파일 %n개"], "You don’t have permission to upload or create files here" : "여기에 파일을 업로드하거나 만들 권한이 없습니다", "_Uploading %n file_::_Uploading %n files_" : ["파일 %n개 업로드 중"], + "\"{name}\" is an invalid file name." : "\"{name}\"은(는) 잘못된 파일 이름입니다.", "Your storage is full, files can not be updated or synced anymore!" : "저장 공간이 가득 찼습니다. 파일을 업데이트하거나 동기화할 수 없습니다!", "Your storage is almost full ({usedSpacePercent}%)" : "저장 공간이 거의 가득 찼습니다 ({usedSpacePercent}%)", "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "암호화 앱이 활성화되어 있지만 키가 초기화되지 않았습니다. 로그아웃한 후 다시 로그인하십시오", "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "암호화 앱의 개인 키가 잘못되었습니다. 암호화된 파일에 다시 접근하려면 개인 설정에서 개인 키 암호를 업데이트해야 합니다.", "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "암호화는 해제되어 있지만, 파일은 아직 암호화되어 있습니다. 개인 설정에서 파일을 복호화하십시오.", - "_matches '{filter}'_::_match '{filter}'_" : [""], + "_matches '{filter}'_::_match '{filter}'_" : ["'{filter}'와(과) 일치"], "{dirs} and {files}" : "{dirs} 그리고 {files}", + "Favorited" : "책갈피에 추가됨", "Favorite" : "즐겨찾기", + "%s could not be renamed as it has been deleted" : "%s이(가) 삭제되었기 때문에 이름을 변경할 수 없습니다", "%s could not be renamed" : "%s의 이름을 변경할 수 없습니다", + "Upload (max. %s)" : "업로드(최대 %s)", "File handling" : "파일 처리", "Maximum upload size" : "최대 업로드 크기", "max. possible: " : "최대 가능:", @@ -78,8 +95,15 @@ "From link" : "링크에서", "Upload" : "업로드", "Cancel upload" : "업로드 취소", + "No files yet" : "아직 파일 없음", + "Upload some content or sync with your devices!" : "파일을 업로드하거나 장치와 동기화하십시오!", + "No entries found in this folder" : "이 폴더에 항목 없음", + "Select all" : "모두 선택", "Upload too large" : "업로드한 파일이 너무 큼", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "이 파일이 서버에서 허용하는 최대 업로드 가능 용량보다 큽니다.", - "Files are being scanned, please wait." : "파일을 검색하고 있습니다. 기다려 주십시오." + "Files are being scanned, please wait." : "파일을 검색하고 있습니다. 기다려 주십시오.", + "Currently scanning" : "현재 검사 중", + "No favorites" : "책갈피 없음", + "Files and folders you mark as favorite will show up here" : "책갈피에 추가한 파일과 폴더가 여기에 나타납니다" },"pluralForm" :"nplurals=1; plural=0;" }
\ No newline at end of file diff --git a/apps/files/l10n/lv.js b/apps/files/l10n/lv.js index 3dc666bfbcb..5113633fd38 100644 --- a/apps/files/l10n/lv.js +++ b/apps/files/l10n/lv.js @@ -75,7 +75,7 @@ OC.L10N.register( "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Šifrēšanas lietotnes ir pieslēgta, bet šifrēšanas atslēgas nav uzstādītas. Lūdzu izejiet no sistēmas un ieejiet sistēmā atpakaļ.", "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Šifrēšanas lietotnei nepareiza privātā atslēga. Lūdzu atjaunojiet savu privāto atslēgu personīgo uzstādījumu sadaļā, lai atjaunot pieeju šifrētajiem failiem.", "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Šifrēšana tika atslēgta, tomēr jūsu faili joprojām ir šifrēti. Atšifrēt failus var Personiskajos uzstādījumos.", - "_matches '{filter}'_::_match '{filter}'_" : ["","",""], + "_matches '{filter}'_::_match '{filter}'_" : ["atrasts pēc '{filter}'","atrasts pēc '{filter}'","atrasti pēc '{filter}'"], "{dirs} and {files}" : "{dirs} un {files}", "Favorited" : "Favorīti", "Favorite" : "Iecienītais", diff --git a/apps/files/l10n/lv.json b/apps/files/l10n/lv.json index 0a09bc6cd19..fce4afe103f 100644 --- a/apps/files/l10n/lv.json +++ b/apps/files/l10n/lv.json @@ -73,7 +73,7 @@ "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Šifrēšanas lietotnes ir pieslēgta, bet šifrēšanas atslēgas nav uzstādītas. Lūdzu izejiet no sistēmas un ieejiet sistēmā atpakaļ.", "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Šifrēšanas lietotnei nepareiza privātā atslēga. Lūdzu atjaunojiet savu privāto atslēgu personīgo uzstādījumu sadaļā, lai atjaunot pieeju šifrētajiem failiem.", "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Šifrēšana tika atslēgta, tomēr jūsu faili joprojām ir šifrēti. Atšifrēt failus var Personiskajos uzstādījumos.", - "_matches '{filter}'_::_match '{filter}'_" : ["","",""], + "_matches '{filter}'_::_match '{filter}'_" : ["atrasts pēc '{filter}'","atrasts pēc '{filter}'","atrasti pēc '{filter}'"], "{dirs} and {files}" : "{dirs} un {files}", "Favorited" : "Favorīti", "Favorite" : "Iecienītais", diff --git a/apps/files/l10n/nb_NO.js b/apps/files/l10n/nb_NO.js index a528ba4542b..34ff0f0c2d7 100644 --- a/apps/files/l10n/nb_NO.js +++ b/apps/files/l10n/nb_NO.js @@ -75,7 +75,7 @@ OC.L10N.register( "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "App for kryptering er aktivert men nøklene dine er ikke satt opp. Logg ut og logg inn igjen.", "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Ugyldig privat nøkkel for Krypterings-app. Oppdater passordet for din private nøkkel i dine personlige innstillinger for å gjenopprette tilgang til de krypterte filene dine.", "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Kryptering ble slått av men filene dine er fremdeles kryptert. Gå til dine personlige innstillinger for å dekryptere filene dine.", - "_matches '{filter}'_::_match '{filter}'_" : ["",""], + "_matches '{filter}'_::_match '{filter}'_" : [" stemmer med '{filter}'"," stemmer med '{filter}'"], "{dirs} and {files}" : "{dirs} og {files}", "Favorited" : "Er favoritt", "Favorite" : "Gjør til favoritt", diff --git a/apps/files/l10n/nb_NO.json b/apps/files/l10n/nb_NO.json index c3957977e3b..2af4e446204 100644 --- a/apps/files/l10n/nb_NO.json +++ b/apps/files/l10n/nb_NO.json @@ -73,7 +73,7 @@ "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "App for kryptering er aktivert men nøklene dine er ikke satt opp. Logg ut og logg inn igjen.", "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Ugyldig privat nøkkel for Krypterings-app. Oppdater passordet for din private nøkkel i dine personlige innstillinger for å gjenopprette tilgang til de krypterte filene dine.", "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Kryptering ble slått av men filene dine er fremdeles kryptert. Gå til dine personlige innstillinger for å dekryptere filene dine.", - "_matches '{filter}'_::_match '{filter}'_" : ["",""], + "_matches '{filter}'_::_match '{filter}'_" : [" stemmer med '{filter}'"," stemmer med '{filter}'"], "{dirs} and {files}" : "{dirs} og {files}", "Favorited" : "Er favoritt", "Favorite" : "Gjør til favoritt", diff --git a/apps/files/l10n/pt_PT.js b/apps/files/l10n/pt_PT.js index a8a3a873cde..57c37495e4e 100644 --- a/apps/files/l10n/pt_PT.js +++ b/apps/files/l10n/pt_PT.js @@ -61,6 +61,7 @@ OC.L10N.register( "Error" : "Erro", "Could not rename file" : "Não pôde renomear o ficheiro", "Error deleting file." : "Erro ao apagar o ficheiro.", + "No entries in this folder match '{filter}'" : "Nenhumas entradas nesta pasta correspondem a '{filter}'", "Name" : "Nome", "Size" : "Tamanho", "Modified" : "Modificado", @@ -74,8 +75,9 @@ OC.L10N.register( "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", "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Chave privada inválida da Aplicação de Encriptação. Por favor atualize a sua senha de chave privada nas definições pessoais, para recuperar o acesso aos seus ficheiros encriptados.", "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "A encriptação foi desactivada mas os seus ficheiros continuam encriptados. Por favor consulte as suas definições pessoais para desencriptar os ficheiros.", - "_matches '{filter}'_::_match '{filter}'_" : ["",""], + "_matches '{filter}'_::_match '{filter}'_" : ["corresponde a '{filter}'","correspondem a '{filter}'"], "{dirs} and {files}" : "{dirs} e {files}", + "Favorited" : "Assinalado como Favorito", "Favorite" : "Favorito", "%s could not be renamed as it has been deleted" : "Não foi possível renomear %s devido a ter sido eliminado", "%s could not be renamed" : "%s não pode ser renomeada", @@ -95,11 +97,15 @@ OC.L10N.register( "From link" : "Da hiperligação", "Upload" : "Enviar", "Cancel upload" : "Cancelar o envio", + "No files yet" : "Ainda não há arquivos", + "Upload some content or sync with your devices!" : "Carregue algum conteúdo ou sincronize com os seus aparelhos!", + "No entries found in this folder" : "Não foram encontradas entradas nesta pasta", "Select all" : "Seleccionar todos", "Upload too large" : "Upload muito grande", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Os ficheiro que está a tentar enviar excedem o tamanho máximo de envio neste servidor.", "Files are being scanned, please wait." : "Os ficheiros estão a ser analisados, por favor aguarde.", "Currently scanning" : "A analisar", - "No favorites" : "Sem favoritos" + "No favorites" : "Sem favoritos", + "Files and folders you mark as favorite will show up here" : "Os ficheiros e pastas que marcou como favoritos serão mostrados aqui" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files/l10n/pt_PT.json b/apps/files/l10n/pt_PT.json index 9acafe0a611..bd168dfb4b1 100644 --- a/apps/files/l10n/pt_PT.json +++ b/apps/files/l10n/pt_PT.json @@ -59,6 +59,7 @@ "Error" : "Erro", "Could not rename file" : "Não pôde renomear o ficheiro", "Error deleting file." : "Erro ao apagar o ficheiro.", + "No entries in this folder match '{filter}'" : "Nenhumas entradas nesta pasta correspondem a '{filter}'", "Name" : "Nome", "Size" : "Tamanho", "Modified" : "Modificado", @@ -72,8 +73,9 @@ "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", "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Chave privada inválida da Aplicação de Encriptação. Por favor atualize a sua senha de chave privada nas definições pessoais, para recuperar o acesso aos seus ficheiros encriptados.", "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "A encriptação foi desactivada mas os seus ficheiros continuam encriptados. Por favor consulte as suas definições pessoais para desencriptar os ficheiros.", - "_matches '{filter}'_::_match '{filter}'_" : ["",""], + "_matches '{filter}'_::_match '{filter}'_" : ["corresponde a '{filter}'","correspondem a '{filter}'"], "{dirs} and {files}" : "{dirs} e {files}", + "Favorited" : "Assinalado como Favorito", "Favorite" : "Favorito", "%s could not be renamed as it has been deleted" : "Não foi possível renomear %s devido a ter sido eliminado", "%s could not be renamed" : "%s não pode ser renomeada", @@ -93,11 +95,15 @@ "From link" : "Da hiperligação", "Upload" : "Enviar", "Cancel upload" : "Cancelar o envio", + "No files yet" : "Ainda não há arquivos", + "Upload some content or sync with your devices!" : "Carregue algum conteúdo ou sincronize com os seus aparelhos!", + "No entries found in this folder" : "Não foram encontradas entradas nesta pasta", "Select all" : "Seleccionar todos", "Upload too large" : "Upload muito grande", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Os ficheiro que está a tentar enviar excedem o tamanho máximo de envio neste servidor.", "Files are being scanned, please wait." : "Os ficheiros estão a ser analisados, por favor aguarde.", "Currently scanning" : "A analisar", - "No favorites" : "Sem favoritos" + "No favorites" : "Sem favoritos", + "Files and folders you mark as favorite will show up here" : "Os ficheiros e pastas que marcou como favoritos serão mostrados aqui" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files/l10n/ru.js b/apps/files/l10n/ru.js index f5b0413dcd4..853cb02112d 100644 --- a/apps/files/l10n/ru.js +++ b/apps/files/l10n/ru.js @@ -22,11 +22,11 @@ OC.L10N.register( "Unable to set upload directory." : "Невозможно установить каталог загрузки.", "Invalid Token" : "Недопустимый маркер", "No file was uploaded. Unknown error" : "Файл не был загружен. Неизвестная ошибка", - "There is no error, the file uploaded with success" : "Файл загружен успешно.", - "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "Файл превышает размер, установленный параметром upload_max_filesize в php.ini:", - "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Загруженный файл превышает размер, установленный параметром MAX_FILE_SIZE в HTML-форме", + "There is no error, the file uploaded with success" : "Файл загружен успешно. Ошибок нет.", + "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "Размер загруженного файла превышает установленный предел upload_max_filesize в php.ini:", + "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Размер загруженного файла превышает установленный предел MAX_FILE_SIZE в HTML-форме", "The uploaded file was only partially uploaded" : "Файл загружен лишь частично", - "No file was uploaded" : "Ни одного файла загружено не было", + "No file was uploaded" : "Не было загружено ни одного файла", "Missing a temporary folder" : "Отсутствует временный каталог", "Failed to write to disk" : "Ошибка записи на диск", "Not enough storage available" : "Недостаточно доступного места в хранилище", @@ -36,10 +36,10 @@ OC.L10N.register( "Files" : "Файлы", "All files" : "Все файлы", "Favorites" : "Избранное", - "Home" : "Домашний", + "Home" : "Главная", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Невозможно загрузить {filename}, так как это либо каталог, либо файл нулевого размера", "Total file size {size1} exceeds upload limit {size2}" : "Полный размер файла {size1} превышает лимит по загрузке {size2}", - "Not enough free space, you are uploading {size1} but only {size2} is left" : "Не достаточно свободного места, Вы загружаете {size1} но осталось только {size2}", + "Not enough free space, you are uploading {size1} but only {size2} is left" : "Недостаточно свободного места, Вы загружаете {size1}, но осталось только {size2}", "Upload cancelled." : "Загрузка отменена.", "Could not get result from server." : "Не удалось получить ответ от сервера.", "File upload is in progress. Leaving the page now will cancel the upload." : "Идёт загрузка файла. Покинув страницу, вы прервёте загрузку.", @@ -50,18 +50,18 @@ OC.L10N.register( "Error fetching URL" : "Ошибка получения URL", "Rename" : "Переименовать", "Delete" : "Удалить", - "Disconnect storage" : "Отсоединиться от хранилища", + "Disconnect storage" : "Отсоединить хранилище", "Unshare" : "Закрыть доступ", "Download" : "Скачать", "Select" : "Выбрать", "Pending" : "Ожидание", "Unable to determine date" : "Невозможно определить дату", - "Error moving file." : "Ошибка перемещения файла.", + "Error moving file." : "Ошибка при перемещении файла.", "Error moving file" : "Ошибка при перемещении файла", "Error" : "Ошибка", "Could not rename file" : "Не удалось переименовать файл", "Error deleting file." : "Ошибка при удалении файла.", - "No entries in this folder match '{filter}'" : "В данном каталоге нет ничего соответствующего '{filter}'", + "No entries in this folder match '{filter}'" : "В данном каталоге нет элементов соответствующих '{filter}'", "Name" : "Имя", "Size" : "Размер", "Modified" : "Изменён", @@ -69,10 +69,10 @@ OC.L10N.register( "_%n file_::_%n files_" : ["%n файл","%n файла","%n файлов"], "You don’t have permission to upload or create files here" : "У вас нет прав для загрузки или создания файлов здесь.", "_Uploading %n file_::_Uploading %n files_" : ["Закачка %n файла","Закачка %n файлов","Закачка %n файлов"], - "\"{name}\" is an invalid file name." : "\"{name}\" это не правильное имя файла.", + "\"{name}\" is an invalid file name." : "\"{name}\" это неправильное имя файла.", "Your storage is full, files can not be updated or synced anymore!" : "Ваше хранилище заполнено, произведите очистку перед загрузкой новых файлов.", "Your storage is almost full ({usedSpacePercent}%)" : "Ваше хранилище почти заполнено ({usedSpacePercent}%)", - "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Приложение для шифрования активно, но ваши ключи не инициализированы, выйдите из системы и войдите вновь", + "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Приложение для шифрования активно, но ваши ключи не инициализированы, выйдите из системы и войдите заново", "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Закрытый ключ приложения шифрования недействителен. Обновите закрытый ключ в личных настройках, чтобы восстановить доступ к зашифрованным файлам.", "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Шифрование было отключено, но ваши файлы остались зашифрованными. Зайдите на страницу личных настроек для того, чтобы расшифровать их.", "_matches '{filter}'_::_match '{filter}'_" : ["соответствует '{filter}'","соответствуют '{filter}'","соответствуют '{filter}'"], @@ -81,7 +81,7 @@ OC.L10N.register( "Favorite" : "Избранное", "%s could not be renamed as it has been deleted" : "Невозможно переименовать %s, поскольку объект удалён.", "%s could not be renamed" : "%s не может быть переименован", - "Upload (max. %s)" : "Загрузка (Максимум: %s)", + "Upload (max. %s)" : "Загрузка (максимум %s)", "File handling" : "Управление файлами", "Maximum upload size" : "Максимальный размер загружаемого файла", "max. possible: " : "макс. возможно: ", diff --git a/apps/files/l10n/ru.json b/apps/files/l10n/ru.json index 2c238e7ad0f..4852a8aebcd 100644 --- a/apps/files/l10n/ru.json +++ b/apps/files/l10n/ru.json @@ -20,11 +20,11 @@ "Unable to set upload directory." : "Невозможно установить каталог загрузки.", "Invalid Token" : "Недопустимый маркер", "No file was uploaded. Unknown error" : "Файл не был загружен. Неизвестная ошибка", - "There is no error, the file uploaded with success" : "Файл загружен успешно.", - "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "Файл превышает размер, установленный параметром upload_max_filesize в php.ini:", - "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Загруженный файл превышает размер, установленный параметром MAX_FILE_SIZE в HTML-форме", + "There is no error, the file uploaded with success" : "Файл загружен успешно. Ошибок нет.", + "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "Размер загруженного файла превышает установленный предел upload_max_filesize в php.ini:", + "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Размер загруженного файла превышает установленный предел MAX_FILE_SIZE в HTML-форме", "The uploaded file was only partially uploaded" : "Файл загружен лишь частично", - "No file was uploaded" : "Ни одного файла загружено не было", + "No file was uploaded" : "Не было загружено ни одного файла", "Missing a temporary folder" : "Отсутствует временный каталог", "Failed to write to disk" : "Ошибка записи на диск", "Not enough storage available" : "Недостаточно доступного места в хранилище", @@ -34,10 +34,10 @@ "Files" : "Файлы", "All files" : "Все файлы", "Favorites" : "Избранное", - "Home" : "Домашний", + "Home" : "Главная", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Невозможно загрузить {filename}, так как это либо каталог, либо файл нулевого размера", "Total file size {size1} exceeds upload limit {size2}" : "Полный размер файла {size1} превышает лимит по загрузке {size2}", - "Not enough free space, you are uploading {size1} but only {size2} is left" : "Не достаточно свободного места, Вы загружаете {size1} но осталось только {size2}", + "Not enough free space, you are uploading {size1} but only {size2} is left" : "Недостаточно свободного места, Вы загружаете {size1}, но осталось только {size2}", "Upload cancelled." : "Загрузка отменена.", "Could not get result from server." : "Не удалось получить ответ от сервера.", "File upload is in progress. Leaving the page now will cancel the upload." : "Идёт загрузка файла. Покинув страницу, вы прервёте загрузку.", @@ -48,18 +48,18 @@ "Error fetching URL" : "Ошибка получения URL", "Rename" : "Переименовать", "Delete" : "Удалить", - "Disconnect storage" : "Отсоединиться от хранилища", + "Disconnect storage" : "Отсоединить хранилище", "Unshare" : "Закрыть доступ", "Download" : "Скачать", "Select" : "Выбрать", "Pending" : "Ожидание", "Unable to determine date" : "Невозможно определить дату", - "Error moving file." : "Ошибка перемещения файла.", + "Error moving file." : "Ошибка при перемещении файла.", "Error moving file" : "Ошибка при перемещении файла", "Error" : "Ошибка", "Could not rename file" : "Не удалось переименовать файл", "Error deleting file." : "Ошибка при удалении файла.", - "No entries in this folder match '{filter}'" : "В данном каталоге нет ничего соответствующего '{filter}'", + "No entries in this folder match '{filter}'" : "В данном каталоге нет элементов соответствующих '{filter}'", "Name" : "Имя", "Size" : "Размер", "Modified" : "Изменён", @@ -67,10 +67,10 @@ "_%n file_::_%n files_" : ["%n файл","%n файла","%n файлов"], "You don’t have permission to upload or create files here" : "У вас нет прав для загрузки или создания файлов здесь.", "_Uploading %n file_::_Uploading %n files_" : ["Закачка %n файла","Закачка %n файлов","Закачка %n файлов"], - "\"{name}\" is an invalid file name." : "\"{name}\" это не правильное имя файла.", + "\"{name}\" is an invalid file name." : "\"{name}\" это неправильное имя файла.", "Your storage is full, files can not be updated or synced anymore!" : "Ваше хранилище заполнено, произведите очистку перед загрузкой новых файлов.", "Your storage is almost full ({usedSpacePercent}%)" : "Ваше хранилище почти заполнено ({usedSpacePercent}%)", - "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Приложение для шифрования активно, но ваши ключи не инициализированы, выйдите из системы и войдите вновь", + "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Приложение для шифрования активно, но ваши ключи не инициализированы, выйдите из системы и войдите заново", "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Закрытый ключ приложения шифрования недействителен. Обновите закрытый ключ в личных настройках, чтобы восстановить доступ к зашифрованным файлам.", "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Шифрование было отключено, но ваши файлы остались зашифрованными. Зайдите на страницу личных настроек для того, чтобы расшифровать их.", "_matches '{filter}'_::_match '{filter}'_" : ["соответствует '{filter}'","соответствуют '{filter}'","соответствуют '{filter}'"], @@ -79,7 +79,7 @@ "Favorite" : "Избранное", "%s could not be renamed as it has been deleted" : "Невозможно переименовать %s, поскольку объект удалён.", "%s could not be renamed" : "%s не может быть переименован", - "Upload (max. %s)" : "Загрузка (Максимум: %s)", + "Upload (max. %s)" : "Загрузка (максимум %s)", "File handling" : "Управление файлами", "Maximum upload size" : "Максимальный размер загружаемого файла", "max. possible: " : "макс. возможно: ", diff --git a/apps/files/l10n/sk_SK.js b/apps/files/l10n/sk_SK.js index 2f3e7928e92..3dd7dd1b27a 100644 --- a/apps/files/l10n/sk_SK.js +++ b/apps/files/l10n/sk_SK.js @@ -55,11 +55,13 @@ OC.L10N.register( "Download" : "Sťahovanie", "Select" : "Vybrať", "Pending" : "Čaká", + "Unable to determine date" : "Nemožno určiť dátum", "Error moving file." : "Chyba pri presune súboru.", "Error moving file" : "Chyba pri presúvaní súboru", "Error" : "Chyba", "Could not rename file" : "Nemožno premenovať súbor", "Error deleting file." : "Chyba pri mazaní súboru.", + "No entries in this folder match '{filter}'" : "V tomto priečinku nič nezodpovedá '{filter}'", "Name" : "Názov", "Size" : "Veľkosť", "Modified" : "Upravené", @@ -73,8 +75,9 @@ OC.L10N.register( "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikácia na šifrovanie je zapnutá, ale vaše kľúče nie sú inicializované. Odhláste sa a znovu sa prihláste.", "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Chybný súkromný kľúč na šifrovanie aplikácií. Zaktualizujte si heslo súkromného kľúča v svojom osobnom nastavení, aby ste znovu získali prístup k svojim zašifrovaným súborom.", "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Šifrovanie bolo zakázané, ale vaše súbory sú stále zašifrované. Prosím, choďte do osobného nastavenia pre dešifrovanie súborov.", - "_matches '{filter}'_::_match '{filter}'_" : ["","",""], + "_matches '{filter}'_::_match '{filter}'_" : ["zodpovedá '{filter}'","zodpovedá '{filter}'","zodpovedá '{filter}'"], "{dirs} and {files}" : "{dirs} a {files}", + "Favorited" : "Pridané k obľúbeným", "Favorite" : "Obľúbené", "%s could not be renamed as it has been deleted" : "%s nebolo možné premenovať, pretože bol zmazaný", "%s could not be renamed" : "%s nemohol byť premenovaný", @@ -94,9 +97,15 @@ OC.L10N.register( "From link" : "Z odkazu", "Upload" : "Nahrať", "Cancel upload" : "Zrušiť nahrávanie", + "No files yet" : "Zatiaľ žiadne súbory.", + "Upload some content or sync with your devices!" : "Nahrajte nejaký obsah alebo synchronizujte zo svojimi zariadeniami!", + "No entries found in this folder" : "V tomto priečinku nebolo nič nájdené", + "Select all" : "Vybrať všetko", "Upload too large" : "Nahrávanie je príliš veľké", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Súbory, ktoré sa snažíte nahrať, presahujú maximálnu veľkosť pre nahratie súborov na tento server.", "Files are being scanned, please wait." : "Čakajte, súbory sú prehľadávané.", - "Currently scanning" : "Prehľadáva sa" + "Currently scanning" : "Prehľadáva sa", + "No favorites" : "Žiadne obľúbené", + "Files and folders you mark as favorite will show up here" : "Súbory a priečinky označené ako obľúbené budú zobrazené tu" }, "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"); diff --git a/apps/files/l10n/sk_SK.json b/apps/files/l10n/sk_SK.json index e025a02504e..ab2cf57be75 100644 --- a/apps/files/l10n/sk_SK.json +++ b/apps/files/l10n/sk_SK.json @@ -53,11 +53,13 @@ "Download" : "Sťahovanie", "Select" : "Vybrať", "Pending" : "Čaká", + "Unable to determine date" : "Nemožno určiť dátum", "Error moving file." : "Chyba pri presune súboru.", "Error moving file" : "Chyba pri presúvaní súboru", "Error" : "Chyba", "Could not rename file" : "Nemožno premenovať súbor", "Error deleting file." : "Chyba pri mazaní súboru.", + "No entries in this folder match '{filter}'" : "V tomto priečinku nič nezodpovedá '{filter}'", "Name" : "Názov", "Size" : "Veľkosť", "Modified" : "Upravené", @@ -71,8 +73,9 @@ "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikácia na šifrovanie je zapnutá, ale vaše kľúče nie sú inicializované. Odhláste sa a znovu sa prihláste.", "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Chybný súkromný kľúč na šifrovanie aplikácií. Zaktualizujte si heslo súkromného kľúča v svojom osobnom nastavení, aby ste znovu získali prístup k svojim zašifrovaným súborom.", "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Šifrovanie bolo zakázané, ale vaše súbory sú stále zašifrované. Prosím, choďte do osobného nastavenia pre dešifrovanie súborov.", - "_matches '{filter}'_::_match '{filter}'_" : ["","",""], + "_matches '{filter}'_::_match '{filter}'_" : ["zodpovedá '{filter}'","zodpovedá '{filter}'","zodpovedá '{filter}'"], "{dirs} and {files}" : "{dirs} a {files}", + "Favorited" : "Pridané k obľúbeným", "Favorite" : "Obľúbené", "%s could not be renamed as it has been deleted" : "%s nebolo možné premenovať, pretože bol zmazaný", "%s could not be renamed" : "%s nemohol byť premenovaný", @@ -92,9 +95,15 @@ "From link" : "Z odkazu", "Upload" : "Nahrať", "Cancel upload" : "Zrušiť nahrávanie", + "No files yet" : "Zatiaľ žiadne súbory.", + "Upload some content or sync with your devices!" : "Nahrajte nejaký obsah alebo synchronizujte zo svojimi zariadeniami!", + "No entries found in this folder" : "V tomto priečinku nebolo nič nájdené", + "Select all" : "Vybrať všetko", "Upload too large" : "Nahrávanie je príliš veľké", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Súbory, ktoré sa snažíte nahrať, presahujú maximálnu veľkosť pre nahratie súborov na tento server.", "Files are being scanned, please wait." : "Čakajte, súbory sú prehľadávané.", - "Currently scanning" : "Prehľadáva sa" + "Currently scanning" : "Prehľadáva sa", + "No favorites" : "Žiadne obľúbené", + "Files and folders you mark as favorite will show up here" : "Súbory a priečinky označené ako obľúbené budú zobrazené tu" },"pluralForm" :"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;" }
\ No newline at end of file diff --git a/apps/files/l10n/sr@latin.js b/apps/files/l10n/sr@latin.js index bfb0019f492..65aafd9d1f3 100644 --- a/apps/files/l10n/sr@latin.js +++ b/apps/files/l10n/sr@latin.js @@ -1,31 +1,111 @@ OC.L10N.register( "files", { + "Storage not available" : "Skladište nije dostupno", + "Storage invalid" : "Neispravno skladište", + "Unknown error" : "Nepoznata greška", + "Could not move %s - File with this name already exists" : "Nemoguće premeštanje %s - fajl sa ovim imenom već postoji", + "Could not move %s" : "Nemoguće premeštanje %s", + "Permission denied" : "Pristup odbijen", + "File name cannot be empty." : "Ime fajla ne može biti prazno.", + "\"%s\" is an invalid file name." : "\"%s\" je neispravno ime fajla.", + "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "Neispravno ime, '\\', '/', '<', '>', ':', '\"', '|', '?' i '*' nisu dozvoljeni.", + "The target folder has been moved or deleted." : "Ciljani direktorijum je premešten ili izbrisan.", + "The name %s is already used in the folder %s. Please choose a different name." : "Ime %s je već u upotrebi u direktorijumu %s. Molimo izaberite drugo ime.", + "Not a valid source" : "Nije ispravan izvor", + "Server is not allowed to open URLs, please check the server configuration" : "Serveru nije dozvoljeno da otvara URL-ove, molimo proverite podešavanja servera", + "The file exceeds your quota by %s" : "Ovaj fajl prevazilazi Vašu kvotu za %s", + "Error while downloading %s to %s" : "Greška pri preuzimanju %s u %s", + "Error when creating the file" : "Greška pri kreiranju fajla", + "Folder name cannot be empty." : "Ime direktorijuma ne može da bude prazno.", + "Error when creating the folder" : "Greška pri kreiranju direktorijuma", + "Unable to set upload directory." : "Nemoguće postaviti direktorijum za otpremanje.", + "Invalid Token" : "Neispravan simbol", + "No file was uploaded. Unknown error" : "Fajl nije otpremeljen. Nepoznata greška", "There is no error, the file uploaded with success" : "Nema greške, fajl je uspešno poslat", + "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "Otpremljeni fajl prevazilazi upload_max_filesize direktivu u php.ini:", "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Poslati fajl prevazilazi direktivu MAX_FILE_SIZE koja je navedena u HTML formi", "The uploaded file was only partially uploaded" : "Poslati fajl je samo delimično otpremljen!", "No file was uploaded" : "Nijedan fajl nije poslat", "Missing a temporary folder" : "Nedostaje privremena fascikla", + "Failed to write to disk" : "Neuspelo pisanje na disk", + "Not enough storage available" : "Nema dovoljno skladišnog prostora na raspolaganju", + "Upload failed. Could not find uploaded file" : "Otpremanje nije uspelo. Nije pronađen otpremljeni fajl", + "Upload failed. Could not get file info." : "Otpremanje nije uspelo. Nije moguće pronaći informacije o fajlu.", + "Invalid directory." : "Neispravan direktorijum", "Files" : "Fajlovi", + "All files" : "Svi fajlovi", + "Favorites" : "Omiljeni", "Home" : "Kuća", + "Unable to upload {filename} as it is a directory or has 0 bytes" : "Nije moguće otpremiti {filename} zato što je u pitanju direktorijum ili ima 0 bajtova.", + "Total file size {size1} exceeds upload limit {size2}" : "Ukupna veličina fajla {size1} prevazilazi limit za otpremanje {size2}", + "Not enough free space, you are uploading {size1} but only {size2} is left" : "Nema dovoljno slobodnog prostora, otpremate {size1} ali samo je {size2} preostalo", + "Upload cancelled." : "Otpremanje otkazano.", + "Could not get result from server." : "Nije bilo moguće dobiti rezultat sa servera.", + "File upload is in progress. Leaving the page now will cancel the upload." : "Otpremanje fajla je u toku. Ako sada napustite stranicu, prekinućete otpremanje.", + "URL cannot be empty" : "URL ne može biti prazan.", + "{new_name} already exists" : "{new_name} već postoji", + "Could not create file" : "Nije bilo moguće kreirati fajl", + "Could not create folder" : "Nije bilo moguće kreirati direktorijum", + "Error fetching URL" : "Greška pri preuzimanju URL-a", "Rename" : "Preimenij", "Delete" : "Obriši", + "Disconnect storage" : "Nepovezano skladište", "Unshare" : "Ukljoni deljenje", "Download" : "Preuzmi", + "Select" : "Odaberi", + "Pending" : "U toku", + "Unable to determine date" : "Nemoguće ustanoviti datum", + "Error moving file." : "Greška pri premeštanju fajla.", + "Error moving file" : "Greška pri premeštanju fajla", "Error" : "Greška", + "Could not rename file" : "Nemoguća promena imena fajla", + "Error deleting file." : "Greška pri brisanju fajla.", + "No entries in this folder match '{filter}'" : "Nijedan unos u ovom direktorijumu se ne poklapa sa '{filter}'", "Name" : "Ime", "Size" : "Veličina", "Modified" : "Zadnja izmena", - "_%n folder_::_%n folders_" : ["","",""], - "_%n file_::_%n files_" : ["","",""], - "_Uploading %n file_::_Uploading %n files_" : ["","",""], - "_matches '{filter}'_::_match '{filter}'_" : ["","",""], + "_%n folder_::_%n folders_" : ["%n direktorijum","%n direktorijuma","%n direktorijuma"], + "_%n file_::_%n files_" : ["%n fajl","%n fajlova","%n fajlova"], + "You don’t have permission to upload or create files here" : "Nemate dozvolu da otpremate ili kreirate fajlove ovde", + "_Uploading %n file_::_Uploading %n files_" : ["Otpremam %n fajl","Otpremam %n fajlova","Otpremam %n fajlova"], + "\"{name}\" is an invalid file name." : "\"{name}\" je neispravno ime fajla.", + "Your storage is full, files can not be updated or synced anymore!" : "Vaše skladište je puno, fajlovi se ne mogu više otpremati ili sinhronizovati.", + "Your storage is almost full ({usedSpacePercent}%)" : "Vaše skladište je skoro puno ({usedSpacePercent}%)", + "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikacija za šifrovanje je omogućena ali Vaši ključevi nisu inicijalizovani, molimo Vas da se izlogujete i ulogujete ponovo.", + "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Neispravan privatni ključ za Aplikaciju za šifrovanje. Molimo da osvežite vašu lozinku privatnog ključa u ličnim podešavanjima kako bi dobili pristup šifrovanim fajlovima.", + "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Šifrovanje je isključeno, ali Vaši fajlovi su i dalje šifrovani. Molimo Vas da odete u lična podešavanja da dešifrujete svoje fajlove.", + "_matches '{filter}'_::_match '{filter}'_" : ["poklapa se sa '{filter}'","poklapaju se sa '{filter}'","poklapaju se sa '{filter}'"], + "{dirs} and {files}" : "{dirs} i {files}", + "Favorited" : "Omiljeni", + "Favorite" : "Omiljen", + "%s could not be renamed as it has been deleted" : "%s nije mogao biti preimenovan jer je obrisan.", + "%s could not be renamed" : "%s nije mogao biti preimenovan", + "Upload (max. %s)" : "Otpremanje (maksimalno %s)", + "File handling" : "Upravljanje fajlovima", "Maximum upload size" : "Maksimalna veličina pošiljke", + "max. possible: " : "najviše moguće:", "Save" : "Snimi", "Settings" : "Podešavanja", + "WebDAV" : "WebDAV", + "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Upotrebite ovu adresu da <a href=\"%s\" target=\"_blank\">pristupite svojim fajlovima putem WebDAV-a</a>", + "New" : "Novi", + "New text file" : "Novi tekstualni fajl", + "Text file" : "Tekstualni fajl", + "New folder" : "Novi direktorijum", "Folder" : "Direktorijum", + "From link" : "Od prečice", "Upload" : "Pošalji", + "Cancel upload" : "Otkaži otpremanje", + "No files yet" : "Još nema fajlova", + "Upload some content or sync with your devices!" : "Otpremite neki sadržaj ili sinhronizujte sa svojim uređajima!", + "No entries found in this folder" : "Nema pronađenih unosa u ovom direktorijumu", + "Select all" : "Odaberi sve", "Upload too large" : "Pošiljka je prevelika", - "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Fajlovi koje želite da pošaljete prevazilaze ograničenje maksimalne veličine pošiljke na ovom serveru." + "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Fajlovi koje želite da pošaljete prevazilaze ograničenje maksimalne veličine pošiljke na ovom serveru.", + "Files are being scanned, please wait." : "Fajlovi se skeniraju, molimo sačekajte.", + "Currently scanning" : "Trenutno skeniram", + "No favorites" : "Nema omiljenih", + "Files and folders you mark as favorite will show up here" : "Fajlovi i direktorijumi koje ste obeležili kao omiljene će biti prikazani ovde" }, "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"); diff --git a/apps/files/l10n/sr@latin.json b/apps/files/l10n/sr@latin.json index 2cc09b861bd..2366c3fee2b 100644 --- a/apps/files/l10n/sr@latin.json +++ b/apps/files/l10n/sr@latin.json @@ -1,29 +1,109 @@ { "translations": { + "Storage not available" : "Skladište nije dostupno", + "Storage invalid" : "Neispravno skladište", + "Unknown error" : "Nepoznata greška", + "Could not move %s - File with this name already exists" : "Nemoguće premeštanje %s - fajl sa ovim imenom već postoji", + "Could not move %s" : "Nemoguće premeštanje %s", + "Permission denied" : "Pristup odbijen", + "File name cannot be empty." : "Ime fajla ne može biti prazno.", + "\"%s\" is an invalid file name." : "\"%s\" je neispravno ime fajla.", + "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "Neispravno ime, '\\', '/', '<', '>', ':', '\"', '|', '?' i '*' nisu dozvoljeni.", + "The target folder has been moved or deleted." : "Ciljani direktorijum je premešten ili izbrisan.", + "The name %s is already used in the folder %s. Please choose a different name." : "Ime %s je već u upotrebi u direktorijumu %s. Molimo izaberite drugo ime.", + "Not a valid source" : "Nije ispravan izvor", + "Server is not allowed to open URLs, please check the server configuration" : "Serveru nije dozvoljeno da otvara URL-ove, molimo proverite podešavanja servera", + "The file exceeds your quota by %s" : "Ovaj fajl prevazilazi Vašu kvotu za %s", + "Error while downloading %s to %s" : "Greška pri preuzimanju %s u %s", + "Error when creating the file" : "Greška pri kreiranju fajla", + "Folder name cannot be empty." : "Ime direktorijuma ne može da bude prazno.", + "Error when creating the folder" : "Greška pri kreiranju direktorijuma", + "Unable to set upload directory." : "Nemoguće postaviti direktorijum za otpremanje.", + "Invalid Token" : "Neispravan simbol", + "No file was uploaded. Unknown error" : "Fajl nije otpremeljen. Nepoznata greška", "There is no error, the file uploaded with success" : "Nema greške, fajl je uspešno poslat", + "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "Otpremljeni fajl prevazilazi upload_max_filesize direktivu u php.ini:", "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Poslati fajl prevazilazi direktivu MAX_FILE_SIZE koja je navedena u HTML formi", "The uploaded file was only partially uploaded" : "Poslati fajl je samo delimično otpremljen!", "No file was uploaded" : "Nijedan fajl nije poslat", "Missing a temporary folder" : "Nedostaje privremena fascikla", + "Failed to write to disk" : "Neuspelo pisanje na disk", + "Not enough storage available" : "Nema dovoljno skladišnog prostora na raspolaganju", + "Upload failed. Could not find uploaded file" : "Otpremanje nije uspelo. Nije pronađen otpremljeni fajl", + "Upload failed. Could not get file info." : "Otpremanje nije uspelo. Nije moguće pronaći informacije o fajlu.", + "Invalid directory." : "Neispravan direktorijum", "Files" : "Fajlovi", + "All files" : "Svi fajlovi", + "Favorites" : "Omiljeni", "Home" : "Kuća", + "Unable to upload {filename} as it is a directory or has 0 bytes" : "Nije moguće otpremiti {filename} zato što je u pitanju direktorijum ili ima 0 bajtova.", + "Total file size {size1} exceeds upload limit {size2}" : "Ukupna veličina fajla {size1} prevazilazi limit za otpremanje {size2}", + "Not enough free space, you are uploading {size1} but only {size2} is left" : "Nema dovoljno slobodnog prostora, otpremate {size1} ali samo je {size2} preostalo", + "Upload cancelled." : "Otpremanje otkazano.", + "Could not get result from server." : "Nije bilo moguće dobiti rezultat sa servera.", + "File upload is in progress. Leaving the page now will cancel the upload." : "Otpremanje fajla je u toku. Ako sada napustite stranicu, prekinućete otpremanje.", + "URL cannot be empty" : "URL ne može biti prazan.", + "{new_name} already exists" : "{new_name} već postoji", + "Could not create file" : "Nije bilo moguće kreirati fajl", + "Could not create folder" : "Nije bilo moguće kreirati direktorijum", + "Error fetching URL" : "Greška pri preuzimanju URL-a", "Rename" : "Preimenij", "Delete" : "Obriši", + "Disconnect storage" : "Nepovezano skladište", "Unshare" : "Ukljoni deljenje", "Download" : "Preuzmi", + "Select" : "Odaberi", + "Pending" : "U toku", + "Unable to determine date" : "Nemoguće ustanoviti datum", + "Error moving file." : "Greška pri premeštanju fajla.", + "Error moving file" : "Greška pri premeštanju fajla", "Error" : "Greška", + "Could not rename file" : "Nemoguća promena imena fajla", + "Error deleting file." : "Greška pri brisanju fajla.", + "No entries in this folder match '{filter}'" : "Nijedan unos u ovom direktorijumu se ne poklapa sa '{filter}'", "Name" : "Ime", "Size" : "Veličina", "Modified" : "Zadnja izmena", - "_%n folder_::_%n folders_" : ["","",""], - "_%n file_::_%n files_" : ["","",""], - "_Uploading %n file_::_Uploading %n files_" : ["","",""], - "_matches '{filter}'_::_match '{filter}'_" : ["","",""], + "_%n folder_::_%n folders_" : ["%n direktorijum","%n direktorijuma","%n direktorijuma"], + "_%n file_::_%n files_" : ["%n fajl","%n fajlova","%n fajlova"], + "You don’t have permission to upload or create files here" : "Nemate dozvolu da otpremate ili kreirate fajlove ovde", + "_Uploading %n file_::_Uploading %n files_" : ["Otpremam %n fajl","Otpremam %n fajlova","Otpremam %n fajlova"], + "\"{name}\" is an invalid file name." : "\"{name}\" je neispravno ime fajla.", + "Your storage is full, files can not be updated or synced anymore!" : "Vaše skladište je puno, fajlovi se ne mogu više otpremati ili sinhronizovati.", + "Your storage is almost full ({usedSpacePercent}%)" : "Vaše skladište je skoro puno ({usedSpacePercent}%)", + "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikacija za šifrovanje je omogućena ali Vaši ključevi nisu inicijalizovani, molimo Vas da se izlogujete i ulogujete ponovo.", + "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Neispravan privatni ključ za Aplikaciju za šifrovanje. Molimo da osvežite vašu lozinku privatnog ključa u ličnim podešavanjima kako bi dobili pristup šifrovanim fajlovima.", + "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Šifrovanje je isključeno, ali Vaši fajlovi su i dalje šifrovani. Molimo Vas da odete u lična podešavanja da dešifrujete svoje fajlove.", + "_matches '{filter}'_::_match '{filter}'_" : ["poklapa se sa '{filter}'","poklapaju se sa '{filter}'","poklapaju se sa '{filter}'"], + "{dirs} and {files}" : "{dirs} i {files}", + "Favorited" : "Omiljeni", + "Favorite" : "Omiljen", + "%s could not be renamed as it has been deleted" : "%s nije mogao biti preimenovan jer je obrisan.", + "%s could not be renamed" : "%s nije mogao biti preimenovan", + "Upload (max. %s)" : "Otpremanje (maksimalno %s)", + "File handling" : "Upravljanje fajlovima", "Maximum upload size" : "Maksimalna veličina pošiljke", + "max. possible: " : "najviše moguće:", "Save" : "Snimi", "Settings" : "Podešavanja", + "WebDAV" : "WebDAV", + "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Upotrebite ovu adresu da <a href=\"%s\" target=\"_blank\">pristupite svojim fajlovima putem WebDAV-a</a>", + "New" : "Novi", + "New text file" : "Novi tekstualni fajl", + "Text file" : "Tekstualni fajl", + "New folder" : "Novi direktorijum", "Folder" : "Direktorijum", + "From link" : "Od prečice", "Upload" : "Pošalji", + "Cancel upload" : "Otkaži otpremanje", + "No files yet" : "Još nema fajlova", + "Upload some content or sync with your devices!" : "Otpremite neki sadržaj ili sinhronizujte sa svojim uređajima!", + "No entries found in this folder" : "Nema pronađenih unosa u ovom direktorijumu", + "Select all" : "Odaberi sve", "Upload too large" : "Pošiljka je prevelika", - "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Fajlovi koje želite da pošaljete prevazilaze ograničenje maksimalne veličine pošiljke na ovom serveru." + "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Fajlovi koje želite da pošaljete prevazilaze ograničenje maksimalne veličine pošiljke na ovom serveru.", + "Files are being scanned, please wait." : "Fajlovi se skeniraju, molimo sačekajte.", + "Currently scanning" : "Trenutno skeniram", + "No favorites" : "Nema omiljenih", + "Files and folders you mark as favorite will show up here" : "Fajlovi i direktorijumi koje ste obeležili kao omiljene će biti prikazani ovde" },"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);" }
\ No newline at end of file diff --git a/apps/files/l10n/tr.js b/apps/files/l10n/tr.js index d780db554b6..6a497a4b3c1 100644 --- a/apps/files/l10n/tr.js +++ b/apps/files/l10n/tr.js @@ -78,7 +78,7 @@ OC.L10N.register( "_matches '{filter}'_::_match '{filter}'_" : ["'{filter}' ile eşleşiyor","'{filter}' ile eşleşiyor"], "{dirs} and {files}" : "{dirs} ve {files}", "Favorited" : "Sık kullanılanlara eklendi", - "Favorite" : "Sık Kullanılan", + "Favorite" : "Sık kullanılan", "%s could not be renamed as it has been deleted" : "%s, silindiği için adlandırılamadı", "%s could not be renamed" : "%s yeniden adlandırılamadı", "Upload (max. %s)" : "Yükle (azami: %s)", @@ -98,7 +98,7 @@ OC.L10N.register( "Upload" : "Yükle", "Cancel upload" : "Yüklemeyi iptal et", "No files yet" : "Henüz dosya yok", - "Upload some content or sync with your devices!" : "Bir şeyler yükleyin veya aygıtlarınızla eşleştirin!", + "Upload some content or sync with your devices!" : "Bir şeyler yükleyin veya aygıtlarınızla eşitleyin!", "No entries found in this folder" : "Bu klasörde hiçbir girdi bulunamadı", "Select all" : "Tümünü seç", "Upload too large" : "Yükleme çok büyük", diff --git a/apps/files/l10n/tr.json b/apps/files/l10n/tr.json index 7aad97b5e1a..7f23744c96a 100644 --- a/apps/files/l10n/tr.json +++ b/apps/files/l10n/tr.json @@ -76,7 +76,7 @@ "_matches '{filter}'_::_match '{filter}'_" : ["'{filter}' ile eşleşiyor","'{filter}' ile eşleşiyor"], "{dirs} and {files}" : "{dirs} ve {files}", "Favorited" : "Sık kullanılanlara eklendi", - "Favorite" : "Sık Kullanılan", + "Favorite" : "Sık kullanılan", "%s could not be renamed as it has been deleted" : "%s, silindiği için adlandırılamadı", "%s could not be renamed" : "%s yeniden adlandırılamadı", "Upload (max. %s)" : "Yükle (azami: %s)", @@ -96,7 +96,7 @@ "Upload" : "Yükle", "Cancel upload" : "Yüklemeyi iptal et", "No files yet" : "Henüz dosya yok", - "Upload some content or sync with your devices!" : "Bir şeyler yükleyin veya aygıtlarınızla eşleştirin!", + "Upload some content or sync with your devices!" : "Bir şeyler yükleyin veya aygıtlarınızla eşitleyin!", "No entries found in this folder" : "Bu klasörde hiçbir girdi bulunamadı", "Select all" : "Tümünü seç", "Upload too large" : "Yükleme çok büyük", diff --git a/apps/files/l10n/uk.js b/apps/files/l10n/uk.js index 7275eea30f7..83ac40ff889 100644 --- a/apps/files/l10n/uk.js +++ b/apps/files/l10n/uk.js @@ -55,11 +55,13 @@ OC.L10N.register( "Download" : "Завантажити", "Select" : "Оберіть", "Pending" : "Очікування", + "Unable to determine date" : "Неможливо визначити дату", "Error moving file." : "Помилка переміщення файлу.", "Error moving file" : "Помилка переміщення файлу", "Error" : "Помилка", "Could not rename file" : "Неможливо перейменувати файл", "Error deleting file." : "Помилка видалення файлу.", + "No entries in this folder match '{filter}'" : "Нічого не знайдено в цій теці '{filter}'", "Name" : "Ім'я", "Size" : "Розмір", "Modified" : "Змінено", @@ -73,8 +75,9 @@ OC.L10N.register( "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Доданок шифрування ввімкнено, але ваші ключі не ініціалізовано, вийдіть та зайдіть знову", "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Невірний закритий ключ для доданку шифрування. Оновіть пароль до вашого закритого ключа в особистих налаштуваннях.", "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Шифрування було вимкнено, але ваші файли все ще зашифровано. Для розшифрування перейдіть до персональних налаштувань.", - "_matches '{filter}'_::_match '{filter}'_" : ["","",""], + "_matches '{filter}'_::_match '{filter}'_" : ["знайдено '{filter}'","знайдено '{filter}'","знайдено '{filter}'"], "{dirs} and {files}" : "{dirs} і {files}", + "Favorited" : "Улюблений", "Favorite" : "Улюблений", "%s could not be renamed as it has been deleted" : "%s не може бути перейменований, оскільки він видалений", "%s could not be renamed" : "%s не може бути перейменований", @@ -94,9 +97,15 @@ OC.L10N.register( "From link" : "З посилання", "Upload" : "Вивантажити", "Cancel upload" : "Перервати завантаження", + "No files yet" : "Немає нічого", + "Upload some content or sync with your devices!" : "Завантажте вміст або синхронізуйте з пристроями!", + "No entries found in this folder" : "Записів не знайдено в цій папці", + "Select all" : "Вибрати всі", "Upload too large" : "Файл занадто великий", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Файли,що ви намагаєтесь відвантажити перевищують максимальний дозволений розмір файлів на цьому сервері.", "Files are being scanned, please wait." : "Файли скануються, зачекайте, будь-ласка.", - "Currently scanning" : "Триває перевірка" + "Currently scanning" : "Триває перевірка", + "No favorites" : "Немає обраних", + "Files and folders you mark as favorite will show up here" : "Файли і папки, які ви помітити як улюблені з'явиться тут" }, "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"); diff --git a/apps/files/l10n/uk.json b/apps/files/l10n/uk.json index af7ce2cd751..67c13571dd7 100644 --- a/apps/files/l10n/uk.json +++ b/apps/files/l10n/uk.json @@ -53,11 +53,13 @@ "Download" : "Завантажити", "Select" : "Оберіть", "Pending" : "Очікування", + "Unable to determine date" : "Неможливо визначити дату", "Error moving file." : "Помилка переміщення файлу.", "Error moving file" : "Помилка переміщення файлу", "Error" : "Помилка", "Could not rename file" : "Неможливо перейменувати файл", "Error deleting file." : "Помилка видалення файлу.", + "No entries in this folder match '{filter}'" : "Нічого не знайдено в цій теці '{filter}'", "Name" : "Ім'я", "Size" : "Розмір", "Modified" : "Змінено", @@ -71,8 +73,9 @@ "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Доданок шифрування ввімкнено, але ваші ключі не ініціалізовано, вийдіть та зайдіть знову", "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Невірний закритий ключ для доданку шифрування. Оновіть пароль до вашого закритого ключа в особистих налаштуваннях.", "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Шифрування було вимкнено, але ваші файли все ще зашифровано. Для розшифрування перейдіть до персональних налаштувань.", - "_matches '{filter}'_::_match '{filter}'_" : ["","",""], + "_matches '{filter}'_::_match '{filter}'_" : ["знайдено '{filter}'","знайдено '{filter}'","знайдено '{filter}'"], "{dirs} and {files}" : "{dirs} і {files}", + "Favorited" : "Улюблений", "Favorite" : "Улюблений", "%s could not be renamed as it has been deleted" : "%s не може бути перейменований, оскільки він видалений", "%s could not be renamed" : "%s не може бути перейменований", @@ -92,9 +95,15 @@ "From link" : "З посилання", "Upload" : "Вивантажити", "Cancel upload" : "Перервати завантаження", + "No files yet" : "Немає нічого", + "Upload some content or sync with your devices!" : "Завантажте вміст або синхронізуйте з пристроями!", + "No entries found in this folder" : "Записів не знайдено в цій папці", + "Select all" : "Вибрати всі", "Upload too large" : "Файл занадто великий", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Файли,що ви намагаєтесь відвантажити перевищують максимальний дозволений розмір файлів на цьому сервері.", "Files are being scanned, please wait." : "Файли скануються, зачекайте, будь-ласка.", - "Currently scanning" : "Триває перевірка" + "Currently scanning" : "Триває перевірка", + "No favorites" : "Немає обраних", + "Files and folders you mark as favorite will show up here" : "Файли і папки, які ви помітити як улюблені з'явиться тут" },"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);" }
\ No newline at end of file diff --git a/apps/files/l10n/yo.js b/apps/files/l10n/yo.js new file mode 100644 index 00000000000..7988332fa91 --- /dev/null +++ b/apps/files/l10n/yo.js @@ -0,0 +1,9 @@ +OC.L10N.register( + "files", + { + "_%n folder_::_%n folders_" : ["",""], + "_%n file_::_%n files_" : ["",""], + "_Uploading %n file_::_Uploading %n files_" : ["",""], + "_matches '{filter}'_::_match '{filter}'_" : ["",""] +}, +"nplurals=2; plural=(n != 1);"); diff --git a/apps/files/l10n/yo.json b/apps/files/l10n/yo.json new file mode 100644 index 00000000000..ef5fc586755 --- /dev/null +++ b/apps/files/l10n/yo.json @@ -0,0 +1,7 @@ +{ "translations": { + "_%n folder_::_%n folders_" : ["",""], + "_%n file_::_%n files_" : ["",""], + "_Uploading %n file_::_Uploading %n files_" : ["",""], + "_matches '{filter}'_::_match '{filter}'_" : ["",""] +},"pluralForm" :"nplurals=2; plural=(n != 1);" +}
\ No newline at end of file diff --git a/apps/files/lib/helper.php b/apps/files/lib/helper.php index 84b1a0f1662..bcca6f0a276 100644 --- a/apps/files/lib/helper.php +++ b/apps/files/lib/helper.php @@ -13,21 +13,26 @@ use OCP\Files\FileInfo; /** * Helper class for manipulating file information */ -class Helper -{ +class Helper { + /** + * @param string $dir + * @return array + * @throws \OCP\Files\NotFoundException + */ public static function buildFileStorageStatistics($dir) { // information about storage capacities $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)); - return array('uploadMaxFilesize' => $maxUploadFileSize, - 'maxHumanFilesize' => $maxHumanFileSize, - 'freeSpace' => $storageInfo['free'], - 'usedSpacePercent' => (int)$storageInfo['relative']); + return [ + 'uploadMaxFilesize' => $maxUploadFileSize, + 'maxHumanFilesize' => $maxHumanFileSize, + 'freeSpace' => $storageInfo['free'], + 'usedSpacePercent' => (int)$storageInfo['relative'] + ]; } /** diff --git a/apps/files/service/tagservice.php b/apps/files/service/tagservice.php index 86885e38ddd..fe26838552a 100644 --- a/apps/files/service/tagservice.php +++ b/apps/files/service/tagservice.php @@ -8,6 +8,8 @@ namespace OCA\Files\Service; +use OC\Files\FileInfo; + /** * Service class to manage tags on files. */ @@ -84,11 +86,19 @@ class TagService { $nodes = $this->homeFolder->searchByTag( $tagName, $this->userSession->getUser()->getUId() ); - foreach ($nodes as &$node) { - $node = $node->getFileInfo(); + $fileInfos = []; + foreach ($nodes as $node) { + try { + /** @var \OC\Files\Node\Node $node */ + $fileInfos[] = $node->getFileInfo(); + } catch (\Exception $e) { + // FIXME Should notify the user, when this happens + // Can not get FileInfo, maybe the connection to the external + // storage is interrupted. + } } - return $nodes; + return $fileInfos; } } diff --git a/apps/files/tests/js/filelistSpec.js b/apps/files/tests/js/filelistSpec.js index c1c8e4ce337..59e3f8a9d4e 100644 --- a/apps/files/tests/js/filelistSpec.js +++ b/apps/files/tests/js/filelistSpec.js @@ -1790,6 +1790,36 @@ describe('OCA.Files.FileList tests', function() { expect(fileList.$el.find('.select-all').prop('checked')).toEqual(false); expect(fileList.getSelectedFiles()).toEqual([]); }); + describe('Disabled selection', function() { + beforeEach(function() { + fileList._allowSelection = false; + fileList.setFiles(testFiles); + }); + it('Does not render checkboxes', function() { + expect(fileList.$fileList.find('.selectCheckBox').length).toEqual(0); + }); + it('Does not select a file with Ctrl or Shift if selection is not allowed', function() { + var $tr = fileList.findFileEl('One.txt'); + var $tr2 = fileList.findFileEl('Three.pdf'); + var e; + e = new $.Event('click'); + e.ctrlKey = true; + $tr.find('td.filename .name').trigger(e); + + // click on second entry, does not clear the selection + e = new $.Event('click'); + e.ctrlKey = true; + $tr2.find('td.filename .name').trigger(e); + + expect(fileList.getSelectedFiles().length).toEqual(0); + + // deselect now + e = new $.Event('click'); + e.shiftKey = true; + $tr2.find('td.filename .name').trigger(e); + expect(fileList.getSelectedFiles().length).toEqual(0); + }); + }) }); describe('File actions', function() { it('Clicking on a file name will trigger default action', function() { diff --git a/apps/files_encryption/appinfo/app.php b/apps/files_encryption/appinfo/app.php index f2dc63c340d..842b1a1ff27 100644 --- a/apps/files_encryption/appinfo/app.php +++ b/apps/files_encryption/appinfo/app.php @@ -1,6 +1,5 @@ <?php -\OCP\Util::addTranslations('files_encryption'); \OCP\Util::addscript('files_encryption', 'encryption'); \OCP\Util::addscript('files_encryption', 'detect-migration'); diff --git a/apps/files_encryption/appinfo/info.xml b/apps/files_encryption/appinfo/info.xml index 6fcef693bed..7f7e09d6271 100644 --- a/apps/files_encryption/appinfo/info.xml +++ b/apps/files_encryption/appinfo/info.xml @@ -19,4 +19,7 @@ <filesystem/> </types> <ocsid>166047</ocsid> + <dependencies> + <lib>openssl</lib> + </dependencies> </info> diff --git a/apps/files_encryption/appinfo/register_command.php b/apps/files_encryption/appinfo/register_command.php new file mode 100644 index 00000000000..dfb7f5c375a --- /dev/null +++ b/apps/files_encryption/appinfo/register_command.php @@ -0,0 +1,12 @@ +<?php +/** + * Copyright (c) 2015 Thomas Müller <deepdiver@owncloud.com> + * This file is licensed under the Affero General Public License version 3 or + * later. + * See the COPYING-README file. + */ + +use OCA\Files_Encryption\Command\MigrateKeys; + +$userManager = OC::$server->getUserManager(); +$application->add(new MigrateKeys($userManager)); diff --git a/apps/files_encryption/appinfo/version b/apps/files_encryption/appinfo/version index faef31a4357..39e898a4f95 100644 --- a/apps/files_encryption/appinfo/version +++ b/apps/files_encryption/appinfo/version @@ -1 +1 @@ -0.7.0 +0.7.1 diff --git a/apps/files_encryption/command/migratekeys.php b/apps/files_encryption/command/migratekeys.php new file mode 100644 index 00000000000..d6db1f70892 --- /dev/null +++ b/apps/files_encryption/command/migratekeys.php @@ -0,0 +1,80 @@ +<?php +/** + * Copyright (c) 2015 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 OCA\Files_Encryption\Command; + +use OCA\Files_Encryption\Migration; +use OCP\IUserBackend; +use Symfony\Component\Console\Command\Command; +use Symfony\Component\Console\Input\InputArgument; +use Symfony\Component\Console\Input\InputInterface; +use Symfony\Component\Console\Output\OutputInterface; + +class MigrateKeys extends Command { + + /** @var \OC\User\Manager */ + private $userManager; + + public function __construct(\OC\User\Manager $userManager) { + $this->userManager = $userManager; + parent::__construct(); + } + + protected function configure() { + $this + ->setName('encryption:migrate-keys') + ->setDescription('migrate encryption keys') + ->addArgument( + 'user_id', + InputArgument::OPTIONAL | InputArgument::IS_ARRAY, + 'will migrate keys of the given user(s)' + ); + } + + protected function execute(InputInterface $input, OutputInterface $output) { + + // perform system reorganization + $migration = new Migration(); + $output->writeln("Reorganize system folder structure"); + $migration->reorganizeSystemFolderStructure(); + + $users = $input->getArgument('user_id'); + if (!empty($users)) { + foreach ($users as $user) { + if ($this->userManager->userExists($user)) { + $output->writeln("Migrating keys <info>$user</info>"); + $migration->reorganizeFolderStructureForUser($user); + } else { + $output->writeln("<error>Unknown user $user</error>"); + } + } + } else { + foreach($this->userManager->getBackends() as $backend) { + $name = get_class($backend); + + if ($backend instanceof IUserBackend) { + $name = $backend->getBackendName(); + } + + $output->writeln("Migrating keys for users on backend <info>$name</info>"); + + $limit = 500; + $offset = 0; + do { + $users = $backend->getUsers('', $limit, $offset); + foreach ($users as $user) { + $output->writeln(" <info>$user</info>"); + $migration->reorganizeFolderStructureForUser($user); + } + $offset += $limit; + } while(count($users) >= $limit); + } + } + + } +} diff --git a/apps/files_encryption/exception/encryptionexception.php b/apps/files_encryption/exception/encryptionexception.php index 2fb679e91d2..24ffaff6f73 100644 --- a/apps/files_encryption/exception/encryptionexception.php +++ b/apps/files_encryption/exception/encryptionexception.php @@ -40,7 +40,7 @@ namespace OCA\Files_Encryption\Exception; class EncryptionException extends \Exception { const GENERIC = 10; const UNEXPECTED_END_OF_ENCRYPTION_HEADER = 20; - const UNEXPECTED_BLOG_SIZE = 30; + const UNEXPECTED_BLOCK_SIZE = 30; const ENCRYPTION_HEADER_TO_LARGE = 40; const UNKNOWN_CIPHER = 50; const ENCRYPTION_FAILED = 60; diff --git a/apps/files_encryption/l10n/ar.js b/apps/files_encryption/l10n/ar.js index ce9c2e91fb8..88b1750cc0d 100644 --- a/apps/files_encryption/l10n/ar.js +++ b/apps/files_encryption/l10n/ar.js @@ -14,12 +14,11 @@ OC.L10N.register( "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." : "مفتاحك الخاص غير صالح! ربما تم تغيير كلمة المرور خارج %s (مثل:مجلد شركتك). يمكنك تحديث كلمة المرور في الاعدادات الشخصية لإستعادة الوصول الى ملفاتك المشفرة.", "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "لا يمكن فك التشفير من هذا الملف, من الممكن ان يكون هذا الملف مُشارك. يرجى سؤال صاحب الملف لإعادة مشاركتة معك.", "Unknown error. Please check your system settings or contact your administrator" : "خطأ غير معروف, الرجاء التحقق من إعدادات نظامك أو راسل المدير", - "Missing requirements." : "متطلبات ناقصة.", - "Following users are not set up for encryption:" : "المستخدمين التاليين لم يتم تعيين لهم التشفيير:", "Initial encryption started... This can take some time. Please wait." : "بدأ التشفير... من الممكن ان ياخذ بعض الوقت. يرجى الانتظار.", "Initial encryption running... Please try again later." : "جاري تفعيل التشفير المبدئي ، الرجاء المحاولة لاحقا", + "Missing requirements." : "متطلبات ناقصة.", + "Following users are not set up for encryption:" : "المستخدمين التاليين لم يتم تعيين لهم التشفيير:", "Go directly to your %spersonal settings%s." : " .%spersonal settings%s إنتقل مباشرة إلى ", - "Encryption" : "التشفير", "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "تم تمكين تشفير البرامج لكن لم يتم تهيئة المفاتيح لذا يرجى تسجيل الخروج ثم تسجيل الدخول مرة آخرى.", "Enable recovery key (allow to recover users files in case of password loss):" : "تفعيل استعادة المفتاح (سوف يمكنك من استعادة ملفات المستخدمين في حال فقدان كلمة المرور):", "Recovery key password" : "استعادة كلمة مرور المفتاح", diff --git a/apps/files_encryption/l10n/ar.json b/apps/files_encryption/l10n/ar.json index d43201b8cd5..ef8d71a0b1f 100644 --- a/apps/files_encryption/l10n/ar.json +++ b/apps/files_encryption/l10n/ar.json @@ -12,12 +12,11 @@ "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." : "مفتاحك الخاص غير صالح! ربما تم تغيير كلمة المرور خارج %s (مثل:مجلد شركتك). يمكنك تحديث كلمة المرور في الاعدادات الشخصية لإستعادة الوصول الى ملفاتك المشفرة.", "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "لا يمكن فك التشفير من هذا الملف, من الممكن ان يكون هذا الملف مُشارك. يرجى سؤال صاحب الملف لإعادة مشاركتة معك.", "Unknown error. Please check your system settings or contact your administrator" : "خطأ غير معروف, الرجاء التحقق من إعدادات نظامك أو راسل المدير", - "Missing requirements." : "متطلبات ناقصة.", - "Following users are not set up for encryption:" : "المستخدمين التاليين لم يتم تعيين لهم التشفيير:", "Initial encryption started... This can take some time. Please wait." : "بدأ التشفير... من الممكن ان ياخذ بعض الوقت. يرجى الانتظار.", "Initial encryption running... Please try again later." : "جاري تفعيل التشفير المبدئي ، الرجاء المحاولة لاحقا", + "Missing requirements." : "متطلبات ناقصة.", + "Following users are not set up for encryption:" : "المستخدمين التاليين لم يتم تعيين لهم التشفيير:", "Go directly to your %spersonal settings%s." : " .%spersonal settings%s إنتقل مباشرة إلى ", - "Encryption" : "التشفير", "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "تم تمكين تشفير البرامج لكن لم يتم تهيئة المفاتيح لذا يرجى تسجيل الخروج ثم تسجيل الدخول مرة آخرى.", "Enable recovery key (allow to recover users files in case of password loss):" : "تفعيل استعادة المفتاح (سوف يمكنك من استعادة ملفات المستخدمين في حال فقدان كلمة المرور):", "Recovery key password" : "استعادة كلمة مرور المفتاح", diff --git a/apps/files_encryption/l10n/ast.js b/apps/files_encryption/l10n/ast.js index c350f3605c2..724f4fb0c1c 100644 --- a/apps/files_encryption/l10n/ast.js +++ b/apps/files_encryption/l10n/ast.js @@ -14,12 +14,11 @@ OC.L10N.register( "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. Por favor, comprueba los axustes del sistema o contauta col alministrador", - "Missing requirements." : "Requisitos incompletos.", - "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.", + "Missing requirements." : "Requisitos incompletos.", + "Following users are not set up for encryption:" : "Los siguientes usuarios nun se configuraron pal cifráu:", "Go directly to your %spersonal settings%s." : "Dir direutamente a los tos %saxustes personales%s.", - "Encryption" : "Cifráu", "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "L'aplicación Encryption ta habilitada pero les tos claves nun s'aniciaron, por favor zarra sesión y aníciala de nueves", "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", diff --git a/apps/files_encryption/l10n/ast.json b/apps/files_encryption/l10n/ast.json index 6418e044717..407c27dfe7e 100644 --- a/apps/files_encryption/l10n/ast.json +++ b/apps/files_encryption/l10n/ast.json @@ -12,12 +12,11 @@ "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. Por favor, comprueba los axustes del sistema o contauta col alministrador", - "Missing requirements." : "Requisitos incompletos.", - "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.", + "Missing requirements." : "Requisitos incompletos.", + "Following users are not set up for encryption:" : "Los siguientes usuarios nun se configuraron pal cifráu:", "Go directly to your %spersonal settings%s." : "Dir direutamente a los tos %saxustes personales%s.", - "Encryption" : "Cifráu", "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "L'aplicación Encryption ta habilitada pero les tos claves nun s'aniciaron, por favor zarra sesión y aníciala de nueves", "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", diff --git a/apps/files_encryption/l10n/az.js b/apps/files_encryption/l10n/az.js index 29c4bc2633d..b8836e3611d 100644 --- a/apps/files_encryption/l10n/az.js +++ b/apps/files_encryption/l10n/az.js @@ -8,9 +8,8 @@ OC.L10N.register( "Password successfully changed." : "Şifrə uğurla dəyişdirildi.", "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." : "Sizin gizli açarınız doğru deyil! Təxmin edilir ki, sizin şifrə %s-dən kənarda dəyişdirilib(misal üçün sizin koorporativ qovluq). Siz öz şifrələnmiş fayllarınıza yetkinizi bərpa etmək üçün, öz şifrənizi şəxsi quraşdırmalarınızda yeniləyə bilərsiniz.", "Unknown error. Please check your system settings or contact your administrator" : "Tanınmayan səhv. Xahiş olunur sistem quraşdırmalarınızı yoxlayın yada öz inzibatçınızla əlaqə yaradın", - "Missing requirements." : "Taləbatlar çatışmır.", "Initial encryption running... Please try again later." : "İlkin şifrələnmə işləyir... Xahiş olunur birazdan yenidən müraciət edəsiniz.", - "Go directly to your %spersonal settings%s." : "Birbaşa öz %sşəxsi quraşdırmalarınıza%s gedin.", - "Encryption" : "Şifrələnmə" + "Missing requirements." : "Taləbatlar çatışmır.", + "Go directly to your %spersonal settings%s." : "Birbaşa öz %sşəxsi quraşdırmalarınıza%s gedin." }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files_encryption/l10n/az.json b/apps/files_encryption/l10n/az.json index f801dd0b247..94ed72f4ddf 100644 --- a/apps/files_encryption/l10n/az.json +++ b/apps/files_encryption/l10n/az.json @@ -6,9 +6,8 @@ "Password successfully changed." : "Şifrə uğurla dəyişdirildi.", "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." : "Sizin gizli açarınız doğru deyil! Təxmin edilir ki, sizin şifrə %s-dən kənarda dəyişdirilib(misal üçün sizin koorporativ qovluq). Siz öz şifrələnmiş fayllarınıza yetkinizi bərpa etmək üçün, öz şifrənizi şəxsi quraşdırmalarınızda yeniləyə bilərsiniz.", "Unknown error. Please check your system settings or contact your administrator" : "Tanınmayan səhv. Xahiş olunur sistem quraşdırmalarınızı yoxlayın yada öz inzibatçınızla əlaqə yaradın", - "Missing requirements." : "Taləbatlar çatışmır.", "Initial encryption running... Please try again later." : "İlkin şifrələnmə işləyir... Xahiş olunur birazdan yenidən müraciət edəsiniz.", - "Go directly to your %spersonal settings%s." : "Birbaşa öz %sşəxsi quraşdırmalarınıza%s gedin.", - "Encryption" : "Şifrələnmə" + "Missing requirements." : "Taləbatlar çatışmır.", + "Go directly to your %spersonal settings%s." : "Birbaşa öz %sşəxsi quraşdırmalarınıza%s gedin." },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files_encryption/l10n/bg_BG.js b/apps/files_encryption/l10n/bg_BG.js index 258c9d2723e..6f5876c0654 100644 --- a/apps/files_encryption/l10n/bg_BG.js +++ b/apps/files_encryption/l10n/bg_BG.js @@ -23,12 +23,13 @@ OC.L10N.register( "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." : "Твоят таен ключ е невалиден! Вероятно твоята парола беше променена извън %s(пр. твоята корпоративна директория). Можеш да промениш своят таен ключ в Лични настройки, за да възстановиш достъпа до криптираните файлове.", "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Неуспешно разшифроване на този файл, вероятно това е споделен файл. Моля, поискай собственика на файла да го сподели повторно с теб.", "Unknown error. Please check your system settings or contact your administrator" : "Непозната грешка. Моля, провери системните настройки или се свържи с администратора.", - "Missing requirements." : "Липсва задължителна информация.", - "Following users are not set up for encryption:" : "Следните потребители не са настроени за криптиране:", "Initial encryption started... This can take some time. Please wait." : "Първоначалното криптиране започна... Това може да отнеме време. Моля изчакай.", "Initial encryption running... Please try again later." : "Тече първоначално криптиране... Моля опитай по-късно.", + "Missing requirements." : "Липсва задължителна информация.", + "Please make sure that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Моля уверете се че OpenSSL заедно с PHP разширене са включени и конфигурирани правилно. За сега, криптиращото приложение е изключено.", + "Following users are not set up for encryption:" : "Следните потребители не са настроени за криптиране:", "Go directly to your %spersonal settings%s." : "Отиде направо към твоите %sлични настройки%s.", - "Encryption" : "Криптиране", + "Server-side Encryption" : "Криптиране от страна на сървъра", "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Програмата за криптиране е включена, но твоите ключове не са зададени, моля отпиши си и се впиши отново.", "Enable recovery key (allow to recover users files in case of password loss):" : "Включи опцията възстановяване на ключ (разрешава да възстанови файловете на потребителите в случай на загубена парола):", "Recovery key password" : "Парола за възстановяане на ключа", diff --git a/apps/files_encryption/l10n/bg_BG.json b/apps/files_encryption/l10n/bg_BG.json index 8a2abbfc5c4..055c434d229 100644 --- a/apps/files_encryption/l10n/bg_BG.json +++ b/apps/files_encryption/l10n/bg_BG.json @@ -21,12 +21,13 @@ "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." : "Твоят таен ключ е невалиден! Вероятно твоята парола беше променена извън %s(пр. твоята корпоративна директория). Можеш да промениш своят таен ключ в Лични настройки, за да възстановиш достъпа до криптираните файлове.", "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Неуспешно разшифроване на този файл, вероятно това е споделен файл. Моля, поискай собственика на файла да го сподели повторно с теб.", "Unknown error. Please check your system settings or contact your administrator" : "Непозната грешка. Моля, провери системните настройки или се свържи с администратора.", - "Missing requirements." : "Липсва задължителна информация.", - "Following users are not set up for encryption:" : "Следните потребители не са настроени за криптиране:", "Initial encryption started... This can take some time. Please wait." : "Първоначалното криптиране започна... Това може да отнеме време. Моля изчакай.", "Initial encryption running... Please try again later." : "Тече първоначално криптиране... Моля опитай по-късно.", + "Missing requirements." : "Липсва задължителна информация.", + "Please make sure that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Моля уверете се че OpenSSL заедно с PHP разширене са включени и конфигурирани правилно. За сега, криптиращото приложение е изключено.", + "Following users are not set up for encryption:" : "Следните потребители не са настроени за криптиране:", "Go directly to your %spersonal settings%s." : "Отиде направо към твоите %sлични настройки%s.", - "Encryption" : "Криптиране", + "Server-side Encryption" : "Криптиране от страна на сървъра", "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Програмата за криптиране е включена, но твоите ключове не са зададени, моля отпиши си и се впиши отново.", "Enable recovery key (allow to recover users files in case of password loss):" : "Включи опцията възстановяване на ключ (разрешава да възстанови файловете на потребителите в случай на загубена парола):", "Recovery key password" : "Парола за възстановяане на ключа", diff --git a/apps/files_encryption/l10n/bn_BD.js b/apps/files_encryption/l10n/bn_BD.js index b3986d9668d..2a1446e5723 100644 --- a/apps/files_encryption/l10n/bn_BD.js +++ b/apps/files_encryption/l10n/bn_BD.js @@ -5,12 +5,11 @@ OC.L10N.register( "Recovery key successfully enabled" : "পূনরুদ্ধার চাবি সার্থকভাবে কার্যকর করা হয়েছে", "Recovery key successfully disabled" : "পূনরুদ্ধার চাবি সার্থকভাবে অকার্যকর করা হয়েছে", "Password successfully changed." : "আপনার কূটশব্দটি সার্থকভাবে পরিবর্তন করা হয়েছে ", - "Missing requirements." : "প্রয়োজনানুযায়ী ঘাটতি আছে।", - "Following users are not set up for encryption:" : "নিম্নবর্ণিত ব্যবহারকারীগণ এনক্রিপসনের জন্য অধিকারপ্রাপ্ত নন:", "Initial encryption started... This can take some time. Please wait." : "প্রাথমিক এনক্রিপসন শুরু হয়েছে.... এটি কিছুটা সময় নিতে পারে। অপেক্ষা করুন।", "Initial encryption running... Please try again later." : "প্রাথমিক এনক্রিপসন চলছে.... দয়া করে পরে আবার চেষ্টা করুন।", + "Missing requirements." : "প্রয়োজনানুযায়ী ঘাটতি আছে।", + "Following users are not set up for encryption:" : "নিম্নবর্ণিত ব্যবহারকারীগণ এনক্রিপসনের জন্য অধিকারপ্রাপ্ত নন:", "Go directly to your %spersonal settings%s." : "সরাসরি আপনার %spersonal settings%s এ যান।", - "Encryption" : "সংকেতায়ন", "Repeat Recovery key password" : "পূণরূদ্ধার কি এর কুটশব্দ পূণরায় দিন", "Enabled" : "কার্যকর", "Disabled" : "অকার্যকর", diff --git a/apps/files_encryption/l10n/bn_BD.json b/apps/files_encryption/l10n/bn_BD.json index d1febcda0bb..9c2eca6591a 100644 --- a/apps/files_encryption/l10n/bn_BD.json +++ b/apps/files_encryption/l10n/bn_BD.json @@ -3,12 +3,11 @@ "Recovery key successfully enabled" : "পূনরুদ্ধার চাবি সার্থকভাবে কার্যকর করা হয়েছে", "Recovery key successfully disabled" : "পূনরুদ্ধার চাবি সার্থকভাবে অকার্যকর করা হয়েছে", "Password successfully changed." : "আপনার কূটশব্দটি সার্থকভাবে পরিবর্তন করা হয়েছে ", - "Missing requirements." : "প্রয়োজনানুযায়ী ঘাটতি আছে।", - "Following users are not set up for encryption:" : "নিম্নবর্ণিত ব্যবহারকারীগণ এনক্রিপসনের জন্য অধিকারপ্রাপ্ত নন:", "Initial encryption started... This can take some time. Please wait." : "প্রাথমিক এনক্রিপসন শুরু হয়েছে.... এটি কিছুটা সময় নিতে পারে। অপেক্ষা করুন।", "Initial encryption running... Please try again later." : "প্রাথমিক এনক্রিপসন চলছে.... দয়া করে পরে আবার চেষ্টা করুন।", + "Missing requirements." : "প্রয়োজনানুযায়ী ঘাটতি আছে।", + "Following users are not set up for encryption:" : "নিম্নবর্ণিত ব্যবহারকারীগণ এনক্রিপসনের জন্য অধিকারপ্রাপ্ত নন:", "Go directly to your %spersonal settings%s." : "সরাসরি আপনার %spersonal settings%s এ যান।", - "Encryption" : "সংকেতায়ন", "Repeat Recovery key password" : "পূণরূদ্ধার কি এর কুটশব্দ পূণরায় দিন", "Enabled" : "কার্যকর", "Disabled" : "অকার্যকর", diff --git a/apps/files_encryption/l10n/bs.js b/apps/files_encryption/l10n/bs.js index 1dc094cc436..7bf649dcb68 100644 --- a/apps/files_encryption/l10n/bs.js +++ b/apps/files_encryption/l10n/bs.js @@ -2,7 +2,6 @@ OC.L10N.register( "files_encryption", { "Unknown error" : "Nepoznata greška", - "Encryption" : "Šifriranje", "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikacija šifriranja je uključena, ali vaši ključevi nisu inicializirani, molim odjavite se i ponovno prijavite", "Enabled" : "Aktivirano", "Disabled" : "Onemogućeno" diff --git a/apps/files_encryption/l10n/bs.json b/apps/files_encryption/l10n/bs.json index e2085f953cc..df05ce3e24f 100644 --- a/apps/files_encryption/l10n/bs.json +++ b/apps/files_encryption/l10n/bs.json @@ -1,6 +1,5 @@ { "translations": { "Unknown error" : "Nepoznata greška", - "Encryption" : "Šifriranje", "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikacija šifriranja je uključena, ali vaši ključevi nisu inicializirani, molim odjavite se i ponovno prijavite", "Enabled" : "Aktivirano", "Disabled" : "Onemogućeno" diff --git a/apps/files_encryption/l10n/ca.js b/apps/files_encryption/l10n/ca.js index 033792d4233..189fc653160 100644 --- a/apps/files_encryption/l10n/ca.js +++ b/apps/files_encryption/l10n/ca.js @@ -14,12 +14,11 @@ OC.L10N.register( "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 clau privada no és vàlida! Probablement la contrasenya va ser canviada des de fora de %s (per exemple, en el directori de l'empresa). Vostè pot actualitzar la contrasenya de clau privada en la seva configuració personal per poder recuperar l'accés en els arxius xifrats.", "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "No es pot desencriptar aquest fitxer, probablement és un fitxer compartit. Demaneu al propietari del fitxer que el comparteixi de nou amb vós.", "Unknown error. Please check your system settings or contact your administrator" : "Error desconegut. Comproveu l'arranjament del sistema o aviseu a l'administrador", - "Missing requirements." : "Manca de requisits.", - "Following users are not set up for encryption:" : "Els usuaris següents no estan configurats per a l'encriptació:", "Initial encryption started... This can take some time. Please wait." : "La encriptació inicial ha començat... Pot trigar una estona, espereu.", "Initial encryption running... Please try again later." : "encriptació inicial en procés... Proveu-ho més tard.", + "Missing requirements." : "Manca de requisits.", + "Following users are not set up for encryption:" : "Els usuaris següents no estan configurats per a l'encriptació:", "Go directly to your %spersonal settings%s." : "Vés directament a l'%sarranjament personal%s.", - "Encryption" : "Xifrat", "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "L'aplicació d'encriptació està activada però les claus no estan inicialitzades, sortiu i acrediteu-vos de nou.", "Enable recovery key (allow to recover users files in case of password loss):" : "Activa la clau de recuperació (permet recuperar fitxers d'usuaris en cas de pèrdua de contrasenya):", "Recovery key password" : "Clau de recuperació de la contrasenya", diff --git a/apps/files_encryption/l10n/ca.json b/apps/files_encryption/l10n/ca.json index 85130ff900e..e3de02e1701 100644 --- a/apps/files_encryption/l10n/ca.json +++ b/apps/files_encryption/l10n/ca.json @@ -12,12 +12,11 @@ "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 clau privada no és vàlida! Probablement la contrasenya va ser canviada des de fora de %s (per exemple, en el directori de l'empresa). Vostè pot actualitzar la contrasenya de clau privada en la seva configuració personal per poder recuperar l'accés en els arxius xifrats.", "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "No es pot desencriptar aquest fitxer, probablement és un fitxer compartit. Demaneu al propietari del fitxer que el comparteixi de nou amb vós.", "Unknown error. Please check your system settings or contact your administrator" : "Error desconegut. Comproveu l'arranjament del sistema o aviseu a l'administrador", - "Missing requirements." : "Manca de requisits.", - "Following users are not set up for encryption:" : "Els usuaris següents no estan configurats per a l'encriptació:", "Initial encryption started... This can take some time. Please wait." : "La encriptació inicial ha començat... Pot trigar una estona, espereu.", "Initial encryption running... Please try again later." : "encriptació inicial en procés... Proveu-ho més tard.", + "Missing requirements." : "Manca de requisits.", + "Following users are not set up for encryption:" : "Els usuaris següents no estan configurats per a l'encriptació:", "Go directly to your %spersonal settings%s." : "Vés directament a l'%sarranjament personal%s.", - "Encryption" : "Xifrat", "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "L'aplicació d'encriptació està activada però les claus no estan inicialitzades, sortiu i acrediteu-vos de nou.", "Enable recovery key (allow to recover users files in case of password loss):" : "Activa la clau de recuperació (permet recuperar fitxers d'usuaris en cas de pèrdua de contrasenya):", "Recovery key password" : "Clau de recuperació de la contrasenya", diff --git a/apps/files_encryption/l10n/cs_CZ.js b/apps/files_encryption/l10n/cs_CZ.js index d25536cfd7b..42e14ca683f 100644 --- a/apps/files_encryption/l10n/cs_CZ.js +++ b/apps/files_encryption/l10n/cs_CZ.js @@ -6,7 +6,7 @@ OC.L10N.register( "Please repeat the recovery key password" : "Zopakujte prosím heslo klíče pro obnovu", "Repeated recovery key password does not match the provided recovery key password" : "Opakované heslo pro obnovu nesouhlasí se zadaným heslem", "Recovery key successfully enabled" : "Záchranný klíč byl úspěšně povolen", - "Could not disable recovery key. Please check your recovery key password!" : "Nelze zakázat záchranný klíč. Zkontrolujte prosím heslo vašeho záchranného klíče!", + "Could not disable recovery key. Please check your recovery key password!" : "Nelze zakázat záchranný klíč. Zkontrolujte prosím heslo svého záchranného klíče!", "Recovery key successfully disabled" : "Záchranný klíč byl úspěšně zakázán", "Please provide the old recovery password" : "Zadejte prosím staré heslo pro obnovu", "Please provide a new recovery password" : "Zadejte prosím nové heslo pro obnovu", @@ -29,7 +29,7 @@ OC.L10N.register( "Please make sure that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Ujistěte se prosím, že máte povolené a správně nakonfigurované OpenSSL včetně jeho rozšíření pro PHP. Aplikace pro šifrování byla prozatím vypnuta.", "Following users are not set up for encryption:" : "Následující uživatelé nemají nastavené šifrování:", "Go directly to your %spersonal settings%s." : "Přejít přímo do svého %sosobního nastavení%s.", - "Encryption" : "Šifrování", + "Server-side Encryption" : "Šifrování na serveru", "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikace pro šifrování je zapnuta, ale vaše klíče nejsou inicializované. Prosím odhlaste se a znovu přihlaste", "Enable recovery key (allow to recover users files in case of password loss):" : "Povolit klíč pro obnovu (umožňuje obnovu uživatelských souborů v případě ztráty hesla)", "Recovery key password" : "Heslo klíče pro obnovu", @@ -42,8 +42,8 @@ OC.L10N.register( "Repeat New Recovery key password" : "Zopakujte nové heslo klíče pro obnovu", "Change Password" : "Změnit heslo", "Your private key password no longer matches your log-in password." : "Heslo vašeho soukromého klíče se již neshoduje s vaším přihlašovacím heslem.", - "Set your old private key password to your current log-in password:" : "Změňte vaše staré heslo soukromého klíče na stejné, jako je vaše současné přihlašovací heslo:", - " If you don't remember your old password you can ask your administrator to recover your files." : "Pokud si nepamatujete vaše původní heslo, můžete požádat správce o obnovu vašich souborů.", + "Set your old private key password to your current log-in password:" : "Změňte své staré heslo soukromého klíče na stejné, jako je vaše současné přihlašovací heslo:", + " If you don't remember your old password you can ask your administrator to recover your files." : "Pokud si nepamatujete své původní heslo, můžete požádat správce o obnovu vašich souborů.", "Old log-in password" : "Původní přihlašovací heslo", "Current log-in password" : "Aktuální přihlašovací heslo", "Update Private Key Password" : "Změnit heslo soukromého klíče", diff --git a/apps/files_encryption/l10n/cs_CZ.json b/apps/files_encryption/l10n/cs_CZ.json index 2dad822877d..6e724f8ea2e 100644 --- a/apps/files_encryption/l10n/cs_CZ.json +++ b/apps/files_encryption/l10n/cs_CZ.json @@ -4,7 +4,7 @@ "Please repeat the recovery key password" : "Zopakujte prosím heslo klíče pro obnovu", "Repeated recovery key password does not match the provided recovery key password" : "Opakované heslo pro obnovu nesouhlasí se zadaným heslem", "Recovery key successfully enabled" : "Záchranný klíč byl úspěšně povolen", - "Could not disable recovery key. Please check your recovery key password!" : "Nelze zakázat záchranný klíč. Zkontrolujte prosím heslo vašeho záchranného klíče!", + "Could not disable recovery key. Please check your recovery key password!" : "Nelze zakázat záchranný klíč. Zkontrolujte prosím heslo svého záchranného klíče!", "Recovery key successfully disabled" : "Záchranný klíč byl úspěšně zakázán", "Please provide the old recovery password" : "Zadejte prosím staré heslo pro obnovu", "Please provide a new recovery password" : "Zadejte prosím nové heslo pro obnovu", @@ -27,7 +27,7 @@ "Please make sure that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Ujistěte se prosím, že máte povolené a správně nakonfigurované OpenSSL včetně jeho rozšíření pro PHP. Aplikace pro šifrování byla prozatím vypnuta.", "Following users are not set up for encryption:" : "Následující uživatelé nemají nastavené šifrování:", "Go directly to your %spersonal settings%s." : "Přejít přímo do svého %sosobního nastavení%s.", - "Encryption" : "Šifrování", + "Server-side Encryption" : "Šifrování na serveru", "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikace pro šifrování je zapnuta, ale vaše klíče nejsou inicializované. Prosím odhlaste se a znovu přihlaste", "Enable recovery key (allow to recover users files in case of password loss):" : "Povolit klíč pro obnovu (umožňuje obnovu uživatelských souborů v případě ztráty hesla)", "Recovery key password" : "Heslo klíče pro obnovu", @@ -40,8 +40,8 @@ "Repeat New Recovery key password" : "Zopakujte nové heslo klíče pro obnovu", "Change Password" : "Změnit heslo", "Your private key password no longer matches your log-in password." : "Heslo vašeho soukromého klíče se již neshoduje s vaším přihlašovacím heslem.", - "Set your old private key password to your current log-in password:" : "Změňte vaše staré heslo soukromého klíče na stejné, jako je vaše současné přihlašovací heslo:", - " If you don't remember your old password you can ask your administrator to recover your files." : "Pokud si nepamatujete vaše původní heslo, můžete požádat správce o obnovu vašich souborů.", + "Set your old private key password to your current log-in password:" : "Změňte své staré heslo soukromého klíče na stejné, jako je vaše současné přihlašovací heslo:", + " If you don't remember your old password you can ask your administrator to recover your files." : "Pokud si nepamatujete své původní heslo, můžete požádat správce o obnovu vašich souborů.", "Old log-in password" : "Původní přihlašovací heslo", "Current log-in password" : "Aktuální přihlašovací heslo", "Update Private Key Password" : "Změnit heslo soukromého klíče", diff --git a/apps/files_encryption/l10n/da.js b/apps/files_encryption/l10n/da.js index 93c718357c9..667b8e72c7a 100644 --- a/apps/files_encryption/l10n/da.js +++ b/apps/files_encryption/l10n/da.js @@ -21,16 +21,16 @@ OC.L10N.register( "Could not update file recovery" : "Kunne ikke opdatere filgendannelse", "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." : "Krypteringsprogrammet er ikke igangsat. Det kan skyldes at krypteringsprogrammet er blevet genaktiveret under din session. Prøv at logge ud og ind igen for at aktivere krypteringsprogrammet. ", "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." : "Din private nøgle er ikke gyldig. Sandsynligvis er dit kodeord blevet ændret uden for %s (f.eks dit firmas adressebog). Du kan opdatere din private nøglekode i dine personlige indstillinger for at genskabe adgang til dine krypterede filer.", - "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Kan ikke kryptere denne fil, sandsynligvis fordi felen er delt. Bed venligst filens ejer om at dele den med dig på ny.", + "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Kan ikke kryptere denne fil, sandsynligvis fordi filen er delt. Bed venligst filens ejer om at dele den med dig på ny.", "Unknown error. Please check your system settings or contact your administrator" : "Ukendt fejl. Venligst tjek dine systemindstillinger eller kontakt din systemadministrator", + "Initial encryption started... This can take some time. Please wait." : "Førstegangskrypteringen er påbegyndt... Dette kan tage nogen tid. Vent venligst.", + "Initial encryption running... Please try again later." : "Kryptering foretages... Prøv venligst igen senere.", "Missing requirements." : "Manglende betingelser.", "Please make sure that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Sørg for at OpenSSL, sammen med PHP-udvidelsen, er aktiveret og korrekt konfigureret. Indtil videre er krypteringsprogrammet deaktiveret.", "Following users are not set up for encryption:" : "Følgende brugere er ikke sat op til kryptering:", - "Initial encryption started... This can take some time. Please wait." : "Førstegangskrypteringen er påbegyndt... Dette kan tage nogen tid. Vent venligst.", - "Initial encryption running... Please try again later." : "Kryptering foretages... Prøv venligst igen senere.", "Go directly to your %spersonal settings%s." : "Gå direkte til dine %spersonlige indstillinger%s.", - "Encryption" : "Kryptering", - "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Krypteringsprogrammet er aktiveret, men din nøgle er ikke igangsat. Log venligst ud og ind igen.", + "Server-side Encryption" : "Kryptering på serverdelen", + "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Krypteringsprogrammet er aktiveret, men din nøgler er ikke igangsat. Log venligst ud og ind igen.", "Enable recovery key (allow to recover users files in case of password loss):" : "Aktiver gendannelsesnøgle (Tillad gendannelse af brugerfiler i tilfælde af tab af kodeord):", "Recovery key password" : "Gendannelsesnøgle kodeord", "Repeat Recovery key password" : "Gentag gendannelse af nøglekoden", @@ -39,7 +39,7 @@ OC.L10N.register( "Change recovery key password:" : "Skift gendannelsesnøgle kodeord:", "Old Recovery key password" : "Gammel Gendannelsesnøgle kodeord", "New Recovery key password" : "Ny Gendannelsesnøgle kodeord", - "Repeat New Recovery key password" : "Gentag dannelse af ny gendannaleses nøglekode", + "Repeat New Recovery key password" : "Gentag det nye gendannaleses nøglekodeord", "Change Password" : "Skift Kodeord", "Your private key password no longer matches your log-in password." : "Dit private nøglekodeord stemmer ikke længere overens med dit login-kodeord.", "Set your old private key password to your current log-in password:" : "Sæt dit gamle, private nøglekodeord til at være dit nuværende login-kodeord. ", diff --git a/apps/files_encryption/l10n/da.json b/apps/files_encryption/l10n/da.json index cd77a31993e..0561094f291 100644 --- a/apps/files_encryption/l10n/da.json +++ b/apps/files_encryption/l10n/da.json @@ -19,16 +19,16 @@ "Could not update file recovery" : "Kunne ikke opdatere filgendannelse", "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." : "Krypteringsprogrammet er ikke igangsat. Det kan skyldes at krypteringsprogrammet er blevet genaktiveret under din session. Prøv at logge ud og ind igen for at aktivere krypteringsprogrammet. ", "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." : "Din private nøgle er ikke gyldig. Sandsynligvis er dit kodeord blevet ændret uden for %s (f.eks dit firmas adressebog). Du kan opdatere din private nøglekode i dine personlige indstillinger for at genskabe adgang til dine krypterede filer.", - "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Kan ikke kryptere denne fil, sandsynligvis fordi felen er delt. Bed venligst filens ejer om at dele den med dig på ny.", + "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Kan ikke kryptere denne fil, sandsynligvis fordi filen er delt. Bed venligst filens ejer om at dele den med dig på ny.", "Unknown error. Please check your system settings or contact your administrator" : "Ukendt fejl. Venligst tjek dine systemindstillinger eller kontakt din systemadministrator", + "Initial encryption started... This can take some time. Please wait." : "Førstegangskrypteringen er påbegyndt... Dette kan tage nogen tid. Vent venligst.", + "Initial encryption running... Please try again later." : "Kryptering foretages... Prøv venligst igen senere.", "Missing requirements." : "Manglende betingelser.", "Please make sure that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Sørg for at OpenSSL, sammen med PHP-udvidelsen, er aktiveret og korrekt konfigureret. Indtil videre er krypteringsprogrammet deaktiveret.", "Following users are not set up for encryption:" : "Følgende brugere er ikke sat op til kryptering:", - "Initial encryption started... This can take some time. Please wait." : "Førstegangskrypteringen er påbegyndt... Dette kan tage nogen tid. Vent venligst.", - "Initial encryption running... Please try again later." : "Kryptering foretages... Prøv venligst igen senere.", "Go directly to your %spersonal settings%s." : "Gå direkte til dine %spersonlige indstillinger%s.", - "Encryption" : "Kryptering", - "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Krypteringsprogrammet er aktiveret, men din nøgle er ikke igangsat. Log venligst ud og ind igen.", + "Server-side Encryption" : "Kryptering på serverdelen", + "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Krypteringsprogrammet er aktiveret, men din nøgler er ikke igangsat. Log venligst ud og ind igen.", "Enable recovery key (allow to recover users files in case of password loss):" : "Aktiver gendannelsesnøgle (Tillad gendannelse af brugerfiler i tilfælde af tab af kodeord):", "Recovery key password" : "Gendannelsesnøgle kodeord", "Repeat Recovery key password" : "Gentag gendannelse af nøglekoden", @@ -37,7 +37,7 @@ "Change recovery key password:" : "Skift gendannelsesnøgle kodeord:", "Old Recovery key password" : "Gammel Gendannelsesnøgle kodeord", "New Recovery key password" : "Ny Gendannelsesnøgle kodeord", - "Repeat New Recovery key password" : "Gentag dannelse af ny gendannaleses nøglekode", + "Repeat New Recovery key password" : "Gentag det nye gendannaleses nøglekodeord", "Change Password" : "Skift Kodeord", "Your private key password no longer matches your log-in password." : "Dit private nøglekodeord stemmer ikke længere overens med dit login-kodeord.", "Set your old private key password to your current log-in password:" : "Sæt dit gamle, private nøglekodeord til at være dit nuværende login-kodeord. ", diff --git a/apps/files_encryption/l10n/de.js b/apps/files_encryption/l10n/de.js index 9687e081c76..e589640bbfb 100644 --- a/apps/files_encryption/l10n/de.js +++ b/apps/files_encryption/l10n/de.js @@ -23,13 +23,13 @@ OC.L10N.register( "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." : "Dein privater Schlüssel ist ungültig. Möglicher Weise wurde außerhalb von %s Dein Passwort geändert (z.B. in Deinem gemeinsamen Verzeichnis). Du kannst das Passwort Deines privaten Schlüssels in den persönlichen Einstellungen aktualisieren, um wieder an Deine Dateien zu gelangen.", "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Die Datei kann nicht entschlüsselt werden, da die Datei möglicherweise eine geteilte Datei ist. Bitte frage den Dateibesitzer, ob er die Datei nochmals mit Dir teilt.", "Unknown error. Please check your system settings or contact your administrator" : "Unbekannter Fehler. Bitte prüfe Deine Systemeinstellungen oder kontaktiere Deinen Administrator", + "Initial encryption started... This can take some time. Please wait." : "Initialverschlüsselung gestartet... Dies kann einige Zeit dauern. Bitte warten.", + "Initial encryption running... Please try again later." : "Anfangsverschlüsselung läuft … Bitte versuche es später wieder.", "Missing requirements." : "Fehlende Vorraussetzungen", "Please make sure that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Bitte stelle sicher, dass OpenSSL zusammen mit der PHP-Erweiterung aktiviert und richtig konfiguriert ist. Die Verschlüsselungsanwendung ist vorerst deaktiviert.", "Following users are not set up for encryption:" : "Für folgende Nutzer ist keine Verschlüsselung eingerichtet:", - "Initial encryption started... This can take some time. Please wait." : "Initialverschlüsselung gestartet... Dies kann einige Zeit dauern. Bitte warten.", - "Initial encryption running... Please try again later." : "Anfangsverschlüsselung läuft … Bitte versuche es später wieder.", "Go directly to your %spersonal settings%s." : "Direkt zu Deinen %spersonal settings%s wechseln.", - "Encryption" : "Verschlüsselung", + "Server-side Encryption" : "Serverseitige Verschlüsselung", "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Die Verschlüsselung-App ist aktiviert, aber Deine Schlüssel sind nicht initialisiert. Bitte melde Dich nochmals ab und wieder an.", "Enable recovery key (allow to recover users files in case of password loss):" : "Wiederherstellungsschlüssel aktivieren (ermöglicht das Wiederherstellen von Dateien, falls das Passwort vergessen wurde):", "Recovery key password" : "Wiederherstellungsschlüssel-Passwort", @@ -41,7 +41,7 @@ OC.L10N.register( "New Recovery key password" : "Neues Wiederherstellungsschlüssel-Passwort", "Repeat New Recovery key password" : "Neues Schlüssel-Passwort zur Wiederherstellung wiederholen", "Change Password" : "Passwort ändern", - "Your private key password no longer matches your log-in password." : "Das Privatschlüsselpasswort darf nicht länger mit dem Anmeldepasswort übereinstimmen.", + "Your private key password no longer matches your log-in password." : "Dein Passwort für Deinen privaten Schlüssel stimmt nicht mehr mit Deinem Loginpasswort überein.", "Set your old private key password to your current log-in password:" : "Dein altes Passwort für Deinen privaten Schlüssel auf Dein aktuelles Anmeldepasswort einstellen:", " If you don't remember your old password you can ask your administrator to recover your files." : "Wenn Du Dein altes Passwort vergessen hast, könntest Du Deinen Administrator bitten, Deine Daten wiederherzustellen.", "Old log-in password" : "Altes Login Passwort", diff --git a/apps/files_encryption/l10n/de.json b/apps/files_encryption/l10n/de.json index 5fc3fb822fd..99646e4a76a 100644 --- a/apps/files_encryption/l10n/de.json +++ b/apps/files_encryption/l10n/de.json @@ -21,13 +21,13 @@ "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." : "Dein privater Schlüssel ist ungültig. Möglicher Weise wurde außerhalb von %s Dein Passwort geändert (z.B. in Deinem gemeinsamen Verzeichnis). Du kannst das Passwort Deines privaten Schlüssels in den persönlichen Einstellungen aktualisieren, um wieder an Deine Dateien zu gelangen.", "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Die Datei kann nicht entschlüsselt werden, da die Datei möglicherweise eine geteilte Datei ist. Bitte frage den Dateibesitzer, ob er die Datei nochmals mit Dir teilt.", "Unknown error. Please check your system settings or contact your administrator" : "Unbekannter Fehler. Bitte prüfe Deine Systemeinstellungen oder kontaktiere Deinen Administrator", + "Initial encryption started... This can take some time. Please wait." : "Initialverschlüsselung gestartet... Dies kann einige Zeit dauern. Bitte warten.", + "Initial encryption running... Please try again later." : "Anfangsverschlüsselung läuft … Bitte versuche es später wieder.", "Missing requirements." : "Fehlende Vorraussetzungen", "Please make sure that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Bitte stelle sicher, dass OpenSSL zusammen mit der PHP-Erweiterung aktiviert und richtig konfiguriert ist. Die Verschlüsselungsanwendung ist vorerst deaktiviert.", "Following users are not set up for encryption:" : "Für folgende Nutzer ist keine Verschlüsselung eingerichtet:", - "Initial encryption started... This can take some time. Please wait." : "Initialverschlüsselung gestartet... Dies kann einige Zeit dauern. Bitte warten.", - "Initial encryption running... Please try again later." : "Anfangsverschlüsselung läuft … Bitte versuche es später wieder.", "Go directly to your %spersonal settings%s." : "Direkt zu Deinen %spersonal settings%s wechseln.", - "Encryption" : "Verschlüsselung", + "Server-side Encryption" : "Serverseitige Verschlüsselung", "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Die Verschlüsselung-App ist aktiviert, aber Deine Schlüssel sind nicht initialisiert. Bitte melde Dich nochmals ab und wieder an.", "Enable recovery key (allow to recover users files in case of password loss):" : "Wiederherstellungsschlüssel aktivieren (ermöglicht das Wiederherstellen von Dateien, falls das Passwort vergessen wurde):", "Recovery key password" : "Wiederherstellungsschlüssel-Passwort", @@ -39,7 +39,7 @@ "New Recovery key password" : "Neues Wiederherstellungsschlüssel-Passwort", "Repeat New Recovery key password" : "Neues Schlüssel-Passwort zur Wiederherstellung wiederholen", "Change Password" : "Passwort ändern", - "Your private key password no longer matches your log-in password." : "Das Privatschlüsselpasswort darf nicht länger mit dem Anmeldepasswort übereinstimmen.", + "Your private key password no longer matches your log-in password." : "Dein Passwort für Deinen privaten Schlüssel stimmt nicht mehr mit Deinem Loginpasswort überein.", "Set your old private key password to your current log-in password:" : "Dein altes Passwort für Deinen privaten Schlüssel auf Dein aktuelles Anmeldepasswort einstellen:", " If you don't remember your old password you can ask your administrator to recover your files." : "Wenn Du Dein altes Passwort vergessen hast, könntest Du Deinen Administrator bitten, Deine Daten wiederherzustellen.", "Old log-in password" : "Altes Login Passwort", diff --git a/apps/files_encryption/l10n/de_DE.js b/apps/files_encryption/l10n/de_DE.js index 01420b52e8d..9ad50104ea8 100644 --- a/apps/files_encryption/l10n/de_DE.js +++ b/apps/files_encryption/l10n/de_DE.js @@ -23,15 +23,15 @@ OC.L10N.register( "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." : "Ihr privater Schlüssel ist ungültig. Möglicher Weise wurde außerhalb von %s Ihr Passwort geändert (z.B. in Ihrem gemeinsamen Verzeichnis). Sie können das Passwort Ihres privaten Schlüssels in den persönlichen Einstellungen aktualisieren, um wieder an Ihre Dateien zu gelangen.", "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Die Datei kann nicht entschlüsselt werden, da die Datei möglicherweise eine geteilte Datei ist. Bitte fragen Sie den Dateibesitzer, dass er die Datei nochmals mit Ihnen teilt.", "Unknown error. Please check your system settings or contact your administrator" : "Unbekannter Fehler. Bitte prüfen Sie die Systemeinstellungen oder kontaktieren Sie Ihren Administrator", - "Missing requirements." : "Fehlende Voraussetzungen", - "Please make sure that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Bitte stellen Sie sicher, dass OpenSSL zusammen mit der PHP-Erweiterung aktiviert und richtig konfiguriert ist. Die Verschlüsselungsanwendung ist vorerst deaktiviert.", - "Following users are not set up for encryption:" : "Für folgende Nutzer ist keine Verschlüsselung eingerichtet:", "Initial encryption started... This can take some time. Please wait." : "Anfangsverschlüsselung gestartet … Dieses kann einige Zeit dauern. Bitte warten.", "Initial encryption running... Please try again later." : "Anfangsverschlüsselung läuft … Bitte versuchen Sie es später wieder.", + "Missing requirements." : "Fehlende Voraussetzungen", + "Please make sure that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Bitte stellen Sie sicher, dass OpenSSL zusammen mit der PHP-Erweiterung aktiviert und richtig konfiguriert ist. Die Verschlüsselungsanwendung ist vorerst deaktiviert.", + "Following users are not set up for encryption:" : "Für folgende Benutzer ist keine Verschlüsselung eingerichtet:", "Go directly to your %spersonal settings%s." : "Wechseln Sie direkt zu Ihren %spersonal settings%s.", - "Encryption" : "Verschlüsselung", + "Server-side Encryption" : "Serverseitige Verschlüsselung", "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Verschlüsselung-App ist aktiviert, aber Ihre Schlüssel sind nicht initialisiert. Bitte nochmals ab- und wieder anmelden.", - "Enable recovery key (allow to recover users files in case of password loss):" : "Aktivieren Sie den Wiederherstellungsschlüssel (erlaubt die Wiederherstellung des Zugangs zu den Benutzerdateien, wenn das Passwort verloren geht).", + "Enable recovery key (allow to recover users files in case of password loss):" : "Aktivieren Sie den Wiederherstellungsschlüssel (erlaubt die Wiederherstellung des Zugangs zu den Benutzerdateien, wenn das Passwort verloren geht):", "Recovery key password" : "Wiederherstellungschlüsselpasswort", "Repeat Recovery key password" : "Schlüsselpasswort zur Wiederherstellung wiederholen", "Enabled" : "Aktiviert", diff --git a/apps/files_encryption/l10n/de_DE.json b/apps/files_encryption/l10n/de_DE.json index 9105dc1e4c3..135818e290c 100644 --- a/apps/files_encryption/l10n/de_DE.json +++ b/apps/files_encryption/l10n/de_DE.json @@ -21,15 +21,15 @@ "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." : "Ihr privater Schlüssel ist ungültig. Möglicher Weise wurde außerhalb von %s Ihr Passwort geändert (z.B. in Ihrem gemeinsamen Verzeichnis). Sie können das Passwort Ihres privaten Schlüssels in den persönlichen Einstellungen aktualisieren, um wieder an Ihre Dateien zu gelangen.", "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Die Datei kann nicht entschlüsselt werden, da die Datei möglicherweise eine geteilte Datei ist. Bitte fragen Sie den Dateibesitzer, dass er die Datei nochmals mit Ihnen teilt.", "Unknown error. Please check your system settings or contact your administrator" : "Unbekannter Fehler. Bitte prüfen Sie die Systemeinstellungen oder kontaktieren Sie Ihren Administrator", - "Missing requirements." : "Fehlende Voraussetzungen", - "Please make sure that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Bitte stellen Sie sicher, dass OpenSSL zusammen mit der PHP-Erweiterung aktiviert und richtig konfiguriert ist. Die Verschlüsselungsanwendung ist vorerst deaktiviert.", - "Following users are not set up for encryption:" : "Für folgende Nutzer ist keine Verschlüsselung eingerichtet:", "Initial encryption started... This can take some time. Please wait." : "Anfangsverschlüsselung gestartet … Dieses kann einige Zeit dauern. Bitte warten.", "Initial encryption running... Please try again later." : "Anfangsverschlüsselung läuft … Bitte versuchen Sie es später wieder.", + "Missing requirements." : "Fehlende Voraussetzungen", + "Please make sure that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Bitte stellen Sie sicher, dass OpenSSL zusammen mit der PHP-Erweiterung aktiviert und richtig konfiguriert ist. Die Verschlüsselungsanwendung ist vorerst deaktiviert.", + "Following users are not set up for encryption:" : "Für folgende Benutzer ist keine Verschlüsselung eingerichtet:", "Go directly to your %spersonal settings%s." : "Wechseln Sie direkt zu Ihren %spersonal settings%s.", - "Encryption" : "Verschlüsselung", + "Server-side Encryption" : "Serverseitige Verschlüsselung", "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Verschlüsselung-App ist aktiviert, aber Ihre Schlüssel sind nicht initialisiert. Bitte nochmals ab- und wieder anmelden.", - "Enable recovery key (allow to recover users files in case of password loss):" : "Aktivieren Sie den Wiederherstellungsschlüssel (erlaubt die Wiederherstellung des Zugangs zu den Benutzerdateien, wenn das Passwort verloren geht).", + "Enable recovery key (allow to recover users files in case of password loss):" : "Aktivieren Sie den Wiederherstellungsschlüssel (erlaubt die Wiederherstellung des Zugangs zu den Benutzerdateien, wenn das Passwort verloren geht):", "Recovery key password" : "Wiederherstellungschlüsselpasswort", "Repeat Recovery key password" : "Schlüsselpasswort zur Wiederherstellung wiederholen", "Enabled" : "Aktiviert", diff --git a/apps/files_encryption/l10n/el.js b/apps/files_encryption/l10n/el.js index bb12d05f049..7e5d38eee2a 100644 --- a/apps/files_encryption/l10n/el.js +++ b/apps/files_encryption/l10n/el.js @@ -27,7 +27,6 @@ OC.L10N.register( "Missing requirements." : "Προαπαιτούμενα που απουσιάζουν.", "Following users are not set up for encryption:" : "Οι κάτωθι χρήστες δεν έχουν ρυθμιστεί για κρυπογράφηση:", "Go directly to your %spersonal settings%s." : "Πηγαίνετε κατ'ευθείαν στις %sπροσωπικές ρυθμίσεις%s σας.", - "Encryption" : "Κρυπτογράφηση", "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Η εφαρμογή κρυπτογράφησης είναι ενεργοποιημένη αλλά τα κλειδιά σας δεν έχουν καταγραφεί, παρακαλώ αποσυνδεθείτε και επανασυνδεθείτε.", "Enable recovery key (allow to recover users files in case of password loss):" : "Ενεργοποίηση κλειδιού ανάκτησης (επιτρέψτε την ανάκτηση αρχείων χρηστών σε περίπτωση απώλειας κωδικού):", "Recovery key password" : "Επαναφορά κωδικού κλειδιού", diff --git a/apps/files_encryption/l10n/el.json b/apps/files_encryption/l10n/el.json index 18cf819643b..985d8a34c35 100644 --- a/apps/files_encryption/l10n/el.json +++ b/apps/files_encryption/l10n/el.json @@ -25,7 +25,6 @@ "Missing requirements." : "Προαπαιτούμενα που απουσιάζουν.", "Following users are not set up for encryption:" : "Οι κάτωθι χρήστες δεν έχουν ρυθμιστεί για κρυπογράφηση:", "Go directly to your %spersonal settings%s." : "Πηγαίνετε κατ'ευθείαν στις %sπροσωπικές ρυθμίσεις%s σας.", - "Encryption" : "Κρυπτογράφηση", "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Η εφαρμογή κρυπτογράφησης είναι ενεργοποιημένη αλλά τα κλειδιά σας δεν έχουν καταγραφεί, παρακαλώ αποσυνδεθείτε και επανασυνδεθείτε.", "Enable recovery key (allow to recover users files in case of password loss):" : "Ενεργοποίηση κλειδιού ανάκτησης (επιτρέψτε την ανάκτηση αρχείων χρηστών σε περίπτωση απώλειας κωδικού):", "Recovery key password" : "Επαναφορά κωδικού κλειδιού", diff --git a/apps/files_encryption/l10n/en_GB.js b/apps/files_encryption/l10n/en_GB.js index 1e5e07d450d..dc0dba85eb2 100644 --- a/apps/files_encryption/l10n/en_GB.js +++ b/apps/files_encryption/l10n/en_GB.js @@ -23,13 +23,13 @@ OC.L10N.register( "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." : "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.", "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Cannot decrypt this file, which is probably a shared file. Please ask the file owner to reshare the file with you.", "Unknown error. Please check your system settings or contact your administrator" : "Unknown error. Please check your system settings or contact your administrator", + "Initial encryption started... This can take some time. Please wait." : "Initial encryption started... This can take some time. Please wait.", + "Initial encryption running... Please try again later." : "Initial encryption running... Please try again later.", "Missing requirements." : "Missing requirements.", "Please make sure that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Please make sure that OpenSSL together with the PHP extension is enabled and properly configured. For now, the encryption app has been disabled.", "Following users are not set up for encryption:" : "Following users are not set up for encryption:", - "Initial encryption started... This can take some time. Please wait." : "Initial encryption started... This can take some time. Please wait.", - "Initial encryption running... Please try again later." : "Initial encryption running... Please try again later.", "Go directly to your %spersonal settings%s." : "Go directly to your %spersonal settings%s.", - "Encryption" : "Encryption", + "Server-side Encryption" : "Server-side Encryption", "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Encryption App is enabled but your keys are not initialised, please log-out and log-in again", "Enable recovery key (allow to recover users files in case of password loss):" : "Enable recovery key (allow to recover users files in case of password loss):", "Recovery key password" : "Recovery key password", diff --git a/apps/files_encryption/l10n/en_GB.json b/apps/files_encryption/l10n/en_GB.json index 68478b60d68..8afafc4e908 100644 --- a/apps/files_encryption/l10n/en_GB.json +++ b/apps/files_encryption/l10n/en_GB.json @@ -21,13 +21,13 @@ "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." : "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.", "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Cannot decrypt this file, which is probably a shared file. Please ask the file owner to reshare the file with you.", "Unknown error. Please check your system settings or contact your administrator" : "Unknown error. Please check your system settings or contact your administrator", + "Initial encryption started... This can take some time. Please wait." : "Initial encryption started... This can take some time. Please wait.", + "Initial encryption running... Please try again later." : "Initial encryption running... Please try again later.", "Missing requirements." : "Missing requirements.", "Please make sure that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Please make sure that OpenSSL together with the PHP extension is enabled and properly configured. For now, the encryption app has been disabled.", "Following users are not set up for encryption:" : "Following users are not set up for encryption:", - "Initial encryption started... This can take some time. Please wait." : "Initial encryption started... This can take some time. Please wait.", - "Initial encryption running... Please try again later." : "Initial encryption running... Please try again later.", "Go directly to your %spersonal settings%s." : "Go directly to your %spersonal settings%s.", - "Encryption" : "Encryption", + "Server-side Encryption" : "Server-side Encryption", "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Encryption App is enabled but your keys are not initialised, please log-out and log-in again", "Enable recovery key (allow to recover users files in case of password loss):" : "Enable recovery key (allow to recover users files in case of password loss):", "Recovery key password" : "Recovery key password", diff --git a/apps/files_encryption/l10n/eo.js b/apps/files_encryption/l10n/eo.js index 8b014abba04..b99a3f80920 100644 --- a/apps/files_encryption/l10n/eo.js +++ b/apps/files_encryption/l10n/eo.js @@ -6,7 +6,6 @@ OC.L10N.register( "Could not change the password. Maybe the old password was not correct." : "Ne eblis ŝanĝi la pasvorton. Eble la malnova pasvorto malĝustis.", "Private key password successfully updated." : "La pasvorto de la malpublika klavo sukcese ĝisdatiĝis.", "Missing requirements." : "Mankas neproj.", - "Encryption" : "Ĉifrado", "Enabled" : "Kapabligita", "Disabled" : "Malkapabligita", "Change Password" : "Ŝarĝi pasvorton", diff --git a/apps/files_encryption/l10n/eo.json b/apps/files_encryption/l10n/eo.json index 221c29addec..02ba7e2faa1 100644 --- a/apps/files_encryption/l10n/eo.json +++ b/apps/files_encryption/l10n/eo.json @@ -4,7 +4,6 @@ "Could not change the password. Maybe the old password was not correct." : "Ne eblis ŝanĝi la pasvorton. Eble la malnova pasvorto malĝustis.", "Private key password successfully updated." : "La pasvorto de la malpublika klavo sukcese ĝisdatiĝis.", "Missing requirements." : "Mankas neproj.", - "Encryption" : "Ĉifrado", "Enabled" : "Kapabligita", "Disabled" : "Malkapabligita", "Change Password" : "Ŝarĝi pasvorton", diff --git a/apps/files_encryption/l10n/es.js b/apps/files_encryption/l10n/es.js index 38433330ce0..0ca865538eb 100644 --- a/apps/files_encryption/l10n/es.js +++ b/apps/files_encryption/l10n/es.js @@ -29,7 +29,7 @@ OC.L10N.register( "Please make sure that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Asegúrese de que OpenSSL y la extensión de PHP estén habilitados y configurados correctamente. Por el momento, la aplicación de cifrado ha sido deshabilitada.", "Following users are not set up for encryption:" : "Los siguientes usuarios no han sido configurados para el cifrado:", "Go directly to your %spersonal settings%s." : "Ir directamente a %sOpciones%s.", - "Encryption" : "Cifrado", + "Server-side Encryption" : "Cifrado en el servidor", "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "La app de crifrado está habilitada pero sus claves no han sido inicializadas, por favor, cierre la sesión y vuelva a iniciarla de nuevo.", "Enable recovery key (allow to recover users files in case of password loss):" : "Habilitar la clave de recuperación (permite recuperar los ficheros del usuario en caso de pérdida de la contraseña);", "Recovery key password" : "Contraseña de clave de recuperación", diff --git a/apps/files_encryption/l10n/es.json b/apps/files_encryption/l10n/es.json index 001b981978f..29d109dcd89 100644 --- a/apps/files_encryption/l10n/es.json +++ b/apps/files_encryption/l10n/es.json @@ -27,7 +27,7 @@ "Please make sure that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Asegúrese de que OpenSSL y la extensión de PHP estén habilitados y configurados correctamente. Por el momento, la aplicación de cifrado ha sido deshabilitada.", "Following users are not set up for encryption:" : "Los siguientes usuarios no han sido configurados para el cifrado:", "Go directly to your %spersonal settings%s." : "Ir directamente a %sOpciones%s.", - "Encryption" : "Cifrado", + "Server-side Encryption" : "Cifrado en el servidor", "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "La app de crifrado está habilitada pero sus claves no han sido inicializadas, por favor, cierre la sesión y vuelva a iniciarla de nuevo.", "Enable recovery key (allow to recover users files in case of password loss):" : "Habilitar la clave de recuperación (permite recuperar los ficheros del usuario en caso de pérdida de la contraseña);", "Recovery key password" : "Contraseña de clave de recuperación", diff --git a/apps/files_encryption/l10n/es_AR.js b/apps/files_encryption/l10n/es_AR.js index e0da73dae9b..88a7456dbc6 100644 --- a/apps/files_encryption/l10n/es_AR.js +++ b/apps/files_encryption/l10n/es_AR.js @@ -13,11 +13,10 @@ OC.L10N.register( "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." : "¡La aplicación de encriptación no está inicializada! Es probable que la aplicación fue re-habilitada durante tu sesión. Intenta salir y iniciar sesión para volverla a iniciar.", "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." : "¡Tu llave privada no es válida! Aparenta que tu clave fue cambiada fuera de %s (de tus directorios). Puedes actualizar la contraseña de tu clave privadaen las configuraciones personales para recobrar el acceso a tus archivos encriptados.", "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "No se puede descibrar este archivo, probablemente sea un archivo compartido. Por favor pídele al dueño que recomparta el archivo contigo.", - "Missing requirements." : "Requisitos incompletos.", - "Following users are not set up for encryption:" : "Los siguientes usuarios no fueron configurados para encriptar:", "Initial encryption started... This can take some time. Please wait." : "Encriptación inicial comenzada... Esto puede durar un tiempo. Por favor espere.", "Initial encryption running... Please try again later." : "Encriptación inicial corriendo... Por favor intente mas tarde. ", - "Encryption" : "Encriptación", + "Missing requirements." : "Requisitos incompletos.", + "Following users are not set up for encryption:" : "Los siguientes usuarios no fueron configurados para encriptar:", "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "La aplicación de encriptación está habilitada pero las llaves no fueron inicializadas, por favor termine y vuelva a iniciar la sesión", "Enable recovery key (allow to recover users files in case of password loss):" : "Habilitar clave de recuperación (te permite recuperar los archivos de usuario en el caso que pierdas la contraseña):", "Recovery key password" : "Contraseña de recuperación de clave", diff --git a/apps/files_encryption/l10n/es_AR.json b/apps/files_encryption/l10n/es_AR.json index ac76c994787..03495731eca 100644 --- a/apps/files_encryption/l10n/es_AR.json +++ b/apps/files_encryption/l10n/es_AR.json @@ -11,11 +11,10 @@ "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." : "¡La aplicación de encriptación no está inicializada! Es probable que la aplicación fue re-habilitada durante tu sesión. Intenta salir y iniciar sesión para volverla a iniciar.", "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." : "¡Tu llave privada no es válida! Aparenta que tu clave fue cambiada fuera de %s (de tus directorios). Puedes actualizar la contraseña de tu clave privadaen las configuraciones personales para recobrar el acceso a tus archivos encriptados.", "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "No se puede descibrar este archivo, probablemente sea un archivo compartido. Por favor pídele al dueño que recomparta el archivo contigo.", - "Missing requirements." : "Requisitos incompletos.", - "Following users are not set up for encryption:" : "Los siguientes usuarios no fueron configurados para encriptar:", "Initial encryption started... This can take some time. Please wait." : "Encriptación inicial comenzada... Esto puede durar un tiempo. Por favor espere.", "Initial encryption running... Please try again later." : "Encriptación inicial corriendo... Por favor intente mas tarde. ", - "Encryption" : "Encriptación", + "Missing requirements." : "Requisitos incompletos.", + "Following users are not set up for encryption:" : "Los siguientes usuarios no fueron configurados para encriptar:", "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "La aplicación de encriptación está habilitada pero las llaves no fueron inicializadas, por favor termine y vuelva a iniciar la sesión", "Enable recovery key (allow to recover users files in case of password loss):" : "Habilitar clave de recuperación (te permite recuperar los archivos de usuario en el caso que pierdas la contraseña):", "Recovery key password" : "Contraseña de recuperación de clave", diff --git a/apps/files_encryption/l10n/es_MX.js b/apps/files_encryption/l10n/es_MX.js index e445cd03b05..29721e7904e 100644 --- a/apps/files_encryption/l10n/es_MX.js +++ b/apps/files_encryption/l10n/es_MX.js @@ -13,10 +13,9 @@ OC.L10N.register( "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." : "¡La aplicación de cifrado no ha sido inicializada! Quizá fue restablecida durante tu sesión. Por favor intenta cerrar la sesión y volver a iniciarla para inicializar la aplicación de cifrado.", "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." : "¡Su clave privada no es válida! Tal vez su contraseña ha sido cambiada desde fuera. de %s (Ej:Su directorio corporativo). Puede actualizar la contraseña de su clave privada en sus opciones personales para recuperar el acceso a sus archivos.", "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "No fue posible descifrar este archivo, probablemente se trate de un archivo compartido. Solicite al propietario del mismo que vuelva a compartirlo con usted.", + "Initial encryption started... This can take some time. Please wait." : "Encriptación iniciada... Esto puede tomar un tiempo. Por favor espere.", "Missing requirements." : "Requisitos incompletos.", "Following users are not set up for encryption:" : "Los siguientes usuarios no han sido configurados para el cifrado:", - "Initial encryption started... This can take some time. Please wait." : "Encriptación iniciada... Esto puede tomar un tiempo. Por favor espere.", - "Encryption" : "Cifrado", "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "La aplicación de crifrado está habilitada pero tus claves no han sido inicializadas, por favor, cierra la sesión y vuelva a iniciarla de nuevo.", "Enable recovery key (allow to recover users files in case of password loss):" : "Habilitar la clave de recuperación (permite recuperar los archivos del usuario en caso de pérdida de la contraseña);", "Recovery key password" : "Contraseña de clave de recuperación", diff --git a/apps/files_encryption/l10n/es_MX.json b/apps/files_encryption/l10n/es_MX.json index 3ca4e51a139..e8c5d52d457 100644 --- a/apps/files_encryption/l10n/es_MX.json +++ b/apps/files_encryption/l10n/es_MX.json @@ -11,10 +11,9 @@ "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." : "¡La aplicación de cifrado no ha sido inicializada! Quizá fue restablecida durante tu sesión. Por favor intenta cerrar la sesión y volver a iniciarla para inicializar la aplicación de cifrado.", "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." : "¡Su clave privada no es válida! Tal vez su contraseña ha sido cambiada desde fuera. de %s (Ej:Su directorio corporativo). Puede actualizar la contraseña de su clave privada en sus opciones personales para recuperar el acceso a sus archivos.", "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "No fue posible descifrar este archivo, probablemente se trate de un archivo compartido. Solicite al propietario del mismo que vuelva a compartirlo con usted.", + "Initial encryption started... This can take some time. Please wait." : "Encriptación iniciada... Esto puede tomar un tiempo. Por favor espere.", "Missing requirements." : "Requisitos incompletos.", "Following users are not set up for encryption:" : "Los siguientes usuarios no han sido configurados para el cifrado:", - "Initial encryption started... This can take some time. Please wait." : "Encriptación iniciada... Esto puede tomar un tiempo. Por favor espere.", - "Encryption" : "Cifrado", "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "La aplicación de crifrado está habilitada pero tus claves no han sido inicializadas, por favor, cierra la sesión y vuelva a iniciarla de nuevo.", "Enable recovery key (allow to recover users files in case of password loss):" : "Habilitar la clave de recuperación (permite recuperar los archivos del usuario en caso de pérdida de la contraseña);", "Recovery key password" : "Contraseña de clave de recuperación", diff --git a/apps/files_encryption/l10n/et_EE.js b/apps/files_encryption/l10n/et_EE.js index 57297e8b9a3..0e293cc0ee6 100644 --- a/apps/files_encryption/l10n/et_EE.js +++ b/apps/files_encryption/l10n/et_EE.js @@ -23,12 +23,11 @@ OC.L10N.register( "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." : "Sinu provaatne võti pole kehtiv! Tõenäoliselt mudueti parooli väljaspool kausta %s (nt. sinu ettevõtte kaust). Sa saad uuendada oma privaatse võtme parooli oma isiklikes seadetes, et taastada ligipääs sinu krüpteeritud failidele.", "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Sa ei saa seda faili dekrüpteerida, see on tõenäoliselt jagatud fail. Palun lase omanikul seda faili sinuga uuesti jagada.", "Unknown error. Please check your system settings or contact your administrator" : "Tundmatu viga. Palun võta ühendust oma administraatoriga.", - "Missing requirements." : "Nõutavad on puudu.", - "Following users are not set up for encryption:" : "Järgmised kasutajad pole seadistatud krüpteeringuks:", "Initial encryption started... This can take some time. Please wait." : "Algne krüpteerimine käivitati... See võib võtta natuke aega. Palun oota.", "Initial encryption running... Please try again later." : "Toimub esmane krüpteerimine... Palun proovi hiljem uuesti.", + "Missing requirements." : "Nõutavad on puudu.", + "Following users are not set up for encryption:" : "Järgmised kasutajad pole seadistatud krüpteeringuks:", "Go directly to your %spersonal settings%s." : "Liigi otse oma %s isiklike seadete %s juurde.", - "Encryption" : "Krüpteerimine", "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Krüpteerimisrakend on lubatud, kuid võtmeid pole lähtestatud. Palun logi välja ning uuesti sisse.", "Enable recovery key (allow to recover users files in case of password loss):" : "Luba taastevõti (võimalda kasutaja failide taastamine parooli kaotuse puhul):", "Recovery key password" : "Taastevõtme parool", diff --git a/apps/files_encryption/l10n/et_EE.json b/apps/files_encryption/l10n/et_EE.json index 364eb02ef4f..c63c9e40e97 100644 --- a/apps/files_encryption/l10n/et_EE.json +++ b/apps/files_encryption/l10n/et_EE.json @@ -21,12 +21,11 @@ "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." : "Sinu provaatne võti pole kehtiv! Tõenäoliselt mudueti parooli väljaspool kausta %s (nt. sinu ettevõtte kaust). Sa saad uuendada oma privaatse võtme parooli oma isiklikes seadetes, et taastada ligipääs sinu krüpteeritud failidele.", "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Sa ei saa seda faili dekrüpteerida, see on tõenäoliselt jagatud fail. Palun lase omanikul seda faili sinuga uuesti jagada.", "Unknown error. Please check your system settings or contact your administrator" : "Tundmatu viga. Palun võta ühendust oma administraatoriga.", - "Missing requirements." : "Nõutavad on puudu.", - "Following users are not set up for encryption:" : "Järgmised kasutajad pole seadistatud krüpteeringuks:", "Initial encryption started... This can take some time. Please wait." : "Algne krüpteerimine käivitati... See võib võtta natuke aega. Palun oota.", "Initial encryption running... Please try again later." : "Toimub esmane krüpteerimine... Palun proovi hiljem uuesti.", + "Missing requirements." : "Nõutavad on puudu.", + "Following users are not set up for encryption:" : "Järgmised kasutajad pole seadistatud krüpteeringuks:", "Go directly to your %spersonal settings%s." : "Liigi otse oma %s isiklike seadete %s juurde.", - "Encryption" : "Krüpteerimine", "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Krüpteerimisrakend on lubatud, kuid võtmeid pole lähtestatud. Palun logi välja ning uuesti sisse.", "Enable recovery key (allow to recover users files in case of password loss):" : "Luba taastevõti (võimalda kasutaja failide taastamine parooli kaotuse puhul):", "Recovery key password" : "Taastevõtme parool", diff --git a/apps/files_encryption/l10n/eu.js b/apps/files_encryption/l10n/eu.js index 65242e2da90..d1d1b55f73b 100644 --- a/apps/files_encryption/l10n/eu.js +++ b/apps/files_encryption/l10n/eu.js @@ -13,6 +13,9 @@ OC.L10N.register( "Please repeat the new recovery password" : "Mesedez errepikatu berreskuratze pasahitz berria", "Password successfully changed." : "Pasahitza behar bezala aldatu da.", "Could not change the password. Maybe the old password was not correct." : "Ezin izan da pasahitza aldatu. Agian pasahitz zaharra okerrekoa da.", + "Could not update the private key password." : "Ezin izan da gako pribatu pasahitza eguneratu. ", + "The old password was not correct, please try again." : "Pasahitz zaharra ez da egokia. Mesedez, saiatu berriro.", + "The current log-in password was not correct, please try again." : "Oraingo pasahitza ez da egokia. Mesedez, saiatu berriro.", "Private key password successfully updated." : "Gako pasahitz pribatu behar bezala eguneratu da.", "File recovery settings updated" : "Fitxategi berreskuratze ezarpenak eguneratuak", "Could not update file recovery" : "Ezin da fitxategi berreskuratzea eguneratu", @@ -20,12 +23,13 @@ OC.L10N.register( "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." : "Zure gako pribatua ez da egokia! Seguruaski zure pasahitza %s-tik kanpo aldatu da (adb. zure direktorio korporatiboa). Zure gako pribatuaren pasahitza eguneratu dezakezu zure ezarpen pertsonaletan zure enkriptatutako fitxategiak berreskuratzeko.", "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Ezin izan da fitxategi hau deszifratu, ziurrenik elkarbanatutako fitxategi bat da. Mesdez, eskatu fitxategiaren jabeari fitxategia zurekin berriz elkarbana dezan.", "Unknown error. Please check your system settings or contact your administrator" : "Errore ezezaguna. Mesedez, egiaztatu zure sistemaren ezarpenak edo jarri zure administrariarekin kontaktuan.", - "Missing requirements." : "Eskakizun batzuk ez dira betetzen.", - "Following users are not set up for encryption:" : "Hurrengo erabiltzaileak ez daude enktriptatzeko konfiguratutak:", "Initial encryption started... This can take some time. Please wait." : "Hasierako enkriptazioa hasi da... Honek denbora har dezake. Mesedez itxaron.", "Initial encryption running... Please try again later." : "Hasierako enkriptaketa abian... mesedez, saiatu beranduago.", + "Missing requirements." : "Eskakizun batzuk ez dira betetzen.", + "Please make sure that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Mesedez ziurtatu OpenSSL eta PHP hedapena instaltuta eta ongi konfiguratuta daudela. Oraingoz enkriptazio aplikazioa desgaitua izan da.", + "Following users are not set up for encryption:" : "Hurrengo erabiltzaileak ez daude enktriptatzeko konfiguratutak:", "Go directly to your %spersonal settings%s." : "Joan zuzenean zure %sezarpen pertsonaletara%s.", - "Encryption" : "Enkriptazioa", + "Server-side Encryption" : "Zerbitzari aldeko enkriptazioa", "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Enkriptazio aplikazioa gaituta dago baina zure gakoak ez daude konfiguratuta, mesedez saioa bukatu eta berriro hasi", "Enable recovery key (allow to recover users files in case of password loss):" : "Gaitu berreskurapen gakoa (erabiltzaileen fitxategiak berreskuratzea ahalbidetzen du pasahitza galtzen badute ere):", "Recovery key password" : "Berreskuratze gako pasahitza", diff --git a/apps/files_encryption/l10n/eu.json b/apps/files_encryption/l10n/eu.json index 961ffe3270a..3bd66a039f3 100644 --- a/apps/files_encryption/l10n/eu.json +++ b/apps/files_encryption/l10n/eu.json @@ -11,6 +11,9 @@ "Please repeat the new recovery password" : "Mesedez errepikatu berreskuratze pasahitz berria", "Password successfully changed." : "Pasahitza behar bezala aldatu da.", "Could not change the password. Maybe the old password was not correct." : "Ezin izan da pasahitza aldatu. Agian pasahitz zaharra okerrekoa da.", + "Could not update the private key password." : "Ezin izan da gako pribatu pasahitza eguneratu. ", + "The old password was not correct, please try again." : "Pasahitz zaharra ez da egokia. Mesedez, saiatu berriro.", + "The current log-in password was not correct, please try again." : "Oraingo pasahitza ez da egokia. Mesedez, saiatu berriro.", "Private key password successfully updated." : "Gako pasahitz pribatu behar bezala eguneratu da.", "File recovery settings updated" : "Fitxategi berreskuratze ezarpenak eguneratuak", "Could not update file recovery" : "Ezin da fitxategi berreskuratzea eguneratu", @@ -18,12 +21,13 @@ "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." : "Zure gako pribatua ez da egokia! Seguruaski zure pasahitza %s-tik kanpo aldatu da (adb. zure direktorio korporatiboa). Zure gako pribatuaren pasahitza eguneratu dezakezu zure ezarpen pertsonaletan zure enkriptatutako fitxategiak berreskuratzeko.", "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Ezin izan da fitxategi hau deszifratu, ziurrenik elkarbanatutako fitxategi bat da. Mesdez, eskatu fitxategiaren jabeari fitxategia zurekin berriz elkarbana dezan.", "Unknown error. Please check your system settings or contact your administrator" : "Errore ezezaguna. Mesedez, egiaztatu zure sistemaren ezarpenak edo jarri zure administrariarekin kontaktuan.", - "Missing requirements." : "Eskakizun batzuk ez dira betetzen.", - "Following users are not set up for encryption:" : "Hurrengo erabiltzaileak ez daude enktriptatzeko konfiguratutak:", "Initial encryption started... This can take some time. Please wait." : "Hasierako enkriptazioa hasi da... Honek denbora har dezake. Mesedez itxaron.", "Initial encryption running... Please try again later." : "Hasierako enkriptaketa abian... mesedez, saiatu beranduago.", + "Missing requirements." : "Eskakizun batzuk ez dira betetzen.", + "Please make sure that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Mesedez ziurtatu OpenSSL eta PHP hedapena instaltuta eta ongi konfiguratuta daudela. Oraingoz enkriptazio aplikazioa desgaitua izan da.", + "Following users are not set up for encryption:" : "Hurrengo erabiltzaileak ez daude enktriptatzeko konfiguratutak:", "Go directly to your %spersonal settings%s." : "Joan zuzenean zure %sezarpen pertsonaletara%s.", - "Encryption" : "Enkriptazioa", + "Server-side Encryption" : "Zerbitzari aldeko enkriptazioa", "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Enkriptazio aplikazioa gaituta dago baina zure gakoak ez daude konfiguratuta, mesedez saioa bukatu eta berriro hasi", "Enable recovery key (allow to recover users files in case of password loss):" : "Gaitu berreskurapen gakoa (erabiltzaileen fitxategiak berreskuratzea ahalbidetzen du pasahitza galtzen badute ere):", "Recovery key password" : "Berreskuratze gako pasahitza", diff --git a/apps/files_encryption/l10n/fa.js b/apps/files_encryption/l10n/fa.js index 037dc26e681..e05d6e4d3a4 100644 --- a/apps/files_encryption/l10n/fa.js +++ b/apps/files_encryption/l10n/fa.js @@ -12,7 +12,6 @@ OC.L10N.register( "Could not update file recovery" : "به روز رسانی بازیابی فایل را نمی تواند انجام دهد.", "Missing requirements." : "نیازمندی های گمشده", "Following users are not set up for encryption:" : "کاربران زیر برای رمزنگاری تنظیم نشده اند", - "Encryption" : "رمزگذاری", "Enable recovery key (allow to recover users files in case of password loss):" : "فعال کردن کلید بازیابی(اجازه بازیابی فایل های کاربران در صورت از دست دادن رمزعبور):", "Recovery key password" : "رمزعبور کلید بازیابی", "Enabled" : "فعال شده", diff --git a/apps/files_encryption/l10n/fa.json b/apps/files_encryption/l10n/fa.json index 0c89886d412..f048a93c1ad 100644 --- a/apps/files_encryption/l10n/fa.json +++ b/apps/files_encryption/l10n/fa.json @@ -10,7 +10,6 @@ "Could not update file recovery" : "به روز رسانی بازیابی فایل را نمی تواند انجام دهد.", "Missing requirements." : "نیازمندی های گمشده", "Following users are not set up for encryption:" : "کاربران زیر برای رمزنگاری تنظیم نشده اند", - "Encryption" : "رمزگذاری", "Enable recovery key (allow to recover users files in case of password loss):" : "فعال کردن کلید بازیابی(اجازه بازیابی فایل های کاربران در صورت از دست دادن رمزعبور):", "Recovery key password" : "رمزعبور کلید بازیابی", "Enabled" : "فعال شده", diff --git a/apps/files_encryption/l10n/fi_FI.js b/apps/files_encryption/l10n/fi_FI.js index aff16f1fcdd..d72e2da452f 100644 --- a/apps/files_encryption/l10n/fi_FI.js +++ b/apps/files_encryption/l10n/fi_FI.js @@ -2,19 +2,32 @@ OC.L10N.register( "files_encryption", { "Unknown error" : "Tuntematon virhe", + "Missing recovery key password" : "Palautusavaimen salasana puuttuu", + "Please repeat the recovery key password" : "Toista palautusavaimen salasana", + "Repeated recovery key password does not match the provided recovery key password" : "Toistamiseen annettu palautusavaimen salasana ei täsmää annettua palautusavaimen salasanaa", "Recovery key successfully enabled" : "Palautusavain kytketty päälle onnistuneesti", + "Could not disable recovery key. Please check your recovery key password!" : "Palautusavaimen poistaminen käytöstä ei onnistunut. Tarkista palautusavaimesi salasana!", + "Recovery key successfully disabled" : "Palautusavain poistettu onnistuneesti käytöstä", + "Please provide the old recovery password" : "Anna vanha palautussalasana", + "Please provide a new recovery password" : "Anna uusi palautussalasana", + "Please repeat the new recovery password" : "Toista uusi palautussalasana", "Password successfully changed." : "Salasana vaihdettiin onnistuneesti.", "Could not change the password. Maybe the old password was not correct." : "Salasanan vaihto epäonnistui. Kenties vanha salasana oli väärin.", + "Could not update the private key password." : "Yksityisen avaimen salasanaa ei voitu päivittää.", "The old password was not correct, please try again." : "Vanha salasana oli väärin, yritä uudelleen.", + "The current log-in password was not correct, please try again." : "Nykyinen kirjautumissalasana ei ollut oikein, yritä uudelleen.", "Private key password successfully updated." : "Yksityisen avaimen salasana päivitetty onnistuneesti.", "File recovery settings updated" : "Tiedostopalautuksen asetukset päivitetty", + "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." : "Salaussovellusta ei ole käynnissä! Kenties salaussovellus otettiin uudelleen käyttöön nykyisen istuntosi aikana. Kirjaudu ulos ja takaisin sisään saadaksesi salaussovelluksen käyttöön.", + "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Tämän tiedoston salauksen purkaminen ei onnistu. Kyseessä on luultavasti jaettu tiedosto. Pyydä tiedoston omistajaa jakamaan tiedosto kanssasi uudelleen.", "Unknown error. Please check your system settings or contact your administrator" : "Tuntematon virhe. Tarkista järjestelmän asetukset tai ole yhteydessä ylläpitäjään.", - "Missing requirements." : "Puuttuvat vaatimukset.", - "Following users are not set up for encryption:" : "Seuraavat käyttäjät eivät ole määrittäneet salausta:", "Initial encryption started... This can take some time. Please wait." : "Ensimmäinen salauskerta käynnistetty... Tämä saattaa kestää hetken.", "Initial encryption running... Please try again later." : "Ensimmäinen salauskerta on meneillään... Yritä myöhemmin uudelleen.", + "Missing requirements." : "Puuttuvat vaatimukset.", + "Please make sure that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Varmista, että OpenSSL ja PHP-laajennus ovat käytössä ja niiden asetukset ovat oikein. Salaussovellus on poistettu toistaiseksi käytöstä.", + "Following users are not set up for encryption:" : "Seuraavat käyttäjät eivät ole määrittäneet salausta:", "Go directly to your %spersonal settings%s." : "Siirry suoraan %shenkilökohtaisiin asetuksiisi%s.", - "Encryption" : "Salaus", + "Server-side Encryption" : "Palvelinpuolen salaus", "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Salaussovellus on käytössä, mutta salausavaimia ei ole alustettu. Ole hyvä ja kirjaudu sisään uudelleen.", "Enable recovery key (allow to recover users files in case of password loss):" : "Käytä palautusavainta (salli käyttäjien tiedostojen palauttaminen, jos heidän salasana unohtuu):", "Recovery key password" : "Palautusavaimen salasana", @@ -26,10 +39,13 @@ OC.L10N.register( "New Recovery key password" : "Uusi palautusavaimen salasana", "Repeat New Recovery key password" : "Toista uusi palautusavaimen salasana", "Change Password" : "Vaihda salasana", + "Your private key password no longer matches your log-in password." : "Salaisen avaimesi salasana ei enää vastaa kirjautumissalasanaasi.", + "Set your old private key password to your current log-in password:" : "Aseta yksityisen avaimen vanha salasana vastaamaan nykyistä kirjautumissalasanaasi:", " If you don't remember your old password you can ask your administrator to recover your files." : "Jos et muista vanhaa salasanaasi, voit pyytää ylläpitäjää palauttamaan tiedostosi.", "Old log-in password" : "Vanha kirjautumissalasana", "Current log-in password" : "Nykyinen kirjautumissalasana", "Update Private Key Password" : "Päivitä yksityisen avaimen salasana", - "Enable password recovery:" : "Ota salasanan palautus käyttöön:" + "Enable password recovery:" : "Ota salasanan palautus käyttöön:", + "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Tämän valinnan käyttäminen mahdollistaa pääsyn salattuihin tiedostoihisi, jos salasana unohtuu" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files_encryption/l10n/fi_FI.json b/apps/files_encryption/l10n/fi_FI.json index 348f8aeb1fe..2b0d92dfd55 100644 --- a/apps/files_encryption/l10n/fi_FI.json +++ b/apps/files_encryption/l10n/fi_FI.json @@ -1,18 +1,31 @@ { "translations": { "Unknown error" : "Tuntematon virhe", + "Missing recovery key password" : "Palautusavaimen salasana puuttuu", + "Please repeat the recovery key password" : "Toista palautusavaimen salasana", + "Repeated recovery key password does not match the provided recovery key password" : "Toistamiseen annettu palautusavaimen salasana ei täsmää annettua palautusavaimen salasanaa", "Recovery key successfully enabled" : "Palautusavain kytketty päälle onnistuneesti", + "Could not disable recovery key. Please check your recovery key password!" : "Palautusavaimen poistaminen käytöstä ei onnistunut. Tarkista palautusavaimesi salasana!", + "Recovery key successfully disabled" : "Palautusavain poistettu onnistuneesti käytöstä", + "Please provide the old recovery password" : "Anna vanha palautussalasana", + "Please provide a new recovery password" : "Anna uusi palautussalasana", + "Please repeat the new recovery password" : "Toista uusi palautussalasana", "Password successfully changed." : "Salasana vaihdettiin onnistuneesti.", "Could not change the password. Maybe the old password was not correct." : "Salasanan vaihto epäonnistui. Kenties vanha salasana oli väärin.", + "Could not update the private key password." : "Yksityisen avaimen salasanaa ei voitu päivittää.", "The old password was not correct, please try again." : "Vanha salasana oli väärin, yritä uudelleen.", + "The current log-in password was not correct, please try again." : "Nykyinen kirjautumissalasana ei ollut oikein, yritä uudelleen.", "Private key password successfully updated." : "Yksityisen avaimen salasana päivitetty onnistuneesti.", "File recovery settings updated" : "Tiedostopalautuksen asetukset päivitetty", + "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." : "Salaussovellusta ei ole käynnissä! Kenties salaussovellus otettiin uudelleen käyttöön nykyisen istuntosi aikana. Kirjaudu ulos ja takaisin sisään saadaksesi salaussovelluksen käyttöön.", + "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Tämän tiedoston salauksen purkaminen ei onnistu. Kyseessä on luultavasti jaettu tiedosto. Pyydä tiedoston omistajaa jakamaan tiedosto kanssasi uudelleen.", "Unknown error. Please check your system settings or contact your administrator" : "Tuntematon virhe. Tarkista järjestelmän asetukset tai ole yhteydessä ylläpitäjään.", - "Missing requirements." : "Puuttuvat vaatimukset.", - "Following users are not set up for encryption:" : "Seuraavat käyttäjät eivät ole määrittäneet salausta:", "Initial encryption started... This can take some time. Please wait." : "Ensimmäinen salauskerta käynnistetty... Tämä saattaa kestää hetken.", "Initial encryption running... Please try again later." : "Ensimmäinen salauskerta on meneillään... Yritä myöhemmin uudelleen.", + "Missing requirements." : "Puuttuvat vaatimukset.", + "Please make sure that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Varmista, että OpenSSL ja PHP-laajennus ovat käytössä ja niiden asetukset ovat oikein. Salaussovellus on poistettu toistaiseksi käytöstä.", + "Following users are not set up for encryption:" : "Seuraavat käyttäjät eivät ole määrittäneet salausta:", "Go directly to your %spersonal settings%s." : "Siirry suoraan %shenkilökohtaisiin asetuksiisi%s.", - "Encryption" : "Salaus", + "Server-side Encryption" : "Palvelinpuolen salaus", "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Salaussovellus on käytössä, mutta salausavaimia ei ole alustettu. Ole hyvä ja kirjaudu sisään uudelleen.", "Enable recovery key (allow to recover users files in case of password loss):" : "Käytä palautusavainta (salli käyttäjien tiedostojen palauttaminen, jos heidän salasana unohtuu):", "Recovery key password" : "Palautusavaimen salasana", @@ -24,10 +37,13 @@ "New Recovery key password" : "Uusi palautusavaimen salasana", "Repeat New Recovery key password" : "Toista uusi palautusavaimen salasana", "Change Password" : "Vaihda salasana", + "Your private key password no longer matches your log-in password." : "Salaisen avaimesi salasana ei enää vastaa kirjautumissalasanaasi.", + "Set your old private key password to your current log-in password:" : "Aseta yksityisen avaimen vanha salasana vastaamaan nykyistä kirjautumissalasanaasi:", " If you don't remember your old password you can ask your administrator to recover your files." : "Jos et muista vanhaa salasanaasi, voit pyytää ylläpitäjää palauttamaan tiedostosi.", "Old log-in password" : "Vanha kirjautumissalasana", "Current log-in password" : "Nykyinen kirjautumissalasana", "Update Private Key Password" : "Päivitä yksityisen avaimen salasana", - "Enable password recovery:" : "Ota salasanan palautus käyttöön:" + "Enable password recovery:" : "Ota salasanan palautus käyttöön:", + "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Tämän valinnan käyttäminen mahdollistaa pääsyn salattuihin tiedostoihisi, jos salasana unohtuu" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files_encryption/l10n/fr.js b/apps/files_encryption/l10n/fr.js index d7d0014b351..64a600500eb 100644 --- a/apps/files_encryption/l10n/fr.js +++ b/apps/files_encryption/l10n/fr.js @@ -3,20 +3,20 @@ OC.L10N.register( { "Unknown error" : "Erreur Inconnue ", "Missing recovery key password" : "Mot de passe de la clef de récupération manquant", - "Please repeat the recovery key password" : "Répétez le mot de passe de la clé de récupération", - "Repeated recovery key password does not match the provided recovery key password" : "Le mot de passe de la clé de récupération et sa répétition ne sont pas identiques.", - "Recovery key successfully enabled" : "Clé de récupération activée avec succès", - "Could not disable recovery key. Please check your recovery key password!" : "Impossible de désactiver la clé de récupération. Veuillez vérifier le mot de passe de votre clé de récupération !", - "Recovery key successfully disabled" : "Clé de récupération désactivée avec succès", + "Please repeat the recovery key password" : "Répétez le mot de passe de la clef de récupération", + "Repeated recovery key password does not match the provided recovery key password" : "Le mot de passe de la clef de récupération et sa répétition ne sont pas identiques.", + "Recovery key successfully enabled" : "Clef de récupération activée avec succès", + "Could not disable recovery key. Please check your recovery key password!" : "Impossible de désactiver la clef de récupération. Veuillez vérifier le mot de passe de votre clef de récupération !", + "Recovery key successfully disabled" : "Clef de récupération désactivée avec succès", "Please provide the old recovery password" : "Veuillez entrer l'ancien mot de passe de récupération", "Please provide a new recovery password" : "Veuillez entrer un nouveau mot de passe de récupération", "Please repeat the new recovery password" : "Veuillez répéter le nouveau mot de passe de récupération", "Password successfully changed." : "Mot de passe changé avec succès.", "Could not change the password. Maybe the old password was not correct." : "Erreur lors du changement de mot de passe. L'ancien mot de passe est peut-être incorrect.", - "Could not update the private key password." : "Impossible de mettre à jour le mot de passe de la clé privée.", + "Could not update the private key password." : "Impossible de mettre à jour le mot de passe de la clef privée.", "The old password was not correct, please try again." : "L'ancien mot de passe est incorrect. Veuillez réessayer.", "The current log-in password was not correct, please try again." : "Le mot de passe actuel n'est pas correct, veuillez réessayer.", - "Private key password successfully updated." : "Mot de passe de la clé privée mis à jour avec succès.", + "Private key password successfully updated." : "Mot de passe de la clef privée mis à jour avec succès.", "File recovery settings updated" : "Paramètres de récupération de fichiers mis à jour", "Could not update file recovery" : "Impossible de mettre à jour les fichiers de récupération", "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'application de chiffrement n'est pas initialisée ! Peut-être que cette application a été réactivée pendant votre session. Veuillez essayer de vous déconnecter et ensuite de vous reconnecter pour initialiser l'application de chiffrement.", @@ -24,29 +24,29 @@ OC.L10N.register( "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Impossible de déchiffrer ce fichier, il s'agit probablement d'un fichier partagé. Veuillez demander au propriétaire de ce fichier de le repartager avec vous.", "Unknown error. Please check your system settings or contact your administrator" : "Erreur inconnue. Veuillez vérifier vos paramètres système ou contacter un administrateur.", "Initial encryption started... This can take some time. Please wait." : "Chiffrement initial démarré... Cela peut prendre un certain temps. Veuillez patienter.", - "Initial encryption running... Please try again later." : "Chiffrement initial en cours... Veuillez re-essayer ultérieurement.", - "Missing requirements." : "Système minimum requis non respecté.", + "Initial encryption running... Please try again later." : "Chiffrement initial en cours... Veuillez ré-essayer ultérieurement.", + "Missing requirements." : "Dépendances manquantes.", "Please make sure that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Merci de vous assurer que OpenSSL et son extension PHP sont activés et configurés correctement. Pour l'instant, l'application de chiffrement a été désactivée.", "Following users are not set up for encryption:" : "Les utilisateurs suivants ne sont pas configurés pour le chiffrement :", - "Go directly to your %spersonal settings%s." : "Allerz directement à vos %spersonal settings%s.", - "Encryption" : "Chiffrement", - "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "L'application de chiffrement est activée mais vos clés ne sont pas initialisées, veuillez vous déconnecter et ensuite vous reconnecter.", + "Go directly to your %spersonal settings%s." : "Aller à %svos paramètres personnels%s.", + "Server-side Encryption" : "Chiffrement côté serveur", + "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "L'application de chiffrement est activée mais vos clefs ne sont pas initialisées. Veuillez vous déconnecter et ensuite vous reconnecter.", "Enable recovery key (allow to recover users files in case of password loss):" : "Activer la clef de récupération (permet de récupérer les fichiers des utilisateurs en cas de perte de mot de passe).", "Recovery key password" : "Mot de passe de la clef de récupération", - "Repeat Recovery key password" : "Répétez le mot de passe de la clé de récupération", + "Repeat Recovery key password" : "Répétez le mot de passe de la clef de récupération", "Enabled" : "Activé", "Disabled" : "Désactivé", "Change recovery key password:" : "Modifier le mot de passe de la clef de récupération :", "Old Recovery key password" : "Ancien mot de passe de la clef de récupération", "New Recovery key password" : "Nouveau mot de passe de la clef de récupération", - "Repeat New Recovery key password" : "Répétez le nouveau mot de passe de la clé de récupération", + "Repeat New Recovery key password" : "Répétez le nouveau mot de passe de la clef de récupération", "Change Password" : "Changer de mot de passe", "Your private key password no longer matches your log-in password." : "Le mot de passe de votre clef privée ne correspond plus à votre mot de passe de connexion.", - "Set your old private key password to your current log-in password:" : "Configurez le mot de passe de votre ancienne clef privée avec votre mot de passe courant de connexion :", + "Set your old private key password to your current log-in password:" : "Faites de votre mot de passe de connexion le mot de passe de votre clef privée :", " If you don't remember your old password you can ask your administrator to recover your files." : "Si vous ne vous souvenez plus de votre ancien mot de passe, vous pouvez demander à votre administrateur de récupérer vos fichiers.", "Old log-in password" : "Ancien mot de passe de connexion", "Current log-in password" : "Actuel mot de passe de connexion", - "Update Private Key Password" : "Mettre à jour le mot de passe de votre clé privée", + "Update Private Key Password" : "Mettre à jour le mot de passe de votre clef privée", "Enable password recovery:" : "Activer la récupération du mot de passe :", "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Activer cette option vous permettra d'obtenir à nouveau l'accès à vos fichiers chiffrés en cas de perte de mot de passe" }, diff --git a/apps/files_encryption/l10n/fr.json b/apps/files_encryption/l10n/fr.json index 683b919e830..1c64ab1f3c0 100644 --- a/apps/files_encryption/l10n/fr.json +++ b/apps/files_encryption/l10n/fr.json @@ -1,20 +1,20 @@ { "translations": { "Unknown error" : "Erreur Inconnue ", "Missing recovery key password" : "Mot de passe de la clef de récupération manquant", - "Please repeat the recovery key password" : "Répétez le mot de passe de la clé de récupération", - "Repeated recovery key password does not match the provided recovery key password" : "Le mot de passe de la clé de récupération et sa répétition ne sont pas identiques.", - "Recovery key successfully enabled" : "Clé de récupération activée avec succès", - "Could not disable recovery key. Please check your recovery key password!" : "Impossible de désactiver la clé de récupération. Veuillez vérifier le mot de passe de votre clé de récupération !", - "Recovery key successfully disabled" : "Clé de récupération désactivée avec succès", + "Please repeat the recovery key password" : "Répétez le mot de passe de la clef de récupération", + "Repeated recovery key password does not match the provided recovery key password" : "Le mot de passe de la clef de récupération et sa répétition ne sont pas identiques.", + "Recovery key successfully enabled" : "Clef de récupération activée avec succès", + "Could not disable recovery key. Please check your recovery key password!" : "Impossible de désactiver la clef de récupération. Veuillez vérifier le mot de passe de votre clef de récupération !", + "Recovery key successfully disabled" : "Clef de récupération désactivée avec succès", "Please provide the old recovery password" : "Veuillez entrer l'ancien mot de passe de récupération", "Please provide a new recovery password" : "Veuillez entrer un nouveau mot de passe de récupération", "Please repeat the new recovery password" : "Veuillez répéter le nouveau mot de passe de récupération", "Password successfully changed." : "Mot de passe changé avec succès.", "Could not change the password. Maybe the old password was not correct." : "Erreur lors du changement de mot de passe. L'ancien mot de passe est peut-être incorrect.", - "Could not update the private key password." : "Impossible de mettre à jour le mot de passe de la clé privée.", + "Could not update the private key password." : "Impossible de mettre à jour le mot de passe de la clef privée.", "The old password was not correct, please try again." : "L'ancien mot de passe est incorrect. Veuillez réessayer.", "The current log-in password was not correct, please try again." : "Le mot de passe actuel n'est pas correct, veuillez réessayer.", - "Private key password successfully updated." : "Mot de passe de la clé privée mis à jour avec succès.", + "Private key password successfully updated." : "Mot de passe de la clef privée mis à jour avec succès.", "File recovery settings updated" : "Paramètres de récupération de fichiers mis à jour", "Could not update file recovery" : "Impossible de mettre à jour les fichiers de récupération", "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'application de chiffrement n'est pas initialisée ! Peut-être que cette application a été réactivée pendant votre session. Veuillez essayer de vous déconnecter et ensuite de vous reconnecter pour initialiser l'application de chiffrement.", @@ -22,29 +22,29 @@ "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Impossible de déchiffrer ce fichier, il s'agit probablement d'un fichier partagé. Veuillez demander au propriétaire de ce fichier de le repartager avec vous.", "Unknown error. Please check your system settings or contact your administrator" : "Erreur inconnue. Veuillez vérifier vos paramètres système ou contacter un administrateur.", "Initial encryption started... This can take some time. Please wait." : "Chiffrement initial démarré... Cela peut prendre un certain temps. Veuillez patienter.", - "Initial encryption running... Please try again later." : "Chiffrement initial en cours... Veuillez re-essayer ultérieurement.", - "Missing requirements." : "Système minimum requis non respecté.", + "Initial encryption running... Please try again later." : "Chiffrement initial en cours... Veuillez ré-essayer ultérieurement.", + "Missing requirements." : "Dépendances manquantes.", "Please make sure that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Merci de vous assurer que OpenSSL et son extension PHP sont activés et configurés correctement. Pour l'instant, l'application de chiffrement a été désactivée.", "Following users are not set up for encryption:" : "Les utilisateurs suivants ne sont pas configurés pour le chiffrement :", - "Go directly to your %spersonal settings%s." : "Allerz directement à vos %spersonal settings%s.", - "Encryption" : "Chiffrement", - "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "L'application de chiffrement est activée mais vos clés ne sont pas initialisées, veuillez vous déconnecter et ensuite vous reconnecter.", + "Go directly to your %spersonal settings%s." : "Aller à %svos paramètres personnels%s.", + "Server-side Encryption" : "Chiffrement côté serveur", + "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "L'application de chiffrement est activée mais vos clefs ne sont pas initialisées. Veuillez vous déconnecter et ensuite vous reconnecter.", "Enable recovery key (allow to recover users files in case of password loss):" : "Activer la clef de récupération (permet de récupérer les fichiers des utilisateurs en cas de perte de mot de passe).", "Recovery key password" : "Mot de passe de la clef de récupération", - "Repeat Recovery key password" : "Répétez le mot de passe de la clé de récupération", + "Repeat Recovery key password" : "Répétez le mot de passe de la clef de récupération", "Enabled" : "Activé", "Disabled" : "Désactivé", "Change recovery key password:" : "Modifier le mot de passe de la clef de récupération :", "Old Recovery key password" : "Ancien mot de passe de la clef de récupération", "New Recovery key password" : "Nouveau mot de passe de la clef de récupération", - "Repeat New Recovery key password" : "Répétez le nouveau mot de passe de la clé de récupération", + "Repeat New Recovery key password" : "Répétez le nouveau mot de passe de la clef de récupération", "Change Password" : "Changer de mot de passe", "Your private key password no longer matches your log-in password." : "Le mot de passe de votre clef privée ne correspond plus à votre mot de passe de connexion.", - "Set your old private key password to your current log-in password:" : "Configurez le mot de passe de votre ancienne clef privée avec votre mot de passe courant de connexion :", + "Set your old private key password to your current log-in password:" : "Faites de votre mot de passe de connexion le mot de passe de votre clef privée :", " If you don't remember your old password you can ask your administrator to recover your files." : "Si vous ne vous souvenez plus de votre ancien mot de passe, vous pouvez demander à votre administrateur de récupérer vos fichiers.", "Old log-in password" : "Ancien mot de passe de connexion", "Current log-in password" : "Actuel mot de passe de connexion", - "Update Private Key Password" : "Mettre à jour le mot de passe de votre clé privée", + "Update Private Key Password" : "Mettre à jour le mot de passe de votre clef privée", "Enable password recovery:" : "Activer la récupération du mot de passe :", "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Activer cette option vous permettra d'obtenir à nouveau l'accès à vos fichiers chiffrés en cas de perte de mot de passe" },"pluralForm" :"nplurals=2; plural=(n > 1);" diff --git a/apps/files_encryption/l10n/gl.js b/apps/files_encryption/l10n/gl.js index 9b14a4455b5..6e9983159fd 100644 --- a/apps/files_encryption/l10n/gl.js +++ b/apps/files_encryption/l10n/gl.js @@ -29,7 +29,7 @@ OC.L10N.register( "Please make sure that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Asegúrese de que está instalado o OpenSSL xunto coa extensión PHP e que estean activados e configurados correctamente. Polo de agora foi desactivado a aplicación de cifrado.", "Following users are not set up for encryption:" : "Os seguintes usuarios non teñen configuración para o cifrado:", "Go directly to your %spersonal settings%s." : "Vaia directamente aos seus %saxustes persoais%s.", - "Encryption" : "Cifrado", + "Server-side Encryption" : "Cifrado na parte do servidor", "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "A aplicación de cifrado está activada, mais as chaves non foron inicializadas, saia da sesión e volva a acceder de novo", "Enable recovery key (allow to recover users files in case of password loss):" : "Activar a chave de recuperación (permitirá recuperar os ficheiros dos usuarios no caso de perda do contrasinal):", "Recovery key password" : "Contrasinal da chave de recuperación", diff --git a/apps/files_encryption/l10n/gl.json b/apps/files_encryption/l10n/gl.json index 3704f7d2c79..6295f339253 100644 --- a/apps/files_encryption/l10n/gl.json +++ b/apps/files_encryption/l10n/gl.json @@ -27,7 +27,7 @@ "Please make sure that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Asegúrese de que está instalado o OpenSSL xunto coa extensión PHP e que estean activados e configurados correctamente. Polo de agora foi desactivado a aplicación de cifrado.", "Following users are not set up for encryption:" : "Os seguintes usuarios non teñen configuración para o cifrado:", "Go directly to your %spersonal settings%s." : "Vaia directamente aos seus %saxustes persoais%s.", - "Encryption" : "Cifrado", + "Server-side Encryption" : "Cifrado na parte do servidor", "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "A aplicación de cifrado está activada, mais as chaves non foron inicializadas, saia da sesión e volva a acceder de novo", "Enable recovery key (allow to recover users files in case of password loss):" : "Activar a chave de recuperación (permitirá recuperar os ficheiros dos usuarios no caso de perda do contrasinal):", "Recovery key password" : "Contrasinal da chave de recuperación", diff --git a/apps/files_encryption/l10n/he.js b/apps/files_encryption/l10n/he.js index 90070547378..d6a018e358d 100644 --- a/apps/files_encryption/l10n/he.js +++ b/apps/files_encryption/l10n/he.js @@ -1,7 +1,6 @@ OC.L10N.register( "files_encryption", { - "Unknown error" : "שגיאה בלתי ידועה", - "Encryption" : "הצפנה" + "Unknown error" : "שגיאה בלתי ידועה" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files_encryption/l10n/he.json b/apps/files_encryption/l10n/he.json index c3d357516d3..83324968384 100644 --- a/apps/files_encryption/l10n/he.json +++ b/apps/files_encryption/l10n/he.json @@ -1,5 +1,4 @@ { "translations": { - "Unknown error" : "שגיאה בלתי ידועה", - "Encryption" : "הצפנה" + "Unknown error" : "שגיאה בלתי ידועה" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files_encryption/l10n/hr.js b/apps/files_encryption/l10n/hr.js index 0474a024642..ec62347f610 100644 --- a/apps/files_encryption/l10n/hr.js +++ b/apps/files_encryption/l10n/hr.js @@ -14,12 +14,11 @@ OC.L10N.register( "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." : "Vaš privatni ključ nije ispravan! Vjerojatno je vaša lozinka promijenjena izvan %s(npr. vašega korporativnog direktorija). Lozinku svoga privatnog ključa možete ažuriratiu svojim osobnim postavkama da biste obnovili pristup svojim šifriranim datotekama.", "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Ovu datoteku nije moguće dešifrirati, vjerojatno je riječ o zajedničkoj datoteci. Molimopitajte vlasnika datoteke da je ponovo podijeli s vama.", "Unknown error. Please check your system settings or contact your administrator" : "Pogreška nepoznata. Molimo provjerite svoje sistemske postavke ili kontaktirajte svog administratora.", - "Missing requirements." : "Nedostaju preduvjeti.", - "Following users are not set up for encryption:" : "Sljedeći korisnici nisu određeni za šifriranje:", "Initial encryption started... This can take some time. Please wait." : "Počelo inicijalno šifriranje... To može potrajati neko vrijeme. Molimo, pričekajte.", "Initial encryption running... Please try again later." : "Inicijalno šifriranje u tijeku... Molimo, pokušajte ponovno kasnije.", + "Missing requirements." : "Nedostaju preduvjeti.", + "Following users are not set up for encryption:" : "Sljedeći korisnici nisu određeni za šifriranje:", "Go directly to your %spersonal settings%s." : "Idite izravno na svoje %sosobne postavke%s.", - "Encryption" : "Šifriranje", "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikacija šifriranja je aktivirana ali vaši ključevi nisu inicijalizirani, molimo odjavite se iponovno prijavite.", "Enable recovery key (allow to recover users files in case of password loss):" : "Aktivirajte ključ za oporavak (u slučaju gubitka lozinke dozvolite oporavak korisničkih datoteka):", "Recovery key password" : "Lozinka ključa za oporavak", diff --git a/apps/files_encryption/l10n/hr.json b/apps/files_encryption/l10n/hr.json index 7c2af923fbd..ea1cfe5ed03 100644 --- a/apps/files_encryption/l10n/hr.json +++ b/apps/files_encryption/l10n/hr.json @@ -12,12 +12,11 @@ "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." : "Vaš privatni ključ nije ispravan! Vjerojatno je vaša lozinka promijenjena izvan %s(npr. vašega korporativnog direktorija). Lozinku svoga privatnog ključa možete ažuriratiu svojim osobnim postavkama da biste obnovili pristup svojim šifriranim datotekama.", "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Ovu datoteku nije moguće dešifrirati, vjerojatno je riječ o zajedničkoj datoteci. Molimopitajte vlasnika datoteke da je ponovo podijeli s vama.", "Unknown error. Please check your system settings or contact your administrator" : "Pogreška nepoznata. Molimo provjerite svoje sistemske postavke ili kontaktirajte svog administratora.", - "Missing requirements." : "Nedostaju preduvjeti.", - "Following users are not set up for encryption:" : "Sljedeći korisnici nisu određeni za šifriranje:", "Initial encryption started... This can take some time. Please wait." : "Počelo inicijalno šifriranje... To može potrajati neko vrijeme. Molimo, pričekajte.", "Initial encryption running... Please try again later." : "Inicijalno šifriranje u tijeku... Molimo, pokušajte ponovno kasnije.", + "Missing requirements." : "Nedostaju preduvjeti.", + "Following users are not set up for encryption:" : "Sljedeći korisnici nisu određeni za šifriranje:", "Go directly to your %spersonal settings%s." : "Idite izravno na svoje %sosobne postavke%s.", - "Encryption" : "Šifriranje", "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikacija šifriranja je aktivirana ali vaši ključevi nisu inicijalizirani, molimo odjavite se iponovno prijavite.", "Enable recovery key (allow to recover users files in case of password loss):" : "Aktivirajte ključ za oporavak (u slučaju gubitka lozinke dozvolite oporavak korisničkih datoteka):", "Recovery key password" : "Lozinka ključa za oporavak", diff --git a/apps/files_encryption/l10n/hu_HU.js b/apps/files_encryption/l10n/hu_HU.js index 92538d1ce56..6d52e85d667 100644 --- a/apps/files_encryption/l10n/hu_HU.js +++ b/apps/files_encryption/l10n/hu_HU.js @@ -13,11 +13,10 @@ OC.L10N.register( "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." : "A titkosítási modul nincs elindítva! Talán a munkafolyamat közben került engedélyezésre. Kérjük jelentkezzen ki majd ismét jelentkezzen be, hogy a titkosítási modul megfelelően elinduljon!", "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." : "Az állományok titkosításához használt titkos kulcsa érvénytelen. Valószínűleg a %s rendszeren kívül változtatta meg a jelszavát (pl. a munkahelyi címtárban). A személyes beállításoknál frissítheti a titkos kulcsát, hogy ismét elérhesse a titkosított állományait.", "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Az állományt nem sikerült dekódolni, valószínűleg ez egy megosztott fájl. Kérje meg az állomány tulajdonosát, hogy újra ossza meg Önnel ezt az állományt!", - "Missing requirements." : "Hiányzó követelmények.", - "Following users are not set up for encryption:" : "A következő felhasználók nem állították be a titkosítást:", "Initial encryption started... This can take some time. Please wait." : "A titkosítási folyamat megkezdődött... Ez hosszabb ideig is eltarthat. Kérem várjon.", "Initial encryption running... Please try again later." : "Kezedeti titkosítás fut... Próbálja később.", - "Encryption" : "Titkosítás", + "Missing requirements." : "Hiányzó követelmények.", + "Following users are not set up for encryption:" : "A következő felhasználók nem állították be a titkosítást:", "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Az állományok titkosítása engedélyezve van, de az Ön titkos kulcsai nincsenek beállítva. Ezért kérjük, hogy jelentkezzen ki, és lépjen be újra!", "Enable recovery key (allow to recover users files in case of password loss):" : "A helyreállítási kulcs beállítása (lehetővé teszi a felhasználók állományainak visszaállítását, ha elfelejtik a jelszavukat):", "Recovery key password" : "A helyreállítási kulcs jelszava", diff --git a/apps/files_encryption/l10n/hu_HU.json b/apps/files_encryption/l10n/hu_HU.json index 023cb51fc5a..0bb4c40f396 100644 --- a/apps/files_encryption/l10n/hu_HU.json +++ b/apps/files_encryption/l10n/hu_HU.json @@ -11,11 +11,10 @@ "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." : "A titkosítási modul nincs elindítva! Talán a munkafolyamat közben került engedélyezésre. Kérjük jelentkezzen ki majd ismét jelentkezzen be, hogy a titkosítási modul megfelelően elinduljon!", "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." : "Az állományok titkosításához használt titkos kulcsa érvénytelen. Valószínűleg a %s rendszeren kívül változtatta meg a jelszavát (pl. a munkahelyi címtárban). A személyes beállításoknál frissítheti a titkos kulcsát, hogy ismét elérhesse a titkosított állományait.", "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Az állományt nem sikerült dekódolni, valószínűleg ez egy megosztott fájl. Kérje meg az állomány tulajdonosát, hogy újra ossza meg Önnel ezt az állományt!", - "Missing requirements." : "Hiányzó követelmények.", - "Following users are not set up for encryption:" : "A következő felhasználók nem állították be a titkosítást:", "Initial encryption started... This can take some time. Please wait." : "A titkosítási folyamat megkezdődött... Ez hosszabb ideig is eltarthat. Kérem várjon.", "Initial encryption running... Please try again later." : "Kezedeti titkosítás fut... Próbálja később.", - "Encryption" : "Titkosítás", + "Missing requirements." : "Hiányzó követelmények.", + "Following users are not set up for encryption:" : "A következő felhasználók nem állították be a titkosítást:", "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Az állományok titkosítása engedélyezve van, de az Ön titkos kulcsai nincsenek beállítva. Ezért kérjük, hogy jelentkezzen ki, és lépjen be újra!", "Enable recovery key (allow to recover users files in case of password loss):" : "A helyreállítási kulcs beállítása (lehetővé teszi a felhasználók állományainak visszaállítását, ha elfelejtik a jelszavukat):", "Recovery key password" : "A helyreállítási kulcs jelszava", diff --git a/apps/files_encryption/l10n/id.js b/apps/files_encryption/l10n/id.js index 6c621bddd04..c9137a51a11 100644 --- a/apps/files_encryption/l10n/id.js +++ b/apps/files_encryption/l10n/id.js @@ -13,6 +13,9 @@ OC.L10N.register( "Please repeat the new recovery password" : "Silakan ulangi sandi pemulihan baru", "Password successfully changed." : "Sandi berhasil diubah", "Could not change the password. Maybe the old password was not correct." : "Tidak dapat mengubah sandi. Kemungkinan sandi lama yang dimasukkan salah.", + "Could not update the private key password." : "Tidak dapat memperbarui sandi kunci private.", + "The old password was not correct, please try again." : "Sandi lama salah, mohon coba lagi.", + "The current log-in password was not correct, please try again." : "Sandi masuk saat ini salah, mohon coba lagi.", "Private key password successfully updated." : "Sandi kunci privat berhasil diperbarui.", "File recovery settings updated" : "Pengaturan pemulihan berkas diperbarui", "Could not update file recovery" : "Tidak dapat memperbarui pemulihan berkas", @@ -20,12 +23,13 @@ OC.L10N.register( "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." : "Kunci private Anda tidak sah! Nampaknya sandi Anda telah diubah diluar %s (misal direktori perusahaan Anda). Anda dapat memperbarui sandi kunci private untuk memulihakan akses ke berkas terenkripsi Anda.", "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Tidak dapat mendekripsi berkas ini, mungkin ini adalah berkas bersama. Silakan meminta pemilik berkas ini untuk membagikan kembali dengan Anda.", "Unknown error. Please check your system settings or contact your administrator" : "Kesalahan tidak diketahui. Silakan periksa pengaturan sistem Anda atau hubungi administrator", - "Missing requirements." : "Persyaratan tidak terpenuhi.", - "Following users are not set up for encryption:" : "Pengguna berikut belum diatur untuk enkripsi:", "Initial encryption started... This can take some time. Please wait." : "Enskripsi awal dijalankan... Ini dapat memakan waktu. Silakan tunggu.", "Initial encryption running... Please try again later." : "Enkripsi awal sedang berjalan... Sialakn coba lagi nanti.", + "Missing requirements." : "Persyaratan tidak terpenuhi.", + "Please make sure that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Mohon pastikan bahwa OpenSSL bersama ekstensi PHP diaktifkan dan terkonfigurasi dengan benar. Untuk sekarang, aplikasi enkripsi akan dinonaktifkan.", + "Following users are not set up for encryption:" : "Pengguna berikut belum diatur untuk enkripsi:", "Go directly to your %spersonal settings%s." : "Langsung ke %spengaturan pribadi%s Anda.", - "Encryption" : "Enkripsi", + "Server-side Encryption" : "Enkripsi Sisi-Server", "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikasi Enskripsi telah diaktifkan tetapi kunci tidak diinisialisasi, silakan log-out dan log-in lagi", "Enable recovery key (allow to recover users files in case of password loss):" : "Aktifkan kunci pemulihan (memungkinkan pengguna untuk memulihkan berkas dalam kasus kehilangan sandi):", "Recovery key password" : "Sandi kunci pemulihan", @@ -36,13 +40,13 @@ OC.L10N.register( "Old Recovery key password" : "Sandi kunci Pemulihan Lama", "New Recovery key password" : "Sandi kunci Pemulihan Baru", "Repeat New Recovery key password" : "Ulangi sandi kunci Pemulihan baru", - "Change Password" : "Ubah sandi", + "Change Password" : "Ubah Sandi", "Your private key password no longer matches your log-in password." : "Sandi kunci private Anda tidak lagi cocok dengan sandi masuk Anda.", "Set your old private key password to your current log-in password:" : "Setel sandi kunci private Anda untuk sandi masuk Anda saat ini:", " If you don't remember your old password you can ask your administrator to recover your files." : "Jika Anda tidak ingat sandi lama, Anda dapat meminta administrator Anda untuk memulihkan berkas.", "Old log-in password" : "Sandi masuk yang lama", "Current log-in password" : "Sandi masuk saat ini", - "Update Private Key Password" : "Perbarui Sandi Kunci Privat", + "Update Private Key Password" : "Perbarui Sandi Kunci Private", "Enable password recovery:" : "Aktifkan sandi pemulihan:", "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Mengaktifkan opsi ini memungkinkan Anda untuk mendapatkan kembali akses ke berkas terenkripsi Anda dalam kasus kehilangan sandi" }, diff --git a/apps/files_encryption/l10n/id.json b/apps/files_encryption/l10n/id.json index 090e56c76b2..5d77cef0b24 100644 --- a/apps/files_encryption/l10n/id.json +++ b/apps/files_encryption/l10n/id.json @@ -11,6 +11,9 @@ "Please repeat the new recovery password" : "Silakan ulangi sandi pemulihan baru", "Password successfully changed." : "Sandi berhasil diubah", "Could not change the password. Maybe the old password was not correct." : "Tidak dapat mengubah sandi. Kemungkinan sandi lama yang dimasukkan salah.", + "Could not update the private key password." : "Tidak dapat memperbarui sandi kunci private.", + "The old password was not correct, please try again." : "Sandi lama salah, mohon coba lagi.", + "The current log-in password was not correct, please try again." : "Sandi masuk saat ini salah, mohon coba lagi.", "Private key password successfully updated." : "Sandi kunci privat berhasil diperbarui.", "File recovery settings updated" : "Pengaturan pemulihan berkas diperbarui", "Could not update file recovery" : "Tidak dapat memperbarui pemulihan berkas", @@ -18,12 +21,13 @@ "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." : "Kunci private Anda tidak sah! Nampaknya sandi Anda telah diubah diluar %s (misal direktori perusahaan Anda). Anda dapat memperbarui sandi kunci private untuk memulihakan akses ke berkas terenkripsi Anda.", "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Tidak dapat mendekripsi berkas ini, mungkin ini adalah berkas bersama. Silakan meminta pemilik berkas ini untuk membagikan kembali dengan Anda.", "Unknown error. Please check your system settings or contact your administrator" : "Kesalahan tidak diketahui. Silakan periksa pengaturan sistem Anda atau hubungi administrator", - "Missing requirements." : "Persyaratan tidak terpenuhi.", - "Following users are not set up for encryption:" : "Pengguna berikut belum diatur untuk enkripsi:", "Initial encryption started... This can take some time. Please wait." : "Enskripsi awal dijalankan... Ini dapat memakan waktu. Silakan tunggu.", "Initial encryption running... Please try again later." : "Enkripsi awal sedang berjalan... Sialakn coba lagi nanti.", + "Missing requirements." : "Persyaratan tidak terpenuhi.", + "Please make sure that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Mohon pastikan bahwa OpenSSL bersama ekstensi PHP diaktifkan dan terkonfigurasi dengan benar. Untuk sekarang, aplikasi enkripsi akan dinonaktifkan.", + "Following users are not set up for encryption:" : "Pengguna berikut belum diatur untuk enkripsi:", "Go directly to your %spersonal settings%s." : "Langsung ke %spengaturan pribadi%s Anda.", - "Encryption" : "Enkripsi", + "Server-side Encryption" : "Enkripsi Sisi-Server", "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikasi Enskripsi telah diaktifkan tetapi kunci tidak diinisialisasi, silakan log-out dan log-in lagi", "Enable recovery key (allow to recover users files in case of password loss):" : "Aktifkan kunci pemulihan (memungkinkan pengguna untuk memulihkan berkas dalam kasus kehilangan sandi):", "Recovery key password" : "Sandi kunci pemulihan", @@ -34,13 +38,13 @@ "Old Recovery key password" : "Sandi kunci Pemulihan Lama", "New Recovery key password" : "Sandi kunci Pemulihan Baru", "Repeat New Recovery key password" : "Ulangi sandi kunci Pemulihan baru", - "Change Password" : "Ubah sandi", + "Change Password" : "Ubah Sandi", "Your private key password no longer matches your log-in password." : "Sandi kunci private Anda tidak lagi cocok dengan sandi masuk Anda.", "Set your old private key password to your current log-in password:" : "Setel sandi kunci private Anda untuk sandi masuk Anda saat ini:", " If you don't remember your old password you can ask your administrator to recover your files." : "Jika Anda tidak ingat sandi lama, Anda dapat meminta administrator Anda untuk memulihkan berkas.", "Old log-in password" : "Sandi masuk yang lama", "Current log-in password" : "Sandi masuk saat ini", - "Update Private Key Password" : "Perbarui Sandi Kunci Privat", + "Update Private Key Password" : "Perbarui Sandi Kunci Private", "Enable password recovery:" : "Aktifkan sandi pemulihan:", "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Mengaktifkan opsi ini memungkinkan Anda untuk mendapatkan kembali akses ke berkas terenkripsi Anda dalam kasus kehilangan sandi" },"pluralForm" :"nplurals=1; plural=0;" diff --git a/apps/files_encryption/l10n/it.js b/apps/files_encryption/l10n/it.js index 08167b8ea7c..32fe42ae275 100644 --- a/apps/files_encryption/l10n/it.js +++ b/apps/files_encryption/l10n/it.js @@ -23,13 +23,13 @@ OC.L10N.register( "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 tua chiave privata non è valida! Forse la password è stata cambiata al di fuori di %s (ad es. la directory aziendale). Puoi aggiornare la password della chiave privata nelle impostazioni personali per ottenere nuovamente l'accesso ai file cifrati.", "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Impossibile decifrare questo file, probabilmente è un file condiviso. Chiedi al proprietario del file di condividere nuovamente il file con te.", "Unknown error. Please check your system settings or contact your administrator" : "Errore sconosciuto. Controlla le impostazioni di sistema o contatta il tuo amministratore", + "Initial encryption started... This can take some time. Please wait." : "Cifratura iniziale avviata... Potrebbe richiedere del tempo. Attendi.", + "Initial encryption running... Please try again later." : "Cifratura iniziale in esecuzione... Riprova più tardi.", "Missing requirements." : "Requisiti mancanti.", "Please make sure that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Assicurati che OpenSSL e l'estensione PHP sia abilitatati e configurati correttamente. Per ora, l'applicazione di cifratura è disabilitata.", "Following users are not set up for encryption:" : "I seguenti utenti non sono configurati per la cifratura:", - "Initial encryption started... This can take some time. Please wait." : "Cifratura iniziale avviata... Potrebbe richiedere del tempo. Attendi.", - "Initial encryption running... Please try again later." : "Cifratura iniziale in esecuzione... Riprova più tardi.", "Go directly to your %spersonal settings%s." : "Vai direttamente alle tue %simpostazioni personali%s.", - "Encryption" : "Cifratura", + "Server-side Encryption" : "Cifratura lato server", "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "L'applicazione di cifratura è abilitata, ma le chiavi non sono state inizializzate, disconnettiti ed effettua nuovamente l'accesso", "Enable recovery key (allow to recover users files in case of password loss):" : "Abilita la chiave di recupero (permette di recuperare i file utenti in caso di perdita della password):", "Recovery key password" : "Password della chiave di recupero", diff --git a/apps/files_encryption/l10n/it.json b/apps/files_encryption/l10n/it.json index 15d2b1b0343..e5fa00dca35 100644 --- a/apps/files_encryption/l10n/it.json +++ b/apps/files_encryption/l10n/it.json @@ -21,13 +21,13 @@ "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 tua chiave privata non è valida! Forse la password è stata cambiata al di fuori di %s (ad es. la directory aziendale). Puoi aggiornare la password della chiave privata nelle impostazioni personali per ottenere nuovamente l'accesso ai file cifrati.", "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Impossibile decifrare questo file, probabilmente è un file condiviso. Chiedi al proprietario del file di condividere nuovamente il file con te.", "Unknown error. Please check your system settings or contact your administrator" : "Errore sconosciuto. Controlla le impostazioni di sistema o contatta il tuo amministratore", + "Initial encryption started... This can take some time. Please wait." : "Cifratura iniziale avviata... Potrebbe richiedere del tempo. Attendi.", + "Initial encryption running... Please try again later." : "Cifratura iniziale in esecuzione... Riprova più tardi.", "Missing requirements." : "Requisiti mancanti.", "Please make sure that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Assicurati che OpenSSL e l'estensione PHP sia abilitatati e configurati correttamente. Per ora, l'applicazione di cifratura è disabilitata.", "Following users are not set up for encryption:" : "I seguenti utenti non sono configurati per la cifratura:", - "Initial encryption started... This can take some time. Please wait." : "Cifratura iniziale avviata... Potrebbe richiedere del tempo. Attendi.", - "Initial encryption running... Please try again later." : "Cifratura iniziale in esecuzione... Riprova più tardi.", "Go directly to your %spersonal settings%s." : "Vai direttamente alle tue %simpostazioni personali%s.", - "Encryption" : "Cifratura", + "Server-side Encryption" : "Cifratura lato server", "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "L'applicazione di cifratura è abilitata, ma le chiavi non sono state inizializzate, disconnettiti ed effettua nuovamente l'accesso", "Enable recovery key (allow to recover users files in case of password loss):" : "Abilita la chiave di recupero (permette di recuperare i file utenti in caso di perdita della password):", "Recovery key password" : "Password della chiave di recupero", diff --git a/apps/files_encryption/l10n/ja.js b/apps/files_encryption/l10n/ja.js index 6d0930b5e25..8fb1364e042 100644 --- a/apps/files_encryption/l10n/ja.js +++ b/apps/files_encryption/l10n/ja.js @@ -29,7 +29,7 @@ OC.L10N.register( "Please make sure that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "必ず、OpenSSL及びOpenSSLのPHPの拡張を有効にした上で、適切に設定してください。現時点では暗号化アプリは無効になっています。", "Following users are not set up for encryption:" : "以下のユーザーは、暗号化設定がされていません：", "Go directly to your %spersonal settings%s." : "直接 %s個人設定%s に進む。", - "Encryption" : "暗号化", + "Server-side Encryption" : "サーバー側暗号", "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "暗号化アプリは有効ですが、あなたの暗号化キーは初期化されていません。ログアウトした後に、再度ログインしてください", "Enable recovery key (allow to recover users files in case of password loss):" : "リカバリキーを有効にする (パスワードを忘れた場合にユーザーのファイルを回復できます):", "Recovery key password" : "リカバリキーのパスワード", diff --git a/apps/files_encryption/l10n/ja.json b/apps/files_encryption/l10n/ja.json index abf2a3555ee..d88a65fe492 100644 --- a/apps/files_encryption/l10n/ja.json +++ b/apps/files_encryption/l10n/ja.json @@ -27,7 +27,7 @@ "Please make sure that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "必ず、OpenSSL及びOpenSSLのPHPの拡張を有効にした上で、適切に設定してください。現時点では暗号化アプリは無効になっています。", "Following users are not set up for encryption:" : "以下のユーザーは、暗号化設定がされていません：", "Go directly to your %spersonal settings%s." : "直接 %s個人設定%s に進む。", - "Encryption" : "暗号化", + "Server-side Encryption" : "サーバー側暗号", "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "暗号化アプリは有効ですが、あなたの暗号化キーは初期化されていません。ログアウトした後に、再度ログインしてください", "Enable recovery key (allow to recover users files in case of password loss):" : "リカバリキーを有効にする (パスワードを忘れた場合にユーザーのファイルを回復できます):", "Recovery key password" : "リカバリキーのパスワード", diff --git a/apps/files_encryption/l10n/ka_GE.js b/apps/files_encryption/l10n/ka_GE.js index cf8468d2191..7b95616ccdd 100644 --- a/apps/files_encryption/l10n/ka_GE.js +++ b/apps/files_encryption/l10n/ka_GE.js @@ -1,7 +1,6 @@ OC.L10N.register( "files_encryption", { - "Unknown error" : "უცნობი შეცდომა", - "Encryption" : "ენკრიპცია" + "Unknown error" : "უცნობი შეცდომა" }, "nplurals=1; plural=0;"); diff --git a/apps/files_encryption/l10n/ka_GE.json b/apps/files_encryption/l10n/ka_GE.json index 90cbc551f46..a22007f7789 100644 --- a/apps/files_encryption/l10n/ka_GE.json +++ b/apps/files_encryption/l10n/ka_GE.json @@ -1,5 +1,4 @@ { "translations": { - "Unknown error" : "უცნობი შეცდომა", - "Encryption" : "ენკრიპცია" + "Unknown error" : "უცნობი შეცდომა" },"pluralForm" :"nplurals=1; plural=0;" }
\ No newline at end of file diff --git a/apps/files_encryption/l10n/km.js b/apps/files_encryption/l10n/km.js index 0fb88f52ef7..336b96f96a8 100644 --- a/apps/files_encryption/l10n/km.js +++ b/apps/files_encryption/l10n/km.js @@ -4,7 +4,6 @@ OC.L10N.register( "Unknown error" : "មិនស្គាល់កំហុស", "Password successfully changed." : "បានប្ដូរពាក្យសម្ងាត់ដោយជោគជ័យ។", "Could not change the password. Maybe the old password was not correct." : "មិនអាចប្ដូរពាក្យសម្ងាត់បានទេ។ ប្រហែលពាក្យសម្ងាត់ចាស់មិនត្រឹមត្រូវ។", - "Encryption" : "កូដនីយកម្ម", "Enabled" : "បានបើក", "Disabled" : "បានបិទ", "Change Password" : "ប្ដូរពាក្យសម្ងាត់" diff --git a/apps/files_encryption/l10n/km.json b/apps/files_encryption/l10n/km.json index 7a68cc58584..26b888c0011 100644 --- a/apps/files_encryption/l10n/km.json +++ b/apps/files_encryption/l10n/km.json @@ -2,7 +2,6 @@ "Unknown error" : "មិនស្គាល់កំហុស", "Password successfully changed." : "បានប្ដូរពាក្យសម្ងាត់ដោយជោគជ័យ។", "Could not change the password. Maybe the old password was not correct." : "មិនអាចប្ដូរពាក្យសម្ងាត់បានទេ។ ប្រហែលពាក្យសម្ងាត់ចាស់មិនត្រឹមត្រូវ។", - "Encryption" : "កូដនីយកម្ម", "Enabled" : "បានបើក", "Disabled" : "បានបិទ", "Change Password" : "ប្ដូរពាក្យសម្ងាត់" diff --git a/apps/files_encryption/l10n/kn.js b/apps/files_encryption/l10n/kn.js index b3fcb4aba3d..e8583cc5a97 100644 --- a/apps/files_encryption/l10n/kn.js +++ b/apps/files_encryption/l10n/kn.js @@ -2,7 +2,6 @@ OC.L10N.register( "files_encryption", { "Unknown error" : "ಗೊತ್ತಿಲ್ಲದ ದೋಷ", - "Encryption" : "ರಹಸ್ಯ ಸಂಕೇತೀಕರಿಸು", "Enabled" : "ಸಕ್ರಿಯಗೊಳಿಸಿದೆ", "Disabled" : "ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ" }, diff --git a/apps/files_encryption/l10n/kn.json b/apps/files_encryption/l10n/kn.json index a6c76f69b22..ccb4203c400 100644 --- a/apps/files_encryption/l10n/kn.json +++ b/apps/files_encryption/l10n/kn.json @@ -1,6 +1,5 @@ { "translations": { "Unknown error" : "ಗೊತ್ತಿಲ್ಲದ ದೋಷ", - "Encryption" : "ರಹಸ್ಯ ಸಂಕೇತೀಕರಿಸು", "Enabled" : "ಸಕ್ರಿಯಗೊಳಿಸಿದೆ", "Disabled" : "ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ" },"pluralForm" :"nplurals=1; plural=0;" diff --git a/apps/files_encryption/l10n/ko.js b/apps/files_encryption/l10n/ko.js index 82c29ecb11a..3d09c0abff2 100644 --- a/apps/files_encryption/l10n/ko.js +++ b/apps/files_encryption/l10n/ko.js @@ -2,21 +2,34 @@ OC.L10N.register( "files_encryption", { "Unknown error" : "알 수 없는 오류", + "Missing recovery key password" : "잊어버린 복구 키 암호 복구", + "Please repeat the recovery key password" : "복구 키 암호를 다시 입력하십시오", + "Repeated recovery key password does not match the provided recovery key password" : "입력한 복구 키 암호가 서로 다릅니다", "Recovery key successfully enabled" : "복구 키가 성공적으로 활성화되었습니다", - "Could not disable recovery key. Please check your recovery key password!" : "복구 키를 비활성화 할 수 없습니다. 복구 키의 암호를 확인해주세요!", + "Could not disable recovery key. Please check your recovery key password!" : "복구 키를 비활성화 할 수 없습니다. 복구 키의 암호를 확인해 주십시오!", "Recovery key successfully disabled" : "복구 키가 성공적으로 비활성화 되었습니다", + "Please provide the old recovery password" : "이전 복구 암호를 입력하십시오", + "Please provide a new recovery password" : "새 복구 암호를 입력하십시오", + "Please repeat the new recovery password" : "새 복구 암호를 다시 입력하십시오", "Password successfully changed." : "암호가 성공적으로 변경되었습니다", "Could not change the password. Maybe the old password was not correct." : "암호를 변경할 수 없습니다. 예전 암호가 정확하지 않은 것 같습니다.", - "Private key password successfully updated." : "개인 키 암호가 성공적으로 업데이트 됨.", + "Could not update the private key password." : "개인 키 암호를 업데이트할 수 없습니다", + "The old password was not correct, please try again." : "이전 암호가 잘못되었습니다. 다시 시도하십시오.", + "The current log-in password was not correct, please try again." : "현재 로그인 암호가 잘못되었습니다. 다시 시도하십시오.", + "Private key password successfully updated." : "개인 키 암호가 성공적으로 업데이트 되었습니다.", "File recovery settings updated" : "파일 복구 설정 업데이트됨", "Could not update file recovery" : "파일 복구를 업데이트할 수 없습니다", "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." : "암호화 앱이 초기화되지 않았습니다! 암호화 앱이 다시 활성화된 것 같습니다. 암호화 앱을 초기화하려면 로그아웃했다 다시 로그인하십시오.", - "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." : "개인 키가 올바르지 않습니다! 암호가 %s(예: 회사 디렉터리) 외부에서 변경된 것 같습니다. 암호화된 파일에 다시 접근하려면 개인 설정에서 개인 키 암호를 수정하십시오.", + "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." : "개인 키가 올바르지 않습니다! 암호가 %s 외부에서(예: 회사 디렉터리) 변경된 것 같습니다. 암호화된 파일에 다시 접근하려면 개인 설정에서 개인 키 암호를 수정하십시오.", "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "이 파일을 복호화할 수 없습니다. 공유된 파일일 수도 있습니다. 파일 소유자에게 공유를 다시 요청하십시오.", + "Unknown error. Please check your system settings or contact your administrator" : "알 수 없는 오류입니다. 시스템 설정을 확인하거나 관리자에게 문의하십시오", + "Initial encryption started... This can take some time. Please wait." : "초기 암호화가 시작되었습니다... 시간이 걸릴 수도 있으니 기다려 주십시오.", + "Initial encryption running... Please try again later." : "초기 암호화가 진행 중입니다... 나중에 다시 시도하십시오.", "Missing requirements." : "요구 사항이 부족합니다.", + "Please make sure that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "OpenSSL 및 PHP OpenSSL 확장이 활성화되어 있고 올바르게 설정되어 있는지 확인하십시오. 현재 암호화 앱이 비활성화되었습니다.", "Following users are not set up for encryption:" : "다음 사용자는 암호화를 사용할 수 없습니다:", - "Initial encryption started... This can take some time. Please wait." : "초기 암호화가 시작되었습니다... 시간이 걸릴 수도 있으니 기다려 주십시오.", - "Encryption" : "암호화", + "Go directly to your %spersonal settings%s." : "%s개인 설정%s으로 직접 이동하십시오.", + "Server-side Encryption" : "서버 측 암호화", "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "암호화 앱이 활성화되어 있지만 키가 초기화되지 않았습니다. 로그아웃한 후 다시 로그인하십시오", "Enable recovery key (allow to recover users files in case of password loss):" : "복구 키 사용 (암호를 잊었을 때 파일을 복구할 수 있도록 함):", "Recovery key password" : "복구 키 암호", @@ -28,6 +41,8 @@ OC.L10N.register( "New Recovery key password" : "새 복구 키 암호", "Repeat New Recovery key password" : "새 복구 키 암호 재입력", "Change Password" : "암호 변경", + "Your private key password no longer matches your log-in password." : "개인 키 암호와 로그인 암호가 일치하지 않습니다.", + "Set your old private key password to your current log-in password:" : "기존 개인 키 암호를 로그인 암호와 동일하게 설정하십시오:", " If you don't remember your old password you can ask your administrator to recover your files." : " 이전 암호가 기억나지 않으면 시스템 관리자에게 파일 복구를 요청하십시오.", "Old log-in password" : "이전 로그인 암호", "Current log-in password" : "현재 로그인 암호", diff --git a/apps/files_encryption/l10n/ko.json b/apps/files_encryption/l10n/ko.json index e1b53e0983e..6e6c6f162c0 100644 --- a/apps/files_encryption/l10n/ko.json +++ b/apps/files_encryption/l10n/ko.json @@ -1,20 +1,33 @@ { "translations": { "Unknown error" : "알 수 없는 오류", + "Missing recovery key password" : "잊어버린 복구 키 암호 복구", + "Please repeat the recovery key password" : "복구 키 암호를 다시 입력하십시오", + "Repeated recovery key password does not match the provided recovery key password" : "입력한 복구 키 암호가 서로 다릅니다", "Recovery key successfully enabled" : "복구 키가 성공적으로 활성화되었습니다", - "Could not disable recovery key. Please check your recovery key password!" : "복구 키를 비활성화 할 수 없습니다. 복구 키의 암호를 확인해주세요!", + "Could not disable recovery key. Please check your recovery key password!" : "복구 키를 비활성화 할 수 없습니다. 복구 키의 암호를 확인해 주십시오!", "Recovery key successfully disabled" : "복구 키가 성공적으로 비활성화 되었습니다", + "Please provide the old recovery password" : "이전 복구 암호를 입력하십시오", + "Please provide a new recovery password" : "새 복구 암호를 입력하십시오", + "Please repeat the new recovery password" : "새 복구 암호를 다시 입력하십시오", "Password successfully changed." : "암호가 성공적으로 변경되었습니다", "Could not change the password. Maybe the old password was not correct." : "암호를 변경할 수 없습니다. 예전 암호가 정확하지 않은 것 같습니다.", - "Private key password successfully updated." : "개인 키 암호가 성공적으로 업데이트 됨.", + "Could not update the private key password." : "개인 키 암호를 업데이트할 수 없습니다", + "The old password was not correct, please try again." : "이전 암호가 잘못되었습니다. 다시 시도하십시오.", + "The current log-in password was not correct, please try again." : "현재 로그인 암호가 잘못되었습니다. 다시 시도하십시오.", + "Private key password successfully updated." : "개인 키 암호가 성공적으로 업데이트 되었습니다.", "File recovery settings updated" : "파일 복구 설정 업데이트됨", "Could not update file recovery" : "파일 복구를 업데이트할 수 없습니다", "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." : "암호화 앱이 초기화되지 않았습니다! 암호화 앱이 다시 활성화된 것 같습니다. 암호화 앱을 초기화하려면 로그아웃했다 다시 로그인하십시오.", - "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." : "개인 키가 올바르지 않습니다! 암호가 %s(예: 회사 디렉터리) 외부에서 변경된 것 같습니다. 암호화된 파일에 다시 접근하려면 개인 설정에서 개인 키 암호를 수정하십시오.", + "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." : "개인 키가 올바르지 않습니다! 암호가 %s 외부에서(예: 회사 디렉터리) 변경된 것 같습니다. 암호화된 파일에 다시 접근하려면 개인 설정에서 개인 키 암호를 수정하십시오.", "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "이 파일을 복호화할 수 없습니다. 공유된 파일일 수도 있습니다. 파일 소유자에게 공유를 다시 요청하십시오.", + "Unknown error. Please check your system settings or contact your administrator" : "알 수 없는 오류입니다. 시스템 설정을 확인하거나 관리자에게 문의하십시오", + "Initial encryption started... This can take some time. Please wait." : "초기 암호화가 시작되었습니다... 시간이 걸릴 수도 있으니 기다려 주십시오.", + "Initial encryption running... Please try again later." : "초기 암호화가 진행 중입니다... 나중에 다시 시도하십시오.", "Missing requirements." : "요구 사항이 부족합니다.", + "Please make sure that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "OpenSSL 및 PHP OpenSSL 확장이 활성화되어 있고 올바르게 설정되어 있는지 확인하십시오. 현재 암호화 앱이 비활성화되었습니다.", "Following users are not set up for encryption:" : "다음 사용자는 암호화를 사용할 수 없습니다:", - "Initial encryption started... This can take some time. Please wait." : "초기 암호화가 시작되었습니다... 시간이 걸릴 수도 있으니 기다려 주십시오.", - "Encryption" : "암호화", + "Go directly to your %spersonal settings%s." : "%s개인 설정%s으로 직접 이동하십시오.", + "Server-side Encryption" : "서버 측 암호화", "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "암호화 앱이 활성화되어 있지만 키가 초기화되지 않았습니다. 로그아웃한 후 다시 로그인하십시오", "Enable recovery key (allow to recover users files in case of password loss):" : "복구 키 사용 (암호를 잊었을 때 파일을 복구할 수 있도록 함):", "Recovery key password" : "복구 키 암호", @@ -26,6 +39,8 @@ "New Recovery key password" : "새 복구 키 암호", "Repeat New Recovery key password" : "새 복구 키 암호 재입력", "Change Password" : "암호 변경", + "Your private key password no longer matches your log-in password." : "개인 키 암호와 로그인 암호가 일치하지 않습니다.", + "Set your old private key password to your current log-in password:" : "기존 개인 키 암호를 로그인 암호와 동일하게 설정하십시오:", " If you don't remember your old password you can ask your administrator to recover your files." : " 이전 암호가 기억나지 않으면 시스템 관리자에게 파일 복구를 요청하십시오.", "Old log-in password" : "이전 로그인 암호", "Current log-in password" : "현재 로그인 암호", diff --git a/apps/files_encryption/l10n/lt_LT.js b/apps/files_encryption/l10n/lt_LT.js index 98541b865fe..eb28b3933df 100644 --- a/apps/files_encryption/l10n/lt_LT.js +++ b/apps/files_encryption/l10n/lt_LT.js @@ -13,10 +13,9 @@ OC.L10N.register( "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." : "Šifravimo programa nepaleista! Galbūt šifravimo programa buvo įjungta dar kartą Jūsų sesijos metu. Prašome atsijungti ir vėl prisijungti, kad paleisti šifravimo programą.", "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." : "Jūsų privatus raktas yra netinkamas! Panašu, kad Jūsų slaptažodis buvo pakeistas už %s (pvz. Jūsų organizacijos kataloge). Galite atnaujinti savo privataus rakto slaptažodį savo asmeniniuose nustatymuose, kad atkurti prieigą prie savo šifruotų failų.", "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Failo iššifruoti nepavyko, gali būti jog jis yra pasidalintas su jumis. Paprašykite failo savininko, kad jums iš naujo pateiktų šį failą.", + "Initial encryption started... This can take some time. Please wait." : "Pradėtas pirminis šifravimas... Tai gali užtrukti. Prašome palaukti.", "Missing requirements." : "Trūkstami laukai.", "Following users are not set up for encryption:" : "Sekantys naudotojai nenustatyti šifravimui:", - "Initial encryption started... This can take some time. Please wait." : "Pradėtas pirminis šifravimas... Tai gali užtrukti. Prašome palaukti.", - "Encryption" : "Šifravimas", "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Šifravimo programa įjungta, bet Jūsų raktai nėra pritaikyti. Prašome atsijungti ir vėl prisijungti", "Enable recovery key (allow to recover users files in case of password loss):" : "Įjunkite atkūrimo raktą, (leisti atkurti naudotojų failus praradus slaptažodį):", "Recovery key password" : "Atkūrimo rakto slaptažodis", diff --git a/apps/files_encryption/l10n/lt_LT.json b/apps/files_encryption/l10n/lt_LT.json index e0e486d020b..f77575b5df4 100644 --- a/apps/files_encryption/l10n/lt_LT.json +++ b/apps/files_encryption/l10n/lt_LT.json @@ -11,10 +11,9 @@ "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." : "Šifravimo programa nepaleista! Galbūt šifravimo programa buvo įjungta dar kartą Jūsų sesijos metu. Prašome atsijungti ir vėl prisijungti, kad paleisti šifravimo programą.", "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." : "Jūsų privatus raktas yra netinkamas! Panašu, kad Jūsų slaptažodis buvo pakeistas už %s (pvz. Jūsų organizacijos kataloge). Galite atnaujinti savo privataus rakto slaptažodį savo asmeniniuose nustatymuose, kad atkurti prieigą prie savo šifruotų failų.", "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Failo iššifruoti nepavyko, gali būti jog jis yra pasidalintas su jumis. Paprašykite failo savininko, kad jums iš naujo pateiktų šį failą.", + "Initial encryption started... This can take some time. Please wait." : "Pradėtas pirminis šifravimas... Tai gali užtrukti. Prašome palaukti.", "Missing requirements." : "Trūkstami laukai.", "Following users are not set up for encryption:" : "Sekantys naudotojai nenustatyti šifravimui:", - "Initial encryption started... This can take some time. Please wait." : "Pradėtas pirminis šifravimas... Tai gali užtrukti. Prašome palaukti.", - "Encryption" : "Šifravimas", "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Šifravimo programa įjungta, bet Jūsų raktai nėra pritaikyti. Prašome atsijungti ir vėl prisijungti", "Enable recovery key (allow to recover users files in case of password loss):" : "Įjunkite atkūrimo raktą, (leisti atkurti naudotojų failus praradus slaptažodį):", "Recovery key password" : "Atkūrimo rakto slaptažodis", diff --git a/apps/files_encryption/l10n/lv.js b/apps/files_encryption/l10n/lv.js index 26a761dc5a8..4c9fd2adad8 100644 --- a/apps/files_encryption/l10n/lv.js +++ b/apps/files_encryption/l10n/lv.js @@ -2,7 +2,6 @@ OC.L10N.register( "files_encryption", { "Unknown error" : "Nezināma kļūda", - "Encryption" : "Šifrēšana", "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Šifrēšanas lietotnes ir pieslēgta, bet šifrēšanas atslēgas nav uzstādītas. Lūdzu izejiet no sistēmas un ieejiet sistēmā atpakaļ.", "Enabled" : "Pievienots" }, diff --git a/apps/files_encryption/l10n/lv.json b/apps/files_encryption/l10n/lv.json index ff29809e4d1..bacaccd6b92 100644 --- a/apps/files_encryption/l10n/lv.json +++ b/apps/files_encryption/l10n/lv.json @@ -1,6 +1,5 @@ { "translations": { "Unknown error" : "Nezināma kļūda", - "Encryption" : "Šifrēšana", "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Šifrēšanas lietotnes ir pieslēgta, bet šifrēšanas atslēgas nav uzstādītas. Lūdzu izejiet no sistēmas un ieejiet sistēmā atpakaļ.", "Enabled" : "Pievienots" },"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);" diff --git a/apps/files_encryption/l10n/mk.js b/apps/files_encryption/l10n/mk.js index a34a81e8693..7996856033b 100644 --- a/apps/files_encryption/l10n/mk.js +++ b/apps/files_encryption/l10n/mk.js @@ -5,7 +5,6 @@ OC.L10N.register( "Password successfully changed." : "Лозинката е успешно променета.", "Could not change the password. Maybe the old password was not correct." : "Лозинката не можеше да се промени. Можеби старата лозинка не беше исправна.", "Missing requirements." : "Барања кои недостасуваат.", - "Encryption" : "Енкрипција", "Repeat Recovery key password" : "Повтори ја лозинката за клучот на обновување", "Enabled" : "Овозможен", "Disabled" : "Оневозможен", diff --git a/apps/files_encryption/l10n/mk.json b/apps/files_encryption/l10n/mk.json index 770bb602dc3..e1929bcfa64 100644 --- a/apps/files_encryption/l10n/mk.json +++ b/apps/files_encryption/l10n/mk.json @@ -3,7 +3,6 @@ "Password successfully changed." : "Лозинката е успешно променета.", "Could not change the password. Maybe the old password was not correct." : "Лозинката не можеше да се промени. Можеби старата лозинка не беше исправна.", "Missing requirements." : "Барања кои недостасуваат.", - "Encryption" : "Енкрипција", "Repeat Recovery key password" : "Повтори ја лозинката за клучот на обновување", "Enabled" : "Овозможен", "Disabled" : "Оневозможен", diff --git a/apps/files_encryption/l10n/nb_NO.js b/apps/files_encryption/l10n/nb_NO.js index 3def2334352..ff52350f98a 100644 --- a/apps/files_encryption/l10n/nb_NO.js +++ b/apps/files_encryption/l10n/nb_NO.js @@ -29,7 +29,7 @@ OC.L10N.register( "Please make sure that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Vennligst se til at OpenSSL sammen med PHP-utvidelsen er aktivert og riktig konfigurert. Krypterings-appen er foreløpig deaktivert.", "Following users are not set up for encryption:" : "Følgende brukere er ikke satt opp for kryptering:", "Go directly to your %spersonal settings%s." : "Gå direkte til dine %spersonlige innstillinger%s.", - "Encryption" : "Kryptering", + "Server-side Encryption" : "Serverkryptering", "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "App for kryptering er aktivert men nøklene dine er ikke satt opp. Logg ut og logg inn igjen.", "Enable recovery key (allow to recover users files in case of password loss):" : "Aktiver gjenopprettingsnøkkel (tillat å gjenopprette brukerfiler i tilfelle tap av passord):", "Recovery key password" : "Passord for gjenopprettingsnøkkel", diff --git a/apps/files_encryption/l10n/nb_NO.json b/apps/files_encryption/l10n/nb_NO.json index bada449a86c..3aa4ec9e868 100644 --- a/apps/files_encryption/l10n/nb_NO.json +++ b/apps/files_encryption/l10n/nb_NO.json @@ -27,7 +27,7 @@ "Please make sure that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Vennligst se til at OpenSSL sammen med PHP-utvidelsen er aktivert og riktig konfigurert. Krypterings-appen er foreløpig deaktivert.", "Following users are not set up for encryption:" : "Følgende brukere er ikke satt opp for kryptering:", "Go directly to your %spersonal settings%s." : "Gå direkte til dine %spersonlige innstillinger%s.", - "Encryption" : "Kryptering", + "Server-side Encryption" : "Serverkryptering", "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "App for kryptering er aktivert men nøklene dine er ikke satt opp. Logg ut og logg inn igjen.", "Enable recovery key (allow to recover users files in case of password loss):" : "Aktiver gjenopprettingsnøkkel (tillat å gjenopprette brukerfiler i tilfelle tap av passord):", "Recovery key password" : "Passord for gjenopprettingsnøkkel", diff --git a/apps/files_encryption/l10n/nl.js b/apps/files_encryption/l10n/nl.js index 0400accd2bd..1100abd76fd 100644 --- a/apps/files_encryption/l10n/nl.js +++ b/apps/files_encryption/l10n/nl.js @@ -23,13 +23,13 @@ OC.L10N.register( "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." : "Uw privésleutel is niet geldig! Waarschijnlijk is uw wachtwoord gewijzigd buiten %s (bijv. uw corporate directory). U kunt uw privésleutel wachtwoord in uw persoonlijke instellingen bijwerken om toegang te krijgen tot uw versleutelde bestanden.", "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Kan dit bestand niet ontcijferen, waarschijnlijk is het een gedeeld bestand, Vraag de eigenaar om het bestand opnieuw met u te delen.", "Unknown error. Please check your system settings or contact your administrator" : "Onbekende fout. Controleer uw systeeminstellingen of neem contact op met de beheerder", + "Initial encryption started... This can take some time. Please wait." : "initiële versleuteling gestart... Dit kan even duren, geduld a.u.b.", + "Initial encryption running... Please try again later." : "Initiële versleuteling bezig... Probeer het later opnieuw.", "Missing requirements." : "Missende benodigdheden.", "Please make sure that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Weed er zeker van dat OpenSSL met de PHP extensie is ingeschakeld en goed geconfigureerd. Op dit moment is de encryptie app uitgeschakeld.", "Following users are not set up for encryption:" : "De volgende gebruikers hebben geen configuratie voor encryptie:", - "Initial encryption started... This can take some time. Please wait." : "initiële versleuteling gestart... Dit kan even duren, geduld a.u.b.", - "Initial encryption running... Please try again later." : "Initiële versleuteling bezig... Probeer het later opnieuw.", "Go directly to your %spersonal settings%s." : "Ga direct naar uw %spersoonlijke instellingen%s.", - "Encryption" : "Versleuteling", + "Server-side Encryption" : "Server-side versleuteling", "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Crypto app is geactiveerd, maar uw sleutels werden niet geïnitialiseerd. Log uit en log daarna opnieuw in.", "Enable recovery key (allow to recover users files in case of password loss):" : "Activeren herstelsleutel (maakt het mogelijk om gebruikersbestanden terug te halen in geval van verlies van het wachtwoord):", "Recovery key password" : "Wachtwoord herstelsleulel", diff --git a/apps/files_encryption/l10n/nl.json b/apps/files_encryption/l10n/nl.json index eb2ea89428b..dab88f4a2e2 100644 --- a/apps/files_encryption/l10n/nl.json +++ b/apps/files_encryption/l10n/nl.json @@ -21,13 +21,13 @@ "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." : "Uw privésleutel is niet geldig! Waarschijnlijk is uw wachtwoord gewijzigd buiten %s (bijv. uw corporate directory). U kunt uw privésleutel wachtwoord in uw persoonlijke instellingen bijwerken om toegang te krijgen tot uw versleutelde bestanden.", "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Kan dit bestand niet ontcijferen, waarschijnlijk is het een gedeeld bestand, Vraag de eigenaar om het bestand opnieuw met u te delen.", "Unknown error. Please check your system settings or contact your administrator" : "Onbekende fout. Controleer uw systeeminstellingen of neem contact op met de beheerder", + "Initial encryption started... This can take some time. Please wait." : "initiële versleuteling gestart... Dit kan even duren, geduld a.u.b.", + "Initial encryption running... Please try again later." : "Initiële versleuteling bezig... Probeer het later opnieuw.", "Missing requirements." : "Missende benodigdheden.", "Please make sure that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Weed er zeker van dat OpenSSL met de PHP extensie is ingeschakeld en goed geconfigureerd. Op dit moment is de encryptie app uitgeschakeld.", "Following users are not set up for encryption:" : "De volgende gebruikers hebben geen configuratie voor encryptie:", - "Initial encryption started... This can take some time. Please wait." : "initiële versleuteling gestart... Dit kan even duren, geduld a.u.b.", - "Initial encryption running... Please try again later." : "Initiële versleuteling bezig... Probeer het later opnieuw.", "Go directly to your %spersonal settings%s." : "Ga direct naar uw %spersoonlijke instellingen%s.", - "Encryption" : "Versleuteling", + "Server-side Encryption" : "Server-side versleuteling", "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Crypto app is geactiveerd, maar uw sleutels werden niet geïnitialiseerd. Log uit en log daarna opnieuw in.", "Enable recovery key (allow to recover users files in case of password loss):" : "Activeren herstelsleutel (maakt het mogelijk om gebruikersbestanden terug te halen in geval van verlies van het wachtwoord):", "Recovery key password" : "Wachtwoord herstelsleulel", diff --git a/apps/files_encryption/l10n/nn_NO.js b/apps/files_encryption/l10n/nn_NO.js index 5adb8d65475..9cfe232080c 100644 --- a/apps/files_encryption/l10n/nn_NO.js +++ b/apps/files_encryption/l10n/nn_NO.js @@ -1,7 +1,6 @@ OC.L10N.register( "files_encryption", { - "Unknown error" : "Ukjend feil", - "Encryption" : "Kryptering" + "Unknown error" : "Ukjend feil" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files_encryption/l10n/nn_NO.json b/apps/files_encryption/l10n/nn_NO.json index 8f78cc1320f..347c2088148 100644 --- a/apps/files_encryption/l10n/nn_NO.json +++ b/apps/files_encryption/l10n/nn_NO.json @@ -1,5 +1,4 @@ { "translations": { - "Unknown error" : "Ukjend feil", - "Encryption" : "Kryptering" + "Unknown error" : "Ukjend feil" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files_encryption/l10n/pl.js b/apps/files_encryption/l10n/pl.js index 26f3cff7397..c53d1e12cc6 100644 --- a/apps/files_encryption/l10n/pl.js +++ b/apps/files_encryption/l10n/pl.js @@ -23,12 +23,13 @@ OC.L10N.register( "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." : "Klucz prywatny nie jest poprawny! Prawdopodobnie Twoje hasło zostało zmienione poza %s (np. w katalogu firmy). Aby odzyskać dostęp do zaszyfrowanych plików można zaktualizować hasło klucza prywatnego w ustawieniach osobistych.", "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Nie można odszyfrować tego pliku, prawdopodobnie jest to plik udostępniony. Poproś właściciela pliku o ponowne udostępnianie pliku Tobie.", "Unknown error. Please check your system settings or contact your administrator" : "Nieznany błąd. Proszę sprawdzić ustawienia systemowe lub skontaktować się z administratorem", - "Missing requirements." : "Brak wymagań.", - "Following users are not set up for encryption:" : "Następujący użytkownicy nie mają skonfigurowanego szyfrowania:", "Initial encryption started... This can take some time. Please wait." : "Rozpoczęto szyfrowanie... To może chwilę potrwać. Proszę czekać.", "Initial encryption running... Please try again later." : "Trwa szyfrowanie początkowe...Spróbuj ponownie.", + "Missing requirements." : "Brak wymagań.", + "Please make sure that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Upewnij się, że OpenSSL jest włączony razem z rozszerzeniem PHP i poprawnie skonfigurowany, Obecnie aplikacja szyfrowania została wyłączona.", + "Following users are not set up for encryption:" : "Następujący użytkownicy nie mają skonfigurowanego szyfrowania:", "Go directly to your %spersonal settings%s." : "Przejdź bezpośrednio do %spersonal settings%s.", - "Encryption" : "Szyfrowanie", + "Server-side Encryption" : "Szyfrowanie po stronie serwera", "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikacja szyfrująca jest aktywna, ale twoje klucze nie zostały zainicjowane, prosze wyloguj się i zaloguj ponownie.", "Enable recovery key (allow to recover users files in case of password loss):" : "Włączhasło klucza odzyskiwania (pozwala odzyskać pliki użytkowników w przypadku utraty hasła):", "Recovery key password" : "Hasło klucza odzyskiwania", diff --git a/apps/files_encryption/l10n/pl.json b/apps/files_encryption/l10n/pl.json index ae2b3f06218..d9d22b2c327 100644 --- a/apps/files_encryption/l10n/pl.json +++ b/apps/files_encryption/l10n/pl.json @@ -21,12 +21,13 @@ "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." : "Klucz prywatny nie jest poprawny! Prawdopodobnie Twoje hasło zostało zmienione poza %s (np. w katalogu firmy). Aby odzyskać dostęp do zaszyfrowanych plików można zaktualizować hasło klucza prywatnego w ustawieniach osobistych.", "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Nie można odszyfrować tego pliku, prawdopodobnie jest to plik udostępniony. Poproś właściciela pliku o ponowne udostępnianie pliku Tobie.", "Unknown error. Please check your system settings or contact your administrator" : "Nieznany błąd. Proszę sprawdzić ustawienia systemowe lub skontaktować się z administratorem", - "Missing requirements." : "Brak wymagań.", - "Following users are not set up for encryption:" : "Następujący użytkownicy nie mają skonfigurowanego szyfrowania:", "Initial encryption started... This can take some time. Please wait." : "Rozpoczęto szyfrowanie... To może chwilę potrwać. Proszę czekać.", "Initial encryption running... Please try again later." : "Trwa szyfrowanie początkowe...Spróbuj ponownie.", + "Missing requirements." : "Brak wymagań.", + "Please make sure that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Upewnij się, że OpenSSL jest włączony razem z rozszerzeniem PHP i poprawnie skonfigurowany, Obecnie aplikacja szyfrowania została wyłączona.", + "Following users are not set up for encryption:" : "Następujący użytkownicy nie mają skonfigurowanego szyfrowania:", "Go directly to your %spersonal settings%s." : "Przejdź bezpośrednio do %spersonal settings%s.", - "Encryption" : "Szyfrowanie", + "Server-side Encryption" : "Szyfrowanie po stronie serwera", "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikacja szyfrująca jest aktywna, ale twoje klucze nie zostały zainicjowane, prosze wyloguj się i zaloguj ponownie.", "Enable recovery key (allow to recover users files in case of password loss):" : "Włączhasło klucza odzyskiwania (pozwala odzyskać pliki użytkowników w przypadku utraty hasła):", "Recovery key password" : "Hasło klucza odzyskiwania", diff --git a/apps/files_encryption/l10n/pt_BR.js b/apps/files_encryption/l10n/pt_BR.js index 2bcf3bc345b..4dd588929e3 100644 --- a/apps/files_encryption/l10n/pt_BR.js +++ b/apps/files_encryption/l10n/pt_BR.js @@ -23,13 +23,13 @@ OC.L10N.register( "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." : "Sua chave privada não é válida! Provavelmente sua senha foi alterada fora de %s (por exemplo, seu diretório corporativo). Você pode atualizar sua senha de chave privada em suas configurações pessoais para recuperar o acesso a seus arquivos criptografados.", "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Este arquivo não pode ser decriptado, provavelmente este é um arquivo compartilhado. Poe favoe peça ao dono do arquivo para compartilha-lo com você.", "Unknown error. Please check your system settings or contact your administrator" : "Erro desconhecido. Por favor, verifique as configurações do sistema ou entre em contato com o administrador", + "Initial encryption started... This can take some time. Please wait." : "Criptografia inicial inicializada... Isto pode tomar algum tempo. Por favor espere.", + "Initial encryption running... Please try again later." : "Criptografia inicial em execução ... Por favor, tente novamente mais tarde.", "Missing requirements." : "Requisitos não encontrados.", "Please make sure that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Por favor, certifique-se de que o OpenSSL em conjunto com a extensão PHP está habilitado e configurado corretamente. Por enquanto, o aplicativo de criptografia foi desativado.", "Following users are not set up for encryption:" : "Seguintes usuários não estão configurados para criptografia:", - "Initial encryption started... This can take some time. Please wait." : "Criptografia inicial inicializada... Isto pode tomar algum tempo. Por favor espere.", - "Initial encryption running... Please try again later." : "Criptografia inicial em execução ... Por favor, tente novamente mais tarde.", "Go directly to your %spersonal settings%s." : "Ir direto para suas %spersonal settings%s.", - "Encryption" : "Criptografia", + "Server-side Encryption" : "Criptografia do lado do servidor", "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "App de criptografia está ativado, mas as chaves não estão inicializadas, por favor log-out e faça login novamente", "Enable recovery key (allow to recover users files in case of password loss):" : "Habilitar chave de recuperação (permite recuperar arquivos de usuários em caso de perda de senha):", "Recovery key password" : "Senha da chave de recuperação", diff --git a/apps/files_encryption/l10n/pt_BR.json b/apps/files_encryption/l10n/pt_BR.json index d078c218ad3..59484331a50 100644 --- a/apps/files_encryption/l10n/pt_BR.json +++ b/apps/files_encryption/l10n/pt_BR.json @@ -21,13 +21,13 @@ "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." : "Sua chave privada não é válida! Provavelmente sua senha foi alterada fora de %s (por exemplo, seu diretório corporativo). Você pode atualizar sua senha de chave privada em suas configurações pessoais para recuperar o acesso a seus arquivos criptografados.", "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Este arquivo não pode ser decriptado, provavelmente este é um arquivo compartilhado. Poe favoe peça ao dono do arquivo para compartilha-lo com você.", "Unknown error. Please check your system settings or contact your administrator" : "Erro desconhecido. Por favor, verifique as configurações do sistema ou entre em contato com o administrador", + "Initial encryption started... This can take some time. Please wait." : "Criptografia inicial inicializada... Isto pode tomar algum tempo. Por favor espere.", + "Initial encryption running... Please try again later." : "Criptografia inicial em execução ... Por favor, tente novamente mais tarde.", "Missing requirements." : "Requisitos não encontrados.", "Please make sure that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Por favor, certifique-se de que o OpenSSL em conjunto com a extensão PHP está habilitado e configurado corretamente. Por enquanto, o aplicativo de criptografia foi desativado.", "Following users are not set up for encryption:" : "Seguintes usuários não estão configurados para criptografia:", - "Initial encryption started... This can take some time. Please wait." : "Criptografia inicial inicializada... Isto pode tomar algum tempo. Por favor espere.", - "Initial encryption running... Please try again later." : "Criptografia inicial em execução ... Por favor, tente novamente mais tarde.", "Go directly to your %spersonal settings%s." : "Ir direto para suas %spersonal settings%s.", - "Encryption" : "Criptografia", + "Server-side Encryption" : "Criptografia do lado do servidor", "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "App de criptografia está ativado, mas as chaves não estão inicializadas, por favor log-out e faça login novamente", "Enable recovery key (allow to recover users files in case of password loss):" : "Habilitar chave de recuperação (permite recuperar arquivos de usuários em caso de perda de senha):", "Recovery key password" : "Senha da chave de recuperação", diff --git a/apps/files_encryption/l10n/pt_PT.js b/apps/files_encryption/l10n/pt_PT.js index b08e0c4b05c..3d6e8a50749 100644 --- a/apps/files_encryption/l10n/pt_PT.js +++ b/apps/files_encryption/l10n/pt_PT.js @@ -23,12 +23,13 @@ OC.L10N.register( "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." : "A sua chave privada não é válida! Provavelmente a senha foi alterada fora do %s (ex. a sua diretoria corporativa). Pode atualizar a sua senha da chave privada nas definições pessoais para recuperar o acesso aos seus ficheiros encriptados. ", "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Não é possível desencriptar este ficheiro, provavelmente é um ficheiro partilhado. Por favor, peça ao proprietário do ficheiro para voltar a partilhar o ficheiro consigo.", "Unknown error. Please check your system settings or contact your administrator" : "Erro desconhecido. Por favor, verifique as configurações do sistema ou entre em contacto com o seu administrador ", - "Missing requirements." : "Requisitos em falta.", - "Following users are not set up for encryption:" : "Os utilizadores seguintes não estão configurados para encriptação:", "Initial encryption started... This can take some time. Please wait." : "A encriptação inicial foi iniciada ... Esta pode demorar algum tempo. Aguarde, por favor.", "Initial encryption running... Please try again later." : "A encriptação inicial está em execução ... Por favor, tente de novo mais tarde.", + "Missing requirements." : "Requisitos em falta.", + "Please make sure that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Por favor, certifique-se de que o OpenSSL, em conjunto com a extensão PHP, está ativado e configurado corretamente. Por agora, a aplicação de encriptação está desactivada.", + "Following users are not set up for encryption:" : "Os utilizadores seguintes não estão configurados para encriptação:", "Go directly to your %spersonal settings%s." : "Ir diretamente para as %sdefinições pessoais%s.", - "Encryption" : "Encriptação", + "Server-side Encryption" : "Encriptação do lado do Servidor", "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", "Enable recovery key (allow to recover users files in case of password loss):" : "Ativar a chave de recuperação (permite recuperar os ficheiros do utilizador, se perder a senha):", "Recovery key password" : "Senha da chave de recuperação", diff --git a/apps/files_encryption/l10n/pt_PT.json b/apps/files_encryption/l10n/pt_PT.json index b51554eaae3..d2a34ec9d01 100644 --- a/apps/files_encryption/l10n/pt_PT.json +++ b/apps/files_encryption/l10n/pt_PT.json @@ -21,12 +21,13 @@ "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." : "A sua chave privada não é válida! Provavelmente a senha foi alterada fora do %s (ex. a sua diretoria corporativa). Pode atualizar a sua senha da chave privada nas definições pessoais para recuperar o acesso aos seus ficheiros encriptados. ", "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Não é possível desencriptar este ficheiro, provavelmente é um ficheiro partilhado. Por favor, peça ao proprietário do ficheiro para voltar a partilhar o ficheiro consigo.", "Unknown error. Please check your system settings or contact your administrator" : "Erro desconhecido. Por favor, verifique as configurações do sistema ou entre em contacto com o seu administrador ", - "Missing requirements." : "Requisitos em falta.", - "Following users are not set up for encryption:" : "Os utilizadores seguintes não estão configurados para encriptação:", "Initial encryption started... This can take some time. Please wait." : "A encriptação inicial foi iniciada ... Esta pode demorar algum tempo. Aguarde, por favor.", "Initial encryption running... Please try again later." : "A encriptação inicial está em execução ... Por favor, tente de novo mais tarde.", + "Missing requirements." : "Requisitos em falta.", + "Please make sure that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Por favor, certifique-se de que o OpenSSL, em conjunto com a extensão PHP, está ativado e configurado corretamente. Por agora, a aplicação de encriptação está desactivada.", + "Following users are not set up for encryption:" : "Os utilizadores seguintes não estão configurados para encriptação:", "Go directly to your %spersonal settings%s." : "Ir diretamente para as %sdefinições pessoais%s.", - "Encryption" : "Encriptação", + "Server-side Encryption" : "Encriptação do lado do Servidor", "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", "Enable recovery key (allow to recover users files in case of password loss):" : "Ativar a chave de recuperação (permite recuperar os ficheiros do utilizador, se perder a senha):", "Recovery key password" : "Senha da chave de recuperação", diff --git a/apps/files_encryption/l10n/ro.js b/apps/files_encryption/l10n/ro.js index 91f657d18f0..242d7c26ecc 100644 --- a/apps/files_encryption/l10n/ro.js +++ b/apps/files_encryption/l10n/ro.js @@ -10,7 +10,6 @@ OC.L10N.register( "Private key password successfully updated." : "Cheia privata a fost actualizata cu succes", "File recovery settings updated" : "Setarile pentru recuperarea fisierelor au fost actualizate", "Could not update file recovery" : "Nu am putut actualiza recuperarea de fisiere", - "Encryption" : "Încriptare", "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplicatia de criptare este activata dar tastatura nu este initializata , va rugam deconectati-va si reconectati-va", "Enabled" : "Activat", "Disabled" : "Dezactivat", diff --git a/apps/files_encryption/l10n/ro.json b/apps/files_encryption/l10n/ro.json index 3c32f040aec..950bf395d73 100644 --- a/apps/files_encryption/l10n/ro.json +++ b/apps/files_encryption/l10n/ro.json @@ -8,7 +8,6 @@ "Private key password successfully updated." : "Cheia privata a fost actualizata cu succes", "File recovery settings updated" : "Setarile pentru recuperarea fisierelor au fost actualizate", "Could not update file recovery" : "Nu am putut actualiza recuperarea de fisiere", - "Encryption" : "Încriptare", "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplicatia de criptare este activata dar tastatura nu este initializata , va rugam deconectati-va si reconectati-va", "Enabled" : "Activat", "Disabled" : "Dezactivat", diff --git a/apps/files_encryption/l10n/ru.js b/apps/files_encryption/l10n/ru.js index 055fea5cddd..bda0d26d80b 100644 --- a/apps/files_encryption/l10n/ru.js +++ b/apps/files_encryption/l10n/ru.js @@ -19,7 +19,7 @@ OC.L10N.register( "Private key password successfully updated." : "Пароль закрытого ключа успешно обновлён.", "File recovery settings updated" : "Настройки восстановления файлов обновлены", "Could not update file recovery" : "Невозможно обновить настройки восстановления файлов", - "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." : "Приложение шифрования не инициализированно! Возможно приложение шифрования было реактивировано во время вашей сессии. Попробуйте выйти и войти снова чтобы проинициализировать приложение шифрования.", + "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." : "Приложение шифрования не инициализировано! Возможно приложение шифрования было выключено и включено снова во время вашей сессии. Попробуйте выйти и войти снова чтобы инициализировать приложение шифрования.", "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." : "Закрытый ключ недействителен! Вероятно, пароль был изменен вне %s (например, корпоративный каталог). Вы можете обновить закрытый ключ в личных настройках на странице восстановления доступа к зашифрованным файлам. ", "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Не удалось расшифровать файл, возможно это опубликованный файл. Попросите владельца файла повторно открыть к нему доступ.", "Unknown error. Please check your system settings or contact your administrator" : "Неизвестная ошибка. Проверьте системные настройки или свяжитесь с вашим администратором", @@ -28,15 +28,15 @@ OC.L10N.register( "Missing requirements." : "Отсутствуют зависимости.", "Please make sure that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Убедитесь, что OpenSSL и соответствующее расширение PHP включены и правильно настроены. На данный момент приложение шифрования выключено.", "Following users are not set up for encryption:" : "Для следующих пользователей шифрование не настроено:", - "Go directly to your %spersonal settings%s." : "Перейти к вашим %spersonal settings%s.", - "Encryption" : "Шифрование", - "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Приложение шифрования активно, но ваши ключи не инициализированы, выйдите из системы и войдите вновь", + "Go directly to your %spersonal settings%s." : "Перейти к вашим %sличным настройкам%s.", + "Server-side Encryption" : "Шифрование на стороне сервера", + "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Приложение шифрования активно, но ваши ключи не инициализированы, выйдите из системы и войдите заново", "Enable recovery key (allow to recover users files in case of password loss):" : "Включить ключ восстановления (позволяет пользователям восстановить файлы при потере пароля):", "Recovery key password" : "Пароль ключа восстановления", "Repeat Recovery key password" : "Повторите пароль ключа восстановления", "Enabled" : "Включено", "Disabled" : "Отключено", - "Change recovery key password:" : "Сменить пароль ключа восстановления:", + "Change recovery key password:" : "Смена пароля ключа восстановления:", "Old Recovery key password" : "Старый пароль ключа восстановления", "New Recovery key password" : "Новый пароль ключа восстановления", "Repeat New Recovery key password" : "Повторите новый пароль ключа восстановления", diff --git a/apps/files_encryption/l10n/ru.json b/apps/files_encryption/l10n/ru.json index fd9fc6d49fd..3fe5bea497a 100644 --- a/apps/files_encryption/l10n/ru.json +++ b/apps/files_encryption/l10n/ru.json @@ -17,7 +17,7 @@ "Private key password successfully updated." : "Пароль закрытого ключа успешно обновлён.", "File recovery settings updated" : "Настройки восстановления файлов обновлены", "Could not update file recovery" : "Невозможно обновить настройки восстановления файлов", - "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." : "Приложение шифрования не инициализированно! Возможно приложение шифрования было реактивировано во время вашей сессии. Попробуйте выйти и войти снова чтобы проинициализировать приложение шифрования.", + "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." : "Приложение шифрования не инициализировано! Возможно приложение шифрования было выключено и включено снова во время вашей сессии. Попробуйте выйти и войти снова чтобы инициализировать приложение шифрования.", "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." : "Закрытый ключ недействителен! Вероятно, пароль был изменен вне %s (например, корпоративный каталог). Вы можете обновить закрытый ключ в личных настройках на странице восстановления доступа к зашифрованным файлам. ", "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Не удалось расшифровать файл, возможно это опубликованный файл. Попросите владельца файла повторно открыть к нему доступ.", "Unknown error. Please check your system settings or contact your administrator" : "Неизвестная ошибка. Проверьте системные настройки или свяжитесь с вашим администратором", @@ -26,15 +26,15 @@ "Missing requirements." : "Отсутствуют зависимости.", "Please make sure that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Убедитесь, что OpenSSL и соответствующее расширение PHP включены и правильно настроены. На данный момент приложение шифрования выключено.", "Following users are not set up for encryption:" : "Для следующих пользователей шифрование не настроено:", - "Go directly to your %spersonal settings%s." : "Перейти к вашим %spersonal settings%s.", - "Encryption" : "Шифрование", - "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Приложение шифрования активно, но ваши ключи не инициализированы, выйдите из системы и войдите вновь", + "Go directly to your %spersonal settings%s." : "Перейти к вашим %sличным настройкам%s.", + "Server-side Encryption" : "Шифрование на стороне сервера", + "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Приложение шифрования активно, но ваши ключи не инициализированы, выйдите из системы и войдите заново", "Enable recovery key (allow to recover users files in case of password loss):" : "Включить ключ восстановления (позволяет пользователям восстановить файлы при потере пароля):", "Recovery key password" : "Пароль ключа восстановления", "Repeat Recovery key password" : "Повторите пароль ключа восстановления", "Enabled" : "Включено", "Disabled" : "Отключено", - "Change recovery key password:" : "Сменить пароль ключа восстановления:", + "Change recovery key password:" : "Смена пароля ключа восстановления:", "Old Recovery key password" : "Старый пароль ключа восстановления", "New Recovery key password" : "Новый пароль ключа восстановления", "Repeat New Recovery key password" : "Повторите новый пароль ключа восстановления", diff --git a/apps/files_encryption/l10n/sk_SK.js b/apps/files_encryption/l10n/sk_SK.js index ae089f31370..799a2c1d21f 100644 --- a/apps/files_encryption/l10n/sk_SK.js +++ b/apps/files_encryption/l10n/sk_SK.js @@ -2,11 +2,19 @@ OC.L10N.register( "files_encryption", { "Unknown error" : "Neznáma chyba", + "Missing recovery key password" : "Chýba kľúč pre obnovu hesla", + "Please repeat the recovery key password" : "Prosím zopakujte heslo kľúča pre obnovu", + "Repeated recovery key password does not match the provided recovery key password" : "Zopakované heslo kľúča pre obnovenie nesúhlasí zo zadaným heslom", "Recovery key successfully enabled" : "Záchranný kľúč bol úspešne povolený", "Could not disable recovery key. Please check your recovery key password!" : "Nepodarilo sa zakázať záchranný kľúč. Skontrolujte prosím Vaše heslo záchranného kľúča!", "Recovery key successfully disabled" : "Záchranný kľúč bol úspešne zakázaný", + "Please provide the old recovery password" : "Zadajte prosím staré heslo pre obnovenie", + "Please provide a new recovery password" : "Zadajte prosím nové heslo pre obnovenie", + "Please repeat the new recovery password" : "Zopakujte prosím nové heslo pre obnovenie", "Password successfully changed." : "Heslo úspešne zmenené.", "Could not change the password. Maybe the old password was not correct." : "Nemožno zmeniť heslo. Pravdepodobne nebolo staré heslo zadané správne.", + "Could not update the private key password." : "Nemožno aktualizovať heslo súkromného kľúča.", + "The old password was not correct, please try again." : "Staré heslo nebolo zadané správne, prosím skúste to ešte raz.", "The current log-in password was not correct, please try again." : "Toto heslo nebolo správne, prosím skúste to ešte raz.", "Private key password successfully updated." : "Heslo súkromného kľúča je úspešne aktualizované.", "File recovery settings updated" : "Nastavenie obnovy súborov aktualizované", @@ -18,9 +26,10 @@ OC.L10N.register( "Initial encryption started... This can take some time. Please wait." : "Počiatočné šifrovanie započalo ... To môže nejakú dobu trvať. Čakajte prosím.", "Initial encryption running... Please try again later." : "Počiatočné šifrovanie beží... Skúste to neskôr znovu.", "Missing requirements." : "Chýbajúce požiadavky.", + "Please make sure that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Uistite sa, že OpenSSL spoločne s rozšírením pre PHP je povolené a správne nakonfigurované. V tejto chvíli je šifrovanie dočasne vypnuté.", "Following users are not set up for encryption:" : "Nasledujúci používatelia nie sú nastavení pre šifrovanie:", "Go directly to your %spersonal settings%s." : "Prejsť priamo do svojho %sosobného nastavenia%s.", - "Encryption" : "Šifrovanie", + "Server-side Encryption" : "Šifrovanie na serveri", "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikácia na šifrovanie je zapnutá, ale vaše kľúče nie sú inicializované. Odhláste sa a znovu sa prihláste.", "Enable recovery key (allow to recover users files in case of password loss):" : "Povoliť obnovovací kľúč (umožňuje obnoviť používateľské súbory v prípade straty hesla):", "Recovery key password" : "Heslo obnovovacieho kľúča", diff --git a/apps/files_encryption/l10n/sk_SK.json b/apps/files_encryption/l10n/sk_SK.json index b54f4da7ee3..08e9d42638f 100644 --- a/apps/files_encryption/l10n/sk_SK.json +++ b/apps/files_encryption/l10n/sk_SK.json @@ -1,10 +1,18 @@ { "translations": { "Unknown error" : "Neznáma chyba", + "Missing recovery key password" : "Chýba kľúč pre obnovu hesla", + "Please repeat the recovery key password" : "Prosím zopakujte heslo kľúča pre obnovu", + "Repeated recovery key password does not match the provided recovery key password" : "Zopakované heslo kľúča pre obnovenie nesúhlasí zo zadaným heslom", "Recovery key successfully enabled" : "Záchranný kľúč bol úspešne povolený", "Could not disable recovery key. Please check your recovery key password!" : "Nepodarilo sa zakázať záchranný kľúč. Skontrolujte prosím Vaše heslo záchranného kľúča!", "Recovery key successfully disabled" : "Záchranný kľúč bol úspešne zakázaný", + "Please provide the old recovery password" : "Zadajte prosím staré heslo pre obnovenie", + "Please provide a new recovery password" : "Zadajte prosím nové heslo pre obnovenie", + "Please repeat the new recovery password" : "Zopakujte prosím nové heslo pre obnovenie", "Password successfully changed." : "Heslo úspešne zmenené.", "Could not change the password. Maybe the old password was not correct." : "Nemožno zmeniť heslo. Pravdepodobne nebolo staré heslo zadané správne.", + "Could not update the private key password." : "Nemožno aktualizovať heslo súkromného kľúča.", + "The old password was not correct, please try again." : "Staré heslo nebolo zadané správne, prosím skúste to ešte raz.", "The current log-in password was not correct, please try again." : "Toto heslo nebolo správne, prosím skúste to ešte raz.", "Private key password successfully updated." : "Heslo súkromného kľúča je úspešne aktualizované.", "File recovery settings updated" : "Nastavenie obnovy súborov aktualizované", @@ -16,9 +24,10 @@ "Initial encryption started... This can take some time. Please wait." : "Počiatočné šifrovanie započalo ... To môže nejakú dobu trvať. Čakajte prosím.", "Initial encryption running... Please try again later." : "Počiatočné šifrovanie beží... Skúste to neskôr znovu.", "Missing requirements." : "Chýbajúce požiadavky.", + "Please make sure that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Uistite sa, že OpenSSL spoločne s rozšírením pre PHP je povolené a správne nakonfigurované. V tejto chvíli je šifrovanie dočasne vypnuté.", "Following users are not set up for encryption:" : "Nasledujúci používatelia nie sú nastavení pre šifrovanie:", "Go directly to your %spersonal settings%s." : "Prejsť priamo do svojho %sosobného nastavenia%s.", - "Encryption" : "Šifrovanie", + "Server-side Encryption" : "Šifrovanie na serveri", "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikácia na šifrovanie je zapnutá, ale vaše kľúče nie sú inicializované. Odhláste sa a znovu sa prihláste.", "Enable recovery key (allow to recover users files in case of password loss):" : "Povoliť obnovovací kľúč (umožňuje obnoviť používateľské súbory v prípade straty hesla):", "Recovery key password" : "Heslo obnovovacieho kľúča", diff --git a/apps/files_encryption/l10n/sl.js b/apps/files_encryption/l10n/sl.js index 678709ab891..e944a68704d 100644 --- a/apps/files_encryption/l10n/sl.js +++ b/apps/files_encryption/l10n/sl.js @@ -23,13 +23,12 @@ OC.L10N.register( "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." : "Zasebni ključ ni veljaven. Najverjetneje je bilo geslo spremenjeno izven %s (najverjetneje je to poslovna mapa). Geslo lahko posodobite med osebnimi nastavitvami in s tem obnovite dostop do šifriranih datotek.", "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Te datoteke ni mogoče šifrirati, ker je to najverjetneje datoteka v souporabi. Prosite lastnika datoteke, da jo da ponovno v souporabo.", "Unknown error. Please check your system settings or contact your administrator" : "Neznana napaka. Preverite nastavitve sistema ali pa stopite v stik s skrbnikom sistema.", + "Initial encryption started... This can take some time. Please wait." : "Začetno šifriranje je začeto ... Opravilo je lahko dolgotrajno.", + "Initial encryption running... Please try again later." : "Začetno šifriranje je v teku ... Poskusite kasneje.", "Missing requirements." : "Manjkajoče zahteve", "Please make sure that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Preverite, ali je OpenSSL z ustrezno razširitvijo PHP omogočen in ustrezno nastavljen. Trenutno je šifriranje onemogočeno.", "Following users are not set up for encryption:" : "Navedeni uporabniki še nimajo nastavljenega šifriranja:", - "Initial encryption started... This can take some time. Please wait." : "Začetno šifriranje je začeto ... Opravilo je lahko dolgotrajno.", - "Initial encryption running... Please try again later." : "Začetno šifriranje je v teku ... Poskusite kasneje.", "Go directly to your %spersonal settings%s." : "Oglejte si %sosebne nastavitve%s.", - "Encryption" : "Šifriranje", "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Program za šifriranje je omogočen, vendar ni začet. Odjavite se in nato ponovno prijavite.", "Enable recovery key (allow to recover users files in case of password loss):" : "Omogoči ključ za obnovitev datotek (v primeru izgube gesla):", "Recovery key password" : "Ključ za obnovitev gesla", diff --git a/apps/files_encryption/l10n/sl.json b/apps/files_encryption/l10n/sl.json index 943fe8a96c1..504f25ad0b4 100644 --- a/apps/files_encryption/l10n/sl.json +++ b/apps/files_encryption/l10n/sl.json @@ -21,13 +21,12 @@ "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." : "Zasebni ključ ni veljaven. Najverjetneje je bilo geslo spremenjeno izven %s (najverjetneje je to poslovna mapa). Geslo lahko posodobite med osebnimi nastavitvami in s tem obnovite dostop do šifriranih datotek.", "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Te datoteke ni mogoče šifrirati, ker je to najverjetneje datoteka v souporabi. Prosite lastnika datoteke, da jo da ponovno v souporabo.", "Unknown error. Please check your system settings or contact your administrator" : "Neznana napaka. Preverite nastavitve sistema ali pa stopite v stik s skrbnikom sistema.", + "Initial encryption started... This can take some time. Please wait." : "Začetno šifriranje je začeto ... Opravilo je lahko dolgotrajno.", + "Initial encryption running... Please try again later." : "Začetno šifriranje je v teku ... Poskusite kasneje.", "Missing requirements." : "Manjkajoče zahteve", "Please make sure that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Preverite, ali je OpenSSL z ustrezno razširitvijo PHP omogočen in ustrezno nastavljen. Trenutno je šifriranje onemogočeno.", "Following users are not set up for encryption:" : "Navedeni uporabniki še nimajo nastavljenega šifriranja:", - "Initial encryption started... This can take some time. Please wait." : "Začetno šifriranje je začeto ... Opravilo je lahko dolgotrajno.", - "Initial encryption running... Please try again later." : "Začetno šifriranje je v teku ... Poskusite kasneje.", "Go directly to your %spersonal settings%s." : "Oglejte si %sosebne nastavitve%s.", - "Encryption" : "Šifriranje", "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Program za šifriranje je omogočen, vendar ni začet. Odjavite se in nato ponovno prijavite.", "Enable recovery key (allow to recover users files in case of password loss):" : "Omogoči ključ za obnovitev datotek (v primeru izgube gesla):", "Recovery key password" : "Ključ za obnovitev gesla", diff --git a/apps/files_encryption/l10n/sq.js b/apps/files_encryption/l10n/sq.js index ffab720cfda..61d02be4a15 100644 --- a/apps/files_encryption/l10n/sq.js +++ b/apps/files_encryption/l10n/sq.js @@ -2,7 +2,6 @@ OC.L10N.register( "files_encryption", { "Unknown error" : "Gabim panjohur", - "Encryption" : "Kodifikimi", "Enabled" : "Aktivizuar" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files_encryption/l10n/sq.json b/apps/files_encryption/l10n/sq.json index dee4c42e547..2fd483d1689 100644 --- a/apps/files_encryption/l10n/sq.json +++ b/apps/files_encryption/l10n/sq.json @@ -1,6 +1,5 @@ { "translations": { "Unknown error" : "Gabim panjohur", - "Encryption" : "Kodifikimi", "Enabled" : "Aktivizuar" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files_encryption/l10n/sr@latin.js b/apps/files_encryption/l10n/sr@latin.js new file mode 100644 index 00000000000..e89299ed05b --- /dev/null +++ b/apps/files_encryption/l10n/sr@latin.js @@ -0,0 +1,8 @@ +OC.L10N.register( + "files_encryption", + { + "Unknown error" : "Nepoznata greška", + "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikacija za šifrovanje je omogućena ali Vaši ključevi nisu inicijalizovani, molimo Vas da se izlogujete i ulogujete ponovo.", + "Disabled" : "Onemogućeno" +}, +"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"); diff --git a/apps/files_encryption/l10n/sr@latin.json b/apps/files_encryption/l10n/sr@latin.json new file mode 100644 index 00000000000..34f0264e031 --- /dev/null +++ b/apps/files_encryption/l10n/sr@latin.json @@ -0,0 +1,6 @@ +{ "translations": { + "Unknown error" : "Nepoznata greška", + "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikacija za šifrovanje je omogućena ali Vaši ključevi nisu inicijalizovani, molimo Vas da se izlogujete i ulogujete ponovo.", + "Disabled" : "Onemogućeno" +},"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);" +}
\ No newline at end of file diff --git a/apps/files_encryption/l10n/sv.js b/apps/files_encryption/l10n/sv.js index eeaebb59e53..023fa92d36c 100644 --- a/apps/files_encryption/l10n/sv.js +++ b/apps/files_encryption/l10n/sv.js @@ -29,7 +29,6 @@ OC.L10N.register( "Please make sure that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Se till att OpenSSL tillsammans med PHP-tillägget är aktiverat och korrekt konfigurerat. För nu har krypteringsappen inaktiverats.", "Following users are not set up for encryption:" : "Följande användare har inte aktiverat kryptering:", "Go directly to your %spersonal settings%s." : "Gå direkt till dina %segna inställningar%s.", - "Encryption" : "Kryptering", "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Krypteringsprogrammet är aktiverat men dina nycklar är inte initierade. Vänligen logga ut och in igen", "Enable recovery key (allow to recover users files in case of password loss):" : "Aktivera återställningsnyckel (för att kunna återfå användarens filer vid glömt eller förlorat lösenord):", "Recovery key password" : "Lösenord för återställningsnyckel", diff --git a/apps/files_encryption/l10n/sv.json b/apps/files_encryption/l10n/sv.json index 9b5ac1dc8ac..1d69d8255d8 100644 --- a/apps/files_encryption/l10n/sv.json +++ b/apps/files_encryption/l10n/sv.json @@ -27,7 +27,6 @@ "Please make sure that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Se till att OpenSSL tillsammans med PHP-tillägget är aktiverat och korrekt konfigurerat. För nu har krypteringsappen inaktiverats.", "Following users are not set up for encryption:" : "Följande användare har inte aktiverat kryptering:", "Go directly to your %spersonal settings%s." : "Gå direkt till dina %segna inställningar%s.", - "Encryption" : "Kryptering", "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Krypteringsprogrammet är aktiverat men dina nycklar är inte initierade. Vänligen logga ut och in igen", "Enable recovery key (allow to recover users files in case of password loss):" : "Aktivera återställningsnyckel (för att kunna återfå användarens filer vid glömt eller förlorat lösenord):", "Recovery key password" : "Lösenord för återställningsnyckel", diff --git a/apps/files_encryption/l10n/th_TH.js b/apps/files_encryption/l10n/th_TH.js index ad95d941a28..ce8a64ef9c2 100644 --- a/apps/files_encryption/l10n/th_TH.js +++ b/apps/files_encryption/l10n/th_TH.js @@ -1,7 +1,6 @@ OC.L10N.register( "files_encryption", { - "Unknown error" : "ข้อผิดพลาดที่ไม่ทราบสาเหตุ", - "Encryption" : "การเข้ารหัส" + "Unknown error" : "ข้อผิดพลาดที่ไม่ทราบสาเหตุ" }, "nplurals=1; plural=0;"); diff --git a/apps/files_encryption/l10n/th_TH.json b/apps/files_encryption/l10n/th_TH.json index d5a9a37569d..2f6f34edf72 100644 --- a/apps/files_encryption/l10n/th_TH.json +++ b/apps/files_encryption/l10n/th_TH.json @@ -1,5 +1,4 @@ { "translations": { - "Unknown error" : "ข้อผิดพลาดที่ไม่ทราบสาเหตุ", - "Encryption" : "การเข้ารหัส" + "Unknown error" : "ข้อผิดพลาดที่ไม่ทราบสาเหตุ" },"pluralForm" :"nplurals=1; plural=0;" }
\ No newline at end of file diff --git a/apps/files_encryption/l10n/tr.js b/apps/files_encryption/l10n/tr.js index 43a05a696a6..0ff5a227b54 100644 --- a/apps/files_encryption/l10n/tr.js +++ b/apps/files_encryption/l10n/tr.js @@ -23,13 +23,13 @@ OC.L10N.register( "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." : "Özel anahtarınız geçerli değil! Muhtemelen parolanız %s dışarısında değiştirildi (örn. şirket dizininde). Gizli anahtar parolanızı kişisel ayarlarınızda güncelleyerek şifreli dosyalarınıza erişimi kurtarabilirsiniz.", "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Bu dosya muhtemelen bir paylaşılan dosya olduğundan şifrelemesi kaldırılamıyor. Lütfen dosyayı sizinle bir daha paylaşması için dosya sahibi ile iletişime geçin.", "Unknown error. Please check your system settings or contact your administrator" : "Bilinmeyen hata. Lütfen sistem ayarlarınızı denetleyin veya yöneticiniz ile iletişime geçin", + "Initial encryption started... This can take some time. Please wait." : "İlk şifreleme başladı... Bu biraz zaman alabilir. Lütfen bekleyin.", + "Initial encryption running... Please try again later." : "İlk şifreleme çalışıyor... Lütfen daha sonra tekrar deneyin.", "Missing requirements." : "Gereklilikler eksik.", "Please make sure that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "OpenSSL'nin PHP uzantısıyla birlikte etkin ve düzgün yapılandırılmış olduğundan emin olun. Şimdilik şifreleme uygulaması devre dışı bırakıldı.", "Following users are not set up for encryption:" : "Aşağıdaki kullanıcılar şifreleme için ayarlanmamış:", - "Initial encryption started... This can take some time. Please wait." : "İlk şifreleme başladı... Bu biraz zaman alabilir. Lütfen bekleyin.", - "Initial encryption running... Please try again later." : "İlk şifreleme çalışıyor... Lütfen daha sonra tekrar deneyin.", "Go directly to your %spersonal settings%s." : "Doğrudan %skişisel ayarlarınıza%s gidin.", - "Encryption" : "Şifreleme", + "Server-side Encryption" : "Sunucu Taraflı Şifreleme", "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Şifreleme Uygulaması etkin ancak anahtarlarınız başlatılmamış. Lütfen oturumu kapatıp yeniden açın", "Enable recovery key (allow to recover users files in case of password loss):" : "Kurtarma anahtarını etkinleştir (parola kaybı durumunda kullanıcı dosyalarının kurtarılmasına izin verir):", "Recovery key password" : "Kurtarma anahtarı parolası", diff --git a/apps/files_encryption/l10n/tr.json b/apps/files_encryption/l10n/tr.json index e78f8fb5203..c35db71b49b 100644 --- a/apps/files_encryption/l10n/tr.json +++ b/apps/files_encryption/l10n/tr.json @@ -21,13 +21,13 @@ "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." : "Özel anahtarınız geçerli değil! Muhtemelen parolanız %s dışarısında değiştirildi (örn. şirket dizininde). Gizli anahtar parolanızı kişisel ayarlarınızda güncelleyerek şifreli dosyalarınıza erişimi kurtarabilirsiniz.", "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Bu dosya muhtemelen bir paylaşılan dosya olduğundan şifrelemesi kaldırılamıyor. Lütfen dosyayı sizinle bir daha paylaşması için dosya sahibi ile iletişime geçin.", "Unknown error. Please check your system settings or contact your administrator" : "Bilinmeyen hata. Lütfen sistem ayarlarınızı denetleyin veya yöneticiniz ile iletişime geçin", + "Initial encryption started... This can take some time. Please wait." : "İlk şifreleme başladı... Bu biraz zaman alabilir. Lütfen bekleyin.", + "Initial encryption running... Please try again later." : "İlk şifreleme çalışıyor... Lütfen daha sonra tekrar deneyin.", "Missing requirements." : "Gereklilikler eksik.", "Please make sure that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "OpenSSL'nin PHP uzantısıyla birlikte etkin ve düzgün yapılandırılmış olduğundan emin olun. Şimdilik şifreleme uygulaması devre dışı bırakıldı.", "Following users are not set up for encryption:" : "Aşağıdaki kullanıcılar şifreleme için ayarlanmamış:", - "Initial encryption started... This can take some time. Please wait." : "İlk şifreleme başladı... Bu biraz zaman alabilir. Lütfen bekleyin.", - "Initial encryption running... Please try again later." : "İlk şifreleme çalışıyor... Lütfen daha sonra tekrar deneyin.", "Go directly to your %spersonal settings%s." : "Doğrudan %skişisel ayarlarınıza%s gidin.", - "Encryption" : "Şifreleme", + "Server-side Encryption" : "Sunucu Taraflı Şifreleme", "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Şifreleme Uygulaması etkin ancak anahtarlarınız başlatılmamış. Lütfen oturumu kapatıp yeniden açın", "Enable recovery key (allow to recover users files in case of password loss):" : "Kurtarma anahtarını etkinleştir (parola kaybı durumunda kullanıcı dosyalarının kurtarılmasına izin verir):", "Recovery key password" : "Kurtarma anahtarı parolası", diff --git a/apps/files_encryption/l10n/ug.js b/apps/files_encryption/l10n/ug.js index 0e56a30f378..c712dd03209 100644 --- a/apps/files_encryption/l10n/ug.js +++ b/apps/files_encryption/l10n/ug.js @@ -1,7 +1,6 @@ OC.L10N.register( "files_encryption", { - "Unknown error" : "يوچۇن خاتالىق", - "Encryption" : "شىفىرلاش" + "Unknown error" : "يوچۇن خاتالىق" }, "nplurals=1; plural=0;"); diff --git a/apps/files_encryption/l10n/ug.json b/apps/files_encryption/l10n/ug.json index eef86f6564a..f42ffe18018 100644 --- a/apps/files_encryption/l10n/ug.json +++ b/apps/files_encryption/l10n/ug.json @@ -1,5 +1,4 @@ { "translations": { - "Unknown error" : "يوچۇن خاتالىق", - "Encryption" : "شىفىرلاش" + "Unknown error" : "يوچۇن خاتالىق" },"pluralForm" :"nplurals=1; plural=0;" }
\ No newline at end of file diff --git a/apps/files_encryption/l10n/uk.js b/apps/files_encryption/l10n/uk.js index 15783a5172e..e01a79f23c5 100644 --- a/apps/files_encryption/l10n/uk.js +++ b/apps/files_encryption/l10n/uk.js @@ -23,12 +23,12 @@ OC.L10N.register( "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." : "Ваш секретний ключ не дійсний! Ймовірно ваш пароль був змінений ззовні %s (наприклад, корпоративний каталог). Ви можете оновити секретний ключ в особистих налаштуваннях на сторінці відновлення доступу до зашифрованих файлів.", "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Не можу розшифрувати цей файл, можливо він опублікований. Будь ласка, попросіть власника опублікувати його заново.", "Unknown error. Please check your system settings or contact your administrator" : "Невідома помилка. Будь ласка, перевірте налаштування системи або зверніться до адміністратора.", - "Missing requirements." : "Відсутні вимоги.", - "Following users are not set up for encryption:" : "Для наступних користувачів шифрування не налаштоване:", "Initial encryption started... This can take some time. Please wait." : "Початкове шифрування почалося... Це може зайняти деякий час. Будь ласка, почекайте.", "Initial encryption running... Please try again later." : "Початкове шифрування працює... Це може зайняти деякий час. Будь ласка, почекайте.", + "Missing requirements." : "Відсутні вимоги.", + "Please make sure that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Будь ласка, переконайтеся, що OpenSSL разом з розширенням PHP включена і налаштована належним чином. В даний час, шифрування додатку було відключено.", + "Following users are not set up for encryption:" : "Для наступних користувачів шифрування не налаштоване:", "Go directly to your %spersonal settings%s." : "Перейти навпростець до ваших %spersonal settings%s.", - "Encryption" : "Шифрування", "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Доданок шифрування ввімкнено, але ваші ключі не ініціалізовано, вийдіть та зайдіть знову", "Enable recovery key (allow to recover users files in case of password loss):" : "Ввімкнути ключ відновлення (дозволяє користувачам відновлювати файли при втраті паролю):", "Recovery key password" : "Пароль ключа відновлення", diff --git a/apps/files_encryption/l10n/uk.json b/apps/files_encryption/l10n/uk.json index 69444961860..51dd3c26335 100644 --- a/apps/files_encryption/l10n/uk.json +++ b/apps/files_encryption/l10n/uk.json @@ -21,12 +21,12 @@ "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." : "Ваш секретний ключ не дійсний! Ймовірно ваш пароль був змінений ззовні %s (наприклад, корпоративний каталог). Ви можете оновити секретний ключ в особистих налаштуваннях на сторінці відновлення доступу до зашифрованих файлів.", "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Не можу розшифрувати цей файл, можливо він опублікований. Будь ласка, попросіть власника опублікувати його заново.", "Unknown error. Please check your system settings or contact your administrator" : "Невідома помилка. Будь ласка, перевірте налаштування системи або зверніться до адміністратора.", - "Missing requirements." : "Відсутні вимоги.", - "Following users are not set up for encryption:" : "Для наступних користувачів шифрування не налаштоване:", "Initial encryption started... This can take some time. Please wait." : "Початкове шифрування почалося... Це може зайняти деякий час. Будь ласка, почекайте.", "Initial encryption running... Please try again later." : "Початкове шифрування працює... Це може зайняти деякий час. Будь ласка, почекайте.", + "Missing requirements." : "Відсутні вимоги.", + "Please make sure that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Будь ласка, переконайтеся, що OpenSSL разом з розширенням PHP включена і налаштована належним чином. В даний час, шифрування додатку було відключено.", + "Following users are not set up for encryption:" : "Для наступних користувачів шифрування не налаштоване:", "Go directly to your %spersonal settings%s." : "Перейти навпростець до ваших %spersonal settings%s.", - "Encryption" : "Шифрування", "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Доданок шифрування ввімкнено, але ваші ключі не ініціалізовано, вийдіть та зайдіть знову", "Enable recovery key (allow to recover users files in case of password loss):" : "Ввімкнути ключ відновлення (дозволяє користувачам відновлювати файли при втраті паролю):", "Recovery key password" : "Пароль ключа відновлення", diff --git a/apps/files_encryption/l10n/vi.js b/apps/files_encryption/l10n/vi.js index b853fb76162..5b660cbf5b8 100644 --- a/apps/files_encryption/l10n/vi.js +++ b/apps/files_encryption/l10n/vi.js @@ -10,7 +10,6 @@ OC.L10N.register( "Private key password successfully updated." : "Cập nhật thành công mật khẩu khóa cá nhân", "File recovery settings updated" : "Đã cập nhật thiết lập khôi phục tập tin ", "Could not update file recovery" : "Không thể cập nhật khôi phục tập tin", - "Encryption" : "Mã hóa", "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Ứng dụng mã hóa đã được kích hoạt nhưng bạn chưa khởi tạo khóa. Vui lòng đăng xuất ra và đăng nhập lại", "Enabled" : "Bật", "Disabled" : "Tắt", diff --git a/apps/files_encryption/l10n/vi.json b/apps/files_encryption/l10n/vi.json index 4800a4bc21f..85c2f363664 100644 --- a/apps/files_encryption/l10n/vi.json +++ b/apps/files_encryption/l10n/vi.json @@ -8,7 +8,6 @@ "Private key password successfully updated." : "Cập nhật thành công mật khẩu khóa cá nhân", "File recovery settings updated" : "Đã cập nhật thiết lập khôi phục tập tin ", "Could not update file recovery" : "Không thể cập nhật khôi phục tập tin", - "Encryption" : "Mã hóa", "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Ứng dụng mã hóa đã được kích hoạt nhưng bạn chưa khởi tạo khóa. Vui lòng đăng xuất ra và đăng nhập lại", "Enabled" : "Bật", "Disabled" : "Tắt", diff --git a/apps/files_encryption/l10n/zh_CN.js b/apps/files_encryption/l10n/zh_CN.js index a7da9155ef6..f6038cc6fdf 100644 --- a/apps/files_encryption/l10n/zh_CN.js +++ b/apps/files_encryption/l10n/zh_CN.js @@ -2,11 +2,18 @@ OC.L10N.register( "files_encryption", { "Unknown error" : "未知错误", + "Missing recovery key password" : "丢失的回复密钥", + "Please repeat the recovery key password" : "请替换恢复密钥", "Recovery key successfully enabled" : "恢复密钥成功启用", "Could not disable recovery key. Please check your recovery key password!" : "不能禁用恢复密钥。请检查恢复密钥密码！", "Recovery key successfully disabled" : "恢复密钥成功禁用", + "Please provide the old recovery password" : "请提供原来的恢复密码", + "Please provide a new recovery password" : "请提供一个新的恢复密码", + "Please repeat the new recovery password" : "请替换新的恢复密码", "Password successfully changed." : "密码修改成功。", "Could not change the password. Maybe the old password was not correct." : "不能修改密码。旧密码可能不正确。", + "Could not update the private key password." : "不能更新私有密钥。", + "The old password was not correct, please try again." : "原始密码错误，请重试。", "Private key password successfully updated." : "私钥密码成功更新。", "File recovery settings updated" : "文件恢复设置已更新", "Could not update file recovery" : "不能更新文件恢复", @@ -14,12 +21,12 @@ OC.L10N.register( "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." : "您的私有密钥无效！也许是您在 %s 外更改了密码 (比如，在您的公司目录)。您可以在个人设置里更新您的私钥密码来恢复访问你的加密文件。", "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : " 无法解密这个文件（或许这是一个共享文件？），请询问文件所有者重新与您分享这个文件。", "Unknown error. Please check your system settings or contact your administrator" : "未知错误。请检查系统设置或联系您的管理员", - "Missing requirements." : "必填项未填写。", - "Following users are not set up for encryption:" : "以下用户还没有设置加密：", "Initial encryption started... This can take some time. Please wait." : "初始加密启动中....这可能会花一些时间，请稍后再试。", "Initial encryption running... Please try again later." : "初始加密运行中....请稍后再试。", + "Missing requirements." : "必填项未填写。", + "Following users are not set up for encryption:" : "以下用户还没有设置加密：", "Go directly to your %spersonal settings%s." : "直接访问您的%s个人设置%s。", - "Encryption" : "加密", + "Server-side Encryption" : "服务器端加密", "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "加密应用被启用了，但是你的加密密钥没有初始化，请重新登出登录系统一次。", "Enable recovery key (allow to recover users files in case of password loss):" : "启用恢复密钥（允许你在密码丢失后恢复文件）：", "Recovery key password" : "恢复密钥密码", diff --git a/apps/files_encryption/l10n/zh_CN.json b/apps/files_encryption/l10n/zh_CN.json index 34576ee72d0..0a98a5d858b 100644 --- a/apps/files_encryption/l10n/zh_CN.json +++ b/apps/files_encryption/l10n/zh_CN.json @@ -1,10 +1,17 @@ { "translations": { "Unknown error" : "未知错误", + "Missing recovery key password" : "丢失的回复密钥", + "Please repeat the recovery key password" : "请替换恢复密钥", "Recovery key successfully enabled" : "恢复密钥成功启用", "Could not disable recovery key. Please check your recovery key password!" : "不能禁用恢复密钥。请检查恢复密钥密码！", "Recovery key successfully disabled" : "恢复密钥成功禁用", + "Please provide the old recovery password" : "请提供原来的恢复密码", + "Please provide a new recovery password" : "请提供一个新的恢复密码", + "Please repeat the new recovery password" : "请替换新的恢复密码", "Password successfully changed." : "密码修改成功。", "Could not change the password. Maybe the old password was not correct." : "不能修改密码。旧密码可能不正确。", + "Could not update the private key password." : "不能更新私有密钥。", + "The old password was not correct, please try again." : "原始密码错误，请重试。", "Private key password successfully updated." : "私钥密码成功更新。", "File recovery settings updated" : "文件恢复设置已更新", "Could not update file recovery" : "不能更新文件恢复", @@ -12,12 +19,12 @@ "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." : "您的私有密钥无效！也许是您在 %s 外更改了密码 (比如，在您的公司目录)。您可以在个人设置里更新您的私钥密码来恢复访问你的加密文件。", "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : " 无法解密这个文件（或许这是一个共享文件？），请询问文件所有者重新与您分享这个文件。", "Unknown error. Please check your system settings or contact your administrator" : "未知错误。请检查系统设置或联系您的管理员", - "Missing requirements." : "必填项未填写。", - "Following users are not set up for encryption:" : "以下用户还没有设置加密：", "Initial encryption started... This can take some time. Please wait." : "初始加密启动中....这可能会花一些时间，请稍后再试。", "Initial encryption running... Please try again later." : "初始加密运行中....请稍后再试。", + "Missing requirements." : "必填项未填写。", + "Following users are not set up for encryption:" : "以下用户还没有设置加密：", "Go directly to your %spersonal settings%s." : "直接访问您的%s个人设置%s。", - "Encryption" : "加密", + "Server-side Encryption" : "服务器端加密", "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "加密应用被启用了，但是你的加密密钥没有初始化，请重新登出登录系统一次。", "Enable recovery key (allow to recover users files in case of password loss):" : "启用恢复密钥（允许你在密码丢失后恢复文件）：", "Recovery key password" : "恢复密钥密码", diff --git a/apps/files_encryption/l10n/zh_HK.js b/apps/files_encryption/l10n/zh_HK.js index f4e3fc7e53e..071be6c554c 100644 --- a/apps/files_encryption/l10n/zh_HK.js +++ b/apps/files_encryption/l10n/zh_HK.js @@ -2,7 +2,6 @@ OC.L10N.register( "files_encryption", { "Unknown error" : "不明錯誤", - "Encryption" : "加密", "Enabled" : "啟用", "Disabled" : "停用", "Change Password" : "更改密碼" diff --git a/apps/files_encryption/l10n/zh_HK.json b/apps/files_encryption/l10n/zh_HK.json index 75a003dd466..eea42097843 100644 --- a/apps/files_encryption/l10n/zh_HK.json +++ b/apps/files_encryption/l10n/zh_HK.json @@ -1,6 +1,5 @@ { "translations": { "Unknown error" : "不明錯誤", - "Encryption" : "加密", "Enabled" : "啟用", "Disabled" : "停用", "Change Password" : "更改密碼" diff --git a/apps/files_encryption/l10n/zh_TW.js b/apps/files_encryption/l10n/zh_TW.js index 3bd3143c5b9..fb80249b709 100644 --- a/apps/files_encryption/l10n/zh_TW.js +++ b/apps/files_encryption/l10n/zh_TW.js @@ -14,11 +14,10 @@ OC.L10N.register( "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." : "您的私人金鑰不正確!可能您的密碼已經變更在外部的 %s (例如:您的企業目錄)。您可以在您的個人設定中更新私人金鑰密碼來還原存取您的加密檔案。", "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "無法解密這個檔案，也許這是分享的檔案。請詢問檔案所有人重新分享檔案給您。", "Unknown error. Please check your system settings or contact your administrator" : "未知錯誤請檢查您的系統設定或是聯絡您的管理員", - "Missing requirements." : "遺失必要條件。", - "Following users are not set up for encryption:" : "以下的使用者無法設定加密:", "Initial encryption started... This can take some time. Please wait." : "加密初始已啟用...這個需要一些時間。請稍等。", "Initial encryption running... Please try again later." : "加密初始執行中...請晚點再試。", - "Encryption" : "加密", + "Missing requirements." : "遺失必要條件。", + "Following users are not set up for encryption:" : "以下的使用者無法設定加密:", "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "檔案加密已啓用，但是您的金鑰尚未初始化，請重新登入一次", "Enable recovery key (allow to recover users files in case of password loss):" : "啟用還原金鑰 (因忘記密碼仍允許還原使用者檔案):", "Recovery key password" : "還原金鑰密碼", diff --git a/apps/files_encryption/l10n/zh_TW.json b/apps/files_encryption/l10n/zh_TW.json index cf85da08c9f..06ff2ed3fe3 100644 --- a/apps/files_encryption/l10n/zh_TW.json +++ b/apps/files_encryption/l10n/zh_TW.json @@ -12,11 +12,10 @@ "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." : "您的私人金鑰不正確!可能您的密碼已經變更在外部的 %s (例如:您的企業目錄)。您可以在您的個人設定中更新私人金鑰密碼來還原存取您的加密檔案。", "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "無法解密這個檔案，也許這是分享的檔案。請詢問檔案所有人重新分享檔案給您。", "Unknown error. Please check your system settings or contact your administrator" : "未知錯誤請檢查您的系統設定或是聯絡您的管理員", - "Missing requirements." : "遺失必要條件。", - "Following users are not set up for encryption:" : "以下的使用者無法設定加密:", "Initial encryption started... This can take some time. Please wait." : "加密初始已啟用...這個需要一些時間。請稍等。", "Initial encryption running... Please try again later." : "加密初始執行中...請晚點再試。", - "Encryption" : "加密", + "Missing requirements." : "遺失必要條件。", + "Following users are not set up for encryption:" : "以下的使用者無法設定加密:", "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "檔案加密已啓用，但是您的金鑰尚未初始化，請重新登入一次", "Enable recovery key (allow to recover users files in case of password loss):" : "啟用還原金鑰 (因忘記密碼仍允許還原使用者檔案):", "Recovery key password" : "還原金鑰密碼", diff --git a/apps/files_encryption/lib/helper.php b/apps/files_encryption/lib/helper.php index 553c52e72fe..ae9f0af4890 100644 --- a/apps/files_encryption/lib/helper.php +++ b/apps/files_encryption/lib/helper.php @@ -293,8 +293,8 @@ class Helper { public static function getUserFromPath($path) { $split = self::splitPath($path); - if (count($split) > 3 && ( - $split[2] === 'files' || $split[2] === 'files_versions' || $split[2] === 'cache')) { + if (count($split) > 2 && ( + $split[2] === 'files' || $split[2] === 'files_versions' || $split[2] === 'cache' || $split[2] === 'files_trashbin')) { $user = $split[1]; diff --git a/apps/files_encryption/lib/keymanager.php b/apps/files_encryption/lib/keymanager.php index 925bba578f4..9ccf0705b28 100644 --- a/apps/files_encryption/lib/keymanager.php +++ b/apps/files_encryption/lib/keymanager.php @@ -41,6 +41,7 @@ class Keymanager { * read key from hard disk * * @param string $path to key + * @param \OC\Files\View $view * @return string|bool either the key or false */ private static function getKey($path, $view) { @@ -51,16 +52,14 @@ class Keymanager { $key = self::$key_cache[$path]; } else { - $proxyStatus = \OC_FileProxy::$enabled; - \OC_FileProxy::$enabled = false; + /** @var \OCP\Files\Storage $storage */ + list($storage, $internalPath) = $view->resolvePath($path); - if ($view->file_exists($path)) { - $key = $view->file_get_contents($path); + if ($storage->file_exists($internalPath)) { + $key = $storage->file_get_contents($internalPath); self::$key_cache[$path] = $key; } - \OC_FileProxy::$enabled = $proxyStatus; - } return $key; @@ -77,14 +76,12 @@ class Keymanager { * @return bool */ private static function setKey($path, $name, $key, $view) { - $proxyStatus = \OC_FileProxy::$enabled; - \OC_FileProxy::$enabled = false; - self::keySetPreparation($view, $path); - $pathToKey = \OC\Files\Filesystem::normalizePath($path . '/' . $name); - $result = $view->file_put_contents($pathToKey, $key); - \OC_FileProxy::$enabled = $proxyStatus; + /** @var \OCP\Files\Storage $storage */ + $pathToKey = \OC\Files\Filesystem::normalizePath($path . '/' . $name); + list($storage, $internalPath) = \OC\Files\Filesystem::resolvePath($pathToKey); + $result = $storage->file_put_contents($internalPath, $key); if (is_int($result) && $result > 0) { self::$key_cache[$pathToKey] = $key; diff --git a/apps/files_encryption/lib/migration.php b/apps/files_encryption/lib/migration.php index 1bab1dfe4a5..7a036ade3fc 100644 --- a/apps/files_encryption/lib/migration.php +++ b/apps/files_encryption/lib/migration.php @@ -40,6 +40,20 @@ class Migration { } public function reorganizeFolderStructure() { + $this->reorganizeSystemFolderStructure(); + + $limit = 500; + $offset = 0; + do { + $users = \OCP\User::getUsers('', $limit, $offset); + foreach ($users as $user) { + $this->reorganizeFolderStructureForUser($user); + } + $offset += $limit; + } while(count($users) >= $limit); + } + + public function reorganizeSystemFolderStructure() { $this->createPathForKeys('/files_encryption'); @@ -60,27 +74,28 @@ class Migration { $this->view->deleteAll('/owncloud_private_key'); $this->view->deleteAll('/files_encryption/share-keys'); $this->view->deleteAll('/files_encryption/keyfiles'); + } - $users = \OCP\User::getUsers(); - foreach ($users as $user) { - // backup all keys - if ($this->backupUserKeys($user)) { - // create new 'key' folder - $this->view->mkdir($user . '/files_encryption/keys'); - // rename users private key - $this->renameUsersPrivateKey($user); - // rename file keys - $path = $user . '/files_encryption/keyfiles'; - $this->renameFileKeys($user, $path); - $trashPath = $user . '/files_trashbin/keyfiles'; - if (\OC_App::isEnabled('files_trashbin') && $this->view->is_dir($trashPath)) { - $this->renameFileKeys($user, $trashPath, true); - $this->view->deleteAll($trashPath); - $this->view->deleteAll($user . '/files_trashbin/share-keys'); - } - // delete old folders - $this->deleteOldKeys($user); + + public function reorganizeFolderStructureForUser($user) { + // backup all keys + \OC_Util::setupFS($user); + if ($this->backupUserKeys($user)) { + // create new 'key' folder + $this->view->mkdir($user . '/files_encryption/keys'); + // rename users private key + $this->renameUsersPrivateKey($user); + // rename file keys + $path = $user . '/files_encryption/keyfiles'; + $this->renameFileKeys($user, $path); + $trashPath = $user . '/files_trashbin/keyfiles'; + if (\OC_App::isEnabled('files_trashbin') && $this->view->is_dir($trashPath)) { + $this->renameFileKeys($user, $trashPath, true); + $this->view->deleteAll($trashPath); + $this->view->deleteAll($user . '/files_trashbin/share-keys'); } + // delete old folders + $this->deleteOldKeys($user); } } @@ -246,11 +261,7 @@ class Migration { if (substr($file, 0, strlen($filename) +1) === $filename . '.') { $uid = $this->getUidFromShareKey($file, $filename, $trash); - if ($uid === $this->public_share_key_id || - $uid === $this->recovery_key_id || - \OCP\User::userExists($uid)) { - $this->view->copy($oldShareKeyPath . '/' . $file, $target . '/' . $uid . '.shareKey'); - } + $this->view->copy($oldShareKeyPath . '/' . $file, $target . '/' . $uid . '.shareKey'); } } @@ -277,6 +288,4 @@ class Migration { } } } - - } diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php index 4972e1dffd6..07fd878f069 100644 --- a/apps/files_encryption/lib/proxy.php +++ b/apps/files_encryption/lib/proxy.php @@ -47,16 +47,15 @@ class Proxy extends \OC_FileProxy { * check if path is excluded from encryption * * @param string $path relative to data/ - * @param string $uid user * @return boolean */ - protected function isExcludedPath($path, $uid) { + protected function isExcludedPath($path) { $view = new \OC\Files\View(); - $path = \OC\Files\Filesystem::normalizePath($path); + $normalizedPath = \OC\Files\Filesystem::normalizePath($path); - $parts = explode('/', $path); + $parts = explode('/', $normalizedPath); // we only encrypt/decrypt files in the files and files_versions folder if (sizeof($parts) < 3) { @@ -69,18 +68,18 @@ class Proxy extends \OC_FileProxy { return true; } if( - strpos($path, '/' . $uid . '/files/') !== 0 && + !($parts[2] === 'files' && \OCP\User::userExists($parts[1])) && !($parts[2] === 'files_versions' && \OCP\User::userExists($parts[1]))) { return true; } - if (!$view->file_exists($path)) { - $path = dirname($path); + if (!$view->file_exists($normalizedPath)) { + $normalizedPath = dirname($normalizedPath); } // we don't encrypt server-to-server shares - list($storage, ) = \OC\Files\Filesystem::resolvePath($path); + list($storage, ) = \OC\Files\Filesystem::resolvePath($normalizedPath); /** * @var \OCP\Files\Storage $storage */ @@ -102,17 +101,16 @@ class Proxy extends \OC_FileProxy { */ private function shouldEncrypt($path, $mode = 'w') { - $userId = Helper::getUser($path); - // don't call the crypt stream wrapper, if... if ( Crypt::mode() !== 'server' // we are not in server-side-encryption mode - || $this->isExcludedPath($path, $userId) // if path is excluded from encryption + || $this->isExcludedPath($path) // if path is excluded from encryption || substr($path, 0, 8) === 'crypt://' // we are already in crypt mode ) { return false; } + $userId = Helper::getUser($path); $view = new \OC\Files\View(''); $util = new Util($view, $userId); diff --git a/apps/files_encryption/lib/stream.php b/apps/files_encryption/lib/stream.php index 1bc0d54e1bc..644ac895a8f 100644 --- a/apps/files_encryption/lib/stream.php +++ b/apps/files_encryption/lib/stream.php @@ -136,7 +136,8 @@ class Stream { switch ($fileType) { case Util::FILE_TYPE_FILE: $this->relPath = Helper::stripUserFilesPath($this->rawPath); - $this->userId = \OC::$server->getUserSession()->getUser()->getUID(); + $user = \OC::$server->getUserSession()->getUser(); + $this->userId = $user ? $user->getUID() : Helper::getUserFromPath($this->rawPath); break; case Util::FILE_TYPE_VERSION: $this->relPath = Helper::getPathFromVersion($this->rawPath); @@ -145,7 +146,8 @@ class Stream { case Util::FILE_TYPE_CACHE: $this->relPath = Helper::getPathFromCachedFile($this->rawPath); Helper::mkdirr($this->rawPath, new \OC\Files\View('/')); - $this->userId = \OC::$server->getUserSession()->getUser()->getUID(); + $user = \OC::$server->getUserSession()->getUser(); + $this->userId = $user ? $user->getUID() : Helper::getUserFromPath($this->rawPath); break; default: \OCP\Util::writeLog('Encryption library', 'failed to open file "' . $this->rawPath . '" expecting a path to "files", "files_versions" or "cache"', \OCP\Util::ERROR); @@ -258,7 +260,7 @@ class Stream { if ($count !== Crypt::BLOCKSIZE) { \OCP\Util::writeLog('Encryption library', 'PHP "bug" 21641 no longer holds, decryption system requires refactoring', \OCP\Util::FATAL); - throw new EncryptionException('expected a blog size of 8192 byte', EncryptionException::UNEXPECTED_BLOG_SIZE); + throw new EncryptionException('expected a block size of 8192 byte', EncryptionException::UNEXPECTED_BLOCK_SIZE); } // Get the data from the file handle diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php index 1b140822724..14d0a0bc4b9 100644 --- a/apps/files_encryption/lib/util.php +++ b/apps/files_encryption/lib/util.php @@ -43,18 +43,69 @@ class Util { const FILE_TYPE_VERSION = 1; const FILE_TYPE_CACHE = 2; + /** + * @var \OC\Files\View + */ private $view; // OC\Files\View object for filesystem operations + + /** + * @var string + */ private $userId; // ID of the user we use to encrypt/decrypt files + + /** + * @var string + */ private $keyId; // ID of the key we want to manipulate + + /** + * @var bool + */ private $client; // Client side encryption mode flag + + /** + * @var string + */ private $publicKeyDir; // Dir containing all public user keys + + /** + * @var string + */ private $encryptionDir; // Dir containing user's files_encryption + + /** + * @var string + */ private $keysPath; // Dir containing all file related encryption keys + + /** + * @var string + */ private $publicKeyPath; // Path to user's public key + + /** + * @var string + */ private $privateKeyPath; // Path to user's private key + + /** + * @var string + */ private $userFilesDir; + + /** + * @var string + */ private $publicShareKeyId; + + /** + * @var string + */ private $recoveryKeyId; + + /** + * @var bool + */ private $isPublic; /** @@ -279,6 +330,10 @@ class Util { while (false !== ($file = readdir($handle))) { if ($file !== "." && $file !== "..") { + // skip stray part files + if (Helper::isPartialFilePath($file)) { + continue; + } $filePath = $directory . '/' . $this->view->getRelativePath('/' . $file); $relPath = Helper::stripUserFilesPath($filePath); @@ -734,7 +789,7 @@ class Util { } if ($successful) { - $this->backupAllKeys('decryptAll'); + $this->backupAllKeys('decryptAll', false, false); $this->view->deleteAll($this->keysPath); } @@ -1054,7 +1109,7 @@ class Util { // Find out who, if anyone, is sharing the file $result = \OCP\Share::getUsersSharingFile($ownerPath, $owner); $userIds = \array_merge($userIds, $result['users']); - if ($result['public']) { + if ($result['public'] || $result['remote']) { $userIds[] = $this->publicShareKeyId; } @@ -1495,16 +1550,61 @@ class Util { /** * create a backup of all keys from the user * - * @param string $purpose (optional) define the purpose of the backup, will be part of the backup folder + * @param string $purpose define the purpose of the backup, will be part of the backup folder name + * @param boolean $timestamp (optional) should a timestamp be added, default true + * @param boolean $includeUserKeys (optional) include users private-/public-key, default true */ - public function backupAllKeys($purpose = '') { + public function backupAllKeys($purpose, $timestamp = true, $includeUserKeys = true) { $this->userId; - $backupDir = $this->encryptionDir . '/backup.'; - $backupDir .= ($purpose === '') ? date("Y-m-d_H-i-s") . '/' : $purpose . '.' . date("Y-m-d_H-i-s") . '/'; + $backupDir = $this->encryptionDir . '/backup.' . $purpose; + $backupDir .= ($timestamp) ? '.' . date("Y-m-d_H-i-s") . '/' : '/'; $this->view->mkdir($backupDir); $this->view->copy($this->keysPath, $backupDir . 'keys/'); - $this->view->copy($this->privateKeyPath, $backupDir . $this->userId . '.privateKey'); - $this->view->copy($this->publicKeyPath, $backupDir . $this->userId . '.publicKey'); + if ($includeUserKeys) { + $this->view->copy($this->privateKeyPath, $backupDir . $this->userId . '.privateKey'); + $this->view->copy($this->publicKeyPath, $backupDir . $this->userId . '.publicKey'); + } + } + + /** + * restore backup + * + * @param string $backup complete name of the backup + * @return boolean + */ + public function restoreBackup($backup) { + $backupDir = $this->encryptionDir . '/backup.' . $backup . '/'; + + $fileKeysRestored = $this->view->rename($backupDir . 'keys', $this->encryptionDir . '/keys'); + + $pubKeyRestored = $privKeyRestored = true; + if ( + $this->view->file_exists($backupDir . $this->userId . '.privateKey') && + $this->view->file_exists($backupDir . $this->userId . '.privateKey') + ) { + + $pubKeyRestored = $this->view->rename($backupDir . $this->userId . '.publicKey', $this->publicKeyPath); + $privKeyRestored = $this->view->rename($backupDir . $this->userId . '.privateKey', $this->privateKeyPath); + } + + if ($fileKeysRestored && $pubKeyRestored && $privKeyRestored) { + $this->view->deleteAll($backupDir); + + return true; + } + + return false; + } + + /** + * delete backup + * + * @param string $backup complete name of the backup + * @return boolean + */ + public function deleteBackup($backup) { + $backupDir = $this->encryptionDir . '/backup.' . $backup . '/'; + return $this->view->deleteAll($backupDir); } /** diff --git a/apps/files_encryption/templates/settings-admin.php b/apps/files_encryption/templates/settings-admin.php index 4c1d724b6dd..b686912bf4d 100644 --- a/apps/files_encryption/templates/settings-admin.php +++ b/apps/files_encryption/templates/settings-admin.php @@ -1,5 +1,9 @@ +<?php + /** @var array $_ */ + /** @var OC_L10N $l */ +?> <form id="encryption" class="section"> - <h2><?php p($l->t('Encryption')); ?></h2> + <h2><?php p($l->t('Server-side Encryption')); ?></h2> <?php if($_["initStatus"] === \OCA\Files_Encryption\Session::NOT_INITIALIZED): ?> <?php p($l->t("Encryption App is enabled but your keys are not initialized, please log-out and log-in again")); ?> diff --git a/apps/files_encryption/templates/settings-personal.php b/apps/files_encryption/templates/settings-personal.php index 17123a154d9..3c8034c968f 100644 --- a/apps/files_encryption/templates/settings-personal.php +++ b/apps/files_encryption/templates/settings-personal.php @@ -1,5 +1,9 @@ +<?php
+ /** @var array $_ */
+ /** @var OC_L10N $l */
+?>
<form id="encryption" class="section">
- <h2><?php p( $l->t( 'Encryption' ) ); ?></h2>
+ <h2><?php p($l->t('Server-side Encryption')); ?></h2>
<?php if ( $_["initialized"] === \OCA\Files_Encryption\Session::NOT_INITIALIZED ): ?>
diff --git a/apps/files_encryption/tests/helper.php b/apps/files_encryption/tests/helper.php index 62fdb80d671..3c82b941347 100644 --- a/apps/files_encryption/tests/helper.php +++ b/apps/files_encryption/tests/helper.php @@ -219,6 +219,7 @@ class TestHelper extends TestCase { return array( array('/' . self::TEST_ENCRYPTION_HELPER_USER1 . '/files/foo.txt', self::TEST_ENCRYPTION_HELPER_USER1), array('//' . self::TEST_ENCRYPTION_HELPER_USER2 . '/files_versions/foo.txt', self::TEST_ENCRYPTION_HELPER_USER2), + array('/' . self::TEST_ENCRYPTION_HELPER_USER1 . '/files_trashbin/', self::TEST_ENCRYPTION_HELPER_USER1), array(self::TEST_ENCRYPTION_HELPER_USER1 . '//cache/foo/bar.txt', self::TEST_ENCRYPTION_HELPER_USER1), ); } diff --git a/apps/files_encryption/tests/proxy.php b/apps/files_encryption/tests/proxy.php index d5d9cc7daee..a6b63176569 100644 --- a/apps/files_encryption/tests/proxy.php +++ b/apps/files_encryption/tests/proxy.php @@ -126,9 +126,7 @@ class Proxy extends TestCase { $this->view->mkdir(dirname($path)); $this->view->file_put_contents($path, "test"); - $testClass = new DummyProxy(); - - $result = $testClass->isExcludedPathTesting($path, $this->userId); + $result = \Test_Helper::invokePrivate(new \OCA\Files_Encryption\Proxy(), 'isExcludedPath', array($path)); $this->assertSame($expected, $result); $this->view->deleteAll(dirname($path)); @@ -149,12 +147,3 @@ class Proxy extends TestCase { } - -/** - * Dummy class to make protected methods available for testing - */ -class DummyProxy extends \OCA\Files_Encryption\Proxy { - public function isExcludedPathTesting($path, $uid) { - return $this->isExcludedPath($path, $uid); - } -} diff --git a/apps/files_encryption/tests/share.php b/apps/files_encryption/tests/share.php index 8ecdbabed39..a59838ede1c 100755 --- a/apps/files_encryption/tests/share.php +++ b/apps/files_encryption/tests/share.php @@ -89,6 +89,8 @@ class Share extends TestCase { // login as first user self::loginHelper(self::TEST_ENCRYPTION_SHARE_USER1); + + $this->createMocks(); } protected function tearDown() { @@ -99,6 +101,8 @@ class Share extends TestCase { \OC_App::disable('files_trashbin'); } + $this->restoreHttpHelper(); + parent::tearDown(); } @@ -115,18 +119,43 @@ class Share extends TestCase { parent::tearDownAfterClass(); } - /** - * @medium - */ - function testDeclineServer2ServerShare() { - + private function createMocks() { $config = $this->getMockBuilder('\OCP\IConfig') ->disableOriginalConstructor()->getMock(); $certificateManager = $this->getMock('\OCP\ICertificateManager'); $httpHelperMock = $this->getMockBuilder('\OC\HTTPHelper') ->setConstructorArgs(array($config, $certificateManager)) ->getMock(); - $httpHelperMock->expects($this->once())->method('post')->with($this->anything())->will($this->returnValue(true)); + $httpHelperMock->expects($this->any())->method('post')->with($this->anything())->will($this->returnValue(array('success' => true, 'result' => "{'ocs' : { 'meta' : { 'statuscode' : 100 }}}"))); + + $this->registerHttpHelper($httpHelperMock); + } + + /** + * Register an http helper mock for testing purposes. + * @param $httpHelper http helper mock + */ + private function registerHttpHelper($httpHelper) { + $this->oldHttpHelper = \OC::$server->query('HTTPHelper'); + \OC::$server->registerService('HTTPHelper', function ($c) use ($httpHelper) { + return $httpHelper; + }); + } + + /** + * Restore the original http helper + */ + private function restoreHttpHelper() { + $oldHttpHelper = $this->oldHttpHelper; + \OC::$server->registerService('HTTPHelper', function ($c) use ($oldHttpHelper) { + return $oldHttpHelper; + }); + } + + /** + * @medium + */ + function testDeclineServer2ServerShare() { self::loginHelper(self::TEST_ENCRYPTION_SHARE_USER1); @@ -134,7 +163,7 @@ class Share extends TestCase { $cryptedFile = file_put_contents('crypt:///' . self::TEST_ENCRYPTION_SHARE_USER1 . '/files/' . $this->filename, $this->dataShort); // test that data was successfully written - $this->assertTrue(is_int($cryptedFile)); + $this->assertInternalType('int', $cryptedFile); // get the file info from previous created file $fileInfo = $this->view->getFileInfo( @@ -167,11 +196,9 @@ class Share extends TestCase { $share = $query->fetch(); - $this->registerHttpHelper($httpHelperMock); $_POST['token'] = $token; $s2s = new \OCA\Files_Sharing\API\Server2Server(); $s2s->declineShare(array('id' => $share['id'])); - $this->restoreHttpHelper(); $this->assertFalse($this->view->file_exists( '/' . self::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/keys/' @@ -179,28 +206,6 @@ class Share extends TestCase { } - - /** - * Register an http helper mock for testing purposes. - * @param $httpHelper http helper mock - */ - private function registerHttpHelper($httpHelper) { - $this->oldHttpHelper = \OC::$server->query('HTTPHelper'); - \OC::$server->registerService('HTTPHelper', function ($c) use ($httpHelper) { - return $httpHelper; - }); - } - - /** - * Restore the original http helper - */ - private function restoreHttpHelper() { - $oldHttpHelper = $this->oldHttpHelper; - \OC::$server->registerService('HTTPHelper', function ($c) use ($oldHttpHelper) { - return $oldHttpHelper; - }); - } - /** * @medium * @param bool $withTeardown @@ -213,7 +218,7 @@ class Share extends TestCase { $cryptedFile = file_put_contents('crypt:///' . self::TEST_ENCRYPTION_SHARE_USER1 . '/files/' . $this->filename, $this->dataShort); // test that data was successfully written - $this->assertTrue(is_int($cryptedFile)); + $this->assertInternalType('int', $cryptedFile); // disable encryption proxy to prevent recursive calls $proxyStatus = \OC_FileProxy::$enabled; @@ -224,7 +229,7 @@ class Share extends TestCase { '/' . self::TEST_ENCRYPTION_SHARE_USER1 . '/files/' . $this->filename); // check if we have a valid file info - $this->assertTrue($fileInfo instanceof \OC\Files\FileInfo); + $this->assertInstanceOf('\OC\Files\FileInfo', $fileInfo); // check if the unencrypted file size is stored $this->assertGreaterThan(0, $fileInfo['unencrypted_size']); @@ -407,7 +412,7 @@ class Share extends TestCase { . $this->filename, $this->dataShort); // test that data was successfully written - $this->assertTrue(is_int($cryptedFile)); + $this->assertInternalType('int', $cryptedFile); // disable encryption proxy to prevent recursive calls $proxyStatus = \OC_FileProxy::$enabled; @@ -418,7 +423,7 @@ class Share extends TestCase { '/' . self::TEST_ENCRYPTION_SHARE_USER1 . '/files' . $this->folder1); // check if we have a valid file info - $this->assertTrue($fileInfo instanceof \OC\Files\FileInfo); + $this->assertInstanceOf('\OC\Files\FileInfo', $fileInfo); // re-enable the file proxy \OC_FileProxy::$enabled = $proxyStatus; @@ -496,7 +501,7 @@ class Share extends TestCase { . $this->subfolder); // check if we have a valid file info - $this->assertTrue($fileInfoSubFolder instanceof \OC\Files\FileInfo); + $this->assertInstanceOf('\OC\Files\FileInfo', $fileInfoSubFolder); // re-enable the file proxy \OC_FileProxy::$enabled = $proxyStatus; @@ -530,7 +535,7 @@ class Share extends TestCase { . $this->subsubfolder . '/' . $this->filename); // check if we have fileInfos - $this->assertTrue($fileInfo instanceof \OC\Files\FileInfo); + $this->assertInstanceOf('\OC\Files\FileInfo', $fileInfo); // share the file with user3 \OCP\Share::shareItem('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, self::TEST_ENCRYPTION_SHARE_USER4, \OCP\Constants::PERMISSION_ALL); @@ -607,6 +612,62 @@ class Share extends TestCase { } + function testRemoteShareFile() { + // login as admin + //self::loginHelper(self::TEST_ENCRYPTION_SHARE_USER1); + + // save file with content + $cryptedFile = file_put_contents('crypt:///' . self::TEST_ENCRYPTION_SHARE_USER1 . '/files/' . $this->filename, $this->dataShort); + + // test that data was successfully written + $this->assertInternalType('int', $cryptedFile); + + // disable encryption proxy to prevent recursive calls + $proxyStatus = \OC_FileProxy::$enabled; + \OC_FileProxy::$enabled = false; + + // get the file info from previous created file + $fileInfo = $this->view->getFileInfo( + '/' . self::TEST_ENCRYPTION_SHARE_USER1 . '/files/' . $this->filename); + + // check if we have a valid file info + $this->assertInstanceOf('\OC\Files\FileInfo', $fileInfo); + + // check if the unencrypted file size is stored + $this->assertGreaterThan(0, $fileInfo['unencrypted_size']); + + // re-enable the file proxy + \OC_FileProxy::$enabled = $proxyStatus; + + // share the file + \OCP\Share::shareItem('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_REMOTE, 'user1@server1', \OCP\Constants::PERMISSION_ALL); + + $publicShareKeyId = \OC::$server->getAppConfig()->getValue('files_encryption', 'publicShareKeyId'); + + // check if share key for public exists + $this->assertTrue($this->view->file_exists( + '/' . self::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/keys/' + . $this->filename . '/' . $publicShareKeyId . '.shareKey')); + + // unshare the file + \OCP\Share::unshare('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_REMOTE, 'user1@server1'); + + // check if share key not exists + $this->assertFalse($this->view->file_exists( + '/' . self::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/keys/' + . $this->filename . '/' . $publicShareKeyId . '.shareKey')); + + // cleanup + $this->view->chroot('/' . self::TEST_ENCRYPTION_SHARE_USER1 . '/files/'); + $this->view->unlink($this->filename); + $this->view->chroot('/'); + + // check if share key not exists + $this->assertFalse($this->view->file_exists( + '/' . self::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/keys/' + . $this->filename . '/' . self::TEST_ENCRYPTION_SHARE_USER1 . '.shareKey')); + } + function testPublicShareFile() { // login as admin self::loginHelper(self::TEST_ENCRYPTION_SHARE_USER1); @@ -615,7 +676,7 @@ class Share extends TestCase { $cryptedFile = file_put_contents('crypt:///' . self::TEST_ENCRYPTION_SHARE_USER1 . '/files/' . $this->filename, $this->dataShort); // test that data was successfully written - $this->assertTrue(is_int($cryptedFile)); + $this->assertInternalType('int', $cryptedFile); // disable encryption proxy to prevent recursive calls $proxyStatus = \OC_FileProxy::$enabled; @@ -626,7 +687,7 @@ class Share extends TestCase { '/' . self::TEST_ENCRYPTION_SHARE_USER1 . '/files/' . $this->filename); // check if we have a valid file info - $this->assertTrue($fileInfo instanceof \OC\Files\FileInfo); + $this->assertInstanceOf('\OC\Files\FileInfo', $fileInfo); // check if the unencrypted file size is stored $this->assertGreaterThan(0, $fileInfo['unencrypted_size']); @@ -693,7 +754,7 @@ class Share extends TestCase { $cryptedFile = file_put_contents('crypt:///' . self::TEST_ENCRYPTION_SHARE_USER1 . '/files/' . $this->filename, $this->dataShort); // test that data was successfully written - $this->assertTrue(is_int($cryptedFile)); + $this->assertInternalType('int', $cryptedFile); // disable encryption proxy to prevent recursive calls $proxyStatus = \OC_FileProxy::$enabled; @@ -704,7 +765,7 @@ class Share extends TestCase { '/' . self::TEST_ENCRYPTION_SHARE_USER1 . '/files/' . $this->filename); // check if we have a valid file info - $this->assertTrue($fileInfo instanceof \OC\Files\FileInfo); + $this->assertInstanceOf('\OC\Files\FileInfo', $fileInfo); // check if the unencrypted file size is stored $this->assertGreaterThan(0, $fileInfo['unencrypted_size']); @@ -799,8 +860,8 @@ class Share extends TestCase { . $this->filename, $this->dataShort); // test that data was successfully written - $this->assertTrue(is_int($cryptedFile1)); - $this->assertTrue(is_int($cryptedFile2)); + $this->assertInternalType('int', $cryptedFile1); + $this->assertInternalType('int', $cryptedFile2); // check if share key for admin and recovery exists $this->assertTrue($this->view->file_exists( @@ -906,8 +967,8 @@ class Share extends TestCase { . $this->filename, $this->dataShort); // test that data was successfully written - $this->assertTrue(is_int($cryptedFile1)); - $this->assertTrue(is_int($cryptedFile2)); + $this->assertInternalType('int', $cryptedFile1); + $this->assertInternalType('int', $cryptedFile2); // check if share key for user and recovery exists $this->assertTrue($this->view->file_exists( @@ -994,7 +1055,7 @@ class Share extends TestCase { $cryptedFile = file_put_contents('crypt:///' . self::TEST_ENCRYPTION_SHARE_USER1 . '/files/' . $this->filename, $this->dataShort); // test that data was successfully written - $this->assertTrue(is_int($cryptedFile)); + $this->assertInternalType('int', $cryptedFile); // disable encryption proxy to prevent recursive calls $proxyStatus = \OC_FileProxy::$enabled; @@ -1005,7 +1066,7 @@ class Share extends TestCase { '/' . self::TEST_ENCRYPTION_SHARE_USER1 . '/files/' . $this->filename); // check if we have a valid file info - $this->assertTrue($fileInfo instanceof \OC\Files\FileInfo); + $this->assertInstanceOf('\OC\Files\FileInfo', $fileInfo); // check if the unencrypted file size is stored $this->assertGreaterThan(0, $fileInfo['unencrypted_size']); @@ -1077,14 +1138,14 @@ class Share extends TestCase { $cryptedFile = file_put_contents('crypt:///' . self::TEST_ENCRYPTION_SHARE_USER1 . '/files/' . $this->filename, $this->dataShort); // test that data was successfully written - $this->assertTrue(is_int($cryptedFile)); + $this->assertInternalType('int', $cryptedFile); // get the file info from previous created file $fileInfo = $this->view->getFileInfo( '/' . self::TEST_ENCRYPTION_SHARE_USER1 . '/files/' . $this->filename); // check if we have a valid file info - $this->assertTrue($fileInfo instanceof \OC\Files\FileInfo); + $this->assertInstanceOf('\OC\Files\FileInfo', $fileInfo); // share the file \OCP\Share::shareItem('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, self::TEST_ENCRYPTION_SHARE_USER2, \OCP\Constants::PERMISSION_ALL); @@ -1143,14 +1204,14 @@ class Share extends TestCase { $cryptedFile = file_put_contents('crypt:///' . self::TEST_ENCRYPTION_SHARE_USER1 . '/files/' . $this->filename, $this->dataShort); // test that data was successfully written - $this->assertTrue(is_int($cryptedFile)); + $this->assertInternalType('int', $cryptedFile); // get the file info from previous created file $fileInfo = $this->view->getFileInfo( '/' . self::TEST_ENCRYPTION_SHARE_USER1 . '/files/' . $this->filename); // check if we have a valid file info - $this->assertTrue($fileInfo instanceof \OC\Files\FileInfo); + $this->assertInstanceOf('\OC\Files\FileInfo', $fileInfo); // share the file \OCP\Share::shareItem('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_GROUP, self::TEST_ENCRYPTION_SHARE_GROUP1, \OCP\Constants::PERMISSION_ALL); @@ -1222,7 +1283,7 @@ class Share extends TestCase { $cryptedFile = \OC\Files\Filesystem::file_put_contents($folder . $filename, $this->dataShort); // Test that data was successfully written - $this->assertTrue(is_int($cryptedFile)); + $this->assertInternalType('int', $cryptedFile); // Get file decrypted contents $decrypt = \OC\Files\Filesystem::file_get_contents($folder . $filename); @@ -1234,7 +1295,7 @@ class Share extends TestCase { // get the file info from previous created file $fileInfo = \OC\Files\Filesystem::getFileInfo('/newfolder'); - $this->assertTrue($fileInfo instanceof \OC\Files\FileInfo); + $this->assertInstanceOf('\OC\Files\FileInfo', $fileInfo); // share the folder \OCP\Share::shareItem('folder', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, self::TEST_ENCRYPTION_SHARE_USER2, \OCP\Constants::PERMISSION_ALL); @@ -1280,7 +1341,7 @@ class Share extends TestCase { $cryptedFile = \OC\Files\Filesystem::file_put_contents($folder . $filename, $this->dataShort); // Test that data was successfully written - $this->assertTrue(is_int($cryptedFile)); + $this->assertInternalType('int', $cryptedFile); // Get file decrypted contents $decrypt = \OC\Files\Filesystem::file_get_contents($folder . $filename); @@ -1292,7 +1353,7 @@ class Share extends TestCase { // get the file info from previous created file $fileInfo = \OC\Files\Filesystem::getFileInfo($folder); - $this->assertTrue($fileInfo instanceof \OC\Files\FileInfo); + $this->assertInstanceOf('\OC\Files\FileInfo', $fileInfo); // share the folder \OCP\Share::shareItem('folder', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, self::TEST_ENCRYPTION_SHARE_USER2, \OCP\Constants::PERMISSION_ALL); @@ -1323,4 +1384,4 @@ class Share extends TestCase { \OC\Files\Filesystem::unlink($folder); } -}
\ No newline at end of file +} diff --git a/apps/files_encryption/tests/trashbin.php b/apps/files_encryption/tests/trashbin.php index d924b8ac77a..2704a9752cc 100755 --- a/apps/files_encryption/tests/trashbin.php +++ b/apps/files_encryption/tests/trashbin.php @@ -93,6 +93,8 @@ class Trashbin extends TestCase { // cleanup test user \OC_User::deleteUser(self::TEST_ENCRYPTION_TRASHBIN_USER1); + \OC\Files\Filesystem::getLoader()->removeStorageWrapper('oc_trashbin'); + parent::tearDownAfterClass(); } @@ -158,31 +160,30 @@ class Trashbin extends TestCase { . $filename2 . '/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '.shareKey')); // get files - $trashFiles = $this->view->getDirectoryContent( - '/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_trashbin/files/'); + $trashFiles = \OCA\Files_Trashbin\Helper::getTrashFiles('/', self::TEST_ENCRYPTION_TRASHBIN_USER1); - $trashFileSuffix = null; // find created file with timestamp + $timestamp = null; foreach ($trashFiles as $file) { - if (strpos($file['path'], $filename . '.d') !== false) { - $path_parts = pathinfo($file['name']); - $trashFileSuffix = $path_parts['extension']; + if ($file['name'] === $filename) { + $timestamp = $file['mtime']; + break; } } // check if we found the file we created - $this->assertNotNull($trashFileSuffix); + $this->assertNotNull($timestamp); - $this->assertTrue($this->view->is_dir('/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_trashbin/keys/' . $filename . '.' . $trashFileSuffix)); + $this->assertTrue($this->view->is_dir('/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_trashbin/keys/' . $filename . '.d' . $timestamp)); // check if key for admin not exists $this->assertTrue($this->view->file_exists( - '/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_trashbin/keys/' . $filename . '.' . $trashFileSuffix . '/fileKey')); + '/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_trashbin/keys/' . $filename . '.d' . $timestamp . '/fileKey')); // check if share key for admin not exists $this->assertTrue($this->view->file_exists( '/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_trashbin/keys/' . $filename - . '.' . $trashFileSuffix . '/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '.shareKey')); + . '.d' . $timestamp . '/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '.shareKey')); } /** @@ -195,27 +196,26 @@ class Trashbin extends TestCase { $filename2 = $filename . '.backup'; // a second file with similar name // save file with content - $cryptedFile = file_put_contents('crypt:///' . self::TEST_ENCRYPTION_TRASHBIN_USER1. '/files/'. $filename, $this->dataShort); - $cryptedFile2 = file_put_contents('crypt:///' . self::TEST_ENCRYPTION_TRASHBIN_USER1. '/files/'. $filename2, $this->dataShort); + file_put_contents('crypt:///' . self::TEST_ENCRYPTION_TRASHBIN_USER1. '/files/'. $filename, $this->dataShort); + file_put_contents('crypt:///' . self::TEST_ENCRYPTION_TRASHBIN_USER1. '/files/'. $filename2, $this->dataShort); // delete both files \OC\Files\Filesystem::unlink($filename); \OC\Files\Filesystem::unlink($filename2); - $trashFiles = $this->view->getDirectoryContent('/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_trashbin/files/'); + $trashFiles = \OCA\Files_Trashbin\Helper::getTrashFiles('/', self::TEST_ENCRYPTION_TRASHBIN_USER1); - $trashFileSuffix = null; - $trashFileSuffix2 = null; // find created file with timestamp + $timestamp = null; foreach ($trashFiles as $file) { - if (strpos($file['path'], $filename . '.d') !== false) { - $path_parts = pathinfo($file['name']); - $trashFileSuffix = $path_parts['extension']; + if ($file['name'] === $filename) { + $timestamp = $file['mtime']; + break; } } - // prepare file information - $timestamp = str_replace('d', '', $trashFileSuffix); + // make sure that we have a timestamp + $this->assertNotNull($timestamp); // before calling the restore operation the keys shouldn't be there $this->assertFalse($this->view->file_exists( @@ -225,7 +225,7 @@ class Trashbin extends TestCase { . $filename . '/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '.shareKey')); // restore first file - $this->assertTrue(\OCA\Files_Trashbin\Trashbin::restore($filename . '.' . $trashFileSuffix, $filename, $timestamp)); + $this->assertTrue(\OCA\Files_Trashbin\Trashbin::restore($filename . '.d' . $timestamp, $filename, $timestamp)); // check if file exists $this->assertTrue($this->view->file_exists( diff --git a/apps/files_encryption/tests/util.php b/apps/files_encryption/tests/util.php index 4e0b4f2d0de..f9ee005e95f 100755 --- a/apps/files_encryption/tests/util.php +++ b/apps/files_encryption/tests/util.php @@ -27,7 +27,7 @@ class Util extends TestCase { * @var \OC\Files\View */ public $view; - public $keyfilesPath; + public $keysPath; public $publicKeyPath; public $privateKeyPath; /** @@ -379,8 +379,6 @@ class Util extends TestCase { $this->assertTrue($this->view->is_dir($backupPath . '/keys')); $this->assertTrue($this->view->file_exists($backupPath . '/keys/' . $filename . '/fileKey')); $this->assertTrue($this->view->file_exists($backupPath . '/keys/' . $filename . '/' . $user . '.shareKey')); - $this->assertTrue($this->view->file_exists($backupPath . '/' . $user . '.privateKey')); - $this->assertTrue($this->view->file_exists($backupPath . '/' . $user . '.publicKey')); // cleanup $this->view->unlink($this->userId . '/files/' . $filename); @@ -389,21 +387,27 @@ class Util extends TestCase { } - /** - * test if all keys get moved to the backup folder correctly - */ - function testBackupAllKeys() { - self::loginHelper(self::TEST_ENCRYPTION_UTIL_USER1); - + private function createDummyKeysForBackupTest() { // create some dummy key files $encPath = '/' . self::TEST_ENCRYPTION_UTIL_USER1 . '/files_encryption'; $this->view->mkdir($encPath . '/keys/foo'); $this->view->file_put_contents($encPath . '/keys/foo/fileKey', 'key'); $this->view->file_put_contents($encPath . '/keys/foo/user1.shareKey', 'share key'); + } + + /** + * test if all keys get moved to the backup folder correctly + * + * @dataProvider dataBackupAllKeys + */ + function testBackupAllKeys($addTimestamp, $includeUserKeys) { + self::loginHelper(self::TEST_ENCRYPTION_UTIL_USER1); + + $this->createDummyKeysForBackupTest(); $util = new \OCA\Files_Encryption\Util($this->view, self::TEST_ENCRYPTION_UTIL_USER1); - $util->backupAllKeys('testBackupAllKeys'); + $util->backupAllKeys('testBackupAllKeys', $addTimestamp, $includeUserKeys); $backupPath = $this->getBackupPath('testBackupAllKeys'); @@ -412,15 +416,80 @@ class Util extends TestCase { $this->assertTrue($this->view->is_dir($backupPath . '/keys/foo')); $this->assertTrue($this->view->file_exists($backupPath . '/keys/foo/fileKey')); $this->assertTrue($this->view->file_exists($backupPath . '/keys/foo/user1.shareKey')); - $this->assertTrue($this->view->file_exists($backupPath . '/' . self::TEST_ENCRYPTION_UTIL_USER1 . '.privateKey')); - $this->assertTrue($this->view->file_exists($backupPath . '/' . self::TEST_ENCRYPTION_UTIL_USER1 . '.publicKey')); + + if ($includeUserKeys) { + $this->assertTrue($this->view->file_exists($backupPath . '/' . self::TEST_ENCRYPTION_UTIL_USER1 . '.privateKey')); + $this->assertTrue($this->view->file_exists($backupPath . '/' . self::TEST_ENCRYPTION_UTIL_USER1 . '.publicKey')); + } else { + $this->assertFalse($this->view->file_exists($backupPath . '/' . self::TEST_ENCRYPTION_UTIL_USER1 . '.privateKey')); + $this->assertFalse($this->view->file_exists($backupPath . '/' . self::TEST_ENCRYPTION_UTIL_USER1 . '.publicKey')); + } //cleanup $this->view->deleteAll($backupPath); - $this->view->unlink($encPath . '/keys/foo/fileKey'); - $this->view->unlink($encPath . '/keys/foo/user1.shareKey'); + $this->view->unlink($this->encryptionDir . '/keys/foo/fileKey'); + $this->view->unlink($this->encryptionDir . '/keys/foo/user1.shareKey'); } + function dataBackupAllKeys() { + return array( + array(true, true), + array(false, true), + array(true, false), + array(false, false), + ); + } + + + /** + * @dataProvider dataBackupAllKeys + */ + function testRestoreBackup($addTimestamp, $includeUserKeys) { + + $util = new \OCA\Files_Encryption\Util($this->view, self::TEST_ENCRYPTION_UTIL_USER1); + $this->createDummyKeysForBackupTest(); + + $util->backupAllKeys('restoreKeysBackupTest', $addTimestamp, $includeUserKeys); + $this->view->deleteAll($this->keysPath); + if ($includeUserKeys) { + $this->view->unlink($this->privateKeyPath); + $this->view->unlink($this->publicKeyPath); + } + + // key should be removed after backup was created + $this->assertFalse($this->view->is_dir($this->keysPath)); + if ($includeUserKeys) { + $this->assertFalse($this->view->file_exists($this->privateKeyPath)); + $this->assertFalse($this->view->file_exists($this->publicKeyPath)); + } + + $backupPath = $this->getBackupPath('restoreKeysBackupTest'); + $backupName = substr(basename($backupPath), strlen('backup.')); + + $this->assertTrue($util->restoreBackup($backupName)); + + // check if all keys are restored + $this->assertFalse($this->view->is_dir($backupPath)); + $this->assertTrue($this->view->is_dir($this->keysPath)); + $this->assertTrue($this->view->is_dir($this->keysPath . '/foo')); + $this->assertTrue($this->view->file_exists($this->keysPath . '/foo/fileKey')); + $this->assertTrue($this->view->file_exists($this->keysPath . '/foo/user1.shareKey')); + $this->assertTrue($this->view->file_exists($this->privateKeyPath)); + $this->assertTrue($this->view->file_exists($this->publicKeyPath)); + } + + function testDeleteBackup() { + $util = new \OCA\Files_Encryption\Util($this->view, self::TEST_ENCRYPTION_UTIL_USER1); + $this->createDummyKeysForBackupTest(); + + $util->backupAllKeys('testDeleteBackup', false, false); + + $this->assertTrue($this->view->is_dir($this->encryptionDir . '/backup.testDeleteBackup')); + + $util->deleteBackup('testDeleteBackup'); + + $this->assertFalse($this->view->is_dir($this->encryptionDir . '/backup.testDeleteBackup')); + } function testDescryptAllWithBrokenFiles() { diff --git a/apps/files_encryption/tests/webdav.php b/apps/files_encryption/tests/webdav.php index 83f4c0a77de..bdbc9d7ef02 100755 --- a/apps/files_encryption/tests/webdav.php +++ b/apps/files_encryption/tests/webdav.php @@ -206,12 +206,17 @@ class Webdav extends TestCase { * handle webdav request * * @param bool $body - * * @note this init procedure is copied from /apps/files/appinfo/remote.php */ function handleWebdavRequest($body = false) { // Backends - $authBackend = new \OC_Connector_Sabre_Auth(); + $authBackend = $this->getMockBuilder('OC_Connector_Sabre_Auth') + ->setMethods(['validateUserPass']) + ->getMock(); + $authBackend->expects($this->any()) + ->method('validateUserPass') + ->will($this->returnValue(true)); + $lockBackend = new \OC_Connector_Sabre_Locks(); $requestBackend = new \OC_Connector_Sabre_Request(); @@ -236,6 +241,10 @@ class Webdav extends TestCase { $server->addPlugin(new \OC_Connector_Sabre_MaintenancePlugin()); $server->debugExceptions = true; + // Totally ugly hack to setup the FS + \OC::$server->getUserSession()->login($this->userId, $this->userId); + \OC_Util::setupFS($this->userId); + // And off we go! if ($body) { $server->httpRequest->setBody($body); diff --git a/apps/files_external/appinfo/app.php b/apps/files_external/appinfo/app.php index 74f0e337a12..70f6b0159a6 100644 --- a/apps/files_external/appinfo/app.php +++ b/apps/files_external/appinfo/app.php @@ -22,46 +22,46 @@ OC::$CLASSPATH['OC\Files\Storage\SFTP_Key'] = 'files_external/lib/sftp_key.php'; OC::$CLASSPATH['OC_Mount_Config'] = 'files_external/lib/config.php'; OC::$CLASSPATH['OCA\Files\External\Api'] = 'files_external/lib/api.php'; -OCP\Util::addTranslations('files_external'); - OCP\App::registerAdmin('files_external', 'settings'); if (OCP\Config::getAppValue('files_external', 'allow_user_mounting', 'yes') == 'yes') { OCP\App::registerPersonal('files_external', 'personal'); } -\OCA\Files\App::getNavigationManager()->add( - array( - "id" => 'extstoragemounts', - "appname" => 'files_external', - "script" => 'list.php', - "order" => 30, - "name" => $l->t('External storage') - ) -); +\OCA\Files\App::getNavigationManager()->add([ + "id" => 'extstoragemounts', + "appname" => 'files_external', + "script" => 'list.php', + "order" => 30, + "name" => $l->t('External storage') +]); // connecting hooks OCP\Util::connectHook('OC_Filesystem', 'post_initMountPoints', '\OC_Mount_Config', 'initMountPointsHook'); OCP\Util::connectHook('OC_User', 'post_login', 'OC\Files\Storage\SMB_OC', 'login'); -OC_Mount_Config::registerBackend('\OC\Files\Storage\Local', array( +OC_Mount_Config::registerBackend('\OC\Files\Storage\Local', [ 'backend' => (string)$l->t('Local'), 'priority' => 150, - 'configuration' => array( - 'datadir' => (string)$l->t('Location')))); + 'configuration' => [ + 'datadir' => (string)$l->t('Location') + ], +]); -OC_Mount_Config::registerBackend('\OC\Files\Storage\AmazonS3', array( +OC_Mount_Config::registerBackend('\OC\Files\Storage\AmazonS3', [ 'backend' => (string)$l->t('Amazon S3'), 'priority' => 100, - 'configuration' => array( + 'configuration' => [ 'key' => (string)$l->t('Key'), 'secret' => '*'.$l->t('Secret'), - 'bucket' => (string)$l->t('Bucket')), - 'has_dependencies' => true)); + 'bucket' => (string)$l->t('Bucket'), + ], + 'has_dependencies' => true, +]); -OC_Mount_Config::registerBackend('\OC\Files\Storage\AmazonS3', array( +OC_Mount_Config::registerBackend('\OC\Files\Storage\AmazonS3', [ 'backend' => (string)$l->t('Amazon S3 and compliant'), 'priority' => 100, - 'configuration' => array( + 'configuration' => [ 'key' => (string)$l->t('Access Key'), 'secret' => '*'.$l->t('Secret Key'), 'bucket' => (string)$l->t('Bucket'), @@ -69,48 +69,56 @@ OC_Mount_Config::registerBackend('\OC\Files\Storage\AmazonS3', array( 'port' => '&'.$l->t('Port'), 'region' => '&'.$l->t('Region'), 'use_ssl' => '!'.$l->t('Enable SSL'), - 'use_path_style' => '!'.$l->t('Enable Path Style')), - 'has_dependencies' => true)); + 'use_path_style' => '!'.$l->t('Enable Path Style') + ], + 'has_dependencies' => true, +]); -OC_Mount_Config::registerBackend('\OC\Files\Storage\Dropbox', array( +OC_Mount_Config::registerBackend('\OC\Files\Storage\Dropbox', [ 'backend' => 'Dropbox', 'priority' => 100, - 'configuration' => array( + 'configuration' => [ 'configured' => '#configured', 'app_key' => (string)$l->t('App key'), 'app_secret' => '*'.$l->t('App secret'), 'token' => '#token', - 'token_secret' => '#token_secret'), + 'token_secret' => '#token_secret' + ], 'custom' => 'dropbox', - 'has_dependencies' => true)); + 'has_dependencies' => true, +]); -OC_Mount_Config::registerBackend('\OC\Files\Storage\FTP', array( +OC_Mount_Config::registerBackend('\OC\Files\Storage\FTP', [ 'backend' => 'FTP', 'priority' => 100, - 'configuration' => array( + 'configuration' => [ 'host' => (string)$l->t('Host'), 'user' => (string)$l->t('Username'), 'password' => '*'.$l->t('Password'), 'root' => '&'.$l->t('Remote subfolder'), - 'secure' => '!'.$l->t('Secure ftps://')), - 'has_dependencies' => true)); + 'secure' => '!'.$l->t('Secure ftps://') + ], + 'has_dependencies' => true, +]); -OC_Mount_Config::registerBackend('\OC\Files\Storage\Google', array( +OC_Mount_Config::registerBackend('\OC\Files\Storage\Google', [ 'backend' => 'Google Drive', 'priority' => 100, - 'configuration' => array( + 'configuration' => [ 'configured' => '#configured', 'client_id' => (string)$l->t('Client ID'), 'client_secret' => '*'.$l->t('Client secret'), - 'token' => '#token'), + 'token' => '#token', + ], 'custom' => 'google', - 'has_dependencies' => true)); + 'has_dependencies' => true, +]); -OC_Mount_Config::registerBackend('\OC\Files\Storage\Swift', array( +OC_Mount_Config::registerBackend('\OC\Files\Storage\Swift', [ 'backend' => (string)$l->t('OpenStack Object Storage'), 'priority' => 100, - 'configuration' => array( + 'configuration' => [ 'user' => (string)$l->t('Username'), 'bucket' => (string)$l->t('Bucket'), 'region' => '&'.$l->t('Region (optional for OpenStack Object Storage)'), @@ -120,63 +128,74 @@ OC_Mount_Config::registerBackend('\OC\Files\Storage\Swift', array( 'service_name' => '&'.$l->t('Service Name (required for OpenStack Object Storage)'), 'url' => '&'.$l->t('URL of identity endpoint (required for OpenStack Object Storage)'), 'timeout' => '&'.$l->t('Timeout of HTTP requests in seconds'), - ), - 'has_dependencies' => true)); + ], + 'has_dependencies' => true, +]); if (!OC_Util::runningOnWindows()) { - OC_Mount_Config::registerBackend('\OC\Files\Storage\SMB', array( + OC_Mount_Config::registerBackend('\OC\Files\Storage\SMB', [ 'backend' => 'SMB / CIFS', 'priority' => 100, - 'configuration' => array( + 'configuration' => [ 'host' => (string)$l->t('Host'), 'user' => (string)$l->t('Username'), 'password' => '*'.$l->t('Password'), 'share' => (string)$l->t('Share'), - 'root' => '&'.$l->t('Remote subfolder')), - 'has_dependencies' => true)); + 'root' => '&'.$l->t('Remote subfolder'), + ], + 'has_dependencies' => true, + ]); - OC_Mount_Config::registerBackend('\OC\Files\Storage\SMB_OC', array( + OC_Mount_Config::registerBackend('\OC\Files\Storage\SMB_OC', [ 'backend' => (string)$l->t('SMB / CIFS using OC login'), 'priority' => 90, - 'configuration' => array( + 'configuration' => [ 'host' => (string)$l->t('Host'), 'username_as_share' => '!'.$l->t('Username as share'), 'share' => '&'.$l->t('Share'), - 'root' => '&'.$l->t('Remote subfolder')), - 'has_dependencies' => true)); + 'root' => '&'.$l->t('Remote subfolder'), + ], + 'has_dependencies' => true, + ]); } -OC_Mount_Config::registerBackend('\OC\Files\Storage\DAV', array( +OC_Mount_Config::registerBackend('\OC\Files\Storage\DAV', [ 'backend' => 'WebDAV', 'priority' => 100, - 'configuration' => array( + 'configuration' => [ 'host' => (string)$l->t('URL'), 'user' => (string)$l->t('Username'), 'password' => '*'.$l->t('Password'), 'root' => '&'.$l->t('Remote subfolder'), - 'secure' => '!'.$l->t('Secure https://')), - 'has_dependencies' => true)); + 'secure' => '!'.$l->t('Secure https://'), + ], + 'has_dependencies' => true, +]); -OC_Mount_Config::registerBackend('\OC\Files\Storage\OwnCloud', array( +OC_Mount_Config::registerBackend('\OC\Files\Storage\OwnCloud', [ 'backend' => 'ownCloud', 'priority' => 100, - 'configuration' => array( + 'configuration' => [ 'host' => (string)$l->t('URL'), 'user' => (string)$l->t('Username'), 'password' => '*'.$l->t('Password'), 'root' => '&'.$l->t('Remote subfolder'), - 'secure' => '!'.$l->t('Secure https://')))); + 'secure' => '!'.$l->t('Secure https://'), + ], +]); -OC_Mount_Config::registerBackend('\OC\Files\Storage\SFTP', array( +OC_Mount_Config::registerBackend('\OC\Files\Storage\SFTP', [ 'backend' => 'SFTP', 'priority' => 100, - 'configuration' => array( + 'configuration' => [ 'host' => (string)$l->t('Host'), 'user' => (string)$l->t('Username'), 'password' => '*'.$l->t('Password'), - 'root' => '&'.$l->t('Remote subfolder')))); + 'root' => '&'.$l->t('Remote subfolder'), + ], +]); OC_Mount_Config::registerBackend('\OC\Files\Storage\SFTP_Key', [ 'backend' => 'SFTP with secret key login', diff --git a/apps/files_external/appinfo/info.xml b/apps/files_external/appinfo/info.xml index f23dea83caa..8518cc89298 100644 --- a/apps/files_external/appinfo/info.xml +++ b/apps/files_external/appinfo/info.xml @@ -9,13 +9,17 @@ </description> <licence>AGPL</licence> <author>Robin Appelman, Michael Gapczynski, Vincent Petry</author> - <requiremin>4.93</requiremin> <shipped>true</shipped> <documentation> <admin>admin-external-storage</admin> </documentation> + <rememberlogin>false</rememberlogin> <types> <filesystem/> </types> <ocsid>166048</ocsid> + + <dependencies> + <owncloud min-version="8" /> + </dependencies> </info> diff --git a/apps/files_external/appinfo/version b/apps/files_external/appinfo/version index f4778493c50..7179039691c 100644 --- a/apps/files_external/appinfo/version +++ b/apps/files_external/appinfo/version @@ -1 +1 @@ -0.2.2
\ No newline at end of file +0.2.3 diff --git a/apps/files_external/css/settings.css b/apps/files_external/css/settings.css index 101c224c5f5..93689f78c52 100644 --- a/apps/files_external/css/settings.css +++ b/apps/files_external/css/settings.css @@ -32,12 +32,18 @@ tr:hover>td.remove>img { visibility:visible; cursor:pointer; } margin-right: 3px; } +#externalStorage td.configuration label { + min-width: 144px; /* 130px plus 2x7px padding */ + display: inline-block; + margin-right: 6px; +} + + #externalStorage td.applicable div.chzn-container { position: relative; top: 3px; } - #externalStorage td.status .success { border-radius: 50%; } diff --git a/apps/files_external/js/dropbox.js b/apps/files_external/js/dropbox.js index 6baaabe11b6..2880e910f2c 100644 --- a/apps/files_external/js/dropbox.js +++ b/apps/files_external/js/dropbox.js @@ -65,7 +65,10 @@ $(document).ready(function() { || $(tr).find('.chzn-select').val() != null)) { if ($(tr).find('.dropbox').length == 0) { - $(config).append('<a class="button dropbox">'+t('files_external', 'Grant access')+'</a>'); + $(config).append($(document.createElement('input')) + .addClass('button dropbox') + .attr('type', 'button') + .attr('value', t('files_external', 'Grant access'))); } else { $(tr).find('.dropbox').show(); } diff --git a/apps/files_external/js/google.js b/apps/files_external/js/google.js index 068c2c13c66..b9a5e66b800 100644 --- a/apps/files_external/js/google.js +++ b/apps/files_external/js/google.js @@ -85,8 +85,9 @@ $(document).ready(function() { || $(tr).find('.chzn-select').val() != null)) { if ($(tr).find('.google').length == 0) { - $(config).append($('<a/>').addClass('button google') - .text(t('files_external', 'Grant access'))); + $(config).append($(document.createElement('input')).addClass('button google') + .attr('type', 'button') + .attr('value', t('files_external', 'Grant access'))); } else { $(tr).find('.google').show(); } diff --git a/apps/files_external/l10n/bg_BG.js b/apps/files_external/l10n/bg_BG.js index dabf8715e82..f1a773b21f9 100644 --- a/apps/files_external/l10n/bg_BG.js +++ b/apps/files_external/l10n/bg_BG.js @@ -56,6 +56,8 @@ OC.L10N.register( "<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>Note:</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>Note:</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>Note:</b> \"%s\" не е инсталиран. Прикачването на %s не е възможно. Моля, поискай системния администратор да я инсталира.", + "No external storage configured" : "Няма настроено външно дисково пространство", + "You can configure external storages in the personal settings" : "Можеш да промениш виншните дискови пространства в личните си настройки", "Name" : "Име", "Storage type" : "Тип дисково пространство", "Scope" : "Обхват", diff --git a/apps/files_external/l10n/bg_BG.json b/apps/files_external/l10n/bg_BG.json index 5dc9e8d60a2..b404afdae5e 100644 --- a/apps/files_external/l10n/bg_BG.json +++ b/apps/files_external/l10n/bg_BG.json @@ -54,6 +54,8 @@ "<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>Note:</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>Note:</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>Note:</b> \"%s\" не е инсталиран. Прикачването на %s не е възможно. Моля, поискай системния администратор да я инсталира.", + "No external storage configured" : "Няма настроено външно дисково пространство", + "You can configure external storages in the personal settings" : "Можеш да промениш виншните дискови пространства в личните си настройки", "Name" : "Име", "Storage type" : "Тип дисково пространство", "Scope" : "Обхват", diff --git a/apps/files_external/l10n/de.js b/apps/files_external/l10n/de.js index f188e8dc9fe..b5775a0b0ef 100644 --- a/apps/files_external/l10n/de.js +++ b/apps/files_external/l10n/de.js @@ -27,7 +27,7 @@ OC.L10N.register( "Username" : "Benutzername", "Password" : "Passwort", "Remote subfolder" : "Remote subfolder", - "Secure ftps://" : "Sicherer FTPS://", + "Secure ftps://" : "Sicherer ftps://", "Client ID" : "Client-ID", "Client secret" : "Geheime Zeichenkette des Client", "OpenStack Object Storage" : "Openstack-Objektspeicher", @@ -49,7 +49,7 @@ OC.L10N.register( "Error configuring Google Drive storage" : "Fehler beim Einrichten von Google Drive", "Personal" : "Persönlich", "System" : "System", - "All users. Type to select user or group." : "Alle Nutzer. Nutzer oder Gruppe zur Auswahl eingeben.", + "All users. Type to select user or group." : "Alle Benutzer. Benutzer oder Gruppe zur Auswahl eingeben.", "(group)" : "(group)", "Saved" : "Gespeichert", "<b>Note:</b> " : "<b>Hinweis:</b> ", diff --git a/apps/files_external/l10n/de.json b/apps/files_external/l10n/de.json index d9d8bd70c77..e6501b57a7d 100644 --- a/apps/files_external/l10n/de.json +++ b/apps/files_external/l10n/de.json @@ -25,7 +25,7 @@ "Username" : "Benutzername", "Password" : "Passwort", "Remote subfolder" : "Remote subfolder", - "Secure ftps://" : "Sicherer FTPS://", + "Secure ftps://" : "Sicherer ftps://", "Client ID" : "Client-ID", "Client secret" : "Geheime Zeichenkette des Client", "OpenStack Object Storage" : "Openstack-Objektspeicher", @@ -47,7 +47,7 @@ "Error configuring Google Drive storage" : "Fehler beim Einrichten von Google Drive", "Personal" : "Persönlich", "System" : "System", - "All users. Type to select user or group." : "Alle Nutzer. Nutzer oder Gruppe zur Auswahl eingeben.", + "All users. Type to select user or group." : "Alle Benutzer. Benutzer oder Gruppe zur Auswahl eingeben.", "(group)" : "(group)", "Saved" : "Gespeichert", "<b>Note:</b> " : "<b>Hinweis:</b> ", diff --git a/apps/files_external/l10n/de_DE.js b/apps/files_external/l10n/de_DE.js index 17061d5bdbd..9122a8caa0a 100644 --- a/apps/files_external/l10n/de_DE.js +++ b/apps/files_external/l10n/de_DE.js @@ -27,7 +27,7 @@ OC.L10N.register( "Username" : "Benutzername", "Password" : "Passwort", "Remote subfolder" : "Entfernter Unterordner:", - "Secure ftps://" : "Sicherer FTPS://", + "Secure ftps://" : "Sicheres ftps://", "Client ID" : "Client-ID", "Client secret" : "Geheime Zeichenkette des Client", "OpenStack Object Storage" : "Openstack-Objektspeicher", @@ -42,14 +42,14 @@ OC.L10N.register( "SMB / CIFS using OC login" : "SMB / CIFS mit OC-Login", "Username as share" : "Benutzername als Freigabe", "URL" : "Adresse", - "Secure https://" : "Sicherer HTTPS://", + "Secure https://" : "Sicheres https://", "Access granted" : "Zugriff gestattet", "Error configuring Dropbox storage" : "Fehler beim Einrichten von Dropbox", "Grant access" : "Zugriff gestatten", "Error configuring Google Drive storage" : "Fehler beim Einrichten von Google Drive", "Personal" : "Persönlich", "System" : "System", - "All users. Type to select user or group." : "Alle Nutzer. Nutzer oder Gruppe zur Auswahl eingeben.", + "All users. Type to select user or group." : "Alle Benutzer. Benutzer oder Gruppe zur Auswahl eingeben.", "(group)" : "(group)", "Saved" : "Gespeichert", "<b>Note:</b> " : "<b>Hinweis:</b> ", diff --git a/apps/files_external/l10n/de_DE.json b/apps/files_external/l10n/de_DE.json index 77bb3b19c49..5c8ba8a89ee 100644 --- a/apps/files_external/l10n/de_DE.json +++ b/apps/files_external/l10n/de_DE.json @@ -25,7 +25,7 @@ "Username" : "Benutzername", "Password" : "Passwort", "Remote subfolder" : "Entfernter Unterordner:", - "Secure ftps://" : "Sicherer FTPS://", + "Secure ftps://" : "Sicheres ftps://", "Client ID" : "Client-ID", "Client secret" : "Geheime Zeichenkette des Client", "OpenStack Object Storage" : "Openstack-Objektspeicher", @@ -40,14 +40,14 @@ "SMB / CIFS using OC login" : "SMB / CIFS mit OC-Login", "Username as share" : "Benutzername als Freigabe", "URL" : "Adresse", - "Secure https://" : "Sicherer HTTPS://", + "Secure https://" : "Sicheres https://", "Access granted" : "Zugriff gestattet", "Error configuring Dropbox storage" : "Fehler beim Einrichten von Dropbox", "Grant access" : "Zugriff gestatten", "Error configuring Google Drive storage" : "Fehler beim Einrichten von Google Drive", "Personal" : "Persönlich", "System" : "System", - "All users. Type to select user or group." : "Alle Nutzer. Nutzer oder Gruppe zur Auswahl eingeben.", + "All users. Type to select user or group." : "Alle Benutzer. Benutzer oder Gruppe zur Auswahl eingeben.", "(group)" : "(group)", "Saved" : "Gespeichert", "<b>Note:</b> " : "<b>Hinweis:</b> ", diff --git a/apps/files_external/l10n/el.js b/apps/files_external/l10n/el.js index ba31abd802f..1000a6d9303 100644 --- a/apps/files_external/l10n/el.js +++ b/apps/files_external/l10n/el.js @@ -57,6 +57,8 @@ OC.L10N.register( "<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> Η υποστήριξη cURL στην PHP δεν είναι ενεργοποιημένη ή εγκατεστημένη. Η προσάρτηση του %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> Η υποστήριξη FTP στην PHP δεν είναι ενεργοποιημένη ή εγκατεστημένη. Δεν είναι δυνατή η προσάρτηση του %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. Παρακαλώ ζητήστε από τον διαχειριστή συστημάτων σας να την εγκαταστήσει.", + "No external storage configured" : "Δεν έχει ρυθμιστεί κανένα εξωτερικό μέσο αποθήκευσης", + "You can configure external storages in the personal settings" : "Μπορείτε να ρυθμίσετε εξωτερικά μέσα αποθήκευσης στις προσωπικές ρυθμίσεις", "Name" : "Όνομα", "Storage type" : "Τύπος αποθηκευτικού χώρου", "Scope" : "Εύρος", diff --git a/apps/files_external/l10n/el.json b/apps/files_external/l10n/el.json index 322949e30a1..b38b81c86d2 100644 --- a/apps/files_external/l10n/el.json +++ b/apps/files_external/l10n/el.json @@ -55,6 +55,8 @@ "<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> Η υποστήριξη cURL στην PHP δεν είναι ενεργοποιημένη ή εγκατεστημένη. Η προσάρτηση του %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> Η υποστήριξη FTP στην PHP δεν είναι ενεργοποιημένη ή εγκατεστημένη. Δεν είναι δυνατή η προσάρτηση του %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. Παρακαλώ ζητήστε από τον διαχειριστή συστημάτων σας να την εγκαταστήσει.", + "No external storage configured" : "Δεν έχει ρυθμιστεί κανένα εξωτερικό μέσο αποθήκευσης", + "You can configure external storages in the personal settings" : "Μπορείτε να ρυθμίσετε εξωτερικά μέσα αποθήκευσης στις προσωπικές ρυθμίσεις", "Name" : "Όνομα", "Storage type" : "Τύπος αποθηκευτικού χώρου", "Scope" : "Εύρος", diff --git a/apps/files_external/l10n/es.js b/apps/files_external/l10n/es.js index 55e8af1b081..bb1631d7ead 100644 --- a/apps/files_external/l10n/es.js +++ b/apps/files_external/l10n/es.js @@ -27,7 +27,7 @@ OC.L10N.register( "Username" : "Nombre de usuario", "Password" : "Contraseña", "Remote subfolder" : "Subcarpeta remota", - "Secure ftps://" : "Secure ftps://", + "Secure ftps://" : "—Seguro— ftps://", "Client ID" : "ID de Cliente", "Client secret" : "Cliente secreto", "OpenStack Object Storage" : "OpenStack Object Storage", @@ -39,10 +39,10 @@ OC.L10N.register( "URL of identity endpoint (required for OpenStack Object Storage)" : "URL de identidad de punto final (requerido para OpenStack Object Storage)", "Timeout of HTTP requests in seconds" : "Tiempo de espera de solicitudes HTTP en segundos", "Share" : "Compartir", - "SMB / CIFS using OC login" : "SMB / CIFS usando acceso OC", - "Username as share" : "Nombre de Usuario como compartir", + "SMB / CIFS using OC login" : "SMB / CIFS que usan acceso OC", + "Username as share" : "Nombre de usuario como compartir", "URL" : "URL", - "Secure https://" : "Secure https://", + "Secure https://" : "—Seguro— https://", "Access granted" : "Acceso concedido", "Error configuring Dropbox storage" : "Error configurando el almacenamiento de Dropbox", "Grant access" : "Conceder acceso", @@ -54,9 +54,9 @@ OC.L10N.register( "Saved" : "Guardado", "<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 no está activado o instalado. No se puede montar %s. Pídale al administrador de sistema que lo 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 no está activado o instalado. No se puede montar %s. Pídale al administrador de sistema que lo 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\" no está instalado. No se puede montar %s. Pídale al administrador de sistema que lo instale.", + "<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 no está activado o instalado. No se puede montar %s. Pídale al administrador del sistema que lo 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 no está activado o instalado. No se puede montar %s. Pídale al administrador del sistema que lo 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\" no está instalado. No se puede montar %s. Pídale al administrador del sistema que lo instale.", "No external storage configured" : "No hay ningún almacenamiento externo configurado", "You can configure external storages in the personal settings" : "Puede configurar almacenamientos externos en su configuración personal", "Name" : "Nombre", diff --git a/apps/files_external/l10n/es.json b/apps/files_external/l10n/es.json index 6d5d9714a4a..7c86b244c32 100644 --- a/apps/files_external/l10n/es.json +++ b/apps/files_external/l10n/es.json @@ -25,7 +25,7 @@ "Username" : "Nombre de usuario", "Password" : "Contraseña", "Remote subfolder" : "Subcarpeta remota", - "Secure ftps://" : "Secure ftps://", + "Secure ftps://" : "—Seguro— ftps://", "Client ID" : "ID de Cliente", "Client secret" : "Cliente secreto", "OpenStack Object Storage" : "OpenStack Object Storage", @@ -37,10 +37,10 @@ "URL of identity endpoint (required for OpenStack Object Storage)" : "URL de identidad de punto final (requerido para OpenStack Object Storage)", "Timeout of HTTP requests in seconds" : "Tiempo de espera de solicitudes HTTP en segundos", "Share" : "Compartir", - "SMB / CIFS using OC login" : "SMB / CIFS usando acceso OC", - "Username as share" : "Nombre de Usuario como compartir", + "SMB / CIFS using OC login" : "SMB / CIFS que usan acceso OC", + "Username as share" : "Nombre de usuario como compartir", "URL" : "URL", - "Secure https://" : "Secure https://", + "Secure https://" : "—Seguro— https://", "Access granted" : "Acceso concedido", "Error configuring Dropbox storage" : "Error configurando el almacenamiento de Dropbox", "Grant access" : "Conceder acceso", @@ -52,9 +52,9 @@ "Saved" : "Guardado", "<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 no está activado o instalado. No se puede montar %s. Pídale al administrador de sistema que lo 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 no está activado o instalado. No se puede montar %s. Pídale al administrador de sistema que lo 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\" no está instalado. No se puede montar %s. Pídale al administrador de sistema que lo instale.", + "<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 no está activado o instalado. No se puede montar %s. Pídale al administrador del sistema que lo 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 no está activado o instalado. No se puede montar %s. Pídale al administrador del sistema que lo 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\" no está instalado. No se puede montar %s. Pídale al administrador del sistema que lo instale.", "No external storage configured" : "No hay ningún almacenamiento externo configurado", "You can configure external storages in the personal settings" : "Puede configurar almacenamientos externos en su configuración personal", "Name" : "Nombre", diff --git a/apps/files_external/l10n/eu.js b/apps/files_external/l10n/eu.js index 8da8ca68263..0127452f697 100644 --- a/apps/files_external/l10n/eu.js +++ b/apps/files_external/l10n/eu.js @@ -52,9 +52,12 @@ OC.L10N.register( "(group)" : "(taldea)", "Saved" : "Gordeta", "<b>Note:</b> " : "<b>Oharra:</b>", + "and" : "eta", "<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>Oharra:</b> :PHPko cURL euskarria ez dago instalatuta edo gaitua. Ezinezko da %s muntatzea. Mesedez eskatu sistema administratzaleari instala dezan. ", "<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>Oharra:</b> :PHPko FTP euskarria ez dago instalatuta edo gaitua. Ezinezko da %s muntatzea. Mesedez eskatu sistema administratzaleari instala dezan. ", "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Oharra:</b>\"%s\" euskarria ez dago instalatuta Ezinezko da %s muntatzea. Mesedez eskatu sistema administratzaleari instala dezan. ", + "No external storage configured" : "Ez da kanpo biltegiratzerik konfiguratu", + "You can configure external storages in the personal settings" : "Ezarpen pertsonaletan kanpo biltegiratzeak konfigura ditzazkezu", "Name" : "Izena", "Storage type" : "Biltegiratze mota", "External Storage" : "Kanpoko biltegiratzea", diff --git a/apps/files_external/l10n/eu.json b/apps/files_external/l10n/eu.json index 7ae84c8dbd3..af7f8e4016b 100644 --- a/apps/files_external/l10n/eu.json +++ b/apps/files_external/l10n/eu.json @@ -50,9 +50,12 @@ "(group)" : "(taldea)", "Saved" : "Gordeta", "<b>Note:</b> " : "<b>Oharra:</b>", + "and" : "eta", "<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>Oharra:</b> :PHPko cURL euskarria ez dago instalatuta edo gaitua. Ezinezko da %s muntatzea. Mesedez eskatu sistema administratzaleari instala dezan. ", "<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>Oharra:</b> :PHPko FTP euskarria ez dago instalatuta edo gaitua. Ezinezko da %s muntatzea. Mesedez eskatu sistema administratzaleari instala dezan. ", "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Oharra:</b>\"%s\" euskarria ez dago instalatuta Ezinezko da %s muntatzea. Mesedez eskatu sistema administratzaleari instala dezan. ", + "No external storage configured" : "Ez da kanpo biltegiratzerik konfiguratu", + "You can configure external storages in the personal settings" : "Ezarpen pertsonaletan kanpo biltegiratzeak konfigura ditzazkezu", "Name" : "Izena", "Storage type" : "Biltegiratze mota", "External Storage" : "Kanpoko biltegiratzea", diff --git a/apps/files_external/l10n/fr.js b/apps/files_external/l10n/fr.js index cb26cfddcac..cec7d16d752 100644 --- a/apps/files_external/l10n/fr.js +++ b/apps/files_external/l10n/fr.js @@ -30,17 +30,17 @@ OC.L10N.register( "Secure ftps://" : "Sécurisation ftps://", "Client ID" : "ID Client", "Client secret" : "Secret client", - "OpenStack Object Storage" : "Object de Stockage OpenStack", - "Region (optional for OpenStack Object Storage)" : "Region (optionnel pour Object de Stockage OpenStack)", + "OpenStack Object Storage" : "OpenStack Object Storage", + "Region (optional for OpenStack Object Storage)" : "Région (optionnel pour OpenStack Object Storage)", "API Key (required for Rackspace Cloud Files)" : "Clé API (requis pour Rackspace Cloud Files)", "Tenantname (required for OpenStack Object Storage)" : "Nom du locataire (requis pour le stockage OpenStack)", "Password (required for OpenStack Object Storage)" : "Mot de passe (requis pour OpenStack Object Storage)", - "Service Name (required for OpenStack Object Storage)" : "Nom du service (requit pour le stockage OpenStack)", + "Service Name (required for OpenStack Object Storage)" : "Nom du service (requis pour le stockage OpenStack)", "URL of identity endpoint (required for OpenStack Object Storage)" : "URL du point d'accès d'identité (requis pour le stockage OpenStack)", "Timeout of HTTP requests in seconds" : "Temps maximal de requête HTTP en seconde", "Share" : "Partager", "SMB / CIFS using OC login" : "SMB / CIFS en utilisant les identifiants OC", - "Username as share" : "Nom d'utilisateur du partage", + "Username as share" : "Nom d'utilisateur comme nom de partage", "URL" : "URL", "Secure https://" : "Sécurisation https://", "Access granted" : "Accès autorisé", @@ -58,7 +58,7 @@ OC.L10N.register( "<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>Attention : </b> La prise en charge du FTP par PHP n'est pas activée ou installée. Le montage de %s n'est pas possible. Contactez votre administrateur système pour l'installer.", "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Attention : </b> \"%s\" n'est pas installé. Le montage de %s n'est pas possible. Contactez votre administrateur système pour l'installer.", "No external storage configured" : "Aucun stockage externe configuré", - "You can configure external storages in the personal settings" : "Vous pouvez configurer vos stockages externes dans les paramètres personnels.", + "You can configure external storages in the personal settings" : "Vous pouvez configurer des stockages externes dans vos paramètres personnels", "Name" : "Nom", "Storage type" : "Type de support de stockage", "Scope" : "Portée", @@ -69,6 +69,6 @@ OC.L10N.register( "Add storage" : "Ajouter un support de stockage", "Delete" : "Supprimer", "Enable User External Storage" : "Autoriser les utilisateurs à ajouter des stockages externes", - "Allow users to mount the following external storage" : "Autorise les utilisateurs à monter les stockage externes suivants" + "Allow users to mount the following external storage" : "Autoriser les utilisateurs à monter les stockages externes suivants" }, "nplurals=2; plural=(n > 1);"); diff --git a/apps/files_external/l10n/fr.json b/apps/files_external/l10n/fr.json index 5b37d312111..af1e7c22cd3 100644 --- a/apps/files_external/l10n/fr.json +++ b/apps/files_external/l10n/fr.json @@ -28,17 +28,17 @@ "Secure ftps://" : "Sécurisation ftps://", "Client ID" : "ID Client", "Client secret" : "Secret client", - "OpenStack Object Storage" : "Object de Stockage OpenStack", - "Region (optional for OpenStack Object Storage)" : "Region (optionnel pour Object de Stockage OpenStack)", + "OpenStack Object Storage" : "OpenStack Object Storage", + "Region (optional for OpenStack Object Storage)" : "Région (optionnel pour OpenStack Object Storage)", "API Key (required for Rackspace Cloud Files)" : "Clé API (requis pour Rackspace Cloud Files)", "Tenantname (required for OpenStack Object Storage)" : "Nom du locataire (requis pour le stockage OpenStack)", "Password (required for OpenStack Object Storage)" : "Mot de passe (requis pour OpenStack Object Storage)", - "Service Name (required for OpenStack Object Storage)" : "Nom du service (requit pour le stockage OpenStack)", + "Service Name (required for OpenStack Object Storage)" : "Nom du service (requis pour le stockage OpenStack)", "URL of identity endpoint (required for OpenStack Object Storage)" : "URL du point d'accès d'identité (requis pour le stockage OpenStack)", "Timeout of HTTP requests in seconds" : "Temps maximal de requête HTTP en seconde", "Share" : "Partager", "SMB / CIFS using OC login" : "SMB / CIFS en utilisant les identifiants OC", - "Username as share" : "Nom d'utilisateur du partage", + "Username as share" : "Nom d'utilisateur comme nom de partage", "URL" : "URL", "Secure https://" : "Sécurisation https://", "Access granted" : "Accès autorisé", @@ -56,7 +56,7 @@ "<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>Attention : </b> La prise en charge du FTP par PHP n'est pas activée ou installée. Le montage de %s n'est pas possible. Contactez votre administrateur système pour l'installer.", "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Attention : </b> \"%s\" n'est pas installé. Le montage de %s n'est pas possible. Contactez votre administrateur système pour l'installer.", "No external storage configured" : "Aucun stockage externe configuré", - "You can configure external storages in the personal settings" : "Vous pouvez configurer vos stockages externes dans les paramètres personnels.", + "You can configure external storages in the personal settings" : "Vous pouvez configurer des stockages externes dans vos paramètres personnels", "Name" : "Nom", "Storage type" : "Type de support de stockage", "Scope" : "Portée", @@ -67,6 +67,6 @@ "Add storage" : "Ajouter un support de stockage", "Delete" : "Supprimer", "Enable User External Storage" : "Autoriser les utilisateurs à ajouter des stockages externes", - "Allow users to mount the following external storage" : "Autorise les utilisateurs à monter les stockage externes suivants" + "Allow users to mount the following external storage" : "Autoriser les utilisateurs à monter les stockages externes suivants" },"pluralForm" :"nplurals=2; plural=(n > 1);" }
\ No newline at end of file diff --git a/apps/files_external/l10n/gl.js b/apps/files_external/l10n/gl.js index 34d85e2fb4c..8cfb4c39da3 100644 --- a/apps/files_external/l10n/gl.js +++ b/apps/files_external/l10n/gl.js @@ -57,6 +57,7 @@ OC.L10N.register( "<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> 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.", "<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> 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.", "<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» non está instalado. Non é posíbel a montaxe de %s. Consulte co administrador do sistema como instalalo.", + "No external storage configured" : "Non hai un almacenamento externo configurado", "You can configure external storages in the personal settings" : "Ten que configurar o almacenamento externo nos axustes persoais", "Name" : "Nome", "Storage type" : "Tipo de almacenamento", diff --git a/apps/files_external/l10n/gl.json b/apps/files_external/l10n/gl.json index 1bd2241849d..b58107282f9 100644 --- a/apps/files_external/l10n/gl.json +++ b/apps/files_external/l10n/gl.json @@ -55,6 +55,7 @@ "<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> 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.", "<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> 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.", "<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» non está instalado. Non é posíbel a montaxe de %s. Consulte co administrador do sistema como instalalo.", + "No external storage configured" : "Non hai un almacenamento externo configurado", "You can configure external storages in the personal settings" : "Ten que configurar o almacenamento externo nos axustes persoais", "Name" : "Nome", "Storage type" : "Tipo de almacenamento", diff --git a/apps/files_external/l10n/it.js b/apps/files_external/l10n/it.js index bb9e59ded4f..af26cabed76 100644 --- a/apps/files_external/l10n/it.js +++ b/apps/files_external/l10n/it.js @@ -57,6 +57,7 @@ OC.L10N.register( "<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> il supporto a cURL di PHP non è abilitato o installato. Impossibile montare %s. Chiedi al tuo amministratore di sistema di installarlo.", "<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> il supporto a FTP in PHP non è abilitato o installato. Impossibile montare %s. Chiedi al tuo amministratore di sistema di installarlo.", "<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\" non è installato. Impossibile montare %s. Chiedi al tuo amministratore di sistema di installarlo.", + "No external storage configured" : "Nessuna archiviazione esterna configurata", "You can configure external storages in the personal settings" : "Puoi configurare archiviazioni esterno nelle impostazioni personali", "Name" : "Nome", "Storage type" : "Tipo di archiviazione", diff --git a/apps/files_external/l10n/it.json b/apps/files_external/l10n/it.json index dde956a3f6e..678eb4c4b10 100644 --- a/apps/files_external/l10n/it.json +++ b/apps/files_external/l10n/it.json @@ -55,6 +55,7 @@ "<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> il supporto a cURL di PHP non è abilitato o installato. Impossibile montare %s. Chiedi al tuo amministratore di sistema di installarlo.", "<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> il supporto a FTP in PHP non è abilitato o installato. Impossibile montare %s. Chiedi al tuo amministratore di sistema di installarlo.", "<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\" non è installato. Impossibile montare %s. Chiedi al tuo amministratore di sistema di installarlo.", + "No external storage configured" : "Nessuna archiviazione esterna configurata", "You can configure external storages in the personal settings" : "Puoi configurare archiviazioni esterno nelle impostazioni personali", "Name" : "Nome", "Storage type" : "Tipo di archiviazione", diff --git a/apps/files_external/l10n/ja.js b/apps/files_external/l10n/ja.js index 587db2db2a1..f981ff6535f 100644 --- a/apps/files_external/l10n/ja.js +++ b/apps/files_external/l10n/ja.js @@ -13,7 +13,7 @@ OC.L10N.register( "Key" : "キー", "Secret" : "シークレットキー", "Bucket" : "バケット名", - "Amazon S3 and compliant" : "Amazon S3 と互換ストレージ", + "Amazon S3 and compliant" : "Amazon S3や互換ストレージ", "Access Key" : "アクセスキー", "Secret Key" : "シークレットキー", "Hostname" : "ホスト名", @@ -39,7 +39,7 @@ OC.L10N.register( "URL of identity endpoint (required for OpenStack Object Storage)" : "識別用エンドポイントURL (OpenStack ObjectStorage)", "Timeout of HTTP requests in seconds" : "HTTP接続タイムアウト秒数", "Share" : "共有", - "SMB / CIFS using OC login" : "ownCloudログインで SMB/CIFSを使用", + "SMB / CIFS using OC login" : "ownCloudログインを利用したSMB / CIFS", "Username as share" : "共有名", "URL" : "URL", "Secure https://" : "セキュア https://", @@ -57,6 +57,7 @@ OC.L10N.register( "<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をマウントできません。このシステムの管理者にインストールをお願いしてください。", + "No external storage configured" : "外部ストレージは設定されていません", "You can configure external storages in the personal settings" : "個人設定で外部ストレージを設定することができます。", "Name" : "名前", "Storage type" : "ストレージ種別", @@ -64,7 +65,7 @@ OC.L10N.register( "External Storage" : "外部ストレージ", "Folder name" : "フォルダー名", "Configuration" : "設定", - "Available for" : "以下が利用可能", + "Available for" : "利用可能", "Add storage" : "ストレージを追加", "Delete" : "削除", "Enable User External Storage" : "ユーザーの外部ストレージを有効にする", diff --git a/apps/files_external/l10n/ja.json b/apps/files_external/l10n/ja.json index 9808e3849c6..d2cb64ad528 100644 --- a/apps/files_external/l10n/ja.json +++ b/apps/files_external/l10n/ja.json @@ -11,7 +11,7 @@ "Key" : "キー", "Secret" : "シークレットキー", "Bucket" : "バケット名", - "Amazon S3 and compliant" : "Amazon S3 と互換ストレージ", + "Amazon S3 and compliant" : "Amazon S3や互換ストレージ", "Access Key" : "アクセスキー", "Secret Key" : "シークレットキー", "Hostname" : "ホスト名", @@ -37,7 +37,7 @@ "URL of identity endpoint (required for OpenStack Object Storage)" : "識別用エンドポイントURL (OpenStack ObjectStorage)", "Timeout of HTTP requests in seconds" : "HTTP接続タイムアウト秒数", "Share" : "共有", - "SMB / CIFS using OC login" : "ownCloudログインで SMB/CIFSを使用", + "SMB / CIFS using OC login" : "ownCloudログインを利用したSMB / CIFS", "Username as share" : "共有名", "URL" : "URL", "Secure https://" : "セキュア https://", @@ -55,6 +55,7 @@ "<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をマウントできません。このシステムの管理者にインストールをお願いしてください。", + "No external storage configured" : "外部ストレージは設定されていません", "You can configure external storages in the personal settings" : "個人設定で外部ストレージを設定することができます。", "Name" : "名前", "Storage type" : "ストレージ種別", @@ -62,7 +63,7 @@ "External Storage" : "外部ストレージ", "Folder name" : "フォルダー名", "Configuration" : "設定", - "Available for" : "以下が利用可能", + "Available for" : "利用可能", "Add storage" : "ストレージを追加", "Delete" : "削除", "Enable User External Storage" : "ユーザーの外部ストレージを有効にする", diff --git a/apps/files_external/l10n/ko.js b/apps/files_external/l10n/ko.js index 6f77ff4071a..f51456a099c 100644 --- a/apps/files_external/l10n/ko.js +++ b/apps/files_external/l10n/ko.js @@ -1,29 +1,74 @@ OC.L10N.register( "files_external", { + "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "요청 토큰을 가져올 수 없습니다. Dropbox 앱 키와 비밀 값이 올바른지 확인하십시오.", + "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "접근 토큰을 가져올 수 없습니다. Dropbox 앱 키와 비밀 값이 올바른지 확인하십시오.", "Please provide a valid Dropbox app key and secret." : "올바른 Dropbox 앱 키와 암호를 입력하십시오.", + "Step 1 failed. Exception: %s" : "1단계 실패. 예외: %s", + "Step 2 failed. Exception: %s" : "2단계 실패. 예외: %s", "External storage" : "외부 저장소", - "Location" : "장소", + "Local" : "로컬", + "Location" : "위치", "Amazon S3" : "Amazon S3", + "Key" : "키", + "Secret" : "비밀 값", + "Bucket" : "버킷", + "Amazon S3 and compliant" : "Amazon S3 및 호환 가능 서비스", + "Access Key" : "접근 키", + "Secret Key" : "비밀 키", + "Hostname" : "호스트 이름", "Port" : "포트", "Region" : "지역", + "Enable SSL" : "SSL 사용", + "Enable Path Style" : "경로 스타일 사용", + "App key" : "앱 키", + "App secret" : "앱 비밀 값", "Host" : "호스트", "Username" : "사용자 이름", "Password" : "암호", + "Remote subfolder" : "원격 하위 폴더", + "Secure ftps://" : "보안 ftps://", + "Client ID" : "클라이언트 ID", + "Client secret" : "클라이언트 비밀 값", + "OpenStack Object Storage" : "OpenStack 객체 저장소", + "Region (optional for OpenStack Object Storage)" : "지역(OpenStack 객체 저장소는 선택 사항)", + "API Key (required for Rackspace Cloud Files)" : "API 키(Rackspace 클라우드 파일에 필요함)", + "Tenantname (required for OpenStack Object Storage)" : "Tenantname(OpenStack 객체 저장소에 필요함)", + "Password (required for OpenStack Object Storage)" : "암호(OpenStack 객체 저장소에 필요함)", + "Service Name (required for OpenStack Object Storage)" : "서비스 이름(OpenStack 객체 저장소에 필요함)", + "URL of identity endpoint (required for OpenStack Object Storage)" : "Identity 엔드포인트 URL(OpenStack 객체 저장소에 필요함)", + "Timeout of HTTP requests in seconds" : "초 단위 HTTP 요청 시간 제한", "Share" : "공유", + "SMB / CIFS using OC login" : "OC 로그인을 사용하는 SMB/CIFS", + "Username as share" : "사용자 이름으로 공유", "URL" : "URL", + "Secure https://" : "보안 https://", "Access granted" : "접근 허가됨", "Error configuring Dropbox storage" : "Dropbox 저장소 설정 오류", "Grant access" : "접근 권한 부여", "Error configuring Google Drive storage" : "Google 드라이브 저장소 설정 오류", "Personal" : "개인", + "System" : "시스템", + "All users. Type to select user or group." : "모든 사용자입니다. 사용자나 그룹을 선택하려면 입력하십시오", + "(group)" : "(그룹)", "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을(를) 마운트할 수 없습니다. 시스템 관리자에게 설치를 요청하십시오.", + "No external storage configured" : "외부 저장소가 설정되지 않았음", + "You can configure external storages in the personal settings" : "개인 설정에서 외부 저장소를 설정할 수 있습니다", "Name" : "이름", + "Storage type" : "저장소 종류", + "Scope" : "범위", "External Storage" : "외부 저장소", "Folder name" : "폴더 이름", "Configuration" : "설정", + "Available for" : "다음으로 사용 가능", "Add storage" : "저장소 추가", "Delete" : "삭제", - "Enable User External Storage" : "사용자 외부 저장소 사용" + "Enable User External Storage" : "사용자 외부 저장소 사용", + "Allow users to mount the following external storage" : "사용자가 다음 외부 저장소를 마운트할 수 있도록 허용" }, "nplurals=1; plural=0;"); diff --git a/apps/files_external/l10n/ko.json b/apps/files_external/l10n/ko.json index 73112120559..7e1797cffc3 100644 --- a/apps/files_external/l10n/ko.json +++ b/apps/files_external/l10n/ko.json @@ -1,27 +1,72 @@ { "translations": { + "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "요청 토큰을 가져올 수 없습니다. Dropbox 앱 키와 비밀 값이 올바른지 확인하십시오.", + "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "접근 토큰을 가져올 수 없습니다. Dropbox 앱 키와 비밀 값이 올바른지 확인하십시오.", "Please provide a valid Dropbox app key and secret." : "올바른 Dropbox 앱 키와 암호를 입력하십시오.", + "Step 1 failed. Exception: %s" : "1단계 실패. 예외: %s", + "Step 2 failed. Exception: %s" : "2단계 실패. 예외: %s", "External storage" : "외부 저장소", - "Location" : "장소", + "Local" : "로컬", + "Location" : "위치", "Amazon S3" : "Amazon S3", + "Key" : "키", + "Secret" : "비밀 값", + "Bucket" : "버킷", + "Amazon S3 and compliant" : "Amazon S3 및 호환 가능 서비스", + "Access Key" : "접근 키", + "Secret Key" : "비밀 키", + "Hostname" : "호스트 이름", "Port" : "포트", "Region" : "지역", + "Enable SSL" : "SSL 사용", + "Enable Path Style" : "경로 스타일 사용", + "App key" : "앱 키", + "App secret" : "앱 비밀 값", "Host" : "호스트", "Username" : "사용자 이름", "Password" : "암호", + "Remote subfolder" : "원격 하위 폴더", + "Secure ftps://" : "보안 ftps://", + "Client ID" : "클라이언트 ID", + "Client secret" : "클라이언트 비밀 값", + "OpenStack Object Storage" : "OpenStack 객체 저장소", + "Region (optional for OpenStack Object Storage)" : "지역(OpenStack 객체 저장소는 선택 사항)", + "API Key (required for Rackspace Cloud Files)" : "API 키(Rackspace 클라우드 파일에 필요함)", + "Tenantname (required for OpenStack Object Storage)" : "Tenantname(OpenStack 객체 저장소에 필요함)", + "Password (required for OpenStack Object Storage)" : "암호(OpenStack 객체 저장소에 필요함)", + "Service Name (required for OpenStack Object Storage)" : "서비스 이름(OpenStack 객체 저장소에 필요함)", + "URL of identity endpoint (required for OpenStack Object Storage)" : "Identity 엔드포인트 URL(OpenStack 객체 저장소에 필요함)", + "Timeout of HTTP requests in seconds" : "초 단위 HTTP 요청 시간 제한", "Share" : "공유", + "SMB / CIFS using OC login" : "OC 로그인을 사용하는 SMB/CIFS", + "Username as share" : "사용자 이름으로 공유", "URL" : "URL", + "Secure https://" : "보안 https://", "Access granted" : "접근 허가됨", "Error configuring Dropbox storage" : "Dropbox 저장소 설정 오류", "Grant access" : "접근 권한 부여", "Error configuring Google Drive storage" : "Google 드라이브 저장소 설정 오류", "Personal" : "개인", + "System" : "시스템", + "All users. Type to select user or group." : "모든 사용자입니다. 사용자나 그룹을 선택하려면 입력하십시오", + "(group)" : "(그룹)", "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을(를) 마운트할 수 없습니다. 시스템 관리자에게 설치를 요청하십시오.", + "No external storage configured" : "외부 저장소가 설정되지 않았음", + "You can configure external storages in the personal settings" : "개인 설정에서 외부 저장소를 설정할 수 있습니다", "Name" : "이름", + "Storage type" : "저장소 종류", + "Scope" : "범위", "External Storage" : "외부 저장소", "Folder name" : "폴더 이름", "Configuration" : "설정", + "Available for" : "다음으로 사용 가능", "Add storage" : "저장소 추가", "Delete" : "삭제", - "Enable User External Storage" : "사용자 외부 저장소 사용" + "Enable User External Storage" : "사용자 외부 저장소 사용", + "Allow users to mount the following external storage" : "사용자가 다음 외부 저장소를 마운트할 수 있도록 허용" },"pluralForm" :"nplurals=1; plural=0;" }
\ No newline at end of file diff --git a/apps/files_external/l10n/nb_NO.js b/apps/files_external/l10n/nb_NO.js index 19e0051e1e3..1fa2f9a8c6e 100644 --- a/apps/files_external/l10n/nb_NO.js +++ b/apps/files_external/l10n/nb_NO.js @@ -57,6 +57,7 @@ OC.L10N.register( "<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>Merk:</b> Støtte for cURL i PHP er ikke aktivert eller installert. Oppkobling av %s er ikke mulig. Be systemadministratoren om å installere det.", "<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>Merk:</b> FTP-støtte i PHP er ikke slått på eller installert. Kan ikke koble opp %s. Ta kontakt med systemadministratoren for å installere det.", "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Merk:</b> \"%s\" er ikke installert. Oppkobling av %s er ikke mulig. Spør systemadministratoren om å installere det.", + "No external storage configured" : "Eksternt lager er ikke konfigurert", "You can configure external storages in the personal settings" : "Du kan konfigurerer eksterne lagre i personlige innstillinger", "Name" : "Navn", "Storage type" : "Lagringstype", diff --git a/apps/files_external/l10n/nb_NO.json b/apps/files_external/l10n/nb_NO.json index 0b707decbea..6ff246ee2ef 100644 --- a/apps/files_external/l10n/nb_NO.json +++ b/apps/files_external/l10n/nb_NO.json @@ -55,6 +55,7 @@ "<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>Merk:</b> Støtte for cURL i PHP er ikke aktivert eller installert. Oppkobling av %s er ikke mulig. Be systemadministratoren om å installere det.", "<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>Merk:</b> FTP-støtte i PHP er ikke slått på eller installert. Kan ikke koble opp %s. Ta kontakt med systemadministratoren for å installere det.", "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Merk:</b> \"%s\" er ikke installert. Oppkobling av %s er ikke mulig. Spør systemadministratoren om å installere det.", + "No external storage configured" : "Eksternt lager er ikke konfigurert", "You can configure external storages in the personal settings" : "Du kan konfigurerer eksterne lagre i personlige innstillinger", "Name" : "Navn", "Storage type" : "Lagringstype", diff --git a/apps/files_external/l10n/ru.js b/apps/files_external/l10n/ru.js index b1e9f0812f5..0d35cb81dc7 100644 --- a/apps/files_external/l10n/ru.js +++ b/apps/files_external/l10n/ru.js @@ -1,9 +1,9 @@ OC.L10N.register( "files_external", { - "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Ошибка при получении токенов. Проверьте правильность вашего ключа приложения и секретного ключа.", - "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Ошибка при получении токена доступа. Проверьте правильность вашего ключа приложения и секретного ключа.", - "Please provide a valid Dropbox app key and secret." : "Укажите действительные ключ и пароль для Dropbox.", + "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Получение токенов запроса прошло не успешно. Проверьте правильность вашего ключа и секрета Dropbox.", + "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Получение токенов доступа прошло не успешно. Проверьте правильность вашего ключа и секрета Dropbox.", + "Please provide a valid Dropbox app key and secret." : "Укажите действительные ключ и секрет для Dropbox.", "Step 1 failed. Exception: %s" : "Шаг 1 неудачен. Исключение: %s", "Step 2 failed. Exception: %s" : "Шаг 2 неудачен. Исключение: %s", "External storage" : "Внешнее хранилище", @@ -38,7 +38,7 @@ OC.L10N.register( "Service Name (required for OpenStack Object Storage)" : "Имя Службы (обяз. для Хранилища объектов OpenStack)", "URL of identity endpoint (required for OpenStack Object Storage)" : "URL для удостоверения конечной точки (обяз. для Хранилища объектов OpenStack)", "Timeout of HTTP requests in seconds" : "Тайм-аут HTTP-запросов в секундах", - "Share" : "Поделиться", + "Share" : "Общий доступ", "SMB / CIFS using OC login" : "SMB / CIFS с ипользованием логина OC", "Username as share" : "Имя пользователя в качестве имени общего ресурса", "URL" : "Ссылка", @@ -57,8 +57,8 @@ OC.L10N.register( "<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> Поддержка cURL в PHP не включена или не установлена. Монтирование %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> Поддержка FTP в PHP не включена или не установлена. Монтирование %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 невозможно. Пожалуйста, обратитесь к системному администратору.", - "No external storage configured" : "Нет внешних носителей", - "You can configure external storages in the personal settings" : "Вы можете изменить параметры внешних носителей в личных настройках", + "No external storage configured" : "Нет внешних хранилищ", + "You can configure external storages in the personal settings" : "Вы можете изменить параметры внешних хранилищ в личных настройках", "Name" : "Имя", "Storage type" : "Тип хранилища", "Scope" : "Область", @@ -68,7 +68,7 @@ OC.L10N.register( "Available for" : "Доступно для", "Add storage" : "Добавить хранилище", "Delete" : "Удалить", - "Enable User External Storage" : "Включить пользовательские внешние носители", + "Enable User External Storage" : "Включить пользовательские внешние хранилища", "Allow users to mount the following external storage" : "Разрешить пользователям монтировать следующие сервисы хранения данных" }, "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"); diff --git a/apps/files_external/l10n/ru.json b/apps/files_external/l10n/ru.json index 7a0e9aa95ca..537a178853a 100644 --- a/apps/files_external/l10n/ru.json +++ b/apps/files_external/l10n/ru.json @@ -1,7 +1,7 @@ { "translations": { - "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Ошибка при получении токенов. Проверьте правильность вашего ключа приложения и секретного ключа.", - "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Ошибка при получении токена доступа. Проверьте правильность вашего ключа приложения и секретного ключа.", - "Please provide a valid Dropbox app key and secret." : "Укажите действительные ключ и пароль для Dropbox.", + "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Получение токенов запроса прошло не успешно. Проверьте правильность вашего ключа и секрета Dropbox.", + "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Получение токенов доступа прошло не успешно. Проверьте правильность вашего ключа и секрета Dropbox.", + "Please provide a valid Dropbox app key and secret." : "Укажите действительные ключ и секрет для Dropbox.", "Step 1 failed. Exception: %s" : "Шаг 1 неудачен. Исключение: %s", "Step 2 failed. Exception: %s" : "Шаг 2 неудачен. Исключение: %s", "External storage" : "Внешнее хранилище", @@ -36,7 +36,7 @@ "Service Name (required for OpenStack Object Storage)" : "Имя Службы (обяз. для Хранилища объектов OpenStack)", "URL of identity endpoint (required for OpenStack Object Storage)" : "URL для удостоверения конечной точки (обяз. для Хранилища объектов OpenStack)", "Timeout of HTTP requests in seconds" : "Тайм-аут HTTP-запросов в секундах", - "Share" : "Поделиться", + "Share" : "Общий доступ", "SMB / CIFS using OC login" : "SMB / CIFS с ипользованием логина OC", "Username as share" : "Имя пользователя в качестве имени общего ресурса", "URL" : "Ссылка", @@ -55,8 +55,8 @@ "<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> Поддержка cURL в PHP не включена или не установлена. Монтирование %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> Поддержка FTP в PHP не включена или не установлена. Монтирование %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 невозможно. Пожалуйста, обратитесь к системному администратору.", - "No external storage configured" : "Нет внешних носителей", - "You can configure external storages in the personal settings" : "Вы можете изменить параметры внешних носителей в личных настройках", + "No external storage configured" : "Нет внешних хранилищ", + "You can configure external storages in the personal settings" : "Вы можете изменить параметры внешних хранилищ в личных настройках", "Name" : "Имя", "Storage type" : "Тип хранилища", "Scope" : "Область", @@ -66,7 +66,7 @@ "Available for" : "Доступно для", "Add storage" : "Добавить хранилище", "Delete" : "Удалить", - "Enable User External Storage" : "Включить пользовательские внешние носители", + "Enable User External Storage" : "Включить пользовательские внешние хранилища", "Allow users to mount the following external storage" : "Разрешить пользователям монтировать следующие сервисы хранения данных" },"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);" }
\ No newline at end of file diff --git a/apps/files_external/l10n/sk_SK.js b/apps/files_external/l10n/sk_SK.js index 67de616dfc6..e48c31008b7 100644 --- a/apps/files_external/l10n/sk_SK.js +++ b/apps/files_external/l10n/sk_SK.js @@ -33,7 +33,7 @@ OC.L10N.register( "OpenStack Object Storage" : "OpenStack Object Storage", "Region (optional for OpenStack Object Storage)" : "Región (voliteľné pre OpenStack Object Storage)", "API Key (required for Rackspace Cloud Files)" : "API Key (požadované pre Rackspace Cloud Files)", - "Tenantname (required for OpenStack Object Storage)" : "Tenantname (požadované pre OpenStack Object Storage)", + "Tenantname (required for OpenStack Object Storage)" : "Meno nájomcu (požadované pre OpenStack Object Storage)", "Password (required for OpenStack Object Storage)" : "Heslo (požadované pre OpenStack Object Storage)", "Service Name (required for OpenStack Object Storage)" : "Meno služby (požadované pre OpenStack Object Storage)", "URL of identity endpoint (required for OpenStack Object Storage)" : "URL of identity endpoint (požadované pre OpenStack Object Storage)", @@ -53,9 +53,12 @@ OC.L10N.register( "(group)" : "(skupina)", "Saved" : "Uložené", "<b>Note:</b> " : "<b>Poznámka:</b> ", + "and" : "a", "<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>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.", "<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>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.", "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Poznámka:</b> \"%s\" nie je nainštalovaná. Pripojenie %s nie je možné. Požiadajte správcu systému, aby ju nainštaloval.", + "No external storage configured" : "Žiadne externé úložisko nie je nakonfigurované", + "You can configure external storages in the personal settings" : "Externé úložisko si môžete nastaviť v osobnom nastavení", "Name" : "Názov", "Storage type" : "Typ úložiska", "Scope" : "Rozsah", diff --git a/apps/files_external/l10n/sk_SK.json b/apps/files_external/l10n/sk_SK.json index 3ad132167df..e0d6c41b066 100644 --- a/apps/files_external/l10n/sk_SK.json +++ b/apps/files_external/l10n/sk_SK.json @@ -31,7 +31,7 @@ "OpenStack Object Storage" : "OpenStack Object Storage", "Region (optional for OpenStack Object Storage)" : "Región (voliteľné pre OpenStack Object Storage)", "API Key (required for Rackspace Cloud Files)" : "API Key (požadované pre Rackspace Cloud Files)", - "Tenantname (required for OpenStack Object Storage)" : "Tenantname (požadované pre OpenStack Object Storage)", + "Tenantname (required for OpenStack Object Storage)" : "Meno nájomcu (požadované pre OpenStack Object Storage)", "Password (required for OpenStack Object Storage)" : "Heslo (požadované pre OpenStack Object Storage)", "Service Name (required for OpenStack Object Storage)" : "Meno služby (požadované pre OpenStack Object Storage)", "URL of identity endpoint (required for OpenStack Object Storage)" : "URL of identity endpoint (požadované pre OpenStack Object Storage)", @@ -51,9 +51,12 @@ "(group)" : "(skupina)", "Saved" : "Uložené", "<b>Note:</b> " : "<b>Poznámka:</b> ", + "and" : "a", "<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>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.", "<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>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.", "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Poznámka:</b> \"%s\" nie je nainštalovaná. Pripojenie %s nie je možné. Požiadajte správcu systému, aby ju nainštaloval.", + "No external storage configured" : "Žiadne externé úložisko nie je nakonfigurované", + "You can configure external storages in the personal settings" : "Externé úložisko si môžete nastaviť v osobnom nastavení", "Name" : "Názov", "Storage type" : "Typ úložiska", "Scope" : "Rozsah", diff --git a/apps/files_external/l10n/uk.js b/apps/files_external/l10n/uk.js index dc914f9340f..2b1cf3e0ee3 100644 --- a/apps/files_external/l10n/uk.js +++ b/apps/files_external/l10n/uk.js @@ -53,9 +53,12 @@ OC.L10N.register( "(group)" : "(група)", "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> Підтримку cURL в PHP не ввімкнено чи не встановлена. Під'єднатися до %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> Підтримку FTP в PHP не ввімкнено чи не встановлена. Під'єднатися до %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 неможливо. Зверніться до системного адміністратора.", + "No external storage configured" : "Немає налаштованих зовнішніх сховищ", + "You can configure external storages in the personal settings" : "Ви можете налаштувати зовнішні сховища в особистих налаштуваннях", "Name" : "Ім'я", "Storage type" : "Тип сховища", "Scope" : "Область", diff --git a/apps/files_external/l10n/uk.json b/apps/files_external/l10n/uk.json index 7c18abea055..55469685ac9 100644 --- a/apps/files_external/l10n/uk.json +++ b/apps/files_external/l10n/uk.json @@ -51,9 +51,12 @@ "(group)" : "(група)", "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> Підтримку cURL в PHP не ввімкнено чи не встановлена. Під'єднатися до %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> Підтримку FTP в PHP не ввімкнено чи не встановлена. Під'єднатися до %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 неможливо. Зверніться до системного адміністратора.", + "No external storage configured" : "Немає налаштованих зовнішніх сховищ", + "You can configure external storages in the personal settings" : "Ви можете налаштувати зовнішні сховища в особистих налаштуваннях", "Name" : "Ім'я", "Storage type" : "Тип сховища", "Scope" : "Область", diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php index 823c0bcbfc1..ddfab439879 100644 --- a/apps/files_external/lib/config.php +++ b/apps/files_external/lib/config.php @@ -882,6 +882,11 @@ class OC_Mount_Config { return hash('md5', $data); } + /** + * Add storage id to the storage configurations that did not have any. + * + * @param string $user user for which to process storage configs + */ private static function addStorageIdToConfig($user) { $config = self::readData($user); @@ -899,13 +904,35 @@ class OC_Mount_Config { } } + /** + * Get storage id from the numeric storage id and set + * it into the given options argument. Only do this + * if there was no storage id set yet. + * + * This might also fail if a storage wasn't fully configured yet + * and couldn't be mounted, in which case this will simply return false. + * + * @param array $options storage options + * + * @return bool true if the storage id was added, false otherwise + */ private static function addStorageId(&$options) { if (isset($options['storage_id'])) { return false; } + $class = $options['class']; - /** @var \OC\Files\Storage\Storage $storage */ - $storage = new $class($options['options']); + try { + /** @var \OC\Files\Storage\Storage $storage */ + $storage = new $class($options['options']); + // TODO: introduce StorageConfigException + } catch (\Exception $e) { + // storage might not be fully configured yet (ex: Dropbox) + // note that storage instances aren't supposed to open any connections + // in the constructor, so this exception is likely to be a config exception + return false; + } + $options['storage_id'] = $storage->getCache()->getNumericStorageId(); return true; } diff --git a/apps/files_external/tests/mountconfig.php b/apps/files_external/tests/mountconfig.php index 342f020d3a9..f288d02705c 100644 --- a/apps/files_external/tests/mountconfig.php +++ b/apps/files_external/tests/mountconfig.php @@ -21,6 +21,12 @@ */ class Test_Mount_Config_Dummy_Storage { + public function __construct($params) { + if (isset($params['simulateFail']) && $params['simulateFail'] == true) { + throw new \Exception('Simulated config validation fail'); + } + } + public function test() { return true; } @@ -82,6 +88,13 @@ class Test_Mount_Config extends \Test\TestCase { protected function setUp() { parent::setUp(); + OC_Mount_Config::registerBackend('Test_Mount_Config_Dummy_Storage', array( + 'backend' => 'dummy', + 'priority' => 150, + 'configuration' => array() + ) + ); + \OC_User::createUser(self::TEST_USER1, self::TEST_USER1); \OC_User::createUser(self::TEST_USER2, self::TEST_USER2); @@ -184,7 +197,13 @@ class Test_Mount_Config extends \Test\TestCase { $applicable = 'all'; $isPersonal = false; - $this->assertEquals(true, OC_Mount_Config::addMountPoint('/ext', '\OC\Files\Storage\SFTP', array(), $mountType, $applicable, $isPersonal)); + $storageOptions = array( + 'host' => 'localhost', + 'user' => 'testuser', + 'password' => '12345', + ); + + $this->assertEquals(true, OC_Mount_Config::addMountPoint('/ext', '\OC\Files\Storage\SFTP', $storageOptions, $mountType, $applicable, $isPersonal)); $config = $this->readGlobalConfig(); $this->assertEquals(1, count($config)); @@ -205,7 +224,13 @@ class Test_Mount_Config extends \Test\TestCase { $applicable = self::TEST_USER1; $isPersonal = true; - $this->assertEquals(true, OC_Mount_Config::addMountPoint('/ext', '\OC\Files\Storage\SFTP', array(), $mountType, $applicable, $isPersonal)); + $storageOptions = array( + 'host' => 'localhost', + 'user' => 'testuser', + 'password' => '12345', + ); + + $this->assertEquals(true, OC_Mount_Config::addMountPoint('/ext', '\OC\Files\Storage\SFTP', $storageOptions, $mountType, $applicable, $isPersonal)); $config = $this->readUserConfig(); $this->assertEquals(1, count($config)); @@ -236,8 +261,14 @@ class Test_Mount_Config extends \Test\TestCase { implode(',', array_keys($this->allBackends)) ); + $storageOptions = array( + 'host' => 'localhost', + 'user' => 'testuser', + 'password' => '12345', + ); + // non-local but forbidden - $this->assertFalse(OC_Mount_Config::addMountPoint('/ext', '\OC\Files\Storage\SFTP', array(), $mountType, $applicable, $isPersonal)); + $this->assertFalse(OC_Mount_Config::addMountPoint('/ext', '\OC\Files\Storage\SFTP', $storageOptions, $mountType, $applicable, $isPersonal)); $this->assertFalse(file_exists($this->userHome . '/mount.json')); } @@ -629,7 +660,8 @@ class Test_Mount_Config extends \Test\TestCase { 'host' => 'someost', 'user' => 'someuser', 'password' => 'somepassword', - 'root' => 'someroot' + 'root' => 'someroot', + 'share' => '', ); // add mount point as "test" user @@ -872,7 +904,8 @@ class Test_Mount_Config extends \Test\TestCase { 'host' => 'somehost', 'user' => 'someuser', 'password' => 'somepassword', - 'root' => 'someroot' + 'root' => 'someroot', + 'share' => '', ); // Add mount points @@ -908,7 +941,8 @@ class Test_Mount_Config extends \Test\TestCase { 'host' => 'somehost', 'user' => 'someuser', 'password' => 'somepassword', - 'root' => 'someroot' + 'root' => 'someroot', + 'share' => '', ); $this->assertTrue( @@ -954,7 +988,8 @@ class Test_Mount_Config extends \Test\TestCase { 'host' => 'somehost', 'user' => 'someuser', 'password' => 'somepassword', - 'root' => 'someroot' + 'root' => 'someroot', + 'share' => '', ); // Create personal mount point @@ -982,4 +1017,29 @@ class Test_Mount_Config extends \Test\TestCase { $this->assertEquals($mountConfig, $mountPointsOther['/'.self::TEST_USER1.'/files/ext']['options']); } + + public function testAllowWritingIncompleteConfigIfStorageContructorFails() { + $storageClass = 'Test_Mount_Config_Dummy_Storage'; + $mountType = 'user'; + $applicable = 'all'; + $isPersonal = false; + + $this->assertTrue( + OC_Mount_Config::addMountPoint( + '/ext', + $storageClass, + array('simulateFail' => true), + $mountType, + $applicable, + $isPersonal + ) + ); + + // config can be retrieved afterwards + $mounts = OC_Mount_Config::getSystemMountPoints(); + $this->assertEquals(1, count($mounts)); + + // no storage id was set + $this->assertFalse(isset($mounts[0]['storage_id'])); + } } diff --git a/apps/files_sharing/ajax/external.php b/apps/files_sharing/ajax/external.php index 1a709eda07c..30c1f38801e 100644 --- a/apps/files_sharing/ajax/external.php +++ b/apps/files_sharing/ajax/external.php @@ -34,28 +34,78 @@ $externalManager = new \OCA\Files_Sharing\External\Manager( \OC::$server->getDatabaseConnection(), \OC\Files\Filesystem::getMountManager(), \OC\Files\Filesystem::getLoader(), - \OC::$server->getUserSession(), - \OC::$server->getHTTPHelper() + \OC::$server->getHTTPHelper(), + \OC::$server->getUserSession()->getUser()->getUID() ); $name = OCP\Files::buildNotExistingFileName('/', $name); // check for ssl cert if (substr($remote, 0, 5) === 'https' and !OC_Util::getUrlContent($remote)) { - \OCP\JSON::error(array('data' => array('message' => $l->t("Invalid or untrusted SSL certificate")))); + \OCP\JSON::error(array('data' => array('message' => $l->t('Invalid or untrusted SSL certificate')))); exit; } else { $mount = $externalManager->addShare($remote, $token, $password, $name, $owner, true); + /** * @var \OCA\Files_Sharing\External\Storage $storage */ $storage = $mount->getStorage(); + try { + // check if storage exists + $storage->checkStorageAvailability(); + } catch (\OCP\Files\StorageInvalidException $e) { + // note: checkStorageAvailability will already remove the invalid share + \OCP\Util::writeLog( + 'files_sharing', + 'Invalid remote storage: ' . get_class($e) . ': ' . $e->getMessage(), + \OCP\Util::DEBUG + ); + \OCP\JSON::error( + array( + 'data' => array( + 'message' => $l->t('Could not authenticate to remote share, password might be wrong') + ) + ) + ); + exit(); + } catch (\Exception $e) { + \OCP\Util::writeLog( + 'files_sharing', + 'Invalid remote storage: ' . get_class($e) . ': ' . $e->getMessage(), + \OCP\Util::DEBUG + ); + $externalManager->removeShare($mount->getMountPoint()); + \OCP\JSON::error(array('data' => array('message' => $l->t('Storage not valid')))); + exit(); + } $result = $storage->file_exists(''); if ($result) { - $storage->getScanner()->scanAll(); - \OCP\JSON::success(); + try { + $storage->getScanner()->scanAll(); + \OCP\JSON::success(); + } catch (\OCP\Files\StorageInvalidException $e) { + \OCP\Util::writeLog( + 'files_sharing', + 'Invalid remote storage: ' . get_class($e) . ': ' . $e->getMessage(), + \OCP\Util::DEBUG + ); + \OCP\JSON::error(array('data' => array('message' => $l->t('Storage not valid')))); + } catch (\Exception $e) { + \OCP\Util::writeLog( + 'files_sharing', + 'Invalid remote storage: ' . get_class($e) . ': ' . $e->getMessage(), + \OCP\Util::DEBUG + ); + \OCP\JSON::error(array('data' => array('message' => $l->t('Couldn\'t add remote share')))); + } } else { $externalManager->removeShare($mount->getMountPoint()); - \OCP\JSON::error(array('data' => array('message' => $l->t("Couldn't add remote share")))); + \OCP\Util::writeLog( + 'files_sharing', + 'Couldn\'t add remote share', + \OCP\Util::DEBUG + ); + \OCP\JSON::error(array('data' => array('message' => $l->t('Couldn\'t add remote share')))); } } diff --git a/apps/files_sharing/ajax/list.php b/apps/files_sharing/ajax/list.php index 073c86365be..657c6f75da5 100644 --- a/apps/files_sharing/ajax/list.php +++ b/apps/files_sharing/ajax/list.php @@ -64,7 +64,10 @@ $files = \OCA\Files\Helper::getFiles($dir, $sortAttribute, $sortDirection); $formattedFiles = array(); foreach ($files as $file) { $entry = \OCA\Files\Helper::formatFileInfo($file); - unset($entry['directory']); // for now + // for now + unset($entry['directory']); + // do not disclose share owner + unset($entry['shareOwner']); $entry['permissions'] = \OCP\Constants::PERMISSION_READ; $formattedFiles[] = $entry; } diff --git a/apps/files_sharing/ajax/testremote.php b/apps/files_sharing/ajax/testremote.php index 08149bf7ecc..14992787012 100644 --- a/apps/files_sharing/ajax/testremote.php +++ b/apps/files_sharing/ajax/testremote.php @@ -6,6 +6,7 @@ * See the COPYING-README file. */ +OCP\JSON::callCheck(); OCP\JSON::checkAppEnabled('files_sharing'); $remote = $_GET['remote']; diff --git a/apps/files_sharing/api/server2server.php b/apps/files_sharing/api/server2server.php index f78d64caa73..f2f7561598f 100644 --- a/apps/files_sharing/api/server2server.php +++ b/apps/files_sharing/api/server2server.php @@ -34,7 +34,7 @@ class Server2Server { public function createShare($params) { if (!$this->isS2SEnabled(true)) { - return new \OC_OCS_Result(null, 503, 'Server does not support server-to-server sharing'); + return new \OC_OCS_Result(null, 503, 'Server does not support federated cloud sharing'); } $remote = isset($_POST['remote']) ? $_POST['remote'] : null; @@ -60,8 +60,9 @@ class Server2Server { \OC::$server->getDatabaseConnection(), \OC\Files\Filesystem::getMountManager(), \OC\Files\Filesystem::getLoader(), - \OC::$server->getUserSession(), - \OC::$server->getHTTPHelper()); + \OC::$server->getHTTPHelper(), + $shareWith + ); $name = \OCP\Files::buildNotExistingFileName('/', $name); @@ -93,7 +94,7 @@ class Server2Server { public function acceptShare($params) { if (!$this->isS2SEnabled()) { - return new \OC_OCS_Result(null, 503, 'Server does not support server-to-server sharing'); + return new \OC_OCS_Result(null, 503, 'Server does not support federated cloud sharing'); } $id = $params['id']; @@ -120,7 +121,7 @@ class Server2Server { public function declineShare($params) { if (!$this->isS2SEnabled()) { - return new \OC_OCS_Result(null, 503, 'Server does not support server-to-server sharing'); + return new \OC_OCS_Result(null, 503, 'Server does not support federated cloud sharing'); } $id = $params['id']; @@ -151,7 +152,7 @@ class Server2Server { public function unshare($params) { if (!$this->isS2SEnabled()) { - return new \OC_OCS_Result(null, 503, 'Server does not support server-to-server sharing'); + return new \OC_OCS_Result(null, 503, 'Server does not support federated cloud sharing'); } $id = $params['id']; diff --git a/apps/files_sharing/appinfo/app.php b/apps/files_sharing/appinfo/app.php index 36d148dce96..837ceacbab3 100644 --- a/apps/files_sharing/appinfo/app.php +++ b/apps/files_sharing/appinfo/app.php @@ -4,6 +4,7 @@ $l = \OC::$server->getL10N('files_sharing'); OC::$CLASSPATH['OC_Share_Backend_File'] = 'files_sharing/lib/share/file.php'; OC::$CLASSPATH['OC_Share_Backend_Folder'] = 'files_sharing/lib/share/folder.php'; OC::$CLASSPATH['OC\Files\Storage\Shared'] = 'files_sharing/lib/sharedstorage.php'; +OC::$CLASSPATH['OC\Files\Cache\SharedScanner'] = 'files_sharing/lib/scanner.php'; OC::$CLASSPATH['OC\Files\Cache\Shared_Cache'] = 'files_sharing/lib/cache.php'; OC::$CLASSPATH['OC\Files\Cache\Shared_Permissions'] = 'files_sharing/lib/permissions.php'; OC::$CLASSPATH['OC\Files\Cache\Shared_Updater'] = 'files_sharing/lib/updater.php'; @@ -21,7 +22,6 @@ OC::$CLASSPATH['OCA\Files_Sharing\Exceptions\BrokenPath'] = 'files_sharing/lib/e OCP\Share::registerBackend('file', 'OC_Share_Backend_File'); OCP\Share::registerBackend('folder', 'OC_Share_Backend_Folder', 'file'); -OCP\Util::addTranslations('files_sharing'); OCP\Util::addScript('files_sharing', 'share'); OCP\Util::addScript('files_sharing', 'external'); diff --git a/apps/files_sharing/appinfo/update.php b/apps/files_sharing/appinfo/update.php new file mode 100644 index 00000000000..1e910eb6ac1 --- /dev/null +++ b/apps/files_sharing/appinfo/update.php @@ -0,0 +1,12 @@ +<?php + +use OCA\Files_Sharing\Migration; + +$installedVersion = \OC::$server->getConfig()->getAppValue('files_sharing', 'installed_version'); + +// Migration OC7 -> OC8 +if (version_compare($installedVersion, '0.6.0', '<')) { + $m = new Migration(); + $m->addAcceptRow(); +} + diff --git a/apps/files_sharing/appinfo/version b/apps/files_sharing/appinfo/version index 7d8568351b4..a918a2aa18d 100644 --- a/apps/files_sharing/appinfo/version +++ b/apps/files_sharing/appinfo/version @@ -1 +1 @@ -0.5.4 +0.6.0 diff --git a/apps/files_sharing/application.php b/apps/files_sharing/application.php index 773831d99b1..3302848106f 100644 --- a/apps/files_sharing/application.php +++ b/apps/files_sharing/application.php @@ -29,21 +29,22 @@ class Application extends App { parent::__construct('files_sharing', $urlParams); $container = $this->getContainer(); + $server = $container->getServer(); /** * Controllers */ - $container->registerService('ShareController', function(SimpleContainer $c) { + $container->registerService('ShareController', function(SimpleContainer $c) use ($server) { return new ShareController( $c->query('AppName'), $c->query('Request'), $c->query('UserSession'), - $c->query('ServerContainer')->getAppConfig(), - $c->query('ServerContainer')->getConfig(), + $server->getAppConfig(), + $server->getConfig(), $c->query('URLGenerator'), - $c->query('ServerContainer')->getUserManager(), - $c->query('ServerContainer')->getLogger(), - $c->query('ServerContainer')->getActivityManager() + $server->getUserManager(), + $server->getLogger(), + $server->getActivityManager() ); }); $container->registerService('ExternalSharesController', function(SimpleContainer $c) { @@ -58,33 +59,35 @@ class Application extends App { /** * Core class wrappers */ - $container->registerService('UserSession', function(SimpleContainer $c) { - return $c->query('ServerContainer')->getUserSession(); + $container->registerService('UserSession', function(SimpleContainer $c) use ($server) { + return $server->getUserSession(); }); - $container->registerService('URLGenerator', function(SimpleContainer $c) { - return $c->query('ServerContainer')->getUrlGenerator(); + $container->registerService('URLGenerator', function(SimpleContainer $c) use ($server){ + return $server->getUrlGenerator(); }); $container->registerService('IsIncomingShareEnabled', function(SimpleContainer $c) { return Helper::isIncomingServer2serverShareEnabled(); }); - $container->registerService('ExternalManager', function(SimpleContainer $c) { + $container->registerService('ExternalManager', function(SimpleContainer $c) use ($server){ + $user = $server->getUserSession()->getUser(); + $uid = $user ? $user->getUID() : null; return new \OCA\Files_Sharing\External\Manager( - \OC::$server->getDatabaseConnection(), + $server->getDatabaseConnection(), \OC\Files\Filesystem::getMountManager(), \OC\Files\Filesystem::getLoader(), - \OC::$server->getUserSession(), - \OC::$server->getHTTPHelper() + $server->getHTTPHelper(), + $uid ); }); /** * Middleware */ - $container->registerService('SharingCheckMiddleware', function(SimpleContainer $c){ + $container->registerService('SharingCheckMiddleware', function(SimpleContainer $c) use ($server){ return new SharingCheckMiddleware( $c->query('AppName'), - $c->query('ServerContainer')->getAppConfig(), - $c->getCoreApi() + $server->getConfig(), + $server->getAppManager() ); }); diff --git a/apps/files_sharing/js/external.js b/apps/files_sharing/js/external.js index aeb4b2461f8..f658de307ab 100644 --- a/apps/files_sharing/js/external.js +++ b/apps/files_sharing/js/external.js @@ -44,7 +44,8 @@ {name: name, owner: owner, remote: remoteClean} ), t('files_sharing','Remote share'), - function (result) { + function (result, password) { + share.password = password; callback(result, share); }, true, @@ -62,72 +63,94 @@ $buttons.eq(0).text(t('core', 'Cancel')); $buttons.eq(1).text(t('files_sharing', 'Add remote share')); }; -})(); -$(document).ready(function () { - // FIXME: HACK: do not init when running unit tests, need a better way - if (!window.TESTING && OCA.Files) {// only run in the files app - var params = OC.Util.History.parseUrlQuery(); + OCA.Sharing.ExternalShareDialogPlugin = { - //manually add server-to-server share - if (params.remote && params.token && params.owner && params.name) { + filesApp: null, - var callbackAddShare = function(result, share) { - var password = share.password || ''; - if (result) { - //$.post(OC.generateUrl('/apps/files_sharing/api/externalShares'), {id: share.id}); - $.post(OC.generateUrl('apps/files_sharing/external'), { - remote: share.remote, - token: share.token, - owner: share.owner, - name: share.name, - password: password}, function(result) { - if (result.status === 'error') { - OC.Notification.show(result.data.message); - } else { - FileList.reload(); - } - }); - } - }; + attach: function(filesApp) { + this.filesApp = filesApp; + this.processIncomingShareFromUrl(); + this.processSharesToConfirm(); + }, - // clear hash, it is unlikely that it contain any extra parameters - location.hash = ''; - params.passwordProtected = parseInt(params.protected, 10) === 1; - OCA.Sharing.showAddExternalDialog( - params, - params.passwordProtected, - callbackAddShare - ); - } + /** + * Process incoming remote share that might have been passed + * through the URL + */ + processIncomingShareFromUrl: function() { + var fileList = this.filesApp.fileList; + var params = OC.Util.History.parseUrlQuery(); + //manually add server-to-server share + if (params.remote && params.token && params.owner && params.name) { - // check for new server-to-server shares which need to be approved - $.get(OC.generateUrl('/apps/files_sharing/api/externalShares'), - {}, - function(shares) { - var index; - for (index = 0; index < shares.length; ++index) { - OCA.Sharing.showAddExternalDialog( - shares[index], - false, - function(result, share) { - if (result) { - // Accept - $.post(OC.generateUrl('/apps/files_sharing/api/externalShares'), {id: share.id}); - FileList.reload(); + var callbackAddShare = function(result, share) { + var password = share.password || ''; + if (result) { + //$.post(OC.generateUrl('/apps/files_sharing/api/externalShares'), {id: share.id}); + $.post(OC.generateUrl('apps/files_sharing/external'), { + remote: share.remote, + token: share.token, + owner: share.owner, + name: share.name, + password: password}, function(result) { + if (result.status === 'error') { + OC.Notification.showTemporary(result.data.message); } else { - // Delete - $.ajax({ - url: OC.generateUrl('/apps/files_sharing/api/externalShares/'+share.id), - type: 'DELETE' - }); + fileList.reload(); } - } + }); + } + }; + + // clear hash, it is unlikely that it contain any extra parameters + location.hash = ''; + params.passwordProtected = parseInt(params.protected, 10) === 1; + OCA.Sharing.showAddExternalDialog( + params, + params.passwordProtected, + callbackAddShare ); } + }, - }); + /** + * Retrieve a list of remote shares that need to be approved + */ + processSharesToConfirm: function() { + var fileList = this.filesApp.fileList; + // check for new server-to-server shares which need to be approved + $.get(OC.generateUrl('/apps/files_sharing/api/externalShares'), + {}, + function(shares) { + var index; + for (index = 0; index < shares.length; ++index) { + OCA.Sharing.showAddExternalDialog( + shares[index], + false, + function(result, share) { + if (result) { + // Accept + $.post(OC.generateUrl('/apps/files_sharing/api/externalShares'), {id: share.id}) + .then(function() { + fileList.reload(); + }); + } else { + // Delete + $.ajax({ + url: OC.generateUrl('/apps/files_sharing/api/externalShares/'+share.id), + type: 'DELETE' + }); + } + } + ); + } + + }); + + } + }; +})(); - } +OC.Plugins.register('OCA.Files.App', OCA.Sharing.ExternalShareDialogPlugin); -}); diff --git a/apps/files_sharing/js/public.js b/apps/files_sharing/js/public.js index 02ecf56fa09..bec43a4fb57 100644 --- a/apps/files_sharing/js/public.js +++ b/apps/files_sharing/js/public.js @@ -8,7 +8,7 @@ * */ -/* global FileActions, Files */ +/* global FileActions, Files, FileList */ /* global dragOptions, folderDropOptions */ if (!OCA.Sharing) { OCA.Sharing = {}; @@ -97,7 +97,17 @@ OCA.Sharing.PublicApp = { }; var img = $('<img class="publicpreview" alt="">'); - if (previewSupported === 'true' || mimetype.substr(0, mimetype.indexOf('/')) === 'image' && mimetype !== 'image/svg+xml') { + + var fileSize = parseInt($('#filesize').val(), 10); + var maxGifSize = parseInt($('#maxSizeAnimateGif').val(), 10); + + if (mimetype === 'image/gif' && + (maxGifSize === -1 || fileSize <= (maxGifSize * 1024 * 1024))) { + img.attr('src', $('#downloadURL').val()); + img.appendTo('#imgframe'); + } else if (previewSupported === 'true' || + mimetype.substr(0, mimetype.indexOf('/')) === 'image' && + mimetype !== 'image/svg+xml') { img.attr('src', OC.filePath('files_sharing', 'ajax', 'publicpreview.php') + '?' + OC.buildQueryString(params)); img.appendTo('#imgframe'); } else if (mimetype.substr(0, mimetype.indexOf('/')) !== 'video') { @@ -164,6 +174,11 @@ OCA.Sharing.PublicApp = { // URL history handling this.fileList.$el.on('changeDirectory', _.bind(this._onDirectoryChanged, this)); OC.Util.History.addOnPopStateHandler(_.bind(this._onUrlChanged, this)); + + $('#download').click(function (e) { + e.preventDefault(); + OC.redirect(FileList.getDownloadUrl()); + }); } $(document).on('click', '#directLink', function () { diff --git a/apps/files_sharing/js/share.js b/apps/files_sharing/js/share.js index 3a16c1f2edd..11c3170c2f0 100644 --- a/apps/files_sharing/js/share.js +++ b/apps/files_sharing/js/share.js @@ -25,7 +25,7 @@ * @param {OCA.Files.FileList} fileList file list to be extended */ attach: function(fileList) { - if (fileList.id === 'trashbin') { + if (fileList.id === 'trashbin' || fileList.id === 'files.public') { return; } var fileActions = fileList.fileActions; diff --git a/apps/files_sharing/l10n/af_ZA.js b/apps/files_sharing/l10n/af_ZA.js index 4e05c598353..4a732284a8c 100644 --- a/apps/files_sharing/l10n/af_ZA.js +++ b/apps/files_sharing/l10n/af_ZA.js @@ -2,6 +2,7 @@ OC.L10N.register( "files_sharing", { "Cancel" : "Kanseleer", + "Share" : "Deel", "Password" : "Wagwoord" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files_sharing/l10n/af_ZA.json b/apps/files_sharing/l10n/af_ZA.json index 1e959e1544a..9ee5e104930 100644 --- a/apps/files_sharing/l10n/af_ZA.json +++ b/apps/files_sharing/l10n/af_ZA.json @@ -1,5 +1,6 @@ { "translations": { "Cancel" : "Kanseleer", + "Share" : "Deel", "Password" : "Wagwoord" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/ar.js b/apps/files_sharing/l10n/ar.js index de2b179847a..88b13872ef0 100644 --- a/apps/files_sharing/l10n/ar.js +++ b/apps/files_sharing/l10n/ar.js @@ -2,6 +2,7 @@ OC.L10N.register( "files_sharing", { "Cancel" : "إلغاء", + "Share" : "شارك", "Shared by" : "تم مشاركتها بواسطة", "This share is password-protected" : "هذه المشاركة محمية بكلمة مرور", "The password is wrong. Try again." : "كلمة المرور خاطئة. حاول مرة أخرى", diff --git a/apps/files_sharing/l10n/ar.json b/apps/files_sharing/l10n/ar.json index 890035152a2..bfcd3376317 100644 --- a/apps/files_sharing/l10n/ar.json +++ b/apps/files_sharing/l10n/ar.json @@ -1,5 +1,6 @@ { "translations": { "Cancel" : "إلغاء", + "Share" : "شارك", "Shared by" : "تم مشاركتها بواسطة", "This share is password-protected" : "هذه المشاركة محمية بكلمة مرور", "The password is wrong. Try again." : "كلمة المرور خاطئة. حاول مرة أخرى", diff --git a/apps/files_sharing/l10n/ast.js b/apps/files_sharing/l10n/ast.js index 5c935410b6f..95349a45349 100644 --- a/apps/files_sharing/l10n/ast.js +++ b/apps/files_sharing/l10n/ast.js @@ -14,6 +14,7 @@ OC.L10N.register( "Cancel" : "Encaboxar", "Add remote share" : "Amestar compartición remota", "Invalid ownCloud url" : "Url ownCloud inválida", + "Share" : "Compartir", "Shared by" : "Compartíos por", "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.", diff --git a/apps/files_sharing/l10n/ast.json b/apps/files_sharing/l10n/ast.json index d776a4fefba..e5fe0ee0c5d 100644 --- a/apps/files_sharing/l10n/ast.json +++ b/apps/files_sharing/l10n/ast.json @@ -12,6 +12,7 @@ "Cancel" : "Encaboxar", "Add remote share" : "Amestar compartición remota", "Invalid ownCloud url" : "Url ownCloud inválida", + "Share" : "Compartir", "Shared by" : "Compartíos por", "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.", diff --git a/apps/files_sharing/l10n/az.js b/apps/files_sharing/l10n/az.js index 223fbfdef59..aa4ec130ae7 100644 --- a/apps/files_sharing/l10n/az.js +++ b/apps/files_sharing/l10n/az.js @@ -11,6 +11,7 @@ OC.L10N.register( "Cancel" : "Dayandır", "Add remote share" : "Uzaq yayımlanmanı əlavə et", "Invalid ownCloud url" : "Yalnış ownCloud url-i", + "Share" : "Yayımla", "Shared by" : "Tərəfindən yayımlanıb", "Password" : "Şifrə", "Name" : "Ad", diff --git a/apps/files_sharing/l10n/az.json b/apps/files_sharing/l10n/az.json index 3bd23948fd6..c27f6426525 100644 --- a/apps/files_sharing/l10n/az.json +++ b/apps/files_sharing/l10n/az.json @@ -9,6 +9,7 @@ "Cancel" : "Dayandır", "Add remote share" : "Uzaq yayımlanmanı əlavə et", "Invalid ownCloud url" : "Yalnış ownCloud url-i", + "Share" : "Yayımla", "Shared by" : "Tərəfindən yayımlanıb", "Password" : "Şifrə", "Name" : "Ad", diff --git a/apps/files_sharing/l10n/bg_BG.js b/apps/files_sharing/l10n/bg_BG.js index 6da77164ddc..7a637db3a40 100644 --- a/apps/files_sharing/l10n/bg_BG.js +++ b/apps/files_sharing/l10n/bg_BG.js @@ -4,20 +4,36 @@ OC.L10N.register( "Server to server sharing is not enabled on this server" : "Споделяне между сървъри не е разрешено на този сървър.", "The mountpoint name contains invalid characters." : "Името на mountpoint-a съдържа невалидни символи.", "Invalid or untrusted SSL certificate" : "Невалиден или ненадежден SSL сертификат", + "Could not authenticate to remote share, password might be wrong" : "Неуспешно автентициране към отсрещната страна, паролата може да е грешна", + "Storage not valid" : "Невалидно дисково пространство.", "Couldn't add remote share" : "Неуспешно добавяне на отдалечена споделена директория.", "Shared with you" : "Споделено с теб", "Shared with others" : "Споделено с други", "Shared by link" : "Споделено с връзка", + "Nothing shared with you yet" : "Все още няма нищо споделено с теб", + "Files and folders others share with you will show up here" : "Файлове и папки, споделени от други с теб, ще се показват тук", + "Nothing shared yet" : "Още нищо не е споделено", + "Files and folders you share will show up here" : "Файлове и папки, които ти споделяшм ще се показват тук.", + "No shared links" : "Няма споделени връзки", + "Files and folders you share by link will show up here" : "Файлове и директории, които ти споделяш чрез връзки, ще се показват тук", "Do you want to add the remote share {name} from {owner}@{remote}?" : "Желаеш ли да добавиш като прикачената папка {name} от {owner}@{remote}?", "Remote share" : "Прикачена Папка", "Remote share password" : "Парола за прикачена папка", "Cancel" : "Отказ", "Add remote share" : "Добави прикачена папка", + "No ownCloud installation (7 or higher) found at {remote}" : "Не е открита ownCloud ( 7 или по-висока ) инсталация на {remote}.", "Invalid ownCloud url" : "Невалиден ownCloud интернет адрес.", + "Share" : "Сподели", "Shared by" : "Споделено от", + "A file or folder was shared from <strong>another server</strong>" : "Файл или папка е споделен от <strong>друг сървър</strong>", + "A public shared file or folder was <strong>downloaded</strong>" : "Публично споделен файл или папка е <strong>изтеглен</strong>", + "%1$s unshared %2$s from you" : "%1$s спря споделянето на %2$s с теб", + "Public shared folder %1$s was downloaded" : "Публично споделената папка %1$s бе изтеглена", + "Public shared file %1$s was downloaded" : "Публично споделения файл %1$s бе изтеглен", "This share is password-protected" : "Тази зона е защитена с парола.", "The password is wrong. Try again." : "Грешна парола. Опитай отново.", "Password" : "Парола", + "No entries found in this folder" : "Няма намерени записи в тази директория", "Name" : "Име", "Share time" : "Споделено на", "Sorry, this link doesn’t seem to work anymore." : "Съжаляваме, връзката вече не е активна.", @@ -30,7 +46,6 @@ OC.L10N.register( "Download" : "Изтегли", "Download %s" : "Изтегли %s", "Direct link" : "Директна връзка", - "Server-to-Server Sharing" : "Споделяне между Сървъри", "Allow users on this server to send shares to other servers" : "Позволи на потребители от този сървър да споделят папки с други сървъри", "Allow users on this server to receive shares from other servers" : "Позволи на потребители на този сървър да получават споделени папки от други сървъри" }, diff --git a/apps/files_sharing/l10n/bg_BG.json b/apps/files_sharing/l10n/bg_BG.json index f151698099b..c4180087200 100644 --- a/apps/files_sharing/l10n/bg_BG.json +++ b/apps/files_sharing/l10n/bg_BG.json @@ -2,20 +2,36 @@ "Server to server sharing is not enabled on this server" : "Споделяне между сървъри не е разрешено на този сървър.", "The mountpoint name contains invalid characters." : "Името на mountpoint-a съдържа невалидни символи.", "Invalid or untrusted SSL certificate" : "Невалиден или ненадежден SSL сертификат", + "Could not authenticate to remote share, password might be wrong" : "Неуспешно автентициране към отсрещната страна, паролата може да е грешна", + "Storage not valid" : "Невалидно дисково пространство.", "Couldn't add remote share" : "Неуспешно добавяне на отдалечена споделена директория.", "Shared with you" : "Споделено с теб", "Shared with others" : "Споделено с други", "Shared by link" : "Споделено с връзка", + "Nothing shared with you yet" : "Все още няма нищо споделено с теб", + "Files and folders others share with you will show up here" : "Файлове и папки, споделени от други с теб, ще се показват тук", + "Nothing shared yet" : "Още нищо не е споделено", + "Files and folders you share will show up here" : "Файлове и папки, които ти споделяшм ще се показват тук.", + "No shared links" : "Няма споделени връзки", + "Files and folders you share by link will show up here" : "Файлове и директории, които ти споделяш чрез връзки, ще се показват тук", "Do you want to add the remote share {name} from {owner}@{remote}?" : "Желаеш ли да добавиш като прикачената папка {name} от {owner}@{remote}?", "Remote share" : "Прикачена Папка", "Remote share password" : "Парола за прикачена папка", "Cancel" : "Отказ", "Add remote share" : "Добави прикачена папка", + "No ownCloud installation (7 or higher) found at {remote}" : "Не е открита ownCloud ( 7 или по-висока ) инсталация на {remote}.", "Invalid ownCloud url" : "Невалиден ownCloud интернет адрес.", + "Share" : "Сподели", "Shared by" : "Споделено от", + "A file or folder was shared from <strong>another server</strong>" : "Файл или папка е споделен от <strong>друг сървър</strong>", + "A public shared file or folder was <strong>downloaded</strong>" : "Публично споделен файл или папка е <strong>изтеглен</strong>", + "%1$s unshared %2$s from you" : "%1$s спря споделянето на %2$s с теб", + "Public shared folder %1$s was downloaded" : "Публично споделената папка %1$s бе изтеглена", + "Public shared file %1$s was downloaded" : "Публично споделения файл %1$s бе изтеглен", "This share is password-protected" : "Тази зона е защитена с парола.", "The password is wrong. Try again." : "Грешна парола. Опитай отново.", "Password" : "Парола", + "No entries found in this folder" : "Няма намерени записи в тази директория", "Name" : "Име", "Share time" : "Споделено на", "Sorry, this link doesn’t seem to work anymore." : "Съжаляваме, връзката вече не е активна.", @@ -28,7 +44,6 @@ "Download" : "Изтегли", "Download %s" : "Изтегли %s", "Direct link" : "Директна връзка", - "Server-to-Server Sharing" : "Споделяне между Сървъри", "Allow users on this server to send shares to other servers" : "Позволи на потребители от този сървър да споделят папки с други сървъри", "Allow users on this server to receive shares from other servers" : "Позволи на потребители на този сървър да получават споделени папки от други сървъри" },"pluralForm" :"nplurals=2; plural=(n != 1);" diff --git a/apps/files_sharing/l10n/bn_BD.js b/apps/files_sharing/l10n/bn_BD.js index f297d1f7b18..64d27cb8857 100644 --- a/apps/files_sharing/l10n/bn_BD.js +++ b/apps/files_sharing/l10n/bn_BD.js @@ -9,6 +9,7 @@ OC.L10N.register( "Remote share" : "দুরবর্তী ভাগাভাগি", "Cancel" : "বাতিল", "Invalid ownCloud url" : "অবৈধ ওউনক্লাউড url", + "Share" : "ভাগাভাগি কর", "Shared by" : "যাদের মাঝে ভাগাভাগি করা হয়েছে", "This share is password-protected" : "এই শেয়ারটি কূটশব্দদ্বারা সুরক্ষিত", "The password is wrong. Try again." : "কুটশব্দটি ভুল। আবার চেষ্টা করুন।", diff --git a/apps/files_sharing/l10n/bn_BD.json b/apps/files_sharing/l10n/bn_BD.json index cff7925505c..f1d67cfd881 100644 --- a/apps/files_sharing/l10n/bn_BD.json +++ b/apps/files_sharing/l10n/bn_BD.json @@ -7,6 +7,7 @@ "Remote share" : "দুরবর্তী ভাগাভাগি", "Cancel" : "বাতিল", "Invalid ownCloud url" : "অবৈধ ওউনক্লাউড url", + "Share" : "ভাগাভাগি কর", "Shared by" : "যাদের মাঝে ভাগাভাগি করা হয়েছে", "This share is password-protected" : "এই শেয়ারটি কূটশব্দদ্বারা সুরক্ষিত", "The password is wrong. Try again." : "কুটশব্দটি ভুল। আবার চেষ্টা করুন।", diff --git a/apps/files_sharing/l10n/bn_IN.js b/apps/files_sharing/l10n/bn_IN.js index 61694c85575..34d657b12eb 100644 --- a/apps/files_sharing/l10n/bn_IN.js +++ b/apps/files_sharing/l10n/bn_IN.js @@ -2,6 +2,7 @@ OC.L10N.register( "files_sharing", { "Cancel" : "বাতিল করা", + "Share" : "শেয়ার", "Name" : "নাম", "Download" : "ডাউনলোড করুন" }, diff --git a/apps/files_sharing/l10n/bn_IN.json b/apps/files_sharing/l10n/bn_IN.json index 344c7677c19..8879de61c23 100644 --- a/apps/files_sharing/l10n/bn_IN.json +++ b/apps/files_sharing/l10n/bn_IN.json @@ -1,5 +1,6 @@ { "translations": { "Cancel" : "বাতিল করা", + "Share" : "শেয়ার", "Name" : "নাম", "Download" : "ডাউনলোড করুন" },"pluralForm" :"nplurals=2; plural=(n != 1);" diff --git a/apps/files_sharing/l10n/bs.js b/apps/files_sharing/l10n/bs.js index 9ff10d77a5b..1a0e62a930b 100644 --- a/apps/files_sharing/l10n/bs.js +++ b/apps/files_sharing/l10n/bs.js @@ -2,6 +2,7 @@ OC.L10N.register( "files_sharing", { "Cancel" : "Odustani", + "Share" : "Dijeli", "Shared by" : "Dijeli", "Password" : "Lozinka", "Name" : "Ime", diff --git a/apps/files_sharing/l10n/bs.json b/apps/files_sharing/l10n/bs.json index c2bfb948e8e..ea6c7082e2c 100644 --- a/apps/files_sharing/l10n/bs.json +++ b/apps/files_sharing/l10n/bs.json @@ -1,5 +1,6 @@ { "translations": { "Cancel" : "Odustani", + "Share" : "Dijeli", "Shared by" : "Dijeli", "Password" : "Lozinka", "Name" : "Ime", diff --git a/apps/files_sharing/l10n/ca.js b/apps/files_sharing/l10n/ca.js index e65956d5f56..08affe3a280 100644 --- a/apps/files_sharing/l10n/ca.js +++ b/apps/files_sharing/l10n/ca.js @@ -13,6 +13,7 @@ OC.L10N.register( "Cancel" : "Cancel·la", "Add remote share" : "Afegeix compartició remota", "Invalid ownCloud url" : "La url d'ownCloud no és vàlida", + "Share" : "Comparteix", "Shared by" : "Compartit per", "This share is password-protected" : "Aquest compartit està protegit amb contrasenya", "The password is wrong. Try again." : "la contrasenya és incorrecta. Intenteu-ho de nou.", diff --git a/apps/files_sharing/l10n/ca.json b/apps/files_sharing/l10n/ca.json index 69e766582c8..feed7ab13b2 100644 --- a/apps/files_sharing/l10n/ca.json +++ b/apps/files_sharing/l10n/ca.json @@ -11,6 +11,7 @@ "Cancel" : "Cancel·la", "Add remote share" : "Afegeix compartició remota", "Invalid ownCloud url" : "La url d'ownCloud no és vàlida", + "Share" : "Comparteix", "Shared by" : "Compartit per", "This share is password-protected" : "Aquest compartit està protegit amb contrasenya", "The password is wrong. Try again." : "la contrasenya és incorrecta. Intenteu-ho de nou.", diff --git a/apps/files_sharing/l10n/cs_CZ.js b/apps/files_sharing/l10n/cs_CZ.js index ebe683ff89f..14d9ffe4a1d 100644 --- a/apps/files_sharing/l10n/cs_CZ.js +++ b/apps/files_sharing/l10n/cs_CZ.js @@ -4,6 +4,8 @@ OC.L10N.register( "Server to server sharing is not enabled on this server" : "Sdílení mezi servery není povoleno", "The mountpoint name contains invalid characters." : "Jméno přípojného bodu obsahuje nepovolené znaky.", "Invalid or untrusted SSL certificate" : "Neplatný nebo nedůvěryhodný SSL certifikát", + "Could not authenticate to remote share, password might be wrong" : "Nezdařilo se ověření vzdáleného úložiště, pravděpodobně chybné heslo", + "Storage not valid" : "Úložiště není platné", "Couldn't add remote share" : "Nelze přidat vzdálené úložiště", "Shared with you" : "Sdíleno s vámi", "Shared with others" : "Sdíleno s ostatními", @@ -21,6 +23,7 @@ OC.L10N.register( "Add remote share" : "Přidat vzdálené úložiště", "No ownCloud installation (7 or higher) found at {remote}" : "Nebyla nalezena instalace ownCloud (7 nebo vyšší) na {remote}", "Invalid ownCloud url" : "Neplatná ownCloud url", + "Share" : "Sdílet", "Shared by" : "Sdílí", "A file or folder was shared from <strong>another server</strong>" : "Soubor nebo složka byla nasdílena z <strong>jiného serveru</strong>", "A public shared file or folder was <strong>downloaded</strong>" : "Byl <strong>stažen</strong> veřejně sdílený soubor nebo adresář", @@ -46,7 +49,7 @@ OC.L10N.register( "Download" : "Stáhnout", "Download %s" : "Stáhnout %s", "Direct link" : "Přímý odkaz", - "Server-to-Server Sharing" : "Sdílení mezi servery", + "Federated Cloud Sharing" : "Propojené cloudové sdílení", "Allow users on this server to send shares to other servers" : "Povolit uživatelům z tohoto serveru zasílat sdílení na jiné servery", "Allow users on this server to receive shares from other servers" : "Povolit uživatelům z tohoto serveru přijímat sdílení z jiných serverů" }, diff --git a/apps/files_sharing/l10n/cs_CZ.json b/apps/files_sharing/l10n/cs_CZ.json index 4b3d934132a..d0679be3227 100644 --- a/apps/files_sharing/l10n/cs_CZ.json +++ b/apps/files_sharing/l10n/cs_CZ.json @@ -2,6 +2,8 @@ "Server to server sharing is not enabled on this server" : "Sdílení mezi servery není povoleno", "The mountpoint name contains invalid characters." : "Jméno přípojného bodu obsahuje nepovolené znaky.", "Invalid or untrusted SSL certificate" : "Neplatný nebo nedůvěryhodný SSL certifikát", + "Could not authenticate to remote share, password might be wrong" : "Nezdařilo se ověření vzdáleného úložiště, pravděpodobně chybné heslo", + "Storage not valid" : "Úložiště není platné", "Couldn't add remote share" : "Nelze přidat vzdálené úložiště", "Shared with you" : "Sdíleno s vámi", "Shared with others" : "Sdíleno s ostatními", @@ -19,6 +21,7 @@ "Add remote share" : "Přidat vzdálené úložiště", "No ownCloud installation (7 or higher) found at {remote}" : "Nebyla nalezena instalace ownCloud (7 nebo vyšší) na {remote}", "Invalid ownCloud url" : "Neplatná ownCloud url", + "Share" : "Sdílet", "Shared by" : "Sdílí", "A file or folder was shared from <strong>another server</strong>" : "Soubor nebo složka byla nasdílena z <strong>jiného serveru</strong>", "A public shared file or folder was <strong>downloaded</strong>" : "Byl <strong>stažen</strong> veřejně sdílený soubor nebo adresář", @@ -44,7 +47,7 @@ "Download" : "Stáhnout", "Download %s" : "Stáhnout %s", "Direct link" : "Přímý odkaz", - "Server-to-Server Sharing" : "Sdílení mezi servery", + "Federated Cloud Sharing" : "Propojené cloudové sdílení", "Allow users on this server to send shares to other servers" : "Povolit uživatelům z tohoto serveru zasílat sdílení na jiné servery", "Allow users on this server to receive shares from other servers" : "Povolit uživatelům z tohoto serveru přijímat sdílení z jiných serverů" },"pluralForm" :"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;" diff --git a/apps/files_sharing/l10n/cy_GB.js b/apps/files_sharing/l10n/cy_GB.js index 1a8addf1729..015052cbae6 100644 --- a/apps/files_sharing/l10n/cy_GB.js +++ b/apps/files_sharing/l10n/cy_GB.js @@ -2,6 +2,7 @@ OC.L10N.register( "files_sharing", { "Cancel" : "Diddymu", + "Share" : "Rhannu", "Shared by" : "Rhannwyd gan", "Password" : "Cyfrinair", "Name" : "Enw", diff --git a/apps/files_sharing/l10n/cy_GB.json b/apps/files_sharing/l10n/cy_GB.json index 9eebc50be7d..dad13499601 100644 --- a/apps/files_sharing/l10n/cy_GB.json +++ b/apps/files_sharing/l10n/cy_GB.json @@ -1,5 +1,6 @@ { "translations": { "Cancel" : "Diddymu", + "Share" : "Rhannu", "Shared by" : "Rhannwyd gan", "Password" : "Cyfrinair", "Name" : "Enw", diff --git a/apps/files_sharing/l10n/da.js b/apps/files_sharing/l10n/da.js index 2a5ba4f6a6b..2c5fe6b82f5 100644 --- a/apps/files_sharing/l10n/da.js +++ b/apps/files_sharing/l10n/da.js @@ -4,7 +4,9 @@ OC.L10N.register( "Server to server sharing is not enabled on this server" : "Server til serverdeling er ikke slået til på denne server", "The mountpoint name contains invalid characters." : "Monteringspunktets navn indeholder ugyldige tegn.", "Invalid or untrusted SSL certificate" : "Ugyldigt eller upålideligt SSL-certifikat", - "Couldn't add remote share" : "Kunne ikke tliføje den delte ekstern ressource", + "Could not authenticate to remote share, password might be wrong" : "Kunne ikke godkende fjerndelingen - kodeordet er muilgvis forkert", + "Storage not valid" : "Lagerplads er ikke gyldig", + "Couldn't add remote share" : "Kunne ikke tliføje den ekstern deling", "Shared with you" : "Delt med dig", "Shared with others" : "Delt med andre", "Shared by link" : "Delt via link", @@ -19,11 +21,12 @@ OC.L10N.register( "Remote share password" : "Adgangskode for ekstern deling", "Cancel" : "Annuller", "Add remote share" : "Tilføj ekstern deling", - "No ownCloud installation (7 or higher) found at {remote}" : "Der blev ikke nogen ownCloud-installation (7 eller højere) på {remote}", + "No ownCloud installation (7 or higher) found at {remote}" : "Der er ingen ownCloud-installation (7 eller højere) på {remote}", "Invalid ownCloud url" : "Ugyldig ownCloud-URL", + "Share" : "Del", "Shared by" : "Delt af", "A file or folder was shared from <strong>another server</strong>" : "En fil eller mappe blev delt fra <strong>en anden server</strong>", - "A public shared file or folder was <strong>downloaded</strong>" : "En offentligt delt fil eller mappe blev <strong>downloadet</strong>", + "A public shared file or folder was <strong>downloaded</strong>" : "En offentligt delt fil eller mappe blev <strong>hentet</strong>", "You received a new remote share from %s" : "Du modtog en ny ekstern deling fra %s", "%1$s accepted remote share %2$s" : "%1$s accepterede den ekstern deling %2$s", "%1$s declined remote share %2$s" : "%1$s afviste den eksterne deling %2$s", @@ -43,10 +46,10 @@ OC.L10N.register( "sharing is disabled" : "deling er deaktiveret", "For more info, please ask the person who sent this link." : "For yderligere information, kontakt venligst personen der sendte linket. ", "Add to your ownCloud" : "Tilføj til din ownCload", - "Download" : "Download", - "Download %s" : "Download %s", + "Download" : "Hent", + "Download %s" : "Hent %s", "Direct link" : "Direkte link", - "Server-to-Server Sharing" : "Deling via server-til-server", + "Federated Cloud Sharing" : "Sammensluttet Cloud deling", "Allow users on this server to send shares to other servers" : "Tillad brugere på denne server, at sende delinger til andre servere", "Allow users on this server to receive shares from other servers" : "Tillad brugere på denne server, at modtage delinger fra andre servere" }, diff --git a/apps/files_sharing/l10n/da.json b/apps/files_sharing/l10n/da.json index 52ca012bbc4..51443a5d003 100644 --- a/apps/files_sharing/l10n/da.json +++ b/apps/files_sharing/l10n/da.json @@ -2,7 +2,9 @@ "Server to server sharing is not enabled on this server" : "Server til serverdeling er ikke slået til på denne server", "The mountpoint name contains invalid characters." : "Monteringspunktets navn indeholder ugyldige tegn.", "Invalid or untrusted SSL certificate" : "Ugyldigt eller upålideligt SSL-certifikat", - "Couldn't add remote share" : "Kunne ikke tliføje den delte ekstern ressource", + "Could not authenticate to remote share, password might be wrong" : "Kunne ikke godkende fjerndelingen - kodeordet er muilgvis forkert", + "Storage not valid" : "Lagerplads er ikke gyldig", + "Couldn't add remote share" : "Kunne ikke tliføje den ekstern deling", "Shared with you" : "Delt med dig", "Shared with others" : "Delt med andre", "Shared by link" : "Delt via link", @@ -17,11 +19,12 @@ "Remote share password" : "Adgangskode for ekstern deling", "Cancel" : "Annuller", "Add remote share" : "Tilføj ekstern deling", - "No ownCloud installation (7 or higher) found at {remote}" : "Der blev ikke nogen ownCloud-installation (7 eller højere) på {remote}", + "No ownCloud installation (7 or higher) found at {remote}" : "Der er ingen ownCloud-installation (7 eller højere) på {remote}", "Invalid ownCloud url" : "Ugyldig ownCloud-URL", + "Share" : "Del", "Shared by" : "Delt af", "A file or folder was shared from <strong>another server</strong>" : "En fil eller mappe blev delt fra <strong>en anden server</strong>", - "A public shared file or folder was <strong>downloaded</strong>" : "En offentligt delt fil eller mappe blev <strong>downloadet</strong>", + "A public shared file or folder was <strong>downloaded</strong>" : "En offentligt delt fil eller mappe blev <strong>hentet</strong>", "You received a new remote share from %s" : "Du modtog en ny ekstern deling fra %s", "%1$s accepted remote share %2$s" : "%1$s accepterede den ekstern deling %2$s", "%1$s declined remote share %2$s" : "%1$s afviste den eksterne deling %2$s", @@ -41,10 +44,10 @@ "sharing is disabled" : "deling er deaktiveret", "For more info, please ask the person who sent this link." : "For yderligere information, kontakt venligst personen der sendte linket. ", "Add to your ownCloud" : "Tilføj til din ownCload", - "Download" : "Download", - "Download %s" : "Download %s", + "Download" : "Hent", + "Download %s" : "Hent %s", "Direct link" : "Direkte link", - "Server-to-Server Sharing" : "Deling via server-til-server", + "Federated Cloud Sharing" : "Sammensluttet Cloud deling", "Allow users on this server to send shares to other servers" : "Tillad brugere på denne server, at sende delinger til andre servere", "Allow users on this server to receive shares from other servers" : "Tillad brugere på denne server, at modtage delinger fra andre servere" },"pluralForm" :"nplurals=2; plural=(n != 1);" diff --git a/apps/files_sharing/l10n/de.js b/apps/files_sharing/l10n/de.js index 88ccb754456..d53e43e83a4 100644 --- a/apps/files_sharing/l10n/de.js +++ b/apps/files_sharing/l10n/de.js @@ -2,8 +2,10 @@ OC.L10N.register( "files_sharing", { "Server to server sharing is not enabled on this server" : "Der Server für die Serverfreigabe ist auf diesem Server nicht aktiviert", - "The mountpoint name contains invalid characters." : "Der Name des Einhängepunktes enthält nicht gültige Zeichen.", + "The mountpoint name contains invalid characters." : "Der Name des Einhängepunktes enthält ungültige Zeichen.", "Invalid or untrusted SSL certificate" : "Ungültiges oder nicht vertrauenswürdiges SSL-Zertifikat", + "Could not authenticate to remote share, password might be wrong" : "Die Authentifizierung an der entfernten Freigabe konnte nicht erfolgen, das Passwort könnte falsch sein", + "Storage not valid" : "Speicher ungültig", "Couldn't add remote share" : "Entfernte Freigabe kann nicht hinzu gefügt werden", "Shared with you" : "Mit Dir geteilt", "Shared with others" : "Von Dir geteilt", @@ -21,15 +23,16 @@ OC.L10N.register( "Add remote share" : "Entfernte Freigabe hinzufügen", "No ownCloud installation (7 or higher) found at {remote}" : "Keine OwnCloud-Installation (7 oder höher) auf {remote} gefunden", "Invalid ownCloud url" : "Ungültige OwnCloud-URL", + "Share" : "Share", "Shared by" : "Geteilt von ", "A file or folder was shared from <strong>another server</strong>" : "Eine Datei oder ein Ordner wurde von <strong>einem anderen Server</strong> geteilt", - "A public shared file or folder was <strong>downloaded</strong>" : "Eine öffentlich geteilte Datei oder Ordner wurde <strong>heruntergeladen</strong>", + "A public shared file or folder was <strong>downloaded</strong>" : "Eine öffentliche geteilte Datei oder ein öffentlicher geteilter Ordner wurde <strong>heruntergeladen</strong>", "You received a new remote share from %s" : "Du hast eine neue Remotefreigabe von %s erhalten", "%1$s accepted remote share %2$s" : "%1$s hat die Remotefreigabe von %2$s akzeptiert", "%1$s declined remote share %2$s" : "%1$s hat die Remotefreigabe von %2$s abgelehnt", "%1$s unshared %2$s from you" : "%1$s hat die Freigabe von %2$s für Dich entfernt", - "Public shared folder %1$s was downloaded" : "Der öffentlich geteilte Ordner %1$s wurde heruntergeladen", - "Public shared file %1$s was downloaded" : "Die öffentlich geteilte Datei %1$s wurde heruntergeladen", + "Public shared folder %1$s was downloaded" : "Der öffentliche geteilte Ordner %1$s wurde heruntergeladen", + "Public shared file %1$s was downloaded" : "Die öffentliche geteilte Datei %1$s wurde heruntergeladen", "This share is password-protected" : "Diese Freigabe ist durch ein Passwort geschützt", "The password is wrong. Try again." : "Bitte überprüfe Dein Passwort und versuche es erneut.", "Password" : "Passwort", @@ -46,7 +49,7 @@ OC.L10N.register( "Download" : "Herunterladen", "Download %s" : "Download %s", "Direct link" : "Direkter Link", - "Server-to-Server Sharing" : "Server-zu-Server Datenaustausch", + "Federated Cloud Sharing" : "Federated-Cloud-Sharing", "Allow users on this server to send shares to other servers" : "Nutzern auf diesem Server das Senden von Freigaben an andere Server erlauben", "Allow users on this server to receive shares from other servers" : "Nutzern auf diesem Server das Empfangen von Freigaben von anderen Servern erlauben" }, diff --git a/apps/files_sharing/l10n/de.json b/apps/files_sharing/l10n/de.json index 11557269547..78ccece1bf1 100644 --- a/apps/files_sharing/l10n/de.json +++ b/apps/files_sharing/l10n/de.json @@ -1,7 +1,9 @@ { "translations": { "Server to server sharing is not enabled on this server" : "Der Server für die Serverfreigabe ist auf diesem Server nicht aktiviert", - "The mountpoint name contains invalid characters." : "Der Name des Einhängepunktes enthält nicht gültige Zeichen.", + "The mountpoint name contains invalid characters." : "Der Name des Einhängepunktes enthält ungültige Zeichen.", "Invalid or untrusted SSL certificate" : "Ungültiges oder nicht vertrauenswürdiges SSL-Zertifikat", + "Could not authenticate to remote share, password might be wrong" : "Die Authentifizierung an der entfernten Freigabe konnte nicht erfolgen, das Passwort könnte falsch sein", + "Storage not valid" : "Speicher ungültig", "Couldn't add remote share" : "Entfernte Freigabe kann nicht hinzu gefügt werden", "Shared with you" : "Mit Dir geteilt", "Shared with others" : "Von Dir geteilt", @@ -19,15 +21,16 @@ "Add remote share" : "Entfernte Freigabe hinzufügen", "No ownCloud installation (7 or higher) found at {remote}" : "Keine OwnCloud-Installation (7 oder höher) auf {remote} gefunden", "Invalid ownCloud url" : "Ungültige OwnCloud-URL", + "Share" : "Share", "Shared by" : "Geteilt von ", "A file or folder was shared from <strong>another server</strong>" : "Eine Datei oder ein Ordner wurde von <strong>einem anderen Server</strong> geteilt", - "A public shared file or folder was <strong>downloaded</strong>" : "Eine öffentlich geteilte Datei oder Ordner wurde <strong>heruntergeladen</strong>", + "A public shared file or folder was <strong>downloaded</strong>" : "Eine öffentliche geteilte Datei oder ein öffentlicher geteilter Ordner wurde <strong>heruntergeladen</strong>", "You received a new remote share from %s" : "Du hast eine neue Remotefreigabe von %s erhalten", "%1$s accepted remote share %2$s" : "%1$s hat die Remotefreigabe von %2$s akzeptiert", "%1$s declined remote share %2$s" : "%1$s hat die Remotefreigabe von %2$s abgelehnt", "%1$s unshared %2$s from you" : "%1$s hat die Freigabe von %2$s für Dich entfernt", - "Public shared folder %1$s was downloaded" : "Der öffentlich geteilte Ordner %1$s wurde heruntergeladen", - "Public shared file %1$s was downloaded" : "Die öffentlich geteilte Datei %1$s wurde heruntergeladen", + "Public shared folder %1$s was downloaded" : "Der öffentliche geteilte Ordner %1$s wurde heruntergeladen", + "Public shared file %1$s was downloaded" : "Die öffentliche geteilte Datei %1$s wurde heruntergeladen", "This share is password-protected" : "Diese Freigabe ist durch ein Passwort geschützt", "The password is wrong. Try again." : "Bitte überprüfe Dein Passwort und versuche es erneut.", "Password" : "Passwort", @@ -44,7 +47,7 @@ "Download" : "Herunterladen", "Download %s" : "Download %s", "Direct link" : "Direkter Link", - "Server-to-Server Sharing" : "Server-zu-Server Datenaustausch", + "Federated Cloud Sharing" : "Federated-Cloud-Sharing", "Allow users on this server to send shares to other servers" : "Nutzern auf diesem Server das Senden von Freigaben an andere Server erlauben", "Allow users on this server to receive shares from other servers" : "Nutzern auf diesem Server das Empfangen von Freigaben von anderen Servern erlauben" },"pluralForm" :"nplurals=2; plural=(n != 1);" diff --git a/apps/files_sharing/l10n/de_AT.js b/apps/files_sharing/l10n/de_AT.js index 50b8f406f80..dbef4e1e56a 100644 --- a/apps/files_sharing/l10n/de_AT.js +++ b/apps/files_sharing/l10n/de_AT.js @@ -2,6 +2,7 @@ OC.L10N.register( "files_sharing", { "Cancel" : "Abbrechen", + "Share" : "Freigeben", "Password" : "Passwort", "Download" : "Herunterladen" }, diff --git a/apps/files_sharing/l10n/de_AT.json b/apps/files_sharing/l10n/de_AT.json index 4f05c28750b..ccb46020bb5 100644 --- a/apps/files_sharing/l10n/de_AT.json +++ b/apps/files_sharing/l10n/de_AT.json @@ -1,5 +1,6 @@ { "translations": { "Cancel" : "Abbrechen", + "Share" : "Freigeben", "Password" : "Passwort", "Download" : "Herunterladen" },"pluralForm" :"nplurals=2; plural=(n != 1);" diff --git a/apps/files_sharing/l10n/de_DE.js b/apps/files_sharing/l10n/de_DE.js index baf7b182c47..d44e97e6056 100644 --- a/apps/files_sharing/l10n/de_DE.js +++ b/apps/files_sharing/l10n/de_DE.js @@ -4,6 +4,8 @@ OC.L10N.register( "Server to server sharing is not enabled on this server" : "Der Server für die Serverfreigabe ist auf diesem Server nicht aktiviert", "The mountpoint name contains invalid characters." : "Der Name des Einhängepunktes enthält nicht gültige Zeichen.", "Invalid or untrusted SSL certificate" : "Ungültiges oder nicht vertrauenswürdiges SSL-Zertifikat", + "Could not authenticate to remote share, password might be wrong" : "Die Authentifizierung an der entfernten Freigabe konnte nicht erfolgen, das Passwort könnte falsch sein", + "Storage not valid" : "Speicher ungültig", "Couldn't add remote share" : "Entfernte Freigabe kann nicht hinzugefügt werden", "Shared with you" : "Mit Ihnen geteilt", "Shared with others" : "Von Ihnen geteilt", @@ -21,15 +23,16 @@ OC.L10N.register( "Add remote share" : "Entfernte Freigabe hinzufügen", "No ownCloud installation (7 or higher) found at {remote}" : "Keine OwnCloud-Installation (7 oder höher) auf {remote} gefunden", "Invalid ownCloud url" : "Ungültige OwnCloud-Adresse", + "Share" : "Teilen", "Shared by" : "Geteilt von", - "A file or folder was shared from <strong>another server</strong>" : "Eine Datei oder Ordner wurde von <strong>einem anderen Server</strong> geteilt", - "A public shared file or folder was <strong>downloaded</strong>" : "Eine öffentlich geteilte Datei oder Ordner wurde <strong>heruntergeladen</strong>", + "A file or folder was shared from <strong>another server</strong>" : "Eine Datei oder ein Ordner wurde von <strong>einem anderen Server</strong> geteilt", + "A public shared file or folder was <strong>downloaded</strong>" : "Eine öffentliche geteilte Datei oder ein öffentlicher geteilter Ordner wurde <strong>heruntergeladen</strong>", "You received a new remote share from %s" : "Sie haben eine neue Remotefreigabe von %s erhalten", "%1$s accepted remote share %2$s" : "%1$s hat die Remotefreigabe von %2$s akzeptiert", "%1$s declined remote share %2$s" : "%1$s hat die Remotefreigabe von %2$s abgelehnt", "%1$s unshared %2$s from you" : "%1$s hat die Freigabe von %2$s für Sie entfernt", - "Public shared folder %1$s was downloaded" : "Der öffentlich geteilte Ordner %1$s wurde heruntergeladen", - "Public shared file %1$s was downloaded" : "Die öffentlich geteilte Datei %1$s wurde heruntergeladen", + "Public shared folder %1$s was downloaded" : "Der öffentliche geteilte Ordner %1$s wurde heruntergeladen", + "Public shared file %1$s was downloaded" : "Die öffentliche geteilte Datei %1$s wurde heruntergeladen", "This share is password-protected" : "Diese Freigabe ist durch ein Passwort geschützt", "The password is wrong. Try again." : "Das Passwort ist falsch. Bitte versuchen Sie es erneut.", "Password" : "Passwort", @@ -41,13 +44,13 @@ OC.L10N.register( "the item was removed" : "Das Element wurde entfernt", "the link expired" : "Der Link ist abgelaufen", "sharing is disabled" : "Teilen ist deaktiviert", - "For more info, please ask the person who sent this link." : "Für mehr Informationen, fragen Sie bitte die Person, die Ihnen diesen Link geschickt hat.", + "For more info, please ask the person who sent this link." : "Um weitere Informationen zu erhalten, fragen Sie bitte die Person, die Ihnen diesen Link geschickt hat.", "Add to your ownCloud" : "Zu Ihrer ownCloud hinzufügen", "Download" : "Herunterladen", "Download %s" : "Download %s", "Direct link" : "Direkte Verlinkung", - "Server-to-Server Sharing" : "Server-zu-Server Datenaustausch", - "Allow users on this server to send shares to other servers" : "Nutzern auf diesem Server das Senden von Freigaben an andere Server erlauben", - "Allow users on this server to receive shares from other servers" : "Nutzern auf diesem Server das Empfangen von Freigaben von anderen Servern erlauben" + "Federated Cloud Sharing" : "Federated-Cloud-Sharing", + "Allow users on this server to send shares to other servers" : "Benutzern auf diesem Server das Senden von Freigaben an andere Server erlauben", + "Allow users on this server to receive shares from other servers" : "Benutzern auf diesem Server das Empfangen von Freigaben von anderen Servern erlauben" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files_sharing/l10n/de_DE.json b/apps/files_sharing/l10n/de_DE.json index 78859f87706..8571d4fdd83 100644 --- a/apps/files_sharing/l10n/de_DE.json +++ b/apps/files_sharing/l10n/de_DE.json @@ -2,6 +2,8 @@ "Server to server sharing is not enabled on this server" : "Der Server für die Serverfreigabe ist auf diesem Server nicht aktiviert", "The mountpoint name contains invalid characters." : "Der Name des Einhängepunktes enthält nicht gültige Zeichen.", "Invalid or untrusted SSL certificate" : "Ungültiges oder nicht vertrauenswürdiges SSL-Zertifikat", + "Could not authenticate to remote share, password might be wrong" : "Die Authentifizierung an der entfernten Freigabe konnte nicht erfolgen, das Passwort könnte falsch sein", + "Storage not valid" : "Speicher ungültig", "Couldn't add remote share" : "Entfernte Freigabe kann nicht hinzugefügt werden", "Shared with you" : "Mit Ihnen geteilt", "Shared with others" : "Von Ihnen geteilt", @@ -19,15 +21,16 @@ "Add remote share" : "Entfernte Freigabe hinzufügen", "No ownCloud installation (7 or higher) found at {remote}" : "Keine OwnCloud-Installation (7 oder höher) auf {remote} gefunden", "Invalid ownCloud url" : "Ungültige OwnCloud-Adresse", + "Share" : "Teilen", "Shared by" : "Geteilt von", - "A file or folder was shared from <strong>another server</strong>" : "Eine Datei oder Ordner wurde von <strong>einem anderen Server</strong> geteilt", - "A public shared file or folder was <strong>downloaded</strong>" : "Eine öffentlich geteilte Datei oder Ordner wurde <strong>heruntergeladen</strong>", + "A file or folder was shared from <strong>another server</strong>" : "Eine Datei oder ein Ordner wurde von <strong>einem anderen Server</strong> geteilt", + "A public shared file or folder was <strong>downloaded</strong>" : "Eine öffentliche geteilte Datei oder ein öffentlicher geteilter Ordner wurde <strong>heruntergeladen</strong>", "You received a new remote share from %s" : "Sie haben eine neue Remotefreigabe von %s erhalten", "%1$s accepted remote share %2$s" : "%1$s hat die Remotefreigabe von %2$s akzeptiert", "%1$s declined remote share %2$s" : "%1$s hat die Remotefreigabe von %2$s abgelehnt", "%1$s unshared %2$s from you" : "%1$s hat die Freigabe von %2$s für Sie entfernt", - "Public shared folder %1$s was downloaded" : "Der öffentlich geteilte Ordner %1$s wurde heruntergeladen", - "Public shared file %1$s was downloaded" : "Die öffentlich geteilte Datei %1$s wurde heruntergeladen", + "Public shared folder %1$s was downloaded" : "Der öffentliche geteilte Ordner %1$s wurde heruntergeladen", + "Public shared file %1$s was downloaded" : "Die öffentliche geteilte Datei %1$s wurde heruntergeladen", "This share is password-protected" : "Diese Freigabe ist durch ein Passwort geschützt", "The password is wrong. Try again." : "Das Passwort ist falsch. Bitte versuchen Sie es erneut.", "Password" : "Passwort", @@ -39,13 +42,13 @@ "the item was removed" : "Das Element wurde entfernt", "the link expired" : "Der Link ist abgelaufen", "sharing is disabled" : "Teilen ist deaktiviert", - "For more info, please ask the person who sent this link." : "Für mehr Informationen, fragen Sie bitte die Person, die Ihnen diesen Link geschickt hat.", + "For more info, please ask the person who sent this link." : "Um weitere Informationen zu erhalten, fragen Sie bitte die Person, die Ihnen diesen Link geschickt hat.", "Add to your ownCloud" : "Zu Ihrer ownCloud hinzufügen", "Download" : "Herunterladen", "Download %s" : "Download %s", "Direct link" : "Direkte Verlinkung", - "Server-to-Server Sharing" : "Server-zu-Server Datenaustausch", - "Allow users on this server to send shares to other servers" : "Nutzern auf diesem Server das Senden von Freigaben an andere Server erlauben", - "Allow users on this server to receive shares from other servers" : "Nutzern auf diesem Server das Empfangen von Freigaben von anderen Servern erlauben" + "Federated Cloud Sharing" : "Federated-Cloud-Sharing", + "Allow users on this server to send shares to other servers" : "Benutzern auf diesem Server das Senden von Freigaben an andere Server erlauben", + "Allow users on this server to receive shares from other servers" : "Benutzern auf diesem Server das Empfangen von Freigaben von anderen Servern erlauben" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/el.js b/apps/files_sharing/l10n/el.js index a11b1f7a00f..69619567ba9 100644 --- a/apps/files_sharing/l10n/el.js +++ b/apps/files_sharing/l10n/el.js @@ -4,22 +4,39 @@ OC.L10N.register( "Server to server sharing is not enabled on this server" : "Ο διαμοιρασμός μεταξύ διακομιστών δεν έχει ενεργοποιηθεί σε αυτόν το διακομιστή", "The mountpoint name contains invalid characters." : "Το όνομα σημείου προσάρτησης περιέχει μη έγκυρους χαρακτήρες.", "Invalid or untrusted SSL certificate" : "Μη έγκυρο ή μη έμπιστο πιστοποιητικό SSL", + "Could not authenticate to remote share, password might be wrong" : "Δεν ήταν δυνατή η πιστοποίηση στο απομακρυσμένο διαμοιρασμένο στοιχείο, μπορεί να είναι λάθος ο κωδικός πρόσβασης", + "Storage not valid" : "Μη έγκυρος αποθηκευτικός χώρος", "Couldn't add remote share" : "Αδυναμία προσθήκης απομακρυσμένου κοινόχρηστου φακέλου", "Shared with you" : "Διαμοιρασμένο με εσάς", "Shared with others" : "Διαμοιρασμένο με άλλους", "Shared by link" : "Διαμοιρασμένο μέσω συνδέσμου", + "Nothing shared with you yet" : "Δεν έχει διαμοιραστεί κάτι με εσάς ακόμα", + "Files and folders others share with you will show up here" : "Τα αρχεία και οι φάκελοι που άλλοι διαμοιράζονται με εσάς θα εμφανιστούν εδώ", "Nothing shared yet" : "Δεν έχει διαμοιραστεί τίποτα μέχρι στιγμής", + "Files and folders you share will show up here" : "Τα αρχεία και οι φάκελοι που διαμοιράζεστε θα εμφανιστούν εδώ", "No shared links" : "Κανένας διαμοιρασμένος σύνδεσμος", + "Files and folders you share by link will show up here" : "Τα αρχεία και οι φάκελοι που διαμοιράζεστε μέσω συνδέσμου θα εμφανιστούνε εδώ", "Do you want to add the remote share {name} from {owner}@{remote}?" : "Θέλετε να προσθέσουμε τον απομακρυσμένο κοινόχρηστο φάκελο {name} από {owner}@{remote}?", "Remote share" : "Απομακρυσμένος κοινόχρηστος φάκελος", "Remote share password" : "Κωδικός πρόσβασης απομακρυσμένου κοινόχρηστου φακέλου", "Cancel" : "Άκυρο", "Add remote share" : "Προσθήκη απομακρυσμένου κοινόχρηστου φακέλου", + "No ownCloud installation (7 or higher) found at {remote}" : "Δεν βρέθηκε εγκατάστση ownCloud (7 ή νεώτερη) στο {remote}", "Invalid ownCloud url" : "Άκυρη url ownCloud ", + "Share" : "Διαμοιράστε", "Shared by" : "Διαμοιράστηκε από", + "A file or folder was shared from <strong>another server</strong>" : "Ένα αρχείο ή φάκελος διαμοιράστηκε από <strong>έναν άλλο διακομιστή</strong>", + "A public shared file or folder was <strong>downloaded</strong>" : "Ένα δημόσια διαμοιρασμένο αρχείο ή φάκελος <strong>ελήφθη</strong>", + "You received a new remote share from %s" : "Λάβατε ένα νέο απομακρυσμένο κοινόχρηστο φάκελο από %s", + "%1$s accepted remote share %2$s" : "Ο %1$s αποδέχθηκε τον απομακρυσμένο φάκελο %2$s", + "%1$s declined remote share %2$s" : "Ο %1$s αρνήθηκε τον απομακρυσμένο διαμοιρασμένο φάκελο %2$s", + "%1$s unshared %2$s from you" : "Ο %1$s απέσυρε το διαμοιρασμό του %2$s με εσάς", + "Public shared folder %1$s was downloaded" : "Ο κοινόχρηστος διαμοιρασμένος φάκελος %1$s ελήφθη", + "Public shared file %1$s was downloaded" : "Το κοινόχρηστο διαμοιρασμένο αρχείο %1$s ελήφθη", "This share is password-protected" : "Αυτός ο κοινόχρηστος φάκελος προστατεύεται με κωδικό", "The password is wrong. Try again." : "Εσφαλμένος κωδικός πρόσβασης. Προσπαθήστε ξανά.", "Password" : "Κωδικός πρόσβασης", + "No entries found in this folder" : "Δεν βρέθηκαν καταχωρήσεις σε αυτόν το φάκελο", "Name" : "Όνομα", "Share time" : "Χρόνος διαμοιρασμού", "Sorry, this link doesn’t seem to work anymore." : "Συγγνώμη, αυτός ο σύνδεσμος μοιάζει να μην ισχύει πια.", @@ -32,7 +49,7 @@ OC.L10N.register( "Download" : "Λήψη", "Download %s" : "Λήψη %s", "Direct link" : "Άμεσος σύνδεσμος", - "Server-to-Server Sharing" : "Διαμοιρασμός διακομιστής προς διακομιστή", + "Allow users on this server to send shares to other servers" : "Να επιτρέπεται σε χρήστες αυτού του διακομιστή να στέλνουν διαμοιρασμένους φακέλους σε άλλους διακομιστές", "Allow users on this server to receive shares from other servers" : "Να επιτρέπεται στους χρίστες του διακομιστή να λαμβάνουν διαμοιρασμένα αρχεία από άλλους διακομιστές" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files_sharing/l10n/el.json b/apps/files_sharing/l10n/el.json index 70b6d1d5ce7..3d124359f43 100644 --- a/apps/files_sharing/l10n/el.json +++ b/apps/files_sharing/l10n/el.json @@ -2,22 +2,39 @@ "Server to server sharing is not enabled on this server" : "Ο διαμοιρασμός μεταξύ διακομιστών δεν έχει ενεργοποιηθεί σε αυτόν το διακομιστή", "The mountpoint name contains invalid characters." : "Το όνομα σημείου προσάρτησης περιέχει μη έγκυρους χαρακτήρες.", "Invalid or untrusted SSL certificate" : "Μη έγκυρο ή μη έμπιστο πιστοποιητικό SSL", + "Could not authenticate to remote share, password might be wrong" : "Δεν ήταν δυνατή η πιστοποίηση στο απομακρυσμένο διαμοιρασμένο στοιχείο, μπορεί να είναι λάθος ο κωδικός πρόσβασης", + "Storage not valid" : "Μη έγκυρος αποθηκευτικός χώρος", "Couldn't add remote share" : "Αδυναμία προσθήκης απομακρυσμένου κοινόχρηστου φακέλου", "Shared with you" : "Διαμοιρασμένο με εσάς", "Shared with others" : "Διαμοιρασμένο με άλλους", "Shared by link" : "Διαμοιρασμένο μέσω συνδέσμου", + "Nothing shared with you yet" : "Δεν έχει διαμοιραστεί κάτι με εσάς ακόμα", + "Files and folders others share with you will show up here" : "Τα αρχεία και οι φάκελοι που άλλοι διαμοιράζονται με εσάς θα εμφανιστούν εδώ", "Nothing shared yet" : "Δεν έχει διαμοιραστεί τίποτα μέχρι στιγμής", + "Files and folders you share will show up here" : "Τα αρχεία και οι φάκελοι που διαμοιράζεστε θα εμφανιστούν εδώ", "No shared links" : "Κανένας διαμοιρασμένος σύνδεσμος", + "Files and folders you share by link will show up here" : "Τα αρχεία και οι φάκελοι που διαμοιράζεστε μέσω συνδέσμου θα εμφανιστούνε εδώ", "Do you want to add the remote share {name} from {owner}@{remote}?" : "Θέλετε να προσθέσουμε τον απομακρυσμένο κοινόχρηστο φάκελο {name} από {owner}@{remote}?", "Remote share" : "Απομακρυσμένος κοινόχρηστος φάκελος", "Remote share password" : "Κωδικός πρόσβασης απομακρυσμένου κοινόχρηστου φακέλου", "Cancel" : "Άκυρο", "Add remote share" : "Προσθήκη απομακρυσμένου κοινόχρηστου φακέλου", + "No ownCloud installation (7 or higher) found at {remote}" : "Δεν βρέθηκε εγκατάστση ownCloud (7 ή νεώτερη) στο {remote}", "Invalid ownCloud url" : "Άκυρη url ownCloud ", + "Share" : "Διαμοιράστε", "Shared by" : "Διαμοιράστηκε από", + "A file or folder was shared from <strong>another server</strong>" : "Ένα αρχείο ή φάκελος διαμοιράστηκε από <strong>έναν άλλο διακομιστή</strong>", + "A public shared file or folder was <strong>downloaded</strong>" : "Ένα δημόσια διαμοιρασμένο αρχείο ή φάκελος <strong>ελήφθη</strong>", + "You received a new remote share from %s" : "Λάβατε ένα νέο απομακρυσμένο κοινόχρηστο φάκελο από %s", + "%1$s accepted remote share %2$s" : "Ο %1$s αποδέχθηκε τον απομακρυσμένο φάκελο %2$s", + "%1$s declined remote share %2$s" : "Ο %1$s αρνήθηκε τον απομακρυσμένο διαμοιρασμένο φάκελο %2$s", + "%1$s unshared %2$s from you" : "Ο %1$s απέσυρε το διαμοιρασμό του %2$s με εσάς", + "Public shared folder %1$s was downloaded" : "Ο κοινόχρηστος διαμοιρασμένος φάκελος %1$s ελήφθη", + "Public shared file %1$s was downloaded" : "Το κοινόχρηστο διαμοιρασμένο αρχείο %1$s ελήφθη", "This share is password-protected" : "Αυτός ο κοινόχρηστος φάκελος προστατεύεται με κωδικό", "The password is wrong. Try again." : "Εσφαλμένος κωδικός πρόσβασης. Προσπαθήστε ξανά.", "Password" : "Κωδικός πρόσβασης", + "No entries found in this folder" : "Δεν βρέθηκαν καταχωρήσεις σε αυτόν το φάκελο", "Name" : "Όνομα", "Share time" : "Χρόνος διαμοιρασμού", "Sorry, this link doesn’t seem to work anymore." : "Συγγνώμη, αυτός ο σύνδεσμος μοιάζει να μην ισχύει πια.", @@ -30,7 +47,7 @@ "Download" : "Λήψη", "Download %s" : "Λήψη %s", "Direct link" : "Άμεσος σύνδεσμος", - "Server-to-Server Sharing" : "Διαμοιρασμός διακομιστής προς διακομιστή", + "Allow users on this server to send shares to other servers" : "Να επιτρέπεται σε χρήστες αυτού του διακομιστή να στέλνουν διαμοιρασμένους φακέλους σε άλλους διακομιστές", "Allow users on this server to receive shares from other servers" : "Να επιτρέπεται στους χρίστες του διακομιστή να λαμβάνουν διαμοιρασμένα αρχεία από άλλους διακομιστές" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/en_GB.js b/apps/files_sharing/l10n/en_GB.js index 78bf0940a54..f7372023a21 100644 --- a/apps/files_sharing/l10n/en_GB.js +++ b/apps/files_sharing/l10n/en_GB.js @@ -4,6 +4,8 @@ OC.L10N.register( "Server to server sharing is not enabled on this server" : "Server to server sharing is not enabled on this server", "The mountpoint name contains invalid characters." : "The mountpoint name contains invalid characters.", "Invalid or untrusted SSL certificate" : "Invalid or untrusted SSL certificate", + "Could not authenticate to remote share, password might be wrong" : "Could not authenticate to remote share, password might be wrong", + "Storage not valid" : "Storage not valid", "Couldn't add remote share" : "Couldn't add remote share", "Shared with you" : "Shared with you", "Shared with others" : "Shared with others", @@ -21,6 +23,7 @@ OC.L10N.register( "Add remote share" : "Add remote share", "No ownCloud installation (7 or higher) found at {remote}" : "No ownCloud installation (7 or higher) found at {remote}", "Invalid ownCloud url" : "Invalid ownCloud URL", + "Share" : "Share", "Shared by" : "Shared by", "A file or folder was shared from <strong>another server</strong>" : "A file or folder was shared from <strong>another server</strong>", "A public shared file or folder was <strong>downloaded</strong>" : "A public shared file or folder was <strong>downloaded</strong>", @@ -46,7 +49,7 @@ OC.L10N.register( "Download" : "Download", "Download %s" : "Download %s", "Direct link" : "Direct link", - "Server-to-Server Sharing" : "Server-to-Server Sharing", + "Federated Cloud Sharing" : "Federated Cloud Sharing", "Allow users on this server to send shares to other servers" : "Allow users on this server to send shares to other servers", "Allow users on this server to receive shares from other servers" : "Allow users on this server to receive shares from other servers" }, diff --git a/apps/files_sharing/l10n/en_GB.json b/apps/files_sharing/l10n/en_GB.json index 25a52e1e13b..0d89d67a73d 100644 --- a/apps/files_sharing/l10n/en_GB.json +++ b/apps/files_sharing/l10n/en_GB.json @@ -2,6 +2,8 @@ "Server to server sharing is not enabled on this server" : "Server to server sharing is not enabled on this server", "The mountpoint name contains invalid characters." : "The mountpoint name contains invalid characters.", "Invalid or untrusted SSL certificate" : "Invalid or untrusted SSL certificate", + "Could not authenticate to remote share, password might be wrong" : "Could not authenticate to remote share, password might be wrong", + "Storage not valid" : "Storage not valid", "Couldn't add remote share" : "Couldn't add remote share", "Shared with you" : "Shared with you", "Shared with others" : "Shared with others", @@ -19,6 +21,7 @@ "Add remote share" : "Add remote share", "No ownCloud installation (7 or higher) found at {remote}" : "No ownCloud installation (7 or higher) found at {remote}", "Invalid ownCloud url" : "Invalid ownCloud URL", + "Share" : "Share", "Shared by" : "Shared by", "A file or folder was shared from <strong>another server</strong>" : "A file or folder was shared from <strong>another server</strong>", "A public shared file or folder was <strong>downloaded</strong>" : "A public shared file or folder was <strong>downloaded</strong>", @@ -44,7 +47,7 @@ "Download" : "Download", "Download %s" : "Download %s", "Direct link" : "Direct link", - "Server-to-Server Sharing" : "Server-to-Server Sharing", + "Federated Cloud Sharing" : "Federated Cloud Sharing", "Allow users on this server to send shares to other servers" : "Allow users on this server to send shares to other servers", "Allow users on this server to receive shares from other servers" : "Allow users on this server to receive shares from other servers" },"pluralForm" :"nplurals=2; plural=(n != 1);" diff --git a/apps/files_sharing/l10n/eo.js b/apps/files_sharing/l10n/eo.js index 1053816107c..3f5d36b4003 100644 --- a/apps/files_sharing/l10n/eo.js +++ b/apps/files_sharing/l10n/eo.js @@ -7,6 +7,7 @@ OC.L10N.register( "Shared by link" : "Kunhavata per ligilo", "Cancel" : "Nuligi", "Invalid ownCloud url" : "Nevalidas URL de ownCloud", + "Share" : "Kunhavigi", "Shared by" : "Kunhavigita de", "This share is password-protected" : "Ĉi tiu kunhavigo estas protektata per pasvorto", "The password is wrong. Try again." : "La pasvorto malĝustas. Provu denove.", diff --git a/apps/files_sharing/l10n/eo.json b/apps/files_sharing/l10n/eo.json index bfe17bdb896..18c68b4d8c8 100644 --- a/apps/files_sharing/l10n/eo.json +++ b/apps/files_sharing/l10n/eo.json @@ -5,6 +5,7 @@ "Shared by link" : "Kunhavata per ligilo", "Cancel" : "Nuligi", "Invalid ownCloud url" : "Nevalidas URL de ownCloud", + "Share" : "Kunhavigi", "Shared by" : "Kunhavigita de", "This share is password-protected" : "Ĉi tiu kunhavigo estas protektata per pasvorto", "The password is wrong. Try again." : "La pasvorto malĝustas. Provu denove.", diff --git a/apps/files_sharing/l10n/es.js b/apps/files_sharing/l10n/es.js index 694a4198a4b..b107bc7f3e1 100644 --- a/apps/files_sharing/l10n/es.js +++ b/apps/files_sharing/l10n/es.js @@ -4,6 +4,8 @@ OC.L10N.register( "Server to server sharing is not enabled on this server" : "Compartir entre servidores no está habilitado en este servidor", "The mountpoint name contains invalid characters." : "El punto de montaje contiene caracteres inválidos.", "Invalid or untrusted SSL certificate" : "Certificado SSL inválido o no confiable", + "Could not authenticate to remote share, password might be wrong" : "No se ha podido autenticar para compartir remotamente, quizás esté mal la contraseña", + "Storage not valid" : "Almacenamiento inválido", "Couldn't add remote share" : "No se puede añadir un compartido remoto", "Shared with you" : "Compartido contigo", "Shared with others" : "Compartido con otros", @@ -21,13 +23,14 @@ OC.L10N.register( "Add remote share" : "Añadir recurso compartido remoto", "No ownCloud installation (7 or higher) found at {remote}" : "No se encontró una instalación de ownCloud (7 o mayor) en {remote}", "Invalid ownCloud url" : "URL de ownCloud inválido", + "Share" : "Compartir", "Shared by" : "Compartido por", "A file or folder was shared from <strong>another server</strong>" : "Se ha compartido un archivo o carpeta desde <strong>otro servidor</strong>", "A public shared file or folder was <strong>downloaded</strong>" : "Ha sido <strong>descargado</strong> un archivo (o carpeta) compartido públicamente", "You received a new remote share from %s" : "Ha recibido un nuevo recurso compartido remoto de %s", "%1$s accepted remote share %2$s" : "%1$s aceptó el recurso compartido remoto %2$s", "%1$s declined remote share %2$s" : "%1$s ha rechazado el recurso compartido remoto %2$s", - "%1$s unshared %2$s from you" : "%1$s dejó de ser compartido %2$s por tí", + "%1$s unshared %2$s from you" : "%1$s dejó de compartirse %2$s por ti", "Public shared folder %1$s was downloaded" : "Se descargó la carpeta pública compartida %1$s", "Public shared file %1$s was downloaded" : "Se descargó el archivo público compartido %1$s", "This share is password-protected" : "Este elemento compartido esta protegido por contraseña", @@ -46,7 +49,7 @@ OC.L10N.register( "Download" : "Descargar", "Download %s" : "Descargar %s", "Direct link" : "Enlace directo", - "Server-to-Server Sharing" : "Compartir Servidor-a-Servidor", + "Federated Cloud Sharing" : "Compartido en Cloud Federado", "Allow users on this server to send shares to other servers" : "Permitir a usuarios de este servidor compartir con usuarios de otros servidores", "Allow users on this server to receive shares from other servers" : "Permitir a usuarios de este servidor recibir archivos de usuarios de otros servidores" }, diff --git a/apps/files_sharing/l10n/es.json b/apps/files_sharing/l10n/es.json index ae5c7a87cb2..02f7e2ab24a 100644 --- a/apps/files_sharing/l10n/es.json +++ b/apps/files_sharing/l10n/es.json @@ -2,6 +2,8 @@ "Server to server sharing is not enabled on this server" : "Compartir entre servidores no está habilitado en este servidor", "The mountpoint name contains invalid characters." : "El punto de montaje contiene caracteres inválidos.", "Invalid or untrusted SSL certificate" : "Certificado SSL inválido o no confiable", + "Could not authenticate to remote share, password might be wrong" : "No se ha podido autenticar para compartir remotamente, quizás esté mal la contraseña", + "Storage not valid" : "Almacenamiento inválido", "Couldn't add remote share" : "No se puede añadir un compartido remoto", "Shared with you" : "Compartido contigo", "Shared with others" : "Compartido con otros", @@ -19,13 +21,14 @@ "Add remote share" : "Añadir recurso compartido remoto", "No ownCloud installation (7 or higher) found at {remote}" : "No se encontró una instalación de ownCloud (7 o mayor) en {remote}", "Invalid ownCloud url" : "URL de ownCloud inválido", + "Share" : "Compartir", "Shared by" : "Compartido por", "A file or folder was shared from <strong>another server</strong>" : "Se ha compartido un archivo o carpeta desde <strong>otro servidor</strong>", "A public shared file or folder was <strong>downloaded</strong>" : "Ha sido <strong>descargado</strong> un archivo (o carpeta) compartido públicamente", "You received a new remote share from %s" : "Ha recibido un nuevo recurso compartido remoto de %s", "%1$s accepted remote share %2$s" : "%1$s aceptó el recurso compartido remoto %2$s", "%1$s declined remote share %2$s" : "%1$s ha rechazado el recurso compartido remoto %2$s", - "%1$s unshared %2$s from you" : "%1$s dejó de ser compartido %2$s por tí", + "%1$s unshared %2$s from you" : "%1$s dejó de compartirse %2$s por ti", "Public shared folder %1$s was downloaded" : "Se descargó la carpeta pública compartida %1$s", "Public shared file %1$s was downloaded" : "Se descargó el archivo público compartido %1$s", "This share is password-protected" : "Este elemento compartido esta protegido por contraseña", @@ -44,7 +47,7 @@ "Download" : "Descargar", "Download %s" : "Descargar %s", "Direct link" : "Enlace directo", - "Server-to-Server Sharing" : "Compartir Servidor-a-Servidor", + "Federated Cloud Sharing" : "Compartido en Cloud Federado", "Allow users on this server to send shares to other servers" : "Permitir a usuarios de este servidor compartir con usuarios de otros servidores", "Allow users on this server to receive shares from other servers" : "Permitir a usuarios de este servidor recibir archivos de usuarios de otros servidores" },"pluralForm" :"nplurals=2; plural=(n != 1);" diff --git a/apps/files_sharing/l10n/es_AR.js b/apps/files_sharing/l10n/es_AR.js index b90c8293dfe..61fc3f6e774 100644 --- a/apps/files_sharing/l10n/es_AR.js +++ b/apps/files_sharing/l10n/es_AR.js @@ -2,6 +2,7 @@ OC.L10N.register( "files_sharing", { "Cancel" : "Cancelar", + "Share" : "Compartir", "Shared by" : "Compartido por", "This share is password-protected" : "Esto está protegido por contraseña", "The password is wrong. Try again." : "La contraseña no es correcta. Probá de nuevo.", diff --git a/apps/files_sharing/l10n/es_AR.json b/apps/files_sharing/l10n/es_AR.json index 9e11b761eda..10c553ea58b 100644 --- a/apps/files_sharing/l10n/es_AR.json +++ b/apps/files_sharing/l10n/es_AR.json @@ -1,5 +1,6 @@ { "translations": { "Cancel" : "Cancelar", + "Share" : "Compartir", "Shared by" : "Compartido por", "This share is password-protected" : "Esto está protegido por contraseña", "The password is wrong. Try again." : "La contraseña no es correcta. Probá de nuevo.", diff --git a/apps/files_sharing/l10n/es_CL.js b/apps/files_sharing/l10n/es_CL.js index 33d53eb99e4..567895ba184 100644 --- a/apps/files_sharing/l10n/es_CL.js +++ b/apps/files_sharing/l10n/es_CL.js @@ -2,6 +2,7 @@ OC.L10N.register( "files_sharing", { "Cancel" : "Cancelar", + "Share" : "Compartir", "Password" : "Clave", "Download" : "Descargar" }, diff --git a/apps/files_sharing/l10n/es_CL.json b/apps/files_sharing/l10n/es_CL.json index a77aecd0347..42b0bb82700 100644 --- a/apps/files_sharing/l10n/es_CL.json +++ b/apps/files_sharing/l10n/es_CL.json @@ -1,5 +1,6 @@ { "translations": { "Cancel" : "Cancelar", + "Share" : "Compartir", "Password" : "Clave", "Download" : "Descargar" },"pluralForm" :"nplurals=2; plural=(n != 1);" diff --git a/apps/files_sharing/l10n/es_MX.js b/apps/files_sharing/l10n/es_MX.js index 7d608b06e45..adf4b823efd 100644 --- a/apps/files_sharing/l10n/es_MX.js +++ b/apps/files_sharing/l10n/es_MX.js @@ -2,6 +2,7 @@ OC.L10N.register( "files_sharing", { "Cancel" : "Cancelar", + "Share" : "Compartir", "Shared by" : "Compartido por", "This share is password-protected" : "Este elemento compartido esta protegido por contraseña", "The password is wrong. Try again." : "La contraseña introducida es errónea. Inténtelo de nuevo.", diff --git a/apps/files_sharing/l10n/es_MX.json b/apps/files_sharing/l10n/es_MX.json index 7b0cff90181..17f05601521 100644 --- a/apps/files_sharing/l10n/es_MX.json +++ b/apps/files_sharing/l10n/es_MX.json @@ -1,5 +1,6 @@ { "translations": { "Cancel" : "Cancelar", + "Share" : "Compartir", "Shared by" : "Compartido por", "This share is password-protected" : "Este elemento compartido esta protegido por contraseña", "The password is wrong. Try again." : "La contraseña introducida es errónea. Inténtelo de nuevo.", diff --git a/apps/files_sharing/l10n/et_EE.js b/apps/files_sharing/l10n/et_EE.js index 7200a5ca3c1..f1ebfe40c9a 100644 --- a/apps/files_sharing/l10n/et_EE.js +++ b/apps/files_sharing/l10n/et_EE.js @@ -14,6 +14,7 @@ OC.L10N.register( "Cancel" : "Loobu", "Add remote share" : "Lisa kaugjagamine", "Invalid ownCloud url" : "Vigane ownCloud url", + "Share" : "Jaga", "Shared by" : "Jagas", "This share is password-protected" : "See jagamine on parooliga kaitstud", "The password is wrong. Try again." : "Parool on vale. Proovi uuesti.", @@ -30,7 +31,6 @@ OC.L10N.register( "Download" : "Lae alla", "Download %s" : "Laadi alla %s", "Direct link" : "Otsene link", - "Server-to-Server Sharing" : "Serverist-serverisse jagamine", "Allow users on this server to send shares to other servers" : "Luba selle serveri kasutajatel saata faile teistesse serveritesse", "Allow users on this server to receive shares from other servers" : "Luba selle serveri kasutajatel võtta vastu jagamisi teistest serveritest" }, diff --git a/apps/files_sharing/l10n/et_EE.json b/apps/files_sharing/l10n/et_EE.json index e35ea6427a7..fe49003fc5d 100644 --- a/apps/files_sharing/l10n/et_EE.json +++ b/apps/files_sharing/l10n/et_EE.json @@ -12,6 +12,7 @@ "Cancel" : "Loobu", "Add remote share" : "Lisa kaugjagamine", "Invalid ownCloud url" : "Vigane ownCloud url", + "Share" : "Jaga", "Shared by" : "Jagas", "This share is password-protected" : "See jagamine on parooliga kaitstud", "The password is wrong. Try again." : "Parool on vale. Proovi uuesti.", @@ -28,7 +29,6 @@ "Download" : "Lae alla", "Download %s" : "Laadi alla %s", "Direct link" : "Otsene link", - "Server-to-Server Sharing" : "Serverist-serverisse jagamine", "Allow users on this server to send shares to other servers" : "Luba selle serveri kasutajatel saata faile teistesse serveritesse", "Allow users on this server to receive shares from other servers" : "Luba selle serveri kasutajatel võtta vastu jagamisi teistest serveritest" },"pluralForm" :"nplurals=2; plural=(n != 1);" diff --git a/apps/files_sharing/l10n/eu.js b/apps/files_sharing/l10n/eu.js index ff254aa50c4..047a96a73f1 100644 --- a/apps/files_sharing/l10n/eu.js +++ b/apps/files_sharing/l10n/eu.js @@ -4,20 +4,34 @@ OC.L10N.register( "Server to server sharing is not enabled on this server" : "Zerbitzaritik zerbitzarirako elkarbanaketa ez dago gaituta zerbitzari honetan", "The mountpoint name contains invalid characters." : "Montatze puntuaren izenak baliogabeko karaktereak ditu.", "Invalid or untrusted SSL certificate" : "SSL ziurtagiri baliogabea edo fidagaitza", + "Storage not valid" : "Biltegi bliogabea", "Couldn't add remote share" : "Ezin izan da hurruneko elkarbanaketa gehitu", "Shared with you" : "Zurekin elkarbanatuta", "Shared with others" : "Beste batzuekin elkarbanatuta", "Shared by link" : "Lotura bidez elkarbanatuta", + "Nothing shared with you yet" : "Oraindik ez da ezer partekatu zurekin", + "Files and folders others share with you will show up here" : "Zurekin partekatutako fitxategi eta karpetak hemen agertuko dira", + "Nothing shared yet" : "Oraindik ez da ezer partekatu", + "Files and folders you share will show up here" : "Partekatzen dituzun fitxategi eta karpetak hemen agertuko dira", + "No shared links" : "Ez dago partekatutako loturarik", + "Files and folders you share by link will show up here" : "Lotura bidez partekatzen dituzun fitxategi eta karpetak hemen agertuko dira", "Do you want to add the remote share {name} from {owner}@{remote}?" : "Nahi duzu gehitzea {name} urrutiko partekatzea honengandik {owner}@{remote}?", "Remote share" : "Urrutiko parte hartzea", "Remote share password" : "Urrutiko parte hartzeen pasahitza", "Cancel" : "Ezeztatu", "Add remote share" : "Gehitu urrutiko parte hartzea", + "No ownCloud installation (7 or higher) found at {remote}" : "Ez da ownClouden instalaziorik (7 edo haundiago) aurkitu {remote}n", "Invalid ownCloud url" : "ownCloud url baliogabea", + "Share" : "Partekatu", "Shared by" : "Honek elkarbanatuta", + "A file or folder was shared from <strong>another server</strong>" : "Fitxategia edo karpeta konpartitu da <strong>beste zerbitzari batetatik</strong>", + "A public shared file or folder was <strong>downloaded</strong>" : "Publikoki partekatutako fitxategi edo karpeta bat <strong>deskargatu da</strong>", + "Public shared folder %1$s was downloaded" : "Publikoki partekatutako %1$s karpeta deskargatu da", + "Public shared file %1$s was downloaded" : "Publikoki partekatutako %1$s fitxategia deskargatu da", "This share is password-protected" : "Elkarbanatutako hau pasahitzarekin babestuta dago", "The password is wrong. Try again." : "Pasahitza ez da egokia. Saiatu berriro.", "Password" : "Pasahitza", + "No entries found in this folder" : "Karpeta honetan ez da sarreraik aurkitu", "Name" : "Izena", "Share time" : "Elkarbanatze unea", "Sorry, this link doesn’t seem to work anymore." : "Barkatu, lotura ez dirudi eskuragarria dagoenik.", @@ -29,6 +43,9 @@ OC.L10N.register( "Add to your ownCloud" : "Gehitu zure ownCloud-era", "Download" : "Deskargatu", "Download %s" : "Deskargatu %s", - "Direct link" : "Lotura zuzena" + "Direct link" : "Lotura zuzena", + "Federated Cloud Sharing" : "Federatutako Hodei Partekatzea", + "Allow users on this server to send shares to other servers" : "Baimendu zerbitzari honetako erabiltzaileak beste zerbitzariekin partekatzera", + "Allow users on this server to receive shares from other servers" : "Baimendu zerbitzari honetako erabiltzaileak beste zerbitzarietatik partekatutakoak jasotzen" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files_sharing/l10n/eu.json b/apps/files_sharing/l10n/eu.json index 62955cafaf3..58e5225abf9 100644 --- a/apps/files_sharing/l10n/eu.json +++ b/apps/files_sharing/l10n/eu.json @@ -2,20 +2,34 @@ "Server to server sharing is not enabled on this server" : "Zerbitzaritik zerbitzarirako elkarbanaketa ez dago gaituta zerbitzari honetan", "The mountpoint name contains invalid characters." : "Montatze puntuaren izenak baliogabeko karaktereak ditu.", "Invalid or untrusted SSL certificate" : "SSL ziurtagiri baliogabea edo fidagaitza", + "Storage not valid" : "Biltegi bliogabea", "Couldn't add remote share" : "Ezin izan da hurruneko elkarbanaketa gehitu", "Shared with you" : "Zurekin elkarbanatuta", "Shared with others" : "Beste batzuekin elkarbanatuta", "Shared by link" : "Lotura bidez elkarbanatuta", + "Nothing shared with you yet" : "Oraindik ez da ezer partekatu zurekin", + "Files and folders others share with you will show up here" : "Zurekin partekatutako fitxategi eta karpetak hemen agertuko dira", + "Nothing shared yet" : "Oraindik ez da ezer partekatu", + "Files and folders you share will show up here" : "Partekatzen dituzun fitxategi eta karpetak hemen agertuko dira", + "No shared links" : "Ez dago partekatutako loturarik", + "Files and folders you share by link will show up here" : "Lotura bidez partekatzen dituzun fitxategi eta karpetak hemen agertuko dira", "Do you want to add the remote share {name} from {owner}@{remote}?" : "Nahi duzu gehitzea {name} urrutiko partekatzea honengandik {owner}@{remote}?", "Remote share" : "Urrutiko parte hartzea", "Remote share password" : "Urrutiko parte hartzeen pasahitza", "Cancel" : "Ezeztatu", "Add remote share" : "Gehitu urrutiko parte hartzea", + "No ownCloud installation (7 or higher) found at {remote}" : "Ez da ownClouden instalaziorik (7 edo haundiago) aurkitu {remote}n", "Invalid ownCloud url" : "ownCloud url baliogabea", + "Share" : "Partekatu", "Shared by" : "Honek elkarbanatuta", + "A file or folder was shared from <strong>another server</strong>" : "Fitxategia edo karpeta konpartitu da <strong>beste zerbitzari batetatik</strong>", + "A public shared file or folder was <strong>downloaded</strong>" : "Publikoki partekatutako fitxategi edo karpeta bat <strong>deskargatu da</strong>", + "Public shared folder %1$s was downloaded" : "Publikoki partekatutako %1$s karpeta deskargatu da", + "Public shared file %1$s was downloaded" : "Publikoki partekatutako %1$s fitxategia deskargatu da", "This share is password-protected" : "Elkarbanatutako hau pasahitzarekin babestuta dago", "The password is wrong. Try again." : "Pasahitza ez da egokia. Saiatu berriro.", "Password" : "Pasahitza", + "No entries found in this folder" : "Karpeta honetan ez da sarreraik aurkitu", "Name" : "Izena", "Share time" : "Elkarbanatze unea", "Sorry, this link doesn’t seem to work anymore." : "Barkatu, lotura ez dirudi eskuragarria dagoenik.", @@ -27,6 +41,9 @@ "Add to your ownCloud" : "Gehitu zure ownCloud-era", "Download" : "Deskargatu", "Download %s" : "Deskargatu %s", - "Direct link" : "Lotura zuzena" + "Direct link" : "Lotura zuzena", + "Federated Cloud Sharing" : "Federatutako Hodei Partekatzea", + "Allow users on this server to send shares to other servers" : "Baimendu zerbitzari honetako erabiltzaileak beste zerbitzariekin partekatzera", + "Allow users on this server to receive shares from other servers" : "Baimendu zerbitzari honetako erabiltzaileak beste zerbitzarietatik partekatutakoak jasotzen" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/fa.js b/apps/files_sharing/l10n/fa.js index 86dc4d5468d..91232ffd638 100644 --- a/apps/files_sharing/l10n/fa.js +++ b/apps/files_sharing/l10n/fa.js @@ -13,6 +13,7 @@ OC.L10N.register( "Cancel" : "منصرف شدن", "Add remote share" : "افزودن اشتراک از راه دور", "Invalid ownCloud url" : "آدرس نمونه ownCloud غیر معتبر است", + "Share" : "اشتراکگذاری", "Shared by" : "اشتراک گذاشته شده به وسیله", "This share is password-protected" : "این اشتراک توسط رمز عبور محافظت می شود", "The password is wrong. Try again." : "رمزعبور اشتباه می باشد. دوباره امتحان کنید.", diff --git a/apps/files_sharing/l10n/fa.json b/apps/files_sharing/l10n/fa.json index 921c9a4bb28..e63d08c2edb 100644 --- a/apps/files_sharing/l10n/fa.json +++ b/apps/files_sharing/l10n/fa.json @@ -11,6 +11,7 @@ "Cancel" : "منصرف شدن", "Add remote share" : "افزودن اشتراک از راه دور", "Invalid ownCloud url" : "آدرس نمونه ownCloud غیر معتبر است", + "Share" : "اشتراکگذاری", "Shared by" : "اشتراک گذاشته شده به وسیله", "This share is password-protected" : "این اشتراک توسط رمز عبور محافظت می شود", "The password is wrong. Try again." : "رمزعبور اشتباه می باشد. دوباره امتحان کنید.", diff --git a/apps/files_sharing/l10n/fi_FI.js b/apps/files_sharing/l10n/fi_FI.js index 5b42bd73062..f8803a05dca 100644 --- a/apps/files_sharing/l10n/fi_FI.js +++ b/apps/files_sharing/l10n/fi_FI.js @@ -4,6 +4,8 @@ OC.L10N.register( "Server to server sharing is not enabled on this server" : "Palvelimelta-palvelimelle-jakaminen ei ole käytössä tällä palvelimella", "The mountpoint name contains invalid characters." : "Liitospisteen nimi sisältää virheellisiä merkkejä.", "Invalid or untrusted SSL certificate" : "Virheellinen tai ei-luotettu SSL-varmenne", + "Could not authenticate to remote share, password might be wrong" : "Tunnistautuminen etäjakoa kohtaan epäonnistui. Salasana saattaa olla väärä", + "Storage not valid" : "Tallennustila ei ole kelvollinen", "Couldn't add remote share" : "Etäjaon liittäminen epäonnistui", "Shared with you" : "Jaettu kanssasi", "Shared with others" : "Jaettu muiden kanssa", @@ -47,7 +49,7 @@ OC.L10N.register( "Download" : "Lataa", "Download %s" : "Lataa %s", "Direct link" : "Suora linkki", - "Server-to-Server Sharing" : "Palvelimelta palvelimelle -jakaminen", + "Federated Cloud Sharing" : "Federoitu pilvijakaminen", "Allow users on this server to send shares to other servers" : "Salli tämän palvelimen käyttäjien lähettää jakoja muille palvelimille", "Allow users on this server to receive shares from other servers" : "Salli tämän palvelimen käyttäjien vastaanottaa jakoja muilta palvelimilta" }, diff --git a/apps/files_sharing/l10n/fi_FI.json b/apps/files_sharing/l10n/fi_FI.json index 32c14309fb3..29f7d5ba14d 100644 --- a/apps/files_sharing/l10n/fi_FI.json +++ b/apps/files_sharing/l10n/fi_FI.json @@ -2,6 +2,8 @@ "Server to server sharing is not enabled on this server" : "Palvelimelta-palvelimelle-jakaminen ei ole käytössä tällä palvelimella", "The mountpoint name contains invalid characters." : "Liitospisteen nimi sisältää virheellisiä merkkejä.", "Invalid or untrusted SSL certificate" : "Virheellinen tai ei-luotettu SSL-varmenne", + "Could not authenticate to remote share, password might be wrong" : "Tunnistautuminen etäjakoa kohtaan epäonnistui. Salasana saattaa olla väärä", + "Storage not valid" : "Tallennustila ei ole kelvollinen", "Couldn't add remote share" : "Etäjaon liittäminen epäonnistui", "Shared with you" : "Jaettu kanssasi", "Shared with others" : "Jaettu muiden kanssa", @@ -45,7 +47,7 @@ "Download" : "Lataa", "Download %s" : "Lataa %s", "Direct link" : "Suora linkki", - "Server-to-Server Sharing" : "Palvelimelta palvelimelle -jakaminen", + "Federated Cloud Sharing" : "Federoitu pilvijakaminen", "Allow users on this server to send shares to other servers" : "Salli tämän palvelimen käyttäjien lähettää jakoja muille palvelimille", "Allow users on this server to receive shares from other servers" : "Salli tämän palvelimen käyttäjien vastaanottaa jakoja muilta palvelimilta" },"pluralForm" :"nplurals=2; plural=(n != 1);" diff --git a/apps/files_sharing/l10n/fr.js b/apps/files_sharing/l10n/fr.js index f3b8ab9fe5b..b450ab08221 100644 --- a/apps/files_sharing/l10n/fr.js +++ b/apps/files_sharing/l10n/fr.js @@ -4,6 +4,8 @@ OC.L10N.register( "Server to server sharing is not enabled on this server" : "Le partage de serveur à serveur n'est pas activé sur ce serveur", "The mountpoint name contains invalid characters." : "Le nom du point de montage contient des caractères invalides.", "Invalid or untrusted SSL certificate" : "Certificat SSL non valable ou non fiable", + "Could not authenticate to remote share, password might be wrong" : "Impossible de s'authentifier au partage distant : le mot de passe en probablement incorrect", + "Storage not valid" : "Support de stockage non valide", "Couldn't add remote share" : "Impossible d'ajouter le partage distant", "Shared with you" : "Partagés avec vous", "Shared with others" : "Partagés avec d'autres", @@ -12,7 +14,7 @@ OC.L10N.register( "Files and folders others share with you will show up here" : "Les fichiers et dossiers partagés avec vous apparaîtront ici", "Nothing shared yet" : "Rien n'est partagé pour l'instant", "Files and folders you share will show up here" : "Les fichiers et dossiers que vous partagerez apparaîtront ici", - "No shared links" : "Aucun lien partagé", + "No shared links" : "Aucun partage par lien", "Files and folders you share by link will show up here" : "Les fichiers et dossiers que vous partagerez par lien apparaîtront ici", "Do you want to add the remote share {name} from {owner}@{remote}?" : "Voulez-vous ajouter le partage distant {name} de {owner}@{remote} ?", "Remote share" : "Partage distant", @@ -21,6 +23,7 @@ OC.L10N.register( "Add remote share" : "Ajouter un partage distant", "No ownCloud installation (7 or higher) found at {remote}" : "Aucune installation ownCloud (7 ou supérieur) trouvée sur {remote}", "Invalid ownCloud url" : "URL ownCloud non valide", + "Share" : "Partager", "Shared by" : "Partagé par", "A file or folder was shared from <strong>another server</strong>" : "Un fichier ou un répertoire a été partagé depuis <strong>un autre serveur</strong>", "A public shared file or folder was <strong>downloaded</strong>" : "Un fichier ou un répertoire partagé a été <strong>téléchargé</strong>", @@ -36,9 +39,9 @@ OC.L10N.register( "No entries found in this folder" : "Aucune entrée trouvée dans ce dossier", "Name" : "Nom", "Share time" : "Date de partage", - "Sorry, this link doesn’t seem to work anymore." : "Désolé, mais le lien semble ne plus fonctionner.", + "Sorry, this link doesn’t seem to work anymore." : "Désolé, mais ce lien semble ne plus fonctionner.", "Reasons might be:" : "Les raisons peuvent être :", - "the item was removed" : "l'item a été supprimé", + "the item was removed" : "l'élément a été supprimé", "the link expired" : "le lien a expiré", "sharing is disabled" : "le partage est désactivé", "For more info, please ask the person who sent this link." : "Pour plus d'informations, veuillez contacter la personne qui a envoyé ce lien.", @@ -46,7 +49,7 @@ OC.L10N.register( "Download" : "Télécharger", "Download %s" : "Télécharger %s", "Direct link" : "Lien direct", - "Server-to-Server Sharing" : "Partage de serveur à serveur", + "Federated Cloud Sharing" : "Federated Cloud Sharing", "Allow users on this server to send shares to other servers" : "Autoriser les utilisateurs de ce serveur à envoyer des partages vers d'autres serveurs", "Allow users on this server to receive shares from other servers" : "Autoriser les utilisateurs de ce serveur à recevoir des partages d'autres serveurs" }, diff --git a/apps/files_sharing/l10n/fr.json b/apps/files_sharing/l10n/fr.json index 1ea0e05ed1e..1c8d0382f79 100644 --- a/apps/files_sharing/l10n/fr.json +++ b/apps/files_sharing/l10n/fr.json @@ -2,6 +2,8 @@ "Server to server sharing is not enabled on this server" : "Le partage de serveur à serveur n'est pas activé sur ce serveur", "The mountpoint name contains invalid characters." : "Le nom du point de montage contient des caractères invalides.", "Invalid or untrusted SSL certificate" : "Certificat SSL non valable ou non fiable", + "Could not authenticate to remote share, password might be wrong" : "Impossible de s'authentifier au partage distant : le mot de passe en probablement incorrect", + "Storage not valid" : "Support de stockage non valide", "Couldn't add remote share" : "Impossible d'ajouter le partage distant", "Shared with you" : "Partagés avec vous", "Shared with others" : "Partagés avec d'autres", @@ -10,7 +12,7 @@ "Files and folders others share with you will show up here" : "Les fichiers et dossiers partagés avec vous apparaîtront ici", "Nothing shared yet" : "Rien n'est partagé pour l'instant", "Files and folders you share will show up here" : "Les fichiers et dossiers que vous partagerez apparaîtront ici", - "No shared links" : "Aucun lien partagé", + "No shared links" : "Aucun partage par lien", "Files and folders you share by link will show up here" : "Les fichiers et dossiers que vous partagerez par lien apparaîtront ici", "Do you want to add the remote share {name} from {owner}@{remote}?" : "Voulez-vous ajouter le partage distant {name} de {owner}@{remote} ?", "Remote share" : "Partage distant", @@ -19,6 +21,7 @@ "Add remote share" : "Ajouter un partage distant", "No ownCloud installation (7 or higher) found at {remote}" : "Aucune installation ownCloud (7 ou supérieur) trouvée sur {remote}", "Invalid ownCloud url" : "URL ownCloud non valide", + "Share" : "Partager", "Shared by" : "Partagé par", "A file or folder was shared from <strong>another server</strong>" : "Un fichier ou un répertoire a été partagé depuis <strong>un autre serveur</strong>", "A public shared file or folder was <strong>downloaded</strong>" : "Un fichier ou un répertoire partagé a été <strong>téléchargé</strong>", @@ -34,9 +37,9 @@ "No entries found in this folder" : "Aucune entrée trouvée dans ce dossier", "Name" : "Nom", "Share time" : "Date de partage", - "Sorry, this link doesn’t seem to work anymore." : "Désolé, mais le lien semble ne plus fonctionner.", + "Sorry, this link doesn’t seem to work anymore." : "Désolé, mais ce lien semble ne plus fonctionner.", "Reasons might be:" : "Les raisons peuvent être :", - "the item was removed" : "l'item a été supprimé", + "the item was removed" : "l'élément a été supprimé", "the link expired" : "le lien a expiré", "sharing is disabled" : "le partage est désactivé", "For more info, please ask the person who sent this link." : "Pour plus d'informations, veuillez contacter la personne qui a envoyé ce lien.", @@ -44,7 +47,7 @@ "Download" : "Télécharger", "Download %s" : "Télécharger %s", "Direct link" : "Lien direct", - "Server-to-Server Sharing" : "Partage de serveur à serveur", + "Federated Cloud Sharing" : "Federated Cloud Sharing", "Allow users on this server to send shares to other servers" : "Autoriser les utilisateurs de ce serveur à envoyer des partages vers d'autres serveurs", "Allow users on this server to receive shares from other servers" : "Autoriser les utilisateurs de ce serveur à recevoir des partages d'autres serveurs" },"pluralForm" :"nplurals=2; plural=(n > 1);" diff --git a/apps/files_sharing/l10n/gl.js b/apps/files_sharing/l10n/gl.js index 642d2776135..36967ee11dd 100644 --- a/apps/files_sharing/l10n/gl.js +++ b/apps/files_sharing/l10n/gl.js @@ -4,6 +4,8 @@ OC.L10N.register( "Server to server sharing is not enabled on this server" : "Neste servidor non está activada a compartición de servidor a servidor", "The mountpoint name contains invalid characters." : "O nome do punto de montaxe contén caracteres inválidos.", "Invalid or untrusted SSL certificate" : "Certificado SSL incorrecto ou non fiábel", + "Could not authenticate to remote share, password might be wrong" : "Non se puido autenticar na compartición remota, o contrasinal podería ser erróneo", + "Storage not valid" : "Almacenamento non válido", "Couldn't add remote share" : "Non foi posíbel engadir a compartición remota", "Shared with you" : "Compartido con vostede", "Shared with others" : "Compartido con outros", @@ -21,6 +23,7 @@ OC.L10N.register( "Add remote share" : "Engadir unha compartición remota", "No ownCloud installation (7 or higher) found at {remote}" : "Non se atopa unha instalación de ownCloud (7 ou superior) en {remote}", "Invalid ownCloud url" : "URL incorrecta do ownCloud", + "Share" : "Compartir", "Shared by" : "Compartido por", "A file or folder was shared from <strong>another server</strong>" : "Compartiuse un ficheiro ou cartafol desde <strong>outro servidor</strong>", "A public shared file or folder was <strong>downloaded</strong>" : "Foi <strong>descargado</strong> un ficheiro ou cartafol público", @@ -46,7 +49,7 @@ OC.L10N.register( "Download" : "Descargar", "Download %s" : "Descargar %s", "Direct link" : "Ligazón directa", - "Server-to-Server Sharing" : "Compartición Servidor-a-Servidor", + "Federated Cloud Sharing" : "Compartición de nube federada", "Allow users on this server to send shares to other servers" : "Permitir aos ususarios de este servidor enviar comparticións a outros servidores", "Allow users on this server to receive shares from other servers" : "Permitir aos usuarios de este servidor recibir comparticións de outros servidores" }, diff --git a/apps/files_sharing/l10n/gl.json b/apps/files_sharing/l10n/gl.json index 6bbe011871b..81d97bfdcec 100644 --- a/apps/files_sharing/l10n/gl.json +++ b/apps/files_sharing/l10n/gl.json @@ -2,6 +2,8 @@ "Server to server sharing is not enabled on this server" : "Neste servidor non está activada a compartición de servidor a servidor", "The mountpoint name contains invalid characters." : "O nome do punto de montaxe contén caracteres inválidos.", "Invalid or untrusted SSL certificate" : "Certificado SSL incorrecto ou non fiábel", + "Could not authenticate to remote share, password might be wrong" : "Non se puido autenticar na compartición remota, o contrasinal podería ser erróneo", + "Storage not valid" : "Almacenamento non válido", "Couldn't add remote share" : "Non foi posíbel engadir a compartición remota", "Shared with you" : "Compartido con vostede", "Shared with others" : "Compartido con outros", @@ -19,6 +21,7 @@ "Add remote share" : "Engadir unha compartición remota", "No ownCloud installation (7 or higher) found at {remote}" : "Non se atopa unha instalación de ownCloud (7 ou superior) en {remote}", "Invalid ownCloud url" : "URL incorrecta do ownCloud", + "Share" : "Compartir", "Shared by" : "Compartido por", "A file or folder was shared from <strong>another server</strong>" : "Compartiuse un ficheiro ou cartafol desde <strong>outro servidor</strong>", "A public shared file or folder was <strong>downloaded</strong>" : "Foi <strong>descargado</strong> un ficheiro ou cartafol público", @@ -44,7 +47,7 @@ "Download" : "Descargar", "Download %s" : "Descargar %s", "Direct link" : "Ligazón directa", - "Server-to-Server Sharing" : "Compartición Servidor-a-Servidor", + "Federated Cloud Sharing" : "Compartición de nube federada", "Allow users on this server to send shares to other servers" : "Permitir aos ususarios de este servidor enviar comparticións a outros servidores", "Allow users on this server to receive shares from other servers" : "Permitir aos usuarios de este servidor recibir comparticións de outros servidores" },"pluralForm" :"nplurals=2; plural=(n != 1);" diff --git a/apps/files_sharing/l10n/he.js b/apps/files_sharing/l10n/he.js index 4e9ce972240..06562c4d967 100644 --- a/apps/files_sharing/l10n/he.js +++ b/apps/files_sharing/l10n/he.js @@ -2,6 +2,7 @@ OC.L10N.register( "files_sharing", { "Cancel" : "ביטול", + "Share" : "שיתוף", "Shared by" : "שותף על־ידי", "Password" : "סיסמא", "Name" : "שם", diff --git a/apps/files_sharing/l10n/he.json b/apps/files_sharing/l10n/he.json index fe209ca3ecd..4a7c6097dd5 100644 --- a/apps/files_sharing/l10n/he.json +++ b/apps/files_sharing/l10n/he.json @@ -1,5 +1,6 @@ { "translations": { "Cancel" : "ביטול", + "Share" : "שיתוף", "Shared by" : "שותף על־ידי", "Password" : "סיסמא", "Name" : "שם", diff --git a/apps/files_sharing/l10n/hi.js b/apps/files_sharing/l10n/hi.js index a9647c762d0..8a6c01ef435 100644 --- a/apps/files_sharing/l10n/hi.js +++ b/apps/files_sharing/l10n/hi.js @@ -2,6 +2,7 @@ OC.L10N.register( "files_sharing", { "Cancel" : "रद्द करें ", + "Share" : "साझा करें", "Shared by" : "द्वारा साझा", "Password" : "पासवर्ड" }, diff --git a/apps/files_sharing/l10n/hi.json b/apps/files_sharing/l10n/hi.json index 5775830b621..6078a1ba37b 100644 --- a/apps/files_sharing/l10n/hi.json +++ b/apps/files_sharing/l10n/hi.json @@ -1,5 +1,6 @@ { "translations": { "Cancel" : "रद्द करें ", + "Share" : "साझा करें", "Shared by" : "द्वारा साझा", "Password" : "पासवर्ड" },"pluralForm" :"nplurals=2; plural=(n != 1);" diff --git a/apps/files_sharing/l10n/hr.js b/apps/files_sharing/l10n/hr.js index e0f17faaa59..c200e1ca826 100644 --- a/apps/files_sharing/l10n/hr.js +++ b/apps/files_sharing/l10n/hr.js @@ -13,10 +13,12 @@ OC.L10N.register( "Cancel" : "Odustanite", "Add remote share" : "Dodajte udaljeni zajednički resurs", "Invalid ownCloud url" : "Neispravan ownCloud URL", + "Share" : "Podijelite resurs", "Shared by" : "Podijeljeno od strane", "This share is password-protected" : "Ovaj zajednički resurs je zaštićen lozinkom", "The password is wrong. Try again." : "Pogrešna lozinka. Pokušajte ponovno.", "Password" : "Lozinka", + "No entries found in this folder" : "Zapis nije pronadjen u ovom direktorijumu ", "Name" : "Naziv", "Share time" : "Vrijeme dijeljenja", "Sorry, this link doesn’t seem to work anymore." : "Žao nam je, čini se da ova veza više ne radi.", diff --git a/apps/files_sharing/l10n/hr.json b/apps/files_sharing/l10n/hr.json index bad140eb242..764710ea84a 100644 --- a/apps/files_sharing/l10n/hr.json +++ b/apps/files_sharing/l10n/hr.json @@ -11,10 +11,12 @@ "Cancel" : "Odustanite", "Add remote share" : "Dodajte udaljeni zajednički resurs", "Invalid ownCloud url" : "Neispravan ownCloud URL", + "Share" : "Podijelite resurs", "Shared by" : "Podijeljeno od strane", "This share is password-protected" : "Ovaj zajednički resurs je zaštićen lozinkom", "The password is wrong. Try again." : "Pogrešna lozinka. Pokušajte ponovno.", "Password" : "Lozinka", + "No entries found in this folder" : "Zapis nije pronadjen u ovom direktorijumu ", "Name" : "Naziv", "Share time" : "Vrijeme dijeljenja", "Sorry, this link doesn’t seem to work anymore." : "Žao nam je, čini se da ova veza više ne radi.", diff --git a/apps/files_sharing/l10n/hu_HU.js b/apps/files_sharing/l10n/hu_HU.js index a48c6b71a05..277273c8783 100644 --- a/apps/files_sharing/l10n/hu_HU.js +++ b/apps/files_sharing/l10n/hu_HU.js @@ -14,10 +14,12 @@ OC.L10N.register( "Cancel" : "Mégsem", "Add remote share" : "Távoli megosztás létrehozása", "Invalid ownCloud url" : "Érvénytelen ownCloud webcím", + "Share" : "Megosztás", "Shared by" : "Megosztotta Önnel", "This share is password-protected" : "Ez egy jelszóval védett megosztás", "The password is wrong. Try again." : "A megadott jelszó nem megfelelő. Próbálja újra!", "Password" : "Jelszó", + "No entries found in this folder" : "Nincsenek bejegyzések ebben a könyvtárban", "Name" : "Név", "Share time" : "A megosztás időpontja", "Sorry, this link doesn’t seem to work anymore." : "Sajnos úgy tűnik, ez a link már nem működik.", diff --git a/apps/files_sharing/l10n/hu_HU.json b/apps/files_sharing/l10n/hu_HU.json index d700541ad28..543ee1596fc 100644 --- a/apps/files_sharing/l10n/hu_HU.json +++ b/apps/files_sharing/l10n/hu_HU.json @@ -12,10 +12,12 @@ "Cancel" : "Mégsem", "Add remote share" : "Távoli megosztás létrehozása", "Invalid ownCloud url" : "Érvénytelen ownCloud webcím", + "Share" : "Megosztás", "Shared by" : "Megosztotta Önnel", "This share is password-protected" : "Ez egy jelszóval védett megosztás", "The password is wrong. Try again." : "A megadott jelszó nem megfelelő. Próbálja újra!", "Password" : "Jelszó", + "No entries found in this folder" : "Nincsenek bejegyzések ebben a könyvtárban", "Name" : "Név", "Share time" : "A megosztás időpontja", "Sorry, this link doesn’t seem to work anymore." : "Sajnos úgy tűnik, ez a link már nem működik.", diff --git a/apps/files_sharing/l10n/ia.js b/apps/files_sharing/l10n/ia.js index c144fbd44f3..0d471561316 100644 --- a/apps/files_sharing/l10n/ia.js +++ b/apps/files_sharing/l10n/ia.js @@ -2,6 +2,7 @@ OC.L10N.register( "files_sharing", { "Cancel" : "Cancellar", + "Share" : "Compartir", "Password" : "Contrasigno", "Name" : "Nomine", "Download" : "Discargar" diff --git a/apps/files_sharing/l10n/ia.json b/apps/files_sharing/l10n/ia.json index d6153f18230..5908b2a4d4d 100644 --- a/apps/files_sharing/l10n/ia.json +++ b/apps/files_sharing/l10n/ia.json @@ -1,5 +1,6 @@ { "translations": { "Cancel" : "Cancellar", + "Share" : "Compartir", "Password" : "Contrasigno", "Name" : "Nomine", "Download" : "Discargar" diff --git a/apps/files_sharing/l10n/id.js b/apps/files_sharing/l10n/id.js index 633195cc99f..74c0af2695b 100644 --- a/apps/files_sharing/l10n/id.js +++ b/apps/files_sharing/l10n/id.js @@ -2,24 +2,43 @@ OC.L10N.register( "files_sharing", { "Server to server sharing is not enabled on this server" : "Berbagi server ke server tidak diaktifkan pada server ini", - "The mountpoint name contains invalid characters." : "Nama titik kait berisi karakter yang tidak sah.", + "The mountpoint name contains invalid characters." : "Nama mount point berisi karakter yang tidak sah.", "Invalid or untrusted SSL certificate" : "Sertifikast SSL tidak sah atau tidak terpercaya", + "Could not authenticate to remote share, password might be wrong" : "Tidak dapat mengautentikasi berbagi remote, kata sandi mungkin salah", + "Storage not valid" : "Penyimpanan tidak sah", "Couldn't add remote share" : "Tidak dapat menambahkan berbagi remote", "Shared with you" : "Dibagikan dengan Anda", "Shared with others" : "Dibagikan dengan lainnya", "Shared by link" : "Dibagikan dengan tautan", + "Nothing shared with you yet" : "Tidak ada yang dibagikan kepada Anda", + "Files and folders others share with you will show up here" : "Berkas dan folder lainnya yang dibagikan kepada Anda akan ditampilkan disini", + "Nothing shared yet" : "Tidak ada yang dibagikan", + "Files and folders you share will show up here" : "Berkas dan folder yang Anda bagikan akan ditampilkan disini", + "No shared links" : "Tidak ada tautan berbagi", + "Files and folders you share by link will show up here" : "Berkas dan folder yang Anda bagikan menggunakan tautan akan ditampilkan disini", "Do you want to add the remote share {name} from {owner}@{remote}?" : "Apakah Anda ingin menambahkan berbagi remote {name} dari {owner}@{remote}?", "Remote share" : "Berbagi remote", "Remote share password" : "Sandi berbagi remote", "Cancel" : "Batal", "Add remote share" : "Tambah berbagi remote", + "No ownCloud installation (7 or higher) found at {remote}" : "Tidak ditemukan instalasi ownCloud (7 atau lebih tinggi) pada {remote}", "Invalid ownCloud url" : "URL ownCloud tidak sah", + "Share" : "Bagikan", "Shared by" : "Dibagikan oleh", + "A file or folder was shared from <strong>another server</strong>" : "Sebuah berkas atau folder telah dibagikan dari <strong>server lainnya</strong>", + "A public shared file or folder was <strong>downloaded</strong>" : "Sebuah berkas atau folder berbagi publik telah <strong>diunduh</strong>", + "You received a new remote share from %s" : "Anda menerima berbagi remote baru dari %s", + "%1$s accepted remote share %2$s" : "%1$s menerima berbagi remote %2$s", + "%1$s declined remote share %2$s" : "%1$s menolak berbagi remote %2$s", + "%1$s unshared %2$s from you" : "%1$s menghapus berbagi %2$s dari Anda", + "Public shared folder %1$s was downloaded" : "Folder berbagi publik %1$s telah diunduh", + "Public shared file %1$s was downloaded" : "Berkas berbagi publik %1$s telah diunduh", "This share is password-protected" : "Berbagi ini dilindungi sandi", "The password is wrong. Try again." : "Sandi salah. Coba lagi", "Password" : "Sandi", + "No entries found in this folder" : "Tidak ada entri yang ditemukan dalam folder ini", "Name" : "Nama", - "Share time" : "Bagikan waktu", + "Share time" : "Waktu berbagi", "Sorry, this link doesn’t seem to work anymore." : "Maaf, tautan ini tampaknya tidak berfungsi lagi.", "Reasons might be:" : "Alasan yang mungkin:", "the item was removed" : "item telah dihapus", @@ -29,6 +48,9 @@ OC.L10N.register( "Add to your ownCloud" : "Tambahkan ke ownCloud Anda", "Download" : "Unduh", "Download %s" : "Unduh %s", - "Direct link" : "Tautan langsung" + "Direct link" : "Tautan langsung", + "Federated Cloud Sharing" : "Federated Cloud Sharing", + "Allow users on this server to send shares to other servers" : "Izinkan para pengguna di server ini untuk mengirimkan berbagi ke server lainnya.", + "Allow users on this server to receive shares from other servers" : "Izinkan para pengguna di server ini untuk menerima berbagi ke server lainnya." }, "nplurals=1; plural=0;"); diff --git a/apps/files_sharing/l10n/id.json b/apps/files_sharing/l10n/id.json index 51a45a575c6..0c53df206a0 100644 --- a/apps/files_sharing/l10n/id.json +++ b/apps/files_sharing/l10n/id.json @@ -1,23 +1,42 @@ { "translations": { "Server to server sharing is not enabled on this server" : "Berbagi server ke server tidak diaktifkan pada server ini", - "The mountpoint name contains invalid characters." : "Nama titik kait berisi karakter yang tidak sah.", + "The mountpoint name contains invalid characters." : "Nama mount point berisi karakter yang tidak sah.", "Invalid or untrusted SSL certificate" : "Sertifikast SSL tidak sah atau tidak terpercaya", + "Could not authenticate to remote share, password might be wrong" : "Tidak dapat mengautentikasi berbagi remote, kata sandi mungkin salah", + "Storage not valid" : "Penyimpanan tidak sah", "Couldn't add remote share" : "Tidak dapat menambahkan berbagi remote", "Shared with you" : "Dibagikan dengan Anda", "Shared with others" : "Dibagikan dengan lainnya", "Shared by link" : "Dibagikan dengan tautan", + "Nothing shared with you yet" : "Tidak ada yang dibagikan kepada Anda", + "Files and folders others share with you will show up here" : "Berkas dan folder lainnya yang dibagikan kepada Anda akan ditampilkan disini", + "Nothing shared yet" : "Tidak ada yang dibagikan", + "Files and folders you share will show up here" : "Berkas dan folder yang Anda bagikan akan ditampilkan disini", + "No shared links" : "Tidak ada tautan berbagi", + "Files and folders you share by link will show up here" : "Berkas dan folder yang Anda bagikan menggunakan tautan akan ditampilkan disini", "Do you want to add the remote share {name} from {owner}@{remote}?" : "Apakah Anda ingin menambahkan berbagi remote {name} dari {owner}@{remote}?", "Remote share" : "Berbagi remote", "Remote share password" : "Sandi berbagi remote", "Cancel" : "Batal", "Add remote share" : "Tambah berbagi remote", + "No ownCloud installation (7 or higher) found at {remote}" : "Tidak ditemukan instalasi ownCloud (7 atau lebih tinggi) pada {remote}", "Invalid ownCloud url" : "URL ownCloud tidak sah", + "Share" : "Bagikan", "Shared by" : "Dibagikan oleh", + "A file or folder was shared from <strong>another server</strong>" : "Sebuah berkas atau folder telah dibagikan dari <strong>server lainnya</strong>", + "A public shared file or folder was <strong>downloaded</strong>" : "Sebuah berkas atau folder berbagi publik telah <strong>diunduh</strong>", + "You received a new remote share from %s" : "Anda menerima berbagi remote baru dari %s", + "%1$s accepted remote share %2$s" : "%1$s menerima berbagi remote %2$s", + "%1$s declined remote share %2$s" : "%1$s menolak berbagi remote %2$s", + "%1$s unshared %2$s from you" : "%1$s menghapus berbagi %2$s dari Anda", + "Public shared folder %1$s was downloaded" : "Folder berbagi publik %1$s telah diunduh", + "Public shared file %1$s was downloaded" : "Berkas berbagi publik %1$s telah diunduh", "This share is password-protected" : "Berbagi ini dilindungi sandi", "The password is wrong. Try again." : "Sandi salah. Coba lagi", "Password" : "Sandi", + "No entries found in this folder" : "Tidak ada entri yang ditemukan dalam folder ini", "Name" : "Nama", - "Share time" : "Bagikan waktu", + "Share time" : "Waktu berbagi", "Sorry, this link doesn’t seem to work anymore." : "Maaf, tautan ini tampaknya tidak berfungsi lagi.", "Reasons might be:" : "Alasan yang mungkin:", "the item was removed" : "item telah dihapus", @@ -27,6 +46,9 @@ "Add to your ownCloud" : "Tambahkan ke ownCloud Anda", "Download" : "Unduh", "Download %s" : "Unduh %s", - "Direct link" : "Tautan langsung" + "Direct link" : "Tautan langsung", + "Federated Cloud Sharing" : "Federated Cloud Sharing", + "Allow users on this server to send shares to other servers" : "Izinkan para pengguna di server ini untuk mengirimkan berbagi ke server lainnya.", + "Allow users on this server to receive shares from other servers" : "Izinkan para pengguna di server ini untuk menerima berbagi ke server lainnya." },"pluralForm" :"nplurals=1; plural=0;" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/is.js b/apps/files_sharing/l10n/is.js index ecce4e25d97..57e49f68ec4 100644 --- a/apps/files_sharing/l10n/is.js +++ b/apps/files_sharing/l10n/is.js @@ -2,6 +2,7 @@ OC.L10N.register( "files_sharing", { "Cancel" : "Hætta við", + "Share" : "Deila", "Shared by" : "Deilt af", "Password" : "Lykilorð", "Name" : "Nafn", diff --git a/apps/files_sharing/l10n/is.json b/apps/files_sharing/l10n/is.json index 889f8a32398..f7094b9cbe8 100644 --- a/apps/files_sharing/l10n/is.json +++ b/apps/files_sharing/l10n/is.json @@ -1,5 +1,6 @@ { "translations": { "Cancel" : "Hætta við", + "Share" : "Deila", "Shared by" : "Deilt af", "Password" : "Lykilorð", "Name" : "Nafn", diff --git a/apps/files_sharing/l10n/it.js b/apps/files_sharing/l10n/it.js index 14ed429be85..e8c87b65d32 100644 --- a/apps/files_sharing/l10n/it.js +++ b/apps/files_sharing/l10n/it.js @@ -4,10 +4,12 @@ OC.L10N.register( "Server to server sharing is not enabled on this server" : "La condivisione tra server non è abilitata su questo server", "The mountpoint name contains invalid characters." : "Il nome del punto di mount contiene caratteri non validi.", "Invalid or untrusted SSL certificate" : "Certificato SSL non valido o non attendibile", + "Could not authenticate to remote share, password might be wrong" : "Impossibile autenticarsi sulla condivisione remota, la password potrebbe essere errata", + "Storage not valid" : "Archiviazione non valida", "Couldn't add remote share" : "Impossibile aggiungere la condivisione remota", - "Shared with you" : "Condiviso con te", - "Shared with others" : "Condiviso con altri", - "Shared by link" : "Condiviso tramite collegamento", + "Shared with you" : "Condivisi con te", + "Shared with others" : "Condivisi con altri", + "Shared by link" : "Condivisi tramite collegamento", "Nothing shared with you yet" : "Non è stato condiviso ancora niente con te", "Files and folders others share with you will show up here" : "I file e le cartelle che altri condividono con te saranno mostrati qui", "Nothing shared yet" : "Ancora nessuna condivisione", @@ -21,13 +23,14 @@ OC.L10N.register( "Add remote share" : "Aggiungi condivisione remota", "No ownCloud installation (7 or higher) found at {remote}" : "Nessuna installazione di ownCloud (7 o superiore) trovata su {remote}", "Invalid ownCloud url" : "URL di ownCloud non valido", + "Share" : "Condividi", "Shared by" : "Condiviso da", "A file or folder was shared from <strong>another server</strong>" : "Un file o una cartella è stato condiviso da <strong>un altro server</strong>", "A public shared file or folder was <strong>downloaded</strong>" : "Un file condiviso pubblicamente o una cartella è stato <strong>scaricato</strong>", "You received a new remote share from %s" : "Hai ricevuto una nuova condivisione remota da %s", "%1$s accepted remote share %2$s" : "%1$s ha accettato la condivisione remota %2$s", "%1$s declined remote share %2$s" : "%1$s ha rifiutato la condivisione remota %2$s", - "%1$s unshared %2$s from you" : "%1$s ha rimosso la condivisione %2$s da te", + "%1$s unshared %2$s from you" : "%1$s ha rimosso la condivisione %2$s con te", "Public shared folder %1$s was downloaded" : "La cartella condivisa pubblicamente %1$s è stata scaricata", "Public shared file %1$s was downloaded" : "Il file condiviso pubblicamente %1$s è stato scaricato", "This share is password-protected" : "Questa condivione è protetta da password", @@ -46,7 +49,7 @@ OC.L10N.register( "Download" : "Scarica", "Download %s" : "Scarica %s", "Direct link" : "Collegamento diretto", - "Server-to-Server Sharing" : "Condivisione server-a-server", + "Federated Cloud Sharing" : "Condivisione cloud federata", "Allow users on this server to send shares to other servers" : "Consenti agli utenti su questo server di inviare condivisioni ad altri server", "Allow users on this server to receive shares from other servers" : "Consenti agli utenti su questo server di ricevere condivisioni da altri server" }, diff --git a/apps/files_sharing/l10n/it.json b/apps/files_sharing/l10n/it.json index f98994a0a4b..46f9f24030b 100644 --- a/apps/files_sharing/l10n/it.json +++ b/apps/files_sharing/l10n/it.json @@ -2,10 +2,12 @@ "Server to server sharing is not enabled on this server" : "La condivisione tra server non è abilitata su questo server", "The mountpoint name contains invalid characters." : "Il nome del punto di mount contiene caratteri non validi.", "Invalid or untrusted SSL certificate" : "Certificato SSL non valido o non attendibile", + "Could not authenticate to remote share, password might be wrong" : "Impossibile autenticarsi sulla condivisione remota, la password potrebbe essere errata", + "Storage not valid" : "Archiviazione non valida", "Couldn't add remote share" : "Impossibile aggiungere la condivisione remota", - "Shared with you" : "Condiviso con te", - "Shared with others" : "Condiviso con altri", - "Shared by link" : "Condiviso tramite collegamento", + "Shared with you" : "Condivisi con te", + "Shared with others" : "Condivisi con altri", + "Shared by link" : "Condivisi tramite collegamento", "Nothing shared with you yet" : "Non è stato condiviso ancora niente con te", "Files and folders others share with you will show up here" : "I file e le cartelle che altri condividono con te saranno mostrati qui", "Nothing shared yet" : "Ancora nessuna condivisione", @@ -19,13 +21,14 @@ "Add remote share" : "Aggiungi condivisione remota", "No ownCloud installation (7 or higher) found at {remote}" : "Nessuna installazione di ownCloud (7 o superiore) trovata su {remote}", "Invalid ownCloud url" : "URL di ownCloud non valido", + "Share" : "Condividi", "Shared by" : "Condiviso da", "A file or folder was shared from <strong>another server</strong>" : "Un file o una cartella è stato condiviso da <strong>un altro server</strong>", "A public shared file or folder was <strong>downloaded</strong>" : "Un file condiviso pubblicamente o una cartella è stato <strong>scaricato</strong>", "You received a new remote share from %s" : "Hai ricevuto una nuova condivisione remota da %s", "%1$s accepted remote share %2$s" : "%1$s ha accettato la condivisione remota %2$s", "%1$s declined remote share %2$s" : "%1$s ha rifiutato la condivisione remota %2$s", - "%1$s unshared %2$s from you" : "%1$s ha rimosso la condivisione %2$s da te", + "%1$s unshared %2$s from you" : "%1$s ha rimosso la condivisione %2$s con te", "Public shared folder %1$s was downloaded" : "La cartella condivisa pubblicamente %1$s è stata scaricata", "Public shared file %1$s was downloaded" : "Il file condiviso pubblicamente %1$s è stato scaricato", "This share is password-protected" : "Questa condivione è protetta da password", @@ -44,7 +47,7 @@ "Download" : "Scarica", "Download %s" : "Scarica %s", "Direct link" : "Collegamento diretto", - "Server-to-Server Sharing" : "Condivisione server-a-server", + "Federated Cloud Sharing" : "Condivisione cloud federata", "Allow users on this server to send shares to other servers" : "Consenti agli utenti su questo server di inviare condivisioni ad altri server", "Allow users on this server to receive shares from other servers" : "Consenti agli utenti su questo server di ricevere condivisioni da altri server" },"pluralForm" :"nplurals=2; plural=(n != 1);" diff --git a/apps/files_sharing/l10n/ja.js b/apps/files_sharing/l10n/ja.js index 1550e41e653..8608d02f617 100644 --- a/apps/files_sharing/l10n/ja.js +++ b/apps/files_sharing/l10n/ja.js @@ -4,6 +4,7 @@ OC.L10N.register( "Server to server sharing is not enabled on this server" : "このサーバーでは、サーバー間の共有が有効ではありません", "The mountpoint name contains invalid characters." : "マウントポイント名 に不正な文字列が含まれています。", "Invalid or untrusted SSL certificate" : "無効または信頼できないSSL証明書", + "Storage not valid" : "ストレージが無効です", "Couldn't add remote share" : "リモート共有を追加できませんでした", "Shared with you" : "他ユーザーがあなたと共有中", "Shared with others" : "他ユーザーと共有中", @@ -21,16 +22,20 @@ OC.L10N.register( "Add remote share" : "リモート共有を追加", "No ownCloud installation (7 or higher) found at {remote}" : "{remote} にはownCloud (7以上)がインストールされていません", "Invalid ownCloud url" : "無効なownCloud URL です", + "Share" : "共有", "Shared by" : "共有者：", - "A file or folder was shared from <strong>another server</strong>" : "ファイルまたはフォルダーは <strong>他のサーバー</strong>から共有されました", + "A file or folder was shared from <strong>another server</strong>" : "ファイルまたはフォルダーが<strong>他のサーバー</strong>から共有されたとき", + "A public shared file or folder was <strong>downloaded</strong>" : "公開共有ファイルまたはフォルダーが<strong>ダウンロードされた</strong>とき", "You received a new remote share from %s" : "%sからリモート共有のリクエストは\n届きました。", + "Public shared folder %1$s was downloaded" : "公開共有フォルダ %1$s がダウンロードされました", + "Public shared file %1$s was downloaded" : "公開共有ファイル %1$s がダウンロードされました", "This share is password-protected" : "この共有はパスワードで保護されています", "The password is wrong. Try again." : "パスワードが間違っています。再試行してください。", "Password" : "パスワード", "No entries found in this folder" : "このフォルダーにはエントリーがありません", "Name" : "名前", "Share time" : "共有時間", - "Sorry, this link doesn’t seem to work anymore." : "申し訳ございません。このリンクはもう利用できません。", + "Sorry, this link doesn’t seem to work anymore." : "すみません。このリンクはもう利用できません。", "Reasons might be:" : "理由は以下の通りと考えられます：", "the item was removed" : "アイテムが削除されました", "the link expired" : "リンクの期限が切れています", @@ -40,7 +45,7 @@ OC.L10N.register( "Download" : "ダウンロード", "Download %s" : "%s をダウンロード", "Direct link" : "リンク", - "Server-to-Server Sharing" : "サーバー間共有", + "Federated Cloud Sharing" : "統合されたクラウド共有", "Allow users on this server to send shares to other servers" : "ユーザーがこのサーバーから他のサーバーに共有することを許可する", "Allow users on this server to receive shares from other servers" : "ユーザーが他のサーバーからこのサーバーに共有することを許可する" }, diff --git a/apps/files_sharing/l10n/ja.json b/apps/files_sharing/l10n/ja.json index 1194a758e30..017596b2172 100644 --- a/apps/files_sharing/l10n/ja.json +++ b/apps/files_sharing/l10n/ja.json @@ -2,6 +2,7 @@ "Server to server sharing is not enabled on this server" : "このサーバーでは、サーバー間の共有が有効ではありません", "The mountpoint name contains invalid characters." : "マウントポイント名 に不正な文字列が含まれています。", "Invalid or untrusted SSL certificate" : "無効または信頼できないSSL証明書", + "Storage not valid" : "ストレージが無効です", "Couldn't add remote share" : "リモート共有を追加できませんでした", "Shared with you" : "他ユーザーがあなたと共有中", "Shared with others" : "他ユーザーと共有中", @@ -19,16 +20,20 @@ "Add remote share" : "リモート共有を追加", "No ownCloud installation (7 or higher) found at {remote}" : "{remote} にはownCloud (7以上)がインストールされていません", "Invalid ownCloud url" : "無効なownCloud URL です", + "Share" : "共有", "Shared by" : "共有者：", - "A file or folder was shared from <strong>another server</strong>" : "ファイルまたはフォルダーは <strong>他のサーバー</strong>から共有されました", + "A file or folder was shared from <strong>another server</strong>" : "ファイルまたはフォルダーが<strong>他のサーバー</strong>から共有されたとき", + "A public shared file or folder was <strong>downloaded</strong>" : "公開共有ファイルまたはフォルダーが<strong>ダウンロードされた</strong>とき", "You received a new remote share from %s" : "%sからリモート共有のリクエストは\n届きました。", + "Public shared folder %1$s was downloaded" : "公開共有フォルダ %1$s がダウンロードされました", + "Public shared file %1$s was downloaded" : "公開共有ファイル %1$s がダウンロードされました", "This share is password-protected" : "この共有はパスワードで保護されています", "The password is wrong. Try again." : "パスワードが間違っています。再試行してください。", "Password" : "パスワード", "No entries found in this folder" : "このフォルダーにはエントリーがありません", "Name" : "名前", "Share time" : "共有時間", - "Sorry, this link doesn’t seem to work anymore." : "申し訳ございません。このリンクはもう利用できません。", + "Sorry, this link doesn’t seem to work anymore." : "すみません。このリンクはもう利用できません。", "Reasons might be:" : "理由は以下の通りと考えられます：", "the item was removed" : "アイテムが削除されました", "the link expired" : "リンクの期限が切れています", @@ -38,7 +43,7 @@ "Download" : "ダウンロード", "Download %s" : "%s をダウンロード", "Direct link" : "リンク", - "Server-to-Server Sharing" : "サーバー間共有", + "Federated Cloud Sharing" : "統合されたクラウド共有", "Allow users on this server to send shares to other servers" : "ユーザーがこのサーバーから他のサーバーに共有することを許可する", "Allow users on this server to receive shares from other servers" : "ユーザーが他のサーバーからこのサーバーに共有することを許可する" },"pluralForm" :"nplurals=1; plural=0;" diff --git a/apps/files_sharing/l10n/ka_GE.js b/apps/files_sharing/l10n/ka_GE.js index df36093b688..c4373ea9f46 100644 --- a/apps/files_sharing/l10n/ka_GE.js +++ b/apps/files_sharing/l10n/ka_GE.js @@ -2,6 +2,7 @@ OC.L10N.register( "files_sharing", { "Cancel" : "უარყოფა", + "Share" : "გაზიარება", "Shared by" : "აზიარებს", "Password" : "პაროლი", "Name" : "სახელი", diff --git a/apps/files_sharing/l10n/ka_GE.json b/apps/files_sharing/l10n/ka_GE.json index acebf7caa30..d052f45f096 100644 --- a/apps/files_sharing/l10n/ka_GE.json +++ b/apps/files_sharing/l10n/ka_GE.json @@ -1,5 +1,6 @@ { "translations": { "Cancel" : "უარყოფა", + "Share" : "გაზიარება", "Shared by" : "აზიარებს", "Password" : "პაროლი", "Name" : "სახელი", diff --git a/apps/files_sharing/l10n/km.js b/apps/files_sharing/l10n/km.js index d98f1df047e..2b730ae146b 100644 --- a/apps/files_sharing/l10n/km.js +++ b/apps/files_sharing/l10n/km.js @@ -2,6 +2,7 @@ OC.L10N.register( "files_sharing", { "Cancel" : "បោះបង់", + "Share" : "ចែករំលែក", "Shared by" : "បានចែករំលែកដោយ", "This share is password-protected" : "ការចែករំលែកនេះត្រូវបានការពារដោយពាក្យសម្ងាត់", "The password is wrong. Try again." : "ពាក្យសម្ងាត់ខុសហើយ។ ព្យាយាមម្ដងទៀត។", diff --git a/apps/files_sharing/l10n/km.json b/apps/files_sharing/l10n/km.json index 283ddcf871a..646f417f6d8 100644 --- a/apps/files_sharing/l10n/km.json +++ b/apps/files_sharing/l10n/km.json @@ -1,5 +1,6 @@ { "translations": { "Cancel" : "បោះបង់", + "Share" : "ចែករំលែក", "Shared by" : "បានចែករំលែកដោយ", "This share is password-protected" : "ការចែករំលែកនេះត្រូវបានការពារដោយពាក្យសម្ងាត់", "The password is wrong. Try again." : "ពាក្យសម្ងាត់ខុសហើយ។ ព្យាយាមម្ដងទៀត។", diff --git a/apps/files_sharing/l10n/kn.js b/apps/files_sharing/l10n/kn.js index 61a3e58aa96..8ae732752a4 100644 --- a/apps/files_sharing/l10n/kn.js +++ b/apps/files_sharing/l10n/kn.js @@ -2,6 +2,7 @@ OC.L10N.register( "files_sharing", { "Cancel" : "ರದ್ದು", + "Share" : "ಹಂಚಿಕೊಳ್ಳಿ", "Password" : "ಗುಪ್ತ ಪದ", "Name" : "ಹೆಸರು", "Download" : "ಪ್ರತಿಯನ್ನು ಸ್ಥಳೀಯವಾಗಿ ಉಳಿಸಿಕೊಳ್ಳಿ" diff --git a/apps/files_sharing/l10n/kn.json b/apps/files_sharing/l10n/kn.json index 1b16ed072cb..5f990849c9b 100644 --- a/apps/files_sharing/l10n/kn.json +++ b/apps/files_sharing/l10n/kn.json @@ -1,5 +1,6 @@ { "translations": { "Cancel" : "ರದ್ದು", + "Share" : "ಹಂಚಿಕೊಳ್ಳಿ", "Password" : "ಗುಪ್ತ ಪದ", "Name" : "ಹೆಸರು", "Download" : "ಪ್ರತಿಯನ್ನು ಸ್ಥಳೀಯವಾಗಿ ಉಳಿಸಿಕೊಳ್ಳಿ" diff --git a/apps/files_sharing/l10n/ko.js b/apps/files_sharing/l10n/ko.js index 88fe10788c9..cc5489232c4 100644 --- a/apps/files_sharing/l10n/ko.js +++ b/apps/files_sharing/l10n/ko.js @@ -1,19 +1,56 @@ OC.L10N.register( "files_sharing", { + "Server to server sharing is not enabled on this server" : "이 서버에서 서버간 공유를 사용할 수 없음", + "The mountpoint name contains invalid characters." : "마운트 지점 이름에 잘못된 글자가 포함되어 있습니다.", + "Invalid or untrusted SSL certificate" : "잘못되었거나 신뢰할 수 없는 SSL 인증서", + "Could not authenticate to remote share, password might be wrong" : "원격 공유에서 인증할 수 없습니다. 암호가 맞지 않을 수 있습니다.", + "Storage not valid" : "저장소가 잘못됨", + "Couldn't add remote share" : "원격 공유를 추가할 수 없음", + "Shared with you" : "나와 공유됨", + "Shared with others" : "다른 사람과 공유됨", + "Shared by link" : "링크로 공유됨", + "Nothing shared with you yet" : "나와 공유된 항목 없음", + "Files and folders others share with you will show up here" : "다른 사람이 공유한 파일과 폴더가 여기에 나타납니다", + "Nothing shared yet" : "공유된 항목 없음", + "Files and folders you share will show up here" : "내가 공유하는 파일과 폴더가 여기에 나타납니다", + "No shared links" : "공유된 링크 없음", + "Files and folders you share by link will show up here" : "내가 링크로 공유하는 파일과 폴더가 여기에 나타납니다", + "Do you want to add the remote share {name} from {owner}@{remote}?" : "{owner}@{remote}의 원격 공유 {name}을(를) 추가하시겠습니까?", + "Remote share" : "원격 공유", + "Remote share password" : "원격 공유 암호", "Cancel" : "취소", + "Add remote share" : "원격 공유 추가", + "No ownCloud installation (7 or higher) found at {remote}" : "{remote}에 ownCloud 7 이상이 설치되어 있지 않음", + "Invalid ownCloud url" : "잘못된 ownCloud URL", + "Share" : "공유", "Shared by" : "공유한 사용자:", + "A file or folder was shared from <strong>another server</strong>" : "<strong>다른 서버</strong>에서 파일이나 폴더를 공유함", + "A public shared file or folder was <strong>downloaded</strong>" : "공개 공유된 파일이나 폴더가 <strong>다운로드됨</strong>", + "You received a new remote share from %s" : "%s에서 원격 공유 요청을 받았습니다", + "%1$s accepted remote share %2$s" : "%1$s 님이 원격 공유 %2$s을(를) 수락함", + "%1$s declined remote share %2$s" : "%1$s 님이 원격 공유 %2$s을(를) 거절함", + "%1$s unshared %2$s from you" : "%1$s 님이 %2$s의 공유를 중단함", + "Public shared folder %1$s was downloaded" : "공개 공유 폴더 %1$s이(가) 다운로드됨", + "Public shared file %1$s was downloaded" : "공개 공유 파일 %1$s이(가) 다운로드됨", "This share is password-protected" : "이 공유는 암호로 보호되어 있습니다", "The password is wrong. Try again." : "암호가 잘못되었습니다. 다시 입력해 주십시오.", "Password" : "암호", + "No entries found in this folder" : "이 폴더에 항목 없음", "Name" : "이름", + "Share time" : "공유 시간", "Sorry, this link doesn’t seem to work anymore." : "죄송합니다. 이 링크는 더 이상 작동하지 않습니다.", "Reasons might be:" : "이유는 다음과 같을 수 있습니다:", "the item was removed" : "항목이 삭제됨", "the link expired" : "링크가 만료됨", "sharing is disabled" : "공유가 비활성화됨", "For more info, please ask the person who sent this link." : "자세한 정보는 링크를 보낸 사람에게 문의하십시오.", + "Add to your ownCloud" : "내 ownCloud에 추가하기", "Download" : "다운로드", - "Direct link" : "직접 링크" + "Download %s" : "%s 다운로드", + "Direct link" : "직접 링크", + "Federated Cloud Sharing" : "클라우드 연합 공유", + "Allow users on this server to send shares to other servers" : "이 서버의 사용자가 다른 서버와 공유할 수 있도록 허용", + "Allow users on this server to receive shares from other servers" : "이 서버의 사용자가 다른 서버에서 공유한 파일을 받을 수 있도록 허용" }, "nplurals=1; plural=0;"); diff --git a/apps/files_sharing/l10n/ko.json b/apps/files_sharing/l10n/ko.json index e005feecef1..b97d68d147d 100644 --- a/apps/files_sharing/l10n/ko.json +++ b/apps/files_sharing/l10n/ko.json @@ -1,17 +1,54 @@ { "translations": { + "Server to server sharing is not enabled on this server" : "이 서버에서 서버간 공유를 사용할 수 없음", + "The mountpoint name contains invalid characters." : "마운트 지점 이름에 잘못된 글자가 포함되어 있습니다.", + "Invalid or untrusted SSL certificate" : "잘못되었거나 신뢰할 수 없는 SSL 인증서", + "Could not authenticate to remote share, password might be wrong" : "원격 공유에서 인증할 수 없습니다. 암호가 맞지 않을 수 있습니다.", + "Storage not valid" : "저장소가 잘못됨", + "Couldn't add remote share" : "원격 공유를 추가할 수 없음", + "Shared with you" : "나와 공유됨", + "Shared with others" : "다른 사람과 공유됨", + "Shared by link" : "링크로 공유됨", + "Nothing shared with you yet" : "나와 공유된 항목 없음", + "Files and folders others share with you will show up here" : "다른 사람이 공유한 파일과 폴더가 여기에 나타납니다", + "Nothing shared yet" : "공유된 항목 없음", + "Files and folders you share will show up here" : "내가 공유하는 파일과 폴더가 여기에 나타납니다", + "No shared links" : "공유된 링크 없음", + "Files and folders you share by link will show up here" : "내가 링크로 공유하는 파일과 폴더가 여기에 나타납니다", + "Do you want to add the remote share {name} from {owner}@{remote}?" : "{owner}@{remote}의 원격 공유 {name}을(를) 추가하시겠습니까?", + "Remote share" : "원격 공유", + "Remote share password" : "원격 공유 암호", "Cancel" : "취소", + "Add remote share" : "원격 공유 추가", + "No ownCloud installation (7 or higher) found at {remote}" : "{remote}에 ownCloud 7 이상이 설치되어 있지 않음", + "Invalid ownCloud url" : "잘못된 ownCloud URL", + "Share" : "공유", "Shared by" : "공유한 사용자:", + "A file or folder was shared from <strong>another server</strong>" : "<strong>다른 서버</strong>에서 파일이나 폴더를 공유함", + "A public shared file or folder was <strong>downloaded</strong>" : "공개 공유된 파일이나 폴더가 <strong>다운로드됨</strong>", + "You received a new remote share from %s" : "%s에서 원격 공유 요청을 받았습니다", + "%1$s accepted remote share %2$s" : "%1$s 님이 원격 공유 %2$s을(를) 수락함", + "%1$s declined remote share %2$s" : "%1$s 님이 원격 공유 %2$s을(를) 거절함", + "%1$s unshared %2$s from you" : "%1$s 님이 %2$s의 공유를 중단함", + "Public shared folder %1$s was downloaded" : "공개 공유 폴더 %1$s이(가) 다운로드됨", + "Public shared file %1$s was downloaded" : "공개 공유 파일 %1$s이(가) 다운로드됨", "This share is password-protected" : "이 공유는 암호로 보호되어 있습니다", "The password is wrong. Try again." : "암호가 잘못되었습니다. 다시 입력해 주십시오.", "Password" : "암호", + "No entries found in this folder" : "이 폴더에 항목 없음", "Name" : "이름", + "Share time" : "공유 시간", "Sorry, this link doesn’t seem to work anymore." : "죄송합니다. 이 링크는 더 이상 작동하지 않습니다.", "Reasons might be:" : "이유는 다음과 같을 수 있습니다:", "the item was removed" : "항목이 삭제됨", "the link expired" : "링크가 만료됨", "sharing is disabled" : "공유가 비활성화됨", "For more info, please ask the person who sent this link." : "자세한 정보는 링크를 보낸 사람에게 문의하십시오.", + "Add to your ownCloud" : "내 ownCloud에 추가하기", "Download" : "다운로드", - "Direct link" : "직접 링크" + "Download %s" : "%s 다운로드", + "Direct link" : "직접 링크", + "Federated Cloud Sharing" : "클라우드 연합 공유", + "Allow users on this server to send shares to other servers" : "이 서버의 사용자가 다른 서버와 공유할 수 있도록 허용", + "Allow users on this server to receive shares from other servers" : "이 서버의 사용자가 다른 서버에서 공유한 파일을 받을 수 있도록 허용" },"pluralForm" :"nplurals=1; plural=0;" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/ku_IQ.js b/apps/files_sharing/l10n/ku_IQ.js index f1549d46c0f..3c751c0a7b3 100644 --- a/apps/files_sharing/l10n/ku_IQ.js +++ b/apps/files_sharing/l10n/ku_IQ.js @@ -2,6 +2,7 @@ OC.L10N.register( "files_sharing", { "Cancel" : "لابردن", + "Share" : "هاوبەشی کردن", "Password" : "وشەی تێپەربو", "Name" : "ناو", "Download" : "داگرتن" diff --git a/apps/files_sharing/l10n/ku_IQ.json b/apps/files_sharing/l10n/ku_IQ.json index 7be49d0c5e2..8c546363624 100644 --- a/apps/files_sharing/l10n/ku_IQ.json +++ b/apps/files_sharing/l10n/ku_IQ.json @@ -1,5 +1,6 @@ { "translations": { "Cancel" : "لابردن", + "Share" : "هاوبەشی کردن", "Password" : "وشەی تێپەربو", "Name" : "ناو", "Download" : "داگرتن" diff --git a/apps/files_sharing/l10n/lb.js b/apps/files_sharing/l10n/lb.js index f391757f709..3ba992bf6de 100644 --- a/apps/files_sharing/l10n/lb.js +++ b/apps/files_sharing/l10n/lb.js @@ -2,6 +2,7 @@ OC.L10N.register( "files_sharing", { "Cancel" : "Ofbriechen", + "Share" : "Deelen", "Shared by" : "Gedeelt vun", "The password is wrong. Try again." : "Den Passwuert ass incorrect. Probeier ed nach eng keier.", "Password" : "Passwuert", diff --git a/apps/files_sharing/l10n/lb.json b/apps/files_sharing/l10n/lb.json index 07d504d9165..760bb015a98 100644 --- a/apps/files_sharing/l10n/lb.json +++ b/apps/files_sharing/l10n/lb.json @@ -1,5 +1,6 @@ { "translations": { "Cancel" : "Ofbriechen", + "Share" : "Deelen", "Shared by" : "Gedeelt vun", "The password is wrong. Try again." : "Den Passwuert ass incorrect. Probeier ed nach eng keier.", "Password" : "Passwuert", diff --git a/apps/files_sharing/l10n/lt_LT.js b/apps/files_sharing/l10n/lt_LT.js index 9a7145bbdae..a2763933434 100644 --- a/apps/files_sharing/l10n/lt_LT.js +++ b/apps/files_sharing/l10n/lt_LT.js @@ -2,6 +2,7 @@ OC.L10N.register( "files_sharing", { "Cancel" : "Atšaukti", + "Share" : "Dalintis", "Shared by" : "Dalinasi", "This share is password-protected" : "Turinys apsaugotas slaptažodžiu", "The password is wrong. Try again." : "Netinka slaptažodis: Bandykite dar kartą.", diff --git a/apps/files_sharing/l10n/lt_LT.json b/apps/files_sharing/l10n/lt_LT.json index 2da5fb37d50..9057bb27204 100644 --- a/apps/files_sharing/l10n/lt_LT.json +++ b/apps/files_sharing/l10n/lt_LT.json @@ -1,5 +1,6 @@ { "translations": { "Cancel" : "Atšaukti", + "Share" : "Dalintis", "Shared by" : "Dalinasi", "This share is password-protected" : "Turinys apsaugotas slaptažodžiu", "The password is wrong. Try again." : "Netinka slaptažodis: Bandykite dar kartą.", diff --git a/apps/files_sharing/l10n/lv.js b/apps/files_sharing/l10n/lv.js index e333563c061..7861127275b 100644 --- a/apps/files_sharing/l10n/lv.js +++ b/apps/files_sharing/l10n/lv.js @@ -1,11 +1,56 @@ OC.L10N.register( "files_sharing", { + "Server to server sharing is not enabled on this server" : "Šajā serverī koplietošana starp serveriem nav ieslēgta", + "The mountpoint name contains invalid characters." : "Montēšanas punkta nosaukums satur nederīgus simbolus.", + "Invalid or untrusted SSL certificate" : "Nepareizs vai neuzticams SSL sertifikāts", + "Could not authenticate to remote share, password might be wrong" : "Nesanāca autentificēties pie attālinātās koplietotnes, parole varētu būt nepareiza", + "Storage not valid" : "Glabātuve nav derīga", + "Couldn't add remote share" : "Nevarēja pievienot attālināto koplietotni", + "Shared with you" : "Koplietots ar tevi", + "Shared with others" : "Koplietots ar citiem", + "Shared by link" : "Koplietots ar saiti", + "Nothing shared with you yet" : "Nekas vēl nav koplietots", + "Files and folders others share with you will show up here" : "Faili un mapes, ko citi koplietos ar tevi, tiks rādīti šeit", + "Nothing shared yet" : "Nekas vēl nav koplietots", + "Files and folders you share will show up here" : "Faili un mapes, ko koplietosi ar citiem, tiks rādīti šeit", + "No shared links" : "Nav koplietotu saišu", + "Files and folders you share by link will show up here" : "Faili un mapes, ko koplietosit ar saitēm, tiks rādīti šeit", + "Do you want to add the remote share {name} from {owner}@{remote}?" : "Vai vēlaties pievienot attālināto koplietotni {name} no {owner}@{remote}?", + "Remote share" : "Attālinātā koplietotne", + "Remote share password" : "Attālinātās koplietotnes parole", "Cancel" : "Atcelt", + "Add remote share" : "Pievienot attālināto koplietotni", + "No ownCloud installation (7 or higher) found at {remote}" : "Nav atrasta neviena ownCloud (7. vai augstāka) instalācija {remote}", + "Invalid ownCloud url" : "Nederīga ownCloud saite", + "Share" : "Dalīties", "Shared by" : "Dalījās", + "A file or folder was shared from <strong>another server</strong>" : "Fails vai mape tika koplietota no <strong>cita servera</strong>", + "A public shared file or folder was <strong>downloaded</strong>" : "Publiski koplietots fails vai mape tika <strong>lejupielādēts</strong>", + "You received a new remote share from %s" : "Saņēmāt jaunu attālinātu koplietotni no %s", + "%1$s accepted remote share %2$s" : "%1$s apstiprināja attālināto koplietotni %2$s", + "%1$s declined remote share %2$s" : "%1$s noraidīja attālināto koplietotni %2$s", + "%1$s unshared %2$s from you" : "%1$s atslēdza koplietošanu %2$s ar tevi", + "Public shared folder %1$s was downloaded" : "Publiski koplietota mape %1$s tika lejupielādēta", + "Public shared file %1$s was downloaded" : "Publiski koplietots fails %1$s tika lejupielādēts", + "This share is password-protected" : "Šī koplietotne ir aizsargāta ar paroli", + "The password is wrong. Try again." : "Nepareiza parole. Mēģiniet vēlreiz.", "Password" : "Parole", "No entries found in this folder" : "Šajā mapē nekas nav atrasts", "Name" : "Nosaukums", - "Download" : "Lejupielādēt" + "Share time" : "Koplietošanas laiks", + "Sorry, this link doesn’t seem to work anymore." : "Izskatās, ka šī saite vairs nedarbojas", + "Reasons might be:" : "Iespējamie iemesli:", + "the item was removed" : "vienums tika dzēsts", + "the link expired" : "saitei beidzies termiņš", + "sharing is disabled" : "koplietošana nav ieslēgta", + "For more info, please ask the person who sent this link." : "Vairāk informācijas vaicā personai, kas nosūtīja šo saiti.", + "Add to your ownCloud" : "Pievienot savam ownCloud", + "Download" : "Lejupielādēt", + "Download %s" : "Lejupielādēt %s", + "Direct link" : "Tiešā saite", + "Federated Cloud Sharing" : "Federatīva mākoņkoplietošana", + "Allow users on this server to send shares to other servers" : "Atļaut šī servera lietotājiem sūtīt koplietotnes uz citiem serveriem", + "Allow users on this server to receive shares from other servers" : "Atļaut šī servera lietotājiem saņem koplietotnes no citiem serveriem" }, "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);"); diff --git a/apps/files_sharing/l10n/lv.json b/apps/files_sharing/l10n/lv.json index 125ba7ee369..d9633ba98d6 100644 --- a/apps/files_sharing/l10n/lv.json +++ b/apps/files_sharing/l10n/lv.json @@ -1,9 +1,54 @@ { "translations": { + "Server to server sharing is not enabled on this server" : "Šajā serverī koplietošana starp serveriem nav ieslēgta", + "The mountpoint name contains invalid characters." : "Montēšanas punkta nosaukums satur nederīgus simbolus.", + "Invalid or untrusted SSL certificate" : "Nepareizs vai neuzticams SSL sertifikāts", + "Could not authenticate to remote share, password might be wrong" : "Nesanāca autentificēties pie attālinātās koplietotnes, parole varētu būt nepareiza", + "Storage not valid" : "Glabātuve nav derīga", + "Couldn't add remote share" : "Nevarēja pievienot attālināto koplietotni", + "Shared with you" : "Koplietots ar tevi", + "Shared with others" : "Koplietots ar citiem", + "Shared by link" : "Koplietots ar saiti", + "Nothing shared with you yet" : "Nekas vēl nav koplietots", + "Files and folders others share with you will show up here" : "Faili un mapes, ko citi koplietos ar tevi, tiks rādīti šeit", + "Nothing shared yet" : "Nekas vēl nav koplietots", + "Files and folders you share will show up here" : "Faili un mapes, ko koplietosi ar citiem, tiks rādīti šeit", + "No shared links" : "Nav koplietotu saišu", + "Files and folders you share by link will show up here" : "Faili un mapes, ko koplietosit ar saitēm, tiks rādīti šeit", + "Do you want to add the remote share {name} from {owner}@{remote}?" : "Vai vēlaties pievienot attālināto koplietotni {name} no {owner}@{remote}?", + "Remote share" : "Attālinātā koplietotne", + "Remote share password" : "Attālinātās koplietotnes parole", "Cancel" : "Atcelt", + "Add remote share" : "Pievienot attālināto koplietotni", + "No ownCloud installation (7 or higher) found at {remote}" : "Nav atrasta neviena ownCloud (7. vai augstāka) instalācija {remote}", + "Invalid ownCloud url" : "Nederīga ownCloud saite", + "Share" : "Dalīties", "Shared by" : "Dalījās", + "A file or folder was shared from <strong>another server</strong>" : "Fails vai mape tika koplietota no <strong>cita servera</strong>", + "A public shared file or folder was <strong>downloaded</strong>" : "Publiski koplietots fails vai mape tika <strong>lejupielādēts</strong>", + "You received a new remote share from %s" : "Saņēmāt jaunu attālinātu koplietotni no %s", + "%1$s accepted remote share %2$s" : "%1$s apstiprināja attālināto koplietotni %2$s", + "%1$s declined remote share %2$s" : "%1$s noraidīja attālināto koplietotni %2$s", + "%1$s unshared %2$s from you" : "%1$s atslēdza koplietošanu %2$s ar tevi", + "Public shared folder %1$s was downloaded" : "Publiski koplietota mape %1$s tika lejupielādēta", + "Public shared file %1$s was downloaded" : "Publiski koplietots fails %1$s tika lejupielādēts", + "This share is password-protected" : "Šī koplietotne ir aizsargāta ar paroli", + "The password is wrong. Try again." : "Nepareiza parole. Mēģiniet vēlreiz.", "Password" : "Parole", "No entries found in this folder" : "Šajā mapē nekas nav atrasts", "Name" : "Nosaukums", - "Download" : "Lejupielādēt" + "Share time" : "Koplietošanas laiks", + "Sorry, this link doesn’t seem to work anymore." : "Izskatās, ka šī saite vairs nedarbojas", + "Reasons might be:" : "Iespējamie iemesli:", + "the item was removed" : "vienums tika dzēsts", + "the link expired" : "saitei beidzies termiņš", + "sharing is disabled" : "koplietošana nav ieslēgta", + "For more info, please ask the person who sent this link." : "Vairāk informācijas vaicā personai, kas nosūtīja šo saiti.", + "Add to your ownCloud" : "Pievienot savam ownCloud", + "Download" : "Lejupielādēt", + "Download %s" : "Lejupielādēt %s", + "Direct link" : "Tiešā saite", + "Federated Cloud Sharing" : "Federatīva mākoņkoplietošana", + "Allow users on this server to send shares to other servers" : "Atļaut šī servera lietotājiem sūtīt koplietotnes uz citiem serveriem", + "Allow users on this server to receive shares from other servers" : "Atļaut šī servera lietotājiem saņem koplietotnes no citiem serveriem" },"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/mk.js b/apps/files_sharing/l10n/mk.js index 890980b2e73..b47fa211329 100644 --- a/apps/files_sharing/l10n/mk.js +++ b/apps/files_sharing/l10n/mk.js @@ -5,6 +5,7 @@ OC.L10N.register( "Shared with others" : "Сподели со останатите", "Shared by link" : "Споделено со врска", "Cancel" : "Откажи", + "Share" : "Сподели", "Shared by" : "Споделено од", "This share is password-protected" : "Ова споделување е заштитено со лозинка", "The password is wrong. Try again." : "Лозинката е грешна. Обиди се повторно.", diff --git a/apps/files_sharing/l10n/mk.json b/apps/files_sharing/l10n/mk.json index 3a1b748d4fc..c399da0089f 100644 --- a/apps/files_sharing/l10n/mk.json +++ b/apps/files_sharing/l10n/mk.json @@ -3,6 +3,7 @@ "Shared with others" : "Сподели со останатите", "Shared by link" : "Споделено со врска", "Cancel" : "Откажи", + "Share" : "Сподели", "Shared by" : "Споделено од", "This share is password-protected" : "Ова споделување е заштитено со лозинка", "The password is wrong. Try again." : "Лозинката е грешна. Обиди се повторно.", diff --git a/apps/files_sharing/l10n/mn.js b/apps/files_sharing/l10n/mn.js index 6769fc38ccd..c99ff7a5a02 100644 --- a/apps/files_sharing/l10n/mn.js +++ b/apps/files_sharing/l10n/mn.js @@ -1,6 +1,7 @@ OC.L10N.register( "files_sharing", { + "Share" : "Түгээх", "Password" : "Нууц үг" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files_sharing/l10n/mn.json b/apps/files_sharing/l10n/mn.json index 13788221f43..3e4112cc4e5 100644 --- a/apps/files_sharing/l10n/mn.json +++ b/apps/files_sharing/l10n/mn.json @@ -1,4 +1,5 @@ { "translations": { + "Share" : "Түгээх", "Password" : "Нууц үг" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/ms_MY.js b/apps/files_sharing/l10n/ms_MY.js index 92ca90bb60e..2a9f8adc6b6 100644 --- a/apps/files_sharing/l10n/ms_MY.js +++ b/apps/files_sharing/l10n/ms_MY.js @@ -2,6 +2,7 @@ OC.L10N.register( "files_sharing", { "Cancel" : "Batal", + "Share" : "Kongsi", "Shared by" : "Dikongsi dengan", "Password" : "Kata laluan", "Name" : "Nama", diff --git a/apps/files_sharing/l10n/ms_MY.json b/apps/files_sharing/l10n/ms_MY.json index 45ae1fe85a0..2ac71a4f483 100644 --- a/apps/files_sharing/l10n/ms_MY.json +++ b/apps/files_sharing/l10n/ms_MY.json @@ -1,5 +1,6 @@ { "translations": { "Cancel" : "Batal", + "Share" : "Kongsi", "Shared by" : "Dikongsi dengan", "Password" : "Kata laluan", "Name" : "Nama", diff --git a/apps/files_sharing/l10n/nb_NO.js b/apps/files_sharing/l10n/nb_NO.js index 7a959d842fe..09090c60cbd 100644 --- a/apps/files_sharing/l10n/nb_NO.js +++ b/apps/files_sharing/l10n/nb_NO.js @@ -4,6 +4,8 @@ OC.L10N.register( "Server to server sharing is not enabled on this server" : "Server til server-deling er ikke aktivert på denne serveren", "The mountpoint name contains invalid characters." : "Navnet på oppkoblingspunktet inneholder ugyldige tegn.", "Invalid or untrusted SSL certificate" : "Ugyldig eller ikke tiltrodd SSL-sertifikat", + "Could not authenticate to remote share, password might be wrong" : "Klarte ikke å autentisere mot ekstern deling. Passordet kan være feil", + "Storage not valid" : "Lagerplass ikke gyldig", "Couldn't add remote share" : "Klarte ikke å legge til ekstern deling", "Shared with you" : "Delt med deg", "Shared with others" : "Delt med andre", @@ -21,6 +23,7 @@ OC.L10N.register( "Add remote share" : "Legg til ekstern deling", "No ownCloud installation (7 or higher) found at {remote}" : "Ingen ownCloud-installasjon (7 eller høyere) funnet på {remote}", "Invalid ownCloud url" : "Ugyldig ownCloud-url", + "Share" : "Del", "Shared by" : "Delt av", "A file or folder was shared from <strong>another server</strong>" : "En fil eller mappe ble delt fra <strong>en annen server</strong>", "A public shared file or folder was <strong>downloaded</strong>" : "En offentlig delt fil eller mappe ble <strong>lastet ned</strong>", @@ -46,7 +49,7 @@ OC.L10N.register( "Download" : "Last ned", "Download %s" : "Last ned %s", "Direct link" : "Direkte lenke", - "Server-to-Server Sharing" : "Server-til-server-deling", + "Federated Cloud Sharing" : "Sammenknyttet sky-deling", "Allow users on this server to send shares to other servers" : "Tillat at brukere på denne serveren sender delinger til andre servere", "Allow users on this server to receive shares from other servers" : "Tillat at brukere på denne serveren mottar delinger fra andre servere" }, diff --git a/apps/files_sharing/l10n/nb_NO.json b/apps/files_sharing/l10n/nb_NO.json index abe847ffaf0..723af5a6aec 100644 --- a/apps/files_sharing/l10n/nb_NO.json +++ b/apps/files_sharing/l10n/nb_NO.json @@ -2,6 +2,8 @@ "Server to server sharing is not enabled on this server" : "Server til server-deling er ikke aktivert på denne serveren", "The mountpoint name contains invalid characters." : "Navnet på oppkoblingspunktet inneholder ugyldige tegn.", "Invalid or untrusted SSL certificate" : "Ugyldig eller ikke tiltrodd SSL-sertifikat", + "Could not authenticate to remote share, password might be wrong" : "Klarte ikke å autentisere mot ekstern deling. Passordet kan være feil", + "Storage not valid" : "Lagerplass ikke gyldig", "Couldn't add remote share" : "Klarte ikke å legge til ekstern deling", "Shared with you" : "Delt med deg", "Shared with others" : "Delt med andre", @@ -19,6 +21,7 @@ "Add remote share" : "Legg til ekstern deling", "No ownCloud installation (7 or higher) found at {remote}" : "Ingen ownCloud-installasjon (7 eller høyere) funnet på {remote}", "Invalid ownCloud url" : "Ugyldig ownCloud-url", + "Share" : "Del", "Shared by" : "Delt av", "A file or folder was shared from <strong>another server</strong>" : "En fil eller mappe ble delt fra <strong>en annen server</strong>", "A public shared file or folder was <strong>downloaded</strong>" : "En offentlig delt fil eller mappe ble <strong>lastet ned</strong>", @@ -44,7 +47,7 @@ "Download" : "Last ned", "Download %s" : "Last ned %s", "Direct link" : "Direkte lenke", - "Server-to-Server Sharing" : "Server-til-server-deling", + "Federated Cloud Sharing" : "Sammenknyttet sky-deling", "Allow users on this server to send shares to other servers" : "Tillat at brukere på denne serveren sender delinger til andre servere", "Allow users on this server to receive shares from other servers" : "Tillat at brukere på denne serveren mottar delinger fra andre servere" },"pluralForm" :"nplurals=2; plural=(n != 1);" diff --git a/apps/files_sharing/l10n/nl.js b/apps/files_sharing/l10n/nl.js index 45ddda94630..36619f9d399 100644 --- a/apps/files_sharing/l10n/nl.js +++ b/apps/files_sharing/l10n/nl.js @@ -4,6 +4,8 @@ OC.L10N.register( "Server to server sharing is not enabled on this server" : "Server met server delen is niet geactiveerd op deze server", "The mountpoint name contains invalid characters." : "De naam van het mountpoint bevat ongeldige karakters.", "Invalid or untrusted SSL certificate" : "Ongeldig of onvertrouwd SSL-certificaat", + "Could not authenticate to remote share, password might be wrong" : "Kon niet authenticeren bij externe share, misschien verkeerd wachtwoord", + "Storage not valid" : "Opslag ongeldig", "Couldn't add remote share" : "Kon geen externe share toevoegen", "Shared with you" : "Gedeeld met u", "Shared with others" : "Gedeeld door u", @@ -21,6 +23,7 @@ OC.L10N.register( "Add remote share" : "Toevoegen externe share", "No ownCloud installation (7 or higher) found at {remote}" : "Geen recente ownCloud installatie (7 of hoger) gevonden op {remote}", "Invalid ownCloud url" : "Ongeldige ownCloud url", + "Share" : "Deel", "Shared by" : "Gedeeld door", "A file or folder was shared from <strong>another server</strong>" : "Een bestand of map werd gedeeld vanaf <strong>een andere server</strong>", "A public shared file or folder was <strong>downloaded</strong>" : "Een openbaar gedeeld bestand of map werd <strong>gedownloaded</strong>", @@ -46,7 +49,7 @@ OC.L10N.register( "Download" : "Downloaden", "Download %s" : "Download %s", "Direct link" : "Directe link", - "Server-to-Server Sharing" : "Server-naar-Server delen", + "Federated Cloud Sharing" : "Federated Cloud Sharing", "Allow users on this server to send shares to other servers" : "Toestaan dat gebruikers op deze server shares sturen naar andere servers", "Allow users on this server to receive shares from other servers" : "Toestaan dat gebruikers op deze server shares ontvangen van andere servers" }, diff --git a/apps/files_sharing/l10n/nl.json b/apps/files_sharing/l10n/nl.json index 363a5d1ab78..01371413f41 100644 --- a/apps/files_sharing/l10n/nl.json +++ b/apps/files_sharing/l10n/nl.json @@ -2,6 +2,8 @@ "Server to server sharing is not enabled on this server" : "Server met server delen is niet geactiveerd op deze server", "The mountpoint name contains invalid characters." : "De naam van het mountpoint bevat ongeldige karakters.", "Invalid or untrusted SSL certificate" : "Ongeldig of onvertrouwd SSL-certificaat", + "Could not authenticate to remote share, password might be wrong" : "Kon niet authenticeren bij externe share, misschien verkeerd wachtwoord", + "Storage not valid" : "Opslag ongeldig", "Couldn't add remote share" : "Kon geen externe share toevoegen", "Shared with you" : "Gedeeld met u", "Shared with others" : "Gedeeld door u", @@ -19,6 +21,7 @@ "Add remote share" : "Toevoegen externe share", "No ownCloud installation (7 or higher) found at {remote}" : "Geen recente ownCloud installatie (7 of hoger) gevonden op {remote}", "Invalid ownCloud url" : "Ongeldige ownCloud url", + "Share" : "Deel", "Shared by" : "Gedeeld door", "A file or folder was shared from <strong>another server</strong>" : "Een bestand of map werd gedeeld vanaf <strong>een andere server</strong>", "A public shared file or folder was <strong>downloaded</strong>" : "Een openbaar gedeeld bestand of map werd <strong>gedownloaded</strong>", @@ -44,7 +47,7 @@ "Download" : "Downloaden", "Download %s" : "Download %s", "Direct link" : "Directe link", - "Server-to-Server Sharing" : "Server-naar-Server delen", + "Federated Cloud Sharing" : "Federated Cloud Sharing", "Allow users on this server to send shares to other servers" : "Toestaan dat gebruikers op deze server shares sturen naar andere servers", "Allow users on this server to receive shares from other servers" : "Toestaan dat gebruikers op deze server shares ontvangen van andere servers" },"pluralForm" :"nplurals=2; plural=(n != 1);" diff --git a/apps/files_sharing/l10n/nn_NO.js b/apps/files_sharing/l10n/nn_NO.js index f0c749ceb58..eb03c0f7cd2 100644 --- a/apps/files_sharing/l10n/nn_NO.js +++ b/apps/files_sharing/l10n/nn_NO.js @@ -2,6 +2,7 @@ OC.L10N.register( "files_sharing", { "Cancel" : "Avbryt", + "Share" : "Del", "Shared by" : "Delt av", "The password is wrong. Try again." : "Passordet er gale. Prøv igjen.", "Password" : "Passord", diff --git a/apps/files_sharing/l10n/nn_NO.json b/apps/files_sharing/l10n/nn_NO.json index c4292b2ccb6..392cf64f3c5 100644 --- a/apps/files_sharing/l10n/nn_NO.json +++ b/apps/files_sharing/l10n/nn_NO.json @@ -1,5 +1,6 @@ { "translations": { "Cancel" : "Avbryt", + "Share" : "Del", "Shared by" : "Delt av", "The password is wrong. Try again." : "Passordet er gale. Prøv igjen.", "Password" : "Passord", diff --git a/apps/files_sharing/l10n/oc.js b/apps/files_sharing/l10n/oc.js index 74492671603..083b8b4d0af 100644 --- a/apps/files_sharing/l10n/oc.js +++ b/apps/files_sharing/l10n/oc.js @@ -2,6 +2,7 @@ OC.L10N.register( "files_sharing", { "Cancel" : "Annula", + "Share" : "Parteja", "Password" : "Senhal", "Name" : "Nom", "Download" : "Avalcarga" diff --git a/apps/files_sharing/l10n/oc.json b/apps/files_sharing/l10n/oc.json index 787013857a5..9146b14e902 100644 --- a/apps/files_sharing/l10n/oc.json +++ b/apps/files_sharing/l10n/oc.json @@ -1,5 +1,6 @@ { "translations": { "Cancel" : "Annula", + "Share" : "Parteja", "Password" : "Senhal", "Name" : "Nom", "Download" : "Avalcarga" diff --git a/apps/files_sharing/l10n/pa.js b/apps/files_sharing/l10n/pa.js index 55e1fcc2498..5cf1b4d73af 100644 --- a/apps/files_sharing/l10n/pa.js +++ b/apps/files_sharing/l10n/pa.js @@ -2,6 +2,7 @@ OC.L10N.register( "files_sharing", { "Cancel" : "ਰੱਦ ਕਰੋ", + "Share" : "ਸਾਂਝਾ ਕਰੋ", "Password" : "ਪਾਸਵਰ", "Download" : "ਡਾਊਨਲੋਡ" }, diff --git a/apps/files_sharing/l10n/pa.json b/apps/files_sharing/l10n/pa.json index d0feec38fff..f0333195205 100644 --- a/apps/files_sharing/l10n/pa.json +++ b/apps/files_sharing/l10n/pa.json @@ -1,5 +1,6 @@ { "translations": { "Cancel" : "ਰੱਦ ਕਰੋ", + "Share" : "ਸਾਂਝਾ ਕਰੋ", "Password" : "ਪਾਸਵਰ", "Download" : "ਡਾਊਨਲੋਡ" },"pluralForm" :"nplurals=2; plural=(n != 1);" diff --git a/apps/files_sharing/l10n/pl.js b/apps/files_sharing/l10n/pl.js index fd696a1e0ba..b37f1049529 100644 --- a/apps/files_sharing/l10n/pl.js +++ b/apps/files_sharing/l10n/pl.js @@ -15,6 +15,7 @@ OC.L10N.register( "Cancel" : "Anuluj", "Add remote share" : "Dodaj zdalny zasób", "Invalid ownCloud url" : "Błędny adres URL", + "Share" : "Udostępnij", "Shared by" : "Udostępniane przez", "This share is password-protected" : "Udział ten jest chroniony hasłem", "The password is wrong. Try again." : "To hasło jest niewłaściwe. Spróbuj ponownie.", diff --git a/apps/files_sharing/l10n/pl.json b/apps/files_sharing/l10n/pl.json index 68c10b409ce..2c0c2385247 100644 --- a/apps/files_sharing/l10n/pl.json +++ b/apps/files_sharing/l10n/pl.json @@ -13,6 +13,7 @@ "Cancel" : "Anuluj", "Add remote share" : "Dodaj zdalny zasób", "Invalid ownCloud url" : "Błędny adres URL", + "Share" : "Udostępnij", "Shared by" : "Udostępniane przez", "This share is password-protected" : "Udział ten jest chroniony hasłem", "The password is wrong. Try again." : "To hasło jest niewłaściwe. Spróbuj ponownie.", diff --git a/apps/files_sharing/l10n/pt_BR.js b/apps/files_sharing/l10n/pt_BR.js index 7203e3c1ecd..3f9e97f95a2 100644 --- a/apps/files_sharing/l10n/pt_BR.js +++ b/apps/files_sharing/l10n/pt_BR.js @@ -4,6 +4,8 @@ OC.L10N.register( "Server to server sharing is not enabled on this server" : "Compartilhamento de servidor para servidor não está habilitado no servidor", "The mountpoint name contains invalid characters." : "O nome do ponto de montagem contém caracteres inválidos.", "Invalid or untrusted SSL certificate" : "Certificado SSL inválido ou não confiável", + "Could not authenticate to remote share, password might be wrong" : "Não foi possível autenticação com o compartilhamento remoto, a senha deve estar errada", + "Storage not valid" : "Armazenamento não válido", "Couldn't add remote share" : "Não foi possível adicionar compartilhamento remoto", "Shared with you" : "Compartilhado com você", "Shared with others" : "Compartilhado com outros", @@ -21,6 +23,7 @@ OC.L10N.register( "Add remote share" : "Adicionar compartilhamento remoto", "No ownCloud installation (7 or higher) found at {remote}" : "Nenhuma instalação ownCloud (7 ou superior) foi encontrada em {remote}", "Invalid ownCloud url" : "Url invalida para ownCloud", + "Share" : "Compartilhar", "Shared by" : "Compartilhado por", "A file or folder was shared from <strong>another server</strong>" : "Um arquivo ou pasta foi compartilhada a partir de <strong>outro servidor</strong>", "A public shared file or folder was <strong>downloaded</strong>" : "Um arquivo ou pasta compartilhada publicamente foi <strong>baixado</strong>", @@ -46,7 +49,7 @@ OC.L10N.register( "Download" : "Baixar", "Download %s" : "Baixar %s", "Direct link" : "Link direto", - "Server-to-Server Sharing" : "Compartilhamento Servidor-a-servidor", + "Federated Cloud Sharing" : "Núvem de Compartilhamento Federada", "Allow users on this server to send shares to other servers" : "Permitir que os usuários deste servidor enviem compartilhamentos para outros servidores", "Allow users on this server to receive shares from other servers" : "Permitir que os usuários nesse servidor recebam compartilhamentos de outros servidores" }, diff --git a/apps/files_sharing/l10n/pt_BR.json b/apps/files_sharing/l10n/pt_BR.json index 8314e75d9fc..4665ba63f8b 100644 --- a/apps/files_sharing/l10n/pt_BR.json +++ b/apps/files_sharing/l10n/pt_BR.json @@ -2,6 +2,8 @@ "Server to server sharing is not enabled on this server" : "Compartilhamento de servidor para servidor não está habilitado no servidor", "The mountpoint name contains invalid characters." : "O nome do ponto de montagem contém caracteres inválidos.", "Invalid or untrusted SSL certificate" : "Certificado SSL inválido ou não confiável", + "Could not authenticate to remote share, password might be wrong" : "Não foi possível autenticação com o compartilhamento remoto, a senha deve estar errada", + "Storage not valid" : "Armazenamento não válido", "Couldn't add remote share" : "Não foi possível adicionar compartilhamento remoto", "Shared with you" : "Compartilhado com você", "Shared with others" : "Compartilhado com outros", @@ -19,6 +21,7 @@ "Add remote share" : "Adicionar compartilhamento remoto", "No ownCloud installation (7 or higher) found at {remote}" : "Nenhuma instalação ownCloud (7 ou superior) foi encontrada em {remote}", "Invalid ownCloud url" : "Url invalida para ownCloud", + "Share" : "Compartilhar", "Shared by" : "Compartilhado por", "A file or folder was shared from <strong>another server</strong>" : "Um arquivo ou pasta foi compartilhada a partir de <strong>outro servidor</strong>", "A public shared file or folder was <strong>downloaded</strong>" : "Um arquivo ou pasta compartilhada publicamente foi <strong>baixado</strong>", @@ -44,7 +47,7 @@ "Download" : "Baixar", "Download %s" : "Baixar %s", "Direct link" : "Link direto", - "Server-to-Server Sharing" : "Compartilhamento Servidor-a-servidor", + "Federated Cloud Sharing" : "Núvem de Compartilhamento Federada", "Allow users on this server to send shares to other servers" : "Permitir que os usuários deste servidor enviem compartilhamentos para outros servidores", "Allow users on this server to receive shares from other servers" : "Permitir que os usuários nesse servidor recebam compartilhamentos de outros servidores" },"pluralForm" :"nplurals=2; plural=(n > 1);" diff --git a/apps/files_sharing/l10n/pt_PT.js b/apps/files_sharing/l10n/pt_PT.js index f0f6221ce30..614f9b101e0 100644 --- a/apps/files_sharing/l10n/pt_PT.js +++ b/apps/files_sharing/l10n/pt_PT.js @@ -4,20 +4,39 @@ OC.L10N.register( "Server to server sharing is not enabled on this server" : "A partilha entre servidores não se encontra disponível neste servidor", "The mountpoint name contains invalid characters." : "O nome do ponto de montagem contém carateres inválidos.", "Invalid or untrusted SSL certificate" : "Certificado SSL inválido ou não confiável", + "Could not authenticate to remote share, password might be wrong" : "Não foi possível autenticar para partilha remota, a palavra-passe pode estar errada", + "Storage not valid" : "Armazenamento inválido", "Couldn't add remote share" : "Não foi possível adicionar a partilha remota", "Shared with you" : "Partilhado consigo ", "Shared with others" : "Partilhado com outros", "Shared by link" : "Partilhado pela hiperligação", + "Nothing shared with you yet" : "Ainda não foi partilhado nada consigo", + "Files and folders others share with you will show up here" : "Os ficheiros e pastas que os outros partilham consigo, serão mostradas aqui", + "Nothing shared yet" : "Ainda não foi nada paratilhado", + "Files and folders you share will show up here" : "Os ficheiros e pastas que você partilha serão mostrados aqui", + "No shared links" : "Sem hiperligações partilhadas", + "Files and folders you share by link will show up here" : "Os ficheiros e pastas que você partilha por link serão mostrados aqui", "Do you want to add the remote share {name} from {owner}@{remote}?" : "Deseja adicionar a partilha remota {nome} de {proprietário}@{remoto}?", "Remote share" : "Partilha remota", "Remote share password" : "Senha da partilha remota", "Cancel" : "Cancelar", "Add remote share" : "Adicionar partilha remota", + "No ownCloud installation (7 or higher) found at {remote}" : "Nenhuma instalação do OwnCloud (7 ou superior) encontrada em {remote}", "Invalid ownCloud url" : "Url ownCloud inválido", + "Share" : "Compartilhar", "Shared by" : "Partilhado por", + "A file or folder was shared from <strong>another server</strong>" : "Um ficheiro ou pasta foi partilhado a partir de <strong>outro servidor</strong>", + "A public shared file or folder was <strong>downloaded</strong>" : "Um ficheiro ou pasta partilhada publicamente foi <strong>descarregado</strong>", + "You received a new remote share from %s" : "Você recebeu uma nova partilha remota de %s", + "%1$s accepted remote share %2$s" : "%1$s aceitou a partilha remota %2$s", + "%1$s declined remote share %2$s" : "%1$s rejeitou a partilha remota %2$s", + "%1$s unshared %2$s from you" : "%1$s retirou a partilha %2$s contigo", + "Public shared folder %1$s was downloaded" : "A pasta partilhada publicamente %1$s foi descarregada", + "Public shared file %1$s was downloaded" : "O ficheiro partilhado publicamente %1$s foi descarregado", "This share is password-protected" : "Esta partilha está protegida por senha", "The password is wrong. Try again." : "A senha está errada. Por favor, tente de novo.", "Password" : "Senha", + "No entries found in this folder" : "Não foram encontradas entradas nesta pasta", "Name" : "Nome", "Share time" : "Hora da Partilha", "Sorry, this link doesn’t seem to work anymore." : "Desculpe, mas esta hiperligação parece já não estar a funcionar.", @@ -30,7 +49,7 @@ OC.L10N.register( "Download" : "Transferir", "Download %s" : "Transferir %s", "Direct link" : "Hiperligação direta", - "Server-to-Server Sharing" : "Servidor-para-Servidor de Partilha", + "Federated Cloud Sharing" : "Partilha de Cloud Federada", "Allow users on this server to send shares to other servers" : "Permitir utilizadores neste servidor para enviar as partilhas para outros servidores", "Allow users on this server to receive shares from other servers" : "Permitir utilizadores neste servidor para receber as partilhas de outros servidores" }, diff --git a/apps/files_sharing/l10n/pt_PT.json b/apps/files_sharing/l10n/pt_PT.json index 400c24b326c..24d0ebafb39 100644 --- a/apps/files_sharing/l10n/pt_PT.json +++ b/apps/files_sharing/l10n/pt_PT.json @@ -2,20 +2,39 @@ "Server to server sharing is not enabled on this server" : "A partilha entre servidores não se encontra disponível neste servidor", "The mountpoint name contains invalid characters." : "O nome do ponto de montagem contém carateres inválidos.", "Invalid or untrusted SSL certificate" : "Certificado SSL inválido ou não confiável", + "Could not authenticate to remote share, password might be wrong" : "Não foi possível autenticar para partilha remota, a palavra-passe pode estar errada", + "Storage not valid" : "Armazenamento inválido", "Couldn't add remote share" : "Não foi possível adicionar a partilha remota", "Shared with you" : "Partilhado consigo ", "Shared with others" : "Partilhado com outros", "Shared by link" : "Partilhado pela hiperligação", + "Nothing shared with you yet" : "Ainda não foi partilhado nada consigo", + "Files and folders others share with you will show up here" : "Os ficheiros e pastas que os outros partilham consigo, serão mostradas aqui", + "Nothing shared yet" : "Ainda não foi nada paratilhado", + "Files and folders you share will show up here" : "Os ficheiros e pastas que você partilha serão mostrados aqui", + "No shared links" : "Sem hiperligações partilhadas", + "Files and folders you share by link will show up here" : "Os ficheiros e pastas que você partilha por link serão mostrados aqui", "Do you want to add the remote share {name} from {owner}@{remote}?" : "Deseja adicionar a partilha remota {nome} de {proprietário}@{remoto}?", "Remote share" : "Partilha remota", "Remote share password" : "Senha da partilha remota", "Cancel" : "Cancelar", "Add remote share" : "Adicionar partilha remota", + "No ownCloud installation (7 or higher) found at {remote}" : "Nenhuma instalação do OwnCloud (7 ou superior) encontrada em {remote}", "Invalid ownCloud url" : "Url ownCloud inválido", + "Share" : "Compartilhar", "Shared by" : "Partilhado por", + "A file or folder was shared from <strong>another server</strong>" : "Um ficheiro ou pasta foi partilhado a partir de <strong>outro servidor</strong>", + "A public shared file or folder was <strong>downloaded</strong>" : "Um ficheiro ou pasta partilhada publicamente foi <strong>descarregado</strong>", + "You received a new remote share from %s" : "Você recebeu uma nova partilha remota de %s", + "%1$s accepted remote share %2$s" : "%1$s aceitou a partilha remota %2$s", + "%1$s declined remote share %2$s" : "%1$s rejeitou a partilha remota %2$s", + "%1$s unshared %2$s from you" : "%1$s retirou a partilha %2$s contigo", + "Public shared folder %1$s was downloaded" : "A pasta partilhada publicamente %1$s foi descarregada", + "Public shared file %1$s was downloaded" : "O ficheiro partilhado publicamente %1$s foi descarregado", "This share is password-protected" : "Esta partilha está protegida por senha", "The password is wrong. Try again." : "A senha está errada. Por favor, tente de novo.", "Password" : "Senha", + "No entries found in this folder" : "Não foram encontradas entradas nesta pasta", "Name" : "Nome", "Share time" : "Hora da Partilha", "Sorry, this link doesn’t seem to work anymore." : "Desculpe, mas esta hiperligação parece já não estar a funcionar.", @@ -28,7 +47,7 @@ "Download" : "Transferir", "Download %s" : "Transferir %s", "Direct link" : "Hiperligação direta", - "Server-to-Server Sharing" : "Servidor-para-Servidor de Partilha", + "Federated Cloud Sharing" : "Partilha de Cloud Federada", "Allow users on this server to send shares to other servers" : "Permitir utilizadores neste servidor para enviar as partilhas para outros servidores", "Allow users on this server to receive shares from other servers" : "Permitir utilizadores neste servidor para receber as partilhas de outros servidores" },"pluralForm" :"nplurals=2; plural=(n != 1);" diff --git a/apps/files_sharing/l10n/ro.js b/apps/files_sharing/l10n/ro.js index 69a4d263545..107d4a1687e 100644 --- a/apps/files_sharing/l10n/ro.js +++ b/apps/files_sharing/l10n/ro.js @@ -5,6 +5,7 @@ OC.L10N.register( "Shared with you" : "Partajat cu tine", "Shared with others" : "Partajat cu alții", "Cancel" : "Anulare", + "Share" : "Partajează", "Shared by" : "impartite in ", "This share is password-protected" : "Această partajare este protejată cu parolă", "The password is wrong. Try again." : "Parola este incorectă. Încercaţi din nou.", diff --git a/apps/files_sharing/l10n/ro.json b/apps/files_sharing/l10n/ro.json index 73501a9acd0..1676f3d7f9f 100644 --- a/apps/files_sharing/l10n/ro.json +++ b/apps/files_sharing/l10n/ro.json @@ -3,6 +3,7 @@ "Shared with you" : "Partajat cu tine", "Shared with others" : "Partajat cu alții", "Cancel" : "Anulare", + "Share" : "Partajează", "Shared by" : "impartite in ", "This share is password-protected" : "Această partajare este protejată cu parolă", "The password is wrong. Try again." : "Parola este incorectă. Încercaţi din nou.", diff --git a/apps/files_sharing/l10n/ru.js b/apps/files_sharing/l10n/ru.js index 0212726e204..31e24f5991c 100644 --- a/apps/files_sharing/l10n/ru.js +++ b/apps/files_sharing/l10n/ru.js @@ -4,6 +4,8 @@ OC.L10N.register( "Server to server sharing is not enabled on this server" : "На данном сервере выключено межсерверное предоставление общего доступа", "The mountpoint name contains invalid characters." : "Имя точки монтирования содержит недопустимые символы.", "Invalid or untrusted SSL certificate" : "Недействительный или недоверенный сертификат SSL", + "Could not authenticate to remote share, password might be wrong" : "Не удалось произвести аутентификацию для доступа к удалённому хранилищу, возможно неправильно указан пароль", + "Storage not valid" : "Хранилище недоступно", "Couldn't add remote share" : "Невозможно добавить удалённый общий ресурс", "Shared with you" : "Поделились с вами", "Shared with others" : "Доступные для других", @@ -21,6 +23,7 @@ OC.L10N.register( "Add remote share" : "Добавить удалённый общий ресурс", "No ownCloud installation (7 or higher) found at {remote}" : "На удаленном ресурсе {remote} не установлен ownCloud версии 7 или выше", "Invalid ownCloud url" : "Неверный адрес ownCloud", + "Share" : "Поделиться", "Shared by" : "Поделился", "A file or folder was shared from <strong>another server</strong>" : "Файлом или каталогом поделились с <strong>удаленного сервера</strong>", "A public shared file or folder was <strong>downloaded</strong>" : "Общий файл или каталог был <strong>скачан</strong>", @@ -33,7 +36,7 @@ OC.L10N.register( "This share is password-protected" : "Общий ресурс защищен паролем", "The password is wrong. Try again." : "Неверный пароль. Попробуйте еще раз.", "Password" : "Пароль", - "No entries found in this folder" : "Каталог пуст", + "No entries found in this folder" : "Нет элементов в этом каталоге", "Name" : "Имя", "Share time" : "Дата публикации", "Sorry, this link doesn’t seem to work anymore." : "Эта ссылка устарела и более не действительна.", @@ -46,7 +49,7 @@ OC.L10N.register( "Download" : "Скачать", "Download %s" : "Скачать %s", "Direct link" : "Прямая ссылка", - "Server-to-Server Sharing" : "Межсерверное предоставление доступа", + "Federated Cloud Sharing" : "Объединение облачных хранилищ", "Allow users on this server to send shares to other servers" : "Разрешить пользователям делиться с пользователями других серверов", "Allow users on this server to receive shares from other servers" : "Разрешить пользователям использовать общие ресурсы с других серверов" }, diff --git a/apps/files_sharing/l10n/ru.json b/apps/files_sharing/l10n/ru.json index d14ffa43101..8ff5e88c458 100644 --- a/apps/files_sharing/l10n/ru.json +++ b/apps/files_sharing/l10n/ru.json @@ -2,6 +2,8 @@ "Server to server sharing is not enabled on this server" : "На данном сервере выключено межсерверное предоставление общего доступа", "The mountpoint name contains invalid characters." : "Имя точки монтирования содержит недопустимые символы.", "Invalid or untrusted SSL certificate" : "Недействительный или недоверенный сертификат SSL", + "Could not authenticate to remote share, password might be wrong" : "Не удалось произвести аутентификацию для доступа к удалённому хранилищу, возможно неправильно указан пароль", + "Storage not valid" : "Хранилище недоступно", "Couldn't add remote share" : "Невозможно добавить удалённый общий ресурс", "Shared with you" : "Поделились с вами", "Shared with others" : "Доступные для других", @@ -19,6 +21,7 @@ "Add remote share" : "Добавить удалённый общий ресурс", "No ownCloud installation (7 or higher) found at {remote}" : "На удаленном ресурсе {remote} не установлен ownCloud версии 7 или выше", "Invalid ownCloud url" : "Неверный адрес ownCloud", + "Share" : "Поделиться", "Shared by" : "Поделился", "A file or folder was shared from <strong>another server</strong>" : "Файлом или каталогом поделились с <strong>удаленного сервера</strong>", "A public shared file or folder was <strong>downloaded</strong>" : "Общий файл или каталог был <strong>скачан</strong>", @@ -31,7 +34,7 @@ "This share is password-protected" : "Общий ресурс защищен паролем", "The password is wrong. Try again." : "Неверный пароль. Попробуйте еще раз.", "Password" : "Пароль", - "No entries found in this folder" : "Каталог пуст", + "No entries found in this folder" : "Нет элементов в этом каталоге", "Name" : "Имя", "Share time" : "Дата публикации", "Sorry, this link doesn’t seem to work anymore." : "Эта ссылка устарела и более не действительна.", @@ -44,7 +47,7 @@ "Download" : "Скачать", "Download %s" : "Скачать %s", "Direct link" : "Прямая ссылка", - "Server-to-Server Sharing" : "Межсерверное предоставление доступа", + "Federated Cloud Sharing" : "Объединение облачных хранилищ", "Allow users on this server to send shares to other servers" : "Разрешить пользователям делиться с пользователями других серверов", "Allow users on this server to receive shares from other servers" : "Разрешить пользователям использовать общие ресурсы с других серверов" },"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);" diff --git a/apps/files_sharing/l10n/si_LK.js b/apps/files_sharing/l10n/si_LK.js index f55e8fc6d50..6d69abd7ef3 100644 --- a/apps/files_sharing/l10n/si_LK.js +++ b/apps/files_sharing/l10n/si_LK.js @@ -2,6 +2,7 @@ OC.L10N.register( "files_sharing", { "Cancel" : "එපා", + "Share" : "බෙදා හදා ගන්න", "Password" : "මුර පදය", "Name" : "නම", "Download" : "බාන්න" diff --git a/apps/files_sharing/l10n/si_LK.json b/apps/files_sharing/l10n/si_LK.json index 528b13cd6e4..6a78f6d7dce 100644 --- a/apps/files_sharing/l10n/si_LK.json +++ b/apps/files_sharing/l10n/si_LK.json @@ -1,5 +1,6 @@ { "translations": { "Cancel" : "එපා", + "Share" : "බෙදා හදා ගන්න", "Password" : "මුර පදය", "Name" : "නම", "Download" : "බාන්න" diff --git a/apps/files_sharing/l10n/sk_SK.js b/apps/files_sharing/l10n/sk_SK.js index 5467f33eba1..b34a84bc6e1 100644 --- a/apps/files_sharing/l10n/sk_SK.js +++ b/apps/files_sharing/l10n/sk_SK.js @@ -2,21 +2,41 @@ OC.L10N.register( "files_sharing", { "Server to server sharing is not enabled on this server" : "Zdieľanie server-server nie je na tomto serveri povolené", + "The mountpoint name contains invalid characters." : "Názov pripojovacieho bodu obsahuje nepovolené znaky.", "Invalid or untrusted SSL certificate" : "Neplatný alebo nedôveryhodný certifikát SSL", + "Could not authenticate to remote share, password might be wrong" : "Nie je možné overiť vo vzdialenom úložisku, heslo môže byť nesprávne", + "Storage not valid" : "Neplatné úložisko", "Couldn't add remote share" : "Nemožno pridať vzdialené zdieľanie", "Shared with you" : "Zdieľané s vami", - "Shared with others" : "Zdieľané s ostanými", + "Shared with others" : "Zdieľané s ostatnými", "Shared by link" : "Zdieľané pomocou odkazu", + "Nothing shared with you yet" : "Zatiaľ s vami nikto nič nezdieľal.", + "Files and folders others share with you will show up here" : "Tu budú zobrazené súbory a priečinky, ktoré s vami zdieľajú ostatní", + "Nothing shared yet" : "Zatiaľ nie je nič zdieľané", + "Files and folders you share will show up here" : "Súbory a priečinky, ktoré zdieľate, budú zobrazené tu", + "No shared links" : "Žiadne zdieľané odkazy", + "Files and folders you share by link will show up here" : "Súbory a priečinky, ktoré zdieľate ako odkazy, budú zobrazené tu", "Do you want to add the remote share {name} from {owner}@{remote}?" : "Chcete pridať vzdialené úložisko {name} patriace používateľovi {owner}@{remote}?", "Remote share" : "Vzdialené úložisko", "Remote share password" : "Heslo k vzdialenému úložisku", "Cancel" : "Zrušiť", "Add remote share" : "Pridať vzdialené úložisko", + "No ownCloud installation (7 or higher) found at {remote}" : "Nebola nájdená inštalácia ownCloudu (7 alebo vyššia) {remote}", "Invalid ownCloud url" : "Chybná ownCloud url", + "Share" : "Zdieľať", "Shared by" : "Zdieľa", + "A file or folder was shared from <strong>another server</strong>" : "Súbor alebo priečinok bol vyzdieľaný z <strong>iného servera</strong>", + "A public shared file or folder was <strong>downloaded</strong>" : "Verejne zdieľaný súbor alebo priečinok bol <strong>stiahnutý</strong>", + "You received a new remote share from %s" : "Dostali ste nové vzdialené zdieľanie z %s", + "%1$s accepted remote share %2$s" : "%1$s povolil vzdialené zdieľanie %2$s", + "%1$s declined remote share %2$s" : "%1$s odmietol vzdialené zdieľanie %2$s", + "%1$s unshared %2$s from you" : "%1$s už s vami nezdieľa %2$s", + "Public shared folder %1$s was downloaded" : "Verejne zdieľaný priečinok %1$s bol stiahnutý", + "Public shared file %1$s was downloaded" : "Verejne zdieľaný súbor %1$s bol stiahnutý", "This share is password-protected" : "Toto zdieľanie je chránené heslom", "The password is wrong. Try again." : "Heslo je chybné. Skúste to znova.", "Password" : "Heslo", + "No entries found in this folder" : "V tomto priečinku nebolo nič nájdené", "Name" : "Názov", "Share time" : "Čas zdieľania", "Sorry, this link doesn’t seem to work anymore." : "To je nepríjemné, ale tento odkaz už nie je funkčný.", @@ -28,6 +48,9 @@ OC.L10N.register( "Add to your ownCloud" : "Pridať do svojho ownCloudu", "Download" : "Sťahovanie", "Download %s" : "Stiahnuť %s", - "Direct link" : "Priama linka" + "Direct link" : "Priama linka", + "Federated Cloud Sharing" : "Združené cloudové zdieľanie", + "Allow users on this server to send shares to other servers" : "Povoliť používateľom z tohoto servera posielať zdieľania na iné servery", + "Allow users on this server to receive shares from other servers" : "Povoliť používateľom z tohoto servera prijímať zdieľania z iných serverov" }, "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"); diff --git a/apps/files_sharing/l10n/sk_SK.json b/apps/files_sharing/l10n/sk_SK.json index 811e9182db2..8044b6112ef 100644 --- a/apps/files_sharing/l10n/sk_SK.json +++ b/apps/files_sharing/l10n/sk_SK.json @@ -1,20 +1,40 @@ { "translations": { "Server to server sharing is not enabled on this server" : "Zdieľanie server-server nie je na tomto serveri povolené", + "The mountpoint name contains invalid characters." : "Názov pripojovacieho bodu obsahuje nepovolené znaky.", "Invalid or untrusted SSL certificate" : "Neplatný alebo nedôveryhodný certifikát SSL", + "Could not authenticate to remote share, password might be wrong" : "Nie je možné overiť vo vzdialenom úložisku, heslo môže byť nesprávne", + "Storage not valid" : "Neplatné úložisko", "Couldn't add remote share" : "Nemožno pridať vzdialené zdieľanie", "Shared with you" : "Zdieľané s vami", - "Shared with others" : "Zdieľané s ostanými", + "Shared with others" : "Zdieľané s ostatnými", "Shared by link" : "Zdieľané pomocou odkazu", + "Nothing shared with you yet" : "Zatiaľ s vami nikto nič nezdieľal.", + "Files and folders others share with you will show up here" : "Tu budú zobrazené súbory a priečinky, ktoré s vami zdieľajú ostatní", + "Nothing shared yet" : "Zatiaľ nie je nič zdieľané", + "Files and folders you share will show up here" : "Súbory a priečinky, ktoré zdieľate, budú zobrazené tu", + "No shared links" : "Žiadne zdieľané odkazy", + "Files and folders you share by link will show up here" : "Súbory a priečinky, ktoré zdieľate ako odkazy, budú zobrazené tu", "Do you want to add the remote share {name} from {owner}@{remote}?" : "Chcete pridať vzdialené úložisko {name} patriace používateľovi {owner}@{remote}?", "Remote share" : "Vzdialené úložisko", "Remote share password" : "Heslo k vzdialenému úložisku", "Cancel" : "Zrušiť", "Add remote share" : "Pridať vzdialené úložisko", + "No ownCloud installation (7 or higher) found at {remote}" : "Nebola nájdená inštalácia ownCloudu (7 alebo vyššia) {remote}", "Invalid ownCloud url" : "Chybná ownCloud url", + "Share" : "Zdieľať", "Shared by" : "Zdieľa", + "A file or folder was shared from <strong>another server</strong>" : "Súbor alebo priečinok bol vyzdieľaný z <strong>iného servera</strong>", + "A public shared file or folder was <strong>downloaded</strong>" : "Verejne zdieľaný súbor alebo priečinok bol <strong>stiahnutý</strong>", + "You received a new remote share from %s" : "Dostali ste nové vzdialené zdieľanie z %s", + "%1$s accepted remote share %2$s" : "%1$s povolil vzdialené zdieľanie %2$s", + "%1$s declined remote share %2$s" : "%1$s odmietol vzdialené zdieľanie %2$s", + "%1$s unshared %2$s from you" : "%1$s už s vami nezdieľa %2$s", + "Public shared folder %1$s was downloaded" : "Verejne zdieľaný priečinok %1$s bol stiahnutý", + "Public shared file %1$s was downloaded" : "Verejne zdieľaný súbor %1$s bol stiahnutý", "This share is password-protected" : "Toto zdieľanie je chránené heslom", "The password is wrong. Try again." : "Heslo je chybné. Skúste to znova.", "Password" : "Heslo", + "No entries found in this folder" : "V tomto priečinku nebolo nič nájdené", "Name" : "Názov", "Share time" : "Čas zdieľania", "Sorry, this link doesn’t seem to work anymore." : "To je nepríjemné, ale tento odkaz už nie je funkčný.", @@ -26,6 +46,9 @@ "Add to your ownCloud" : "Pridať do svojho ownCloudu", "Download" : "Sťahovanie", "Download %s" : "Stiahnuť %s", - "Direct link" : "Priama linka" + "Direct link" : "Priama linka", + "Federated Cloud Sharing" : "Združené cloudové zdieľanie", + "Allow users on this server to send shares to other servers" : "Povoliť používateľom z tohoto servera posielať zdieľania na iné servery", + "Allow users on this server to receive shares from other servers" : "Povoliť používateľom z tohoto servera prijímať zdieľania z iných serverov" },"pluralForm" :"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/sl.js b/apps/files_sharing/l10n/sl.js index 5fe340ab04c..dc31132d9da 100644 --- a/apps/files_sharing/l10n/sl.js +++ b/apps/files_sharing/l10n/sl.js @@ -21,6 +21,7 @@ OC.L10N.register( "Add remote share" : "Dodaj oddaljeno mesto za souporabo", "No ownCloud installation (7 or higher) found at {remote}" : "Na mestu {remote} ni nameščenega okolja ownCloud (različice 7 ali višje)", "Invalid ownCloud url" : "Naveden je neveljaven naslov URL strežnika ownCloud", + "Share" : "Souporaba", "Shared by" : "V souporabi z", "A file or folder was shared from <strong>another server</strong>" : "Souporaba datoteke ali mape <strong>z drugega strežnika</strong> je odobrena.", "A public shared file or folder was <strong>downloaded</strong>" : "Mapa ali datoteka v souporabi je bila <strong>prejeta</strong>.", @@ -46,7 +47,6 @@ OC.L10N.register( "Download" : "Prejmi", "Download %s" : "Prejmi %s", "Direct link" : "Neposredna povezava", - "Server-to-Server Sharing" : "Souporaba strežnik-na-strežnik", "Allow users on this server to send shares to other servers" : "Dovoli uporabnikom tega strežnika pošiljanje map za souporabo na druge strežnike.", "Allow users on this server to receive shares from other servers" : "Dovoli uporabnikom tega strežnika sprejemanje map za souporabo z drugih strežnikov." }, diff --git a/apps/files_sharing/l10n/sl.json b/apps/files_sharing/l10n/sl.json index 2618dce954e..eaf78fe1cfe 100644 --- a/apps/files_sharing/l10n/sl.json +++ b/apps/files_sharing/l10n/sl.json @@ -19,6 +19,7 @@ "Add remote share" : "Dodaj oddaljeno mesto za souporabo", "No ownCloud installation (7 or higher) found at {remote}" : "Na mestu {remote} ni nameščenega okolja ownCloud (različice 7 ali višje)", "Invalid ownCloud url" : "Naveden je neveljaven naslov URL strežnika ownCloud", + "Share" : "Souporaba", "Shared by" : "V souporabi z", "A file or folder was shared from <strong>another server</strong>" : "Souporaba datoteke ali mape <strong>z drugega strežnika</strong> je odobrena.", "A public shared file or folder was <strong>downloaded</strong>" : "Mapa ali datoteka v souporabi je bila <strong>prejeta</strong>.", @@ -44,7 +45,6 @@ "Download" : "Prejmi", "Download %s" : "Prejmi %s", "Direct link" : "Neposredna povezava", - "Server-to-Server Sharing" : "Souporaba strežnik-na-strežnik", "Allow users on this server to send shares to other servers" : "Dovoli uporabnikom tega strežnika pošiljanje map za souporabo na druge strežnike.", "Allow users on this server to receive shares from other servers" : "Dovoli uporabnikom tega strežnika sprejemanje map za souporabo z drugih strežnikov." },"pluralForm" :"nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);" diff --git a/apps/files_sharing/l10n/sq.js b/apps/files_sharing/l10n/sq.js index 5f11b75039f..e09b4d4a4c6 100644 --- a/apps/files_sharing/l10n/sq.js +++ b/apps/files_sharing/l10n/sq.js @@ -2,6 +2,7 @@ OC.L10N.register( "files_sharing", { "Cancel" : "Anullo", + "Share" : "Ndaj", "Shared by" : "Ndarë nga", "This share is password-protected" : "Kjo pjesë është e mbrojtur me fjalëkalim", "The password is wrong. Try again." : "Kodi është i gabuar. Provojeni përsëri.", diff --git a/apps/files_sharing/l10n/sq.json b/apps/files_sharing/l10n/sq.json index 491c0bfc7a9..1fd4a7fa978 100644 --- a/apps/files_sharing/l10n/sq.json +++ b/apps/files_sharing/l10n/sq.json @@ -1,5 +1,6 @@ { "translations": { "Cancel" : "Anullo", + "Share" : "Ndaj", "Shared by" : "Ndarë nga", "This share is password-protected" : "Kjo pjesë është e mbrojtur me fjalëkalim", "The password is wrong. Try again." : "Kodi është i gabuar. Provojeni përsëri.", diff --git a/apps/files_sharing/l10n/sr.js b/apps/files_sharing/l10n/sr.js index 6e8100375f1..68f64f4f138 100644 --- a/apps/files_sharing/l10n/sr.js +++ b/apps/files_sharing/l10n/sr.js @@ -2,6 +2,7 @@ OC.L10N.register( "files_sharing", { "Cancel" : "Откажи", + "Share" : "Дели", "Shared by" : "Делио", "Password" : "Лозинка", "Name" : "Име", diff --git a/apps/files_sharing/l10n/sr.json b/apps/files_sharing/l10n/sr.json index 53642f3f349..86a7a4b57d0 100644 --- a/apps/files_sharing/l10n/sr.json +++ b/apps/files_sharing/l10n/sr.json @@ -1,5 +1,6 @@ { "translations": { "Cancel" : "Откажи", + "Share" : "Дели", "Shared by" : "Делио", "Password" : "Лозинка", "Name" : "Име", diff --git a/apps/files_sharing/l10n/sr@latin.js b/apps/files_sharing/l10n/sr@latin.js index 6e13a919b1b..4f8fdf8aa0e 100644 --- a/apps/files_sharing/l10n/sr@latin.js +++ b/apps/files_sharing/l10n/sr@latin.js @@ -1,9 +1,53 @@ OC.L10N.register( "files_sharing", { + "Server to server sharing is not enabled on this server" : "Deljenje od servera do servera nije omogućeno na ovom serveru.", + "The mountpoint name contains invalid characters." : "Ime tačke za montiranje sadrži neispravne karaktere.", + "Invalid or untrusted SSL certificate" : "Nevažeći SSL sertifikat ili SSL sertifikat koji nije od poverenja.", + "Couldn't add remote share" : "Nemoguće dodavanje udaljenog deljenog direktorijuma", + "Shared with you" : "Deljeno sa Vama", + "Shared with others" : "Deljeno sa ostalima", + "Shared by link" : "Deljeno pomoću prečice", + "Nothing shared with you yet" : "Još ništa nije deljeno sa Vama", + "Files and folders others share with you will show up here" : "Fajlovi i direktorijumi koji drugi dele sa Vama će se pojaviti ovde", + "Nothing shared yet" : "Još ništa nije deljeno", + "Files and folders you share will show up here" : "Fajlovi i direktorijumi koje vi delite će se pojaviti ovde", + "No shared links" : "Nema deljenih prečica", + "Files and folders you share by link will show up here" : "Fajlovi i direktorijumi koje delite putem prečice će se pojaviti ovde", + "Do you want to add the remote share {name} from {owner}@{remote}?" : "Da li želite da dodate udaljeni deljeni resurs {name} od {owner}@{remote}?", + "Remote share" : "Udaljeni deljeni resurs", + "Remote share password" : "Lozinka za udaljeni deljeni resurs", "Cancel" : "Otkaži", + "Add remote share" : "Dodaj udaljeni deljeni resurs", + "No ownCloud installation (7 or higher) found at {remote}" : "Nije pronađena ownCloud instalacija (7 ili noviji) na {remote}", + "Invalid ownCloud url" : "Neispravan ownCloud url", + "Share" : "Podeli", + "Shared by" : "Deljeno od strane", + "A file or folder was shared from <strong>another server</strong>" : "Fajl ili direktorijum je deljen sa <strong>drugog servera</strong>", + "A public shared file or folder was <strong>downloaded</strong>" : "Javni deljeni fajl ili direktorijum je <strong>preuzet</strong>", + "You received a new remote share from %s" : "Primili ste novi udaljeni deljeni resurs od %s", + "%1$s accepted remote share %2$s" : "%1$s je prihvatio udaljeni deljeni resurs %2$s", + "%1$s declined remote share %2$s" : "%1$s je odbio %2$s", + "%1$s unshared %2$s from you" : "%1$s je prekinuo deljenje %2$s sa Vama", + "Public shared folder %1$s was downloaded" : "Javni deljeni direktorijum %1$s je preuzet", + "Public shared file %1$s was downloaded" : "Javni deljeni fajl %1$s je preuzet", + "This share is password-protected" : "Ovaj deljeni resurs je zaštićen lozinkom", + "The password is wrong. Try again." : "Lozinka je netačna. Pokušajte ponovo.", "Password" : "Lozinka", + "No entries found in this folder" : "Nema unosa u ovom direktorijumu", "Name" : "Ime", - "Download" : "Preuzmi" + "Share time" : "Vreme deljenja", + "Sorry, this link doesn’t seem to work anymore." : "Žao nam je, ali ova prečica više ne radi.", + "Reasons might be:" : "Razlozi mogu biti:", + "the item was removed" : "stavka je uklonjena", + "the link expired" : "prečica je istekla", + "sharing is disabled" : "deljenje je onemogućeno", + "For more info, please ask the person who sent this link." : "Za više informacija, molimo Vas da se obratite osobi koja je poslala prečicu.", + "Add to your ownCloud" : "Dodaj na svoj ownCloud", + "Download" : "Preuzmi", + "Download %s" : "Preuzmi %s", + "Direct link" : "Direktna prečica", + "Allow users on this server to send shares to other servers" : "Dozvoli korisnicima na ovom serveru da šalju deljene resurse na druge servere", + "Allow users on this server to receive shares from other servers" : "Dozvoli korisnicima na ovom serveru da primaju deljene resurse sa drugih servera" }, "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"); diff --git a/apps/files_sharing/l10n/sr@latin.json b/apps/files_sharing/l10n/sr@latin.json index 9aebf35fc82..9ff5074d21b 100644 --- a/apps/files_sharing/l10n/sr@latin.json +++ b/apps/files_sharing/l10n/sr@latin.json @@ -1,7 +1,51 @@ { "translations": { + "Server to server sharing is not enabled on this server" : "Deljenje od servera do servera nije omogućeno na ovom serveru.", + "The mountpoint name contains invalid characters." : "Ime tačke za montiranje sadrži neispravne karaktere.", + "Invalid or untrusted SSL certificate" : "Nevažeći SSL sertifikat ili SSL sertifikat koji nije od poverenja.", + "Couldn't add remote share" : "Nemoguće dodavanje udaljenog deljenog direktorijuma", + "Shared with you" : "Deljeno sa Vama", + "Shared with others" : "Deljeno sa ostalima", + "Shared by link" : "Deljeno pomoću prečice", + "Nothing shared with you yet" : "Još ništa nije deljeno sa Vama", + "Files and folders others share with you will show up here" : "Fajlovi i direktorijumi koji drugi dele sa Vama će se pojaviti ovde", + "Nothing shared yet" : "Još ništa nije deljeno", + "Files and folders you share will show up here" : "Fajlovi i direktorijumi koje vi delite će se pojaviti ovde", + "No shared links" : "Nema deljenih prečica", + "Files and folders you share by link will show up here" : "Fajlovi i direktorijumi koje delite putem prečice će se pojaviti ovde", + "Do you want to add the remote share {name} from {owner}@{remote}?" : "Da li želite da dodate udaljeni deljeni resurs {name} od {owner}@{remote}?", + "Remote share" : "Udaljeni deljeni resurs", + "Remote share password" : "Lozinka za udaljeni deljeni resurs", "Cancel" : "Otkaži", + "Add remote share" : "Dodaj udaljeni deljeni resurs", + "No ownCloud installation (7 or higher) found at {remote}" : "Nije pronađena ownCloud instalacija (7 ili noviji) na {remote}", + "Invalid ownCloud url" : "Neispravan ownCloud url", + "Share" : "Podeli", + "Shared by" : "Deljeno od strane", + "A file or folder was shared from <strong>another server</strong>" : "Fajl ili direktorijum je deljen sa <strong>drugog servera</strong>", + "A public shared file or folder was <strong>downloaded</strong>" : "Javni deljeni fajl ili direktorijum je <strong>preuzet</strong>", + "You received a new remote share from %s" : "Primili ste novi udaljeni deljeni resurs od %s", + "%1$s accepted remote share %2$s" : "%1$s je prihvatio udaljeni deljeni resurs %2$s", + "%1$s declined remote share %2$s" : "%1$s je odbio %2$s", + "%1$s unshared %2$s from you" : "%1$s je prekinuo deljenje %2$s sa Vama", + "Public shared folder %1$s was downloaded" : "Javni deljeni direktorijum %1$s je preuzet", + "Public shared file %1$s was downloaded" : "Javni deljeni fajl %1$s je preuzet", + "This share is password-protected" : "Ovaj deljeni resurs je zaštićen lozinkom", + "The password is wrong. Try again." : "Lozinka je netačna. Pokušajte ponovo.", "Password" : "Lozinka", + "No entries found in this folder" : "Nema unosa u ovom direktorijumu", "Name" : "Ime", - "Download" : "Preuzmi" + "Share time" : "Vreme deljenja", + "Sorry, this link doesn’t seem to work anymore." : "Žao nam je, ali ova prečica više ne radi.", + "Reasons might be:" : "Razlozi mogu biti:", + "the item was removed" : "stavka je uklonjena", + "the link expired" : "prečica je istekla", + "sharing is disabled" : "deljenje je onemogućeno", + "For more info, please ask the person who sent this link." : "Za više informacija, molimo Vas da se obratite osobi koja je poslala prečicu.", + "Add to your ownCloud" : "Dodaj na svoj ownCloud", + "Download" : "Preuzmi", + "Download %s" : "Preuzmi %s", + "Direct link" : "Direktna prečica", + "Allow users on this server to send shares to other servers" : "Dozvoli korisnicima na ovom serveru da šalju deljene resurse na druge servere", + "Allow users on this server to receive shares from other servers" : "Dozvoli korisnicima na ovom serveru da primaju deljene resurse sa drugih servera" },"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/sv.js b/apps/files_sharing/l10n/sv.js index bab77a7431e..66012b8c3eb 100644 --- a/apps/files_sharing/l10n/sv.js +++ b/apps/files_sharing/l10n/sv.js @@ -20,6 +20,7 @@ OC.L10N.register( "Cancel" : "Avbryt", "Add remote share" : "Lägg till fjärrdelning", "Invalid ownCloud url" : "Felaktig ownCloud url", + "Share" : "Dela", "Shared by" : "Delad av", "A file or folder was shared from <strong>another server</strong>" : "En fil eller mapp delades från <strong>en annan server</strong>", "A public shared file or folder was <strong>downloaded</strong>" : "En publikt delad fil eller mapp blev <strong>nerladdad</strong>", @@ -44,7 +45,6 @@ OC.L10N.register( "Download" : "Ladda ner", "Download %s" : "Ladda ner %s", "Direct link" : "Direkt länk", - "Server-to-Server Sharing" : "Server-till-Server delning", "Allow users on this server to send shares to other servers" : "Tillåt användare på denna server att skicka utdelningar till andra servrar", "Allow users on this server to receive shares from other servers" : "Tillåt användare på denna servern att ta emot utdelningar från andra servrar" }, diff --git a/apps/files_sharing/l10n/sv.json b/apps/files_sharing/l10n/sv.json index a7334a15685..4e9735737c0 100644 --- a/apps/files_sharing/l10n/sv.json +++ b/apps/files_sharing/l10n/sv.json @@ -18,6 +18,7 @@ "Cancel" : "Avbryt", "Add remote share" : "Lägg till fjärrdelning", "Invalid ownCloud url" : "Felaktig ownCloud url", + "Share" : "Dela", "Shared by" : "Delad av", "A file or folder was shared from <strong>another server</strong>" : "En fil eller mapp delades från <strong>en annan server</strong>", "A public shared file or folder was <strong>downloaded</strong>" : "En publikt delad fil eller mapp blev <strong>nerladdad</strong>", @@ -42,7 +43,6 @@ "Download" : "Ladda ner", "Download %s" : "Ladda ner %s", "Direct link" : "Direkt länk", - "Server-to-Server Sharing" : "Server-till-Server delning", "Allow users on this server to send shares to other servers" : "Tillåt användare på denna server att skicka utdelningar till andra servrar", "Allow users on this server to receive shares from other servers" : "Tillåt användare på denna servern att ta emot utdelningar från andra servrar" },"pluralForm" :"nplurals=2; plural=(n != 1);" diff --git a/apps/files_sharing/l10n/ta_LK.js b/apps/files_sharing/l10n/ta_LK.js index 846ed1b4f84..d81565a3f62 100644 --- a/apps/files_sharing/l10n/ta_LK.js +++ b/apps/files_sharing/l10n/ta_LK.js @@ -2,6 +2,7 @@ OC.L10N.register( "files_sharing", { "Cancel" : "இரத்து செய்க", + "Share" : "பகிர்வு", "Password" : "கடவுச்சொல்", "Name" : "பெயர்", "Download" : "பதிவிறக்குக" diff --git a/apps/files_sharing/l10n/ta_LK.json b/apps/files_sharing/l10n/ta_LK.json index 8e722a93889..4d2bfd332b5 100644 --- a/apps/files_sharing/l10n/ta_LK.json +++ b/apps/files_sharing/l10n/ta_LK.json @@ -1,5 +1,6 @@ { "translations": { "Cancel" : "இரத்து செய்க", + "Share" : "பகிர்வு", "Password" : "கடவுச்சொல்", "Name" : "பெயர்", "Download" : "பதிவிறக்குக" diff --git a/apps/files_sharing/l10n/th_TH.js b/apps/files_sharing/l10n/th_TH.js index 153f7e222c6..d879c3d25af 100644 --- a/apps/files_sharing/l10n/th_TH.js +++ b/apps/files_sharing/l10n/th_TH.js @@ -2,6 +2,7 @@ OC.L10N.register( "files_sharing", { "Cancel" : "ยกเลิก", + "Share" : "แชร์", "Shared by" : "ถูกแชร์โดย", "Password" : "รหัสผ่าน", "Name" : "ชื่อ", diff --git a/apps/files_sharing/l10n/th_TH.json b/apps/files_sharing/l10n/th_TH.json index 05757834e53..1e793855e2b 100644 --- a/apps/files_sharing/l10n/th_TH.json +++ b/apps/files_sharing/l10n/th_TH.json @@ -1,5 +1,6 @@ { "translations": { "Cancel" : "ยกเลิก", + "Share" : "แชร์", "Shared by" : "ถูกแชร์โดย", "Password" : "รหัสผ่าน", "Name" : "ชื่อ", diff --git a/apps/files_sharing/l10n/tr.js b/apps/files_sharing/l10n/tr.js index ce34d67f5fe..e924e441197 100644 --- a/apps/files_sharing/l10n/tr.js +++ b/apps/files_sharing/l10n/tr.js @@ -4,6 +4,8 @@ OC.L10N.register( "Server to server sharing is not enabled on this server" : "Sunucudan sunucuya paylaşım bu sunucuda etkin değil", "The mountpoint name contains invalid characters." : "Bağlama noktası adı geçersiz karakterler içeriyor.", "Invalid or untrusted SSL certificate" : "Geçersiz veya güvenilmeyen SSL sertifikası", + "Could not authenticate to remote share, password might be wrong" : "Uzak paylaşım kimliği doğrulanamadı, parola hatalı olabilir", + "Storage not valid" : "Depolama geçerli değil", "Couldn't add remote share" : "Uzak paylaşım eklenemedi", "Shared with you" : "Sizinle paylaşılmış", "Shared with others" : "Diğerleri ile paylaşılmış", @@ -21,6 +23,7 @@ OC.L10N.register( "Add remote share" : "Uzak paylaşım ekle", "No ownCloud installation (7 or higher) found at {remote}" : "{remote} üzerinde ownCloud (7 veya daha üstü) kurulumu bulunamadı", "Invalid ownCloud url" : "Geçersiz ownCloud adresi", + "Share" : "Paylaş", "Shared by" : "Paylaşan", "A file or folder was shared from <strong>another server</strong>" : "<strong>Başka sunucudan</strong> bir dosya veya klasör paylaşıldı", "A public shared file or folder was <strong>downloaded</strong>" : "Herkese açık paylaşılan bir dosya veya klasör <strong>indirildi</strong>", @@ -46,7 +49,7 @@ OC.L10N.register( "Download" : "İndir", "Download %s" : "İndir: %s", "Direct link" : "Doğrudan bağlantı", - "Server-to-Server Sharing" : "Sunucu-Sunucu Paylaşımı", + "Federated Cloud Sharing" : "Birleşmiş Bulut Paylaşımı", "Allow users on this server to send shares to other servers" : "Bu sunucudaki kullanıcıların diğer sunuculara paylaşım göndermelerine izin ver", "Allow users on this server to receive shares from other servers" : "Bu sunucudaki kullanıcıların diğer sunuculardan paylaşım almalarına izin ver" }, diff --git a/apps/files_sharing/l10n/tr.json b/apps/files_sharing/l10n/tr.json index f2be16ee9c3..b432345a618 100644 --- a/apps/files_sharing/l10n/tr.json +++ b/apps/files_sharing/l10n/tr.json @@ -2,6 +2,8 @@ "Server to server sharing is not enabled on this server" : "Sunucudan sunucuya paylaşım bu sunucuda etkin değil", "The mountpoint name contains invalid characters." : "Bağlama noktası adı geçersiz karakterler içeriyor.", "Invalid or untrusted SSL certificate" : "Geçersiz veya güvenilmeyen SSL sertifikası", + "Could not authenticate to remote share, password might be wrong" : "Uzak paylaşım kimliği doğrulanamadı, parola hatalı olabilir", + "Storage not valid" : "Depolama geçerli değil", "Couldn't add remote share" : "Uzak paylaşım eklenemedi", "Shared with you" : "Sizinle paylaşılmış", "Shared with others" : "Diğerleri ile paylaşılmış", @@ -19,6 +21,7 @@ "Add remote share" : "Uzak paylaşım ekle", "No ownCloud installation (7 or higher) found at {remote}" : "{remote} üzerinde ownCloud (7 veya daha üstü) kurulumu bulunamadı", "Invalid ownCloud url" : "Geçersiz ownCloud adresi", + "Share" : "Paylaş", "Shared by" : "Paylaşan", "A file or folder was shared from <strong>another server</strong>" : "<strong>Başka sunucudan</strong> bir dosya veya klasör paylaşıldı", "A public shared file or folder was <strong>downloaded</strong>" : "Herkese açık paylaşılan bir dosya veya klasör <strong>indirildi</strong>", @@ -44,7 +47,7 @@ "Download" : "İndir", "Download %s" : "İndir: %s", "Direct link" : "Doğrudan bağlantı", - "Server-to-Server Sharing" : "Sunucu-Sunucu Paylaşımı", + "Federated Cloud Sharing" : "Birleşmiş Bulut Paylaşımı", "Allow users on this server to send shares to other servers" : "Bu sunucudaki kullanıcıların diğer sunuculara paylaşım göndermelerine izin ver", "Allow users on this server to receive shares from other servers" : "Bu sunucudaki kullanıcıların diğer sunuculardan paylaşım almalarına izin ver" },"pluralForm" :"nplurals=2; plural=(n > 1);" diff --git a/apps/files_sharing/l10n/ug.js b/apps/files_sharing/l10n/ug.js index 2e1fcc17441..4a9b698aa00 100644 --- a/apps/files_sharing/l10n/ug.js +++ b/apps/files_sharing/l10n/ug.js @@ -2,6 +2,7 @@ OC.L10N.register( "files_sharing", { "Cancel" : "ۋاز كەچ", + "Share" : "ھەمبەھىر", "Shared by" : "ھەمبەھىرلىگۈچى", "Password" : "ئىم", "Name" : "ئاتى", diff --git a/apps/files_sharing/l10n/ug.json b/apps/files_sharing/l10n/ug.json index da37c17a579..a4253e61d07 100644 --- a/apps/files_sharing/l10n/ug.json +++ b/apps/files_sharing/l10n/ug.json @@ -1,5 +1,6 @@ { "translations": { "Cancel" : "ۋاز كەچ", + "Share" : "ھەمبەھىر", "Shared by" : "ھەمبەھىرلىگۈچى", "Password" : "ئىم", "Name" : "ئاتى", diff --git a/apps/files_sharing/l10n/uk.js b/apps/files_sharing/l10n/uk.js index 47ae87389f0..135b0550558 100644 --- a/apps/files_sharing/l10n/uk.js +++ b/apps/files_sharing/l10n/uk.js @@ -8,16 +8,33 @@ OC.L10N.register( "Shared with you" : "Доступне для вас", "Shared with others" : "Доступне для інших", "Shared by link" : "Доступне за посиланням", + "Nothing shared with you yet" : "Ніхто з вами ще не поділився файлами", + "Files and folders others share with you will show up here" : "Розшарені для вас файли і папки з'являться тут", + "Nothing shared yet" : "Немає нічого розшареного", + "Files and folders you share will show up here" : "Файли і папки, які розшарені для вас відображатимуться тут", + "No shared links" : "Немає опублікованих посилань", + "Files and folders you share by link will show up here" : "Файли і папки, якими ви поділитися по посиланню будуть відображатися тут", "Do you want to add the remote share {name} from {owner}@{remote}?" : "Додати віддалену загальну теку {name} з {owner}@{remote}?", "Remote share" : "Віддалена загальна тека", "Remote share password" : "Пароль для віддаленої загальної теки", "Cancel" : "Відмінити", "Add remote share" : "Додати віддалену загальну теку", + "No ownCloud installation (7 or higher) found at {remote}" : "Немає установленого OwnCloud (7 або вище), можна знайти на {remote}", "Invalid ownCloud url" : "Невірний ownCloud URL", + "Share" : "Поділитися", "Shared by" : "Опубліковано", + "A file or folder was shared from <strong>another server</strong>" : "Файл або каталог був опублікований <strong>з іншого сервера</strong>", + "A public shared file or folder was <strong>downloaded</strong>" : "Опублікований файл або каталог був <strong>завантажений</strong>", + "You received a new remote share from %s" : "Ви отримали нову віддалену папку %s", + "%1$s accepted remote share %2$s" : "%1$s віддалена шара підтверджена %2$s", + "%1$s declined remote share %2$s" : "%1$s віддалена шара скасована %2$s", + "%1$s unshared %2$s from you" : "%1$s не розшарений %2$s для вас", + "Public shared folder %1$s was downloaded" : "Опублікований каталог %1$s був завантажений", + "Public shared file %1$s was downloaded" : "Опублікований файл %1$s був завантажений", "This share is password-protected" : "Цей ресурс обміну захищений паролем", "The password is wrong. Try again." : "Невірний пароль. Спробуйте ще раз.", "Password" : "Пароль", + "No entries found in this folder" : "Записів не знайдено в цій папці", "Name" : "Ім'я", "Share time" : "Дата публікації", "Sorry, this link doesn’t seem to work anymore." : "На жаль, посилання більше не працює.", @@ -30,7 +47,6 @@ OC.L10N.register( "Download" : "Завантажити", "Download %s" : "Завантажити %s", "Direct link" : "Пряме посилання", - "Server-to-Server Sharing" : "Публікація між серверами", "Allow users on this server to send shares to other servers" : "Дозволити користувачам цього сервера публікувати на інших серверах", "Allow users on this server to receive shares from other servers" : "Дозволити користувачам на цьому сервері отримувати публікації з інших серверів" }, diff --git a/apps/files_sharing/l10n/uk.json b/apps/files_sharing/l10n/uk.json index 1a0bd7c7b11..21f4f5efb52 100644 --- a/apps/files_sharing/l10n/uk.json +++ b/apps/files_sharing/l10n/uk.json @@ -6,16 +6,33 @@ "Shared with you" : "Доступне для вас", "Shared with others" : "Доступне для інших", "Shared by link" : "Доступне за посиланням", + "Nothing shared with you yet" : "Ніхто з вами ще не поділився файлами", + "Files and folders others share with you will show up here" : "Розшарені для вас файли і папки з'являться тут", + "Nothing shared yet" : "Немає нічого розшареного", + "Files and folders you share will show up here" : "Файли і папки, які розшарені для вас відображатимуться тут", + "No shared links" : "Немає опублікованих посилань", + "Files and folders you share by link will show up here" : "Файли і папки, якими ви поділитися по посиланню будуть відображатися тут", "Do you want to add the remote share {name} from {owner}@{remote}?" : "Додати віддалену загальну теку {name} з {owner}@{remote}?", "Remote share" : "Віддалена загальна тека", "Remote share password" : "Пароль для віддаленої загальної теки", "Cancel" : "Відмінити", "Add remote share" : "Додати віддалену загальну теку", + "No ownCloud installation (7 or higher) found at {remote}" : "Немає установленого OwnCloud (7 або вище), можна знайти на {remote}", "Invalid ownCloud url" : "Невірний ownCloud URL", + "Share" : "Поділитися", "Shared by" : "Опубліковано", + "A file or folder was shared from <strong>another server</strong>" : "Файл або каталог був опублікований <strong>з іншого сервера</strong>", + "A public shared file or folder was <strong>downloaded</strong>" : "Опублікований файл або каталог був <strong>завантажений</strong>", + "You received a new remote share from %s" : "Ви отримали нову віддалену папку %s", + "%1$s accepted remote share %2$s" : "%1$s віддалена шара підтверджена %2$s", + "%1$s declined remote share %2$s" : "%1$s віддалена шара скасована %2$s", + "%1$s unshared %2$s from you" : "%1$s не розшарений %2$s для вас", + "Public shared folder %1$s was downloaded" : "Опублікований каталог %1$s був завантажений", + "Public shared file %1$s was downloaded" : "Опублікований файл %1$s був завантажений", "This share is password-protected" : "Цей ресурс обміну захищений паролем", "The password is wrong. Try again." : "Невірний пароль. Спробуйте ще раз.", "Password" : "Пароль", + "No entries found in this folder" : "Записів не знайдено в цій папці", "Name" : "Ім'я", "Share time" : "Дата публікації", "Sorry, this link doesn’t seem to work anymore." : "На жаль, посилання більше не працює.", @@ -28,7 +45,6 @@ "Download" : "Завантажити", "Download %s" : "Завантажити %s", "Direct link" : "Пряме посилання", - "Server-to-Server Sharing" : "Публікація між серверами", "Allow users on this server to send shares to other servers" : "Дозволити користувачам цього сервера публікувати на інших серверах", "Allow users on this server to receive shares from other servers" : "Дозволити користувачам на цьому сервері отримувати публікації з інших серверів" },"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);" diff --git a/apps/files_sharing/l10n/ur_PK.js b/apps/files_sharing/l10n/ur_PK.js index 2e9b145d789..ad802fe8ea3 100644 --- a/apps/files_sharing/l10n/ur_PK.js +++ b/apps/files_sharing/l10n/ur_PK.js @@ -2,6 +2,7 @@ OC.L10N.register( "files_sharing", { "Cancel" : "منسوخ کریں", + "Share" : "اشتراک", "Shared by" : "سے اشتراک شدہ", "Password" : "پاسورڈ", "Name" : "اسم", diff --git a/apps/files_sharing/l10n/ur_PK.json b/apps/files_sharing/l10n/ur_PK.json index b0ac6d244b8..5431e0a2fa5 100644 --- a/apps/files_sharing/l10n/ur_PK.json +++ b/apps/files_sharing/l10n/ur_PK.json @@ -1,5 +1,6 @@ { "translations": { "Cancel" : "منسوخ کریں", + "Share" : "اشتراک", "Shared by" : "سے اشتراک شدہ", "Password" : "پاسورڈ", "Name" : "اسم", diff --git a/apps/files_sharing/l10n/vi.js b/apps/files_sharing/l10n/vi.js index 3b73c2c9ec4..e3a4c83d58b 100644 --- a/apps/files_sharing/l10n/vi.js +++ b/apps/files_sharing/l10n/vi.js @@ -2,6 +2,7 @@ OC.L10N.register( "files_sharing", { "Cancel" : "Hủy", + "Share" : "Chia sẻ", "Shared by" : "Chia sẻ bởi", "Password" : "Mật khẩu", "Name" : "Tên", diff --git a/apps/files_sharing/l10n/vi.json b/apps/files_sharing/l10n/vi.json index 149509fa91e..e3c784e5b78 100644 --- a/apps/files_sharing/l10n/vi.json +++ b/apps/files_sharing/l10n/vi.json @@ -1,5 +1,6 @@ { "translations": { "Cancel" : "Hủy", + "Share" : "Chia sẻ", "Shared by" : "Chia sẻ bởi", "Password" : "Mật khẩu", "Name" : "Tên", diff --git a/apps/files_sharing/l10n/zh_CN.js b/apps/files_sharing/l10n/zh_CN.js index c97aa805ca7..64004e3b1ae 100644 --- a/apps/files_sharing/l10n/zh_CN.js +++ b/apps/files_sharing/l10n/zh_CN.js @@ -12,6 +12,7 @@ OC.L10N.register( "Cancel" : "取消", "Add remote share" : "添加远程分享", "Invalid ownCloud url" : "无效的 ownCloud 网址", + "Share" : "共享", "Shared by" : "共享人", "This share is password-protected" : "这是一个密码保护的共享", "The password is wrong. Try again." : "用户名或密码错误！请重试", diff --git a/apps/files_sharing/l10n/zh_CN.json b/apps/files_sharing/l10n/zh_CN.json index a06835a7f1f..4223da44404 100644 --- a/apps/files_sharing/l10n/zh_CN.json +++ b/apps/files_sharing/l10n/zh_CN.json @@ -10,6 +10,7 @@ "Cancel" : "取消", "Add remote share" : "添加远程分享", "Invalid ownCloud url" : "无效的 ownCloud 网址", + "Share" : "共享", "Shared by" : "共享人", "This share is password-protected" : "这是一个密码保护的共享", "The password is wrong. Try again." : "用户名或密码错误！请重试", diff --git a/apps/files_sharing/l10n/zh_HK.js b/apps/files_sharing/l10n/zh_HK.js index 02246228f3c..95bde13eda1 100644 --- a/apps/files_sharing/l10n/zh_HK.js +++ b/apps/files_sharing/l10n/zh_HK.js @@ -2,6 +2,7 @@ OC.L10N.register( "files_sharing", { "Cancel" : "取消", + "Share" : "分享", "Password" : "密碼", "Name" : "名稱", "Download" : "下載" diff --git a/apps/files_sharing/l10n/zh_HK.json b/apps/files_sharing/l10n/zh_HK.json index dedf9d2e9ee..6f18eaf373c 100644 --- a/apps/files_sharing/l10n/zh_HK.json +++ b/apps/files_sharing/l10n/zh_HK.json @@ -1,5 +1,6 @@ { "translations": { "Cancel" : "取消", + "Share" : "分享", "Password" : "密碼", "Name" : "名稱", "Download" : "下載" diff --git a/apps/files_sharing/l10n/zh_TW.js b/apps/files_sharing/l10n/zh_TW.js index d379da10ca9..6d6f73c64c9 100644 --- a/apps/files_sharing/l10n/zh_TW.js +++ b/apps/files_sharing/l10n/zh_TW.js @@ -12,6 +12,7 @@ OC.L10N.register( "Cancel" : "取消", "Add remote share" : "加入遠端分享", "Invalid ownCloud url" : "無效的 ownCloud URL", + "Share" : "分享", "Shared by" : "由...分享", "This share is password-protected" : "這個分享有密碼保護", "The password is wrong. Try again." : "請檢查您的密碼並再試一次", diff --git a/apps/files_sharing/l10n/zh_TW.json b/apps/files_sharing/l10n/zh_TW.json index a4fc1ae2ea2..d7518ef2578 100644 --- a/apps/files_sharing/l10n/zh_TW.json +++ b/apps/files_sharing/l10n/zh_TW.json @@ -10,6 +10,7 @@ "Cancel" : "取消", "Add remote share" : "加入遠端分享", "Invalid ownCloud url" : "無效的 ownCloud URL", + "Share" : "分享", "Shared by" : "由...分享", "This share is password-protected" : "這個分享有密碼保護", "The password is wrong. Try again." : "請檢查您的密碼並再試一次", diff --git a/apps/files_sharing/lib/activity.php b/apps/files_sharing/lib/activity.php index 23f548474d3..bfac91fd71a 100644 --- a/apps/files_sharing/lib/activity.php +++ b/apps/files_sharing/lib/activity.php @@ -68,11 +68,18 @@ class Activity implements \OCP\Activity\IExtension { * @return array|false */ public function getDefaultTypes($method) { - if ($method === 'stream') { - return array(self::TYPE_REMOTE_SHARE, self::TYPE_PUBLIC_LINKS); + switch ($method) { + case 'email': + $result = array(self::TYPE_REMOTE_SHARE); + break; + case 'stream': + $result = array(self::TYPE_REMOTE_SHARE, self::TYPE_PUBLIC_LINKS); + break; + default: + $result = false; } - return false; + return $result; } /** diff --git a/apps/files_sharing/lib/cache.php b/apps/files_sharing/lib/cache.php index 21f807f3533..e0737834812 100644 --- a/apps/files_sharing/lib/cache.php +++ b/apps/files_sharing/lib/cache.php @@ -45,7 +45,7 @@ class Shared_Cache extends Cache { * Get the source cache of a shared file or folder * * @param string $target Shared target file path - * @return \OC\Files\Cache\Cache + * @return \OC\Files\Cache\Cache|false */ private function getSourceCache($target) { if ($target === false || $target === $this->storage->getMountPoint()) { @@ -82,7 +82,7 @@ class Shared_Cache extends Cache { * get the stored metadata of a file or folder * * @param string|int $file - * @return array + * @return array|false */ public function get($file) { if (is_string($file)) { @@ -148,7 +148,7 @@ class Shared_Cache extends Cache { * get the metadata of all files stored in $folder * * @param string $folderId - * @return array + * @return array|false */ public function getFolderContentsById($folderId) { $cache = $this->getSourceCache(''); @@ -178,7 +178,7 @@ class Shared_Cache extends Cache { * @param string $file * @param array $data * - * @return int file id + * @return int|false file id */ public function put($file, array $data) { $file = ($file === false) ? '' : $file; diff --git a/apps/files_sharing/lib/controllers/sharecontroller.php b/apps/files_sharing/lib/controllers/sharecontroller.php index 69de717611c..34339154b5c 100644 --- a/apps/files_sharing/lib/controllers/sharecontroller.php +++ b/apps/files_sharing/lib/controllers/sharecontroller.php @@ -131,7 +131,7 @@ class ShareController extends Controller { * * @param string $token * @param string $path - * @return TemplateResponse + * @return TemplateResponse|RedirectResponse */ public function showShare($token, $path = '') { \OC_User::setIncognitoMode(true); @@ -142,7 +142,6 @@ class ShareController extends Controller { return new TemplateResponse('core', '404', array(), 'guest'); } - $linkItem = OCP\Share::getShareByToken($token, false); $shareOwner = $linkItem['uid_owner']; $originalSharePath = null; $rootLinkItem = OCP\Share::resolveReShare($linkItem); @@ -176,7 +175,9 @@ class ShareController extends Controller { $shareTmpl['server2serversharing'] = Helper::isOutgoingServer2serverShareEnabled(); $shareTmpl['protected'] = isset($linkItem['share_with']) ? 'true' : 'false'; $shareTmpl['dir'] = ''; - $shareTmpl['fileSize'] = \OCP\Util::humanFileSize(\OC\Files\Filesystem::filesize($originalSharePath)); + $nonHumanFileSize = \OC\Files\Filesystem::filesize($originalSharePath); + $shareTmpl['nonHumanFileSize'] = $nonHumanFileSize; + $shareTmpl['fileSize'] = \OCP\Util::humanFileSize($nonHumanFileSize); // Show file list if (Filesystem::is_dir($originalSharePath)) { @@ -202,6 +203,7 @@ class ShareController extends Controller { } $shareTmpl['downloadURL'] = $this->urlGenerator->linkToRouteAbsolute('files_sharing.sharecontroller.downloadShare', array('token' => $token)); + $shareTmpl['maxSizeAnimateGif'] = $this->config->getSystemValue('max_filesize_animated_gifs_public_sharing', 10); return new TemplateResponse($this->appName, 'public', $shareTmpl, 'base'); } diff --git a/apps/files_sharing/lib/external/cache.php b/apps/files_sharing/lib/external/cache.php index cd06bfb1272..2f5f7a59dbd 100644 --- a/apps/files_sharing/lib/external/cache.php +++ b/apps/files_sharing/lib/external/cache.php @@ -28,6 +28,9 @@ class Cache extends \OC\Files\Cache\Cache { public function get($file) { $result = parent::get($file); + if (!$result) { + return false; + } $result['displayname_owner'] = $this->remoteUser . '@' . $this->remote; if (!$file || $file === '') { $result['is_share_mount_point'] = true; diff --git a/apps/files_sharing/lib/external/manager.php b/apps/files_sharing/lib/external/manager.php index 665e47c0fe9..8985aeb3fce 100644 --- a/apps/files_sharing/lib/external/manager.php +++ b/apps/files_sharing/lib/external/manager.php @@ -14,6 +14,11 @@ class Manager { const STORAGE = '\OCA\Files_Sharing\External\Storage'; /** + * @var string + */ + private $uid; + + /** * @var \OCP\IDBConnection */ private $connection; @@ -29,11 +34,6 @@ class Manager { private $storageLoader; /** - * @var \OC\User\Session - */ - private $userSession; - - /** * @var \OC\HTTPHelper */ private $httpHelper; @@ -41,21 +41,35 @@ class Manager { /** * @param \OCP\IDBConnection $connection * @param \OC\Files\Mount\Manager $mountManager - * @param \OC\User\Session $userSession * @param \OC\Files\Storage\StorageFactory $storageLoader + * @param \OC\HTTPHelper $httpHelper + * @param string $uid */ public function __construct(\OCP\IDBConnection $connection, \OC\Files\Mount\Manager $mountManager, - \OC\Files\Storage\StorageFactory $storageLoader, \OC\User\Session $userSession, \OC\HTTPHelper $httpHelper) { + \OC\Files\Storage\StorageFactory $storageLoader, \OC\HTTPHelper $httpHelper, $uid) { $this->connection = $connection; $this->mountManager = $mountManager; - $this->userSession = $userSession; $this->storageLoader = $storageLoader; $this->httpHelper = $httpHelper; + $this->uid = $uid; } + /** + * add new server-to-server share + * + * @param string $remote + * @param string $token + * @param string $password + * @param string $name + * @param string $owner + * @param boolean $accepted + * @param string $user + * @param int $remoteId + * @return mixed + */ public function addShare($remote, $token, $password, $name, $owner, $accepted=false, $user = null, $remoteId = -1) { - $user = $user ? $user: $this->userSession->getUser()->getUID(); + $user = $user ? $user : $this->uid; $accepted = $accepted ? 1 : 0; $mountPoint = Filesystem::normalizePath('/' . $name); @@ -86,14 +100,13 @@ class Manager { return false; } - $user = $this->userSession->getUser(); - if ($user) { + if (!is_null($this->uid)) { $query = $this->connection->prepare(' SELECT `remote`, `share_token`, `password`, `mountpoint`, `owner` FROM `*PREFIX*share_external` WHERE `user` = ? AND `accepted` = ? '); - $query->execute(array($user->getUID(), 1)); + $query->execute(array($this->uid, 1)); while ($row = $query->fetch()) { $row['manager'] = $this; @@ -114,7 +127,7 @@ class Manager { SELECT `remote`, `share_token` FROM `*PREFIX*share_external` WHERE `id` = ? AND `user` = ?'); - $result = $getShare->execute(array($id, $this->userSession->getUser()->getUID())); + $result = $getShare->execute(array($id, $this->uid)); return $result ? $getShare->fetch() : false; } @@ -133,7 +146,7 @@ class Manager { UPDATE `*PREFIX*share_external` SET `accepted` = ? WHERE `id` = ? AND `user` = ?'); - $acceptShare->execute(array(1, $id, $this->userSession->getUser()->getUID())); + $acceptShare->execute(array(1, $id, $this->uid)); $this->sendFeedbackToRemote($share['remote'], $share['share_token'], $id, 'accept'); } } @@ -150,7 +163,7 @@ class Manager { if ($share) { $removeShare = $this->connection->prepare(' DELETE FROM `*PREFIX*share_external` WHERE `id` = ? AND `user` = ?'); - $removeShare->execute(array($id, $this->userSession->getUser()->getUID())); + $removeShare->execute(array($id, $this->uid)); $this->sendFeedbackToRemote($share['remote'], $share['share_token'], $id, 'decline'); } } @@ -175,19 +188,31 @@ class Manager { return ($result['success'] && $status['ocs']['meta']['statuscode'] === 100); } - public static function setup() { + /** + * setup the server-to-server mounts + * + * @param array $params + */ + public static function setup(array $params) { $externalManager = new \OCA\Files_Sharing\External\Manager( \OC::$server->getDatabaseConnection(), \OC\Files\Filesystem::getMountManager(), \OC\Files\Filesystem::getLoader(), - \OC::$server->getUserSession(), - \OC::$server->getHTTPHelper() + \OC::$server->getHTTPHelper(), + $params['user'] ); + $externalManager->setupMounts(); } + /** + * remove '/user/files' from the path and trailing slashes + * + * @param string $path + * @return string + */ protected function stripPath($path) { - $prefix = '/' . $this->userSession->getUser()->getUID() . '/files'; + $prefix = '/' . $this->uid . '/files'; return rtrim(substr($path, strlen($prefix)), '/'); } @@ -196,11 +221,10 @@ class Manager { * @return Mount */ protected function mountShare($data) { - $user = $this->userSession->getUser(); $data['manager'] = $this; - $mountPoint = '/' . $user->getUID() . '/files' . $data['mountpoint']; + $mountPoint = '/' . $this->uid . '/files' . $data['mountpoint']; $data['mountpoint'] = $mountPoint; - $data['certificateManager'] = \OC::$server->getCertificateManager($user); + $data['certificateManager'] = \OC::$server->getCertificateManager($this->uid); $mount = new Mount(self::STORAGE, $mountPoint, $data, $this, $this->storageLoader); $this->mountManager->addMount($mount); return $mount; @@ -219,7 +243,6 @@ class Manager { * @return bool */ public function setMountPoint($source, $target) { - $user = $this->userSession->getUser(); $source = $this->stripPath($source); $target = $this->stripPath($target); $sourceHash = md5($source); @@ -231,13 +254,12 @@ class Manager { WHERE `mountpoint_hash` = ? AND `user` = ? '); - $result = (bool)$query->execute(array($target, $targetHash, $sourceHash, $user->getUID())); + $result = (bool)$query->execute(array($target, $targetHash, $sourceHash, $this->uid)); return $result; } public function removeShare($mountPoint) { - $user = $this->userSession->getUser(); $mountPoint = $this->stripPath($mountPoint); $hash = md5($mountPoint); @@ -245,7 +267,7 @@ class Manager { SELECT `remote`, `share_token`, `remote_id` FROM `*PREFIX*share_external` WHERE `mountpoint_hash` = ? AND `user` = ?'); - $result = $getShare->execute(array($hash, $user->getUID())); + $result = $getShare->execute(array($hash, $this->uid)); if ($result) { $share = $getShare->fetch(); @@ -257,7 +279,34 @@ class Manager { WHERE `mountpoint_hash` = ? AND `user` = ? '); - return (bool)$query->execute(array($hash, $user->getUID())); + return (bool)$query->execute(array($hash, $this->uid)); + } + + /** + * remove all shares for user $uid if the user was deleted + * + * @param string $uid + * @return bool + */ + public function removeUserShares($uid) { + $getShare = $this->connection->prepare(' + SELECT `remote`, `share_token`, `remote_id` + FROM `*PREFIX*share_external` + WHERE `user` = ?'); + $result = $getShare->execute(array($uid)); + + if ($result) { + $shares = $getShare->fetchAll(); + foreach($shares as $share) { + $this->sendFeedbackToRemote($share['remote'], $share['share_token'], $share['remote_id'], 'decline'); + } + } + + $query = $this->connection->prepare(' + DELETE FROM `*PREFIX*share_external` + WHERE `user` = ? + '); + return (bool)$query->execute(array($uid)); } /** @@ -267,7 +316,7 @@ class Manager { */ public function getOpenShares() { $openShares = $this->connection->prepare('SELECT * FROM `*PREFIX*share_external` WHERE `accepted` = ? AND `user` = ?'); - $result = $openShares->execute(array(0, $this->userSession->getUser()->getUID())); + $result = $openShares->execute(array(0, $this->uid)); return $result ? $openShares->fetchAll() : array(); diff --git a/apps/files_sharing/lib/external/scanner.php b/apps/files_sharing/lib/external/scanner.php index 4e61e0c4ccb..b45a8942e96 100644 --- a/apps/files_sharing/lib/external/scanner.php +++ b/apps/files_sharing/lib/external/scanner.php @@ -8,6 +8,11 @@ namespace OCA\Files_Sharing\External; +use OC\ForbiddenException; +use OCP\Files\NotFoundException; +use OCP\Files\StorageInvalidException; +use OCP\Files\StorageNotAvailableException; + class Scanner extends \OC\Files\Cache\Scanner { /** * @var \OCA\Files_Sharing\External\Storage @@ -18,12 +23,56 @@ class Scanner extends \OC\Files\Cache\Scanner { $this->scanAll(); } + /** + * Scan a single file and store it in the cache. + * If an exception happened while accessing the external storage, + * the storage will be checked for availability and removed + * if it is not available any more. + * + * @param string $file file to scan + * @param int $reuseExisting + * @return array an array of metadata of the scanned file + */ + public function scanFile($file, $reuseExisting = 0) { + try { + return parent::scanFile($file, $reuseExisting); + } catch (ForbiddenException $e) { + $this->storage->checkStorageAvailability(); + } catch (NotFoundException $e) { + // if the storage isn't found, the call to + // checkStorageAvailable() will verify it and remove it + // if appropriate + $this->storage->checkStorageAvailability(); + } catch (StorageInvalidException $e) { + $this->storage->checkStorageAvailability(); + } catch (StorageNotAvailableException $e) { + $this->storage->checkStorageAvailability(); + } + } + + /** + * Checks the remote share for changes. + * If changes are available, scan them and update + * the cache. + */ public function scanAll() { - $data = $this->storage->getShareInfo(); + try { + $data = $this->storage->getShareInfo(); + } catch (\Exception $e) { + $this->storage->checkStorageAvailability(); + throw new \Exception( + 'Error while scanning remote share: "' . + $this->storage->getRemote() . '" ' . + $e->getMessage() + ); + } if ($data['status'] === 'success') { $this->addResult($data['data'], ''); } else { - throw new \Exception('Error while scanning remote share'); + throw new \Exception( + 'Error while scanning remote share: "' . + $this->storage->getRemote() . '"' + ); } } diff --git a/apps/files_sharing/lib/external/storage.php b/apps/files_sharing/lib/external/storage.php index 306a7b8db8a..648376e8cb5 100644 --- a/apps/files_sharing/lib/external/storage.php +++ b/apps/files_sharing/lib/external/storage.php @@ -103,7 +103,7 @@ class Storage extends DAV implements ISharedStorage { } public function getCache($path = '', $storage = null) { - if (!$storage) { + if (is_null($this->cache)) { $this->cache = new Cache($this, $this->remote, $this->remoteUser); } return $this->cache; @@ -142,27 +142,47 @@ class Storage extends DAV implements ISharedStorage { $this->updateChecked = true; try { return parent::hasUpdated('', $time); + } catch (StorageInvalidException $e) { + // check if it needs to be removed + $this->checkStorageAvailability(); + throw $e; } catch (StorageNotAvailableException $e) { - // see if we can find out why the share is unavailable\ - try { - $this->getShareInfo(); - } catch (NotFoundException $shareException) { - // a 404 can either mean that the share no longer exists or there is no ownCloud on the remote - if ($this->testRemote()) { - // valid ownCloud instance means that the public share no longer exists - // since this is permanent (re-sharing the file will create a new token) - // we remove the invalid storage - $this->manager->removeShare($this->mountPoint); - $this->manager->getMountManager()->removeMount($this->mountPoint); - throw new StorageInvalidException(); - } else { - // ownCloud instance is gone, likely to be a temporary server configuration error - throw $e; - } - } catch (\Exception $shareException) { - // todo, maybe handle 403 better and ask the user for a new password + // check if it needs to be removed or just temp unavailable + $this->checkStorageAvailability(); + throw $e; + } + } + + /** + * Check whether this storage is permanently or temporarily + * unavailable + * + * @throws \OCP\Files\StorageNotAvailableException + * @throws \OCP\Files\StorageInvalidException + */ + public function checkStorageAvailability() { + // see if we can find out why the share is unavailable + try { + $this->getShareInfo(); + } catch (NotFoundException $e) { + // a 404 can either mean that the share no longer exists or there is no ownCloud on the remote + if ($this->testRemote()) { + // valid ownCloud instance means that the public share no longer exists + // since this is permanent (re-sharing the file will create a new token) + // we remove the invalid storage + $this->manager->removeShare($this->mountPoint); + $this->manager->getMountManager()->removeMount($this->mountPoint); + throw new StorageInvalidException(); + } else { + // ownCloud instance is gone, likely to be a temporary server configuration error throw $e; } + } catch (ForbiddenException $e) { + // auth error, remove share for now (provide a dialog in the future) + $this->manager->removeShare($this->mountPoint); + $this->manager->getMountManager()->removeMount($this->mountPoint); + throw new StorageInvalidException(); + } catch (\Exception $e) { throw $e; } } @@ -194,7 +214,7 @@ class Storage extends DAV implements ISharedStorage { $remote = $this->getRemote(); $token = $this->getToken(); $password = $this->getPassword(); - $url = $remote . '/index.php/apps/files_sharing/shareinfo?t=' . $token; + $url = rtrim($remote, '/') . '/index.php/apps/files_sharing/shareinfo?t=' . $token; $ch = curl_init(); diff --git a/apps/files_sharing/lib/helper.php b/apps/files_sharing/lib/helper.php index 001d0387fa4..8fabd8d42d7 100644 --- a/apps/files_sharing/lib/helper.php +++ b/apps/files_sharing/lib/helper.php @@ -16,6 +16,8 @@ class Helper { \OCP\Util::connectHook('OCP\Share', 'post_shared', '\OC\Files\Cache\Shared_Updater', 'postShareHook'); \OCP\Util::connectHook('OCP\Share', 'post_unshare', '\OC\Files\Cache\Shared_Updater', 'postUnshareHook'); \OCP\Util::connectHook('OCP\Share', 'post_unshareFromSelf', '\OC\Files\Cache\Shared_Updater', 'postUnshareFromSelfHook'); + + \OCP\Util::connectHook('OC_User', 'post_deleteUser', '\OCA\Files_Sharing\Hooks', 'deleteUser'); } /** diff --git a/apps/files_sharing/lib/hooks.php b/apps/files_sharing/lib/hooks.php new file mode 100644 index 00000000000..10e16be4a91 --- /dev/null +++ b/apps/files_sharing/lib/hooks.php @@ -0,0 +1,39 @@ +<?php + +/** + * ownCloud + * + * @copyright (C) 2015 ownCloud, Inc. + * + * @author Bjoern Schiessle <schiessle@owncloud.com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE + * 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 OCA\Files_Sharing; + +class Hooks { + + public static function deleteUser($params) { + $manager = new External\Manager( + \OC::$server->getDatabaseConnection(), + \OC\Files\Filesystem::getMountManager(), + \OC\Files\Filesystem::getLoader(), + \OC::$server->getHTTPHelper(), + $params['uid']); + + $manager->removeUserShares($params['uid']); + } + +} diff --git a/apps/files_sharing/lib/middleware/sharingcheckmiddleware.php b/apps/files_sharing/lib/middleware/sharingcheckmiddleware.php index af79cd9e94a..3508407f2a0 100644 --- a/apps/files_sharing/lib/middleware/sharingcheckmiddleware.php +++ b/apps/files_sharing/lib/middleware/sharingcheckmiddleware.php @@ -10,10 +10,10 @@ namespace OCA\Files_Sharing\Middleware; -use OCP\AppFramework\IApi; -use \OCP\AppFramework\Middleware; +use OCP\App\IAppManager; +use OCP\AppFramework\Middleware; use OCP\AppFramework\Http\TemplateResponse; -use OCP\IAppConfig; +use OCP\IConfig; /** * Checks whether the "sharing check" is enabled @@ -24,22 +24,22 @@ class SharingCheckMiddleware extends Middleware { /** @var string */ protected $appName; - /** @var IAppConfig */ - protected $appConfig; - /** @var IApi */ - protected $api; + /** @var IConfig */ + protected $config; + /** @var IAppManager */ + protected $appManager; /*** * @param string $appName - * @param IAppConfig $appConfig - * @param IApi $api + * @param IConfig $config + * @param IAppManager $appManager */ public function __construct($appName, - IAppConfig $appConfig, - IApi $api) { + IConfig $config, + IAppManager $appManager) { $this->appName = $appName; - $this->appConfig = $appConfig; - $this->api = $api; + $this->config = $config; + $this->appManager = $appManager; } /** @@ -69,12 +69,12 @@ class SharingCheckMiddleware extends Middleware { private function isSharingEnabled() { // FIXME: This check is done here since the route is globally defined and not inside the files_sharing app // Check whether the sharing application is enabled - if(!$this->api->isAppEnabled($this->appName)) { + if(!$this->appManager->isEnabledForUser($this->appName)) { return false; } // Check whether public sharing is enabled - if($this->appConfig->getValue('core', 'shareapi_allow_links', 'yes') !== 'yes') { + if($this->config->getAppValue('core', 'shareapi_allow_links', 'yes') !== 'yes') { return false; } diff --git a/apps/files_sharing/lib/migration.php b/apps/files_sharing/lib/migration.php new file mode 100644 index 00000000000..1a3bfecffb0 --- /dev/null +++ b/apps/files_sharing/lib/migration.php @@ -0,0 +1,42 @@ +<?php + /** + * ownCloud - migration to new version of the files sharing app + * + * @copyright (C) 2014 ownCloud, Inc. + * + * @author Bjoern Schiessle <schiessle@owncloud.com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE + * 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 OCA\Files_Sharing; + +class Migration { + + + /** + * set accepted to 1 for all external shares. At this point in time we only + * have shares from the first version of server-to-server sharing so all should + * be accepted + */ + public function addAcceptRow() { + $statement = 'UPDATE `*PREFIX*share_external` SET `accepted` = 1'; + $connection = \OC::$server->getDatabaseConnection(); + $query = $connection->prepare($statement); + $query->execute(); + } + + +} diff --git a/apps/files_sharing/lib/scanner.php b/apps/files_sharing/lib/scanner.php new file mode 100644 index 00000000000..48c1ae9e084 --- /dev/null +++ b/apps/files_sharing/lib/scanner.php @@ -0,0 +1,45 @@ +<?php +/** + * ownCloud + * + * @author Vincent Petry + * @copyright 2015 Vincent Petry <pvince81@owncloud.com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE + * 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\Files\Cache; + +/** + * Scanner for SharedStorage + */ +class SharedScanner extends Scanner { + + /** + * Returns metadata from the shared storage, but + * with permissions from the source storage. + * + * @param string $path path of the file for which to retrieve metadata + * + * @return array an array of metadata of the file + */ + public function getData($path){ + $data = parent::getData($path); + $sourcePath = $this->storage->getSourcePath($path); + list($sourceStorage, $internalPath) = \OC\Files\Filesystem::resolvePath($sourcePath); + $data['permissions'] = $sourceStorage->getPermissions($internalPath); + return $data; + } +} + diff --git a/apps/files_sharing/lib/share/file.php b/apps/files_sharing/lib/share/file.php index 1d7eb77f7cf..dae859781e2 100644 --- a/apps/files_sharing/lib/share/file.php +++ b/apps/files_sharing/lib/share/file.php @@ -96,12 +96,13 @@ class OC_Share_Backend_File implements OCP\Share_Backend_File_Dependent { public function formatItems($items, $format, $parameters = null) { if ($format == self::FORMAT_SHARED_STORAGE) { // Only 1 item should come through for this format call + $item = array_shift($items); return array( - 'parent' => $items[key($items)]['parent'], - 'path' => $items[key($items)]['path'], - 'storage' => $items[key($items)]['storage'], - 'permissions' => $items[key($items)]['permissions'], - 'uid_owner' => $items[key($items)]['uid_owner'], + 'parent' => $item['parent'], + 'path' => $item['path'], + 'storage' => $item['storage'], + 'permissions' => $item['permissions'], + 'uid_owner' => $item['uid_owner'], ); } else if ($format == self::FORMAT_GET_FOLDER_CONTENTS) { $files = array(); diff --git a/apps/files_sharing/lib/sharedstorage.php b/apps/files_sharing/lib/sharedstorage.php index 1ac57053e25..ccfbebddb29 100644 --- a/apps/files_sharing/lib/sharedstorage.php +++ b/apps/files_sharing/lib/sharedstorage.php @@ -80,7 +80,7 @@ class Shared extends \OC\Files\Storage\Common implements ISharedStorage { /** * Get the source file path for a shared file * @param string $target Shared target file path - * @return string source file path or false if not found + * @return string|false source file path or false if not found */ public function getSourcePath($target) { $source = $this->getFile($target); @@ -501,7 +501,7 @@ class Shared extends \OC\Files\Storage\Common implements ISharedStorage { if (!$storage) { $storage = $this; } - return new \OC\Files\Cache\Scanner($storage); + return new \OC\Files\Cache\SharedScanner($storage); } public function getWatcher($path = '', $storage = null) { diff --git a/apps/files_sharing/templates/public.php b/apps/files_sharing/templates/public.php index 0384d9a60aa..4ec4d264b31 100644 --- a/apps/files_sharing/templates/public.php +++ b/apps/files_sharing/templates/public.php @@ -40,6 +40,8 @@ $previewSupported = OC\Preview::isMimeSupported($_['mimetype']) ? 'true' : 'fals <input type="hidden" name="mimetype" value="<?php p($_['mimetype']) ?>" id="mimetype"> <input type="hidden" name="previewSupported" value="<?php p($previewSupported); ?>" id="previewSupported"> <input type="hidden" name="mimetypeIcon" value="<?php p(OC_Helper::mimetypeIcon($_['mimetype'])); ?>" id="mimetypeIcon"> +<input type="hidden" name="filesize" value="<?php p($_['nonHumanFileSize']); ?>" id="filesize"> +<input type="hidden" name="maxSizeAnimateGif" value="<?php p($_['maxSizeAnimateGif']); ?>" id="maxSizeAnimateGif"> <header><div id="header" class="<?php p((isset($_['folder']) ? 'share-folder' : 'share-file')) ?>"> diff --git a/apps/files_sharing/templates/settings-admin.php b/apps/files_sharing/templates/settings-admin.php index c71ef31b21c..9fac97faf55 100644 --- a/apps/files_sharing/templates/settings-admin.php +++ b/apps/files_sharing/templates/settings-admin.php @@ -4,7 +4,7 @@ ?> <div class="section" id="fileSharingSettings" > - <h2><?php p($l->t('Server-to-Server Sharing'));?></h2> + <h2><?php p($l->t('Federated Cloud Sharing'));?></h2> <input type="checkbox" name="outgoing_server2server_share_enabled" id="outgoingServer2serverShareEnabled" value="1" <?php if ($_['outgoingServer2serverShareEnabled']) print_unescaped('checked="checked"'); ?> /> diff --git a/apps/files_sharing/tests/activity.php b/apps/files_sharing/tests/activity.php new file mode 100644 index 00000000000..04930e3bb76 --- /dev/null +++ b/apps/files_sharing/tests/activity.php @@ -0,0 +1,65 @@ +<?php + +/** + * ownCloud + * + * @copyright (C) 2015 ownCloud, Inc. + * + * @author Bjoern Schiessle <schiessle@owncloud.com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE + * 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 OCA\Files_sharing\Tests; +use OCA\Files_sharing\Tests\TestCase; + + +class Activity extends \OCA\Files_Sharing\Tests\TestCase{ + + /** + * @var \OCA\Files_Sharing\Activity + */ + private $activity; + + protected function setUp() { + parent::setUp(); + $this->activity = new \OCA\Files_Sharing\Activity(); + } + + /** + * @dataProvider dataTestGetDefaultType + */ + public function testGetDefaultTypes($method, $expectedResult) { + $result = $this->activity->getDefaultTypes($method); + + if (is_array($expectedResult)) { + $this->assertSame(count($expectedResult), count($result)); + foreach ($expectedResult as $key => $expected) { + $this->assertSame($expected, $result[$key]); + } + } else { + $this->assertSame($expectedResult, $result); + } + + } + + public function dataTestGetDefaultType() { + return array( + array('email', array(\OCA\Files_Sharing\Activity::TYPE_REMOTE_SHARE)), + array('stream', array(\OCA\Files_Sharing\Activity::TYPE_REMOTE_SHARE, \OCA\Files_Sharing\Activity::TYPE_PUBLIC_LINKS)), + array('foo', false) + ); + } + +} diff --git a/apps/files_sharing/tests/controller/sharecontroller.php b/apps/files_sharing/tests/controller/sharecontroller.php index f13e5b2e497..931cd506d43 100644 --- a/apps/files_sharing/tests/controller/sharecontroller.php +++ b/apps/files_sharing/tests/controller/sharecontroller.php @@ -155,7 +155,9 @@ class ShareControllerTest extends \PHPUnit_Framework_TestCase { 'protected' => 'true', 'dir' => '', 'downloadURL' => null, - 'fileSize' => '33 B' + 'fileSize' => '33 B', + 'nonHumanFileSize' => 33, + 'maxSizeAnimateGif' => 10, ); $expectedResponse = new TemplateResponse($this->container['AppName'], 'public', $sharedTmplParams, 'base'); $this->assertEquals($expectedResponse, $response); diff --git a/apps/files_sharing/tests/external/cache.php b/apps/files_sharing/tests/external/cache.php new file mode 100644 index 00000000000..33f59cf70f1 --- /dev/null +++ b/apps/files_sharing/tests/external/cache.php @@ -0,0 +1,114 @@ +<?php +namespace OCA\Files_sharing\Tests\External; + +use OCA\Files_sharing\Tests\TestCase; + +/** + * ownCloud + * + * @author Vincent Petry + * @copyright 2015 Vincent Petry <pvince81@owncloud.com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE + * 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/>. + * + */ +class Cache extends TestCase { + + /** + * @var \OC\Files\Storage\Storage + **/ + private $storage; + + /** + * @var \OCA\Files_Sharing\External\Cache + */ + private $cache; + + /** + * @var string + */ + private $remoteUser; + + protected function setUp() { + parent::setUp(); + + $this->remoteUser = $this->getUniqueID('remoteuser'); + + $this->storage = $this->getMockBuilder('\OCA\Files_Sharing\External\Storage') + ->disableOriginalConstructor() + ->getMock(); + $this->storage + ->expects($this->any()) + ->method('getId') + ->will($this->returnValue('dummystorage::')); + $this->cache = new \OCA\Files_Sharing\External\Cache( + $this->storage, + 'http://example.com/owncloud', + $this->remoteUser + ); + $this->cache->put( + 'test.txt', + array( + 'mimetype' => 'text/plain', + 'size' => 5, + 'mtime' => 123, + ) + ); + } + + protected function tearDown() { + $this->cache->clear(); + parent::tearDown(); + } + + public function testGetInjectsOwnerDisplayName() { + $info = $this->cache->get('test.txt'); + $this->assertEquals( + $this->remoteUser . '@example.com/owncloud', + $info['displayname_owner'] + ); + } + + public function testGetReturnsFalseIfNotFound() { + $info = $this->cache->get('unexisting-entry.txt'); + $this->assertFalse($info); + } + + public function testGetFolderPopulatesOwner() { + $dirId = $this->cache->put( + 'subdir', + array( + 'mimetype' => 'httpd/unix-directory', + 'size' => 5, + 'mtime' => 123, + ) + ); + $this->cache->put( + 'subdir/contents.txt', + array( + 'mimetype' => 'text/plain', + 'size' => 5, + 'mtime' => 123, + ) + ); + + $results = $this->cache->getFolderContentsById($dirId); + $this->assertEquals(1, count($results)); + $this->assertEquals( + $this->remoteUser . '@example.com/owncloud', + $results[0]['displayname_owner'] + ); + } + +} diff --git a/apps/files_sharing/tests/js/externalSpec.js b/apps/files_sharing/tests/js/externalSpec.js new file mode 100644 index 00000000000..255f0fc3a48 --- /dev/null +++ b/apps/files_sharing/tests/js/externalSpec.js @@ -0,0 +1,241 @@ +/* + * Copyright (c) 2015 Vincent Petry <pvince81@owncloud.com> + * + * This file is licensed under the Affero General Public License version 3 + * or later. + * + * See the COPYING-README file. + * + */ + +describe('OCA.Sharing external tests', function() { + var plugin; + var urlQueryStub; + var promptDialogStub; + var confirmDialogStub; + + function dummyShowDialog() { + var deferred = $.Deferred(); + deferred.resolve(); + return deferred.promise(); + } + + beforeEach(function() { + plugin = OCA.Sharing.ExternalShareDialogPlugin; + urlQueryStub = sinon.stub(OC.Util.History, 'parseUrlQuery'); + + confirmDialogStub = sinon.stub(OC.dialogs, 'confirm', dummyShowDialog); + promptDialogStub = sinon.stub(OC.dialogs, 'prompt', dummyShowDialog); + + plugin.filesApp = { + fileList: { + reload: sinon.stub() + } + }; + }); + afterEach(function() { + urlQueryStub.restore(); + confirmDialogStub.restore(); + promptDialogStub.restore(); + plugin = null; + }); + describe('confirmation dialog from URL', function() { + var testShare; + + /** + * Checks that the server call's query matches what is + * expected. + * + * @param {Object} expectedQuery expected query params + */ + function checkRequest(expectedQuery) { + var request = fakeServer.requests[0]; + var query = OC.parseQueryString(request.requestBody); + expect(request.method).toEqual('POST'); + expect(query).toEqual(expectedQuery); + + request.respond( + 200, + {'Content-Type': 'application/json'}, + JSON.stringify({status: 'success'}) + ); + expect(plugin.filesApp.fileList.reload.calledOnce).toEqual(true); + } + + beforeEach(function() { + testShare = { + remote: 'http://example.com/owncloud', + token: 'abcdefg', + owner: 'theowner', + name: 'the share name' + }; + }); + it('does nothing when no share was passed in URL', function() { + urlQueryStub.returns({}); + plugin.processIncomingShareFromUrl(); + expect(promptDialogStub.notCalled).toEqual(true); + expect(confirmDialogStub.notCalled).toEqual(true); + expect(fakeServer.requests.length).toEqual(0); + }); + it('sends share info to server on confirm', function() { + urlQueryStub.returns(testShare); + plugin.processIncomingShareFromUrl(); + expect(promptDialogStub.notCalled).toEqual(true); + expect(confirmDialogStub.calledOnce).toEqual(true); + confirmDialogStub.getCall(0).args[2](true); + expect(fakeServer.requests.length).toEqual(1); + checkRequest({ + remote: 'http://example.com/owncloud', + token: 'abcdefg', + owner: 'theowner', + name: 'the share name', + password: '' + }); + }); + it('sends share info with password to server on confirm', function() { + testShare = _.extend(testShare, {protected: 1}); + urlQueryStub.returns(testShare); + plugin.processIncomingShareFromUrl(); + expect(promptDialogStub.calledOnce).toEqual(true); + expect(confirmDialogStub.notCalled).toEqual(true); + promptDialogStub.getCall(0).args[2](true, 'thepassword'); + expect(fakeServer.requests.length).toEqual(1); + checkRequest({ + remote: 'http://example.com/owncloud', + token: 'abcdefg', + owner: 'theowner', + name: 'the share name', + password: 'thepassword' + }); + }); + it('does not send share info on cancel', function() { + urlQueryStub.returns(testShare); + plugin.processIncomingShareFromUrl(); + expect(promptDialogStub.notCalled).toEqual(true); + expect(confirmDialogStub.calledOnce).toEqual(true); + confirmDialogStub.getCall(0).args[2](false); + expect(fakeServer.requests.length).toEqual(0); + }); + }); + describe('show dialog for each share to confirm', function() { + var testShare; + + /** + * Call processSharesToConfirm() and make the fake server + * return the passed response. + * + * @param {Array} response list of shares to process + */ + function processShares(response) { + plugin.processSharesToConfirm(); + + expect(fakeServer.requests.length).toEqual(1); + + var req = fakeServer.requests[0]; + expect(req.method).toEqual('GET'); + expect(req.url).toEqual(OC.webroot + '/index.php/apps/files_sharing/api/externalShares'); + + req.respond( + 200, + {'Content-Type': 'application/json'}, + JSON.stringify(response) + ); + } + + beforeEach(function() { + testShare = { + id: 123, + remote: 'http://example.com/owncloud', + token: 'abcdefg', + owner: 'theowner', + name: 'the share name' + }; + }); + + it('does not show any dialog if no shares to confirm', function() { + processShares([]); + expect(confirmDialogStub.notCalled).toEqual(true); + expect(promptDialogStub.notCalled).toEqual(true); + }); + it('sends accept info to server on confirm', function() { + processShares([testShare]); + + expect(promptDialogStub.notCalled).toEqual(true); + expect(confirmDialogStub.calledOnce).toEqual(true); + + confirmDialogStub.getCall(0).args[2](true); + + expect(fakeServer.requests.length).toEqual(2); + + var request = fakeServer.requests[1]; + var query = OC.parseQueryString(request.requestBody); + expect(request.method).toEqual('POST'); + expect(query).toEqual({id: '123'}); + expect(request.url).toEqual( + OC.webroot + '/index.php/apps/files_sharing/api/externalShares' + ); + + expect(plugin.filesApp.fileList.reload.notCalled).toEqual(true); + request.respond( + 200, + {'Content-Type': 'application/json'}, + JSON.stringify({status: 'success'}) + ); + expect(plugin.filesApp.fileList.reload.calledOnce).toEqual(true); + }); + it('sends delete info to server on cancel', function() { + processShares([testShare]); + + expect(promptDialogStub.notCalled).toEqual(true); + expect(confirmDialogStub.calledOnce).toEqual(true); + + confirmDialogStub.getCall(0).args[2](false); + + expect(fakeServer.requests.length).toEqual(2); + + var request = fakeServer.requests[1]; + expect(request.method).toEqual('DELETE'); + expect(request.url).toEqual( + OC.webroot + '/index.php/apps/files_sharing/api/externalShares/123' + ); + + expect(plugin.filesApp.fileList.reload.notCalled).toEqual(true); + request.respond( + 200, + {'Content-Type': 'application/json'}, + JSON.stringify({status: 'success'}) + ); + expect(plugin.filesApp.fileList.reload.notCalled).toEqual(true); + }); + xit('shows another dialog when multiple shares need to be accepted', function() { + // TODO: enable this test when fixing multiple dialogs issue / confirm loop + var testShare2 = _.extend({}, testShare); + testShare2.id = 256; + processShares([testShare, testShare2]); + + // confirm first one + expect(confirmDialogStub.calledOnce).toEqual(true); + confirmDialogStub.getCall(0).args[2](true); + + // next dialog not shown yet + expect(confirmDialogStub.calledOnce); + + // respond to the first accept request + fakeServer.requests[1].respond( + 200, + {'Content-Type': 'application/json'}, + JSON.stringify({status: 'success'}) + ); + + // don't reload yet, there are other shares to confirm + expect(plugin.filesApp.fileList.reload.notCalled).toEqual(true); + + // cancel second share + expect(confirmDialogStub.calledTwice).toEqual(true); + confirmDialogStub.getCall(1).args[2](true); + + // reload only called at the very end + expect(plugin.filesApp.fileList.reload.calledOnce).toEqual(true); + }); + }); +}); diff --git a/apps/files_sharing/tests/js/shareSpec.js b/apps/files_sharing/tests/js/shareSpec.js index e5b5de314d7..1b1e363b792 100644 --- a/apps/files_sharing/tests/js/shareSpec.js +++ b/apps/files_sharing/tests/js/shareSpec.js @@ -27,7 +27,7 @@ describe('OCA.Sharing.Util tests', function() { $('#testArea').append($content); // dummy file list var $div = $( - '<div>' + + '<div id="listContainer">' + '<table id="filestable">' + '<thead></thead>' + '<tbody id="fileList"></tbody>' + @@ -450,5 +450,29 @@ describe('OCA.Sharing.Util tests', function() { .toEqual('User four, User one, User three, User two, +6'); }); }); + describe('Excluded lists', function() { + function createListThenAttach(listId) { + var fileActions = new OCA.Files.FileActions(); + fileList.destroy(); + fileList = new OCA.Files.FileList( + $('#listContainer'), { + id: listId, + fileActions: fileActions + } + ); + OCA.Sharing.Util.attach(fileList); + fileList.setFiles(testFiles); + return fileList; + } + + it('does not attach to trashbin or public file lists', function() { + createListThenAttach('trashbin'); + expect($('.action-share').length).toEqual(0); + expect($('[data-share-recipient]').length).toEqual(0); + createListThenAttach('files.public'); + expect($('.action-share').length).toEqual(0); + expect($('[data-share-recipient]').length).toEqual(0); + }); + }); }); diff --git a/apps/files_sharing/tests/middleware/sharingcheckmiddleware.php b/apps/files_sharing/tests/middleware/sharingcheckmiddleware.php index 90c9a7bba10..466904889af 100644 --- a/apps/files_sharing/tests/middleware/sharingcheckmiddleware.php +++ b/apps/files_sharing/tests/middleware/sharingcheckmiddleware.php @@ -14,34 +14,34 @@ namespace OCA\Files_Sharing\Middleware; /** * @package OCA\Files_Sharing\Middleware\SharingCheckMiddleware */ -class SharingCheckMiddlewareTest extends \PHPUnit_Framework_TestCase { +class SharingCheckMiddlewareTest extends \Test\TestCase { - /** @var \OCP\IAppConfig */ - private $appConfig; - /** @var \OCP\AppFramework\IApi */ - private $api; + /** @var \OCP\IConfig */ + private $config; + /** @var \OCP\App\IAppManager */ + private $appManager; /** @var SharingCheckMiddleware */ private $sharingCheckMiddleware; protected function setUp() { - $this->appConfig = $this->getMockBuilder('\OCP\IAppConfig') + $this->config = $this->getMockBuilder('\OCP\IConfig') ->disableOriginalConstructor()->getMock(); - $this->api = $this->getMockBuilder('\OCP\AppFramework\IApi') + $this->appManager = $this->getMockBuilder('\OCP\App\IAppManager') ->disableOriginalConstructor()->getMock(); - $this->sharingCheckMiddleware = new SharingCheckMiddleware('files_sharing', $this->appConfig, $this->api); + $this->sharingCheckMiddleware = new SharingCheckMiddleware('files_sharing', $this->config, $this->appManager); } public function testIsSharingEnabledWithEverythingEnabled() { - $this->api + $this->appManager ->expects($this->once()) - ->method('isAppEnabled') + ->method('isEnabledForUser') ->with('files_sharing') ->will($this->returnValue(true)); - $this->appConfig + $this->config ->expects($this->once()) - ->method('getValue') + ->method('getAppValue') ->with('core', 'shareapi_allow_links', 'yes') ->will($this->returnValue('yes')); @@ -49,9 +49,9 @@ class SharingCheckMiddlewareTest extends \PHPUnit_Framework_TestCase { } public function testIsSharingEnabledWithAppDisabled() { - $this->api + $this->appManager ->expects($this->once()) - ->method('isAppEnabled') + ->method('isEnabledForUser') ->with('files_sharing') ->will($this->returnValue(false)); @@ -59,15 +59,15 @@ class SharingCheckMiddlewareTest extends \PHPUnit_Framework_TestCase { } public function testIsSharingEnabledWithSharingDisabled() { - $this->api + $this->appManager ->expects($this->once()) - ->method('isAppEnabled') + ->method('isEnabledForUser') ->with('files_sharing') ->will($this->returnValue(true)); - $this->appConfig + $this->config ->expects($this->once()) - ->method('getValue') + ->method('getAppValue') ->with('core', 'shareapi_allow_links', 'yes') ->will($this->returnValue('no')); diff --git a/apps/files_sharing/tests/migrationtest.php b/apps/files_sharing/tests/migrationtest.php new file mode 100644 index 00000000000..1f29d9bed04 --- /dev/null +++ b/apps/files_sharing/tests/migrationtest.php @@ -0,0 +1,76 @@ +<?php +/** + * ownCloud + * + * @author Bjoern Schiessle + * @copyright 2014 Bjoern Schiessle <schiessle@owncloud.com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE + * 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/>. + * + */ + + +use OCA\Files_Sharing\Tests\TestCase; +use OCA\Files_Sharing\Migration; + +class MigrationTest extends TestCase { + + /** + * @var \OCP\IDBConnection + */ + private $connection; + + function __construct() { + parent::__construct(); + + $this->connection = \OC::$server->getDatabaseConnection(); + } + + function testAddAccept() { + + $query = $this->connection->prepare(' + INSERT INTO `*PREFIX*share_external` + (`remote`, `share_token`, `password`, `name`, `owner`, `user`, `mountpoint`, `mountpoint_hash`, `remote_id`, `accepted`) + VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?) + '); + + for ($i = 0; $i < 10; $i++) { + $query->execute(array('remote', 'token', 'password', 'name', 'owner', 'user', 'mount point', $i, $i, 0)); + } + + $query = $this->connection->prepare('SELECT `id` FROM `*PREFIX*share_external`'); + $query->execute(); + $dummyEntries = $query->fetchAll(); + + $this->assertSame(10, count($dummyEntries)); + + $m = new Migration(); + $m->addAcceptRow(); + + // verify result + $query = $this->connection->prepare('SELECT `accepted` FROM `*PREFIX*share_external`'); + $query->execute(); + $results = $query->fetchAll(); + $this->assertSame(10, count($results)); + + foreach ($results as $r) { + $this->assertSame(1, (int) $r['accepted']); + } + + // cleanup + $cleanup = $this->connection->prepare('DELETE FROM `*PREFIX*share_external`'); + $cleanup->execute(); + } + +} diff --git a/apps/files_sharing/tests/server2server.php b/apps/files_sharing/tests/server2server.php index 0400d357b82..6e9c0dd0ddd 100644 --- a/apps/files_sharing/tests/server2server.php +++ b/apps/files_sharing/tests/server2server.php @@ -30,6 +30,14 @@ class Test_Files_Sharing_S2S_OCS_API extends TestCase { const TEST_FOLDER_NAME = '/folder_share_api_test'; + /** + * @var \OCP\IDBConnection + */ + private $connection; + + /** + * @var \OCA\Files_Sharing\API\Server2Server + */ private $s2s; protected function setUp() { @@ -49,6 +57,8 @@ class Test_Files_Sharing_S2S_OCS_API extends TestCase { $this->registerHttpHelper($httpHelperMock); $this->s2s = new \OCA\Files_Sharing\API\Server2Server(); + + $this->connection = \OC::$server->getDatabaseConnection(); } protected function tearDown() { @@ -132,4 +142,71 @@ class Test_Files_Sharing_S2S_OCS_API extends TestCase { $data = $result->fetchAll(); $this->assertEmpty($data); } + + /** + * @dataProvider dataTestDeleteUser + */ + function testDeleteUser($toDelete, $expected, $remainingUsers) { + $this->createDummyS2SShares(); + + $manager = new OCA\Files_Sharing\External\Manager( + \OC::$server->getDatabaseConnection(), + \OC\Files\Filesystem::getMountManager(), + \OC\Files\Filesystem::getLoader(), + \OC::$server->getHTTPHelper(), + $toDelete + ); + + $manager->removeUserShares($toDelete); + + $query = $this->connection->prepare('SELECT `user` FROM `*PREFIX*share_external`'); + $query->execute(); + $result = $query->fetchAll(); + + foreach ($result as $r) { + $remainingShares[$r['user']] = isset($remainingShares[$r['user']]) ? $remainingShares[$r['user']] + 1 : 1; + } + + $this->assertSame($remainingUsers, count($remainingShares)); + + foreach ($expected as $key => $value) { + if ($key === $toDelete) { + $this->assertArrayNotHasKey($key, $remainingShares); + } else { + $this->assertSame($value, $remainingShares[$key]); + } + } + + } + + function dataTestDeleteUser() { + return array( + array('user1', array('user1' => 0, 'user2' => 3, 'user3' => 3), 2), + array('user2', array('user1' => 4, 'user2' => 0, 'user3' => 3), 2), + array('user3', array('user1' => 4, 'user2' => 3, 'user3' => 0), 2), + array('user4', array('user1' => 4, 'user2' => 3, 'user3' => 3), 3), + ); + } + + private function createDummyS2SShares() { + $query = $this->connection->prepare(' + INSERT INTO `*PREFIX*share_external` + (`remote`, `share_token`, `password`, `name`, `owner`, `user`, `mountpoint`, `mountpoint_hash`, `remote_id`, `accepted`) + VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?) + '); + + $users = array('user1', 'user2', 'user3'); + + for ($i = 0; $i < 10; $i++) { + $user = $users[$i%3]; + $query->execute(array('remote', 'token', 'password', 'name', 'owner', $user, 'mount point', $i, $i, 0)); + } + + $query = $this->connection->prepare('SELECT `id` FROM `*PREFIX*share_external`'); + $query->execute(); + $dummyEntries = $query->fetchAll(); + + $this->assertSame(10, count($dummyEntries)); + } + } diff --git a/apps/files_sharing/tests/share.php b/apps/files_sharing/tests/share.php index b8c8b70bd1f..9ae2e330649 100644 --- a/apps/files_sharing/tests/share.php +++ b/apps/files_sharing/tests/share.php @@ -50,6 +50,7 @@ class Test_Files_Sharing extends OCA\Files_sharing\Tests\TestCase { } protected function tearDown() { + self::loginHelper(self::TEST_FILES_SHARING_API_USER1); $this->view->unlink($this->filename); $this->view->deleteAll($this->folder); diff --git a/apps/files_sharing/tests/sharedmount.php b/apps/files_sharing/tests/sharedmount.php index dd66ca05d38..715c22cf4ae 100644 --- a/apps/files_sharing/tests/sharedmount.php +++ b/apps/files_sharing/tests/sharedmount.php @@ -186,6 +186,7 @@ class Test_Files_Sharing_Mount extends OCA\Files_sharing\Tests\TestCase { $this->assertFalse(\OC\Files\Filesystem::file_exists("newFileName")); //cleanup + self::loginHelper(self::TEST_FILES_SHARING_API_USER1); \OCP\Share::unshare('file', $fileinfo['fileid'], \OCP\Share::SHARE_TYPE_GROUP, 'testGroup'); \OC_Group::removeFromGroup(self::TEST_FILES_SHARING_API_USER1, 'testGroup'); \OC_Group::removeFromGroup(self::TEST_FILES_SHARING_API_USER2, 'testGroup'); diff --git a/apps/files_sharing/tests/sharedstorage.php b/apps/files_sharing/tests/sharedstorage.php index 75373244508..2959b9aacfb 100644 --- a/apps/files_sharing/tests/sharedstorage.php +++ b/apps/files_sharing/tests/sharedstorage.php @@ -29,7 +29,7 @@ class Test_Files_Sharing_Storage extends OCA\Files_sharing\Tests\TestCase { protected function setUp() { parent::setUp(); - + \OCA\Files_Trashbin\Trashbin::registerHooks(); $this->folder = '/folder_share_storage_test'; $this->filename = '/share-api-storage.txt'; @@ -46,6 +46,8 @@ class Test_Files_Sharing_Storage extends OCA\Files_sharing\Tests\TestCase { $this->view->unlink($this->folder); $this->view->unlink($this->filename); + \OC\Files\Filesystem::getLoader()->removeStorageWrapper('oc_trashbin'); + parent::tearDown(); } diff --git a/apps/files_sharing/tests/updater.php b/apps/files_sharing/tests/updater.php index bc8deaf19b0..cdaff0d0a56 100644 --- a/apps/files_sharing/tests/updater.php +++ b/apps/files_sharing/tests/updater.php @@ -98,12 +98,12 @@ class Test_Files_Sharing_Updater extends OCA\Files_sharing\Tests\TestCase { // trashbin should contain the local file but not the mount point $rootView = new \OC\Files\View('/' . self::TEST_FILES_SHARING_API_USER2); - $dirContent = $rootView->getDirectoryContent('files_trashbin/files'); - $this->assertSame(1, count($dirContent)); - $firstElement = reset($dirContent); - $ext = pathinfo($firstElement['path'], PATHINFO_EXTENSION); - $this->assertTrue($rootView->file_exists('files_trashbin/files/localFolder.' . $ext . '/localFile.txt')); - $this->assertFalse($rootView->file_exists('files_trashbin/files/localFolder.' . $ext . '/' . $this->folder)); + $trashContent = \OCA\Files_Trashbin\Helper::getTrashFiles('/', self::TEST_FILES_SHARING_API_USER2); + $this->assertSame(1, count($trashContent)); + $firstElement = reset($trashContent); + $timestamp = $firstElement['mtime']; + $this->assertTrue($rootView->file_exists('files_trashbin/files/localFolder.d' . $timestamp . '/localFile.txt')); + $this->assertFalse($rootView->file_exists('files_trashbin/files/localFolder.d' . $timestamp . '/' . $this->folder)); //cleanup $rootView->deleteAll('files_trashin'); @@ -111,6 +111,8 @@ class Test_Files_Sharing_Updater extends OCA\Files_sharing\Tests\TestCase { if ($status === false) { \OC_App::disable('files_trashbin'); } + + \OC\Files\Filesystem::getLoader()->removeStorageWrapper('oc_trashbin'); } /** diff --git a/apps/files_trashbin/appinfo/app.php b/apps/files_trashbin/appinfo/app.php index 0e2cbaa529f..da502f0c11e 100644 --- a/apps/files_trashbin/appinfo/app.php +++ b/apps/files_trashbin/appinfo/app.php @@ -1,8 +1,6 @@ <?php $l = \OC::$server->getL10N('files_trashbin'); -OCP\Util::addTranslations('files_trashbin'); - // register hooks \OCA\Files_Trashbin\Trashbin::registerHooks(); diff --git a/apps/files_trashbin/appinfo/routes.php b/apps/files_trashbin/appinfo/routes.php index 56dbf382735..66a324c54d9 100644 --- a/apps/files_trashbin/appinfo/routes.php +++ b/apps/files_trashbin/appinfo/routes.php @@ -1,10 +1,7 @@ <?php /** @var $this \OCP\Route\IRouter */ -$this->create('core_ajax_trashbin_preview', '/preview')->action( -function() { - require_once __DIR__ . '/../ajax/preview.php'; -}); - +$this->create('core_ajax_trashbin_preview', 'ajax/preview.php') + ->actionInclude('files_trashbin/ajax/preview.php'); $this->create('files_trashbin_ajax_delete', 'ajax/delete.php') ->actionInclude('files_trashbin/ajax/delete.php'); $this->create('files_trashbin_ajax_isEmpty', 'ajax/isEmpty.php') diff --git a/apps/files_trashbin/l10n/bg_BG.js b/apps/files_trashbin/l10n/bg_BG.js index eae24b14a1b..9db73c98a6d 100644 --- a/apps/files_trashbin/l10n/bg_BG.js +++ b/apps/files_trashbin/l10n/bg_BG.js @@ -8,6 +8,10 @@ OC.L10N.register( "Delete permanently" : "Изтрий завинаги", "Error" : "Грешка", "restored" : "възстановено", + "No deleted files" : "Няма изтрити файлове", + "You will be able to recover deleted files from here" : "Имате възможност да възстановите изтрити файлове от тук", + "No entries found in this folder" : "Няма намерени записи в тази папка", + "Select all" : "Избери всички", "Name" : "Име", "Deleted" : "Изтрито", "Delete" : "Изтрий" diff --git a/apps/files_trashbin/l10n/bg_BG.json b/apps/files_trashbin/l10n/bg_BG.json index 2e83d97304c..3f3b3e8b835 100644 --- a/apps/files_trashbin/l10n/bg_BG.json +++ b/apps/files_trashbin/l10n/bg_BG.json @@ -6,6 +6,10 @@ "Delete permanently" : "Изтрий завинаги", "Error" : "Грешка", "restored" : "възстановено", + "No deleted files" : "Няма изтрити файлове", + "You will be able to recover deleted files from here" : "Имате възможност да възстановите изтрити файлове от тук", + "No entries found in this folder" : "Няма намерени записи в тази папка", + "Select all" : "Избери всички", "Name" : "Име", "Deleted" : "Изтрито", "Delete" : "Изтрий" diff --git a/apps/files_trashbin/l10n/el.js b/apps/files_trashbin/l10n/el.js index f41ab173604..f6e38988323 100644 --- a/apps/files_trashbin/l10n/el.js +++ b/apps/files_trashbin/l10n/el.js @@ -9,6 +9,7 @@ OC.L10N.register( "Error" : "Σφάλμα", "restored" : "επαναφέρθηκαν", "No deleted files" : "Κανένα διαγεγραμμένο αρχείο", + "No entries found in this folder" : "Δεν βρέθηκαν καταχωρήσεις σε αυτόν το φάκελο", "Select all" : "Επιλογή όλων", "Name" : "Όνομα", "Deleted" : "Διαγραμμένα", diff --git a/apps/files_trashbin/l10n/el.json b/apps/files_trashbin/l10n/el.json index 31fcde922b1..f76e46954ca 100644 --- a/apps/files_trashbin/l10n/el.json +++ b/apps/files_trashbin/l10n/el.json @@ -7,6 +7,7 @@ "Error" : "Σφάλμα", "restored" : "επαναφέρθηκαν", "No deleted files" : "Κανένα διαγεγραμμένο αρχείο", + "No entries found in this folder" : "Δεν βρέθηκαν καταχωρήσεις σε αυτόν το φάκελο", "Select all" : "Επιλογή όλων", "Name" : "Όνομα", "Deleted" : "Διαγραμμένα", diff --git a/apps/files_trashbin/l10n/eu.js b/apps/files_trashbin/l10n/eu.js index 9371bddcd88..568fda14450 100644 --- a/apps/files_trashbin/l10n/eu.js +++ b/apps/files_trashbin/l10n/eu.js @@ -8,6 +8,10 @@ OC.L10N.register( "Delete permanently" : "Ezabatu betirako", "Error" : "Errorea", "restored" : "Berrezarrita", + "No deleted files" : "Ez dago ezabatutako fitxategirik", + "You will be able to recover deleted files from here" : "Hemendik ezabatutako fitxategiak berreskuratu ahal izango duzu", + "No entries found in this folder" : "Ez da sarrerarik aurkitu karpeta honetan", + "Select all" : "Hautatu dena", "Name" : "Izena", "Deleted" : "Ezabatuta", "Delete" : "Ezabatu" diff --git a/apps/files_trashbin/l10n/eu.json b/apps/files_trashbin/l10n/eu.json index 46378327f42..890ff07a468 100644 --- a/apps/files_trashbin/l10n/eu.json +++ b/apps/files_trashbin/l10n/eu.json @@ -6,6 +6,10 @@ "Delete permanently" : "Ezabatu betirako", "Error" : "Errorea", "restored" : "Berrezarrita", + "No deleted files" : "Ez dago ezabatutako fitxategirik", + "You will be able to recover deleted files from here" : "Hemendik ezabatutako fitxategiak berreskuratu ahal izango duzu", + "No entries found in this folder" : "Ez da sarrerarik aurkitu karpeta honetan", + "Select all" : "Hautatu dena", "Name" : "Izena", "Deleted" : "Ezabatuta", "Delete" : "Ezabatu" diff --git a/apps/files_trashbin/l10n/hr.js b/apps/files_trashbin/l10n/hr.js index de4e0d6a403..89db9a16b98 100644 --- a/apps/files_trashbin/l10n/hr.js +++ b/apps/files_trashbin/l10n/hr.js @@ -8,6 +8,8 @@ OC.L10N.register( "Delete permanently" : "Trajno izbrišite", "Error" : "Pogreška", "restored" : "Obnovljeno", + "No entries found in this folder" : "Zapis nije pronadjen u ovom direktorijumu ", + "Select all" : "Selektiraj sve", "Name" : "Naziv", "Deleted" : "Izbrisano", "Delete" : "Izbrišite" diff --git a/apps/files_trashbin/l10n/hr.json b/apps/files_trashbin/l10n/hr.json index 3b1f0c0eaf9..d74addf2ca7 100644 --- a/apps/files_trashbin/l10n/hr.json +++ b/apps/files_trashbin/l10n/hr.json @@ -6,6 +6,8 @@ "Delete permanently" : "Trajno izbrišite", "Error" : "Pogreška", "restored" : "Obnovljeno", + "No entries found in this folder" : "Zapis nije pronadjen u ovom direktorijumu ", + "Select all" : "Selektiraj sve", "Name" : "Naziv", "Deleted" : "Izbrisano", "Delete" : "Izbrišite" diff --git a/apps/files_trashbin/l10n/hu_HU.js b/apps/files_trashbin/l10n/hu_HU.js index 86fbd169640..2863e8e6a68 100644 --- a/apps/files_trashbin/l10n/hu_HU.js +++ b/apps/files_trashbin/l10n/hu_HU.js @@ -8,6 +8,7 @@ OC.L10N.register( "Delete permanently" : "Végleges törlés", "Error" : "Hiba", "restored" : "visszaállítva", + "No entries found in this folder" : "Nincsenek bejegyzések ebben a könyvtárban", "Select all" : "Összes kijelölése", "Name" : "Név", "Deleted" : "Törölve", diff --git a/apps/files_trashbin/l10n/hu_HU.json b/apps/files_trashbin/l10n/hu_HU.json index e445b3a4728..91c613d638d 100644 --- a/apps/files_trashbin/l10n/hu_HU.json +++ b/apps/files_trashbin/l10n/hu_HU.json @@ -6,6 +6,7 @@ "Delete permanently" : "Végleges törlés", "Error" : "Hiba", "restored" : "visszaállítva", + "No entries found in this folder" : "Nincsenek bejegyzések ebben a könyvtárban", "Select all" : "Összes kijelölése", "Name" : "Név", "Deleted" : "Törölve", diff --git a/apps/files_trashbin/l10n/id.js b/apps/files_trashbin/l10n/id.js index 52183a9cbef..53827980ea9 100644 --- a/apps/files_trashbin/l10n/id.js +++ b/apps/files_trashbin/l10n/id.js @@ -7,6 +7,11 @@ OC.L10N.register( "Restore" : "Pulihkan", "Delete permanently" : "Hapus secara permanen", "Error" : "Galat", + "restored" : "dipulihkan", + "No deleted files" : "Tidak ada berkas yang dihapus", + "You will be able to recover deleted files from here" : "Anda dapat memulihkan berkas yang dihapus dari sini", + "No entries found in this folder" : "Tidak ada entri yang ditemukan dalam folder ini", + "Select all" : "Pilih Semua", "Name" : "Nama", "Deleted" : "Dihapus", "Delete" : "Hapus" diff --git a/apps/files_trashbin/l10n/id.json b/apps/files_trashbin/l10n/id.json index 55384503601..d0d107a9571 100644 --- a/apps/files_trashbin/l10n/id.json +++ b/apps/files_trashbin/l10n/id.json @@ -5,6 +5,11 @@ "Restore" : "Pulihkan", "Delete permanently" : "Hapus secara permanen", "Error" : "Galat", + "restored" : "dipulihkan", + "No deleted files" : "Tidak ada berkas yang dihapus", + "You will be able to recover deleted files from here" : "Anda dapat memulihkan berkas yang dihapus dari sini", + "No entries found in this folder" : "Tidak ada entri yang ditemukan dalam folder ini", + "Select all" : "Pilih Semua", "Name" : "Nama", "Deleted" : "Dihapus", "Delete" : "Hapus" diff --git a/apps/files_trashbin/l10n/ko.js b/apps/files_trashbin/l10n/ko.js index 83c57f8914a..d93dca056bb 100644 --- a/apps/files_trashbin/l10n/ko.js +++ b/apps/files_trashbin/l10n/ko.js @@ -1,13 +1,17 @@ OC.L10N.register( "files_trashbin", { - "Couldn't delete %s permanently" : "%s을(를_ 영구적으로 삭제할 수 없습니다", + "Couldn't delete %s permanently" : "%s을(를) 영구적으로 삭제할 수 없습니다", "Couldn't restore %s" : "%s을(를) 복원할 수 없습니다", "Deleted files" : "삭제된 파일", "Restore" : "복원", "Delete permanently" : "영구히 삭제", "Error" : "오류", "restored" : "복원됨", + "No deleted files" : "삭제된 파일 없음", + "You will be able to recover deleted files from here" : "삭제된 파일을 여기에서 복구할 수 있습니다", + "No entries found in this folder" : "이 폴더에 항목 없음", + "Select all" : "모두 선택", "Name" : "이름", "Deleted" : "삭제됨", "Delete" : "삭제" diff --git a/apps/files_trashbin/l10n/ko.json b/apps/files_trashbin/l10n/ko.json index d9820ba8ffe..25d1c888550 100644 --- a/apps/files_trashbin/l10n/ko.json +++ b/apps/files_trashbin/l10n/ko.json @@ -1,11 +1,15 @@ { "translations": { - "Couldn't delete %s permanently" : "%s을(를_ 영구적으로 삭제할 수 없습니다", + "Couldn't delete %s permanently" : "%s을(를) 영구적으로 삭제할 수 없습니다", "Couldn't restore %s" : "%s을(를) 복원할 수 없습니다", "Deleted files" : "삭제된 파일", "Restore" : "복원", "Delete permanently" : "영구히 삭제", "Error" : "오류", "restored" : "복원됨", + "No deleted files" : "삭제된 파일 없음", + "You will be able to recover deleted files from here" : "삭제된 파일을 여기에서 복구할 수 있습니다", + "No entries found in this folder" : "이 폴더에 항목 없음", + "Select all" : "모두 선택", "Name" : "이름", "Deleted" : "삭제됨", "Delete" : "삭제" diff --git a/apps/files_trashbin/l10n/lv.js b/apps/files_trashbin/l10n/lv.js index 21ac79785a6..813ddd314e1 100644 --- a/apps/files_trashbin/l10n/lv.js +++ b/apps/files_trashbin/l10n/lv.js @@ -8,6 +8,8 @@ OC.L10N.register( "Delete permanently" : "Dzēst pavisam", "Error" : "Kļūda", "restored" : "atjaunots", + "No deleted files" : "Nav dzēstu failu", + "You will be able to recover deleted files from here" : "No šejienes būs iespējams atgūt dzēstos failus", "No entries found in this folder" : "Šajā mapē nekas nav atrasts", "Select all" : "Atzīmēt visu", "Name" : "Nosaukums", diff --git a/apps/files_trashbin/l10n/lv.json b/apps/files_trashbin/l10n/lv.json index 683a929948b..9c0ad01ce9a 100644 --- a/apps/files_trashbin/l10n/lv.json +++ b/apps/files_trashbin/l10n/lv.json @@ -6,6 +6,8 @@ "Delete permanently" : "Dzēst pavisam", "Error" : "Kļūda", "restored" : "atjaunots", + "No deleted files" : "Nav dzēstu failu", + "You will be able to recover deleted files from here" : "No šejienes būs iespējams atgūt dzēstos failus", "No entries found in this folder" : "Šajā mapē nekas nav atrasts", "Select all" : "Atzīmēt visu", "Name" : "Nosaukums", diff --git a/apps/files_trashbin/l10n/pt_PT.js b/apps/files_trashbin/l10n/pt_PT.js index 7427cebfca5..8124af21751 100644 --- a/apps/files_trashbin/l10n/pt_PT.js +++ b/apps/files_trashbin/l10n/pt_PT.js @@ -9,6 +9,8 @@ OC.L10N.register( "Error" : "Erro", "restored" : "Restaurado", "No deleted files" : "Sem ficheiros eliminados", + "You will be able to recover deleted files from here" : "Poderá recuperar ficheiros apagados aqui", + "No entries found in this folder" : "Não foram encontradas entradas nesta pasta", "Select all" : "Seleccionar todos", "Name" : "Nome", "Deleted" : "Eliminado", diff --git a/apps/files_trashbin/l10n/pt_PT.json b/apps/files_trashbin/l10n/pt_PT.json index 97fe7ac33aa..f1fb924af59 100644 --- a/apps/files_trashbin/l10n/pt_PT.json +++ b/apps/files_trashbin/l10n/pt_PT.json @@ -7,6 +7,8 @@ "Error" : "Erro", "restored" : "Restaurado", "No deleted files" : "Sem ficheiros eliminados", + "You will be able to recover deleted files from here" : "Poderá recuperar ficheiros apagados aqui", + "No entries found in this folder" : "Não foram encontradas entradas nesta pasta", "Select all" : "Seleccionar todos", "Name" : "Nome", "Deleted" : "Eliminado", diff --git a/apps/files_trashbin/l10n/ru.js b/apps/files_trashbin/l10n/ru.js index 39a47584221..47b971180c3 100644 --- a/apps/files_trashbin/l10n/ru.js +++ b/apps/files_trashbin/l10n/ru.js @@ -10,7 +10,7 @@ OC.L10N.register( "restored" : "восстановлен", "No deleted files" : "Нет удалённых файлов", "You will be able to recover deleted files from here" : "Здесь вы сможете восстановить удалённые файлы", - "No entries found in this folder" : "Каталог пуст", + "No entries found in this folder" : "Нет элементов в этом каталоге", "Select all" : "Выделить все", "Name" : "Имя", "Deleted" : "Удалён", diff --git a/apps/files_trashbin/l10n/ru.json b/apps/files_trashbin/l10n/ru.json index 171c0aa2325..3d38b545ad7 100644 --- a/apps/files_trashbin/l10n/ru.json +++ b/apps/files_trashbin/l10n/ru.json @@ -8,7 +8,7 @@ "restored" : "восстановлен", "No deleted files" : "Нет удалённых файлов", "You will be able to recover deleted files from here" : "Здесь вы сможете восстановить удалённые файлы", - "No entries found in this folder" : "Каталог пуст", + "No entries found in this folder" : "Нет элементов в этом каталоге", "Select all" : "Выделить все", "Name" : "Имя", "Deleted" : "Удалён", diff --git a/apps/files_trashbin/l10n/sk_SK.js b/apps/files_trashbin/l10n/sk_SK.js index 4cca753fc79..483691acf99 100644 --- a/apps/files_trashbin/l10n/sk_SK.js +++ b/apps/files_trashbin/l10n/sk_SK.js @@ -5,9 +5,13 @@ OC.L10N.register( "Couldn't restore %s" : "Nemožno obnoviť %s", "Deleted files" : "Zmazané súbory", "Restore" : "Obnoviť", - "Delete permanently" : "Zmazať trvalo", + "Delete permanently" : "Zmazať natrvalo", "Error" : "Chyba", "restored" : "obnovené", + "No deleted files" : "Žiadne zmazané súbory", + "You will be able to recover deleted files from here" : "Tu budete mať možnosť obnoviť zmazané súbory", + "No entries found in this folder" : "V tomto priečinku nebolo nič nájdené", + "Select all" : "Vybrať všetko", "Name" : "Názov", "Deleted" : "Zmazané", "Delete" : "Zmazať" diff --git a/apps/files_trashbin/l10n/sk_SK.json b/apps/files_trashbin/l10n/sk_SK.json index a014537a968..90b91cd92be 100644 --- a/apps/files_trashbin/l10n/sk_SK.json +++ b/apps/files_trashbin/l10n/sk_SK.json @@ -3,9 +3,13 @@ "Couldn't restore %s" : "Nemožno obnoviť %s", "Deleted files" : "Zmazané súbory", "Restore" : "Obnoviť", - "Delete permanently" : "Zmazať trvalo", + "Delete permanently" : "Zmazať natrvalo", "Error" : "Chyba", "restored" : "obnovené", + "No deleted files" : "Žiadne zmazané súbory", + "You will be able to recover deleted files from here" : "Tu budete mať možnosť obnoviť zmazané súbory", + "No entries found in this folder" : "V tomto priečinku nebolo nič nájdené", + "Select all" : "Vybrať všetko", "Name" : "Názov", "Deleted" : "Zmazané", "Delete" : "Zmazať" diff --git a/apps/files_trashbin/l10n/sr@latin.js b/apps/files_trashbin/l10n/sr@latin.js index ee9560bf680..ab9f86c8d37 100644 --- a/apps/files_trashbin/l10n/sr@latin.js +++ b/apps/files_trashbin/l10n/sr@latin.js @@ -1,8 +1,19 @@ OC.L10N.register( "files_trashbin", { + "Couldn't delete %s permanently" : "Nije bilo moguće obrisati %s za stalno", + "Couldn't restore %s" : "Nije bilo moguće povratiti %s", + "Deleted files" : "Obrisani fajlovi", + "Restore" : "Povrati", + "Delete permanently" : "Obriši za stalno", "Error" : "Greška", + "restored" : "povraćeno", + "No deleted files" : "Nema obrisanih fajlova", + "You will be able to recover deleted files from here" : "Odavde ćete moći da povratite obrisane fajlove", + "No entries found in this folder" : "Nema unosa u ovom direktorijumu", + "Select all" : "Odaberi sve", "Name" : "Ime", + "Deleted" : "Obrisano", "Delete" : "Obriši" }, "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"); diff --git a/apps/files_trashbin/l10n/sr@latin.json b/apps/files_trashbin/l10n/sr@latin.json index 3f64cf8f2b9..8e2d627c3e7 100644 --- a/apps/files_trashbin/l10n/sr@latin.json +++ b/apps/files_trashbin/l10n/sr@latin.json @@ -1,6 +1,17 @@ { "translations": { + "Couldn't delete %s permanently" : "Nije bilo moguće obrisati %s za stalno", + "Couldn't restore %s" : "Nije bilo moguće povratiti %s", + "Deleted files" : "Obrisani fajlovi", + "Restore" : "Povrati", + "Delete permanently" : "Obriši za stalno", "Error" : "Greška", + "restored" : "povraćeno", + "No deleted files" : "Nema obrisanih fajlova", + "You will be able to recover deleted files from here" : "Odavde ćete moći da povratite obrisane fajlove", + "No entries found in this folder" : "Nema unosa u ovom direktorijumu", + "Select all" : "Odaberi sve", "Name" : "Ime", + "Deleted" : "Obrisano", "Delete" : "Obriši" },"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);" }
\ No newline at end of file diff --git a/apps/files_trashbin/l10n/uk.js b/apps/files_trashbin/l10n/uk.js index a3272ac313f..656a6f7b50b 100644 --- a/apps/files_trashbin/l10n/uk.js +++ b/apps/files_trashbin/l10n/uk.js @@ -8,6 +8,10 @@ OC.L10N.register( "Delete permanently" : "Видалити назавжди", "Error" : "Помилка", "restored" : "відновлено", + "No deleted files" : "Немає видалених файлів", + "You will be able to recover deleted files from here" : "Ви зможете відновлювати видалені файли звідси", + "No entries found in this folder" : "Записів не знайдено в цій папці", + "Select all" : "Вибрати всі", "Name" : "Ім'я", "Deleted" : "Видалено", "Delete" : "Видалити" diff --git a/apps/files_trashbin/l10n/uk.json b/apps/files_trashbin/l10n/uk.json index a711236cd0a..bfd6860252e 100644 --- a/apps/files_trashbin/l10n/uk.json +++ b/apps/files_trashbin/l10n/uk.json @@ -6,6 +6,10 @@ "Delete permanently" : "Видалити назавжди", "Error" : "Помилка", "restored" : "відновлено", + "No deleted files" : "Немає видалених файлів", + "You will be able to recover deleted files from here" : "Ви зможете відновлювати видалені файли звідси", + "No entries found in this folder" : "Записів не знайдено в цій папці", + "Select all" : "Вибрати всі", "Name" : "Ім'я", "Deleted" : "Видалено", "Delete" : "Видалити" diff --git a/apps/files_trashbin/lib/hooks.php b/apps/files_trashbin/lib/hooks.php index b6f0fb7e547..c6c69aaa23f 100644 --- a/apps/files_trashbin/lib/hooks.php +++ b/apps/files_trashbin/lib/hooks.php @@ -29,21 +29,6 @@ namespace OCA\Files_Trashbin; class Hooks { /** - * Copy files to trash bin - * @param array $params - * - * This function is connected to the delete signal of OC_Filesystem - * to copy the file to the trash bin - */ - public static function remove_hook($params) { - - if ( \OCP\App::isEnabled('files_trashbin') ) { - $path = $params['path']; - Trashbin::move2trash($path); - } - } - - /** * clean up user specific settings if user gets deleted * @param array $params array with uid * diff --git a/apps/files_trashbin/lib/storage.php b/apps/files_trashbin/lib/storage.php new file mode 100644 index 00000000000..175889ef95d --- /dev/null +++ b/apps/files_trashbin/lib/storage.php @@ -0,0 +1,106 @@ +<?php + +/** + * ownCloud + * + * @copyright (C) 2015 ownCloud, Inc. + * + * @author Bjoern Schiessle <schiessle@owncloud.com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE + * 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 OCA\Files_Trashbin; + +use OC\Files\Filesystem; +use OC\Files\Storage\Wrapper\Wrapper; + +class Storage extends Wrapper { + + private $mountPoint; + // remember already deleted files to avoid infinite loops if the trash bin + // move files across storages + private $deletedFiles = array(); + + /** + * Disable trash logic + * + * @var bool + */ + private static $disableTrash = false; + + function __construct($parameters) { + $this->mountPoint = $parameters['mountPoint']; + parent::__construct($parameters); + } + + /** + * @internal + */ + public static function preRenameHook($params) { + // in cross-storage cases, a rename is a copy + unlink, + // that last unlink must not go to trash + self::$disableTrash = true; + } + + /** + * @internal + */ + public static function postRenameHook($params) { + self::$disableTrash = false; + } + + /** + * Deletes the given file by moving it into the trashbin. + * + * @param string $path + */ + public function unlink($path) { + if (self::$disableTrash) { + return $this->storage->unlink($path); + } + $normalized = Filesystem::normalizePath($this->mountPoint . '/' . $path); + $result = true; + if (!isset($this->deletedFiles[$normalized])) { + $view = Filesystem::getView(); + $this->deletedFiles[$normalized] = $normalized; + if ($filesPath = $view->getRelativePath($normalized)) { + $filesPath = trim($filesPath, '/'); + $result = \OCA\Files_Trashbin\Trashbin::move2trash($filesPath); + // in cross-storage cases the file will be copied + // but not deleted, so we delete it here + if ($result) { + $this->storage->unlink($path); + } + } else { + $result = $this->storage->unlink($path); + } + unset($this->deletedFiles[$normalized]); + } else if ($this->storage->file_exists($path)) { + $result = $this->storage->unlink($path); + } + + return $result; + } + + /** + * Setup the storate wrapper callback + */ + public static function setupStorage() { + \OC\Files\Filesystem::addStorageWrapper('oc_trashbin', function ($mountPoint, $storage) { + return new \OCA\Files_Trashbin\Storage(array('storage' => $storage, 'mountPoint' => $mountPoint)); + }); + } + +} diff --git a/apps/files_trashbin/lib/trashbin.php b/apps/files_trashbin/lib/trashbin.php index 26257bd3817..8ce6d668d66 100644 --- a/apps/files_trashbin/lib/trashbin.php +++ b/apps/files_trashbin/lib/trashbin.php @@ -144,14 +144,14 @@ class Trashbin { $size = 0; list($owner, $ownerPath) = self::getUidAndFilename($file_path); + $view = new \OC\Files\View('/' . $user); // file has been deleted in between - if (empty($ownerPath)) { - return false; + if (!$view->file_exists('/files/' . $file_path)) { + return true; } self::setUpTrash($user); - $view = new \OC\Files\View('/' . $user); $path_parts = pathinfo($file_path); $filename = $path_parts['basename']; @@ -165,7 +165,11 @@ class Trashbin { \OC_FileProxy::$enabled = false; $trashPath = '/files_trashbin/files/' . $filename . '.d' . $timestamp; try { - $sizeOfAddedFiles = self::copy_recursive('/files/'.$file_path, $trashPath, $view); + $sizeOfAddedFiles = $view->filesize('/files/' . $file_path); + if ($view->file_exists($trashPath)) { + $view->unlink($trashPath); + } + $view->rename('/files/' . $file_path, $trashPath); } catch (\OCA\Files_Trashbin\Exceptions\CopyRecursiveException $e) { $sizeOfAddedFiles = false; if ($view->file_exists($trashPath)) { @@ -175,6 +179,11 @@ class Trashbin { } \OC_FileProxy::$enabled = $proxyStatus; + if ($view->file_exists('/files/' . $file_path)) { // failed to delete the original file, abort + $view->unlink($trashPath); + return false; + } + if ($sizeOfAddedFiles !== false) { $size = $sizeOfAddedFiles; $query = \OC_DB::prepare("INSERT INTO `*PREFIX*files_trash` (`id`,`timestamp`,`location`,`user`) VALUES (?,?,?,?)"); @@ -203,6 +212,8 @@ class Trashbin { $ownerTrashSize += $size; $ownerTrashSize -= self::expire($ownerTrashSize, $owner); } + + return ($sizeOfAddedFiles === false) ? false : true; } /** @@ -321,8 +332,8 @@ class Trashbin { } else { // if location no longer exists, restore file in the root directory if ($location !== '/' && - (!$view->is_dir('files' . $location) || - !$view->isCreatable('files' . $location)) + (!$view->is_dir('files/' . $location) || + !$view->isCreatable('files/' . $location)) ) { $location = ''; } @@ -918,12 +929,15 @@ class Trashbin { * register hooks */ public static function registerHooks() { - //Listen to delete file signal - \OCP\Util::connectHook('OC_Filesystem', 'delete', "OCA\Files_Trashbin\Hooks", "remove_hook"); + // create storage wrapper on setup + \OCP\Util::connectHook('OC_Filesystem', 'setup', 'OCA\Files_Trashbin\Storage', 'setupStorage'); //Listen to delete user signal - \OCP\Util::connectHook('OC_User', 'pre_deleteUser', "OCA\Files_Trashbin\Hooks", "deleteUser_hook"); + \OCP\Util::connectHook('OC_User', 'pre_deleteUser', 'OCA\Files_Trashbin\Hooks', 'deleteUser_hook'); //Listen to post write hook - \OCP\Util::connectHook('OC_Filesystem', 'post_write', "OCA\Files_Trashbin\Hooks", "post_write_hook"); + \OCP\Util::connectHook('OC_Filesystem', 'post_write', 'OCA\Files_Trashbin\Hooks', 'post_write_hook'); + // pre and post-rename, disable trash logic for the copy+unlink case + \OCP\Util::connectHook('OC_Filesystem', 'rename', 'OCA\Files_Trashbin\Storage', 'preRenameHook'); + \OCP\Util::connectHook('OC_Filesystem', 'post_rename', 'OCA\Files_Trashbin\Storage', 'postRenameHook'); } /** diff --git a/apps/files_trashbin/tests/storage.php b/apps/files_trashbin/tests/storage.php new file mode 100644 index 00000000000..24a04e68b2a --- /dev/null +++ b/apps/files_trashbin/tests/storage.php @@ -0,0 +1,209 @@ +<?php +/** + * Copyright (c) 2015 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_trashbin\Tests\Storage; + +use OC\Files\Storage\Home; +use OC\Files\Storage\Temporary; +use OC\Files\Mount\MountPoint; +use OC\Files\Filesystem; + +class Storage extends \Test\TestCase { + /** + * @var string + */ + private $user; + + /** + * @var \OC\Files\Storage\Storage + **/ + private $originalStorage; + + /** + * @var \OC\Files\View + */ + private $rootView; + + /** + * @var \OC\Files\View + */ + private $userView; + + protected function setUp() { + parent::setUp(); + + \OC_Hook::clear(); + \OCA\Files_Trashbin\Trashbin::registerHooks(); + + $this->user = $this->getUniqueId('user'); + \OC::$server->getUserManager()->createUser($this->user, $this->user); + + // this will setup the FS + $this->loginAsUser($this->user); + + $this->originalStorage = \OC\Files\Filesystem::getStorage('/'); + + \OCA\Files_Trashbin\Storage::setupStorage(); + + $this->rootView = new \OC\Files\View('/'); + $this->userView = new \OC\Files\View('/' . $this->user . '/files/'); + $this->userView->file_put_contents('test.txt', 'foo'); + + } + + protected function tearDown() { + \OC\Files\Filesystem::getLoader()->removeStorageWrapper('oc_trashbin'); + \OC\Files\Filesystem::mount($this->originalStorage, array(), '/'); + $this->logout(); + \OC_User::deleteUser($this->user); + \OC_Hook::clear(); + parent::tearDown(); + } + + /** + * Test that deleting a file puts it into the trashbin. + */ + public function testSingleStorageDelete() { + $this->assertTrue($this->userView->file_exists('test.txt')); + $this->userView->unlink('test.txt'); + list($storage,) = $this->userView->resolvePath('test.txt'); + $storage->getScanner()->scan(''); // make sure we check the storage + $this->assertFalse($this->userView->getFileInfo('test.txt')); + + // check if file is in trashbin + $results = $this->rootView->getDirectoryContent($this->user . '/files_trashbin/files/'); + $this->assertEquals(1, count($results)); + $name = $results[0]->getName(); + $this->assertEquals('test.txt', substr($name, 0, strrpos($name, '.'))); + } + + /** + * Test that deleting a file from another mounted storage properly + * lands in the trashbin. This is a cross-storage situation because + * the trashbin folder is in the root storage while the mounted one + * isn't. + */ + public function testCrossStorageDelete() { + $storage2 = new Temporary(array()); + \OC\Files\Filesystem::mount($storage2, array(), $this->user . '/files/substorage'); + + $this->userView->file_put_contents('substorage/subfile.txt', 'foo'); + $storage2->getScanner()->scan(''); + $this->assertTrue($storage2->file_exists('subfile.txt')); + $this->userView->unlink('substorage/subfile.txt'); + + $storage2->getScanner()->scan(''); + $this->assertFalse($this->userView->getFileInfo('substorage/subfile.txt')); + $this->assertFalse($storage2->file_exists('subfile.txt')); + + // check if file is in trashbin + $results = $this->rootView->getDirectoryContent($this->user . '/files_trashbin/files'); + $this->assertEquals(1, count($results)); + $name = $results[0]->getName(); + $this->assertEquals('subfile.txt', substr($name, 0, strrpos($name, '.'))); + } + + /** + * Test that deleted versions properly land in the trashbin. + */ + public function testDeleteVersions() { + \OCA\Files_Versions\Hooks::connectHooks(); + + // trigger a version (multiple would not work because of the expire logic) + $this->userView->file_put_contents('test.txt', 'v1'); + + $results = $this->rootView->getDirectoryContent($this->user . '/files_versions/'); + $this->assertEquals(1, count($results)); + + $this->userView->unlink('test.txt'); + + // rescan trash storage + list($rootStorage,) = $this->rootView->resolvePath($this->user . '/files_trashbin'); + $rootStorage->getScanner()->scan(''); + + // check if versions are in trashbin + $results = $this->rootView->getDirectoryContent($this->user . '/files_trashbin/versions'); + $this->assertEquals(1, count($results)); + $name = $results[0]->getName(); + $this->assertEquals('test.txt', substr($name, 0, strlen('test.txt'))); + } + + /** + * Test that versions are not auto-trashed when moving a file between + * storages. This is because rename() between storages would call + * unlink() which should NOT trigger the version deletion logic. + */ + public function testKeepFileAndVersionsWhenMovingBetweenStorages() { + \OCA\Files_Versions\Hooks::connectHooks(); + + $storage2 = new Temporary(array()); + \OC\Files\Filesystem::mount($storage2, array(), $this->user . '/files/substorage'); + + // trigger a version (multiple would not work because of the expire logic) + $this->userView->file_put_contents('test.txt', 'v1'); + + $results = $this->rootView->getDirectoryContent($this->user . '/files_trashbin/files'); + $this->assertEquals(0, count($results)); + + $results = $this->rootView->getDirectoryContent($this->user . '/files_versions/'); + $this->assertEquals(1, count($results)); + + // move to another storage + $this->userView->rename('test.txt', 'substorage/test.txt'); + $this->userView->file_exists('substorage/test.txt'); + + // rescan trash storage + list($rootStorage,) = $this->rootView->resolvePath($this->user . '/files_trashbin'); + $rootStorage->getScanner()->scan(''); + + // versions were moved too + $results = $this->rootView->getDirectoryContent($this->user . '/files_versions/substorage'); + $this->assertEquals(1, count($results)); + + // check that nothing got trashed by the rename's unlink() call + $results = $this->rootView->getDirectoryContent($this->user . '/files_trashbin/files'); + $this->assertEquals(0, count($results)); + + // check that versions were moved and not trashed + $results = $this->rootView->getDirectoryContent($this->user . '/files_trashbin/versions/'); + $this->assertEquals(0, count($results)); + } + + /** + * Delete should fail is the source file cant be deleted + */ + public function testSingleStorageDeleteFail() { + /** + * @var \OC\Files\Storage\Temporary | \PHPUnit_Framework_MockObject_MockObject $storage + */ + $storage = $this->getMockBuilder('\OC\Files\Storage\Temporary') + ->setConstructorArgs([[]]) + ->setMethods(['rename', 'unlink']) + ->getMock(); + + $storage->expects($this->any()) + ->method('rename') + ->will($this->returnValue(false)); + $storage->expects($this->any()) + ->method('unlink') + ->will($this->returnValue(false)); + + $cache = $storage->getCache(); + + Filesystem::mount($storage, [], '/' . $this->user . '/files'); + $this->userView->file_put_contents('test.txt', 'foo'); + $this->assertTrue($storage->file_exists('test.txt')); + $this->assertFalse($this->userView->unlink('test.txt')); + $this->assertTrue($storage->file_exists('test.txt')); + $this->assertTrue($cache->inCache('test.txt')); + + // file should not be in the trashbin + $results = $this->rootView->getDirectoryContent($this->user . '/files_trashbin/files/'); + $this->assertEquals(0, count($results)); + } +} diff --git a/apps/files_trashbin/tests/trashbin.php b/apps/files_trashbin/tests/trashbin.php index f572e22623e..17e38015868 100644 --- a/apps/files_trashbin/tests/trashbin.php +++ b/apps/files_trashbin/tests/trashbin.php @@ -88,6 +88,8 @@ class Test_Trashbin extends \Test\TestCase { \OC_Hook::clear(); + \OC\Files\Filesystem::getLoader()->removeStorageWrapper('oc_trashbin'); + parent::tearDownAfterClass(); } diff --git a/apps/files_versions/appinfo/app.php b/apps/files_versions/appinfo/app.php index ae29bceb37c..e13dc64c46e 100644 --- a/apps/files_versions/appinfo/app.php +++ b/apps/files_versions/appinfo/app.php @@ -1,6 +1,5 @@ <?php -OCP\Util::addTranslations('files_versions'); OCP\Util::addscript('files_versions', 'versions'); OCP\Util::addStyle('files_versions', 'versions'); diff --git a/apps/files_versions/l10n/ar.js b/apps/files_versions/l10n/ar.js index ee0199f5b11..81390bc50a9 100644 --- a/apps/files_versions/l10n/ar.js +++ b/apps/files_versions/l10n/ar.js @@ -1,7 +1,11 @@ OC.L10N.register( "files_versions", { + "Could not revert: %s" : "غير قادر على الاستعادة : %s", "Versions" : "الإصدارات", - "Restore" : "استعيد" + "Failed to revert {file} to revision {timestamp}." : "فشل في استعادة {ملف} لنتقيح {الطابع الزمني}", + "More versions..." : "المزيد من الإصدارات", + "No other versions available" : "لا توجد إصدارات أخرى متاحة", + "Restore" : "استعادة " }, "nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;"); diff --git a/apps/files_versions/l10n/ar.json b/apps/files_versions/l10n/ar.json index e84fbfc56c2..683df8a7c0e 100644 --- a/apps/files_versions/l10n/ar.json +++ b/apps/files_versions/l10n/ar.json @@ -1,5 +1,9 @@ { "translations": { + "Could not revert: %s" : "غير قادر على الاستعادة : %s", "Versions" : "الإصدارات", - "Restore" : "استعيد" + "Failed to revert {file} to revision {timestamp}." : "فشل في استعادة {ملف} لنتقيح {الطابع الزمني}", + "More versions..." : "المزيد من الإصدارات", + "No other versions available" : "لا توجد إصدارات أخرى متاحة", + "Restore" : "استعادة " },"pluralForm" :"nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;" }
\ No newline at end of file diff --git a/apps/files_versions/l10n/lv.js b/apps/files_versions/l10n/lv.js index 5a8cbcf0ece..5ac3fa1ad87 100644 --- a/apps/files_versions/l10n/lv.js +++ b/apps/files_versions/l10n/lv.js @@ -3,6 +3,9 @@ OC.L10N.register( { "Could not revert: %s" : "Nevarēja atgriezt — %s", "Versions" : "Versijas", + "Failed to revert {file} to revision {timestamp}." : "Neizdevās atjaunot {file} no rediģējuma {timestamp} ", + "More versions..." : "Vairāk versiju...", + "No other versions available" : "Citas versijas nav pieejamas", "Restore" : "Atjaunot" }, "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);"); diff --git a/apps/files_versions/l10n/lv.json b/apps/files_versions/l10n/lv.json index 6781de4d471..f0912544887 100644 --- a/apps/files_versions/l10n/lv.json +++ b/apps/files_versions/l10n/lv.json @@ -1,6 +1,9 @@ { "translations": { "Could not revert: %s" : "Nevarēja atgriezt — %s", "Versions" : "Versijas", + "Failed to revert {file} to revision {timestamp}." : "Neizdevās atjaunot {file} no rediģējuma {timestamp} ", + "More versions..." : "Vairāk versiju...", + "No other versions available" : "Citas versijas nav pieejamas", "Restore" : "Atjaunot" },"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);" }
\ No newline at end of file diff --git a/apps/files_versions/l10n/sr@latin.js b/apps/files_versions/l10n/sr@latin.js new file mode 100644 index 00000000000..54215cc4d38 --- /dev/null +++ b/apps/files_versions/l10n/sr@latin.js @@ -0,0 +1,11 @@ +OC.L10N.register( + "files_versions", + { + "Could not revert: %s" : "Nemoguće povratiti: %s", + "Versions" : "Verzije", + "Failed to revert {file} to revision {timestamp}." : "Neuspelo vraćanje {file} na reviziju {timestamp}.", + "More versions..." : "Još verzija...", + "No other versions available" : "Nema drugih dostupnih verzija.", + "Restore" : "Povrati" +}, +"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"); diff --git a/apps/files_versions/l10n/sr@latin.json b/apps/files_versions/l10n/sr@latin.json new file mode 100644 index 00000000000..3e74cb9762c --- /dev/null +++ b/apps/files_versions/l10n/sr@latin.json @@ -0,0 +1,9 @@ +{ "translations": { + "Could not revert: %s" : "Nemoguće povratiti: %s", + "Versions" : "Verzije", + "Failed to revert {file} to revision {timestamp}." : "Neuspelo vraćanje {file} na reviziju {timestamp}.", + "More versions..." : "Još verzija...", + "No other versions available" : "Nema drugih dostupnih verzija.", + "Restore" : "Povrati" +},"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);" +}
\ No newline at end of file diff --git a/apps/files_versions/lib/storage.php b/apps/files_versions/lib/storage.php index 0fbb80f425f..60a4c463fd5 100644 --- a/apps/files_versions/lib/storage.php +++ b/apps/files_versions/lib/storage.php @@ -327,7 +327,7 @@ class Storage { } else { $versions[$key]['preview'] = \OCP\Util::linkToRoute('core_ajax_versions_preview', array('file' => $userFullPath, 'version' => $timestamp)); } - $versions[$key]['path'] = $pathinfo['dirname'] . '/' . $filename; + $versions[$key]['path'] = \OC\Files\Filesystem::normalizePath($pathinfo['dirname'] . '/' . $filename); $versions[$key]['name'] = $versionedFile; $versions[$key]['size'] = $view->filesize($dir . '/' . $entryName); } diff --git a/apps/provisioning_api/appinfo/info.xml b/apps/provisioning_api/appinfo/info.xml index 3f1fa745cf5..7c662c18c09 100644 --- a/apps/provisioning_api/appinfo/info.xml +++ b/apps/provisioning_api/appinfo/info.xml @@ -19,4 +19,8 @@ <documentation> <admin>admin-provisioning-api</admin> </documentation> + <types> + <!-- this is used to disable the feature of enabling an app for specific groups only because this would break this app --> + <filesystem/> + </types> </info> diff --git a/apps/provisioning_api/img/app.svg b/apps/provisioning_api/img/app.svg new file mode 100644 index 00000000000..b6ae35211a3 --- /dev/null +++ b/apps/provisioning_api/img/app.svg @@ -0,0 +1,4 @@ +<?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="32" width="32" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/"> + <path d="m13.733 0.00064c-0.52991 0-0.93331 0.40337-0.93331 0.93333v2.6666c-1.182 0.3034-2.243 0.7934-3.2668 1.4001l-1.9334-1.9334c-0.3747-0.3747-0.9586-0.3747-1.3333 0l-3.1999 3.2c-0.37473 0.37474-0.37473 0.95859 0 1.3333l1.9334 1.9335c-0.6067 1.0239-1.0967 2.0849-1.4001 3.2669h-2.6666c-0.52994 0-0.9333 0.403-0.9333 0.933v4.5333c2e-8 0.52996 0.40336 0.93333 0.93331 0.93333h2.6666c0.30335 1.1817 0.79332 2.2426 1.4 3.2666l-1.9334 1.9349c-0.37473 0.37474-0.37473 0.95859 0 1.3333l3.1999 3.2c0.37473 0.37474 0.95857 0.37474 1.3333 0l1.9334-1.9349c1.024 0.608 2.0849 1.0965 3.2665 1.3995v2.6667c0 0.53 0.403 0.933 0.933 0.933h4.5332c0.52991 0 0.93331-0.4032 0.93331-0.9344v-2.6667c1.1816-0.30336 2.2425-0.79335 3.2665-1.4l1.9333 1.9333c0.37473 0.37474 0.95857 0.37474 1.3333 0l3.1999-3.2c0.37473-0.37474 0.37473-0.95859 0-1.3333l-1.9327-1.9328c0.60798-1.024 1.0965-2.0845 1.3994-3.2661h2.6666c0.532 0 0.935-0.403 0.935-0.933v-4.534c0-0.53-0.403-0.933-0.934-0.933h-2.667c-0.303-1.182-0.791-2.243-1.399-3.2666l1.932-1.9334c0.37473-0.37474 0.37473-0.95859 0-1.3333l-3.2-3.2c-0.37473-0.37474-0.95857-0.37474-1.3333 0l-1.9327 1.9334c-1.024-0.6067-2.084-1.0967-3.266-1.4001v-2.6667c0-0.52993-0.403-0.9333-0.933-0.9333zm2.2666 8.8689c3.9361 0 7.1309 3.1947 7.1309 7.1311 0 3.9362-3.1946 7.1311-7.1309 7.1311-3.9361 0-7.1309-3.1955-7.1309-7.1317s3.1948-7.1311 7.1309-7.1311z" display="block" fill="#fff"/> +</svg> diff --git a/apps/user_ldap/ajax/wizard.php b/apps/user_ldap/ajax/wizard.php index 48bfb56311c..7c4ef3a9a29 100644 --- a/apps/user_ldap/ajax/wizard.php +++ b/apps/user_ldap/ajax/wizard.php @@ -85,7 +85,7 @@ switch($action) { exit; } } catch (\Exception $e) { - \OCP\JSON::error(array('message' => $e->getMessage())); + \OCP\JSON::error(array('message' => $e->getMessage(), 'code' => $e->getCode())); exit; } \OCP\JSON::error(); diff --git a/apps/user_ldap/appinfo/app.php b/apps/user_ldap/appinfo/app.php index 911688a5c20..6895cdbe843 100644 --- a/apps/user_ldap/appinfo/app.php +++ b/apps/user_ldap/appinfo/app.php @@ -57,7 +57,6 @@ if(count($configPrefixes) > 0) { OC_Group::useBackend($groupBackend); } -OCP\Util::addTranslations('user_ldap'); OCP\Backgroundjob::registerJob('OCA\user_ldap\lib\Jobs'); OCP\Backgroundjob::registerJob('\OCA\User_LDAP\Jobs\CleanUp'); diff --git a/apps/user_ldap/appinfo/info.xml b/apps/user_ldap/appinfo/info.xml index a1a934f0140..88462902421 100644 --- a/apps/user_ldap/appinfo/info.xml +++ b/apps/user_ldap/appinfo/info.xml @@ -18,4 +18,7 @@ A user logs into ownCloud with their LDAP or AD credentials, and is granted acce <admin>admin-ldap</admin> </documentation> <ocsid>166061</ocsid> + <dependencies> + <lib>ldap</lib> + </dependencies> </info> diff --git a/apps/user_ldap/appinfo/update.php b/apps/user_ldap/appinfo/update.php deleted file mode 100644 index b4121b19852..00000000000 --- a/apps/user_ldap/appinfo/update.php +++ /dev/null @@ -1,48 +0,0 @@ -<?php - -$configInstance = \OC::$server->getConfig(); - -//detect if we can switch on naming guidelines. We won't do it on conflicts. -//it's a bit spaghetti, but hey. -$state = $configInstance->getSystemValue('ldapIgnoreNamingRules', 'unset'); -if($state === 'unset') { - $configInstance->setSystemValue('ldapIgnoreNamingRules', false); -} - -$installedVersion = $configInstance->getAppValue('user_ldap', 'installed_version'); -$enableRawMode = version_compare($installedVersion, '0.4.1', '<'); - -$helper = new \OCA\user_ldap\lib\Helper(); -$configPrefixes = $helper->getServerConfigurationPrefixes(true); -$ldap = new OCA\user_ldap\lib\LDAP(); -foreach($configPrefixes as $config) { - $connection = new OCA\user_ldap\lib\Connection($ldap, $config); - - $state = $configInstance->getAppValue( - 'user_ldap', $config.'ldap_uuid_user_attribute', 'not existing'); - if($state === 'non existing') { - $value = $configInstance->getAppValue( - 'user_ldap', $config.'ldap_uuid_attribute', ''); - $configInstance->setAppValue( - 'user_ldap', $config.'ldap_uuid_user_attribute', $value); - $configInstance->setAppValue( - 'user_ldap', $config.'ldap_uuid_group_attribute', $value); - } - - $state = $configInstance->getAppValue( - 'user_ldap', $config.'ldap_expert_uuid_user_attr', 'not existing'); - if($state === 'non existing') { - $value = $configInstance->getAppValue( - 'user_ldap', $config.'ldap_expert_uuid_attr', ''); - $configInstance->setAppValue( - 'user_ldap', $config.'ldap_expert_uuid_user_attr', $value); - $configInstance->setAppValue( - 'user_ldap', $config.'ldap_expert_uuid_group_attr', $value); - } - - if($enableRawMode) { - $configInstance->setAppValue('user_ldap', $config.'ldap_user_filter_mode', 1); - $configInstance->setAppValue('user_ldap', $config.'ldap_login_filter_mode', 1); - $configInstance->setAppValue('user_ldap', $config.'ldap_group_filter_mode', 1); - } -} diff --git a/apps/user_ldap/appinfo/version b/apps/user_ldap/appinfo/version index 0bfccb08040..8f0916f768f 100644 --- a/apps/user_ldap/appinfo/version +++ b/apps/user_ldap/appinfo/version @@ -1 +1 @@ -0.4.5 +0.5.0 diff --git a/apps/user_ldap/img/app.svg b/apps/user_ldap/img/app.svg index 63a065afdc7..0ce7ed867bd 100644 --- a/apps/user_ldap/img/app.svg +++ b/apps/user_ldap/img/app.svg @@ -1,61 +1,5 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> -<svg - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - height="16" - width="16" - version="1.0" - id="svg2" - inkscape:version="0.48.5 r10040" - sodipodi:docname="app.svg"> - <metadata - id="metadata12"> - <rdf:RDF> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - </cc:Work> - </rdf:RDF> - </metadata> - <defs - id="defs10" /> - <sodipodi:namedview - pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="1" - objecttolerance="10" - gridtolerance="10" - guidetolerance="10" - inkscape:pageopacity="0" - inkscape:pageshadow="2" - inkscape:window-width="1920" - inkscape:window-height="1014" - id="namedview8" - showgrid="false" - inkscape:zoom="14.75" - inkscape:cx="-6.6440678" - inkscape:cy="8" - inkscape:window-x="0" - inkscape:window-y="27" - inkscape:window-maximized="1" - inkscape:current-layer="svg2" /> - <rect - style="color:#000000" - fill-opacity="0" - height="97.986" - width="163.31" - y="-32.993" - x="-62.897" - id="rect4" /> - <path - style="block-progression:tb;color:#000000;text-transform:none;text-indent:0;fill:#ffffff;fill-opacity:1" - d="m8.4036 1c-1.7312 0-3.1998 1.2661-3.1998 2.9 0.012287 0.51643 0.058473 1.1532 0.36664 2.5v0.033333l0.033328 0.033333c0.098928 0.28338 0.24289 0.44549 0.4333 0.66666s0.41742 0.48149 0.63328 0.69999c0.025397 0.025708 0.041676 0.041633 0.066656 0.066677 0.04281 0.18631 0.094672 0.38681 0.13332 0.56666 0.10284 0.47851 0.092296 0.81737 0.066668 0.93332-0.74389 0.26121-1.6694 0.57228-2.4998 0.93332-0.46622 0.2027-0.8881 0.3837-1.2332 0.59999-0.34513 0.2163-0.68837 0.37971-0.79994 0.86666-0.16004 0.63293-0.19866 0.7539-0.39997 1.5333-0.027212 0.20914 0.083011 0.42961 0.26665 0.53333 1.5078 0.81451 3.824 1.1423 6.1329 1.1333s4.6066-0.35609 6.0662-1.1333c0.11739-0.07353 0.14304-0.10869 0.13332-0.2333-0.04365-0.68908-0.08154-1.3669-0.13332-1.7666-0.01807-0.09908-0.06492-0.19275-0.13332-0.26666-0.46366-0.5537-1.1564-0.89218-1.9665-1.2333-0.7396-0.31144-1.6067-0.63486-2.4665-0.99999-0.048123-0.10721-0.095926-0.41912 0-0.89999 0.025759-0.12912 0.066096-0.26742 0.099994-0.4 0.0808-0.090507 0.14378-0.16447 0.23332-0.26666 0.19096-0.21796 0.39614-0.44661 0.56662-0.66666s0.30996-0.40882 0.39997-0.66666l0.03333-0.033333c0.34839-1.4062 0.34857-1.9929 0.36664-2.5v-0.033333c0-1.6339-1.4686-2.9-3.1998-2.9z" - id="path6" /> +<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/"> + <rect style="color:#000000" fill-opacity="0" height="97.986" width="163.31" y="-32.993" x="-62.897"/> + <path style="block-progression:tb;color:#000000;text-transform:none;text-indent:0" fill="#fff" d="m8.4036 1c-1.7312 0-3.1998 1.2661-3.1998 2.9 0.012287 0.51643 0.058473 1.1532 0.36664 2.5v0.033333l0.033328 0.033333c0.098928 0.28338 0.24289 0.44549 0.4333 0.66666s0.41742 0.48149 0.63328 0.69999c0.025397 0.025708 0.041676 0.041633 0.066656 0.066677 0.04281 0.18631 0.094672 0.38681 0.13332 0.56666 0.10284 0.47851 0.092296 0.81737 0.066668 0.93332-0.74389 0.26121-1.6694 0.57228-2.4998 0.93332-0.46622 0.2027-0.8881 0.3837-1.2332 0.59999-0.34513 0.2163-0.68837 0.37971-0.79994 0.86666-0.16004 0.63293-0.19866 0.7539-0.39997 1.5333-0.027212 0.20914 0.083011 0.42961 0.26665 0.53333 1.5078 0.81451 3.824 1.1423 6.1329 1.1333s4.6066-0.35609 6.0662-1.1333c0.11739-0.07353 0.14304-0.10869 0.13332-0.2333-0.04365-0.68908-0.08154-1.3669-0.13332-1.7666-0.01807-0.09908-0.06492-0.19275-0.13332-0.26666-0.46366-0.5537-1.1564-0.89218-1.9665-1.2333-0.7396-0.31144-1.6067-0.63486-2.4665-0.99999-0.048123-0.10721-0.095926-0.41912 0-0.89999 0.025759-0.12912 0.066096-0.26742 0.099994-0.4 0.0808-0.090507 0.14378-0.16447 0.23332-0.26666 0.19096-0.21796 0.39614-0.44661 0.56662-0.66666s0.30996-0.40882 0.39997-0.66666l0.03333-0.033333c0.34839-1.4062 0.34857-1.9929 0.36664-2.5v-0.033333c0-1.6339-1.4686-2.9-3.1998-2.9z"/> </svg> diff --git a/apps/user_ldap/js/experiencedAdmin.js b/apps/user_ldap/js/experiencedAdmin.js index 8d138eecc41..7dc5a4e503d 100644 --- a/apps/user_ldap/js/experiencedAdmin.js +++ b/apps/user_ldap/js/experiencedAdmin.js @@ -25,7 +25,7 @@ function ExperiencedAdmin(wizard, initialState) { /** * toggles whether the admin is an experienced one or not * - * @param {boolean} whether the admin is experienced or not + * @param {boolean} isExperienced whether the admin is experienced or not */ ExperiencedAdmin.prototype.setExperienced = function(isExperienced) { this._isExperienced = isExperienced; diff --git a/apps/user_ldap/js/ldapFilter.js b/apps/user_ldap/js/ldapFilter.js index 0f7d240adac..dc65858217d 100644 --- a/apps/user_ldap/js/ldapFilter.js +++ b/apps/user_ldap/js/ldapFilter.js @@ -19,6 +19,8 @@ function LdapFilter(target, determineModeCallback) { LdapFilter.prototype.activate = function() { if(this.activated) { + // might be necessary, if configuration changes happened. + this.findFeatures(); return; } this.activated = true; @@ -70,14 +72,6 @@ LdapFilter.prototype.compose = function(updateCount) { }; /** - * this function is triggered after attribute detectors have completed in - * LdapWizard - */ -LdapFilter.prototype.afterDetectorsRan = function() { - this.updateCount(); -}; - -/** * this function is triggered after LDAP filters have been composed successfully * @param {object} result returned by the ajax call */ @@ -99,11 +93,15 @@ LdapFilter.prototype.determineMode = function() { function(result) { var property = 'ldap' + filter.target + 'FilterMode'; filter.mode = parseInt(result.changes[property], 10); - if(filter.mode === LdapWizard.filterModeRaw && - $('#raw'+filter.target+'FilterContainer').hasClass('invisible')) { + var rawContainerIsInvisible = + $('#raw'+filter.target+'FilterContainer').hasClass('invisible'); + if ( filter.mode === LdapWizard.filterModeRaw + && rawContainerIsInvisible + ) { LdapWizard['toggleRaw'+filter.target+'Filter'](); - } else if(filter.mode === LdapWizard.filterModeAssisted && - !$('#raw'+filter.target+'FilterContainer').hasClass('invisible')) { + } else if ( filter.mode === LdapWizard.filterModeAssisted + && !rawContainerIsInvisible + ) { LdapWizard['toggleRaw'+filter.target+'Filter'](); } else { console.log('LDAP Wizard determineMode: returned mode was »' + @@ -142,8 +140,15 @@ LdapFilter.prototype.unlock = function() { } }; +/** + * resets this.foundFeatures so that LDAP queries can be fired again to retrieve + * objectClasses, groups, etc. + */ +LdapFilter.prototype.reAllowFeatureLookup = function () { + this.foundFeatures = false; +}; + LdapFilter.prototype.findFeatures = function() { - //TODO: reset this.foundFeatures when any base DN changes if(!this.foundFeatures && !this.locked && this.mode === LdapWizard.filterModeAssisted) { this.foundFeatures = true; var objcEl, avgrEl; @@ -167,7 +172,6 @@ LdapFilter.prototype.findFeatures = function() { /** * this function is triggered before user and group counts are executed * resolving the passed status variable will fire up counting - * @param {object} status an instance of $.Deferred */ LdapFilter.prototype.beforeUpdateCount = function() { var status = $.Deferred(); diff --git a/apps/user_ldap/js/settings.js b/apps/user_ldap/js/settings.js index 6db210fe435..768d62a18d1 100644 --- a/apps/user_ldap/js/settings.js +++ b/apps/user_ldap/js/settings.js @@ -149,6 +149,7 @@ var LdapWizard = { loginFilter: false, groupFilter: false, ajaxRequests: {}, + lastTestSuccessful: true, ajax: function(param, fnOnSuccess, fnOnError, reqID) { if(!_.isUndefined(reqID)) { @@ -207,7 +208,7 @@ var LdapWizard = { }, basicStatusCheck: function() { - //criterias to continue from the first tab + //criteria to continue from the first tab // - host, port, user filter, agent dn, password, base dn var host = $('#ldap_host').val(); var port = $('#ldap_port').val(); @@ -224,7 +225,7 @@ var LdapWizard = { blacklistAdd: function(id) { - obj = $('#'+id); + var obj = $('#' + id); if(!(obj[0].hasOwnProperty('multiple') && obj[0]['multiple'] === true)) { //no need to blacklist multiselect LdapWizard.saveBlacklist[id] = true; @@ -242,14 +243,14 @@ var LdapWizard = { }, checkBaseDN: function() { - host = $('#ldap_host').val(); - port = $('#ldap_port').val(); - user = $('#ldap_dn').val(); - pass = $('#ldap_agent_password').val(); + var host = $('#ldap_host').val(); + var port = $('#ldap_port').val(); + var user = $('#ldap_dn').val(); + var pass = $('#ldap_agent_password').val(); //FIXME: determine base dn with anonymous access if(host && port && user && pass) { - param = 'action=guessBaseDN'+ + var param = 'action=guessBaseDN'+ '&ldap_serverconfig_chooser='+ encodeURIComponent($('#ldap_serverconfig_chooser').val()); @@ -276,11 +277,11 @@ var LdapWizard = { }, checkPort: function() { - host = $('#ldap_host').val(); - port = $('#ldap_port').val(); + var host = $('#ldap_host').val(); + var port = $('#ldap_port').val(); if(host && !port) { - param = 'action=guessPortAndTLS'+ + var param = 'action=guessPortAndTLS'+ '&ldap_serverconfig_chooser='+ encodeURIComponent($('#ldap_serverconfig_chooser').val()); @@ -307,7 +308,7 @@ var LdapWizard = { }, controlBack: function() { - curTabIndex = $('#ldapSettings').tabs('option', 'active'); + var curTabIndex = $('#ldapSettings').tabs('option', 'active'); if(curTabIndex == 0) { return; } @@ -316,7 +317,7 @@ var LdapWizard = { }, controlContinue: function() { - curTabIndex = $('#ldapSettings').tabs('option', 'active'); + var curTabIndex = $('#ldapSettings').tabs('option', 'active'); if(curTabIndex == 3) { return; } @@ -350,7 +351,7 @@ var LdapWizard = { encodeURIComponent($('#ldap_serverconfig_chooser').val()); LdapWizard.showSpinner(spinnerID); - var request = LdapWizard.ajax(param, + LdapWizard.ajax(param, function(result) { LdapWizard.applyChanges(result); LdapWizard.hideSpinner(spinnerID); @@ -359,7 +360,7 @@ var LdapWizard = { } }, function (result) { - OC.Notification.show('Counting the entries failed with, ' + result.message); + OC.Notification.showTemporary('Counting the entries failed with: ' + result.message); LdapWizard.hideSpinner(spinnerID); if(!_.isUndefined(doneCallback)) { doneCallback(method); @@ -370,11 +371,17 @@ var LdapWizard = { }, countGroups: function(doneCallback) { - LdapWizard._countThings('countGroups', '#ldap_group_count', doneCallback); + var groupFilter = $('#ldap_group_filter').val(); + if(!_.isEmpty(groupFilter)) { + LdapWizard._countThings('countGroups', '#ldap_group_count', doneCallback); + } }, countUsers: function(doneCallback) { - LdapWizard._countThings('countUsers', '#ldap_user_count', doneCallback); + var userFilter = $('#ldap_userlist_filter').val(); + if(!_.isEmpty(userFilter)) { + LdapWizard._countThings('countUsers', '#ldap_user_count', doneCallback); + } }, /** @@ -529,7 +536,7 @@ var LdapWizard = { if(type !== 'User' && type !== 'Group') { return false; } - param = 'action=determine'+encodeURIComponent(type)+'ObjectClasses'+ + var param = 'action=determine'+encodeURIComponent(type)+'ObjectClasses'+ '&ldap_serverconfig_chooser='+ encodeURIComponent($('#ldap_serverconfig_chooser').val()); @@ -571,11 +578,11 @@ var LdapWizard = { functionalityCheck: function() { //criteria to enable the connection: // - host, port, basedn, user filter, login filter - host = $('#ldap_host').val(); - port = $('#ldap_port').val(); - base = $('#ldap_base').val(); - userfilter = $('#ldap_userlist_filter').val(); - loginfilter = $('#ldap_login_filter').val(); + var host = $('#ldap_host').val(); + var port = $('#ldap_port').val(); + var base = $('#ldap_base').val(); + var userfilter = $('#ldap_userlist_filter').val(); + var loginfilter = $('#ldap_login_filter').val(); //FIXME: activates a manually deactivated configuration. if(host && port && base && userfilter && loginfilter) { @@ -619,6 +626,7 @@ var LdapWizard = { LdapWizard.detectorsRunInXPMode = 0; LdapWizard.instantiateFilters(); LdapWizard.admin.setExperienced($('#ldap_experienced_admin').is(':checked')); + LdapWizard.lastTestSuccessful = true; LdapWizard.basicStatusCheck(); LdapWizard.functionalityCheck(); LdapWizard.isConfigurationActiveControlLocked = false; @@ -760,7 +768,19 @@ var LdapWizard = { } }, - processChanges: function(triggerObj) { + /** + * allows UserFilter, LoginFilter and GroupFilter to lookup objectClasses + * and similar again. This should be called after essential changes, e.g. + * Host or BaseDN changes, or positive functionality check + * + */ + allowFilterFeatureSearch: function () { + LdapWizard.userFilter.reAllowFeatureLookup(); + LdapWizard.loginFilter.reAllowFeatureLookup(); + LdapWizard.groupFilter.reAllowFeatureLookup(); + }, + + processChanges: function (triggerObj) { LdapWizard.hideInfoBox(); if(triggerObj.id === 'ldap_host' @@ -771,6 +791,7 @@ var LdapWizard = { if($('#ldap_port').val()) { //if Port is already set, check BaseDN LdapWizard.checkBaseDN(); + LdapWizard.allowFilterFeatureSearch(); } } @@ -804,15 +825,33 @@ var LdapWizard = { LdapWizard._save(inputObj, val); }, + /** + * updates user or group count on multiSelect close. Resets the event + * function subsequently. + * + * @param {LdapFilter} filter + * @param {Object} $multiSelectObj + */ + onMultiSelectClose: function(filter, $multiSelectObj) { + filter.updateCount(); + $multiSelectObj.multiselect({close: function(){}}); + }, + saveMultiSelect: function(originalObj, resultObj) { - values = ''; - for(i = 0; i < resultObj.length; i++) { + var values = ''; + for(var i = 0; i < resultObj.length; i++) { values = values + "\n" + resultObj[i].value; } LdapWizard._save($('#'+originalObj)[0], $.trim(values)); + var $multiSelectObj = $('#'+originalObj); + var updateCount = !$multiSelectObj.multiselect("isOpen"); + var applyUpdateOnCloseToFilter; if(originalObj === 'ldap_userfilter_objectclass' || originalObj === 'ldap_userfilter_groups') { - LdapWizard.userFilter.compose(true); + LdapWizard.userFilter.compose(updateCount); + if(!updateCount) { + applyUpdateOnCloseToFilter = LdapWizard.userFilter; + } //when user filter is changed afterwards, login filter needs to //be adjusted, too if(!LdapWizard.loginFilter) { @@ -823,7 +862,19 @@ var LdapWizard = { LdapWizard.loginFilter.compose(); } else if(originalObj === 'ldap_groupfilter_objectclass' || originalObj === 'ldap_groupfilter_groups') { - LdapWizard.groupFilter.compose(true); + LdapWizard.groupFilter.compose(updateCount); + if(!updateCount) { + applyUpdateOnCloseToFilter = LdapWizard.groupFilter; + } + } + + if(applyUpdateOnCloseToFilter instanceof LdapFilter) { + $multiSelectObj.multiselect({ + close: function () { + LdapWizard.onMultiSelectClose( + applyUpdateOnCloseToFilter, $multiSelectObj); + } + }); } }, @@ -1002,6 +1053,10 @@ var LdapWizard = { $('.ldap_config_state_indicator').addClass('ldap_grey'); $('.ldap_config_state_indicator_sign').removeClass('error'); $('.ldap_config_state_indicator_sign').addClass('success'); + if(!LdapWizard.lastTestSuccessful) { + LdapWizard.lastTestSuccessful = true; + LdapWizard.allowFilterFeatureSearch(); + } }, //onError function(result) { @@ -1011,6 +1066,7 @@ var LdapWizard = { $('.ldap_config_state_indicator').removeClass('ldap_grey'); $('.ldap_config_state_indicator_sign').addClass('error'); $('.ldap_config_state_indicator_sign').removeClass('success'); + LdapWizard.lastTestSuccessful = false; } ); } else { diff --git a/apps/user_ldap/l10n/ar.js b/apps/user_ldap/l10n/ar.js index 6b5cdf33d48..ddbdc482b86 100644 --- a/apps/user_ldap/l10n/ar.js +++ b/apps/user_ldap/l10n/ar.js @@ -40,6 +40,7 @@ OC.L10N.register( "Port" : "المنفذ", "Password" : "كلمة المرور", "Back" : "رجوع", + "Continue" : "المتابعة", "Advanced" : "تعديلات متقدمه", "Email Field" : "خانة البريد الإلكتروني" }, diff --git a/apps/user_ldap/l10n/ar.json b/apps/user_ldap/l10n/ar.json index 4bf07f625d5..178e8f0acd8 100644 --- a/apps/user_ldap/l10n/ar.json +++ b/apps/user_ldap/l10n/ar.json @@ -38,6 +38,7 @@ "Port" : "المنفذ", "Password" : "كلمة المرور", "Back" : "رجوع", + "Continue" : "المتابعة", "Advanced" : "تعديلات متقدمه", "Email Field" : "خانة البريد الإلكتروني" },"pluralForm" :"nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;" diff --git a/apps/user_ldap/l10n/de.js b/apps/user_ldap/l10n/de.js index 545fb9c194f..ba6d9c214f3 100644 --- a/apps/user_ldap/l10n/de.js +++ b/apps/user_ldap/l10n/de.js @@ -111,12 +111,12 @@ OC.L10N.register( "Nested Groups" : "Eingebundene Gruppen", "When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" : "Wenn aktiviert, werden Gruppen, die Gruppen enthalten, unterstützt. (Funktioniert nur, wenn das Merkmal des Gruppenmitgliedes den Domain-Namen enthält.)", "Paging chunksize" : "Seitenstücke (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.)" : "Die Größe der Seitenstücke (Chunksize) wird für seitenbezogene LDAP-Suchen verwendet die sehr viele Ergebnisse z.B. Nutzer- und Gruppenaufzählungen liefern. (Die Einstellung 0 deaktiviert das seitenbezogene LDAP-Suchen in diesen Situationen)", + "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.)" : "Abschnittslänge von seitenweise angezeigten LDAP-Suchen, die bei Suchen wie etwa Benutzer- und Gruppen-Auflistungen ausufernd viele Ergebnisse liefern können (die Einstellung „0“ deaktiviert seitenweise angezeigte LDAP-Suchen in diesen Situationen).", "Special Attributes" : "Spezielle Eigenschaften", "Quota Field" : "Kontingent Feld", "Quota Default" : "Standard Kontingent", "in bytes" : "in Bytes", - "Email Field" : "E-Mail Feld", + "Email Field" : "E-Mail-Feld", "User Home Folder Naming Rule" : "Benennungsregel für das Home-Verzeichnis des Benutzers", "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Ohne Eingabe wird der Benutzername (Standard) verwendet. Anderenfall trage ein LDAP/AD-Attribut ein.", "Internal Username" : "Interner Benutzername", @@ -128,7 +128,7 @@ OC.L10N.register( "UUID Attribute for Groups:" : "UUID-Attribute für Gruppen:", "Username-LDAP User Mapping" : "LDAP-Benutzernamenzuordnung", "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." : "Die Benutzernamen werden genutzt, um (Meta)Daten zuzuordnen und zu speichern. Um Benutzer eindeutig und präzise zu identifizieren, hat jeder LDAP-Benutzer einen internen Benutzernamen. Dies erfordert eine Zuordnung (mappen) von Benutzernamen zum LDAP-Benutzer. Der erstellte Benutzername wird der UUID des LDAP-Benutzernamens zugeordnet. Zusätzlich wird der DN zwischengespeichert, um die Interaktion mit dem LDAP zu minimieren, was aber nicht der Identifikation dient. Ändert sich der DN, werden die Änderungen durch gefunden. Der interne Benutzername, wird in überall verwendet. Werden die Zuordnungen gelöscht, bleiben überall Reste zurück. Die Löschung der Zuordnungen kann nicht in der Konfiguration vorgenommen werden, beeinflusst aber die LDAP-Konfiguration! Löschen Sie niemals die Zuordnungen in einer produktiven Umgebung. Lösche die Zuordnungen nur in einer Test- oder Experimentierumgebung.", - "Clear Username-LDAP User Mapping" : "Lösche LDAP-Benutzernamenzuordnung", - "Clear Groupname-LDAP Group Mapping" : "Lösche LDAP-Gruppennamenzuordnung" + "Clear Username-LDAP User Mapping" : "LDAP-Benutzernamenzuordnung löschen", + "Clear Groupname-LDAP Group Mapping" : "LDAP-Gruppennamenzuordnung löschen" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/user_ldap/l10n/de.json b/apps/user_ldap/l10n/de.json index df0f777536a..df4af011afc 100644 --- a/apps/user_ldap/l10n/de.json +++ b/apps/user_ldap/l10n/de.json @@ -109,12 +109,12 @@ "Nested Groups" : "Eingebundene Gruppen", "When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" : "Wenn aktiviert, werden Gruppen, die Gruppen enthalten, unterstützt. (Funktioniert nur, wenn das Merkmal des Gruppenmitgliedes den Domain-Namen enthält.)", "Paging chunksize" : "Seitenstücke (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.)" : "Die Größe der Seitenstücke (Chunksize) wird für seitenbezogene LDAP-Suchen verwendet die sehr viele Ergebnisse z.B. Nutzer- und Gruppenaufzählungen liefern. (Die Einstellung 0 deaktiviert das seitenbezogene LDAP-Suchen in diesen Situationen)", + "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.)" : "Abschnittslänge von seitenweise angezeigten LDAP-Suchen, die bei Suchen wie etwa Benutzer- und Gruppen-Auflistungen ausufernd viele Ergebnisse liefern können (die Einstellung „0“ deaktiviert seitenweise angezeigte LDAP-Suchen in diesen Situationen).", "Special Attributes" : "Spezielle Eigenschaften", "Quota Field" : "Kontingent Feld", "Quota Default" : "Standard Kontingent", "in bytes" : "in Bytes", - "Email Field" : "E-Mail Feld", + "Email Field" : "E-Mail-Feld", "User Home Folder Naming Rule" : "Benennungsregel für das Home-Verzeichnis des Benutzers", "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Ohne Eingabe wird der Benutzername (Standard) verwendet. Anderenfall trage ein LDAP/AD-Attribut ein.", "Internal Username" : "Interner Benutzername", @@ -126,7 +126,7 @@ "UUID Attribute for Groups:" : "UUID-Attribute für Gruppen:", "Username-LDAP User Mapping" : "LDAP-Benutzernamenzuordnung", "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." : "Die Benutzernamen werden genutzt, um (Meta)Daten zuzuordnen und zu speichern. Um Benutzer eindeutig und präzise zu identifizieren, hat jeder LDAP-Benutzer einen internen Benutzernamen. Dies erfordert eine Zuordnung (mappen) von Benutzernamen zum LDAP-Benutzer. Der erstellte Benutzername wird der UUID des LDAP-Benutzernamens zugeordnet. Zusätzlich wird der DN zwischengespeichert, um die Interaktion mit dem LDAP zu minimieren, was aber nicht der Identifikation dient. Ändert sich der DN, werden die Änderungen durch gefunden. Der interne Benutzername, wird in überall verwendet. Werden die Zuordnungen gelöscht, bleiben überall Reste zurück. Die Löschung der Zuordnungen kann nicht in der Konfiguration vorgenommen werden, beeinflusst aber die LDAP-Konfiguration! Löschen Sie niemals die Zuordnungen in einer produktiven Umgebung. Lösche die Zuordnungen nur in einer Test- oder Experimentierumgebung.", - "Clear Username-LDAP User Mapping" : "Lösche LDAP-Benutzernamenzuordnung", - "Clear Groupname-LDAP Group Mapping" : "Lösche LDAP-Gruppennamenzuordnung" + "Clear Username-LDAP User Mapping" : "LDAP-Benutzernamenzuordnung löschen", + "Clear Groupname-LDAP Group Mapping" : "LDAP-Gruppennamenzuordnung löschen" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/user_ldap/l10n/de_DE.js b/apps/user_ldap/l10n/de_DE.js index c89d7793a4a..a007f589ef6 100644 --- a/apps/user_ldap/l10n/de_DE.js +++ b/apps/user_ldap/l10n/de_DE.js @@ -37,7 +37,7 @@ OC.L10N.register( "Could not find the desired feature" : "Konnte die gewünschte Funktion nicht finden", "Invalid Host" : "Ungültiger Host", "Server" : "Server", - "User Filter" : "Nutzer-Filter", + "User Filter" : "Benutzer-Filter", "Login Filter" : "Anmeldefilter", "Group Filter" : "Gruppen-Filter", "Save" : "Speichern", @@ -51,7 +51,7 @@ OC.L10N.register( "The filter specifies which LDAP groups shall have access to the %s instance." : "Der Filter definiert welche LDAP-Gruppen Zugriff auf die %s Instanz haben sollen.", "Test Filter" : "Test-Filter", "groups found" : "Gruppen gefunden", - "Users login with this attribute:" : "Nutzeranmeldung mit diesem Merkmal:", + "Users login with this attribute:" : "Benutzeranmeldung mit diesem Merkmal:", "LDAP Username:" : "LDAP-Benutzername:", "LDAP Email Address:" : "LDAP E-Mail-Adresse:", "Other Attributes:" : "Andere Attribute:", @@ -111,7 +111,7 @@ OC.L10N.register( "Nested Groups" : "Eingebundene Gruppen", "When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" : "Wenn aktiviert, werden Gruppen, die Gruppen enthalten, unterstützt. (Funktioniert nur, wenn das Merkmal des Gruppenmitgliedes den Domain-Namen enthält.)", "Paging chunksize" : "Seitenstücke (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.)" : "Die Größe der Seitenstücke (Chunksize) wird für seitenbezogene LDAP-Suchen verwendet die sehr viele Ergebnisse z.B. Nutzer- und Gruppenaufzählungen liefern. (Die Einstellung 0 deaktiviert das seitenbezogene LDAP-Suchen in diesen Situationen)", + "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.)" : "Abschnittslänge von seitenweise angezeigten LDAP-Suchen, die bei Suchen wie etwa Benutzer- und Gruppen-Auflistungen ausufernd viele Ergebnisse liefern können (die Einstellung „0“ deaktiviert seitenweise angezeigte LDAP-Suchen in diesen Situationen).", "Special Attributes" : "Spezielle Eigenschaften", "Quota Field" : "Kontingent-Feld", "Quota Default" : "Standard-Kontingent", diff --git a/apps/user_ldap/l10n/de_DE.json b/apps/user_ldap/l10n/de_DE.json index 7b047cbcd2f..5fdb285a863 100644 --- a/apps/user_ldap/l10n/de_DE.json +++ b/apps/user_ldap/l10n/de_DE.json @@ -35,7 +35,7 @@ "Could not find the desired feature" : "Konnte die gewünschte Funktion nicht finden", "Invalid Host" : "Ungültiger Host", "Server" : "Server", - "User Filter" : "Nutzer-Filter", + "User Filter" : "Benutzer-Filter", "Login Filter" : "Anmeldefilter", "Group Filter" : "Gruppen-Filter", "Save" : "Speichern", @@ -49,7 +49,7 @@ "The filter specifies which LDAP groups shall have access to the %s instance." : "Der Filter definiert welche LDAP-Gruppen Zugriff auf die %s Instanz haben sollen.", "Test Filter" : "Test-Filter", "groups found" : "Gruppen gefunden", - "Users login with this attribute:" : "Nutzeranmeldung mit diesem Merkmal:", + "Users login with this attribute:" : "Benutzeranmeldung mit diesem Merkmal:", "LDAP Username:" : "LDAP-Benutzername:", "LDAP Email Address:" : "LDAP E-Mail-Adresse:", "Other Attributes:" : "Andere Attribute:", @@ -109,7 +109,7 @@ "Nested Groups" : "Eingebundene Gruppen", "When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" : "Wenn aktiviert, werden Gruppen, die Gruppen enthalten, unterstützt. (Funktioniert nur, wenn das Merkmal des Gruppenmitgliedes den Domain-Namen enthält.)", "Paging chunksize" : "Seitenstücke (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.)" : "Die Größe der Seitenstücke (Chunksize) wird für seitenbezogene LDAP-Suchen verwendet die sehr viele Ergebnisse z.B. Nutzer- und Gruppenaufzählungen liefern. (Die Einstellung 0 deaktiviert das seitenbezogene LDAP-Suchen in diesen Situationen)", + "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.)" : "Abschnittslänge von seitenweise angezeigten LDAP-Suchen, die bei Suchen wie etwa Benutzer- und Gruppen-Auflistungen ausufernd viele Ergebnisse liefern können (die Einstellung „0“ deaktiviert seitenweise angezeigte LDAP-Suchen in diesen Situationen).", "Special Attributes" : "Spezielle Eigenschaften", "Quota Field" : "Kontingent-Feld", "Quota Default" : "Standard-Kontingent", diff --git a/apps/user_ldap/l10n/eu.js b/apps/user_ldap/l10n/eu.js index 520c47a839e..3da1f9be156 100644 --- a/apps/user_ldap/l10n/eu.js +++ b/apps/user_ldap/l10n/eu.js @@ -33,6 +33,7 @@ OC.L10N.register( "Confirm Deletion" : "Baieztatu Ezabatzea", "_%s group found_::_%s groups found_" : ["Talde %s aurkitu da","%s talde aurkitu dira"], "_%s user found_::_%s users found_" : ["Erabiltzaile %s aurkitu da","%s erabiltzaile aurkitu dira"], + "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Ezin izan da erabiltzailearen bistaratze izenaren atributua antzeman. Mesedez zehaztu ldap ezarpen aurreratuetan.", "Could not find the desired feature" : "Ezin izan da nahi zen ezaugarria aurkitu", "Invalid Host" : "Baliogabeko hostalaria", "Server" : "Zerbitzaria", @@ -47,6 +48,7 @@ OC.L10N.register( "only from those groups:" : "bakarrik talde hauetakoak:", "Raw LDAP filter" : "Raw LDAP iragazkia", "The filter specifies which LDAP groups shall have access to the %s instance." : "Iragazkiak zehazten du ze LDAP taldek izango duten sarrera %s instantziara:", + "Test Filter" : "Frogatu Iragazkia", "groups found" : "talde aurkituta", "Users login with this attribute:" : "Erabiltzaileak atributu honekin sartzen dira:", "LDAP Username:" : "LDAP Erabiltzaile izena:", @@ -66,12 +68,14 @@ OC.L10N.register( "For anonymous access, leave DN and Password empty." : "Sarrera anonimoak gaitzeko utzi DN eta Pasahitza hutsik.", "One Base DN per line" : "DN Oinarri bat lerroko", "You can specify Base DN for users and groups in the Advanced tab" : "Erabiltzaile eta taldeentzako Oinarrizko DN zehaztu dezakezu Aurreratu fitxan", + "Manually enter LDAP filters (recommended for large directories)" : "Eskuz sartu LDAP iragazkiak (direktorio handietarako gomendatuta)", "Limit %s access to users meeting these criteria:" : "Mugatu %s sarbidea baldintza horiek betetzen dituzten erabiltzaileei.", "The filter specifies which LDAP users shall have access to the %s instance." : "Iragazkiak zehazten du ze LDAP erabiltzailek izango duten sarrera %s instantziara:", "users found" : "erabiltzaile aurkituta", "Saving" : "Gordetzen", "Back" : "Atzera", "Continue" : "Jarraitu", + "LDAP" : "LDAP", "Expert" : "Aditua", "Advanced" : "Aurreratua", "<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." : "<b>Abisua:</b> user_ldap eta user_webdavauth aplikazioak bateraezinak dira. Portaera berezia izan dezakezu. Mesedez eskatu zure sistema kudeatzaileari bietako bat desgaitzeko.", diff --git a/apps/user_ldap/l10n/eu.json b/apps/user_ldap/l10n/eu.json index 67c82070861..1c698593f56 100644 --- a/apps/user_ldap/l10n/eu.json +++ b/apps/user_ldap/l10n/eu.json @@ -31,6 +31,7 @@ "Confirm Deletion" : "Baieztatu Ezabatzea", "_%s group found_::_%s groups found_" : ["Talde %s aurkitu da","%s talde aurkitu dira"], "_%s user found_::_%s users found_" : ["Erabiltzaile %s aurkitu da","%s erabiltzaile aurkitu dira"], + "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Ezin izan da erabiltzailearen bistaratze izenaren atributua antzeman. Mesedez zehaztu ldap ezarpen aurreratuetan.", "Could not find the desired feature" : "Ezin izan da nahi zen ezaugarria aurkitu", "Invalid Host" : "Baliogabeko hostalaria", "Server" : "Zerbitzaria", @@ -45,6 +46,7 @@ "only from those groups:" : "bakarrik talde hauetakoak:", "Raw LDAP filter" : "Raw LDAP iragazkia", "The filter specifies which LDAP groups shall have access to the %s instance." : "Iragazkiak zehazten du ze LDAP taldek izango duten sarrera %s instantziara:", + "Test Filter" : "Frogatu Iragazkia", "groups found" : "talde aurkituta", "Users login with this attribute:" : "Erabiltzaileak atributu honekin sartzen dira:", "LDAP Username:" : "LDAP Erabiltzaile izena:", @@ -64,12 +66,14 @@ "For anonymous access, leave DN and Password empty." : "Sarrera anonimoak gaitzeko utzi DN eta Pasahitza hutsik.", "One Base DN per line" : "DN Oinarri bat lerroko", "You can specify Base DN for users and groups in the Advanced tab" : "Erabiltzaile eta taldeentzako Oinarrizko DN zehaztu dezakezu Aurreratu fitxan", + "Manually enter LDAP filters (recommended for large directories)" : "Eskuz sartu LDAP iragazkiak (direktorio handietarako gomendatuta)", "Limit %s access to users meeting these criteria:" : "Mugatu %s sarbidea baldintza horiek betetzen dituzten erabiltzaileei.", "The filter specifies which LDAP users shall have access to the %s instance." : "Iragazkiak zehazten du ze LDAP erabiltzailek izango duten sarrera %s instantziara:", "users found" : "erabiltzaile aurkituta", "Saving" : "Gordetzen", "Back" : "Atzera", "Continue" : "Jarraitu", + "LDAP" : "LDAP", "Expert" : "Aditua", "Advanced" : "Aurreratua", "<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." : "<b>Abisua:</b> user_ldap eta user_webdavauth aplikazioak bateraezinak dira. Portaera berezia izan dezakezu. Mesedez eskatu zure sistema kudeatzaileari bietako bat desgaitzeko.", diff --git a/apps/user_ldap/l10n/fr.js b/apps/user_ldap/l10n/fr.js index e9574595491..0783dd94af7 100644 --- a/apps/user_ldap/l10n/fr.js +++ b/apps/user_ldap/l10n/fr.js @@ -35,10 +35,10 @@ OC.L10N.register( "_%s user found_::_%s users found_" : ["%s utilisateur trouvé","%s utilisateurs trouvés"], "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Impossible de détecter l'attribut contenant le nom d'affichage des utilisateurs. Veuillez l'indiquer vous-même dans les paramètres ldap avancés.", "Could not find the desired feature" : "Impossible de trouver la fonction souhaitée", - "Invalid Host" : "Hôte invalide", + "Invalid Host" : "Hôte non valide", "Server" : "Serveur", "User Filter" : "Filtre utilisateur", - "Login Filter" : "Filtre par nom d'utilisateur", + "Login Filter" : "Filtre de login", "Group Filter" : "Filtre de groupes", "Save" : "Sauvegarder", "Test Configuration" : "Tester la configuration", @@ -100,13 +100,13 @@ OC.L10N.register( "The LDAP attribute to use to generate the user's display name." : "L'attribut LDAP utilisé pour générer le nom d'affichage de l'utilisateur.", "Base User Tree" : "DN racine de l'arbre utilisateurs", "One User Base DN per line" : "Un DN racine utilisateur par ligne", - "User Search Attributes" : "Recherche des attributs utilisateur", + "User Search Attributes" : "Attributs de recherche utilisateurs", "Optional; one attribute per line" : "Optionnel, un attribut par ligne", "Group Display Name Field" : "Champ \"nom d'affichage\" du groupe", "The LDAP attribute to use to generate the groups's display name." : "L'attribut LDAP utilisé pour générer le nom d'affichage du groupe.", - "Base Group Tree" : "DN racine de l'arbre groupes", + "Base Group Tree" : "Base Group Tree", "One Group Base DN per line" : "Un DN racine groupe par ligne", - "Group Search Attributes" : "Recherche des attributs du groupe", + "Group Search Attributes" : "Attributs de recherche des groupes", "Group-Member association" : "Association groupe-membre", "Nested Groups" : "Groupes imbriqués", "When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" : "Si activé, les groupes contenant d'autres groupes sont pris en charge (fonctionne uniquement si l'attribut membre du groupe contient des DNs).", @@ -127,7 +127,7 @@ OC.L10N.register( "UUID Attribute for Users:" : "Attribut UUID pour les utilisateurs :", "UUID Attribute for Groups:" : "Attribut UUID pour les groupes :", "Username-LDAP User Mapping" : "Association Nom d'utilisateur-Utilisateur 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." : "Les noms d'utilisateurs sont utilisés pour le stockage et l'assignation de (meta) données. Pour identifier et reconnaitre précisément les utilisateurs, chaque utilisateur LDAP aura un nom interne spécifique. Cela requiert l'association d'un nom d'utilisateur ownCloud à un nom d'utilisateur LDAP. Le nom d'utilisateur créé est associé à l'attribut UUID de l'utilisateur LDAP. Par ailleurs, le DN est mémorisé en cache pour limiter les interactions LDAP mais il n'est pas utilisé pour l'identification. Si le DN est modifié, ces modifications seront retrouvées. Seul le nom interne à ownCloud est utilisé au sein du produit. Supprimer les associations créera des orphelins et l'action affectera toutes les configurations LDAP. NE JAMAIS SUPPRIMER LES ASSOCIATIONS EN ENVIRONNEMENT DE PRODUCTION, mais uniquement sur des environnements de tests et d'expérimentation.", + "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." : "Les noms d'utilisateurs sont utilisés pour le stockage et l'assignation de (meta) données. Pour identifier et reconnaître précisément les utilisateurs, chaque utilisateur LDAP aura un nom interne spécifique. Cela requiert l'association d'un nom d'utilisateur ownCloud à un nom d'utilisateur LDAP. Le nom d'utilisateur créé est associé à l'attribut UUID de l'utilisateur LDAP. Par ailleurs, le DN est mémorisé en cache pour limiter les interactions LDAP mais il n'est pas utilisé pour l'identification. Si le DN est modifié, ces modifications seront retrouvées. Seul le nom interne à ownCloud est utilisé au sein du produit. Supprimer les associations créera des orphelins et l'action affectera toutes les configurations LDAP. NE JAMAIS SUPPRIMER LES ASSOCIATIONS EN ENVIRONNEMENT DE PRODUCTION, mais uniquement sur des environnements de tests et d'expérimentation.", "Clear Username-LDAP User Mapping" : "Supprimer l'association utilisateur interne-utilisateur LDAP", "Clear Groupname-LDAP Group Mapping" : "Supprimer l'association nom de groupe-groupe LDAP" }, diff --git a/apps/user_ldap/l10n/fr.json b/apps/user_ldap/l10n/fr.json index b9012718362..06cc2e9c60e 100644 --- a/apps/user_ldap/l10n/fr.json +++ b/apps/user_ldap/l10n/fr.json @@ -33,10 +33,10 @@ "_%s user found_::_%s users found_" : ["%s utilisateur trouvé","%s utilisateurs trouvés"], "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Impossible de détecter l'attribut contenant le nom d'affichage des utilisateurs. Veuillez l'indiquer vous-même dans les paramètres ldap avancés.", "Could not find the desired feature" : "Impossible de trouver la fonction souhaitée", - "Invalid Host" : "Hôte invalide", + "Invalid Host" : "Hôte non valide", "Server" : "Serveur", "User Filter" : "Filtre utilisateur", - "Login Filter" : "Filtre par nom d'utilisateur", + "Login Filter" : "Filtre de login", "Group Filter" : "Filtre de groupes", "Save" : "Sauvegarder", "Test Configuration" : "Tester la configuration", @@ -98,13 +98,13 @@ "The LDAP attribute to use to generate the user's display name." : "L'attribut LDAP utilisé pour générer le nom d'affichage de l'utilisateur.", "Base User Tree" : "DN racine de l'arbre utilisateurs", "One User Base DN per line" : "Un DN racine utilisateur par ligne", - "User Search Attributes" : "Recherche des attributs utilisateur", + "User Search Attributes" : "Attributs de recherche utilisateurs", "Optional; one attribute per line" : "Optionnel, un attribut par ligne", "Group Display Name Field" : "Champ \"nom d'affichage\" du groupe", "The LDAP attribute to use to generate the groups's display name." : "L'attribut LDAP utilisé pour générer le nom d'affichage du groupe.", - "Base Group Tree" : "DN racine de l'arbre groupes", + "Base Group Tree" : "Base Group Tree", "One Group Base DN per line" : "Un DN racine groupe par ligne", - "Group Search Attributes" : "Recherche des attributs du groupe", + "Group Search Attributes" : "Attributs de recherche des groupes", "Group-Member association" : "Association groupe-membre", "Nested Groups" : "Groupes imbriqués", "When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" : "Si activé, les groupes contenant d'autres groupes sont pris en charge (fonctionne uniquement si l'attribut membre du groupe contient des DNs).", @@ -125,7 +125,7 @@ "UUID Attribute for Users:" : "Attribut UUID pour les utilisateurs :", "UUID Attribute for Groups:" : "Attribut UUID pour les groupes :", "Username-LDAP User Mapping" : "Association Nom d'utilisateur-Utilisateur 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." : "Les noms d'utilisateurs sont utilisés pour le stockage et l'assignation de (meta) données. Pour identifier et reconnaitre précisément les utilisateurs, chaque utilisateur LDAP aura un nom interne spécifique. Cela requiert l'association d'un nom d'utilisateur ownCloud à un nom d'utilisateur LDAP. Le nom d'utilisateur créé est associé à l'attribut UUID de l'utilisateur LDAP. Par ailleurs, le DN est mémorisé en cache pour limiter les interactions LDAP mais il n'est pas utilisé pour l'identification. Si le DN est modifié, ces modifications seront retrouvées. Seul le nom interne à ownCloud est utilisé au sein du produit. Supprimer les associations créera des orphelins et l'action affectera toutes les configurations LDAP. NE JAMAIS SUPPRIMER LES ASSOCIATIONS EN ENVIRONNEMENT DE PRODUCTION, mais uniquement sur des environnements de tests et d'expérimentation.", + "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." : "Les noms d'utilisateurs sont utilisés pour le stockage et l'assignation de (meta) données. Pour identifier et reconnaître précisément les utilisateurs, chaque utilisateur LDAP aura un nom interne spécifique. Cela requiert l'association d'un nom d'utilisateur ownCloud à un nom d'utilisateur LDAP. Le nom d'utilisateur créé est associé à l'attribut UUID de l'utilisateur LDAP. Par ailleurs, le DN est mémorisé en cache pour limiter les interactions LDAP mais il n'est pas utilisé pour l'identification. Si le DN est modifié, ces modifications seront retrouvées. Seul le nom interne à ownCloud est utilisé au sein du produit. Supprimer les associations créera des orphelins et l'action affectera toutes les configurations LDAP. NE JAMAIS SUPPRIMER LES ASSOCIATIONS EN ENVIRONNEMENT DE PRODUCTION, mais uniquement sur des environnements de tests et d'expérimentation.", "Clear Username-LDAP User Mapping" : "Supprimer l'association utilisateur interne-utilisateur LDAP", "Clear Groupname-LDAP Group Mapping" : "Supprimer l'association nom de groupe-groupe LDAP" },"pluralForm" :"nplurals=2; plural=(n > 1);" diff --git a/apps/user_ldap/l10n/hr.js b/apps/user_ldap/l10n/hr.js index d552505a397..48a1dc2e37b 100644 --- a/apps/user_ldap/l10n/hr.js +++ b/apps/user_ldap/l10n/hr.js @@ -1,6 +1,7 @@ OC.L10N.register( "user_ldap", { + "Failed to delete the server configuration" : "Greška prilikom brisanja konfiguracije poslužitelja.", "Deletion failed" : "Brisanje nije uspjelo", "Error" : "Greška", "_%s group found_::_%s groups found_" : ["","",""], diff --git a/apps/user_ldap/l10n/hr.json b/apps/user_ldap/l10n/hr.json index 045019c266b..abc06252669 100644 --- a/apps/user_ldap/l10n/hr.json +++ b/apps/user_ldap/l10n/hr.json @@ -1,4 +1,5 @@ { "translations": { + "Failed to delete the server configuration" : "Greška prilikom brisanja konfiguracije poslužitelja.", "Deletion failed" : "Brisanje nije uspjelo", "Error" : "Greška", "_%s group found_::_%s groups found_" : ["","",""], diff --git a/apps/user_ldap/l10n/id.js b/apps/user_ldap/l10n/id.js index 26ca061c71a..3319f9bea58 100644 --- a/apps/user_ldap/l10n/id.js +++ b/apps/user_ldap/l10n/id.js @@ -19,7 +19,7 @@ OC.L10N.register( "Success" : "Berhasil", "Error" : "Kesalahan", "Please specify a Base DN" : "Sialakan menetapkan Base DN", - "Could not determine Base DN" : "Tidak dapat menetakan Base DN", + "Could not determine Base DN" : "Tidak dapat menetapkan Base DN", "Please specify the port" : "Silakan tetapkan port", "Configuration OK" : "Konfigurasi Oke", "Configuration incorrect" : "Konfigurasi salah", @@ -33,6 +33,7 @@ OC.L10N.register( "Confirm Deletion" : "Konfirmasi Penghapusan", "_%s group found_::_%s groups found_" : ["%s grup ditemukan"], "_%s user found_::_%s users found_" : ["%s pengguna ditemukan"], + "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Tidak mendeteksi atribut nama tampilan pengguna. Silakan menentukannya sendiri di pengaturan ldap lanjutan.", "Could not find the desired feature" : "Tidak dapat menemukan fitur yang diinginkan", "Invalid Host" : "Host tidak sah", "Server" : "Server", @@ -107,6 +108,7 @@ OC.L10N.register( "User Home Folder Naming Rule" : "Aturan Penamaan Folder Home Pengguna", "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Biarkan nama pengguna kosong (default). Atau tetapkan atribut LDAP/AD.", "Internal Username" : "Nama Pengguna Internal", + "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." : "Secara default, nama pengguna internal akan dibuat dari atribut UUID. Hal ini untuk memastikan bahwa nama pengguna agar unik dan karakter tidak perlu dikonversi. Nama pengguna internal memiliki batasan hanya karakter ini yang diizinkan: [ a-zA-Z0-9_.@- ]. Karakter selain itu akan diganti dengan korespondensi ASCII mereka atau akan dihilangkan. Pada nama yang bentrok, sebuah angka akan ditambahkan dan ditingkatkan. Nama pengguna internal ini digunakan untuk mengenali sebuah nama secara internal. Itu juga dipakai sebagai nama folder home default, serta sebagai bagian dari URL remote untuk semua instansi layanan *DAV. Dengan pengaturan ini, perilaku default dapat diganti. Untuk mewujudkan perilaku seperti sebelum ownCloud 5, masukkan atribut nama tampilan pengguna di bidang isian berikut. Tinggalkan kosong untuk menggunakan perilaku default. Perubahan hanya akan terlihat untuk pengguna LDAP yang baru dipetakan (ditambahkan).", "Internal Username Attribute:" : "Atribut Nama Pengguna Internal:", "Override UUID detection" : "Timpa deteksi UUID", "UUID Attribute for Users:" : "Atribut UUID untuk Pengguna:", diff --git a/apps/user_ldap/l10n/id.json b/apps/user_ldap/l10n/id.json index ad650fc0fb9..c6a7ecd2e95 100644 --- a/apps/user_ldap/l10n/id.json +++ b/apps/user_ldap/l10n/id.json @@ -17,7 +17,7 @@ "Success" : "Berhasil", "Error" : "Kesalahan", "Please specify a Base DN" : "Sialakan menetapkan Base DN", - "Could not determine Base DN" : "Tidak dapat menetakan Base DN", + "Could not determine Base DN" : "Tidak dapat menetapkan Base DN", "Please specify the port" : "Silakan tetapkan port", "Configuration OK" : "Konfigurasi Oke", "Configuration incorrect" : "Konfigurasi salah", @@ -31,6 +31,7 @@ "Confirm Deletion" : "Konfirmasi Penghapusan", "_%s group found_::_%s groups found_" : ["%s grup ditemukan"], "_%s user found_::_%s users found_" : ["%s pengguna ditemukan"], + "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Tidak mendeteksi atribut nama tampilan pengguna. Silakan menentukannya sendiri di pengaturan ldap lanjutan.", "Could not find the desired feature" : "Tidak dapat menemukan fitur yang diinginkan", "Invalid Host" : "Host tidak sah", "Server" : "Server", @@ -105,6 +106,7 @@ "User Home Folder Naming Rule" : "Aturan Penamaan Folder Home Pengguna", "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Biarkan nama pengguna kosong (default). Atau tetapkan atribut LDAP/AD.", "Internal Username" : "Nama Pengguna Internal", + "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." : "Secara default, nama pengguna internal akan dibuat dari atribut UUID. Hal ini untuk memastikan bahwa nama pengguna agar unik dan karakter tidak perlu dikonversi. Nama pengguna internal memiliki batasan hanya karakter ini yang diizinkan: [ a-zA-Z0-9_.@- ]. Karakter selain itu akan diganti dengan korespondensi ASCII mereka atau akan dihilangkan. Pada nama yang bentrok, sebuah angka akan ditambahkan dan ditingkatkan. Nama pengguna internal ini digunakan untuk mengenali sebuah nama secara internal. Itu juga dipakai sebagai nama folder home default, serta sebagai bagian dari URL remote untuk semua instansi layanan *DAV. Dengan pengaturan ini, perilaku default dapat diganti. Untuk mewujudkan perilaku seperti sebelum ownCloud 5, masukkan atribut nama tampilan pengguna di bidang isian berikut. Tinggalkan kosong untuk menggunakan perilaku default. Perubahan hanya akan terlihat untuk pengguna LDAP yang baru dipetakan (ditambahkan).", "Internal Username Attribute:" : "Atribut Nama Pengguna Internal:", "Override UUID detection" : "Timpa deteksi UUID", "UUID Attribute for Users:" : "Atribut UUID untuk Pengguna:", diff --git a/apps/user_ldap/l10n/ja.js b/apps/user_ldap/l10n/ja.js index b139c5b3fb4..0c28cf14ab6 100644 --- a/apps/user_ldap/l10n/ja.js +++ b/apps/user_ldap/l10n/ja.js @@ -39,23 +39,23 @@ OC.L10N.register( "Server" : "サーバー", "User Filter" : "ユーザーフィルター", "Login Filter" : "ログインフィルター", - "Group Filter" : "グループフィルタ", + "Group Filter" : "グループフィルター", "Save" : "保存", "Test Configuration" : "設定をテスト", "Help" : "ヘルプ", "Groups meeting these criteria are available in %s:" : "これらの基準を満たすグループが %s で利用可能:", "only those object classes:" : "それらのオブジェクトクラスのみ:", "only from those groups:" : "それらのグループからのみ:", - "Edit raw filter instead" : "フィルタを編集", - "Raw LDAP filter" : "LDAP フィルタ", - "The filter specifies which LDAP groups shall have access to the %s instance." : "フィルタは、どの LDAP グループが %s にアクセスするかを指定します。", + "Edit raw filter instead" : "フィルターを編集", + "Raw LDAP filter" : "LDAPフィルター", + "The filter specifies which LDAP groups shall have access to the %s instance." : "フィルターは、どの LDAP グループが %s にアクセスするかを指定します。", "Test Filter" : "フィルターをテスト", "groups found" : "グループが見つかりました", "Users login with this attribute:" : "この属性でユーザーログイン:", "LDAP Username:" : "LDAPユーザー名:", "LDAP Email Address:" : "LDAPメールアドレス:", "Other Attributes:" : "他の属性:", - "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "ログイン実行時に適用するフィルタを定義します。%%uid にはログイン操作におけるユーザー名が入ります。例： \"uid=%%uid\"", + "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "ログイン実行時に適用するフィルターを定義します。%%uid にはログイン操作におけるユーザー名が入ります。例： \"uid=%%uid\"", "1. Server" : "1. Server", "%s. Server:" : "%s. サーバー:", "Add Server Configuration" : "サーバー設定を追加", @@ -72,7 +72,7 @@ OC.L10N.register( "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "自動LDAP問合せを停止。大規模な設定には適していますが、LDAPの知識がいくらか必要になります。", "Manually enter LDAP filters (recommended for large directories)" : "手動でLDAPフィルターを入力(大規模ディレクトリ時のみ推奨)", "Limit %s access to users meeting these criteria:" : "この基準を満たすユーザーに対し %s へのアクセスを制限:", - "The filter specifies which LDAP users shall have access to the %s instance." : "フィルタは、どのLDAPユーザーが %s にアクセスするかを指定します。", + "The filter specifies which LDAP users shall have access to the %s instance." : "フィルターは、どのLDAPユーザーが %s にアクセスするかを指定します。", "users found" : "ユーザーが見つかりました", "Saving" : "保存中", "Back" : "戻る", diff --git a/apps/user_ldap/l10n/ja.json b/apps/user_ldap/l10n/ja.json index 25ad7f73bd8..036808e1d6b 100644 --- a/apps/user_ldap/l10n/ja.json +++ b/apps/user_ldap/l10n/ja.json @@ -37,23 +37,23 @@ "Server" : "サーバー", "User Filter" : "ユーザーフィルター", "Login Filter" : "ログインフィルター", - "Group Filter" : "グループフィルタ", + "Group Filter" : "グループフィルター", "Save" : "保存", "Test Configuration" : "設定をテスト", "Help" : "ヘルプ", "Groups meeting these criteria are available in %s:" : "これらの基準を満たすグループが %s で利用可能:", "only those object classes:" : "それらのオブジェクトクラスのみ:", "only from those groups:" : "それらのグループからのみ:", - "Edit raw filter instead" : "フィルタを編集", - "Raw LDAP filter" : "LDAP フィルタ", - "The filter specifies which LDAP groups shall have access to the %s instance." : "フィルタは、どの LDAP グループが %s にアクセスするかを指定します。", + "Edit raw filter instead" : "フィルターを編集", + "Raw LDAP filter" : "LDAPフィルター", + "The filter specifies which LDAP groups shall have access to the %s instance." : "フィルターは、どの LDAP グループが %s にアクセスするかを指定します。", "Test Filter" : "フィルターをテスト", "groups found" : "グループが見つかりました", "Users login with this attribute:" : "この属性でユーザーログイン:", "LDAP Username:" : "LDAPユーザー名:", "LDAP Email Address:" : "LDAPメールアドレス:", "Other Attributes:" : "他の属性:", - "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "ログイン実行時に適用するフィルタを定義します。%%uid にはログイン操作におけるユーザー名が入ります。例： \"uid=%%uid\"", + "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "ログイン実行時に適用するフィルターを定義します。%%uid にはログイン操作におけるユーザー名が入ります。例： \"uid=%%uid\"", "1. Server" : "1. Server", "%s. Server:" : "%s. サーバー:", "Add Server Configuration" : "サーバー設定を追加", @@ -70,7 +70,7 @@ "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "自動LDAP問合せを停止。大規模な設定には適していますが、LDAPの知識がいくらか必要になります。", "Manually enter LDAP filters (recommended for large directories)" : "手動でLDAPフィルターを入力(大規模ディレクトリ時のみ推奨)", "Limit %s access to users meeting these criteria:" : "この基準を満たすユーザーに対し %s へのアクセスを制限:", - "The filter specifies which LDAP users shall have access to the %s instance." : "フィルタは、どのLDAPユーザーが %s にアクセスするかを指定します。", + "The filter specifies which LDAP users shall have access to the %s instance." : "フィルターは、どのLDAPユーザーが %s にアクセスするかを指定します。", "users found" : "ユーザーが見つかりました", "Saving" : "保存中", "Back" : "戻る", diff --git a/apps/user_ldap/l10n/ko.js b/apps/user_ldap/l10n/ko.js index 35aeea142e4..120121de0c3 100644 --- a/apps/user_ldap/l10n/ko.js +++ b/apps/user_ldap/l10n/ko.js @@ -13,10 +13,14 @@ OC.L10N.register( "Deletion failed" : "삭제 실패", "Take over settings from recent server configuration?" : "최근 서버 설정을 다시 불러오시겠습니까?", "Keep settings?" : "설정을 유지하겠습니까?", + "{nthServer}. Server" : "{nthServer}. 서버", "Cannot add server configuration" : "서버 설정을 추가할 수 없음", "mappings cleared" : "매핑 삭제됨", "Success" : "성공", "Error" : "오류", + "Please specify a Base DN" : "기본 DN을 입력하십시오", + "Could not determine Base DN" : "기본 DN을 결정할 수 없음", + "Please specify the port" : "포트를 입력하십시오", "Configuration OK" : "설정 올바름", "Configuration incorrect" : "설정 올바르지 않음", "Configuration incomplete" : "설정 불완전함", @@ -29,6 +33,7 @@ OC.L10N.register( "Confirm Deletion" : "삭제 확인", "_%s group found_::_%s groups found_" : ["그룹 %s개 찾음"], "_%s user found_::_%s users found_" : ["사용자 %s명 찾음"], + "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "사용자 표시 이름을 결정할 수 없습니다. 고급 LDAP 설정에서 직접 입력하십시오.", "Could not find the desired feature" : "필요한 기능을 찾을 수 없음", "Invalid Host" : "잘못된 호스트", "Server" : "서버", @@ -38,17 +43,23 @@ OC.L10N.register( "Save" : "저장", "Test Configuration" : "설정 시험", "Help" : "도움말", + "Groups meeting these criteria are available in %s:" : "이 조건을 만족하는 그룹은 %s에 있습니다:", "only those object classes:" : "다음 객체 클래스만:", "only from those groups:" : "다음 그룹에서만:", "Edit raw filter instead" : "필터 직접 편집", "Raw LDAP filter" : "LDAP 필터", "The filter specifies which LDAP groups shall have access to the %s instance." : "이 필터는 %s에 접근할 수 있는 LDAP 그룹을 설정합니다.", + "Test Filter" : "필터 시험", "groups found" : "그룹 찾음", + "Users login with this attribute:" : "다음 속성으로 사용자 로그인:", "LDAP Username:" : "LDAP 사용자 이름:", "LDAP Email Address:" : "LDAP 이메일 주소:", "Other Attributes:" : "기타 속성:", "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "로그인을 시도할 때 적용할 필터를 입력하십시오. %%uid는 로그인 동작의 사용자 이름으로 대체됩니다. 예: \"uid=%%uid\"", + "1. Server" : "1. 서버", + "%s. Server:" : "%s. 서버:", "Add Server Configuration" : "서버 설정 추가", + "Delete Configuration" : "설정 삭제", "Host" : "호스트", "You can omit the protocol, except you require SSL. Then start with ldaps://" : "SSL을 사용하지 않으면 프로토콜을 입력하지 않아도 됩니다. SSL을 사용하려면 ldaps://를 입력하십시오.", "Port" : "포트", @@ -58,21 +69,28 @@ OC.L10N.register( "For anonymous access, leave DN and Password empty." : "익명 접근을 허용하려면 DN과 암호를 비워 두십시오.", "One Base DN per line" : "기본 DN을 한 줄에 하나씩 입력하십시오", "You can specify Base DN for users and groups in the Advanced tab" : "고급 탭에서 사용자 및 그룹에 대한 기본 DN을 지정할 수 있습니다.", + "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "자동 LDAP 요청을 줄입니다. 대형 사이트에서 유용하지만 LDAP에 관한 지식이 필요합니다.", + "Manually enter LDAP filters (recommended for large directories)" : "수동으로 LDAP 필터 입력(대형 사이트에 추천)", + "Limit %s access to users meeting these criteria:" : "다음 조건을 만족하는 사용자만 %s 접근 허용:", "The filter specifies which LDAP users shall have access to the %s instance." : "이 필터는 %s에 접근할 수 있는 LDAP 사용자를 설정합니다.", "users found" : "사용자 찾음", + "Saving" : "저장 중", "Back" : "뒤로", "Continue" : "계속", + "LDAP" : "LDAP", + "Expert" : "전문가", "Advanced" : "고급", "<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." : "<b>경고:</b> user_ldap, user_webdavauth 앱은 서로 호환되지 않습니다. 예상하지 못한 행동을 할 수도 있습니다. 시스템 관리자에게 연락하여 둘 중 하나의 앱의 사용을 중단하십시오.", "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>경고:</b> PHP LDAP 모듈이 비활성화되어 있거나 설치되어 있지 않습니다. 백엔드를 사용할 수 없습니다. 시스템 관리자에게 설치를 요청하십시오.", "Connection Settings" : "연결 설정", "Configuration Active" : "구성 활성", "When unchecked, this configuration will be skipped." : "선택하지 않으면 이 설정을 무시합니다.", - "Backup (Replica) Host" : "백업 (복제) 호스트", + "Backup (Replica) Host" : "백업(복제) 호스트", "Give an optional backup host. It must be a replica of the main LDAP/AD server." : "추가적인 백업 호스트를 지정합니다. 기본 LDAP/AD 서버의 복사본이어야 합니다.", - "Backup (Replica) Port" : "백업 (복제) 포트", + "Backup (Replica) Port" : "백업(복제) 포트", "Disable Main Server" : "주 서버 비활성화", "Only connect to the replica server." : "복제 서버에만 연결합니다.", + "Case insensitive LDAP server (Windows)" : "LDAP 서버에서 대소문자 구분하지 않음(Windows)", "Turn off SSL certificate validation." : "SSL 인증서 유효성 검사를 해제합니다.", "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "테스트 목적으로만 사용하십시오! 이 옵션을 사용해야만 연결할 수 있으면 %s 서버에 LDAP 서버의 SSL 인증서를 설치하십시오.", "Cache Time-To-Live" : "캐시 유지 시간", @@ -89,7 +107,11 @@ OC.L10N.register( "Base Group Tree" : "기본 그룹 트리", "One Group Base DN per line" : "그룹 기본 DN을 한 줄에 하나씩 입력하십시오", "Group Search Attributes" : "그룹 검색 속성", - "Group-Member association" : "그룹-회원 연결", + "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으로 설정하면 이러한 검색을 할 때 페이지를 사용하지 않습니다.)", "Special Attributes" : "특수 속성", "Quota Field" : "할당량 필드", "Quota Default" : "기본 할당량", diff --git a/apps/user_ldap/l10n/ko.json b/apps/user_ldap/l10n/ko.json index a415fc8f337..38c9d9aa83c 100644 --- a/apps/user_ldap/l10n/ko.json +++ b/apps/user_ldap/l10n/ko.json @@ -11,10 +11,14 @@ "Deletion failed" : "삭제 실패", "Take over settings from recent server configuration?" : "최근 서버 설정을 다시 불러오시겠습니까?", "Keep settings?" : "설정을 유지하겠습니까?", + "{nthServer}. Server" : "{nthServer}. 서버", "Cannot add server configuration" : "서버 설정을 추가할 수 없음", "mappings cleared" : "매핑 삭제됨", "Success" : "성공", "Error" : "오류", + "Please specify a Base DN" : "기본 DN을 입력하십시오", + "Could not determine Base DN" : "기본 DN을 결정할 수 없음", + "Please specify the port" : "포트를 입력하십시오", "Configuration OK" : "설정 올바름", "Configuration incorrect" : "설정 올바르지 않음", "Configuration incomplete" : "설정 불완전함", @@ -27,6 +31,7 @@ "Confirm Deletion" : "삭제 확인", "_%s group found_::_%s groups found_" : ["그룹 %s개 찾음"], "_%s user found_::_%s users found_" : ["사용자 %s명 찾음"], + "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "사용자 표시 이름을 결정할 수 없습니다. 고급 LDAP 설정에서 직접 입력하십시오.", "Could not find the desired feature" : "필요한 기능을 찾을 수 없음", "Invalid Host" : "잘못된 호스트", "Server" : "서버", @@ -36,17 +41,23 @@ "Save" : "저장", "Test Configuration" : "설정 시험", "Help" : "도움말", + "Groups meeting these criteria are available in %s:" : "이 조건을 만족하는 그룹은 %s에 있습니다:", "only those object classes:" : "다음 객체 클래스만:", "only from those groups:" : "다음 그룹에서만:", "Edit raw filter instead" : "필터 직접 편집", "Raw LDAP filter" : "LDAP 필터", "The filter specifies which LDAP groups shall have access to the %s instance." : "이 필터는 %s에 접근할 수 있는 LDAP 그룹을 설정합니다.", + "Test Filter" : "필터 시험", "groups found" : "그룹 찾음", + "Users login with this attribute:" : "다음 속성으로 사용자 로그인:", "LDAP Username:" : "LDAP 사용자 이름:", "LDAP Email Address:" : "LDAP 이메일 주소:", "Other Attributes:" : "기타 속성:", "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "로그인을 시도할 때 적용할 필터를 입력하십시오. %%uid는 로그인 동작의 사용자 이름으로 대체됩니다. 예: \"uid=%%uid\"", + "1. Server" : "1. 서버", + "%s. Server:" : "%s. 서버:", "Add Server Configuration" : "서버 설정 추가", + "Delete Configuration" : "설정 삭제", "Host" : "호스트", "You can omit the protocol, except you require SSL. Then start with ldaps://" : "SSL을 사용하지 않으면 프로토콜을 입력하지 않아도 됩니다. SSL을 사용하려면 ldaps://를 입력하십시오.", "Port" : "포트", @@ -56,21 +67,28 @@ "For anonymous access, leave DN and Password empty." : "익명 접근을 허용하려면 DN과 암호를 비워 두십시오.", "One Base DN per line" : "기본 DN을 한 줄에 하나씩 입력하십시오", "You can specify Base DN for users and groups in the Advanced tab" : "고급 탭에서 사용자 및 그룹에 대한 기본 DN을 지정할 수 있습니다.", + "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "자동 LDAP 요청을 줄입니다. 대형 사이트에서 유용하지만 LDAP에 관한 지식이 필요합니다.", + "Manually enter LDAP filters (recommended for large directories)" : "수동으로 LDAP 필터 입력(대형 사이트에 추천)", + "Limit %s access to users meeting these criteria:" : "다음 조건을 만족하는 사용자만 %s 접근 허용:", "The filter specifies which LDAP users shall have access to the %s instance." : "이 필터는 %s에 접근할 수 있는 LDAP 사용자를 설정합니다.", "users found" : "사용자 찾음", + "Saving" : "저장 중", "Back" : "뒤로", "Continue" : "계속", + "LDAP" : "LDAP", + "Expert" : "전문가", "Advanced" : "고급", "<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." : "<b>경고:</b> user_ldap, user_webdavauth 앱은 서로 호환되지 않습니다. 예상하지 못한 행동을 할 수도 있습니다. 시스템 관리자에게 연락하여 둘 중 하나의 앱의 사용을 중단하십시오.", "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>경고:</b> PHP LDAP 모듈이 비활성화되어 있거나 설치되어 있지 않습니다. 백엔드를 사용할 수 없습니다. 시스템 관리자에게 설치를 요청하십시오.", "Connection Settings" : "연결 설정", "Configuration Active" : "구성 활성", "When unchecked, this configuration will be skipped." : "선택하지 않으면 이 설정을 무시합니다.", - "Backup (Replica) Host" : "백업 (복제) 호스트", + "Backup (Replica) Host" : "백업(복제) 호스트", "Give an optional backup host. It must be a replica of the main LDAP/AD server." : "추가적인 백업 호스트를 지정합니다. 기본 LDAP/AD 서버의 복사본이어야 합니다.", - "Backup (Replica) Port" : "백업 (복제) 포트", + "Backup (Replica) Port" : "백업(복제) 포트", "Disable Main Server" : "주 서버 비활성화", "Only connect to the replica server." : "복제 서버에만 연결합니다.", + "Case insensitive LDAP server (Windows)" : "LDAP 서버에서 대소문자 구분하지 않음(Windows)", "Turn off SSL certificate validation." : "SSL 인증서 유효성 검사를 해제합니다.", "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "테스트 목적으로만 사용하십시오! 이 옵션을 사용해야만 연결할 수 있으면 %s 서버에 LDAP 서버의 SSL 인증서를 설치하십시오.", "Cache Time-To-Live" : "캐시 유지 시간", @@ -87,7 +105,11 @@ "Base Group Tree" : "기본 그룹 트리", "One Group Base DN per line" : "그룹 기본 DN을 한 줄에 하나씩 입력하십시오", "Group Search Attributes" : "그룹 검색 속성", - "Group-Member association" : "그룹-회원 연결", + "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으로 설정하면 이러한 검색을 할 때 페이지를 사용하지 않습니다.)", "Special Attributes" : "특수 속성", "Quota Field" : "할당량 필드", "Quota Default" : "기본 할당량", diff --git a/apps/user_ldap/l10n/pl.js b/apps/user_ldap/l10n/pl.js index a00fa0f2306..054d7a3494a 100644 --- a/apps/user_ldap/l10n/pl.js +++ b/apps/user_ldap/l10n/pl.js @@ -49,6 +49,7 @@ OC.L10N.register( "Edit raw filter instead" : "Edytuj zamiast tego czysty filtr", "Raw LDAP filter" : "Czysty filtr LDAP", "The filter specifies which LDAP groups shall have access to the %s instance." : "Filtr określa, które grupy LDAP powinny mieć dostęp do instancji %s.", + "Test Filter" : "Testuj filtr", "groups found" : "grup znaleziono", "Users login with this attribute:" : "Użytkownicy zalogowani z tymi ustawieniami:", "LDAP Username:" : "Nazwa użytkownika LDAP:", diff --git a/apps/user_ldap/l10n/pl.json b/apps/user_ldap/l10n/pl.json index 178d47afbfe..04fd22c0836 100644 --- a/apps/user_ldap/l10n/pl.json +++ b/apps/user_ldap/l10n/pl.json @@ -47,6 +47,7 @@ "Edit raw filter instead" : "Edytuj zamiast tego czysty filtr", "Raw LDAP filter" : "Czysty filtr LDAP", "The filter specifies which LDAP groups shall have access to the %s instance." : "Filtr określa, które grupy LDAP powinny mieć dostęp do instancji %s.", + "Test Filter" : "Testuj filtr", "groups found" : "grup znaleziono", "Users login with this attribute:" : "Użytkownicy zalogowani z tymi ustawieniami:", "LDAP Username:" : "Nazwa użytkownika LDAP:", diff --git a/apps/user_ldap/l10n/pt_PT.js b/apps/user_ldap/l10n/pt_PT.js index 0f4b3d11bed..46b9e1e0cc5 100644 --- a/apps/user_ldap/l10n/pt_PT.js +++ b/apps/user_ldap/l10n/pt_PT.js @@ -33,6 +33,7 @@ OC.L10N.register( "Confirm Deletion" : "Confirmar a operação de apagar", "_%s group found_::_%s groups found_" : ["%s grupo encontrado","%s grupos encontrados"], "_%s user found_::_%s users found_" : ["%s utilizador encontrado","%s utilizadores encontrados"], + "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Não foi possível detetar o atributo do nome do utilizador. Por favor especifique-o nas configurações ldap avançadas.", "Could not find the desired feature" : "Não se encontrou a função desejada", "Invalid Host" : "Hospedeiro Inválido", "Server" : "Servidor", diff --git a/apps/user_ldap/l10n/pt_PT.json b/apps/user_ldap/l10n/pt_PT.json index 9c753884160..ab690b30216 100644 --- a/apps/user_ldap/l10n/pt_PT.json +++ b/apps/user_ldap/l10n/pt_PT.json @@ -31,6 +31,7 @@ "Confirm Deletion" : "Confirmar a operação de apagar", "_%s group found_::_%s groups found_" : ["%s grupo encontrado","%s grupos encontrados"], "_%s user found_::_%s users found_" : ["%s utilizador encontrado","%s utilizadores encontrados"], + "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Não foi possível detetar o atributo do nome do utilizador. Por favor especifique-o nas configurações ldap avançadas.", "Could not find the desired feature" : "Não se encontrou a função desejada", "Invalid Host" : "Hospedeiro Inválido", "Server" : "Servidor", diff --git a/apps/user_ldap/l10n/ru.js b/apps/user_ldap/l10n/ru.js index 016ef747a2c..1637d3a24ae 100644 --- a/apps/user_ldap/l10n/ru.js +++ b/apps/user_ldap/l10n/ru.js @@ -3,9 +3,9 @@ OC.L10N.register( { "Failed to clear the mappings." : "Не удалось очистить соответствия.", "Failed to delete the server configuration" : "Не удалось удалить конфигурацию сервера", - "The configuration is valid and the connection could be established!" : "Конфигурация правильная и подключение может быть установлено!", - "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "Конфигурация верна, но операция подключения завершилась неудачно. Проверьте настройки сервера и учетные данные.", - "The configuration is invalid. Please have a look at the logs for further details." : "Конфигурация недействительна. Проверьте журналы для уточнения деталей.", + "The configuration is valid and the connection could be established!" : "Конфигурация корректна и подключение может быть установлено!", + "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "Конфигурация корректна, но операция подключения завершилась неудачно. Проверьте настройки сервера и учетные данные.", + "The configuration is invalid. Please have a look at the logs for further details." : "Конфигурация некорректна. Проверьте журналы для уточнения деталей.", "No action specified" : "Действие не указано", "No configuration specified" : "Конфигурация не создана", "No data specified" : "Нет данных", @@ -13,16 +13,16 @@ OC.L10N.register( "Deletion failed" : "Удаление не удалось", "Take over settings from recent server configuration?" : "Принять настройки из последней конфигурации сервера?", "Keep settings?" : "Сохранить настройки?", - "{nthServer}. Server" : "{nthServer}. Сервер", - "Cannot add server configuration" : "Не получилось добавить конфигурацию сервера", - "mappings cleared" : "Соответствия очищены", + "{nthServer}. Server" : "Сервер {nthServer}.", + "Cannot add server configuration" : "Не удалось добавить конфигурацию сервера", + "mappings cleared" : "соответствия очищены", "Success" : "Успешно", "Error" : "Ошибка", "Please specify a Base DN" : "Необходимо указать Base DN", "Could not determine Base DN" : "Невозможно определить Base DN", "Please specify the port" : "Укажите порт", "Configuration OK" : "Конфигурация в порядке", - "Configuration incorrect" : "Конфигурация неправильна", + "Configuration incorrect" : "Конфигурация некорректна", "Configuration incomplete" : "Конфигурация не завершена", "Select groups" : "Выберите группы", "Select object classes" : "Выберите объектные классы", @@ -34,45 +34,45 @@ OC.L10N.register( "_%s group found_::_%s groups found_" : ["%s группа найдена","%s группы найдены","%s групп найдено"], "_%s user found_::_%s users found_" : ["%s пользователь найден","%s пользователя найдено","%s пользователей найдено"], "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Не удалось автоматически определить атрибут содержащий отображаемое имя пользователя. Зайдите в расширенные настройки ldap и укажите его вручную.", - "Could not find the desired feature" : "Не могу найти требуемой функциональности", - "Invalid Host" : "Неверный сервер", + "Could not find the desired feature" : "Не удается найти требуемую функциональность", + "Invalid Host" : "Некорректный адрес сервера", "Server" : "Сервер", - "User Filter" : "Пользователи", - "Login Filter" : "Логин", + "User Filter" : "Фильтр пользователей", + "Login Filter" : "Фильтр логинов", "Group Filter" : "Фильтр группы", "Save" : "Сохранить", "Test Configuration" : "Проверить конфигурацию", "Help" : "Помощь", - "Groups meeting these criteria are available in %s:" : "Группы, отвечающие этим критериям доступны в %s:", - "only those object classes:" : "только эти объектные классы", - "only from those groups:" : "только из этих групп", + "Groups meeting these criteria are available in %s:" : "Группы, отвечающие этим критериям доступны в %s:", + "only those object classes:" : "только эти объектные классы:", + "only from those groups:" : "только из этих групп:", "Edit raw filter instead" : "Редактировать исходный фильтр", "Raw LDAP filter" : "Исходный LDAP фильтр", - "The filter specifies which LDAP groups shall have access to the %s instance." : "Этот фильтр определяет, какие LDAP группы должны иметь доступ к %s.", + "The filter specifies which LDAP groups shall have access to the %s instance." : "Этот фильтр определяет какие LDAP группы должны иметь доступ к экземпляру %s.", "Test Filter" : "Проверить фильтр", "groups found" : "групп найдено", - "Users login with this attribute:" : "Пользователи пользуются этим атрибутом для входа:", + "Users login with this attribute:" : "Логин пользователей с этим атрибутом:", "LDAP Username:" : "Имя пользователя LDAP", - "LDAP Email Address:" : "LDAP адрес электронной почты:", + "LDAP Email Address:" : "Адрес email LDAP:", "Other Attributes:" : "Другие атрибуты:", "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Определяет фильтр для применения при попытке входа. %%uid заменяет имя пользователя при входе в систему. Например: \"uid=%%uid\"", - "1. Server" : "1. Сервер", - "%s. Server:" : "%s. Сервер:", + "1. Server" : "Сервер 1.", + "%s. Server:" : "Сервер %s:", "Add Server Configuration" : "Добавить конфигурацию сервера", "Delete Configuration" : "Удалить конфигурацию", "Host" : "Сервер", - "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Можно опустить протокол, за исключением того, когда вам требуется SSL. Тогда начните с ldaps :/ /", + "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Можно пренебречь протоколом, за исключением использования SSL. В этом случае укажите ldaps://", "Port" : "Порт", "User DN" : "DN пользователя", "The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty." : "DN пользователя, под которым выполняется подключение, например, uid=agent,dc=example,dc=com. Для анонимного доступа оставьте DN и пароль пустыми.", "Password" : "Пароль", "For anonymous access, leave DN and Password empty." : "Для анонимного доступа оставьте DN и пароль пустыми.", "One Base DN per line" : "По одной базе поиска (Base DN) в строке.", - "You can specify Base DN for users and groups in the Advanced tab" : "Вы можете задать Base DN для пользователей и групп на вкладке \"Расширенное\"", - "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Перестаёт посылать автоматически запросы LDAP. Эта опция хороша для крупных проектов, но требует некоторых знаний LDAP.", + "You can specify Base DN for users and groups in the Advanced tab" : "Вы можете задать Base DN для пользователей и групп на вкладке \"Расширенные\"", + "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Избегает отправки автоматических запросов LDAP. Эта опция подходит для крупных проектов, но требует некоторых знаний LDAP.", "Manually enter LDAP filters (recommended for large directories)" : "Ввести LDAP фильтры вручную (рекомендуется для больших директорий)", - "Limit %s access to users meeting these criteria:" : "Ограничить доступ к %s пользователям, удовлетворяющим этому критерию:", - "The filter specifies which LDAP users shall have access to the %s instance." : "Этот фильтр указывает, какие пользователи LDAP должны иметь доступ к %s.", + "Limit %s access to users meeting these criteria:" : "Ограничить доступ пользователям к %s, удовлетворяющим этому критерию:", + "The filter specifies which LDAP users shall have access to the %s instance." : "Этот фильтр указывает, какие пользователи LDAP должны иметь доступ к экземпляру %s.", "users found" : "пользователей найдено", "Saving" : "Сохраняется", "Back" : "Назад", @@ -81,7 +81,7 @@ OC.L10N.register( "Expert" : "Эксперт", "Advanced" : "Дополнительно", "<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." : "<b>Предупреждение:</b> Приложения user_ldap и user_webdavauth несовместимы. Вы можете наблюдать некорректное поведение. Пожалуйста, попросите вашего системного администратора отключить одно из них.", - "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>Внимание:</b> Модуль LDAP для PHP не установлен, бэкенд не будет работать. Пожалуйста, попросите вашего системного администратора его установить. ", + "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>Предупреждение:</b> Модуль LDAP для PHP не установлен, бэкенд не будет работать. Пожалуйста, попросите вашего системного администратора его установить. ", "Connection Settings" : "Настройки подключения", "Configuration Active" : "Конфигурация активна", "When unchecked, this configuration will be skipped." : "Когда галочка снята, эта конфигурация будет пропущена.", @@ -89,38 +89,38 @@ OC.L10N.register( "Give an optional backup host. It must be a replica of the main LDAP/AD server." : "Укажите дополнительный резервный сервер. Он должен быть репликой главного LDAP/AD сервера.", "Backup (Replica) Port" : "Порт резервного сервера", "Disable Main Server" : "Отключить главный сервер", - "Only connect to the replica server." : "Подключаться только к серверу-реплике.", + "Only connect to the replica server." : "Подключаться только к резервному серверу", "Case insensitive LDAP server (Windows)" : "Нечувствительный к регистру сервер LDAP (Windows)", "Turn off SSL certificate validation." : "Отключить проверку сертификата SSL.", "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "Не рекомендуется, используйте только в режиме тестирования! Если соединение работает только с этой опцией, импортируйте на ваш %s сервер SSL-сертификат сервера LDAP.", - "Cache Time-To-Live" : "Кэш времени жизни", + "Cache Time-To-Live" : "Кэш времени жизни (TTL)", "in seconds. A change empties the cache." : "в секундах. Изменение очистит кэш.", "Directory Settings" : "Настройки каталога", "User Display Name Field" : "Поле отображаемого имени пользователя", "The LDAP attribute to use to generate the user's display name." : "Атрибут LDAP, который используется для генерации отображаемого имени пользователя.", - "Base User Tree" : "База пользовательского дерева", + "Base User Tree" : "База дерева пользователей", "One User Base DN per line" : "По одной базовому DN пользователей в строке.", "User Search Attributes" : "Атрибуты поиска пользоватетелей", "Optional; one attribute per line" : "Опционально; один атрибут в строке", "Group Display Name Field" : "Поле отображаемого имени группы", "The LDAP attribute to use to generate the groups's display name." : "Атрибут LDAP, который используется для генерации отображаемого имени группы.", - "Base Group Tree" : "База группового дерева", + "Base Group Tree" : "База дерева групп", "One Group Base DN per line" : "По одной базовому DN групп в строке.", - "Group Search Attributes" : "Атрибуты поиска для группы", + "Group Search Attributes" : "Атрибуты поиска групп", "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", - "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.)" : "ChunkSize используется в страничных поисках LDAP которые могут возвращать громоздкие результаты, как например списки пользователей или групп. (Настройка его в \"0\" отключает страничный поиск LDAP для таких ситуаций.)", + "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.)" : "ChunkSize используется в страничных поисках LDAP которые могут возвращать громоздкие результаты, как например списки пользователей или групп. (Установка значения в \"0\" отключает страничный поиск LDAP для таких ситуаций.)", "Special Attributes" : "Специальные атрибуты", "Quota Field" : "Поле квоты", "Quota Default" : "Квота по умолчанию", "in bytes" : "в байтах", - "Email Field" : "Поле адреса электронной почты", + "Email Field" : "Поле адреса email", "User Home Folder Naming Rule" : "Правило именования домашнего каталога пользователя", "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Оставьте пустым для использования имени пользователя (по умолчанию). Иначе укажите атрибут LDAP/AD.", "Internal Username" : "Внутреннее имя пользователя", - "By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder. 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." : "По умолчанию внутреннее имя пользователя будет создано из атрибута UUID. Таким образом имя пользователя становится уникальным и не требует конвертации символов. Внутреннее имя пользователя может состоять только из следующих символов: [ a-zA-Z0-9_.@- ]. Остальные символы замещаются соответствиями из таблицы ASCII или же просто пропускаются. При совпадении к имени будет добавлено или увеличено число. Внутреннее имя пользователя используется для внутренней идентификации пользователя. Также оно является именем по умолчанию для каталога пользователя в ownCloud. Оно также является частью URL, к примеру, для всех сервисов *DAV. С помощью данной настройки можно изменить поведение по умолчанию. Чтобы достичь поведения, как было до ownCloud 5, введите атрибут отображаемого имени пользователя в этом поле. Оставьте его пустым для режима по умолчанию. Изменения будут иметь эффект только для новых подключенных (добавленных) пользователей LDAP.", + "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." : "По умолчанию внутреннее имя пользователя будет создано из атрибута UUID. Таким образом имя пользователя становится уникальным и не требует конвертации символов. Внутреннее имя пользователя может состоять только из следующих символов: [ a-zA-Z0-9_.@- ]. Остальные символы заменяются аналогами из таблицы ASCII или же просто пропускаются. В случае конфликта к имени будет добавлено/увеличено число. Внутреннее имя пользователя используется для внутренней идентификации пользователя. Также оно является именем по умолчанию для каталога пользователя в ownCloud. Оно также является частью URL, к примеру, для всех сервисов *DAV. С помощью данной настройки можно изменить поведение по умолчанию. Чтобы достичь поведения, как было до ownCloud 5, введите атрибут отображаемого имени пользователя в этом поле. Оставьте его пустым для режима по умолчанию. Изменения будут иметь эффект только для новых подключенных (добавленных) пользователей LDAP.", "Internal Username Attribute:" : "Атрибут для внутреннего имени:", "Override UUID detection" : "Переопределить нахождение 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." : "По умолчанию ownCloud определяет атрибут UUID автоматически. Этот атрибут используется для того, чтобы достоверно идентифицировать пользователей и группы LDAP. Также на основании атрибута UUID создается внутреннее имя пользователя, если выше не указано иначе. Вы можете переопределить эту настройку и указать свой атрибут по выбору. Вы должны удостовериться, что выбранный вами атрибут может быть выбран для пользователей и групп, а также то, что он уникальный. Оставьте поле пустым для поведения по умолчанию. Изменения вступят в силу только для новых подключенных (добавленных) пользователей и групп LDAP.", diff --git a/apps/user_ldap/l10n/ru.json b/apps/user_ldap/l10n/ru.json index e20baa90401..5cfde269ec1 100644 --- a/apps/user_ldap/l10n/ru.json +++ b/apps/user_ldap/l10n/ru.json @@ -1,9 +1,9 @@ { "translations": { "Failed to clear the mappings." : "Не удалось очистить соответствия.", "Failed to delete the server configuration" : "Не удалось удалить конфигурацию сервера", - "The configuration is valid and the connection could be established!" : "Конфигурация правильная и подключение может быть установлено!", - "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "Конфигурация верна, но операция подключения завершилась неудачно. Проверьте настройки сервера и учетные данные.", - "The configuration is invalid. Please have a look at the logs for further details." : "Конфигурация недействительна. Проверьте журналы для уточнения деталей.", + "The configuration is valid and the connection could be established!" : "Конфигурация корректна и подключение может быть установлено!", + "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "Конфигурация корректна, но операция подключения завершилась неудачно. Проверьте настройки сервера и учетные данные.", + "The configuration is invalid. Please have a look at the logs for further details." : "Конфигурация некорректна. Проверьте журналы для уточнения деталей.", "No action specified" : "Действие не указано", "No configuration specified" : "Конфигурация не создана", "No data specified" : "Нет данных", @@ -11,16 +11,16 @@ "Deletion failed" : "Удаление не удалось", "Take over settings from recent server configuration?" : "Принять настройки из последней конфигурации сервера?", "Keep settings?" : "Сохранить настройки?", - "{nthServer}. Server" : "{nthServer}. Сервер", - "Cannot add server configuration" : "Не получилось добавить конфигурацию сервера", - "mappings cleared" : "Соответствия очищены", + "{nthServer}. Server" : "Сервер {nthServer}.", + "Cannot add server configuration" : "Не удалось добавить конфигурацию сервера", + "mappings cleared" : "соответствия очищены", "Success" : "Успешно", "Error" : "Ошибка", "Please specify a Base DN" : "Необходимо указать Base DN", "Could not determine Base DN" : "Невозможно определить Base DN", "Please specify the port" : "Укажите порт", "Configuration OK" : "Конфигурация в порядке", - "Configuration incorrect" : "Конфигурация неправильна", + "Configuration incorrect" : "Конфигурация некорректна", "Configuration incomplete" : "Конфигурация не завершена", "Select groups" : "Выберите группы", "Select object classes" : "Выберите объектные классы", @@ -32,45 +32,45 @@ "_%s group found_::_%s groups found_" : ["%s группа найдена","%s группы найдены","%s групп найдено"], "_%s user found_::_%s users found_" : ["%s пользователь найден","%s пользователя найдено","%s пользователей найдено"], "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Не удалось автоматически определить атрибут содержащий отображаемое имя пользователя. Зайдите в расширенные настройки ldap и укажите его вручную.", - "Could not find the desired feature" : "Не могу найти требуемой функциональности", - "Invalid Host" : "Неверный сервер", + "Could not find the desired feature" : "Не удается найти требуемую функциональность", + "Invalid Host" : "Некорректный адрес сервера", "Server" : "Сервер", - "User Filter" : "Пользователи", - "Login Filter" : "Логин", + "User Filter" : "Фильтр пользователей", + "Login Filter" : "Фильтр логинов", "Group Filter" : "Фильтр группы", "Save" : "Сохранить", "Test Configuration" : "Проверить конфигурацию", "Help" : "Помощь", - "Groups meeting these criteria are available in %s:" : "Группы, отвечающие этим критериям доступны в %s:", - "only those object classes:" : "только эти объектные классы", - "only from those groups:" : "только из этих групп", + "Groups meeting these criteria are available in %s:" : "Группы, отвечающие этим критериям доступны в %s:", + "only those object classes:" : "только эти объектные классы:", + "only from those groups:" : "только из этих групп:", "Edit raw filter instead" : "Редактировать исходный фильтр", "Raw LDAP filter" : "Исходный LDAP фильтр", - "The filter specifies which LDAP groups shall have access to the %s instance." : "Этот фильтр определяет, какие LDAP группы должны иметь доступ к %s.", + "The filter specifies which LDAP groups shall have access to the %s instance." : "Этот фильтр определяет какие LDAP группы должны иметь доступ к экземпляру %s.", "Test Filter" : "Проверить фильтр", "groups found" : "групп найдено", - "Users login with this attribute:" : "Пользователи пользуются этим атрибутом для входа:", + "Users login with this attribute:" : "Логин пользователей с этим атрибутом:", "LDAP Username:" : "Имя пользователя LDAP", - "LDAP Email Address:" : "LDAP адрес электронной почты:", + "LDAP Email Address:" : "Адрес email LDAP:", "Other Attributes:" : "Другие атрибуты:", "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Определяет фильтр для применения при попытке входа. %%uid заменяет имя пользователя при входе в систему. Например: \"uid=%%uid\"", - "1. Server" : "1. Сервер", - "%s. Server:" : "%s. Сервер:", + "1. Server" : "Сервер 1.", + "%s. Server:" : "Сервер %s:", "Add Server Configuration" : "Добавить конфигурацию сервера", "Delete Configuration" : "Удалить конфигурацию", "Host" : "Сервер", - "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Можно опустить протокол, за исключением того, когда вам требуется SSL. Тогда начните с ldaps :/ /", + "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Можно пренебречь протоколом, за исключением использования SSL. В этом случае укажите ldaps://", "Port" : "Порт", "User DN" : "DN пользователя", "The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty." : "DN пользователя, под которым выполняется подключение, например, uid=agent,dc=example,dc=com. Для анонимного доступа оставьте DN и пароль пустыми.", "Password" : "Пароль", "For anonymous access, leave DN and Password empty." : "Для анонимного доступа оставьте DN и пароль пустыми.", "One Base DN per line" : "По одной базе поиска (Base DN) в строке.", - "You can specify Base DN for users and groups in the Advanced tab" : "Вы можете задать Base DN для пользователей и групп на вкладке \"Расширенное\"", - "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Перестаёт посылать автоматически запросы LDAP. Эта опция хороша для крупных проектов, но требует некоторых знаний LDAP.", + "You can specify Base DN for users and groups in the Advanced tab" : "Вы можете задать Base DN для пользователей и групп на вкладке \"Расширенные\"", + "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Избегает отправки автоматических запросов LDAP. Эта опция подходит для крупных проектов, но требует некоторых знаний LDAP.", "Manually enter LDAP filters (recommended for large directories)" : "Ввести LDAP фильтры вручную (рекомендуется для больших директорий)", - "Limit %s access to users meeting these criteria:" : "Ограничить доступ к %s пользователям, удовлетворяющим этому критерию:", - "The filter specifies which LDAP users shall have access to the %s instance." : "Этот фильтр указывает, какие пользователи LDAP должны иметь доступ к %s.", + "Limit %s access to users meeting these criteria:" : "Ограничить доступ пользователям к %s, удовлетворяющим этому критерию:", + "The filter specifies which LDAP users shall have access to the %s instance." : "Этот фильтр указывает, какие пользователи LDAP должны иметь доступ к экземпляру %s.", "users found" : "пользователей найдено", "Saving" : "Сохраняется", "Back" : "Назад", @@ -79,7 +79,7 @@ "Expert" : "Эксперт", "Advanced" : "Дополнительно", "<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." : "<b>Предупреждение:</b> Приложения user_ldap и user_webdavauth несовместимы. Вы можете наблюдать некорректное поведение. Пожалуйста, попросите вашего системного администратора отключить одно из них.", - "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>Внимание:</b> Модуль LDAP для PHP не установлен, бэкенд не будет работать. Пожалуйста, попросите вашего системного администратора его установить. ", + "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>Предупреждение:</b> Модуль LDAP для PHP не установлен, бэкенд не будет работать. Пожалуйста, попросите вашего системного администратора его установить. ", "Connection Settings" : "Настройки подключения", "Configuration Active" : "Конфигурация активна", "When unchecked, this configuration will be skipped." : "Когда галочка снята, эта конфигурация будет пропущена.", @@ -87,38 +87,38 @@ "Give an optional backup host. It must be a replica of the main LDAP/AD server." : "Укажите дополнительный резервный сервер. Он должен быть репликой главного LDAP/AD сервера.", "Backup (Replica) Port" : "Порт резервного сервера", "Disable Main Server" : "Отключить главный сервер", - "Only connect to the replica server." : "Подключаться только к серверу-реплике.", + "Only connect to the replica server." : "Подключаться только к резервному серверу", "Case insensitive LDAP server (Windows)" : "Нечувствительный к регистру сервер LDAP (Windows)", "Turn off SSL certificate validation." : "Отключить проверку сертификата SSL.", "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "Не рекомендуется, используйте только в режиме тестирования! Если соединение работает только с этой опцией, импортируйте на ваш %s сервер SSL-сертификат сервера LDAP.", - "Cache Time-To-Live" : "Кэш времени жизни", + "Cache Time-To-Live" : "Кэш времени жизни (TTL)", "in seconds. A change empties the cache." : "в секундах. Изменение очистит кэш.", "Directory Settings" : "Настройки каталога", "User Display Name Field" : "Поле отображаемого имени пользователя", "The LDAP attribute to use to generate the user's display name." : "Атрибут LDAP, который используется для генерации отображаемого имени пользователя.", - "Base User Tree" : "База пользовательского дерева", + "Base User Tree" : "База дерева пользователей", "One User Base DN per line" : "По одной базовому DN пользователей в строке.", "User Search Attributes" : "Атрибуты поиска пользоватетелей", "Optional; one attribute per line" : "Опционально; один атрибут в строке", "Group Display Name Field" : "Поле отображаемого имени группы", "The LDAP attribute to use to generate the groups's display name." : "Атрибут LDAP, который используется для генерации отображаемого имени группы.", - "Base Group Tree" : "База группового дерева", + "Base Group Tree" : "База дерева групп", "One Group Base DN per line" : "По одной базовому DN групп в строке.", - "Group Search Attributes" : "Атрибуты поиска для группы", + "Group Search Attributes" : "Атрибуты поиска групп", "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", - "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.)" : "ChunkSize используется в страничных поисках LDAP которые могут возвращать громоздкие результаты, как например списки пользователей или групп. (Настройка его в \"0\" отключает страничный поиск LDAP для таких ситуаций.)", + "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.)" : "ChunkSize используется в страничных поисках LDAP которые могут возвращать громоздкие результаты, как например списки пользователей или групп. (Установка значения в \"0\" отключает страничный поиск LDAP для таких ситуаций.)", "Special Attributes" : "Специальные атрибуты", "Quota Field" : "Поле квоты", "Quota Default" : "Квота по умолчанию", "in bytes" : "в байтах", - "Email Field" : "Поле адреса электронной почты", + "Email Field" : "Поле адреса email", "User Home Folder Naming Rule" : "Правило именования домашнего каталога пользователя", "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Оставьте пустым для использования имени пользователя (по умолчанию). Иначе укажите атрибут LDAP/AD.", "Internal Username" : "Внутреннее имя пользователя", - "By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder. 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." : "По умолчанию внутреннее имя пользователя будет создано из атрибута UUID. Таким образом имя пользователя становится уникальным и не требует конвертации символов. Внутреннее имя пользователя может состоять только из следующих символов: [ a-zA-Z0-9_.@- ]. Остальные символы замещаются соответствиями из таблицы ASCII или же просто пропускаются. При совпадении к имени будет добавлено или увеличено число. Внутреннее имя пользователя используется для внутренней идентификации пользователя. Также оно является именем по умолчанию для каталога пользователя в ownCloud. Оно также является частью URL, к примеру, для всех сервисов *DAV. С помощью данной настройки можно изменить поведение по умолчанию. Чтобы достичь поведения, как было до ownCloud 5, введите атрибут отображаемого имени пользователя в этом поле. Оставьте его пустым для режима по умолчанию. Изменения будут иметь эффект только для новых подключенных (добавленных) пользователей LDAP.", + "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." : "По умолчанию внутреннее имя пользователя будет создано из атрибута UUID. Таким образом имя пользователя становится уникальным и не требует конвертации символов. Внутреннее имя пользователя может состоять только из следующих символов: [ a-zA-Z0-9_.@- ]. Остальные символы заменяются аналогами из таблицы ASCII или же просто пропускаются. В случае конфликта к имени будет добавлено/увеличено число. Внутреннее имя пользователя используется для внутренней идентификации пользователя. Также оно является именем по умолчанию для каталога пользователя в ownCloud. Оно также является частью URL, к примеру, для всех сервисов *DAV. С помощью данной настройки можно изменить поведение по умолчанию. Чтобы достичь поведения, как было до ownCloud 5, введите атрибут отображаемого имени пользователя в этом поле. Оставьте его пустым для режима по умолчанию. Изменения будут иметь эффект только для новых подключенных (добавленных) пользователей LDAP.", "Internal Username Attribute:" : "Атрибут для внутреннего имени:", "Override UUID detection" : "Переопределить нахождение 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." : "По умолчанию ownCloud определяет атрибут UUID автоматически. Этот атрибут используется для того, чтобы достоверно идентифицировать пользователей и группы LDAP. Также на основании атрибута UUID создается внутреннее имя пользователя, если выше не указано иначе. Вы можете переопределить эту настройку и указать свой атрибут по выбору. Вы должны удостовериться, что выбранный вами атрибут может быть выбран для пользователей и групп, а также то, что он уникальный. Оставьте поле пустым для поведения по умолчанию. Изменения вступят в силу только для новых подключенных (добавленных) пользователей и групп LDAP.", diff --git a/apps/user_ldap/l10n/sk_SK.js b/apps/user_ldap/l10n/sk_SK.js index 3c3f9a0cc83..79ff7d3a715 100644 --- a/apps/user_ldap/l10n/sk_SK.js +++ b/apps/user_ldap/l10n/sk_SK.js @@ -33,6 +33,7 @@ OC.L10N.register( "Confirm Deletion" : "Potvrdiť vymazanie", "_%s group found_::_%s groups found_" : ["%s nájdená skupina","%s nájdené skupiny","%s nájdených skupín"], "_%s user found_::_%s users found_" : ["%s nájdený používateľ","%s nájdení používatelia","%s nájdených používateľov"], + "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Nemožno zistiť používateľský atribút pre zobrazenie používateľského mena. Prosím, zadajte ho sami v pokročilých nastaveniach LDAP.", "Could not find the desired feature" : "Nemožno nájsť požadovanú funkciu", "Invalid Host" : "Neplatný hostiteľ", "Server" : "Server", diff --git a/apps/user_ldap/l10n/sk_SK.json b/apps/user_ldap/l10n/sk_SK.json index ff881a68803..17d511b2ea9 100644 --- a/apps/user_ldap/l10n/sk_SK.json +++ b/apps/user_ldap/l10n/sk_SK.json @@ -31,6 +31,7 @@ "Confirm Deletion" : "Potvrdiť vymazanie", "_%s group found_::_%s groups found_" : ["%s nájdená skupina","%s nájdené skupiny","%s nájdených skupín"], "_%s user found_::_%s users found_" : ["%s nájdený používateľ","%s nájdení používatelia","%s nájdených používateľov"], + "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Nemožno zistiť používateľský atribút pre zobrazenie používateľského mena. Prosím, zadajte ho sami v pokročilých nastaveniach LDAP.", "Could not find the desired feature" : "Nemožno nájsť požadovanú funkciu", "Invalid Host" : "Neplatný hostiteľ", "Server" : "Server", diff --git a/apps/user_ldap/l10n/uk.js b/apps/user_ldap/l10n/uk.js index 0b8e8946e0f..7d0409fabac 100644 --- a/apps/user_ldap/l10n/uk.js +++ b/apps/user_ldap/l10n/uk.js @@ -33,6 +33,7 @@ OC.L10N.register( "Confirm Deletion" : "Підтвердіть Видалення", "_%s group found_::_%s groups found_" : [" %s група знайдена "," %s груп знайдено ","%s груп знайдено "], "_%s user found_::_%s users found_" : ["%s користувач знайден","%s користувачів знайдено","%s користувачів знайдено"], + "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Не вдалося виявити ім'я користувача. Будь ласка, сформулюйте самі в розширених налаштуваннях LDAP.", "Could not find the desired feature" : "Не вдалося знайти потрібну функцію", "Invalid Host" : "Невірний Host", "Server" : "Сервер", diff --git a/apps/user_ldap/l10n/uk.json b/apps/user_ldap/l10n/uk.json index 9fb1ce119fb..e069adf2ea7 100644 --- a/apps/user_ldap/l10n/uk.json +++ b/apps/user_ldap/l10n/uk.json @@ -31,6 +31,7 @@ "Confirm Deletion" : "Підтвердіть Видалення", "_%s group found_::_%s groups found_" : [" %s група знайдена "," %s груп знайдено ","%s груп знайдено "], "_%s user found_::_%s users found_" : ["%s користувач знайден","%s користувачів знайдено","%s користувачів знайдено"], + "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Не вдалося виявити ім'я користувача. Будь ласка, сформулюйте самі в розширених налаштуваннях LDAP.", "Could not find the desired feature" : "Не вдалося знайти потрібну функцію", "Invalid Host" : "Невірний Host", "Server" : "Сервер", diff --git a/apps/user_ldap/l10n/yo.js b/apps/user_ldap/l10n/yo.js new file mode 100644 index 00000000000..37042a4f412 --- /dev/null +++ b/apps/user_ldap/l10n/yo.js @@ -0,0 +1,7 @@ +OC.L10N.register( + "user_ldap", + { + "_%s group found_::_%s groups found_" : ["",""], + "_%s user found_::_%s users found_" : ["",""] +}, +"nplurals=2; plural=(n != 1);"); diff --git a/apps/user_ldap/l10n/yo.json b/apps/user_ldap/l10n/yo.json new file mode 100644 index 00000000000..521de7ba1a8 --- /dev/null +++ b/apps/user_ldap/l10n/yo.json @@ -0,0 +1,5 @@ +{ "translations": { + "_%s group found_::_%s groups found_" : ["",""], + "_%s user found_::_%s users found_" : ["",""] +},"pluralForm" :"nplurals=2; plural=(n != 1);" +}
\ No newline at end of file diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php index 0fb968cebe7..76cd9713e4e 100644 --- a/apps/user_ldap/lib/access.php +++ b/apps/user_ldap/lib/access.php @@ -152,7 +152,7 @@ class Access extends LDAPUtility implements user\IUserTools { $pagingSize = intval($this->connection->ldapPagingSize); // 0 won't result in replies, small numbers may leave out groups // (cf. #12306), 500 is default for paging and should work everywhere. - $maxResults = $pagingSize < 20 ? $pagingSize : 500; + $maxResults = $pagingSize > 20 ? $pagingSize : 500; $this->initPagedSearch($filter, array($dn), array($attr), $maxResults, 0); $dn = $this->DNasBaseParameter($dn); $rr = @$this->ldap->read($cr, $dn, $filter, array($attr)); @@ -303,7 +303,7 @@ class Access extends LDAPUtility implements user\IUserTools { /** * 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 + * @return string|false with the LDAP DN on success, otherwise false */ public function username2dn($name) { $fdn = $this->userMapper->getDNbyName($name); @@ -322,7 +322,7 @@ class Access extends LDAPUtility implements user\IUserTools { * returns the internal ownCloud name for the given LDAP DN of the group, false on DN outside of search DN or failure * @param string $fdn 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 + * @return string|false with the name to use in ownCloud, false on DN outside of search DN */ public function dn2groupname($fdn, $ldapName = null) { //To avoid bypassing the base DN settings under certain circumstances @@ -339,7 +339,7 @@ class Access extends LDAPUtility implements user\IUserTools { * 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 + * @return string|false with with the name to use in ownCloud */ public function dn2username($fdn, $ldapName = null) { //To avoid bypassing the base DN settings under certain circumstances @@ -357,7 +357,7 @@ class Access extends LDAPUtility implements user\IUserTools { * @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 + * @return string|false with with the name to use in ownCloud */ public function dn2ocname($fdn, $ldapName = null, $isUser = true) { if($isUser) { @@ -508,7 +508,7 @@ class Access extends LDAPUtility implements user\IUserTools { /** * creates a unique name for internal ownCloud use for users. Don't call it directly. * @param string $name the display name of the object - * @return string with with the name to use in ownCloud or false if unsuccessful + * @return string|false with with the name to use in ownCloud or false if unsuccessful * * Instead of using this method directly, call * createAltInternalOwnCloudName($name, true) @@ -530,7 +530,7 @@ class Access extends LDAPUtility implements user\IUserTools { /** * creates a unique name for internal ownCloud use for groups. Don't call it directly. * @param string $name the display name of the object - * @return string with with the name to use in ownCloud or false if unsuccessful. + * @return string|false with with the name to use in ownCloud or false if unsuccessful. * * Instead of using this method directly, call * createAltInternalOwnCloudName($name, false) @@ -569,7 +569,7 @@ class Access extends LDAPUtility implements user\IUserTools { * creates a unique name for internal ownCloud use. * @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) - * @return string with with the name to use in ownCloud or false if unsuccessful + * @return string|false with with the name to use in ownCloud or false if unsuccessful */ private function createAltInternalOwnCloudName($name, $isUser) { $originalTTL = $this->connection->ldapCacheTTL; diff --git a/apps/user_ldap/lib/connection.php b/apps/user_ldap/lib/connection.php index a9d21ffc8e7..e3b2616e2d2 100644 --- a/apps/user_ldap/lib/connection.php +++ b/apps/user_ldap/lib/connection.php @@ -592,7 +592,7 @@ class Connection extends LDAPUtility { if(!$ldapLogin) { \OCP\Util::writeLog('user_ldap', 'Bind failed: ' . $this->ldap->errno($cr) . ': ' . $this->ldap->error($cr), - \OCP\Util::ERROR); + \OCP\Util::WARN); $this->ldapConnectionRes = null; return false; } diff --git a/apps/user_ldap/lib/wizard.php b/apps/user_ldap/lib/wizard.php index 2e4507a2585..ed9188bc880 100644 --- a/apps/user_ldap/lib/wizard.php +++ b/apps/user_ldap/lib/wizard.php @@ -110,7 +110,7 @@ class Wizard extends LDAPUtility { return false; } $groupsTotal = ($groupsTotal !== false) ? $groupsTotal : 0; - $output = self::$l->n('%s group found', '%s groups found', $groupsTotal, $groupsTotal); + $output = self::$l->n('%s group found', '%s groups found', $groupsTotal, array($groupsTotal)); $this->result->addChange('ldap_group_count', $output); return $this->result; } @@ -124,7 +124,7 @@ class Wizard extends LDAPUtility { $usersTotal = $this->countEntries($filter, 'users'); $usersTotal = ($usersTotal !== false) ? $usersTotal : 0; - $output = self::$l->n('%s user found', '%s users found', $usersTotal, $usersTotal); + $output = self::$l->n('%s user found', '%s users found', $usersTotal, array($usersTotal)); $this->result->addChange('ldap_user_count', $output); return $this->result; } @@ -314,7 +314,7 @@ class Wizard extends LDAPUtility { /** * detects the available LDAP attributes - * @return array The instance's WizardResult instance + * @return array|false The instance's WizardResult instance * @throws \Exception */ private function getUserAttributes() { @@ -348,7 +348,7 @@ class Wizard extends LDAPUtility { /** * detects the available LDAP groups - * @return WizardResult the instance's WizardResult instance + * @return WizardResult|false the instance's WizardResult instance */ public function determineGroupsForGroups() { return $this->determineGroups('ldap_groupfilter_groups', @@ -358,7 +358,7 @@ class Wizard extends LDAPUtility { /** * detects the available LDAP groups - * @return WizardResult the instance's WizardResult instance + * @return WizardResult|false the instance's WizardResult instance */ public function determineGroupsForUsers() { return $this->determineGroups('ldap_userfilter_groups', @@ -370,7 +370,7 @@ class Wizard extends LDAPUtility { * @param string $dbKey * @param string $confKey * @param bool $testMemberOf - * @return WizardResult the instance's WizardResult instance + * @return WizardResult|false the instance's WizardResult instance * @throws \Exception */ private function determineGroups($dbKey, $confKey, $testMemberOf = true) { @@ -467,7 +467,7 @@ class Wizard extends LDAPUtility { /** * Detects the available object classes - * @return WizardResult the instance's WizardResult instance + * @return WizardResult|false the instance's WizardResult instance * @throws \Exception */ public function determineGroupObjectClasses() { @@ -524,7 +524,7 @@ class Wizard extends LDAPUtility { } /** - * @return WizardResult + * @return WizardResult|false * @throws \Exception */ public function getGroupFilter() { @@ -548,7 +548,7 @@ class Wizard extends LDAPUtility { } /** - * @return WizardResult + * @return WizardResult|false * @throws \Exception */ public function getUserListFilter() { @@ -1146,7 +1146,7 @@ class Wizard extends LDAPUtility { * Configuration class * @param bool $po whether the objectClass with most result entries * shall be pre-selected via the result - * @return array, list of found items. + * @return array|false list of found items. * @throws \Exception */ private function determineFeature($objectclasses, $attr, $dbkey, $confkey, $po = false) { diff --git a/apps/user_ldap/user_ldap.php b/apps/user_ldap/user_ldap.php index 051e760105b..270e94121d5 100644 --- a/apps/user_ldap/user_ldap.php +++ b/apps/user_ldap/user_ldap.php @@ -303,7 +303,7 @@ class USER_LDAP extends BackendUtility implements \OCP\IUserBackend, \OCP\UserIn /** * get display name of the user * @param string $uid user ID of the user - * @return string display name + * @return string|false display name */ public function getDisplayName($uid) { if(!$this->userExists($uid)) { diff --git a/apps/user_webdavauth/appinfo/app.php b/apps/user_webdavauth/appinfo/app.php index 125f5f40654..3cd227bddbe 100644 --- a/apps/user_webdavauth/appinfo/app.php +++ b/apps/user_webdavauth/appinfo/app.php @@ -28,8 +28,6 @@ OC_APP::registerAdmin('user_webdavauth', 'settings'); OC_User::registerBackend("WEBDAVAUTH"); OC_User::useBackend( "WEBDAVAUTH" ); -OCP\Util::addTranslations('user_webdavauth'); - // add settings page to navigation $entry = array( 'id' => "user_webdavauth_settings", diff --git a/apps/user_webdavauth/img/app.svg b/apps/user_webdavauth/img/app.svg index 63a065afdc7..0ce7ed867bd 100644 --- a/apps/user_webdavauth/img/app.svg +++ b/apps/user_webdavauth/img/app.svg @@ -1,61 +1,5 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> -<svg - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - height="16" - width="16" - version="1.0" - id="svg2" - inkscape:version="0.48.5 r10040" - sodipodi:docname="app.svg"> - <metadata - id="metadata12"> - <rdf:RDF> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - </cc:Work> - </rdf:RDF> - </metadata> - <defs - id="defs10" /> - <sodipodi:namedview - pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="1" - objecttolerance="10" - gridtolerance="10" - guidetolerance="10" - inkscape:pageopacity="0" - inkscape:pageshadow="2" - inkscape:window-width="1920" - inkscape:window-height="1014" - id="namedview8" - showgrid="false" - inkscape:zoom="14.75" - inkscape:cx="-6.6440678" - inkscape:cy="8" - inkscape:window-x="0" - inkscape:window-y="27" - inkscape:window-maximized="1" - inkscape:current-layer="svg2" /> - <rect - style="color:#000000" - fill-opacity="0" - height="97.986" - width="163.31" - y="-32.993" - x="-62.897" - id="rect4" /> - <path - style="block-progression:tb;color:#000000;text-transform:none;text-indent:0;fill:#ffffff;fill-opacity:1" - d="m8.4036 1c-1.7312 0-3.1998 1.2661-3.1998 2.9 0.012287 0.51643 0.058473 1.1532 0.36664 2.5v0.033333l0.033328 0.033333c0.098928 0.28338 0.24289 0.44549 0.4333 0.66666s0.41742 0.48149 0.63328 0.69999c0.025397 0.025708 0.041676 0.041633 0.066656 0.066677 0.04281 0.18631 0.094672 0.38681 0.13332 0.56666 0.10284 0.47851 0.092296 0.81737 0.066668 0.93332-0.74389 0.26121-1.6694 0.57228-2.4998 0.93332-0.46622 0.2027-0.8881 0.3837-1.2332 0.59999-0.34513 0.2163-0.68837 0.37971-0.79994 0.86666-0.16004 0.63293-0.19866 0.7539-0.39997 1.5333-0.027212 0.20914 0.083011 0.42961 0.26665 0.53333 1.5078 0.81451 3.824 1.1423 6.1329 1.1333s4.6066-0.35609 6.0662-1.1333c0.11739-0.07353 0.14304-0.10869 0.13332-0.2333-0.04365-0.68908-0.08154-1.3669-0.13332-1.7666-0.01807-0.09908-0.06492-0.19275-0.13332-0.26666-0.46366-0.5537-1.1564-0.89218-1.9665-1.2333-0.7396-0.31144-1.6067-0.63486-2.4665-0.99999-0.048123-0.10721-0.095926-0.41912 0-0.89999 0.025759-0.12912 0.066096-0.26742 0.099994-0.4 0.0808-0.090507 0.14378-0.16447 0.23332-0.26666 0.19096-0.21796 0.39614-0.44661 0.56662-0.66666s0.30996-0.40882 0.39997-0.66666l0.03333-0.033333c0.34839-1.4062 0.34857-1.9929 0.36664-2.5v-0.033333c0-1.6339-1.4686-2.9-3.1998-2.9z" - id="path6" /> +<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/"> + <rect style="color:#000000" fill-opacity="0" height="97.986" width="163.31" y="-32.993" x="-62.897"/> + <path style="block-progression:tb;color:#000000;text-transform:none;text-indent:0" fill="#fff" d="m8.4036 1c-1.7312 0-3.1998 1.2661-3.1998 2.9 0.012287 0.51643 0.058473 1.1532 0.36664 2.5v0.033333l0.033328 0.033333c0.098928 0.28338 0.24289 0.44549 0.4333 0.66666s0.41742 0.48149 0.63328 0.69999c0.025397 0.025708 0.041676 0.041633 0.066656 0.066677 0.04281 0.18631 0.094672 0.38681 0.13332 0.56666 0.10284 0.47851 0.092296 0.81737 0.066668 0.93332-0.74389 0.26121-1.6694 0.57228-2.4998 0.93332-0.46622 0.2027-0.8881 0.3837-1.2332 0.59999-0.34513 0.2163-0.68837 0.37971-0.79994 0.86666-0.16004 0.63293-0.19866 0.7539-0.39997 1.5333-0.027212 0.20914 0.083011 0.42961 0.26665 0.53333 1.5078 0.81451 3.824 1.1423 6.1329 1.1333s4.6066-0.35609 6.0662-1.1333c0.11739-0.07353 0.14304-0.10869 0.13332-0.2333-0.04365-0.68908-0.08154-1.3669-0.13332-1.7666-0.01807-0.09908-0.06492-0.19275-0.13332-0.26666-0.46366-0.5537-1.1564-0.89218-1.9665-1.2333-0.7396-0.31144-1.6067-0.63486-2.4665-0.99999-0.048123-0.10721-0.095926-0.41912 0-0.89999 0.025759-0.12912 0.066096-0.26742 0.099994-0.4 0.0808-0.090507 0.14378-0.16447 0.23332-0.26666 0.19096-0.21796 0.39614-0.44661 0.56662-0.66666s0.30996-0.40882 0.39997-0.66666l0.03333-0.033333c0.34839-1.4062 0.34857-1.9929 0.36664-2.5v-0.033333c0-1.6339-1.4686-2.9-3.1998-2.9z"/> </svg> diff --git a/apps/user_webdavauth/l10n/da.js b/apps/user_webdavauth/l10n/da.js index 9fc6a4e161f..f545d82413b 100644 --- a/apps/user_webdavauth/l10n/da.js +++ b/apps/user_webdavauth/l10n/da.js @@ -4,6 +4,6 @@ OC.L10N.register( "WebDAV Authentication" : "WebDAV-godkendelse", "Address:" : "Adresse:", "Save" : "Gem", - "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." : "Bruger oplysningerne vil blive sendt til denne adresse. Plugin'et registrerer responsen og fortolker HTTP-statuskode 401 og 403 som ugyldige oplysninger, men alle andre besvarelser som gyldige oplysninger." + "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." : "Bruger oplysningerne vil blive sendt til denne adresse. Udvidelsen registrerer svaret og fortolker HTTP-statuskode 401 og 403 som ugyldige oplysninger, men alle andre besvarelser som gyldige oplysninger." }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/user_webdavauth/l10n/da.json b/apps/user_webdavauth/l10n/da.json index 9e967eb3158..c0e7a709b57 100644 --- a/apps/user_webdavauth/l10n/da.json +++ b/apps/user_webdavauth/l10n/da.json @@ -2,6 +2,6 @@ "WebDAV Authentication" : "WebDAV-godkendelse", "Address:" : "Adresse:", "Save" : "Gem", - "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." : "Bruger oplysningerne vil blive sendt til denne adresse. Plugin'et registrerer responsen og fortolker HTTP-statuskode 401 og 403 som ugyldige oplysninger, men alle andre besvarelser som gyldige oplysninger." + "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." : "Bruger oplysningerne vil blive sendt til denne adresse. Udvidelsen registrerer svaret og fortolker HTTP-statuskode 401 og 403 som ugyldige oplysninger, men alle andre besvarelser som gyldige oplysninger." },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/user_webdavauth/l10n/fr.js b/apps/user_webdavauth/l10n/fr.js index a53302d4a6d..5a89cf211ef 100644 --- a/apps/user_webdavauth/l10n/fr.js +++ b/apps/user_webdavauth/l10n/fr.js @@ -4,6 +4,6 @@ OC.L10N.register( "WebDAV Authentication" : "Authentification WebDAV", "Address:" : "Adresse :", "Save" : "Sauvegarder", - "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." : "Les informations de connexion de l'utilisateur seront envoyées à cette adresse. Ce module analyse le code de la réponse HTTP et considère les codes 401 et 403 comme une authentification non valable et toute autre valeur comme une authentification valable." + "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." : "Les informations de connexion de l'utilisateur seront envoyées à cette adresse. Ce module analyse le code de la réponse HTTP et considère les codes 401 et 403 comme une authentification invalide et toute autre valeur comme une authentification valide." }, "nplurals=2; plural=(n > 1);"); diff --git a/apps/user_webdavauth/l10n/fr.json b/apps/user_webdavauth/l10n/fr.json index 93d631c8ed6..72336cad0b2 100644 --- a/apps/user_webdavauth/l10n/fr.json +++ b/apps/user_webdavauth/l10n/fr.json @@ -2,6 +2,6 @@ "WebDAV Authentication" : "Authentification WebDAV", "Address:" : "Adresse :", "Save" : "Sauvegarder", - "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." : "Les informations de connexion de l'utilisateur seront envoyées à cette adresse. Ce module analyse le code de la réponse HTTP et considère les codes 401 et 403 comme une authentification non valable et toute autre valeur comme une authentification valable." + "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." : "Les informations de connexion de l'utilisateur seront envoyées à cette adresse. Ce module analyse le code de la réponse HTTP et considère les codes 401 et 403 comme une authentification invalide et toute autre valeur comme une authentification valide." },"pluralForm" :"nplurals=2; plural=(n > 1);" }
\ No newline at end of file diff --git a/apps/user_webdavauth/l10n/hr.js b/apps/user_webdavauth/l10n/hr.js index 041fea254dc..1c3044b69b3 100644 --- a/apps/user_webdavauth/l10n/hr.js +++ b/apps/user_webdavauth/l10n/hr.js @@ -1,6 +1,9 @@ OC.L10N.register( "user_webdavauth", { - "Save" : "Snimi" + "WebDAV Authentication" : "WebDAV autentifikacija", + "Address:" : "Adresa:", + "Save" : "Spremi", + "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." : "Korisnički podaci će biti poslani na tu adresu. Ovaj dodatak provjerava odgovor i interpretira HTTP status 401 i 403 kao neuspječnu prijavu, svi ostali statusi znače da je prijava uspješna i da su korisnički podaci točni." }, "nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;"); diff --git a/apps/user_webdavauth/l10n/hr.json b/apps/user_webdavauth/l10n/hr.json index d7da18a7a96..20ff7796fbb 100644 --- a/apps/user_webdavauth/l10n/hr.json +++ b/apps/user_webdavauth/l10n/hr.json @@ -1,4 +1,7 @@ { "translations": { - "Save" : "Snimi" + "WebDAV Authentication" : "WebDAV autentifikacija", + "Address:" : "Adresa:", + "Save" : "Spremi", + "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." : "Korisnički podaci će biti poslani na tu adresu. Ovaj dodatak provjerava odgovor i interpretira HTTP status 401 i 403 kao neuspječnu prijavu, svi ostali statusi znače da je prijava uspješna i da su korisnički podaci točni." },"pluralForm" :"nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;" }
\ No newline at end of file diff --git a/apps/user_webdavauth/l10n/ko.js b/apps/user_webdavauth/l10n/ko.js index e8b5ee69816..331e65c0200 100644 --- a/apps/user_webdavauth/l10n/ko.js +++ b/apps/user_webdavauth/l10n/ko.js @@ -2,6 +2,7 @@ OC.L10N.register( "user_webdavauth", { "WebDAV Authentication" : "WebDAV 인증", + "Address:" : "주소:", "Save" : "저장", "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." : "ownCloud에서 이 URL로 사용자 인증 정보를 보냅니다. 이 플러그인은 응답을 확인하여 HTTP 상태 코드 401이나 403이 돌아온 경우에 잘못된 인증 정보로 간주합니다. 다른 모든 상태 코드는 올바른 인증 정보로 간주합니다." }, diff --git a/apps/user_webdavauth/l10n/ko.json b/apps/user_webdavauth/l10n/ko.json index 90fde9abd62..7e42e9d3fd7 100644 --- a/apps/user_webdavauth/l10n/ko.json +++ b/apps/user_webdavauth/l10n/ko.json @@ -1,5 +1,6 @@ { "translations": { "WebDAV Authentication" : "WebDAV 인증", + "Address:" : "주소:", "Save" : "저장", "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." : "ownCloud에서 이 URL로 사용자 인증 정보를 보냅니다. 이 플러그인은 응답을 확인하여 HTTP 상태 코드 401이나 403이 돌아온 경우에 잘못된 인증 정보로 간주합니다. 다른 모든 상태 코드는 올바른 인증 정보로 간주합니다." },"pluralForm" :"nplurals=1; plural=0;" |
