From d4c0ac779034a47d4fc8a56e0a96a7d84170e03c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Thu, 14 Nov 2013 09:38:55 +0100 Subject: [PATCH 001/253] introduce auto completion on share email - integrated with the contactsmanager api --- core/ajax/share.php | 24 ++++++++++++++++++++++++ core/js/share.js | 20 ++++++++++++++++++++ 2 files changed, 44 insertions(+) diff --git a/core/ajax/share.php b/core/ajax/share.php index be02c056357..6bac2867c48 100644 --- a/core/ajax/share.php +++ b/core/ajax/share.php @@ -261,6 +261,30 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo OC_JSON::success(array('data' => array('reshare' => $reshare, 'shares' => $shares))); } break; + case 'getShareWithEmail': + $result = array(); + if (isset($_GET['search'])) { + $cm = OC::$server->getContactsManager(); + if (!is_null($cm) && $cm->isEnabled()) { + $contacts = $cm->search($_GET['search'], array('FN', 'EMAIL')); + foreach ($contacts as $contact) { + $emails = $contact['EMAIL']; + if (!is_array($emails)) { + $emails = array($emails); + } + + foreach($emails as $email) { + $result[] = array( + 'id' => $contact['ID'], + 'email' => $email, + 'displayname' => $contact['FN'], + ); + } + } + } + } + OC_JSON::success(array('data' => $result)); + break; case 'getShareWith': if (isset($_GET['search'])) { $sharePolicy = OC_Appconfig::getValue('core', 'shareapi_share_policy', 'global'); diff --git a/core/js/share.js b/core/js/share.js index 411f0d23c36..44c58a3f942 100644 --- a/core/js/share.js +++ b/core/js/share.js @@ -314,6 +314,26 @@ OC.Share={ .append( insert ) .appendTo( ul ); }; + $('#email').autocomplete({ + minLength: 1, + source: function (search, response) { + $.get(OC.filePath('core', 'ajax', 'share.php'), { fetch: 'getShareWithEmail', search: search.term }, function(result) { + if (result.status == 'success' && result.data.length > 0) { + response(result.data); + } + }); + }, + select: function( event, item ) { + $('#email').val(item.item.email); + return false; + } + }) + .data("ui-autocomplete")._renderItem = function( ul, item ) { + return $( "
  • " ) + .append( "" + item.displayname + "
    " + item.email + "    " ) + .appendTo( ul ); + }; + } else { html += ''; html += ''; -- GitLab From 79a6d89bccf4c5d4ce934c88bc544988c47b8e98 Mon Sep 17 00:00:00 2001 From: Luke Policinski Date: Wed, 19 Feb 2014 21:23:39 +0000 Subject: [PATCH 002/253] Feature Added : Ability to drag and drop in Chrome --- apps/files/ajax/upload.php | 26 ++++++++++++++++++-------- apps/files/js/file-upload.js | 3 ++- apps/files/js/filelist.js | 32 ++++++++++++++++++++++++++++---- lib/private/files/view.php | 11 +++++++++++ 4 files changed, 59 insertions(+), 13 deletions(-) diff --git a/apps/files/ajax/upload.php b/apps/files/ajax/upload.php index 145f40c50da..b2aa7a99200 100644 --- a/apps/files/ajax/upload.php +++ b/apps/files/ajax/upload.php @@ -103,22 +103,32 @@ if ($maxUploadFileSize >= 0 and $totalSize > $maxUploadFileSize) { } $result = array(); +$directory = ''; if (strpos($dir, '..') === false) { $fileCount = count($files['name']); for ($i = 0; $i < $fileCount; $i++) { + + // Get the files directory + if(isset($_POST['file_directory']) === true) { + $directory = '/'.$_POST['file_directory']; + } + // $path needs to be normalized - this failed within drag'n'drop upload to a sub-folder if (isset($_POST['resolution']) && $_POST['resolution']==='autorename') { // append a number in brackets like 'filename (2).ext' - $target = OCP\Files::buildNotExistingFileName(stripslashes($dir), $files['name'][$i]); + $target = OCP\Files::buildNotExistingFileName(stripslashes($dir.$directory), $files['name'][$i]); } else { - $target = \OC\Files\Filesystem::normalizePath(stripslashes($dir).'/'.$files['name'][$i]); + $target = \OC\Files\Filesystem::normalizePath(stripslashes($dir.$directory).'/'.$files['name'][$i]); } - - $directory = \OC\Files\Filesystem::normalizePath(stripslashes($dir)); - if (isset($public_directory)) { - // If we are uploading from the public app, - // we want to send the relative path in the ajax request. - $directory = $public_directory; + + if(empty($directory) === true) + { + $directory = \OC\Files\Filesystem::normalizePath(stripslashes($dir)); + if (isset($public_directory)) { + // If we are uploading from the public app, + // we want to send the relative path in the ajax request. + $directory = $public_directory; + } } if ( ! \OC\Files\Filesystem::file_exists($target) diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js index f962a7044a8..ae6fdc654e4 100644 --- a/apps/files/js/file-upload.js +++ b/apps/files/js/file-upload.js @@ -327,7 +327,8 @@ $(document).ready(function() { // noone set update parameters, we set the minimum data.formData = { requesttoken: oc_requesttoken, - dir: $('#dir').val() + dir: $('#dir').val(), + file_directory: data.files[0]['relativePath'], }; } }, diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index d6cffde05de..2631812c2e2 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -879,7 +879,8 @@ $(document).ready(function() { data.formData = function(form) { return [ {name: 'dir', value: dir}, - {name: 'requesttoken', value: oc_requesttoken} + {name: 'requesttoken', value: oc_requesttoken}, + {name: 'file_directory', value: data.files[0]['relativePath']} ]; }; } @@ -935,7 +936,7 @@ $(document).ready(function() { var file = result[0]; if (data.context && data.context.data('type') === 'dir') { - + // update upload counter ui var uploadtext = data.context.find('.uploadtext'); var currentUploads = parseInt(uploadtext.attr('currentUploads')); @@ -956,10 +957,33 @@ $(document).ready(function() { size += parseInt(file.size); data.context.attr('data-size', size); data.context.find('td.filesize').text(humanFileSize(size)); - - } else { + } + else { + // only append new file if uploaded into the current folder if (file.directory !== FileList.getCurrentDirectory()) { + + file_directory = file.directory.replace('/','').replace(/\/$/, "").split('/'); + + if (file_directory.length == 1) { + file_directory = file_directory[0]; + + // Get the directory + if ($('tr[data-file="'+file_directory+'"]').length == 0) + { + FileList.addDir(file_directory, 0, new Date(), false); + } + } + else { + file_directory = file_directory[0]; + } + + // update folder size + var size = parseInt($('tr[data-file="'+file_directory+'"]').attr('data-size')); + size += parseInt(file.size); + $('tr[data-file="'+file_directory+'"]').attr('data-size', size); + $('tr[data-file="'+file_directory+'"]').find('td.filesize').text(humanFileSize(size)); + return; } diff --git a/lib/private/files/view.php b/lib/private/files/view.php index 530aa8f7514..7977272ee1f 100644 --- a/lib/private/files/view.php +++ b/lib/private/files/view.php @@ -617,10 +617,21 @@ class View { } public function fromTmpFile($tmpFile, $path) { + if (Filesystem::isValidPath($path)) { + + // Get directory that the file is going into + $file_path = \OC_User::getHome(\OC_User::getUser()) . '/files'.substr($path, 0, strrpos($path,'/')); + + // Create the directories if any + if(empty($file_path) === false) { + mkdir($file_path, 0770, true); + } + if (!$tmpFile) { debug_print_backtrace(); } + $source = fopen($tmpFile, 'r'); if ($source) { $this->file_put_contents($path, $source); -- GitLab From b01492fecd5019a09cd7b1265a9cef43fc42616f Mon Sep 17 00:00:00 2001 From: Luke Policinski Date: Wed, 19 Feb 2014 21:28:32 +0000 Subject: [PATCH 003/253] Feature Added : Ability to drag and drop in Chrome --- apps/files/ajax/upload.php | 4 ++-- apps/files/js/filelist.js | 12 ++++++------ lib/private/files/view.php | 10 +++++----- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/apps/files/ajax/upload.php b/apps/files/ajax/upload.php index b2aa7a99200..d189386e051 100644 --- a/apps/files/ajax/upload.php +++ b/apps/files/ajax/upload.php @@ -107,12 +107,12 @@ $directory = ''; if (strpos($dir, '..') === false) { $fileCount = count($files['name']); for ($i = 0; $i < $fileCount; $i++) { - + // Get the files directory if(isset($_POST['file_directory']) === true) { $directory = '/'.$_POST['file_directory']; } - + // $path needs to be normalized - this failed within drag'n'drop upload to a sub-folder if (isset($_POST['resolution']) && $_POST['resolution']==='autorename') { // append a number in brackets like 'filename (2).ext' diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index 2631812c2e2..17846c23b72 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -936,7 +936,7 @@ $(document).ready(function() { var file = result[0]; if (data.context && data.context.data('type') === 'dir') { - + // update upload counter ui var uploadtext = data.context.find('.uploadtext'); var currentUploads = parseInt(uploadtext.attr('currentUploads')); @@ -962,12 +962,12 @@ $(document).ready(function() { // only append new file if uploaded into the current folder if (file.directory !== FileList.getCurrentDirectory()) { - + file_directory = file.directory.replace('/','').replace(/\/$/, "").split('/'); - + if (file_directory.length == 1) { file_directory = file_directory[0]; - + // Get the directory if ($('tr[data-file="'+file_directory+'"]').length == 0) { @@ -977,13 +977,13 @@ $(document).ready(function() { else { file_directory = file_directory[0]; } - + // update folder size var size = parseInt($('tr[data-file="'+file_directory+'"]').attr('data-size')); size += parseInt(file.size); $('tr[data-file="'+file_directory+'"]').attr('data-size', size); $('tr[data-file="'+file_directory+'"]').find('td.filesize').text(humanFileSize(size)); - + return; } diff --git a/lib/private/files/view.php b/lib/private/files/view.php index 7977272ee1f..ddf8c3038be 100644 --- a/lib/private/files/view.php +++ b/lib/private/files/view.php @@ -617,21 +617,21 @@ class View { } public function fromTmpFile($tmpFile, $path) { - + if (Filesystem::isValidPath($path)) { - + // Get directory that the file is going into $file_path = \OC_User::getHome(\OC_User::getUser()) . '/files'.substr($path, 0, strrpos($path,'/')); - + // Create the directories if any if(empty($file_path) === false) { mkdir($file_path, 0770, true); } - + if (!$tmpFile) { debug_print_backtrace(); } - + $source = fopen($tmpFile, 'r'); if ($source) { $this->file_put_contents($path, $source); -- GitLab From 089052b13af7a5e27d225ab345616511f4eaf2a9 Mon Sep 17 00:00:00 2001 From: Luke Policinski Date: Thu, 20 Feb 2014 20:18:27 +0000 Subject: [PATCH 004/253] Fixed issue with drag and drop not in the root directory, for folders and files --- apps/files/js/filelist.js | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index 17846c23b72..64315c03627 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -958,10 +958,9 @@ $(document).ready(function() { data.context.attr('data-size', size); data.context.find('td.filesize').text(humanFileSize(size)); } - else { - + else { // only append new file if uploaded into the current folder - if (file.directory !== FileList.getCurrentDirectory()) { + if (file.directory != '/' && file.directory !== FileList.getCurrentDirectory()) { file_directory = file.directory.replace('/','').replace(/\/$/, "").split('/'); @@ -977,12 +976,14 @@ $(document).ready(function() { else { file_directory = file_directory[0]; } + + file_directory = FileList.findFileEl(file_directory); // update folder size - var size = parseInt($('tr[data-file="'+file_directory+'"]').attr('data-size')); + var size = parseInt(file_directory.attr('data-size')); size += parseInt(file.size); - $('tr[data-file="'+file_directory+'"]').attr('data-size', size); - $('tr[data-file="'+file_directory+'"]').find('td.filesize').text(humanFileSize(size)); + file_directory.attr('data-size', size); + file_directory.find('td.filesize').text(humanFileSize(size)); return; } -- GitLab From 3a21755963d8d9897a48ab58292345c0b710e239 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Tue, 25 Feb 2014 16:23:09 +0100 Subject: [PATCH 005/253] Pass the filesystem view as argument in the sabredav connectors and use the fileinfo object --- apps/files/appinfo/remote.php | 22 ++- .../sabre/aborteduploaddetectionplugin.php | 33 ++-- lib/private/connector/sabre/directory.php | 35 ++-- lib/private/connector/sabre/file.php | 64 +++---- lib/private/connector/sabre/node.php | 166 ++++++------------ lib/private/connector/sabre/objecttree.php | 78 ++++---- lib/private/connector/sabre/quotaplugin.php | 30 ++-- lib/private/connector/sabre/server.php | 80 ++++++--- 8 files changed, 231 insertions(+), 277 deletions(-) diff --git a/apps/files/appinfo/remote.php b/apps/files/appinfo/remote.php index ef22fe92188..1922bc4fcdd 100644 --- a/apps/files/appinfo/remote.php +++ b/apps/files/appinfo/remote.php @@ -34,12 +34,8 @@ $authBackend = new OC_Connector_Sabre_Auth(); $lockBackend = new OC_Connector_Sabre_Locks(); $requestBackend = new OC_Connector_Sabre_Request(); -// Create ownCloud Dir -$rootDir = new OC_Connector_Sabre_Directory(''); -$objectTree = new \OC\Connector\Sabre\ObjectTree($rootDir); - // Fire up server -$server = new OC_Connector_Sabre_Server($objectTree); +$server = new OC_Connector_Sabre_Server(); $server->httpRequest = $requestBackend; $server->setBaseUri($baseuri); @@ -49,10 +45,22 @@ $server->addPlugin(new Sabre_DAV_Auth_Plugin($authBackend, $defaults->getName()) $server->addPlugin(new Sabre_DAV_Locks_Plugin($lockBackend)); $server->addPlugin(new Sabre_DAV_Browser_Plugin(false)); // Show something in the Browser, but no upload $server->addPlugin(new OC_Connector_Sabre_FilesPlugin()); -$server->addPlugin(new OC_Connector_Sabre_AbortedUploadDetectionPlugin()); -$server->addPlugin(new OC_Connector_Sabre_QuotaPlugin()); $server->addPlugin(new OC_Connector_Sabre_MaintenancePlugin()); $server->addPlugin(new OC_Connector_Sabre_ExceptionLoggerPlugin('webdav')); +// wait with registering these until auth is handled and the filesystem is setup +$server->subscribeEvent('beforeMethod', function () use ($server) { + $view = \OC\Files\Filesystem::getView(); + $rootInfo = $view->getFileInfo(''); + + // Create ownCloud Dir + $rootDir = new OC_Connector_Sabre_Directory($view, $rootInfo); + $objectTree = new \OC\Connector\Sabre\ObjectTree($rootDir, $view); + $server->setObjectTree($objectTree); + + $server->addPlugin(new OC_Connector_Sabre_AbortedUploadDetectionPlugin($view)); + $server->addPlugin(new OC_Connector_Sabre_QuotaPlugin($view)); +}, 30); // priority 30: after auth (10) and acl(20), before lock(50) and handling the request + // And off we go! $server->exec(); diff --git a/lib/private/connector/sabre/aborteduploaddetectionplugin.php b/lib/private/connector/sabre/aborteduploaddetectionplugin.php index ad759d1d84a..1a092a59a82 100644 --- a/lib/private/connector/sabre/aborteduploaddetectionplugin.php +++ b/lib/private/connector/sabre/aborteduploaddetectionplugin.php @@ -22,11 +22,16 @@ class OC_Connector_Sabre_AbortedUploadDetectionPlugin extends Sabre_DAV_ServerPl private $server; /** - * is kept public to allow overwrite for unit testing - * * @var \OC\Files\View */ - public $fileView; + private $fileView; + + /** + * @param \OC\Files\View $view + */ + public function __construct($view) { + $this->fileView = $view; + } /** * This initializes the plugin. @@ -55,7 +60,7 @@ class OC_Connector_Sabre_AbortedUploadDetectionPlugin extends Sabre_DAV_ServerPl // we should only react on PUT which is used for upload // e.g. with LOCK this will not work, but LOCK uses createFile() as well - if ($this->server->httpRequest->getMethod() !== 'PUT' ) { + if ($this->server->httpRequest->getMethod() !== 'PUT') { return; } @@ -70,9 +75,9 @@ class OC_Connector_Sabre_AbortedUploadDetectionPlugin extends Sabre_DAV_ServerPl if (!$expected) { return; } - $actual = $this->getFileView()->filesize($filePath); + $actual = $this->fileView->filesize($filePath); if ($actual != $expected) { - $this->getFileView()->unlink($filePath); + $this->fileView->unlink($filePath); throw new Sabre_DAV_Exception_BadRequest('expected filesize ' . $expected . ' got ' . $actual); } @@ -81,8 +86,7 @@ class OC_Connector_Sabre_AbortedUploadDetectionPlugin extends Sabre_DAV_ServerPl /** * @return string */ - public function getLength() - { + public function getLength() { $req = $this->server->httpRequest; $length = $req->getHeader('X-Expected-Entity-Length'); if (!$length) { @@ -91,17 +95,4 @@ class OC_Connector_Sabre_AbortedUploadDetectionPlugin extends Sabre_DAV_ServerPl return $length; } - - /** - * @return \OC\Files\View - */ - public function getFileView() - { - if (is_null($this->fileView)) { - // initialize fileView - $this->fileView = \OC\Files\Filesystem::getView(); - } - - return $this->fileView; - } } diff --git a/lib/private/connector/sabre/directory.php b/lib/private/connector/sabre/directory.php index 02d1a9f4ba2..619aec21eac 100644 --- a/lib/private/connector/sabre/directory.php +++ b/lib/private/connector/sabre/directory.php @@ -60,20 +60,22 @@ class OC_Connector_Sabre_Directory extends OC_Connector_Sabre_Node implements Sa // exit if we can't create a new file and we don't updatable existing file $info = OC_FileChunking::decodeName($name); - if (!\OC\Files\Filesystem::isCreatable($this->path) && - !\OC\Files\Filesystem::isUpdatable($this->path . '/' . $info['name'])) { + if (!$this->fileView->isCreatable($this->path) && + !$this->fileView->isUpdatable($this->path . '/' . $info['name'])) { throw new \Sabre_DAV_Exception_Forbidden(); } } else { // For non-chunked upload it is enough to check if we can create a new file - if (!\OC\Files\Filesystem::isCreatable($this->path)) { + if (!$this->fileView->isCreatable($this->path)) { throw new \Sabre_DAV_Exception_Forbidden(); } } $path = $this->path . '/' . $name; - $node = new OC_Connector_Sabre_File($path); + // using a dummy FileInfo is acceptable here since it will be refreshed after the put is complete + $info = new \OC\Files\FileInfo($path, null, null, array()); + $node = new OC_Connector_Sabre_File($this->fileView, $info); return $node->put($data); } @@ -90,12 +92,12 @@ class OC_Connector_Sabre_Directory extends OC_Connector_Sabre_Node implements Sa throw new \Sabre_DAV_Exception_Forbidden(); } - if (!\OC\Files\Filesystem::isCreatable($this->path)) { + if (!$this->fileView->isCreatable($this->path)) { throw new \Sabre_DAV_Exception_Forbidden(); } $newPath = $this->path . '/' . $name; - if(!\OC\Files\Filesystem::mkdir($newPath)) { + if(!$this->fileView->mkdir($newPath)) { throw new Sabre_DAV_Exception_Forbidden('Could not create directory '.$newPath); } @@ -105,6 +107,7 @@ class OC_Connector_Sabre_Directory extends OC_Connector_Sabre_Node implements Sa * Returns a specific child node, referenced by its name * * @param string $name + * @param \OCP\Files\FileInfo $info * @throws Sabre_DAV_Exception_FileNotFound * @return Sabre_DAV_INode */ @@ -112,7 +115,7 @@ class OC_Connector_Sabre_Directory extends OC_Connector_Sabre_Node implements Sa $path = $this->path . '/' . $name; if (is_null($info)) { - $info = \OC\Files\Filesystem::getFileInfo($path); + $info = $this->fileView->getFileInfo($path); } if (!$info) { @@ -120,12 +123,10 @@ class OC_Connector_Sabre_Directory extends OC_Connector_Sabre_Node implements Sa } if ($info['mimetype'] == 'httpd/unix-directory') { - $node = new OC_Connector_Sabre_Directory($path); + $node = new OC_Connector_Sabre_Directory($this->fileView, $info); } else { - $node = new OC_Connector_Sabre_File($path); + $node = new OC_Connector_Sabre_File($this->fileView, $info); } - - $node->setFileinfoCache($info); return $node; } @@ -136,7 +137,7 @@ class OC_Connector_Sabre_Directory extends OC_Connector_Sabre_Node implements Sa */ public function getChildren() { - $folder_content = \OC\Files\Filesystem::getDirectoryContent($this->path); + $folder_content = $this->fileView->getDirectoryContent($this->path); $paths = array(); foreach($folder_content as $info) { $paths[] = $this->path.'/'.$info['name']; @@ -167,7 +168,7 @@ class OC_Connector_Sabre_Directory extends OC_Connector_Sabre_Node implements Sa $nodes = array(); foreach($folder_content as $info) { - $node = $this->getChild($info['name'], $info); + $node = $this->getChild($info->getName(), $info); $node->setPropertyCache($properties[$this->path.'/'.$info['name']]); $nodes[] = $node; } @@ -183,7 +184,7 @@ class OC_Connector_Sabre_Directory extends OC_Connector_Sabre_Node implements Sa public function childExists($name) { $path = $this->path . '/' . $name; - return \OC\Files\Filesystem::file_exists($path); + return $this->fileView->file_exists($path); } @@ -199,11 +200,11 @@ class OC_Connector_Sabre_Directory extends OC_Connector_Sabre_Node implements Sa throw new \Sabre_DAV_Exception_Forbidden(); } - if (!\OC\Files\Filesystem::isDeletable($this->path)) { + if (!$this->info->isDeletable()) { throw new \Sabre_DAV_Exception_Forbidden(); } - \OC\Files\Filesystem::rmdir($this->path); + $this->fileView->rmdir($this->path); } @@ -235,7 +236,7 @@ class OC_Connector_Sabre_Directory extends OC_Connector_Sabre_Node implements Sa public function getProperties($properties) { $props = parent::getProperties($properties); if (in_array(self::GETETAG_PROPERTYNAME, $properties) && !isset($props[self::GETETAG_PROPERTYNAME])) { - $props[self::GETETAG_PROPERTYNAME] = $this->getETagPropertyForPath($this->path); + $props[self::GETETAG_PROPERTYNAME] = $this->info->getEtag(); } return $props; } diff --git a/lib/private/connector/sabre/file.php b/lib/private/connector/sabre/file.php index ef6caaf22a7..cbecd90b7d6 100644 --- a/lib/private/connector/sabre/file.php +++ b/lib/private/connector/sabre/file.php @@ -45,11 +45,8 @@ class OC_Connector_Sabre_File extends OC_Connector_Sabre_Node implements Sabre_D * @return string|null */ public function put($data) { - - $fs = $this->getFS(); - - if ($fs->file_exists($this->path) && - !$fs->isUpdatable($this->path)) { + if ($this->info && $this->fileView->file_exists($this->path) && + !$this->info->isUpdateable()) { throw new \Sabre_DAV_Exception_Forbidden(); } @@ -79,10 +76,10 @@ class OC_Connector_Sabre_File extends OC_Connector_Sabre_Node implements Sabre_D } try { - $putOkay = $fs->file_put_contents($partpath, $data); + $putOkay = $this->fileView->file_put_contents($partpath, $data); if ($putOkay === false) { \OC_Log::write('webdav', '\OC\Files\Filesystem::file_put_contents() failed', \OC_Log::ERROR); - $fs->unlink($partpath); + $this->fileView->unlink($partpath); // because we have no clue about the cause we can only throw back a 500/Internal Server Error throw new Sabre_DAV_Exception('Could not write file contents'); } @@ -105,29 +102,30 @@ class OC_Connector_Sabre_File extends OC_Connector_Sabre_Node implements Sabre_D } // rename to correct path - $renameOkay = $fs->rename($partpath, $this->path); - $fileExists = $fs->file_exists($this->path); + $renameOkay = $this->fileView->rename($partpath, $this->path); + $fileExists = $this->fileView->file_exists($this->path); if ($renameOkay === false || $fileExists === false) { \OC_Log::write('webdav', '\OC\Files\Filesystem::rename() failed', \OC_Log::ERROR); - $fs->unlink($partpath); + $this->fileView->unlink($partpath); throw new Sabre_DAV_Exception('Could not rename part file to final file'); } // allow sync clients to send the mtime along in a header $mtime = OC_Request::hasModificationTime(); if ($mtime !== false) { - if($fs->touch($this->path, $mtime)) { + if($this->fileView->touch($this->path, $mtime)) { header('X-OC-MTime: accepted'); } } + $this->refreshInfo(); - return $this->getETagPropertyForPath($this->path); + return '"' . $this->info->getEtag() . '"'; } /** * Returns the data * - * @return string + * @return string | resource */ public function get() { @@ -135,7 +133,7 @@ class OC_Connector_Sabre_File extends OC_Connector_Sabre_Node implements Sabre_D if (\OC_Util::encryptedFiles()) { throw new \Sabre_DAV_Exception_ServiceUnavailable(); } else { - return \OC\Files\Filesystem::fopen($this->path, 'rb'); + return $this->fileView->fopen($this->path, 'rb'); } } @@ -147,16 +145,14 @@ class OC_Connector_Sabre_File extends OC_Connector_Sabre_Node implements Sabre_D * @throws Sabre_DAV_Exception_Forbidden */ public function delete() { - $fs = $this->getFS(); - if ($this->path === 'Shared') { throw new \Sabre_DAV_Exception_Forbidden(); } - if (!$fs->isDeletable($this->path)) { + if (!$this->info->isDeletable()) { throw new \Sabre_DAV_Exception_Forbidden(); } - $fs->unlink($this->path); + $this->fileView->unlink($this->path); // remove properties $this->removeProperties(); @@ -169,12 +165,7 @@ class OC_Connector_Sabre_File extends OC_Connector_Sabre_Node implements Sabre_D * @return int */ public function getSize() { - $this->getFileinfoCache(); - if ($this->fileinfo_cache['size'] > -1) { - return $this->fileinfo_cache['size']; - } else { - return null; - } + return $this->info->getSize(); } /** @@ -189,11 +180,7 @@ class OC_Connector_Sabre_File extends OC_Connector_Sabre_Node implements Sabre_D * @return mixed */ public function getETag() { - $properties = $this->getProperties(array(self::GETETAG_PROPERTYNAME)); - if (isset($properties[self::GETETAG_PROPERTYNAME])) { - return $properties[self::GETETAG_PROPERTYNAME]; - } - return null; + return $this->info->getEtag(); } /** @@ -204,12 +191,7 @@ class OC_Connector_Sabre_File extends OC_Connector_Sabre_Node implements Sabre_D * @return mixed */ public function getContentType() { - if (isset($this->fileinfo_cache['mimetype'])) { - return $this->fileinfo_cache['mimetype']; - } - - return \OC\Files\Filesystem::getMimeType($this->path); - + return $this->info->getMimetype(); } /** @@ -245,15 +227,14 @@ class OC_Connector_Sabre_File extends OC_Connector_Sabre_Node implements Sabre_D $chunk_handler->file_assemble($partFile); // here is the final atomic rename - $fs = $this->getFS(); $targetPath = $path . '/' . $info['name']; - $renameOkay = $fs->rename($partFile, $targetPath); - $fileExists = $fs->file_exists($targetPath); + $renameOkay = $this->fileView->rename($partFile, $targetPath); + $fileExists = $this->fileView->file_exists($targetPath); if ($renameOkay === false || $fileExists === false) { \OC_Log::write('webdav', '\OC\Files\Filesystem::rename() failed', \OC_Log::ERROR); // only delete if an error occurred and the target file was already created if ($fileExists) { - $fs->unlink($targetPath); + $this->fileView->unlink($targetPath); } throw new Sabre_DAV_Exception('Could not rename part file assembled from chunks'); } @@ -261,12 +242,13 @@ class OC_Connector_Sabre_File extends OC_Connector_Sabre_Node implements Sabre_D // allow sync clients to send the mtime along in a header $mtime = OC_Request::hasModificationTime(); if ($mtime !== false) { - if($fs->touch($targetPath, $mtime)) { + if($this->fileView->touch($targetPath, $mtime)) { header('X-OC-MTime: accepted'); } } - return OC_Connector_Sabre_Node::getETagPropertyForPath($targetPath); + $info = $this->fileView->getFileInfo($targetPath); + return $info->getEtag(); } return null; diff --git a/lib/private/connector/sabre/node.php b/lib/private/connector/sabre/node.php index 5807c5c7f71..3a5c721dda5 100644 --- a/lib/private/connector/sabre/node.php +++ b/lib/private/connector/sabre/node.php @@ -20,7 +20,6 @@ * License along with this library. If not, see . * */ - abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IProperties { const GETETAG_PROPERTYNAME = '{DAV:}getetag'; const LASTMODIFIED_PROPERTYNAME = '{DAV:}lastmodified'; @@ -29,15 +28,13 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr * Allow configuring the method used to generate Etags * * @var array(class_name, function_name) - */ + */ public static $ETagFunction = null; /** - * is kept public to allow overwrite for unit testing - * * @var \OC\Files\View */ - public $fileView; + protected $fileView; /** * The path to the current node @@ -46,53 +43,53 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr */ protected $path; - /** - * node fileinfo cache - * @var array - */ - protected $fileinfo_cache; /** * node properties cache + * * @var array */ protected $property_cache = null; + /** + * @var \OCP\Files\FileInfo + */ + protected $info; + /** * @brief Sets up the node, expects a full path name - * @param string $path - * @return void + * @param \OC\Files\View $view + * @param \OCP\Files\FileInfo $info */ - public function __construct($path) { - $this->path = $path; + public function __construct($view, $info) { + $this->fileView = $view; + $this->path = $this->fileView->getRelativePath($info->getPath()); + $this->info = $info; } - + protected function refreshInfo() { + $this->info = $this->fileView->getFileInfo($this->path); + } /** * @brief Returns the name of the node * @return string */ public function getName() { - - list(, $name) = Sabre_DAV_URLUtil::splitPath($this->path); - return $name; - + return $this->info->getName(); } /** * @brief Renames the node * @param string $name The new name - * @return void */ public function setName($name) { - $fs = $this->getFS(); // rename is only allowed if the update privilege is granted - if (!$fs->isUpdatable($this->path)) { + if (!$this->info->isUpdateable()) { throw new \Sabre_DAV_Exception_Forbidden(); } - list($parentPath, ) = Sabre_DAV_URLUtil::splitPath($this->path); + list($parentPath,) = Sabre_DAV_URLUtil::splitPath($this->path); list(, $newName) = Sabre_DAV_URLUtil::splitPath($name); if (!\OCP\Util::isValidFileName($newName)) { @@ -102,38 +99,17 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr $newPath = $parentPath . '/' . $newName; $oldPath = $this->path; - $fs->rename($this->path, $newPath); + $this->fileView->rename($this->path, $newPath); $this->path = $newPath; - $query = OC_DB::prepare( 'UPDATE `*PREFIX*properties` SET `propertypath` = ?' - .' WHERE `userid` = ? AND `propertypath` = ?' ); - $query->execute( array( $newPath, OC_User::getUser(), $oldPath )); - + $query = OC_DB::prepare('UPDATE `*PREFIX*properties` SET `propertypath` = ?' + . ' WHERE `userid` = ? AND `propertypath` = ?'); + $query->execute(array($newPath, OC_User::getUser(), $oldPath)); + $this->refreshInfo(); } - public function setFileinfoCache($fileinfo_cache) - { - $this->fileinfo_cache = $fileinfo_cache; - } - - /** - * @brief Ensure that the fileinfo cache is filled - * @note Uses OC_FileCache or a direct stat - */ - protected function getFileinfoCache() { - if (!isset($this->fileinfo_cache)) { - if ($fileinfo_cache = \OC\Files\Filesystem::getFileInfo($this->path)) { - } else { - $fileinfo_cache = \OC\Files\Filesystem::stat($this->path); - } - - $this->fileinfo_cache = $fileinfo_cache; - } - } - - public function setPropertyCache($property_cache) - { + public function setPropertyCache($property_cache) { $this->property_cache = $property_cache; } @@ -142,8 +118,7 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr * @return int */ public function getLastModified() { - $this->getFileinfoCache(); - return $this->fileinfo_cache['mtime']; + return $this->info->getMtime(); } @@ -153,7 +128,8 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr * Even if the modification time is set to a custom value the access time is set to now. */ public function touch($mtime) { - \OC\Files\Filesystem::touch($this->path, $mtime); + $this->fileView->touch($this->path, $mtime); + $this->refreshInfo(); } /** @@ -163,29 +139,28 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr */ public function updateProperties($properties) { $existing = $this->getProperties(array()); - foreach($properties as $propertyName => $propertyValue) { + foreach ($properties as $propertyName => $propertyValue) { // If it was null, we need to delete the property if (is_null($propertyValue)) { - if(array_key_exists( $propertyName, $existing )) { - $query = OC_DB::prepare( 'DELETE FROM `*PREFIX*properties`' - .' WHERE `userid` = ? AND `propertypath` = ? AND `propertyname` = ?' ); - $query->execute( array( OC_User::getUser(), $this->path, $propertyName )); + if (array_key_exists($propertyName, $existing)) { + $query = OC_DB::prepare('DELETE FROM `*PREFIX*properties`' + . ' WHERE `userid` = ? AND `propertypath` = ? AND `propertyname` = ?'); + $query->execute(array(OC_User::getUser(), $this->path, $propertyName)); } - } - else { - if( strcmp( $propertyName, self::GETETAG_PROPERTYNAME) === 0 ) { - \OC\Files\Filesystem::putFileInfo($this->path, array('etag'=> $propertyValue)); - } elseif( strcmp( $propertyName, self::LASTMODIFIED_PROPERTYNAME) === 0 ) { + } else { + if (strcmp($propertyName, self::GETETAG_PROPERTYNAME) === 0) { + \OC\Files\Filesystem::putFileInfo($this->path, array('etag' => $propertyValue)); + } elseif (strcmp($propertyName, self::LASTMODIFIED_PROPERTYNAME) === 0) { $this->touch($propertyValue); } else { - if(!array_key_exists( $propertyName, $existing )) { - $query = OC_DB::prepare( 'INSERT INTO `*PREFIX*properties`' - .' (`userid`,`propertypath`,`propertyname`,`propertyvalue`) VALUES(?,?,?,?)' ); - $query->execute( array( OC_User::getUser(), $this->path, $propertyName,$propertyValue )); + if (!array_key_exists($propertyName, $existing)) { + $query = OC_DB::prepare('INSERT INTO `*PREFIX*properties`' + . ' (`userid`,`propertypath`,`propertyname`,`propertyvalue`) VALUES(?,?,?,?)'); + $query->execute(array(OC_User::getUser(), $this->path, $propertyName, $propertyValue)); } else { - $query = OC_DB::prepare( 'UPDATE `*PREFIX*properties` SET `propertyvalue` = ?' - .' WHERE `userid` = ? AND `propertypath` = ? AND `propertyname` = ?' ); - $query->execute( array( $propertyValue,OC_User::getUser(), $this->path, $propertyName )); + $query = OC_DB::prepare('UPDATE `*PREFIX*properties` SET `propertyvalue` = ?' + . ' WHERE `userid` = ? AND `propertypath` = ? AND `propertyname` = ?'); + $query->execute(array($propertyValue, OC_User::getUser(), $this->path, $propertyName)); } } } @@ -199,9 +174,9 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr * removes all properties for this node and user */ public function removeProperties() { - $query = OC_DB::prepare( 'DELETE FROM `*PREFIX*properties`' - .' WHERE `userid` = ? AND `propertypath` = ?' ); - $query->execute( array( OC_User::getUser(), $this->path)); + $query = OC_DB::prepare('DELETE FROM `*PREFIX*properties`' + . ' WHERE `userid` = ? AND `propertypath` = ?'); + $query->execute(array(OC_User::getUser(), $this->path)); $this->setPropertyCache(null); } @@ -219,29 +194,23 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr if (is_null($this->property_cache)) { $sql = 'SELECT * FROM `*PREFIX*properties` WHERE `userid` = ? AND `propertypath` = ?'; - $result = OC_DB::executeAudited( $sql, array( OC_User::getUser(), $this->path ) ); + $result = OC_DB::executeAudited($sql, array(OC_User::getUser(), $this->path)); $this->property_cache = array(); - while( $row = $result->fetchRow()) { + while ($row = $result->fetchRow()) { $this->property_cache[$row['propertyname']] = $row['propertyvalue']; } - // Don't call the static getETagPropertyForPath, its result is not cached - $this->getFileinfoCache(); - if ($this->fileinfo_cache['etag']) { - $this->property_cache[self::GETETAG_PROPERTYNAME] = '"'.$this->fileinfo_cache['etag'].'"'; - } else { - $this->property_cache[self::GETETAG_PROPERTYNAME] = null; - } + $this->property_cache[self::GETETAG_PROPERTYNAME] = '"' . $this->info->getEtag() . '"'; } // if the array was empty, we need to return everything - if(count($properties) == 0) { + if (count($properties) == 0) { return $this->property_cache; } $props = array(); - foreach($properties as $property) { + foreach ($properties as $property) { if (isset($this->property_cache[$property])) { $props[$property] = $this->property_cache[$property]; } @@ -250,36 +219,13 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr return $props; } - /** - * Returns the ETag surrounded by double-quotes for this path. - * @param string $path Path of the file - * @return string|null Returns null if the ETag can not effectively be determined - */ - protected function getETagPropertyForPath($path) { - $data = $this->getFS()->getFileInfo($path); - if (isset($data['etag'])) { - return '"'.$data['etag'].'"'; - } - return null; - } - - protected function getFS() { - if (is_null($this->fileView)) { - $this->fileView = \OC\Files\Filesystem::getView(); - } - return $this->fileView; - } - /** * @return string|null */ - public function getFileId() - { - $this->getFileinfoCache(); - - if (isset($this->fileinfo_cache['fileid'])) { + public function getFileId() { + if ($this->info->getId()) { $instanceId = OC_Util::getInstanceId(); - $id = sprintf('%08d', $this->fileinfo_cache['fileid']); + $id = sprintf('%08d', $this->info->getId()); return $id . $instanceId; } diff --git a/lib/private/connector/sabre/objecttree.php b/lib/private/connector/sabre/objecttree.php index d2fa425b22c..d176d3333f8 100644 --- a/lib/private/connector/sabre/objecttree.php +++ b/lib/private/connector/sabre/objecttree.php @@ -8,16 +8,28 @@ namespace OC\Connector\Sabre; +use OC\Files\FileInfo; use OC\Files\Filesystem; class ObjectTree extends \Sabre_DAV_ObjectTree { /** - * keep this public to allow mock injection during unit test - * * @var \OC\Files\View */ - public $fileView; + protected $fileView; + + /** + * Creates the object + * + * This method expects the rootObject to be passed as a parameter + * + * @param \Sabre_DAV_ICollection $rootNode + * @param \OC\Files\View $view + */ + public function __construct(\Sabre_DAV_ICollection $rootNode, $view) { + parent::__construct($rootNode); + $this->fileView = $view; + } /** * Returns the INode object for the requested path @@ -40,31 +52,34 @@ class ObjectTree extends \Sabre_DAV_ObjectTree { if (pathinfo($path, PATHINFO_EXTENSION) === 'part') { // read from storage - $absPath = $this->getFileView()->getAbsolutePath($path); + $absPath = $this->fileView->getAbsolutePath($path); list($storage, $internalPath) = Filesystem::resolvePath('/' . $absPath); if ($storage) { + /** + * @var \OC\Files\Storage\Storage $storage + */ $scanner = $storage->getScanner($internalPath); // get data directly - $info = $scanner->getData($internalPath); + $data = $scanner->getData($internalPath); + $info = new FileInfo($absPath, $storage, $internalPath, $data); + } else { + $info = null; } - } - else { + } else { // read from cache - $info = $this->getFileView()->getFileInfo($path); + $info = $this->fileView->getFileInfo($path); } if (!$info) { throw new \Sabre_DAV_Exception_NotFound('File with name ' . $path . ' could not be located'); } - if ($info['mimetype'] === 'httpd/unix-directory') { - $node = new \OC_Connector_Sabre_Directory($path); + if ($info->getType() === 'dir') { + $node = new \OC_Connector_Sabre_Directory($this->fileView, $info); } else { - $node = new \OC_Connector_Sabre_File($path); + $node = new \OC_Connector_Sabre_File($this->fileView, $info); } - $node->setFileinfoCache($info); - $this->cache[$path] = $node; return $node; @@ -88,19 +103,18 @@ class ObjectTree extends \Sabre_DAV_ObjectTree { list($destinationDir,) = \Sabre_DAV_URLUtil::splitPath($destinationPath); // check update privileges - $fs = $this->getFileView(); - if (!$fs->isUpdatable($sourcePath)) { + if (!$this->fileView->isUpdatable($sourcePath)) { throw new \Sabre_DAV_Exception_Forbidden(); } if ($sourceDir !== $destinationDir) { // for a full move we need update privileges on sourcePath and sourceDir as well as destinationDir - if (!$fs->isUpdatable($sourceDir)) { + if (!$this->fileView->isUpdatable($sourceDir)) { throw new \Sabre_DAV_Exception_Forbidden(); } - if (!$fs->isUpdatable($destinationDir)) { + if (!$this->fileView->isUpdatable($destinationDir)) { throw new \Sabre_DAV_Exception_Forbidden(); } - if (!$fs->isDeletable($sourcePath)) { + if (!$this->fileView->isDeletable($sourcePath)) { throw new \Sabre_DAV_Exception_Forbidden(); } } @@ -110,15 +124,15 @@ class ObjectTree extends \Sabre_DAV_ObjectTree { throw new \Sabre_DAV_Exception_BadRequest(); } - $renameOkay = $fs->rename($sourcePath, $destinationPath); + $renameOkay = $this->fileView->rename($sourcePath, $destinationPath); if (!$renameOkay) { throw new \Sabre_DAV_Exception_Forbidden(''); } // update properties - $query = \OC_DB::prepare( 'UPDATE `*PREFIX*properties` SET `propertypath` = ?' - .' WHERE `userid` = ? AND `propertypath` = ?' ); - $query->execute( array( $destinationPath, \OC_User::getUser(), $sourcePath )); + $query = \OC_DB::prepare('UPDATE `*PREFIX*properties` SET `propertypath` = ?' + . ' WHERE `userid` = ? AND `propertypath` = ?'); + $query->execute(array($destinationPath, \OC_User::getUser(), $sourcePath)); $this->markDirty($sourceDir); $this->markDirty($destinationDir); @@ -137,12 +151,12 @@ class ObjectTree extends \Sabre_DAV_ObjectTree { */ public function copy($source, $destination) { - if (Filesystem::is_file($source)) { - Filesystem::copy($source, $destination); + if ($this->fileView->is_file($source)) { + $this->fileView->copy($source, $destination); } else { - Filesystem::mkdir($destination); - $dh = Filesystem::opendir($source); - if(is_resource($dh)) { + $this->fileView->mkdir($destination); + $dh = $this->fileView->opendir($source); + if (is_resource($dh)) { while (($subnode = readdir($dh)) !== false) { if ($subnode == '.' || $subnode == '..') continue; @@ -155,14 +169,4 @@ class ObjectTree extends \Sabre_DAV_ObjectTree { list($destinationDir,) = \Sabre_DAV_URLUtil::splitPath($destination); $this->markDirty($destinationDir); } - - /** - * @return \OC\Files\View - */ - public function getFileView() { - if (is_null($this->fileView)) { - $this->fileView = \OC\Files\Filesystem::getView(); - } - return $this->fileView; - } } diff --git a/lib/private/connector/sabre/quotaplugin.php b/lib/private/connector/sabre/quotaplugin.php index 8099794f670..13fb187eed3 100644 --- a/lib/private/connector/sabre/quotaplugin.php +++ b/lib/private/connector/sabre/quotaplugin.php @@ -9,6 +9,11 @@ */ class OC_Connector_Sabre_QuotaPlugin extends Sabre_DAV_ServerPlugin { + /** + * @var \OC\Files\View + */ + private $view; + /** * Reference to main server object * @@ -17,11 +22,11 @@ class OC_Connector_Sabre_QuotaPlugin extends Sabre_DAV_ServerPlugin { private $server; /** - * is kept public to allow overwrite for unit testing - * - * @var \OC\Files\View + * @param \OC\Files\View $view */ - public $fileView; + public function __construct($view) { + $this->view = $view; + } /** * This initializes the plugin. @@ -52,8 +57,8 @@ class OC_Connector_Sabre_QuotaPlugin extends Sabre_DAV_ServerPlugin { public function checkQuota($uri, $data = null) { $length = $this->getLength(); if ($length) { - if (substr($uri, 0, 1)!=='/') { - $uri='/'.$uri; + if (substr($uri, 0, 1) !== '/') { + $uri = '/' . $uri; } list($parentUri, $newName) = Sabre_DAV_URLUtil::splitPath($uri); $freeSpace = $this->getFreeSpace($parentUri); @@ -64,8 +69,7 @@ class OC_Connector_Sabre_QuotaPlugin extends Sabre_DAV_ServerPlugin { return true; } - public function getLength() - { + public function getLength() { $req = $this->server->httpRequest; $length = $req->getHeader('X-Expected-Entity-Length'); if (!$length) { @@ -84,14 +88,8 @@ class OC_Connector_Sabre_QuotaPlugin extends Sabre_DAV_ServerPlugin { * @param $parentUri * @return mixed */ - public function getFreeSpace($parentUri) - { - if (is_null($this->fileView)) { - // initialize fileView - $this->fileView = \OC\Files\Filesystem::getView(); - } - - $freeSpace = $this->fileView->free_space($parentUri); + public function getFreeSpace($parentUri) { + $freeSpace = $this->view->free_space($parentUri); return $freeSpace; } } diff --git a/lib/private/connector/sabre/server.php b/lib/private/connector/sabre/server.php index 2660b043f46..bb7a7171d1f 100644 --- a/lib/private/connector/sabre/server.php +++ b/lib/private/connector/sabre/server.php @@ -27,6 +27,22 @@ * @see Sabre_DAV_Server */ class OC_Connector_Sabre_Server extends Sabre_DAV_Server { + /** + * Sets up the server + * + * Unlike Sabre_DAV_Server's constructor this does not take an INode or ObjectTree as argument, + * the object tree needs to be set later with setObjectTree + */ + public function __construct() { + $this->httpResponse = new Sabre_HTTP_Response(); + $this->httpRequest = new Sabre_HTTP_Request(); + + } + + public function setObjectTree($tree) { + $this->tree = $tree; + } + /** * @see Sabre_DAV_Server @@ -40,22 +56,22 @@ class OC_Connector_Sabre_Server extends Sabre_DAV_Server { // The only two options for the depth of a propfind is 0 or 1 // if ($depth!=0) $depth = 1; - $newProperties = $this->getPropertiesForPath($uri,$requestedProperties,$depth); + $newProperties = $this->getPropertiesForPath($uri, $requestedProperties, $depth); // This is a multi-status response $this->httpResponse->sendStatus(207); - $this->httpResponse->setHeader('Content-Type','application/xml; charset=utf-8'); - $this->httpResponse->setHeader('Vary','Brief,Prefer'); + $this->httpResponse->setHeader('Content-Type', 'application/xml; charset=utf-8'); + $this->httpResponse->setHeader('Vary', 'Brief,Prefer'); // Normally this header is only needed for OPTIONS responses, however.. // iCal seems to also depend on these being set for PROPFIND. Since // this is not harmful, we'll add it. - $features = array('1','3', 'extended-mkcol'); - foreach($this->plugins as $plugin) { - $features = array_merge($features,$plugin->getFeatures()); + $features = array('1', '3', 'extended-mkcol'); + foreach ($this->plugins as $plugin) { + $features = array_merge($features, $plugin->getFeatures()); } - $this->httpResponse->setHeader('DAV',implode(', ',$features)); + $this->httpResponse->setHeader('DAV', implode(', ', $features)); $prefer = $this->getHTTPPrefer(); $minimal = $prefer['return-minimal']; @@ -67,10 +83,11 @@ class OC_Connector_Sabre_Server extends Sabre_DAV_Server { /** * Small helper to support PROPFIND with DEPTH_INFINITY. + * * @param string $path */ private function addPathNodesRecursively(&$nodes, $path) { - foreach($this->tree->getChildren($path) as $childNode) { + foreach ($this->tree->getChildren($path) as $childNode) { $nodes[$path . '/' . $childNode->getName()] = $childNode; if ($childNode instanceof Sabre_DAV_ICollection) $this->addPathNodesRecursively($nodes, $path . '/' . $childNode->getName()); @@ -81,7 +98,7 @@ class OC_Connector_Sabre_Server extends Sabre_DAV_Server { // if ($depth!=0) $depth = 1; - $path = rtrim($path,'/'); + $path = rtrim($path, '/'); $returnPropertyList = array(); @@ -89,9 +106,10 @@ class OC_Connector_Sabre_Server extends Sabre_DAV_Server { $nodes = array( $path => $parentNode ); - if ($depth==1 && $parentNode instanceof Sabre_DAV_ICollection) { - foreach($this->tree->getChildren($path) as $childNode) + if ($depth == 1 && $parentNode instanceof Sabre_DAV_ICollection) { + foreach ($this->tree->getChildren($path) as $childNode) { $nodes[$path . '/' . $childNode->getName()] = $childNode; + } } else if ($depth == self::DEPTH_INFINITY && $parentNode instanceof Sabre_DAV_ICollection) { $this->addPathNodesRecursively($nodes, $path); } @@ -99,9 +117,9 @@ class OC_Connector_Sabre_Server extends Sabre_DAV_Server { // If the propertyNames array is empty, it means all properties are requested. // We shouldn't actually return everything we know though, and only return a // sensible list. - $allProperties = count($propertyNames)==0; + $allProperties = count($propertyNames) == 0; - foreach($nodes as $myPath=>$node) { + foreach ($nodes as $myPath => $node) { $currentPropertyNames = $propertyNames; @@ -128,15 +146,15 @@ class OC_Connector_Sabre_Server extends Sabre_DAV_Server { // to make certain decisions about the entry. // WebDAV dictates we should add a / and the end of href's for collections $removeRT = false; - if (!in_array('{DAV:}resourcetype',$currentPropertyNames)) { + if (!in_array('{DAV:}resourcetype', $currentPropertyNames)) { $currentPropertyNames[] = '{DAV:}resourcetype'; $removeRT = true; } - $result = $this->broadcastEvent('beforeGetProperties',array($myPath, $node, &$currentPropertyNames, &$newProperties)); + $result = $this->broadcastEvent('beforeGetProperties', array($myPath, $node, &$currentPropertyNames, &$newProperties)); // If this method explicitly returned false, we must ignore this // node as it is inaccessible. - if ($result===false) continue; + if ($result === false) continue; if (count($currentPropertyNames) > 0) { @@ -149,7 +167,7 @@ class OC_Connector_Sabre_Server extends Sabre_DAV_Server { // So as we loop through this list, we will only take the // properties that were actually requested and discard the // rest. - foreach($currentPropertyNames as $k=>$currentPropertyName) { + foreach ($currentPropertyNames as $k => $currentPropertyName) { if (isset($nodeProperties[$currentPropertyName])) { unset($currentPropertyNames[$k]); $newProperties[200][$currentPropertyName] = $nodeProperties[$currentPropertyName]; @@ -160,12 +178,14 @@ class OC_Connector_Sabre_Server extends Sabre_DAV_Server { } - foreach($currentPropertyNames as $prop) { + foreach ($currentPropertyNames as $prop) { if (isset($newProperties[200][$prop])) continue; - switch($prop) { - case '{DAV:}getlastmodified' : if ($node->getLastModified()) $newProperties[200][$prop] = new Sabre_DAV_Property_GetLastModified($node->getLastModified()); break; + switch ($prop) { + case '{DAV:}getlastmodified' : + if ($node->getLastModified()) $newProperties[200][$prop] = new Sabre_DAV_Property_GetLastModified($node->getLastModified()); + break; case '{DAV:}getcontentlength' : if ($node instanceof Sabre_DAV_IFile) { $size = $node->getSize(); @@ -186,18 +206,22 @@ class OC_Connector_Sabre_Server extends Sabre_DAV_Server { $newProperties[200][$prop] = $quotaInfo[1]; } break; - case '{DAV:}getetag' : if ($node instanceof Sabre_DAV_IFile && $etag = $node->getETag()) $newProperties[200][$prop] = $etag; break; - case '{DAV:}getcontenttype' : if ($node instanceof Sabre_DAV_IFile && $ct = $node->getContentType()) $newProperties[200][$prop] = $ct; break; + case '{DAV:}getetag' : + if ($node instanceof Sabre_DAV_IFile && $etag = $node->getETag()) $newProperties[200][$prop] = $etag; + break; + case '{DAV:}getcontenttype' : + if ($node instanceof Sabre_DAV_IFile && $ct = $node->getContentType()) $newProperties[200][$prop] = $ct; + break; case '{DAV:}supported-report-set' : $reports = array(); - foreach($this->plugins as $plugin) { + foreach ($this->plugins as $plugin) { $reports = array_merge($reports, $plugin->getSupportedReportSet($myPath)); } $newProperties[200][$prop] = new Sabre_DAV_Property_SupportedReportSet($reports); break; case '{DAV:}resourcetype' : $newProperties[200]['{DAV:}resourcetype'] = new Sabre_DAV_Property_ResourceType(); - foreach($this->resourceTypeMapping as $className => $resourceType) { + foreach ($this->resourceTypeMapping as $className => $resourceType) { if ($node instanceof $className) $newProperties[200]['{DAV:}resourcetype']->add($resourceType); } break; @@ -209,16 +233,16 @@ class OC_Connector_Sabre_Server extends Sabre_DAV_Server { } - $this->broadcastEvent('afterGetProperties',array(trim($myPath,'/'),&$newProperties, $node)); + $this->broadcastEvent('afterGetProperties', array(trim($myPath, '/'), &$newProperties, $node)); - $newProperties['href'] = trim($myPath,'/'); + $newProperties['href'] = trim($myPath, '/'); // Its is a WebDAV recommendation to add a trailing slash to collectionnames. // Apple's iCal also requires a trailing slash for principals (rfc 3744), though this is non-standard. - if ($myPath!='' && isset($newProperties[200]['{DAV:}resourcetype'])) { + if ($myPath != '' && isset($newProperties[200]['{DAV:}resourcetype'])) { $rt = $newProperties[200]['{DAV:}resourcetype']; if ($rt->is('{DAV:}collection') || $rt->is('{DAV:}principal')) { - $newProperties['href'] .='/'; + $newProperties['href'] .= '/'; } } -- GitLab From 9231195c98b5fc709903e8a0b639b882aa3f9ec8 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Mon, 3 Mar 2014 13:51:49 +0100 Subject: [PATCH 006/253] Fix FileInfo->getType --- lib/private/files/fileinfo.php | 8 ++++++-- lib/public/files/fileinfo.php | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/lib/private/files/fileinfo.php b/lib/private/files/fileinfo.php index 2dbdd80a26b..916346b6082 100644 --- a/lib/private/files/fileinfo.php +++ b/lib/private/files/fileinfo.php @@ -144,10 +144,14 @@ class FileInfo implements \OCP\Files\FileInfo, \ArrayAccess { * @return \OCP\Files\FileInfo::TYPE_FILE | \OCP\Files\FileInfo::TYPE_FOLDER */ public function getType() { - return $this->data['type']; + if ($this->data['type']) { + return $this->data['type']; + } else { + return $this->getMimetype() === 'httpd/unix-directory' ? self::TYPE_FOLDER : self::TYPE_FILE; + } } - public function getData(){ + public function getData() { return $this->data; } diff --git a/lib/public/files/fileinfo.php b/lib/public/files/fileinfo.php index 68ce45d3fa1..37162e09336 100644 --- a/lib/public/files/fileinfo.php +++ b/lib/public/files/fileinfo.php @@ -9,7 +9,7 @@ namespace OCP\Files; interface FileInfo { const TYPE_FILE = 'file'; - const TYPE_FOLDER = 'folder'; + const TYPE_FOLDER = 'dir'; /** * Get the Etag of the file or folder -- GitLab From fe994669cdec336f6c4a3e724a9d468fd8f69dfe Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Mon, 3 Mar 2014 13:57:08 +0100 Subject: [PATCH 007/253] Make path for dummy fileinfo absolute --- lib/private/connector/sabre/directory.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/private/connector/sabre/directory.php b/lib/private/connector/sabre/directory.php index 619aec21eac..641354e763b 100644 --- a/lib/private/connector/sabre/directory.php +++ b/lib/private/connector/sabre/directory.php @@ -72,7 +72,7 @@ class OC_Connector_Sabre_Directory extends OC_Connector_Sabre_Node implements Sa } } - $path = $this->path . '/' . $name; + $path = $this->fileView->getAbsolutePath($this->path) . '/' . $name; // using a dummy FileInfo is acceptable here since it will be refreshed after the put is complete $info = new \OC\Files\FileInfo($path, null, null, array()); $node = new OC_Connector_Sabre_File($this->fileView, $info); -- GitLab From 331fc55e2d876123580986264f47318afcf9352b Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Mon, 3 Mar 2014 14:27:24 +0100 Subject: [PATCH 008/253] Update unit tests to use the new injection --- .../sabre/aborteduploaddetectionplugin.php | 27 +++---- tests/lib/connector/sabre/directory.php | 22 ++++- tests/lib/connector/sabre/file.php | 81 +++++++++++++++---- tests/lib/connector/sabre/objecttree.php | 14 +++- tests/lib/connector/sabre/quotaplugin.php | 23 +++--- 5 files changed, 120 insertions(+), 47 deletions(-) diff --git a/tests/lib/connector/sabre/aborteduploaddetectionplugin.php b/tests/lib/connector/sabre/aborteduploaddetectionplugin.php index 201f1263867..60d141e72bc 100644 --- a/tests/lib/connector/sabre/aborteduploaddetectionplugin.php +++ b/tests/lib/connector/sabre/aborteduploaddetectionplugin.php @@ -1,11 +1,11 @@ * This file is licensed under the Affero General Public License version 3 or * later. * See the COPYING-README file. */ - class Test_OC_Connector_Sabre_AbortedUploadDetectionPlugin extends PHPUnit_Framework_TestCase { /** @@ -18,17 +18,18 @@ class Test_OC_Connector_Sabre_AbortedUploadDetectionPlugin extends PHPUnit_Frame */ private $plugin; - public function setUp() { + private function init($view) { $this->server = new Sabre_DAV_Server(); - $this->plugin = new OC_Connector_Sabre_AbortedUploadDetectionPlugin(); + $this->plugin = new OC_Connector_Sabre_AbortedUploadDetectionPlugin($view); $this->plugin->initialize($this->server); } /** * @dataProvider lengthProvider */ - public function testLength($expected, $headers) - { + public function testLength($expected, $headers) { + $this->init(null); + $this->server->httpRequest = new Sabre_HTTP_Request($headers); $length = $this->plugin->getLength(); $this->assertEquals($expected, $length); @@ -37,9 +38,8 @@ class Test_OC_Connector_Sabre_AbortedUploadDetectionPlugin extends PHPUnit_Frame /** * @dataProvider verifyContentLengthProvider */ - public function testVerifyContentLength($method, $fileSize, $headers) - { - $this->plugin->fileView = $this->buildFileViewMock($fileSize); + public function testVerifyContentLength($method, $fileSize, $headers) { + $this->init($this->buildFileViewMock($fileSize)); $headers['REQUEST_METHOD'] = $method; $this->server->httpRequest = new Sabre_HTTP_Request($headers); @@ -51,12 +51,11 @@ class Test_OC_Connector_Sabre_AbortedUploadDetectionPlugin extends PHPUnit_Frame * @dataProvider verifyContentLengthFailedProvider * @expectedException Sabre_DAV_Exception_BadRequest */ - public function testVerifyContentLengthFailed($method, $fileSize, $headers) - { - $this->plugin->fileView = $this->buildFileViewMock($fileSize); - + public function testVerifyContentLengthFailed($method, $fileSize, $headers) { + $view = $this->buildFileViewMock($fileSize); + $this->init($view); // we expect unlink to be called - $this->plugin->fileView->expects($this->once())->method('unlink'); + $view->expects($this->once())->method('unlink'); $headers['REQUEST_METHOD'] = $method; $this->server->httpRequest = new Sabre_HTTP_Request($headers); @@ -92,7 +91,7 @@ class Test_OC_Connector_Sabre_AbortedUploadDetectionPlugin extends PHPUnit_Frame private function buildFileViewMock($fileSize) { // mock filesystem - $view = $this->getMock('\OC\Files\View', array('filesize', 'unlink'), array(), '', FALSE); + $view = $this->getMock('\OC\Files\View', array('filesize', 'unlink'), array(), '', false); $view->expects($this->any())->method('filesize')->withAnyParameters()->will($this->returnValue($fileSize)); return $view; diff --git a/tests/lib/connector/sabre/directory.php b/tests/lib/connector/sabre/directory.php index c501521b601..b2bf0d4a6d2 100644 --- a/tests/lib/connector/sabre/directory.php +++ b/tests/lib/connector/sabre/directory.php @@ -1,18 +1,32 @@ * This file is licensed under the Affero General Public License version 3 or * later. * See the COPYING-README file. */ - class Test_OC_Connector_Sabre_Directory extends PHPUnit_Framework_TestCase { + private function getRootDir() { + $view = $this->getMock('OC\Files\View', array(), array(), '', false); + $view->expects($this->once()) + ->method('getRelativePath') + ->will($this->returnValue('')); + + $info = $this->getMock('OC\Files\FileInfo', array(), array(), '', false); + $info->expects($this->once()) + ->method('getPath') + ->will($this->returnValue('')); + + return new OC_Connector_Sabre_Directory($view, $info); + } + /** * @expectedException Sabre_DAV_Exception_Forbidden */ public function testCreateSharedFileFails() { - $dir = new OC_Connector_Sabre_Directory(''); + $dir = $this->getRootDir(); $dir->createFile('Shared'); } @@ -20,7 +34,7 @@ class Test_OC_Connector_Sabre_Directory extends PHPUnit_Framework_TestCase { * @expectedException Sabre_DAV_Exception_Forbidden */ public function testCreateSharedFolderFails() { - $dir = new OC_Connector_Sabre_Directory(''); + $dir = $this->getRootDir(); $dir->createDirectory('Shared'); } @@ -28,7 +42,7 @@ class Test_OC_Connector_Sabre_Directory extends PHPUnit_Framework_TestCase { * @expectedException Sabre_DAV_Exception_Forbidden */ public function testDeleteSharedFolderFails() { - $dir = new OC_Connector_Sabre_Directory('Shared'); + $dir = $this->getRootDir(); $dir->delete(); } } diff --git a/tests/lib/connector/sabre/file.php b/tests/lib/connector/sabre/file.php index c2f0ffa12d4..011f8ffb6e3 100644 --- a/tests/lib/connector/sabre/file.php +++ b/tests/lib/connector/sabre/file.php @@ -13,9 +13,20 @@ class Test_OC_Connector_Sabre_File extends PHPUnit_Framework_TestCase { */ public function testSimplePutFails() { // setup - $file = new OC_Connector_Sabre_File('/test.txt'); - $file->fileView = $this->getMock('\OC\Files\View', array('file_put_contents'), array(), '', FALSE); - $file->fileView->expects($this->any())->method('file_put_contents')->withAnyParameters()->will($this->returnValue(false)); + $view = $this->getMock('\OC\Files\View', array('file_put_contents', 'getRelativePath'), array(), '', false); + $view->expects($this->any()) + ->method('file_put_contents') + ->will($this->returnValue(false)); + + $view->expects($this->any()) + ->method('getRelativePath') + ->will($this->returnValue('/test.txt')); + + $info = new \OC\Files\FileInfo('/test.txt', null, null, array( + 'permissions'=>\OCP\PERMISSION_ALL + )); + + $file = new OC_Connector_Sabre_File($view, $info); // action $etag = $file->put('test data'); @@ -26,10 +37,25 @@ class Test_OC_Connector_Sabre_File extends PHPUnit_Framework_TestCase { */ public function testSimplePutFailsOnRename() { // setup - $file = new OC_Connector_Sabre_File('/test.txt'); - $file->fileView = $this->getMock('\OC\Files\View', array('file_put_contents', 'rename'), array(), '', FALSE); - $file->fileView->expects($this->any())->method('file_put_contents')->withAnyParameters()->will($this->returnValue(true)); - $file->fileView->expects($this->any())->method('rename')->withAnyParameters()->will($this->returnValue(false)); + $view = $this->getMock('\OC\Files\View', array('file_put_contents', 'rename', 'getRelativePath'), array(), '', false); + $view->expects($this->any()) + ->method('file_put_contents') + ->withAnyParameters() + ->will($this->returnValue(true)); + $view->expects($this->any()) + ->method('rename') + ->withAnyParameters() + ->will($this->returnValue(false)); + + $view->expects($this->any()) + ->method('getRelativePath') + ->will($this->returnValue('/test.txt')); + + $info = new \OC\Files\FileInfo('/test.txt', null, null, array( + 'permissions' => \OCP\PERMISSION_ALL + )); + + $file = new OC_Connector_Sabre_File($view, $info); // action $etag = $file->put('test data'); @@ -40,9 +66,19 @@ class Test_OC_Connector_Sabre_File extends PHPUnit_Framework_TestCase { */ public function testSimplePutInvalidChars() { // setup - $file = new OC_Connector_Sabre_File('/super*star.txt'); - $file->fileView = $this->getMock('\OC\Files\View', array('file_put_contents'), array(), '', FALSE); - $file->fileView->expects($this->any())->method('file_put_contents')->withAnyParameters()->will($this->returnValue(false)); + $view = $this->getMock('\OC\Files\View', array('file_put_contents', 'getRelativePath'), array(), '', false); + $view->expects($this->any()) + ->method('file_put_contents') + ->will($this->returnValue(false)); + + $view->expects($this->any()) + ->method('getRelativePath') + ->will($this->returnValue('/super*star.txt')); + + $info = new \OC\Files\FileInfo('/super*star.txt', null, null, array( + 'permissions' => \OCP\PERMISSION_ALL + )); + $file = new OC_Connector_Sabre_File($view, $info); // action $etag = $file->put('test data'); @@ -54,9 +90,16 @@ class Test_OC_Connector_Sabre_File extends PHPUnit_Framework_TestCase { */ public function testSetNameInvalidChars() { // setup - $file = new OC_Connector_Sabre_File('/test.txt'); - $file->fileView = $this->getMock('\OC\Files\View', array('isUpdatable'), array(), '', FALSE); - $file->fileView->expects($this->any())->method('isUpdatable')->withAnyParameters()->will($this->returnValue(true)); + $view = $this->getMock('\OC\Files\View', array('getRelativePath'), array(), '', false); + + $view->expects($this->any()) + ->method('getRelativePath') + ->will($this->returnValue('/super*star.txt')); + + $info = new \OC\Files\FileInfo('/super*star.txt', null, null, array( + 'permissions' => \OCP\PERMISSION_ALL + )); + $file = new OC_Connector_Sabre_File($view, $info); $file->setName('/super*star.txt'); } @@ -64,7 +107,17 @@ class Test_OC_Connector_Sabre_File extends PHPUnit_Framework_TestCase { * @expectedException Sabre_DAV_Exception_Forbidden */ public function testDeleteSharedFails() { - $file = new OC_Connector_Sabre_File('Shared'); + $view = $this->getMock('\OC\Files\View', array('getRelativePath'), array(), '', false); + + $view->expects($this->any()) + ->method('getRelativePath') + ->will($this->returnValue('Shared')); + + $info = new \OC\Files\FileInfo('/Shared', null, null, array( + 'permissions' => \OCP\PERMISSION_ALL + )); + + $file = new OC_Connector_Sabre_File($view, $info); $file->delete(); } } diff --git a/tests/lib/connector/sabre/objecttree.php b/tests/lib/connector/sabre/objecttree.php index fb50c736edd..876334cf68f 100644 --- a/tests/lib/connector/sabre/objecttree.php +++ b/tests/lib/connector/sabre/objecttree.php @@ -9,6 +9,7 @@ namespace Test\OC\Connector\Sabre; +use OC\Files\FileInfo; use OC_Connector_Sabre_Directory; use PHPUnit_Framework_TestCase; use Sabre_DAV_Exception_Forbidden; @@ -32,6 +33,10 @@ class TestDoubleFileView extends \OC\Files\View{ public function rename($path1, $path2) { return $this->canRename; } + + public function getRelativePath($path){ + return $path; + } } class ObjectTree extends PHPUnit_Framework_TestCase { @@ -91,10 +96,14 @@ class ObjectTree extends PHPUnit_Framework_TestCase { * @param $updatables */ private function moveTest($source, $dest, $updatables, $deletables) { - $rootDir = new OC_Connector_Sabre_Directory(''); + $view = new TestDoubleFileView($updatables, $deletables); + + $info = new FileInfo('', null, null, array()); + + $rootDir = new OC_Connector_Sabre_Directory($view, $info); $objectTree = $this->getMock('\OC\Connector\Sabre\ObjectTree', array('nodeExists', 'getNodeForPath'), - array($rootDir)); + array($rootDir, $view)); $objectTree->expects($this->once()) ->method('getNodeForPath') @@ -102,7 +111,6 @@ class ObjectTree extends PHPUnit_Framework_TestCase { ->will($this->returnValue(false)); /** @var $objectTree \OC\Connector\Sabre\ObjectTree */ - $objectTree->fileView = new TestDoubleFileView($updatables, $deletables); $objectTree->move($source, $dest); } diff --git a/tests/lib/connector/sabre/quotaplugin.php b/tests/lib/connector/sabre/quotaplugin.php index 1186de28742..6781b970a4f 100644 --- a/tests/lib/connector/sabre/quotaplugin.php +++ b/tests/lib/connector/sabre/quotaplugin.php @@ -1,11 +1,11 @@ * This file is licensed under the Affero General Public License version 3 or * later. * See the COPYING-README file. */ - class Test_OC_Connector_Sabre_QuotaPlugin extends PHPUnit_Framework_TestCase { /** @@ -18,17 +18,18 @@ class Test_OC_Connector_Sabre_QuotaPlugin extends PHPUnit_Framework_TestCase { */ private $plugin; - public function setUp() { + private function init($quota) { + $view = $this->buildFileViewMock($quota); $this->server = new Sabre_DAV_Server(); - $this->plugin = new OC_Connector_Sabre_QuotaPlugin(); + $this->plugin = new OC_Connector_Sabre_QuotaPlugin($view); $this->plugin->initialize($this->server); } /** * @dataProvider lengthProvider */ - public function testLength($expected, $headers) - { + public function testLength($expected, $headers) { + $this->init(0); $this->server->httpRequest = new Sabre_HTTP_Request($headers); $length = $this->plugin->getLength(); $this->assertEquals($expected, $length); @@ -37,9 +38,8 @@ class Test_OC_Connector_Sabre_QuotaPlugin extends PHPUnit_Framework_TestCase { /** * @dataProvider quotaOkayProvider */ - public function testCheckQuota($quota, $headers) - { - $this->plugin->fileView = $this->buildFileViewMock($quota); + public function testCheckQuota($quota, $headers) { + $this->init($quota); $this->server->httpRequest = new Sabre_HTTP_Request($headers); $result = $this->plugin->checkQuota(''); @@ -50,9 +50,8 @@ class Test_OC_Connector_Sabre_QuotaPlugin extends PHPUnit_Framework_TestCase { * @expectedException Sabre_DAV_Exception_InsufficientStorage * @dataProvider quotaExceededProvider */ - public function testCheckExceededQuota($quota, $headers) - { - $this->plugin->fileView = $this->buildFileViewMock($quota); + public function testCheckExceededQuota($quota, $headers) { + $this->init($quota); $this->server->httpRequest = new Sabre_HTTP_Request($headers); $this->plugin->checkQuota(''); @@ -92,7 +91,7 @@ class Test_OC_Connector_Sabre_QuotaPlugin extends PHPUnit_Framework_TestCase { private function buildFileViewMock($quota) { // mock filesysten - $view = $this->getMock('\OC\Files\View', array('free_space'), array(), '', FALSE); + $view = $this->getMock('\OC\Files\View', array('free_space'), array(), '', false); $view->expects($this->any())->method('free_space')->withAnyParameters()->will($this->returnValue($quota)); return $view; -- GitLab From 5ef37c28d1dc73c1fc16a731954b84b46c1943f4 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Tue, 4 Mar 2014 13:28:48 +0100 Subject: [PATCH 009/253] Remove the need for a custom SabreDav server constructor --- apps/files/appinfo/remote.php | 8 ++++---- lib/private/connector/sabre/objecttree.php | 19 ++++++++++++++++--- lib/private/connector/sabre/server.php | 11 ----------- 3 files changed, 20 insertions(+), 18 deletions(-) diff --git a/apps/files/appinfo/remote.php b/apps/files/appinfo/remote.php index 1922bc4fcdd..d9c667c0106 100644 --- a/apps/files/appinfo/remote.php +++ b/apps/files/appinfo/remote.php @@ -35,7 +35,8 @@ $lockBackend = new OC_Connector_Sabre_Locks(); $requestBackend = new OC_Connector_Sabre_Request(); // Fire up server -$server = new OC_Connector_Sabre_Server(); +$objectTree = new \OC\Connector\Sabre\ObjectTree(); +$server = new OC_Connector_Sabre_Server($objectTree); $server->httpRequest = $requestBackend; $server->setBaseUri($baseuri); @@ -49,14 +50,13 @@ $server->addPlugin(new OC_Connector_Sabre_MaintenancePlugin()); $server->addPlugin(new OC_Connector_Sabre_ExceptionLoggerPlugin('webdav')); // wait with registering these until auth is handled and the filesystem is setup -$server->subscribeEvent('beforeMethod', function () use ($server) { +$server->subscribeEvent('beforeMethod', function () use ($server, $objectTree) { $view = \OC\Files\Filesystem::getView(); $rootInfo = $view->getFileInfo(''); // Create ownCloud Dir $rootDir = new OC_Connector_Sabre_Directory($view, $rootInfo); - $objectTree = new \OC\Connector\Sabre\ObjectTree($rootDir, $view); - $server->setObjectTree($objectTree); + $objectTree->init($rootDir, $view); $server->addPlugin(new OC_Connector_Sabre_AbortedUploadDetectionPlugin($view)); $server->addPlugin(new OC_Connector_Sabre_QuotaPlugin($view)); diff --git a/lib/private/connector/sabre/objecttree.php b/lib/private/connector/sabre/objecttree.php index d176d3333f8..76f4817d3ba 100644 --- a/lib/private/connector/sabre/objecttree.php +++ b/lib/private/connector/sabre/objecttree.php @@ -22,12 +22,16 @@ class ObjectTree extends \Sabre_DAV_ObjectTree { * Creates the object * * This method expects the rootObject to be passed as a parameter - * + */ + public function __construct() { + } + + /** * @param \Sabre_DAV_ICollection $rootNode * @param \OC\Files\View $view */ - public function __construct(\Sabre_DAV_ICollection $rootNode, $view) { - parent::__construct($rootNode); + public function init(\Sabre_DAV_ICollection $rootNode, \OC\Files\View $view) { + $this->rootNode = $rootNode; $this->fileView = $view; } @@ -39,6 +43,9 @@ class ObjectTree extends \Sabre_DAV_ObjectTree { * @return \Sabre_DAV_INode */ public function getNodeForPath($path) { + if (!$this->fileView) { + throw new \Sabre_DAV_Exception_ServiceUnavailable('filesystem not setup'); + } $path = trim($path, '/'); if (isset($this->cache[$path])) { @@ -94,6 +101,9 @@ class ObjectTree extends \Sabre_DAV_ObjectTree { * @return int */ public function move($sourcePath, $destinationPath) { + if (!$this->fileView) { + throw new \Sabre_DAV_Exception_ServiceUnavailable('filesystem not setup'); + } $sourceNode = $this->getNodeForPath($sourcePath); if ($sourceNode instanceof \Sabre_DAV_ICollection and $this->nodeExists($destinationPath)) { @@ -150,6 +160,9 @@ class ObjectTree extends \Sabre_DAV_ObjectTree { * @return void */ public function copy($source, $destination) { + if (!$this->fileView) { + throw new \Sabre_DAV_Exception_ServiceUnavailable('filesystem not setup'); + } if ($this->fileView->is_file($source)) { $this->fileView->copy($source, $destination); diff --git a/lib/private/connector/sabre/server.php b/lib/private/connector/sabre/server.php index bb7a7171d1f..b09237fb3cd 100644 --- a/lib/private/connector/sabre/server.php +++ b/lib/private/connector/sabre/server.php @@ -27,17 +27,6 @@ * @see Sabre_DAV_Server */ class OC_Connector_Sabre_Server extends Sabre_DAV_Server { - /** - * Sets up the server - * - * Unlike Sabre_DAV_Server's constructor this does not take an INode or ObjectTree as argument, - * the object tree needs to be set later with setObjectTree - */ - public function __construct() { - $this->httpResponse = new Sabre_HTTP_Response(); - $this->httpRequest = new Sabre_HTTP_Request(); - - } public function setObjectTree($tree) { $this->tree = $tree; -- GitLab From 52115662057408d095249a237a78c2207ab1b821 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Tue, 4 Mar 2014 16:36:03 +0100 Subject: [PATCH 010/253] update test case --- tests/lib/connector/sabre/objecttree.php | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/lib/connector/sabre/objecttree.php b/tests/lib/connector/sabre/objecttree.php index 876334cf68f..bc8ec98faee 100644 --- a/tests/lib/connector/sabre/objecttree.php +++ b/tests/lib/connector/sabre/objecttree.php @@ -111,6 +111,7 @@ class ObjectTree extends PHPUnit_Framework_TestCase { ->will($this->returnValue(false)); /** @var $objectTree \OC\Connector\Sabre\ObjectTree */ + $objectTree->init($rootDir, $view); $objectTree->move($source, $dest); } -- GitLab From a687498547448d6ff11eccc0acddcf0647873ce8 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Wed, 5 Mar 2014 13:19:08 +0100 Subject: [PATCH 011/253] Fix encryption webdav tests --- apps/files_encryption/tests/util.php | 6 +++++- apps/files_encryption/tests/webdav.php | 19 ++++++++++++++----- 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/apps/files_encryption/tests/util.php b/apps/files_encryption/tests/util.php index f70e30c4d73..5fa96f6ad69 100755 --- a/apps/files_encryption/tests/util.php +++ b/apps/files_encryption/tests/util.php @@ -510,7 +510,11 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase { */ public static function loginHelper($user, $create = false, $password = false) { if ($create) { - \OC_User::createUser($user, $user); + try { + \OC_User::createUser($user, $user); + } catch(\Exception $e) { // catch username is already being used from previous aborted runs + + } } if ($password === false) { diff --git a/apps/files_encryption/tests/webdav.php b/apps/files_encryption/tests/webdav.php index 8e8b9c53cee..1f23be3e79a 100755 --- a/apps/files_encryption/tests/webdav.php +++ b/apps/files_encryption/tests/webdav.php @@ -33,6 +33,7 @@ use OCA\Encryption; /** * Class Test_Encryption_Webdav + * * @brief this class provide basic webdav tests for PUT,GET and DELETE */ class Test_Encryption_Webdav extends \PHPUnit_Framework_TestCase { @@ -48,6 +49,8 @@ class Test_Encryption_Webdav extends \PHPUnit_Framework_TestCase { public $dataShort; public $stateFilesTrashbin; + private static $storage; + public static function setUpBeforeClass() { // reset backend \OC_User::clearBackends(); @@ -65,6 +68,8 @@ class Test_Encryption_Webdav extends \PHPUnit_Framework_TestCase { // create test user \Test_Encryption_Util::loginHelper(\Test_Encryption_Webdav::TEST_ENCRYPTION_WEBDAV_USER1, true); + + self::$storage = new \OC\Files\Storage\Temporary(array()); } function setUp() { @@ -96,8 +101,7 @@ class Test_Encryption_Webdav extends \PHPUnit_Framework_TestCase { // reset app files_trashbin if ($this->stateFilesTrashbin) { OC_App::enable('files_trashbin'); - } - else { + } else { OC_App::disable('files_trashbin'); } } @@ -153,7 +157,7 @@ class Test_Encryption_Webdav extends \PHPUnit_Framework_TestCase { $this->assertTrue(Encryption\Crypt::isCatfileContent($encryptedContent)); // get decrypted file contents - $decrypt = file_get_contents('crypt:///' . $this->userId . '/files'. $filename); + $decrypt = file_get_contents('crypt:///' . $this->userId . '/files' . $filename); // check if file content match with the written content $this->assertEquals($this->dataShort, $decrypt); @@ -225,7 +229,12 @@ class Test_Encryption_Webdav extends \PHPUnit_Framework_TestCase { $requestBackend = new OC_Connector_Sabre_Request(); // Create ownCloud Dir - $publicDir = new OC_Connector_Sabre_Directory(''); + $root = '/' . $this->userId . '/files'; + \OC\Files\Filesystem::mount(self::$storage, array(), $root); + $view = new \OC\Files\View($root); + $publicDir = new OC_Connector_Sabre_Directory($view, $view->getFileInfo('')); + $objectTree = new \OC\Connector\Sabre\ObjectTree(); + $objectTree->init($publicDir, $view); // Fire up server $server = new Sabre_DAV_Server($publicDir); @@ -236,7 +245,7 @@ class Test_Encryption_Webdav extends \PHPUnit_Framework_TestCase { $server->addPlugin(new Sabre_DAV_Auth_Plugin($authBackend, 'ownCloud')); $server->addPlugin(new Sabre_DAV_Locks_Plugin($lockBackend)); $server->addPlugin(new Sabre_DAV_Browser_Plugin(false)); // Show something in the Browser, but no upload - $server->addPlugin(new OC_Connector_Sabre_QuotaPlugin()); + $server->addPlugin(new OC_Connector_Sabre_QuotaPlugin($view)); $server->addPlugin(new OC_Connector_Sabre_MaintenancePlugin()); // And off we go! -- GitLab From 8fcc29ee8b7b5ed600c8ec7116f52486718467f6 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 10 Dec 2013 17:50:45 +0100 Subject: [PATCH 012/253] only check ldap_errno if an ldap_* function actually fails fix wizard errors reset search paging right after the search, not before some of the possible next search operations cookie contains binary characters, don't log it (avoids json_encode(): Invalid UTF-8 sequence in argument errors) --- apps/user_ldap/lib/access.php | 10 ++++++---- apps/user_ldap/lib/ldap.php | 6 ++++-- apps/user_ldap/lib/wizard.php | 1 + 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php index b7e4023dd73..018cf13c91c 100644 --- a/apps/user_ldap/lib/access.php +++ b/apps/user_ldap/lib/access.php @@ -63,7 +63,6 @@ class Access extends LDAPUtility { return false; } //all or nothing! otherwise we get in trouble with. - $this->initPagedSearch($filter, array($dn), $attr, 99999, 0); $dn = $this->DNasBaseParameter($dn); $rr = @$this->ldap->read($cr, $dn, $filter, array($attr)); if(!$this->ldap->isResource($rr)) { @@ -707,6 +706,9 @@ class Access extends LDAPUtility { $linkResources = array_pad(array(), count($base), $cr); $sr = $this->ldap->search($linkResources, $base, $filter, $attr); $error = $this->ldap->errno($cr); + if ($pagedSearchOK) { + $this->ldap->controlPagedResult($cr, 0, false, ""); + } if(!is_array($sr) || $error !== 0) { \OCP\Util::writeLog('user_ldap', 'Error when searching: '.$this->ldap->error($cr). @@ -1236,9 +1238,9 @@ class Access extends LDAPUtility { if($this->connection->hasPagedResultSupport && !is_null($limit)) { $offset = intval($offset); //can be null \OCP\Util::writeLog('user_ldap', - 'initializing paged search for Filter'.$filter.' base '.print_r($bases, true) + 'initializing paged search for Filter '.$filter.' base '.print_r($bases, true) .' attr '.print_r($attr, true). ' limit ' .$limit.' offset '.$offset, - \OCP\Util::INFO); + \OCP\Util::DEBUG); //get the cookie from the search for the previous search, required by LDAP foreach($bases as $base) { @@ -1260,7 +1262,7 @@ class Access extends LDAPUtility { } if(!is_null($cookie)) { if($offset > 0) { - \OCP\Util::writeLog('user_ldap', 'Cookie '.$cookie, \OCP\Util::INFO); + \OCP\Util::writeLog('user_ldap', 'Cookie '.CRC32($cookie), \OCP\Util::INFO); } $pagedSearchOK = $this->ldap->controlPagedResult( $this->connection->getConnectionResource(), $limit, diff --git a/apps/user_ldap/lib/ldap.php b/apps/user_ldap/lib/ldap.php index de9b7481c19..0e5f78cd28c 100644 --- a/apps/user_ldap/lib/ldap.php +++ b/apps/user_ldap/lib/ldap.php @@ -78,7 +78,7 @@ class LDAP implements ILDAPWrapper { } public function nextEntry($link, $result) { - return $this->invokeLDAPMethod('next_entry', $link, $result); + return ldap_next_entry($link, $result); } public function read($link, $baseDN, $filter, $attr) { @@ -139,7 +139,9 @@ class LDAP implements ILDAPWrapper { if(function_exists($func)) { $this->preFunctionCall($func, $arguments); $result = call_user_func_array($func, $arguments); - $this->postFunctionCall(); + if ($result === FALSE) { + $this->postFunctionCall(); + } return $result; } } diff --git a/apps/user_ldap/lib/wizard.php b/apps/user_ldap/lib/wizard.php index e79090febc1..04ea87d53e5 100644 --- a/apps/user_ldap/lib/wizard.php +++ b/apps/user_ldap/lib/wizard.php @@ -799,6 +799,7 @@ class Wizard extends LDAPUtility { \OCP\Util::writeLog('user_ldap', 'Wiz: Setting LDAP Options ', \OCP\Util::DEBUG); //set LDAP options $this->ldap->setOption($cr, LDAP_OPT_PROTOCOL_VERSION, 3); + $this->ldap->setOption($cr, LDAP_OPT_REFERRALS, 0); $this->ldap->setOption($cr, LDAP_OPT_NETWORK_TIMEOUT, self::LDAP_NW_TIMEOUT); if($tls) { $isTlsWorking = @$this->ldap->startTls($cr); -- GitLab From 6585bd5a500292a284490e96250d465280f3c34b Mon Sep 17 00:00:00 2001 From: root Date: Wed, 11 Dec 2013 11:00:53 +0100 Subject: [PATCH 013/253] "reset" ldap pagedSearch control by setting it to a high value call nextEntry via invokeLDAPMethod --- apps/user_ldap/lib/ldap.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/user_ldap/lib/ldap.php b/apps/user_ldap/lib/ldap.php index 0e5f78cd28c..d1ca91045b2 100644 --- a/apps/user_ldap/lib/ldap.php +++ b/apps/user_ldap/lib/ldap.php @@ -78,7 +78,7 @@ class LDAP implements ILDAPWrapper { } public function nextEntry($link, $result) { - return ldap_next_entry($link, $result); + return $this->invokeLDAPMethod('next_entry', $link, $result); } public function read($link, $baseDN, $filter, $attr) { -- GitLab From f850fcfac51080baf1af90d59a8d94b80721c819 Mon Sep 17 00:00:00 2001 From: Alexander Bergolth Date: Thu, 6 Mar 2014 12:23:20 +0100 Subject: [PATCH 014/253] "reset" ldap pagedSearch control by setting it to a high value --- apps/user_ldap/lib/access.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php index 018cf13c91c..01bfbb4cbf6 100644 --- a/apps/user_ldap/lib/access.php +++ b/apps/user_ldap/lib/access.php @@ -707,7 +707,7 @@ class Access extends LDAPUtility { $sr = $this->ldap->search($linkResources, $base, $filter, $attr); $error = $this->ldap->errno($cr); if ($pagedSearchOK) { - $this->ldap->controlPagedResult($cr, 0, false, ""); + $this->ldap->controlPagedResult($cr, 999999, false, ""); } if(!is_array($sr) || $error !== 0) { \OCP\Util::writeLog('user_ldap', -- GitLab From 08a46e30806434bcd854f7868c3c9c6553d4ac11 Mon Sep 17 00:00:00 2001 From: adrien Date: Thu, 6 Mar 2014 17:57:09 +0100 Subject: [PATCH 015/253] add cache for single users --- lib/private/user/database.php | 78 ++++++++++++++++++++--------------- 1 file changed, 45 insertions(+), 33 deletions(-) diff --git a/lib/private/user/database.php b/lib/private/user/database.php index 15e6643dfb3..911073c133e 100644 --- a/lib/private/user/database.php +++ b/lib/private/user/database.php @@ -42,7 +42,9 @@ class OC_User_Database extends OC_User_Backend { /** * @var PasswordHash */ - static private $hasher = null; + private static $hasher = null; + + protected static $cache = array(); private function getHasher() { if (!self::$hasher) { @@ -135,11 +137,9 @@ class OC_User_Database extends OC_User_Backend { * @return string display name */ public function getDisplayName($uid) { - $query = OC_DB::prepare('SELECT `displayname` FROM `*PREFIX*users` WHERE `uid` = ?'); - $result = $query->execute(array($uid))->fetchAll(); - $displayName = trim($result[0]['displayname'], ' '); - if (!empty($displayName)) { - return $displayName; + $this->loadUser($uid); + if (!empty(self::$cache['uid']['displayname'])) { + return self::$cache['uid']['displayname']; } else { return $uid; } @@ -183,23 +183,41 @@ class OC_User_Database extends OC_User_Backend { $storedHash = $row['password']; if ($storedHash[0] == '$') { //the new phpass based hashing $hasher = $this->getHasher(); - if ($hasher->CheckPassword($password . OC_Config::getValue('passwordsalt', ''), $storedHash)) { - return $row['uid']; - } else { - return false; - } - } else { //old sha1 based hashing - if (sha1($password) == $storedHash) { - //upgrade to new hashing - $this->setPassword($row['uid'], $password); + if ($hasher->CheckPassword($password . OC_Config::getValue('passwordsalt', ''), $storedHash)) return $row['uid']; - } else { - return false; - } + + //old sha1 based hashing + } elseif (sha1($password) == $storedHash) { + //upgrade to new hashing + $this->setPassword($row['uid'], $password); + return $row['uid']; + } + } + + return false; + } + + /** + * @brief Load an user in the cache + * @returns boolean + */ + protected function loadUser($uid) { + if (empty(self::$cache[$uid])) { + $query = OC_DB::prepare('SELECT `uid`, `displayname` FROM `*PREFIX*users` WHERE LOWER(`uid`) = LOWER(?)'); + $result = $query->execute(array($uid)); + + if (OC_DB::isError($result)) { + OC_Log::write('core', OC_DB::getErrorMessage($result), OC_Log::ERROR); + return false; + } + + while ($row = $result->fetchRow()) { + self::$cache[$uid]['uid'] = $row['uid']; + self::$cache[$uid]['displayname'] = $row['displayname']; } - } else { - return false; } + + return true; } /** @@ -224,26 +242,20 @@ class OC_User_Database extends OC_User_Backend { * @return boolean */ public function userExists($uid) { - $query = OC_DB::prepare('SELECT COUNT(*) FROM `*PREFIX*users` WHERE LOWER(`uid`) = LOWER(?)'); - $result = $query->execute(array($uid)); - if (OC_DB::isError($result)) { - OC_Log::write('core', OC_DB::getErrorMessage($result), OC_Log::ERROR); - return false; - } - return $result->fetchOne() > 0; + $this->loadUser($uid); + return empty(self::$cache[$uid]) ? false : true; } /** * @brief get the user's home directory * @param string $uid the username - * @return string|false + * @return boolean */ public function getHome($uid) { - if ($this->userExists($uid)) { + if ($this->userExists($uid)) return OC_Config::getValue("datadirectory", OC::$SERVERROOT . "/data") . '/' . $uid; - } else { - return false; - } + + return false; } /** @@ -256,7 +268,7 @@ class OC_User_Database extends OC_User_Backend { /** * counts the users in the database * - * @return false|string | bool + * @return int | bool */ public function countUsers() { $query = OC_DB::prepare('SELECT COUNT(*) FROM `*PREFIX*users`'); -- GitLab From 43e79f41f34b71499b9bac85d27b87b53a569da0 Mon Sep 17 00:00:00 2001 From: ben-denham Date: Fri, 28 Feb 2014 15:07:25 +1300 Subject: [PATCH 016/253] Added improved version of patch by @blizzz in https://github.com/owncloud/core/issues/6651#issuecomment-32261257 to stop filter settings from being reset under a race condition. --- apps/user_ldap/js/settings.js | 192 +++++++++++++++++++++------------- 1 file changed, 118 insertions(+), 74 deletions(-) diff --git a/apps/user_ldap/js/settings.js b/apps/user_ldap/js/settings.js index acf88ef58a4..0470ee079f9 100644 --- a/apps/user_ldap/js/settings.js +++ b/apps/user_ldap/js/settings.js @@ -138,6 +138,108 @@ var LdapConfiguration = { } }; + +// LdapFilter object. + +function LdapFilter(target) { + this.locked = true; + this.target = false; + this.mode = LdapWizard.filterModeAssisted; + this.lazyRunCompose = false; + + if( target === 'User' || + target === 'Login' || + target === 'Group') { + this.target = target; + this.determineMode(); + } +} + +LdapFilter.prototype.compose = function() { + var action; + + if(this.locked) { + this.lazyRunCompose = true; + return false; + } + + if(this.target === 'User') { + action = 'getUserListFilter'; + } else if(this.target === 'Login') { + action = 'getUserLoginFilter'; + } else if(this.target === 'Group') { + action = 'getGroupFilter'; + } + + if(!$('#raw'+this.target+'FilterContainer').hasClass('invisible')) { + //Raw filter editing, i.e. user defined filter, don't compose + return; + } + + var param = 'action='+action+ + '&ldap_serverconfig_chooser='+ + encodeURIComponent($('#ldap_serverconfig_chooser').val()); + + var filter = this; + + LdapWizard.ajax(param, + function(result) { + LdapWizard.applyChanges(result); + if(filter.target === 'User') { + LdapWizard.countUsers(); + } else if(filter.target === 'Group') { + LdapWizard.countGroups(); + LdapWizard.detectGroupMemberAssoc(); + } + }, + function (result) { + // error handling + } + ); +} + +LdapFilter.prototype.determineMode = function() { + var param = 'action=get'+encodeURIComponent(this.target)+'FilterMode'+ + '&ldap_serverconfig_chooser='+ + encodeURIComponent($('#ldap_serverconfig_chooser').val()); + + var filter = this; + LdapWizard.ajax(param, + function(result) { + property = 'ldap' + filter.target + 'FilterMode'; + filter.mode = result.changes[property]; + if(filter.mode == LdapWizard.filterModeRaw + && $('#raw'+filter.target+'FilterContainer').hasClass('invisible')) { + LdapWizard['toggleRaw'+filter.target+'Filter'](); + } else if(filter.mode == LdapWizard.filterModeAssisted + && !$('#raw'+filter.target+'FilterContainer').hasClass('invisible')) { + LdapWizard['toggleRaw'+filter.target+'Filter'](); + } + filter.unlock(); + }, + function (result) { + //on error case get back to default i.e. Assisted + if(!$('#raw'+filter.target+'FilterContainer').hasClass('invisible')) { + LdapWizard['toggleRaw'+filter.target+'Filter'](); + filter.mode = LdapWizard.filterModeAssisted; + } + filter.unlock(); + } + ); + +} + +LdapFilter.prototype.unlock = function() { + this.locked = false; + if(this.lazyRunCompose) { + this.lazyRunCompose = false; + this.compose(); + } +} + +// end of LdapFilter object. + + var LdapWizard = { checkPortInfoShown: false, saveBlacklist: {}, @@ -145,6 +247,9 @@ var LdapWizard = { spinner: '', filterModeAssisted: 0, filterModeRaw: 1, + userFilter: false, + loginFilter: false, + groupFilter: false, ajax: function(param, fnOnSuccess, fnOnError) { $.post( @@ -275,41 +380,6 @@ var LdapWizard = { } }, - composeFilter: function(type) { - subject = type.charAt(0).toUpperCase() + type.substr(1); - if(!$('#raw'+subject+'FilterContainer').hasClass('invisible')) { - //Raw filter editing, i.e. user defined filter, don't compose - return; - } - - if(type == 'user') { - action = 'getUserListFilter'; - } else if(type == 'login') { - action = 'getUserLoginFilter'; - } else if(type == 'group') { - action = 'getGroupFilter'; - } - - param = 'action='+action+ - '&ldap_serverconfig_chooser='+ - encodeURIComponent($('#ldap_serverconfig_chooser').val()); - - LdapWizard.ajax(param, - function(result) { - LdapWizard.applyChanges(result); - if(type == 'user') { - LdapWizard.countUsers(); - } else if(type == 'group') { - LdapWizard.countGroups(); - LdapWizard.detectGroupMemberAssoc(); - } - }, - function (result) { - // error handling - } - ); - }, - controlBack: function() { curTabIndex = $('#ldapSettings').tabs('option', 'active'); if(curTabIndex == 0) { @@ -559,7 +629,7 @@ var LdapWizard = { }, initGroupFilter: function() { - LdapWizard.regardFilterMode('Group'); + LdapWizard.groupFilter = new LdapFilter('Group'); LdapWizard.findObjectClasses('ldap_groupfilter_objectclass', 'Group'); LdapWizard.findAvailableGroups('ldap_groupfilter_groups', 'Groups'); LdapWizard.countGroups(); @@ -568,13 +638,13 @@ var LdapWizard = { /** init login filter tab section **/ initLoginFilter: function() { - LdapWizard.regardFilterMode('Login'); + LdapWizard.loginFilter = new LdapFilter('Login'); LdapWizard.findAttributes(); }, postInitLoginFilter: function() { if($('#rawLoginFilterContainer').hasClass('invisible')) { - LdapWizard.composeFilter('login'); + LdapWizard.loginFilter.compose(); } }, @@ -600,7 +670,7 @@ var LdapWizard = { initUserFilter: function() { LdapWizard.userFilterObjectClassesHasRun = false; LdapWizard.userFilterAvailableGroupsHasRun = false; - LdapWizard.regardFilterMode('User'); + LdapWizard.userFilter = new LdapFilter('User'); LdapWizard.findObjectClasses('ldap_userfilter_objectclass', 'User'); LdapWizard.findAvailableGroups('ldap_userfilter_groups', 'Users'); }, @@ -608,7 +678,7 @@ var LdapWizard = { postInitUserFilter: function() { if(LdapWizard.userFilterObjectClassesHasRun && LdapWizard.userFilterAvailableGroupsHasRun) { - LdapWizard.composeFilter('user'); + LdapWizard.userFilter.compose(); LdapWizard.countUsers(); } }, @@ -657,7 +727,7 @@ var LdapWizard = { if(triggerObj.id == 'ldap_loginfilter_username' || triggerObj.id == 'ldap_loginfilter_email') { - LdapWizard.composeFilter('login'); + LdapWizard.loginFilter.compose(); } if($('#ldapSettings').tabs('option', 'active') == 0) { @@ -666,32 +736,6 @@ var LdapWizard = { } }, - regardFilterMode: function(subject) { - param = 'action=get'+encodeURIComponent(subject)+'FilterMode'+ - '&ldap_serverconfig_chooser='+ - encodeURIComponent($('#ldap_serverconfig_chooser').val()); - - LdapWizard.ajax(param, - function(result) { - property = 'ldap' + subject + 'FilterMode'; - mode = result.changes[property]; - if(mode == LdapWizard.filterModeRaw - && $('#raw'+subject+'FilterContainer').hasClass('invisible')) { - LdapWizard['toggleRaw'+subject+'Filter'](); - } else if(mode == LdapWizard.filterModeAssisted - && !$('#raw'+subject+'FilterContainer').hasClass('invisible')) { - LdapWizard['toggleRaw'+subject+'Filter'](); - } - }, - function (result) { - //on error case get back to default i.e. Assisted - if(!$('#raw'+subject+'FilterContainer').hasClass('invisible')) { - LdapWizard['toggleRaw'+subject+'Filter'](); - } - } - ); - }, - save: function(inputObj) { if(LdapWizard.blacklistRemove(inputObj.id)) { return; @@ -713,15 +757,15 @@ var LdapWizard = { LdapWizard._save($('#'+originalObj)[0], $.trim(values)); if(originalObj == 'ldap_userfilter_objectclass' || originalObj == 'ldap_userfilter_groups') { - LdapWizard.composeFilter('user'); + LdapWizard.userFilter.compose(); //when user filter is changed afterwards, login filter needs to //be adjusted, too - LdapWizard.composeFilter('login'); + LdapWizard.loginFilter.compose(); } else if(originalObj == 'ldap_loginfilter_attributes') { - LdapWizard.composeFilter('login'); + LdapWizard.loginFilter.compose(); } else if(originalObj == 'ldap_groupfilter_objectclass' || originalObj == 'ldap_groupfilter_groups') { - LdapWizard.composeFilter('group'); + LdapWizard.groupFilter.compose(); } }, @@ -777,10 +821,10 @@ var LdapWizard = { LdapWizard._save({ id: modeKey }, LdapWizard.filterModeAssisted); if(moc.indexOf('user') >= 0) { LdapWizard.blacklistRemove('ldap_userlist_filter'); - LdapWizard.composeFilter('user'); + LdapWizard.userFilter.compose(); } else { LdapWizard.blacklistRemove('ldap_group_filter'); - LdapWizard.composeFilter('group'); + LdapWizard.groupFilter.compose(); } } }, @@ -814,7 +858,7 @@ var LdapWizard = { $('#ldap_loginfilter_username').prop('disabled', property); LdapWizard._save({ id: 'ldapLoginFilterMode' }, mode); if(action == 'enable') { - LdapWizard.composeFilter('login'); + LdapWizard.loginFilter.compose(); } }, -- GitLab From ef65381a0b41a1d6519e7d5bf39d3aac75127a1e Mon Sep 17 00:00:00 2001 From: ben-denham Date: Fri, 7 Mar 2014 10:10:42 +1300 Subject: [PATCH 017/253] Moved LdapFilter into a separate js file in user_ldap. --- apps/user_ldap/js/ldapFilter.js | 95 +++++++++++++++++++++++++++++ apps/user_ldap/js/settings.js | 102 -------------------------------- apps/user_ldap/settings.php | 1 + 3 files changed, 96 insertions(+), 102 deletions(-) create mode 100644 apps/user_ldap/js/ldapFilter.js diff --git a/apps/user_ldap/js/ldapFilter.js b/apps/user_ldap/js/ldapFilter.js new file mode 100644 index 00000000000..71f8cd6c7c4 --- /dev/null +++ b/apps/user_ldap/js/ldapFilter.js @@ -0,0 +1,95 @@ +function LdapFilter(target) { + this.locked = true; + this.target = false; + this.mode = LdapWizard.filterModeAssisted; + this.lazyRunCompose = false; + + if( target === 'User' || + target === 'Login' || + target === 'Group') { + this.target = target; + this.determineMode(); + } +} + +LdapFilter.prototype.compose = function() { + var action; + + if(this.locked) { + this.lazyRunCompose = true; + return false; + } + + if(this.target === 'User') { + action = 'getUserListFilter'; + } else if(this.target === 'Login') { + action = 'getUserLoginFilter'; + } else if(this.target === 'Group') { + action = 'getGroupFilter'; + } + + if(!$('#raw'+this.target+'FilterContainer').hasClass('invisible')) { + //Raw filter editing, i.e. user defined filter, don't compose + return; + } + + var param = 'action='+action+ + '&ldap_serverconfig_chooser='+ + encodeURIComponent($('#ldap_serverconfig_chooser').val()); + + var filter = this; + + LdapWizard.ajax(param, + function(result) { + LdapWizard.applyChanges(result); + if(filter.target === 'User') { + LdapWizard.countUsers(); + } else if(filter.target === 'Group') { + LdapWizard.countGroups(); + LdapWizard.detectGroupMemberAssoc(); + } + }, + function (result) { + // error handling + } + ); +} + +LdapFilter.prototype.determineMode = function() { + var param = 'action=get'+encodeURIComponent(this.target)+'FilterMode'+ + '&ldap_serverconfig_chooser='+ + encodeURIComponent($('#ldap_serverconfig_chooser').val()); + + var filter = this; + LdapWizard.ajax(param, + function(result) { + property = 'ldap' + filter.target + 'FilterMode'; + filter.mode = result.changes[property]; + if(filter.mode == LdapWizard.filterModeRaw + && $('#raw'+filter.target+'FilterContainer').hasClass('invisible')) { + LdapWizard['toggleRaw'+filter.target+'Filter'](); + } else if(filter.mode == LdapWizard.filterModeAssisted + && !$('#raw'+filter.target+'FilterContainer').hasClass('invisible')) { + LdapWizard['toggleRaw'+filter.target+'Filter'](); + } + filter.unlock(); + }, + function (result) { + //on error case get back to default i.e. Assisted + if(!$('#raw'+filter.target+'FilterContainer').hasClass('invisible')) { + LdapWizard['toggleRaw'+filter.target+'Filter'](); + filter.mode = LdapWizard.filterModeAssisted; + } + filter.unlock(); + } + ); + +} + +LdapFilter.prototype.unlock = function() { + this.locked = false; + if(this.lazyRunCompose) { + this.lazyRunCompose = false; + this.compose(); + } +} diff --git a/apps/user_ldap/js/settings.js b/apps/user_ldap/js/settings.js index 0470ee079f9..57f61b7d680 100644 --- a/apps/user_ldap/js/settings.js +++ b/apps/user_ldap/js/settings.js @@ -138,108 +138,6 @@ var LdapConfiguration = { } }; - -// LdapFilter object. - -function LdapFilter(target) { - this.locked = true; - this.target = false; - this.mode = LdapWizard.filterModeAssisted; - this.lazyRunCompose = false; - - if( target === 'User' || - target === 'Login' || - target === 'Group') { - this.target = target; - this.determineMode(); - } -} - -LdapFilter.prototype.compose = function() { - var action; - - if(this.locked) { - this.lazyRunCompose = true; - return false; - } - - if(this.target === 'User') { - action = 'getUserListFilter'; - } else if(this.target === 'Login') { - action = 'getUserLoginFilter'; - } else if(this.target === 'Group') { - action = 'getGroupFilter'; - } - - if(!$('#raw'+this.target+'FilterContainer').hasClass('invisible')) { - //Raw filter editing, i.e. user defined filter, don't compose - return; - } - - var param = 'action='+action+ - '&ldap_serverconfig_chooser='+ - encodeURIComponent($('#ldap_serverconfig_chooser').val()); - - var filter = this; - - LdapWizard.ajax(param, - function(result) { - LdapWizard.applyChanges(result); - if(filter.target === 'User') { - LdapWizard.countUsers(); - } else if(filter.target === 'Group') { - LdapWizard.countGroups(); - LdapWizard.detectGroupMemberAssoc(); - } - }, - function (result) { - // error handling - } - ); -} - -LdapFilter.prototype.determineMode = function() { - var param = 'action=get'+encodeURIComponent(this.target)+'FilterMode'+ - '&ldap_serverconfig_chooser='+ - encodeURIComponent($('#ldap_serverconfig_chooser').val()); - - var filter = this; - LdapWizard.ajax(param, - function(result) { - property = 'ldap' + filter.target + 'FilterMode'; - filter.mode = result.changes[property]; - if(filter.mode == LdapWizard.filterModeRaw - && $('#raw'+filter.target+'FilterContainer').hasClass('invisible')) { - LdapWizard['toggleRaw'+filter.target+'Filter'](); - } else if(filter.mode == LdapWizard.filterModeAssisted - && !$('#raw'+filter.target+'FilterContainer').hasClass('invisible')) { - LdapWizard['toggleRaw'+filter.target+'Filter'](); - } - filter.unlock(); - }, - function (result) { - //on error case get back to default i.e. Assisted - if(!$('#raw'+filter.target+'FilterContainer').hasClass('invisible')) { - LdapWizard['toggleRaw'+filter.target+'Filter'](); - filter.mode = LdapWizard.filterModeAssisted; - } - filter.unlock(); - } - ); - -} - -LdapFilter.prototype.unlock = function() { - this.locked = false; - if(this.lazyRunCompose) { - this.lazyRunCompose = false; - this.compose(); - } -} - -// end of LdapFilter object. - - var LdapWizard = { checkPortInfoShown: false, saveBlacklist: {}, diff --git a/apps/user_ldap/settings.php b/apps/user_ldap/settings.php index d077eafdde9..6b7d8e6f53e 100644 --- a/apps/user_ldap/settings.php +++ b/apps/user_ldap/settings.php @@ -25,6 +25,7 @@ OC_Util::checkAdminUser(); +OCP\Util::addScript('user_ldap', 'ldapFilter'); OCP\Util::addScript('user_ldap', 'settings'); OCP\Util::addScript('core', 'jquery.multiselect'); OCP\Util::addStyle('user_ldap', 'settings'); -- GitLab From dde4f2f91720a5eb4ad7db4fdb15dfc115f0e8c0 Mon Sep 17 00:00:00 2001 From: adrien Date: Thu, 6 Mar 2014 22:23:17 +0100 Subject: [PATCH 018/253] upgrade the cache user --- lib/private/user/database.php | 52 +++++++++++++++++++++++++---------- 1 file changed, 38 insertions(+), 14 deletions(-) diff --git a/lib/private/user/database.php b/lib/private/user/database.php index 911073c133e..1e3d457eb50 100644 --- a/lib/private/user/database.php +++ b/lib/private/user/database.php @@ -39,13 +39,15 @@ require_once 'phpass/PasswordHash.php'; * Class for user management in a SQL Database (e.g. MySQL, SQLite) */ class OC_User_Database extends OC_User_Backend { + + protected static $cache = array(); + protected static $cache_complete = true; + /** * @var PasswordHash */ private static $hasher = null; - protected static $cache = array(); - private function getHasher() { if (!self::$hasher) { //we don't want to use DES based crypt(), since it doesn't return a hash with a recognisable prefix @@ -199,6 +201,7 @@ class OC_User_Database extends OC_User_Backend { /** * @brief Load an user in the cache + * @param string $uid the username * @returns boolean */ protected function loadUser($uid) { @@ -220,6 +223,32 @@ class OC_User_Database extends OC_User_Backend { return true; } + /** + * @brief Load an user in the cache + * @param string $uid the username + * @returns boolean + */ + protected function loadUsers() { + if (!self::$cache_complete) { + $query = OC_DB::prepare('SELECT `uid`, `displayname` FROM `*PREFIX*users` ORDER BY `uid`'); + $result = $query->execute(array($uid)); + + if (OC_DB::isError($result)) { + OC_Log::write('core', OC_DB::getErrorMessage($result), OC_Log::ERROR); + return false; + } + + while ($row = $result->fetchRow()) { + self::$cache[$uid]['uid'] = $row['uid']; + self::$cache[$uid]['displayname'] = $row['displayname']; + } + + self::$cache_complete = true; + } + + return true; + } + /** * @brief Get a list of all users * @returns array with all uids @@ -227,12 +256,12 @@ class OC_User_Database extends OC_User_Backend { * Get a list of all users. */ public function getUsers($search = '', $limit = null, $offset = null) { - $query = OC_DB::prepare('SELECT `uid` FROM `*PREFIX*users` WHERE LOWER(`uid`) LIKE LOWER(?)', $limit, $offset); - $result = $query->execute(array($search . '%')); + $this->loadUsers(); + $users = array(); - while ($row = $result->fetchRow()) { - $users[] = $row['uid']; - } + foreach (self::$cache as $uid => $value) + $users[] = $uid; + return $users; } @@ -271,13 +300,8 @@ class OC_User_Database extends OC_User_Backend { * @return int | bool */ public function countUsers() { - $query = OC_DB::prepare('SELECT COUNT(*) FROM `*PREFIX*users`'); - $result = $query->execute(); - if (OC_DB::isError($result)) { - OC_Log::write('core', OC_DB::getErrorMessage($result), OC_Log::ERROR); - return false; - } - return $result->fetchOne(); + $this->loadUsers(); + return count(self::$cache); } } -- GitLab From 5cdfc56867d0fe8dc5be9e2112c53e3ddf212104 Mon Sep 17 00:00:00 2001 From: adrien Date: Thu, 6 Mar 2014 22:34:43 +0100 Subject: [PATCH 019/253] update the cache when add user --- lib/private/user/database.php | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/lib/private/user/database.php b/lib/private/user/database.php index 1e3d457eb50..bbd72fc65e7 100644 --- a/lib/private/user/database.php +++ b/lib/private/user/database.php @@ -39,15 +39,14 @@ require_once 'phpass/PasswordHash.php'; * Class for user management in a SQL Database (e.g. MySQL, SQLite) */ class OC_User_Database extends OC_User_Backend { - - protected static $cache = array(); - protected static $cache_complete = true; - /** * @var PasswordHash */ private static $hasher = null; + protected static $cache = array(); + protected static $cache_complete = false; + private function getHasher() { if (!self::$hasher) { //we don't want to use DES based crypt(), since it doesn't return a hash with a recognisable prefix @@ -68,16 +67,19 @@ class OC_User_Database extends OC_User_Backend { * itself, not in its subclasses. */ public function createUser($uid, $password) { - if ($this->userExists($uid)) { - return false; - } else { + if (!$this->userExists($uid)) { $hasher = $this->getHasher(); $hash = $hasher->HashPassword($password . OC_Config::getValue('passwordsalt', '')); $query = OC_DB::prepare('INSERT INTO `*PREFIX*users` ( `uid`, `password` ) VALUES( ?, ? )'); $result = $query->execute(array($uid, $hash)); - - return $result ? true : false; + + if ($result) { + self::$cache[$uid]['uid'] = $uid; + return true; + } } + + return false; } /** @@ -127,10 +129,11 @@ class OC_User_Database extends OC_User_Backend { if ($this->userExists($uid)) { $query = OC_DB::prepare('UPDATE `*PREFIX*users` SET `displayname` = ? WHERE LOWER(`uid`) = ?'); $query->execute(array($displayName, $uid)); + self::$cache[$uid]['displayname'] = $displayName; return true; - } else { - return false; } + + return false; } /** @@ -140,8 +143,8 @@ class OC_User_Database extends OC_User_Backend { */ public function getDisplayName($uid) { $this->loadUser($uid); - if (!empty(self::$cache['uid']['displayname'])) { - return self::$cache['uid']['displayname']; + if (!empty(self::$cache[$uid]['displayname'])) { + return self::$cache[$uid]['displayname']; } else { return $uid; } -- GitLab From fbde24c89ae61294bb6327ccc2b5b150b2ec4928 Mon Sep 17 00:00:00 2001 From: adrien Date: Fri, 7 Mar 2014 08:46:34 +0100 Subject: [PATCH 020/253] fix undefined in loadUsers --- lib/private/user/database.php | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/lib/private/user/database.php b/lib/private/user/database.php index bbd72fc65e7..80d52feffc8 100644 --- a/lib/private/user/database.php +++ b/lib/private/user/database.php @@ -54,7 +54,6 @@ class OC_User_Database extends OC_User_Backend { self::$hasher = new PasswordHash(8, $forcePortable); } return self::$hasher; - } /** @@ -112,9 +111,9 @@ class OC_User_Database extends OC_User_Backend { $query->execute(array($hash, $uid)); return true; - } else { - return false; } + + return false; } /** @@ -188,8 +187,9 @@ class OC_User_Database extends OC_User_Backend { $storedHash = $row['password']; if ($storedHash[0] == '$') { //the new phpass based hashing $hasher = $this->getHasher(); - if ($hasher->CheckPassword($password . OC_Config::getValue('passwordsalt', ''), $storedHash)) + if ($hasher->CheckPassword($password . OC_Config::getValue('passwordsalt', ''), $storedHash)) { return $row['uid']; + } //old sha1 based hashing } elseif (sha1($password) == $storedHash) { @@ -234,7 +234,7 @@ class OC_User_Database extends OC_User_Backend { protected function loadUsers() { if (!self::$cache_complete) { $query = OC_DB::prepare('SELECT `uid`, `displayname` FROM `*PREFIX*users` ORDER BY `uid`'); - $result = $query->execute(array($uid)); + $result = $query->execute(); if (OC_DB::isError($result)) { OC_Log::write('core', OC_DB::getErrorMessage($result), OC_Log::ERROR); @@ -262,8 +262,9 @@ class OC_User_Database extends OC_User_Backend { $this->loadUsers(); $users = array(); - foreach (self::$cache as $uid => $value) + foreach (self::$cache as $uid => $value) { $users[] = $uid; + } return $users; } @@ -281,11 +282,12 @@ class OC_User_Database extends OC_User_Backend { /** * @brief get the user's home directory * @param string $uid the username - * @return boolean + * @return string|false */ public function getHome($uid) { - if ($this->userExists($uid)) + if ($this->userExists($uid)) { return OC_Config::getValue("datadirectory", OC::$SERVERROOT . "/data") . '/' . $uid; + } return false; } -- GitLab From db6fb198fe7b8fa854050730b32d58d3787505b3 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Fri, 7 Mar 2014 14:27:23 +0100 Subject: [PATCH 021/253] don't throw errors in getType --- lib/private/files/fileinfo.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/private/files/fileinfo.php b/lib/private/files/fileinfo.php index 916346b6082..26ea0aab562 100644 --- a/lib/private/files/fileinfo.php +++ b/lib/private/files/fileinfo.php @@ -53,6 +53,9 @@ class FileInfo implements \OCP\Files\FileInfo, \ArrayAccess { } public function offsetGet($offset) { + if ($offset === 'type') { + return $this->getType(); + } return $this->data[$offset]; } @@ -144,7 +147,7 @@ class FileInfo implements \OCP\Files\FileInfo, \ArrayAccess { * @return \OCP\Files\FileInfo::TYPE_FILE | \OCP\Files\FileInfo::TYPE_FOLDER */ public function getType() { - if ($this->data['type']) { + if (isset($this->data['type'])) { return $this->data['type']; } else { return $this->getMimetype() === 'httpd/unix-directory' ? self::TYPE_FOLDER : self::TYPE_FILE; -- GitLab From d8843f6cd3b37bc7e95b5baa437d7087b09fc6fd Mon Sep 17 00:00:00 2001 From: nishiki Date: Sun, 9 Mar 2014 12:01:35 +0100 Subject: [PATCH 022/253] minor clean code --- lib/private/user/database.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/private/user/database.php b/lib/private/user/database.php index 80d52feffc8..c472c5445b7 100644 --- a/lib/private/user/database.php +++ b/lib/private/user/database.php @@ -276,7 +276,7 @@ class OC_User_Database extends OC_User_Backend { */ public function userExists($uid) { $this->loadUser($uid); - return empty(self::$cache[$uid]) ? false : true; + return !empty(self::$cache[$uid]); } /** -- GitLab From 75011c2e09e2ee7e9c76a86e938c4d8656225352 Mon Sep 17 00:00:00 2001 From: nishiki Date: Sun, 9 Mar 2014 12:22:47 +0100 Subject: [PATCH 023/253] add query result (boolean) for update or delete --- lib/private/user/database.php | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/lib/private/user/database.php b/lib/private/user/database.php index c472c5445b7..57ecdda9dad 100644 --- a/lib/private/user/database.php +++ b/lib/private/user/database.php @@ -91,8 +91,9 @@ class OC_User_Database extends OC_User_Backend { public function deleteUser($uid) { // Delete user-group-relation $query = OC_DB::prepare('DELETE FROM `*PREFIX*users` WHERE `uid` = ?'); - $query->execute(array($uid)); - return true; + $result = $query->execute(array($uid)); + + return $result ? true : false; } /** @@ -108,9 +109,9 @@ class OC_User_Database extends OC_User_Backend { $hasher = $this->getHasher(); $hash = $hasher->HashPassword($password . OC_Config::getValue('passwordsalt', '')); $query = OC_DB::prepare('UPDATE `*PREFIX*users` SET `password` = ? WHERE `uid` = ?'); - $query->execute(array($hash, $uid)); + $result = $query->execute(array($hash, $uid)); - return true; + return $result ? true : false; } return false; @@ -142,11 +143,7 @@ class OC_User_Database extends OC_User_Backend { */ public function getDisplayName($uid) { $this->loadUser($uid); - if (!empty(self::$cache[$uid]['displayname'])) { - return self::$cache[$uid]['displayname']; - } else { - return $uid; - } + return empty(self::$cache[$uid]['displayname']) ? $uid : self::$cache[$uid]['displayname']; } /** -- GitLab From ba9d8f7c1a448e0a769ee31d20ee75c1616b22e7 Mon Sep 17 00:00:00 2001 From: nishiki Date: Sun, 9 Mar 2014 12:47:19 +0100 Subject: [PATCH 024/253] fix undifined uid --- lib/private/user/database.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/private/user/database.php b/lib/private/user/database.php index 57ecdda9dad..591ea2a5c98 100644 --- a/lib/private/user/database.php +++ b/lib/private/user/database.php @@ -239,7 +239,8 @@ class OC_User_Database extends OC_User_Backend { } while ($row = $result->fetchRow()) { - self::$cache[$uid]['uid'] = $row['uid']; + $uid = $row['uid']; + self::$cache[$uid]['uid'] = $uid; self::$cache[$uid]['displayname'] = $row['displayname']; } -- GitLab From 415b1d03bca12c082ff70e44d3b7b8b3fbc8f347 Mon Sep 17 00:00:00 2001 From: adrien Date: Mon, 10 Mar 2014 17:27:51 +0100 Subject: [PATCH 025/253] fix cache when remove an user --- lib/private/user/database.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/lib/private/user/database.php b/lib/private/user/database.php index 591ea2a5c98..4a9ad1b825e 100644 --- a/lib/private/user/database.php +++ b/lib/private/user/database.php @@ -93,7 +93,14 @@ class OC_User_Database extends OC_User_Backend { $query = OC_DB::prepare('DELETE FROM `*PREFIX*users` WHERE `uid` = ?'); $result = $query->execute(array($uid)); - return $result ? true : false; + if ($result) { + if (isset(self::$cache[$uid])) { + unset(self::$cache[$uid]); + } + return true; + } + + return false; } /** -- GitLab From f827761e7111d4f3b082074facef31efd74939e7 Mon Sep 17 00:00:00 2001 From: adrien Date: Tue, 11 Mar 2014 11:56:46 +0100 Subject: [PATCH 026/253] remove static variable, add limit and offset --- lib/private/user/database.php | 80 ++++++++++++++++++++++------------- 1 file changed, 51 insertions(+), 29 deletions(-) diff --git a/lib/private/user/database.php b/lib/private/user/database.php index 4a9ad1b825e..5df9c9e2b42 100644 --- a/lib/private/user/database.php +++ b/lib/private/user/database.php @@ -44,8 +44,8 @@ class OC_User_Database extends OC_User_Backend { */ private static $hasher = null; - protected static $cache = array(); - protected static $cache_complete = false; + private $cache = array(); + private $cache_complete = false; private function getHasher() { if (!self::$hasher) { @@ -73,7 +73,7 @@ class OC_User_Database extends OC_User_Backend { $result = $query->execute(array($uid, $hash)); if ($result) { - self::$cache[$uid]['uid'] = $uid; + $this->cache[$uid]['uid'] = $uid; return true; } } @@ -94,8 +94,8 @@ class OC_User_Database extends OC_User_Backend { $result = $query->execute(array($uid)); if ($result) { - if (isset(self::$cache[$uid])) { - unset(self::$cache[$uid]); + if (isset($this->cache[$uid])) { + unset($this->cache[$uid]); } return true; } @@ -136,7 +136,8 @@ class OC_User_Database extends OC_User_Backend { if ($this->userExists($uid)) { $query = OC_DB::prepare('UPDATE `*PREFIX*users` SET `displayname` = ? WHERE LOWER(`uid`) = ?'); $query->execute(array($displayName, $uid)); - self::$cache[$uid]['displayname'] = $displayName; + $this->cache[$uid]['displayname'] = $displayName; + return true; } @@ -150,7 +151,7 @@ class OC_User_Database extends OC_User_Backend { */ public function getDisplayName($uid) { $this->loadUser($uid); - return empty(self::$cache[$uid]['displayname']) ? $uid : self::$cache[$uid]['displayname']; + return empty($this->cache[$uid]['displayname']) ? $uid : $this->cache[$uid]['displayname']; } /** @@ -159,15 +160,24 @@ class OC_User_Database extends OC_User_Backend { * * Get a list of all display names and user ids. */ - public function getDisplayNames($search = '', $limit = null, $offset = null) { + public function getDisplayNames($search = '', $limit = null, $offset = 0) { + $this->loadUsers(); + + $search = strtolower($search); + $i = 0; + $displayNames = array(); - $query = OC_DB::prepare('SELECT `uid`, `displayname` FROM `*PREFIX*users`' - . ' WHERE LOWER(`displayname`) LIKE LOWER(?) OR ' - . 'LOWER(`uid`) LIKE LOWER(?)', $limit, $offset); - $result = $query->execute(array($search . '%', $search . '%')); - $users = array(); - while ($row = $result->fetchRow()) { - $displayNames[$row['uid']] = $row['displayname']; + foreach ($this->cache as $uid => $value) { + if ((preg_match('/^.*'.$search.'.*/', strtolower($uid)) || preg_match('/^.*'.$search.'.*/', strtolower($value['displayname']))) && $offset <= $i) { + $displayNames[$uid] = $value['displayname']; + if (!is_null($limit)) { + $limit--; + if ($limit <= 0) { + break; + } + } + } + $i++; } return $displayNames; @@ -211,8 +221,8 @@ class OC_User_Database extends OC_User_Backend { * @param string $uid the username * @returns boolean */ - protected function loadUser($uid) { - if (empty(self::$cache[$uid])) { + private function loadUser($uid) { + if (empty($this->cache[$uid])) { $query = OC_DB::prepare('SELECT `uid`, `displayname` FROM `*PREFIX*users` WHERE LOWER(`uid`) = LOWER(?)'); $result = $query->execute(array($uid)); @@ -222,8 +232,8 @@ class OC_User_Database extends OC_User_Backend { } while ($row = $result->fetchRow()) { - self::$cache[$uid]['uid'] = $row['uid']; - self::$cache[$uid]['displayname'] = $row['displayname']; + $this->cache[$uid]['uid'] = $row['uid']; + $this->cache[$uid]['displayname'] = $row['displayname']; } } @@ -235,8 +245,8 @@ class OC_User_Database extends OC_User_Backend { * @param string $uid the username * @returns boolean */ - protected function loadUsers() { - if (!self::$cache_complete) { + private function loadUsers() { + if (!$this->cache_complete) { $query = OC_DB::prepare('SELECT `uid`, `displayname` FROM `*PREFIX*users` ORDER BY `uid`'); $result = $query->execute(); @@ -247,11 +257,11 @@ class OC_User_Database extends OC_User_Backend { while ($row = $result->fetchRow()) { $uid = $row['uid']; - self::$cache[$uid]['uid'] = $uid; - self::$cache[$uid]['displayname'] = $row['displayname']; + $this->cache[$uid]['uid'] = $uid; + $this->cache[$uid]['displayname'] = $row['displayname']; } - self::$cache_complete = true; + $this->cache_complete = true; } return true; @@ -263,12 +273,24 @@ class OC_User_Database extends OC_User_Backend { * * Get a list of all users. */ - public function getUsers($search = '', $limit = null, $offset = null) { + public function getUsers($search = '', $limit = null, $offset = 0) { $this->loadUsers(); + $search = strtolower($search); + $i = 0; + $users = array(); - foreach (self::$cache as $uid => $value) { - $users[] = $uid; + foreach ($this->cache as $uid => $value) { + if (preg_match('/^'.$search.'.*/', strtolower($uid)) && $offset <= $i) { + $users[] = $uid; + if (!is_null($limit)) { + $limit--; + if ($limit <= 0) { + break; + } + } + } + $i++; } return $users; @@ -281,7 +303,7 @@ class OC_User_Database extends OC_User_Backend { */ public function userExists($uid) { $this->loadUser($uid); - return !empty(self::$cache[$uid]); + return !empty($this->cache[$uid]); } /** @@ -311,7 +333,7 @@ class OC_User_Database extends OC_User_Backend { */ public function countUsers() { $this->loadUsers(); - return count(self::$cache); + return count($this->cache); } } -- GitLab From ea6f8ba352ac7b3c9069407d6f64664ddee81c4d Mon Sep 17 00:00:00 2001 From: adrien Date: Tue, 11 Mar 2014 16:58:10 +0100 Subject: [PATCH 027/253] fix remove cache when delete --- lib/private/user/database.php | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/lib/private/user/database.php b/lib/private/user/database.php index 5df9c9e2b42..683ba90e558 100644 --- a/lib/private/user/database.php +++ b/lib/private/user/database.php @@ -93,14 +93,11 @@ class OC_User_Database extends OC_User_Backend { $query = OC_DB::prepare('DELETE FROM `*PREFIX*users` WHERE `uid` = ?'); $result = $query->execute(array($uid)); - if ($result) { - if (isset($this->cache[$uid])) { - unset($this->cache[$uid]); - } - return true; + if (isset($this->cache[$uid])) { + unset($this->cache[$uid]); } - return false; + return $result ? true : false; } /** -- GitLab From 8a8a32cf43efad6fdb2089097cb7fadbe0472456 Mon Sep 17 00:00:00 2001 From: ben-denham Date: Fri, 14 Mar 2014 09:17:39 +1300 Subject: [PATCH 028/253] Changed conditions in user_ldap's ldapFilter.js to use ===, fixed indentation. --- apps/user_ldap/js/ldapFilter.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/user_ldap/js/ldapFilter.js b/apps/user_ldap/js/ldapFilter.js index 71f8cd6c7c4..70f24f0d4a5 100644 --- a/apps/user_ldap/js/ldapFilter.js +++ b/apps/user_ldap/js/ldapFilter.js @@ -65,10 +65,10 @@ LdapFilter.prototype.determineMode = function() { function(result) { property = 'ldap' + filter.target + 'FilterMode'; filter.mode = result.changes[property]; - if(filter.mode == LdapWizard.filterModeRaw + if(filter.mode === LdapWizard.filterModeRaw && $('#raw'+filter.target+'FilterContainer').hasClass('invisible')) { LdapWizard['toggleRaw'+filter.target+'Filter'](); - } else if(filter.mode == LdapWizard.filterModeAssisted + } else if(filter.mode === LdapWizard.filterModeAssisted && !$('#raw'+filter.target+'FilterContainer').hasClass('invisible')) { LdapWizard['toggleRaw'+filter.target+'Filter'](); } @@ -80,7 +80,7 @@ LdapFilter.prototype.determineMode = function() { LdapWizard['toggleRaw'+filter.target+'Filter'](); filter.mode = LdapWizard.filterModeAssisted; } - filter.unlock(); + filter.unlock(); } ); -- GitLab From 36da3bc35908d9324397ba5fac5f2a4228bea51e Mon Sep 17 00:00:00 2001 From: Scott Arciszewski Date: Wed, 19 Mar 2014 13:31:51 -0400 Subject: [PATCH 029/253] Update crypt.php A 1024 kilobyte key would be obnoxiously slow to operate on. I'm assuming you meant 1024-bit? Also, 183 bytes = 1464 bits. Here's a safe alternative: 2048 bits, with comment-code sanity --- apps/files_encryption/lib/crypt.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/files_encryption/lib/crypt.php b/apps/files_encryption/lib/crypt.php index caca13acece..e38a4ef7125 100755 --- a/apps/files_encryption/lib/crypt.php +++ b/apps/files_encryption/lib/crypt.php @@ -497,13 +497,13 @@ class Crypt { } /** - * @brief Generate a pseudo random 1024kb ASCII key, used as file key + * @brief Generate a pseudo random 2048-bit ASCII key, used as file key * @returns $key Generated key */ public static function generateKey() { // Generate key - if ($key = base64_encode(openssl_random_pseudo_bytes(183, $strong))) { + if ($key = base64_encode(openssl_random_pseudo_bytes(256, $strong))) { if (!$strong) { -- GitLab From 0da61a26ee842e611f33d32109572c70bbc170b1 Mon Sep 17 00:00:00 2001 From: adrien Date: Fri, 21 Mar 2014 15:50:25 +0100 Subject: [PATCH 030/253] remove cache all user --- lib/private/user/database.php | 92 +++++++++-------------------------- 1 file changed, 22 insertions(+), 70 deletions(-) diff --git a/lib/private/user/database.php b/lib/private/user/database.php index 683ba90e558..706982bb75d 100644 --- a/lib/private/user/database.php +++ b/lib/private/user/database.php @@ -45,7 +45,6 @@ class OC_User_Database extends OC_User_Backend { private static $hasher = null; private $cache = array(); - private $cache_complete = false; private function getHasher() { if (!self::$hasher) { @@ -71,11 +70,8 @@ class OC_User_Database extends OC_User_Backend { $hash = $hasher->HashPassword($password . OC_Config::getValue('passwordsalt', '')); $query = OC_DB::prepare('INSERT INTO `*PREFIX*users` ( `uid`, `password` ) VALUES( ?, ? )'); $result = $query->execute(array($uid, $hash)); - - if ($result) { - $this->cache[$uid]['uid'] = $uid; - return true; - } + + return $result ? true : false; } return false; @@ -157,24 +153,15 @@ class OC_User_Database extends OC_User_Backend { * * Get a list of all display names and user ids. */ - public function getDisplayNames($search = '', $limit = null, $offset = 0) { - $this->loadUsers(); - - $search = strtolower($search); - $i = 0; - + public function getDisplayNames($search = '', $limit = null, $offset = null) { $displayNames = array(); - foreach ($this->cache as $uid => $value) { - if ((preg_match('/^.*'.$search.'.*/', strtolower($uid)) || preg_match('/^.*'.$search.'.*/', strtolower($value['displayname']))) && $offset <= $i) { - $displayNames[$uid] = $value['displayname']; - if (!is_null($limit)) { - $limit--; - if ($limit <= 0) { - break; - } - } - } - $i++; + $query = OC_DB::prepare('SELECT `uid`, `displayname` FROM `*PREFIX*users`' + . ' WHERE LOWER(`displayname`) LIKE LOWER(?) OR ' + . 'LOWER(`uid`) LIKE LOWER(?)', $limit, $offset); + $result = $query->execute(array($search . '%', $search . '%')); + $users = array(); + while ($row = $result->fetchRow()) { + $displayNames[$row['uid']] = $row['displayname']; } return $displayNames; @@ -237,59 +224,19 @@ class OC_User_Database extends OC_User_Backend { return true; } - /** - * @brief Load an user in the cache - * @param string $uid the username - * @returns boolean - */ - private function loadUsers() { - if (!$this->cache_complete) { - $query = OC_DB::prepare('SELECT `uid`, `displayname` FROM `*PREFIX*users` ORDER BY `uid`'); - $result = $query->execute(); - - if (OC_DB::isError($result)) { - OC_Log::write('core', OC_DB::getErrorMessage($result), OC_Log::ERROR); - return false; - } - - while ($row = $result->fetchRow()) { - $uid = $row['uid']; - $this->cache[$uid]['uid'] = $uid; - $this->cache[$uid]['displayname'] = $row['displayname']; - } - - $this->cache_complete = true; - } - - return true; - } - /** * @brief Get a list of all users * @returns array with all uids * * Get a list of all users. */ - public function getUsers($search = '', $limit = null, $offset = 0) { - $this->loadUsers(); - - $search = strtolower($search); - $i = 0; - + public function getUsers($search = '', $limit = null, $offset = null) { + $query = OC_DB::prepare('SELECT `uid` FROM `*PREFIX*users` WHERE LOWER(`uid`) LIKE LOWER(?)', $limit, $offset); + $result = $query->execute(array($search . '%')); $users = array(); - foreach ($this->cache as $uid => $value) { - if (preg_match('/^'.$search.'.*/', strtolower($uid)) && $offset <= $i) { - $users[] = $uid; - if (!is_null($limit)) { - $limit--; - if ($limit <= 0) { - break; - } - } - } - $i++; + while ($row = $result->fetchRow()) { + $users[] = $row['uid']; } - return $users; } @@ -329,8 +276,13 @@ class OC_User_Database extends OC_User_Backend { * @return int | bool */ public function countUsers() { - $this->loadUsers(); - return count($this->cache); + $query = OC_DB::prepare('SELECT COUNT(*) FROM `*PREFIX*users`'); + $result = $query->execute(); + if (OC_DB::isError($result)) { + OC_Log::write('core', OC_DB::getErrorMessage($result), OC_Log::ERROR); + return false; + } + return $result->fetchOne(); } } -- GitLab From 09cc0205352ce02ea5e4d3dc36d12c89fbe3db1a Mon Sep 17 00:00:00 2001 From: Scott Arciszewski Date: Mon, 24 Mar 2014 08:57:33 -0400 Subject: [PATCH 031/253] Update crypt.php Use a 256-bit random value --- apps/files_encryption/lib/crypt.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/files_encryption/lib/crypt.php b/apps/files_encryption/lib/crypt.php index e38a4ef7125..a4f7bd35497 100755 --- a/apps/files_encryption/lib/crypt.php +++ b/apps/files_encryption/lib/crypt.php @@ -497,13 +497,13 @@ class Crypt { } /** - * @brief Generate a pseudo random 2048-bit ASCII key, used as file key + * @brief Generate a pseudo random 256-bit ASCII key, used as file key * @returns $key Generated key */ public static function generateKey() { // Generate key - if ($key = base64_encode(openssl_random_pseudo_bytes(256, $strong))) { + if ($key = base64_encode(openssl_random_pseudo_bytes(32, $strong))) { if (!$strong) { -- GitLab From aa5bba2bcce010ecbbbf4df0a63570a66986d846 Mon Sep 17 00:00:00 2001 From: Thomas Tanghus Date: Tue, 25 Mar 2014 14:22:39 +0100 Subject: [PATCH 032/253] 'ID' => 'id' and check existence of EMAIL --- core/ajax/share.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/core/ajax/share.php b/core/ajax/share.php index 6bac2867c48..588781556ff 100644 --- a/core/ajax/share.php +++ b/core/ajax/share.php @@ -268,6 +268,10 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo if (!is_null($cm) && $cm->isEnabled()) { $contacts = $cm->search($_GET['search'], array('FN', 'EMAIL')); foreach ($contacts as $contact) { + if (!isset($emails = $contact['EMAIL']) { + continue; + } + $emails = $contact['EMAIL']; if (!is_array($emails)) { $emails = array($emails); @@ -275,7 +279,7 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo foreach($emails as $email) { $result[] = array( - 'id' => $contact['ID'], + 'id' => $contact['id'], 'email' => $email, 'displayname' => $contact['FN'], ); -- GitLab From 0b4d87961926d69e5f95b2a6477edb804d726b78 Mon Sep 17 00:00:00 2001 From: Thomas Tanghus Date: Tue, 25 Mar 2014 15:38:11 +0100 Subject: [PATCH 033/253] Fix copy/paste error :P --- core/ajax/share.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/ajax/share.php b/core/ajax/share.php index 588781556ff..747cb3c6dbb 100644 --- a/core/ajax/share.php +++ b/core/ajax/share.php @@ -268,7 +268,7 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo if (!is_null($cm) && $cm->isEnabled()) { $contacts = $cm->search($_GET['search'], array('FN', 'EMAIL')); foreach ($contacts as $contact) { - if (!isset($emails = $contact['EMAIL']) { + if (!isset($contact['EMAIL'])) { continue; } -- GitLab From 9c8596e95b81f9d5ddcd7132ac0134b0ffed67e5 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Tue, 1 Apr 2014 15:43:27 +0200 Subject: [PATCH 034/253] Keep cached urls with different hostnames or baseurls seperate --- lib/private/route/cachingrouter.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/private/route/cachingrouter.php b/lib/private/route/cachingrouter.php index ad25372391f..63bfd3e0539 100644 --- a/lib/private/route/cachingrouter.php +++ b/lib/private/route/cachingrouter.php @@ -31,7 +31,7 @@ class CachingRouter extends Router { * @return string */ public function generate($name, $parameters = array(), $absolute = false) { - $key = $name . json_encode($parameters) . $absolute; + $key = $this->context->getHost() . $this->context->getBaseUrl() . $name . json_encode($parameters) . $absolute; if ($this->cache->hasKey($key)) { return $this->cache->get($key); } else { -- GitLab From c926e98ea96f4782bc75b97e4db5996dacd6e0d4 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Tue, 1 Apr 2014 17:18:03 +0200 Subject: [PATCH 035/253] fix log in input sizing caused by core input field switch to px --- core/css/styles.css | 42 +++++++++++++++++++++++++++++++----------- 1 file changed, 31 insertions(+), 11 deletions(-) diff --git a/core/css/styles.css b/core/css/styles.css index 8a12057529d..f750c72077c 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -402,14 +402,32 @@ input[type="submit"].enabled { } /* Icons for username and password fields to better recognize them */ -#adminlogin, #adminpass, #user, #password { width:11.7em!important; padding-left:1.8em; } -#adminlogin+label+img, #adminpass-icon, #user+label+img, #password-icon { - position:absolute; left:1.25em; top:1.65em; - -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=30)"; filter:alpha(opacity=30); opacity:.3; +#adminlogin, #adminpass, #user, #password { + width: 223px !important; + padding-left: 36px !important; +} +#adminlogin+label+img, +#adminpass-icon, +#user+label+img, +#password-icon { + position: absolute; + left: 1.25em; + top: 1.65em; + -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=30)"; + filter: alpha(opacity=30); + opacity: .3; +} +#adminpass-icon, #password-icon { + top: 1.1em; +} +input[name="password-clone"] { + padding-left: 1.8em; + width: 11.7em !important; +} +input[name="adminpass-clone"] { + padding-left: 1.8em; + width: 11.7em !important; } -#adminpass-icon, #password-icon { top:1.1em; } -input[name="password-clone"] { padding-left:1.8em; width:11.7em !important; } -input[name="adminpass-clone"] { padding-left:1.8em; width:11.7em !important; } /* General new input field look */ #body-login input[type="text"], @@ -456,7 +474,7 @@ label.infield { cursor:text !important; top:1.05em; left:.85em; } #body-login form input[type="checkbox"]+label { position: relative; margin: 0; - font-size: 1em; + font-size: 13px; padding: 14px; padding-left: 28px; margin-left: -28px; @@ -610,11 +628,13 @@ label.infield { cursor:text !important; top:1.05em; left:.85em; } /* Log in and install button */ #body-login input { - font-size: 1.5em; + font-size: 20px; + margin: 5px; + padding: 12px 10px 8px; } #body-login input[type="text"], #body-login input[type="password"] { - width: 13em; + width: 249px; } #body-login input.login { width: auto; @@ -624,7 +644,7 @@ label.infield { cursor:text !important; top:1.05em; left:.85em; } padding: 10px 20px; /* larger log in and installation buttons */ } #remember_login { - margin: 18px 5px 0 18px; + margin: 24px 5px 0 16px !important; vertical-align: text-bottom; } -- GitLab From 0c441724bc3031e50715169e9fd5541b347b2878 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Tue, 1 Apr 2014 17:21:05 +0200 Subject: [PATCH 036/253] make infield labels use less space so pasting in is easier --- core/css/styles.css | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/core/css/styles.css b/core/css/styles.css index f750c72077c..7af80e31ffb 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -466,9 +466,14 @@ input[name="adminpass-clone"] { p.infield { position:relative; } label.infield { cursor:text !important; top:1.05em; left:.85em; } #body-login form label.infield { /* labels are ellipsized when too long, keep them short */ - position:absolute; width:90%; padding-left:1.4em; - font-size:19px; color:#aaa; - white-space:nowrap; overflow:hidden; text-overflow:ellipsis; + position: absolute; + width: auto; + margin-left: 26px; + font-size: 19px; + color: #aaa; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; } #body-login #databaseField .infield { padding-left:0; } #body-login form input[type="checkbox"]+label { -- GitLab From 54a15a80011e50e7b7b9cf9c946c5bd5e82df42b Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Thu, 20 Mar 2014 15:35:01 +0100 Subject: [PATCH 037/253] Use streams when generating hashes of remote files --- lib/private/files/storage/common.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/private/files/storage/common.php b/lib/private/files/storage/common.php index 2b697141515..05e031b37ad 100644 --- a/lib/private/files/storage/common.php +++ b/lib/private/files/storage/common.php @@ -159,9 +159,11 @@ abstract class Common implements \OC\Files\Storage\Storage { } public function hash($type, $path, $raw = false) { - $tmpFile = $this->getLocalFile($path); - $hash = hash_file($type, $tmpFile, $raw); - return $hash; + $fh = $this->fopen($path, 'r'); + $ctx = hash_init($type); + hash_update_stream($ctx, $fh); + fclose($fh); + return hash_final($ctx, $raw); } public function search($query) { -- GitLab From 1c7a71ca779af16059dd00dbe3dd79097c556ad4 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Thu, 20 Mar 2014 16:45:24 +0100 Subject: [PATCH 038/253] use binary safe read --- lib/private/files/storage/common.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/private/files/storage/common.php b/lib/private/files/storage/common.php index 05e031b37ad..9af3a398c1c 100644 --- a/lib/private/files/storage/common.php +++ b/lib/private/files/storage/common.php @@ -159,7 +159,7 @@ abstract class Common implements \OC\Files\Storage\Storage { } public function hash($type, $path, $raw = false) { - $fh = $this->fopen($path, 'r'); + $fh = $this->fopen($path, 'rb'); $ctx = hash_init($type); hash_update_stream($ctx, $fh); fclose($fh); -- GitLab From 850a0e73885779b9768afc1f2a2dd8260b006587 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Tue, 18 Mar 2014 09:25:04 +0100 Subject: [PATCH 039/253] Verify that a file exists before we share it --- lib/private/share/share.php | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/lib/private/share/share.php b/lib/private/share/share.php index 7bab98b00bf..74cc8877858 100644 --- a/lib/private/share/share.php +++ b/lib/private/share/share.php @@ -431,6 +431,16 @@ class Share extends \OC\Share\Constants { $itemSourceName = $itemSource; } + // verify that the file exists before we try to share it + if ($itemType === 'file' or $itemType === 'folder') { + $path = \OC\Files\Filesystem::getPath($itemSource); + if (!$path) { + $message = 'Sharing ' . $itemSourceName . ' failed, because the file does not exist'; + \OC_Log::write('OCP\Share', $message, \OC_Log::ERROR); + throw new \Exception($message); + } + } + // Verify share type and sharing conditions are met if ($shareType === self::SHARE_TYPE_USER) { if ($shareWith == $uidOwner) { -- GitLab From b8248f4a0acf0de228774aec0f7150a538ed09e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= Date: Wed, 2 Apr 2014 17:32:27 +0200 Subject: [PATCH 040/253] compare floats with epsilon --- lib/private/preview.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/private/preview.php b/lib/private/preview.php index 0c1af3c9588..963cda66992 100755 --- a/lib/private/preview.php +++ b/lib/private/preview.php @@ -355,7 +355,8 @@ class Preview { $y = (int)$size[1]; $aspectRatio = (float)($x / $y); - if ($aspectRatio !== $wantedAspectRatio) { + $epsilon = 0.000001; + if (($aspectRatio - $wantedAspectRatio) >= $epsilon) { continue; } -- GitLab From bca6cc6f741ae957a345ca21d689a5f23d964d9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= Date: Wed, 2 Apr 2014 17:34:48 +0200 Subject: [PATCH 041/253] remove unnecessary code --- lib/private/preview.php | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/lib/private/preview.php b/lib/private/preview.php index 963cda66992..493ed90f770 100755 --- a/lib/private/preview.php +++ b/lib/private/preview.php @@ -373,24 +373,8 @@ class Preview { $possibleThumbnails[$x] = $thumbnail['path']; } - if (count($possibleThumbnails) === 0) { - return false; - } - - if (count($possibleThumbnails) === 1) { - return current($possibleThumbnails); - } - ksort($possibleThumbnails); - if (key(reset($possibleThumbnails)) > $maxX) { - return current(reset($possibleThumbnails)); - } - - if (key(end($possibleThumbnails)) < $maxX) { - return current(end($possibleThumbnails)); - } - foreach ($possibleThumbnails as $width => $path) { if ($width < $maxX) { continue; @@ -398,6 +382,8 @@ class Preview { return $path; } } + + return false; } /** -- GitLab From 6b017201b8753206236bf96b61c87224c6e41f41 Mon Sep 17 00:00:00 2001 From: tomneedham Date: Wed, 2 Apr 2014 15:50:51 +0000 Subject: [PATCH 042/253] Only accept success as 100 like the OCS spec does --- lib/private/ocs/result.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/private/ocs/result.php b/lib/private/ocs/result.php index 9f14e8da7e8..0e3b85d5905 100644 --- a/lib/private/ocs/result.php +++ b/lib/private/ocs/result.php @@ -96,7 +96,7 @@ class OC_OCS_Result{ * @return bool */ public function succeeded() { - return (substr($this->statusCode, 0, 1) === '1'); + return ($this->statusCode == 100); } -- GitLab From 436a78db448d4263f90de0490202b8d7a936d3a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= Date: Wed, 2 Apr 2014 17:59:39 +0200 Subject: [PATCH 043/253] extract method isCachedBigger --- lib/private/preview.php | 47 +++++++++++++++++++++++++++++------------ 1 file changed, 33 insertions(+), 14 deletions(-) diff --git a/lib/private/preview.php b/lib/private/preview.php index 493ed90f770..7be392a50d9 100755 --- a/lib/private/preview.php +++ b/lib/private/preview.php @@ -314,16 +314,12 @@ class Preview { /** * @brief check if thumbnail or bigger version of thumbnail of file is cached - * @return mixed (bool / string) - * false if thumbnail does not exist - * path to thumbnail if thumbnail exists + * @return string|false path to thumbnail if it exists or false */ private function isCached() { $file = $this->getFile(); $maxX = $this->getMaxX(); $maxY = $this->getMaxY(); - $scalingUp = $this->getScalingUp(); - $maxScaleFactor = $this->getMaxScaleFactor(); $fileInfo = $this->getFileInfo($file); $fileId = $fileInfo->getId(); @@ -333,16 +329,40 @@ class Preview { } $previewPath = $this->getThumbnailsFolder() . '/' . $fileId . '/'; - if (!$this->userView->is_dir($previewPath)) { - return false; - } //does a preview with the wanted height and width already exist? if ($this->userView->file_exists($previewPath . $maxX . '-' . $maxY . '.png')) { return $previewPath . $maxX . '-' . $maxY . '.png'; } - $wantedAspectRatio = (float)($maxX / $maxY); + return $this->isCachedBigger(); + } + + /** + * @brief check if a bigger version of thumbnail of file is cached + * @return string|false path to bigger thumbnail if it exists or false + */ + private function isCachedBigger() { + + $file = $this->getFile(); + $maxX = $this->getMaxX(); + $maxY = $this->getMaxY(); + $scalingUp = $this->getScalingUp(); + $maxScaleFactor = $this->getMaxScaleFactor(); + + $fileInfo = $this->fileView->getFileInfo($file); + $fileId = $fileInfo['fileid']; + + if (is_null($fileId)) { + return false; + } + + $previewPath = $this->getThumbnailsFolder() . '/' . $fileId . '/'; + if (!$this->userView->is_dir($previewPath)) { + return false; + } + + $wantedAspectRatio = (float) ($maxX / $maxY); //array for usable cached thumbnails $possibleThumbnails = array(); @@ -351,10 +371,10 @@ class Preview { foreach ($allThumbnails as $thumbnail) { $name = rtrim($thumbnail['name'], '.png'); $size = explode('-', $name); - $x = (int)$size[0]; - $y = (int)$size[1]; + $x = (int) $size[0]; + $y = (int) $size[1]; - $aspectRatio = (float)($x / $y); + $aspectRatio = (float) ($x / $y); $epsilon = 0.000001; if (($aspectRatio - $wantedAspectRatio) >= $epsilon) { continue; @@ -382,10 +402,9 @@ class Preview { return $path; } } - + return false; } - /** * @brief return a preview of a file * @return \OC_Image -- GitLab From b9a8bd7e1f6f99fe5d26e1693d13ebc6ddf81777 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= Date: Wed, 2 Apr 2014 18:32:32 +0200 Subject: [PATCH 044/253] extract more methods --- lib/private/preview.php | 109 +++++++++++++++++++++++----------------- 1 file changed, 63 insertions(+), 46 deletions(-) diff --git a/lib/private/preview.php b/lib/private/preview.php index 7be392a50d9..36cc5d9a2e0 100755 --- a/lib/private/preview.php +++ b/lib/private/preview.php @@ -314,19 +314,16 @@ class Preview { /** * @brief check if thumbnail or bigger version of thumbnail of file is cached + * @param int $fileId fileId of the original image * @return string|false path to thumbnail if it exists or false */ - private function isCached() { - $file = $this->getFile(); - $maxX = $this->getMaxX(); - $maxY = $this->getMaxY(); - - $fileInfo = $this->getFileInfo($file); - $fileId = $fileInfo->getId(); - + private function isCached($fileId) { if (is_null($fileId)) { return false; } + + $maxX = $this->getMaxX(); + $maxY = $this->getMaxY(); $previewPath = $this->getThumbnailsFolder() . '/' . $fileId . '/'; @@ -335,34 +332,49 @@ class Preview { return $previewPath . $maxX . '-' . $maxY . '.png'; } - return $this->isCachedBigger(); + return $this->isCachedBigger($fileId); } /** * @brief check if a bigger version of thumbnail of file is cached + * @param int $fileId fileId of the original image * @return string|false path to bigger thumbnail if it exists or false */ - private function isCachedBigger() { - - $file = $this->getFile(); + private function isCachedBigger($fileId) { + + if (is_null($fileId)) { + return false; + } + $maxX = $this->getMaxX(); - $maxY = $this->getMaxY(); - $scalingUp = $this->getScalingUp(); - $maxScaleFactor = $this->getMaxScaleFactor(); - $fileInfo = $this->fileView->getFileInfo($file); - $fileId = $fileInfo['fileid']; + //array for usable cached thumbnails + $possibleThumbnails = $this->getPossibleThumbnails($fileId); + + foreach ($possibleThumbnails as $width => $path) { + if ($width < $maxX) { + continue; + } else { + return $path; + } + } + + return false; + } + /** + * @brief get possible bigger thumbnails of the given image + * @param int $fileId fileId of the original image + * @return array of paths to bigger thumbnails + */ + private function getPossibleThumbnails($fileId) { if (is_null($fileId)) { - return false; + return array(); } $previewPath = $this->getThumbnailsFolder() . '/' . $fileId . '/'; - if (!$this->userView->is_dir($previewPath)) { - return false; - } - - $wantedAspectRatio = (float) ($maxX / $maxY); + + $wantedAspectRatio = (float) ($this->getMaxX() / $this->getMaxY()); //array for usable cached thumbnails $possibleThumbnails = array(); @@ -370,39 +382,44 @@ class Preview { $allThumbnails = $this->userView->getDirectoryContent($previewPath); foreach ($allThumbnails as $thumbnail) { $name = rtrim($thumbnail['name'], '.png'); - $size = explode('-', $name); - $x = (int) $size[0]; - $y = (int) $size[1]; + list($x, $y, $aspectRatio) = $this->getDimensionsFromFilename($name); - $aspectRatio = (float) ($x / $y); - $epsilon = 0.000001; - if (($aspectRatio - $wantedAspectRatio) >= $epsilon) { + if (($aspectRatio - $wantedAspectRatio) >= 0.000001 + || $this->unscalable($x, $y) + ) { continue; } - - if ($x < $maxX || $y < $maxY) { - if ($scalingUp) { - $scalefactor = $maxX / $x; - if ($scalefactor > $maxScaleFactor) { - continue; - } - } else { - continue; - } - } $possibleThumbnails[$x] = $thumbnail['path']; } ksort($possibleThumbnails); - foreach ($possibleThumbnails as $width => $path) { - if ($width < $maxX) { - continue; + return $possibleThumbnails; + } + private function getDimensionsFromFilename($name) { + $size = explode('-', $name); + $x = (int) $size[0]; + $y = (int) $size[1]; + $aspectRatio = (float) ($x / $y); + return array('x' => $x,'y' => $y,'aspectRatio' => $aspectRatio); + } + private function unscalable($x, $y) { + + $maxX = $this->getMaxX(); + $maxY = $this->getMaxY(); + $scalingUp = $this->getScalingUp(); + $maxScaleFactor = $this->getMaxScaleFactor(); + + if ($x < $maxX || $y < $maxY) { + if ($scalingUp) { + $scalefactor = $maxX / $x; + if ($scalefactor > $maxScaleFactor) { + return true; + } } else { - return $path; + return true; } } - return false; } /** @@ -426,7 +443,7 @@ class Preview { } $fileId = $fileInfo->getId(); - $cached = $this->isCached(); + $cached = $this->isCached($fileId); if ($cached) { $stream = $this->userView->fopen($cached, 'r'); -- GitLab From c7324f7e44d1d1bd5c39a9b967dff76b274b9048 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= Date: Thu, 3 Apr 2014 12:00:53 +0200 Subject: [PATCH 045/253] fix float comparison for negative results --- lib/private/preview.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/private/preview.php b/lib/private/preview.php index 36cc5d9a2e0..71c16687fb9 100755 --- a/lib/private/preview.php +++ b/lib/private/preview.php @@ -109,7 +109,7 @@ class Preview { * @brief returns the path of the file you want a thumbnail from * @return string */ - public function getFile() { + public function getFile() { return $this->file; } @@ -384,7 +384,7 @@ class Preview { $name = rtrim($thumbnail['name'], '.png'); list($x, $y, $aspectRatio) = $this->getDimensionsFromFilename($name); - if (($aspectRatio - $wantedAspectRatio) >= 0.000001 + if (abs($aspectRatio - $wantedAspectRatio) >= 0.000001 || $this->unscalable($x, $y) ) { continue; -- GitLab From db95f49b7e454a5168d502977488bf7cd29f7e65 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Thu, 3 Apr 2014 13:01:20 +0200 Subject: [PATCH 046/253] Load all routes when matching an ocs route --- lib/private/route/router.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/private/route/router.php b/lib/private/route/router.php index 1f0a23ee124..6ad016b2a31 100644 --- a/lib/private/route/router.php +++ b/lib/private/route/router.php @@ -183,7 +183,7 @@ class Router implements IRouter { // empty string / 'apps' / $app / rest of the route list(, , $app,) = explode('/', $url, 4); $this->loadRoutes($app); - } else if (substr($url, 0, 6) === '/core/' or substr($url, 0, 5) === '/ocs/' or substr($url, 0, 10) === '/settings/') { + } else if (substr($url, 0, 6) === '/core/' or substr($url, 0, 10) === '/settings/') { $this->loadRoutes('core'); } else { $this->loadRoutes(); -- GitLab From 7dafdfbe88e713a3f3e03e142679fd840deed494 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Thu, 3 Apr 2014 13:14:34 +0200 Subject: [PATCH 047/253] add tests for sharing files the users doesn't have access to --- apps/files_sharing/tests/api.php | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/apps/files_sharing/tests/api.php b/apps/files_sharing/tests/api.php index e3c5b6e4315..c7a848315ac 100644 --- a/apps/files_sharing/tests/api.php +++ b/apps/files_sharing/tests/api.php @@ -878,6 +878,29 @@ class Test_Files_Sharing_Api extends Test_Files_Sharing_Base { $this->assertSame($expectedResult, $shareApiDummy->correctPathTest($path, $folder)); } + /** + * @expectedException \Exception + */ + public function testShareNonExisting() { + \Test_Files_Sharing_Api::loginHelper(\Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER1); + + $id = PHP_INT_MAX - 1; + \OCP\Share::shareItem('file', $id, \OCP\Share::SHARE_TYPE_LINK, \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2, 31); + } + + /** + * @expectedException \Exception + */ + public function testShareNotOwner() { + \Test_Files_Sharing_Api::loginHelper(\Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2); + \OC\Files\Filesystem::file_put_contents('foo.txt', 'bar'); + $info = \OC\Files\Filesystem::getFileInfo('foo.txt'); + + \Test_Files_Sharing_Api::loginHelper(\Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER1); + + \OCP\Share::shareItem('file', $info->getId(), \OCP\Share::SHARE_TYPE_LINK, \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2, 31); + } + } /** -- GitLab From b00592ade50f48b73002682494341c429a6a12eb Mon Sep 17 00:00:00 2001 From: tomneedham Date: Thu, 3 Apr 2014 14:47:55 +0000 Subject: [PATCH 048/253] Fix test case for api response code --- tests/lib/api.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/lib/api.php b/tests/lib/api.php index 233beebd68a..0f7d08543ea 100644 --- a/tests/lib/api.php +++ b/tests/lib/api.php @@ -37,7 +37,7 @@ class Test_API extends PHPUnit_Framework_TestCase { function dataProviderTestOneResult() { return array( array(100, true), - array(101, true), + array(101, false), array(997, false), ); } -- GitLab From f029312e5b20a540aa94f2ead4581a8b653b1c5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Fri, 4 Apr 2014 11:37:47 +0200 Subject: [PATCH 049/253] fixing typos/spellings --- lib/private/preview.php | 15 +++++++++++---- tests/lib/preview.php | 32 ++++++++++++++++---------------- 2 files changed, 27 insertions(+), 20 deletions(-) diff --git a/lib/private/preview.php b/lib/private/preview.php index 71c16687fb9..0fecb25341b 100755 --- a/lib/private/preview.php +++ b/lib/private/preview.php @@ -13,6 +13,8 @@ */ namespace OC; +use OC\Preview\Provider; + require_once 'preview/image.php'; require_once 'preview/movies.php'; require_once 'preview/mp3.php'; @@ -46,8 +48,9 @@ class Preview { // index is path, value is fileinfo static public $deleteFileMapper = array(); - //preview images object /** + * preview images object + * * @var \OC_Image */ private $preview; @@ -198,7 +201,7 @@ class Preview { } /** - * @brief set mimetype explicitely + * @brief set mimetype explicitly * @param string $mimetype */ public function setMimetype($mimetype) { @@ -361,6 +364,7 @@ class Preview { return false; } + /** * @brief get possible bigger thumbnails of the given image * @param int $fileId fileId of the original image @@ -396,6 +400,7 @@ class Preview { return $possibleThumbnails; } + private function getDimensionsFromFilename($name) { $size = explode('-', $name); $x = (int) $size[0]; @@ -403,6 +408,7 @@ class Preview { $aspectRatio = (float) ($x / $y); return array('x' => $x,'y' => $y,'aspectRatio' => $aspectRatio); } + private function unscalable($x, $y) { $maxX = $this->getMaxX(); @@ -422,6 +428,7 @@ class Preview { } return false; } + /** * @brief return a preview of a file * @return \OC_Image @@ -464,6 +471,7 @@ class Preview { \OC_Log::write('core', 'Generating preview for "' . $file . '" with "' . get_class($provider) . '"', \OC_Log::DEBUG); + /** @var $provider Provider */ $preview = $provider->getThumbnail($file, $maxX, $maxY, $scalingUp, $this->fileView); if (!($preview instanceof \OC_Image)) { @@ -507,7 +515,6 @@ class Preview { $this->getPreview(); } $this->preview->show('image/png'); - return; } /** @@ -516,7 +523,6 @@ class Preview { */ public function show() { $this->showPreview(); - return; } /** @@ -653,6 +659,7 @@ class Preview { $class = $provider['class']; $options = $provider['options']; + /** @var $object Provider */ $object = new $class($options); self::$providers[$object->getMimeType()] = $object; diff --git a/tests/lib/preview.php b/tests/lib/preview.php index 353b66fd6d6..fb1c959b45a 100644 --- a/tests/lib/preview.php +++ b/tests/lib/preview.php @@ -17,9 +17,9 @@ class Preview extends \PHPUnit_Framework_TestCase { $rootView->mkdir('/'.$user); $rootView->mkdir('/'.$user.'/files'); - $samplefile = '/'.$user.'/files/test.txt'; + $sampleFile = '/'.$user.'/files/test.txt'; - $rootView->file_put_contents($samplefile, 'dummy file data'); + $rootView->file_put_contents($sampleFile, 'dummy file data'); $x = 50; $y = 50; @@ -27,16 +27,16 @@ class Preview extends \PHPUnit_Framework_TestCase { $preview = new \OC\Preview($user, 'files/', 'test.txt', $x, $y); $preview->getPreview(); - $fileinfo = $rootView->getFileInfo($samplefile); - $fileid = $fileinfo['fileid']; + $fileInfo = $rootView->getFileInfo($sampleFile); + $fileId = $fileInfo['fileid']; - $thumbcachefile = '/' . $user . '/' . \OC\Preview::THUMBNAILS_FOLDER . '/' . $fileid . '/' . $x . '-' . $y . '.png'; + $thumbCacheFile = '/' . $user . '/' . \OC\Preview::THUMBNAILS_FOLDER . '/' . $fileId . '/' . $x . '-' . $y . '.png'; - $this->assertEquals($rootView->file_exists($thumbcachefile), true); + $this->assertEquals($rootView->file_exists($thumbCacheFile), true); $preview->deletePreview(); - $this->assertEquals($rootView->file_exists($thumbcachefile), false); + $this->assertEquals($rootView->file_exists($thumbCacheFile), false); } public function testAreAllPreviewsDeleted() { @@ -46,9 +46,9 @@ class Preview extends \PHPUnit_Framework_TestCase { $rootView->mkdir('/'.$user); $rootView->mkdir('/'.$user.'/files'); - $samplefile = '/'.$user.'/files/test.txt'; + $sampleFile = '/'.$user.'/files/test.txt'; - $rootView->file_put_contents($samplefile, 'dummy file data'); + $rootView->file_put_contents($sampleFile, 'dummy file data'); $x = 50; $y = 50; @@ -56,16 +56,16 @@ class Preview extends \PHPUnit_Framework_TestCase { $preview = new \OC\Preview($user, 'files/', 'test.txt', $x, $y); $preview->getPreview(); - $fileinfo = $rootView->getFileInfo($samplefile); - $fileid = $fileinfo['fileid']; + $fileInfo = $rootView->getFileInfo($sampleFile); + $fileId = $fileInfo['fileid']; - $thumbcachefolder = '/' . $user . '/' . \OC\Preview::THUMBNAILS_FOLDER . '/' . $fileid . '/'; + $thumbCacheFolder = '/' . $user . '/' . \OC\Preview::THUMBNAILS_FOLDER . '/' . $fileId . '/'; - $this->assertEquals($rootView->is_dir($thumbcachefolder), true); + $this->assertEquals($rootView->is_dir($thumbCacheFolder), true); $preview->deleteAllPreviews(); - $this->assertEquals($rootView->is_dir($thumbcachefolder), false); + $this->assertEquals($rootView->is_dir($thumbCacheFolder), false); } public function testIsMaxSizeWorking() { @@ -81,9 +81,9 @@ class Preview extends \PHPUnit_Framework_TestCase { $rootView->mkdir('/'.$user); $rootView->mkdir('/'.$user.'/files'); - $samplefile = '/'.$user.'/files/test.txt'; + $sampleFile = '/'.$user.'/files/test.txt'; - $rootView->file_put_contents($samplefile, 'dummy file data'); + $rootView->file_put_contents($sampleFile, 'dummy file data'); $preview = new \OC\Preview($user, 'files/', 'test.txt', 1000, 1000); $image = $preview->getPreview(); -- GitLab From e76c246718fe013af7cd0994e0445eeecf14dee1 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Fri, 4 Apr 2014 15:02:08 +0200 Subject: [PATCH 050/253] Pass the correct root to the preview on post_write --- lib/private/preview.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/private/preview.php b/lib/private/preview.php index 0c1af3c9588..26016555a32 100755 --- a/lib/private/preview.php +++ b/lib/private/preview.php @@ -640,7 +640,7 @@ class Preview { } public static function post_write($args) { - self::post_delete($args); + self::post_delete($args, 'files/'); } public static function prepare_delete_files($args) { -- GitLab From ccf1287fbf8baa083c7c043b0ed0df054ecaf9c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Fri, 4 Apr 2014 16:21:50 +0200 Subject: [PATCH 051/253] adding unit test for cache mechanism --- lib/private/preview.php | 98 ++++++++++++++--------------- tests/lib/preview.php | 136 ++++++++++++++++++++++++++++------------ 2 files changed, 145 insertions(+), 89 deletions(-) diff --git a/lib/private/preview.php b/lib/private/preview.php index 0fecb25341b..995cfc3f6dc 100755 --- a/lib/private/preview.php +++ b/lib/private/preview.php @@ -41,8 +41,8 @@ class Preview { private $file; private $maxX; private $maxY; - private $scalingup; - private $mimetype; + private $scalingUp; + private $mimeType; //filemapper used for deleting previews // index is path, value is fileinfo @@ -137,7 +137,7 @@ class Preview { * @return bool */ public function getScalingUp() { - return $this->scalingup; + return $this->scalingUp; } /** @@ -194,18 +194,18 @@ class Preview { if ($file !== '') { $this->getFileInfo(); if($this->info !== null && $this->info !== false) { - $this->mimetype = $this->info->getMimetype(); + $this->mimeType = $this->info->getMimetype(); } } return $this; } /** - * @brief set mimetype explicitly - * @param string $mimetype + * @brief set mime type explicitly + * @param string $mimeType */ - public function setMimetype($mimetype) { - $this->mimetype = $mimetype; + public function setMimetype($mimeType) { + $this->mimeType = $mimeType; } /** @@ -257,7 +257,7 @@ class Preview { if ($this->getMaxScaleFactor() === 1) { $scalingUp = false; } - $this->scalingup = $scalingUp; + $this->scalingUp = $scalingUp; return $this; } @@ -320,7 +320,7 @@ class Preview { * @param int $fileId fileId of the original image * @return string|false path to thumbnail if it exists or false */ - private function isCached($fileId) { + public function isCached($fileId) { if (is_null($fileId)) { return false; } @@ -406,7 +406,7 @@ class Preview { $x = (int) $size[0]; $y = (int) $size[1]; $aspectRatio = (float) ($x / $y); - return array('x' => $x,'y' => $y,'aspectRatio' => $aspectRatio); + return array($x, $y, $aspectRatio); } private function unscalable($x, $y) { @@ -464,8 +464,8 @@ class Preview { if (is_null($this->preview)) { $preview = null; - foreach (self::$providers as $supportedMimetype => $provider) { - if (!preg_match($supportedMimetype, $this->mimetype)) { + foreach (self::$providers as $supportedMimeType => $provider) { + if (!preg_match($supportedMimeType, $this->mimeType)) { continue; } @@ -534,7 +534,7 @@ class Preview { $x = $this->getMaxX(); $y = $this->getMaxY(); $scalingUp = $this->getScalingUp(); - $maxscalefactor = $this->getMaxScaleFactor(); + $maxScaleFactor = $this->getMaxScaleFactor(); if (!($image instanceof \OC_Image)) { \OC_Log::write('core', '$this->preview is not an instance of OC_Image', \OC_Log::DEBUG); @@ -543,16 +543,16 @@ class Preview { $image->fixOrientation(); - $realx = (int)$image->width(); - $realy = (int)$image->height(); + $realX = (int)$image->width(); + $realY = (int)$image->height(); - if ($x === $realx && $y === $realy) { + if ($x === $realX && $y === $realY) { $this->preview = $image; return; } - $factorX = $x / $realx; - $factorY = $y / $realy; + $factorX = $x / $realX; + $factorY = $y / $realY; if ($factorX >= $factorY) { $factor = $factorX; @@ -566,25 +566,25 @@ class Preview { } } - if (!is_null($maxscalefactor)) { - if ($factor > $maxscalefactor) { - \OC_Log::write('core', 'scalefactor reduced from ' . $factor . ' to ' . $maxscalefactor, \OC_Log::DEBUG); - $factor = $maxscalefactor; + if (!is_null($maxScaleFactor)) { + if ($factor > $maxScaleFactor) { + \OC_Log::write('core', 'scale factor reduced from ' . $factor . ' to ' . $maxScaleFactor, \OC_Log::DEBUG); + $factor = $maxScaleFactor; } } - $newXsize = (int)($realx * $factor); - $newYsize = (int)($realy * $factor); + $newXSize = (int)($realX * $factor); + $newYSize = (int)($realY * $factor); - $image->preciseResize($newXsize, $newYsize); + $image->preciseResize($newXSize, $newYSize); - if ($newXsize === $x && $newYsize === $y) { + if ($newXSize === $x && $newYSize === $y) { $this->preview = $image; return; } - if ($newXsize >= $x && $newYsize >= $y) { - $cropX = floor(abs($x - $newXsize) * 0.5); + if ($newXSize >= $x && $newYSize >= $y) { + $cropX = floor(abs($x - $newXSize) * 0.5); //don't crop previews on the Y axis, this sucks if it's a document. //$cropY = floor(abs($y - $newYsize) * 0.5); $cropY = 0; @@ -595,36 +595,36 @@ class Preview { return; } - if ($newXsize < $x || $newYsize < $y) { - if ($newXsize > $x) { - $cropX = floor(($newXsize - $x) * 0.5); - $image->crop($cropX, 0, $x, $newYsize); + if ($newXSize < $x || $newYSize < $y) { + if ($newXSize > $x) { + $cropX = floor(($newXSize - $x) * 0.5); + $image->crop($cropX, 0, $x, $newYSize); } - if ($newYsize > $y) { - $cropY = floor(($newYsize - $y) * 0.5); - $image->crop(0, $cropY, $newXsize, $y); + if ($newYSize > $y) { + $cropY = floor(($newYSize - $y) * 0.5); + $image->crop(0, $cropY, $newXSize, $y); } - $newXsize = (int)$image->width(); - $newYsize = (int)$image->height(); + $newXSize = (int)$image->width(); + $newYSize = (int)$image->height(); //create transparent background layer - $backgroundlayer = imagecreatetruecolor($x, $y); - $white = imagecolorallocate($backgroundlayer, 255, 255, 255); - imagefill($backgroundlayer, 0, 0, $white); + $backgroundLayer = imagecreatetruecolor($x, $y); + $white = imagecolorallocate($backgroundLayer, 255, 255, 255); + imagefill($backgroundLayer, 0, 0, $white); $image = $image->resource(); - $mergeX = floor(abs($x - $newXsize) * 0.5); - $mergeY = floor(abs($y - $newYsize) * 0.5); + $mergeX = floor(abs($x - $newXSize) * 0.5); + $mergeY = floor(abs($y - $newYSize) * 0.5); - imagecopy($backgroundlayer, $image, $mergeX, $mergeY, 0, 0, $newXsize, $newYsize); + imagecopy($backgroundLayer, $image, $mergeX, $mergeY, 0, 0, $newXSize, $newYSize); //$black = imagecolorallocate(0,0,0); //imagecolortransparent($transparentlayer, $black); - $image = new \OC_Image($backgroundlayer); + $image = new \OC_Image($backgroundLayer); $this->preview = $image; return; @@ -706,9 +706,9 @@ class Preview { } /** - * @param string $mimetype + * @param string $mimeType */ - public static function isMimeSupported($mimetype) { + public static function isMimeSupported($mimeType) { if (!\OC_Config::getValue('enable_previews', true)) { return false; } @@ -720,8 +720,8 @@ class Preview { //remove last element because it has the mimetype * $providers = array_slice(self::$providers, 0, -1); - foreach ($providers as $supportedMimetype => $provider) { - if (preg_match($supportedMimetype, $mimetype)) { + foreach ($providers as $supportedMimeType => $provider) { + if (preg_match($supportedMimeType, $mimeType)) { return true; } } diff --git a/tests/lib/preview.php b/tests/lib/preview.php index fb1c959b45a..4ef61fb8257 100644 --- a/tests/lib/preview.php +++ b/tests/lib/preview.php @@ -10,66 +10,73 @@ namespace Test; class Preview extends \PHPUnit_Framework_TestCase { - public function testIsPreviewDeleted() { - $user = $this->initFS(); + /** + * @var string + */ + private $user; - $rootView = new \OC\Files\View(''); - $rootView->mkdir('/'.$user); - $rootView->mkdir('/'.$user.'/files'); + /** + * @var \OC\Files\View + */ + private $rootView; - $sampleFile = '/'.$user.'/files/test.txt'; + public function setUp() { + $this->user = $this->initFS(); - $rootView->file_put_contents($sampleFile, 'dummy file data'); + $this->rootView = new \OC\Files\View(''); + $this->rootView->mkdir('/'.$this->user); + $this->rootView->mkdir('/'.$this->user.'/files'); + } + + public function testIsPreviewDeleted() { + + $sampleFile = '/'.$this->user.'/files/test.txt'; + + $this->rootView->file_put_contents($sampleFile, 'dummy file data'); $x = 50; $y = 50; - $preview = new \OC\Preview($user, 'files/', 'test.txt', $x, $y); + $preview = new \OC\Preview($this->user, 'files/', 'test.txt', $x, $y); $preview->getPreview(); - $fileInfo = $rootView->getFileInfo($sampleFile); + $fileInfo = $this->rootView->getFileInfo($sampleFile); $fileId = $fileInfo['fileid']; - $thumbCacheFile = '/' . $user . '/' . \OC\Preview::THUMBNAILS_FOLDER . '/' . $fileId . '/' . $x . '-' . $y . '.png'; + $thumbCacheFile = '/' . $this->user . '/' . \OC\Preview::THUMBNAILS_FOLDER . '/' . $fileId . '/' . $x . '-' . $y . '.png'; - $this->assertEquals($rootView->file_exists($thumbCacheFile), true); + $this->assertEquals($this->rootView->file_exists($thumbCacheFile), true); $preview->deletePreview(); - $this->assertEquals($rootView->file_exists($thumbCacheFile), false); + $this->assertEquals($this->rootView->file_exists($thumbCacheFile), false); } public function testAreAllPreviewsDeleted() { - $user = $this->initFS(); - - $rootView = new \OC\Files\View(''); - $rootView->mkdir('/'.$user); - $rootView->mkdir('/'.$user.'/files'); - $sampleFile = '/'.$user.'/files/test.txt'; + $sampleFile = '/'.$this->user.'/files/test.txt'; - $rootView->file_put_contents($sampleFile, 'dummy file data'); + $this->rootView->file_put_contents($sampleFile, 'dummy file data'); $x = 50; $y = 50; - $preview = new \OC\Preview($user, 'files/', 'test.txt', $x, $y); + $preview = new \OC\Preview($this->user, 'files/', 'test.txt', $x, $y); $preview->getPreview(); - $fileInfo = $rootView->getFileInfo($sampleFile); + $fileInfo = $this->rootView->getFileInfo($sampleFile); $fileId = $fileInfo['fileid']; - $thumbCacheFolder = '/' . $user . '/' . \OC\Preview::THUMBNAILS_FOLDER . '/' . $fileId . '/'; + $thumbCacheFolder = '/' . $this->user . '/' . \OC\Preview::THUMBNAILS_FOLDER . '/' . $fileId . '/'; - $this->assertEquals($rootView->is_dir($thumbCacheFolder), true); + $this->assertEquals($this->rootView->is_dir($thumbCacheFolder), true); $preview->deleteAllPreviews(); - $this->assertEquals($rootView->is_dir($thumbCacheFolder), false); + $this->assertEquals($this->rootView->is_dir($thumbCacheFolder), false); } public function testIsMaxSizeWorking() { - $user = $this->initFS(); $maxX = 250; $maxY = 250; @@ -77,15 +84,11 @@ class Preview extends \PHPUnit_Framework_TestCase { \OC_Config::setValue('preview_max_x', $maxX); \OC_Config::setValue('preview_max_y', $maxY); - $rootView = new \OC\Files\View(''); - $rootView->mkdir('/'.$user); - $rootView->mkdir('/'.$user.'/files'); + $sampleFile = '/'.$this->user.'/files/test.txt'; - $sampleFile = '/'.$user.'/files/test.txt'; + $this->rootView->file_put_contents($sampleFile, 'dummy file data'); - $rootView->file_put_contents($sampleFile, 'dummy file data'); - - $preview = new \OC\Preview($user, 'files/', 'test.txt', 1000, 1000); + $preview = new \OC\Preview($this->user, 'files/', 'test.txt', 1000, 1000); $image = $preview->getPreview(); $this->assertEquals($image->width(), $maxX); @@ -108,18 +111,13 @@ class Preview extends \PHPUnit_Framework_TestCase { * @dataProvider txtBlacklist */ public function testIsTransparent($extension, $data, $expectedResult) { - $user = $this->initFS(); - - $rootView = new \OC\Files\View(''); - $rootView->mkdir('/'.$user); - $rootView->mkdir('/'.$user.'/files'); $x = 32; $y = 32; - $sample = '/'.$user.'/files/test.'.$extension; - $rootView->file_put_contents($sample, $data); - $preview = new \OC\Preview($user, 'files/', 'test.'.$extension, $x, $y); + $sample = '/'.$this->user.'/files/test.'.$extension; + $this->rootView->file_put_contents($sample, $data); + $preview = new \OC\Preview($this->user, 'files/', 'test.'.$extension, $x, $y); $image = $preview->getPreview(); $resource = $image->resource(); @@ -133,6 +131,64 @@ class Preview extends \PHPUnit_Framework_TestCase { ); } + public function testCreationFromCached() { + + $sampleFile = '/'.$this->user.'/files/test.txt'; + + $this->rootView->file_put_contents($sampleFile, 'dummy file data'); + + // create base preview + $x = 150; + $y = 150; + + $preview = new \OC\Preview($this->user, 'files/', 'test.txt', $x, $y); + $preview->getPreview(); + + $fileInfo = $this->rootView->getFileInfo($sampleFile); + $fileId = $fileInfo['fileid']; + + $thumbCacheFile = '/' . $this->user . '/' . \OC\Preview::THUMBNAILS_FOLDER . '/' . $fileId . '/' . $x . '-' . $y . '.png'; + + $this->assertEquals($this->rootView->file_exists($thumbCacheFile), true); + + + // create smaller previews + $preview = new \OC\Preview($this->user, 'files/', 'test.txt', 50, 50); + $isCached = $preview->isCached($fileId); + + $this->assertEquals($this->user . '/' . \OC\Preview::THUMBNAILS_FOLDER . '/' . $fileId . '/150-150.png', $isCached); + } + + /* + public function testScalingUp() { + + $sampleFile = '/'.$this->user.'/files/test.txt'; + + $this->rootView->file_put_contents($sampleFile, 'dummy file data'); + + // create base preview + $x = 150; + $y = 150; + + $preview = new \OC\Preview($this->user, 'files/', 'test.txt', $x, $y); + $preview->getPreview(); + + $fileInfo = $this->rootView->getFileInfo($sampleFile); + $fileId = $fileInfo['fileid']; + + $thumbCacheFile = '/' . $this->user . '/' . \OC\Preview::THUMBNAILS_FOLDER . '/' . $fileId . '/' . $x . '-' . $y . '.png'; + + $this->assertEquals($this->rootView->file_exists($thumbCacheFile), true); + + + // create bigger previews - with scale up + $preview = new \OC\Preview($this->user, 'files/', 'test.txt', 250, 250); + $isCached = $preview->isCached($fileId); + + $this->assertEquals($this->user . '/' . \OC\Preview::THUMBNAILS_FOLDER . '/' . $fileId . '/150-150.png', $isCached); + } + */ + private function initFS() { // create a new user with his own filesystem view // this gets called by each test in this test class -- GitLab From 286323f7a41a783543a646e7f8c949bb9a402159 Mon Sep 17 00:00:00 2001 From: Volkan Gezer Date: Sat, 5 Apr 2014 19:28:53 +0200 Subject: [PATCH 052/253] Fix some localization issues with file encryption/decription strings --- apps/files/js/files.js | 6 +++--- settings/ajax/decryptall.php | 7 ++++--- settings/js/personal.js | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/apps/files/js/files.js b/apps/files/js/files.js index ceb096f0941..206fa561251 100644 --- a/apps/files/js/files.js +++ b/apps/files/js/files.js @@ -131,15 +131,15 @@ var Files = { var encryptedFiles = $('#encryptedFiles').val(); var initStatus = $('#encryptionInitStatus').val(); if (initStatus === '0') { // enc not initialized, but should be - OC.Notification.show(t('files_encryption', 'Encryption App is enabled but your keys are not initialized, please log-out and log-in again')); + OC.Notification.show(t('files', 'Encryption App is enabled but your keys are not initialized, please log-out and log-in again')); return; } if (initStatus === '1') { // encryption tried to init but failed - OC.Notification.showHtml(t('files_encryption', 'Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files.')); + OC.Notification.showHtml(t('files', 'Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files.')); return; } if (encryptedFiles === '1') { - OC.Notification.show(t('files_encryption', 'Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files.')); + OC.Notification.show(t('files', 'Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files.')); return; } }, diff --git a/settings/ajax/decryptall.php b/settings/ajax/decryptall.php index 4782a4cfc81..d12df230d41 100644 --- a/settings/ajax/decryptall.php +++ b/settings/ajax/decryptall.php @@ -12,6 +12,7 @@ $params = array('uid' => \OCP\User::getUser(), $view = new OC_FilesystemView('/'); $util = new \OCA\Encryption\Util($view, \OCP\User::getUser()); +$l = \OC_L10N::get('settings'); $result = $util->initEncryption($params); @@ -27,11 +28,11 @@ if ($result !== false) { $util->closeEncryptionSession(); if ($successful === true) { - \OCP\JSON::success(array('data' => array('message' => 'Files decrypted successfully'))); + \OCP\JSON::success(array('data' => array('message' => $l->t('Files decrypted successfully')))); } else { - \OCP\JSON::error(array('data' => array('message' => 'Couldn\'t decrypt your files, please check your owncloud.log or ask your administrator'))); + \OCP\JSON::error(array('data' => array('message' => $l->t('Couldn\'t decrypt your files, please check your owncloud.log or ask your administrator')))); } } else { - \OCP\JSON::error(array('data' => array('message' => 'Couldn\'t decrypt your files, check your password and try again'))); + \OCP\JSON::error(array('data' => array('message' => $l->t('Couldn\'t decrypt your files, check your password and try again')))); } diff --git a/settings/js/personal.js b/settings/js/personal.js index f502037cfda..b659d1f1d39 100644 --- a/settings/js/personal.js +++ b/settings/js/personal.js @@ -313,7 +313,7 @@ OC.Encryption.msg={ startDecrypting:function(selector){ var spinner = ''; $(selector) - .html( t('files_encryption', 'Decrypting files... Please wait, this can take some time.') + ' ' + spinner ) + .html( t('settings', 'Decrypting files... Please wait, this can take some time.') + ' ' + spinner ) .removeClass('success') .removeClass('error') .stop(true, true) -- GitLab From 593977f016e2edbd4e27293f3f5ed39f7c58f10e Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Sun, 6 Apr 2014 14:49:39 +0200 Subject: [PATCH 053/253] Re-enable the sabredav browser plugin --- apps/files/appinfo/remote.php | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/files/appinfo/remote.php b/apps/files/appinfo/remote.php index a8acfdb6e6e..c70db0b5ae4 100644 --- a/apps/files/appinfo/remote.php +++ b/apps/files/appinfo/remote.php @@ -41,6 +41,7 @@ $server->setBaseUri($baseuri); $defaults = new OC_Defaults(); $server->addPlugin(new Sabre_DAV_Auth_Plugin($authBackend, $defaults->getName())); $server->addPlugin(new Sabre_DAV_Locks_Plugin($lockBackend)); +$server->addPlugin(new Sabre_DAV_Browser_Plugin(false)); $server->addPlugin(new OC_Connector_Sabre_FilesPlugin()); $server->addPlugin(new OC_Connector_Sabre_AbortedUploadDetectionPlugin()); $server->addPlugin(new OC_Connector_Sabre_QuotaPlugin()); -- GitLab From 51fbf0bcbc2c3c68f7b4b36128304f4ab9df98e7 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Mon, 7 Apr 2014 13:27:18 +0200 Subject: [PATCH 054/253] add delimiter between host and baseurl --- lib/private/route/cachingrouter.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/private/route/cachingrouter.php b/lib/private/route/cachingrouter.php index 63bfd3e0539..766c67c73a0 100644 --- a/lib/private/route/cachingrouter.php +++ b/lib/private/route/cachingrouter.php @@ -31,7 +31,7 @@ class CachingRouter extends Router { * @return string */ public function generate($name, $parameters = array(), $absolute = false) { - $key = $this->context->getHost() . $this->context->getBaseUrl() . $name . json_encode($parameters) . $absolute; + $key = $this->context->getHost() . '#' . $this->context->getBaseUrl() . $name . json_encode($parameters) . $absolute; if ($this->cache->hasKey($key)) { return $this->cache->get($key); } else { -- GitLab From 6d373e97c32ec51bd649eeafdfcc3596067776f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Mon, 7 Apr 2014 23:02:49 +0200 Subject: [PATCH 055/253] remove unused exit() --- apps/files/ajax/upload.php | 1 - 1 file changed, 1 deletion(-) diff --git a/apps/files/ajax/upload.php b/apps/files/ajax/upload.php index 38175fa5001..a5ce7b257da 100644 --- a/apps/files/ajax/upload.php +++ b/apps/files/ajax/upload.php @@ -196,7 +196,6 @@ if (strpos($dir, '..') === false) { if ($error === false) { OCP\JSON::encodedPrint($result); - exit(); } else { OCP\JSON::error(array(array('data' => array_merge(array('message' => $error, 'code' => $errorCode), $storageStats)))); } -- GitLab From 971a311feec6c4c2de905bdbbe71c2cf60296cb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Mon, 7 Apr 2014 23:03:19 +0200 Subject: [PATCH 056/253] adding parentId to file info array --- apps/files/lib/helper.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/files/lib/helper.php b/apps/files/lib/helper.php index b765fdaf3e3..f9515d67157 100644 --- a/apps/files/lib/helper.php +++ b/apps/files/lib/helper.php @@ -73,13 +73,14 @@ class Helper /** * Formats the file info to be returned as JSON to the client. * - * @param \OCP\Files\FileInfo file info + * @param \OCP\Files\FileInfo $i * @return array formatted file info */ public static function formatFileInfo($i) { $entry = array(); $entry['id'] = $i['fileid']; + $entry['parentId'] = $i['parent']; $entry['date'] = \OCP\Util::formatDate($i['mtime']); $entry['mtime'] = $i['mtime'] * 1000; // only pick out the needed attributes -- GitLab From d15a4719d2bc58827d7cbe616ab25aaf376c8293 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Mon, 7 Apr 2014 23:04:08 +0200 Subject: [PATCH 057/253] fix folder upload in js --- apps/files/js/filelist.js | 37 +++++++++++++++++++++---------------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index 69c97e8b32a..4a595083304 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -1103,33 +1103,38 @@ $(document).ready(function() { size += parseInt(file.size); data.context.attr('data-size', size); data.context.find('td.filesize').text(humanFileSize(size)); - } - else { + } else { // only append new file if uploaded into the current folder - if (file.directory != '/' && file.directory !== FileList.getCurrentDirectory()) { + if (file.directory !== '/' && file.directory !== FileList.getCurrentDirectory()) { - file_directory = file.directory.replace('/','').replace(/\/$/, "").split('/'); + var fileDirectory = file.directory.replace('/','').replace(/\/$/, "").split('/'); - if (file_directory.length == 1) { - file_directory = file_directory[0]; + if (fileDirectory.length === 1) { + fileDirectory = fileDirectory[0]; // Get the directory - if ($('tr[data-file="'+file_directory+'"]').length == 0) - { - FileList.addDir(file_directory, 0, new Date(), false); + if ($('tr[data-file="'+fileDirectory+'"]').length === 0) { + var dir = { + name: fileDirectory, + type: 'dir', + mimetype: 'httpd/unix-directory', + permissions: file.permissions, + size: 0, + id: file.parentId + }; + FileList.add(dir, {insert: true}); } - } - else { - file_directory = file_directory[0]; + } else { + fileDirectory = fileDirectory[0]; } - file_directory = FileList.findFileEl(file_directory); + fileDirectory = FileList.findFileEl(fileDirectory); // update folder size - var size = parseInt(file_directory.attr('data-size')); + var size = parseInt(fileDirectory.attr('data-size')); size += parseInt(file.size); - file_directory.attr('data-size', size); - file_directory.find('td.filesize').text(humanFileSize(size)); + fileDirectory.attr('data-size', size); + fileDirectory.find('td.filesize').text(humanFileSize(size)); return; } -- GitLab From 7dd00746556aa4be26e41a6f3b66095a29b02c45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Mon, 7 Apr 2014 23:17:35 +0200 Subject: [PATCH 058/253] fixing mkdir code to respect external file systems as well --- lib/private/files/view.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/private/files/view.php b/lib/private/files/view.php index 0dce90aec4d..519ed250b1f 100644 --- a/lib/private/files/view.php +++ b/lib/private/files/view.php @@ -633,11 +633,11 @@ class View { if (Filesystem::isValidPath($path)) { // Get directory that the file is going into - $file_path = \OC_User::getHome(\OC_User::getUser()) . '/files'.substr($path, 0, strrpos($path,'/')); + $filePath = dirname($path); // Create the directories if any - if(empty($file_path) === false) { - mkdir($file_path, 0770, true); + if (!$this->file_exists($filePath)) { + $this->mkdir($filePath); } if (!$tmpFile) { -- GitLab From 68b7822cf50a670619659ae2082633f4c62fb5f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Mon, 7 Apr 2014 23:45:35 +0200 Subject: [PATCH 059/253] js style fixes according to our jshintrc rules --- apps/files/js/filelist.js | 114 +++++++++++++++++++------------------- 1 file changed, 56 insertions(+), 58 deletions(-) diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index 4a595083304..ceaaed264ae 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -9,7 +9,7 @@ */ /* global OC, t, n, FileList, FileActions, Files, BreadCrumb */ -/* global procesSelection, dragOptions, SVGSupport */ +/* global procesSelection, dragOptions, folderDropOptions, SVGSupport */ window.FileList = { appName: t('files', 'Files'), isEmpty: true, @@ -228,7 +228,7 @@ window.FileList = { linkUrl = Files.getDownloadUrl(name, FileList.getCurrentDirectory()); } td.append(''); - var link_elem = $('').attr({ + var linkElem = $('').attr({ "class": "name", "href": linkUrl }); @@ -244,19 +244,19 @@ window.FileList = { basename = name; extension = false; } - var name_span=$('').addClass('nametext').text(basename); - link_elem.append(name_span); + var nameSpan=$('').addClass('nametext').text(basename); + linkElem.append(nameSpan); if (extension) { - name_span.append($('').addClass('extension').text(extension)); + nameSpan.append($('').addClass('extension').text(extension)); } // dirs can show the number of uploaded files if (type === 'dir') { - link_elem.append($('').attr({ + linkElem.append($('').attr({ 'class': 'uploadtext', 'currentUploads': 0 })); } - td.append(link_elem); + td.append(linkElem); tr.append(td); // size column @@ -266,7 +266,7 @@ window.FileList = { } else { simpleSize = t('files', 'Pending'); } - var lastModifiedTime = Math.round(mtime / 1000); + td = $('').attr({ "class": "filesize", "style": 'color:rgb(' + sizeColor + ',' + sizeColor + ',' + sizeColor + ')' @@ -453,8 +453,6 @@ window.FileList = { }); }, reloadCallback: function(result) { - var $controls = $('#controls'); - delete this._reloadCall; this.hideMask(); @@ -822,10 +820,9 @@ window.FileList = { var info = t('files', '{dirs} and {files}', infoVars); // don't show the filesize column, if filesize is NaN (e.g. in trashbin) - if (isNaN(summary.totalSize)) { - var fileSize = ''; - } else { - var fileSize = ''+humanFileSize(summary.totalSize)+''; + var fileSize = ''; + if (!isNaN(summary.totalSize)) { + fileSize = ''+humanFileSize(summary.totalSize)+''; } var $summary = $(''+info+''+fileSize+''); @@ -911,7 +908,6 @@ window.FileList = { } }, updateEmptyContent: function() { - var $fileList = $('#fileList'); var permissions = $('#permissions').val(); var isCreatable = (permissions & OC.PERMISSION_CREATE) !== 0; $('#emptycontent').toggleClass('hidden', !isCreatable || !FileList.isEmpty); @@ -949,13 +945,13 @@ window.FileList = { }, scrollTo:function(file) { //scroll to and highlight preselected file - var $scrolltorow = FileList.findFileEl(file); - if ($scrolltorow.exists()) { - $scrolltorow.addClass('searchresult'); - $(window).scrollTop($scrolltorow.position().top); + var $scrollToRow = FileList.findFileEl(file); + if ($scrollToRow.exists()) { + $scrollToRow.addClass('searchresult'); + $(window).scrollTop($scrollToRow.position().top); //remove highlight when hovered over - $scrolltorow.one('hover', function() { - $scrolltorow.removeClass('searchresult'); + $scrollToRow.one('hover', function() { + $scrollToRow.removeClass('searchresult'); }); } }, @@ -991,9 +987,9 @@ $(document).ready(function() { FileList.initialize(); // handle upload events - var file_upload_start = $('#file_upload_start'); + var fileUploadStart = $('#file_upload_start'); - file_upload_start.on('fileuploaddrop', function(e, data) { + fileUploadStart.on('fileuploaddrop', function(e, data) { OC.Upload.log('filelist handle fileuploaddrop', e, data); var dropTarget = $(e.originalEvent.target).closest('tr, .crumb'); @@ -1021,7 +1017,7 @@ $(document).ready(function() { return [ {name: 'dir', value: dir}, {name: 'requesttoken', value: oc_requesttoken}, - {name: 'file_directory', value: data.files[0]['relativePath']} + {name: 'file_directory', value: data.files[0].relativePath} ]; }; } else { @@ -1032,7 +1028,7 @@ $(document).ready(function() { } } }); - file_upload_start.on('fileuploadadd', function(e, data) { + fileUploadStart.on('fileuploadadd', function(e, data) { OC.Upload.log('filelist handle fileuploadadd', e, data); //finish delete if we are uploading a deleted file @@ -1045,19 +1041,19 @@ $(document).ready(function() { // add to existing folder // update upload counter ui - var uploadtext = data.context.find('.uploadtext'); - var currentUploads = parseInt(uploadtext.attr('currentUploads')); + var uploadText = data.context.find('.uploadtext'); + var currentUploads = parseInt(uploadText.attr('currentUploads'), 10); currentUploads += 1; - uploadtext.attr('currentUploads', currentUploads); + uploadText.attr('currentUploads', currentUploads); var translatedText = n('files', 'Uploading %n file', 'Uploading %n files', currentUploads); if (currentUploads === 1) { var img = OC.imagePath('core', 'loading.gif'); data.context.find('td.filename').attr('style','background-image:url('+img+')'); - uploadtext.text(translatedText); - uploadtext.show(); + uploadText.text(translatedText); + uploadText.show(); } else { - uploadtext.text(translatedText); + uploadText.text(translatedText); } } @@ -1066,7 +1062,7 @@ $(document).ready(function() { * when file upload done successfully add row to filelist * update counter when uploading to sub folder */ - file_upload_start.on('fileuploaddone', function(e, data) { + fileUploadStart.on('fileuploaddone', function(e, data) { OC.Upload.log('filelist handle fileuploaddone', e, data); var response; @@ -1080,27 +1076,28 @@ $(document).ready(function() { if (typeof result[0] !== 'undefined' && result[0].status === 'success') { var file = result[0]; + var size = 0; if (data.context && data.context.data('type') === 'dir') { // update upload counter ui - var uploadtext = data.context.find('.uploadtext'); - var currentUploads = parseInt(uploadtext.attr('currentUploads')); + var uploadText = data.context.find('.uploadtext'); + var currentUploads = parseInt(uploadText.attr('currentUploads'), 10); currentUploads -= 1; - uploadtext.attr('currentUploads', currentUploads); + uploadText.attr('currentUploads', currentUploads); var translatedText = n('files', 'Uploading %n file', 'Uploading %n files', currentUploads); if (currentUploads === 0) { var img = OC.imagePath('core', 'filetypes/folder'); data.context.find('td.filename').attr('style','background-image:url('+img+')'); - uploadtext.text(translatedText); - uploadtext.hide(); + uploadText.text(translatedText); + uploadText.hide(); } else { - uploadtext.text(translatedText); + uploadText.text(translatedText); } // update folder size - var size = parseInt(data.context.data('size')); - size += parseInt(file.size); + size = parseInt(data.context.data('size'), 10); + size += parseInt(file.size, 10); data.context.attr('data-size', size); data.context.find('td.filesize').text(humanFileSize(size)); } else { @@ -1131,8 +1128,8 @@ $(document).ready(function() { fileDirectory = FileList.findFileEl(fileDirectory); // update folder size - var size = parseInt(fileDirectory.attr('data-size')); - size += parseInt(file.size); + size = parseInt(fileDirectory.attr('data-size'), 10); + size += parseInt(file.size, 10); fileDirectory.attr('data-size', size); fileDirectory.find('td.filesize').text(humanFileSize(size)); @@ -1140,7 +1137,7 @@ $(document).ready(function() { } // add as stand-alone row to filelist - var size=t('files', 'Pending'); + size = t('files', 'Pending'); if (data.files[0].size>=0) { size=data.files[0].size; } @@ -1152,37 +1149,40 @@ $(document).ready(function() { } } }); - file_upload_start.on('fileuploadstop', function(e, data) { + fileUploadStart.on('fileuploadstop', function(e, data) { OC.Upload.log('filelist handle fileuploadstop', e, data); //if user pressed cancel hide upload chrome if (data.errorThrown === 'abort') { //cleanup uploading to a dir - var uploadtext = $('tr .uploadtext'); + var uploadText = $('tr .uploadtext'); var img = OC.imagePath('core', 'filetypes/folder'); - uploadtext.parents('td.filename').attr('style','background-image:url('+img+')'); - uploadtext.fadeOut(); - uploadtext.attr('currentUploads', 0); + uploadText.parents('td.filename').attr('style','background-image:url('+img+')'); + uploadText.fadeOut(); + uploadText.attr('currentUploads', 0); } }); - file_upload_start.on('fileuploadfail', function(e, data) { + fileUploadStart.on('fileuploadfail', function(e, data) { OC.Upload.log('filelist handle fileuploadfail', e, data); //if user pressed cancel hide upload chrome if (data.errorThrown === 'abort') { //cleanup uploading to a dir - var uploadtext = $('tr .uploadtext'); + var uploadText = $('tr .uploadtext'); var img = OC.imagePath('core', 'filetypes/folder'); - uploadtext.parents('td.filename').attr('style','background-image:url('+img+')'); - uploadtext.fadeOut(); - uploadtext.attr('currentUploads', 0); + uploadText.parents('td.filename').attr('style','background-image:url('+img+')'); + uploadText.fadeOut(); + uploadText.attr('currentUploads', 0); } }); $('#notification').hide(); $('#notification:first-child').on('click', '.replace', function() { OC.Notification.hide(function() { - FileList.replace($('#notification > span').attr('data-oldName'), $('#notification > span').attr('data-newName'), $('#notification > span').attr('data-isNewFile')); + FileList.replace( + $('#notification > span').attr('data-oldName'), + $('#notification > span').attr('data-newName'), + $('#notification > span').attr('data-isNewFile')); }); }); $('#notification:first-child').on('click', '.suggest', function() { @@ -1212,8 +1212,7 @@ $(document).ready(function() { function parseHashQuery() { var hash = window.location.hash, - pos = hash.indexOf('?'), - query; + pos = hash.indexOf('?'); if (pos >= 0) { return hash.substr(pos + 1); } @@ -1222,8 +1221,7 @@ $(document).ready(function() { function parseCurrentDirFromUrl() { var query = parseHashQuery(), - params, - dir = '/'; + params; // try and parse from URL hash first if (query) { params = OC.parseQueryString(decodeQuery(query)); -- GitLab From 698297feb3cb8e78c0e4adb6756e0ea98da49677 Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Fri, 4 Apr 2014 18:56:14 +0200 Subject: [PATCH 060/253] add optional countUsersInGroup method to group backends --- lib/private/group/backend.php | 2 ++ lib/private/group/database.php | 14 ++++++++++++++ lib/private/group/dummy.php | 10 ++++++++++ lib/private/group/group.php | 21 +++++++++++++++++++++ 4 files changed, 47 insertions(+) diff --git a/lib/private/group/backend.php b/lib/private/group/backend.php index 2e17b5d0b7f..b0ed0d90d76 100644 --- a/lib/private/group/backend.php +++ b/lib/private/group/backend.php @@ -34,6 +34,7 @@ define('OC_GROUP_BACKEND_DELETE_GROUP', 0x00000010); define('OC_GROUP_BACKEND_ADD_TO_GROUP', 0x00000100); define('OC_GROUP_BACKEND_REMOVE_FROM_GOUP', 0x00001000); define('OC_GROUP_BACKEND_GET_DISPLAYNAME', 0x00010000); +define('OC_GROUP_BACKEND_COUNT_USERS', 0x00100000); /** * Abstract base class for user management @@ -45,6 +46,7 @@ abstract class OC_Group_Backend implements OC_Group_Interface { OC_GROUP_BACKEND_ADD_TO_GROUP => 'addToGroup', OC_GROUP_BACKEND_REMOVE_FROM_GOUP => 'removeFromGroup', OC_GROUP_BACKEND_GET_DISPLAYNAME => 'displayNamesInGroup', + OC_GROUP_BACKEND_COUNT_USERS => 'countUsersInGroup', ); /** diff --git a/lib/private/group/database.php b/lib/private/group/database.php index d0974685ff6..3815dcff2e5 100644 --- a/lib/private/group/database.php +++ b/lib/private/group/database.php @@ -211,6 +211,20 @@ class OC_Group_Database extends OC_Group_Backend { return $users; } + /** + * @brief get the number of all users matching the search string in a group + * @param string $gid + * @param string $search + * @param int $limit + * @param int $offset + * @return int | false + */ + public function countUsersInGroup($gid, $search = '') { + $stmt = OC_DB::prepare('SELECT COUNT(`uid`) AS `count` FROM `*PREFIX*group_user` WHERE `gid` = ? AND `uid` LIKE ?'); + $result = $stmt->execute(array($gid, $search.'%')); + return $result->fetchOne(); + } + /** * @brief get a list of all display names in a group * @param string $gid diff --git a/lib/private/group/dummy.php b/lib/private/group/dummy.php index da26e1b910e..94cbb607ad1 100644 --- a/lib/private/group/dummy.php +++ b/lib/private/group/dummy.php @@ -157,4 +157,14 @@ class OC_Group_Dummy extends OC_Group_Backend { } } + /** + * @brief get the number of all users in a group + * @returns int | bool + */ + public function countUsersInGroup($gid, $search = '', $limit = -1, $offset = 0) { + if(isset($this->groups[$gid])) { + return count($this->groups[$gid]); + } + } + } diff --git a/lib/private/group/group.php b/lib/private/group/group.php index 8d2aa87a788..9965d938ebb 100644 --- a/lib/private/group/group.php +++ b/lib/private/group/group.php @@ -186,6 +186,27 @@ class Group { return array_values($users); } + /** + * returns the number of users matching the search string + * + * @param string $search + * @return int | bool + */ + public function count($search) { + $users = false; + foreach ($this->backends as $backend) { + if(method_exists($backend, 'countUsersInGroup')) { + if($users === false) { + //we could directly add to a bool variable, but this would + //be ugly + $users = 0; + } + $users += $backend->countUsersInGroup($this->gid, $search); + } + } + return $users; + } + /** * search for users in the group by displayname * -- GitLab From 96cb75f5cf8c14f389213e1745cc3a98f8d1cbd4 Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Fri, 4 Apr 2014 18:56:34 +0200 Subject: [PATCH 061/253] implement countUsersInGroup in LDAP group backend --- apps/user_ldap/group_ldap.php | 82 +++++++++++++++++++++++++++++++++- apps/user_ldap/group_proxy.php | 11 +++++ 2 files changed, 92 insertions(+), 1 deletion(-) diff --git a/apps/user_ldap/group_ldap.php b/apps/user_ldap/group_ldap.php index 4f2424d9531..820d2c4636e 100644 --- a/apps/user_ldap/group_ldap.php +++ b/apps/user_ldap/group_ldap.php @@ -276,6 +276,83 @@ class GROUP_LDAP extends BackendUtility implements \OCP\GroupInterface { return $groupUsers; } + /** + * @brief returns the number of users in a group, who match the search term + * @param string the internal group name + * @param string optional, a search string + * @returns int | bool + */ + public function countUsersInGroup($gid, $search = '') { + $cachekey = 'countUsersInGroup-'.$gid.'-'.$search; + if(!$this->enabled || !$this->groupExists($gid)) { + return false; + } + $groupUsers = $this->access->connection->getFromCache($cachekey); + if(!is_null($groupUsers)) { + return $groupUsers; + } + + $groupDN = $this->access->groupname2dn($gid); + if(!$groupDN) { + // group couldn't be found, return empty resultset + $this->access->connection->writeToCache($cachekey, false); + return false; + } + + $members = array_keys($this->_groupMembers($groupDN)); + if(!$members) { + //in case users could not be retrieved, return empty resultset + $this->access->connection->writeToCache($cachekey, false); + return false; + } + + if(empty($search)) { + $groupUsers = count($members); + $this->access->connection->writeToCache($cachekey, $groupUsers); + return $groupUsers; + } + $isMemberUid = + (strtolower($this->access->connection->ldapGroupMemberAssocAttr) + === 'memberuid'); + + //we need to apply the search filter + //alternatives that need to be checked: + //a) get all users by search filter and array_intersect them + //b) a, but only when less than 1k 10k ?k users like it is + //c) put all DNs|uids in a LDAP filter, combine with the search string + // and let it count. + //For now this is not important, because the only use of this method + //does not supply a search string + foreach($members as $member) { + if($isMemberUid) { + //we got uids, need to get their DNs to 'tranlsate' them to usernames + $filter = $this->access->combineFilterWithAnd(array( + \OCP\Util::mb_str_replace('%uid', $member, + $this->access->connection->ldapLoginFilter, 'UTF-8'), + $this->access->getFilterPartForUserSearch($search) + )); + $ldap_users = $this->access->fetchListOfUsers($filter, 'dn'); + if(count($ldap_users) < 1) { + continue; + } + $groupUsers[] = $this->access->dn2username($ldap_users[0]); + } else { + //we need to apply the search filter now + if(!$this->access->readAttribute($member, + $this->access->connection->ldapUserDisplayName, + $this->access->getFilterPartForUserSearch($search))) { + continue; + } + // dn2username will also check if the users belong to the allowed base + if($ocname = $this->access->dn2username($member)) { + $groupUsers[] = $ocname; + } + } + } + + return $groupUsers; + } + /** * @brief get a list of all display names in a group * @returns array with display names (value) and user ids(key) @@ -418,6 +495,9 @@ class GROUP_LDAP extends BackendUtility implements \OCP\GroupInterface { * compared with OC_USER_BACKEND_CREATE_USER etc. */ public function implementsActions($actions) { - return (bool)(OC_GROUP_BACKEND_GET_DISPLAYNAME & $actions); + return (bool)(( + OC_GROUP_BACKEND_GET_DISPLAYNAME + | OC_GROUP_BACKEND_COUNT_USERS + ) & $actions); } } diff --git a/apps/user_ldap/group_proxy.php b/apps/user_ldap/group_proxy.php index 4404bd7fe3a..c0009736239 100644 --- a/apps/user_ldap/group_proxy.php +++ b/apps/user_ldap/group_proxy.php @@ -144,6 +144,17 @@ class Group_Proxy extends lib\Proxy implements \OCP\GroupInterface { return $users; } + /** + * @brief returns the number of users in a group, who match the search term + * @param string the internal group name + * @param string optional, a search string + * @returns int | bool + */ + public function countUsersInGroup($gid, $search = '') { + return $this->handleRequest( + $gid, 'countUsersInGroup', array($gid, $search)); + } + /** * @brief get a list of all display names in a group * @returns array with display names (value) and user ids(key) -- GitLab From 5f8d9b3a4e259d1f9c02b482bab37321c0d3b3dc Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Tue, 8 Apr 2014 12:31:11 +0200 Subject: [PATCH 062/253] ask implementsAction instead of checking method_exists for easier testing --- lib/private/group/group.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/private/group/group.php b/lib/private/group/group.php index 9965d938ebb..a2b8a0dcbea 100644 --- a/lib/private/group/group.php +++ b/lib/private/group/group.php @@ -195,7 +195,7 @@ class Group { public function count($search) { $users = false; foreach ($this->backends as $backend) { - if(method_exists($backend, 'countUsersInGroup')) { + if($backend->implementsActions(OC_GROUP_BACKEND_COUNT_USERS)) { if($users === false) { //we could directly add to a bool variable, but this would //be ugly -- GitLab From 9597f4190460c54066586c0eb42ed9a8532ad90a Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Tue, 8 Apr 2014 12:32:30 +0200 Subject: [PATCH 063/253] add group tests --- tests/lib/group/group.php | 62 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/tests/lib/group/group.php b/tests/lib/group/group.php index 3982c00e45f..147532f9947 100644 --- a/tests/lib/group/group.php +++ b/tests/lib/group/group.php @@ -299,6 +299,68 @@ class Group extends \PHPUnit_Framework_TestCase { $this->assertEquals('user1', $user1->getUID()); } + public function testCountUsers() { + $backend1 = $this->getMock('OC_Group_Database'); + $userManager = $this->getUserManager(); + $group = new \OC\Group\Group('group1', array($backend1), $userManager); + + $backend1->expects($this->once()) + ->method('countUsersInGroup') + ->with('group1', '2') + ->will($this->returnValue(3)); + + $backend1->expects($this->any()) + ->method('implementsActions') + ->will($this->returnValue(true)); + + $users = $group->count('2'); + + $this->assertSame(3, $users); + } + + public function testCountUsersMultipleBackends() { + $backend1 = $this->getMock('OC_Group_Database'); + $backend2 = $this->getMock('OC_Group_Database'); + $userManager = $this->getUserManager(); + $group = new \OC\Group\Group('group1', array($backend1, $backend2), $userManager); + + $backend1->expects($this->once()) + ->method('countUsersInGroup') + ->with('group1', '2') + ->will($this->returnValue(3)); + $backend1->expects($this->any()) + ->method('implementsActions') + ->will($this->returnValue(true)); + + $backend2->expects($this->once()) + ->method('countUsersInGroup') + ->with('group1', '2') + ->will($this->returnValue(4)); + $backend2->expects($this->any()) + ->method('implementsActions') + ->will($this->returnValue(true)); + + $users = $group->count('2'); + + $this->assertSame(7, $users); + } + + public function testCountUsersNoMethod() { + $backend1 = $this->getMock('OC_Group_Database'); + $userManager = $this->getUserManager(); + $group = new \OC\Group\Group('group1', array($backend1), $userManager); + + $backend1->expects($this->never()) + ->method('countUsersInGroup'); + $backend1->expects($this->any()) + ->method('implementsActions') + ->will($this->returnValue(false)); + + $users = $group->count('2'); + + $this->assertSame(false, $users); + } + public function testDelete() { $backend = $this->getMock('OC_Group_Database'); $userManager = $this->getUserManager(); -- GitLab From 142fc5f3af6e81f5c777caa9f8d42fad36866de2 Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Tue, 8 Apr 2014 12:53:59 +0200 Subject: [PATCH 064/253] fix return value when a search string was passed to return integer instead of array --- apps/user_ldap/group_ldap.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/user_ldap/group_ldap.php b/apps/user_ldap/group_ldap.php index 820d2c4636e..40d9dec1410 100644 --- a/apps/user_ldap/group_ldap.php +++ b/apps/user_ldap/group_ldap.php @@ -323,6 +323,7 @@ class GROUP_LDAP extends BackendUtility implements \OCP\GroupInterface { // and let it count. //For now this is not important, because the only use of this method //does not supply a search string + $groupUsers = array(); foreach($members as $member) { if($isMemberUid) { //we got uids, need to get their DNs to 'tranlsate' them to usernames @@ -350,7 +351,7 @@ class GROUP_LDAP extends BackendUtility implements \OCP\GroupInterface { } } - return $groupUsers; + return count($groupUsers); } /** -- GitLab From 240732162509d0caf71ef5f1414b2595bbe47fe9 Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Tue, 8 Apr 2014 12:57:06 +0200 Subject: [PATCH 065/253] add tests for LDAP --- apps/user_ldap/tests/group_ldap.php | 115 ++++++++++++++++++++++++++++ 1 file changed, 115 insertions(+) create mode 100644 apps/user_ldap/tests/group_ldap.php diff --git a/apps/user_ldap/tests/group_ldap.php b/apps/user_ldap/tests/group_ldap.php new file mode 100644 index 00000000000..ecbd42319e3 --- /dev/null +++ b/apps/user_ldap/tests/group_ldap.php @@ -0,0 +1,115 @@ + +* +* 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 . +* +*/ + +namespace OCA\user_ldap\tests; + +namespace OCA\user_ldap\tests; + +use \OCA\user_ldap\GROUP_LDAP as GroupLDAP; +use \OCA\user_ldap\lib\Access; +use \OCA\user_ldap\lib\Connection; +use \OCA\user_ldap\lib\ILDAPWrapper; + +class Test_Group_Ldap extends \PHPUnit_Framework_TestCase { + private function getAccessMock() { + static $conMethods; + static $accMethods; + + if(is_null($conMethods) || is_null($accMethods)) { + $conMethods = get_class_methods('\OCA\user_ldap\lib\Connection'); + $accMethods = get_class_methods('\OCA\user_ldap\lib\Access'); + } + $lw = $this->getMock('\OCA\user_ldap\lib\ILDAPWrapper'); + $connector = $this->getMock('\OCA\user_ldap\lib\Connection', + $conMethods, + array($lw, null, null)); + $access = $this->getMock('\OCA\user_ldap\lib\Access', + $accMethods, + array($connector, $lw)); + + return $access; + } + + private function enableGroups($access) { + $access->connection->expects($this->any()) + ->method('__get') + ->will($this->returnCallback(function($name) { +// if($name === 'ldapLoginFilter') { +// return '%uid'; +// } + return 1; + })); + } + + public function testCountEmptySearchString() { + $access = $this->getAccessMock(); + + $this->enableGroups($access); + + $access->expects($this->any()) + ->method('groupname2dn') + ->will($this->returnValue('cn=group,dc=foo,dc=bar')); + + $access->expects($this->any()) + ->method('readAttribute') + ->will($this->returnValue(array('u11', 'u22', 'u33', 'u34'))); + + $groupBackend = new GroupLDAP($access); + $users = $groupBackend->countUsersInGroup('group'); + + $this->assertSame(4, $users); + } + + public function testCountWithSearchString() { + $access = $this->getAccessMock(); + + $this->enableGroups($access); + + $access->expects($this->any()) + ->method('groupname2dn') + ->will($this->returnValue('cn=group,dc=foo,dc=bar')); + + $access->expects($this->any()) + ->method('readAttribute') + ->will($this->returnCallback(function($name) { + //the search operation will call readAttribute, thus we need + //to anaylze the "dn". All other times we just need to return + //something that is neither null or false, but once an array + //with the users in the group – so we do so all other times for + //simplicicity. + if(strpos($name, 'u') === 0) { + return strpos($name, '3'); + } + return array('u11', 'u22', 'u33', 'u34'); + })); + + $access->expects($this->any()) + ->method('dn2username') + ->will($this->returnValue('foobar')); + + $groupBackend = new GroupLDAP($access); + $users = $groupBackend->countUsersInGroup('group', '3'); + + $this->assertSame(2, $users); + } + +} \ No newline at end of file -- GitLab From bfb1e0867f82a61a2e19e900d3e62d2bafa0b514 Mon Sep 17 00:00:00 2001 From: Vincent Petry Date: Tue, 8 Apr 2014 17:21:11 +0200 Subject: [PATCH 066/253] Enable autowatch for karma This way unit tests can be run in multiple browsers with the command line and tests will re-run automatically when files are changed. --- tests/karma.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/karma.config.js b/tests/karma.config.js index 529bd31338f..ed9836ed4c3 100644 --- a/tests/karma.config.js +++ b/tests/karma.config.js @@ -167,7 +167,7 @@ module.exports = function(config) { logLevel: config.LOG_INFO, // enable / disable watching file and executing tests whenever any file changes - autoWatch: false, + autoWatch: true, // Start these browsers, currently available: // - Chrome -- GitLab From 8bb27551bde2d5aa516f4df2918ca3ed0ccd18b0 Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Thu, 20 Mar 2014 00:21:14 +0100 Subject: [PATCH 067/253] LDAP: make sure cache key for paged result cookie matches when limit or offset is null or 0 --- apps/user_ldap/lib/access.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php index 4d187bab8d5..b8e7e9bb670 100644 --- a/apps/user_ldap/lib/access.php +++ b/apps/user_ldap/lib/access.php @@ -1184,7 +1184,7 @@ class Access extends LDAPUtility { } $offset -= $limit; //we work with cache here - $cachekey = 'lc' . crc32($base) . '-' . crc32($filter) . '-' . $limit . '-' . $offset; + $cachekey = 'lc' . crc32($base) . '-' . crc32($filter) . '-' . intval($limit) . '-' . intval($offset); $cookie = ''; if(isset($this->cookies[$cachekey])) { $cookie = $this->cookies[$cachekey]; @@ -1206,7 +1206,7 @@ class Access extends LDAPUtility { */ private function setPagedResultCookie($base, $filter, $limit, $offset, $cookie) { if(!empty($cookie)) { - $cachekey = 'lc' . crc32($base) . '-' . crc32($filter) . '-' .$limit . '-' . $offset; + $cachekey = 'lc' . crc32($base) . '-' . crc32($filter) . '-' .intval($limit) . '-' . intval($offset); $this->cookies[$cachekey] = $cookie; } } -- GitLab From 40f9875f11e1bd35dd96ebd8fc8cf718be49689c Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Thu, 20 Mar 2014 00:21:51 +0100 Subject: [PATCH 068/253] LDAP: fix user report i.e. count for LDAP servers with really many users --- apps/user_ldap/lib/access.php | 38 +++++++++++++++++++++++------------ 1 file changed, 25 insertions(+), 13 deletions(-) diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php index b8e7e9bb670..7640a5b1bc0 100644 --- a/apps/user_ldap/lib/access.php +++ b/apps/user_ldap/lib/access.php @@ -659,7 +659,7 @@ class Access extends LDAPUtility { * @param string $filter */ public function countUsers($filter, $attr = array('dn'), $limit = null, $offset = null) { - return $this->count($filter, $this->connection->ldapBaseGroups, $attr, $limit, $offset); + return $this->count($filter, $this->connection->ldapBaseUsers, $attr, $limit, $offset); } /** @@ -775,22 +775,34 @@ class Access extends LDAPUtility { */ private function count($filter, $base, $attr = null, $limit = null, $offset = null, $skipHandling = false) { \OCP\Util::writeLog('user_ldap', 'Count filter: '.print_r($filter, true), \OCP\Util::DEBUG); - $search = $this->executeSearch($filter, $base, $attr, $limit, $offset); - if($search === false) { - return false; + + if(is_null($limit)) { + //TODO replace 400 with $this->connection->ldapPagingSize; once PR 6221 is merged and move it to callee countUsers() + $limit = 400; } - list($sr, $pagedSearchOK) = $search; - $cr = $this->connection->getConnectionResource(); + $counter = 0; - foreach($sr as $key => $res) { - $count = $this->ldap->countEntries($cr, $res); - if($count !== false) { - $counter += $count; + $cr = $this->connection->getConnectionResource(); + + do { + $search = $this->executeSearch($filter, $base, $attr, + $limit, $offset); + if($search === false) { + return $counter > 0 ? $counter : false; + } + list($sr, $pagedSearchOK) = $search; + + foreach($sr as $key => $res) { + $count = $this->ldap->countEntries($cr, $res); + if($count !== false) { + $counter += $count; + } } - } - $this->processPagedSearchStatus($sr, $filter, $base, $counter, $limit, + $this->processPagedSearchStatus($sr, $filter, $base, $count, $limit, $offset, $pagedSearchOK, $skipHandling); + $offset += $limit; + } while($count === $limit); return $counter; } @@ -891,7 +903,7 @@ class Access extends LDAPUtility { //we slice the findings, when //a) paged search insuccessful, though attempted //b) no paged search, but limit set - if((!$this->pagedSearchedSuccessful + if((!$this->getPagedSearchResultState() && $pagedSearchOK) || ( !$pagedSearchOK -- GitLab From 43402c56ddbe5e4041fdcdc0605d16badeadb69b Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Thu, 20 Mar 2014 09:14:41 +0100 Subject: [PATCH 069/253] initialize variable --- apps/user_ldap/lib/access.php | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php index 7640a5b1bc0..1af993677cd 100644 --- a/apps/user_ldap/lib/access.php +++ b/apps/user_ldap/lib/access.php @@ -782,6 +782,7 @@ class Access extends LDAPUtility { } $counter = 0; + $count = null; $cr = $this->connection->getConnectionResource(); do { -- GitLab From bdc418d1f99738d45b2a0e4fab07c974d5b58681 Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Thu, 20 Mar 2014 10:59:58 +0100 Subject: [PATCH 070/253] var count is assigned in the inner loop so it must be checked inside there to be properly used as part of the exit condition of the outer loop --- apps/user_ldap/lib/access.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php index 1af993677cd..d135ee5b735 100644 --- a/apps/user_ldap/lib/access.php +++ b/apps/user_ldap/lib/access.php @@ -786,6 +786,7 @@ class Access extends LDAPUtility { $cr = $this->connection->getConnectionResource(); do { + $continue = false; $search = $this->executeSearch($filter, $base, $attr, $limit, $offset); if($search === false) { @@ -798,12 +799,15 @@ class Access extends LDAPUtility { if($count !== false) { $counter += $count; } + if($count === $limit) { + $continue = true; + } } $this->processPagedSearchStatus($sr, $filter, $base, $count, $limit, $offset, $pagedSearchOK, $skipHandling); $offset += $limit; - } while($count === $limit); + } while($continue); return $counter; } -- GitLab From 2e5adadad7b779f0794a6ecddb2b0f51b9214b4a Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Thu, 20 Mar 2014 11:38:05 +0100 Subject: [PATCH 071/253] Put inner loop into own method, let's see whether it makes scrutinizer happier --- apps/user_ldap/lib/access.php | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php index d135ee5b735..ce97aaff145 100644 --- a/apps/user_ldap/lib/access.php +++ b/apps/user_ldap/lib/access.php @@ -794,15 +794,8 @@ class Access extends LDAPUtility { } list($sr, $pagedSearchOK) = $search; - foreach($sr as $key => $res) { - $count = $this->ldap->countEntries($cr, $res); - if($count !== false) { - $counter += $count; - } - if($count === $limit) { - $continue = true; - } - } + $count = $this->countEntriesInSearchResults($sr, $limit, $continue); + $counter += $count; $this->processPagedSearchStatus($sr, $filter, $base, $count, $limit, $offset, $pagedSearchOK, $skipHandling); @@ -812,6 +805,22 @@ class Access extends LDAPUtility { return $counter; } + private function countEntriesInSearchResults($searchResults, $limit, + &$hasHitLimit) { + $cr = $this->connection->getConnectionResource(); + $count = 0; + + foreach($searchResults as $res) { + $count = intval($this->ldap->countEntries($cr, $res)); + $counter += $count; + if($count === $limit) { + $hasHitLimit = true; + } + } + + return $counter; + } + /** * @brief executes an LDAP search * @param $filter the LDAP filter for the search -- GitLab From ee3368d2ad8c362e27d904bbb22c7b741b09cff8 Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Wed, 9 Apr 2014 11:38:51 +0200 Subject: [PATCH 072/253] replace hardcoded limit of 400 with user controlled ldapPagingSize value --- apps/user_ldap/lib/access.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php index ce97aaff145..0b3ff4aa15e 100644 --- a/apps/user_ldap/lib/access.php +++ b/apps/user_ldap/lib/access.php @@ -777,8 +777,7 @@ class Access extends LDAPUtility { \OCP\Util::writeLog('user_ldap', 'Count filter: '.print_r($filter, true), \OCP\Util::DEBUG); if(is_null($limit)) { - //TODO replace 400 with $this->connection->ldapPagingSize; once PR 6221 is merged and move it to callee countUsers() - $limit = 400; + $limit = $this->connection->ldapPagingSize; } $counter = 0; -- GitLab From ee6fe9718e9eba3ebcc6e11a1fac6a8621e8e612 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Wed, 9 Apr 2014 12:51:32 +0200 Subject: [PATCH 073/253] make search results work on mobile as well --- search/css/results.css | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/search/css/results.css b/search/css/results.css index 8a32b0b995d..c41e23af8a4 100644 --- a/search/css/results.css +++ b/search/css/results.css @@ -9,13 +9,14 @@ list-style:none; max-height:80%; overflow-x:hidden; - overflow-y: scroll; + overflow-y: auto; padding-bottom:6px; position:fixed; right:0; text-overflow:ellipsis; top:45px; width:380px; + max-width: 95%; z-index:75; } @@ -50,12 +51,14 @@ display: none; } -#searchresults td.result { - width:250px; +#searchresults .name, +#searchresults .text { + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; } -#searchresults td.result div.text { - padding-left:1em; - white-space:nowrap; +#searchresults .text { + padding-left: 16px; } #searchresults td.result * { -- GitLab From d72269d361bee3f00528c7f7ef739bf278280b8d Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Wed, 9 Apr 2014 12:55:10 +0200 Subject: [PATCH 074/253] increase height of result for better clickability --- search/css/results.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/search/css/results.css b/search/css/results.css index c41e23af8a4..679a695b041 100644 --- a/search/css/results.css +++ b/search/css/results.css @@ -45,7 +45,7 @@ #searchresults td { padding:0 .3em; - height: 32px; + height: 44px; } #searchresults tr.template { display: none; -- GitLab From 0ad8e1b1e6341688eb4052f6ad9a33792fd6f60f Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Wed, 9 Apr 2014 12:58:14 +0200 Subject: [PATCH 075/253] search: change date color to grey for less distraction --- search/css/results.css | 1 + 1 file changed, 1 insertion(+) diff --git a/search/css/results.css b/search/css/results.css index 679a695b041..a2fc5b002de 100644 --- a/search/css/results.css +++ b/search/css/results.css @@ -59,6 +59,7 @@ } #searchresults .text { padding-left: 16px; + color: 999; } #searchresults td.result * { -- GitLab From 1258cde0209b2ef86aeedcc9470cd654dce58bab Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Wed, 9 Apr 2014 13:20:46 +0200 Subject: [PATCH 076/253] fix search box wrapping on very narrow screens --- core/css/mobile.css | 1 + 1 file changed, 1 insertion(+) diff --git a/core/css/mobile.css b/core/css/mobile.css index c67ac3e5ecf..821da619295 100644 --- a/core/css/mobile.css +++ b/core/css/mobile.css @@ -19,6 +19,7 @@ .searchbox input[type="search"]:focus, .searchbox input[type="search"]:active { width: 155px; + max-width: 50%; } /* do not show display name on mobile when profile picture is present */ -- GitLab From 015b9b1dac1e7f90e4e28d2b19697bedf83e56fe Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Wed, 2 Apr 2014 12:54:41 +0200 Subject: [PATCH 077/253] Add option to getUsersSharingFile() to get the paths for the shared users --- lib/private/share/share.php | 61 ++++++++++++++++++++++++++++++------- lib/public/share.php | 7 +++-- 2 files changed, 54 insertions(+), 14 deletions(-) diff --git a/lib/private/share/share.php b/lib/private/share/share.php index 7bab98b00bf..3d22f6fd450 100644 --- a/lib/private/share/share.php +++ b/lib/private/share/share.php @@ -91,23 +91,25 @@ class Share extends \OC\Share\Constants { /** * Find which users can access a shared item - * @param $path to the file - * @param $user owner of the file - * @param include owner to the list of users with access to the file + * @param string $path to the file + * @param string $ownerUser owner of the file + * @param bool $includeOwner include owner to the list of users with access to the file + * @param bool $returnUserPaths Return an array with the user => path map * @return array * @note $path needs to be relative to user data dir, e.g. 'file.txt' * not '/admin/data/file.txt' */ - public static function getUsersSharingFile($path, $user, $includeOwner = false) { + public static function getUsersSharingFile($path, $ownerUser, $includeOwner = false, $returnUserPaths = false) { - $shares = array(); + $shares = $sharePaths = $fileTargets = array(); $publicShare = false; $source = -1; $cache = false; - $view = new \OC\Files\View('/' . $user . '/files'); + $view = new \OC\Files\View('/' . $ownerUser . '/files'); if ($view->file_exists($path)) { $meta = $view->getFileInfo($path); + $path = substr($meta->getPath(), strlen('/' . $ownerUser . '/files')); } else { // if the file doesn't exists yet we start with the parent folder $meta = $view->getFileInfo(dirname($path)); @@ -119,10 +121,9 @@ class Share extends \OC\Share\Constants { } while ($source !== -1) { - // Fetch all shares with another user $query = \OC_DB::prepare( - 'SELECT `share_with` + 'SELECT `share_with`, `file_source`, `file_target` FROM `*PREFIX*share` WHERE @@ -136,12 +137,15 @@ class Share extends \OC\Share\Constants { } else { while ($row = $result->fetchRow()) { $shares[] = $row['share_with']; + if ($returnUserPaths) { + $fileTargets[(int) $row['file_source']][$row['share_with']] = $row; + } } } - // We also need to take group shares into account + // We also need to take group shares into account $query = \OC_DB::prepare( - 'SELECT `share_with` + 'SELECT `share_with`, `file_source`, `file_target` FROM `*PREFIX*share` WHERE @@ -156,6 +160,11 @@ class Share extends \OC\Share\Constants { while ($row = $result->fetchRow()) { $usersInGroup = \OC_Group::usersInGroup($row['share_with']); $shares = array_merge($shares, $usersInGroup); + if ($returnUserPaths) { + foreach ($usersInGroup as $user) { + $fileTargets[(int) $row['file_source']][$user] = $row; + } + } } } @@ -188,9 +197,39 @@ class Share extends \OC\Share\Constants { $source = -1; } } + // Include owner in list of users, if requested if ($includeOwner) { - $shares[] = $user; + $shares[] = $ownerUser; + if ($returnUserPaths) { + $sharePaths[$ownerUser] = $path; + } + } + + if ($returnUserPaths) { + $fileTargetIDs = array_keys($fileTargets); + $fileTargetIDs = array_unique($fileTargetIDs); + + $query = \OC_DB::prepare( + 'SELECT `fileid`, `path` + FROM `*PREFIX*filecache` + WHERE `fileid` IN (' . implode(',', $fileTargetIDs) . ')' + ); + $result = $query->execute(); + + if (\OCP\DB::isError($result)) { + \OCP\Util::writeLog('OCP\Share', \OC_DB::getErrorMessage($result), \OC_Log::ERROR); + } else { + while ($row = $result->fetchRow()) { + foreach ($fileTargets[$row['fileid']] as $uid => $shareData) { + $sharedPath = '/Shared' . $shareData['file_target']; + $sharedPath .= substr($path, strlen($row['path']) -5); + $sharePaths[$uid] = $sharedPath; + } + } + } + + return $sharePaths; } return array("users" => array_unique($shares), "public" => $publicShare); diff --git a/lib/public/share.php b/lib/public/share.php index 564839e86b6..c694314ad08 100644 --- a/lib/public/share.php +++ b/lib/public/share.php @@ -64,14 +64,15 @@ class Share extends \OC\Share\Constants { /** * Find which users can access a shared item * @param string $path to the file - * @param string $user owner of the file + * @param string $ownerUser owner of the file * @param bool $includeOwner include owner to the list of users with access to the file + * @param bool $returnUserPaths Return an array with the user => path map * @return array * @note $path needs to be relative to user data dir, e.g. 'file.txt' * not '/admin/data/file.txt' */ - public static function getUsersSharingFile($path, $user, $includeOwner = false) { - return \OC\Share\Share::getUsersSharingFile($path, $user, $includeOwner); + public static function getUsersSharingFile($path, $ownerUser, $includeOwner = false, $returnUserPaths = false) { + return \OC\Share\Share::getUsersSharingFile($path, $ownerUser, $includeOwner, $returnUserPaths); } /** -- GitLab From d418e176ce4ce3ee07a5b9e632150470c0387f87 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Wed, 9 Apr 2014 15:01:39 +0200 Subject: [PATCH 078/253] Do not query when the list is empty --- lib/private/share/share.php | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/lib/private/share/share.php b/lib/private/share/share.php index 3d22f6fd450..59826d03039 100644 --- a/lib/private/share/share.php +++ b/lib/private/share/share.php @@ -210,21 +210,23 @@ class Share extends \OC\Share\Constants { $fileTargetIDs = array_keys($fileTargets); $fileTargetIDs = array_unique($fileTargetIDs); - $query = \OC_DB::prepare( - 'SELECT `fileid`, `path` - FROM `*PREFIX*filecache` - WHERE `fileid` IN (' . implode(',', $fileTargetIDs) . ')' - ); - $result = $query->execute(); + if (!empty($fileTargetIDs)) { + $query = \OC_DB::prepare( + 'SELECT `fileid`, `path` + FROM `*PREFIX*filecache` + WHERE `fileid` IN (' . implode(',', $fileTargetIDs) . ')' + ); + $result = $query->execute(); - if (\OCP\DB::isError($result)) { - \OCP\Util::writeLog('OCP\Share', \OC_DB::getErrorMessage($result), \OC_Log::ERROR); - } else { - while ($row = $result->fetchRow()) { - foreach ($fileTargets[$row['fileid']] as $uid => $shareData) { - $sharedPath = '/Shared' . $shareData['file_target']; - $sharedPath .= substr($path, strlen($row['path']) -5); - $sharePaths[$uid] = $sharedPath; + if (\OCP\DB::isError($result)) { + \OCP\Util::writeLog('OCP\Share', \OC_DB::getErrorMessage($result), \OC_Log::ERROR); + } else { + while ($row = $result->fetchRow()) { + foreach ($fileTargets[$row['fileid']] as $uid => $shareData) { + $sharedPath = '/Shared' . $shareData['file_target']; + $sharedPath .= substr($path, strlen($row['path']) -5); + $sharePaths[$uid] = $sharedPath; + } } } } -- GitLab From 4f11786a3d0d88a3bf43ae56cc9bb7a3023c83fb Mon Sep 17 00:00:00 2001 From: Vincent Petry Date: Tue, 8 Apr 2014 11:57:33 +0200 Subject: [PATCH 079/253] Fixed Sabre Node implementation to correctly return timestamps as int Negative timestamps were returned as string and were confusing other Sabre API like Sabre_DAV_Property_GetLastModified. This fix makes sure the timestamp is returned as int when defined. --- lib/private/connector/sabre/node.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/lib/private/connector/sabre/node.php b/lib/private/connector/sabre/node.php index 5807c5c7f71..7ff9f50ca68 100644 --- a/lib/private/connector/sabre/node.php +++ b/lib/private/connector/sabre/node.php @@ -139,12 +139,15 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr /** * @brief Returns the last modification time, as a unix timestamp - * @return int + * @return int timestamp as integer */ public function getLastModified() { $this->getFileinfoCache(); - return $this->fileinfo_cache['mtime']; - + $timestamp = $this->fileinfo_cache['mtime']; + if (!empty($timestamp)) { + return (int)$timestamp; + } + return $timestamp; } /** -- GitLab From 70c88027db5c5d586d689d310572f8f34d10b285 Mon Sep 17 00:00:00 2001 From: Bernhard Posselt Date: Wed, 9 Apr 2014 21:57:32 +0200 Subject: [PATCH 080/253] add requirements to routing --- .../appframework/routing/routeconfig.php | 10 ++++++- .../lib/appframework/routing/RoutingTest.php | 26 ++++++++++++++++--- 2 files changed, 31 insertions(+), 5 deletions(-) diff --git a/lib/private/appframework/routing/routeconfig.php b/lib/private/appframework/routing/routeconfig.php index 35bee75cc4d..a3bbde6af53 100644 --- a/lib/private/appframework/routing/routeconfig.php +++ b/lib/private/appframework/routing/routeconfig.php @@ -84,7 +84,15 @@ class RouteConfig { // register the route $handler = new RouteActionHandler($this->container, $controllerName, $actionName); - $this->router->create($this->appName.'.'.$controller.'.'.$action, $url)->method($verb)->action($handler); + $router = $this->router->create($this->appName.'.'.$controller.'.'.$action, $url) + ->method($verb) + ->action($handler); + + // optionally register requirements for route. This is used to + // tell the route parser how url parameters should be matched + if(array_key_exists('requirements', $simpleRoute)) { + $router->requirements($simpleRoute['requirements']); + } } } diff --git a/tests/lib/appframework/routing/RoutingTest.php b/tests/lib/appframework/routing/RoutingTest.php index 735dd7cef41..261ab0b26af 100644 --- a/tests/lib/appframework/routing/RoutingTest.php +++ b/tests/lib/appframework/routing/RoutingTest.php @@ -36,6 +36,16 @@ class RouteConfigTest extends \PHPUnit_Framework_TestCase $this->assertSimpleRoute($routes, 'folders.open', 'DELETE', '/folders/{folderId}/open', 'FoldersController', 'open'); } + public function testSimpleRouteWithRequirements() + { + $routes = array('routes' => array( + array('name' => 'folders#open', 'url' => '/folders/{folderId}/open', 'verb' => 'delete', 'requirements' => array('something')) + )); + + $this->assertSimpleRoute($routes, 'folders.open', 'DELETE', '/folders/{folderId}/open', 'FoldersController', 'open', array('something')); + } + + /** * @expectedException \UnexpectedValueException */ @@ -85,10 +95,10 @@ class RouteConfigTest extends \PHPUnit_Framework_TestCase * @param string $controllerName * @param string $actionName */ - private function assertSimpleRoute($routes, $name, $verb, $url, $controllerName, $actionName) + private function assertSimpleRoute($routes, $name, $verb, $url, $controllerName, $actionName, array $requirements=array()) { // route mocks - $route = $this->mockRoute($verb, $controllerName, $actionName); + $route = $this->mockRoute($verb, $controllerName, $actionName, $requirements); // router mock $router = $this->getMock("\OC\Route\Router", array('create')); @@ -171,10 +181,10 @@ class RouteConfigTest extends \PHPUnit_Framework_TestCase * @param string $actionName * @return \PHPUnit_Framework_MockObject_MockObject */ - private function mockRoute($verb, $controllerName, $actionName) + private function mockRoute($verb, $controllerName, $actionName, array $requirements=array()) { $container = new DIContainer('app1'); - $route = $this->getMock("\OC\Route\Route", array('method', 'action'), array(), '', false); + $route = $this->getMock("\OC\Route\Route", array('method', 'action', 'requirements'), array(), '', false); $route ->expects($this->exactly(1)) ->method('method') @@ -186,6 +196,14 @@ class RouteConfigTest extends \PHPUnit_Framework_TestCase ->method('action') ->with($this->equalTo(new RouteActionHandler($container, $controllerName, $actionName))) ->will($this->returnValue($route)); + + if(count($requirements) > 0) { + $route + ->expects($this->exactly(1)) + ->method('requirements') + ->with($this->equalTo($requirements)) + ->will($this->returnValue($route)); + } return $route; } -- GitLab From 2fc9e27ceddf9d632d79916a71f9100138bb685f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Wed, 9 Apr 2014 22:16:41 +0200 Subject: [PATCH 081/253] use FileList.findFileEl --- apps/files/js/filelist.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index 8ee89aad3ef..9c749bb8f34 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -1098,7 +1098,8 @@ $(document).ready(function() { fileDirectory = fileDirectory[0]; // Get the directory - if ($('tr[data-file="'+fileDirectory+'"]').length === 0) { + var fd = FileList.findFileEl(fileDirectory); + if (fd.length === 0) { var dir = { name: fileDirectory, type: 'dir', -- GitLab From 98a5f121fddf9b41aa68937d6f8da700a34f9744 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Wed, 9 Apr 2014 22:45:34 +0200 Subject: [PATCH 082/253] To isolate the variable scope used inside the $file it is required in it's own method --- lib/private/route/router.php | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/lib/private/route/router.php b/lib/private/route/router.php index 1f0a23ee124..0431855707e 100644 --- a/lib/private/route/router.php +++ b/lib/private/route/router.php @@ -117,7 +117,7 @@ class Router implements IRouter { if (!isset($this->loadedApps[$app])) { $this->loadedApps[$app] = true; $this->useCollection($app); - require_once $file; + $this->requireRouteFile($file); $collection = $this->getCollection($app); $collection->addPrefix('/apps/' . $app); $this->root->addCollection($collection); @@ -230,4 +230,12 @@ class Router implements IRouter { return $this->getGenerator()->generate($name, $parameters, $absolute); } + /** + * To isolate the variable scope used inside the $file it is required in it's own method + * @param $file + */ + private function requireRouteFile($file) { + require_once $file; + } + } -- GitLab From e8be2ac55492a7e4f141d3bb7e6698783bef454c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Wed, 9 Apr 2014 23:32:12 +0200 Subject: [PATCH 083/253] In cases folder drag and drop is not supported a proper message is displayed --- apps/files/js/file-upload.js | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js index 46a53208406..070314a1188 100644 --- a/apps/files/js/file-upload.js +++ b/apps/files/js/file-upload.js @@ -242,11 +242,18 @@ OC.Upload = { data.errorThrown = errorMessage; } - if (file.type === '' && file.size === 4096) { - data.textStatus = 'dirorzero'; - data.errorThrown = t('files', 'Unable to upload {filename} as it is a directory or has 0 bytes', - {filename: file.name} - ); + // in case folder drag and drop is not supported file will point to a directory + if (!file.type && file.size%4096 === 0 && file.size <= 102400) { + try { + reader = new FileReader(); + reader.readAsBinaryString(f); + } catch (NS_ERROR_FILE_ACCESS_DENIED) { + //file is a directory + data.textStatus = 'dirorzero'; + data.errorThrown = t('files', 'Unable to upload {filename} as it is a directory or has 0 bytes', + {filename: file.name} + ); + } } // add size -- GitLab From f06ef8aa4b02be0b43ab8cf2f83cf3a044ad9759 Mon Sep 17 00:00:00 2001 From: Bernhard Posselt Date: Wed, 9 Apr 2014 23:59:57 +0200 Subject: [PATCH 084/253] register middleware as string to not force request to be instantiated too early and thus not having url parameters --- .../appframework/dependencyinjection/dicontainer.php | 6 +++--- lib/public/appframework/iappcontainer.php | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/private/appframework/dependencyinjection/dicontainer.php b/lib/private/appframework/dependencyinjection/dicontainer.php index 4821ecaf67b..78224ea54c0 100644 --- a/lib/private/appframework/dependencyinjection/dicontainer.php +++ b/lib/private/appframework/dependencyinjection/dicontainer.php @@ -98,7 +98,7 @@ class DIContainer extends SimpleContainer implements IAppContainer{ $dispatcher->registerMiddleware($c['SecurityMiddleware']); foreach($middleWares as $middleWare) { - $dispatcher->registerMiddleware($middleWare); + $dispatcher->registerMiddleware($c[$middleWare]); } return $dispatcher; @@ -133,10 +133,10 @@ class DIContainer extends SimpleContainer implements IAppContainer{ } /** - * @param Middleware $middleWare + * @param string $middleWare * @return boolean|null */ - function registerMiddleWare(Middleware $middleWare) { + function registerMiddleWare($middleWare) { array_push($this->middleWares, $middleWare); } diff --git a/lib/public/appframework/iappcontainer.php b/lib/public/appframework/iappcontainer.php index e4f5f37cad2..a0b0c06881a 100644 --- a/lib/public/appframework/iappcontainer.php +++ b/lib/public/appframework/iappcontainer.php @@ -50,10 +50,10 @@ interface IAppContainer extends IContainer{ function getServer(); /** - * @param Middleware $middleWare + * @param string $middleWare * @return boolean */ - function registerMiddleWare(Middleware $middleWare); + function registerMiddleWare($middleWare); /** * @return boolean -- GitLab From 7c072510d30b30b3d2a6d9c8b055fb816e5f0967 Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Thu, 10 Apr 2014 01:55:39 -0400 Subject: [PATCH 085/253] [tx-robot] updated from transifex --- apps/files/l10n/ast.php | 2 + apps/files_external/l10n/ast.php | 2 + apps/files_external/l10n/en_GB.php | 5 ++ apps/files_external/l10n/es.php | 6 ++ apps/files_external/l10n/fi_FI.php | 5 ++ apps/files_external/l10n/fr.php | 1 + apps/files_external/l10n/gl.php | 5 ++ apps/files_external/l10n/it.php | 5 ++ apps/files_external/l10n/pl.php | 5 ++ apps/files_external/l10n/pt_BR.php | 5 ++ apps/files_external/l10n/tr.php | 5 ++ apps/files_trashbin/l10n/ast.php | 1 + apps/user_ldap/l10n/ast.php | 1 + apps/user_ldap/l10n/it.php | 1 + core/l10n/ast.php | 3 + core/l10n/de.php | 1 + core/l10n/de_DE.php | 1 + core/l10n/it.php | 1 + l10n/ar/lib.po | 8 +-- l10n/ar/settings.po | 102 ++++++++++++++-------------- l10n/ast/core.po | 66 +++++++++--------- l10n/ast/files.po | 24 +++---- l10n/ast/files_external.po | 8 +-- l10n/ast/files_trashbin.po | 6 +- l10n/ast/lib.po | 23 ++++--- l10n/ast/settings.po | 6 +- l10n/ast/user_ldap.po | 8 +-- l10n/ca/lib.po | 10 +-- l10n/ca/settings.po | 102 ++++++++++++++-------------- l10n/cs_CZ/lib.po | 10 +-- l10n/cs_CZ/settings.po | 102 ++++++++++++++-------------- l10n/da/lib.po | 8 +-- l10n/da/settings.po | 102 ++++++++++++++-------------- l10n/de/core.po | 63 ++++++++--------- l10n/de/lib.po | 13 ++-- l10n/de/settings.po | 18 ++--- l10n/de_CH/lib.po | 8 +-- l10n/de_CH/settings.po | 102 ++++++++++++++-------------- l10n/de_DE/core.po | 62 ++++++++--------- l10n/de_DE/lib.po | 13 ++-- l10n/de_DE/settings.po | 18 ++--- l10n/el/lib.po | 8 +-- l10n/el/settings.po | 86 +++++++++++------------ l10n/en_GB/files_external.po | 16 ++--- l10n/en_GB/lib.po | 14 ++-- l10n/en_GB/settings.po | 102 ++++++++++++++-------------- l10n/es/files_external.po | 18 ++--- l10n/es/lib.po | 14 ++-- l10n/es/settings.po | 18 ++--- l10n/es_AR/lib.po | 8 +-- l10n/es_AR/settings.po | 102 ++++++++++++++-------------- l10n/es_MX/lib.po | 8 +-- l10n/es_MX/settings.po | 102 ++++++++++++++-------------- l10n/et_EE/lib.po | 10 +-- l10n/et_EE/settings.po | 18 ++--- l10n/eu/lib.po | 10 +-- l10n/eu/settings.po | 102 ++++++++++++++-------------- l10n/fa/lib.po | 8 +-- l10n/fa/settings.po | 102 ++++++++++++++-------------- l10n/fi_FI/files_external.po | 16 ++--- l10n/fi_FI/lib.po | 14 ++-- l10n/fi_FI/settings.po | 102 ++++++++++++++-------------- l10n/fr/files_external.po | 9 +-- l10n/fr/lib.po | 10 +-- l10n/fr/settings.po | 18 ++--- l10n/gl/files_external.po | 16 ++--- l10n/gl/lib.po | 14 ++-- l10n/gl/settings.po | 86 +++++++++++------------ l10n/he/lib.po | 8 +-- l10n/he/settings.po | 102 ++++++++++++++-------------- l10n/hu_HU/lib.po | 10 +-- l10n/hu_HU/settings.po | 102 ++++++++++++++-------------- l10n/id/lib.po | 8 +-- l10n/id/settings.po | 102 ++++++++++++++-------------- l10n/it/core.po | 66 +++++++++--------- l10n/it/files_external.po | 17 ++--- l10n/it/lib.po | 15 ++-- l10n/it/settings.po | 18 ++--- l10n/it/user_ldap.po | 11 +-- l10n/ja/lib.po | 10 +-- l10n/ja/settings.po | 102 ++++++++++++++-------------- l10n/ka_GE/lib.po | 8 +-- l10n/ka_GE/settings.po | 102 ++++++++++++++-------------- l10n/km/lib.po | 8 +-- l10n/km/settings.po | 102 ++++++++++++++-------------- l10n/ko/lib.po | 8 +-- l10n/ko/settings.po | 102 ++++++++++++++-------------- l10n/lt_LT/lib.po | 8 +-- l10n/lt_LT/settings.po | 102 ++++++++++++++-------------- l10n/lv/lib.po | 10 +-- l10n/lv/settings.po | 102 ++++++++++++++-------------- l10n/mk/lib.po | 8 +-- l10n/mk/settings.po | 102 ++++++++++++++-------------- l10n/nb_NO/lib.po | 8 +-- l10n/nb_NO/settings.po | 18 ++--- l10n/nl/lib.po | 8 +-- l10n/nl/settings.po | 102 ++++++++++++++-------------- l10n/nn_NO/lib.po | 8 +-- l10n/nn_NO/settings.po | 102 ++++++++++++++-------------- l10n/pl/files_external.po | 16 ++--- l10n/pl/lib.po | 14 ++-- l10n/pl/settings.po | 102 ++++++++++++++-------------- l10n/pt_BR/files_external.po | 16 ++--- l10n/pt_BR/lib.po | 14 ++-- l10n/pt_BR/settings.po | 18 ++--- l10n/pt_PT/lib.po | 8 +-- l10n/pt_PT/settings.po | 102 ++++++++++++++-------------- l10n/ro/lib.po | 8 +-- l10n/ro/settings.po | 102 ++++++++++++++-------------- l10n/ru/lib.po | 8 +-- l10n/ru/settings.po | 102 ++++++++++++++-------------- l10n/sk_SK/lib.po | 8 +-- l10n/sk_SK/settings.po | 4 +- l10n/sl/lib.po | 8 +-- l10n/sl/settings.po | 18 ++--- l10n/sq/lib.po | 8 +-- l10n/sq/settings.po | 102 ++++++++++++++-------------- l10n/sr/lib.po | 8 +-- l10n/sr/settings.po | 102 ++++++++++++++-------------- l10n/sv/lib.po | 8 +-- l10n/sv/settings.po | 18 ++--- l10n/templates/core.pot | 58 ++++++++-------- l10n/templates/files.pot | 18 ++--- l10n/templates/files_encryption.pot | 2 +- l10n/templates/files_external.pot | 2 +- l10n/templates/files_sharing.pot | 2 +- l10n/templates/files_trashbin.pot | 2 +- l10n/templates/files_versions.pot | 2 +- l10n/templates/lib.pot | 2 +- l10n/templates/private.pot | 2 +- l10n/templates/settings.pot | 2 +- l10n/templates/user_ldap.pot | 4 +- l10n/templates/user_webdavauth.pot | 2 +- l10n/tr/files_external.po | 16 ++--- l10n/tr/lib.po | 14 ++-- l10n/tr/settings.po | 4 +- l10n/ug/lib.po | 8 +-- l10n/ug/settings.po | 102 ++++++++++++++-------------- l10n/uk/lib.po | 8 +-- l10n/uk/settings.po | 102 ++++++++++++++-------------- l10n/zh_CN/lib.po | 8 +-- l10n/zh_CN/settings.po | 102 ++++++++++++++-------------- l10n/zh_TW/lib.po | 8 +-- l10n/zh_TW/settings.po | 102 ++++++++++++++-------------- lib/l10n/ar.php | 4 +- lib/l10n/ast.php | 8 +++ lib/l10n/ca.php | 5 +- lib/l10n/cs_CZ.php | 5 +- lib/l10n/da.php | 4 +- lib/l10n/de.php | 6 +- lib/l10n/de_CH.php | 4 +- lib/l10n/de_DE.php | 6 +- lib/l10n/el.php | 4 +- lib/l10n/en_GB.php | 6 +- lib/l10n/es.php | 6 +- lib/l10n/es_AR.php | 4 +- lib/l10n/es_MX.php | 4 +- lib/l10n/et_EE.php | 5 +- lib/l10n/eu.php | 5 +- lib/l10n/fa.php | 4 +- lib/l10n/fi_FI.php | 6 +- lib/l10n/fr.php | 5 +- lib/l10n/gl.php | 6 +- lib/l10n/he.php | 4 +- lib/l10n/hu_HU.php | 5 +- lib/l10n/id.php | 4 +- lib/l10n/it.php | 6 +- lib/l10n/ja.php | 5 +- lib/l10n/ka_GE.php | 4 +- lib/l10n/km.php | 4 +- lib/l10n/ko.php | 4 +- lib/l10n/lt_LT.php | 4 +- lib/l10n/lv.php | 5 +- lib/l10n/mk.php | 4 +- lib/l10n/nb_NO.php | 4 +- lib/l10n/nl.php | 4 +- lib/l10n/nn_NO.php | 4 +- lib/l10n/pl.php | 6 +- lib/l10n/pt_BR.php | 6 +- lib/l10n/pt_PT.php | 4 +- lib/l10n/ro.php | 4 +- lib/l10n/ru.php | 4 +- lib/l10n/sk_SK.php | 4 +- lib/l10n/sl.php | 4 +- lib/l10n/sq.php | 4 +- lib/l10n/sr.php | 4 +- lib/l10n/sv.php | 4 +- lib/l10n/tr.php | 6 +- lib/l10n/ug.php | 4 +- lib/l10n/uk.php | 4 +- lib/l10n/zh_CN.php | 4 +- lib/l10n/zh_TW.php | 4 +- settings/l10n/ast.php | 1 + 193 files changed, 2616 insertions(+), 2422 deletions(-) diff --git a/apps/files/l10n/ast.php b/apps/files/l10n/ast.php index 3e1eb722655..93ae47b25c5 100644 --- a/apps/files/l10n/ast.php +++ b/apps/files/l10n/ast.php @@ -13,6 +13,7 @@ $TRANSLATIONS = array( "Files" => "Ficheros", "Share" => "Compartir", "Rename" => "Renomar", +"Error" => "Fallu", "_%n folder_::_%n folders_" => array("",""), "_%n file_::_%n files_" => array("",""), "_Uploading %n file_::_Uploading %n files_" => array("",""), @@ -20,6 +21,7 @@ $TRANSLATIONS = array( "Size" => "Tamañu", "Upload" => "Xubir", "Save" => "Guardar", +"New folder" => "Nueva carpeta", "Cancel upload" => "Encaboxar xuba", "Download" => "Descargar", "Delete" => "Desaniciar" diff --git a/apps/files_external/l10n/ast.php b/apps/files_external/l10n/ast.php index 9d4d891dda3..7061cffaa8e 100644 --- a/apps/files_external/l10n/ast.php +++ b/apps/files_external/l10n/ast.php @@ -1,7 +1,9 @@ "Nome de la carpeta", "Options" => "Opciones", "Groups" => "Grupos", +"Users" => "Usuarios", "Delete" => "Desaniciar" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files_external/l10n/en_GB.php b/apps/files_external/l10n/en_GB.php index 3160d514621..4bd3f9daf2a 100644 --- a/apps/files_external/l10n/en_GB.php +++ b/apps/files_external/l10n/en_GB.php @@ -6,6 +6,11 @@ $TRANSLATIONS = array( "Please provide a valid Dropbox app key and secret." => "Please provide a valid Dropbox app key and secret.", "Error configuring Google Drive storage" => "Error configuring Google Drive storage", "Saved" => "Saved", +"Note: " => "Note: ", +" and " => " and ", +"Note: The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "Note: The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it.", +"Note: The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "Note: The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it.", +"Note: \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "Note: \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it.", "External Storage" => "External Storage", "Folder name" => "Folder name", "External storage" => "External storage", diff --git a/apps/files_external/l10n/es.php b/apps/files_external/l10n/es.php index 0af20d939b2..bfe542c6e71 100644 --- a/apps/files_external/l10n/es.php +++ b/apps/files_external/l10n/es.php @@ -6,11 +6,17 @@ $TRANSLATIONS = array( "Please provide a valid Dropbox app key and secret." => "Por favor, proporcione un una clave válida de la app Dropbox y una clave secreta.", "Error configuring Google Drive storage" => "Error configurando el almacenamiento de Google Drive", "Saved" => "Guardado", +"Note: " => "Nota: ", +" and " => "y", +"Note: The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "Nota: 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.", +"Note: The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "Nota: 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.", +"Note: \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "Nota: \"%s\" no está instalado. No se puede montar %s. Pídale al administrador de sistema que lo instale.", "External Storage" => "Almacenamiento externo", "Folder name" => "Nombre de la carpeta", "External storage" => "Almacenamiento externo", "Configuration" => "Configuración", "Options" => "Opciones", +"Available for" => "Disponible para", "Add storage" => "Añadir almacenamiento", "No user or group" => "Ningún usuario o grupo", "All Users" => "Todos los usuarios", diff --git a/apps/files_external/l10n/fi_FI.php b/apps/files_external/l10n/fi_FI.php index 1924478ad23..677425d8a6a 100644 --- a/apps/files_external/l10n/fi_FI.php +++ b/apps/files_external/l10n/fi_FI.php @@ -6,6 +6,11 @@ $TRANSLATIONS = array( "Please provide a valid Dropbox app key and secret." => "Anna kelvollinen Dropbox-sovellusavain ja salainen vastaus.", "Error configuring Google Drive storage" => "Virhe Google Drive levyn asetuksia tehtäessä", "Saved" => "Tallennettu", +"Note: " => "Huomio: ", +" and " => "ja", +"Note: The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "Huomio: PHP:n cURL-tuki ei ole käytössä tai sitä ei ole asennettu. Kohteen %s liittäminen ei ole mahdollista. Pyydä järjestelmän ylläpitäjää ottamaan cURL-tuki käyttöön.", +"Note: The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "Huomio: PHP:n FTP-tuki ei ole käytössä tai sitä ei ole asennettu. Kohteen %s liittäminen ei ole mahdollista. Pyydä järjestelmän ylläpitäjää ottamaan FTP-tuki käyttöön.", +"Note: \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "Huomio: \"%s\" ei ole asennettu. Kohteen %s liittäminen ei ole mahdollista. Pyydä järjestelmän ylläpitäjää asentamaan puuttuva kohde.", "External Storage" => "Erillinen tallennusväline", "Folder name" => "Kansion nimi", "External storage" => "Ulkoinen tallennustila", diff --git a/apps/files_external/l10n/fr.php b/apps/files_external/l10n/fr.php index 80c18940096..dc4c62522c9 100644 --- a/apps/files_external/l10n/fr.php +++ b/apps/files_external/l10n/fr.php @@ -6,6 +6,7 @@ $TRANSLATIONS = array( "Please provide a valid Dropbox app key and secret." => "Veuillez fournir une clé d'application (app key) ainsi qu'un mot de passe valides.", "Error configuring Google Drive storage" => "Erreur lors de la configuration du support de stockage Google Drive", "Saved" => "Sauvegarder", +" and " => "et", "External Storage" => "Stockage externe", "Folder name" => "Nom du dossier", "External storage" => "Stockage externe", diff --git a/apps/files_external/l10n/gl.php b/apps/files_external/l10n/gl.php index 1117e8590cf..5efa6ce6028 100644 --- a/apps/files_external/l10n/gl.php +++ b/apps/files_external/l10n/gl.php @@ -6,6 +6,11 @@ $TRANSLATIONS = array( "Please provide a valid Dropbox app key and secret." => "Forneza unha chave correcta e segreda do Dropbox.", "Error configuring Google Drive storage" => "Produciuse un erro ao configurar o almacenamento en Google Drive", "Saved" => "Gardado", +"Note: " => "Nota: ", +" and " => "e", +"Note: The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "Nota: 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.", +"Note: The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "Nota: 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.", +"Note: \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "Nota: «%s» non está instalado. Non é posíbel a montaxe de %s. Consulte co administrador do sistema como instalalo.", "External Storage" => "Almacenamento externo", "Folder name" => "Nome do cartafol", "External storage" => "Almacenamento externo", diff --git a/apps/files_external/l10n/it.php b/apps/files_external/l10n/it.php index b68bff2474e..0c4109ae567 100644 --- a/apps/files_external/l10n/it.php +++ b/apps/files_external/l10n/it.php @@ -6,6 +6,11 @@ $TRANSLATIONS = array( "Please provide a valid Dropbox app key and secret." => "Fornisci chiave di applicazione e segreto di Dropbox validi.", "Error configuring Google Drive storage" => "Errore durante la configurazione dell'archivio Google Drive", "Saved" => "Salvato", +"Note: " => "Nota:", +" and " => "e", +"Note: The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "Nota:Il support a cURL non è abilitato o installato in PHP. Impossibile montare %s. Chiedi al tuo amministratore di sistema di installarlo.", +"Note: The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "Nota:Il support a FTP non è abilitato o installato in PHP. Impossibile montare %s. Chiedi al tuo amministratore di sistema di installarlo.", +"Note: \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "Nota:\"%s\" non è installato. Impossibile montare %s. Chiedi al tuo amministratore di sistema di installarlo.", "External Storage" => "Archiviazione esterna", "Folder name" => "Nome della cartella", "External storage" => "Archiviazione esterna", diff --git a/apps/files_external/l10n/pl.php b/apps/files_external/l10n/pl.php index 801a72c9bf9..246e12b6ac8 100644 --- a/apps/files_external/l10n/pl.php +++ b/apps/files_external/l10n/pl.php @@ -6,6 +6,11 @@ $TRANSLATIONS = array( "Please provide a valid Dropbox app key and secret." => "Proszę podać prawidłowy klucz aplikacji Dropbox i klucz sekretny.", "Error configuring Google Drive storage" => "Wystąpił błąd podczas konfigurowania zasobu Google Drive", "Saved" => "Zapisano", +"Note: " => "Uwaga: ", +" and " => "oraz", +"Note: The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "Uwaga: Wsparcie dla cURL w PHP nie zostało włączone lub zainstalowane. Zamontowanie %s nie jest możliwe. Proszę poproś Twojego administratora o zainstalowanie go.", +"Note: The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "Uwaga: Wsparcie dla FTP w PHP nie zostało włączone lub zainstalowane. Zamontowanie %s nie jest możliwe. Proszę poproś Twojego administratora o zainstalowanie go.", +"Note: \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "Uwaga: \"%s\" nie jest zainstalowane. Zamontowanie %s nie jest możliwe. Proszę poproś Twojego administratora o zainstalowanie go.", "External Storage" => "Zewnętrzna zasoby dyskowe", "Folder name" => "Nazwa folderu", "External storage" => "Zewnętrzne zasoby dyskowe", diff --git a/apps/files_external/l10n/pt_BR.php b/apps/files_external/l10n/pt_BR.php index 121c45f45d6..9a5a39f2358 100644 --- a/apps/files_external/l10n/pt_BR.php +++ b/apps/files_external/l10n/pt_BR.php @@ -6,6 +6,11 @@ $TRANSLATIONS = array( "Please provide a valid Dropbox app key and secret." => "Por favor forneça um app key e secret válido do Dropbox", "Error configuring Google Drive storage" => "Erro ao configurar armazenamento do Google Drive", "Saved" => "Salvo", +"Note: " => "Nota:", +" and " => "e", +"Note: The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "Nota: O suporte cURL do PHP não está habilitado ou instalado. Montagem de %s não é possível. Por favor, solicite ao seu administrador do sistema para instalá-lo.", +"Note: The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "Nota: O suporte FTP no PHP não está habilitado ou instalado. Montagem de %s não é possível. Por favor, solicite ao seu administrador do sistema para instalá-lo.", +"Note: \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "Nota: \"%s\" não está instalado. Montagem de %s não é possível. Por favor, solicite ao seu administrador do sistema para instalá-lo.", "External Storage" => "Armazenamento Externo", "Folder name" => "Nome da pasta", "External storage" => "Armazenamento Externo", diff --git a/apps/files_external/l10n/tr.php b/apps/files_external/l10n/tr.php index 07bf1a2354c..3646a47605d 100644 --- a/apps/files_external/l10n/tr.php +++ b/apps/files_external/l10n/tr.php @@ -6,6 +6,11 @@ $TRANSLATIONS = array( "Please provide a valid Dropbox app key and secret." => "Lütfen Dropbox app key ve secret temin ediniz", "Error configuring Google Drive storage" => "Google Drive depo yapılandırma hatası", "Saved" => "Kaydedildi", +"Note: " => "Not: ", +" and " => "ve", +"Note: The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "Not: PHP'de cURL desteği etkin veya kurulu değil. %s bağlaması mümkün olmayacak. Lütfen kurulumu için sistem yöneticilerinizle iletişime geçin.", +"Note: The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "Not: PHP'de FTP desteği etkin veya kurulu değil. %s bağlaması mümkün olmayacak. Lütfen kurulumu için sistem yöneticilerinizle iletişime geçin.", +"Note: \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "Not: \"%s\" kurulu değil. %s bağlaması mümkün olmayacak. Lütfen kurulumu için sistem yöneticilerinizle iletişime geçin.", "External Storage" => "Harici Depolama", "Folder name" => "Klasör ismi", "External storage" => "Harici depolama", diff --git a/apps/files_trashbin/l10n/ast.php b/apps/files_trashbin/l10n/ast.php index d2cfafd679c..91c122bd4d3 100644 --- a/apps/files_trashbin/l10n/ast.php +++ b/apps/files_trashbin/l10n/ast.php @@ -1,5 +1,6 @@ "Fallu", "Name" => "Nome", "Restore" => "Restaurar", "Delete" => "Desaniciar" diff --git a/apps/user_ldap/l10n/ast.php b/apps/user_ldap/l10n/ast.php index e8e2d779d19..2c022880019 100644 --- a/apps/user_ldap/l10n/ast.php +++ b/apps/user_ldap/l10n/ast.php @@ -1,6 +1,7 @@ "Falló'l borráu", +"Error" => "Fallu", "_%s group found_::_%s groups found_" => array("",""), "_%s user found_::_%s users found_" => array("",""), "Save" => "Guardar", diff --git a/apps/user_ldap/l10n/it.php b/apps/user_ldap/l10n/it.php index 4436127747f..ceb29590627 100644 --- a/apps/user_ldap/l10n/it.php +++ b/apps/user_ldap/l10n/it.php @@ -90,6 +90,7 @@ $TRANSLATIONS = array( "Group-Member association" => "Associazione gruppo-utente ", "Nested Groups" => "Gruppi nidificati", "When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" => "Quando è attivato, i gruppi che contengono altri gruppi sono supportati. (Funziona solo se l'attributo del gruppo membro contiene DN.)", +"Paging chunksize" => "Dimensione del blocco di paginazione", "Special Attributes" => "Attributi speciali", "Quota Field" => "Campo Quota", "Quota Default" => "Quota predefinita", diff --git a/core/l10n/ast.php b/core/l10n/ast.php index 9ae1685347c..0fcda328dc0 100644 --- a/core/l10n/ast.php +++ b/core/l10n/ast.php @@ -1,6 +1,7 @@ "Base de datos anovada", +"Invalid image" => "Imaxe inválida", "Sunday" => "Domingu", "Monday" => "Llunes", "Tuesday" => "Martes", @@ -41,6 +42,7 @@ $TRANSLATIONS = array( "Continue" => "Continuar", "Shared" => "Compartíu", "Share" => "Compartir", +"Error" => "Fallu", "Share link" => "Compartir enllaz", "Password" => "Contraseña", "Send" => "Unviar", @@ -62,6 +64,7 @@ $TRANSLATIONS = array( "Reset" => "Reaniciar", "For the best results, please consider using a GNU/Linux server instead." => "Pa los meyores resultaos, por favor considera l'usu d'un sirvidor GNU/Linux nel so llugar.", "Personal" => "Personal", +"Users" => "Usuarios", "Cheers!" => "¡Salú!", "will be used" => "usaráse", "Finishing …" => "Finando ...", diff --git a/core/l10n/de.php b/core/l10n/de.php index 4d8c583e164..fabf35440cb 100644 --- a/core/l10n/de.php +++ b/core/l10n/de.php @@ -51,6 +51,7 @@ $TRANSLATIONS = array( "_{count} file conflict_::_{count} file conflicts_" => array("{count} Dateikonflikt","{count} Dateikonflikte"), "One file conflict" => "Ein Dateikonflikt", "New Files" => "Neue Dateien", +"Already existing files" => "Die Dateien existieren bereits", "Which files do you want to keep?" => "Welche Dateien möchtest Du behalten?", "If you select both versions, the copied file will have a number added to its name." => "Wenn Du beide Versionen auswählst, erhält die kopierte Datei eine Zahl am Ende des Dateinamens.", "Cancel" => "Abbrechen", diff --git a/core/l10n/de_DE.php b/core/l10n/de_DE.php index 900d3c03172..a65714f26f6 100644 --- a/core/l10n/de_DE.php +++ b/core/l10n/de_DE.php @@ -51,6 +51,7 @@ $TRANSLATIONS = array( "_{count} file conflict_::_{count} file conflicts_" => array("{count} Dateikonflikt","{count} Dateikonflikte"), "One file conflict" => "Ein Dateikonflikt", "New Files" => "Neue Dateien", +"Already existing files" => "Die Dateien existieren bereits", "Which files do you want to keep?" => "Welche Dateien möchten Sie behalten?", "If you select both versions, the copied file will have a number added to its name." => "Wenn Sie beide Versionen auswählen, erhält die kopierte Datei eine Zahl am Ende des Dateinamens.", "Cancel" => "Abbrechen", diff --git a/core/l10n/it.php b/core/l10n/it.php index 43e9752f5e0..98d0d5e3b0e 100644 --- a/core/l10n/it.php +++ b/core/l10n/it.php @@ -51,6 +51,7 @@ $TRANSLATIONS = array( "_{count} file conflict_::_{count} file conflicts_" => array("{count} file in conflitto","{count} file in conflitto"), "One file conflict" => "Un file in conflitto", "New Files" => "File nuovi", +"Already existing files" => "File già esistenti", "Which files do you want to keep?" => "Quali file vuoi mantenere?", "If you select both versions, the copied file will have a number added to its name." => "Se selezioni entrambe le versioni, sarà aggiunto un numero al nome del file copiato.", "Cancel" => "Annulla", diff --git a/l10n/ar/lib.po b/l10n/ar/lib.po index f5419aee959..1ac427fb619 100644 --- a/l10n/ar/lib.po +++ b/l10n/ar/lib.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-09 01:55-0400\n" -"PO-Revision-Date: 2014-04-09 05:55+0000\n" +"POT-Creation-Date: 2014-04-10 01:54-0400\n" +"PO-Revision-Date: 2014-04-09 06:10+0000\n" "Last-Translator: I Robot\n" "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n" "MIME-Version: 1.0\n" @@ -363,11 +363,11 @@ msgstr "" #: private/user/manager.php:251 msgid "A valid username must be provided" -msgstr "" +msgstr "يجب ادخال اسم مستخدم صحيح" #: private/user/manager.php:255 msgid "A valid password must be provided" -msgstr "" +msgstr "يجب ادخال كلمة مرور صحيحة" #: private/user/manager.php:260 msgid "The username is already being used" diff --git a/l10n/ar/settings.po b/l10n/ar/settings.po index 6e6dd969c68..9a4af6d1886 100644 --- a/l10n/ar/settings.po +++ b/l10n/ar/settings.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-03-26 01:55-0400\n" -"PO-Revision-Date: 2014-03-26 05:55+0000\n" +"POT-Creation-Date: 2014-04-10 01:54-0400\n" +"PO-Revision-Date: 2014-04-09 06:10+0000\n" "Last-Translator: I Robot\n" "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n" "MIME-Version: 1.0\n" @@ -54,7 +54,7 @@ msgstr "" msgid "Send mode" msgstr "وضعية الإرسال" -#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159 +#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149 msgid "Encryption" msgstr "التشفير" @@ -67,7 +67,7 @@ msgid "Unable to load list from App Store" msgstr "فشل تحميل القائمة من الآب ستور" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 changepassword/controller.php:55 +#: ajax/togglegroups.php:20 changepassword/controller.php:49 msgid "Authentication error" msgstr "لم يتم التأكد من الشخصية بنجاح" @@ -129,32 +129,32 @@ msgstr "فشل إزالة المستخدم من المجموعة %s" msgid "Couldn't update app." msgstr "تعذر تحديث التطبيق." -#: changepassword/controller.php:20 +#: changepassword/controller.php:17 msgid "Wrong password" msgstr "كلمة مرور خاطئة" -#: changepassword/controller.php:42 +#: changepassword/controller.php:36 msgid "No user supplied" msgstr "لم يتم توفير مستخدم " -#: changepassword/controller.php:74 +#: changepassword/controller.php:68 msgid "" "Please provide an admin recovery password, otherwise all user data will be " "lost" msgstr "يرجى توفير كلمة مرور المسؤول المستردة, وإلا سيتم فقد جميع بيانات المستخدم " -#: changepassword/controller.php:79 +#: changepassword/controller.php:73 msgid "" "Wrong admin recovery password. Please check the password and try again." msgstr "خطا في كلمة مرور المسؤول المستردة, يرجى التاكد من كلمة المرور والمحاولة مرة اخرى." -#: changepassword/controller.php:87 +#: changepassword/controller.php:81 msgid "" "Back-end doesn't support password change, but the users encryption key was " "successfully updated." msgstr "Back-end لا يدعم تغيير كلمة المرور, لاكن مفتاح تشفير المستخدمين تم تحديثة بنجاح." -#: changepassword/controller.php:92 changepassword/controller.php:103 +#: changepassword/controller.php:86 changepassword/controller.php:97 msgid "Unable to change password" msgstr "لا يمكن تغيير كلمة المرور" @@ -206,7 +206,7 @@ msgstr "حصل خطأ أثناء تحديث التطبيق" msgid "Error" msgstr "خطأ" -#: js/apps.js:153 templates/apps.php:54 +#: js/apps.js:153 templates/apps.php:55 msgid "Update" msgstr "حدث" @@ -214,31 +214,31 @@ msgstr "حدث" msgid "Updated" msgstr "تم التحديث بنجاح" -#: js/personal.js:246 +#: js/personal.js:243 msgid "Select a profile picture" msgstr "اختر صورة الملف الشخصي " -#: js/personal.js:277 +#: js/personal.js:274 msgid "Very weak password" msgstr "كلمة السر ضعيفة جدا" -#: js/personal.js:278 +#: js/personal.js:275 msgid "Weak password" msgstr "كلمة السر ضعيفة" -#: js/personal.js:279 +#: js/personal.js:276 msgid "So-so password" msgstr "" -#: js/personal.js:280 +#: js/personal.js:277 msgid "Good password" msgstr "كلمة السر جيدة" -#: js/personal.js:281 +#: js/personal.js:278 msgid "Strong password" msgstr "كلمة السر قوية" -#: js/personal.js:316 +#: js/personal.js:313 msgid "Decrypting files... Please wait, this can take some time." msgstr "فك تشفير الملفات... يرجى الانتظار, من الممكن ان ياخذ بعض الوقت." @@ -287,7 +287,7 @@ msgstr "يجب ادخال كلمة مرور صحيحة" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "تحذير: المجلد الرئيسي لـ المستخدم \"{user}\" موجود مسبقا" -#: personal.php:49 personal.php:50 +#: personal.php:48 personal.php:49 msgid "__language_name__" msgstr "__language_name__" @@ -592,11 +592,11 @@ msgstr "المزيد" msgid "Less" msgstr "أقل" -#: templates/admin.php:416 templates/personal.php:181 +#: templates/admin.php:416 templates/personal.php:171 msgid "Version" msgstr "إصدار" -#: templates/admin.php:420 templates/personal.php:184 +#: templates/admin.php:420 templates/personal.php:174 msgid "" "Developed by the ownCloud community, the -licensed by " msgstr "-ترخيص من قبل " @@ -667,108 +667,108 @@ msgstr "ابدأ خطوات بداية التشغيل من جديد" msgid "You have used %s of the available %s" msgstr "تم إستهلاك %s من المتوفر %s" -#: templates/personal.php:39 templates/users.php:21 templates/users.php:87 +#: templates/personal.php:38 templates/users.php:21 templates/users.php:87 msgid "Password" msgstr "كلمة المرور" -#: templates/personal.php:40 +#: templates/personal.php:39 msgid "Your password was changed" msgstr "لقد تم تغيير كلمة السر" -#: templates/personal.php:41 +#: templates/personal.php:40 msgid "Unable to change your password" msgstr "لم يتم تعديل كلمة السر بنجاح" -#: templates/personal.php:43 +#: templates/personal.php:42 msgid "Current password" msgstr "كلمات السر الحالية" -#: templates/personal.php:46 +#: templates/personal.php:45 msgid "New password" msgstr "كلمات سر جديدة" -#: templates/personal.php:50 +#: templates/personal.php:49 msgid "Change password" msgstr "عدل كلمة السر" -#: templates/personal.php:64 templates/users.php:86 +#: templates/personal.php:61 templates/users.php:86 msgid "Full Name" msgstr "اسمك الكامل" -#: templates/personal.php:81 +#: templates/personal.php:76 msgid "Email" msgstr "البريد الإلكترونى" -#: templates/personal.php:83 +#: templates/personal.php:78 msgid "Your email address" msgstr "عنوانك البريدي" -#: templates/personal.php:86 +#: templates/personal.php:81 msgid "" "Fill in an email address to enable password recovery and receive " "notifications" msgstr "" -#: templates/personal.php:96 +#: templates/personal.php:89 msgid "Profile picture" msgstr "صورة الملف الشخصي" -#: templates/personal.php:101 +#: templates/personal.php:94 msgid "Upload new" msgstr "رفع الان" -#: templates/personal.php:103 +#: templates/personal.php:96 msgid "Select new from Files" msgstr "اختر جديد من الملفات " -#: templates/personal.php:104 +#: templates/personal.php:97 msgid "Remove image" msgstr "احذف الصورة " -#: templates/personal.php:105 +#: templates/personal.php:98 msgid "Either png or jpg. Ideally square but you will be able to crop it." msgstr "سواء png او jpg. بامكانك قص الصورة " -#: templates/personal.php:107 +#: templates/personal.php:100 msgid "Your avatar is provided by your original account." msgstr "صورتك الرمزية يتم توفيرها عن طريق حسابك الاصلي." -#: templates/personal.php:111 +#: templates/personal.php:104 msgid "Cancel" msgstr "الغاء" -#: templates/personal.php:112 +#: templates/personal.php:105 msgid "Choose as profile image" msgstr "اختر صورة الملف الشخصي" -#: templates/personal.php:120 templates/personal.php:121 +#: templates/personal.php:111 templates/personal.php:112 msgid "Language" msgstr "اللغة" -#: templates/personal.php:140 +#: templates/personal.php:131 msgid "Help translate" msgstr "ساعد في الترجمه" -#: templates/personal.php:147 +#: templates/personal.php:137 msgid "WebDAV" msgstr "WebDAV" -#: templates/personal.php:149 +#: templates/personal.php:139 #, php-format msgid "" "Use this address to access your Files via " "WebDAV" msgstr "استخدم هذا العنوان لـ الدخول الى ملفاتك عن طريق WebDAV" -#: templates/personal.php:161 +#: templates/personal.php:151 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "البرنامج المشفر لم يعد مفعل, يرجى فك التشفير عن كل ملفاتك" -#: templates/personal.php:167 +#: templates/personal.php:157 msgid "Log-in password" msgstr "كلمه سر الدخول" -#: templates/personal.php:172 +#: templates/personal.php:162 msgid "Decrypt all Files" msgstr "فك تشفير جميع الملفات " diff --git a/l10n/ast/core.po b/l10n/ast/core.po index 96ac7799a29..145a76968a8 100644 --- a/l10n/ast/core.po +++ b/l10n/ast/core.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-09 01:55-0400\n" -"PO-Revision-Date: 2014-04-08 22:40+0000\n" +"POT-Creation-Date: 2014-04-10 01:54-0400\n" +"PO-Revision-Date: 2014-04-09 21:20+0000\n" "Last-Translator: Tornes Llume \n" "Language-Team: Asturian (http://www.transifex.com/projects/p/owncloud/language/ast/)\n" "MIME-Version: 1.0\n" @@ -49,7 +49,7 @@ msgstr "" #: avatar/controller.php:85 msgid "Invalid image" -msgstr "" +msgstr "Imaxe inválida" #: avatar/controller.php:115 avatar/controller.php:142 msgid "No temporary profile picture available, try again" @@ -143,127 +143,127 @@ msgstr "Axustes" msgid "Saving..." msgstr "" -#: js/js.js:1124 +#: js/js.js:1099 msgid "seconds ago" msgstr "fai segundos" -#: js/js.js:1125 +#: js/js.js:1100 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "fai %n minutu" msgstr[1] "fai %n minutos" -#: js/js.js:1126 +#: js/js.js:1101 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "fai %n hora" msgstr[1] "fai %n hores" -#: js/js.js:1127 +#: js/js.js:1102 msgid "today" msgstr "güei" -#: js/js.js:1128 +#: js/js.js:1103 msgid "yesterday" msgstr "ayeri" -#: js/js.js:1129 +#: js/js.js:1104 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "fai %n día" msgstr[1] "fai %n díes" -#: js/js.js:1130 +#: js/js.js:1105 msgid "last month" msgstr "mes caberu" -#: js/js.js:1131 +#: js/js.js:1106 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "fai %n mes" msgstr[1] "fai %n meses" -#: js/js.js:1132 +#: js/js.js:1107 msgid "months ago" msgstr "fai meses" -#: js/js.js:1133 +#: js/js.js:1108 msgid "last year" msgstr "añu caberu" -#: js/js.js:1134 +#: js/js.js:1109 msgid "years ago" msgstr "fai años" -#: js/oc-dialogs.js:123 +#: js/oc-dialogs.js:125 msgid "Choose" msgstr "Esbillar" -#: js/oc-dialogs.js:146 +#: js/oc-dialogs.js:151 msgid "Error loading file picker template: {error}" msgstr "" -#: js/oc-dialogs.js:172 +#: js/oc-dialogs.js:177 msgid "Yes" msgstr "Sí" -#: js/oc-dialogs.js:182 +#: js/oc-dialogs.js:187 msgid "No" msgstr "Non" -#: js/oc-dialogs.js:199 +#: js/oc-dialogs.js:204 msgid "Ok" msgstr "" -#: js/oc-dialogs.js:219 +#: js/oc-dialogs.js:224 msgid "Error loading message template: {error}" msgstr "" -#: js/oc-dialogs.js:347 +#: js/oc-dialogs.js:352 msgid "{count} file conflict" msgid_plural "{count} file conflicts" msgstr[0] "" msgstr[1] "" -#: js/oc-dialogs.js:361 +#: js/oc-dialogs.js:366 msgid "One file conflict" msgstr "" -#: js/oc-dialogs.js:367 +#: js/oc-dialogs.js:372 msgid "New Files" msgstr "" -#: js/oc-dialogs.js:368 +#: js/oc-dialogs.js:373 msgid "Already existing files" msgstr "" -#: js/oc-dialogs.js:370 +#: js/oc-dialogs.js:375 msgid "Which files do you want to keep?" msgstr "¿Qué ficheros quies caltener?" -#: js/oc-dialogs.js:371 +#: js/oc-dialogs.js:376 msgid "" "If you select both versions, the copied file will have a number added to its" " name." msgstr "" -#: js/oc-dialogs.js:379 +#: js/oc-dialogs.js:384 msgid "Cancel" msgstr "Encaboxar" -#: js/oc-dialogs.js:389 +#: js/oc-dialogs.js:394 msgid "Continue" msgstr "Continuar" -#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +#: js/oc-dialogs.js:441 js/oc-dialogs.js:454 msgid "(all selected)" msgstr "" -#: js/oc-dialogs.js:439 js/oc-dialogs.js:452 +#: js/oc-dialogs.js:444 js/oc-dialogs.js:457 msgid "({count} selected)" msgstr "" -#: js/oc-dialogs.js:460 +#: js/oc-dialogs.js:465 msgid "Error loading file exists template" msgstr "" @@ -298,7 +298,7 @@ msgstr "Compartir" #: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711 #: templates/installation.php:10 msgid "Error" -msgstr "" +msgstr "Fallu" #: js/share.js:160 js/share.js:767 msgid "Error while sharing" @@ -560,7 +560,7 @@ msgstr "Personal" #: strings.php:6 msgid "Users" -msgstr "" +msgstr "Usuarios" #: strings.php:7 templates/layout.user.php:116 msgid "Apps" diff --git a/l10n/ast/files.po b/l10n/ast/files.po index f3d8d88b2df..03e4145bb31 100644 --- a/l10n/ast/files.po +++ b/l10n/ast/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-09 01:55-0400\n" -"PO-Revision-Date: 2014-04-08 22:20+0000\n" +"POT-Creation-Date: 2014-04-10 01:54-0400\n" +"PO-Revision-Date: 2014-04-09 21:20+0000\n" "Last-Translator: I Robot\n" "Language-Team: Asturian (http://www.transifex.com/projects/p/owncloud/language/ast/)\n" "MIME-Version: 1.0\n" @@ -177,7 +177,7 @@ msgstr "" msgid "In the home folder 'Shared' is a reserved filename" msgstr "" -#: js/file-upload.js:548 js/filelist.js:603 +#: js/file-upload.js:548 js/filelist.js:587 msgid "{new_name} already exists" msgstr "" @@ -211,37 +211,37 @@ msgstr "" #: js/filelist.js:102 js/files.js:552 msgid "Error" -msgstr "" +msgstr "Fallu" -#: js/filelist.js:267 js/filelist.js:1113 +#: js/filelist.js:251 js/filelist.js:1101 msgid "Pending" msgstr "" -#: js/filelist.js:630 +#: js/filelist.js:614 msgid "Could not rename file" msgstr "" -#: js/filelist.js:789 +#: js/filelist.js:777 msgid "Error deleting file." msgstr "" -#: js/filelist.js:814 js/filelist.js:891 js/files.js:589 +#: js/filelist.js:802 js/filelist.js:879 js/files.js:589 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:815 js/filelist.js:892 js/files.js:595 +#: js/filelist.js:803 js/filelist.js:880 js/files.js:595 msgid "%n file" msgid_plural "%n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:822 +#: js/filelist.js:810 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:1052 js/filelist.js:1090 +#: js/filelist.js:1040 js/filelist.js:1078 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" @@ -355,7 +355,7 @@ msgstr "" #: templates/index.php:12 msgid "New folder" -msgstr "" +msgstr "Nueva carpeta" #: templates/index.php:13 msgid "Folder" diff --git a/l10n/ast/files_external.po b/l10n/ast/files_external.po index d330ac83e5b..ac5c5b82314 100644 --- a/l10n/ast/files_external.po +++ b/l10n/ast/files_external.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-09 01:55-0400\n" -"PO-Revision-Date: 2014-04-09 05:55+0000\n" +"POT-Creation-Date: 2014-04-10 01:54-0400\n" +"PO-Revision-Date: 2014-04-09 21:20+0000\n" "Last-Translator: I Robot\n" "Language-Team: Asturian (http://www.transifex.com/projects/p/owncloud/language/ast/)\n" "MIME-Version: 1.0\n" @@ -76,7 +76,7 @@ msgstr "" #: templates/settings.php:8 templates/settings.php:27 msgid "Folder name" -msgstr "" +msgstr "Nome de la carpeta" #: templates/settings.php:9 msgid "External storage" @@ -112,7 +112,7 @@ msgstr "Grupos" #: templates/settings.php:105 msgid "Users" -msgstr "" +msgstr "Usuarios" #: templates/settings.php:118 templates/settings.php:119 #: templates/settings.php:158 templates/settings.php:159 diff --git a/l10n/ast/files_trashbin.po b/l10n/ast/files_trashbin.po index bab374d0cd0..180064b93cb 100644 --- a/l10n/ast/files_trashbin.po +++ b/l10n/ast/files_trashbin.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-09 01:55-0400\n" -"PO-Revision-Date: 2014-04-08 21:40+0000\n" +"POT-Creation-Date: 2014-04-10 01:54-0400\n" +"PO-Revision-Date: 2014-04-09 21:20+0000\n" "Last-Translator: I Robot\n" "Language-Team: Asturian (http://www.transifex.com/projects/p/owncloud/language/ast/)\n" "MIME-Version: 1.0\n" @@ -33,7 +33,7 @@ msgstr "" #: js/trash.js:33 js/trash.js:124 js/trash.js:173 msgid "Error" -msgstr "" +msgstr "Fallu" #: js/trash.js:264 msgid "Deleted Files" diff --git a/l10n/ast/lib.po b/l10n/ast/lib.po index fe01f80318e..7608549ac6d 100644 --- a/l10n/ast/lib.po +++ b/l10n/ast/lib.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Tornes Llume , 2014 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-09 01:55-0400\n" -"PO-Revision-Date: 2014-04-09 05:55+0000\n" -"Last-Translator: I Robot\n" +"POT-Creation-Date: 2014-04-10 01:54-0400\n" +"PO-Revision-Date: 2014-04-09 09:20+0000\n" +"Last-Translator: Tornes Llume \n" "Language-Team: Asturian (http://www.transifex.com/projects/p/owncloud/language/ast/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -42,7 +43,7 @@ msgstr "Axustes" #: private/app.php:389 msgid "Users" -msgstr "" +msgstr "Usuarios" #: private/app.php:402 msgid "Admin" @@ -51,7 +52,7 @@ msgstr "" #: private/app.php:875 #, php-format msgid "Failed to upgrade \"%s\"." -msgstr "" +msgstr "Fallu al anovar \"%s\"." #: private/avatar.php:66 msgid "Unknown filetype" @@ -59,7 +60,7 @@ msgstr "" #: private/avatar.php:71 msgid "Invalid image" -msgstr "" +msgstr "Imaxe inválida" #: private/defaults.php:35 msgid "web services under your control" @@ -145,7 +146,7 @@ msgstr "" #: private/json.php:29 msgid "Application is not enabled" -msgstr "" +msgstr "L'aplicación nun ta habilitada" #: private/json.php:40 private/json.php:63 private/json.php:88 msgid "Authentication error" @@ -169,7 +170,7 @@ msgstr "Testu" #: private/search/provider/file.php:30 msgid "Images" -msgstr "" +msgstr "Imaxes" #: private/setup/abstractdatabase.php:26 #, php-format @@ -261,11 +262,11 @@ msgstr "" #: private/setup.php:28 msgid "Set an admin username." -msgstr "" +msgstr "Afitar nome d'usuariu p'almin" #: private/setup.php:31 msgid "Set an admin password." -msgstr "" +msgstr "Afitar contraseña p'almin" #: private/setup.php:202 msgid "" @@ -287,7 +288,7 @@ msgstr "" #: private/tags.php:193 #, php-format msgid "Could not find category \"%s\"" -msgstr "" +msgstr "Nun pudo alcontrase la estaya \"%s.\"" #: private/template/functions.php:133 msgid "seconds ago" diff --git a/l10n/ast/settings.po b/l10n/ast/settings.po index adb96b40df3..0c2cf566e17 100644 --- a/l10n/ast/settings.po +++ b/l10n/ast/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-09 01:55-0400\n" -"PO-Revision-Date: 2014-04-08 22:40+0000\n" +"POT-Creation-Date: 2014-04-10 01:54-0400\n" +"PO-Revision-Date: 2014-04-09 21:20+0000\n" "Last-Translator: I Robot\n" "Language-Team: Asturian (http://www.transifex.com/projects/p/owncloud/language/ast/)\n" "MIME-Version: 1.0\n" @@ -201,7 +201,7 @@ msgstr "" #: js/apps.js:152 msgid "Error" -msgstr "" +msgstr "Fallu" #: js/apps.js:153 templates/apps.php:55 msgid "Update" diff --git a/l10n/ast/user_ldap.po b/l10n/ast/user_ldap.po index 93779a6b297..2ee3b4bb024 100644 --- a/l10n/ast/user_ldap.po +++ b/l10n/ast/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-09 01:55-0400\n" -"PO-Revision-Date: 2014-04-08 22:40+0000\n" +"POT-Creation-Date: 2014-04-10 01:54-0400\n" +"PO-Revision-Date: 2014-04-09 21:20+0000\n" "Last-Translator: I Robot\n" "Language-Team: Asturian (http://www.transifex.com/projects/p/owncloud/language/ast/)\n" "MIME-Version: 1.0\n" @@ -84,7 +84,7 @@ msgstr "" #: js/settings.js:133 msgid "Error" -msgstr "" +msgstr "Fallu" #: js/settings.js:838 msgid "Configuration OK" @@ -144,7 +144,7 @@ msgstr[1] "" msgid "Invalid Host" msgstr "" -#: lib/wizard.php:963 +#: lib/wizard.php:983 msgid "Could not find the desired feature" msgstr "" diff --git a/l10n/ca/lib.po b/l10n/ca/lib.po index 348b20d7afe..7b5a5cd549f 100644 --- a/l10n/ca/lib.po +++ b/l10n/ca/lib.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-09 01:55-0400\n" -"PO-Revision-Date: 2014-04-09 05:55+0000\n" +"POT-Creation-Date: 2014-04-10 01:54-0400\n" +"PO-Revision-Date: 2014-04-09 06:10+0000\n" "Last-Translator: I Robot\n" "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n" "MIME-Version: 1.0\n" @@ -346,12 +346,12 @@ msgstr "" #: private/user/manager.php:251 msgid "A valid username must be provided" -msgstr "" +msgstr "Heu de facilitar un nom d'usuari vàlid" #: private/user/manager.php:255 msgid "A valid password must be provided" -msgstr "" +msgstr "Heu de facilitar una contrasenya vàlida" #: private/user/manager.php:260 msgid "The username is already being used" -msgstr "" +msgstr "El nom d'usuari ja està en ús" diff --git a/l10n/ca/settings.po b/l10n/ca/settings.po index 9368907aeb2..ec8cf451845 100644 --- a/l10n/ca/settings.po +++ b/l10n/ca/settings.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-03-27 01:55-0400\n" -"PO-Revision-Date: 2014-03-26 13:43+0000\n" +"POT-Creation-Date: 2014-04-10 01:54-0400\n" +"PO-Revision-Date: 2014-04-09 06:10+0000\n" "Last-Translator: Josep Torné \n" "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n" "MIME-Version: 1.0\n" @@ -54,7 +54,7 @@ msgstr "Heu d'establir un nom d'usuari abans de poder enviar correus de prova." msgid "Send mode" msgstr "Mode d'enviament" -#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159 +#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149 msgid "Encryption" msgstr "Xifrat" @@ -67,7 +67,7 @@ msgid "Unable to load list from App Store" msgstr "No s'ha pogut carregar la llista des de l'App Store" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 changepassword/controller.php:55 +#: ajax/togglegroups.php:20 changepassword/controller.php:49 msgid "Authentication error" msgstr "Error d'autenticació" @@ -129,32 +129,32 @@ msgstr "No es pot eliminar l'usuari del grup %s" msgid "Couldn't update app." msgstr "No s'ha pogut actualitzar l'aplicació." -#: changepassword/controller.php:20 +#: changepassword/controller.php:17 msgid "Wrong password" msgstr "Contrasenya incorrecta" -#: changepassword/controller.php:42 +#: changepassword/controller.php:36 msgid "No user supplied" msgstr "No heu proporcionat cap usuari" -#: changepassword/controller.php:74 +#: changepassword/controller.php:68 msgid "" "Please provide an admin recovery password, otherwise all user data will be " "lost" msgstr "Sisplau, proporcioneu una contrasenya de recuperació d'administrador, altrament totes les dades d'usuari es perdran" -#: changepassword/controller.php:79 +#: changepassword/controller.php:73 msgid "" "Wrong admin recovery password. Please check the password and try again." msgstr "La contrasenya de recuperació d'administrador és incorrecta. Comproveu-la i torneu-ho a intentar." -#: changepassword/controller.php:87 +#: changepassword/controller.php:81 msgid "" "Back-end doesn't support password change, but the users encryption key was " "successfully updated." msgstr "El dorsal no permet canviar la contrasenya, però la clau d'encripació d'usuaris s'ha actualitzat correctament." -#: changepassword/controller.php:92 changepassword/controller.php:103 +#: changepassword/controller.php:86 changepassword/controller.php:97 msgid "Unable to change password" msgstr "No es pot canviar la contrasenya" @@ -206,7 +206,7 @@ msgstr "Error en actualitzar l'aplicació" msgid "Error" msgstr "Error" -#: js/apps.js:153 templates/apps.php:54 +#: js/apps.js:153 templates/apps.php:55 msgid "Update" msgstr "Actualitza" @@ -214,31 +214,31 @@ msgstr "Actualitza" msgid "Updated" msgstr "Actualitzada" -#: js/personal.js:246 +#: js/personal.js:243 msgid "Select a profile picture" msgstr "Seleccioneu una imatge de perfil" -#: js/personal.js:277 +#: js/personal.js:274 msgid "Very weak password" msgstr "Contrasenya massa feble" -#: js/personal.js:278 +#: js/personal.js:275 msgid "Weak password" msgstr "Contrasenya feble" -#: js/personal.js:279 +#: js/personal.js:276 msgid "So-so password" msgstr "Contrasenya passable" -#: js/personal.js:280 +#: js/personal.js:277 msgid "Good password" msgstr "Contrasenya bona" -#: js/personal.js:281 +#: js/personal.js:278 msgid "Strong password" msgstr "Contrasenya forta" -#: js/personal.js:316 +#: js/personal.js:313 msgid "Decrypting files... Please wait, this can take some time." msgstr "Desencriptant fitxers... Espereu, això pot trigar una estona." @@ -287,7 +287,7 @@ msgstr "Heu de facilitar una contrasenya vàlida" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "Avís: la carpeta Home per l'usuari \"{user}\" ja existeix" -#: personal.php:49 personal.php:50 +#: personal.php:48 personal.php:49 msgid "__language_name__" msgstr "Català" @@ -592,11 +592,11 @@ msgstr "Més" msgid "Less" msgstr "Menys" -#: templates/admin.php:416 templates/personal.php:181 +#: templates/admin.php:416 templates/personal.php:171 msgid "Version" msgstr "Versió" -#: templates/admin.php:420 templates/personal.php:184 +#: templates/admin.php:420 templates/personal.php:174 msgid "" "Developed by the ownCloud community, the -licensed by " msgstr "-propietat de " @@ -667,108 +667,108 @@ msgstr "Torna a mostrar l'assistent de primera execució" msgid "You have used %s of the available %s" msgstr "Heu utilitzat %s d'un total disponible de %s" -#: templates/personal.php:39 templates/users.php:21 templates/users.php:87 +#: templates/personal.php:38 templates/users.php:21 templates/users.php:87 msgid "Password" msgstr "Contrasenya" -#: templates/personal.php:40 +#: templates/personal.php:39 msgid "Your password was changed" msgstr "La seva contrasenya s'ha canviat" -#: templates/personal.php:41 +#: templates/personal.php:40 msgid "Unable to change your password" msgstr "No s'ha pogut canviar la contrasenya" -#: templates/personal.php:43 +#: templates/personal.php:42 msgid "Current password" msgstr "Contrasenya actual" -#: templates/personal.php:46 +#: templates/personal.php:45 msgid "New password" msgstr "Contrasenya nova" -#: templates/personal.php:50 +#: templates/personal.php:49 msgid "Change password" msgstr "Canvia la contrasenya" -#: templates/personal.php:64 templates/users.php:86 +#: templates/personal.php:61 templates/users.php:86 msgid "Full Name" msgstr "Nom complet" -#: templates/personal.php:81 +#: templates/personal.php:76 msgid "Email" msgstr "Correu electrònic" -#: templates/personal.php:83 +#: templates/personal.php:78 msgid "Your email address" msgstr "Correu electrònic" -#: templates/personal.php:86 +#: templates/personal.php:81 msgid "" "Fill in an email address to enable password recovery and receive " "notifications" msgstr "Ompliu una adreça de correu per poder recuperar la contrasenya i rebre notificacions" -#: templates/personal.php:96 +#: templates/personal.php:89 msgid "Profile picture" msgstr "Foto de perfil" -#: templates/personal.php:101 +#: templates/personal.php:94 msgid "Upload new" msgstr "Puja'n una de nova" -#: templates/personal.php:103 +#: templates/personal.php:96 msgid "Select new from Files" msgstr "Selecciona'n una de nova dels fitxers" -#: templates/personal.php:104 +#: templates/personal.php:97 msgid "Remove image" msgstr "Elimina imatge" -#: templates/personal.php:105 +#: templates/personal.php:98 msgid "Either png or jpg. Ideally square but you will be able to crop it." msgstr "Pot ser png o jpg. Idealment quadrada, però podreu retallar-la." -#: templates/personal.php:107 +#: templates/personal.php:100 msgid "Your avatar is provided by your original account." msgstr "El vostre compte original proporciona l'avatar." -#: templates/personal.php:111 +#: templates/personal.php:104 msgid "Cancel" msgstr "Cancel·la" -#: templates/personal.php:112 +#: templates/personal.php:105 msgid "Choose as profile image" msgstr "Selecciona com a imatge de perfil" -#: templates/personal.php:120 templates/personal.php:121 +#: templates/personal.php:111 templates/personal.php:112 msgid "Language" msgstr "Idioma" -#: templates/personal.php:140 +#: templates/personal.php:131 msgid "Help translate" msgstr "Ajudeu-nos amb la traducció" -#: templates/personal.php:147 +#: templates/personal.php:137 msgid "WebDAV" msgstr "WebDAV" -#: templates/personal.php:149 +#: templates/personal.php:139 #, php-format msgid "" "Use this address to access your Files via " "WebDAV" msgstr "Useu aquesta adreça per accedir als fitxers via WebDAV" -#: templates/personal.php:161 +#: templates/personal.php:151 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "L'aplicació d'encriptació ja no està activada, desencripteu tots els vostres fitxers" -#: templates/personal.php:167 +#: templates/personal.php:157 msgid "Log-in password" msgstr "Contrasenya d'accés" -#: templates/personal.php:172 +#: templates/personal.php:162 msgid "Decrypt all Files" msgstr "Desencripta tots els fitxers" diff --git a/l10n/cs_CZ/lib.po b/l10n/cs_CZ/lib.po index f613429e0bd..92e8e85cb40 100644 --- a/l10n/cs_CZ/lib.po +++ b/l10n/cs_CZ/lib.po @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-09 01:55-0400\n" -"PO-Revision-Date: 2014-04-09 05:55+0000\n" +"POT-Creation-Date: 2014-04-10 01:54-0400\n" +"PO-Revision-Date: 2014-04-09 06:10+0000\n" "Last-Translator: I Robot\n" "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n" "MIME-Version: 1.0\n" @@ -354,12 +354,12 @@ msgstr "" #: private/user/manager.php:251 msgid "A valid username must be provided" -msgstr "" +msgstr "Musíte zadat platné uživatelské jméno" #: private/user/manager.php:255 msgid "A valid password must be provided" -msgstr "" +msgstr "Musíte zadat platné heslo" #: private/user/manager.php:260 msgid "The username is already being used" -msgstr "" +msgstr "Uživatelské jméno je již využíváno" diff --git a/l10n/cs_CZ/settings.po b/l10n/cs_CZ/settings.po index 3a2d8b6029b..b9a259d6d43 100644 --- a/l10n/cs_CZ/settings.po +++ b/l10n/cs_CZ/settings.po @@ -14,8 +14,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-03-28 01:55-0400\n" -"PO-Revision-Date: 2014-03-27 21:10+0000\n" +"POT-Creation-Date: 2014-04-10 01:54-0400\n" +"PO-Revision-Date: 2014-04-09 06:10+0000\n" "Last-Translator: m23 \n" "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n" "MIME-Version: 1.0\n" @@ -58,7 +58,7 @@ msgstr "Pro možnost odeslání zkušebních e-mailů musíte nejprve nastavit s msgid "Send mode" msgstr "Mód odesílání" -#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159 +#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149 msgid "Encryption" msgstr "Šifrování" @@ -71,7 +71,7 @@ msgid "Unable to load list from App Store" msgstr "Nelze načíst seznam z App Store" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 changepassword/controller.php:55 +#: ajax/togglegroups.php:20 changepassword/controller.php:49 msgid "Authentication error" msgstr "Chyba přihlášení" @@ -133,32 +133,32 @@ msgstr "Nelze odebrat uživatele ze skupiny %s" msgid "Couldn't update app." msgstr "Nelze aktualizovat aplikaci." -#: changepassword/controller.php:20 +#: changepassword/controller.php:17 msgid "Wrong password" msgstr "Nesprávné heslo" -#: changepassword/controller.php:42 +#: changepassword/controller.php:36 msgid "No user supplied" msgstr "Nebyl uveden uživatel" -#: changepassword/controller.php:74 +#: changepassword/controller.php:68 msgid "" "Please provide an admin recovery password, otherwise all user data will be " "lost" msgstr "Zadejte prosím administrátorské heslo pro obnovu, jinak budou všechna data ztracena" -#: changepassword/controller.php:79 +#: changepassword/controller.php:73 msgid "" "Wrong admin recovery password. Please check the password and try again." msgstr "Chybné administrátorské heslo pro obnovu. Překontrolujte správnost hesla a zkuste to znovu." -#: changepassword/controller.php:87 +#: changepassword/controller.php:81 msgid "" "Back-end doesn't support password change, but the users encryption key was " "successfully updated." msgstr "Úložiště nepodporuje změnu hesla, ale šifrovací klíč uživatelů byl úspěšně změněn." -#: changepassword/controller.php:92 changepassword/controller.php:103 +#: changepassword/controller.php:86 changepassword/controller.php:97 msgid "Unable to change password" msgstr "Změna hesla se nezdařila" @@ -210,7 +210,7 @@ msgstr "Chyba při aktualizaci aplikace" msgid "Error" msgstr "Chyba" -#: js/apps.js:153 templates/apps.php:54 +#: js/apps.js:153 templates/apps.php:55 msgid "Update" msgstr "Aktualizovat" @@ -218,31 +218,31 @@ msgstr "Aktualizovat" msgid "Updated" msgstr "Aktualizováno" -#: js/personal.js:246 +#: js/personal.js:243 msgid "Select a profile picture" msgstr "Vyberte profilový obrázek" -#: js/personal.js:277 +#: js/personal.js:274 msgid "Very weak password" msgstr "Velmi slabé heslo" -#: js/personal.js:278 +#: js/personal.js:275 msgid "Weak password" msgstr "Slabé heslo" -#: js/personal.js:279 +#: js/personal.js:276 msgid "So-so password" msgstr "Středně silné heslo" -#: js/personal.js:280 +#: js/personal.js:277 msgid "Good password" msgstr "Dobré heslo" -#: js/personal.js:281 +#: js/personal.js:278 msgid "Strong password" msgstr "Silné heslo" -#: js/personal.js:316 +#: js/personal.js:313 msgid "Decrypting files... Please wait, this can take some time." msgstr "Probíhá dešifrování souborů... Čekejte prosím, tato operace může trvat nějakou dobu." @@ -291,7 +291,7 @@ msgstr "Musíte zadat platné heslo" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "Varování: Osobní složka uživatele \"{user}\" již existuje." -#: personal.php:49 personal.php:50 +#: personal.php:48 personal.php:49 msgid "__language_name__" msgstr "Česky" @@ -596,11 +596,11 @@ msgstr "Více" msgid "Less" msgstr "Méně" -#: templates/admin.php:416 templates/personal.php:181 +#: templates/admin.php:416 templates/personal.php:171 msgid "Version" msgstr "Verze" -#: templates/admin.php:420 templates/personal.php:184 +#: templates/admin.php:420 templates/personal.php:174 msgid "" "Developed by the ownCloud community, the -licensed by " msgstr "-licencováno " @@ -671,108 +671,108 @@ msgstr "Znovu zobrazit průvodce prvním spuštěním" msgid "You have used %s of the available %s" msgstr "Používáte %s z %s dostupných" -#: templates/personal.php:39 templates/users.php:21 templates/users.php:87 +#: templates/personal.php:38 templates/users.php:21 templates/users.php:87 msgid "Password" msgstr "Heslo" -#: templates/personal.php:40 +#: templates/personal.php:39 msgid "Your password was changed" msgstr "Vaše heslo bylo změněno" -#: templates/personal.php:41 +#: templates/personal.php:40 msgid "Unable to change your password" msgstr "Změna vašeho hesla se nezdařila" -#: templates/personal.php:43 +#: templates/personal.php:42 msgid "Current password" msgstr "Současné heslo" -#: templates/personal.php:46 +#: templates/personal.php:45 msgid "New password" msgstr "Nové heslo" -#: templates/personal.php:50 +#: templates/personal.php:49 msgid "Change password" msgstr "Změnit heslo" -#: templates/personal.php:64 templates/users.php:86 +#: templates/personal.php:61 templates/users.php:86 msgid "Full Name" msgstr "Celé jméno" -#: templates/personal.php:81 +#: templates/personal.php:76 msgid "Email" msgstr "E-mail" -#: templates/personal.php:83 +#: templates/personal.php:78 msgid "Your email address" msgstr "Vaše e-mailová adresa" -#: templates/personal.php:86 +#: templates/personal.php:81 msgid "" "Fill in an email address to enable password recovery and receive " "notifications" msgstr "Zadejte e-mailovou adresu pro umožnění obnovy zapomenutého hesla a pro přijímání upozornění." -#: templates/personal.php:96 +#: templates/personal.php:89 msgid "Profile picture" msgstr "Profilový obrázek" -#: templates/personal.php:101 +#: templates/personal.php:94 msgid "Upload new" msgstr "Nahrát nový" -#: templates/personal.php:103 +#: templates/personal.php:96 msgid "Select new from Files" msgstr "Vyberte nový ze souborů" -#: templates/personal.php:104 +#: templates/personal.php:97 msgid "Remove image" msgstr "Odebrat obrázek" -#: templates/personal.php:105 +#: templates/personal.php:98 msgid "Either png or jpg. Ideally square but you will be able to crop it." msgstr "png nebo jpg, nejlépe čtvercový, ale budete mít možnost jej oříznout." -#: templates/personal.php:107 +#: templates/personal.php:100 msgid "Your avatar is provided by your original account." msgstr "Váš avatar je poskytován Vaším původním účtem." -#: templates/personal.php:111 +#: templates/personal.php:104 msgid "Cancel" msgstr "Zrušit" -#: templates/personal.php:112 +#: templates/personal.php:105 msgid "Choose as profile image" msgstr "Vybrat jako profilový obrázek" -#: templates/personal.php:120 templates/personal.php:121 +#: templates/personal.php:111 templates/personal.php:112 msgid "Language" msgstr "Jazyk" -#: templates/personal.php:140 +#: templates/personal.php:131 msgid "Help translate" msgstr "Pomoci s překladem" -#: templates/personal.php:147 +#: templates/personal.php:137 msgid "WebDAV" msgstr "WebDAV" -#: templates/personal.php:149 +#: templates/personal.php:139 #, php-format msgid "" "Use this address to access your Files via " "WebDAV" msgstr "Použijte tuto adresu pro přístup k vašim souborům přes WebDAV" -#: templates/personal.php:161 +#: templates/personal.php:151 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "Šifrovací aplikace již není spuštěna, dešifrujte prosím všechny své soubory" -#: templates/personal.php:167 +#: templates/personal.php:157 msgid "Log-in password" msgstr "Přihlašovací heslo" -#: templates/personal.php:172 +#: templates/personal.php:162 msgid "Decrypt all Files" msgstr "Odšifrovat všechny soubory" diff --git a/l10n/da/lib.po b/l10n/da/lib.po index 94ac0b43f36..6bef7060df0 100644 --- a/l10n/da/lib.po +++ b/l10n/da/lib.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-09 01:55-0400\n" -"PO-Revision-Date: 2014-04-09 05:55+0000\n" +"POT-Creation-Date: 2014-04-10 01:54-0400\n" +"PO-Revision-Date: 2014-04-09 06:10+0000\n" "Last-Translator: I Robot\n" "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n" "MIME-Version: 1.0\n" @@ -349,11 +349,11 @@ msgstr "" #: private/user/manager.php:251 msgid "A valid username must be provided" -msgstr "" +msgstr "Et gyldigt brugernavn skal angives" #: private/user/manager.php:255 msgid "A valid password must be provided" -msgstr "" +msgstr "En gyldig adgangskode skal angives" #: private/user/manager.php:260 msgid "The username is already being used" diff --git a/l10n/da/settings.po b/l10n/da/settings.po index ecc1285414a..2841b8d5188 100644 --- a/l10n/da/settings.po +++ b/l10n/da/settings.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-03-27 01:55-0400\n" -"PO-Revision-Date: 2014-03-26 09:30+0000\n" +"POT-Creation-Date: 2014-04-10 01:54-0400\n" +"PO-Revision-Date: 2014-04-09 06:10+0000\n" "Last-Translator: Sappe\n" "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n" "MIME-Version: 1.0\n" @@ -55,7 +55,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159 +#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149 msgid "Encryption" msgstr "Kryptering" @@ -68,7 +68,7 @@ msgid "Unable to load list from App Store" msgstr "Kunne ikke indlæse listen fra App Store" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 changepassword/controller.php:55 +#: ajax/togglegroups.php:20 changepassword/controller.php:49 msgid "Authentication error" msgstr "Adgangsfejl" @@ -130,32 +130,32 @@ msgstr "Brugeren kan ikke fjernes fra gruppen %s" msgid "Couldn't update app." msgstr "Kunne ikke opdatere app'en." -#: changepassword/controller.php:20 +#: changepassword/controller.php:17 msgid "Wrong password" msgstr "Forkert kodeord" -#: changepassword/controller.php:42 +#: changepassword/controller.php:36 msgid "No user supplied" msgstr "Intet brugernavn givet" -#: changepassword/controller.php:74 +#: changepassword/controller.php:68 msgid "" "Please provide an admin recovery password, otherwise all user data will be " "lost" msgstr "Angiv venligst en admininstrator gendannelseskode, ellers vil alt brugerdata gå tabt" -#: changepassword/controller.php:79 +#: changepassword/controller.php:73 msgid "" "Wrong admin recovery password. Please check the password and try again." msgstr "Forkert admin gendannelseskode. Se venligst koden efter og prøv igen." -#: changepassword/controller.php:87 +#: changepassword/controller.php:81 msgid "" "Back-end doesn't support password change, but the users encryption key was " "successfully updated." msgstr "Serveren understøtter ikke kodeordsskifte, men brugernes krypteringsnøgle blev opdateret." -#: changepassword/controller.php:92 changepassword/controller.php:103 +#: changepassword/controller.php:86 changepassword/controller.php:97 msgid "Unable to change password" msgstr "Kunne ikke ændre kodeord" @@ -207,7 +207,7 @@ msgstr "Der opstod en fejl under app opgraderingen" msgid "Error" msgstr "Fejl" -#: js/apps.js:153 templates/apps.php:54 +#: js/apps.js:153 templates/apps.php:55 msgid "Update" msgstr "Opdater" @@ -215,31 +215,31 @@ msgstr "Opdater" msgid "Updated" msgstr "Opdateret" -#: js/personal.js:246 +#: js/personal.js:243 msgid "Select a profile picture" msgstr "Vælg et profilbillede" -#: js/personal.js:277 +#: js/personal.js:274 msgid "Very weak password" msgstr "Meget svagt kodeord" -#: js/personal.js:278 +#: js/personal.js:275 msgid "Weak password" msgstr "Svagt kodeord" -#: js/personal.js:279 +#: js/personal.js:276 msgid "So-so password" msgstr "Jævnt kodeord" -#: js/personal.js:280 +#: js/personal.js:277 msgid "Good password" msgstr "Godt kodeord" -#: js/personal.js:281 +#: js/personal.js:278 msgid "Strong password" msgstr "Stærkt kodeord" -#: js/personal.js:316 +#: js/personal.js:313 msgid "Decrypting files... Please wait, this can take some time." msgstr "Dekryptere filer... Vent venligst, dette kan tage lang tid. " @@ -288,7 +288,7 @@ msgstr "En gyldig adgangskode skal angives" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "Advarsel: Hjemmemappen for bruger \"{user}\" findes allerede" -#: personal.php:49 personal.php:50 +#: personal.php:48 personal.php:49 msgid "__language_name__" msgstr "Dansk" @@ -593,11 +593,11 @@ msgstr "Mere" msgid "Less" msgstr "Mindre" -#: templates/admin.php:416 templates/personal.php:181 +#: templates/admin.php:416 templates/personal.php:171 msgid "Version" msgstr "Version" -#: templates/admin.php:420 templates/personal.php:184 +#: templates/admin.php:420 templates/personal.php:174 msgid "" "Developed by the ownCloud community, the -licensed by " msgstr "-licenseret af " @@ -668,108 +668,108 @@ msgstr "Vis Første Kørsels Guiden igen." msgid "You have used %s of the available %s" msgstr "Du har brugt %s af den tilgængelige %s" -#: templates/personal.php:39 templates/users.php:21 templates/users.php:87 +#: templates/personal.php:38 templates/users.php:21 templates/users.php:87 msgid "Password" msgstr "Kodeord" -#: templates/personal.php:40 +#: templates/personal.php:39 msgid "Your password was changed" msgstr "Din adgangskode blev ændret" -#: templates/personal.php:41 +#: templates/personal.php:40 msgid "Unable to change your password" msgstr "Ude af stand til at ændre dit kodeord" -#: templates/personal.php:43 +#: templates/personal.php:42 msgid "Current password" msgstr "Nuværende adgangskode" -#: templates/personal.php:46 +#: templates/personal.php:45 msgid "New password" msgstr "Nyt kodeord" -#: templates/personal.php:50 +#: templates/personal.php:49 msgid "Change password" msgstr "Skift kodeord" -#: templates/personal.php:64 templates/users.php:86 +#: templates/personal.php:61 templates/users.php:86 msgid "Full Name" msgstr "Fulde navn" -#: templates/personal.php:81 +#: templates/personal.php:76 msgid "Email" msgstr "E-mail" -#: templates/personal.php:83 +#: templates/personal.php:78 msgid "Your email address" msgstr "Din emailadresse" -#: templates/personal.php:86 +#: templates/personal.php:81 msgid "" "Fill in an email address to enable password recovery and receive " "notifications" msgstr "" -#: templates/personal.php:96 +#: templates/personal.php:89 msgid "Profile picture" msgstr "Profilbillede" -#: templates/personal.php:101 +#: templates/personal.php:94 msgid "Upload new" msgstr "Upload nyt" -#: templates/personal.php:103 +#: templates/personal.php:96 msgid "Select new from Files" msgstr "Vælg nyt fra Filer" -#: templates/personal.php:104 +#: templates/personal.php:97 msgid "Remove image" msgstr "Fjern billede" -#: templates/personal.php:105 +#: templates/personal.php:98 msgid "Either png or jpg. Ideally square but you will be able to crop it." msgstr "Enten png eller jpg. Ideelt firkantet men du har mulighed for at beskære det. " -#: templates/personal.php:107 +#: templates/personal.php:100 msgid "Your avatar is provided by your original account." msgstr "Din avatar kommer fra din oprindelige konto." -#: templates/personal.php:111 +#: templates/personal.php:104 msgid "Cancel" msgstr "Annuller" -#: templates/personal.php:112 +#: templates/personal.php:105 msgid "Choose as profile image" msgstr "Vælg som profilbillede" -#: templates/personal.php:120 templates/personal.php:121 +#: templates/personal.php:111 templates/personal.php:112 msgid "Language" msgstr "Sprog" -#: templates/personal.php:140 +#: templates/personal.php:131 msgid "Help translate" msgstr "Hjælp med oversættelsen" -#: templates/personal.php:147 +#: templates/personal.php:137 msgid "WebDAV" msgstr "WebDAV" -#: templates/personal.php:149 +#: templates/personal.php:139 #, php-format msgid "" "Use this address to access your Files via " "WebDAV" msgstr "Brug denne adresse for at tilgå dine filer via WebDAV" -#: templates/personal.php:161 +#: templates/personal.php:151 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "Krypteringsprogrammet er ikke længere aktiveret. Dekrypter venligst alle dine filer" -#: templates/personal.php:167 +#: templates/personal.php:157 msgid "Log-in password" msgstr "Log-in kodeord" -#: templates/personal.php:172 +#: templates/personal.php:162 msgid "Decrypt all Files" msgstr "Dekrypter alle Filer " diff --git a/l10n/de/core.po b/l10n/de/core.po index ba8d5f905b9..31ff35c916b 100644 --- a/l10n/de/core.po +++ b/l10n/de/core.po @@ -5,6 +5,7 @@ # Translators: # arkascha , 2013 # I Robot, 2013 +# I Robot, 2014 # Marcel Kühlhorn , 2013 # Mario Siegmann , 2013-2014 # JamFX , 2013 @@ -17,8 +18,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-09 01:55-0400\n" -"PO-Revision-Date: 2014-04-08 06:10+0000\n" +"POT-Creation-Date: 2014-04-10 01:54-0400\n" +"PO-Revision-Date: 2014-04-09 08:50+0000\n" "Last-Translator: I Robot\n" "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n" "MIME-Version: 1.0\n" @@ -152,127 +153,127 @@ msgstr "Einstellungen" msgid "Saving..." msgstr "Speichern..." -#: js/js.js:1124 +#: js/js.js:1099 msgid "seconds ago" msgstr "Gerade eben" -#: js/js.js:1125 +#: js/js.js:1100 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "Vor %n Minute" msgstr[1] "Vor %n Minuten" -#: js/js.js:1126 +#: js/js.js:1101 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "Vor %n Stunde" msgstr[1] "Vor %n Stunden" -#: js/js.js:1127 +#: js/js.js:1102 msgid "today" msgstr "Heute" -#: js/js.js:1128 +#: js/js.js:1103 msgid "yesterday" msgstr "Gestern" -#: js/js.js:1129 +#: js/js.js:1104 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "Vor %n Tag" msgstr[1] "Vor %n Tagen" -#: js/js.js:1130 +#: js/js.js:1105 msgid "last month" msgstr "Letzten Monat" -#: js/js.js:1131 +#: js/js.js:1106 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "Vor %n Monat" msgstr[1] "Vor %n Monaten" -#: js/js.js:1132 +#: js/js.js:1107 msgid "months ago" msgstr "Vor Monaten" -#: js/js.js:1133 +#: js/js.js:1108 msgid "last year" msgstr "Letztes Jahr" -#: js/js.js:1134 +#: js/js.js:1109 msgid "years ago" msgstr "Vor Jahren" -#: js/oc-dialogs.js:123 +#: js/oc-dialogs.js:125 msgid "Choose" msgstr "Auswählen" -#: js/oc-dialogs.js:146 +#: js/oc-dialogs.js:151 msgid "Error loading file picker template: {error}" msgstr "Fehler beim Laden der Dateiauswahlvorlage: {error}" -#: js/oc-dialogs.js:172 +#: js/oc-dialogs.js:177 msgid "Yes" msgstr "Ja" -#: js/oc-dialogs.js:182 +#: js/oc-dialogs.js:187 msgid "No" msgstr "Nein" -#: js/oc-dialogs.js:199 +#: js/oc-dialogs.js:204 msgid "Ok" msgstr "OK" -#: js/oc-dialogs.js:219 +#: js/oc-dialogs.js:224 msgid "Error loading message template: {error}" msgstr "Fehler beim Laden der Nachrichtenvorlage: {error}" -#: js/oc-dialogs.js:347 +#: js/oc-dialogs.js:352 msgid "{count} file conflict" msgid_plural "{count} file conflicts" msgstr[0] "{count} Dateikonflikt" msgstr[1] "{count} Dateikonflikte" -#: js/oc-dialogs.js:361 +#: js/oc-dialogs.js:366 msgid "One file conflict" msgstr "Ein Dateikonflikt" -#: js/oc-dialogs.js:367 +#: js/oc-dialogs.js:372 msgid "New Files" msgstr "Neue Dateien" -#: js/oc-dialogs.js:368 +#: js/oc-dialogs.js:373 msgid "Already existing files" -msgstr "" +msgstr "Die Dateien existieren bereits" -#: js/oc-dialogs.js:370 +#: js/oc-dialogs.js:375 msgid "Which files do you want to keep?" msgstr "Welche Dateien möchtest Du behalten?" -#: js/oc-dialogs.js:371 +#: js/oc-dialogs.js:376 msgid "" "If you select both versions, the copied file will have a number added to its" " name." msgstr "Wenn Du beide Versionen auswählst, erhält die kopierte Datei eine Zahl am Ende des Dateinamens." -#: js/oc-dialogs.js:379 +#: js/oc-dialogs.js:384 msgid "Cancel" msgstr "Abbrechen" -#: js/oc-dialogs.js:389 +#: js/oc-dialogs.js:394 msgid "Continue" msgstr "Fortsetzen" -#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +#: js/oc-dialogs.js:441 js/oc-dialogs.js:454 msgid "(all selected)" msgstr "(Alle ausgewählt)" -#: js/oc-dialogs.js:439 js/oc-dialogs.js:452 +#: js/oc-dialogs.js:444 js/oc-dialogs.js:457 msgid "({count} selected)" msgstr "({count} ausgewählt)" -#: js/oc-dialogs.js:460 +#: js/oc-dialogs.js:465 msgid "Error loading file exists template" msgstr "Fehler beim Laden der vorhanden Dateivorlage" diff --git a/l10n/de/lib.po b/l10n/de/lib.po index 811013a102a..1c19e3ca284 100644 --- a/l10n/de/lib.po +++ b/l10n/de/lib.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# I Robot, 2014 # Mario Siegmann , 2013 # ninov , 2013 # stefanniedermann , 2014 @@ -12,8 +13,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-09 01:55-0400\n" -"PO-Revision-Date: 2014-04-09 05:55+0000\n" +"POT-Creation-Date: 2014-04-10 01:54-0400\n" +"PO-Revision-Date: 2014-04-09 08:50+0000\n" "Last-Translator: I Robot\n" "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n" "MIME-Version: 1.0\n" @@ -346,16 +347,16 @@ msgstr "Vor Jahren" msgid "" "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", " "\"0-9\", and \"_.@-\"" -msgstr "" +msgstr "Folgende Zeichen sind im Benutzernamen erlaubt: \"a-z\", \"A-Z\", \"0-9\" und \"_.@-\"" #: private/user/manager.php:251 msgid "A valid username must be provided" -msgstr "" +msgstr "Es muss ein gültiger Benutzername angegeben werden" #: private/user/manager.php:255 msgid "A valid password must be provided" -msgstr "" +msgstr "Es muss ein gültiges Passwort angegeben werden" #: private/user/manager.php:260 msgid "The username is already being used" -msgstr "" +msgstr "Dieser Benutzername existiert bereits" diff --git a/l10n/de/settings.po b/l10n/de/settings.po index dfea3e12a2d..bee681657b5 100644 --- a/l10n/de/settings.po +++ b/l10n/de/settings.po @@ -16,8 +16,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-04 01:55-0400\n" -"PO-Revision-Date: 2014-04-03 20:10+0000\n" +"POT-Creation-Date: 2014-04-10 01:54-0400\n" +"PO-Revision-Date: 2014-04-09 06:10+0000\n" "Last-Translator: kabum \n" "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n" "MIME-Version: 1.0\n" @@ -220,31 +220,31 @@ msgstr "Aktualisierung durchführen" msgid "Updated" msgstr "Aktualisiert" -#: js/personal.js:246 +#: js/personal.js:243 msgid "Select a profile picture" msgstr "Wähle ein Profilbild" -#: js/personal.js:277 +#: js/personal.js:274 msgid "Very weak password" msgstr "Sehr schwaches Passwort" -#: js/personal.js:278 +#: js/personal.js:275 msgid "Weak password" msgstr "Schwaches Passwort" -#: js/personal.js:279 +#: js/personal.js:276 msgid "So-so password" msgstr "Durchschnittliches Passwort" -#: js/personal.js:280 +#: js/personal.js:277 msgid "Good password" msgstr "Gutes Passwort" -#: js/personal.js:281 +#: js/personal.js:278 msgid "Strong password" msgstr "Starkes Passwort" -#: js/personal.js:316 +#: js/personal.js:313 msgid "Decrypting files... Please wait, this can take some time." msgstr "Entschlüssle Dateien ... Bitte warten, denn dieser Vorgang kann einige Zeit beanspruchen." diff --git a/l10n/de_CH/lib.po b/l10n/de_CH/lib.po index ec7ff99968b..b39979b3657 100644 --- a/l10n/de_CH/lib.po +++ b/l10n/de_CH/lib.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-09 01:55-0400\n" -"PO-Revision-Date: 2014-04-09 05:55+0000\n" +"POT-Creation-Date: 2014-04-10 01:54-0400\n" +"PO-Revision-Date: 2014-04-09 06:10+0000\n" "Last-Translator: I Robot\n" "Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/owncloud/language/de_CH/)\n" "MIME-Version: 1.0\n" @@ -349,11 +349,11 @@ msgstr "" #: private/user/manager.php:251 msgid "A valid username must be provided" -msgstr "" +msgstr "Es muss ein gültiger Benutzername angegeben werden" #: private/user/manager.php:255 msgid "A valid password must be provided" -msgstr "" +msgstr "Es muss ein gültiges Passwort angegeben werden" #: private/user/manager.php:260 msgid "The username is already being used" diff --git a/l10n/de_CH/settings.po b/l10n/de_CH/settings.po index a57d5b69ac2..adc54611f07 100644 --- a/l10n/de_CH/settings.po +++ b/l10n/de_CH/settings.po @@ -16,8 +16,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-03-26 01:55-0400\n" -"PO-Revision-Date: 2014-03-26 05:55+0000\n" +"POT-Creation-Date: 2014-04-10 01:54-0400\n" +"PO-Revision-Date: 2014-04-09 06:10+0000\n" "Last-Translator: I Robot\n" "Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/owncloud/language/de_CH/)\n" "MIME-Version: 1.0\n" @@ -60,7 +60,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159 +#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149 msgid "Encryption" msgstr "Verschlüsselung" @@ -73,7 +73,7 @@ msgid "Unable to load list from App Store" msgstr "Die Liste der Anwendungen im Store konnte nicht geladen werden." #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 changepassword/controller.php:55 +#: ajax/togglegroups.php:20 changepassword/controller.php:49 msgid "Authentication error" msgstr "Authentifizierungs-Fehler" @@ -135,32 +135,32 @@ msgstr "Der Benutzer konnte nicht aus der Gruppe %s entfernt werden" msgid "Couldn't update app." msgstr "Die App konnte nicht aktualisiert werden." -#: changepassword/controller.php:20 +#: changepassword/controller.php:17 msgid "Wrong password" msgstr "" -#: changepassword/controller.php:42 +#: changepassword/controller.php:36 msgid "No user supplied" msgstr "" -#: changepassword/controller.php:74 +#: changepassword/controller.php:68 msgid "" "Please provide an admin recovery password, otherwise all user data will be " "lost" msgstr "" -#: changepassword/controller.php:79 +#: changepassword/controller.php:73 msgid "" "Wrong admin recovery password. Please check the password and try again." msgstr "" -#: changepassword/controller.php:87 +#: changepassword/controller.php:81 msgid "" "Back-end doesn't support password change, but the users encryption key was " "successfully updated." msgstr "" -#: changepassword/controller.php:92 changepassword/controller.php:103 +#: changepassword/controller.php:86 changepassword/controller.php:97 msgid "Unable to change password" msgstr "" @@ -212,7 +212,7 @@ msgstr "Es ist ein Fehler während des Updates aufgetreten" msgid "Error" msgstr "Fehler" -#: js/apps.js:153 templates/apps.php:54 +#: js/apps.js:153 templates/apps.php:55 msgid "Update" msgstr "Update durchführen" @@ -220,31 +220,31 @@ msgstr "Update durchführen" msgid "Updated" msgstr "Aktualisiert" -#: js/personal.js:246 +#: js/personal.js:243 msgid "Select a profile picture" msgstr "" -#: js/personal.js:277 +#: js/personal.js:274 msgid "Very weak password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:275 msgid "Weak password" msgstr "" -#: js/personal.js:279 +#: js/personal.js:276 msgid "So-so password" msgstr "" -#: js/personal.js:280 +#: js/personal.js:277 msgid "Good password" msgstr "" -#: js/personal.js:281 +#: js/personal.js:278 msgid "Strong password" msgstr "" -#: js/personal.js:316 +#: js/personal.js:313 msgid "Decrypting files... Please wait, this can take some time." msgstr "Entschlüssel Dateien ... Bitte warten Sie, denn dieser Vorgang kann einige Zeit beanspruchen." @@ -293,7 +293,7 @@ msgstr "Es muss ein gültiges Passwort angegeben werden" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:49 personal.php:50 +#: personal.php:48 personal.php:49 msgid "__language_name__" msgstr "Deutsch (Schweiz)" @@ -598,11 +598,11 @@ msgstr "Mehr" msgid "Less" msgstr "Weniger" -#: templates/admin.php:416 templates/personal.php:181 +#: templates/admin.php:416 templates/personal.php:171 msgid "Version" msgstr "Version" -#: templates/admin.php:420 templates/personal.php:184 +#: templates/admin.php:420 templates/personal.php:174 msgid "" "Developed by the ownCloud community, the -licensed by " msgstr "-lizenziert von " @@ -673,108 +673,108 @@ msgstr "Den Einrichtungsassistenten erneut anzeigen" msgid "You have used %s of the available %s" msgstr "Sie verwenden %s der verfügbaren %s" -#: templates/personal.php:39 templates/users.php:21 templates/users.php:87 +#: templates/personal.php:38 templates/users.php:21 templates/users.php:87 msgid "Password" msgstr "Passwort" -#: templates/personal.php:40 +#: templates/personal.php:39 msgid "Your password was changed" msgstr "Ihr Passwort wurde geändert." -#: templates/personal.php:41 +#: templates/personal.php:40 msgid "Unable to change your password" msgstr "Das Passwort konnte nicht geändert werden" -#: templates/personal.php:43 +#: templates/personal.php:42 msgid "Current password" msgstr "Aktuelles Passwort" -#: templates/personal.php:46 +#: templates/personal.php:45 msgid "New password" msgstr "Neues Passwort" -#: templates/personal.php:50 +#: templates/personal.php:49 msgid "Change password" msgstr "Passwort ändern" -#: templates/personal.php:64 templates/users.php:86 +#: templates/personal.php:61 templates/users.php:86 msgid "Full Name" msgstr "" -#: templates/personal.php:81 +#: templates/personal.php:76 msgid "Email" msgstr "E-Mail" -#: templates/personal.php:83 +#: templates/personal.php:78 msgid "Your email address" msgstr "Ihre E-Mail-Adresse" -#: templates/personal.php:86 +#: templates/personal.php:81 msgid "" "Fill in an email address to enable password recovery and receive " "notifications" msgstr "" -#: templates/personal.php:96 +#: templates/personal.php:89 msgid "Profile picture" msgstr "" -#: templates/personal.php:101 +#: templates/personal.php:94 msgid "Upload new" msgstr "" -#: templates/personal.php:103 +#: templates/personal.php:96 msgid "Select new from Files" msgstr "" -#: templates/personal.php:104 +#: templates/personal.php:97 msgid "Remove image" msgstr "" -#: templates/personal.php:105 +#: templates/personal.php:98 msgid "Either png or jpg. Ideally square but you will be able to crop it." msgstr "" -#: templates/personal.php:107 +#: templates/personal.php:100 msgid "Your avatar is provided by your original account." msgstr "" -#: templates/personal.php:111 +#: templates/personal.php:104 msgid "Cancel" msgstr "Abbrechen" -#: templates/personal.php:112 +#: templates/personal.php:105 msgid "Choose as profile image" msgstr "" -#: templates/personal.php:120 templates/personal.php:121 +#: templates/personal.php:111 templates/personal.php:112 msgid "Language" msgstr "Sprache" -#: templates/personal.php:140 +#: templates/personal.php:131 msgid "Help translate" msgstr "Helfen Sie bei der Übersetzung" -#: templates/personal.php:147 +#: templates/personal.php:137 msgid "WebDAV" msgstr "WebDAV" -#: templates/personal.php:149 +#: templates/personal.php:139 #, php-format msgid "" "Use this address to access your Files via " "WebDAV" msgstr "" -#: templates/personal.php:161 +#: templates/personal.php:151 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:167 +#: templates/personal.php:157 msgid "Log-in password" msgstr "Login-Passwort" -#: templates/personal.php:172 +#: templates/personal.php:162 msgid "Decrypt all Files" msgstr "Alle Dateien entschlüsseln" diff --git a/l10n/de_DE/core.po b/l10n/de_DE/core.po index dc0425ed00f..75bdf01c6a2 100644 --- a/l10n/de_DE/core.po +++ b/l10n/de_DE/core.po @@ -18,8 +18,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-09 01:55-0400\n" -"PO-Revision-Date: 2014-04-08 06:10+0000\n" +"POT-Creation-Date: 2014-04-10 01:54-0400\n" +"PO-Revision-Date: 2014-04-09 08:50+0000\n" "Last-Translator: I Robot\n" "Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n" "MIME-Version: 1.0\n" @@ -153,127 +153,127 @@ msgstr "Einstellungen" msgid "Saving..." msgstr "Speichern..." -#: js/js.js:1124 +#: js/js.js:1099 msgid "seconds ago" msgstr "Gerade eben" -#: js/js.js:1125 +#: js/js.js:1100 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "Vor %n Minute" msgstr[1] "Vor %n Minuten" -#: js/js.js:1126 +#: js/js.js:1101 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "Vor %n Stunde" msgstr[1] "Vor %n Stunden" -#: js/js.js:1127 +#: js/js.js:1102 msgid "today" msgstr "Heute" -#: js/js.js:1128 +#: js/js.js:1103 msgid "yesterday" msgstr "Gestern" -#: js/js.js:1129 +#: js/js.js:1104 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "Vor %n Tag" msgstr[1] "Vor %n Tagen" -#: js/js.js:1130 +#: js/js.js:1105 msgid "last month" msgstr "Letzten Monat" -#: js/js.js:1131 +#: js/js.js:1106 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "Vor %n Monat" msgstr[1] "Vor %n Monaten" -#: js/js.js:1132 +#: js/js.js:1107 msgid "months ago" msgstr "Vor Monaten" -#: js/js.js:1133 +#: js/js.js:1108 msgid "last year" msgstr "Letztes Jahr" -#: js/js.js:1134 +#: js/js.js:1109 msgid "years ago" msgstr "Vor Jahren" -#: js/oc-dialogs.js:123 +#: js/oc-dialogs.js:125 msgid "Choose" msgstr "Auswählen" -#: js/oc-dialogs.js:146 +#: js/oc-dialogs.js:151 msgid "Error loading file picker template: {error}" msgstr "Fehler beim Laden der Dateiauswahlvorlage: {error}" -#: js/oc-dialogs.js:172 +#: js/oc-dialogs.js:177 msgid "Yes" msgstr "Ja" -#: js/oc-dialogs.js:182 +#: js/oc-dialogs.js:187 msgid "No" msgstr "Nein" -#: js/oc-dialogs.js:199 +#: js/oc-dialogs.js:204 msgid "Ok" msgstr "OK" -#: js/oc-dialogs.js:219 +#: js/oc-dialogs.js:224 msgid "Error loading message template: {error}" msgstr "Fehler beim Laden der Nachrichtenvorlage: {error}" -#: js/oc-dialogs.js:347 +#: js/oc-dialogs.js:352 msgid "{count} file conflict" msgid_plural "{count} file conflicts" msgstr[0] "{count} Dateikonflikt" msgstr[1] "{count} Dateikonflikte" -#: js/oc-dialogs.js:361 +#: js/oc-dialogs.js:366 msgid "One file conflict" msgstr "Ein Dateikonflikt" -#: js/oc-dialogs.js:367 +#: js/oc-dialogs.js:372 msgid "New Files" msgstr "Neue Dateien" -#: js/oc-dialogs.js:368 +#: js/oc-dialogs.js:373 msgid "Already existing files" -msgstr "" +msgstr "Die Dateien existieren bereits" -#: js/oc-dialogs.js:370 +#: js/oc-dialogs.js:375 msgid "Which files do you want to keep?" msgstr "Welche Dateien möchten Sie behalten?" -#: js/oc-dialogs.js:371 +#: js/oc-dialogs.js:376 msgid "" "If you select both versions, the copied file will have a number added to its" " name." msgstr "Wenn Sie beide Versionen auswählen, erhält die kopierte Datei eine Zahl am Ende des Dateinamens." -#: js/oc-dialogs.js:379 +#: js/oc-dialogs.js:384 msgid "Cancel" msgstr "Abbrechen" -#: js/oc-dialogs.js:389 +#: js/oc-dialogs.js:394 msgid "Continue" msgstr "Fortsetzen" -#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +#: js/oc-dialogs.js:441 js/oc-dialogs.js:454 msgid "(all selected)" msgstr "(Alle ausgewählt)" -#: js/oc-dialogs.js:439 js/oc-dialogs.js:452 +#: js/oc-dialogs.js:444 js/oc-dialogs.js:457 msgid "({count} selected)" msgstr "({count} ausgewählt)" -#: js/oc-dialogs.js:460 +#: js/oc-dialogs.js:465 msgid "Error loading file exists template" msgstr "Fehler beim Laden der vorhanden Dateivorlage" diff --git a/l10n/de_DE/lib.po b/l10n/de_DE/lib.po index a6321e11a88..94fe0bdbef2 100644 --- a/l10n/de_DE/lib.po +++ b/l10n/de_DE/lib.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# I Robot, 2014 # Mario Siegmann , 2013 # stefanniedermann , 2014 # traductor, 2013 @@ -12,8 +13,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-09 01:55-0400\n" -"PO-Revision-Date: 2014-04-09 05:55+0000\n" +"POT-Creation-Date: 2014-04-10 01:54-0400\n" +"PO-Revision-Date: 2014-04-09 08:50+0000\n" "Last-Translator: I Robot\n" "Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n" "MIME-Version: 1.0\n" @@ -346,16 +347,16 @@ msgstr "Vor Jahren" msgid "" "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", " "\"0-9\", and \"_.@-\"" -msgstr "" +msgstr "Folgende Zeichen sind im Benutzernamen erlaubt: \"a-z\", \"A-Z\", \"0-9\" und \"_.@-\"" #: private/user/manager.php:251 msgid "A valid username must be provided" -msgstr "" +msgstr "Es muss ein gültiger Benutzername angegeben werden" #: private/user/manager.php:255 msgid "A valid password must be provided" -msgstr "" +msgstr "Es muss ein gültiges Passwort angegeben werden" #: private/user/manager.php:260 msgid "The username is already being used" -msgstr "" +msgstr "Der Benutzername existiert bereits" diff --git a/l10n/de_DE/settings.po b/l10n/de_DE/settings.po index 1c6c92fdde1..6dfc08877fd 100644 --- a/l10n/de_DE/settings.po +++ b/l10n/de_DE/settings.po @@ -16,8 +16,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-04 01:55-0400\n" -"PO-Revision-Date: 2014-04-03 20:10+0000\n" +"POT-Creation-Date: 2014-04-10 01:54-0400\n" +"PO-Revision-Date: 2014-04-09 06:10+0000\n" "Last-Translator: kabum \n" "Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n" "MIME-Version: 1.0\n" @@ -220,31 +220,31 @@ msgstr "Update durchführen" msgid "Updated" msgstr "Aktualisiert" -#: js/personal.js:246 +#: js/personal.js:243 msgid "Select a profile picture" msgstr "Wählen Sie ein Profilbild" -#: js/personal.js:277 +#: js/personal.js:274 msgid "Very weak password" msgstr "Sehr schwaches Passwort" -#: js/personal.js:278 +#: js/personal.js:275 msgid "Weak password" msgstr "Schwaches Passwort" -#: js/personal.js:279 +#: js/personal.js:276 msgid "So-so password" msgstr "Passables Passwort" -#: js/personal.js:280 +#: js/personal.js:277 msgid "Good password" msgstr "Gutes Passwort" -#: js/personal.js:281 +#: js/personal.js:278 msgid "Strong password" msgstr "Starkes Passwort" -#: js/personal.js:316 +#: js/personal.js:313 msgid "Decrypting files... Please wait, this can take some time." msgstr "Entschlüssle Dateien ... Bitte warten Sie, denn dieser Vorgang kann einige Zeit beanspruchen." diff --git a/l10n/el/lib.po b/l10n/el/lib.po index 80a7f0699a7..49613a13f1c 100644 --- a/l10n/el/lib.po +++ b/l10n/el/lib.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-09 01:55-0400\n" -"PO-Revision-Date: 2014-04-09 05:55+0000\n" +"POT-Creation-Date: 2014-04-10 01:54-0400\n" +"PO-Revision-Date: 2014-04-09 06:10+0000\n" "Last-Translator: I Robot\n" "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n" "MIME-Version: 1.0\n" @@ -349,11 +349,11 @@ msgstr "" #: private/user/manager.php:251 msgid "A valid username must be provided" -msgstr "" +msgstr "Πρέπει να δοθεί έγκυρο όνομα χρήστη" #: private/user/manager.php:255 msgid "A valid password must be provided" -msgstr "" +msgstr "Πρέπει να δοθεί έγκυρο συνθηματικό" #: private/user/manager.php:260 msgid "The username is already being used" diff --git a/l10n/el/settings.po b/l10n/el/settings.po index adda7be21db..e59b95e37c3 100644 --- a/l10n/el/settings.po +++ b/l10n/el/settings.po @@ -16,8 +16,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-01 01:55-0400\n" -"PO-Revision-Date: 2014-03-31 17:11+0000\n" +"POT-Creation-Date: 2014-04-10 01:54-0400\n" +"PO-Revision-Date: 2014-04-09 06:10+0000\n" "Last-Translator: pe_ppe \n" "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n" "MIME-Version: 1.0\n" @@ -60,7 +60,7 @@ msgstr "Πρέπει να ορίσετε το email του χρήστη πριν msgid "Send mode" msgstr "Κατάσταση αποστολής" -#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159 +#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149 msgid "Encryption" msgstr "Κρυπτογράφηση" @@ -212,7 +212,7 @@ msgstr "Σφάλμα κατά την ενημέρωση της εφαρμογή msgid "Error" msgstr "Σφάλμα" -#: js/apps.js:153 templates/apps.php:54 +#: js/apps.js:153 templates/apps.php:55 msgid "Update" msgstr "Ενημέρωση" @@ -220,31 +220,31 @@ msgstr "Ενημέρωση" msgid "Updated" msgstr "Ενημερώθηκε" -#: js/personal.js:246 +#: js/personal.js:243 msgid "Select a profile picture" msgstr "Επιλογή εικόνας προφίλ" -#: js/personal.js:277 +#: js/personal.js:274 msgid "Very weak password" msgstr "Πολύ αδύναμο συνθηματικό" -#: js/personal.js:278 +#: js/personal.js:275 msgid "Weak password" msgstr "Αδύναμο συνθηματικό" -#: js/personal.js:279 +#: js/personal.js:276 msgid "So-so password" msgstr "Μέτριο συνθηματικό" -#: js/personal.js:280 +#: js/personal.js:277 msgid "Good password" msgstr "Καλό συνθηματικό" -#: js/personal.js:281 +#: js/personal.js:278 msgid "Strong password" msgstr "Δυνατό συνθηματικό" -#: js/personal.js:316 +#: js/personal.js:313 msgid "Decrypting files... Please wait, this can take some time." msgstr "Αποκρυπτογράφηση αρχείων... Παρακαλώ περιμένετε, αυτό μπορεί να πάρει κάποιο χρόνο." @@ -598,11 +598,11 @@ msgstr "Περισσότερα" msgid "Less" msgstr "Λιγότερα" -#: templates/admin.php:416 templates/personal.php:181 +#: templates/admin.php:416 templates/personal.php:171 msgid "Version" msgstr "Έκδοση" -#: templates/admin.php:420 templates/personal.php:184 +#: templates/admin.php:420 templates/personal.php:174 msgid "" "Developed by the ownCloud community, the -licensed by " msgstr "Άδεια χρήσης από " @@ -673,108 +673,108 @@ msgstr "Προβολή Οδηγού Πρώτης Εκτέλεσης ξανά" msgid "You have used %s of the available %s" msgstr "Χρησιμοποιήσατε %s από τα %s διαθέσιμα" -#: templates/personal.php:39 templates/users.php:21 templates/users.php:87 +#: templates/personal.php:38 templates/users.php:21 templates/users.php:87 msgid "Password" msgstr "Συνθηματικό" -#: templates/personal.php:40 +#: templates/personal.php:39 msgid "Your password was changed" msgstr "Το συνθηματικό σας έχει αλλάξει" -#: templates/personal.php:41 +#: templates/personal.php:40 msgid "Unable to change your password" msgstr "Δεν ήταν δυνατή η αλλαγή του κωδικού πρόσβασης" -#: templates/personal.php:43 +#: templates/personal.php:42 msgid "Current password" msgstr "Τρέχων συνθηματικό" -#: templates/personal.php:46 +#: templates/personal.php:45 msgid "New password" msgstr "Νέο συνθηματικό" -#: templates/personal.php:50 +#: templates/personal.php:49 msgid "Change password" msgstr "Αλλαγή συνθηματικού" -#: templates/personal.php:64 templates/users.php:86 +#: templates/personal.php:61 templates/users.php:86 msgid "Full Name" msgstr "Πλήρες όνομα" -#: templates/personal.php:81 +#: templates/personal.php:76 msgid "Email" msgstr "Ηλεκτρονικό ταχυδρομείο" -#: templates/personal.php:83 +#: templates/personal.php:78 msgid "Your email address" msgstr "Η διεύθυνση ηλ. ταχυδρομείου σας" -#: templates/personal.php:86 +#: templates/personal.php:81 msgid "" "Fill in an email address to enable password recovery and receive " "notifications" msgstr "Συμπληρώστε μια διεύθυνση email για να ενεργοποιήσετε την επαναφορά συνθηματικού και να λαμβάνετε ειδοποιήσεις" -#: templates/personal.php:96 +#: templates/personal.php:89 msgid "Profile picture" msgstr "Φωτογραφία προφίλ" -#: templates/personal.php:101 +#: templates/personal.php:94 msgid "Upload new" msgstr "Μεταφόρτωση νέου" -#: templates/personal.php:103 +#: templates/personal.php:96 msgid "Select new from Files" msgstr "Επιλογή νέου από τα Αρχεία" -#: templates/personal.php:104 +#: templates/personal.php:97 msgid "Remove image" msgstr "Αφαίρεση εικόνας" -#: templates/personal.php:105 +#: templates/personal.php:98 msgid "Either png or jpg. Ideally square but you will be able to crop it." msgstr "Είτε png ή jpg. Ιδανικά τετράγωνη αλλά θα είστε σε θέση να την περικόψετε." -#: templates/personal.php:107 +#: templates/personal.php:100 msgid "Your avatar is provided by your original account." msgstr "Το άβατάρ σας παρέχεται από τον αρχικό σας λογαριασμό." -#: templates/personal.php:111 +#: templates/personal.php:104 msgid "Cancel" msgstr "Άκυρο" -#: templates/personal.php:112 +#: templates/personal.php:105 msgid "Choose as profile image" msgstr "Επιλογή εικόνας προφίλ" -#: templates/personal.php:120 templates/personal.php:121 +#: templates/personal.php:111 templates/personal.php:112 msgid "Language" msgstr "Γλώσσα" -#: templates/personal.php:140 +#: templates/personal.php:131 msgid "Help translate" msgstr "Βοηθήστε στη μετάφραση" -#: templates/personal.php:147 +#: templates/personal.php:137 msgid "WebDAV" msgstr "WebDAV" -#: templates/personal.php:149 +#: templates/personal.php:139 #, php-format msgid "" "Use this address to access your Files via " "WebDAV" msgstr "Χρησιμοποιήστε αυτήν την διεύθυνση για να αποκτήσετε πρόσβαση στα αρχεία σας μέσω WebDAV" -#: templates/personal.php:161 +#: templates/personal.php:151 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "Η εφαρμογή κρυπτογράφησης δεν είναι πλέον ενεργοποιημένη, παρακαλώ αποκρυπτογραφήστε όλα τα αρχεία σας" -#: templates/personal.php:167 +#: templates/personal.php:157 msgid "Log-in password" msgstr "Συνθηματικό εισόδου" -#: templates/personal.php:172 +#: templates/personal.php:162 msgid "Decrypt all Files" msgstr "Αποκρυπτογράφηση όλων των Αρχείων" diff --git a/l10n/en_GB/files_external.po b/l10n/en_GB/files_external.po index 83c6537a620..03485fd10eb 100644 --- a/l10n/en_GB/files_external.po +++ b/l10n/en_GB/files_external.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-09 01:55-0400\n" -"PO-Revision-Date: 2014-04-09 05:55+0000\n" -"Last-Translator: I Robot\n" +"POT-Creation-Date: 2014-04-10 01:54-0400\n" +"PO-Revision-Date: 2014-04-09 14:20+0000\n" +"Last-Translator: mnestis \n" "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/en_GB/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -44,32 +44,32 @@ msgstr "Saved" #: lib/config.php:592 msgid "Note: " -msgstr "" +msgstr "Note: " #: lib/config.php:602 msgid " and " -msgstr "" +msgstr " and " #: lib/config.php:624 #, php-format msgid "" "Note: The cURL support in PHP is not enabled or installed. Mounting " "of %s is not possible. Please ask your system administrator to install it." -msgstr "" +msgstr "Note: The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." #: lib/config.php:626 #, php-format msgid "" "Note: The FTP support in PHP is not enabled or installed. Mounting of" " %s is not possible. Please ask your system administrator to install it." -msgstr "" +msgstr "Note: The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." #: lib/config.php:628 #, php-format msgid "" "Note: \"%s\" is not installed. Mounting of %s is not possible. Please" " ask your system administrator to install it." -msgstr "" +msgstr "Note: \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." #: templates/settings.php:2 msgid "External Storage" diff --git a/l10n/en_GB/lib.po b/l10n/en_GB/lib.po index d65f8d73bd1..bb29a772bc7 100644 --- a/l10n/en_GB/lib.po +++ b/l10n/en_GB/lib.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-09 01:55-0400\n" -"PO-Revision-Date: 2014-04-09 05:55+0000\n" -"Last-Translator: I Robot\n" +"POT-Creation-Date: 2014-04-10 01:54-0400\n" +"PO-Revision-Date: 2014-04-09 14:20+0000\n" +"Last-Translator: mnestis \n" "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/en_GB/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -342,16 +342,16 @@ msgstr "years ago" msgid "" "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", " "\"0-9\", and \"_.@-\"" -msgstr "" +msgstr "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" #: private/user/manager.php:251 msgid "A valid username must be provided" -msgstr "" +msgstr "A valid username must be provided" #: private/user/manager.php:255 msgid "A valid password must be provided" -msgstr "" +msgstr "A valid password must be provided" #: private/user/manager.php:260 msgid "The username is already being used" -msgstr "" +msgstr "The username is already being used" diff --git a/l10n/en_GB/settings.po b/l10n/en_GB/settings.po index f04a916b0cf..5d7ff3543fd 100644 --- a/l10n/en_GB/settings.po +++ b/l10n/en_GB/settings.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-03-27 01:55-0400\n" -"PO-Revision-Date: 2014-03-26 12:20+0000\n" +"POT-Creation-Date: 2014-04-10 01:54-0400\n" +"PO-Revision-Date: 2014-04-09 06:10+0000\n" "Last-Translator: mnestis \n" "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/en_GB/)\n" "MIME-Version: 1.0\n" @@ -52,7 +52,7 @@ msgstr "You need to set your user email before being able to send test emails." msgid "Send mode" msgstr "Send mode" -#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159 +#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149 msgid "Encryption" msgstr "Encryption" @@ -65,7 +65,7 @@ msgid "Unable to load list from App Store" msgstr "Unable to load list from App Store" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 changepassword/controller.php:55 +#: ajax/togglegroups.php:20 changepassword/controller.php:49 msgid "Authentication error" msgstr "Authentication error" @@ -127,32 +127,32 @@ msgstr "Unable to remove user from group %s" msgid "Couldn't update app." msgstr "Couldn't update app." -#: changepassword/controller.php:20 +#: changepassword/controller.php:17 msgid "Wrong password" msgstr "Incorrect password" -#: changepassword/controller.php:42 +#: changepassword/controller.php:36 msgid "No user supplied" msgstr "No user supplied" -#: changepassword/controller.php:74 +#: changepassword/controller.php:68 msgid "" "Please provide an admin recovery password, otherwise all user data will be " "lost" msgstr "Please provide an admin recovery password, otherwise all user data will be lost" -#: changepassword/controller.php:79 +#: changepassword/controller.php:73 msgid "" "Wrong admin recovery password. Please check the password and try again." msgstr "Incorrect admin recovery password. Please check the password and try again." -#: changepassword/controller.php:87 +#: changepassword/controller.php:81 msgid "" "Back-end doesn't support password change, but the users encryption key was " "successfully updated." msgstr "Back-end doesn't support password change, but the user's encryption key was successfully updated." -#: changepassword/controller.php:92 changepassword/controller.php:103 +#: changepassword/controller.php:86 changepassword/controller.php:97 msgid "Unable to change password" msgstr "Unable to change password" @@ -204,7 +204,7 @@ msgstr "Error whilst updating app" msgid "Error" msgstr "Error" -#: js/apps.js:153 templates/apps.php:54 +#: js/apps.js:153 templates/apps.php:55 msgid "Update" msgstr "Update" @@ -212,31 +212,31 @@ msgstr "Update" msgid "Updated" msgstr "Updated" -#: js/personal.js:246 +#: js/personal.js:243 msgid "Select a profile picture" msgstr "Select a profile picture" -#: js/personal.js:277 +#: js/personal.js:274 msgid "Very weak password" msgstr "Very weak password" -#: js/personal.js:278 +#: js/personal.js:275 msgid "Weak password" msgstr "Weak password" -#: js/personal.js:279 +#: js/personal.js:276 msgid "So-so password" msgstr "So-so password" -#: js/personal.js:280 +#: js/personal.js:277 msgid "Good password" msgstr "Good password" -#: js/personal.js:281 +#: js/personal.js:278 msgid "Strong password" msgstr "Strong password" -#: js/personal.js:316 +#: js/personal.js:313 msgid "Decrypting files... Please wait, this can take some time." msgstr "Decrypting files... Please wait, this can take some time." @@ -285,7 +285,7 @@ msgstr "A valid password must be provided" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "Warning: Home directory for user \"{user}\" already exists" -#: personal.php:49 personal.php:50 +#: personal.php:48 personal.php:49 msgid "__language_name__" msgstr "__language_name__" @@ -590,11 +590,11 @@ msgstr "More" msgid "Less" msgstr "Less" -#: templates/admin.php:416 templates/personal.php:181 +#: templates/admin.php:416 templates/personal.php:171 msgid "Version" msgstr "Version" -#: templates/admin.php:420 templates/personal.php:184 +#: templates/admin.php:420 templates/personal.php:174 msgid "" "Developed by the ownCloud community, the -licensed by " msgstr "-licensed by " @@ -665,108 +665,108 @@ msgstr "Show First Run Wizard again" msgid "You have used %s of the available %s" msgstr "You have used %s of the available %s" -#: templates/personal.php:39 templates/users.php:21 templates/users.php:87 +#: templates/personal.php:38 templates/users.php:21 templates/users.php:87 msgid "Password" msgstr "Password" -#: templates/personal.php:40 +#: templates/personal.php:39 msgid "Your password was changed" msgstr "Your password was changed" -#: templates/personal.php:41 +#: templates/personal.php:40 msgid "Unable to change your password" msgstr "Unable to change your password" -#: templates/personal.php:43 +#: templates/personal.php:42 msgid "Current password" msgstr "Current password" -#: templates/personal.php:46 +#: templates/personal.php:45 msgid "New password" msgstr "New password" -#: templates/personal.php:50 +#: templates/personal.php:49 msgid "Change password" msgstr "Change password" -#: templates/personal.php:64 templates/users.php:86 +#: templates/personal.php:61 templates/users.php:86 msgid "Full Name" msgstr "Full Name" -#: templates/personal.php:81 +#: templates/personal.php:76 msgid "Email" msgstr "Email" -#: templates/personal.php:83 +#: templates/personal.php:78 msgid "Your email address" msgstr "Your email address" -#: templates/personal.php:86 +#: templates/personal.php:81 msgid "" "Fill in an email address to enable password recovery and receive " "notifications" msgstr "Fill in an email address to enable password recovery and receive notifications" -#: templates/personal.php:96 +#: templates/personal.php:89 msgid "Profile picture" msgstr "Profile picture" -#: templates/personal.php:101 +#: templates/personal.php:94 msgid "Upload new" msgstr "Upload new" -#: templates/personal.php:103 +#: templates/personal.php:96 msgid "Select new from Files" msgstr "Select new from Files" -#: templates/personal.php:104 +#: templates/personal.php:97 msgid "Remove image" msgstr "Remove image" -#: templates/personal.php:105 +#: templates/personal.php:98 msgid "Either png or jpg. Ideally square but you will be able to crop it." msgstr "Either png or jpg. Ideally square but you will be able to crop it." -#: templates/personal.php:107 +#: templates/personal.php:100 msgid "Your avatar is provided by your original account." msgstr "Your avatar is provided by your original account." -#: templates/personal.php:111 +#: templates/personal.php:104 msgid "Cancel" msgstr "Cancel" -#: templates/personal.php:112 +#: templates/personal.php:105 msgid "Choose as profile image" msgstr "Choose as profile image" -#: templates/personal.php:120 templates/personal.php:121 +#: templates/personal.php:111 templates/personal.php:112 msgid "Language" msgstr "Language" -#: templates/personal.php:140 +#: templates/personal.php:131 msgid "Help translate" msgstr "Help translate" -#: templates/personal.php:147 +#: templates/personal.php:137 msgid "WebDAV" msgstr "WebDAV" -#: templates/personal.php:149 +#: templates/personal.php:139 #, php-format msgid "" "Use this address to access your Files via " "WebDAV" msgstr "Use this address to access your Files via WebDAV" -#: templates/personal.php:161 +#: templates/personal.php:151 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "The encryption app is no longer enabled, please decrypt all your files" -#: templates/personal.php:167 +#: templates/personal.php:157 msgid "Log-in password" msgstr "Log-in password" -#: templates/personal.php:172 +#: templates/personal.php:162 msgid "Decrypt all Files" msgstr "Decrypt all Files" diff --git a/l10n/es/files_external.po b/l10n/es/files_external.po index 097fda073bc..af6aa0b29ed 100644 --- a/l10n/es/files_external.po +++ b/l10n/es/files_external.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-09 01:55-0400\n" -"PO-Revision-Date: 2014-04-09 05:55+0000\n" -"Last-Translator: I Robot\n" +"POT-Creation-Date: 2014-04-10 01:54-0400\n" +"PO-Revision-Date: 2014-04-09 18:50+0000\n" +"Last-Translator: Art O. Pal \n" "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -45,32 +45,32 @@ msgstr "Guardado" #: lib/config.php:592 msgid "Note: " -msgstr "" +msgstr "Nota: " #: lib/config.php:602 msgid " and " -msgstr "" +msgstr "y" #: lib/config.php:624 #, php-format msgid "" "Note: The cURL support in PHP is not enabled or installed. Mounting " "of %s is not possible. Please ask your system administrator to install it." -msgstr "" +msgstr "Nota: El soporte de cURL en PHP no está activado o instalado. No se puede montar %s. Pídale al administrador de sistema que lo instale." #: lib/config.php:626 #, php-format msgid "" "Note: The FTP support in PHP is not enabled or installed. Mounting of" " %s is not possible. Please ask your system administrator to install it." -msgstr "" +msgstr "Nota: El soporte de FTP en PHP no está activado o instalado. No se puede montar %s. Pídale al administrador de sistema que lo instale." #: lib/config.php:628 #, php-format msgid "" "Note: \"%s\" is not installed. Mounting of %s is not possible. Please" " ask your system administrator to install it." -msgstr "" +msgstr "Nota: \"%s\" no está instalado. No se puede montar %s. Pídale al administrador de sistema que lo instale." #: templates/settings.php:2 msgid "External Storage" @@ -94,7 +94,7 @@ msgstr "Opciones" #: templates/settings.php:12 msgid "Available for" -msgstr "" +msgstr "Disponible para" #: templates/settings.php:32 msgid "Add storage" diff --git a/l10n/es/lib.po b/l10n/es/lib.po index b5958c392d1..91209fc57d5 100644 --- a/l10n/es/lib.po +++ b/l10n/es/lib.po @@ -14,9 +14,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-09 01:55-0400\n" -"PO-Revision-Date: 2014-04-09 05:55+0000\n" -"Last-Translator: I Robot\n" +"POT-Creation-Date: 2014-04-10 01:54-0400\n" +"PO-Revision-Date: 2014-04-09 15:50+0000\n" +"Last-Translator: Art O. Pal \n" "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -348,16 +348,16 @@ msgstr "hace años" msgid "" "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", " "\"0-9\", and \"_.@-\"" -msgstr "" +msgstr "Solo los siguientes caracteres están permitidos en un nombre de usuario: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" #: private/user/manager.php:251 msgid "A valid username must be provided" -msgstr "" +msgstr "Se debe proporcionar un nombre de usuario válido" #: private/user/manager.php:255 msgid "A valid password must be provided" -msgstr "" +msgstr "Se debe proporcionar una contraseña válida" #: private/user/manager.php:260 msgid "The username is already being used" -msgstr "" +msgstr "El nombre de usuario ya está en uso" diff --git a/l10n/es/settings.po b/l10n/es/settings.po index 9b0c0bf17ce..058eac2fa3c 100644 --- a/l10n/es/settings.po +++ b/l10n/es/settings.po @@ -21,8 +21,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-04 01:55-0400\n" -"PO-Revision-Date: 2014-04-04 01:10+0000\n" +"POT-Creation-Date: 2014-04-10 01:54-0400\n" +"PO-Revision-Date: 2014-04-09 06:10+0000\n" "Last-Translator: juanman \n" "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n" "MIME-Version: 1.0\n" @@ -225,31 +225,31 @@ msgstr "Actualizar" msgid "Updated" msgstr "Actualizado" -#: js/personal.js:246 +#: js/personal.js:243 msgid "Select a profile picture" msgstr "Seleccionar una imagen de perfil" -#: js/personal.js:277 +#: js/personal.js:274 msgid "Very weak password" msgstr "Contraseña muy débil" -#: js/personal.js:278 +#: js/personal.js:275 msgid "Weak password" msgstr "Contraseña débil" -#: js/personal.js:279 +#: js/personal.js:276 msgid "So-so password" msgstr "Contraseña pasable" -#: js/personal.js:280 +#: js/personal.js:277 msgid "Good password" msgstr "Contraseña buena" -#: js/personal.js:281 +#: js/personal.js:278 msgid "Strong password" msgstr "Contraseña muy buena" -#: js/personal.js:316 +#: js/personal.js:313 msgid "Decrypting files... Please wait, this can take some time." msgstr "Descifrando archivos... Espere por favor, esto puede llevar algo de tiempo." diff --git a/l10n/es_AR/lib.po b/l10n/es_AR/lib.po index af7dd38bda3..fc41e7c9c94 100644 --- a/l10n/es_AR/lib.po +++ b/l10n/es_AR/lib.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-09 01:55-0400\n" -"PO-Revision-Date: 2014-04-09 05:55+0000\n" +"POT-Creation-Date: 2014-04-10 01:54-0400\n" +"PO-Revision-Date: 2014-04-09 06:10+0000\n" "Last-Translator: I Robot\n" "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n" "MIME-Version: 1.0\n" @@ -347,11 +347,11 @@ msgstr "" #: private/user/manager.php:251 msgid "A valid username must be provided" -msgstr "" +msgstr "Debe ingresar un nombre de usuario válido" #: private/user/manager.php:255 msgid "A valid password must be provided" -msgstr "" +msgstr "Debe ingresar una contraseña válida" #: private/user/manager.php:260 msgid "The username is already being used" diff --git a/l10n/es_AR/settings.po b/l10n/es_AR/settings.po index 206cfbe5cf2..3b2f8487931 100644 --- a/l10n/es_AR/settings.po +++ b/l10n/es_AR/settings.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-03-26 01:55-0400\n" -"PO-Revision-Date: 2014-03-26 05:55+0000\n" +"POT-Creation-Date: 2014-04-10 01:54-0400\n" +"PO-Revision-Date: 2014-04-09 06:10+0000\n" "Last-Translator: I Robot\n" "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n" "MIME-Version: 1.0\n" @@ -54,7 +54,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159 +#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149 msgid "Encryption" msgstr "Encriptación" @@ -67,7 +67,7 @@ msgid "Unable to load list from App Store" msgstr "Imposible cargar la lista desde el App Store" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 changepassword/controller.php:55 +#: ajax/togglegroups.php:20 changepassword/controller.php:49 msgid "Authentication error" msgstr "Error al autenticar" @@ -129,32 +129,32 @@ msgstr "No es posible borrar al usuario del grupo %s" msgid "Couldn't update app." msgstr "No se pudo actualizar la App." -#: changepassword/controller.php:20 +#: changepassword/controller.php:17 msgid "Wrong password" msgstr "Clave incorrecta" -#: changepassword/controller.php:42 +#: changepassword/controller.php:36 msgid "No user supplied" msgstr "No se ha indicado el usuario" -#: changepassword/controller.php:74 +#: changepassword/controller.php:68 msgid "" "Please provide an admin recovery password, otherwise all user data will be " "lost" msgstr "Por favor provea de una contraseña de recuperación administrativa, sino se perderá todos los datos del usuario" -#: changepassword/controller.php:79 +#: changepassword/controller.php:73 msgid "" "Wrong admin recovery password. Please check the password and try again." msgstr "Contraseña de recuperación administrativa incorrecta. Por favor, chequee la clave e intente de nuevo" -#: changepassword/controller.php:87 +#: changepassword/controller.php:81 msgid "" "Back-end doesn't support password change, but the users encryption key was " "successfully updated." msgstr "El back-end no soporta cambios de contraseña, pero las claves de encriptación fueron subidas exitosamente." -#: changepassword/controller.php:92 changepassword/controller.php:103 +#: changepassword/controller.php:86 changepassword/controller.php:97 msgid "Unable to change password" msgstr "Imposible cambiar la contraseña" @@ -206,7 +206,7 @@ msgstr "Error al actualizar App" msgid "Error" msgstr "Error" -#: js/apps.js:153 templates/apps.php:54 +#: js/apps.js:153 templates/apps.php:55 msgid "Update" msgstr "Actualizar" @@ -214,31 +214,31 @@ msgstr "Actualizar" msgid "Updated" msgstr "Actualizado" -#: js/personal.js:246 +#: js/personal.js:243 msgid "Select a profile picture" msgstr "Seleccionar una imágen de perfil" -#: js/personal.js:277 +#: js/personal.js:274 msgid "Very weak password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:275 msgid "Weak password" msgstr "" -#: js/personal.js:279 +#: js/personal.js:276 msgid "So-so password" msgstr "" -#: js/personal.js:280 +#: js/personal.js:277 msgid "Good password" msgstr "" -#: js/personal.js:281 +#: js/personal.js:278 msgid "Strong password" msgstr "" -#: js/personal.js:316 +#: js/personal.js:313 msgid "Decrypting files... Please wait, this can take some time." msgstr "Desencriptando archivos... Por favor espere, esto puede tardar." @@ -287,7 +287,7 @@ msgstr "Debe ingresar una contraseña válida" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "Advertencia: El directorio Home del usuario \"{user}\" ya existe" -#: personal.php:49 personal.php:50 +#: personal.php:48 personal.php:49 msgid "__language_name__" msgstr "Castellano (Argentina)" @@ -592,11 +592,11 @@ msgstr "Más" msgid "Less" msgstr "Menos" -#: templates/admin.php:416 templates/personal.php:181 +#: templates/admin.php:416 templates/personal.php:171 msgid "Version" msgstr "Versión" -#: templates/admin.php:420 templates/personal.php:184 +#: templates/admin.php:420 templates/personal.php:174 msgid "" "Developed by the ownCloud community, the -licensed by " msgstr "-licenciado por " @@ -667,108 +667,108 @@ msgstr "Mostrar de nuevo el asistente de primera ejecución" msgid "You have used %s of the available %s" msgstr "Usás %s de los %s disponibles" -#: templates/personal.php:39 templates/users.php:21 templates/users.php:87 +#: templates/personal.php:38 templates/users.php:21 templates/users.php:87 msgid "Password" msgstr "Contraseña" -#: templates/personal.php:40 +#: templates/personal.php:39 msgid "Your password was changed" msgstr "Tu contraseña fue cambiada" -#: templates/personal.php:41 +#: templates/personal.php:40 msgid "Unable to change your password" msgstr "No fue posible cambiar tu contraseña" -#: templates/personal.php:43 +#: templates/personal.php:42 msgid "Current password" msgstr "Contraseña actual" -#: templates/personal.php:46 +#: templates/personal.php:45 msgid "New password" msgstr "Nueva contraseña:" -#: templates/personal.php:50 +#: templates/personal.php:49 msgid "Change password" msgstr "Cambiar contraseña" -#: templates/personal.php:64 templates/users.php:86 +#: templates/personal.php:61 templates/users.php:86 msgid "Full Name" msgstr "Nombre completo" -#: templates/personal.php:81 +#: templates/personal.php:76 msgid "Email" msgstr "e-mail" -#: templates/personal.php:83 +#: templates/personal.php:78 msgid "Your email address" msgstr "Tu dirección de e-mail" -#: templates/personal.php:86 +#: templates/personal.php:81 msgid "" "Fill in an email address to enable password recovery and receive " "notifications" msgstr "" -#: templates/personal.php:96 +#: templates/personal.php:89 msgid "Profile picture" msgstr "Imágen de perfil" -#: templates/personal.php:101 +#: templates/personal.php:94 msgid "Upload new" msgstr "Subir nuevo" -#: templates/personal.php:103 +#: templates/personal.php:96 msgid "Select new from Files" msgstr "Seleccionar nuevo desde archivos" -#: templates/personal.php:104 +#: templates/personal.php:97 msgid "Remove image" msgstr "Remover imagen" -#: templates/personal.php:105 +#: templates/personal.php:98 msgid "Either png or jpg. Ideally square but you will be able to crop it." msgstr "Sólo png o jpg. Lo ideal que sea cuadrada sino luego podrás recortarlo." -#: templates/personal.php:107 +#: templates/personal.php:100 msgid "Your avatar is provided by your original account." msgstr "Su avatar es proveído por su cuenta original." -#: templates/personal.php:111 +#: templates/personal.php:104 msgid "Cancel" msgstr "Cancelar" -#: templates/personal.php:112 +#: templates/personal.php:105 msgid "Choose as profile image" msgstr "Elegir como imagen de perfil" -#: templates/personal.php:120 templates/personal.php:121 +#: templates/personal.php:111 templates/personal.php:112 msgid "Language" msgstr "Idioma" -#: templates/personal.php:140 +#: templates/personal.php:131 msgid "Help translate" msgstr "Ayudanos a traducir" -#: templates/personal.php:147 +#: templates/personal.php:137 msgid "WebDAV" msgstr "WebDAV" -#: templates/personal.php:149 +#: templates/personal.php:139 #, php-format msgid "" "Use this address to access your Files via " "WebDAV" msgstr "Usar esta dirección para acceder a tus archivos vía WebDAV" -#: templates/personal.php:161 +#: templates/personal.php:151 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "La aplicación de encriptación ya no está habilidata, por favor desencripte todos sus archivos." -#: templates/personal.php:167 +#: templates/personal.php:157 msgid "Log-in password" msgstr "Clave de acceso" -#: templates/personal.php:172 +#: templates/personal.php:162 msgid "Decrypt all Files" msgstr "Desencriptar todos los archivos" diff --git a/l10n/es_MX/lib.po b/l10n/es_MX/lib.po index 30dd734868e..3e6f085cf41 100644 --- a/l10n/es_MX/lib.po +++ b/l10n/es_MX/lib.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-09 01:55-0400\n" -"PO-Revision-Date: 2014-04-09 05:55+0000\n" +"POT-Creation-Date: 2014-04-10 01:54-0400\n" +"PO-Revision-Date: 2014-04-09 06:10+0000\n" "Last-Translator: I Robot\n" "Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/owncloud/language/es_MX/)\n" "MIME-Version: 1.0\n" @@ -345,11 +345,11 @@ msgstr "" #: private/user/manager.php:251 msgid "A valid username must be provided" -msgstr "" +msgstr "Se debe proporcionar un nombre de usuario válido" #: private/user/manager.php:255 msgid "A valid password must be provided" -msgstr "" +msgstr "Se debe proporcionar una contraseña válida" #: private/user/manager.php:260 msgid "The username is already being used" diff --git a/l10n/es_MX/settings.po b/l10n/es_MX/settings.po index 29badc9fef1..a2f997aea52 100644 --- a/l10n/es_MX/settings.po +++ b/l10n/es_MX/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-03-26 01:55-0400\n" -"PO-Revision-Date: 2014-03-26 05:55+0000\n" +"POT-Creation-Date: 2014-04-10 01:54-0400\n" +"PO-Revision-Date: 2014-04-09 06:10+0000\n" "Last-Translator: I Robot\n" "Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/owncloud/language/es_MX/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159 +#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149 msgid "Encryption" msgstr "Cifrado" @@ -64,7 +64,7 @@ msgid "Unable to load list from App Store" msgstr "No se pudo cargar la lista desde el App Store" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 changepassword/controller.php:55 +#: ajax/togglegroups.php:20 changepassword/controller.php:49 msgid "Authentication error" msgstr "Error de autenticación" @@ -126,32 +126,32 @@ msgstr "No se pudo eliminar al usuario del grupo %s" msgid "Couldn't update app." msgstr "No se pudo actualizar la aplicación." -#: changepassword/controller.php:20 +#: changepassword/controller.php:17 msgid "Wrong password" msgstr "Contraseña incorrecta" -#: changepassword/controller.php:42 +#: changepassword/controller.php:36 msgid "No user supplied" msgstr "No se especificó un usuario" -#: changepassword/controller.php:74 +#: changepassword/controller.php:68 msgid "" "Please provide an admin recovery password, otherwise all user data will be " "lost" msgstr "Por favor facilite una contraseña de recuperación de administrador, sino podrían perderse todos los datos de usuario" -#: changepassword/controller.php:79 +#: changepassword/controller.php:73 msgid "" "Wrong admin recovery password. Please check the password and try again." msgstr "Contraseña de recuperación de administrador incorrecta. Por favor compruebe la contraseña e inténtelo de nuevo." -#: changepassword/controller.php:87 +#: changepassword/controller.php:81 msgid "" "Back-end doesn't support password change, but the users encryption key was " "successfully updated." msgstr "El back-end no soporta cambios de contraseña, pero la clave de cifrado del usuario ha sido actualizada satisfactoriamente." -#: changepassword/controller.php:92 changepassword/controller.php:103 +#: changepassword/controller.php:86 changepassword/controller.php:97 msgid "Unable to change password" msgstr "No se ha podido cambiar la contraseña" @@ -203,7 +203,7 @@ msgstr "Error mientras se actualizaba la aplicación" msgid "Error" msgstr "Error" -#: js/apps.js:153 templates/apps.php:54 +#: js/apps.js:153 templates/apps.php:55 msgid "Update" msgstr "Actualizar" @@ -211,31 +211,31 @@ msgstr "Actualizar" msgid "Updated" msgstr "Actualizado" -#: js/personal.js:246 +#: js/personal.js:243 msgid "Select a profile picture" msgstr "Seleccionar una imagen de perfil" -#: js/personal.js:277 +#: js/personal.js:274 msgid "Very weak password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:275 msgid "Weak password" msgstr "" -#: js/personal.js:279 +#: js/personal.js:276 msgid "So-so password" msgstr "" -#: js/personal.js:280 +#: js/personal.js:277 msgid "Good password" msgstr "" -#: js/personal.js:281 +#: js/personal.js:278 msgid "Strong password" msgstr "" -#: js/personal.js:316 +#: js/personal.js:313 msgid "Decrypting files... Please wait, this can take some time." msgstr "Descifrando archivos... Espere por favor, esto puede llevar algo de tiempo." @@ -284,7 +284,7 @@ msgstr "Se debe proporcionar una contraseña válida" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "Atención: el directorio de inicio para el usuario \"{user}\" ya existe." -#: personal.php:49 personal.php:50 +#: personal.php:48 personal.php:49 msgid "__language_name__" msgstr "Español (México)" @@ -589,11 +589,11 @@ msgstr "Más" msgid "Less" msgstr "Menos" -#: templates/admin.php:416 templates/personal.php:181 +#: templates/admin.php:416 templates/personal.php:171 msgid "Version" msgstr "Versión" -#: templates/admin.php:420 templates/personal.php:184 +#: templates/admin.php:420 templates/personal.php:174 msgid "" "Developed by the ownCloud community, the -licensed by " msgstr "-licencia otorgada por " @@ -664,108 +664,108 @@ msgstr "Mostrar nuevamente el Asistente de ejecución inicial" msgid "You have used %s of the available %s" msgstr "Ha usado %s de los %s disponibles" -#: templates/personal.php:39 templates/users.php:21 templates/users.php:87 +#: templates/personal.php:38 templates/users.php:21 templates/users.php:87 msgid "Password" msgstr "Contraseña" -#: templates/personal.php:40 +#: templates/personal.php:39 msgid "Your password was changed" msgstr "Su contraseña ha sido cambiada" -#: templates/personal.php:41 +#: templates/personal.php:40 msgid "Unable to change your password" msgstr "No se ha podido cambiar su contraseña" -#: templates/personal.php:43 +#: templates/personal.php:42 msgid "Current password" msgstr "Contraseña actual" -#: templates/personal.php:46 +#: templates/personal.php:45 msgid "New password" msgstr "Nueva contraseña" -#: templates/personal.php:50 +#: templates/personal.php:49 msgid "Change password" msgstr "Cambiar contraseña" -#: templates/personal.php:64 templates/users.php:86 +#: templates/personal.php:61 templates/users.php:86 msgid "Full Name" msgstr "Nombre completo" -#: templates/personal.php:81 +#: templates/personal.php:76 msgid "Email" msgstr "Correo electrónico" -#: templates/personal.php:83 +#: templates/personal.php:78 msgid "Your email address" msgstr "Su dirección de correo" -#: templates/personal.php:86 +#: templates/personal.php:81 msgid "" "Fill in an email address to enable password recovery and receive " "notifications" msgstr "" -#: templates/personal.php:96 +#: templates/personal.php:89 msgid "Profile picture" msgstr "Foto de perfil" -#: templates/personal.php:101 +#: templates/personal.php:94 msgid "Upload new" msgstr "Subir otra" -#: templates/personal.php:103 +#: templates/personal.php:96 msgid "Select new from Files" msgstr "Seleccionar otra desde Archivos" -#: templates/personal.php:104 +#: templates/personal.php:97 msgid "Remove image" msgstr "Borrar imagen" -#: templates/personal.php:105 +#: templates/personal.php:98 msgid "Either png or jpg. Ideally square but you will be able to crop it." msgstr "Archivo PNG o JPG. Preferiblemente cuadrado, pero tendrás la posibilidad de recortarlo." -#: templates/personal.php:107 +#: templates/personal.php:100 msgid "Your avatar is provided by your original account." msgstr "Su avatar es proporcionado por su cuenta original." -#: templates/personal.php:111 +#: templates/personal.php:104 msgid "Cancel" msgstr "Cancelar" -#: templates/personal.php:112 +#: templates/personal.php:105 msgid "Choose as profile image" msgstr "Seleccionar como imagen de perfil" -#: templates/personal.php:120 templates/personal.php:121 +#: templates/personal.php:111 templates/personal.php:112 msgid "Language" msgstr "Idioma" -#: templates/personal.php:140 +#: templates/personal.php:131 msgid "Help translate" msgstr "Ayúdanos a traducir" -#: templates/personal.php:147 +#: templates/personal.php:137 msgid "WebDAV" msgstr "WebDAV" -#: templates/personal.php:149 +#: templates/personal.php:139 #, php-format msgid "" "Use this address to access your Files via " "WebDAV" msgstr "Utilice esta dirección para acceder a sus archivos vía WebDAV" -#: templates/personal.php:161 +#: templates/personal.php:151 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "La aplicación de cifrado ya no está activada, descifre todos sus archivos" -#: templates/personal.php:167 +#: templates/personal.php:157 msgid "Log-in password" msgstr "Contraseña de acceso" -#: templates/personal.php:172 +#: templates/personal.php:162 msgid "Decrypt all Files" msgstr "Descifrar archivos" diff --git a/l10n/et_EE/lib.po b/l10n/et_EE/lib.po index 22ad38b16d2..7602de2d16e 100644 --- a/l10n/et_EE/lib.po +++ b/l10n/et_EE/lib.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-09 01:55-0400\n" -"PO-Revision-Date: 2014-04-09 05:55+0000\n" +"POT-Creation-Date: 2014-04-10 01:54-0400\n" +"PO-Revision-Date: 2014-04-09 06:10+0000\n" "Last-Translator: I Robot\n" "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n" "MIME-Version: 1.0\n" @@ -347,12 +347,12 @@ msgstr "" #: private/user/manager.php:251 msgid "A valid username must be provided" -msgstr "" +msgstr "Sisesta nõuetele vastav kasutajatunnus" #: private/user/manager.php:255 msgid "A valid password must be provided" -msgstr "" +msgstr "Sisesta nõuetele vastav parool" #: private/user/manager.php:260 msgid "The username is already being used" -msgstr "" +msgstr "Kasutajanimi on juba kasutuses" diff --git a/l10n/et_EE/settings.po b/l10n/et_EE/settings.po index 676b970fc09..031b5521718 100644 --- a/l10n/et_EE/settings.po +++ b/l10n/et_EE/settings.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-02 01:55-0400\n" -"PO-Revision-Date: 2014-04-01 10:01+0000\n" +"POT-Creation-Date: 2014-04-10 01:54-0400\n" +"PO-Revision-Date: 2014-04-09 06:10+0000\n" "Last-Translator: pisike.sipelgas \n" "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n" "MIME-Version: 1.0\n" @@ -213,31 +213,31 @@ msgstr "Uuenda" msgid "Updated" msgstr "Uuendatud" -#: js/personal.js:246 +#: js/personal.js:243 msgid "Select a profile picture" msgstr "Vali profiili pilt" -#: js/personal.js:277 +#: js/personal.js:274 msgid "Very weak password" msgstr "Väga nõrk parool" -#: js/personal.js:278 +#: js/personal.js:275 msgid "Weak password" msgstr "Nõrk parool" -#: js/personal.js:279 +#: js/personal.js:276 msgid "So-so password" msgstr "Enam-vähem sobiv parool" -#: js/personal.js:280 +#: js/personal.js:277 msgid "Good password" msgstr "Hea parool" -#: js/personal.js:281 +#: js/personal.js:278 msgid "Strong password" msgstr "Väga hea parool" -#: js/personal.js:316 +#: js/personal.js:313 msgid "Decrypting files... Please wait, this can take some time." msgstr "Dekrüpteerin faile... Palun oota, see võib võtta veidi aega." diff --git a/l10n/eu/lib.po b/l10n/eu/lib.po index 46c2edf7e3f..6c379c48627 100644 --- a/l10n/eu/lib.po +++ b/l10n/eu/lib.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-09 01:55-0400\n" -"PO-Revision-Date: 2014-04-09 05:55+0000\n" +"POT-Creation-Date: 2014-04-10 01:54-0400\n" +"PO-Revision-Date: 2014-04-09 06:10+0000\n" "Last-Translator: I Robot\n" "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n" "MIME-Version: 1.0\n" @@ -347,12 +347,12 @@ msgstr "" #: private/user/manager.php:251 msgid "A valid username must be provided" -msgstr "" +msgstr "Baliozko erabiltzaile izena eman behar da" #: private/user/manager.php:255 msgid "A valid password must be provided" -msgstr "" +msgstr "Baliozko pasahitza eman behar da" #: private/user/manager.php:260 msgid "The username is already being used" -msgstr "" +msgstr "Erabiltzaile izena dagoeneko erabiltzen ari da" diff --git a/l10n/eu/settings.po b/l10n/eu/settings.po index 3968d2fbc17..136a7c70e61 100644 --- a/l10n/eu/settings.po +++ b/l10n/eu/settings.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-03-26 01:55-0400\n" -"PO-Revision-Date: 2014-03-26 05:55+0000\n" +"POT-Creation-Date: 2014-04-10 01:54-0400\n" +"PO-Revision-Date: 2014-04-09 06:10+0000\n" "Last-Translator: I Robot\n" "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n" "MIME-Version: 1.0\n" @@ -54,7 +54,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159 +#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149 msgid "Encryption" msgstr "Enkriptazioa" @@ -67,7 +67,7 @@ msgid "Unable to load list from App Store" msgstr "Ezin izan da App Dendatik zerrenda kargatu" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 changepassword/controller.php:55 +#: ajax/togglegroups.php:20 changepassword/controller.php:49 msgid "Authentication error" msgstr "Autentifikazio errorea" @@ -129,32 +129,32 @@ msgstr "Ezin izan da erabiltzailea %s taldetik ezabatu" msgid "Couldn't update app." msgstr "Ezin izan da aplikazioa eguneratu." -#: changepassword/controller.php:20 +#: changepassword/controller.php:17 msgid "Wrong password" msgstr "Pasahitz okerra" -#: changepassword/controller.php:42 +#: changepassword/controller.php:36 msgid "No user supplied" msgstr "Ez da erabiltzailerik zehaztu" -#: changepassword/controller.php:74 +#: changepassword/controller.php:68 msgid "" "Please provide an admin recovery password, otherwise all user data will be " "lost" msgstr "Mesedez eman berreskuratzeko administrazio pasahitza, bestela erabiltzaile datu guztiak galduko dira" -#: changepassword/controller.php:79 +#: changepassword/controller.php:73 msgid "" "Wrong admin recovery password. Please check the password and try again." msgstr "Berreskuratze administradore pasahitz ez egokia. Medesez egiaztatu pasahitza eta saiatu berriz." -#: changepassword/controller.php:87 +#: changepassword/controller.php:81 msgid "" "Back-end doesn't support password change, but the users encryption key was " "successfully updated." msgstr "" -#: changepassword/controller.php:92 changepassword/controller.php:103 +#: changepassword/controller.php:86 changepassword/controller.php:97 msgid "Unable to change password" msgstr "Ezin izan da pasahitza aldatu" @@ -206,7 +206,7 @@ msgstr "Errorea aplikazioa eguneratzen zen bitartean" msgid "Error" msgstr "Errorea" -#: js/apps.js:153 templates/apps.php:54 +#: js/apps.js:153 templates/apps.php:55 msgid "Update" msgstr "Eguneratu" @@ -214,31 +214,31 @@ msgstr "Eguneratu" msgid "Updated" msgstr "Eguneratuta" -#: js/personal.js:246 +#: js/personal.js:243 msgid "Select a profile picture" msgstr "Profil argazkia aukeratu" -#: js/personal.js:277 +#: js/personal.js:274 msgid "Very weak password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:275 msgid "Weak password" msgstr "" -#: js/personal.js:279 +#: js/personal.js:276 msgid "So-so password" msgstr "" -#: js/personal.js:280 +#: js/personal.js:277 msgid "Good password" msgstr "" -#: js/personal.js:281 +#: js/personal.js:278 msgid "Strong password" msgstr "" -#: js/personal.js:316 +#: js/personal.js:313 msgid "Decrypting files... Please wait, this can take some time." msgstr "" @@ -287,7 +287,7 @@ msgstr "Baliozko pasahitza eman behar da" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "Abisua: \"{user}\" erabiltzailearen Home karpeta dagoeneko exisititzen da" -#: personal.php:49 personal.php:50 +#: personal.php:48 personal.php:49 msgid "__language_name__" msgstr "Euskera" @@ -592,11 +592,11 @@ msgstr "Gehiago" msgid "Less" msgstr "Gutxiago" -#: templates/admin.php:416 templates/personal.php:181 +#: templates/admin.php:416 templates/personal.php:171 msgid "Version" msgstr "Bertsioa" -#: templates/admin.php:420 templates/personal.php:184 +#: templates/admin.php:420 templates/personal.php:174 msgid "" "Developed by the ownCloud community, the -licensed by " msgstr "-lizentziatua " @@ -667,108 +667,108 @@ msgstr "Erakutsi berriz Lehenengo Aldiko Morroia" msgid "You have used %s of the available %s" msgstr "Dagoeneko %s erabili duzu eskuragarri duzun %setatik" -#: templates/personal.php:39 templates/users.php:21 templates/users.php:87 +#: templates/personal.php:38 templates/users.php:21 templates/users.php:87 msgid "Password" msgstr "Pasahitza" -#: templates/personal.php:40 +#: templates/personal.php:39 msgid "Your password was changed" msgstr "Zere pasahitza aldatu da" -#: templates/personal.php:41 +#: templates/personal.php:40 msgid "Unable to change your password" msgstr "Ezin izan da zure pasahitza aldatu" -#: templates/personal.php:43 +#: templates/personal.php:42 msgid "Current password" msgstr "Uneko pasahitza" -#: templates/personal.php:46 +#: templates/personal.php:45 msgid "New password" msgstr "Pasahitz berria" -#: templates/personal.php:50 +#: templates/personal.php:49 msgid "Change password" msgstr "Aldatu pasahitza" -#: templates/personal.php:64 templates/users.php:86 +#: templates/personal.php:61 templates/users.php:86 msgid "Full Name" msgstr "Izena" -#: templates/personal.php:81 +#: templates/personal.php:76 msgid "Email" msgstr "E-posta" -#: templates/personal.php:83 +#: templates/personal.php:78 msgid "Your email address" msgstr "Zure e-posta" -#: templates/personal.php:86 +#: templates/personal.php:81 msgid "" "Fill in an email address to enable password recovery and receive " "notifications" msgstr "" -#: templates/personal.php:96 +#: templates/personal.php:89 msgid "Profile picture" msgstr "Profilaren irudia" -#: templates/personal.php:101 +#: templates/personal.php:94 msgid "Upload new" msgstr "Igo berria" -#: templates/personal.php:103 +#: templates/personal.php:96 msgid "Select new from Files" msgstr "Hautatu berria Fitxategietatik" -#: templates/personal.php:104 +#: templates/personal.php:97 msgid "Remove image" msgstr "Irudia ezabatu" -#: templates/personal.php:105 +#: templates/personal.php:98 msgid "Either png or jpg. Ideally square but you will be able to crop it." msgstr "png edo jpg. Hobe karratua baina mozteko aukera izango duzu." -#: templates/personal.php:107 +#: templates/personal.php:100 msgid "Your avatar is provided by your original account." msgstr "" -#: templates/personal.php:111 +#: templates/personal.php:104 msgid "Cancel" msgstr "Ezeztatu" -#: templates/personal.php:112 +#: templates/personal.php:105 msgid "Choose as profile image" msgstr "Profil irudi bezala aukeratu" -#: templates/personal.php:120 templates/personal.php:121 +#: templates/personal.php:111 templates/personal.php:112 msgid "Language" msgstr "Hizkuntza" -#: templates/personal.php:140 +#: templates/personal.php:131 msgid "Help translate" msgstr "Lagundu itzultzen" -#: templates/personal.php:147 +#: templates/personal.php:137 msgid "WebDAV" msgstr "WebDAV" -#: templates/personal.php:149 +#: templates/personal.php:139 #, php-format msgid "" "Use this address to access your Files via " "WebDAV" msgstr "helbidea erabili zure fitxategiak WebDAV bidez eskuratzeko" -#: templates/personal.php:161 +#: templates/personal.php:151 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "Enkriptazio aplikazioa ez dago jada gaiturik, mesedez desenkriptatu zure fitxategi guztiak." -#: templates/personal.php:167 +#: templates/personal.php:157 msgid "Log-in password" msgstr "Saioa hasteko pasahitza" -#: templates/personal.php:172 +#: templates/personal.php:162 msgid "Decrypt all Files" msgstr "Desenkripattu fitxategi guztiak" diff --git a/l10n/fa/lib.po b/l10n/fa/lib.po index 98fd26210e5..2f2c29cb563 100644 --- a/l10n/fa/lib.po +++ b/l10n/fa/lib.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-09 01:55-0400\n" -"PO-Revision-Date: 2014-04-09 05:55+0000\n" +"POT-Creation-Date: 2014-04-10 01:54-0400\n" +"PO-Revision-Date: 2014-04-09 06:10+0000\n" "Last-Translator: I Robot\n" "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n" "MIME-Version: 1.0\n" @@ -342,11 +342,11 @@ msgstr "" #: private/user/manager.php:251 msgid "A valid username must be provided" -msgstr "" +msgstr "نام کاربری صحیح باید وارد شود" #: private/user/manager.php:255 msgid "A valid password must be provided" -msgstr "" +msgstr "رمز عبور صحیح باید وارد شود" #: private/user/manager.php:260 msgid "The username is already being used" diff --git a/l10n/fa/settings.po b/l10n/fa/settings.po index 9161be26f74..f963e25c9aa 100644 --- a/l10n/fa/settings.po +++ b/l10n/fa/settings.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-03-26 01:55-0400\n" -"PO-Revision-Date: 2014-03-26 05:55+0000\n" +"POT-Creation-Date: 2014-04-10 01:54-0400\n" +"PO-Revision-Date: 2014-04-09 06:10+0000\n" "Last-Translator: I Robot\n" "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n" "MIME-Version: 1.0\n" @@ -54,7 +54,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159 +#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149 msgid "Encryption" msgstr "رمزگذاری" @@ -67,7 +67,7 @@ msgid "Unable to load list from App Store" msgstr "قادر به بارگذاری لیست از فروشگاه اپ نیستم" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 changepassword/controller.php:55 +#: ajax/togglegroups.php:20 changepassword/controller.php:49 msgid "Authentication error" msgstr "خطا در اعتبار سنجی" @@ -129,32 +129,32 @@ msgstr "امکان حذف کاربر از گروه %s نیست" msgid "Couldn't update app." msgstr "برنامه را نمی توان به هنگام ساخت." -#: changepassword/controller.php:20 +#: changepassword/controller.php:17 msgid "Wrong password" msgstr "رمز عبور اشتباه است" -#: changepassword/controller.php:42 +#: changepassword/controller.php:36 msgid "No user supplied" msgstr "هیچ کاربری تعریف نشده است" -#: changepassword/controller.php:74 +#: changepassword/controller.php:68 msgid "" "Please provide an admin recovery password, otherwise all user data will be " "lost" msgstr "لطفاً یک رمز مدیریتی برای بازیابی کردن تعریف نمایید. در غیر اینصورت اطلاعات تمامی کاربران از دست خواهند رفت." -#: changepassword/controller.php:79 +#: changepassword/controller.php:73 msgid "" "Wrong admin recovery password. Please check the password and try again." msgstr "رمز مدیریتی بازیابی غلط است. لطفاً رمز را کنترل کرده و دوباره امتحان نمایید." -#: changepassword/controller.php:87 +#: changepassword/controller.php:81 msgid "" "Back-end doesn't support password change, but the users encryption key was " "successfully updated." msgstr "سیستم مدیریتی امکان تغییر رمز را پشتیبانی نمی‌کند. ولی کلید رمزنگاری کاربران با موفقیت به روز شد." -#: changepassword/controller.php:92 changepassword/controller.php:103 +#: changepassword/controller.php:86 changepassword/controller.php:97 msgid "Unable to change password" msgstr "نمی‌توان رمز را تغییر داد" @@ -206,7 +206,7 @@ msgstr "خطا در هنگام بهنگام سازی برنامه" msgid "Error" msgstr "خطا" -#: js/apps.js:153 templates/apps.php:54 +#: js/apps.js:153 templates/apps.php:55 msgid "Update" msgstr "به روز رسانی" @@ -214,31 +214,31 @@ msgstr "به روز رسانی" msgid "Updated" msgstr "بروز رسانی انجام شد" -#: js/personal.js:246 +#: js/personal.js:243 msgid "Select a profile picture" msgstr "انتخاب تصویر پروفایل" -#: js/personal.js:277 +#: js/personal.js:274 msgid "Very weak password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:275 msgid "Weak password" msgstr "" -#: js/personal.js:279 +#: js/personal.js:276 msgid "So-so password" msgstr "" -#: js/personal.js:280 +#: js/personal.js:277 msgid "Good password" msgstr "" -#: js/personal.js:281 +#: js/personal.js:278 msgid "Strong password" msgstr "" -#: js/personal.js:316 +#: js/personal.js:313 msgid "Decrypting files... Please wait, this can take some time." msgstr "در حال بازگشایی رمز فایل‌ها... لطفاً صبر نمایید. این امر ممکن است مدتی زمان ببرد." @@ -287,7 +287,7 @@ msgstr "رمز عبور صحیح باید وارد شود" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "اخطار: پوشه‌ی خانه برای کاربر \"{user}\" در حال حاضر وجود دارد" -#: personal.php:49 personal.php:50 +#: personal.php:48 personal.php:49 msgid "__language_name__" msgstr "__language_name__" @@ -592,11 +592,11 @@ msgstr "بیش‌تر" msgid "Less" msgstr "کم‌تر" -#: templates/admin.php:416 templates/personal.php:181 +#: templates/admin.php:416 templates/personal.php:171 msgid "Version" msgstr "نسخه" -#: templates/admin.php:420 templates/personal.php:184 +#: templates/admin.php:420 templates/personal.php:174 msgid "" "Developed by the ownCloud community, the -licensed by " msgstr "-مجاز از طرف " @@ -667,108 +667,108 @@ msgstr "راهبری کمکی اجرای اول را دوباره نمایش ب msgid "You have used %s of the available %s" msgstr "شما استفاده کردید از %s از میزان در دسترس %s" -#: templates/personal.php:39 templates/users.php:21 templates/users.php:87 +#: templates/personal.php:38 templates/users.php:21 templates/users.php:87 msgid "Password" msgstr "گذرواژه" -#: templates/personal.php:40 +#: templates/personal.php:39 msgid "Your password was changed" msgstr "رمز عبور شما تغییر یافت" -#: templates/personal.php:41 +#: templates/personal.php:40 msgid "Unable to change your password" msgstr "ناتوان در تغییر گذرواژه" -#: templates/personal.php:43 +#: templates/personal.php:42 msgid "Current password" msgstr "گذرواژه کنونی" -#: templates/personal.php:46 +#: templates/personal.php:45 msgid "New password" msgstr "گذرواژه جدید" -#: templates/personal.php:50 +#: templates/personal.php:49 msgid "Change password" msgstr "تغییر گذر واژه" -#: templates/personal.php:64 templates/users.php:86 +#: templates/personal.php:61 templates/users.php:86 msgid "Full Name" msgstr "نام کامل" -#: templates/personal.php:81 +#: templates/personal.php:76 msgid "Email" msgstr "ایمیل" -#: templates/personal.php:83 +#: templates/personal.php:78 msgid "Your email address" msgstr "پست الکترونیکی شما" -#: templates/personal.php:86 +#: templates/personal.php:81 msgid "" "Fill in an email address to enable password recovery and receive " "notifications" msgstr "" -#: templates/personal.php:96 +#: templates/personal.php:89 msgid "Profile picture" msgstr "تصویر پروفایل" -#: templates/personal.php:101 +#: templates/personal.php:94 msgid "Upload new" msgstr "بارگذاری جدید" -#: templates/personal.php:103 +#: templates/personal.php:96 msgid "Select new from Files" msgstr "انتخاب جدید از میان فایل ها" -#: templates/personal.php:104 +#: templates/personal.php:97 msgid "Remove image" msgstr "تصویر پاک شود" -#: templates/personal.php:105 +#: templates/personal.php:98 msgid "Either png or jpg. Ideally square but you will be able to crop it." msgstr "هردوی jpg و png ها مربع گونه می‌باشند. با این حال شما می‌توانید آنها را برش بزنید." -#: templates/personal.php:107 +#: templates/personal.php:100 msgid "Your avatar is provided by your original account." msgstr "" -#: templates/personal.php:111 +#: templates/personal.php:104 msgid "Cancel" msgstr "منصرف شدن" -#: templates/personal.php:112 +#: templates/personal.php:105 msgid "Choose as profile image" msgstr "یک تصویر پروفایل انتخاب کنید" -#: templates/personal.php:120 templates/personal.php:121 +#: templates/personal.php:111 templates/personal.php:112 msgid "Language" msgstr "زبان" -#: templates/personal.php:140 +#: templates/personal.php:131 msgid "Help translate" msgstr "به ترجمه آن کمک کنید" -#: templates/personal.php:147 +#: templates/personal.php:137 msgid "WebDAV" msgstr "WebDAV" -#: templates/personal.php:149 +#: templates/personal.php:139 #, php-format msgid "" "Use this address to access your Files via " "WebDAV" msgstr "از این آدرس استفاده کنید تا بتوانید به فایل‌های خود توسط WebDAV دسترسی پیدا کنید" -#: templates/personal.php:161 +#: templates/personal.php:151 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:167 +#: templates/personal.php:157 msgid "Log-in password" msgstr "رمز ورود" -#: templates/personal.php:172 +#: templates/personal.php:162 msgid "Decrypt all Files" msgstr "تمام فایلها رمزگشایی شود" diff --git a/l10n/fi_FI/files_external.po b/l10n/fi_FI/files_external.po index 5e012a3cfcb..2ed2462b962 100644 --- a/l10n/fi_FI/files_external.po +++ b/l10n/fi_FI/files_external.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-09 01:55-0400\n" -"PO-Revision-Date: 2014-04-09 05:55+0000\n" -"Last-Translator: I Robot\n" +"POT-Creation-Date: 2014-04-10 01:54-0400\n" +"PO-Revision-Date: 2014-04-09 12:30+0000\n" +"Last-Translator: Jiri Grönroos \n" "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -44,32 +44,32 @@ msgstr "Tallennettu" #: lib/config.php:592 msgid "Note: " -msgstr "" +msgstr "Huomio: " #: lib/config.php:602 msgid " and " -msgstr "" +msgstr "ja" #: lib/config.php:624 #, php-format msgid "" "Note: The cURL support in PHP is not enabled or installed. Mounting " "of %s is not possible. Please ask your system administrator to install it." -msgstr "" +msgstr "Huomio: PHP:n cURL-tuki ei ole käytössä tai sitä ei ole asennettu. Kohteen %s liittäminen ei ole mahdollista. Pyydä järjestelmän ylläpitäjää ottamaan cURL-tuki käyttöön." #: lib/config.php:626 #, php-format msgid "" "Note: The FTP support in PHP is not enabled or installed. Mounting of" " %s is not possible. Please ask your system administrator to install it." -msgstr "" +msgstr "Huomio: PHP:n FTP-tuki ei ole käytössä tai sitä ei ole asennettu. Kohteen %s liittäminen ei ole mahdollista. Pyydä järjestelmän ylläpitäjää ottamaan FTP-tuki käyttöön." #: lib/config.php:628 #, php-format msgid "" "Note: \"%s\" is not installed. Mounting of %s is not possible. Please" " ask your system administrator to install it." -msgstr "" +msgstr "Huomio: \"%s\" ei ole asennettu. Kohteen %s liittäminen ei ole mahdollista. Pyydä järjestelmän ylläpitäjää asentamaan puuttuva kohde." #: templates/settings.php:2 msgid "External Storage" diff --git a/l10n/fi_FI/lib.po b/l10n/fi_FI/lib.po index ea6a7b590df..68427d6e24a 100644 --- a/l10n/fi_FI/lib.po +++ b/l10n/fi_FI/lib.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-09 01:55-0400\n" -"PO-Revision-Date: 2014-04-09 05:55+0000\n" -"Last-Translator: I Robot\n" +"POT-Creation-Date: 2014-04-10 01:54-0400\n" +"PO-Revision-Date: 2014-04-09 12:20+0000\n" +"Last-Translator: Jiri Grönroos \n" "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -342,16 +342,16 @@ msgstr "vuotta sitten" msgid "" "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", " "\"0-9\", and \"_.@-\"" -msgstr "" +msgstr "Vain seuraavat merkit ovat sallittuja käyttäjätunnuksessa: \"a-z\", \"A-Z\", \"0-9\" ja \"_.@-\"" #: private/user/manager.php:251 msgid "A valid username must be provided" -msgstr "" +msgstr "Anna kelvollinen käyttäjätunnus" #: private/user/manager.php:255 msgid "A valid password must be provided" -msgstr "" +msgstr "Anna kelvollinen salasana" #: private/user/manager.php:260 msgid "The username is already being used" -msgstr "" +msgstr "Käyttäjätunnus on jo käytössä" diff --git a/l10n/fi_FI/settings.po b/l10n/fi_FI/settings.po index 820800fa818..12029fb7fc9 100644 --- a/l10n/fi_FI/settings.po +++ b/l10n/fi_FI/settings.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-03-27 01:55-0400\n" -"PO-Revision-Date: 2014-03-26 07:01+0000\n" +"POT-Creation-Date: 2014-04-10 01:54-0400\n" +"PO-Revision-Date: 2014-04-09 06:10+0000\n" "Last-Translator: Jiri Grönroos \n" "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n" "MIME-Version: 1.0\n" @@ -52,7 +52,7 @@ msgstr "Aseta sähköpostiosoite, jotta voit testata sähköpostin toimivuutta." msgid "Send mode" msgstr "Lähetystila" -#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159 +#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149 msgid "Encryption" msgstr "Salaus" @@ -65,7 +65,7 @@ msgid "Unable to load list from App Store" msgstr "Ei pystytä lataamaan listaa sovellusvarastosta (App Store)" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 changepassword/controller.php:55 +#: ajax/togglegroups.php:20 changepassword/controller.php:49 msgid "Authentication error" msgstr "Tunnistautumisvirhe" @@ -127,32 +127,32 @@ msgstr "Käyttäjän poistaminen ryhmästä %s ei onnistu" msgid "Couldn't update app." msgstr "Sovelluksen päivitys epäonnistui." -#: changepassword/controller.php:20 +#: changepassword/controller.php:17 msgid "Wrong password" msgstr "Väärä salasana" -#: changepassword/controller.php:42 +#: changepassword/controller.php:36 msgid "No user supplied" msgstr "" -#: changepassword/controller.php:74 +#: changepassword/controller.php:68 msgid "" "Please provide an admin recovery password, otherwise all user data will be " "lost" msgstr "" -#: changepassword/controller.php:79 +#: changepassword/controller.php:73 msgid "" "Wrong admin recovery password. Please check the password and try again." msgstr "" -#: changepassword/controller.php:87 +#: changepassword/controller.php:81 msgid "" "Back-end doesn't support password change, but the users encryption key was " "successfully updated." msgstr "" -#: changepassword/controller.php:92 changepassword/controller.php:103 +#: changepassword/controller.php:86 changepassword/controller.php:97 msgid "Unable to change password" msgstr "Salasanan vaihto ei onnistunut" @@ -204,7 +204,7 @@ msgstr "Virhe sovellusta päivittäessä" msgid "Error" msgstr "Virhe" -#: js/apps.js:153 templates/apps.php:54 +#: js/apps.js:153 templates/apps.php:55 msgid "Update" msgstr "Päivitä" @@ -212,31 +212,31 @@ msgstr "Päivitä" msgid "Updated" msgstr "Päivitetty" -#: js/personal.js:246 +#: js/personal.js:243 msgid "Select a profile picture" msgstr "Valitse profiilikuva" -#: js/personal.js:277 +#: js/personal.js:274 msgid "Very weak password" msgstr "Erittäin heikko salasana" -#: js/personal.js:278 +#: js/personal.js:275 msgid "Weak password" msgstr "Heikko salasana" -#: js/personal.js:279 +#: js/personal.js:276 msgid "So-so password" msgstr "Kohtalainen salasana" -#: js/personal.js:280 +#: js/personal.js:277 msgid "Good password" msgstr "Hyvä salasana" -#: js/personal.js:281 +#: js/personal.js:278 msgid "Strong password" msgstr "Vahva salasana" -#: js/personal.js:316 +#: js/personal.js:313 msgid "Decrypting files... Please wait, this can take some time." msgstr "Puretaan tiedostojen salausta... Odota, tämä voi kestää jonkin aikaa." @@ -285,7 +285,7 @@ msgstr "Anna kelvollinen salasana" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "Varoitus: käyttäjällä \"{user}\" on jo olemassa kotikansio" -#: personal.php:49 personal.php:50 +#: personal.php:48 personal.php:49 msgid "__language_name__" msgstr "_kielen_nimi_" @@ -590,11 +590,11 @@ msgstr "Enemmän" msgid "Less" msgstr "Vähemmän" -#: templates/admin.php:416 templates/personal.php:181 +#: templates/admin.php:416 templates/personal.php:171 msgid "Version" msgstr "Versio" -#: templates/admin.php:420 templates/personal.php:184 +#: templates/admin.php:420 templates/personal.php:174 msgid "" "Developed by the ownCloud community, the -licensed by " msgstr "-lisensoija " @@ -665,108 +665,108 @@ msgstr "Näytä ensimmäisen käyttökerran avustaja uudelleen" msgid "You have used %s of the available %s" msgstr "Käytössäsi on %s/%s" -#: templates/personal.php:39 templates/users.php:21 templates/users.php:87 +#: templates/personal.php:38 templates/users.php:21 templates/users.php:87 msgid "Password" msgstr "Salasana" -#: templates/personal.php:40 +#: templates/personal.php:39 msgid "Your password was changed" msgstr "Salasanasi vaihdettiin" -#: templates/personal.php:41 +#: templates/personal.php:40 msgid "Unable to change your password" msgstr "Salasanaasi ei voitu vaihtaa" -#: templates/personal.php:43 +#: templates/personal.php:42 msgid "Current password" msgstr "Nykyinen salasana" -#: templates/personal.php:46 +#: templates/personal.php:45 msgid "New password" msgstr "Uusi salasana" -#: templates/personal.php:50 +#: templates/personal.php:49 msgid "Change password" msgstr "Vaihda salasana" -#: templates/personal.php:64 templates/users.php:86 +#: templates/personal.php:61 templates/users.php:86 msgid "Full Name" msgstr "Koko nimi" -#: templates/personal.php:81 +#: templates/personal.php:76 msgid "Email" msgstr "Sähköpostiosoite" -#: templates/personal.php:83 +#: templates/personal.php:78 msgid "Your email address" msgstr "Sähköpostiosoitteesi" -#: templates/personal.php:86 +#: templates/personal.php:81 msgid "" "Fill in an email address to enable password recovery and receive " "notifications" msgstr "Anna sähköpostiosoitteesi, jotta unohdettu salasana on mahdollista palauttaa ja voit vastaanottaa ilmoituksia" -#: templates/personal.php:96 +#: templates/personal.php:89 msgid "Profile picture" msgstr "Profiilikuva" -#: templates/personal.php:101 +#: templates/personal.php:94 msgid "Upload new" msgstr "Lähetä uusi" -#: templates/personal.php:103 +#: templates/personal.php:96 msgid "Select new from Files" msgstr "Valitse uusi tiedostoista" -#: templates/personal.php:104 +#: templates/personal.php:97 msgid "Remove image" msgstr "Poista kuva" -#: templates/personal.php:105 +#: templates/personal.php:98 msgid "Either png or jpg. Ideally square but you will be able to crop it." msgstr "Joko png- tai jpg-kuva. Mieluite neliö, voit kuitenkin rajata kuvaa." -#: templates/personal.php:107 +#: templates/personal.php:100 msgid "Your avatar is provided by your original account." msgstr "" -#: templates/personal.php:111 +#: templates/personal.php:104 msgid "Cancel" msgstr "Peru" -#: templates/personal.php:112 +#: templates/personal.php:105 msgid "Choose as profile image" msgstr "Valitse profiilikuvaksi" -#: templates/personal.php:120 templates/personal.php:121 +#: templates/personal.php:111 templates/personal.php:112 msgid "Language" msgstr "Kieli" -#: templates/personal.php:140 +#: templates/personal.php:131 msgid "Help translate" msgstr "Auta kääntämisessä" -#: templates/personal.php:147 +#: templates/personal.php:137 msgid "WebDAV" msgstr "WebDAV" -#: templates/personal.php:149 +#: templates/personal.php:139 #, php-format msgid "" "Use this address to access your Files via " "WebDAV" msgstr "Käytä tätä osoitetta käyttääksesi tiedostojasi WebDAVin kautta" -#: templates/personal.php:161 +#: templates/personal.php:151 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "Salaussovellus ei ole enää käytössä, joten pura kaikkien tiedostojesi salaus" -#: templates/personal.php:167 +#: templates/personal.php:157 msgid "Log-in password" msgstr "" -#: templates/personal.php:172 +#: templates/personal.php:162 msgid "Decrypt all Files" msgstr "Pura kaikkien tiedostojen salaus" diff --git a/l10n/fr/files_external.po b/l10n/fr/files_external.po index 472e1beb377..500cc45f235 100644 --- a/l10n/fr/files_external.po +++ b/l10n/fr/files_external.po @@ -3,14 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# timelord , 2014 # Christophe Lherieau , 2014 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-09 01:55-0400\n" -"PO-Revision-Date: 2014-04-09 05:55+0000\n" -"Last-Translator: I Robot\n" +"POT-Creation-Date: 2014-04-10 01:54-0400\n" +"PO-Revision-Date: 2014-04-09 12:20+0000\n" +"Last-Translator: timelord \n" "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -48,7 +49,7 @@ msgstr "" #: lib/config.php:602 msgid " and " -msgstr "" +msgstr "et" #: lib/config.php:624 #, php-format diff --git a/l10n/fr/lib.po b/l10n/fr/lib.po index 9dcc4505655..108ab1eab7d 100644 --- a/l10n/fr/lib.po +++ b/l10n/fr/lib.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-09 01:55-0400\n" -"PO-Revision-Date: 2014-04-09 05:55+0000\n" +"POT-Creation-Date: 2014-04-10 01:54-0400\n" +"PO-Revision-Date: 2014-04-09 06:10+0000\n" "Last-Translator: I Robot\n" "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n" "MIME-Version: 1.0\n" @@ -349,12 +349,12 @@ msgstr "" #: private/user/manager.php:251 msgid "A valid username must be provided" -msgstr "" +msgstr "Un nom d'utilisateur valide doit être saisi" #: private/user/manager.php:255 msgid "A valid password must be provided" -msgstr "" +msgstr "Un mot de passe valide doit être saisi" #: private/user/manager.php:260 msgid "The username is already being used" -msgstr "" +msgstr "Le nom d'utilisateur est déjà utilisé" diff --git a/l10n/fr/settings.po b/l10n/fr/settings.po index 47f6fb23248..364745b1f33 100644 --- a/l10n/fr/settings.po +++ b/l10n/fr/settings.po @@ -18,8 +18,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-07 01:55-0400\n" -"PO-Revision-Date: 2014-04-06 20:00+0000\n" +"POT-Creation-Date: 2014-04-10 01:54-0400\n" +"PO-Revision-Date: 2014-04-09 06:10+0000\n" "Last-Translator: Christophe Lherieau \n" "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n" "MIME-Version: 1.0\n" @@ -222,31 +222,31 @@ msgstr "Mettre à jour" msgid "Updated" msgstr "Mise à jour effectuée avec succès" -#: js/personal.js:246 +#: js/personal.js:243 msgid "Select a profile picture" msgstr "Selectionner une photo de profil " -#: js/personal.js:277 +#: js/personal.js:274 msgid "Very weak password" msgstr "Mot de passe de très faible sécurité" -#: js/personal.js:278 +#: js/personal.js:275 msgid "Weak password" msgstr "Mot de passe de faible sécurité" -#: js/personal.js:279 +#: js/personal.js:276 msgid "So-so password" msgstr "Mot de passe de sécurité tout juste acceptable" -#: js/personal.js:280 +#: js/personal.js:277 msgid "Good password" msgstr "Mot de passe de sécurité suffisante" -#: js/personal.js:281 +#: js/personal.js:278 msgid "Strong password" msgstr "Mot de passe de forte sécurité" -#: js/personal.js:316 +#: js/personal.js:313 msgid "Decrypting files... Please wait, this can take some time." msgstr "Déchiffrement en cours... Cela peut prendre un certain temps." diff --git a/l10n/gl/files_external.po b/l10n/gl/files_external.po index e8c8bbb0325..cdc233fcea0 100644 --- a/l10n/gl/files_external.po +++ b/l10n/gl/files_external.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-09 01:55-0400\n" -"PO-Revision-Date: 2014-04-09 05:55+0000\n" -"Last-Translator: I Robot\n" +"POT-Creation-Date: 2014-04-10 01:54-0400\n" +"PO-Revision-Date: 2014-04-09 07:40+0000\n" +"Last-Translator: mbouzada \n" "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -44,32 +44,32 @@ msgstr "Gardado" #: lib/config.php:592 msgid "Note: " -msgstr "" +msgstr "Nota: " #: lib/config.php:602 msgid " and " -msgstr "" +msgstr "e" #: lib/config.php:624 #, php-format msgid "" "Note: The cURL support in PHP is not enabled or installed. Mounting " "of %s is not possible. Please ask your system administrator to install it." -msgstr "" +msgstr "Nota: A compatibilidade de cURL en PHP non está activada, ou non está instalado. Non é posíbel a montaxe de %s. Consulte co administrador do sistema como instalalo." #: lib/config.php:626 #, php-format msgid "" "Note: The FTP support in PHP is not enabled or installed. Mounting of" " %s is not possible. Please ask your system administrator to install it." -msgstr "" +msgstr "Nota: A compatibilidade de FTP en PHP non está activada, ou non está instalado. Non é posíbel a montaxe de %s. Consulte co administrador do sistema como instalalo." #: lib/config.php:628 #, php-format msgid "" "Note: \"%s\" is not installed. Mounting of %s is not possible. Please" " ask your system administrator to install it." -msgstr "" +msgstr "Nota: «%s» non está instalado. Non é posíbel a montaxe de %s. Consulte co administrador do sistema como instalalo." #: templates/settings.php:2 msgid "External Storage" diff --git a/l10n/gl/lib.po b/l10n/gl/lib.po index 3f4820e8bb0..c112809faad 100644 --- a/l10n/gl/lib.po +++ b/l10n/gl/lib.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-09 01:55-0400\n" -"PO-Revision-Date: 2014-04-09 05:55+0000\n" -"Last-Translator: I Robot\n" +"POT-Creation-Date: 2014-04-10 01:54-0400\n" +"PO-Revision-Date: 2014-04-09 07:30+0000\n" +"Last-Translator: mbouzada \n" "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -343,16 +343,16 @@ msgstr "anos atrás" msgid "" "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", " "\"0-9\", and \"_.@-\"" -msgstr "" +msgstr "Só se permiten os seguintes caracteres no nome de usuario: «a-z», «A-Z», «0-9», e «_.@-»" #: private/user/manager.php:251 msgid "A valid username must be provided" -msgstr "" +msgstr "Debe fornecer un nome de usuario" #: private/user/manager.php:255 msgid "A valid password must be provided" -msgstr "" +msgstr "Debe fornecer un contrasinal" #: private/user/manager.php:260 msgid "The username is already being used" -msgstr "" +msgstr "Este nome de usuario xa está a ser usado" diff --git a/l10n/gl/settings.po b/l10n/gl/settings.po index 2403bc7cc3e..c89f5caaf81 100644 --- a/l10n/gl/settings.po +++ b/l10n/gl/settings.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-03-29 01:55-0400\n" -"PO-Revision-Date: 2014-03-28 19:40+0000\n" +"POT-Creation-Date: 2014-04-10 01:54-0400\n" +"PO-Revision-Date: 2014-04-09 06:10+0000\n" "Last-Translator: mbouzada \n" "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n" "MIME-Version: 1.0\n" @@ -53,7 +53,7 @@ msgstr "É necesario configurar o correo do usuario antes de poder enviar mensax msgid "Send mode" msgstr "Modo de envío" -#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159 +#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149 msgid "Encryption" msgstr "Cifrado" @@ -205,7 +205,7 @@ msgstr "Produciuse un erro mentres actualizaba o aplicativo" msgid "Error" msgstr "Erro" -#: js/apps.js:153 templates/apps.php:54 +#: js/apps.js:153 templates/apps.php:55 msgid "Update" msgstr "Actualizar" @@ -213,31 +213,31 @@ msgstr "Actualizar" msgid "Updated" msgstr "Actualizado" -#: js/personal.js:246 +#: js/personal.js:243 msgid "Select a profile picture" msgstr "Seleccione unha imaxe para o perfil" -#: js/personal.js:277 +#: js/personal.js:274 msgid "Very weak password" msgstr "Contrasinal moi feble" -#: js/personal.js:278 +#: js/personal.js:275 msgid "Weak password" msgstr "Contrasinal feble" -#: js/personal.js:279 +#: js/personal.js:276 msgid "So-so password" msgstr "Contrasinal non moi aló" -#: js/personal.js:280 +#: js/personal.js:277 msgid "Good password" msgstr "Bo contrasinal" -#: js/personal.js:281 +#: js/personal.js:278 msgid "Strong password" msgstr "Contrasinal forte" -#: js/personal.js:316 +#: js/personal.js:313 msgid "Decrypting files... Please wait, this can take some time." msgstr "Descifrando ficheiros... isto pode levar un anaco." @@ -591,11 +591,11 @@ msgstr "Máis" msgid "Less" msgstr "Menos" -#: templates/admin.php:416 templates/personal.php:181 +#: templates/admin.php:416 templates/personal.php:171 msgid "Version" msgstr "Versión" -#: templates/admin.php:420 templates/personal.php:184 +#: templates/admin.php:420 templates/personal.php:174 msgid "" "Developed by the ownCloud community, the -licensed by " msgstr "-licenciado por" @@ -666,108 +666,108 @@ msgstr "Amosar o axudante da primeira execución outra vez" msgid "You have used %s of the available %s" msgstr "Ten en uso %s do total dispoñíbel de %s" -#: templates/personal.php:39 templates/users.php:21 templates/users.php:87 +#: templates/personal.php:38 templates/users.php:21 templates/users.php:87 msgid "Password" msgstr "Contrasinal" -#: templates/personal.php:40 +#: templates/personal.php:39 msgid "Your password was changed" msgstr "O seu contrasinal foi cambiado" -#: templates/personal.php:41 +#: templates/personal.php:40 msgid "Unable to change your password" msgstr "Non é posíbel cambiar o seu contrasinal" -#: templates/personal.php:43 +#: templates/personal.php:42 msgid "Current password" msgstr "Contrasinal actual" -#: templates/personal.php:46 +#: templates/personal.php:45 msgid "New password" msgstr "Novo contrasinal" -#: templates/personal.php:50 +#: templates/personal.php:49 msgid "Change password" msgstr "Cambiar o contrasinal" -#: templates/personal.php:64 templates/users.php:86 +#: templates/personal.php:61 templates/users.php:86 msgid "Full Name" msgstr "Nome completo" -#: templates/personal.php:81 +#: templates/personal.php:76 msgid "Email" msgstr "Correo" -#: templates/personal.php:83 +#: templates/personal.php:78 msgid "Your email address" msgstr "O seu enderezo de correo" -#: templates/personal.php:86 +#: templates/personal.php:81 msgid "" "Fill in an email address to enable password recovery and receive " "notifications" msgstr "Escriba un enderezo de correo para permitir a recuperación de contrasinais e recibir notificacións" -#: templates/personal.php:96 +#: templates/personal.php:89 msgid "Profile picture" msgstr "Imaxe do perfil" -#: templates/personal.php:101 +#: templates/personal.php:94 msgid "Upload new" msgstr "Novo envío" -#: templates/personal.php:103 +#: templates/personal.php:96 msgid "Select new from Files" msgstr "Seleccione unha nova de ficheiros" -#: templates/personal.php:104 +#: templates/personal.php:97 msgid "Remove image" msgstr "Retirar a imaxe" -#: templates/personal.php:105 +#: templates/personal.php:98 msgid "Either png or jpg. Ideally square but you will be able to crop it." msgstr "Calquera png ou jpg. É preferíbel que sexa cadrada, mais poderá recortala." -#: templates/personal.php:107 +#: templates/personal.php:100 msgid "Your avatar is provided by your original account." msgstr "O seu avatar é fornecido pola súa conta orixinal." -#: templates/personal.php:111 +#: templates/personal.php:104 msgid "Cancel" msgstr "Cancelar" -#: templates/personal.php:112 +#: templates/personal.php:105 msgid "Choose as profile image" msgstr "Escolla unha imaxe para o perfil" -#: templates/personal.php:120 templates/personal.php:121 +#: templates/personal.php:111 templates/personal.php:112 msgid "Language" msgstr "Idioma" -#: templates/personal.php:140 +#: templates/personal.php:131 msgid "Help translate" msgstr "Axude na tradución" -#: templates/personal.php:147 +#: templates/personal.php:137 msgid "WebDAV" msgstr "WebDAV" -#: templates/personal.php:149 +#: templates/personal.php:139 #, php-format msgid "" "Use this address to access your Files via " "WebDAV" msgstr "Empregue esta ligazón para acceder aos sus ficheiros mediante WebDAV" -#: templates/personal.php:161 +#: templates/personal.php:151 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "O aplicativo de cifrado non está activado, descifre todos os ficheiros" -#: templates/personal.php:167 +#: templates/personal.php:157 msgid "Log-in password" msgstr "Contrasinal de acceso" -#: templates/personal.php:172 +#: templates/personal.php:162 msgid "Decrypt all Files" msgstr "Descifrar todos os ficheiros" diff --git a/l10n/he/lib.po b/l10n/he/lib.po index 0773676f705..98e02d70405 100644 --- a/l10n/he/lib.po +++ b/l10n/he/lib.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-09 01:55-0400\n" -"PO-Revision-Date: 2014-04-09 05:55+0000\n" +"POT-Creation-Date: 2014-04-10 01:54-0400\n" +"PO-Revision-Date: 2014-04-09 06:10+0000\n" "Last-Translator: I Robot\n" "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n" "MIME-Version: 1.0\n" @@ -345,11 +345,11 @@ msgstr "" #: private/user/manager.php:251 msgid "A valid username must be provided" -msgstr "" +msgstr "יש לספק שם משתמש תקני" #: private/user/manager.php:255 msgid "A valid password must be provided" -msgstr "" +msgstr "יש לספק ססמה תקנית" #: private/user/manager.php:260 msgid "The username is already being used" diff --git a/l10n/he/settings.po b/l10n/he/settings.po index 6d958a14213..1fa7bd0336e 100644 --- a/l10n/he/settings.po +++ b/l10n/he/settings.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-03-26 01:55-0400\n" -"PO-Revision-Date: 2014-03-26 05:55+0000\n" +"POT-Creation-Date: 2014-04-10 01:54-0400\n" +"PO-Revision-Date: 2014-04-09 06:10+0000\n" "Last-Translator: I Robot\n" "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n" "MIME-Version: 1.0\n" @@ -52,7 +52,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159 +#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149 msgid "Encryption" msgstr "הצפנה" @@ -65,7 +65,7 @@ msgid "Unable to load list from App Store" msgstr "לא ניתן לטעון רשימה מה־App Store" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 changepassword/controller.php:55 +#: ajax/togglegroups.php:20 changepassword/controller.php:49 msgid "Authentication error" msgstr "שגיאת הזדהות" @@ -127,32 +127,32 @@ msgstr "לא ניתן להסיר משתמש מהקבוצה %s" msgid "Couldn't update app." msgstr "לא ניתן לעדכן את היישום." -#: changepassword/controller.php:20 +#: changepassword/controller.php:17 msgid "Wrong password" msgstr "" -#: changepassword/controller.php:42 +#: changepassword/controller.php:36 msgid "No user supplied" msgstr "" -#: changepassword/controller.php:74 +#: changepassword/controller.php:68 msgid "" "Please provide an admin recovery password, otherwise all user data will be " "lost" msgstr "" -#: changepassword/controller.php:79 +#: changepassword/controller.php:73 msgid "" "Wrong admin recovery password. Please check the password and try again." msgstr "" -#: changepassword/controller.php:87 +#: changepassword/controller.php:81 msgid "" "Back-end doesn't support password change, but the users encryption key was " "successfully updated." msgstr "" -#: changepassword/controller.php:92 changepassword/controller.php:103 +#: changepassword/controller.php:86 changepassword/controller.php:97 msgid "Unable to change password" msgstr "" @@ -204,7 +204,7 @@ msgstr "אירעה שגיאה בעת עדכון היישום" msgid "Error" msgstr "שגיאה" -#: js/apps.js:153 templates/apps.php:54 +#: js/apps.js:153 templates/apps.php:55 msgid "Update" msgstr "עדכון" @@ -212,31 +212,31 @@ msgstr "עדכון" msgid "Updated" msgstr "מעודכן" -#: js/personal.js:246 +#: js/personal.js:243 msgid "Select a profile picture" msgstr "" -#: js/personal.js:277 +#: js/personal.js:274 msgid "Very weak password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:275 msgid "Weak password" msgstr "" -#: js/personal.js:279 +#: js/personal.js:276 msgid "So-so password" msgstr "" -#: js/personal.js:280 +#: js/personal.js:277 msgid "Good password" msgstr "" -#: js/personal.js:281 +#: js/personal.js:278 msgid "Strong password" msgstr "" -#: js/personal.js:316 +#: js/personal.js:313 msgid "Decrypting files... Please wait, this can take some time." msgstr "" @@ -285,7 +285,7 @@ msgstr "יש לספק ססמה תקנית" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:49 personal.php:50 +#: personal.php:48 personal.php:49 msgid "__language_name__" msgstr "עברית" @@ -590,11 +590,11 @@ msgstr "יותר" msgid "Less" msgstr "פחות" -#: templates/admin.php:416 templates/personal.php:181 +#: templates/admin.php:416 templates/personal.php:171 msgid "Version" msgstr "גרסא" -#: templates/admin.php:420 templates/personal.php:184 +#: templates/admin.php:420 templates/personal.php:174 msgid "" "Developed by the ownCloud community, the -licensed by " msgstr "ברישיון לטובת " @@ -665,108 +665,108 @@ msgstr "הצגת אשף ההפעלה הראשונית שוב" msgid "You have used %s of the available %s" msgstr "השתמשת ב־%s מתוך %s הזמינים לך" -#: templates/personal.php:39 templates/users.php:21 templates/users.php:87 +#: templates/personal.php:38 templates/users.php:21 templates/users.php:87 msgid "Password" msgstr "סיסמא" -#: templates/personal.php:40 +#: templates/personal.php:39 msgid "Your password was changed" msgstr "הססמה שלך הוחלפה" -#: templates/personal.php:41 +#: templates/personal.php:40 msgid "Unable to change your password" msgstr "לא ניתן לשנות את הססמה שלך" -#: templates/personal.php:43 +#: templates/personal.php:42 msgid "Current password" msgstr "ססמה נוכחית" -#: templates/personal.php:46 +#: templates/personal.php:45 msgid "New password" msgstr "ססמה חדשה" -#: templates/personal.php:50 +#: templates/personal.php:49 msgid "Change password" msgstr "שינוי ססמה" -#: templates/personal.php:64 templates/users.php:86 +#: templates/personal.php:61 templates/users.php:86 msgid "Full Name" msgstr "" -#: templates/personal.php:81 +#: templates/personal.php:76 msgid "Email" msgstr "דואר אלקטרוני" -#: templates/personal.php:83 +#: templates/personal.php:78 msgid "Your email address" msgstr "כתובת הדוא״ל שלך" -#: templates/personal.php:86 +#: templates/personal.php:81 msgid "" "Fill in an email address to enable password recovery and receive " "notifications" msgstr "" -#: templates/personal.php:96 +#: templates/personal.php:89 msgid "Profile picture" msgstr "תמונת פרופיל" -#: templates/personal.php:101 +#: templates/personal.php:94 msgid "Upload new" msgstr "" -#: templates/personal.php:103 +#: templates/personal.php:96 msgid "Select new from Files" msgstr "" -#: templates/personal.php:104 +#: templates/personal.php:97 msgid "Remove image" msgstr "" -#: templates/personal.php:105 +#: templates/personal.php:98 msgid "Either png or jpg. Ideally square but you will be able to crop it." msgstr "" -#: templates/personal.php:107 +#: templates/personal.php:100 msgid "Your avatar is provided by your original account." msgstr "" -#: templates/personal.php:111 +#: templates/personal.php:104 msgid "Cancel" msgstr "ביטול" -#: templates/personal.php:112 +#: templates/personal.php:105 msgid "Choose as profile image" msgstr "" -#: templates/personal.php:120 templates/personal.php:121 +#: templates/personal.php:111 templates/personal.php:112 msgid "Language" msgstr "פה" -#: templates/personal.php:140 +#: templates/personal.php:131 msgid "Help translate" msgstr "עזרה בתרגום" -#: templates/personal.php:147 +#: templates/personal.php:137 msgid "WebDAV" msgstr "WebDAV" -#: templates/personal.php:149 +#: templates/personal.php:139 #, php-format msgid "" "Use this address to access your Files via " "WebDAV" msgstr "" -#: templates/personal.php:161 +#: templates/personal.php:151 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:167 +#: templates/personal.php:157 msgid "Log-in password" msgstr "" -#: templates/personal.php:172 +#: templates/personal.php:162 msgid "Decrypt all Files" msgstr "" diff --git a/l10n/hu_HU/lib.po b/l10n/hu_HU/lib.po index 5cae103f6d7..858b0c42ef8 100644 --- a/l10n/hu_HU/lib.po +++ b/l10n/hu_HU/lib.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-09 01:55-0400\n" -"PO-Revision-Date: 2014-04-09 05:55+0000\n" +"POT-Creation-Date: 2014-04-10 01:54-0400\n" +"PO-Revision-Date: 2014-04-09 06:10+0000\n" "Last-Translator: I Robot\n" "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n" "MIME-Version: 1.0\n" @@ -348,12 +348,12 @@ msgstr "" #: private/user/manager.php:251 msgid "A valid username must be provided" -msgstr "" +msgstr "Érvényes felhasználónevet kell megadnia" #: private/user/manager.php:255 msgid "A valid password must be provided" -msgstr "" +msgstr "Érvényes jelszót kell megadnia" #: private/user/manager.php:260 msgid "The username is already being used" -msgstr "" +msgstr "Ez a bejelentkezési név már foglalt" diff --git a/l10n/hu_HU/settings.po b/l10n/hu_HU/settings.po index ebd9fa5baf6..e0457774ded 100644 --- a/l10n/hu_HU/settings.po +++ b/l10n/hu_HU/settings.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-03-26 01:55-0400\n" -"PO-Revision-Date: 2014-03-26 05:55+0000\n" +"POT-Creation-Date: 2014-04-10 01:54-0400\n" +"PO-Revision-Date: 2014-04-09 06:10+0000\n" "Last-Translator: I Robot\n" "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n" "MIME-Version: 1.0\n" @@ -55,7 +55,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159 +#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149 msgid "Encryption" msgstr "Titkosítás" @@ -68,7 +68,7 @@ msgid "Unable to load list from App Store" msgstr "Nem tölthető le a lista az App Store-ból" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 changepassword/controller.php:55 +#: ajax/togglegroups.php:20 changepassword/controller.php:49 msgid "Authentication error" msgstr "Azonosítási hiba" @@ -130,32 +130,32 @@ msgstr "A felhasználó nem távolítható el ebből a csoportból: %s" msgid "Couldn't update app." msgstr "A program frissítése nem sikerült." -#: changepassword/controller.php:20 +#: changepassword/controller.php:17 msgid "Wrong password" msgstr "Hibás jelszó" -#: changepassword/controller.php:42 +#: changepassword/controller.php:36 msgid "No user supplied" msgstr "Nincs felhasználó által mellékelve" -#: changepassword/controller.php:74 +#: changepassword/controller.php:68 msgid "" "Please provide an admin recovery password, otherwise all user data will be " "lost" msgstr "Add meg az admin helyreállító jelszót, máskülönben az összes felhasználói adat elveszik." -#: changepassword/controller.php:79 +#: changepassword/controller.php:73 msgid "" "Wrong admin recovery password. Please check the password and try again." msgstr "Hibás admin helyreállítási jelszó. Ellenörizd a jelszót és próbáld újra." -#: changepassword/controller.php:87 +#: changepassword/controller.php:81 msgid "" "Back-end doesn't support password change, but the users encryption key was " "successfully updated." msgstr "A back-end nem támogatja a jelszó módosítást, de felhasználó titkosítási kulcsa sikeresen frissítve lett." -#: changepassword/controller.php:92 changepassword/controller.php:103 +#: changepassword/controller.php:86 changepassword/controller.php:97 msgid "Unable to change password" msgstr "Nem sikerült megváltoztatni a jelszót" @@ -207,7 +207,7 @@ msgstr "Hiba történt a programfrissítés közben" msgid "Error" msgstr "Hiba" -#: js/apps.js:153 templates/apps.php:54 +#: js/apps.js:153 templates/apps.php:55 msgid "Update" msgstr "Frissítés" @@ -215,31 +215,31 @@ msgstr "Frissítés" msgid "Updated" msgstr "Frissítve" -#: js/personal.js:246 +#: js/personal.js:243 msgid "Select a profile picture" msgstr "Válassz profil képet" -#: js/personal.js:277 +#: js/personal.js:274 msgid "Very weak password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:275 msgid "Weak password" msgstr "" -#: js/personal.js:279 +#: js/personal.js:276 msgid "So-so password" msgstr "" -#: js/personal.js:280 +#: js/personal.js:277 msgid "Good password" msgstr "" -#: js/personal.js:281 +#: js/personal.js:278 msgid "Strong password" msgstr "" -#: js/personal.js:316 +#: js/personal.js:313 msgid "Decrypting files... Please wait, this can take some time." msgstr "File-ok kititkosítása folyamatban... Kérlek várj, ez hosszabb ideig is eltarthat ..." @@ -288,7 +288,7 @@ msgstr "Érvényes jelszót kell megadnia" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "Figyelmeztetés: A felhasználó \"{user}\" kezdő könyvtára már létezett" -#: personal.php:49 personal.php:50 +#: personal.php:48 personal.php:49 msgid "__language_name__" msgstr "__language_name__" @@ -593,11 +593,11 @@ msgstr "Több" msgid "Less" msgstr "Kevesebb" -#: templates/admin.php:416 templates/personal.php:181 +#: templates/admin.php:416 templates/personal.php:171 msgid "Version" msgstr "Verzió" -#: templates/admin.php:420 templates/personal.php:184 +#: templates/admin.php:420 templates/personal.php:174 msgid "" "Developed by the ownCloud community, the -licensed by " msgstr "-a jogtuladonos " @@ -668,108 +668,108 @@ msgstr "Nézzük meg újra az első bejelentkezéskori segítséget!" msgid "You have used %s of the available %s" msgstr "Az Ön tárterület-felhasználása jelenleg: %s. Maximálisan ennyi áll rendelkezésére: %s" -#: templates/personal.php:39 templates/users.php:21 templates/users.php:87 +#: templates/personal.php:38 templates/users.php:21 templates/users.php:87 msgid "Password" msgstr "Jelszó" -#: templates/personal.php:40 +#: templates/personal.php:39 msgid "Your password was changed" msgstr "A jelszava megváltozott" -#: templates/personal.php:41 +#: templates/personal.php:40 msgid "Unable to change your password" msgstr "A jelszó nem változtatható meg" -#: templates/personal.php:43 +#: templates/personal.php:42 msgid "Current password" msgstr "A jelenlegi jelszó" -#: templates/personal.php:46 +#: templates/personal.php:45 msgid "New password" msgstr "Az új jelszó" -#: templates/personal.php:50 +#: templates/personal.php:49 msgid "Change password" msgstr "A jelszó megváltoztatása" -#: templates/personal.php:64 templates/users.php:86 +#: templates/personal.php:61 templates/users.php:86 msgid "Full Name" msgstr "Teljes név" -#: templates/personal.php:81 +#: templates/personal.php:76 msgid "Email" msgstr "Email" -#: templates/personal.php:83 +#: templates/personal.php:78 msgid "Your email address" msgstr "Az Ön email címe" -#: templates/personal.php:86 +#: templates/personal.php:81 msgid "" "Fill in an email address to enable password recovery and receive " "notifications" msgstr "" -#: templates/personal.php:96 +#: templates/personal.php:89 msgid "Profile picture" msgstr "Profilkép" -#: templates/personal.php:101 +#: templates/personal.php:94 msgid "Upload new" msgstr "Új feltöltése" -#: templates/personal.php:103 +#: templates/personal.php:96 msgid "Select new from Files" msgstr "Új kiválasztása Fileokból" -#: templates/personal.php:104 +#: templates/personal.php:97 msgid "Remove image" msgstr "Kép eltávolítása" -#: templates/personal.php:105 +#: templates/personal.php:98 msgid "Either png or jpg. Ideally square but you will be able to crop it." msgstr "Egyaránt png vagy jpg. Az ideális ha négyzet alaku, de késöbb még átszabható" -#: templates/personal.php:107 +#: templates/personal.php:100 msgid "Your avatar is provided by your original account." msgstr "Az avatarod az eredeti fiókod alapján van beállítva." -#: templates/personal.php:111 +#: templates/personal.php:104 msgid "Cancel" msgstr "Mégsem" -#: templates/personal.php:112 +#: templates/personal.php:105 msgid "Choose as profile image" msgstr "Válassz profil képet" -#: templates/personal.php:120 templates/personal.php:121 +#: templates/personal.php:111 templates/personal.php:112 msgid "Language" msgstr "Nyelv" -#: templates/personal.php:140 +#: templates/personal.php:131 msgid "Help translate" msgstr "Segítsen a fordításban!" -#: templates/personal.php:147 +#: templates/personal.php:137 msgid "WebDAV" msgstr "WebDAV" -#: templates/personal.php:149 +#: templates/personal.php:139 #, php-format msgid "" "Use this address to access your Files via " "WebDAV" msgstr "Ezt a címet használd, hogy hozzáférj a fileokhoz WebDAV-on keresztül" -#: templates/personal.php:161 +#: templates/personal.php:151 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "A titkosító alkalmazás továbbiakban nem lesz engedélyezve, szüntesd meg a titkosítását a file-jaidnak." -#: templates/personal.php:167 +#: templates/personal.php:157 msgid "Log-in password" msgstr "Bejelentkezési jelszó" -#: templates/personal.php:172 +#: templates/personal.php:162 msgid "Decrypt all Files" msgstr "Kititkosítja az összes file-t" diff --git a/l10n/id/lib.po b/l10n/id/lib.po index 9692c6033b4..edf2ae28a7e 100644 --- a/l10n/id/lib.po +++ b/l10n/id/lib.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-09 01:55-0400\n" -"PO-Revision-Date: 2014-04-09 05:55+0000\n" +"POT-Creation-Date: 2014-04-10 01:54-0400\n" +"PO-Revision-Date: 2014-04-09 06:10+0000\n" "Last-Translator: I Robot\n" "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n" "MIME-Version: 1.0\n" @@ -341,11 +341,11 @@ msgstr "" #: private/user/manager.php:251 msgid "A valid username must be provided" -msgstr "" +msgstr "Tuliskan nama pengguna yang valid" #: private/user/manager.php:255 msgid "A valid password must be provided" -msgstr "" +msgstr "Tuliskan sandi yang valid" #: private/user/manager.php:260 msgid "The username is already being used" diff --git a/l10n/id/settings.po b/l10n/id/settings.po index 6f7c733c33a..551731125a2 100644 --- a/l10n/id/settings.po +++ b/l10n/id/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-03-26 01:55-0400\n" -"PO-Revision-Date: 2014-03-26 05:55+0000\n" +"POT-Creation-Date: 2014-04-10 01:54-0400\n" +"PO-Revision-Date: 2014-04-09 06:10+0000\n" "Last-Translator: I Robot\n" "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159 +#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149 msgid "Encryption" msgstr "Enkripsi" @@ -64,7 +64,7 @@ msgid "Unable to load list from App Store" msgstr "Tidak dapat memuat daftar dari App Store" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 changepassword/controller.php:55 +#: ajax/togglegroups.php:20 changepassword/controller.php:49 msgid "Authentication error" msgstr "Galat saat autentikasi" @@ -126,32 +126,32 @@ msgstr "Tidak dapat menghapus pengguna dari grup %s" msgid "Couldn't update app." msgstr "Tidak dapat memperbarui aplikasi." -#: changepassword/controller.php:20 +#: changepassword/controller.php:17 msgid "Wrong password" msgstr "Sandi salah" -#: changepassword/controller.php:42 +#: changepassword/controller.php:36 msgid "No user supplied" msgstr "Tidak ada pengguna yang diberikan" -#: changepassword/controller.php:74 +#: changepassword/controller.php:68 msgid "" "Please provide an admin recovery password, otherwise all user data will be " "lost" msgstr "" -#: changepassword/controller.php:79 +#: changepassword/controller.php:73 msgid "" "Wrong admin recovery password. Please check the password and try again." msgstr "Sandi pemulihan admin salah. Periksa sandi dan ulangi kembali." -#: changepassword/controller.php:87 +#: changepassword/controller.php:81 msgid "" "Back-end doesn't support password change, but the users encryption key was " "successfully updated." msgstr "Back-end tidak mendukung perubahan password, tetapi kunci enkripsi pengguna berhasil diperbarui." -#: changepassword/controller.php:92 changepassword/controller.php:103 +#: changepassword/controller.php:86 changepassword/controller.php:97 msgid "Unable to change password" msgstr "Tidak dapat mengubah sandi" @@ -203,7 +203,7 @@ msgstr "Gagal ketika memperbarui aplikasi" msgid "Error" msgstr "Galat" -#: js/apps.js:153 templates/apps.php:54 +#: js/apps.js:153 templates/apps.php:55 msgid "Update" msgstr "Perbarui" @@ -211,31 +211,31 @@ msgstr "Perbarui" msgid "Updated" msgstr "Diperbarui" -#: js/personal.js:246 +#: js/personal.js:243 msgid "Select a profile picture" msgstr "Pilih foto profil" -#: js/personal.js:277 +#: js/personal.js:274 msgid "Very weak password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:275 msgid "Weak password" msgstr "" -#: js/personal.js:279 +#: js/personal.js:276 msgid "So-so password" msgstr "" -#: js/personal.js:280 +#: js/personal.js:277 msgid "Good password" msgstr "" -#: js/personal.js:281 +#: js/personal.js:278 msgid "Strong password" msgstr "" -#: js/personal.js:316 +#: js/personal.js:313 msgid "Decrypting files... Please wait, this can take some time." msgstr "Mendeskripsi berkas... Modon tunggu, ini memerlukan beberapa saat." @@ -284,7 +284,7 @@ msgstr "Tuliskan sandi yang valid" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "Peringatan: Direktori home untuk pengguna \"{user}\" sudah ada" -#: personal.php:49 personal.php:50 +#: personal.php:48 personal.php:49 msgid "__language_name__" msgstr "__language_name__" @@ -589,11 +589,11 @@ msgstr "Lainnya" msgid "Less" msgstr "Ciutkan" -#: templates/admin.php:416 templates/personal.php:181 +#: templates/admin.php:416 templates/personal.php:171 msgid "Version" msgstr "Versi" -#: templates/admin.php:420 templates/personal.php:184 +#: templates/admin.php:420 templates/personal.php:174 msgid "" "Developed by the ownCloud community, the -licensed by " msgstr "-dilisensikan oleh " @@ -664,108 +664,108 @@ msgstr "Tampilkan Penuntun Konfigurasi Awal" msgid "You have used %s of the available %s" msgstr "Anda telah menggunakan %s dari total %s" -#: templates/personal.php:39 templates/users.php:21 templates/users.php:87 +#: templates/personal.php:38 templates/users.php:21 templates/users.php:87 msgid "Password" msgstr "Sandi" -#: templates/personal.php:40 +#: templates/personal.php:39 msgid "Your password was changed" msgstr "Sandi Anda telah diubah" -#: templates/personal.php:41 +#: templates/personal.php:40 msgid "Unable to change your password" msgstr "Gagal mengubah sandi Anda" -#: templates/personal.php:43 +#: templates/personal.php:42 msgid "Current password" msgstr "Sandi saat ini" -#: templates/personal.php:46 +#: templates/personal.php:45 msgid "New password" msgstr "Sandi baru" -#: templates/personal.php:50 +#: templates/personal.php:49 msgid "Change password" msgstr "Ubah sandi" -#: templates/personal.php:64 templates/users.php:86 +#: templates/personal.php:61 templates/users.php:86 msgid "Full Name" msgstr "Nama Lengkap" -#: templates/personal.php:81 +#: templates/personal.php:76 msgid "Email" msgstr "Email" -#: templates/personal.php:83 +#: templates/personal.php:78 msgid "Your email address" msgstr "Alamat email Anda" -#: templates/personal.php:86 +#: templates/personal.php:81 msgid "" "Fill in an email address to enable password recovery and receive " "notifications" msgstr "" -#: templates/personal.php:96 +#: templates/personal.php:89 msgid "Profile picture" msgstr "Foto profil" -#: templates/personal.php:101 +#: templates/personal.php:94 msgid "Upload new" msgstr "Unggah baru" -#: templates/personal.php:103 +#: templates/personal.php:96 msgid "Select new from Files" msgstr "Pilih baru dari Berkas" -#: templates/personal.php:104 +#: templates/personal.php:97 msgid "Remove image" msgstr "Hapus gambar" -#: templates/personal.php:105 +#: templates/personal.php:98 msgid "Either png or jpg. Ideally square but you will be able to crop it." msgstr "Bisa png atau jpg. Idealnya berbentuk persegi tetapi jika tidak Anda bisa memotongnya nanti." -#: templates/personal.php:107 +#: templates/personal.php:100 msgid "Your avatar is provided by your original account." msgstr "Avatar disediakan oleh akun asli Anda." -#: templates/personal.php:111 +#: templates/personal.php:104 msgid "Cancel" msgstr "Batal" -#: templates/personal.php:112 +#: templates/personal.php:105 msgid "Choose as profile image" msgstr "Pilih sebagai gambar profil" -#: templates/personal.php:120 templates/personal.php:121 +#: templates/personal.php:111 templates/personal.php:112 msgid "Language" msgstr "Bahasa" -#: templates/personal.php:140 +#: templates/personal.php:131 msgid "Help translate" msgstr "Bantu menerjemahkan" -#: templates/personal.php:147 +#: templates/personal.php:137 msgid "WebDAV" msgstr "WebDAV" -#: templates/personal.php:149 +#: templates/personal.php:139 #, php-format msgid "" "Use this address to access your Files via " "WebDAV" msgstr "Gunakan alamat ini untuk mengakses Berkas via WebDAV" -#: templates/personal.php:161 +#: templates/personal.php:151 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "Aplikasi enkripsi tidak lagi diaktifkan, silahkan mendekripsi semua file Anda" -#: templates/personal.php:167 +#: templates/personal.php:157 msgid "Log-in password" msgstr "Sandi masuk" -#: templates/personal.php:172 +#: templates/personal.php:162 msgid "Decrypt all Files" msgstr "Deskripsi semua Berkas" diff --git a/l10n/it/core.po b/l10n/it/core.po index 6c9c54add50..cd474e5344c 100644 --- a/l10n/it/core.po +++ b/l10n/it/core.po @@ -4,16 +4,16 @@ # # Translators: # nappo , 2013 -# idetao , 2013 +# idetao , 2013-2014 # Paolo Velati , 2013-2014 # Vincenzo Reale , 2013-2014 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-09 01:55-0400\n" -"PO-Revision-Date: 2014-04-08 06:10+0000\n" -"Last-Translator: I Robot\n" +"POT-Creation-Date: 2014-04-10 01:54-0400\n" +"PO-Revision-Date: 2014-04-09 23:10+0000\n" +"Last-Translator: idetao \n" "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -146,127 +146,127 @@ msgstr "Impostazioni" msgid "Saving..." msgstr "Salvataggio in corso..." -#: js/js.js:1124 +#: js/js.js:1099 msgid "seconds ago" msgstr "secondi fa" -#: js/js.js:1125 +#: js/js.js:1100 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "%n minuto fa" msgstr[1] "%n minuti fa" -#: js/js.js:1126 +#: js/js.js:1101 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "%n ora fa" msgstr[1] "%n ore fa" -#: js/js.js:1127 +#: js/js.js:1102 msgid "today" msgstr "oggi" -#: js/js.js:1128 +#: js/js.js:1103 msgid "yesterday" msgstr "ieri" -#: js/js.js:1129 +#: js/js.js:1104 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "%n giorno fa" msgstr[1] "%n giorni fa" -#: js/js.js:1130 +#: js/js.js:1105 msgid "last month" msgstr "mese scorso" -#: js/js.js:1131 +#: js/js.js:1106 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "%n mese fa" msgstr[1] "%n mesi fa" -#: js/js.js:1132 +#: js/js.js:1107 msgid "months ago" msgstr "mesi fa" -#: js/js.js:1133 +#: js/js.js:1108 msgid "last year" msgstr "anno scorso" -#: js/js.js:1134 +#: js/js.js:1109 msgid "years ago" msgstr "anni fa" -#: js/oc-dialogs.js:123 +#: js/oc-dialogs.js:125 msgid "Choose" msgstr "Scegli" -#: js/oc-dialogs.js:146 +#: js/oc-dialogs.js:151 msgid "Error loading file picker template: {error}" msgstr "Errore durante il caricamento del modello del selettore file: {error}" -#: js/oc-dialogs.js:172 +#: js/oc-dialogs.js:177 msgid "Yes" msgstr "Sì" -#: js/oc-dialogs.js:182 +#: js/oc-dialogs.js:187 msgid "No" msgstr "No" -#: js/oc-dialogs.js:199 +#: js/oc-dialogs.js:204 msgid "Ok" msgstr "Ok" -#: js/oc-dialogs.js:219 +#: js/oc-dialogs.js:224 msgid "Error loading message template: {error}" msgstr "Errore durante il caricamento del modello di messaggio: {error}" -#: js/oc-dialogs.js:347 +#: js/oc-dialogs.js:352 msgid "{count} file conflict" msgid_plural "{count} file conflicts" msgstr[0] "{count} file in conflitto" msgstr[1] "{count} file in conflitto" -#: js/oc-dialogs.js:361 +#: js/oc-dialogs.js:366 msgid "One file conflict" msgstr "Un file in conflitto" -#: js/oc-dialogs.js:367 +#: js/oc-dialogs.js:372 msgid "New Files" msgstr "File nuovi" -#: js/oc-dialogs.js:368 +#: js/oc-dialogs.js:373 msgid "Already existing files" -msgstr "" +msgstr "File già esistenti" -#: js/oc-dialogs.js:370 +#: js/oc-dialogs.js:375 msgid "Which files do you want to keep?" msgstr "Quali file vuoi mantenere?" -#: js/oc-dialogs.js:371 +#: js/oc-dialogs.js:376 msgid "" "If you select both versions, the copied file will have a number added to its" " name." msgstr "Se selezioni entrambe le versioni, sarà aggiunto un numero al nome del file copiato." -#: js/oc-dialogs.js:379 +#: js/oc-dialogs.js:384 msgid "Cancel" msgstr "Annulla" -#: js/oc-dialogs.js:389 +#: js/oc-dialogs.js:394 msgid "Continue" msgstr "Continua" -#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +#: js/oc-dialogs.js:441 js/oc-dialogs.js:454 msgid "(all selected)" msgstr "(tutti i selezionati)" -#: js/oc-dialogs.js:439 js/oc-dialogs.js:452 +#: js/oc-dialogs.js:444 js/oc-dialogs.js:457 msgid "({count} selected)" msgstr "({count} selezionati)" -#: js/oc-dialogs.js:460 +#: js/oc-dialogs.js:465 msgid "Error loading file exists template" msgstr "Errore durante il caricamento del modello del file esistente" diff --git a/l10n/it/files_external.po b/l10n/it/files_external.po index 10ab9a85d7a..b4042ccce21 100644 --- a/l10n/it/files_external.po +++ b/l10n/it/files_external.po @@ -4,14 +4,15 @@ # # Translators: # Jessica Di Maria , 2014 +# idetao , 2014 # Paolo Velati , 2014 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-09 01:55-0400\n" -"PO-Revision-Date: 2014-04-09 05:55+0000\n" -"Last-Translator: I Robot\n" +"POT-Creation-Date: 2014-04-10 01:54-0400\n" +"PO-Revision-Date: 2014-04-09 22:50+0000\n" +"Last-Translator: idetao \n" "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -45,32 +46,32 @@ msgstr "Salvato" #: lib/config.php:592 msgid "Note: " -msgstr "" +msgstr "Nota:" #: lib/config.php:602 msgid " and " -msgstr "" +msgstr "e" #: lib/config.php:624 #, php-format msgid "" "Note: The cURL support in PHP is not enabled or installed. Mounting " "of %s is not possible. Please ask your system administrator to install it." -msgstr "" +msgstr "Nota:Il support a cURL non è abilitato o installato in PHP. Impossibile montare %s. Chiedi al tuo amministratore di sistema di installarlo." #: lib/config.php:626 #, php-format msgid "" "Note: The FTP support in PHP is not enabled or installed. Mounting of" " %s is not possible. Please ask your system administrator to install it." -msgstr "" +msgstr "Nota:Il support a FTP non è abilitato o installato in PHP. Impossibile montare %s. Chiedi al tuo amministratore di sistema di installarlo." #: lib/config.php:628 #, php-format msgid "" "Note: \"%s\" is not installed. Mounting of %s is not possible. Please" " ask your system administrator to install it." -msgstr "" +msgstr "Nota:\"%s\" non è installato. Impossibile montare %s. Chiedi al tuo amministratore di sistema di installarlo." #: templates/settings.php:2 msgid "External Storage" diff --git a/l10n/it/lib.po b/l10n/it/lib.po index 5688fe306ca..409d389579a 100644 --- a/l10n/it/lib.po +++ b/l10n/it/lib.po @@ -4,15 +4,16 @@ # # Translators: # Francesco Capuano , 2013 +# idetao , 2014 # Paolo Velati , 2013-2014 # Vincenzo Reale , 2013-2014 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-09 01:55-0400\n" -"PO-Revision-Date: 2014-04-09 05:55+0000\n" -"Last-Translator: I Robot\n" +"POT-Creation-Date: 2014-04-10 01:54-0400\n" +"PO-Revision-Date: 2014-04-09 23:00+0000\n" +"Last-Translator: idetao \n" "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -344,16 +345,16 @@ msgstr "anni fa" msgid "" "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", " "\"0-9\", and \"_.@-\"" -msgstr "" +msgstr "Solo i seguenti caratteri sono ammessi in un nome utente: \"a-z\", \"A-Z\", \"0-9\", e \"_.@-\"" #: private/user/manager.php:251 msgid "A valid username must be provided" -msgstr "" +msgstr "Deve essere fornito un nome utente valido" #: private/user/manager.php:255 msgid "A valid password must be provided" -msgstr "" +msgstr "Deve essere fornita una password valida" #: private/user/manager.php:260 msgid "The username is already being used" -msgstr "" +msgstr "Il nome utente è già utilizzato" diff --git a/l10n/it/settings.po b/l10n/it/settings.po index e02fc127bd9..358818292cb 100644 --- a/l10n/it/settings.po +++ b/l10n/it/settings.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-04 01:55-0400\n" -"PO-Revision-Date: 2014-04-03 20:20+0000\n" +"POT-Creation-Date: 2014-04-10 01:54-0400\n" +"PO-Revision-Date: 2014-04-09 06:10+0000\n" "Last-Translator: Vincenzo Reale \n" "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n" "MIME-Version: 1.0\n" @@ -215,31 +215,31 @@ msgstr "Aggiorna" msgid "Updated" msgstr "Aggiornato" -#: js/personal.js:246 +#: js/personal.js:243 msgid "Select a profile picture" msgstr "Seleziona un'immagine del profilo" -#: js/personal.js:277 +#: js/personal.js:274 msgid "Very weak password" msgstr "Password molto debole" -#: js/personal.js:278 +#: js/personal.js:275 msgid "Weak password" msgstr "Password debole" -#: js/personal.js:279 +#: js/personal.js:276 msgid "So-so password" msgstr "Password così-così" -#: js/personal.js:280 +#: js/personal.js:277 msgid "Good password" msgstr "Password buona" -#: js/personal.js:281 +#: js/personal.js:278 msgid "Strong password" msgstr "Password forte" -#: js/personal.js:316 +#: js/personal.js:313 msgid "Decrypting files... Please wait, this can take some time." msgstr "Decifratura dei file in corso... Attendi, potrebbe richiedere del tempo." diff --git a/l10n/it/user_ldap.po b/l10n/it/user_ldap.po index 58546f1fb70..b8e77c2a3e2 100644 --- a/l10n/it/user_ldap.po +++ b/l10n/it/user_ldap.po @@ -3,15 +3,16 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# idetao , 2014 # Paolo Velati , 2013 # Vincenzo Reale , 2013-2014 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-08 01:56-0400\n" -"PO-Revision-Date: 2014-04-08 05:56+0000\n" -"Last-Translator: I Robot\n" +"POT-Creation-Date: 2014-04-10 01:54-0400\n" +"PO-Revision-Date: 2014-04-09 22:50+0000\n" +"Last-Translator: idetao \n" "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -146,7 +147,7 @@ msgstr[1] "%s utenti trovati" msgid "Invalid Host" msgstr "Host non valido" -#: lib/wizard.php:963 +#: lib/wizard.php:983 msgid "Could not find the desired feature" msgstr "Impossibile trovare la funzionalità desiderata" @@ -423,7 +424,7 @@ msgstr "Quando è attivato, i gruppi che contengono altri gruppi sono supportati #: templates/settings.php:40 msgid "Paging chunksize" -msgstr "" +msgstr "Dimensione del blocco di paginazione" #: templates/settings.php:40 msgid "" diff --git a/l10n/ja/lib.po b/l10n/ja/lib.po index b8fdbca0bf9..44361df0669 100644 --- a/l10n/ja/lib.po +++ b/l10n/ja/lib.po @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-09 01:55-0400\n" -"PO-Revision-Date: 2014-04-09 05:55+0000\n" +"POT-Creation-Date: 2014-04-10 01:54-0400\n" +"PO-Revision-Date: 2014-04-09 06:10+0000\n" "Last-Translator: I Robot\n" "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n" "MIME-Version: 1.0\n" @@ -346,12 +346,12 @@ msgstr "" #: private/user/manager.php:251 msgid "A valid username must be provided" -msgstr "" +msgstr "有効なユーザー名を指定する必要があります" #: private/user/manager.php:255 msgid "A valid password must be provided" -msgstr "" +msgstr "有効なパスワードを指定する必要があります" #: private/user/manager.php:260 msgid "The username is already being used" -msgstr "" +msgstr "ユーザ名はすでに使われています" diff --git a/l10n/ja/settings.po b/l10n/ja/settings.po index 85b9f370db8..539a9c1e798 100644 --- a/l10n/ja/settings.po +++ b/l10n/ja/settings.po @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-03-26 01:55-0400\n" -"PO-Revision-Date: 2014-03-26 05:55+0000\n" +"POT-Creation-Date: 2014-04-10 01:54-0400\n" +"PO-Revision-Date: 2014-04-09 06:10+0000\n" "Last-Translator: I Robot\n" "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n" "MIME-Version: 1.0\n" @@ -56,7 +56,7 @@ msgstr "ユーザーメールを設定して初めて、テストメールを送 msgid "Send mode" msgstr "送信モード" -#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159 +#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149 msgid "Encryption" msgstr "暗号化" @@ -69,7 +69,7 @@ msgid "Unable to load list from App Store" msgstr "アプリストアからリストをロードできません" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 changepassword/controller.php:55 +#: ajax/togglegroups.php:20 changepassword/controller.php:49 msgid "Authentication error" msgstr "認証エラー" @@ -131,32 +131,32 @@ msgstr "ユーザーをグループ %s から削除できません" msgid "Couldn't update app." msgstr "アプリをアップデートできませんでした。" -#: changepassword/controller.php:20 +#: changepassword/controller.php:17 msgid "Wrong password" msgstr "無効なパスワード" -#: changepassword/controller.php:42 +#: changepassword/controller.php:36 msgid "No user supplied" msgstr "ユーザーが指定されていません" -#: changepassword/controller.php:74 +#: changepassword/controller.php:68 msgid "" "Please provide an admin recovery password, otherwise all user data will be " "lost" msgstr "リカバリ用の管理者パスワードを入力してください。そうでない場合は、全ユーザーのデータが失われます。" -#: changepassword/controller.php:79 +#: changepassword/controller.php:73 msgid "" "Wrong admin recovery password. Please check the password and try again." msgstr "リカバリ用の管理者パスワードが間違っています。パスワードを確認して再度実行してください。" -#: changepassword/controller.php:87 +#: changepassword/controller.php:81 msgid "" "Back-end doesn't support password change, but the users encryption key was " "successfully updated." msgstr "バックエンドはパスワード変更をサポートしていませんが、ユーザーの暗号化キーは正常に更新されました。" -#: changepassword/controller.php:92 changepassword/controller.php:103 +#: changepassword/controller.php:86 changepassword/controller.php:97 msgid "Unable to change password" msgstr "パスワードを変更できません" @@ -208,7 +208,7 @@ msgstr "アプリの更新中にエラーが発生" msgid "Error" msgstr "エラー" -#: js/apps.js:153 templates/apps.php:54 +#: js/apps.js:153 templates/apps.php:55 msgid "Update" msgstr "アップデート" @@ -216,31 +216,31 @@ msgstr "アップデート" msgid "Updated" msgstr "アップデート済み" -#: js/personal.js:246 +#: js/personal.js:243 msgid "Select a profile picture" msgstr "プロファイル画像を選択" -#: js/personal.js:277 +#: js/personal.js:274 msgid "Very weak password" msgstr "非常に弱いパスワード" -#: js/personal.js:278 +#: js/personal.js:275 msgid "Weak password" msgstr "弱いパスワード" -#: js/personal.js:279 +#: js/personal.js:276 msgid "So-so password" msgstr "まずまずのパスワード" -#: js/personal.js:280 +#: js/personal.js:277 msgid "Good password" msgstr "良好なパスワード" -#: js/personal.js:281 +#: js/personal.js:278 msgid "Strong password" msgstr "強いパスワード" -#: js/personal.js:316 +#: js/personal.js:313 msgid "Decrypting files... Please wait, this can take some time." msgstr "ファイルを複合中... しばらくお待ちください、この処理には少し時間がかかるかもしれません。" @@ -289,7 +289,7 @@ msgstr "有効なパスワードを指定する必要があります" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "警告: ユーザー \"{user}\" のホームディレクトリはすでに存在します" -#: personal.php:49 personal.php:50 +#: personal.php:48 personal.php:49 msgid "__language_name__" msgstr "Japanese (日本語)" @@ -594,11 +594,11 @@ msgstr "もっと見る" msgid "Less" msgstr "閉じる" -#: templates/admin.php:416 templates/personal.php:181 +#: templates/admin.php:416 templates/personal.php:171 msgid "Version" msgstr "バージョン" -#: templates/admin.php:420 templates/personal.php:184 +#: templates/admin.php:420 templates/personal.php:174 msgid "" "Developed by the ownCloud community, the -licensed by " msgstr "-ライセンス: " @@ -669,108 +669,108 @@ msgstr "初回ウィザードを再表示する" msgid "You have used %s of the available %s" msgstr "現在、%s / %s を利用しています" -#: templates/personal.php:39 templates/users.php:21 templates/users.php:87 +#: templates/personal.php:38 templates/users.php:21 templates/users.php:87 msgid "Password" msgstr "パスワード" -#: templates/personal.php:40 +#: templates/personal.php:39 msgid "Your password was changed" msgstr "パスワードを変更しました" -#: templates/personal.php:41 +#: templates/personal.php:40 msgid "Unable to change your password" msgstr "パスワードを変更することができません" -#: templates/personal.php:43 +#: templates/personal.php:42 msgid "Current password" msgstr "Current password" -#: templates/personal.php:46 +#: templates/personal.php:45 msgid "New password" msgstr "新しいパスワードを入力" -#: templates/personal.php:50 +#: templates/personal.php:49 msgid "Change password" msgstr "パスワードを変更" -#: templates/personal.php:64 templates/users.php:86 +#: templates/personal.php:61 templates/users.php:86 msgid "Full Name" msgstr "名前" -#: templates/personal.php:81 +#: templates/personal.php:76 msgid "Email" msgstr "メール" -#: templates/personal.php:83 +#: templates/personal.php:78 msgid "Your email address" msgstr "あなたのメールアドレス" -#: templates/personal.php:86 +#: templates/personal.php:81 msgid "" "Fill in an email address to enable password recovery and receive " "notifications" msgstr "パスワードの回復を有効にし、通知を受け取るにはメールアドレスを入力してください" -#: templates/personal.php:96 +#: templates/personal.php:89 msgid "Profile picture" msgstr "プロフィール写真" -#: templates/personal.php:101 +#: templates/personal.php:94 msgid "Upload new" msgstr "新規にアップロード" -#: templates/personal.php:103 +#: templates/personal.php:96 msgid "Select new from Files" msgstr "ファイルから新規に選択" -#: templates/personal.php:104 +#: templates/personal.php:97 msgid "Remove image" msgstr "画像を削除" -#: templates/personal.php:105 +#: templates/personal.php:98 msgid "Either png or jpg. Ideally square but you will be able to crop it." msgstr "png と jpg のいずれか。正方形が理想ですが、切り取って加工することも可能です。" -#: templates/personal.php:107 +#: templates/personal.php:100 msgid "Your avatar is provided by your original account." msgstr "あなたのアバターは、あなたのオリジナルのアカウントで提供されています。" -#: templates/personal.php:111 +#: templates/personal.php:104 msgid "Cancel" msgstr "キャンセル" -#: templates/personal.php:112 +#: templates/personal.php:105 msgid "Choose as profile image" msgstr "プロファイル画像として選択" -#: templates/personal.php:120 templates/personal.php:121 +#: templates/personal.php:111 templates/personal.php:112 msgid "Language" msgstr "言語" -#: templates/personal.php:140 +#: templates/personal.php:131 msgid "Help translate" msgstr "翻訳に協力する" -#: templates/personal.php:147 +#: templates/personal.php:137 msgid "WebDAV" msgstr "WebDAV" -#: templates/personal.php:149 +#: templates/personal.php:139 #, php-format msgid "" "Use this address to access your Files via " "WebDAV" msgstr "WebDAV 経由でファイルにアクセス するにはこのアドレスを利用してください" -#: templates/personal.php:161 +#: templates/personal.php:151 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "暗号化アプリはもはや有効ではありません、すべてのファイルを複合してください" -#: templates/personal.php:167 +#: templates/personal.php:157 msgid "Log-in password" msgstr "ログインパスワード" -#: templates/personal.php:172 +#: templates/personal.php:162 msgid "Decrypt all Files" msgstr "すべてのファイルを複合する" diff --git a/l10n/ka_GE/lib.po b/l10n/ka_GE/lib.po index a161500da58..d6c36f3cf5a 100644 --- a/l10n/ka_GE/lib.po +++ b/l10n/ka_GE/lib.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-09 01:55-0400\n" -"PO-Revision-Date: 2014-04-09 05:55+0000\n" +"POT-Creation-Date: 2014-04-10 01:54-0400\n" +"PO-Revision-Date: 2014-04-09 06:10+0000\n" "Last-Translator: I Robot\n" "Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n" "MIME-Version: 1.0\n" @@ -341,11 +341,11 @@ msgstr "" #: private/user/manager.php:251 msgid "A valid username must be provided" -msgstr "" +msgstr "უნდა მიუთითოთ არსებული მომხმარებლის სახელი" #: private/user/manager.php:255 msgid "A valid password must be provided" -msgstr "" +msgstr "უნდა მიუთითოთ არსებული პაროლი" #: private/user/manager.php:260 msgid "The username is already being used" diff --git a/l10n/ka_GE/settings.po b/l10n/ka_GE/settings.po index 797400953fe..deed78e7873 100644 --- a/l10n/ka_GE/settings.po +++ b/l10n/ka_GE/settings.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-03-26 01:55-0400\n" -"PO-Revision-Date: 2014-03-26 05:55+0000\n" +"POT-Creation-Date: 2014-04-10 01:54-0400\n" +"PO-Revision-Date: 2014-04-09 06:10+0000\n" "Last-Translator: I Robot\n" "Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n" "MIME-Version: 1.0\n" @@ -52,7 +52,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159 +#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149 msgid "Encryption" msgstr "ენკრიპცია" @@ -65,7 +65,7 @@ msgid "Unable to load list from App Store" msgstr "აპლიკაციების სია ვერ ჩამოიტვირთა App Store" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 changepassword/controller.php:55 +#: ajax/togglegroups.php:20 changepassword/controller.php:49 msgid "Authentication error" msgstr "ავთენტიფიკაციის შეცდომა" @@ -127,32 +127,32 @@ msgstr "მომხმარებლის წაშლა ვერ მოხ msgid "Couldn't update app." msgstr "ვერ მოხერხდა აპლიკაციის განახლება." -#: changepassword/controller.php:20 +#: changepassword/controller.php:17 msgid "Wrong password" msgstr "" -#: changepassword/controller.php:42 +#: changepassword/controller.php:36 msgid "No user supplied" msgstr "" -#: changepassword/controller.php:74 +#: changepassword/controller.php:68 msgid "" "Please provide an admin recovery password, otherwise all user data will be " "lost" msgstr "" -#: changepassword/controller.php:79 +#: changepassword/controller.php:73 msgid "" "Wrong admin recovery password. Please check the password and try again." msgstr "" -#: changepassword/controller.php:87 +#: changepassword/controller.php:81 msgid "" "Back-end doesn't support password change, but the users encryption key was " "successfully updated." msgstr "" -#: changepassword/controller.php:92 changepassword/controller.php:103 +#: changepassword/controller.php:86 changepassword/controller.php:97 msgid "Unable to change password" msgstr "" @@ -204,7 +204,7 @@ msgstr "შეცდომა აპლიკაციის განახლ msgid "Error" msgstr "შეცდომა" -#: js/apps.js:153 templates/apps.php:54 +#: js/apps.js:153 templates/apps.php:55 msgid "Update" msgstr "განახლება" @@ -212,31 +212,31 @@ msgstr "განახლება" msgid "Updated" msgstr "განახლებულია" -#: js/personal.js:246 +#: js/personal.js:243 msgid "Select a profile picture" msgstr "" -#: js/personal.js:277 +#: js/personal.js:274 msgid "Very weak password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:275 msgid "Weak password" msgstr "" -#: js/personal.js:279 +#: js/personal.js:276 msgid "So-so password" msgstr "" -#: js/personal.js:280 +#: js/personal.js:277 msgid "Good password" msgstr "" -#: js/personal.js:281 +#: js/personal.js:278 msgid "Strong password" msgstr "" -#: js/personal.js:316 +#: js/personal.js:313 msgid "Decrypting files... Please wait, this can take some time." msgstr "" @@ -285,7 +285,7 @@ msgstr "უნდა მიუთითოთ არსებული პარ msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:49 personal.php:50 +#: personal.php:48 personal.php:49 msgid "__language_name__" msgstr "__language_name__" @@ -590,11 +590,11 @@ msgstr "უფრო მეტი" msgid "Less" msgstr "უფრო ნაკლები" -#: templates/admin.php:416 templates/personal.php:181 +#: templates/admin.php:416 templates/personal.php:171 msgid "Version" msgstr "ვერსია" -#: templates/admin.php:420 templates/personal.php:184 +#: templates/admin.php:420 templates/personal.php:174 msgid "" "Developed by the ownCloud community, the -licensed by " msgstr "-ლიცენსირებულია " @@ -665,108 +665,108 @@ msgstr "მაჩვენე თავიდან გაშვებული msgid "You have used %s of the available %s" msgstr "თქვენ გამოყენებული გაქვთ %s –ი –%s–დან" -#: templates/personal.php:39 templates/users.php:21 templates/users.php:87 +#: templates/personal.php:38 templates/users.php:21 templates/users.php:87 msgid "Password" msgstr "პაროლი" -#: templates/personal.php:40 +#: templates/personal.php:39 msgid "Your password was changed" msgstr "თქვენი პაროლი შეიცვალა" -#: templates/personal.php:41 +#: templates/personal.php:40 msgid "Unable to change your password" msgstr "თქვენი პაროლი არ შეიცვალა" -#: templates/personal.php:43 +#: templates/personal.php:42 msgid "Current password" msgstr "მიმდინარე პაროლი" -#: templates/personal.php:46 +#: templates/personal.php:45 msgid "New password" msgstr "ახალი პაროლი" -#: templates/personal.php:50 +#: templates/personal.php:49 msgid "Change password" msgstr "პაროლის შეცვლა" -#: templates/personal.php:64 templates/users.php:86 +#: templates/personal.php:61 templates/users.php:86 msgid "Full Name" msgstr "" -#: templates/personal.php:81 +#: templates/personal.php:76 msgid "Email" msgstr "იმეილი" -#: templates/personal.php:83 +#: templates/personal.php:78 msgid "Your email address" msgstr "თქვენი იმეილ მისამართი" -#: templates/personal.php:86 +#: templates/personal.php:81 msgid "" "Fill in an email address to enable password recovery and receive " "notifications" msgstr "" -#: templates/personal.php:96 +#: templates/personal.php:89 msgid "Profile picture" msgstr "" -#: templates/personal.php:101 +#: templates/personal.php:94 msgid "Upload new" msgstr "" -#: templates/personal.php:103 +#: templates/personal.php:96 msgid "Select new from Files" msgstr "" -#: templates/personal.php:104 +#: templates/personal.php:97 msgid "Remove image" msgstr "" -#: templates/personal.php:105 +#: templates/personal.php:98 msgid "Either png or jpg. Ideally square but you will be able to crop it." msgstr "" -#: templates/personal.php:107 +#: templates/personal.php:100 msgid "Your avatar is provided by your original account." msgstr "" -#: templates/personal.php:111 +#: templates/personal.php:104 msgid "Cancel" msgstr "უარყოფა" -#: templates/personal.php:112 +#: templates/personal.php:105 msgid "Choose as profile image" msgstr "" -#: templates/personal.php:120 templates/personal.php:121 +#: templates/personal.php:111 templates/personal.php:112 msgid "Language" msgstr "ენა" -#: templates/personal.php:140 +#: templates/personal.php:131 msgid "Help translate" msgstr "თარგმნის დახმარება" -#: templates/personal.php:147 +#: templates/personal.php:137 msgid "WebDAV" msgstr "WebDAV" -#: templates/personal.php:149 +#: templates/personal.php:139 #, php-format msgid "" "Use this address to access your Files via " "WebDAV" msgstr "" -#: templates/personal.php:161 +#: templates/personal.php:151 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:167 +#: templates/personal.php:157 msgid "Log-in password" msgstr "" -#: templates/personal.php:172 +#: templates/personal.php:162 msgid "Decrypt all Files" msgstr "" diff --git a/l10n/km/lib.po b/l10n/km/lib.po index 354848af619..3bc0663f9b6 100644 --- a/l10n/km/lib.po +++ b/l10n/km/lib.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-09 01:55-0400\n" -"PO-Revision-Date: 2014-04-09 05:55+0000\n" +"POT-Creation-Date: 2014-04-10 01:54-0400\n" +"PO-Revision-Date: 2014-04-09 06:10+0000\n" "Last-Translator: I Robot\n" "Language-Team: Khmer (http://www.transifex.com/projects/p/owncloud/language/km/)\n" "MIME-Version: 1.0\n" @@ -342,11 +342,11 @@ msgstr "" #: private/user/manager.php:251 msgid "A valid username must be provided" -msgstr "" +msgstr "ត្រូវ​ផ្ដល់​ឈ្មោះ​អ្នក​ប្រើ​ឲ្យ​បាន​ត្រឹម​ត្រូវ" #: private/user/manager.php:255 msgid "A valid password must be provided" -msgstr "" +msgstr "ត្រូវ​ផ្ដល់​ពាក្យ​សម្ងាត់​ឲ្យ​បាន​ត្រឹម​ត្រូវ" #: private/user/manager.php:260 msgid "The username is already being used" diff --git a/l10n/km/settings.po b/l10n/km/settings.po index 35d2fa646a6..f551450fbe0 100644 --- a/l10n/km/settings.po +++ b/l10n/km/settings.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-03-26 01:55-0400\n" -"PO-Revision-Date: 2014-03-26 05:55+0000\n" +"POT-Creation-Date: 2014-04-10 01:54-0400\n" +"PO-Revision-Date: 2014-04-09 06:10+0000\n" "Last-Translator: I Robot\n" "Language-Team: Khmer (http://www.transifex.com/projects/p/owncloud/language/km/)\n" "MIME-Version: 1.0\n" @@ -53,7 +53,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159 +#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149 msgid "Encryption" msgstr "" @@ -66,7 +66,7 @@ msgid "Unable to load list from App Store" msgstr "មិនអាចផ្ទុកបញ្ជីកម្មវិធីពី App Store" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 changepassword/controller.php:55 +#: ajax/togglegroups.php:20 changepassword/controller.php:49 msgid "Authentication error" msgstr "កំហុស​ការ​ផ្ទៀង​ផ្ទាត់​ភាព​ត្រឹម​ត្រូវ" @@ -128,32 +128,32 @@ msgstr "មិន​អាច​ដក​អ្នក​ប្រើ​ចេញ msgid "Couldn't update app." msgstr "មិន​អាច​ធ្វើ​បច្ចុប្បន្នភាព​កម្មវិធី។" -#: changepassword/controller.php:20 +#: changepassword/controller.php:17 msgid "Wrong password" msgstr "" -#: changepassword/controller.php:42 +#: changepassword/controller.php:36 msgid "No user supplied" msgstr "" -#: changepassword/controller.php:74 +#: changepassword/controller.php:68 msgid "" "Please provide an admin recovery password, otherwise all user data will be " "lost" msgstr "" -#: changepassword/controller.php:79 +#: changepassword/controller.php:73 msgid "" "Wrong admin recovery password. Please check the password and try again." msgstr "" -#: changepassword/controller.php:87 +#: changepassword/controller.php:81 msgid "" "Back-end doesn't support password change, but the users encryption key was " "successfully updated." msgstr "" -#: changepassword/controller.php:92 changepassword/controller.php:103 +#: changepassword/controller.php:86 changepassword/controller.php:97 msgid "Unable to change password" msgstr "" @@ -205,7 +205,7 @@ msgstr "មាន​កំហុស​ពេល​ធ្វើ​បច្ចុ msgid "Error" msgstr "កំហុស" -#: js/apps.js:153 templates/apps.php:54 +#: js/apps.js:153 templates/apps.php:55 msgid "Update" msgstr "ធ្វើ​បច្ចុប្បន្នភាព" @@ -213,31 +213,31 @@ msgstr "ធ្វើ​បច្ចុប្បន្នភាព" msgid "Updated" msgstr "បាន​ធ្វើ​បច្ចុប្បន្នភាព" -#: js/personal.js:246 +#: js/personal.js:243 msgid "Select a profile picture" msgstr "" -#: js/personal.js:277 +#: js/personal.js:274 msgid "Very weak password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:275 msgid "Weak password" msgstr "" -#: js/personal.js:279 +#: js/personal.js:276 msgid "So-so password" msgstr "" -#: js/personal.js:280 +#: js/personal.js:277 msgid "Good password" msgstr "" -#: js/personal.js:281 +#: js/personal.js:278 msgid "Strong password" msgstr "" -#: js/personal.js:316 +#: js/personal.js:313 msgid "Decrypting files... Please wait, this can take some time." msgstr "" @@ -286,7 +286,7 @@ msgstr "ត្រូវ​ផ្ដល់​ពាក្យ​សម្ងាត msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:49 personal.php:50 +#: personal.php:48 personal.php:49 msgid "__language_name__" msgstr "__language_name__" @@ -591,11 +591,11 @@ msgstr "ច្រើន​ទៀត" msgid "Less" msgstr "តិច" -#: templates/admin.php:416 templates/personal.php:181 +#: templates/admin.php:416 templates/personal.php:171 msgid "Version" msgstr "កំណែ" -#: templates/admin.php:420 templates/personal.php:184 +#: templates/admin.php:420 templates/personal.php:174 msgid "" "Developed by the ownCloud community, the -licensed by " msgstr "" @@ -666,108 +666,108 @@ msgstr "" msgid "You have used %s of the available %s" msgstr "" -#: templates/personal.php:39 templates/users.php:21 templates/users.php:87 +#: templates/personal.php:38 templates/users.php:21 templates/users.php:87 msgid "Password" msgstr "ពាក្យសម្ងាត់" -#: templates/personal.php:40 +#: templates/personal.php:39 msgid "Your password was changed" msgstr "" -#: templates/personal.php:41 +#: templates/personal.php:40 msgid "Unable to change your password" msgstr "" -#: templates/personal.php:43 +#: templates/personal.php:42 msgid "Current password" msgstr "ពាក្យសម្ងាត់​បច្ចុប្បន្ន" -#: templates/personal.php:46 +#: templates/personal.php:45 msgid "New password" msgstr "ពាក្យ​សម្ងាត់​ថ្មី" -#: templates/personal.php:50 +#: templates/personal.php:49 msgid "Change password" msgstr "ប្តូរ​ពាក្យសម្ងាត់" -#: templates/personal.php:64 templates/users.php:86 +#: templates/personal.php:61 templates/users.php:86 msgid "Full Name" msgstr "" -#: templates/personal.php:81 +#: templates/personal.php:76 msgid "Email" msgstr "អ៊ីមែល" -#: templates/personal.php:83 +#: templates/personal.php:78 msgid "Your email address" msgstr "អ៊ីម៉ែល​របស់​អ្នក" -#: templates/personal.php:86 +#: templates/personal.php:81 msgid "" "Fill in an email address to enable password recovery and receive " "notifications" msgstr "" -#: templates/personal.php:96 +#: templates/personal.php:89 msgid "Profile picture" msgstr "" -#: templates/personal.php:101 +#: templates/personal.php:94 msgid "Upload new" msgstr "" -#: templates/personal.php:103 +#: templates/personal.php:96 msgid "Select new from Files" msgstr "" -#: templates/personal.php:104 +#: templates/personal.php:97 msgid "Remove image" msgstr "" -#: templates/personal.php:105 +#: templates/personal.php:98 msgid "Either png or jpg. Ideally square but you will be able to crop it." msgstr "" -#: templates/personal.php:107 +#: templates/personal.php:100 msgid "Your avatar is provided by your original account." msgstr "" -#: templates/personal.php:111 +#: templates/personal.php:104 msgid "Cancel" msgstr "លើកលែង" -#: templates/personal.php:112 +#: templates/personal.php:105 msgid "Choose as profile image" msgstr "" -#: templates/personal.php:120 templates/personal.php:121 +#: templates/personal.php:111 templates/personal.php:112 msgid "Language" msgstr "ភាសា" -#: templates/personal.php:140 +#: templates/personal.php:131 msgid "Help translate" msgstr "ជួយ​បក​ប្រែ" -#: templates/personal.php:147 +#: templates/personal.php:137 msgid "WebDAV" msgstr "WebDAV" -#: templates/personal.php:149 +#: templates/personal.php:139 #, php-format msgid "" "Use this address to access your Files via " "WebDAV" msgstr "" -#: templates/personal.php:161 +#: templates/personal.php:151 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:167 +#: templates/personal.php:157 msgid "Log-in password" msgstr "" -#: templates/personal.php:172 +#: templates/personal.php:162 msgid "Decrypt all Files" msgstr "" diff --git a/l10n/ko/lib.po b/l10n/ko/lib.po index baba62b8b73..02e1760e6aa 100644 --- a/l10n/ko/lib.po +++ b/l10n/ko/lib.po @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-09 01:55-0400\n" -"PO-Revision-Date: 2014-04-09 05:55+0000\n" +"POT-Creation-Date: 2014-04-10 01:54-0400\n" +"PO-Revision-Date: 2014-04-09 06:10+0000\n" "Last-Translator: I Robot\n" "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n" "MIME-Version: 1.0\n" @@ -346,11 +346,11 @@ msgstr "" #: private/user/manager.php:251 msgid "A valid username must be provided" -msgstr "" +msgstr "올바른 사용자 이름을 입력해야 함" #: private/user/manager.php:255 msgid "A valid password must be provided" -msgstr "" +msgstr "올바른 암호를 입력해야 함" #: private/user/manager.php:260 msgid "The username is already being used" diff --git a/l10n/ko/settings.po b/l10n/ko/settings.po index 65a843dddbb..7ede0d46667 100644 --- a/l10n/ko/settings.po +++ b/l10n/ko/settings.po @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-03-26 01:55-0400\n" -"PO-Revision-Date: 2014-03-26 05:55+0000\n" +"POT-Creation-Date: 2014-04-10 01:54-0400\n" +"PO-Revision-Date: 2014-04-09 06:10+0000\n" "Last-Translator: I Robot\n" "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n" "MIME-Version: 1.0\n" @@ -56,7 +56,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159 +#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149 msgid "Encryption" msgstr "암호화" @@ -69,7 +69,7 @@ msgid "Unable to load list from App Store" msgstr "앱 스토어에서 목록을 가져올 수 없습니다" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 changepassword/controller.php:55 +#: ajax/togglegroups.php:20 changepassword/controller.php:49 msgid "Authentication error" msgstr "인증 오류" @@ -131,32 +131,32 @@ msgstr "그룹 %s에서 사용자를 삭제할 수 없음" msgid "Couldn't update app." msgstr "앱을 업데이트할 수 없습니다." -#: changepassword/controller.php:20 +#: changepassword/controller.php:17 msgid "Wrong password" msgstr "잘못된 암호" -#: changepassword/controller.php:42 +#: changepassword/controller.php:36 msgid "No user supplied" msgstr "사용자가 지정되지 않음" -#: changepassword/controller.php:74 +#: changepassword/controller.php:68 msgid "" "Please provide an admin recovery password, otherwise all user data will be " "lost" msgstr "관리자 복구 암호를 입력하지 않으면 모든 사용자 데이터가 삭제됩니다" -#: changepassword/controller.php:79 +#: changepassword/controller.php:73 msgid "" "Wrong admin recovery password. Please check the password and try again." msgstr "관리자 복구 암호가 잘못되었습니다. 암호를 다시 확인하십시오." -#: changepassword/controller.php:87 +#: changepassword/controller.php:81 msgid "" "Back-end doesn't support password change, but the users encryption key was " "successfully updated." msgstr "백엔드에서 암호 변경을 지원하지 않지만, 사용자의 암호화 키는 갱신되었습니다." -#: changepassword/controller.php:92 changepassword/controller.php:103 +#: changepassword/controller.php:86 changepassword/controller.php:97 msgid "Unable to change password" msgstr "암호를 변경할 수 없음" @@ -208,7 +208,7 @@ msgstr "앱을 업데이트하는 중 오류 발생" msgid "Error" msgstr "오류" -#: js/apps.js:153 templates/apps.php:54 +#: js/apps.js:153 templates/apps.php:55 msgid "Update" msgstr "업데이트" @@ -216,31 +216,31 @@ msgstr "업데이트" msgid "Updated" msgstr "업데이트됨" -#: js/personal.js:246 +#: js/personal.js:243 msgid "Select a profile picture" msgstr "프로필 사진 선택" -#: js/personal.js:277 +#: js/personal.js:274 msgid "Very weak password" msgstr "매우 약한 암호" -#: js/personal.js:278 +#: js/personal.js:275 msgid "Weak password" msgstr "약한 암호" -#: js/personal.js:279 +#: js/personal.js:276 msgid "So-so password" msgstr "그저 그런 암호" -#: js/personal.js:280 +#: js/personal.js:277 msgid "Good password" msgstr "좋은 암호" -#: js/personal.js:281 +#: js/personal.js:278 msgid "Strong password" msgstr "강력한 암호" -#: js/personal.js:316 +#: js/personal.js:313 msgid "Decrypting files... Please wait, this can take some time." msgstr "파일 복호화 중... 시간이 걸릴 수도 있으니 기다려 주십시오." @@ -289,7 +289,7 @@ msgstr "올바른 암호를 입력해야 함" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "경고: 사용자 \"{user}\"의 홈 디렉터리가 이미 존재합니다" -#: personal.php:49 personal.php:50 +#: personal.php:48 personal.php:49 msgid "__language_name__" msgstr "한국어" @@ -594,11 +594,11 @@ msgstr "더 중요함" msgid "Less" msgstr "덜 중요함" -#: templates/admin.php:416 templates/personal.php:181 +#: templates/admin.php:416 templates/personal.php:171 msgid "Version" msgstr "버전" -#: templates/admin.php:420 templates/personal.php:184 +#: templates/admin.php:420 templates/personal.php:174 msgid "" "Developed by the ownCloud community, the -licensed by " msgstr "-라이선스됨: " @@ -669,108 +669,108 @@ msgstr "첫 실행 마법사 다시 보이기" msgid "You have used %s of the available %s" msgstr "현재 공간 중 %s/%s을(를) 사용 중입니다" -#: templates/personal.php:39 templates/users.php:21 templates/users.php:87 +#: templates/personal.php:38 templates/users.php:21 templates/users.php:87 msgid "Password" msgstr "암호" -#: templates/personal.php:40 +#: templates/personal.php:39 msgid "Your password was changed" msgstr "암호가 변경되었습니다" -#: templates/personal.php:41 +#: templates/personal.php:40 msgid "Unable to change your password" msgstr "암호를 변경할 수 없음" -#: templates/personal.php:43 +#: templates/personal.php:42 msgid "Current password" msgstr "현재 암호" -#: templates/personal.php:46 +#: templates/personal.php:45 msgid "New password" msgstr "새 암호" -#: templates/personal.php:50 +#: templates/personal.php:49 msgid "Change password" msgstr "암호 변경" -#: templates/personal.php:64 templates/users.php:86 +#: templates/personal.php:61 templates/users.php:86 msgid "Full Name" msgstr "전체 이름" -#: templates/personal.php:81 +#: templates/personal.php:76 msgid "Email" msgstr "이메일" -#: templates/personal.php:83 +#: templates/personal.php:78 msgid "Your email address" msgstr "이메일 주소" -#: templates/personal.php:86 +#: templates/personal.php:81 msgid "" "Fill in an email address to enable password recovery and receive " "notifications" msgstr "" -#: templates/personal.php:96 +#: templates/personal.php:89 msgid "Profile picture" msgstr "프로필 사진" -#: templates/personal.php:101 +#: templates/personal.php:94 msgid "Upload new" msgstr "새로 업로드" -#: templates/personal.php:103 +#: templates/personal.php:96 msgid "Select new from Files" msgstr "파일에서 선택" -#: templates/personal.php:104 +#: templates/personal.php:97 msgid "Remove image" msgstr "그림 삭제" -#: templates/personal.php:105 +#: templates/personal.php:98 msgid "Either png or jpg. Ideally square but you will be able to crop it." msgstr "png나 jpg를 사용하십시오. 정사각형 형태가 가장 좋지만 잘라낼 수 있습니다." -#: templates/personal.php:107 +#: templates/personal.php:100 msgid "Your avatar is provided by your original account." msgstr "원본 계정의 아바타를 사용합니다." -#: templates/personal.php:111 +#: templates/personal.php:104 msgid "Cancel" msgstr "취소" -#: templates/personal.php:112 +#: templates/personal.php:105 msgid "Choose as profile image" msgstr "프로필 이미지로 사용" -#: templates/personal.php:120 templates/personal.php:121 +#: templates/personal.php:111 templates/personal.php:112 msgid "Language" msgstr "언어" -#: templates/personal.php:140 +#: templates/personal.php:131 msgid "Help translate" msgstr "번역 돕기" -#: templates/personal.php:147 +#: templates/personal.php:137 msgid "WebDAV" msgstr "WebDAV" -#: templates/personal.php:149 +#: templates/personal.php:139 #, php-format msgid "" "Use this address to access your Files via " "WebDAV" msgstr "WebDAV로 파일에 접근하려면 이 주소를 사용하십시오" -#: templates/personal.php:161 +#: templates/personal.php:151 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "암호화 앱이 비활성화되었습니다. 모든 파일을 복호화해야 합니다." -#: templates/personal.php:167 +#: templates/personal.php:157 msgid "Log-in password" msgstr "로그인 암호" -#: templates/personal.php:172 +#: templates/personal.php:162 msgid "Decrypt all Files" msgstr "모든 파일 복호화" diff --git a/l10n/lt_LT/lib.po b/l10n/lt_LT/lib.po index 94c3515831b..58ff50b54f6 100644 --- a/l10n/lt_LT/lib.po +++ b/l10n/lt_LT/lib.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-09 01:55-0400\n" -"PO-Revision-Date: 2014-04-09 05:55+0000\n" +"POT-Creation-Date: 2014-04-10 01:54-0400\n" +"PO-Revision-Date: 2014-04-09 06:10+0000\n" "Last-Translator: I Robot\n" "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n" "MIME-Version: 1.0\n" @@ -353,11 +353,11 @@ msgstr "" #: private/user/manager.php:251 msgid "A valid username must be provided" -msgstr "" +msgstr "Vartotojo vardas turi būti tinkamas" #: private/user/manager.php:255 msgid "A valid password must be provided" -msgstr "" +msgstr "Slaptažodis turi būti tinkamas" #: private/user/manager.php:260 msgid "The username is already being used" diff --git a/l10n/lt_LT/settings.po b/l10n/lt_LT/settings.po index 5e45ec42c63..4b4e306f816 100644 --- a/l10n/lt_LT/settings.po +++ b/l10n/lt_LT/settings.po @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-03-26 01:55-0400\n" -"PO-Revision-Date: 2014-03-26 05:55+0000\n" +"POT-Creation-Date: 2014-04-10 01:54-0400\n" +"PO-Revision-Date: 2014-04-09 06:10+0000\n" "Last-Translator: I Robot\n" "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n" "MIME-Version: 1.0\n" @@ -56,7 +56,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159 +#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149 msgid "Encryption" msgstr "Šifravimas" @@ -69,7 +69,7 @@ msgid "Unable to load list from App Store" msgstr "Neįmanoma įkelti sąrašo iš Programų Katalogo" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 changepassword/controller.php:55 +#: ajax/togglegroups.php:20 changepassword/controller.php:49 msgid "Authentication error" msgstr "Autentikacijos klaida" @@ -131,32 +131,32 @@ msgstr "Nepavyko ištrinti vartotojo iš grupės %s" msgid "Couldn't update app." msgstr "Nepavyko atnaujinti programos." -#: changepassword/controller.php:20 +#: changepassword/controller.php:17 msgid "Wrong password" msgstr "Neteisingas slaptažodis" -#: changepassword/controller.php:42 +#: changepassword/controller.php:36 msgid "No user supplied" msgstr "Nepateiktas naudotojas" -#: changepassword/controller.php:74 +#: changepassword/controller.php:68 msgid "" "Please provide an admin recovery password, otherwise all user data will be " "lost" msgstr "Prašome įvesti administratoriaus atkūrimo slaptažodį, kitaip visi naudotojo suomenys bus prarasti" -#: changepassword/controller.php:79 +#: changepassword/controller.php:73 msgid "" "Wrong admin recovery password. Please check the password and try again." msgstr "Netinkamas administratoriau atkūrimo slaptažodis. Prašome pasitikrinti ir bandyti vėl." -#: changepassword/controller.php:87 +#: changepassword/controller.php:81 msgid "" "Back-end doesn't support password change, but the users encryption key was " "successfully updated." msgstr "Sistema nepalaiko slaptažodžio keitimo, bet naudotojo šifravimo raktas buvo sėkmingai atnaujintas." -#: changepassword/controller.php:92 changepassword/controller.php:103 +#: changepassword/controller.php:86 changepassword/controller.php:97 msgid "Unable to change password" msgstr "Nepavyksta pakeisti slaptažodžio" @@ -208,7 +208,7 @@ msgstr "Įvyko klaida atnaujinant programą" msgid "Error" msgstr "Klaida" -#: js/apps.js:153 templates/apps.php:54 +#: js/apps.js:153 templates/apps.php:55 msgid "Update" msgstr "Atnaujinti" @@ -216,31 +216,31 @@ msgstr "Atnaujinti" msgid "Updated" msgstr "Atnaujinta" -#: js/personal.js:246 +#: js/personal.js:243 msgid "Select a profile picture" msgstr "Pažymėkite profilio paveikslėlį" -#: js/personal.js:277 +#: js/personal.js:274 msgid "Very weak password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:275 msgid "Weak password" msgstr "" -#: js/personal.js:279 +#: js/personal.js:276 msgid "So-so password" msgstr "" -#: js/personal.js:280 +#: js/personal.js:277 msgid "Good password" msgstr "" -#: js/personal.js:281 +#: js/personal.js:278 msgid "Strong password" msgstr "" -#: js/personal.js:316 +#: js/personal.js:313 msgid "Decrypting files... Please wait, this can take some time." msgstr "Iššifruojami failai... Prašome palaukti, tai gali užtrukti." @@ -289,7 +289,7 @@ msgstr "Slaptažodis turi būti tinkamas" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "Įspėjimas: Vartotojo \"{user}\" namų aplankas jau egzistuoja" -#: personal.php:49 personal.php:50 +#: personal.php:48 personal.php:49 msgid "__language_name__" msgstr "Kalba" @@ -594,11 +594,11 @@ msgstr "Daugiau" msgid "Less" msgstr "Mažiau" -#: templates/admin.php:416 templates/personal.php:181 +#: templates/admin.php:416 templates/personal.php:171 msgid "Version" msgstr "Versija" -#: templates/admin.php:420 templates/personal.php:184 +#: templates/admin.php:420 templates/personal.php:174 msgid "" "Developed by the ownCloud community, the -licensed by " msgstr "- autorius" @@ -669,108 +669,108 @@ msgstr "Rodyti pirmo karto vedlį dar kartą" msgid "You have used %s of the available %s" msgstr "Jūs naudojate %s iš galimų %s" -#: templates/personal.php:39 templates/users.php:21 templates/users.php:87 +#: templates/personal.php:38 templates/users.php:21 templates/users.php:87 msgid "Password" msgstr "Slaptažodis" -#: templates/personal.php:40 +#: templates/personal.php:39 msgid "Your password was changed" msgstr "Jūsų slaptažodis buvo pakeistas" -#: templates/personal.php:41 +#: templates/personal.php:40 msgid "Unable to change your password" msgstr "Neįmanoma pakeisti slaptažodžio" -#: templates/personal.php:43 +#: templates/personal.php:42 msgid "Current password" msgstr "Dabartinis slaptažodis" -#: templates/personal.php:46 +#: templates/personal.php:45 msgid "New password" msgstr "Naujas slaptažodis" -#: templates/personal.php:50 +#: templates/personal.php:49 msgid "Change password" msgstr "Pakeisti slaptažodį" -#: templates/personal.php:64 templates/users.php:86 +#: templates/personal.php:61 templates/users.php:86 msgid "Full Name" msgstr "Pilnas vardas" -#: templates/personal.php:81 +#: templates/personal.php:76 msgid "Email" msgstr "El. Paštas" -#: templates/personal.php:83 +#: templates/personal.php:78 msgid "Your email address" msgstr "Jūsų el. pašto adresas" -#: templates/personal.php:86 +#: templates/personal.php:81 msgid "" "Fill in an email address to enable password recovery and receive " "notifications" msgstr "" -#: templates/personal.php:96 +#: templates/personal.php:89 msgid "Profile picture" msgstr "Profilio paveikslėlis" -#: templates/personal.php:101 +#: templates/personal.php:94 msgid "Upload new" msgstr "Įkelti naują" -#: templates/personal.php:103 +#: templates/personal.php:96 msgid "Select new from Files" msgstr "Pasirinkti naują iš failų" -#: templates/personal.php:104 +#: templates/personal.php:97 msgid "Remove image" msgstr "Pašalinti paveikslėlį" -#: templates/personal.php:105 +#: templates/personal.php:98 msgid "Either png or jpg. Ideally square but you will be able to crop it." msgstr "Arba png arba jpg. Geriausia kvadratinį, bet galėsite jį apkarpyti." -#: templates/personal.php:107 +#: templates/personal.php:100 msgid "Your avatar is provided by your original account." msgstr "" -#: templates/personal.php:111 +#: templates/personal.php:104 msgid "Cancel" msgstr "Atšaukti" -#: templates/personal.php:112 +#: templates/personal.php:105 msgid "Choose as profile image" msgstr "Pasirinkite profilio paveiksliuką" -#: templates/personal.php:120 templates/personal.php:121 +#: templates/personal.php:111 templates/personal.php:112 msgid "Language" msgstr "Kalba" -#: templates/personal.php:140 +#: templates/personal.php:131 msgid "Help translate" msgstr "Padėkite išversti" -#: templates/personal.php:147 +#: templates/personal.php:137 msgid "WebDAV" msgstr "WebDAV" -#: templates/personal.php:149 +#: templates/personal.php:139 #, php-format msgid "" "Use this address to access your Files via " "WebDAV" msgstr "Naudokite šį adresą, kad pasiektumėte savo failus per WebDAV" -#: templates/personal.php:161 +#: templates/personal.php:151 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:167 +#: templates/personal.php:157 msgid "Log-in password" msgstr "Prisijungimo slaptažodis" -#: templates/personal.php:172 +#: templates/personal.php:162 msgid "Decrypt all Files" msgstr "Iššifruoti visus failus" diff --git a/l10n/lv/lib.po b/l10n/lv/lib.po index 455b5fbf796..5a8a9d5813b 100644 --- a/l10n/lv/lib.po +++ b/l10n/lv/lib.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-09 01:55-0400\n" -"PO-Revision-Date: 2014-04-09 05:55+0000\n" +"POT-Creation-Date: 2014-04-10 01:54-0400\n" +"PO-Revision-Date: 2014-04-09 06:10+0000\n" "Last-Translator: I Robot\n" "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n" "MIME-Version: 1.0\n" @@ -350,12 +350,12 @@ msgstr "" #: private/user/manager.php:251 msgid "A valid username must be provided" -msgstr "" +msgstr "Jānorāda derīgs lietotājvārds" #: private/user/manager.php:255 msgid "A valid password must be provided" -msgstr "" +msgstr "Jānorāda derīga parole" #: private/user/manager.php:260 msgid "The username is already being used" -msgstr "" +msgstr "Šāds lietotājvārds jau tiek izmantots" diff --git a/l10n/lv/settings.po b/l10n/lv/settings.po index cb79419f22c..13c92ee1a70 100644 --- a/l10n/lv/settings.po +++ b/l10n/lv/settings.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-03-26 01:55-0400\n" -"PO-Revision-Date: 2014-03-26 05:55+0000\n" +"POT-Creation-Date: 2014-04-10 01:54-0400\n" +"PO-Revision-Date: 2014-04-09 06:10+0000\n" "Last-Translator: I Robot\n" "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n" "MIME-Version: 1.0\n" @@ -52,7 +52,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159 +#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149 msgid "Encryption" msgstr "Šifrēšana" @@ -65,7 +65,7 @@ msgid "Unable to load list from App Store" msgstr "Nevar lejupielādēt sarakstu no lietotņu veikala" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 changepassword/controller.php:55 +#: ajax/togglegroups.php:20 changepassword/controller.php:49 msgid "Authentication error" msgstr "Autentifikācijas kļūda" @@ -127,32 +127,32 @@ msgstr "Nevar izņemt lietotāju no grupas %s" msgid "Couldn't update app." msgstr "Nevarēja atjaunināt lietotni." -#: changepassword/controller.php:20 +#: changepassword/controller.php:17 msgid "Wrong password" msgstr "" -#: changepassword/controller.php:42 +#: changepassword/controller.php:36 msgid "No user supplied" msgstr "" -#: changepassword/controller.php:74 +#: changepassword/controller.php:68 msgid "" "Please provide an admin recovery password, otherwise all user data will be " "lost" msgstr "" -#: changepassword/controller.php:79 +#: changepassword/controller.php:73 msgid "" "Wrong admin recovery password. Please check the password and try again." msgstr "" -#: changepassword/controller.php:87 +#: changepassword/controller.php:81 msgid "" "Back-end doesn't support password change, but the users encryption key was " "successfully updated." msgstr "" -#: changepassword/controller.php:92 changepassword/controller.php:103 +#: changepassword/controller.php:86 changepassword/controller.php:97 msgid "Unable to change password" msgstr "" @@ -204,7 +204,7 @@ msgstr "Kļūda, atjauninot lietotni" msgid "Error" msgstr "Kļūda" -#: js/apps.js:153 templates/apps.php:54 +#: js/apps.js:153 templates/apps.php:55 msgid "Update" msgstr "Atjaunināt" @@ -212,31 +212,31 @@ msgstr "Atjaunināt" msgid "Updated" msgstr "Atjaunināta" -#: js/personal.js:246 +#: js/personal.js:243 msgid "Select a profile picture" msgstr "" -#: js/personal.js:277 +#: js/personal.js:274 msgid "Very weak password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:275 msgid "Weak password" msgstr "" -#: js/personal.js:279 +#: js/personal.js:276 msgid "So-so password" msgstr "" -#: js/personal.js:280 +#: js/personal.js:277 msgid "Good password" msgstr "" -#: js/personal.js:281 +#: js/personal.js:278 msgid "Strong password" msgstr "" -#: js/personal.js:316 +#: js/personal.js:313 msgid "Decrypting files... Please wait, this can take some time." msgstr "Atšifrēju failus... Uzgaidiet tas var ilgt kādu laiku." @@ -285,7 +285,7 @@ msgstr "Jānorāda derīga parole" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:49 personal.php:50 +#: personal.php:48 personal.php:49 msgid "__language_name__" msgstr "__valodas_nosaukums__" @@ -590,11 +590,11 @@ msgstr "Vairāk" msgid "Less" msgstr "Mazāk" -#: templates/admin.php:416 templates/personal.php:181 +#: templates/admin.php:416 templates/personal.php:171 msgid "Version" msgstr "Versija" -#: templates/admin.php:420 templates/personal.php:184 +#: templates/admin.php:420 templates/personal.php:174 msgid "" "Developed by the ownCloud community, the -licensed by " msgstr "-licencēts no " @@ -665,108 +665,108 @@ msgstr "Vēlreiz rādīt pirmās palaišanas vedni" msgid "You have used %s of the available %s" msgstr "Jūs lietojat %s no pieejamajiem %s" -#: templates/personal.php:39 templates/users.php:21 templates/users.php:87 +#: templates/personal.php:38 templates/users.php:21 templates/users.php:87 msgid "Password" msgstr "Parole" -#: templates/personal.php:40 +#: templates/personal.php:39 msgid "Your password was changed" msgstr "Jūru parole tika nomainīta" -#: templates/personal.php:41 +#: templates/personal.php:40 msgid "Unable to change your password" msgstr "Nevar nomainīt jūsu paroli" -#: templates/personal.php:43 +#: templates/personal.php:42 msgid "Current password" msgstr "Pašreizējā parole" -#: templates/personal.php:46 +#: templates/personal.php:45 msgid "New password" msgstr "Jauna parole" -#: templates/personal.php:50 +#: templates/personal.php:49 msgid "Change password" msgstr "Mainīt paroli" -#: templates/personal.php:64 templates/users.php:86 +#: templates/personal.php:61 templates/users.php:86 msgid "Full Name" msgstr "" -#: templates/personal.php:81 +#: templates/personal.php:76 msgid "Email" msgstr "E-pasts" -#: templates/personal.php:83 +#: templates/personal.php:78 msgid "Your email address" msgstr "Jūsu e-pasta adrese" -#: templates/personal.php:86 +#: templates/personal.php:81 msgid "" "Fill in an email address to enable password recovery and receive " "notifications" msgstr "" -#: templates/personal.php:96 +#: templates/personal.php:89 msgid "Profile picture" msgstr "" -#: templates/personal.php:101 +#: templates/personal.php:94 msgid "Upload new" msgstr "" -#: templates/personal.php:103 +#: templates/personal.php:96 msgid "Select new from Files" msgstr "" -#: templates/personal.php:104 +#: templates/personal.php:97 msgid "Remove image" msgstr "" -#: templates/personal.php:105 +#: templates/personal.php:98 msgid "Either png or jpg. Ideally square but you will be able to crop it." msgstr "" -#: templates/personal.php:107 +#: templates/personal.php:100 msgid "Your avatar is provided by your original account." msgstr "" -#: templates/personal.php:111 +#: templates/personal.php:104 msgid "Cancel" msgstr "Atcelt" -#: templates/personal.php:112 +#: templates/personal.php:105 msgid "Choose as profile image" msgstr "" -#: templates/personal.php:120 templates/personal.php:121 +#: templates/personal.php:111 templates/personal.php:112 msgid "Language" msgstr "Valoda" -#: templates/personal.php:140 +#: templates/personal.php:131 msgid "Help translate" msgstr "Palīdzi tulkot" -#: templates/personal.php:147 +#: templates/personal.php:137 msgid "WebDAV" msgstr "WebDAV" -#: templates/personal.php:149 +#: templates/personal.php:139 #, php-format msgid "" "Use this address to access your Files via " "WebDAV" msgstr "" -#: templates/personal.php:161 +#: templates/personal.php:151 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:167 +#: templates/personal.php:157 msgid "Log-in password" msgstr "Pieslēgšanās parole" -#: templates/personal.php:172 +#: templates/personal.php:162 msgid "Decrypt all Files" msgstr "Atšifrēt visus failus" diff --git a/l10n/mk/lib.po b/l10n/mk/lib.po index 28ea982580e..c611a9b9d0d 100644 --- a/l10n/mk/lib.po +++ b/l10n/mk/lib.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-09 01:55-0400\n" -"PO-Revision-Date: 2014-04-09 05:55+0000\n" +"POT-Creation-Date: 2014-04-10 01:54-0400\n" +"PO-Revision-Date: 2014-04-09 06:10+0000\n" "Last-Translator: I Robot\n" "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n" "MIME-Version: 1.0\n" @@ -345,11 +345,11 @@ msgstr "" #: private/user/manager.php:251 msgid "A valid username must be provided" -msgstr "" +msgstr "Мора да се обезбеди валидно корисничко име " #: private/user/manager.php:255 msgid "A valid password must be provided" -msgstr "" +msgstr "Мора да се обезбеди валидна лозинка" #: private/user/manager.php:260 msgid "The username is already being used" diff --git a/l10n/mk/settings.po b/l10n/mk/settings.po index 39b831e785e..e6096b1af4f 100644 --- a/l10n/mk/settings.po +++ b/l10n/mk/settings.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-03-26 01:55-0400\n" -"PO-Revision-Date: 2014-03-26 05:55+0000\n" +"POT-Creation-Date: 2014-04-10 01:54-0400\n" +"PO-Revision-Date: 2014-04-09 06:10+0000\n" "Last-Translator: I Robot\n" "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n" "MIME-Version: 1.0\n" @@ -52,7 +52,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159 +#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149 msgid "Encryption" msgstr "Енкрипција" @@ -65,7 +65,7 @@ msgid "Unable to load list from App Store" msgstr "Неможам да вчитам листа од App Store" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 changepassword/controller.php:55 +#: ajax/togglegroups.php:20 changepassword/controller.php:49 msgid "Authentication error" msgstr "Грешка во автентикација" @@ -127,32 +127,32 @@ msgstr "Неможе да избришам корисник од група %s" msgid "Couldn't update app." msgstr "Не можам да ја надградам апликацијата." -#: changepassword/controller.php:20 +#: changepassword/controller.php:17 msgid "Wrong password" msgstr "Погрешна лозинка" -#: changepassword/controller.php:42 +#: changepassword/controller.php:36 msgid "No user supplied" msgstr "Нема корисничко име" -#: changepassword/controller.php:74 +#: changepassword/controller.php:68 msgid "" "Please provide an admin recovery password, otherwise all user data will be " "lost" msgstr "" -#: changepassword/controller.php:79 +#: changepassword/controller.php:73 msgid "" "Wrong admin recovery password. Please check the password and try again." msgstr "" -#: changepassword/controller.php:87 +#: changepassword/controller.php:81 msgid "" "Back-end doesn't support password change, but the users encryption key was " "successfully updated." msgstr "" -#: changepassword/controller.php:92 changepassword/controller.php:103 +#: changepassword/controller.php:86 changepassword/controller.php:97 msgid "Unable to change password" msgstr "Вашата лозинка неможе да се смени" @@ -204,7 +204,7 @@ msgstr "Грешка додека ја надградувам апликациј msgid "Error" msgstr "Грешка" -#: js/apps.js:153 templates/apps.php:54 +#: js/apps.js:153 templates/apps.php:55 msgid "Update" msgstr "Ажурирај" @@ -212,31 +212,31 @@ msgstr "Ажурирај" msgid "Updated" msgstr "Надграден" -#: js/personal.js:246 +#: js/personal.js:243 msgid "Select a profile picture" msgstr "Одбери фотографија за профилот" -#: js/personal.js:277 +#: js/personal.js:274 msgid "Very weak password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:275 msgid "Weak password" msgstr "" -#: js/personal.js:279 +#: js/personal.js:276 msgid "So-so password" msgstr "" -#: js/personal.js:280 +#: js/personal.js:277 msgid "Good password" msgstr "" -#: js/personal.js:281 +#: js/personal.js:278 msgid "Strong password" msgstr "" -#: js/personal.js:316 +#: js/personal.js:313 msgid "Decrypting files... Please wait, this can take some time." msgstr "" @@ -285,7 +285,7 @@ msgstr "Мора да се обезбеди валидна лозинка" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:49 personal.php:50 +#: personal.php:48 personal.php:49 msgid "__language_name__" msgstr "__language_name__" @@ -590,11 +590,11 @@ msgstr "Повеќе" msgid "Less" msgstr "Помалку" -#: templates/admin.php:416 templates/personal.php:181 +#: templates/admin.php:416 templates/personal.php:171 msgid "Version" msgstr "Верзија" -#: templates/admin.php:420 templates/personal.php:184 +#: templates/admin.php:420 templates/personal.php:174 msgid "" "Developed by the ownCloud community, the -licensed by " msgstr "-лиценцирано од " @@ -665,108 +665,108 @@ msgstr "" msgid "You have used %s of the available %s" msgstr "Имате искористено %s од достапните %s" -#: templates/personal.php:39 templates/users.php:21 templates/users.php:87 +#: templates/personal.php:38 templates/users.php:21 templates/users.php:87 msgid "Password" msgstr "Лозинка" -#: templates/personal.php:40 +#: templates/personal.php:39 msgid "Your password was changed" msgstr "Вашата лозинка беше променета." -#: templates/personal.php:41 +#: templates/personal.php:40 msgid "Unable to change your password" msgstr "Вашата лозинка неможе да се смени" -#: templates/personal.php:43 +#: templates/personal.php:42 msgid "Current password" msgstr "Моментална лозинка" -#: templates/personal.php:46 +#: templates/personal.php:45 msgid "New password" msgstr "Нова лозинка" -#: templates/personal.php:50 +#: templates/personal.php:49 msgid "Change password" msgstr "Смени лозинка" -#: templates/personal.php:64 templates/users.php:86 +#: templates/personal.php:61 templates/users.php:86 msgid "Full Name" msgstr "" -#: templates/personal.php:81 +#: templates/personal.php:76 msgid "Email" msgstr "Е-пошта" -#: templates/personal.php:83 +#: templates/personal.php:78 msgid "Your email address" msgstr "Вашата адреса за е-пошта" -#: templates/personal.php:86 +#: templates/personal.php:81 msgid "" "Fill in an email address to enable password recovery and receive " "notifications" msgstr "" -#: templates/personal.php:96 +#: templates/personal.php:89 msgid "Profile picture" msgstr "Фотографија за профил" -#: templates/personal.php:101 +#: templates/personal.php:94 msgid "Upload new" msgstr "Префрли нова" -#: templates/personal.php:103 +#: templates/personal.php:96 msgid "Select new from Files" msgstr "Одбери нова од датотеките" -#: templates/personal.php:104 +#: templates/personal.php:97 msgid "Remove image" msgstr "Отстрани ја фотографијата" -#: templates/personal.php:105 +#: templates/personal.php:98 msgid "Either png or jpg. Ideally square but you will be able to crop it." msgstr "Мора де биде png или jpg. Идеално квадрат, но ќе бидете во можност да ја исечете." -#: templates/personal.php:107 +#: templates/personal.php:100 msgid "Your avatar is provided by your original account." msgstr "" -#: templates/personal.php:111 +#: templates/personal.php:104 msgid "Cancel" msgstr "Откажи" -#: templates/personal.php:112 +#: templates/personal.php:105 msgid "Choose as profile image" msgstr "Одбери фотографија за профилот" -#: templates/personal.php:120 templates/personal.php:121 +#: templates/personal.php:111 templates/personal.php:112 msgid "Language" msgstr "Јазик" -#: templates/personal.php:140 +#: templates/personal.php:131 msgid "Help translate" msgstr "Помогни во преводот" -#: templates/personal.php:147 +#: templates/personal.php:137 msgid "WebDAV" msgstr "WebDAV" -#: templates/personal.php:149 +#: templates/personal.php:139 #, php-format msgid "" "Use this address to access your Files via " "WebDAV" msgstr "" -#: templates/personal.php:161 +#: templates/personal.php:151 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:167 +#: templates/personal.php:157 msgid "Log-in password" msgstr "Лозинка за најавување" -#: templates/personal.php:172 +#: templates/personal.php:162 msgid "Decrypt all Files" msgstr "Дешифрирај ги сите датотеки" diff --git a/l10n/nb_NO/lib.po b/l10n/nb_NO/lib.po index d4f40165bc1..896430174f2 100644 --- a/l10n/nb_NO/lib.po +++ b/l10n/nb_NO/lib.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-09 01:55-0400\n" -"PO-Revision-Date: 2014-04-09 05:55+0000\n" +"POT-Creation-Date: 2014-04-10 01:54-0400\n" +"PO-Revision-Date: 2014-04-09 06:10+0000\n" "Last-Translator: I Robot\n" "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n" "MIME-Version: 1.0\n" @@ -347,11 +347,11 @@ msgstr "" #: private/user/manager.php:251 msgid "A valid username must be provided" -msgstr "" +msgstr "Oppgi et gyldig brukernavn" #: private/user/manager.php:255 msgid "A valid password must be provided" -msgstr "" +msgstr "Oppgi et gyldig passord" #: private/user/manager.php:260 msgid "The username is already being used" diff --git a/l10n/nb_NO/settings.po b/l10n/nb_NO/settings.po index 80f2ab80a34..5a36f04ddb2 100644 --- a/l10n/nb_NO/settings.po +++ b/l10n/nb_NO/settings.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-07 01:55-0400\n" -"PO-Revision-Date: 2014-04-06 16:40+0000\n" +"POT-Creation-Date: 2014-04-10 01:54-0400\n" +"PO-Revision-Date: 2014-04-09 06:10+0000\n" "Last-Translator: espenbye \n" "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n" "MIME-Version: 1.0\n" @@ -215,31 +215,31 @@ msgstr "Oppdater" msgid "Updated" msgstr "Oppdatert" -#: js/personal.js:246 +#: js/personal.js:243 msgid "Select a profile picture" msgstr "Velg et profilbilde" -#: js/personal.js:277 +#: js/personal.js:274 msgid "Very weak password" msgstr "Veldig svakt passord" -#: js/personal.js:278 +#: js/personal.js:275 msgid "Weak password" msgstr "Svakt passord" -#: js/personal.js:279 +#: js/personal.js:276 msgid "So-so password" msgstr "" -#: js/personal.js:280 +#: js/personal.js:277 msgid "Good password" msgstr "Bra passord" -#: js/personal.js:281 +#: js/personal.js:278 msgid "Strong password" msgstr "Sterkt passord" -#: js/personal.js:316 +#: js/personal.js:313 msgid "Decrypting files... Please wait, this can take some time." msgstr "Dekrypterer filer... Vennligst vent, dette kan ta litt tid." diff --git a/l10n/nl/lib.po b/l10n/nl/lib.po index 117e252b26b..a727e37a2eb 100644 --- a/l10n/nl/lib.po +++ b/l10n/nl/lib.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-09 01:55-0400\n" -"PO-Revision-Date: 2014-04-09 05:55+0000\n" +"POT-Creation-Date: 2014-04-10 01:54-0400\n" +"PO-Revision-Date: 2014-04-09 06:10+0000\n" "Last-Translator: I Robot\n" "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n" "MIME-Version: 1.0\n" @@ -348,11 +348,11 @@ msgstr "" #: private/user/manager.php:251 msgid "A valid username must be provided" -msgstr "" +msgstr "Er moet een geldige gebruikersnaam worden opgegeven" #: private/user/manager.php:255 msgid "A valid password must be provided" -msgstr "" +msgstr "Er moet een geldig wachtwoord worden opgegeven" #: private/user/manager.php:260 msgid "The username is already being used" diff --git a/l10n/nl/settings.po b/l10n/nl/settings.po index 8113608307e..0c10ccf3c4d 100644 --- a/l10n/nl/settings.po +++ b/l10n/nl/settings.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-03-27 01:55-0400\n" -"PO-Revision-Date: 2014-03-26 19:01+0000\n" +"POT-Creation-Date: 2014-04-10 01:54-0400\n" +"PO-Revision-Date: 2014-04-09 06:10+0000\n" "Last-Translator: André Koot \n" "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n" "MIME-Version: 1.0\n" @@ -55,7 +55,7 @@ msgstr "U moet uw e-mailadres instellen voordat u testberichten kunt versturen." msgid "Send mode" msgstr "Verstuurmodus" -#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159 +#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149 msgid "Encryption" msgstr "Versleuteling" @@ -68,7 +68,7 @@ msgid "Unable to load list from App Store" msgstr "Kan de lijst niet van de App store laden" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 changepassword/controller.php:55 +#: ajax/togglegroups.php:20 changepassword/controller.php:49 msgid "Authentication error" msgstr "Authenticatie fout" @@ -130,32 +130,32 @@ msgstr "Niet in staat om gebruiker te verwijderen uit groep %s" msgid "Couldn't update app." msgstr "Kon de app niet bijwerken." -#: changepassword/controller.php:20 +#: changepassword/controller.php:17 msgid "Wrong password" msgstr "Onjuist wachtwoord" -#: changepassword/controller.php:42 +#: changepassword/controller.php:36 msgid "No user supplied" msgstr "Geen gebruiker opgegeven" -#: changepassword/controller.php:74 +#: changepassword/controller.php:68 msgid "" "Please provide an admin recovery password, otherwise all user data will be " "lost" msgstr "Voer een beheerdersherstelwachtwoord in, anders zullen alle gebruikersgegevens verloren gaan" -#: changepassword/controller.php:79 +#: changepassword/controller.php:73 msgid "" "Wrong admin recovery password. Please check the password and try again." msgstr "Onjuist beheerdersherstelwachtwoord. Controleer het wachtwoord en probeer het opnieuw." -#: changepassword/controller.php:87 +#: changepassword/controller.php:81 msgid "" "Back-end doesn't support password change, but the users encryption key was " "successfully updated." msgstr "De Back-end ondersteunt geen wachtwoordwijzigingen, maar de cryptosleutel van de gebruiker is succesvol bijgewerkt." -#: changepassword/controller.php:92 changepassword/controller.php:103 +#: changepassword/controller.php:86 changepassword/controller.php:97 msgid "Unable to change password" msgstr "Kan wachtwoord niet wijzigen" @@ -207,7 +207,7 @@ msgstr "Fout bij bijwerken app" msgid "Error" msgstr "Fout" -#: js/apps.js:153 templates/apps.php:54 +#: js/apps.js:153 templates/apps.php:55 msgid "Update" msgstr "Bijwerken" @@ -215,31 +215,31 @@ msgstr "Bijwerken" msgid "Updated" msgstr "Bijgewerkt" -#: js/personal.js:246 +#: js/personal.js:243 msgid "Select a profile picture" msgstr "Kies een profielafbeelding" -#: js/personal.js:277 +#: js/personal.js:274 msgid "Very weak password" msgstr "Zeer zwak wachtwoord" -#: js/personal.js:278 +#: js/personal.js:275 msgid "Weak password" msgstr "Zwak wachtwoord" -#: js/personal.js:279 +#: js/personal.js:276 msgid "So-so password" msgstr "Matig wachtwoord" -#: js/personal.js:280 +#: js/personal.js:277 msgid "Good password" msgstr "Goed wachtwoord" -#: js/personal.js:281 +#: js/personal.js:278 msgid "Strong password" msgstr "Sterk wachtwoord" -#: js/personal.js:316 +#: js/personal.js:313 msgid "Decrypting files... Please wait, this can take some time." msgstr "Bestanden worden gedecodeerd... Even geduld alstublieft, dit kan even duren." @@ -288,7 +288,7 @@ msgstr "Er moet een geldig wachtwoord worden opgegeven" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "Waarschuwing: Home directory voor gebruiker \"{user}\" bestaat al" -#: personal.php:49 personal.php:50 +#: personal.php:48 personal.php:49 msgid "__language_name__" msgstr "Nederlands" @@ -593,11 +593,11 @@ msgstr "Meer" msgid "Less" msgstr "Minder" -#: templates/admin.php:416 templates/personal.php:181 +#: templates/admin.php:416 templates/personal.php:171 msgid "Version" msgstr "Versie" -#: templates/admin.php:420 templates/personal.php:184 +#: templates/admin.php:420 templates/personal.php:174 msgid "" "Developed by the ownCloud community, the -licensed by " msgstr "-Gelicenseerd door " @@ -668,108 +668,108 @@ msgstr "Toon de Eerste start Wizard opnieuw" msgid "You have used %s of the available %s" msgstr "Je hebt %s gebruikt van de beschikbare %s" -#: templates/personal.php:39 templates/users.php:21 templates/users.php:87 +#: templates/personal.php:38 templates/users.php:21 templates/users.php:87 msgid "Password" msgstr "Wachtwoord" -#: templates/personal.php:40 +#: templates/personal.php:39 msgid "Your password was changed" msgstr "Je wachtwoord is veranderd" -#: templates/personal.php:41 +#: templates/personal.php:40 msgid "Unable to change your password" msgstr "Niet in staat om uw wachtwoord te wijzigen" -#: templates/personal.php:43 +#: templates/personal.php:42 msgid "Current password" msgstr "Huidig wachtwoord" -#: templates/personal.php:46 +#: templates/personal.php:45 msgid "New password" msgstr "Nieuw" -#: templates/personal.php:50 +#: templates/personal.php:49 msgid "Change password" msgstr "Wijzig wachtwoord" -#: templates/personal.php:64 templates/users.php:86 +#: templates/personal.php:61 templates/users.php:86 msgid "Full Name" msgstr "Volledige naam" -#: templates/personal.php:81 +#: templates/personal.php:76 msgid "Email" msgstr "E-mailadres" -#: templates/personal.php:83 +#: templates/personal.php:78 msgid "Your email address" msgstr "Uw e-mailadres" -#: templates/personal.php:86 +#: templates/personal.php:81 msgid "" "Fill in an email address to enable password recovery and receive " "notifications" msgstr "Vul een e-mailbericht in om wachtwoordherstel mogelijk te maken en meldingen te ontvangen" -#: templates/personal.php:96 +#: templates/personal.php:89 msgid "Profile picture" msgstr "Profielafbeelding" -#: templates/personal.php:101 +#: templates/personal.php:94 msgid "Upload new" msgstr "Upload een nieuwe" -#: templates/personal.php:103 +#: templates/personal.php:96 msgid "Select new from Files" msgstr "Selecteer een nieuwe vanuit bestanden" -#: templates/personal.php:104 +#: templates/personal.php:97 msgid "Remove image" msgstr "Verwijder afbeelding" -#: templates/personal.php:105 +#: templates/personal.php:98 msgid "Either png or jpg. Ideally square but you will be able to crop it." msgstr "Of png, of jpg. Bij voorkeur vierkant, maar u kunt bijsnijden." -#: templates/personal.php:107 +#: templates/personal.php:100 msgid "Your avatar is provided by your original account." msgstr "Uw avatar is verstrekt door uw originele account." -#: templates/personal.php:111 +#: templates/personal.php:104 msgid "Cancel" msgstr "Annuleer" -#: templates/personal.php:112 +#: templates/personal.php:105 msgid "Choose as profile image" msgstr "Kies als profielafbeelding" -#: templates/personal.php:120 templates/personal.php:121 +#: templates/personal.php:111 templates/personal.php:112 msgid "Language" msgstr "Taal" -#: templates/personal.php:140 +#: templates/personal.php:131 msgid "Help translate" msgstr "Help met vertalen" -#: templates/personal.php:147 +#: templates/personal.php:137 msgid "WebDAV" msgstr "WebDAV" -#: templates/personal.php:149 +#: templates/personal.php:139 #, php-format msgid "" "Use this address to access your Files via " "WebDAV" msgstr "Gebruik deze link om uw bestanden via WebDAV te benaderen" -#: templates/personal.php:161 +#: templates/personal.php:151 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "De crypto app is niet langer geactiveerd, u moet alle bestanden decrypten." -#: templates/personal.php:167 +#: templates/personal.php:157 msgid "Log-in password" msgstr "Inlog-wachtwoord" -#: templates/personal.php:172 +#: templates/personal.php:162 msgid "Decrypt all Files" msgstr "Decodeer alle bestanden" diff --git a/l10n/nn_NO/lib.po b/l10n/nn_NO/lib.po index bc43bde4c02..5f7f37471b4 100644 --- a/l10n/nn_NO/lib.po +++ b/l10n/nn_NO/lib.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-09 01:55-0400\n" -"PO-Revision-Date: 2014-04-09 05:55+0000\n" +"POT-Creation-Date: 2014-04-10 01:54-0400\n" +"PO-Revision-Date: 2014-04-09 06:10+0000\n" "Last-Translator: I Robot\n" "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n" "MIME-Version: 1.0\n" @@ -347,11 +347,11 @@ msgstr "" #: private/user/manager.php:251 msgid "A valid username must be provided" -msgstr "" +msgstr "Du må oppgje eit gyldig brukarnamn" #: private/user/manager.php:255 msgid "A valid password must be provided" -msgstr "" +msgstr "Du må oppgje eit gyldig passord" #: private/user/manager.php:260 msgid "The username is already being used" diff --git a/l10n/nn_NO/settings.po b/l10n/nn_NO/settings.po index 2077d182fd5..f0a4f6ec449 100644 --- a/l10n/nn_NO/settings.po +++ b/l10n/nn_NO/settings.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-03-26 01:55-0400\n" -"PO-Revision-Date: 2014-03-26 05:55+0000\n" +"POT-Creation-Date: 2014-04-10 01:54-0400\n" +"PO-Revision-Date: 2014-04-09 06:10+0000\n" "Last-Translator: I Robot\n" "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n" "MIME-Version: 1.0\n" @@ -54,7 +54,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159 +#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149 msgid "Encryption" msgstr "Kryptering" @@ -67,7 +67,7 @@ msgid "Unable to load list from App Store" msgstr "Klarer ikkje å lasta inn liste fra app-butikken" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 changepassword/controller.php:55 +#: ajax/togglegroups.php:20 changepassword/controller.php:49 msgid "Authentication error" msgstr "Autentiseringsfeil" @@ -129,32 +129,32 @@ msgstr "Klarte ikkje fjerna brukaren frå gruppa %s" msgid "Couldn't update app." msgstr "Klarte ikkje oppdatera programmet." -#: changepassword/controller.php:20 +#: changepassword/controller.php:17 msgid "Wrong password" msgstr "Feil passord" -#: changepassword/controller.php:42 +#: changepassword/controller.php:36 msgid "No user supplied" msgstr "Ingen brukar gitt" -#: changepassword/controller.php:74 +#: changepassword/controller.php:68 msgid "" "Please provide an admin recovery password, otherwise all user data will be " "lost" msgstr "Ver venleg og gi eit admingjenopprettingspassord, elles vil all brukardata gå tapt." -#: changepassword/controller.php:79 +#: changepassword/controller.php:73 msgid "" "Wrong admin recovery password. Please check the password and try again." msgstr "Feil admingjenopprettingspassord. Ver venleg og sjekk passordet og prøv igjen." -#: changepassword/controller.php:87 +#: changepassword/controller.php:81 msgid "" "Back-end doesn't support password change, but the users encryption key was " "successfully updated." msgstr "Bakstykket støttar ikkje passordendring, men krypteringsnøkkelen til brukaren blei oppdatert." -#: changepassword/controller.php:92 changepassword/controller.php:103 +#: changepassword/controller.php:86 changepassword/controller.php:97 msgid "Unable to change password" msgstr "Klarte ikkje å endra passordet" @@ -206,7 +206,7 @@ msgstr "Feil ved oppdatering av app" msgid "Error" msgstr "Feil" -#: js/apps.js:153 templates/apps.php:54 +#: js/apps.js:153 templates/apps.php:55 msgid "Update" msgstr "Oppdater" @@ -214,31 +214,31 @@ msgstr "Oppdater" msgid "Updated" msgstr "Oppdatert" -#: js/personal.js:246 +#: js/personal.js:243 msgid "Select a profile picture" msgstr "Vel eit profilbilete" -#: js/personal.js:277 +#: js/personal.js:274 msgid "Very weak password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:275 msgid "Weak password" msgstr "" -#: js/personal.js:279 +#: js/personal.js:276 msgid "So-so password" msgstr "" -#: js/personal.js:280 +#: js/personal.js:277 msgid "Good password" msgstr "" -#: js/personal.js:281 +#: js/personal.js:278 msgid "Strong password" msgstr "" -#: js/personal.js:316 +#: js/personal.js:313 msgid "Decrypting files... Please wait, this can take some time." msgstr "Dekrypterer filer … Ver venleg og vent, dette kan ta ei stund." @@ -287,7 +287,7 @@ msgstr "Du må oppgje eit gyldig passord" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:49 personal.php:50 +#: personal.php:48 personal.php:49 msgid "__language_name__" msgstr "Nynorsk" @@ -592,11 +592,11 @@ msgstr "Meir" msgid "Less" msgstr "Mindre" -#: templates/admin.php:416 templates/personal.php:181 +#: templates/admin.php:416 templates/personal.php:171 msgid "Version" msgstr "Utgåve" -#: templates/admin.php:420 templates/personal.php:184 +#: templates/admin.php:420 templates/personal.php:174 msgid "" "Developed by the ownCloud community, the -licensed by " msgstr "Lisensiert under av " @@ -667,108 +667,108 @@ msgstr "Vis Oppstartvegvisaren igjen" msgid "You have used %s of the available %s" msgstr "Du har brukt %s av dine tilgjengelege %s" -#: templates/personal.php:39 templates/users.php:21 templates/users.php:87 +#: templates/personal.php:38 templates/users.php:21 templates/users.php:87 msgid "Password" msgstr "Passord" -#: templates/personal.php:40 +#: templates/personal.php:39 msgid "Your password was changed" msgstr "Passordet ditt er endra" -#: templates/personal.php:41 +#: templates/personal.php:40 msgid "Unable to change your password" msgstr "Klarte ikkje endra passordet" -#: templates/personal.php:43 +#: templates/personal.php:42 msgid "Current password" msgstr "Passord" -#: templates/personal.php:46 +#: templates/personal.php:45 msgid "New password" msgstr "Nytt passord" -#: templates/personal.php:50 +#: templates/personal.php:49 msgid "Change password" msgstr "Endra passord" -#: templates/personal.php:64 templates/users.php:86 +#: templates/personal.php:61 templates/users.php:86 msgid "Full Name" msgstr "" -#: templates/personal.php:81 +#: templates/personal.php:76 msgid "Email" msgstr "E-post" -#: templates/personal.php:83 +#: templates/personal.php:78 msgid "Your email address" msgstr "Di epost-adresse" -#: templates/personal.php:86 +#: templates/personal.php:81 msgid "" "Fill in an email address to enable password recovery and receive " "notifications" msgstr "" -#: templates/personal.php:96 +#: templates/personal.php:89 msgid "Profile picture" msgstr "Profilbilete" -#: templates/personal.php:101 +#: templates/personal.php:94 msgid "Upload new" msgstr "Last opp ny" -#: templates/personal.php:103 +#: templates/personal.php:96 msgid "Select new from Files" msgstr "Vel ny frå Filer" -#: templates/personal.php:104 +#: templates/personal.php:97 msgid "Remove image" msgstr "Fjern bilete" -#: templates/personal.php:105 +#: templates/personal.php:98 msgid "Either png or jpg. Ideally square but you will be able to crop it." msgstr "Anten PNG eller JPG. Helst kvadratisk, men du får moglegheita til å beskjera det." -#: templates/personal.php:107 +#: templates/personal.php:100 msgid "Your avatar is provided by your original account." msgstr "" -#: templates/personal.php:111 +#: templates/personal.php:104 msgid "Cancel" msgstr "Avbryt" -#: templates/personal.php:112 +#: templates/personal.php:105 msgid "Choose as profile image" msgstr "Vel som profilbilete" -#: templates/personal.php:120 templates/personal.php:121 +#: templates/personal.php:111 templates/personal.php:112 msgid "Language" msgstr "Språk" -#: templates/personal.php:140 +#: templates/personal.php:131 msgid "Help translate" msgstr "Hjelp oss å omsetja" -#: templates/personal.php:147 +#: templates/personal.php:137 msgid "WebDAV" msgstr "WebDAV" -#: templates/personal.php:149 +#: templates/personal.php:139 #, php-format msgid "" "Use this address to access your Files via " "WebDAV" msgstr "" -#: templates/personal.php:161 +#: templates/personal.php:151 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:167 +#: templates/personal.php:157 msgid "Log-in password" msgstr "Innloggingspassord" -#: templates/personal.php:172 +#: templates/personal.php:162 msgid "Decrypt all Files" msgstr "Dekrypter alle filene" diff --git a/l10n/pl/files_external.po b/l10n/pl/files_external.po index 75ad91e0828..ea9e5451478 100644 --- a/l10n/pl/files_external.po +++ b/l10n/pl/files_external.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-09 01:55-0400\n" -"PO-Revision-Date: 2014-04-09 05:55+0000\n" -"Last-Translator: I Robot\n" +"POT-Creation-Date: 2014-04-10 01:54-0400\n" +"PO-Revision-Date: 2014-04-09 10:53+0000\n" +"Last-Translator: bobie \n" "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -45,32 +45,32 @@ msgstr "Zapisano" #: lib/config.php:592 msgid "Note: " -msgstr "" +msgstr "Uwaga: " #: lib/config.php:602 msgid " and " -msgstr "" +msgstr "oraz" #: lib/config.php:624 #, php-format msgid "" "Note: The cURL support in PHP is not enabled or installed. Mounting " "of %s is not possible. Please ask your system administrator to install it." -msgstr "" +msgstr "Uwaga: Wsparcie dla cURL w PHP nie zostało włączone lub zainstalowane. Zamontowanie %s nie jest możliwe. Proszę poproś Twojego administratora o zainstalowanie go." #: lib/config.php:626 #, php-format msgid "" "Note: The FTP support in PHP is not enabled or installed. Mounting of" " %s is not possible. Please ask your system administrator to install it." -msgstr "" +msgstr "Uwaga: Wsparcie dla FTP w PHP nie zostało włączone lub zainstalowane. Zamontowanie %s nie jest możliwe. Proszę poproś Twojego administratora o zainstalowanie go." #: lib/config.php:628 #, php-format msgid "" "Note: \"%s\" is not installed. Mounting of %s is not possible. Please" " ask your system administrator to install it." -msgstr "" +msgstr "Uwaga: \"%s\" nie jest zainstalowane. Zamontowanie %s nie jest możliwe. Proszę poproś Twojego administratora o zainstalowanie go." #: templates/settings.php:2 msgid "External Storage" diff --git a/l10n/pl/lib.po b/l10n/pl/lib.po index 9ae2481a2d8..35e7c37ef0a 100644 --- a/l10n/pl/lib.po +++ b/l10n/pl/lib.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-09 01:55-0400\n" -"PO-Revision-Date: 2014-04-09 05:55+0000\n" -"Last-Translator: I Robot\n" +"POT-Creation-Date: 2014-04-10 01:54-0400\n" +"PO-Revision-Date: 2014-04-09 10:53+0000\n" +"Last-Translator: bobie \n" "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -347,16 +347,16 @@ msgstr "lat temu" msgid "" "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", " "\"0-9\", and \"_.@-\"" -msgstr "" +msgstr "W nazwach użytkowników dozwolone są wyłącznie następujące znaki: \"a-z\", \"A-Z\", \"0-9\", oraz \"_.@-\"" #: private/user/manager.php:251 msgid "A valid username must be provided" -msgstr "" +msgstr "Należy podać prawidłową nazwę użytkownika" #: private/user/manager.php:255 msgid "A valid password must be provided" -msgstr "" +msgstr "Należy podać prawidłowe hasło" #: private/user/manager.php:260 msgid "The username is already being used" -msgstr "" +msgstr "Ta nazwa użytkownika jest już używana" diff --git a/l10n/pl/settings.po b/l10n/pl/settings.po index d1e47d0889e..8c1c418c8e7 100644 --- a/l10n/pl/settings.po +++ b/l10n/pl/settings.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-03-27 01:55-0400\n" -"PO-Revision-Date: 2014-03-26 10:42+0000\n" +"POT-Creation-Date: 2014-04-10 01:54-0400\n" +"PO-Revision-Date: 2014-04-09 06:10+0000\n" "Last-Translator: bobie \n" "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n" "MIME-Version: 1.0\n" @@ -54,7 +54,7 @@ msgstr "Musisz najpierw ustawić użytkownika e-mail, aby móc wysyłać wiadomo msgid "Send mode" msgstr "Tryb wysyłki" -#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159 +#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149 msgid "Encryption" msgstr "Szyfrowanie" @@ -67,7 +67,7 @@ msgid "Unable to load list from App Store" msgstr "Nie można wczytać listy aplikacji" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 changepassword/controller.php:55 +#: ajax/togglegroups.php:20 changepassword/controller.php:49 msgid "Authentication error" msgstr "Błąd uwierzytelniania" @@ -129,32 +129,32 @@ msgstr "Nie można usunąć użytkownika z grupy %s" msgid "Couldn't update app." msgstr "Nie można uaktualnić aplikacji." -#: changepassword/controller.php:20 +#: changepassword/controller.php:17 msgid "Wrong password" msgstr "Złe hasło" -#: changepassword/controller.php:42 +#: changepassword/controller.php:36 msgid "No user supplied" msgstr "Niedostarczony użytkownik" -#: changepassword/controller.php:74 +#: changepassword/controller.php:68 msgid "" "Please provide an admin recovery password, otherwise all user data will be " "lost" msgstr "Podaj hasło odzyskiwania administratora, w przeciwnym razie wszystkie dane użytkownika zostaną utracone" -#: changepassword/controller.php:79 +#: changepassword/controller.php:73 msgid "" "Wrong admin recovery password. Please check the password and try again." msgstr "Błędne hasło odzyskiwania. Sprawdź hasło i spróbuj ponownie." -#: changepassword/controller.php:87 +#: changepassword/controller.php:81 msgid "" "Back-end doesn't support password change, but the users encryption key was " "successfully updated." msgstr "Zaplecze nie obsługuje zmiany hasła, ale klucz szyfrowania użytkownika został pomyślnie zaktualizowany." -#: changepassword/controller.php:92 changepassword/controller.php:103 +#: changepassword/controller.php:86 changepassword/controller.php:97 msgid "Unable to change password" msgstr "Nie można zmienić hasła" @@ -206,7 +206,7 @@ msgstr "Błąd podczas aktualizacji aplikacji" msgid "Error" msgstr "Błąd" -#: js/apps.js:153 templates/apps.php:54 +#: js/apps.js:153 templates/apps.php:55 msgid "Update" msgstr "Aktualizuj" @@ -214,31 +214,31 @@ msgstr "Aktualizuj" msgid "Updated" msgstr "Zaktualizowano" -#: js/personal.js:246 +#: js/personal.js:243 msgid "Select a profile picture" msgstr "Wybierz zdjęcie profilu" -#: js/personal.js:277 +#: js/personal.js:274 msgid "Very weak password" msgstr "Bardzo słabe hasło" -#: js/personal.js:278 +#: js/personal.js:275 msgid "Weak password" msgstr "Słabe hasło" -#: js/personal.js:279 +#: js/personal.js:276 msgid "So-so password" msgstr "Mało skomplikowane hasło" -#: js/personal.js:280 +#: js/personal.js:277 msgid "Good password" msgstr "Dobre hasło" -#: js/personal.js:281 +#: js/personal.js:278 msgid "Strong password" msgstr "Mocne hasło" -#: js/personal.js:316 +#: js/personal.js:313 msgid "Decrypting files... Please wait, this can take some time." msgstr "Odszyfrowuje pliki... Proszę czekać, to może zająć jakiś czas." @@ -287,7 +287,7 @@ msgstr "Należy podać prawidłowe hasło" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "Ostrzeżenie: Katalog domowy dla użytkownika \"{user}\" już istnieje" -#: personal.php:49 personal.php:50 +#: personal.php:48 personal.php:49 msgid "__language_name__" msgstr "polski" @@ -592,11 +592,11 @@ msgstr "Więcej" msgid "Less" msgstr "Mniej" -#: templates/admin.php:416 templates/personal.php:181 +#: templates/admin.php:416 templates/personal.php:171 msgid "Version" msgstr "Wersja" -#: templates/admin.php:420 templates/personal.php:184 +#: templates/admin.php:420 templates/personal.php:174 msgid "" "Developed by the ownCloud community, the -licensed by " msgstr "-licencjonowane przez " @@ -667,108 +667,108 @@ msgstr "Uruchom ponownie kreatora pierwszego uruchomienia" msgid "You have used %s of the available %s" msgstr "Wykorzystujesz %s z dostępnych %s" -#: templates/personal.php:39 templates/users.php:21 templates/users.php:87 +#: templates/personal.php:38 templates/users.php:21 templates/users.php:87 msgid "Password" msgstr "Hasło" -#: templates/personal.php:40 +#: templates/personal.php:39 msgid "Your password was changed" msgstr "Twoje hasło zostało zmienione" -#: templates/personal.php:41 +#: templates/personal.php:40 msgid "Unable to change your password" msgstr "Nie można zmienić hasła" -#: templates/personal.php:43 +#: templates/personal.php:42 msgid "Current password" msgstr "Bieżące hasło" -#: templates/personal.php:46 +#: templates/personal.php:45 msgid "New password" msgstr "Nowe hasło" -#: templates/personal.php:50 +#: templates/personal.php:49 msgid "Change password" msgstr "Zmień hasło" -#: templates/personal.php:64 templates/users.php:86 +#: templates/personal.php:61 templates/users.php:86 msgid "Full Name" msgstr "Pełna nazwa" -#: templates/personal.php:81 +#: templates/personal.php:76 msgid "Email" msgstr "Email" -#: templates/personal.php:83 +#: templates/personal.php:78 msgid "Your email address" msgstr "Twój adres e-mail" -#: templates/personal.php:86 +#: templates/personal.php:81 msgid "" "Fill in an email address to enable password recovery and receive " "notifications" msgstr "Wypełnij adres email aby włączyć odzyskiwanie hasła oraz otrzymywać powiadomienia" -#: templates/personal.php:96 +#: templates/personal.php:89 msgid "Profile picture" msgstr "Zdjęcie profilu" -#: templates/personal.php:101 +#: templates/personal.php:94 msgid "Upload new" msgstr "Wczytaj nowe" -#: templates/personal.php:103 +#: templates/personal.php:96 msgid "Select new from Files" msgstr "Wybierz nowe z plików" -#: templates/personal.php:104 +#: templates/personal.php:97 msgid "Remove image" msgstr "Usuń zdjęcie" -#: templates/personal.php:105 +#: templates/personal.php:98 msgid "Either png or jpg. Ideally square but you will be able to crop it." msgstr "Png lub jpg. Idealnie kwadratowy, ale będzie można je przyciąć." -#: templates/personal.php:107 +#: templates/personal.php:100 msgid "Your avatar is provided by your original account." msgstr "Twój awatar jest ustawiony jako domyślny." -#: templates/personal.php:111 +#: templates/personal.php:104 msgid "Cancel" msgstr "Anuluj" -#: templates/personal.php:112 +#: templates/personal.php:105 msgid "Choose as profile image" msgstr "Wybierz zdjęcie profilu" -#: templates/personal.php:120 templates/personal.php:121 +#: templates/personal.php:111 templates/personal.php:112 msgid "Language" msgstr "Język" -#: templates/personal.php:140 +#: templates/personal.php:131 msgid "Help translate" msgstr "Pomóż w tłumaczeniu" -#: templates/personal.php:147 +#: templates/personal.php:137 msgid "WebDAV" msgstr "WebDAV" -#: templates/personal.php:149 +#: templates/personal.php:139 #, php-format msgid "" "Use this address to access your Files via " "WebDAV" msgstr "Użyj tego adresu do dostępu do twoich plików przez WebDAV" -#: templates/personal.php:161 +#: templates/personal.php:151 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "Aplikacja szyfrowanie nie jest włączona, odszyfruj wszystkie plik" -#: templates/personal.php:167 +#: templates/personal.php:157 msgid "Log-in password" msgstr "Hasło logowania" -#: templates/personal.php:172 +#: templates/personal.php:162 msgid "Decrypt all Files" msgstr "Odszyfruj wszystkie pliki" diff --git a/l10n/pt_BR/files_external.po b/l10n/pt_BR/files_external.po index ef0179cf115..0a8a376d6f6 100644 --- a/l10n/pt_BR/files_external.po +++ b/l10n/pt_BR/files_external.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-09 01:55-0400\n" -"PO-Revision-Date: 2014-04-09 05:55+0000\n" -"Last-Translator: I Robot\n" +"POT-Creation-Date: 2014-04-10 01:54-0400\n" +"PO-Revision-Date: 2014-04-09 16:50+0000\n" +"Last-Translator: Flávio Veras \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -44,32 +44,32 @@ msgstr "Salvo" #: lib/config.php:592 msgid "Note: " -msgstr "" +msgstr "Nota:" #: lib/config.php:602 msgid " and " -msgstr "" +msgstr "e" #: lib/config.php:624 #, php-format msgid "" "Note: The cURL support in PHP is not enabled or installed. Mounting " "of %s is not possible. Please ask your system administrator to install it." -msgstr "" +msgstr "Nota: O suporte cURL do PHP não está habilitado ou instalado. Montagem de %s não é possível. Por favor, solicite ao seu administrador do sistema para instalá-lo." #: lib/config.php:626 #, php-format msgid "" "Note: The FTP support in PHP is not enabled or installed. Mounting of" " %s is not possible. Please ask your system administrator to install it." -msgstr "" +msgstr "Nota: O suporte FTP no PHP não está habilitado ou instalado. Montagem de %s não é possível. Por favor, solicite ao seu administrador do sistema para instalá-lo." #: lib/config.php:628 #, php-format msgid "" "Note: \"%s\" is not installed. Mounting of %s is not possible. Please" " ask your system administrator to install it." -msgstr "" +msgstr "Nota: \"%s\" não está instalado. Montagem de %s não é possível. Por favor, solicite ao seu administrador do sistema para instalá-lo." #: templates/settings.php:2 msgid "External Storage" diff --git a/l10n/pt_BR/lib.po b/l10n/pt_BR/lib.po index 6dc1cf3a5b2..a7c133b16a6 100644 --- a/l10n/pt_BR/lib.po +++ b/l10n/pt_BR/lib.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-09 01:55-0400\n" -"PO-Revision-Date: 2014-04-09 05:55+0000\n" -"Last-Translator: I Robot\n" +"POT-Creation-Date: 2014-04-10 01:54-0400\n" +"PO-Revision-Date: 2014-04-09 16:40+0000\n" +"Last-Translator: Flávio Veras \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -342,16 +342,16 @@ msgstr "anos atrás" msgid "" "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", " "\"0-9\", and \"_.@-\"" -msgstr "" +msgstr "Somente os seguintes caracteres são permitidos no nome do usuário: \"a-z\", \"A-Z\", \"0-9\", e \"_.@-\"" #: private/user/manager.php:251 msgid "A valid username must be provided" -msgstr "" +msgstr "Forneça um nome de usuário válido" #: private/user/manager.php:255 msgid "A valid password must be provided" -msgstr "" +msgstr "Forneça uma senha válida" #: private/user/manager.php:260 msgid "The username is already being used" -msgstr "" +msgstr "Este nome de usuário já está sendo usado" diff --git a/l10n/pt_BR/settings.po b/l10n/pt_BR/settings.po index 8b7fc8e6093..c94e167dc92 100644 --- a/l10n/pt_BR/settings.po +++ b/l10n/pt_BR/settings.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-04 01:55-0400\n" -"PO-Revision-Date: 2014-04-03 12:40+0000\n" +"POT-Creation-Date: 2014-04-10 01:54-0400\n" +"PO-Revision-Date: 2014-04-09 06:10+0000\n" "Last-Translator: Flávio Veras \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n" "MIME-Version: 1.0\n" @@ -213,31 +213,31 @@ msgstr "Atualizar" msgid "Updated" msgstr "Atualizado" -#: js/personal.js:246 +#: js/personal.js:243 msgid "Select a profile picture" msgstr "Selecione uma imagem para o perfil" -#: js/personal.js:277 +#: js/personal.js:274 msgid "Very weak password" msgstr "Senha muito fraca" -#: js/personal.js:278 +#: js/personal.js:275 msgid "Weak password" msgstr "Senha fraca" -#: js/personal.js:279 +#: js/personal.js:276 msgid "So-so password" msgstr "So-so senha" -#: js/personal.js:280 +#: js/personal.js:277 msgid "Good password" msgstr "Boa senha" -#: js/personal.js:281 +#: js/personal.js:278 msgid "Strong password" msgstr "Senha forte" -#: js/personal.js:316 +#: js/personal.js:313 msgid "Decrypting files... Please wait, this can take some time." msgstr "Decriptando arquivos... Por favor aguarde, isso pode levar algum tempo." diff --git a/l10n/pt_PT/lib.po b/l10n/pt_PT/lib.po index e62af4ccc4e..e8a0c4927da 100644 --- a/l10n/pt_PT/lib.po +++ b/l10n/pt_PT/lib.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-09 01:55-0400\n" -"PO-Revision-Date: 2014-04-09 05:55+0000\n" +"POT-Creation-Date: 2014-04-10 01:54-0400\n" +"PO-Revision-Date: 2014-04-09 06:10+0000\n" "Last-Translator: I Robot\n" "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n" "MIME-Version: 1.0\n" @@ -348,11 +348,11 @@ msgstr "" #: private/user/manager.php:251 msgid "A valid username must be provided" -msgstr "" +msgstr "Um nome de utilizador válido deve ser fornecido" #: private/user/manager.php:255 msgid "A valid password must be provided" -msgstr "" +msgstr "Uma password válida deve ser fornecida" #: private/user/manager.php:260 msgid "The username is already being used" diff --git a/l10n/pt_PT/settings.po b/l10n/pt_PT/settings.po index 3879c7118d5..ea6ff1bc02c 100644 --- a/l10n/pt_PT/settings.po +++ b/l10n/pt_PT/settings.po @@ -14,8 +14,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-03-26 01:55-0400\n" -"PO-Revision-Date: 2014-03-26 05:55+0000\n" +"POT-Creation-Date: 2014-04-10 01:54-0400\n" +"PO-Revision-Date: 2014-04-09 06:10+0000\n" "Last-Translator: I Robot\n" "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n" "MIME-Version: 1.0\n" @@ -58,7 +58,7 @@ msgstr "" msgid "Send mode" msgstr "Modo de envio" -#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159 +#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149 msgid "Encryption" msgstr "Encriptação" @@ -71,7 +71,7 @@ msgid "Unable to load list from App Store" msgstr "Incapaz de carregar a lista da App Store" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 changepassword/controller.php:55 +#: ajax/togglegroups.php:20 changepassword/controller.php:49 msgid "Authentication error" msgstr "Erro na autenticação" @@ -133,32 +133,32 @@ msgstr "Impossível apagar utilizador do grupo %s" msgid "Couldn't update app." msgstr "Não foi possível actualizar a aplicação." -#: changepassword/controller.php:20 +#: changepassword/controller.php:17 msgid "Wrong password" msgstr "Password errada" -#: changepassword/controller.php:42 +#: changepassword/controller.php:36 msgid "No user supplied" msgstr "Nenhum utilizador especificado." -#: changepassword/controller.php:74 +#: changepassword/controller.php:68 msgid "" "Please provide an admin recovery password, otherwise all user data will be " "lost" msgstr "Por favor forneça uma palavra chave de recuperação de administrador, caso contrário todos os dados de utilizador serão perdidos" -#: changepassword/controller.php:79 +#: changepassword/controller.php:73 msgid "" "Wrong admin recovery password. Please check the password and try again." msgstr "Palavra chave de recuperação de administrador errada. Por favor verifique a palavra chave e tente de novo." -#: changepassword/controller.php:87 +#: changepassword/controller.php:81 msgid "" "Back-end doesn't support password change, but the users encryption key was " "successfully updated." msgstr "Não foi possível alterar a sua palavra-passe, mas a chave de encriptação foi atualizada." -#: changepassword/controller.php:92 changepassword/controller.php:103 +#: changepassword/controller.php:86 changepassword/controller.php:97 msgid "Unable to change password" msgstr "Não foi possível alterar a sua password" @@ -210,7 +210,7 @@ msgstr "Erro enquanto actualizava a aplicação" msgid "Error" msgstr "Erro" -#: js/apps.js:153 templates/apps.php:54 +#: js/apps.js:153 templates/apps.php:55 msgid "Update" msgstr "Actualizar" @@ -218,31 +218,31 @@ msgstr "Actualizar" msgid "Updated" msgstr "Actualizado" -#: js/personal.js:246 +#: js/personal.js:243 msgid "Select a profile picture" msgstr "Seleccione uma fotografia de perfil" -#: js/personal.js:277 +#: js/personal.js:274 msgid "Very weak password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:275 msgid "Weak password" msgstr "" -#: js/personal.js:279 +#: js/personal.js:276 msgid "So-so password" msgstr "" -#: js/personal.js:280 +#: js/personal.js:277 msgid "Good password" msgstr "" -#: js/personal.js:281 +#: js/personal.js:278 msgid "Strong password" msgstr "" -#: js/personal.js:316 +#: js/personal.js:313 msgid "Decrypting files... Please wait, this can take some time." msgstr "A desencriptar os ficheiros... Por favor aguarde, esta operação pode demorar algum tempo." @@ -291,7 +291,7 @@ msgstr "Uma password válida deve ser fornecida" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "Atenção: a pasta pessoal do utilizador \"{user}\" já existe" -#: personal.php:49 personal.php:50 +#: personal.php:48 personal.php:49 msgid "__language_name__" msgstr "__language_name__" @@ -596,11 +596,11 @@ msgstr "Mais" msgid "Less" msgstr "Menos" -#: templates/admin.php:416 templates/personal.php:181 +#: templates/admin.php:416 templates/personal.php:171 msgid "Version" msgstr "Versão" -#: templates/admin.php:420 templates/personal.php:184 +#: templates/admin.php:420 templates/personal.php:174 msgid "" "Developed by the ownCloud community, the -licensed by " msgstr "-licenciado por " @@ -671,108 +671,108 @@ msgstr "Mostrar novamente Wizard de Arranque Inicial" msgid "You have used %s of the available %s" msgstr "Usou %s do disponivel %s" -#: templates/personal.php:39 templates/users.php:21 templates/users.php:87 +#: templates/personal.php:38 templates/users.php:21 templates/users.php:87 msgid "Password" msgstr "Password" -#: templates/personal.php:40 +#: templates/personal.php:39 msgid "Your password was changed" msgstr "A sua palavra-passe foi alterada" -#: templates/personal.php:41 +#: templates/personal.php:40 msgid "Unable to change your password" msgstr "Não foi possivel alterar a sua palavra-chave" -#: templates/personal.php:43 +#: templates/personal.php:42 msgid "Current password" msgstr "Palavra-chave actual" -#: templates/personal.php:46 +#: templates/personal.php:45 msgid "New password" msgstr "Nova palavra-chave" -#: templates/personal.php:50 +#: templates/personal.php:49 msgid "Change password" msgstr "Alterar palavra-chave" -#: templates/personal.php:64 templates/users.php:86 +#: templates/personal.php:61 templates/users.php:86 msgid "Full Name" msgstr "Nome completo" -#: templates/personal.php:81 +#: templates/personal.php:76 msgid "Email" msgstr "Email" -#: templates/personal.php:83 +#: templates/personal.php:78 msgid "Your email address" msgstr "O seu endereço de email" -#: templates/personal.php:86 +#: templates/personal.php:81 msgid "" "Fill in an email address to enable password recovery and receive " "notifications" msgstr "" -#: templates/personal.php:96 +#: templates/personal.php:89 msgid "Profile picture" msgstr "Foto do perfil" -#: templates/personal.php:101 +#: templates/personal.php:94 msgid "Upload new" msgstr "Carregar novo" -#: templates/personal.php:103 +#: templates/personal.php:96 msgid "Select new from Files" msgstr "Seleccionar novo a partir dos ficheiros" -#: templates/personal.php:104 +#: templates/personal.php:97 msgid "Remove image" msgstr "Remover imagem" -#: templates/personal.php:105 +#: templates/personal.php:98 msgid "Either png or jpg. Ideally square but you will be able to crop it." msgstr "Apenas png ou jpg. Idealmente quadrada, mas poderá corta-la depois." -#: templates/personal.php:107 +#: templates/personal.php:100 msgid "Your avatar is provided by your original account." msgstr "O seu avatar é fornecido pela sua conta original." -#: templates/personal.php:111 +#: templates/personal.php:104 msgid "Cancel" msgstr "Cancelar" -#: templates/personal.php:112 +#: templates/personal.php:105 msgid "Choose as profile image" msgstr "Escolha uma fotografia de perfil" -#: templates/personal.php:120 templates/personal.php:121 +#: templates/personal.php:111 templates/personal.php:112 msgid "Language" msgstr "Idioma" -#: templates/personal.php:140 +#: templates/personal.php:131 msgid "Help translate" msgstr "Ajude a traduzir" -#: templates/personal.php:147 +#: templates/personal.php:137 msgid "WebDAV" msgstr "WebDAV" -#: templates/personal.php:149 +#: templates/personal.php:139 #, php-format msgid "" "Use this address to access your Files via " "WebDAV" msgstr "Utilize esta ligação para aceder aos seus ficheiros via WebDAV" -#: templates/personal.php:161 +#: templates/personal.php:151 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "A aplicação de encriptação já não está ativa, por favor desincripte todos os seus ficheiros" -#: templates/personal.php:167 +#: templates/personal.php:157 msgid "Log-in password" msgstr "Password de entrada" -#: templates/personal.php:172 +#: templates/personal.php:162 msgid "Decrypt all Files" msgstr "Desencriptar todos os ficheiros" diff --git a/l10n/ro/lib.po b/l10n/ro/lib.po index 442afc592da..6beeb527615 100644 --- a/l10n/ro/lib.po +++ b/l10n/ro/lib.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-09 01:55-0400\n" -"PO-Revision-Date: 2014-04-09 05:55+0000\n" +"POT-Creation-Date: 2014-04-10 01:54-0400\n" +"PO-Revision-Date: 2014-04-09 06:10+0000\n" "Last-Translator: I Robot\n" "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n" "MIME-Version: 1.0\n" @@ -350,11 +350,11 @@ msgstr "" #: private/user/manager.php:251 msgid "A valid username must be provided" -msgstr "" +msgstr "Trebuie să furnizaţi un nume de utilizator valid" #: private/user/manager.php:255 msgid "A valid password must be provided" -msgstr "" +msgstr "Trebuie să furnizaţi o parolă validă" #: private/user/manager.php:260 msgid "The username is already being used" diff --git a/l10n/ro/settings.po b/l10n/ro/settings.po index 788adc850f7..7358fd44fc6 100644 --- a/l10n/ro/settings.po +++ b/l10n/ro/settings.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-03-26 01:55-0400\n" -"PO-Revision-Date: 2014-03-26 05:55+0000\n" +"POT-Creation-Date: 2014-04-10 01:54-0400\n" +"PO-Revision-Date: 2014-04-09 06:10+0000\n" "Last-Translator: I Robot\n" "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n" "MIME-Version: 1.0\n" @@ -53,7 +53,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159 +#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149 msgid "Encryption" msgstr "Încriptare" @@ -66,7 +66,7 @@ msgid "Unable to load list from App Store" msgstr "Imposibil de actualizat lista din App Store." #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 changepassword/controller.php:55 +#: ajax/togglegroups.php:20 changepassword/controller.php:49 msgid "Authentication error" msgstr "Eroare la autentificare" @@ -128,32 +128,32 @@ msgstr "Nu s-a putut elimina utilizatorul din grupul %s" msgid "Couldn't update app." msgstr "Aplicaţia nu s-a putut actualiza." -#: changepassword/controller.php:20 +#: changepassword/controller.php:17 msgid "Wrong password" msgstr "Parolă greșită" -#: changepassword/controller.php:42 +#: changepassword/controller.php:36 msgid "No user supplied" msgstr "" -#: changepassword/controller.php:74 +#: changepassword/controller.php:68 msgid "" "Please provide an admin recovery password, otherwise all user data will be " "lost" msgstr "" -#: changepassword/controller.php:79 +#: changepassword/controller.php:73 msgid "" "Wrong admin recovery password. Please check the password and try again." msgstr "" -#: changepassword/controller.php:87 +#: changepassword/controller.php:81 msgid "" "Back-end doesn't support password change, but the users encryption key was " "successfully updated." msgstr "" -#: changepassword/controller.php:92 changepassword/controller.php:103 +#: changepassword/controller.php:86 changepassword/controller.php:97 msgid "Unable to change password" msgstr "Imposibil de schimbat parola" @@ -205,7 +205,7 @@ msgstr "Eroare în timpul actualizării aplicaţiei" msgid "Error" msgstr "Eroare" -#: js/apps.js:153 templates/apps.php:54 +#: js/apps.js:153 templates/apps.php:55 msgid "Update" msgstr "Actualizare" @@ -213,31 +213,31 @@ msgstr "Actualizare" msgid "Updated" msgstr "Actualizat" -#: js/personal.js:246 +#: js/personal.js:243 msgid "Select a profile picture" msgstr "" -#: js/personal.js:277 +#: js/personal.js:274 msgid "Very weak password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:275 msgid "Weak password" msgstr "" -#: js/personal.js:279 +#: js/personal.js:276 msgid "So-so password" msgstr "" -#: js/personal.js:280 +#: js/personal.js:277 msgid "Good password" msgstr "" -#: js/personal.js:281 +#: js/personal.js:278 msgid "Strong password" msgstr "" -#: js/personal.js:316 +#: js/personal.js:313 msgid "Decrypting files... Please wait, this can take some time." msgstr "" @@ -286,7 +286,7 @@ msgstr "Trebuie să furnizaţi o parolă validă" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:49 personal.php:50 +#: personal.php:48 personal.php:49 msgid "__language_name__" msgstr "_language_name_" @@ -591,11 +591,11 @@ msgstr "Mai mult" msgid "Less" msgstr "Mai puțin" -#: templates/admin.php:416 templates/personal.php:181 +#: templates/admin.php:416 templates/personal.php:171 msgid "Version" msgstr "Versiunea" -#: templates/admin.php:420 templates/personal.php:184 +#: templates/admin.php:420 templates/personal.php:174 msgid "" "Developed by the ownCloud community, the -licensed by " msgstr "-licențiat " @@ -666,108 +666,108 @@ msgstr "" msgid "You have used %s of the available %s" msgstr "Ați utilizat %s din %s disponibile" -#: templates/personal.php:39 templates/users.php:21 templates/users.php:87 +#: templates/personal.php:38 templates/users.php:21 templates/users.php:87 msgid "Password" msgstr "Parolă" -#: templates/personal.php:40 +#: templates/personal.php:39 msgid "Your password was changed" msgstr "Parola a fost modificată" -#: templates/personal.php:41 +#: templates/personal.php:40 msgid "Unable to change your password" msgstr "Imposibil de-ați schimbat parola" -#: templates/personal.php:43 +#: templates/personal.php:42 msgid "Current password" msgstr "Parola curentă" -#: templates/personal.php:46 +#: templates/personal.php:45 msgid "New password" msgstr "Noua parolă" -#: templates/personal.php:50 +#: templates/personal.php:49 msgid "Change password" msgstr "Schimbă parola" -#: templates/personal.php:64 templates/users.php:86 +#: templates/personal.php:61 templates/users.php:86 msgid "Full Name" msgstr "" -#: templates/personal.php:81 +#: templates/personal.php:76 msgid "Email" msgstr "Email" -#: templates/personal.php:83 +#: templates/personal.php:78 msgid "Your email address" msgstr "Adresa ta de email" -#: templates/personal.php:86 +#: templates/personal.php:81 msgid "" "Fill in an email address to enable password recovery and receive " "notifications" msgstr "" -#: templates/personal.php:96 +#: templates/personal.php:89 msgid "Profile picture" msgstr "Imagine de profil" -#: templates/personal.php:101 +#: templates/personal.php:94 msgid "Upload new" msgstr "" -#: templates/personal.php:103 +#: templates/personal.php:96 msgid "Select new from Files" msgstr "" -#: templates/personal.php:104 +#: templates/personal.php:97 msgid "Remove image" msgstr "Înlătură imagine" -#: templates/personal.php:105 +#: templates/personal.php:98 msgid "Either png or jpg. Ideally square but you will be able to crop it." msgstr "" -#: templates/personal.php:107 +#: templates/personal.php:100 msgid "Your avatar is provided by your original account." msgstr "" -#: templates/personal.php:111 +#: templates/personal.php:104 msgid "Cancel" msgstr "Anulare" -#: templates/personal.php:112 +#: templates/personal.php:105 msgid "Choose as profile image" msgstr "Alege drept imagine de profil" -#: templates/personal.php:120 templates/personal.php:121 +#: templates/personal.php:111 templates/personal.php:112 msgid "Language" msgstr "Limba" -#: templates/personal.php:140 +#: templates/personal.php:131 msgid "Help translate" msgstr "Ajută la traducere" -#: templates/personal.php:147 +#: templates/personal.php:137 msgid "WebDAV" msgstr "WebDAV" -#: templates/personal.php:149 +#: templates/personal.php:139 #, php-format msgid "" "Use this address to access your Files via " "WebDAV" msgstr "" -#: templates/personal.php:161 +#: templates/personal.php:151 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:167 +#: templates/personal.php:157 msgid "Log-in password" msgstr "" -#: templates/personal.php:172 +#: templates/personal.php:162 msgid "Decrypt all Files" msgstr "" diff --git a/l10n/ru/lib.po b/l10n/ru/lib.po index f9f03c5f434..f59ffd70fa5 100644 --- a/l10n/ru/lib.po +++ b/l10n/ru/lib.po @@ -14,8 +14,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-09 01:55-0400\n" -"PO-Revision-Date: 2014-04-09 05:55+0000\n" +"POT-Creation-Date: 2014-04-10 01:54-0400\n" +"PO-Revision-Date: 2014-04-09 06:10+0000\n" "Last-Translator: I Robot\n" "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n" "MIME-Version: 1.0\n" @@ -356,11 +356,11 @@ msgstr "" #: private/user/manager.php:251 msgid "A valid username must be provided" -msgstr "" +msgstr "Укажите правильное имя пользователя" #: private/user/manager.php:255 msgid "A valid password must be provided" -msgstr "" +msgstr "Укажите валидный пароль" #: private/user/manager.php:260 msgid "The username is already being used" diff --git a/l10n/ru/settings.po b/l10n/ru/settings.po index 5654edd1a82..4e3067464e0 100644 --- a/l10n/ru/settings.po +++ b/l10n/ru/settings.po @@ -22,8 +22,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-03-28 01:55-0400\n" -"PO-Revision-Date: 2014-03-27 14:41+0000\n" +"POT-Creation-Date: 2014-04-10 01:54-0400\n" +"PO-Revision-Date: 2014-04-09 06:10+0000\n" "Last-Translator: I Robot\n" "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n" "MIME-Version: 1.0\n" @@ -66,7 +66,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159 +#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149 msgid "Encryption" msgstr "Шифрование" @@ -79,7 +79,7 @@ msgid "Unable to load list from App Store" msgstr "Не удалось загрузить список из App Store" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 changepassword/controller.php:55 +#: ajax/togglegroups.php:20 changepassword/controller.php:49 msgid "Authentication error" msgstr "Ошибка аутентификации" @@ -141,32 +141,32 @@ msgstr "Невозможно удалить пользователя из гру msgid "Couldn't update app." msgstr "Невозможно обновить приложение" -#: changepassword/controller.php:20 +#: changepassword/controller.php:17 msgid "Wrong password" msgstr "Неправильный пароль" -#: changepassword/controller.php:42 +#: changepassword/controller.php:36 msgid "No user supplied" msgstr "Пользователь не задан" -#: changepassword/controller.php:74 +#: changepassword/controller.php:68 msgid "" "Please provide an admin recovery password, otherwise all user data will be " "lost" msgstr "Пожалуйста введите администраторский пароль восстановления, иначе все пользовательские данные будут утеряны" -#: changepassword/controller.php:79 +#: changepassword/controller.php:73 msgid "" "Wrong admin recovery password. Please check the password and try again." msgstr "Неправильный пароль восстановления. Проверьте пароль и попробуйте еще раз." -#: changepassword/controller.php:87 +#: changepassword/controller.php:81 msgid "" "Back-end doesn't support password change, but the users encryption key was " "successfully updated." msgstr "Используемый механизм не поддерживает смену паролей, но пользовательский ключ шифрования был успешно обновлён" -#: changepassword/controller.php:92 changepassword/controller.php:103 +#: changepassword/controller.php:86 changepassword/controller.php:97 msgid "Unable to change password" msgstr "Невозможно изменить пароль" @@ -218,7 +218,7 @@ msgstr "Ошибка при обновлении приложения" msgid "Error" msgstr "Ошибка" -#: js/apps.js:153 templates/apps.php:54 +#: js/apps.js:153 templates/apps.php:55 msgid "Update" msgstr "Обновить" @@ -226,31 +226,31 @@ msgstr "Обновить" msgid "Updated" msgstr "Обновлено" -#: js/personal.js:246 +#: js/personal.js:243 msgid "Select a profile picture" msgstr "Выберите картинку профиля" -#: js/personal.js:277 +#: js/personal.js:274 msgid "Very weak password" msgstr "Очень слабый пароль" -#: js/personal.js:278 +#: js/personal.js:275 msgid "Weak password" msgstr "Слабый пароль" -#: js/personal.js:279 +#: js/personal.js:276 msgid "So-so password" msgstr "Так себе пароль" -#: js/personal.js:280 +#: js/personal.js:277 msgid "Good password" msgstr "Хороший пароль" -#: js/personal.js:281 +#: js/personal.js:278 msgid "Strong password" msgstr "Устойчивый к взлому пароль" -#: js/personal.js:316 +#: js/personal.js:313 msgid "Decrypting files... Please wait, this can take some time." msgstr "Расшифровка файлов... Пожалуйста, подождите, это может занять некоторое время." @@ -299,7 +299,7 @@ msgstr "Укажите валидный пароль" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "Предупреждение: домашняя папка пользователя \"{user}\" уже существует" -#: personal.php:49 personal.php:50 +#: personal.php:48 personal.php:49 msgid "__language_name__" msgstr "Русский " @@ -604,11 +604,11 @@ msgstr "Больше" msgid "Less" msgstr "Меньше" -#: templates/admin.php:416 templates/personal.php:181 +#: templates/admin.php:416 templates/personal.php:171 msgid "Version" msgstr "Версия" -#: templates/admin.php:420 templates/personal.php:184 +#: templates/admin.php:420 templates/personal.php:174 msgid "" "Developed by the ownCloud community, the -licensed by " msgstr " лицензия. Автор " @@ -679,108 +679,108 @@ msgstr "Показать помощник настройки" msgid "You have used %s of the available %s" msgstr "Вы использовали %s из доступных %s" -#: templates/personal.php:39 templates/users.php:21 templates/users.php:87 +#: templates/personal.php:38 templates/users.php:21 templates/users.php:87 msgid "Password" msgstr "Пароль" -#: templates/personal.php:40 +#: templates/personal.php:39 msgid "Your password was changed" msgstr "Ваш пароль изменён" -#: templates/personal.php:41 +#: templates/personal.php:40 msgid "Unable to change your password" msgstr "Невозможно сменить пароль" -#: templates/personal.php:43 +#: templates/personal.php:42 msgid "Current password" msgstr "Текущий пароль" -#: templates/personal.php:46 +#: templates/personal.php:45 msgid "New password" msgstr "Новый пароль" -#: templates/personal.php:50 +#: templates/personal.php:49 msgid "Change password" msgstr "Сменить пароль" -#: templates/personal.php:64 templates/users.php:86 +#: templates/personal.php:61 templates/users.php:86 msgid "Full Name" msgstr "Полное имя" -#: templates/personal.php:81 +#: templates/personal.php:76 msgid "Email" msgstr "E-mail" -#: templates/personal.php:83 +#: templates/personal.php:78 msgid "Your email address" msgstr "Ваш адрес электронной почты" -#: templates/personal.php:86 +#: templates/personal.php:81 msgid "" "Fill in an email address to enable password recovery and receive " "notifications" msgstr "" -#: templates/personal.php:96 +#: templates/personal.php:89 msgid "Profile picture" msgstr "Фото профиля" -#: templates/personal.php:101 +#: templates/personal.php:94 msgid "Upload new" msgstr "Загрузить новую" -#: templates/personal.php:103 +#: templates/personal.php:96 msgid "Select new from Files" msgstr "Выберите новый из файлов" -#: templates/personal.php:104 +#: templates/personal.php:97 msgid "Remove image" msgstr "Удалить изображение" -#: templates/personal.php:105 +#: templates/personal.php:98 msgid "Either png or jpg. Ideally square but you will be able to crop it." msgstr "Либо png, либо jpg. Изображение должно быть квадратным, но вы сможете обрезать его позже." -#: templates/personal.php:107 +#: templates/personal.php:100 msgid "Your avatar is provided by your original account." msgstr "Будет использован аватар вашей оригинальной учетной записи." -#: templates/personal.php:111 +#: templates/personal.php:104 msgid "Cancel" msgstr "Отменить" -#: templates/personal.php:112 +#: templates/personal.php:105 msgid "Choose as profile image" msgstr "Выберите изображение профиля" -#: templates/personal.php:120 templates/personal.php:121 +#: templates/personal.php:111 templates/personal.php:112 msgid "Language" msgstr "Язык" -#: templates/personal.php:140 +#: templates/personal.php:131 msgid "Help translate" msgstr "Помочь с переводом" -#: templates/personal.php:147 +#: templates/personal.php:137 msgid "WebDAV" msgstr "WebDAV" -#: templates/personal.php:149 +#: templates/personal.php:139 #, php-format msgid "" "Use this address to access your Files via " "WebDAV" msgstr "Используйте этот адресс для доступа к вашим файлам через WebDAV" -#: templates/personal.php:161 +#: templates/personal.php:151 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "Приложение для шифрования выключено, пожалуйста, расшифруйте ваши файлы" -#: templates/personal.php:167 +#: templates/personal.php:157 msgid "Log-in password" msgstr "Пароль входа" -#: templates/personal.php:172 +#: templates/personal.php:162 msgid "Decrypt all Files" msgstr "Снять шифрование со всех файлов" diff --git a/l10n/sk_SK/lib.po b/l10n/sk_SK/lib.po index 434ad7c1f4f..10d44986712 100644 --- a/l10n/sk_SK/lib.po +++ b/l10n/sk_SK/lib.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-09 01:55-0400\n" -"PO-Revision-Date: 2014-04-09 05:55+0000\n" +"POT-Creation-Date: 2014-04-10 01:54-0400\n" +"PO-Revision-Date: 2014-04-09 06:10+0000\n" "Last-Translator: I Robot\n" "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n" "MIME-Version: 1.0\n" @@ -351,11 +351,11 @@ msgstr "" #: private/user/manager.php:251 msgid "A valid username must be provided" -msgstr "" +msgstr "Musíte zadať platné používateľské meno" #: private/user/manager.php:255 msgid "A valid password must be provided" -msgstr "" +msgstr "Musíte zadať platné heslo" #: private/user/manager.php:260 msgid "The username is already being used" diff --git a/l10n/sk_SK/settings.po b/l10n/sk_SK/settings.po index d021ae13773..8aecaab335b 100644 --- a/l10n/sk_SK/settings.po +++ b/l10n/sk_SK/settings.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-09 01:55-0400\n" -"PO-Revision-Date: 2014-04-08 07:10+0000\n" +"POT-Creation-Date: 2014-04-10 01:54-0400\n" +"PO-Revision-Date: 2014-04-09 06:10+0000\n" "Last-Translator: mhh \n" "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/sl/lib.po b/l10n/sl/lib.po index 5a7ab52c3f5..6593ed803c0 100644 --- a/l10n/sl/lib.po +++ b/l10n/sl/lib.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-09 01:55-0400\n" -"PO-Revision-Date: 2014-04-09 05:55+0000\n" +"POT-Creation-Date: 2014-04-10 01:54-0400\n" +"PO-Revision-Date: 2014-04-09 06:10+0000\n" "Last-Translator: I Robot\n" "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n" "MIME-Version: 1.0\n" @@ -355,11 +355,11 @@ msgstr "" #: private/user/manager.php:251 msgid "A valid username must be provided" -msgstr "" +msgstr "Navedeno mora biti veljavno uporabniško ime" #: private/user/manager.php:255 msgid "A valid password must be provided" -msgstr "" +msgstr "Navedeno mora biti veljavno geslo" #: private/user/manager.php:260 msgid "The username is already being used" diff --git a/l10n/sl/settings.po b/l10n/sl/settings.po index 84a5d4921dd..23a92432934 100644 --- a/l10n/sl/settings.po +++ b/l10n/sl/settings.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-04 01:55-0400\n" -"PO-Revision-Date: 2014-04-03 19:40+0000\n" +"POT-Creation-Date: 2014-04-10 01:54-0400\n" +"PO-Revision-Date: 2014-04-09 06:10+0000\n" "Last-Translator: mateju <>\n" "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n" "MIME-Version: 1.0\n" @@ -213,31 +213,31 @@ msgstr "Posodobi" msgid "Updated" msgstr "Posodobljeno" -#: js/personal.js:246 +#: js/personal.js:243 msgid "Select a profile picture" msgstr "Izbor slike profila" -#: js/personal.js:277 +#: js/personal.js:274 msgid "Very weak password" msgstr "Zelo šibko geslo" -#: js/personal.js:278 +#: js/personal.js:275 msgid "Weak password" msgstr "Šibko geslo" -#: js/personal.js:279 +#: js/personal.js:276 msgid "So-so password" msgstr "Slabo geslo" -#: js/personal.js:280 +#: js/personal.js:277 msgid "Good password" msgstr "Dobro geslo" -#: js/personal.js:281 +#: js/personal.js:278 msgid "Strong password" msgstr "Odlično geslo" -#: js/personal.js:316 +#: js/personal.js:313 msgid "Decrypting files... Please wait, this can take some time." msgstr "Poteka odšifriranje datotek ... Opravilo je lahko dolgotrajno." diff --git a/l10n/sq/lib.po b/l10n/sq/lib.po index a52513d2496..1e227ddd183 100644 --- a/l10n/sq/lib.po +++ b/l10n/sq/lib.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-09 01:55-0400\n" -"PO-Revision-Date: 2014-04-09 05:55+0000\n" +"POT-Creation-Date: 2014-04-10 01:54-0400\n" +"PO-Revision-Date: 2014-04-09 06:10+0000\n" "Last-Translator: I Robot\n" "Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n" "MIME-Version: 1.0\n" @@ -345,11 +345,11 @@ msgstr "" #: private/user/manager.php:251 msgid "A valid username must be provided" -msgstr "" +msgstr "Duhet të jepni një emër të vlefshëm përdoruesi" #: private/user/manager.php:255 msgid "A valid password must be provided" -msgstr "" +msgstr "Duhet të jepni një fjalëkalim te vlefshëm" #: private/user/manager.php:260 msgid "The username is already being used" diff --git a/l10n/sq/settings.po b/l10n/sq/settings.po index 4cb82529cc1..8d2970bcdc2 100644 --- a/l10n/sq/settings.po +++ b/l10n/sq/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-03-26 01:55-0400\n" -"PO-Revision-Date: 2014-03-26 05:55+0000\n" +"POT-Creation-Date: 2014-04-10 01:54-0400\n" +"PO-Revision-Date: 2014-04-09 06:10+0000\n" "Last-Translator: I Robot\n" "Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159 +#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149 msgid "Encryption" msgstr "" @@ -64,7 +64,7 @@ msgid "Unable to load list from App Store" msgstr "E pamundur të shkarkohet lista nga App Store" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 changepassword/controller.php:55 +#: ajax/togglegroups.php:20 changepassword/controller.php:49 msgid "Authentication error" msgstr "Gabim autentifikimi" @@ -126,32 +126,32 @@ msgstr "E pamundur të hiqet përdoruesi nga grupi %s" msgid "Couldn't update app." msgstr "E pamundur të përditësohet app." -#: changepassword/controller.php:20 +#: changepassword/controller.php:17 msgid "Wrong password" msgstr "" -#: changepassword/controller.php:42 +#: changepassword/controller.php:36 msgid "No user supplied" msgstr "" -#: changepassword/controller.php:74 +#: changepassword/controller.php:68 msgid "" "Please provide an admin recovery password, otherwise all user data will be " "lost" msgstr "" -#: changepassword/controller.php:79 +#: changepassword/controller.php:73 msgid "" "Wrong admin recovery password. Please check the password and try again." msgstr "" -#: changepassword/controller.php:87 +#: changepassword/controller.php:81 msgid "" "Back-end doesn't support password change, but the users encryption key was " "successfully updated." msgstr "" -#: changepassword/controller.php:92 changepassword/controller.php:103 +#: changepassword/controller.php:86 changepassword/controller.php:97 msgid "Unable to change password" msgstr "" @@ -203,7 +203,7 @@ msgstr "Gabim gjatë përditësimit të app" msgid "Error" msgstr "Gabim" -#: js/apps.js:153 templates/apps.php:54 +#: js/apps.js:153 templates/apps.php:55 msgid "Update" msgstr "Përditësim" @@ -211,31 +211,31 @@ msgstr "Përditësim" msgid "Updated" msgstr "I përditësuar" -#: js/personal.js:246 +#: js/personal.js:243 msgid "Select a profile picture" msgstr "" -#: js/personal.js:277 +#: js/personal.js:274 msgid "Very weak password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:275 msgid "Weak password" msgstr "" -#: js/personal.js:279 +#: js/personal.js:276 msgid "So-so password" msgstr "" -#: js/personal.js:280 +#: js/personal.js:277 msgid "Good password" msgstr "" -#: js/personal.js:281 +#: js/personal.js:278 msgid "Strong password" msgstr "" -#: js/personal.js:316 +#: js/personal.js:313 msgid "Decrypting files... Please wait, this can take some time." msgstr "" @@ -284,7 +284,7 @@ msgstr "Duhet të jepni një fjalëkalim te vlefshëm" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:49 personal.php:50 +#: personal.php:48 personal.php:49 msgid "__language_name__" msgstr "Shqip" @@ -589,11 +589,11 @@ msgstr "Më tepër" msgid "Less" msgstr "M'pak" -#: templates/admin.php:416 templates/personal.php:181 +#: templates/admin.php:416 templates/personal.php:171 msgid "Version" msgstr "Versioni" -#: templates/admin.php:420 templates/personal.php:184 +#: templates/admin.php:420 templates/personal.php:174 msgid "" "Developed by the ownCloud community, the -licensed by " msgstr "-licensuar nga " @@ -664,108 +664,108 @@ msgstr "Rishfaq përsëri fazat për hapjen e herës së parë" msgid "You have used %s of the available %s" msgstr "Ju keni përdorur %s nga %s të mundshme " -#: templates/personal.php:39 templates/users.php:21 templates/users.php:87 +#: templates/personal.php:38 templates/users.php:21 templates/users.php:87 msgid "Password" msgstr "Fjalëkalim" -#: templates/personal.php:40 +#: templates/personal.php:39 msgid "Your password was changed" msgstr "fjalëkalimi juaj u ndryshua" -#: templates/personal.php:41 +#: templates/personal.php:40 msgid "Unable to change your password" msgstr "Nuk është e mundur të ndryshohet fjalëkalimi" -#: templates/personal.php:43 +#: templates/personal.php:42 msgid "Current password" msgstr "Fjalëkalimi aktual" -#: templates/personal.php:46 +#: templates/personal.php:45 msgid "New password" msgstr "Fjalëkalimi i ri" -#: templates/personal.php:50 +#: templates/personal.php:49 msgid "Change password" msgstr "Ndrysho fjalëkalimin" -#: templates/personal.php:64 templates/users.php:86 +#: templates/personal.php:61 templates/users.php:86 msgid "Full Name" msgstr "" -#: templates/personal.php:81 +#: templates/personal.php:76 msgid "Email" msgstr "Email" -#: templates/personal.php:83 +#: templates/personal.php:78 msgid "Your email address" msgstr "Adresa juaj email" -#: templates/personal.php:86 +#: templates/personal.php:81 msgid "" "Fill in an email address to enable password recovery and receive " "notifications" msgstr "" -#: templates/personal.php:96 +#: templates/personal.php:89 msgid "Profile picture" msgstr "" -#: templates/personal.php:101 +#: templates/personal.php:94 msgid "Upload new" msgstr "" -#: templates/personal.php:103 +#: templates/personal.php:96 msgid "Select new from Files" msgstr "" -#: templates/personal.php:104 +#: templates/personal.php:97 msgid "Remove image" msgstr "" -#: templates/personal.php:105 +#: templates/personal.php:98 msgid "Either png or jpg. Ideally square but you will be able to crop it." msgstr "" -#: templates/personal.php:107 +#: templates/personal.php:100 msgid "Your avatar is provided by your original account." msgstr "" -#: templates/personal.php:111 +#: templates/personal.php:104 msgid "Cancel" msgstr "Anullo" -#: templates/personal.php:112 +#: templates/personal.php:105 msgid "Choose as profile image" msgstr "" -#: templates/personal.php:120 templates/personal.php:121 +#: templates/personal.php:111 templates/personal.php:112 msgid "Language" msgstr "Gjuha" -#: templates/personal.php:140 +#: templates/personal.php:131 msgid "Help translate" msgstr "Ndihmoni në përkthim" -#: templates/personal.php:147 +#: templates/personal.php:137 msgid "WebDAV" msgstr "WebDAV" -#: templates/personal.php:149 +#: templates/personal.php:139 #, php-format msgid "" "Use this address to access your Files via " "WebDAV" msgstr "" -#: templates/personal.php:161 +#: templates/personal.php:151 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:167 +#: templates/personal.php:157 msgid "Log-in password" msgstr "" -#: templates/personal.php:172 +#: templates/personal.php:162 msgid "Decrypt all Files" msgstr "" diff --git a/l10n/sr/lib.po b/l10n/sr/lib.po index 1f49ce77b3c..9cd072c745e 100644 --- a/l10n/sr/lib.po +++ b/l10n/sr/lib.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-09 01:55-0400\n" -"PO-Revision-Date: 2014-04-09 05:55+0000\n" +"POT-Creation-Date: 2014-04-10 01:54-0400\n" +"PO-Revision-Date: 2014-04-09 06:10+0000\n" "Last-Translator: I Robot\n" "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n" "MIME-Version: 1.0\n" @@ -349,11 +349,11 @@ msgstr "" #: private/user/manager.php:251 msgid "A valid username must be provided" -msgstr "" +msgstr "Морате унети исправно корисничко име" #: private/user/manager.php:255 msgid "A valid password must be provided" -msgstr "" +msgstr "Морате унети исправну лозинку" #: private/user/manager.php:260 msgid "The username is already being used" diff --git a/l10n/sr/settings.po b/l10n/sr/settings.po index ea03c7d195d..ad83bcb144a 100644 --- a/l10n/sr/settings.po +++ b/l10n/sr/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-03-26 01:55-0400\n" -"PO-Revision-Date: 2014-03-26 05:55+0000\n" +"POT-Creation-Date: 2014-04-10 01:54-0400\n" +"PO-Revision-Date: 2014-04-09 06:10+0000\n" "Last-Translator: I Robot\n" "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159 +#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149 msgid "Encryption" msgstr "Шифровање" @@ -64,7 +64,7 @@ msgid "Unable to load list from App Store" msgstr "Грешка приликом учитавања списка из Складишта Програма" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 changepassword/controller.php:55 +#: ajax/togglegroups.php:20 changepassword/controller.php:49 msgid "Authentication error" msgstr "Грешка при провери идентитета" @@ -126,32 +126,32 @@ msgstr "Не могу да уклоним корисника из групе %s" msgid "Couldn't update app." msgstr "Не могу да ажурирам апликацију." -#: changepassword/controller.php:20 +#: changepassword/controller.php:17 msgid "Wrong password" msgstr "" -#: changepassword/controller.php:42 +#: changepassword/controller.php:36 msgid "No user supplied" msgstr "" -#: changepassword/controller.php:74 +#: changepassword/controller.php:68 msgid "" "Please provide an admin recovery password, otherwise all user data will be " "lost" msgstr "" -#: changepassword/controller.php:79 +#: changepassword/controller.php:73 msgid "" "Wrong admin recovery password. Please check the password and try again." msgstr "" -#: changepassword/controller.php:87 +#: changepassword/controller.php:81 msgid "" "Back-end doesn't support password change, but the users encryption key was " "successfully updated." msgstr "" -#: changepassword/controller.php:92 changepassword/controller.php:103 +#: changepassword/controller.php:86 changepassword/controller.php:97 msgid "Unable to change password" msgstr "" @@ -203,7 +203,7 @@ msgstr "Грешка при ажурирању апликације" msgid "Error" msgstr "Грешка" -#: js/apps.js:153 templates/apps.php:54 +#: js/apps.js:153 templates/apps.php:55 msgid "Update" msgstr "Ажурирај" @@ -211,31 +211,31 @@ msgstr "Ажурирај" msgid "Updated" msgstr "Ажурирано" -#: js/personal.js:246 +#: js/personal.js:243 msgid "Select a profile picture" msgstr "" -#: js/personal.js:277 +#: js/personal.js:274 msgid "Very weak password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:275 msgid "Weak password" msgstr "" -#: js/personal.js:279 +#: js/personal.js:276 msgid "So-so password" msgstr "" -#: js/personal.js:280 +#: js/personal.js:277 msgid "Good password" msgstr "" -#: js/personal.js:281 +#: js/personal.js:278 msgid "Strong password" msgstr "" -#: js/personal.js:316 +#: js/personal.js:313 msgid "Decrypting files... Please wait, this can take some time." msgstr "" @@ -284,7 +284,7 @@ msgstr "Морате унети исправну лозинку" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:49 personal.php:50 +#: personal.php:48 personal.php:49 msgid "__language_name__" msgstr "__language_name__" @@ -589,11 +589,11 @@ msgstr "Више" msgid "Less" msgstr "Мање" -#: templates/admin.php:416 templates/personal.php:181 +#: templates/admin.php:416 templates/personal.php:171 msgid "Version" msgstr "Верзија" -#: templates/admin.php:420 templates/personal.php:184 +#: templates/admin.php:420 templates/personal.php:174 msgid "" "Developed by the ownCloud community, the -licensed by " msgstr "-лиценцирао " @@ -664,108 +664,108 @@ msgstr "Поново прикажи чаробњак за прво покрет msgid "You have used %s of the available %s" msgstr "Искористили сте %s од дозвољених %s" -#: templates/personal.php:39 templates/users.php:21 templates/users.php:87 +#: templates/personal.php:38 templates/users.php:21 templates/users.php:87 msgid "Password" msgstr "Лозинка" -#: templates/personal.php:40 +#: templates/personal.php:39 msgid "Your password was changed" msgstr "Лозинка је промењена" -#: templates/personal.php:41 +#: templates/personal.php:40 msgid "Unable to change your password" msgstr "Не могу да изменим вашу лозинку" -#: templates/personal.php:43 +#: templates/personal.php:42 msgid "Current password" msgstr "Тренутна лозинка" -#: templates/personal.php:46 +#: templates/personal.php:45 msgid "New password" msgstr "Нова лозинка" -#: templates/personal.php:50 +#: templates/personal.php:49 msgid "Change password" msgstr "Измени лозинку" -#: templates/personal.php:64 templates/users.php:86 +#: templates/personal.php:61 templates/users.php:86 msgid "Full Name" msgstr "" -#: templates/personal.php:81 +#: templates/personal.php:76 msgid "Email" msgstr "Е-пошта" -#: templates/personal.php:83 +#: templates/personal.php:78 msgid "Your email address" msgstr "Ваша адреса е-поште" -#: templates/personal.php:86 +#: templates/personal.php:81 msgid "" "Fill in an email address to enable password recovery and receive " "notifications" msgstr "" -#: templates/personal.php:96 +#: templates/personal.php:89 msgid "Profile picture" msgstr "" -#: templates/personal.php:101 +#: templates/personal.php:94 msgid "Upload new" msgstr "" -#: templates/personal.php:103 +#: templates/personal.php:96 msgid "Select new from Files" msgstr "" -#: templates/personal.php:104 +#: templates/personal.php:97 msgid "Remove image" msgstr "" -#: templates/personal.php:105 +#: templates/personal.php:98 msgid "Either png or jpg. Ideally square but you will be able to crop it." msgstr "" -#: templates/personal.php:107 +#: templates/personal.php:100 msgid "Your avatar is provided by your original account." msgstr "" -#: templates/personal.php:111 +#: templates/personal.php:104 msgid "Cancel" msgstr "Откажи" -#: templates/personal.php:112 +#: templates/personal.php:105 msgid "Choose as profile image" msgstr "" -#: templates/personal.php:120 templates/personal.php:121 +#: templates/personal.php:111 templates/personal.php:112 msgid "Language" msgstr "Језик" -#: templates/personal.php:140 +#: templates/personal.php:131 msgid "Help translate" msgstr " Помозите у превођењу" -#: templates/personal.php:147 +#: templates/personal.php:137 msgid "WebDAV" msgstr "WebDAV" -#: templates/personal.php:149 +#: templates/personal.php:139 #, php-format msgid "" "Use this address to access your Files via " "WebDAV" msgstr "" -#: templates/personal.php:161 +#: templates/personal.php:151 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:167 +#: templates/personal.php:157 msgid "Log-in password" msgstr "" -#: templates/personal.php:172 +#: templates/personal.php:162 msgid "Decrypt all Files" msgstr "" diff --git a/l10n/sv/lib.po b/l10n/sv/lib.po index 2934570091a..07600270a14 100644 --- a/l10n/sv/lib.po +++ b/l10n/sv/lib.po @@ -13,8 +13,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-09 01:55-0400\n" -"PO-Revision-Date: 2014-04-09 05:55+0000\n" +"POT-Creation-Date: 2014-04-10 01:54-0400\n" +"PO-Revision-Date: 2014-04-09 06:10+0000\n" "Last-Translator: I Robot\n" "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n" "MIME-Version: 1.0\n" @@ -351,11 +351,11 @@ msgstr "" #: private/user/manager.php:251 msgid "A valid username must be provided" -msgstr "" +msgstr "Ett giltigt användarnamn måste anges" #: private/user/manager.php:255 msgid "A valid password must be provided" -msgstr "" +msgstr "Ett giltigt lösenord måste anges" #: private/user/manager.php:260 msgid "The username is already being used" diff --git a/l10n/sv/settings.po b/l10n/sv/settings.po index f3161f40534..af537045197 100644 --- a/l10n/sv/settings.po +++ b/l10n/sv/settings.po @@ -17,8 +17,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-07 01:55-0400\n" -"PO-Revision-Date: 2014-04-06 12:20+0000\n" +"POT-Creation-Date: 2014-04-10 01:54-0400\n" +"PO-Revision-Date: 2014-04-09 06:10+0000\n" "Last-Translator: AsavarTzeth \n" "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n" "MIME-Version: 1.0\n" @@ -221,31 +221,31 @@ msgstr "Uppdatera" msgid "Updated" msgstr "Uppdaterad" -#: js/personal.js:246 +#: js/personal.js:243 msgid "Select a profile picture" msgstr "Välj en profilbild" -#: js/personal.js:277 +#: js/personal.js:274 msgid "Very weak password" msgstr "Väldigt svagt lösenord" -#: js/personal.js:278 +#: js/personal.js:275 msgid "Weak password" msgstr "Svagt lösenord" -#: js/personal.js:279 +#: js/personal.js:276 msgid "So-so password" msgstr "Okej lösenord" -#: js/personal.js:280 +#: js/personal.js:277 msgid "Good password" msgstr "Bra lösenord" -#: js/personal.js:281 +#: js/personal.js:278 msgid "Strong password" msgstr "Starkt lösenord" -#: js/personal.js:316 +#: js/personal.js:313 msgid "Decrypting files... Please wait, this can take some time." msgstr "Dekrypterar filer... Vänligen vänta, detta kan ta en stund." diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot index b365936e9e0..f69b4b5d432 100644 --- a/l10n/templates/core.pot +++ b/l10n/templates/core.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-09 01:55-0400\n" +"POT-Creation-Date: 2014-04-10 01:54-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -143,127 +143,127 @@ msgstr "" msgid "Saving..." msgstr "" -#: js/js.js:1124 +#: js/js.js:1099 msgid "seconds ago" msgstr "" -#: js/js.js:1125 +#: js/js.js:1100 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1126 +#: js/js.js:1101 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1127 +#: js/js.js:1102 msgid "today" msgstr "" -#: js/js.js:1128 +#: js/js.js:1103 msgid "yesterday" msgstr "" -#: js/js.js:1129 +#: js/js.js:1104 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1130 +#: js/js.js:1105 msgid "last month" msgstr "" -#: js/js.js:1131 +#: js/js.js:1106 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1132 +#: js/js.js:1107 msgid "months ago" msgstr "" -#: js/js.js:1133 +#: js/js.js:1108 msgid "last year" msgstr "" -#: js/js.js:1134 +#: js/js.js:1109 msgid "years ago" msgstr "" -#: js/oc-dialogs.js:123 +#: js/oc-dialogs.js:125 msgid "Choose" msgstr "" -#: js/oc-dialogs.js:146 +#: js/oc-dialogs.js:151 msgid "Error loading file picker template: {error}" msgstr "" -#: js/oc-dialogs.js:172 +#: js/oc-dialogs.js:177 msgid "Yes" msgstr "" -#: js/oc-dialogs.js:182 +#: js/oc-dialogs.js:187 msgid "No" msgstr "" -#: js/oc-dialogs.js:199 +#: js/oc-dialogs.js:204 msgid "Ok" msgstr "" -#: js/oc-dialogs.js:219 +#: js/oc-dialogs.js:224 msgid "Error loading message template: {error}" msgstr "" -#: js/oc-dialogs.js:347 +#: js/oc-dialogs.js:352 msgid "{count} file conflict" msgid_plural "{count} file conflicts" msgstr[0] "" msgstr[1] "" -#: js/oc-dialogs.js:361 +#: js/oc-dialogs.js:366 msgid "One file conflict" msgstr "" -#: js/oc-dialogs.js:367 +#: js/oc-dialogs.js:372 msgid "New Files" msgstr "" -#: js/oc-dialogs.js:368 +#: js/oc-dialogs.js:373 msgid "Already existing files" msgstr "" -#: js/oc-dialogs.js:370 +#: js/oc-dialogs.js:375 msgid "Which files do you want to keep?" msgstr "" -#: js/oc-dialogs.js:371 +#: js/oc-dialogs.js:376 msgid "" "If you select both versions, the copied file will have a number added to its " "name." msgstr "" -#: js/oc-dialogs.js:379 +#: js/oc-dialogs.js:384 msgid "Cancel" msgstr "" -#: js/oc-dialogs.js:389 +#: js/oc-dialogs.js:394 msgid "Continue" msgstr "" -#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +#: js/oc-dialogs.js:441 js/oc-dialogs.js:454 msgid "(all selected)" msgstr "" -#: js/oc-dialogs.js:439 js/oc-dialogs.js:452 +#: js/oc-dialogs.js:444 js/oc-dialogs.js:457 msgid "({count} selected)" msgstr "" -#: js/oc-dialogs.js:460 +#: js/oc-dialogs.js:465 msgid "Error loading file exists template" msgstr "" diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot index 97b53b761c4..a6d07cdc509 100644 --- a/l10n/templates/files.pot +++ b/l10n/templates/files.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-09 01:55-0400\n" +"POT-Creation-Date: 2014-04-10 01:54-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -177,7 +177,7 @@ msgstr "" msgid "In the home folder 'Shared' is a reserved filename" msgstr "" -#: js/file-upload.js:548 js/filelist.js:603 +#: js/file-upload.js:548 js/filelist.js:587 msgid "{new_name} already exists" msgstr "" @@ -213,35 +213,35 @@ msgstr "" msgid "Error" msgstr "" -#: js/filelist.js:267 js/filelist.js:1113 +#: js/filelist.js:251 js/filelist.js:1101 msgid "Pending" msgstr "" -#: js/filelist.js:630 +#: js/filelist.js:614 msgid "Could not rename file" msgstr "" -#: js/filelist.js:789 +#: js/filelist.js:777 msgid "Error deleting file." msgstr "" -#: js/filelist.js:814 js/filelist.js:891 js/files.js:589 +#: js/filelist.js:802 js/filelist.js:879 js/files.js:589 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:815 js/filelist.js:892 js/files.js:595 +#: js/filelist.js:803 js/filelist.js:880 js/files.js:595 msgid "%n file" msgid_plural "%n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:822 +#: js/filelist.js:810 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:1052 js/filelist.js:1090 +#: js/filelist.js:1040 js/filelist.js:1078 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot index 5420e3eeda4..76d141a0859 100644 --- a/l10n/templates/files_encryption.pot +++ b/l10n/templates/files_encryption.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-09 01:55-0400\n" +"POT-Creation-Date: 2014-04-10 01:54-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot index 9d84c3a33b2..5be8bf356f3 100644 --- a/l10n/templates/files_external.pot +++ b/l10n/templates/files_external.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-09 01:55-0400\n" +"POT-Creation-Date: 2014-04-10 01:54-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot index c21dcd23046..60582d89f51 100644 --- a/l10n/templates/files_sharing.pot +++ b/l10n/templates/files_sharing.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-09 01:55-0400\n" +"POT-Creation-Date: 2014-04-10 01:54-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_trashbin.pot b/l10n/templates/files_trashbin.pot index 011aa053031..4e8d76a5465 100644 --- a/l10n/templates/files_trashbin.pot +++ b/l10n/templates/files_trashbin.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-09 01:55-0400\n" +"POT-Creation-Date: 2014-04-10 01:54-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot index 26903a761f7..1a27053a19a 100644 --- a/l10n/templates/files_versions.pot +++ b/l10n/templates/files_versions.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-09 01:55-0400\n" +"POT-Creation-Date: 2014-04-10 01:54-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot index fb1b7a7289c..ad065b90cad 100644 --- a/l10n/templates/lib.pot +++ b/l10n/templates/lib.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-09 01:55-0400\n" +"POT-Creation-Date: 2014-04-10 01:54-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/private.pot b/l10n/templates/private.pot index a405235f323..c92cf519b8c 100644 --- a/l10n/templates/private.pot +++ b/l10n/templates/private.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-09 01:55-0400\n" +"POT-Creation-Date: 2014-04-10 01:54-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot index 6ecfbc8c504..fb3582a4558 100644 --- a/l10n/templates/settings.pot +++ b/l10n/templates/settings.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-09 01:55-0400\n" +"POT-Creation-Date: 2014-04-10 01:54-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot index 1204e2bb4c9..88cd14c529d 100644 --- a/l10n/templates/user_ldap.pot +++ b/l10n/templates/user_ldap.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-09 01:55-0400\n" +"POT-Creation-Date: 2014-04-10 01:54-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -145,7 +145,7 @@ msgstr[1] "" msgid "Invalid Host" msgstr "" -#: lib/wizard.php:963 +#: lib/wizard.php:983 msgid "Could not find the desired feature" msgstr "" diff --git a/l10n/templates/user_webdavauth.pot b/l10n/templates/user_webdavauth.pot index c1012033296..47794841273 100644 --- a/l10n/templates/user_webdavauth.pot +++ b/l10n/templates/user_webdavauth.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-09 01:55-0400\n" +"POT-Creation-Date: 2014-04-10 01:54-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/tr/files_external.po b/l10n/tr/files_external.po index 8a805f876d8..02bf5aab5fe 100644 --- a/l10n/tr/files_external.po +++ b/l10n/tr/files_external.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-09 01:55-0400\n" -"PO-Revision-Date: 2014-04-09 05:55+0000\n" -"Last-Translator: I Robot\n" +"POT-Creation-Date: 2014-04-10 01:54-0400\n" +"PO-Revision-Date: 2014-04-09 20:50+0000\n" +"Last-Translator: volkangezer \n" "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -44,32 +44,32 @@ msgstr "Kaydedildi" #: lib/config.php:592 msgid "Note: " -msgstr "" +msgstr "Not: " #: lib/config.php:602 msgid " and " -msgstr "" +msgstr "ve" #: lib/config.php:624 #, php-format msgid "" "Note: The cURL support in PHP is not enabled or installed. Mounting " "of %s is not possible. Please ask your system administrator to install it." -msgstr "" +msgstr "Not: PHP'de cURL desteği etkin veya kurulu değil. %s bağlaması mümkün olmayacak. Lütfen kurulumu için sistem yöneticilerinizle iletişime geçin." #: lib/config.php:626 #, php-format msgid "" "Note: The FTP support in PHP is not enabled or installed. Mounting of" " %s is not possible. Please ask your system administrator to install it." -msgstr "" +msgstr "Not: PHP'de FTP desteği etkin veya kurulu değil. %s bağlaması mümkün olmayacak. Lütfen kurulumu için sistem yöneticilerinizle iletişime geçin." #: lib/config.php:628 #, php-format msgid "" "Note: \"%s\" is not installed. Mounting of %s is not possible. Please" " ask your system administrator to install it." -msgstr "" +msgstr "Not: \"%s\" kurulu değil. %s bağlaması mümkün olmayacak. Lütfen kurulumu için sistem yöneticilerinizle iletişime geçin." #: templates/settings.php:2 msgid "External Storage" diff --git a/l10n/tr/lib.po b/l10n/tr/lib.po index 470d8a70cb3..f067d809632 100644 --- a/l10n/tr/lib.po +++ b/l10n/tr/lib.po @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-09 01:55-0400\n" -"PO-Revision-Date: 2014-04-09 05:55+0000\n" -"Last-Translator: I Robot\n" +"POT-Creation-Date: 2014-04-10 01:54-0400\n" +"PO-Revision-Date: 2014-04-09 21:00+0000\n" +"Last-Translator: volkangezer \n" "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -345,16 +345,16 @@ msgstr "yıl önce" msgid "" "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", " "\"0-9\", and \"_.@-\"" -msgstr "" +msgstr "Kullanıcı adında sadece bu karakterlere izin verilmektedir: \"a-z\", \"A-Z\", \"0-9\", ve \"_.@-\"" #: private/user/manager.php:251 msgid "A valid username must be provided" -msgstr "" +msgstr "Geçerli bir kullanıcı adı mutlaka sağlanmalı" #: private/user/manager.php:255 msgid "A valid password must be provided" -msgstr "" +msgstr "Geçerli bir parola mutlaka sağlanmalı" #: private/user/manager.php:260 msgid "The username is already being used" -msgstr "" +msgstr "Bu kullanıcı adı zaten kullanımda" diff --git a/l10n/tr/settings.po b/l10n/tr/settings.po index f4015df4899..3f8e26a01f5 100644 --- a/l10n/tr/settings.po +++ b/l10n/tr/settings.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-09 01:55-0400\n" -"PO-Revision-Date: 2014-04-08 23:30+0000\n" +"POT-Creation-Date: 2014-04-10 01:54-0400\n" +"PO-Revision-Date: 2014-04-09 06:10+0000\n" "Last-Translator: volkangezer \n" "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/ug/lib.po b/l10n/ug/lib.po index ba3733d9f32..49eec14adb2 100644 --- a/l10n/ug/lib.po +++ b/l10n/ug/lib.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-09 01:55-0400\n" -"PO-Revision-Date: 2014-04-09 05:55+0000\n" +"POT-Creation-Date: 2014-04-10 01:54-0400\n" +"PO-Revision-Date: 2014-04-09 06:10+0000\n" "Last-Translator: I Robot\n" "Language-Team: Uighur (http://www.transifex.com/projects/p/owncloud/language/ug/)\n" "MIME-Version: 1.0\n" @@ -341,11 +341,11 @@ msgstr "" #: private/user/manager.php:251 msgid "A valid username must be provided" -msgstr "" +msgstr "چوقۇم ئىناۋەتلىك ئىشلەتكۈچى ئىسمىدىن بىرنى تەمىنلەش كېرەك" #: private/user/manager.php:255 msgid "A valid password must be provided" -msgstr "" +msgstr "چوقۇم ئىناۋەتلىك ئىم تەمىنلەش كېرەك" #: private/user/manager.php:260 msgid "The username is already being used" diff --git a/l10n/ug/settings.po b/l10n/ug/settings.po index a304d79b2fc..384a913c7f0 100644 --- a/l10n/ug/settings.po +++ b/l10n/ug/settings.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-03-26 01:55-0400\n" -"PO-Revision-Date: 2014-03-26 05:55+0000\n" +"POT-Creation-Date: 2014-04-10 01:54-0400\n" +"PO-Revision-Date: 2014-04-09 06:10+0000\n" "Last-Translator: I Robot\n" "Language-Team: Uighur (http://www.transifex.com/projects/p/owncloud/language/ug/)\n" "MIME-Version: 1.0\n" @@ -52,7 +52,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159 +#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149 msgid "Encryption" msgstr "شىفىرلاش" @@ -65,7 +65,7 @@ msgid "Unable to load list from App Store" msgstr "ئەپ بازىرىدىن تىزىمنى يۈكلىيەلمىدى" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 changepassword/controller.php:55 +#: ajax/togglegroups.php:20 changepassword/controller.php:49 msgid "Authentication error" msgstr "سالاھىيەت دەلىللەش خاتالىقى" @@ -127,32 +127,32 @@ msgstr "ئىشلەتكۈچىنى %s گۇرۇپپىدىن چىقىرىۋېتەل msgid "Couldn't update app." msgstr "ئەپنى يېڭىلىيالمايدۇ." -#: changepassword/controller.php:20 +#: changepassword/controller.php:17 msgid "Wrong password" msgstr "" -#: changepassword/controller.php:42 +#: changepassword/controller.php:36 msgid "No user supplied" msgstr "" -#: changepassword/controller.php:74 +#: changepassword/controller.php:68 msgid "" "Please provide an admin recovery password, otherwise all user data will be " "lost" msgstr "" -#: changepassword/controller.php:79 +#: changepassword/controller.php:73 msgid "" "Wrong admin recovery password. Please check the password and try again." msgstr "" -#: changepassword/controller.php:87 +#: changepassword/controller.php:81 msgid "" "Back-end doesn't support password change, but the users encryption key was " "successfully updated." msgstr "" -#: changepassword/controller.php:92 changepassword/controller.php:103 +#: changepassword/controller.php:86 changepassword/controller.php:97 msgid "Unable to change password" msgstr "" @@ -204,7 +204,7 @@ msgstr "ئەپنى يېڭىلاۋاتقاندا خاتالىق كۆرۈلدى" msgid "Error" msgstr "خاتالىق" -#: js/apps.js:153 templates/apps.php:54 +#: js/apps.js:153 templates/apps.php:55 msgid "Update" msgstr "يېڭىلا" @@ -212,31 +212,31 @@ msgstr "يېڭىلا" msgid "Updated" msgstr "يېڭىلاندى" -#: js/personal.js:246 +#: js/personal.js:243 msgid "Select a profile picture" msgstr "" -#: js/personal.js:277 +#: js/personal.js:274 msgid "Very weak password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:275 msgid "Weak password" msgstr "" -#: js/personal.js:279 +#: js/personal.js:276 msgid "So-so password" msgstr "" -#: js/personal.js:280 +#: js/personal.js:277 msgid "Good password" msgstr "" -#: js/personal.js:281 +#: js/personal.js:278 msgid "Strong password" msgstr "" -#: js/personal.js:316 +#: js/personal.js:313 msgid "Decrypting files... Please wait, this can take some time." msgstr "" @@ -285,7 +285,7 @@ msgstr "چوقۇم ئىناۋەتلىك ئىم تەمىنلەش كېرەك" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:49 personal.php:50 +#: personal.php:48 personal.php:49 msgid "__language_name__" msgstr "ئۇيغۇرچە" @@ -590,11 +590,11 @@ msgstr "تېخىمۇ كۆپ" msgid "Less" msgstr "ئاز" -#: templates/admin.php:416 templates/personal.php:181 +#: templates/admin.php:416 templates/personal.php:171 msgid "Version" msgstr "نەشرى" -#: templates/admin.php:420 templates/personal.php:184 +#: templates/admin.php:420 templates/personal.php:174 msgid "" "Developed by the ownCloud community, the -licensed by " msgstr "" @@ -665,108 +665,108 @@ msgstr "" msgid "You have used %s of the available %s" msgstr "" -#: templates/personal.php:39 templates/users.php:21 templates/users.php:87 +#: templates/personal.php:38 templates/users.php:21 templates/users.php:87 msgid "Password" msgstr "ئىم" -#: templates/personal.php:40 +#: templates/personal.php:39 msgid "Your password was changed" msgstr "ئىمىڭىز مۇۋەپپەقىيەتلىك ئۆزگەرتىلدى" -#: templates/personal.php:41 +#: templates/personal.php:40 msgid "Unable to change your password" msgstr "ئىمنى ئۆزگەرتكىلى بولمايدۇ." -#: templates/personal.php:43 +#: templates/personal.php:42 msgid "Current password" msgstr "نۆۋەتتىكى ئىم" -#: templates/personal.php:46 +#: templates/personal.php:45 msgid "New password" msgstr "يېڭى ئىم" -#: templates/personal.php:50 +#: templates/personal.php:49 msgid "Change password" msgstr "ئىم ئۆزگەرت" -#: templates/personal.php:64 templates/users.php:86 +#: templates/personal.php:61 templates/users.php:86 msgid "Full Name" msgstr "" -#: templates/personal.php:81 +#: templates/personal.php:76 msgid "Email" msgstr "تورخەت" -#: templates/personal.php:83 +#: templates/personal.php:78 msgid "Your email address" msgstr "تورخەت ئادرېسىڭىز" -#: templates/personal.php:86 +#: templates/personal.php:81 msgid "" "Fill in an email address to enable password recovery and receive " "notifications" msgstr "" -#: templates/personal.php:96 +#: templates/personal.php:89 msgid "Profile picture" msgstr "" -#: templates/personal.php:101 +#: templates/personal.php:94 msgid "Upload new" msgstr "" -#: templates/personal.php:103 +#: templates/personal.php:96 msgid "Select new from Files" msgstr "" -#: templates/personal.php:104 +#: templates/personal.php:97 msgid "Remove image" msgstr "" -#: templates/personal.php:105 +#: templates/personal.php:98 msgid "Either png or jpg. Ideally square but you will be able to crop it." msgstr "" -#: templates/personal.php:107 +#: templates/personal.php:100 msgid "Your avatar is provided by your original account." msgstr "" -#: templates/personal.php:111 +#: templates/personal.php:104 msgid "Cancel" msgstr "ۋاز كەچ" -#: templates/personal.php:112 +#: templates/personal.php:105 msgid "Choose as profile image" msgstr "" -#: templates/personal.php:120 templates/personal.php:121 +#: templates/personal.php:111 templates/personal.php:112 msgid "Language" msgstr "تىل" -#: templates/personal.php:140 +#: templates/personal.php:131 msgid "Help translate" msgstr "تەرجىمىگە ياردەم" -#: templates/personal.php:147 +#: templates/personal.php:137 msgid "WebDAV" msgstr "WebDAV" -#: templates/personal.php:149 +#: templates/personal.php:139 #, php-format msgid "" "Use this address to access your Files via " "WebDAV" msgstr "" -#: templates/personal.php:161 +#: templates/personal.php:151 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:167 +#: templates/personal.php:157 msgid "Log-in password" msgstr "" -#: templates/personal.php:172 +#: templates/personal.php:162 msgid "Decrypt all Files" msgstr "" diff --git a/l10n/uk/lib.po b/l10n/uk/lib.po index 4fd8fcdbe48..5724656194a 100644 --- a/l10n/uk/lib.po +++ b/l10n/uk/lib.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-09 01:55-0400\n" -"PO-Revision-Date: 2014-04-09 05:55+0000\n" +"POT-Creation-Date: 2014-04-10 01:54-0400\n" +"PO-Revision-Date: 2014-04-09 06:10+0000\n" "Last-Translator: I Robot\n" "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n" "MIME-Version: 1.0\n" @@ -349,11 +349,11 @@ msgstr "" #: private/user/manager.php:251 msgid "A valid username must be provided" -msgstr "" +msgstr "Потрібно задати вірне ім'я користувача" #: private/user/manager.php:255 msgid "A valid password must be provided" -msgstr "" +msgstr "Потрібно задати вірний пароль" #: private/user/manager.php:260 msgid "The username is already being used" diff --git a/l10n/uk/settings.po b/l10n/uk/settings.po index 3b7a588fc6d..5408c4789aa 100644 --- a/l10n/uk/settings.po +++ b/l10n/uk/settings.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-03-26 01:55-0400\n" -"PO-Revision-Date: 2014-03-26 05:55+0000\n" +"POT-Creation-Date: 2014-04-10 01:54-0400\n" +"PO-Revision-Date: 2014-04-09 06:10+0000\n" "Last-Translator: I Robot\n" "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n" "MIME-Version: 1.0\n" @@ -52,7 +52,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159 +#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149 msgid "Encryption" msgstr "Шифрування" @@ -65,7 +65,7 @@ msgid "Unable to load list from App Store" msgstr "Не вдалося завантажити список з App Store" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 changepassword/controller.php:55 +#: ajax/togglegroups.php:20 changepassword/controller.php:49 msgid "Authentication error" msgstr "Помилка автентифікації" @@ -127,32 +127,32 @@ msgstr "Не вдалося видалити користувача із гру msgid "Couldn't update app." msgstr "Не вдалося оновити програму. " -#: changepassword/controller.php:20 +#: changepassword/controller.php:17 msgid "Wrong password" msgstr "" -#: changepassword/controller.php:42 +#: changepassword/controller.php:36 msgid "No user supplied" msgstr "" -#: changepassword/controller.php:74 +#: changepassword/controller.php:68 msgid "" "Please provide an admin recovery password, otherwise all user data will be " "lost" msgstr "" -#: changepassword/controller.php:79 +#: changepassword/controller.php:73 msgid "" "Wrong admin recovery password. Please check the password and try again." msgstr "" -#: changepassword/controller.php:87 +#: changepassword/controller.php:81 msgid "" "Back-end doesn't support password change, but the users encryption key was " "successfully updated." msgstr "" -#: changepassword/controller.php:92 changepassword/controller.php:103 +#: changepassword/controller.php:86 changepassword/controller.php:97 msgid "Unable to change password" msgstr "" @@ -204,7 +204,7 @@ msgstr "Помилка при оновленні програми" msgid "Error" msgstr "Помилка" -#: js/apps.js:153 templates/apps.php:54 +#: js/apps.js:153 templates/apps.php:55 msgid "Update" msgstr "Оновити" @@ -212,31 +212,31 @@ msgstr "Оновити" msgid "Updated" msgstr "Оновлено" -#: js/personal.js:246 +#: js/personal.js:243 msgid "Select a profile picture" msgstr "" -#: js/personal.js:277 +#: js/personal.js:274 msgid "Very weak password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:275 msgid "Weak password" msgstr "" -#: js/personal.js:279 +#: js/personal.js:276 msgid "So-so password" msgstr "" -#: js/personal.js:280 +#: js/personal.js:277 msgid "Good password" msgstr "" -#: js/personal.js:281 +#: js/personal.js:278 msgid "Strong password" msgstr "" -#: js/personal.js:316 +#: js/personal.js:313 msgid "Decrypting files... Please wait, this can take some time." msgstr "" @@ -285,7 +285,7 @@ msgstr "Потрібно задати вірний пароль" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:49 personal.php:50 +#: personal.php:48 personal.php:49 msgid "__language_name__" msgstr "__language_name__" @@ -590,11 +590,11 @@ msgstr "Більше" msgid "Less" msgstr "Менше" -#: templates/admin.php:416 templates/personal.php:181 +#: templates/admin.php:416 templates/personal.php:171 msgid "Version" msgstr "Версія" -#: templates/admin.php:420 templates/personal.php:184 +#: templates/admin.php:420 templates/personal.php:174 msgid "" "Developed by the ownCloud community, the -licensed by " msgstr "-licensed by " @@ -665,108 +665,108 @@ msgstr "Показувати Майстер Налаштувань знову" msgid "You have used %s of the available %s" msgstr "Ви використали %s із доступних %s" -#: templates/personal.php:39 templates/users.php:21 templates/users.php:87 +#: templates/personal.php:38 templates/users.php:21 templates/users.php:87 msgid "Password" msgstr "Пароль" -#: templates/personal.php:40 +#: templates/personal.php:39 msgid "Your password was changed" msgstr "Ваш пароль змінено" -#: templates/personal.php:41 +#: templates/personal.php:40 msgid "Unable to change your password" msgstr "Не вдалося змінити Ваш пароль" -#: templates/personal.php:43 +#: templates/personal.php:42 msgid "Current password" msgstr "Поточний пароль" -#: templates/personal.php:46 +#: templates/personal.php:45 msgid "New password" msgstr "Новий пароль" -#: templates/personal.php:50 +#: templates/personal.php:49 msgid "Change password" msgstr "Змінити пароль" -#: templates/personal.php:64 templates/users.php:86 +#: templates/personal.php:61 templates/users.php:86 msgid "Full Name" msgstr "" -#: templates/personal.php:81 +#: templates/personal.php:76 msgid "Email" msgstr "Ел.пошта" -#: templates/personal.php:83 +#: templates/personal.php:78 msgid "Your email address" msgstr "Ваша адреса електронної пошти" -#: templates/personal.php:86 +#: templates/personal.php:81 msgid "" "Fill in an email address to enable password recovery and receive " "notifications" msgstr "" -#: templates/personal.php:96 +#: templates/personal.php:89 msgid "Profile picture" msgstr "" -#: templates/personal.php:101 +#: templates/personal.php:94 msgid "Upload new" msgstr "" -#: templates/personal.php:103 +#: templates/personal.php:96 msgid "Select new from Files" msgstr "" -#: templates/personal.php:104 +#: templates/personal.php:97 msgid "Remove image" msgstr "" -#: templates/personal.php:105 +#: templates/personal.php:98 msgid "Either png or jpg. Ideally square but you will be able to crop it." msgstr "" -#: templates/personal.php:107 +#: templates/personal.php:100 msgid "Your avatar is provided by your original account." msgstr "" -#: templates/personal.php:111 +#: templates/personal.php:104 msgid "Cancel" msgstr "Відмінити" -#: templates/personal.php:112 +#: templates/personal.php:105 msgid "Choose as profile image" msgstr "" -#: templates/personal.php:120 templates/personal.php:121 +#: templates/personal.php:111 templates/personal.php:112 msgid "Language" msgstr "Мова" -#: templates/personal.php:140 +#: templates/personal.php:131 msgid "Help translate" msgstr "Допомогти з перекладом" -#: templates/personal.php:147 +#: templates/personal.php:137 msgid "WebDAV" msgstr "WebDAV" -#: templates/personal.php:149 +#: templates/personal.php:139 #, php-format msgid "" "Use this address to access your Files via " "WebDAV" msgstr "" -#: templates/personal.php:161 +#: templates/personal.php:151 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:167 +#: templates/personal.php:157 msgid "Log-in password" msgstr "" -#: templates/personal.php:172 +#: templates/personal.php:162 msgid "Decrypt all Files" msgstr "" diff --git a/l10n/zh_CN/lib.po b/l10n/zh_CN/lib.po index df5922a64b7..81c8dfbaedb 100644 --- a/l10n/zh_CN/lib.po +++ b/l10n/zh_CN/lib.po @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-09 01:55-0400\n" -"PO-Revision-Date: 2014-04-09 05:55+0000\n" +"POT-Creation-Date: 2014-04-10 01:54-0400\n" +"PO-Revision-Date: 2014-04-09 06:10+0000\n" "Last-Translator: I Robot\n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n" "MIME-Version: 1.0\n" @@ -346,11 +346,11 @@ msgstr "" #: private/user/manager.php:251 msgid "A valid username must be provided" -msgstr "" +msgstr "必须提供合法的用户名" #: private/user/manager.php:255 msgid "A valid password must be provided" -msgstr "" +msgstr "必须提供合法的密码" #: private/user/manager.php:260 msgid "The username is already being used" diff --git a/l10n/zh_CN/settings.po b/l10n/zh_CN/settings.po index 34e1ff4df24..4b19e0c792f 100644 --- a/l10n/zh_CN/settings.po +++ b/l10n/zh_CN/settings.po @@ -14,8 +14,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-03-26 01:55-0400\n" -"PO-Revision-Date: 2014-03-26 05:55+0000\n" +"POT-Creation-Date: 2014-04-10 01:54-0400\n" +"PO-Revision-Date: 2014-04-09 06:10+0000\n" "Last-Translator: I Robot\n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n" "MIME-Version: 1.0\n" @@ -58,7 +58,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159 +#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149 msgid "Encryption" msgstr "加密" @@ -71,7 +71,7 @@ msgid "Unable to load list from App Store" msgstr "无法从应用商店载入列表" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 changepassword/controller.php:55 +#: ajax/togglegroups.php:20 changepassword/controller.php:49 msgid "Authentication error" msgstr "认证出错" @@ -133,32 +133,32 @@ msgstr "无法从组%s中移除用户" msgid "Couldn't update app." msgstr "无法更新 app。" -#: changepassword/controller.php:20 +#: changepassword/controller.php:17 msgid "Wrong password" msgstr "错误密码" -#: changepassword/controller.php:42 +#: changepassword/controller.php:36 msgid "No user supplied" msgstr "没有满足的用户" -#: changepassword/controller.php:74 +#: changepassword/controller.php:68 msgid "" "Please provide an admin recovery password, otherwise all user data will be " "lost" msgstr "" -#: changepassword/controller.php:79 +#: changepassword/controller.php:73 msgid "" "Wrong admin recovery password. Please check the password and try again." msgstr "" -#: changepassword/controller.php:87 +#: changepassword/controller.php:81 msgid "" "Back-end doesn't support password change, but the users encryption key was " "successfully updated." msgstr "" -#: changepassword/controller.php:92 changepassword/controller.php:103 +#: changepassword/controller.php:86 changepassword/controller.php:97 msgid "Unable to change password" msgstr "不能更改密码" @@ -210,7 +210,7 @@ msgstr "更新 app 时出错" msgid "Error" msgstr "错误" -#: js/apps.js:153 templates/apps.php:54 +#: js/apps.js:153 templates/apps.php:55 msgid "Update" msgstr "更新" @@ -218,31 +218,31 @@ msgstr "更新" msgid "Updated" msgstr "已更新" -#: js/personal.js:246 +#: js/personal.js:243 msgid "Select a profile picture" msgstr "" -#: js/personal.js:277 +#: js/personal.js:274 msgid "Very weak password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:275 msgid "Weak password" msgstr "" -#: js/personal.js:279 +#: js/personal.js:276 msgid "So-so password" msgstr "" -#: js/personal.js:280 +#: js/personal.js:277 msgid "Good password" msgstr "" -#: js/personal.js:281 +#: js/personal.js:278 msgid "Strong password" msgstr "" -#: js/personal.js:316 +#: js/personal.js:313 msgid "Decrypting files... Please wait, this can take some time." msgstr "正在解密文件... 请稍等，可能需要一些时间。" @@ -291,7 +291,7 @@ msgstr "必须提供合法的密码" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "警告：用户 \"{user}\" 的家目录已存在" -#: personal.php:49 personal.php:50 +#: personal.php:48 personal.php:49 msgid "__language_name__" msgstr "简体中文" @@ -596,11 +596,11 @@ msgstr "更多" msgid "Less" msgstr "更少" -#: templates/admin.php:416 templates/personal.php:181 +#: templates/admin.php:416 templates/personal.php:171 msgid "Version" msgstr "版本" -#: templates/admin.php:420 templates/personal.php:184 +#: templates/admin.php:420 templates/personal.php:174 msgid "" "Developed by the ownCloud community, the -licensed by " msgstr "-核准： " @@ -671,108 +671,108 @@ msgstr "再次显示首次运行向导" msgid "You have used %s of the available %s" msgstr "你已使用 %s，有效空间 %s" -#: templates/personal.php:39 templates/users.php:21 templates/users.php:87 +#: templates/personal.php:38 templates/users.php:21 templates/users.php:87 msgid "Password" msgstr "密码" -#: templates/personal.php:40 +#: templates/personal.php:39 msgid "Your password was changed" msgstr "密码已修改" -#: templates/personal.php:41 +#: templates/personal.php:40 msgid "Unable to change your password" msgstr "无法修改密码" -#: templates/personal.php:43 +#: templates/personal.php:42 msgid "Current password" msgstr "当前密码" -#: templates/personal.php:46 +#: templates/personal.php:45 msgid "New password" msgstr "新密码" -#: templates/personal.php:50 +#: templates/personal.php:49 msgid "Change password" msgstr "修改密码" -#: templates/personal.php:64 templates/users.php:86 +#: templates/personal.php:61 templates/users.php:86 msgid "Full Name" msgstr "全名" -#: templates/personal.php:81 +#: templates/personal.php:76 msgid "Email" msgstr "电子邮件" -#: templates/personal.php:83 +#: templates/personal.php:78 msgid "Your email address" msgstr "您的电子邮件" -#: templates/personal.php:86 +#: templates/personal.php:81 msgid "" "Fill in an email address to enable password recovery and receive " "notifications" msgstr "" -#: templates/personal.php:96 +#: templates/personal.php:89 msgid "Profile picture" msgstr "联系人图片" -#: templates/personal.php:101 +#: templates/personal.php:94 msgid "Upload new" msgstr "上传新的" -#: templates/personal.php:103 +#: templates/personal.php:96 msgid "Select new from Files" msgstr "从文件中选择一个新的" -#: templates/personal.php:104 +#: templates/personal.php:97 msgid "Remove image" msgstr "移除图片" -#: templates/personal.php:105 +#: templates/personal.php:98 msgid "Either png or jpg. Ideally square but you will be able to crop it." msgstr "" -#: templates/personal.php:107 +#: templates/personal.php:100 msgid "Your avatar is provided by your original account." msgstr "您的头像由您的原始账户所提供。" -#: templates/personal.php:111 +#: templates/personal.php:104 msgid "Cancel" msgstr "取消" -#: templates/personal.php:112 +#: templates/personal.php:105 msgid "Choose as profile image" msgstr "" -#: templates/personal.php:120 templates/personal.php:121 +#: templates/personal.php:111 templates/personal.php:112 msgid "Language" msgstr "语言" -#: templates/personal.php:140 +#: templates/personal.php:131 msgid "Help translate" msgstr "帮助翻译" -#: templates/personal.php:147 +#: templates/personal.php:137 msgid "WebDAV" msgstr "WebDAV" -#: templates/personal.php:149 +#: templates/personal.php:139 #, php-format msgid "" "Use this address to access your Files via " "WebDAV" msgstr "使用这个地址 通过 WebDAV 访问您的文件" -#: templates/personal.php:161 +#: templates/personal.php:151 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:167 +#: templates/personal.php:157 msgid "Log-in password" msgstr "登录密码" -#: templates/personal.php:172 +#: templates/personal.php:162 msgid "Decrypt all Files" msgstr "解密所有文件" diff --git a/l10n/zh_TW/lib.po b/l10n/zh_TW/lib.po index c10955598bf..509f97f58f7 100644 --- a/l10n/zh_TW/lib.po +++ b/l10n/zh_TW/lib.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-09 01:55-0400\n" -"PO-Revision-Date: 2014-04-09 05:55+0000\n" +"POT-Creation-Date: 2014-04-10 01:54-0400\n" +"PO-Revision-Date: 2014-04-09 06:10+0000\n" "Last-Translator: I Robot\n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n" "MIME-Version: 1.0\n" @@ -343,11 +343,11 @@ msgstr "" #: private/user/manager.php:251 msgid "A valid username must be provided" -msgstr "" +msgstr "必須提供一個有效的用戶名" #: private/user/manager.php:255 msgid "A valid password must be provided" -msgstr "" +msgstr "一定要提供一個有效的密碼" #: private/user/manager.php:260 msgid "The username is already being used" diff --git a/l10n/zh_TW/settings.po b/l10n/zh_TW/settings.po index 963c82e52c7..df741fa89fc 100644 --- a/l10n/zh_TW/settings.po +++ b/l10n/zh_TW/settings.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-03-26 01:55-0400\n" -"PO-Revision-Date: 2014-03-26 05:55+0000\n" +"POT-Creation-Date: 2014-04-10 01:54-0400\n" +"PO-Revision-Date: 2014-04-09 06:10+0000\n" "Last-Translator: I Robot\n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n" "MIME-Version: 1.0\n" @@ -52,7 +52,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159 +#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149 msgid "Encryption" msgstr "加密" @@ -65,7 +65,7 @@ msgid "Unable to load list from App Store" msgstr "無法從 App Store 讀取清單" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 changepassword/controller.php:55 +#: ajax/togglegroups.php:20 changepassword/controller.php:49 msgid "Authentication error" msgstr "認證錯誤" @@ -127,32 +127,32 @@ msgstr "使用者移出群組 %s 錯誤" msgid "Couldn't update app." msgstr "無法更新應用程式" -#: changepassword/controller.php:20 +#: changepassword/controller.php:17 msgid "Wrong password" msgstr "密碼錯誤" -#: changepassword/controller.php:42 +#: changepassword/controller.php:36 msgid "No user supplied" msgstr "未提供使用者" -#: changepassword/controller.php:74 +#: changepassword/controller.php:68 msgid "" "Please provide an admin recovery password, otherwise all user data will be " "lost" msgstr "請提供管理者還原密碼，否則會遺失所有使用者資料" -#: changepassword/controller.php:79 +#: changepassword/controller.php:73 msgid "" "Wrong admin recovery password. Please check the password and try again." msgstr "錯誤的管理者還原密碼" -#: changepassword/controller.php:87 +#: changepassword/controller.php:81 msgid "" "Back-end doesn't support password change, but the users encryption key was " "successfully updated." msgstr "後端不支援變更密碼，但成功更新使用者的加密金鑰" -#: changepassword/controller.php:92 changepassword/controller.php:103 +#: changepassword/controller.php:86 changepassword/controller.php:97 msgid "Unable to change password" msgstr "無法修改密碼" @@ -204,7 +204,7 @@ msgstr "更新應用程式錯誤" msgid "Error" msgstr "錯誤" -#: js/apps.js:153 templates/apps.php:54 +#: js/apps.js:153 templates/apps.php:55 msgid "Update" msgstr "更新" @@ -212,31 +212,31 @@ msgstr "更新" msgid "Updated" msgstr "已更新" -#: js/personal.js:246 +#: js/personal.js:243 msgid "Select a profile picture" msgstr "選擇大頭貼" -#: js/personal.js:277 +#: js/personal.js:274 msgid "Very weak password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:275 msgid "Weak password" msgstr "" -#: js/personal.js:279 +#: js/personal.js:276 msgid "So-so password" msgstr "" -#: js/personal.js:280 +#: js/personal.js:277 msgid "Good password" msgstr "" -#: js/personal.js:281 +#: js/personal.js:278 msgid "Strong password" msgstr "" -#: js/personal.js:316 +#: js/personal.js:313 msgid "Decrypting files... Please wait, this can take some time." msgstr "檔案解密中，請稍候。" @@ -285,7 +285,7 @@ msgstr "一定要提供一個有效的密碼" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "警告：使用者 {user} 的家目錄已經存在" -#: personal.php:49 personal.php:50 +#: personal.php:48 personal.php:49 msgid "__language_name__" msgstr "__language_name__" @@ -590,11 +590,11 @@ msgstr "更多" msgid "Less" msgstr "更少" -#: templates/admin.php:416 templates/personal.php:181 +#: templates/admin.php:416 templates/personal.php:171 msgid "Version" msgstr "版本" -#: templates/admin.php:420 templates/personal.php:184 +#: templates/admin.php:420 templates/personal.php:174 msgid "" "Developed by the ownCloud community, the -licensed by " msgstr "-核准: " @@ -665,108 +665,108 @@ msgstr "再次顯示首次使用精靈" msgid "You have used %s of the available %s" msgstr "您已經使用了 %s ，目前可用空間為 %s" -#: templates/personal.php:39 templates/users.php:21 templates/users.php:87 +#: templates/personal.php:38 templates/users.php:21 templates/users.php:87 msgid "Password" msgstr "密碼" -#: templates/personal.php:40 +#: templates/personal.php:39 msgid "Your password was changed" msgstr "你的密碼已更改" -#: templates/personal.php:41 +#: templates/personal.php:40 msgid "Unable to change your password" msgstr "無法變更您的密碼" -#: templates/personal.php:43 +#: templates/personal.php:42 msgid "Current password" msgstr "目前密碼" -#: templates/personal.php:46 +#: templates/personal.php:45 msgid "New password" msgstr "新密碼" -#: templates/personal.php:50 +#: templates/personal.php:49 msgid "Change password" msgstr "變更密碼" -#: templates/personal.php:64 templates/users.php:86 +#: templates/personal.php:61 templates/users.php:86 msgid "Full Name" msgstr "" -#: templates/personal.php:81 +#: templates/personal.php:76 msgid "Email" msgstr "信箱" -#: templates/personal.php:83 +#: templates/personal.php:78 msgid "Your email address" msgstr "您的電子郵件信箱" -#: templates/personal.php:86 +#: templates/personal.php:81 msgid "" "Fill in an email address to enable password recovery and receive " "notifications" msgstr "" -#: templates/personal.php:96 +#: templates/personal.php:89 msgid "Profile picture" msgstr "個人資料照片" -#: templates/personal.php:101 +#: templates/personal.php:94 msgid "Upload new" msgstr "上傳新的" -#: templates/personal.php:103 +#: templates/personal.php:96 msgid "Select new from Files" msgstr "從已上傳的檔案中選一個" -#: templates/personal.php:104 +#: templates/personal.php:97 msgid "Remove image" msgstr "移除圖片" -#: templates/personal.php:105 +#: templates/personal.php:98 msgid "Either png or jpg. Ideally square but you will be able to crop it." msgstr "可以使用 png 或 jpg 格式，最好是方形的，但是您之後也可以裁剪它" -#: templates/personal.php:107 +#: templates/personal.php:100 msgid "Your avatar is provided by your original account." msgstr "" -#: templates/personal.php:111 +#: templates/personal.php:104 msgid "Cancel" msgstr "取消" -#: templates/personal.php:112 +#: templates/personal.php:105 msgid "Choose as profile image" msgstr "設定為大頭貼" -#: templates/personal.php:120 templates/personal.php:121 +#: templates/personal.php:111 templates/personal.php:112 msgid "Language" msgstr "語言" -#: templates/personal.php:140 +#: templates/personal.php:131 msgid "Help translate" msgstr "幫助翻譯" -#: templates/personal.php:147 +#: templates/personal.php:137 msgid "WebDAV" msgstr "WebDAV" -#: templates/personal.php:149 +#: templates/personal.php:139 #, php-format msgid "" "Use this address to access your Files via " "WebDAV" msgstr "使用這個地址來透過 WebDAV 存取檔案" -#: templates/personal.php:161 +#: templates/personal.php:151 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:167 +#: templates/personal.php:157 msgid "Log-in password" msgstr "登入密碼" -#: templates/personal.php:172 +#: templates/personal.php:162 msgid "Decrypt all Files" msgstr "解密所有檔案" diff --git a/lib/l10n/ar.php b/lib/l10n/ar.php index 6287a53d619..c8b51a3bb7e 100644 --- a/lib/l10n/ar.php +++ b/lib/l10n/ar.php @@ -56,6 +56,8 @@ $TRANSLATIONS = array( "last month" => "الشهر الماضي", "_%n month ago_::_%n months ago_" => array("","","","","",""), "last year" => "السنةالماضية", -"years ago" => "سنة مضت" +"years ago" => "سنة مضت", +"A valid username must be provided" => "يجب ادخال اسم مستخدم صحيح", +"A valid password must be provided" => "يجب ادخال كلمة مرور صحيحة" ); $PLURAL_FORMS = "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/lib/l10n/ast.php b/lib/l10n/ast.php index 6b76d8126ee..93a20beb5d4 100644 --- a/lib/l10n/ast.php +++ b/lib/l10n/ast.php @@ -2,8 +2,16 @@ $TRANSLATIONS = array( "Personal" => "Personal", "Settings" => "Axustes", +"Users" => "Usuarios", +"Failed to upgrade \"%s\"." => "Fallu al anovar \"%s\".", +"Invalid image" => "Imaxe inválida", +"Application is not enabled" => "L'aplicación nun ta habilitada", "Files" => "Ficheros", "Text" => "Testu", +"Images" => "Imaxes", +"Set an admin username." => "Afitar nome d'usuariu p'almin", +"Set an admin password." => "Afitar contraseña p'almin", +"Could not find category \"%s\"" => "Nun pudo alcontrase la estaya \"%s.\"", "seconds ago" => "fai segundos", "_%n minute ago_::_%n minutes ago_" => array("","fai %n minutos"), "_%n hour ago_::_%n hours ago_" => array("","fai %n hores"), diff --git a/lib/l10n/ca.php b/lib/l10n/ca.php index 88bb8ec9eee..477cdf2925b 100644 --- a/lib/l10n/ca.php +++ b/lib/l10n/ca.php @@ -66,6 +66,9 @@ $TRANSLATIONS = array( "last month" => "el mes passat", "_%n month ago_::_%n months ago_" => array("fa %n mes","fa %n mesos"), "last year" => "l'any passat", -"years ago" => "anys enrere" +"years ago" => "anys enrere", +"A valid username must be provided" => "Heu de facilitar un nom d'usuari vàlid", +"A valid password must be provided" => "Heu de facilitar una contrasenya vàlida", +"The username is already being used" => "El nom d'usuari ja està en ús" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/lib/l10n/cs_CZ.php b/lib/l10n/cs_CZ.php index 6b5c8441ca1..d535b97f631 100644 --- a/lib/l10n/cs_CZ.php +++ b/lib/l10n/cs_CZ.php @@ -66,6 +66,9 @@ $TRANSLATIONS = array( "last month" => "minulý měsíc", "_%n month ago_::_%n months ago_" => array("před %n měsícem","před %n měsíci","před %n měsíci"), "last year" => "minulý rok", -"years ago" => "před lety" +"years ago" => "před lety", +"A valid username must be provided" => "Musíte zadat platné uživatelské jméno", +"A valid password must be provided" => "Musíte zadat platné heslo", +"The username is already being used" => "Uživatelské jméno je již využíváno" ); $PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"; diff --git a/lib/l10n/da.php b/lib/l10n/da.php index c3166000727..3be45001030 100644 --- a/lib/l10n/da.php +++ b/lib/l10n/da.php @@ -66,6 +66,8 @@ $TRANSLATIONS = array( "last month" => "sidste måned", "_%n month ago_::_%n months ago_" => array("%n måned siden","%n måneder siden"), "last year" => "sidste år", -"years ago" => "år siden" +"years ago" => "år siden", +"A valid username must be provided" => "Et gyldigt brugernavn skal angives", +"A valid password must be provided" => "En gyldig adgangskode skal angives" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/lib/l10n/de.php b/lib/l10n/de.php index d644582b91e..297cc57bde7 100644 --- a/lib/l10n/de.php +++ b/lib/l10n/de.php @@ -66,6 +66,10 @@ $TRANSLATIONS = array( "last month" => "Letzten Monat", "_%n month ago_::_%n months ago_" => array("Vor %n Monat","Vor %n Monaten"), "last year" => "Letztes Jahr", -"years ago" => "Vor Jahren" +"years ago" => "Vor Jahren", +"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" => "Folgende Zeichen sind im Benutzernamen erlaubt: \"a-z\", \"A-Z\", \"0-9\" und \"_.@-\"", +"A valid username must be provided" => "Es muss ein gültiger Benutzername angegeben werden", +"A valid password must be provided" => "Es muss ein gültiges Passwort angegeben werden", +"The username is already being used" => "Dieser Benutzername existiert bereits" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/lib/l10n/de_CH.php b/lib/l10n/de_CH.php index fe1a519ccf7..e034cc3c209 100644 --- a/lib/l10n/de_CH.php +++ b/lib/l10n/de_CH.php @@ -47,6 +47,8 @@ $TRANSLATIONS = array( "last month" => "Letzten Monat", "_%n month ago_::_%n months ago_" => array("","Vor %n Monaten"), "last year" => "Letztes Jahr", -"years ago" => "Vor Jahren" +"years ago" => "Vor Jahren", +"A valid username must be provided" => "Es muss ein gültiger Benutzername angegeben werden", +"A valid password must be provided" => "Es muss ein gültiges Passwort angegeben werden" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/lib/l10n/de_DE.php b/lib/l10n/de_DE.php index 85ed7e5c80a..d0a4a9b1c6e 100644 --- a/lib/l10n/de_DE.php +++ b/lib/l10n/de_DE.php @@ -66,6 +66,10 @@ $TRANSLATIONS = array( "last month" => "Letzten Monat", "_%n month ago_::_%n months ago_" => array("Vor %n Monat","Vor %n Monaten"), "last year" => "Letztes Jahr", -"years ago" => "Vor Jahren" +"years ago" => "Vor Jahren", +"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" => "Folgende Zeichen sind im Benutzernamen erlaubt: \"a-z\", \"A-Z\", \"0-9\" und \"_.@-\"", +"A valid username must be provided" => "Es muss ein gültiger Benutzername angegeben werden", +"A valid password must be provided" => "Es muss ein gültiges Passwort angegeben werden", +"The username is already being used" => "Der Benutzername existiert bereits" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/lib/l10n/el.php b/lib/l10n/el.php index a169ae38649..244cc50b847 100644 --- a/lib/l10n/el.php +++ b/lib/l10n/el.php @@ -66,6 +66,8 @@ $TRANSLATIONS = array( "last month" => "τελευταίο μήνα", "_%n month ago_::_%n months ago_" => array("","%n μήνες πριν"), "last year" => "τελευταίο χρόνο", -"years ago" => "χρόνια πριν" +"years ago" => "χρόνια πριν", +"A valid username must be provided" => "Πρέπει να δοθεί έγκυρο όνομα χρήστη", +"A valid password must be provided" => "Πρέπει να δοθεί έγκυρο συνθηματικό" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/lib/l10n/en_GB.php b/lib/l10n/en_GB.php index 7d2246eb66b..e1c49392bd8 100644 --- a/lib/l10n/en_GB.php +++ b/lib/l10n/en_GB.php @@ -66,6 +66,10 @@ $TRANSLATIONS = array( "last month" => "last month", "_%n month ago_::_%n months ago_" => array("%n month ago","%n months ago"), "last year" => "last year", -"years ago" => "years ago" +"years ago" => "years ago", +"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" => "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"", +"A valid username must be provided" => "A valid username must be provided", +"A valid password must be provided" => "A valid password must be provided", +"The username is already being used" => "The username is already being used" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/lib/l10n/es.php b/lib/l10n/es.php index 14d6435c891..c01239cca7a 100644 --- a/lib/l10n/es.php +++ b/lib/l10n/es.php @@ -66,6 +66,10 @@ $TRANSLATIONS = array( "last month" => "mes pasado", "_%n month ago_::_%n months ago_" => array("Hace %n mes","Hace %n meses"), "last year" => "año pasado", -"years ago" => "hace años" +"years ago" => "hace años", +"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" => "Solo los siguientes caracteres están permitidos en un nombre de usuario: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"", +"A valid username must be provided" => "Se debe proporcionar un nombre de usuario válido", +"A valid password must be provided" => "Se debe proporcionar una contraseña válida", +"The username is already being used" => "El nombre de usuario ya está en uso" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/lib/l10n/es_AR.php b/lib/l10n/es_AR.php index a925e22ba88..34775b16b22 100644 --- a/lib/l10n/es_AR.php +++ b/lib/l10n/es_AR.php @@ -60,6 +60,8 @@ $TRANSLATIONS = array( "last month" => "el mes pasado", "_%n month ago_::_%n months ago_" => array("Hace %n mes","Hace %n meses"), "last year" => "el año pasado", -"years ago" => "años atrás" +"years ago" => "años atrás", +"A valid username must be provided" => "Debe ingresar un nombre de usuario válido", +"A valid password must be provided" => "Debe ingresar una contraseña válida" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/lib/l10n/es_MX.php b/lib/l10n/es_MX.php index 2f0ed33f6b3..befb076b7de 100644 --- a/lib/l10n/es_MX.php +++ b/lib/l10n/es_MX.php @@ -60,6 +60,8 @@ $TRANSLATIONS = array( "last month" => "mes pasado", "_%n month ago_::_%n months ago_" => array("Hace %n mes","Hace %n meses"), "last year" => "año pasado", -"years ago" => "hace años" +"years ago" => "hace años", +"A valid username must be provided" => "Se debe proporcionar un nombre de usuario válido", +"A valid password must be provided" => "Se debe proporcionar una contraseña válida" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/lib/l10n/et_EE.php b/lib/l10n/et_EE.php index 7d8cc0f4b49..883c7323c0c 100644 --- a/lib/l10n/et_EE.php +++ b/lib/l10n/et_EE.php @@ -66,6 +66,9 @@ $TRANSLATIONS = array( "last month" => "viimasel kuul", "_%n month ago_::_%n months ago_" => array("","%n kuud tagasi"), "last year" => "viimasel aastal", -"years ago" => "aastat tagasi" +"years ago" => "aastat tagasi", +"A valid username must be provided" => "Sisesta nõuetele vastav kasutajatunnus", +"A valid password must be provided" => "Sisesta nõuetele vastav parool", +"The username is already being used" => "Kasutajanimi on juba kasutuses" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/lib/l10n/eu.php b/lib/l10n/eu.php index 58c198cff14..7a8a11f5b32 100644 --- a/lib/l10n/eu.php +++ b/lib/l10n/eu.php @@ -60,6 +60,9 @@ $TRANSLATIONS = array( "last month" => "joan den hilabetean", "_%n month ago_::_%n months ago_" => array("orain dela hilabete %n","orain dela %n hilabete"), "last year" => "joan den urtean", -"years ago" => "urte" +"years ago" => "urte", +"A valid username must be provided" => "Baliozko erabiltzaile izena eman behar da", +"A valid password must be provided" => "Baliozko pasahitza eman behar da", +"The username is already being used" => "Erabiltzaile izena dagoeneko erabiltzen ari da" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/lib/l10n/fa.php b/lib/l10n/fa.php index 7323ffe1918..c1c16cf94b4 100644 --- a/lib/l10n/fa.php +++ b/lib/l10n/fa.php @@ -42,6 +42,8 @@ $TRANSLATIONS = array( "last month" => "ماه قبل", "_%n month ago_::_%n months ago_" => array(""), "last year" => "سال قبل", -"years ago" => "سال‌های قبل" +"years ago" => "سال‌های قبل", +"A valid username must be provided" => "نام کاربری صحیح باید وارد شود", +"A valid password must be provided" => "رمز عبور صحیح باید وارد شود" ); $PLURAL_FORMS = "nplurals=1; plural=0;"; diff --git a/lib/l10n/fi_FI.php b/lib/l10n/fi_FI.php index 018e4c04c4f..13e97e1b677 100644 --- a/lib/l10n/fi_FI.php +++ b/lib/l10n/fi_FI.php @@ -59,6 +59,10 @@ $TRANSLATIONS = array( "last month" => "viime kuussa", "_%n month ago_::_%n months ago_" => array("%n kuukausi sitten","%n kuukautta sitten"), "last year" => "viime vuonna", -"years ago" => "vuotta sitten" +"years ago" => "vuotta sitten", +"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" => "Vain seuraavat merkit ovat sallittuja käyttäjätunnuksessa: \"a-z\", \"A-Z\", \"0-9\" ja \"_.@-\"", +"A valid username must be provided" => "Anna kelvollinen käyttäjätunnus", +"A valid password must be provided" => "Anna kelvollinen salasana", +"The username is already being used" => "Käyttäjätunnus on jo käytössä" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/lib/l10n/fr.php b/lib/l10n/fr.php index d866fb664ee..52cbfb85b40 100644 --- a/lib/l10n/fr.php +++ b/lib/l10n/fr.php @@ -66,6 +66,9 @@ $TRANSLATIONS = array( "last month" => "le mois dernier", "_%n month ago_::_%n months ago_" => array("","Il y a %n mois"), "last year" => "l'année dernière", -"years ago" => "il y a plusieurs années" +"years ago" => "il y a plusieurs années", +"A valid username must be provided" => "Un nom d'utilisateur valide doit être saisi", +"A valid password must be provided" => "Un mot de passe valide doit être saisi", +"The username is already being used" => "Le nom d'utilisateur est déjà utilisé" ); $PLURAL_FORMS = "nplurals=2; plural=(n > 1);"; diff --git a/lib/l10n/gl.php b/lib/l10n/gl.php index cc1351c2f15..0da1695e37f 100644 --- a/lib/l10n/gl.php +++ b/lib/l10n/gl.php @@ -66,6 +66,10 @@ $TRANSLATIONS = array( "last month" => "último mes", "_%n month ago_::_%n months ago_" => array("hai %n mes","hai %n meses"), "last year" => "último ano", -"years ago" => "anos atrás" +"years ago" => "anos atrás", +"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" => "Só se permiten os seguintes caracteres no nome de usuario: «a-z», «A-Z», «0-9», e «_.@-»", +"A valid username must be provided" => "Debe fornecer un nome de usuario", +"A valid password must be provided" => "Debe fornecer un contrasinal", +"The username is already being used" => "Este nome de usuario xa está a ser usado" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/lib/l10n/he.php b/lib/l10n/he.php index 6a9020009e9..27267c2e34d 100644 --- a/lib/l10n/he.php +++ b/lib/l10n/he.php @@ -29,6 +29,8 @@ $TRANSLATIONS = array( "last month" => "חודש שעבר", "_%n month ago_::_%n months ago_" => array("","לפני %n חודשים"), "last year" => "שנה שעברה", -"years ago" => "שנים" +"years ago" => "שנים", +"A valid username must be provided" => "יש לספק שם משתמש תקני", +"A valid password must be provided" => "יש לספק ססמה תקנית" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/lib/l10n/hu_HU.php b/lib/l10n/hu_HU.php index 2a03f72a51e..0637773d17c 100644 --- a/lib/l10n/hu_HU.php +++ b/lib/l10n/hu_HU.php @@ -60,6 +60,9 @@ $TRANSLATIONS = array( "last month" => "múlt hónapban", "_%n month ago_::_%n months ago_" => array("%n hónappal ezelőtt","%n hónappal ezelőtt"), "last year" => "tavaly", -"years ago" => "több éve" +"years ago" => "több éve", +"A valid username must be provided" => "Érvényes felhasználónevet kell megadnia", +"A valid password must be provided" => "Érvényes jelszót kell megadnia", +"The username is already being used" => "Ez a bejelentkezési név már foglalt" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/lib/l10n/id.php b/lib/l10n/id.php index 76dda80cf70..d694967cd42 100644 --- a/lib/l10n/id.php +++ b/lib/l10n/id.php @@ -60,6 +60,8 @@ $TRANSLATIONS = array( "last month" => "bulan kemarin", "_%n month ago_::_%n months ago_" => array("%n bulan yang lalu"), "last year" => "tahun kemarin", -"years ago" => "beberapa tahun lalu" +"years ago" => "beberapa tahun lalu", +"A valid username must be provided" => "Tuliskan nama pengguna yang valid", +"A valid password must be provided" => "Tuliskan sandi yang valid" ); $PLURAL_FORMS = "nplurals=1; plural=0;"; diff --git a/lib/l10n/it.php b/lib/l10n/it.php index ed1cbc2e31a..b76b5060a4d 100644 --- a/lib/l10n/it.php +++ b/lib/l10n/it.php @@ -66,6 +66,10 @@ $TRANSLATIONS = array( "last month" => "mese scorso", "_%n month ago_::_%n months ago_" => array("%n mese fa","%n mesi fa"), "last year" => "anno scorso", -"years ago" => "anni fa" +"years ago" => "anni fa", +"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" => "Solo i seguenti caratteri sono ammessi in un nome utente: \"a-z\", \"A-Z\", \"0-9\", e \"_.@-\"", +"A valid username must be provided" => "Deve essere fornito un nome utente valido", +"A valid password must be provided" => "Deve essere fornita una password valida", +"The username is already being used" => "Il nome utente è già utilizzato" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/lib/l10n/ja.php b/lib/l10n/ja.php index 015c885904e..6d72836f775 100644 --- a/lib/l10n/ja.php +++ b/lib/l10n/ja.php @@ -66,6 +66,9 @@ $TRANSLATIONS = array( "last month" => "1ヶ月前", "_%n month ago_::_%n months ago_" => array("%nヶ月前"), "last year" => "1年前", -"years ago" => "年前" +"years ago" => "年前", +"A valid username must be provided" => "有効なユーザー名を指定する必要があります", +"A valid password must be provided" => "有効なパスワードを指定する必要があります", +"The username is already being used" => "ユーザ名はすでに使われています" ); $PLURAL_FORMS = "nplurals=1; plural=0;"; diff --git a/lib/l10n/ka_GE.php b/lib/l10n/ka_GE.php index e2a719d0746..f15563c297d 100644 --- a/lib/l10n/ka_GE.php +++ b/lib/l10n/ka_GE.php @@ -40,6 +40,8 @@ $TRANSLATIONS = array( "last month" => "გასულ თვეში", "_%n month ago_::_%n months ago_" => array(""), "last year" => "ბოლო წელს", -"years ago" => "წლის წინ" +"years ago" => "წლის წინ", +"A valid username must be provided" => "უნდა მიუთითოთ არსებული მომხმარებლის სახელი", +"A valid password must be provided" => "უნდა მიუთითოთ არსებული პაროლი" ); $PLURAL_FORMS = "nplurals=1; plural=0;"; diff --git a/lib/l10n/km.php b/lib/l10n/km.php index 51dd4f33a7e..d5fdc025760 100644 --- a/lib/l10n/km.php +++ b/lib/l10n/km.php @@ -39,6 +39,8 @@ $TRANSLATIONS = array( "last month" => "ខែមុន", "_%n month ago_::_%n months ago_" => array("%n ខែ​មុន"), "last year" => "ឆ្នាំ​មុន", -"years ago" => "ឆ្នាំ​មុន" +"years ago" => "ឆ្នាំ​មុន", +"A valid username must be provided" => "ត្រូវ​ផ្ដល់​ឈ្មោះ​អ្នក​ប្រើ​ឲ្យ​បាន​ត្រឹម​ត្រូវ", +"A valid password must be provided" => "ត្រូវ​ផ្ដល់​ពាក្យ​សម្ងាត់​ឲ្យ​បាន​ត្រឹម​ត្រូវ" ); $PLURAL_FORMS = "nplurals=1; plural=0;"; diff --git a/lib/l10n/ko.php b/lib/l10n/ko.php index 833476f6464..2c94ebdcc22 100644 --- a/lib/l10n/ko.php +++ b/lib/l10n/ko.php @@ -60,6 +60,8 @@ $TRANSLATIONS = array( "last month" => "지난 달", "_%n month ago_::_%n months ago_" => array("%n달 전 "), "last year" => "작년", -"years ago" => "년 전" +"years ago" => "년 전", +"A valid username must be provided" => "올바른 사용자 이름을 입력해야 함", +"A valid password must be provided" => "올바른 암호를 입력해야 함" ); $PLURAL_FORMS = "nplurals=1; plural=0;"; diff --git a/lib/l10n/lt_LT.php b/lib/l10n/lt_LT.php index dac8eed7633..88aca7aba46 100644 --- a/lib/l10n/lt_LT.php +++ b/lib/l10n/lt_LT.php @@ -60,6 +60,8 @@ $TRANSLATIONS = array( "last month" => "praeitą mėnesį", "_%n month ago_::_%n months ago_" => array("Prieš %n mėnesį","Prieš %n mėnesius","Prieš %n mėnesių"), "last year" => "praeitais metais", -"years ago" => "prieš metus" +"years ago" => "prieš metus", +"A valid username must be provided" => "Vartotojo vardas turi būti tinkamas", +"A valid password must be provided" => "Slaptažodis turi būti tinkamas" ); $PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);"; diff --git a/lib/l10n/lv.php b/lib/l10n/lv.php index 5461e077ec9..1c8a31aff2f 100644 --- a/lib/l10n/lv.php +++ b/lib/l10n/lv.php @@ -43,6 +43,9 @@ $TRANSLATIONS = array( "last month" => "pagājušajā mēnesī", "_%n month ago_::_%n months ago_" => array("","","Pirms %n mēnešiem"), "last year" => "gājušajā gadā", -"years ago" => "gadus atpakaļ" +"years ago" => "gadus atpakaļ", +"A valid username must be provided" => "Jānorāda derīgs lietotājvārds", +"A valid password must be provided" => "Jānorāda derīga parole", +"The username is already being used" => "Šāds lietotājvārds jau tiek izmantots" ); $PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);"; diff --git a/lib/l10n/mk.php b/lib/l10n/mk.php index deaf1bc8d05..a0b3c39865a 100644 --- a/lib/l10n/mk.php +++ b/lib/l10n/mk.php @@ -28,6 +28,8 @@ $TRANSLATIONS = array( "last month" => "минатиот месец", "_%n month ago_::_%n months ago_" => array("",""), "last year" => "минатата година", -"years ago" => "пред години" +"years ago" => "пред години", +"A valid username must be provided" => "Мора да се обезбеди валидно корисничко име ", +"A valid password must be provided" => "Мора да се обезбеди валидна лозинка" ); $PLURAL_FORMS = "nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;"; diff --git a/lib/l10n/nb_NO.php b/lib/l10n/nb_NO.php index 4b41e54ef44..fd9b631f23c 100644 --- a/lib/l10n/nb_NO.php +++ b/lib/l10n/nb_NO.php @@ -60,6 +60,8 @@ $TRANSLATIONS = array( "last month" => "forrige måned", "_%n month ago_::_%n months ago_" => array("","%n dager siden"), "last year" => "forrige år", -"years ago" => "år siden" +"years ago" => "år siden", +"A valid username must be provided" => "Oppgi et gyldig brukernavn", +"A valid password must be provided" => "Oppgi et gyldig passord" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/lib/l10n/nl.php b/lib/l10n/nl.php index dcf893af630..c7a1609a770 100644 --- a/lib/l10n/nl.php +++ b/lib/l10n/nl.php @@ -66,6 +66,8 @@ $TRANSLATIONS = array( "last month" => "vorige maand", "_%n month ago_::_%n months ago_" => array("%n maand geleden","%n maanden geleden"), "last year" => "vorig jaar", -"years ago" => "jaar geleden" +"years ago" => "jaar geleden", +"A valid username must be provided" => "Er moet een geldige gebruikersnaam worden opgegeven", +"A valid password must be provided" => "Er moet een geldig wachtwoord worden opgegeven" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/lib/l10n/nn_NO.php b/lib/l10n/nn_NO.php index db257f35dce..77aebb26ffa 100644 --- a/lib/l10n/nn_NO.php +++ b/lib/l10n/nn_NO.php @@ -23,6 +23,8 @@ $TRANSLATIONS = array( "last month" => "førre månad", "_%n month ago_::_%n months ago_" => array("","%n månadar sidan"), "last year" => "i fjor", -"years ago" => "år sidan" +"years ago" => "år sidan", +"A valid username must be provided" => "Du må oppgje eit gyldig brukarnamn", +"A valid password must be provided" => "Du må oppgje eit gyldig passord" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/lib/l10n/pl.php b/lib/l10n/pl.php index bc5e4a947c7..f786e1832a2 100644 --- a/lib/l10n/pl.php +++ b/lib/l10n/pl.php @@ -66,6 +66,10 @@ $TRANSLATIONS = array( "last month" => "w zeszłym miesiącu", "_%n month ago_::_%n months ago_" => array("%n miesiąc temu","%n miesięcy temu","%n miesięcy temu"), "last year" => "w zeszłym roku", -"years ago" => "lat temu" +"years ago" => "lat temu", +"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" => "W nazwach użytkowników dozwolone są wyłącznie następujące znaki: \"a-z\", \"A-Z\", \"0-9\", oraz \"_.@-\"", +"A valid username must be provided" => "Należy podać prawidłową nazwę użytkownika", +"A valid password must be provided" => "Należy podać prawidłowe hasło", +"The username is already being used" => "Ta nazwa użytkownika jest już używana" ); $PLURAL_FORMS = "nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"; diff --git a/lib/l10n/pt_BR.php b/lib/l10n/pt_BR.php index 6c8ea586de8..3cc02f76524 100644 --- a/lib/l10n/pt_BR.php +++ b/lib/l10n/pt_BR.php @@ -66,6 +66,10 @@ $TRANSLATIONS = array( "last month" => "último mês", "_%n month ago_::_%n months ago_" => array("","ha %n meses"), "last year" => "último ano", -"years ago" => "anos atrás" +"years ago" => "anos atrás", +"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" => "Somente os seguintes caracteres são permitidos no nome do usuário: \"a-z\", \"A-Z\", \"0-9\", e \"_.@-\"", +"A valid username must be provided" => "Forneça um nome de usuário válido", +"A valid password must be provided" => "Forneça uma senha válida", +"The username is already being used" => "Este nome de usuário já está sendo usado" ); $PLURAL_FORMS = "nplurals=2; plural=(n > 1);"; diff --git a/lib/l10n/pt_PT.php b/lib/l10n/pt_PT.php index e6dd459a7e1..8b3c003678d 100644 --- a/lib/l10n/pt_PT.php +++ b/lib/l10n/pt_PT.php @@ -61,6 +61,8 @@ $TRANSLATIONS = array( "last month" => "ultímo mês", "_%n month ago_::_%n months ago_" => array("","%n meses atrás"), "last year" => "ano passado", -"years ago" => "anos atrás" +"years ago" => "anos atrás", +"A valid username must be provided" => "Um nome de utilizador válido deve ser fornecido", +"A valid password must be provided" => "Uma password válida deve ser fornecida" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/lib/l10n/ro.php b/lib/l10n/ro.php index 6bff105a61f..87e9a92c464 100644 --- a/lib/l10n/ro.php +++ b/lib/l10n/ro.php @@ -31,6 +31,8 @@ $TRANSLATIONS = array( "last month" => "ultima lună", "_%n month ago_::_%n months ago_" => array("","",""), "last year" => "ultimul an", -"years ago" => "ani în urmă" +"years ago" => "ani în urmă", +"A valid username must be provided" => "Trebuie să furnizaţi un nume de utilizator valid", +"A valid password must be provided" => "Trebuie să furnizaţi o parolă validă" ); $PLURAL_FORMS = "nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));"; diff --git a/lib/l10n/ru.php b/lib/l10n/ru.php index 214849721da..2611fcf7a6b 100644 --- a/lib/l10n/ru.php +++ b/lib/l10n/ru.php @@ -60,6 +60,8 @@ $TRANSLATIONS = array( "last month" => "в прошлом месяце", "_%n month ago_::_%n months ago_" => array("%n месяц назад","%n месяца назад","%n месяцев назад"), "last year" => "в прошлом году", -"years ago" => "несколько лет назад" +"years ago" => "несколько лет назад", +"A valid username must be provided" => "Укажите правильное имя пользователя", +"A valid password must be provided" => "Укажите валидный пароль" ); $PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"; diff --git a/lib/l10n/sk_SK.php b/lib/l10n/sk_SK.php index 424f0f5bd8c..17108d4bdf6 100644 --- a/lib/l10n/sk_SK.php +++ b/lib/l10n/sk_SK.php @@ -61,6 +61,8 @@ $TRANSLATIONS = array( "last month" => "minulý mesiac", "_%n month ago_::_%n months ago_" => array("pred %n mesiacom","pred %n mesiacmi","pred %n mesiacmi"), "last year" => "minulý rok", -"years ago" => "pred rokmi" +"years ago" => "pred rokmi", +"A valid username must be provided" => "Musíte zadať platné používateľské meno", +"A valid password must be provided" => "Musíte zadať platné heslo" ); $PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"; diff --git a/lib/l10n/sl.php b/lib/l10n/sl.php index 411a14370ee..6f9470401ed 100644 --- a/lib/l10n/sl.php +++ b/lib/l10n/sl.php @@ -66,6 +66,8 @@ $TRANSLATIONS = array( "last month" => "zadnji mesec", "_%n month ago_::_%n months ago_" => array("pred %n mesecem","pred %n mesecema","pred %n meseci","pred %n meseci"), "last year" => "lansko leto", -"years ago" => "let nazaj" +"years ago" => "let nazaj", +"A valid username must be provided" => "Navedeno mora biti veljavno uporabniško ime", +"A valid password must be provided" => "Navedeno mora biti veljavno geslo" ); $PLURAL_FORMS = "nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);"; diff --git a/lib/l10n/sq.php b/lib/l10n/sq.php index b22663f76df..e29fa2cee53 100644 --- a/lib/l10n/sq.php +++ b/lib/l10n/sq.php @@ -41,6 +41,8 @@ $TRANSLATIONS = array( "last month" => "muajin e shkuar", "_%n month ago_::_%n months ago_" => array("","%n muaj më parë"), "last year" => "vitin e shkuar", -"years ago" => "vite më parë" +"years ago" => "vite më parë", +"A valid username must be provided" => "Duhet të jepni një emër të vlefshëm përdoruesi", +"A valid password must be provided" => "Duhet të jepni një fjalëkalim te vlefshëm" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/lib/l10n/sr.php b/lib/l10n/sr.php index 47a84803683..f9155bfd575 100644 --- a/lib/l10n/sr.php +++ b/lib/l10n/sr.php @@ -28,6 +28,8 @@ $TRANSLATIONS = array( "last month" => "прошлог месеца", "_%n month ago_::_%n months ago_" => array("","",""), "last year" => "прошле године", -"years ago" => "година раније" +"years ago" => "година раније", +"A valid username must be provided" => "Морате унети исправно корисничко име", +"A valid password must be provided" => "Морате унети исправну лозинку" ); $PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"; diff --git a/lib/l10n/sv.php b/lib/l10n/sv.php index 7053e09624d..d8d47cc9666 100644 --- a/lib/l10n/sv.php +++ b/lib/l10n/sv.php @@ -66,6 +66,8 @@ $TRANSLATIONS = array( "last month" => "förra månaden", "_%n month ago_::_%n months ago_" => array("%n månad sedan","%n månader sedan"), "last year" => "förra året", -"years ago" => "år sedan" +"years ago" => "år sedan", +"A valid username must be provided" => "Ett giltigt användarnamn måste anges", +"A valid password must be provided" => "Ett giltigt lösenord måste anges" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/lib/l10n/tr.php b/lib/l10n/tr.php index 80f1ade9950..83dc1e0ac8c 100644 --- a/lib/l10n/tr.php +++ b/lib/l10n/tr.php @@ -66,6 +66,10 @@ $TRANSLATIONS = array( "last month" => "geçen ay", "_%n month ago_::_%n months ago_" => array("","%n ay önce"), "last year" => "geçen yıl", -"years ago" => "yıl önce" +"years ago" => "yıl önce", +"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" => "Kullanıcı adında sadece bu karakterlere izin verilmektedir: \"a-z\", \"A-Z\", \"0-9\", ve \"_.@-\"", +"A valid username must be provided" => "Geçerli bir kullanıcı adı mutlaka sağlanmalı", +"A valid password must be provided" => "Geçerli bir parola mutlaka sağlanmalı", +"The username is already being used" => "Bu kullanıcı adı zaten kullanımda" ); $PLURAL_FORMS = "nplurals=2; plural=(n > 1);"; diff --git a/lib/l10n/ug.php b/lib/l10n/ug.php index e2cf38ecc8c..8cfa99732ab 100644 --- a/lib/l10n/ug.php +++ b/lib/l10n/ug.php @@ -14,6 +14,8 @@ $TRANSLATIONS = array( "today" => "بۈگۈن", "yesterday" => "تۈنۈگۈن", "_%n day go_::_%n days ago_" => array(""), -"_%n month ago_::_%n months ago_" => array("") +"_%n month ago_::_%n months ago_" => array(""), +"A valid username must be provided" => "چوقۇم ئىناۋەتلىك ئىشلەتكۈچى ئىسمىدىن بىرنى تەمىنلەش كېرەك", +"A valid password must be provided" => "چوقۇم ئىناۋەتلىك ئىم تەمىنلەش كېرەك" ); $PLURAL_FORMS = "nplurals=1; plural=0;"; diff --git a/lib/l10n/uk.php b/lib/l10n/uk.php index 94163f0b6f5..fed6277fdd8 100644 --- a/lib/l10n/uk.php +++ b/lib/l10n/uk.php @@ -43,6 +43,8 @@ $TRANSLATIONS = array( "last month" => "минулого місяця", "_%n month ago_::_%n months ago_" => array("","","%n місяців тому"), "last year" => "минулого року", -"years ago" => "роки тому" +"years ago" => "роки тому", +"A valid username must be provided" => "Потрібно задати вірне ім'я користувача", +"A valid password must be provided" => "Потрібно задати вірний пароль" ); $PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"; diff --git a/lib/l10n/zh_CN.php b/lib/l10n/zh_CN.php index 684ee17f98e..8fca52f3dbd 100644 --- a/lib/l10n/zh_CN.php +++ b/lib/l10n/zh_CN.php @@ -48,6 +48,8 @@ $TRANSLATIONS = array( "last month" => "上月", "_%n month ago_::_%n months ago_" => array("%n 月前"), "last year" => "去年", -"years ago" => "年前" +"years ago" => "年前", +"A valid username must be provided" => "必须提供合法的用户名", +"A valid password must be provided" => "必须提供合法的密码" ); $PLURAL_FORMS = "nplurals=1; plural=0;"; diff --git a/lib/l10n/zh_TW.php b/lib/l10n/zh_TW.php index 1fbae6e2355..83616cf6a42 100644 --- a/lib/l10n/zh_TW.php +++ b/lib/l10n/zh_TW.php @@ -60,6 +60,8 @@ $TRANSLATIONS = array( "last month" => "上個月", "_%n month ago_::_%n months ago_" => array("%n 個月前"), "last year" => "去年", -"years ago" => "幾年前" +"years ago" => "幾年前", +"A valid username must be provided" => "必須提供一個有效的用戶名", +"A valid password must be provided" => "一定要提供一個有效的密碼" ); $PLURAL_FORMS = "nplurals=1; plural=0;"; diff --git a/settings/l10n/ast.php b/settings/l10n/ast.php index df4ed92b1f2..81300ed5636 100644 --- a/settings/l10n/ast.php +++ b/settings/l10n/ast.php @@ -3,6 +3,7 @@ $TRANSLATIONS = array( "Email sent" => "Corréu unviáu", "Encryption" => "Cifráu", "Invalid request" => "Solicitú non válida", +"Error" => "Fallu", "Groups" => "Grupos", "Delete" => "Desaniciar", "More" => "Más", -- GitLab From 0edacf372c5b2e1f1b64210ceff5e757494c959b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Thu, 10 Apr 2014 18:07:36 +0200 Subject: [PATCH 086/253] fix single file upload in firefox --- apps/files/js/file-upload.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js index 070314a1188..516812563ac 100644 --- a/apps/files/js/file-upload.js +++ b/apps/files/js/file-upload.js @@ -333,11 +333,15 @@ OC.Upload = { submit: function(e, data) { OC.Upload.rememberUpload(data); if ( ! data.formData ) { + var fileDirectory = ''; + if(typeof data.files[0].relativePath !== 'undefined') { + fileDirectory = data.files[0].relativePath; + } // noone set update parameters, we set the minimum data.formData = { requesttoken: oc_requesttoken, dir: $('#dir').val(), - file_directory: data.files[0]['relativePath'] + file_directory: fileDirectory }; } }, -- GitLab From 763da4258e14c782e9fba2cf522fa266acecf298 Mon Sep 17 00:00:00 2001 From: Bernhard Posselt Date: Thu, 10 Apr 2014 20:51:03 +0200 Subject: [PATCH 087/253] fix the middleware registration process in the container --- lib/private/appframework/dependencyinjection/dicontainer.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/private/appframework/dependencyinjection/dicontainer.php b/lib/private/appframework/dependencyinjection/dicontainer.php index 78224ea54c0..beba71052f8 100644 --- a/lib/private/appframework/dependencyinjection/dicontainer.php +++ b/lib/private/appframework/dependencyinjection/dicontainer.php @@ -92,12 +92,11 @@ class DIContainer extends SimpleContainer implements IAppContainer{ return new SecurityMiddleware($app, $c['Request']); }); - $middleWares = $this->middleWares; - $this['MiddlewareDispatcher'] = $this->share(function($c) use ($middleWares) { + $this['MiddlewareDispatcher'] = $this->share(function($c) { $dispatcher = new MiddlewareDispatcher(); $dispatcher->registerMiddleware($c['SecurityMiddleware']); - foreach($middleWares as $middleWare) { + foreach($this->middleWares as $middleWare) { $dispatcher->registerMiddleware($c[$middleWare]); } -- GitLab From 9e9c109390c265cdb63b5788365ce74034009a6c Mon Sep 17 00:00:00 2001 From: Volkan Gezer Date: Thu, 10 Apr 2014 21:54:25 +0200 Subject: [PATCH 088/253] Expiration date is hidden smoothly From now on, it is hidden smoothly as the other fields do. --- core/js/share.js | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/core/js/share.js b/core/js/share.js index ef71cc7999a..19d71a6cbd5 100644 --- a/core/js/share.js +++ b/core/js/share.js @@ -480,15 +480,16 @@ OC.Share={ $('#emailPrivateLink #email').hide(); $('#emailPrivateLink #emailButton').hide(); $('#allowPublicUploadWrapper').hide(); + $('#expirationDate').hide(); }, dirname:function(path) { return path.replace(/\\/g,'/').replace(/\/[^\/]*$/, ''); }, showExpirationDate:function(date) { $('#expirationCheckbox').attr('checked', true); - $('#expirationDate').before('
    '); $('#expirationDate').val(date); - $('#expirationDate').show(); + $('#expirationDate').show('blind'); + $('#expirationDate').css('display','block'); $('#expirationDate').datepicker({ dateFormat : 'dd-mm-yy' }); @@ -558,7 +559,7 @@ $(document).ready(function() { OC.Share.itemShares[shareType].splice(index, 1); OC.Share.updateIcon(itemType, itemSource); if (typeof OC.Share.statuses[itemSource] === 'undefined') { - $('#expiration').hide(); + $('#expiration').hide('blind'); } }); return false; @@ -618,7 +619,7 @@ $(document).ready(function() { OC.Share.itemShares[OC.Share.SHARE_TYPE_LINK] = false; OC.Share.updateIcon(itemType, itemSource); if (typeof OC.Share.statuses[itemSource] === 'undefined') { - $('#expiration').hide(); + $('#expiration').hide('blind'); } }); } @@ -710,7 +711,7 @@ $(document).ready(function() { if (!result || result.status !== 'success') { OC.dialogs.alert(t('core', 'Error unsetting expiration date'), t('core', 'Error')); } - $('#expirationDate').hide(); + $('#expirationDate').hide('blind'); }); } }); -- GitLab From 36107e1bad9f696be9ac15141b120c7c30ee4e7f Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Fri, 11 Apr 2014 01:55:15 -0400 Subject: [PATCH 089/253] [tx-robot] updated from transifex --- apps/files_external/l10n/de.php | 5 ++ apps/files_external/l10n/de_DE.php | 5 ++ apps/files_external/l10n/fr.php | 4 ++ apps/files_external/l10n/it.php | 6 +- apps/files_external/l10n/nl.php | 5 ++ apps/files_trashbin/l10n/tr.php | 6 +- apps/user_ldap/l10n/de.php | 2 + apps/user_ldap/l10n/de_DE.php | 2 + apps/user_ldap/l10n/fr.php | 2 + apps/user_ldap/l10n/it.php | 1 + core/l10n/fr.php | 1 + core/l10n/tr.php | 2 +- l10n/de/files_external.po | 16 ++--- l10n/de/user_ldap.po | 12 ++-- l10n/de_DE/files_external.po | 16 ++--- l10n/de_DE/user_ldap.po | 12 ++-- l10n/fr/core.po | 102 ++++++++++++++-------------- l10n/fr/files_external.po | 14 ++-- l10n/fr/lib.po | 8 +-- l10n/fr/user_ldap.po | 12 ++-- l10n/it/core.po | 44 ++++++------ l10n/it/files_external.po | 13 ++-- l10n/it/lib.po | 6 +- l10n/it/user_ldap.po | 8 +-- l10n/nl/files_external.po | 16 ++--- l10n/nl/lib.po | 10 +-- l10n/templates/core.pot | 40 +++++------ l10n/templates/files.pot | 2 +- l10n/templates/files_encryption.pot | 2 +- l10n/templates/files_external.pot | 2 +- l10n/templates/files_sharing.pot | 2 +- l10n/templates/files_trashbin.pot | 2 +- l10n/templates/files_versions.pot | 2 +- l10n/templates/lib.pot | 2 +- l10n/templates/private.pot | 2 +- l10n/templates/settings.pot | 2 +- l10n/templates/user_ldap.pot | 2 +- l10n/templates/user_webdavauth.pot | 2 +- l10n/tr/core.po | 100 +++++++++++++-------------- l10n/tr/files_trashbin.po | 34 +++++----- lib/l10n/fr.php | 1 + lib/l10n/nl.php | 4 +- 42 files changed, 281 insertions(+), 250 deletions(-) diff --git a/apps/files_external/l10n/de.php b/apps/files_external/l10n/de.php index 1d5a4f626b0..25c7ffb3af1 100644 --- a/apps/files_external/l10n/de.php +++ b/apps/files_external/l10n/de.php @@ -6,6 +6,11 @@ $TRANSLATIONS = array( "Please provide a valid Dropbox app key and secret." => "Bitte trage einen gültigen Dropbox-App-Key mit Secret ein.", "Error configuring Google Drive storage" => "Fehler beim Einrichten von Google Drive", "Saved" => "Gespeichert", +"Note: " => "Hinweis: ", +" and " => "und", +"Note: The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "Hinweis: Die cURL-Unterstützung von PHP ist nicht aktiviert oder installiert. Das Hinzufügen von %s ist nicht möglich. Bitte wende Dich zur Installation an Deinen Systemadministrator.", +"Note: The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "Hinweis: Die FTP Unterstützung von PHP ist nicht aktiviert oder installiert. Das Hinzufügen von %s ist nicht möglich. Bitte wende Dich sich zur Installation an Deinen Systemadministrator.", +"Note: \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "Hinweis: \"%s\" ist nicht installiert. Das Hinzufügen von %s ist nicht möglich. Bitte wende Dich sich zur Installation an Deinen Systemadministrator.", "External Storage" => "Externer Speicher", "Folder name" => "Ordnername", "External storage" => "Externer Speicher", diff --git a/apps/files_external/l10n/de_DE.php b/apps/files_external/l10n/de_DE.php index c2534f3dd8a..186aa5a299a 100644 --- a/apps/files_external/l10n/de_DE.php +++ b/apps/files_external/l10n/de_DE.php @@ -6,6 +6,11 @@ $TRANSLATIONS = array( "Please provide a valid Dropbox app key and secret." => "Bitte tragen Sie einen gültigen Dropbox-App-Key mit Secret ein.", "Error configuring Google Drive storage" => "Fehler beim Einrichten von Google Drive", "Saved" => "Gespeichert", +"Note: " => "Hinweis: ", +" and " => "und", +"Note: The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "Hinweis: Die cURL-Unterstützung von PHP ist nicht aktiviert oder installiert. Das Hinzufügen von %s ist nicht möglich. Bitte wenden Sie sich zur Installation an Ihren Systemadministrator.", +"Note: The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "Hinweis: Die FTP Unterstützung von PHP ist nicht aktiviert oder installiert. Das Hinzufügen von %s ist nicht möglich. Bitte wenden Sie sich zur Installation an Ihren Systemadministrator.", +"Note: \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "Hinweis: \"%s\" ist nicht installiert. Das Hinzufügen von %s ist nicht möglich. Bitte wenden Sie sich zur Installation an Ihren Systemadministrator.", "External Storage" => "Externer Speicher", "Folder name" => "Ordnername", "External storage" => "Externer Speicher", diff --git a/apps/files_external/l10n/fr.php b/apps/files_external/l10n/fr.php index dc4c62522c9..8ff19697182 100644 --- a/apps/files_external/l10n/fr.php +++ b/apps/files_external/l10n/fr.php @@ -6,7 +6,11 @@ $TRANSLATIONS = array( "Please provide a valid Dropbox app key and secret." => "Veuillez fournir une clé d'application (app key) ainsi qu'un mot de passe valides.", "Error configuring Google Drive storage" => "Erreur lors de la configuration du support de stockage Google Drive", "Saved" => "Sauvegarder", +"Note: " => "Attention :", " and " => "et", +"Note: The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "Attention : Le support de cURL de PHP n'est pas activé ou installé. Le montage de %s n'est pas possible. Contactez votre administrateur système pour l'installer.", +"Note: The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "Attention : Le support FTP de PHP n'est pas activé ou installé. Le montage de %s n'est pas possible. Contactez votre administrateur système pour l'installer.", +"Note: \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "Attention : \"%s\" n'est pas installé. Le montage de %s n'est pas possible. Contactez votre administrateur système pour l'installer.", "External Storage" => "Stockage externe", "Folder name" => "Nom du dossier", "External storage" => "Stockage externe", diff --git a/apps/files_external/l10n/it.php b/apps/files_external/l10n/it.php index 0c4109ae567..f3a6f9af129 100644 --- a/apps/files_external/l10n/it.php +++ b/apps/files_external/l10n/it.php @@ -8,9 +8,9 @@ $TRANSLATIONS = array( "Saved" => "Salvato", "Note: " => "Nota:", " and " => "e", -"Note: The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "Nota:Il support a cURL non è abilitato o installato in PHP. Impossibile montare %s. Chiedi al tuo amministratore di sistema di installarlo.", -"Note: The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "Nota:Il support a FTP non è abilitato o installato in PHP. Impossibile montare %s. Chiedi al tuo amministratore di sistema di installarlo.", -"Note: \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "Nota:\"%s\" non è installato. Impossibile montare %s. Chiedi al tuo amministratore di sistema di installarlo.", +"Note: The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "Nota: il supporto a cURL di PHP non è abilitato o installato. Impossibile montare %s. Chiedi al tuo amministratore di sistema di installarlo.", +"Note: The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "Nota: il supporto a FTP in PHP non è abilitato o installato. Impossibile montare %s. Chiedi al tuo amministratore di sistema di installarlo.", +"Note: \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "Nota: \"%s\" non è installato. Impossibile montare %s. Chiedi al tuo amministratore di sistema di installarlo.", "External Storage" => "Archiviazione esterna", "Folder name" => "Nome della cartella", "External storage" => "Archiviazione esterna", diff --git a/apps/files_external/l10n/nl.php b/apps/files_external/l10n/nl.php index 0226e454f9a..c055be50f87 100644 --- a/apps/files_external/l10n/nl.php +++ b/apps/files_external/l10n/nl.php @@ -6,6 +6,11 @@ $TRANSLATIONS = array( "Please provide a valid Dropbox app key and secret." => "Geef een geldige Dropbox key en secret.", "Error configuring Google Drive storage" => "Fout tijdens het configureren van Google Drive opslag", "Saved" => "Bewaard", +"Note: " => "Let op: ", +" and " => "en", +"Note: The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "Let op: Curl ondersteuning in PHP is niet geactiveerd of geïnstalleerd. Mounten van %s is niet mogelijk. Vraag uw systeembeheerder dit te installeren.", +"Note: The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "Let op: FTP ondersteuning in PHP is niet geactiveerd of geïnstalleerd. Mounten van %s is niet mogelijk. Vraag uw beheerder dit te installeren.", +"Note: \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "Let op: \"%s\" is niet geïnstalleerd. Mounten van %s is niet mogelijk. Vraag uw beheerder om dit te installeren.", "External Storage" => "Externe opslag", "Folder name" => "Mapnaam", "External storage" => "Externe opslag", diff --git a/apps/files_trashbin/l10n/tr.php b/apps/files_trashbin/l10n/tr.php index c1234cdfb0c..ff4227e38c7 100644 --- a/apps/files_trashbin/l10n/tr.php +++ b/apps/files_trashbin/l10n/tr.php @@ -1,15 +1,15 @@ "%s alıcı olarak silinemedi", -"Couldn't restore %s" => "%s eri yüklenemedi", +"Couldn't restore %s" => "%s geri yüklenemedi", "Deleted files" => "Silinmiş dosyalar", "Error" => "Hata", +"Deleted Files" => "Silinen Dosyalar", "restored" => "geri yüklendi", "Nothing in here. Your trash bin is empty!" => "Burada hiçbir şey yok. Çöp kutunuz tamamen boş!", "Name" => "İsim", "Restore" => "Geri yükle", "Deleted" => "Silindi", -"Delete" => "Sil", -"Deleted Files" => "Silinen Dosyalar" +"Delete" => "Sil" ); $PLURAL_FORMS = "nplurals=2; plural=(n > 1);"; diff --git a/apps/user_ldap/l10n/de.php b/apps/user_ldap/l10n/de.php index 8dad9b34539..fd6bde8a97e 100644 --- a/apps/user_ldap/l10n/de.php +++ b/apps/user_ldap/l10n/de.php @@ -90,6 +90,8 @@ $TRANSLATIONS = array( "Group-Member association" => "Assoziation zwischen Gruppe und Benutzer", "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)", "Special Attributes" => "Spezielle Eigenschaften", "Quota Field" => "Kontingent Feld", "Quota Default" => "Standard Kontingent", diff --git a/apps/user_ldap/l10n/de_DE.php b/apps/user_ldap/l10n/de_DE.php index 6e6e29ea3db..8c6ba0f3130 100644 --- a/apps/user_ldap/l10n/de_DE.php +++ b/apps/user_ldap/l10n/de_DE.php @@ -90,6 +90,8 @@ $TRANSLATIONS = array( "Group-Member association" => "Assoziation zwischen Gruppe und Benutzer", "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)", "Special Attributes" => "Spezielle Eigenschaften", "Quota Field" => "Kontingent-Feld", "Quota Default" => "Standard-Kontingent", diff --git a/apps/user_ldap/l10n/fr.php b/apps/user_ldap/l10n/fr.php index dbcaadfc2a7..39e7d2ae429 100644 --- a/apps/user_ldap/l10n/fr.php +++ b/apps/user_ldap/l10n/fr.php @@ -90,6 +90,8 @@ $TRANSLATIONS = array( "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 supportés (fonctionne uniquement si l'attribut membre du groupe contient des DNs).", +"Paging chunksize" => "Dimensionnement des paginations", +"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.)" => "La taille d'une part (chunksize) est utilisée pour les recherches paginées de LDAP qui peuvent retourner des résultats par lots comme une énumération d'utilisateurs ou groupes. (Configurer à 0 pour désactiver les recherches paginées de LDAP.)", "Special Attributes" => "Attributs spéciaux", "Quota Field" => "Champ du quota", "Quota Default" => "Quota par défaut", diff --git a/apps/user_ldap/l10n/it.php b/apps/user_ldap/l10n/it.php index ceb29590627..de540f22821 100644 --- a/apps/user_ldap/l10n/it.php +++ b/apps/user_ldap/l10n/it.php @@ -91,6 +91,7 @@ $TRANSLATIONS = array( "Nested Groups" => "Gruppi nidificati", "When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" => "Quando è attivato, i gruppi che contengono altri gruppi sono supportati. (Funziona solo se l'attributo del gruppo membro contiene DN.)", "Paging chunksize" => "Dimensione del blocco di paginazione", +"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.)" => "Dimensione del blocco per le ricerche LDAP paginate che potrebbero restituire risultati pesanti come l'enumerazione di utenti o gruppi.(L'impostazione a 0 disabilita le ricerche LDAP paginate in questi casi.)", "Special Attributes" => "Attributi speciali", "Quota Field" => "Campo Quota", "Quota Default" => "Quota predefinita", diff --git a/core/l10n/fr.php b/core/l10n/fr.php index 2475eddee8a..623f129c860 100644 --- a/core/l10n/fr.php +++ b/core/l10n/fr.php @@ -51,6 +51,7 @@ $TRANSLATIONS = array( "_{count} file conflict_::_{count} file conflicts_" => array("{count} fichier en conflit","{count} fichiers en conflit"), "One file conflict" => "Un conflit de fichier", "New Files" => "Nouveaux fichiers", +"Already existing files" => "Fichiers déjà existants", "Which files do you want to keep?" => "Quels fichiers désirez-vous garder ?", "If you select both versions, the copied file will have a number added to its name." => "Si vous sélectionnez les deux versions, un nombre sera ajouté au nom du fichier copié.", "Cancel" => "Annuler", diff --git a/core/l10n/tr.php b/core/l10n/tr.php index 7e75cdf4b01..8f9c60c157b 100644 --- a/core/l10n/tr.php +++ b/core/l10n/tr.php @@ -42,7 +42,7 @@ $TRANSLATIONS = array( "months ago" => "ay önce", "last year" => "geçen yıl", "years ago" => "yıl önce", -"Choose" => "seç", +"Choose" => "Seç", "Error loading file picker template: {error}" => "Dosya seçici şablonu yüklenirken hata: {error}", "Yes" => "Evet", "No" => "Hayır", diff --git a/l10n/de/files_external.po b/l10n/de/files_external.po index f8273641768..895dc57a819 100644 --- a/l10n/de/files_external.po +++ b/l10n/de/files_external.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-09 01:55-0400\n" -"PO-Revision-Date: 2014-04-09 05:55+0000\n" -"Last-Translator: I Robot\n" +"POT-Creation-Date: 2014-04-11 01:54-0400\n" +"PO-Revision-Date: 2014-04-10 19:00+0000\n" +"Last-Translator: Mario Siegmann \n" "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -46,32 +46,32 @@ msgstr "Gespeichert" #: lib/config.php:592 msgid "Note: " -msgstr "" +msgstr "Hinweis: " #: lib/config.php:602 msgid " and " -msgstr "" +msgstr "und" #: lib/config.php:624 #, php-format msgid "" "Note: The cURL support in PHP is not enabled or installed. Mounting " "of %s is not possible. Please ask your system administrator to install it." -msgstr "" +msgstr "Hinweis: Die cURL-Unterstützung von PHP ist nicht aktiviert oder installiert. Das Hinzufügen von %s ist nicht möglich. Bitte wende Dich zur Installation an Deinen Systemadministrator." #: lib/config.php:626 #, php-format msgid "" "Note: The FTP support in PHP is not enabled or installed. Mounting of" " %s is not possible. Please ask your system administrator to install it." -msgstr "" +msgstr "Hinweis: Die FTP Unterstützung von PHP ist nicht aktiviert oder installiert. Das Hinzufügen von %s ist nicht möglich. Bitte wende Dich sich zur Installation an Deinen Systemadministrator." #: lib/config.php:628 #, php-format msgid "" "Note: \"%s\" is not installed. Mounting of %s is not possible. Please" " ask your system administrator to install it." -msgstr "" +msgstr "Hinweis: \"%s\" ist nicht installiert. Das Hinzufügen von %s ist nicht möglich. Bitte wende Dich sich zur Installation an Deinen Systemadministrator." #: templates/settings.php:2 msgid "External Storage" diff --git a/l10n/de/user_ldap.po b/l10n/de/user_ldap.po index 91044ece8b3..527d5f8dce6 100644 --- a/l10n/de/user_ldap.po +++ b/l10n/de/user_ldap.po @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-08 01:56-0400\n" -"PO-Revision-Date: 2014-04-08 05:56+0000\n" -"Last-Translator: I Robot\n" +"POT-Creation-Date: 2014-04-11 01:54-0400\n" +"PO-Revision-Date: 2014-04-10 18:40+0000\n" +"Last-Translator: Mario Siegmann \n" "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -148,7 +148,7 @@ msgstr[1] "%s Benutzer gefunden" msgid "Invalid Host" msgstr "Ungültiger Host" -#: lib/wizard.php:963 +#: lib/wizard.php:983 msgid "Could not find the desired feature" msgstr "Konnte die gewünschte Funktion nicht finden" @@ -425,14 +425,14 @@ msgstr "Wenn aktiviert, werden Gruppen, die Gruppen enthalten, unterstützt. (Fu #: templates/settings.php:40 msgid "Paging chunksize" -msgstr "" +msgstr "Seitenstücke (Paging chunksize)" #: templates/settings.php:40 msgid "" "Chunksize used for paged LDAP searches that may return bulky results like " "user or group enumeration. (Setting it 0 disables paged LDAP searches in " "those situations.)" -msgstr "" +msgstr "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)" #: templates/settings.php:42 msgid "Special Attributes" diff --git a/l10n/de_DE/files_external.po b/l10n/de_DE/files_external.po index d18946d9c29..214a786b82f 100644 --- a/l10n/de_DE/files_external.po +++ b/l10n/de_DE/files_external.po @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-09 01:55-0400\n" -"PO-Revision-Date: 2014-04-09 05:55+0000\n" -"Last-Translator: I Robot\n" +"POT-Creation-Date: 2014-04-11 01:54-0400\n" +"PO-Revision-Date: 2014-04-10 18:50+0000\n" +"Last-Translator: Mario Siegmann \n" "Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -47,32 +47,32 @@ msgstr "Gespeichert" #: lib/config.php:592 msgid "Note: " -msgstr "" +msgstr "Hinweis: " #: lib/config.php:602 msgid " and " -msgstr "" +msgstr "und" #: lib/config.php:624 #, php-format msgid "" "Note: The cURL support in PHP is not enabled or installed. Mounting " "of %s is not possible. Please ask your system administrator to install it." -msgstr "" +msgstr "Hinweis: Die cURL-Unterstützung von PHP ist nicht aktiviert oder installiert. Das Hinzufügen von %s ist nicht möglich. Bitte wenden Sie sich zur Installation an Ihren Systemadministrator." #: lib/config.php:626 #, php-format msgid "" "Note: The FTP support in PHP is not enabled or installed. Mounting of" " %s is not possible. Please ask your system administrator to install it." -msgstr "" +msgstr "Hinweis: Die FTP Unterstützung von PHP ist nicht aktiviert oder installiert. Das Hinzufügen von %s ist nicht möglich. Bitte wenden Sie sich zur Installation an Ihren Systemadministrator." #: lib/config.php:628 #, php-format msgid "" "Note: \"%s\" is not installed. Mounting of %s is not possible. Please" " ask your system administrator to install it." -msgstr "" +msgstr "Hinweis: \"%s\" ist nicht installiert. Das Hinzufügen von %s ist nicht möglich. Bitte wenden Sie sich zur Installation an Ihren Systemadministrator." #: templates/settings.php:2 msgid "External Storage" diff --git a/l10n/de_DE/user_ldap.po b/l10n/de_DE/user_ldap.po index 07050c277c5..cfcb1ae0423 100644 --- a/l10n/de_DE/user_ldap.po +++ b/l10n/de_DE/user_ldap.po @@ -13,9 +13,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-08 01:56-0400\n" -"PO-Revision-Date: 2014-04-08 05:56+0000\n" -"Last-Translator: I Robot\n" +"POT-Creation-Date: 2014-04-11 01:54-0400\n" +"PO-Revision-Date: 2014-04-10 18:40+0000\n" +"Last-Translator: Mario Siegmann \n" "Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -150,7 +150,7 @@ msgstr[1] "%s Benutzer gefunden" msgid "Invalid Host" msgstr "Ungültiger Host" -#: lib/wizard.php:963 +#: lib/wizard.php:983 msgid "Could not find the desired feature" msgstr "Konnte die gewünschte Funktion nicht finden" @@ -427,14 +427,14 @@ msgstr "Wenn aktiviert, werden Gruppen, die Gruppen enthalten, unterstützt. (Fu #: templates/settings.php:40 msgid "Paging chunksize" -msgstr "" +msgstr "Seitenstücke (Paging chunksize)" #: templates/settings.php:40 msgid "" "Chunksize used for paged LDAP searches that may return bulky results like " "user or group enumeration. (Setting it 0 disables paged LDAP searches in " "those situations.)" -msgstr "" +msgstr "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)" #: templates/settings.php:42 msgid "Special Attributes" diff --git a/l10n/fr/core.po b/l10n/fr/core.po index db845b7f25d..c36deca9604 100644 --- a/l10n/fr/core.po +++ b/l10n/fr/core.po @@ -15,9 +15,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-09 01:55-0400\n" -"PO-Revision-Date: 2014-04-08 06:10+0000\n" -"Last-Translator: I Robot\n" +"POT-Creation-Date: 2014-04-11 01:54-0400\n" +"PO-Revision-Date: 2014-04-10 11:40+0000\n" +"Last-Translator: Christophe Lherieau \n" "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -150,127 +150,127 @@ msgstr "Paramètres" msgid "Saving..." msgstr "Enregistrement..." -#: js/js.js:1124 +#: js/js.js:1099 msgid "seconds ago" msgstr "il y a quelques secondes" -#: js/js.js:1125 +#: js/js.js:1100 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "il y a %n minute" msgstr[1] "il y a %n minutes" -#: js/js.js:1126 +#: js/js.js:1101 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "Il y a %n heure" msgstr[1] "Il y a %n heures" -#: js/js.js:1127 +#: js/js.js:1102 msgid "today" msgstr "aujourd'hui" -#: js/js.js:1128 +#: js/js.js:1103 msgid "yesterday" msgstr "hier" -#: js/js.js:1129 +#: js/js.js:1104 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "il y a %n jour" msgstr[1] "il y a %n jours" -#: js/js.js:1130 +#: js/js.js:1105 msgid "last month" msgstr "le mois dernier" -#: js/js.js:1131 +#: js/js.js:1106 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "Il y a %n mois" msgstr[1] "Il y a %n mois" -#: js/js.js:1132 +#: js/js.js:1107 msgid "months ago" msgstr "il y a plusieurs mois" -#: js/js.js:1133 +#: js/js.js:1108 msgid "last year" msgstr "l'année dernière" -#: js/js.js:1134 +#: js/js.js:1109 msgid "years ago" msgstr "il y a plusieurs années" -#: js/oc-dialogs.js:123 +#: js/oc-dialogs.js:125 msgid "Choose" msgstr "Choisir" -#: js/oc-dialogs.js:146 +#: js/oc-dialogs.js:151 msgid "Error loading file picker template: {error}" msgstr "Erreur de chargement du modèle de sélectionneur de fichiers : {error}" -#: js/oc-dialogs.js:172 +#: js/oc-dialogs.js:177 msgid "Yes" msgstr "Oui" -#: js/oc-dialogs.js:182 +#: js/oc-dialogs.js:187 msgid "No" msgstr "Non" -#: js/oc-dialogs.js:199 +#: js/oc-dialogs.js:204 msgid "Ok" msgstr "Ok" -#: js/oc-dialogs.js:219 +#: js/oc-dialogs.js:224 msgid "Error loading message template: {error}" msgstr "Erreur de chargement du modèle de message : {error}" -#: js/oc-dialogs.js:347 +#: js/oc-dialogs.js:352 msgid "{count} file conflict" msgid_plural "{count} file conflicts" msgstr[0] "{count} fichier en conflit" msgstr[1] "{count} fichiers en conflit" -#: js/oc-dialogs.js:361 +#: js/oc-dialogs.js:366 msgid "One file conflict" msgstr "Un conflit de fichier" -#: js/oc-dialogs.js:367 +#: js/oc-dialogs.js:372 msgid "New Files" msgstr "Nouveaux fichiers" -#: js/oc-dialogs.js:368 +#: js/oc-dialogs.js:373 msgid "Already existing files" -msgstr "" +msgstr "Fichiers déjà existants" -#: js/oc-dialogs.js:370 +#: js/oc-dialogs.js:375 msgid "Which files do you want to keep?" msgstr "Quels fichiers désirez-vous garder ?" -#: js/oc-dialogs.js:371 +#: js/oc-dialogs.js:376 msgid "" "If you select both versions, the copied file will have a number added to its" " name." msgstr "Si vous sélectionnez les deux versions, un nombre sera ajouté au nom du fichier copié." -#: js/oc-dialogs.js:379 +#: js/oc-dialogs.js:384 msgid "Cancel" msgstr "Annuler" -#: js/oc-dialogs.js:389 +#: js/oc-dialogs.js:394 msgid "Continue" msgstr "Poursuivre" -#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +#: js/oc-dialogs.js:441 js/oc-dialogs.js:454 msgid "(all selected)" msgstr "(tous sélectionnés)" -#: js/oc-dialogs.js:439 js/oc-dialogs.js:452 +#: js/oc-dialogs.js:444 js/oc-dialogs.js:457 msgid "({count} selected)" msgstr "({count} sélectionnés)" -#: js/oc-dialogs.js:460 +#: js/oc-dialogs.js:465 msgid "Error loading file exists template" msgstr "Erreur de chargement du modèle de fichier existant" @@ -302,12 +302,12 @@ msgstr "Partagé" msgid "Share" msgstr "Partager" -#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711 +#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:731 #: templates/installation.php:10 msgid "Error" msgstr "Erreur" -#: js/share.js:160 js/share.js:767 +#: js/share.js:160 js/share.js:787 msgid "Error while sharing" msgstr "Erreur lors de la mise en partage" @@ -371,71 +371,71 @@ msgstr "Partager via e-mail :" msgid "No people found" msgstr "Aucun utilisateur trouvé" -#: js/share.js:324 js/share.js:363 +#: js/share.js:324 js/share.js:383 msgid "group" msgstr "groupe" -#: js/share.js:335 +#: js/share.js:355 msgid "Resharing is not allowed" msgstr "Le repartage n'est pas autorisé" -#: js/share.js:379 +#: js/share.js:399 msgid "Shared in {item} with {user}" msgstr "Partagé dans {item} avec {user}" -#: js/share.js:401 +#: js/share.js:421 msgid "Unshare" msgstr "Ne plus partager" -#: js/share.js:409 +#: js/share.js:429 msgid "notify by email" msgstr "Notifier par email" -#: js/share.js:412 +#: js/share.js:432 msgid "can edit" msgstr "édition autorisée" -#: js/share.js:414 +#: js/share.js:434 msgid "access control" msgstr "contrôle des accès" -#: js/share.js:417 +#: js/share.js:437 msgid "create" msgstr "créer" -#: js/share.js:420 +#: js/share.js:440 msgid "update" msgstr "mettre à jour" -#: js/share.js:423 +#: js/share.js:443 msgid "delete" msgstr "supprimer" -#: js/share.js:426 +#: js/share.js:446 msgid "share" msgstr "partager" -#: js/share.js:698 +#: js/share.js:718 msgid "Password protected" msgstr "Protégé par un mot de passe" -#: js/share.js:711 +#: js/share.js:731 msgid "Error unsetting expiration date" msgstr "Une erreur est survenue pendant la suppression de la date d'expiration" -#: js/share.js:729 +#: js/share.js:749 msgid "Error setting expiration date" msgstr "Erreur lors de la spécification de la date d'expiration" -#: js/share.js:754 +#: js/share.js:774 msgid "Sending ..." msgstr "En cours d'envoi ..." -#: js/share.js:765 +#: js/share.js:785 msgid "Email sent" msgstr "Email envoyé" -#: js/share.js:789 +#: js/share.js:809 msgid "Warning" msgstr "Attention" diff --git a/l10n/fr/files_external.po b/l10n/fr/files_external.po index 500cc45f235..a7cb6164419 100644 --- a/l10n/fr/files_external.po +++ b/l10n/fr/files_external.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-10 01:54-0400\n" -"PO-Revision-Date: 2014-04-09 12:20+0000\n" -"Last-Translator: timelord \n" +"POT-Creation-Date: 2014-04-11 01:54-0400\n" +"PO-Revision-Date: 2014-04-10 12:00+0000\n" +"Last-Translator: Christophe Lherieau \n" "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -45,7 +45,7 @@ msgstr "Sauvegarder" #: lib/config.php:592 msgid "Note: " -msgstr "" +msgstr "Attention :" #: lib/config.php:602 msgid " and " @@ -56,21 +56,21 @@ msgstr "et" msgid "" "Note: The cURL support in PHP is not enabled or installed. Mounting " "of %s is not possible. Please ask your system administrator to install it." -msgstr "" +msgstr "Attention : Le support de cURL de PHP n'est pas activé ou installé. Le montage de %s n'est pas possible. Contactez votre administrateur système pour l'installer." #: lib/config.php:626 #, php-format msgid "" "Note: The FTP support in PHP is not enabled or installed. Mounting of" " %s is not possible. Please ask your system administrator to install it." -msgstr "" +msgstr "Attention : Le support FTP de PHP n'est pas activé ou installé. Le montage de %s n'est pas possible. Contactez votre administrateur système pour l'installer." #: lib/config.php:628 #, php-format msgid "" "Note: \"%s\" is not installed. Mounting of %s is not possible. Please" " ask your system administrator to install it." -msgstr "" +msgstr "Attention : \"%s\" n'est pas installé. Le montage de %s n'est pas possible. Contactez votre administrateur système pour l'installer." #: templates/settings.php:2 msgid "External Storage" diff --git a/l10n/fr/lib.po b/l10n/fr/lib.po index 108ab1eab7d..f556076b575 100644 --- a/l10n/fr/lib.po +++ b/l10n/fr/lib.po @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-10 01:54-0400\n" -"PO-Revision-Date: 2014-04-09 06:10+0000\n" -"Last-Translator: I Robot\n" +"POT-Creation-Date: 2014-04-11 01:54-0400\n" +"PO-Revision-Date: 2014-04-10 11:50+0000\n" +"Last-Translator: Christophe Lherieau \n" "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -345,7 +345,7 @@ msgstr "il y a plusieurs années" msgid "" "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", " "\"0-9\", and \"_.@-\"" -msgstr "" +msgstr "Seuls les caractères suivants sont autorisés dans un nom d'utilisateur : \"a-z\", \"A-Z\", \"0-9\", et \"_.@-\"" #: private/user/manager.php:251 msgid "A valid username must be provided" diff --git a/l10n/fr/user_ldap.po b/l10n/fr/user_ldap.po index cde39796c94..fb2c06ad2d8 100644 --- a/l10n/fr/user_ldap.po +++ b/l10n/fr/user_ldap.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-08 01:56-0400\n" -"PO-Revision-Date: 2014-04-08 05:56+0000\n" -"Last-Translator: I Robot\n" +"POT-Creation-Date: 2014-04-11 01:54-0400\n" +"PO-Revision-Date: 2014-04-10 12:40+0000\n" +"Last-Translator: Christophe Lherieau \n" "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -147,7 +147,7 @@ msgstr[1] "%s utilisateurs trouvés" msgid "Invalid Host" msgstr "Hôte invalide" -#: lib/wizard.php:963 +#: lib/wizard.php:983 msgid "Could not find the desired feature" msgstr "Impossible de trouver la fonction souhaitée" @@ -424,14 +424,14 @@ msgstr "Si activé, les groupes contenant d'autres groupes sont supportés (fonc #: templates/settings.php:40 msgid "Paging chunksize" -msgstr "" +msgstr "Dimensionnement des paginations" #: templates/settings.php:40 msgid "" "Chunksize used for paged LDAP searches that may return bulky results like " "user or group enumeration. (Setting it 0 disables paged LDAP searches in " "those situations.)" -msgstr "" +msgstr "La taille d'une part (chunksize) est utilisée pour les recherches paginées de LDAP qui peuvent retourner des résultats par lots comme une énumération d'utilisateurs ou groupes. (Configurer à 0 pour désactiver les recherches paginées de LDAP.)" #: templates/settings.php:42 msgid "Special Attributes" diff --git a/l10n/it/core.po b/l10n/it/core.po index cd474e5344c..fa750f66180 100644 --- a/l10n/it/core.po +++ b/l10n/it/core.po @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-10 01:54-0400\n" -"PO-Revision-Date: 2014-04-09 23:10+0000\n" -"Last-Translator: idetao \n" +"POT-Creation-Date: 2014-04-11 01:54-0400\n" +"PO-Revision-Date: 2014-04-10 22:35+0000\n" +"Last-Translator: Vincenzo Reale \n" "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -298,12 +298,12 @@ msgstr "Condivisi" msgid "Share" msgstr "Condividi" -#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711 +#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:731 #: templates/installation.php:10 msgid "Error" msgstr "Errore" -#: js/share.js:160 js/share.js:767 +#: js/share.js:160 js/share.js:787 msgid "Error while sharing" msgstr "Errore durante la condivisione" @@ -367,71 +367,71 @@ msgstr "Condividi tramite email:" msgid "No people found" msgstr "Non sono state trovate altre persone" -#: js/share.js:324 js/share.js:363 +#: js/share.js:324 js/share.js:383 msgid "group" msgstr "gruppo" -#: js/share.js:335 +#: js/share.js:355 msgid "Resharing is not allowed" msgstr "La ri-condivisione non è consentita" -#: js/share.js:379 +#: js/share.js:399 msgid "Shared in {item} with {user}" msgstr "Condiviso in {item} con {user}" -#: js/share.js:401 +#: js/share.js:421 msgid "Unshare" msgstr "Rimuovi condivisione" -#: js/share.js:409 +#: js/share.js:429 msgid "notify by email" msgstr "notifica tramite email" -#: js/share.js:412 +#: js/share.js:432 msgid "can edit" msgstr "può modificare" -#: js/share.js:414 +#: js/share.js:434 msgid "access control" msgstr "controllo d'accesso" -#: js/share.js:417 +#: js/share.js:437 msgid "create" msgstr "creare" -#: js/share.js:420 +#: js/share.js:440 msgid "update" msgstr "aggiornare" -#: js/share.js:423 +#: js/share.js:443 msgid "delete" msgstr "elimina" -#: js/share.js:426 +#: js/share.js:446 msgid "share" msgstr "condividi" -#: js/share.js:698 +#: js/share.js:718 msgid "Password protected" msgstr "Protetta da password" -#: js/share.js:711 +#: js/share.js:731 msgid "Error unsetting expiration date" msgstr "Errore durante la rimozione della data di scadenza" -#: js/share.js:729 +#: js/share.js:749 msgid "Error setting expiration date" msgstr "Errore durante l'impostazione della data di scadenza" -#: js/share.js:754 +#: js/share.js:774 msgid "Sending ..." msgstr "Invio in corso..." -#: js/share.js:765 +#: js/share.js:785 msgid "Email sent" msgstr "Messaggio inviato" -#: js/share.js:789 +#: js/share.js:809 msgid "Warning" msgstr "Avviso" diff --git a/l10n/it/files_external.po b/l10n/it/files_external.po index b4042ccce21..652c7841ce7 100644 --- a/l10n/it/files_external.po +++ b/l10n/it/files_external.po @@ -6,13 +6,14 @@ # Jessica Di Maria , 2014 # idetao , 2014 # Paolo Velati , 2014 +# Vincenzo Reale , 2014 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-10 01:54-0400\n" -"PO-Revision-Date: 2014-04-09 22:50+0000\n" -"Last-Translator: idetao \n" +"POT-Creation-Date: 2014-04-11 01:54-0400\n" +"PO-Revision-Date: 2014-04-10 22:40+0000\n" +"Last-Translator: Vincenzo Reale \n" "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -57,21 +58,21 @@ msgstr "e" msgid "" "Note: The cURL support in PHP is not enabled or installed. Mounting " "of %s is not possible. Please ask your system administrator to install it." -msgstr "Nota:Il support a cURL non è abilitato o installato in PHP. Impossibile montare %s. Chiedi al tuo amministratore di sistema di installarlo." +msgstr "Nota: il supporto a cURL di PHP non è abilitato o installato. Impossibile montare %s. Chiedi al tuo amministratore di sistema di installarlo." #: lib/config.php:626 #, php-format msgid "" "Note: The FTP support in PHP is not enabled or installed. Mounting of" " %s is not possible. Please ask your system administrator to install it." -msgstr "Nota:Il support a FTP non è abilitato o installato in PHP. Impossibile montare %s. Chiedi al tuo amministratore di sistema di installarlo." +msgstr "Nota: il supporto a FTP in PHP non è abilitato o installato. Impossibile montare %s. Chiedi al tuo amministratore di sistema di installarlo." #: lib/config.php:628 #, php-format msgid "" "Note: \"%s\" is not installed. Mounting of %s is not possible. Please" " ask your system administrator to install it." -msgstr "Nota:\"%s\" non è installato. Impossibile montare %s. Chiedi al tuo amministratore di sistema di installarlo." +msgstr "Nota: \"%s\" non è installato. Impossibile montare %s. Chiedi al tuo amministratore di sistema di installarlo." #: templates/settings.php:2 msgid "External Storage" diff --git a/l10n/it/lib.po b/l10n/it/lib.po index 409d389579a..7de4b24e4d4 100644 --- a/l10n/it/lib.po +++ b/l10n/it/lib.po @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-10 01:54-0400\n" -"PO-Revision-Date: 2014-04-09 23:00+0000\n" -"Last-Translator: idetao \n" +"POT-Creation-Date: 2014-04-11 01:54-0400\n" +"PO-Revision-Date: 2014-04-10 22:37+0000\n" +"Last-Translator: Vincenzo Reale \n" "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff --git a/l10n/it/user_ldap.po b/l10n/it/user_ldap.po index b8e77c2a3e2..b7958a71cae 100644 --- a/l10n/it/user_ldap.po +++ b/l10n/it/user_ldap.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-10 01:54-0400\n" -"PO-Revision-Date: 2014-04-09 22:50+0000\n" -"Last-Translator: idetao \n" +"POT-Creation-Date: 2014-04-11 01:54-0400\n" +"PO-Revision-Date: 2014-04-10 22:50+0000\n" +"Last-Translator: Vincenzo Reale \n" "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -431,7 +431,7 @@ msgid "" "Chunksize used for paged LDAP searches that may return bulky results like " "user or group enumeration. (Setting it 0 disables paged LDAP searches in " "those situations.)" -msgstr "" +msgstr "Dimensione del blocco per le ricerche LDAP paginate che potrebbero restituire risultati pesanti come l'enumerazione di utenti o gruppi.(L'impostazione a 0 disabilita le ricerche LDAP paginate in questi casi.)" #: templates/settings.php:42 msgid "Special Attributes" diff --git a/l10n/nl/files_external.po b/l10n/nl/files_external.po index 8d2871bf582..92ecf69764f 100644 --- a/l10n/nl/files_external.po +++ b/l10n/nl/files_external.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-09 01:55-0400\n" -"PO-Revision-Date: 2014-04-09 05:55+0000\n" -"Last-Translator: I Robot\n" +"POT-Creation-Date: 2014-04-11 01:54-0400\n" +"PO-Revision-Date: 2014-04-10 06:50+0000\n" +"Last-Translator: André Koot \n" "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -44,32 +44,32 @@ msgstr "Bewaard" #: lib/config.php:592 msgid "Note: " -msgstr "" +msgstr "Let op: " #: lib/config.php:602 msgid " and " -msgstr "" +msgstr "en" #: lib/config.php:624 #, php-format msgid "" "Note: The cURL support in PHP is not enabled or installed. Mounting " "of %s is not possible. Please ask your system administrator to install it." -msgstr "" +msgstr "Let op: Curl ondersteuning in PHP is niet geactiveerd of geïnstalleerd. Mounten van %s is niet mogelijk. Vraag uw systeembeheerder dit te installeren." #: lib/config.php:626 #, php-format msgid "" "Note: The FTP support in PHP is not enabled or installed. Mounting of" " %s is not possible. Please ask your system administrator to install it." -msgstr "" +msgstr "Let op: FTP ondersteuning in PHP is niet geactiveerd of geïnstalleerd. Mounten van %s is niet mogelijk. Vraag uw beheerder dit te installeren." #: lib/config.php:628 #, php-format msgid "" "Note: \"%s\" is not installed. Mounting of %s is not possible. Please" " ask your system administrator to install it." -msgstr "" +msgstr "Let op: \"%s\" is niet geïnstalleerd. Mounten van %s is niet mogelijk. Vraag uw beheerder om dit te installeren." #: templates/settings.php:2 msgid "External Storage" diff --git a/l10n/nl/lib.po b/l10n/nl/lib.po index a727e37a2eb..35171905f80 100644 --- a/l10n/nl/lib.po +++ b/l10n/nl/lib.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-10 01:54-0400\n" -"PO-Revision-Date: 2014-04-09 06:10+0000\n" -"Last-Translator: I Robot\n" +"POT-Creation-Date: 2014-04-11 01:54-0400\n" +"PO-Revision-Date: 2014-04-10 06:50+0000\n" +"Last-Translator: André Koot \n" "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -344,7 +344,7 @@ msgstr "jaar geleden" msgid "" "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", " "\"0-9\", and \"_.@-\"" -msgstr "" +msgstr "Alleen de volgende tekens zijn toegestaan in een gebruikersnaam: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" #: private/user/manager.php:251 msgid "A valid username must be provided" @@ -356,4 +356,4 @@ msgstr "Er moet een geldig wachtwoord worden opgegeven" #: private/user/manager.php:260 msgid "The username is already being used" -msgstr "" +msgstr "De gebruikersnaam bestaat al" diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot index f69b4b5d432..5c36d44feb1 100644 --- a/l10n/templates/core.pot +++ b/l10n/templates/core.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-10 01:54-0400\n" +"POT-Creation-Date: 2014-04-11 01:54-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -295,12 +295,12 @@ msgstr "" msgid "Share" msgstr "" -#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711 +#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:731 #: templates/installation.php:10 msgid "Error" msgstr "" -#: js/share.js:160 js/share.js:767 +#: js/share.js:160 js/share.js:787 msgid "Error while sharing" msgstr "" @@ -364,71 +364,71 @@ msgstr "" msgid "No people found" msgstr "" -#: js/share.js:324 js/share.js:363 +#: js/share.js:324 js/share.js:383 msgid "group" msgstr "" -#: js/share.js:335 +#: js/share.js:355 msgid "Resharing is not allowed" msgstr "" -#: js/share.js:379 +#: js/share.js:399 msgid "Shared in {item} with {user}" msgstr "" -#: js/share.js:401 +#: js/share.js:421 msgid "Unshare" msgstr "" -#: js/share.js:409 +#: js/share.js:429 msgid "notify by email" msgstr "" -#: js/share.js:412 +#: js/share.js:432 msgid "can edit" msgstr "" -#: js/share.js:414 +#: js/share.js:434 msgid "access control" msgstr "" -#: js/share.js:417 +#: js/share.js:437 msgid "create" msgstr "" -#: js/share.js:420 +#: js/share.js:440 msgid "update" msgstr "" -#: js/share.js:423 +#: js/share.js:443 msgid "delete" msgstr "" -#: js/share.js:426 +#: js/share.js:446 msgid "share" msgstr "" -#: js/share.js:698 +#: js/share.js:718 msgid "Password protected" msgstr "" -#: js/share.js:711 +#: js/share.js:731 msgid "Error unsetting expiration date" msgstr "" -#: js/share.js:729 +#: js/share.js:749 msgid "Error setting expiration date" msgstr "" -#: js/share.js:754 +#: js/share.js:774 msgid "Sending ..." msgstr "" -#: js/share.js:765 +#: js/share.js:785 msgid "Email sent" msgstr "" -#: js/share.js:789 +#: js/share.js:809 msgid "Warning" msgstr "" diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot index a6d07cdc509..97d8aaf0ab0 100644 --- a/l10n/templates/files.pot +++ b/l10n/templates/files.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-10 01:54-0400\n" +"POT-Creation-Date: 2014-04-11 01:54-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot index 76d141a0859..09f5900a03a 100644 --- a/l10n/templates/files_encryption.pot +++ b/l10n/templates/files_encryption.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-10 01:54-0400\n" +"POT-Creation-Date: 2014-04-11 01:54-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot index 5be8bf356f3..446829a7066 100644 --- a/l10n/templates/files_external.pot +++ b/l10n/templates/files_external.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-10 01:54-0400\n" +"POT-Creation-Date: 2014-04-11 01:54-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot index 60582d89f51..335843470ba 100644 --- a/l10n/templates/files_sharing.pot +++ b/l10n/templates/files_sharing.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-10 01:54-0400\n" +"POT-Creation-Date: 2014-04-11 01:54-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_trashbin.pot b/l10n/templates/files_trashbin.pot index 4e8d76a5465..9800a9ad3f7 100644 --- a/l10n/templates/files_trashbin.pot +++ b/l10n/templates/files_trashbin.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-10 01:54-0400\n" +"POT-Creation-Date: 2014-04-11 01:54-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot index 1a27053a19a..eca1e25e0df 100644 --- a/l10n/templates/files_versions.pot +++ b/l10n/templates/files_versions.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-10 01:54-0400\n" +"POT-Creation-Date: 2014-04-11 01:54-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot index ad065b90cad..df8dcaa8041 100644 --- a/l10n/templates/lib.pot +++ b/l10n/templates/lib.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-10 01:54-0400\n" +"POT-Creation-Date: 2014-04-11 01:54-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/private.pot b/l10n/templates/private.pot index c92cf519b8c..c7c39e54af5 100644 --- a/l10n/templates/private.pot +++ b/l10n/templates/private.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-10 01:54-0400\n" +"POT-Creation-Date: 2014-04-11 01:54-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot index fb3582a4558..9095c16f9f7 100644 --- a/l10n/templates/settings.pot +++ b/l10n/templates/settings.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-10 01:54-0400\n" +"POT-Creation-Date: 2014-04-11 01:54-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot index 88cd14c529d..9418a90de14 100644 --- a/l10n/templates/user_ldap.pot +++ b/l10n/templates/user_ldap.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-10 01:54-0400\n" +"POT-Creation-Date: 2014-04-11 01:54-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/user_webdavauth.pot b/l10n/templates/user_webdavauth.pot index 47794841273..e858ef7740c 100644 --- a/l10n/templates/user_webdavauth.pot +++ b/l10n/templates/user_webdavauth.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-10 01:54-0400\n" +"POT-Creation-Date: 2014-04-11 01:54-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/tr/core.po b/l10n/tr/core.po index 4a6ae0d299f..cc1c42a783f 100644 --- a/l10n/tr/core.po +++ b/l10n/tr/core.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-09 01:55-0400\n" -"PO-Revision-Date: 2014-04-08 16:21+0000\n" +"POT-Creation-Date: 2014-04-11 01:54-0400\n" +"PO-Revision-Date: 2014-04-11 00:20+0000\n" "Last-Translator: volkangezer \n" "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n" "MIME-Version: 1.0\n" @@ -146,127 +146,127 @@ msgstr "Ayarlar" msgid "Saving..." msgstr "Kaydediliyor..." -#: js/js.js:1124 +#: js/js.js:1099 msgid "seconds ago" msgstr "saniyeler önce" -#: js/js.js:1125 +#: js/js.js:1100 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "%n dakika önce" msgstr[1] "%n dakika önce" -#: js/js.js:1126 +#: js/js.js:1101 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "%n saat önce" msgstr[1] "%n saat önce" -#: js/js.js:1127 +#: js/js.js:1102 msgid "today" msgstr "bugün" -#: js/js.js:1128 +#: js/js.js:1103 msgid "yesterday" msgstr "dün" -#: js/js.js:1129 +#: js/js.js:1104 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "%n gün önce" msgstr[1] "%n gün önce" -#: js/js.js:1130 +#: js/js.js:1105 msgid "last month" msgstr "geçen ay" -#: js/js.js:1131 +#: js/js.js:1106 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "%n ay önce" msgstr[1] "%n ay önce" -#: js/js.js:1132 +#: js/js.js:1107 msgid "months ago" msgstr "ay önce" -#: js/js.js:1133 +#: js/js.js:1108 msgid "last year" msgstr "geçen yıl" -#: js/js.js:1134 +#: js/js.js:1109 msgid "years ago" msgstr "yıl önce" -#: js/oc-dialogs.js:123 +#: js/oc-dialogs.js:125 msgid "Choose" -msgstr "seç" +msgstr "Seç" -#: js/oc-dialogs.js:146 +#: js/oc-dialogs.js:151 msgid "Error loading file picker template: {error}" msgstr "Dosya seçici şablonu yüklenirken hata: {error}" -#: js/oc-dialogs.js:172 +#: js/oc-dialogs.js:177 msgid "Yes" msgstr "Evet" -#: js/oc-dialogs.js:182 +#: js/oc-dialogs.js:187 msgid "No" msgstr "Hayır" -#: js/oc-dialogs.js:199 +#: js/oc-dialogs.js:204 msgid "Ok" msgstr "Tamam" -#: js/oc-dialogs.js:219 +#: js/oc-dialogs.js:224 msgid "Error loading message template: {error}" msgstr "İleti şablonu yüklenirken hata: {error}" -#: js/oc-dialogs.js:347 +#: js/oc-dialogs.js:352 msgid "{count} file conflict" msgid_plural "{count} file conflicts" msgstr[0] "{count} dosya çakışması" msgstr[1] "{count} dosya çakışması" -#: js/oc-dialogs.js:361 +#: js/oc-dialogs.js:366 msgid "One file conflict" msgstr "Bir dosya çakışması" -#: js/oc-dialogs.js:367 +#: js/oc-dialogs.js:372 msgid "New Files" msgstr "Yeni Dosyalar" -#: js/oc-dialogs.js:368 +#: js/oc-dialogs.js:373 msgid "Already existing files" msgstr "Zaten mevcut olan dosyalar" -#: js/oc-dialogs.js:370 +#: js/oc-dialogs.js:375 msgid "Which files do you want to keep?" msgstr "Hangi dosyaları saklamak istiyorsunuz?" -#: js/oc-dialogs.js:371 +#: js/oc-dialogs.js:376 msgid "" "If you select both versions, the copied file will have a number added to its" " name." msgstr "İki sürümü de seçerseniz, kopyalanan dosyanın ismine bir sayı ilave edilecektir." -#: js/oc-dialogs.js:379 +#: js/oc-dialogs.js:384 msgid "Cancel" msgstr "İptal" -#: js/oc-dialogs.js:389 +#: js/oc-dialogs.js:394 msgid "Continue" msgstr "Devam et" -#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +#: js/oc-dialogs.js:441 js/oc-dialogs.js:454 msgid "(all selected)" msgstr "(tümü seçildi)" -#: js/oc-dialogs.js:439 js/oc-dialogs.js:452 +#: js/oc-dialogs.js:444 js/oc-dialogs.js:457 msgid "({count} selected)" msgstr "({count} seçildi)" -#: js/oc-dialogs.js:460 +#: js/oc-dialogs.js:465 msgid "Error loading file exists template" msgstr "Dosya mevcut şablonu yüklenirken hata" @@ -298,12 +298,12 @@ msgstr "Paylaşılan" msgid "Share" msgstr "Paylaş" -#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711 +#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:731 #: templates/installation.php:10 msgid "Error" msgstr "Hata" -#: js/share.js:160 js/share.js:767 +#: js/share.js:160 js/share.js:787 msgid "Error while sharing" msgstr "Paylaşım sırasında hata" @@ -367,71 +367,71 @@ msgstr "E-posta ile paylaş" msgid "No people found" msgstr "Kişi bulunamadı" -#: js/share.js:324 js/share.js:363 +#: js/share.js:324 js/share.js:383 msgid "group" msgstr "grup" -#: js/share.js:335 +#: js/share.js:355 msgid "Resharing is not allowed" msgstr "Tekrar paylaşmaya izin verilmiyor" -#: js/share.js:379 +#: js/share.js:399 msgid "Shared in {item} with {user}" msgstr "{item} içinde {user} ile paylaşılanlar" -#: js/share.js:401 +#: js/share.js:421 msgid "Unshare" msgstr "Paylaşılmayan" -#: js/share.js:409 +#: js/share.js:429 msgid "notify by email" msgstr "e-posta ile bildir" -#: js/share.js:412 +#: js/share.js:432 msgid "can edit" msgstr "düzenleyebilir" -#: js/share.js:414 +#: js/share.js:434 msgid "access control" msgstr "erişim kontrolü" -#: js/share.js:417 +#: js/share.js:437 msgid "create" msgstr "oluştur" -#: js/share.js:420 +#: js/share.js:440 msgid "update" msgstr "güncelle" -#: js/share.js:423 +#: js/share.js:443 msgid "delete" msgstr "sil" -#: js/share.js:426 +#: js/share.js:446 msgid "share" msgstr "paylaş" -#: js/share.js:698 +#: js/share.js:718 msgid "Password protected" msgstr "Parola korumalı" -#: js/share.js:711 +#: js/share.js:731 msgid "Error unsetting expiration date" msgstr "Geçerlilik tarihi tanımlama kaldırma hatası" -#: js/share.js:729 +#: js/share.js:749 msgid "Error setting expiration date" msgstr "Geçerlilik tarihi tanımlama hatası" -#: js/share.js:754 +#: js/share.js:774 msgid "Sending ..." msgstr "Gönderiliyor..." -#: js/share.js:765 +#: js/share.js:785 msgid "Email sent" msgstr "E-posta gönderildi" -#: js/share.js:789 +#: js/share.js:809 msgid "Warning" msgstr "Uyarı" diff --git a/l10n/tr/files_trashbin.po b/l10n/tr/files_trashbin.po index 7ac32596ae6..d4f9948df31 100644 --- a/l10n/tr/files_trashbin.po +++ b/l10n/tr/files_trashbin.po @@ -4,14 +4,14 @@ # # Translators: # tridinebandim, 2013 -# volkangezer , 2013 +# volkangezer , 2013-2014 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-03-15 02:13-0400\n" -"PO-Revision-Date: 2014-03-15 05:40+0000\n" -"Last-Translator: I Robot\n" +"POT-Creation-Date: 2014-04-11 01:54-0400\n" +"PO-Revision-Date: 2014-04-10 16:50+0000\n" +"Last-Translator: volkangezer \n" "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -27,40 +27,40 @@ msgstr "%s alıcı olarak silinemedi" #: ajax/undelete.php:64 #, php-format msgid "Couldn't restore %s" -msgstr "%s eri yüklenemedi" +msgstr "%s geri yüklenemedi" -#: js/filelist.js:23 +#: js/filelist.js:3 msgid "Deleted files" msgstr "Silinmiş dosyalar" -#: js/trash.js:16 js/trash.js:103 js/trash.js:152 +#: js/trash.js:33 js/trash.js:124 js/trash.js:173 msgid "Error" msgstr "Hata" -#: lib/trashbin.php:853 lib/trashbin.php:855 +#: js/trash.js:264 +msgid "Deleted Files" +msgstr "Silinen Dosyalar" + +#: lib/trashbin.php:859 lib/trashbin.php:861 msgid "restored" msgstr "geri yüklendi" -#: templates/index.php:7 +#: templates/index.php:6 msgid "Nothing in here. Your trash bin is empty!" msgstr "Burada hiçbir şey yok. Çöp kutunuz tamamen boş!" -#: templates/index.php:20 +#: templates/index.php:19 msgid "Name" msgstr "İsim" -#: templates/index.php:23 templates/index.php:25 +#: templates/index.php:22 templates/index.php:24 msgid "Restore" msgstr "Geri yükle" -#: templates/index.php:31 +#: templates/index.php:30 msgid "Deleted" msgstr "Silindi" -#: templates/index.php:34 templates/index.php:35 +#: templates/index.php:33 templates/index.php:34 msgid "Delete" msgstr "Sil" - -#: templates/part.breadcrumb.php:8 -msgid "Deleted Files" -msgstr "Silinen Dosyalar" diff --git a/lib/l10n/fr.php b/lib/l10n/fr.php index 52cbfb85b40..b13970c610d 100644 --- a/lib/l10n/fr.php +++ b/lib/l10n/fr.php @@ -67,6 +67,7 @@ $TRANSLATIONS = array( "_%n month ago_::_%n months ago_" => array("","Il y a %n mois"), "last year" => "l'année dernière", "years ago" => "il y a plusieurs années", +"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" => "Seuls les caractères suivants sont autorisés dans un nom d'utilisateur : \"a-z\", \"A-Z\", \"0-9\", et \"_.@-\"", "A valid username must be provided" => "Un nom d'utilisateur valide doit être saisi", "A valid password must be provided" => "Un mot de passe valide doit être saisi", "The username is already being used" => "Le nom d'utilisateur est déjà utilisé" diff --git a/lib/l10n/nl.php b/lib/l10n/nl.php index c7a1609a770..c43703c504e 100644 --- a/lib/l10n/nl.php +++ b/lib/l10n/nl.php @@ -67,7 +67,9 @@ $TRANSLATIONS = array( "_%n month ago_::_%n months ago_" => array("%n maand geleden","%n maanden geleden"), "last year" => "vorig jaar", "years ago" => "jaar geleden", +"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" => "Alleen de volgende tekens zijn toegestaan in een gebruikersnaam: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"", "A valid username must be provided" => "Er moet een geldige gebruikersnaam worden opgegeven", -"A valid password must be provided" => "Er moet een geldig wachtwoord worden opgegeven" +"A valid password must be provided" => "Er moet een geldig wachtwoord worden opgegeven", +"The username is already being used" => "De gebruikersnaam bestaat al" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; -- GitLab From e28227ecdc0f898868701fe131326d8c15ef60d7 Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Fri, 11 Apr 2014 13:56:06 +0200 Subject: [PATCH 090/253] fix comparison in determineMode, fixes problems with restoring the filter mode (assisted or manually) on page refresh --- apps/user_ldap/js/ldapFilter.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apps/user_ldap/js/ldapFilter.js b/apps/user_ldap/js/ldapFilter.js index 70f24f0d4a5..d0fee6db7fc 100644 --- a/apps/user_ldap/js/ldapFilter.js +++ b/apps/user_ldap/js/ldapFilter.js @@ -64,13 +64,16 @@ LdapFilter.prototype.determineMode = function() { LdapWizard.ajax(param, function(result) { property = 'ldap' + filter.target + 'FilterMode'; - filter.mode = result.changes[property]; + filter.mode = parseInt(result.changes[property]); if(filter.mode === LdapWizard.filterModeRaw && $('#raw'+filter.target+'FilterContainer').hasClass('invisible')) { LdapWizard['toggleRaw'+filter.target+'Filter'](); } else if(filter.mode === LdapWizard.filterModeAssisted && !$('#raw'+filter.target+'FilterContainer').hasClass('invisible')) { LdapWizard['toggleRaw'+filter.target+'Filter'](); + } else { + console.log('LDAP Wizard determineMode: returned mode was »' + + filter.mode + '« of type ' + typeof filter.mode); } filter.unlock(); }, -- GitLab From 1c57ffa16fab8cfb132978865d819e98cb143a24 Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Fri, 11 Apr 2014 14:08:12 +0200 Subject: [PATCH 091/253] Give hint when composing filter failed --- apps/user_ldap/js/ldapFilter.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/user_ldap/js/ldapFilter.js b/apps/user_ldap/js/ldapFilter.js index d0fee6db7fc..0d691647944 100644 --- a/apps/user_ldap/js/ldapFilter.js +++ b/apps/user_ldap/js/ldapFilter.js @@ -50,7 +50,8 @@ LdapFilter.prototype.compose = function() { } }, function (result) { - // error handling + console.log('LDAP Wizard: could not compose filter. '+ + 'Please check owncloud.log'); } ); } -- GitLab From 07ea57465ba23dd31dae943b44f4c04ccabb5e60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Fri, 11 Apr 2014 14:54:13 +0200 Subject: [PATCH 092/253] drop folder support on public shared folders --- apps/files_sharing/js/public.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/apps/files_sharing/js/public.js b/apps/files_sharing/js/public.js index 9ce8985f1fd..ae2412f6a3b 100644 --- a/apps/files_sharing/js/public.js +++ b/apps/files_sharing/js/public.js @@ -62,11 +62,17 @@ $(document).ready(function() { var file_upload_start = $('#file_upload_start'); file_upload_start.on('fileuploadadd', function(e, data) { + var fileDirectory = ''; + if(typeof data.files[0].relativePath !== 'undefined') { + fileDirectory = data.files[0].relativePath; + } + // Add custom data to the upload handler data.formData = { requesttoken: $('#publicUploadRequestToken').val(), dirToken: $('#dirToken').val(), - subdir: $('input#dir').val() + subdir: $('input#dir').val(), + file_directory: fileDirectory }; }); -- GitLab From d67cba973e7037a7c9f48cc3aceec9eff26b4393 Mon Sep 17 00:00:00 2001 From: Volkan Gezer Date: Fri, 11 Apr 2014 15:23:43 +0200 Subject: [PATCH 093/253] Typo fix. --- apps/user_ldap/templates/settings.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/user_ldap/templates/settings.php b/apps/user_ldap/templates/settings.php index 32cf44a56b9..0a111225a70 100644 --- a/apps/user_ldap/templates/settings.php +++ b/apps/user_ldap/templates/settings.php @@ -23,7 +23,7 @@

    -

    >

    +

    >


    -- GitLab From e92fe47d2af67f844584da2d9e802f77815d6aa4 Mon Sep 17 00:00:00 2001 From: Vincent Petry Date: Fri, 11 Apr 2014 15:25:40 +0200 Subject: [PATCH 094/253] Remove annoying karma 404 warnings for images Karma now serves images from core to avoid polluting the logs with a lot of 404 warnings. This also makes it easier to read the test errors during development. --- tests/karma.config.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tests/karma.config.js b/tests/karma.config.js index ed9836ed4c3..338e3f868e9 100644 --- a/tests/karma.config.js +++ b/tests/karma.config.js @@ -121,6 +121,9 @@ module.exports = function(config) { files.push('apps/' + appsToTest[i] + '/tests/js/*.js'); } + // serve images to avoid warnings + files.push({pattern: 'core/img/**/*', watched: false, included: false, served: true}); + config.set({ // base path, that will be used to resolve files and exclude @@ -137,6 +140,11 @@ module.exports = function(config) { ], + proxies: { + // prevent warnings for images + '/context.html//core/img/': 'http://localhost:9876/base/core/img/' + }, + // test results reporter to use // possible values: 'dots', 'progress', 'junit', 'growl', 'coverage' reporters: ['dots', 'junit', 'coverage'], -- GitLab From 77ecfdd1a42811a1239b29c18b21768d2a5a3ae0 Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Fri, 11 Apr 2014 19:42:15 +0200 Subject: [PATCH 095/253] Only encode dangerous dangerous characters There is no need to encode all characters into HTML entities, only potential dangerous characters as &, ", ', < and > should get encoded. This may fix issues like https://github.com/owncloud/calendar/pull/394 --- lib/private/util.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/private/util.php b/lib/private/util.php index 731b7c97503..a744644b39c 100755 --- a/lib/private/util.php +++ b/lib/private/util.php @@ -805,7 +805,7 @@ class OC_Util { array_walk_recursive($value, 'OC_Util::sanitizeHTML'); } else { //Specify encoding for PHP<5.4 - $value = htmlentities((string)$value, ENT_QUOTES, 'UTF-8'); + $value = htmlspecialchars((string)$value, ENT_QUOTES, 'UTF-8'); } return $value; } -- GitLab From 6343391e580b0a686f2b2ee2b0b43ca675473be8 Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Fri, 11 Apr 2014 20:38:27 +0200 Subject: [PATCH 096/253] Change from showHTML to show There is no need to use `showHTML` here. --- apps/files/js/files.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/files/js/files.js b/apps/files/js/files.js index ac10191618b..9f38263bef3 100644 --- a/apps/files/js/files.js +++ b/apps/files/js/files.js @@ -135,7 +135,7 @@ var Files = { return; } if (initStatus === '1') { // encryption tried to init but failed - OC.Notification.showHtml(t('files', 'Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files.')); + OC.Notification.show(t('files', 'Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files.')); return; } if (encryptedFiles === '1') { -- GitLab From 4af72a076d9796907bf48ee34de1ae29528b55df Mon Sep 17 00:00:00 2001 From: Bernhard Posselt Date: Fri, 11 Apr 2014 20:50:49 +0200 Subject: [PATCH 097/253] use references for middleware to fix problems on 5.3 --- lib/private/appframework/dependencyinjection/dicontainer.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/private/appframework/dependencyinjection/dicontainer.php b/lib/private/appframework/dependencyinjection/dicontainer.php index beba71052f8..e478225a53d 100644 --- a/lib/private/appframework/dependencyinjection/dicontainer.php +++ b/lib/private/appframework/dependencyinjection/dicontainer.php @@ -92,11 +92,12 @@ class DIContainer extends SimpleContainer implements IAppContainer{ return new SecurityMiddleware($app, $c['Request']); }); - $this['MiddlewareDispatcher'] = $this->share(function($c) { + $middleWares = &$this->middleWares; + $this['MiddlewareDispatcher'] = $this->share(function($c) use (&$middleWares) { $dispatcher = new MiddlewareDispatcher(); $dispatcher->registerMiddleware($c['SecurityMiddleware']); - foreach($this->middleWares as $middleWare) { + foreach($middleWares as $middleWare) { $dispatcher->registerMiddleware($c[$middleWare]); } -- GitLab From 329b8f3e99767141c03880cb0aaff6af2e3ce043 Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Sat, 12 Apr 2014 01:56:11 -0400 Subject: [PATCH 098/253] [tx-robot] updated from transifex --- apps/user_ldap/l10n/bn_BD.php | 1 - apps/user_ldap/l10n/ca.php | 1 - apps/user_ldap/l10n/cs_CZ.php | 1 - apps/user_ldap/l10n/da.php | 1 - apps/user_ldap/l10n/de.php | 1 - apps/user_ldap/l10n/de_CH.php | 1 - apps/user_ldap/l10n/de_DE.php | 1 - apps/user_ldap/l10n/el.php | 1 - apps/user_ldap/l10n/en_GB.php | 1 - apps/user_ldap/l10n/eo.php | 1 - apps/user_ldap/l10n/es.php | 1 - apps/user_ldap/l10n/es_AR.php | 1 - apps/user_ldap/l10n/es_MX.php | 1 - apps/user_ldap/l10n/et_EE.php | 1 - apps/user_ldap/l10n/eu.php | 1 - apps/user_ldap/l10n/fa.php | 1 - apps/user_ldap/l10n/fi_FI.php | 1 - apps/user_ldap/l10n/fr.php | 1 - apps/user_ldap/l10n/gl.php | 1 - apps/user_ldap/l10n/hu_HU.php | 1 - apps/user_ldap/l10n/id.php | 1 - apps/user_ldap/l10n/it.php | 1 - apps/user_ldap/l10n/ja.php | 1 - apps/user_ldap/l10n/ka_GE.php | 1 - apps/user_ldap/l10n/ko.php | 1 - apps/user_ldap/l10n/lv.php | 1 - apps/user_ldap/l10n/nb_NO.php | 1 - apps/user_ldap/l10n/nl.php | 1 - apps/user_ldap/l10n/pl.php | 1 - apps/user_ldap/l10n/pt_BR.php | 1 - apps/user_ldap/l10n/pt_PT.php | 1 - apps/user_ldap/l10n/ro.php | 1 - apps/user_ldap/l10n/ru.php | 1 - apps/user_ldap/l10n/sk_SK.php | 1 - apps/user_ldap/l10n/sl.php | 1 - apps/user_ldap/l10n/sq.php | 1 - apps/user_ldap/l10n/sr.php | 1 - apps/user_ldap/l10n/sv.php | 1 - apps/user_ldap/l10n/ta_LK.php | 1 - apps/user_ldap/l10n/th_TH.php | 1 - apps/user_ldap/l10n/tr.php | 37 +++++---- apps/user_ldap/l10n/uk.php | 1 - apps/user_ldap/l10n/vi.php | 1 - apps/user_ldap/l10n/zh_CN.php | 1 - apps/user_ldap/l10n/zh_TW.php | 1 - l10n/ach/settings.po | 116 ++++++++++++++++------------ l10n/ach/user_ldap.po | 8 +- l10n/ady/settings.po | 116 ++++++++++++++++------------ l10n/ady/user_ldap.po | 8 +- l10n/af/settings.po | 116 ++++++++++++++++------------ l10n/af/user_ldap.po | 8 +- l10n/af_ZA/settings.po | 116 ++++++++++++++++------------ l10n/af_ZA/user_ldap.po | 8 +- l10n/ak/settings.po | 116 ++++++++++++++++------------ l10n/ak/user_ldap.po | 8 +- l10n/am_ET/settings.po | 116 ++++++++++++++++------------ l10n/am_ET/user_ldap.po | 8 +- l10n/ar/settings.po | 18 ++++- l10n/ar/user_ldap.po | 8 +- l10n/ast/settings.po | 18 ++++- l10n/ast/user_ldap.po | 6 +- l10n/az/settings.po | 116 ++++++++++++++++------------ l10n/az/user_ldap.po | 8 +- l10n/be/settings.po | 116 ++++++++++++++++------------ l10n/be/user_ldap.po | 8 +- l10n/bg_BG/settings.po | 116 ++++++++++++++++------------ l10n/bg_BG/user_ldap.po | 8 +- l10n/bn_BD/settings.po | 116 ++++++++++++++++------------ l10n/bn_BD/user_ldap.po | 10 +-- l10n/bs/settings.po | 116 ++++++++++++++++------------ l10n/bs/user_ldap.po | 8 +- l10n/ca/settings.po | 20 ++++- l10n/ca/user_ldap.po | 10 +-- l10n/cs_CZ/settings.po | 20 ++++- l10n/cs_CZ/user_ldap.po | 10 +-- l10n/cy_GB/settings.po | 116 ++++++++++++++++------------ l10n/cy_GB/user_ldap.po | 8 +- l10n/da/settings.po | 20 ++++- l10n/da/user_ldap.po | 10 +-- l10n/de/settings.po | 20 ++++- l10n/de/user_ldap.po | 10 +-- l10n/de_AT/settings.po | 116 ++++++++++++++++------------ l10n/de_AT/user_ldap.po | 8 +- l10n/de_CH/settings.po | 18 ++++- l10n/de_CH/user_ldap.po | 10 +-- l10n/de_DE/settings.po | 20 ++++- l10n/de_DE/user_ldap.po | 10 +-- l10n/el/settings.po | 20 ++++- l10n/el/user_ldap.po | 10 +-- l10n/en@pirate/settings.po | 116 ++++++++++++++++------------ l10n/en@pirate/user_ldap.po | 8 +- l10n/en_GB/settings.po | 20 ++++- l10n/en_GB/user_ldap.po | 12 +-- l10n/eo/settings.po | 116 ++++++++++++++++------------ l10n/eo/user_ldap.po | 10 +-- l10n/es/settings.po | 20 ++++- l10n/es/user_ldap.po | 10 +-- l10n/es_AR/settings.po | 18 ++++- l10n/es_AR/user_ldap.po | 10 +-- l10n/es_CL/settings.po | 116 ++++++++++++++++------------ l10n/es_CL/user_ldap.po | 8 +- l10n/es_MX/settings.po | 18 ++++- l10n/es_MX/user_ldap.po | 10 +-- l10n/et_EE/settings.po | 20 ++++- l10n/et_EE/user_ldap.po | 10 +-- l10n/eu/settings.po | 18 ++++- l10n/eu/user_ldap.po | 10 +-- l10n/eu_ES/settings.po | 116 ++++++++++++++++------------ l10n/eu_ES/user_ldap.po | 8 +- l10n/fa/settings.po | 18 ++++- l10n/fa/user_ldap.po | 10 +-- l10n/fi_FI/settings.po | 20 ++++- l10n/fi_FI/user_ldap.po | 10 +-- l10n/fr/settings.po | 20 ++++- l10n/fr/user_ldap.po | 10 +-- l10n/fr_CA/settings.po | 116 ++++++++++++++++------------ l10n/fr_CA/user_ldap.po | 8 +- l10n/gl/settings.po | 20 ++++- l10n/gl/user_ldap.po | 12 +-- l10n/he/settings.po | 18 ++++- l10n/he/user_ldap.po | 8 +- l10n/hi/settings.po | 116 ++++++++++++++++------------ l10n/hi/user_ldap.po | 8 +- l10n/hr/settings.po | 116 ++++++++++++++++------------ l10n/hr/user_ldap.po | 8 +- l10n/hu_HU/settings.po | 18 ++++- l10n/hu_HU/user_ldap.po | 10 +-- l10n/hy/settings.po | 116 ++++++++++++++++------------ l10n/hy/user_ldap.po | 8 +- l10n/ia/settings.po | 116 ++++++++++++++++------------ l10n/ia/user_ldap.po | 8 +- l10n/id/settings.po | 18 ++++- l10n/id/user_ldap.po | 10 +-- l10n/is/settings.po | 116 ++++++++++++++++------------ l10n/is/user_ldap.po | 8 +- l10n/it/settings.po | 20 ++++- l10n/it/user_ldap.po | 10 +-- l10n/ja/settings.po | 18 ++++- l10n/ja/user_ldap.po | 10 +-- l10n/jv/settings.po | 18 ++++- l10n/jv/user_ldap.po | 8 +- l10n/ka_GE/settings.po | 18 ++++- l10n/ka_GE/user_ldap.po | 10 +-- l10n/km/settings.po | 18 ++++- l10n/km/user_ldap.po | 8 +- l10n/kn/settings.po | 116 ++++++++++++++++------------ l10n/kn/user_ldap.po | 8 +- l10n/ko/settings.po | 18 ++++- l10n/ko/user_ldap.po | 10 +-- l10n/ku_IQ/settings.po | 116 ++++++++++++++++------------ l10n/ku_IQ/user_ldap.po | 8 +- l10n/lb/settings.po | 116 ++++++++++++++++------------ l10n/lb/user_ldap.po | 8 +- l10n/lt_LT/settings.po | 18 ++++- l10n/lt_LT/user_ldap.po | 8 +- l10n/lv/settings.po | 18 ++++- l10n/lv/user_ldap.po | 10 +-- l10n/mk/settings.po | 18 ++++- l10n/mk/user_ldap.po | 8 +- l10n/ml/settings.po | 116 ++++++++++++++++------------ l10n/ml/user_ldap.po | 8 +- l10n/ml_IN/settings.po | 116 ++++++++++++++++------------ l10n/ml_IN/user_ldap.po | 8 +- l10n/mn/settings.po | 116 ++++++++++++++++------------ l10n/mn/user_ldap.po | 8 +- l10n/ms_MY/settings.po | 116 ++++++++++++++++------------ l10n/ms_MY/user_ldap.po | 8 +- l10n/my_MM/settings.po | 116 ++++++++++++++++------------ l10n/my_MM/user_ldap.po | 8 +- l10n/nb_NO/settings.po | 20 ++++- l10n/nb_NO/user_ldap.po | 10 +-- l10n/nds/settings.po | 116 ++++++++++++++++------------ l10n/nds/user_ldap.po | 8 +- l10n/ne/settings.po | 116 ++++++++++++++++------------ l10n/ne/user_ldap.po | 8 +- l10n/nl/settings.po | 20 ++++- l10n/nl/user_ldap.po | 12 +-- l10n/nn_NO/settings.po | 18 ++++- l10n/nn_NO/user_ldap.po | 8 +- l10n/nqo/settings.po | 116 ++++++++++++++++------------ l10n/nqo/user_ldap.po | 8 +- l10n/oc/settings.po | 116 ++++++++++++++++------------ l10n/oc/user_ldap.po | 8 +- l10n/pa/settings.po | 116 ++++++++++++++++------------ l10n/pa/user_ldap.po | 8 +- l10n/pl/settings.po | 20 ++++- l10n/pl/user_ldap.po | 12 +-- l10n/pt_BR/settings.po | 20 ++++- l10n/pt_BR/user_ldap.po | 12 +-- l10n/pt_PT/settings.po | 18 ++++- l10n/pt_PT/user_ldap.po | 10 +-- l10n/ro/settings.po | 18 ++++- l10n/ro/user_ldap.po | 10 +-- l10n/ru/settings.po | 18 ++++- l10n/ru/user_ldap.po | 10 +-- l10n/si_LK/settings.po | 116 ++++++++++++++++------------ l10n/si_LK/user_ldap.po | 8 +- l10n/sk/settings.po | 116 ++++++++++++++++------------ l10n/sk/user_ldap.po | 8 +- l10n/sk_SK/settings.po | 20 ++++- l10n/sk_SK/user_ldap.po | 10 +-- l10n/sl/settings.po | 20 ++++- l10n/sl/user_ldap.po | 10 +-- l10n/sq/settings.po | 18 ++++- l10n/sq/user_ldap.po | 10 +-- l10n/sr/settings.po | 18 ++++- l10n/sr/user_ldap.po | 10 +-- l10n/sr@latin/settings.po | 116 ++++++++++++++++------------ l10n/sr@latin/user_ldap.po | 8 +- l10n/su/settings.po | 116 ++++++++++++++++------------ l10n/su/user_ldap.po | 8 +- l10n/sv/settings.po | 20 ++++- l10n/sv/user_ldap.po | 12 +-- l10n/sw_KE/settings.po | 116 ++++++++++++++++------------ l10n/sw_KE/user_ldap.po | 8 +- l10n/ta_LK/settings.po | 116 ++++++++++++++++------------ l10n/ta_LK/user_ldap.po | 10 +-- l10n/te/settings.po | 116 ++++++++++++++++------------ l10n/te/user_ldap.po | 8 +- l10n/templates/core.pot | 2 +- l10n/templates/files.pot | 2 +- l10n/templates/files_encryption.pot | 2 +- l10n/templates/files_external.pot | 2 +- l10n/templates/files_sharing.pot | 2 +- l10n/templates/files_trashbin.pot | 2 +- l10n/templates/files_versions.pot | 2 +- l10n/templates/lib.pot | 2 +- l10n/templates/private.pot | 2 +- l10n/templates/settings.pot | 16 +++- l10n/templates/user_ldap.pot | 4 +- l10n/templates/user_webdavauth.pot | 2 +- l10n/th_TH/settings.po | 116 ++++++++++++++++------------ l10n/th_TH/user_ldap.po | 10 +-- l10n/tr/lib.po | 18 ++--- l10n/tr/settings.po | 20 ++++- l10n/tr/user_ldap.po | 48 ++++++------ l10n/tzm/settings.po | 116 ++++++++++++++++------------ l10n/tzm/user_ldap.po | 8 +- l10n/ug/settings.po | 18 ++++- l10n/ug/user_ldap.po | 8 +- l10n/uk/settings.po | 18 ++++- l10n/uk/user_ldap.po | 10 +-- l10n/ur/settings.po | 116 ++++++++++++++++------------ l10n/ur/user_ldap.po | 8 +- l10n/ur_PK/settings.po | 116 ++++++++++++++++------------ l10n/ur_PK/user_ldap.po | 8 +- l10n/uz/settings.po | 116 ++++++++++++++++------------ l10n/uz/user_ldap.po | 8 +- l10n/vi/settings.po | 116 ++++++++++++++++------------ l10n/vi/user_ldap.po | 10 +-- l10n/zh_CN/settings.po | 18 ++++- l10n/zh_CN/user_ldap.po | 10 +-- l10n/zh_HK/settings.po | 116 ++++++++++++++++------------ l10n/zh_HK/user_ldap.po | 8 +- l10n/zh_TW/settings.po | 18 ++++- l10n/zh_TW/user_ldap.po | 10 +-- lib/l10n/tr.php | 14 ++-- 257 files changed, 4581 insertions(+), 3226 deletions(-) diff --git a/apps/user_ldap/l10n/bn_BD.php b/apps/user_ldap/l10n/bn_BD.php index 0b43a27df94..90f7b572a95 100644 --- a/apps/user_ldap/l10n/bn_BD.php +++ b/apps/user_ldap/l10n/bn_BD.php @@ -13,7 +13,6 @@ $TRANSLATIONS = array( "Password" => "কূটশব্দ", "For anonymous access, leave DN and Password empty." => "অজ্ঞাতকুলশীল অধিগমনের জন্য DN এবং কূটশব্দটি ফাঁকা রাখুন।", "You can specify Base DN for users and groups in the Advanced tab" => "সুচারু ট্যঅবে গিয়ে আপনি ব্যবহারকারি এবং গোষ্ঠীসমূহের জন্য ভিত্তি DN নির্ধারণ করতে পারেন।", -"Case insensitve LDAP server (Windows)" => "বর্ণ অসংবেদী LDAP সার্ভার (উইন্ডোজ)", "Turn off SSL certificate validation." => "SSL সনদপত্র যাচাইকরণ বন্ধ রাক।", "in seconds. A change empties the cache." => "সেকেন্ডে। কোন পরিবর্তন ক্যাসে খালি করবে।", "User Display Name Field" => "ব্যবহারকারীর প্রদর্শিতব্য নামের ক্ষেত্র", diff --git a/apps/user_ldap/l10n/ca.php b/apps/user_ldap/l10n/ca.php index 940c6ea8b66..98b1cf74640 100644 --- a/apps/user_ldap/l10n/ca.php +++ b/apps/user_ldap/l10n/ca.php @@ -70,7 +70,6 @@ $TRANSLATIONS = array( "Backup (Replica) Port" => "Port de la còpia de seguretat (rèplica)", "Disable Main Server" => "Desactiva el servidor principal", "Only connect to the replica server." => "Connecta només al servidor rèplica.", -"Case insensitve LDAP server (Windows)" => "Servidor LDAP sense distinció entre majúscules i minúscules (Windows)", "Turn off SSL certificate validation." => "Desactiva la validació de certificat SSL.", "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "No es recomana, useu-ho només com a prova! Importeu el certificat SSL del servidor LDAP al servidor %s només si la connexió funciona amb aquesta opció.", "Cache Time-To-Live" => "Memòria de cau Time-To-Live", diff --git a/apps/user_ldap/l10n/cs_CZ.php b/apps/user_ldap/l10n/cs_CZ.php index 536834ee8b5..d4039e9ef10 100644 --- a/apps/user_ldap/l10n/cs_CZ.php +++ b/apps/user_ldap/l10n/cs_CZ.php @@ -70,7 +70,6 @@ $TRANSLATIONS = array( "Backup (Replica) Port" => "Záložní (kopie) port", "Disable Main Server" => "Zakázat hlavní server", "Only connect to the replica server." => "Připojit jen k záložnímu serveru.", -"Case insensitve LDAP server (Windows)" => "LDAP server nerozlišující velikost znaků (Windows)", "Turn off SSL certificate validation." => "Vypnout ověřování SSL certifikátu.", "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "Nedoporučuje se, určeno pouze k testovacímu použití. Pokud spojení funguje jen s touto volbou, importujte SSL certifikát vašeho LDAP serveru na server %s.", "Cache Time-To-Live" => "TTL vyrovnávací paměti", diff --git a/apps/user_ldap/l10n/da.php b/apps/user_ldap/l10n/da.php index e375598c9bd..8264a18116c 100644 --- a/apps/user_ldap/l10n/da.php +++ b/apps/user_ldap/l10n/da.php @@ -35,7 +35,6 @@ $TRANSLATIONS = array( "Backup (Replica) Port" => "Backup (Replika) Port", "Disable Main Server" => "Deaktiver Hovedserver", "Only connect to the replica server." => "Forbind kun til replika serveren.", -"Case insensitve LDAP server (Windows)" => "Ikke versalfølsom LDAP server (Windows)", "Turn off SSL certificate validation." => "Deaktiver SSL certifikat validering", "Cache Time-To-Live" => "Cache Time-To-Live", "User Display Name Field" => "User Display Name Field", diff --git a/apps/user_ldap/l10n/de.php b/apps/user_ldap/l10n/de.php index fd6bde8a97e..15c8d21687d 100644 --- a/apps/user_ldap/l10n/de.php +++ b/apps/user_ldap/l10n/de.php @@ -70,7 +70,6 @@ $TRANSLATIONS = array( "Backup (Replica) Port" => "Backup Port", "Disable Main Server" => "Hauptserver deaktivieren", "Only connect to the replica server." => "Nur zum Replikat-Server verbinden.", -"Case insensitve LDAP server (Windows)" => "LDAP-Server (Windows: Groß- und Kleinschreibung bleibt unbeachtet)", "Turn off SSL certificate validation." => "Schalte die SSL-Zertifikatsprüfung aus.", "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." => "Nur für Testzwecke geeignet, sollte Standardmäßig nicht verwendet werden. Falls die Verbindung nur mit dieser Option funktioniert, importiere das SSL-Zertifikat des LDAP-Servers in deinen %s Server.", "Cache Time-To-Live" => "Speichere Time-To-Live zwischen", diff --git a/apps/user_ldap/l10n/de_CH.php b/apps/user_ldap/l10n/de_CH.php index 5f8e2907f07..f60d425a2e6 100644 --- a/apps/user_ldap/l10n/de_CH.php +++ b/apps/user_ldap/l10n/de_CH.php @@ -42,7 +42,6 @@ $TRANSLATIONS = array( "Backup (Replica) Port" => "Backup Port", "Disable Main Server" => "Hauptserver deaktivieren", "Only connect to the replica server." => "Nur zum Replikat-Server verbinden.", -"Case insensitve LDAP server (Windows)" => "LDAP-Server (Windows: Gross- und Kleinschreibung bleibt unbeachtet)", "Turn off SSL certificate validation." => "Schalten Sie die SSL-Zertifikatsprüfung aus.", "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." => "Nur für Testzwecke geeignet, sollte Standardmäßig nicht verwendet werden. Falls die Verbindung nur mit dieser Option funktioniert, importieren Sie das SSL-Zertifikat des LDAP-Servers in Ihren %s Server.", "Cache Time-To-Live" => "Speichere Time-To-Live zwischen", diff --git a/apps/user_ldap/l10n/de_DE.php b/apps/user_ldap/l10n/de_DE.php index 8c6ba0f3130..60d52cd30f6 100644 --- a/apps/user_ldap/l10n/de_DE.php +++ b/apps/user_ldap/l10n/de_DE.php @@ -70,7 +70,6 @@ $TRANSLATIONS = array( "Backup (Replica) Port" => "Backup Port", "Disable Main Server" => "Hauptserver deaktivieren", "Only connect to the replica server." => "Nur zum Replikat-Server verbinden.", -"Case insensitve LDAP server (Windows)" => "LDAP-Server (Windows: Groß- und Kleinschreibung bleibt unbeachtet)", "Turn off SSL certificate validation." => "Schalten Sie die SSL-Zertifikatsprüfung aus.", "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." => "Nur für Testzwecke geeignet, sollte Standardmäßig nicht verwendet werden. Falls die Verbindung nur mit dieser Option funktioniert, importieren Sie das SSL-Zertifikat des LDAP-Servers in Ihren %s Server.", "Cache Time-To-Live" => "Speichere Time-To-Live zwischen", diff --git a/apps/user_ldap/l10n/el.php b/apps/user_ldap/l10n/el.php index 926419d86b2..cfc5286a408 100644 --- a/apps/user_ldap/l10n/el.php +++ b/apps/user_ldap/l10n/el.php @@ -70,7 +70,6 @@ $TRANSLATIONS = array( "Backup (Replica) Port" => "Δημιουργία αντιγράφων ασφαλείας (Replica) Υποδοχη", "Disable Main Server" => "Απενεργοποιηση του κεντρικου διακομιστη", "Only connect to the replica server." => "Σύνδεση μόνο με το διακομιστή-αντίγραφο.", -"Case insensitve LDAP server (Windows)" => "LDAP server (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." => "Δεν προτείνεται, χρησιμοποιείστε το μόνο για δοκιμές! Εάν η σύνδεση λειτουργεί μόνο με αυτή την επιλογή, εισάγετε το πιστοποιητικό SSL του διακομιστή LDAP στο %s διακομιστή σας.", "Cache Time-To-Live" => "Cache Time-To-Live", diff --git a/apps/user_ldap/l10n/en_GB.php b/apps/user_ldap/l10n/en_GB.php index b87c99c135c..6dfc3e53f0c 100644 --- a/apps/user_ldap/l10n/en_GB.php +++ b/apps/user_ldap/l10n/en_GB.php @@ -70,7 +70,6 @@ $TRANSLATIONS = array( "Backup (Replica) Port" => "Backup (Replica) Port", "Disable Main Server" => "Disable Main Server", "Only connect to the replica server." => "Only connect to the replica server.", -"Case insensitve LDAP server (Windows)" => "Case insensitve LDAP server (Windows)", "Turn off SSL certificate validation." => "Turn off SSL certificate validation.", "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." => "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.", "Cache Time-To-Live" => "Cache Time-To-Live", diff --git a/apps/user_ldap/l10n/eo.php b/apps/user_ldap/l10n/eo.php index 0cae524bcc1..74928899c8a 100644 --- a/apps/user_ldap/l10n/eo.php +++ b/apps/user_ldap/l10n/eo.php @@ -35,7 +35,6 @@ $TRANSLATIONS = array( "Back" => "Antaŭen", "Connection Settings" => "Agordo de konekto", "Disable Main Server" => "Malkapabligi la ĉefan servilon", -"Case insensitve LDAP server (Windows)" => "LDAP-servilo blinda je litergrandeco (Vindozo)", "Turn off SSL certificate validation." => "Malkapabligi validkontrolon de SSL-atestiloj.", "Cache Time-To-Live" => "Vivotempo de la kaŝmemoro", "in seconds. A change empties the cache." => "sekunde. Ajna ŝanĝo malplenigas la kaŝmemoron.", diff --git a/apps/user_ldap/l10n/es.php b/apps/user_ldap/l10n/es.php index 1821aa8d446..6034b4fb635 100644 --- a/apps/user_ldap/l10n/es.php +++ b/apps/user_ldap/l10n/es.php @@ -70,7 +70,6 @@ $TRANSLATIONS = array( "Backup (Replica) Port" => "Puerto para copias de seguridad (Replica)", "Disable Main Server" => "Deshabilitar servidor principal", "Only connect to the replica server." => "Conectar sólo con el servidor de réplica.", -"Case insensitve LDAP server (Windows)" => "Servidor de LDAP no sensible a mayúsculas/minúsculas (Windows)", "Turn off SSL certificate validation." => "Apagar la validación por certificado SSL.", "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "No se recomienda, ¡utilízalo únicamente para pruebas! Si la conexión únicamente funciona con esta opción, importa el certificado SSL del servidor LDAP en tu servidor %s.", "Cache Time-To-Live" => "Cache TTL", diff --git a/apps/user_ldap/l10n/es_AR.php b/apps/user_ldap/l10n/es_AR.php index 6323fe0c4ad..877141bcdc8 100644 --- a/apps/user_ldap/l10n/es_AR.php +++ b/apps/user_ldap/l10n/es_AR.php @@ -67,7 +67,6 @@ $TRANSLATIONS = array( "Backup (Replica) Port" => "Puerto para copia de seguridad (réplica)", "Disable Main Server" => "Deshabilitar el Servidor Principal", "Only connect to the replica server." => "Conectarse únicamente al servidor de réplica.", -"Case insensitve LDAP server (Windows)" => "Servidor de LDAP sensible a mayúsculas/minúsculas (Windows)", "Turn off SSL certificate validation." => "Desactivar la validación por certificado SSL.", "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "No es recomendado, ¡Usalo solamente para pruebas! Si la conexión únicamente funciona con esta opción, importá el certificado SSL del servidor LDAP en tu servidor %s.", "Cache Time-To-Live" => "Tiempo de vida del caché", diff --git a/apps/user_ldap/l10n/es_MX.php b/apps/user_ldap/l10n/es_MX.php index 09c99209a55..bb4c3700ec5 100644 --- a/apps/user_ldap/l10n/es_MX.php +++ b/apps/user_ldap/l10n/es_MX.php @@ -67,7 +67,6 @@ $TRANSLATIONS = array( "Backup (Replica) Port" => "Puerto para copias de seguridad (Replica)", "Disable Main Server" => "Deshabilitar servidor principal", "Only connect to the replica server." => "Conectar sólo con el servidor de réplica.", -"Case insensitve LDAP server (Windows)" => "Servidor de LDAP no sensible a mayúsculas/minúsculas (Windows)", "Turn off SSL certificate validation." => "Apagar la validación por certificado SSL.", "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "No se recomienda, ¡utilízalo únicamente para pruebas! Si la conexión únicamente funciona con esta opción, importa el certificado SSL del servidor LDAP en tu servidor %s.", "Cache Time-To-Live" => "Cache TTL", diff --git a/apps/user_ldap/l10n/et_EE.php b/apps/user_ldap/l10n/et_EE.php index 9bf3a189efd..f52449bda8b 100644 --- a/apps/user_ldap/l10n/et_EE.php +++ b/apps/user_ldap/l10n/et_EE.php @@ -70,7 +70,6 @@ $TRANSLATIONS = array( "Backup (Replica) Port" => "Varuserveri (replika) port", "Disable Main Server" => "Ära kasuta peaserverit", "Only connect to the replica server." => "Ühendu ainult replitseeriva serveriga.", -"Case insensitve LDAP server (Windows)" => "Mittetõstutundlik LDAP server (Windows)", "Turn off SSL certificate validation." => "Lülita SSL sertifikaadi kontrollimine välja.", "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." => "Pole soovitatav, kasuta seda ainult testimiseks! Kui ühendus toimib ainult selle valikuga, siis impordi LDAP serveri SSL sertifikaat oma %s serverisse.", "Cache Time-To-Live" => "Puhvri iga", diff --git a/apps/user_ldap/l10n/eu.php b/apps/user_ldap/l10n/eu.php index a7bd52e50ac..c19cb034ad0 100644 --- a/apps/user_ldap/l10n/eu.php +++ b/apps/user_ldap/l10n/eu.php @@ -61,7 +61,6 @@ $TRANSLATIONS = array( "Backup (Replica) Port" => "Babeskopia (Replica) Ataka", "Disable Main Server" => "Desgaitu Zerbitzari Nagusia", "Only connect to the replica server." => "Konektatu bakarrik erreplika zerbitzarira", -"Case insensitve LDAP server (Windows)" => "Maiuskulak eta minuskulak ezberditzen ez dituen LDAP zerbitzaria (windows)", "Turn off SSL certificate validation." => "Ezgaitu SSL ziurtagirien egiaztapena.", "Cache Time-To-Live" => "Katxearen Bizi-Iraupena", "in seconds. A change empties the cache." => "segundutan. Aldaketak katxea husten du.", diff --git a/apps/user_ldap/l10n/fa.php b/apps/user_ldap/l10n/fa.php index 688a6ee0d42..62a949f88bd 100644 --- a/apps/user_ldap/l10n/fa.php +++ b/apps/user_ldap/l10n/fa.php @@ -34,7 +34,6 @@ $TRANSLATIONS = array( "Backup (Replica) Host" => "پشتیبان گیری (بدل) میزبان", "Backup (Replica) Port" => "پشتیبان گیری (بدل) پورت", "Disable Main Server" => "غیر فعال کردن سرور اصلی", -"Case insensitve LDAP server (Windows)" => "غیر حساس به بزرگی و کوچکی حروف LDAP سرور (ویندوز)", "Turn off SSL certificate validation." => "غیرفعال کردن اعتبار گواهی نامه SSL .", "Directory Settings" => "تنظیمات پوشه", "User Display Name Field" => "فیلد نام کاربر", diff --git a/apps/user_ldap/l10n/fi_FI.php b/apps/user_ldap/l10n/fi_FI.php index ac1dfcc5ab8..552fd9f923b 100644 --- a/apps/user_ldap/l10n/fi_FI.php +++ b/apps/user_ldap/l10n/fi_FI.php @@ -25,7 +25,6 @@ $TRANSLATIONS = array( "Continue" => "Jatka", "Connection Settings" => "Yhteysasetukset", "Disable Main Server" => "Poista pääpalvelin käytöstä", -"Case insensitve LDAP server (Windows)" => "Kirjainkoosta piittamaton LDAP-palvelin (Windows)", "Turn off SSL certificate validation." => "Poista käytöstä SSL-varmenteen vahvistus", "in seconds. A change empties the cache." => "sekunneissa. Muutos tyhjentää välimuistin.", "Directory Settings" => "Hakemistoasetukset", diff --git a/apps/user_ldap/l10n/fr.php b/apps/user_ldap/l10n/fr.php index 39e7d2ae429..468297ca1f3 100644 --- a/apps/user_ldap/l10n/fr.php +++ b/apps/user_ldap/l10n/fr.php @@ -70,7 +70,6 @@ $TRANSLATIONS = array( "Backup (Replica) Port" => "Port du serveur de backup (réplique)", "Disable Main Server" => "Désactiver le serveur principal", "Only connect to the replica server." => "Se connecter uniquement au serveur de replica.", -"Case insensitve LDAP server (Windows)" => "Serveur LDAP insensible à la casse (Windows)", "Turn off SSL certificate validation." => "Désactiver la validation du certificat SSL.", "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "Non recommandé, à utiliser à des fins de tests uniquement. Si la connexion ne fonctionne qu'avec cette option, importez le certificat SSL du serveur LDAP dans le serveur %s.", "Cache Time-To-Live" => "Durée de vie du cache", diff --git a/apps/user_ldap/l10n/gl.php b/apps/user_ldap/l10n/gl.php index c3524453899..f27f8eb7bb1 100644 --- a/apps/user_ldap/l10n/gl.php +++ b/apps/user_ldap/l10n/gl.php @@ -70,7 +70,6 @@ $TRANSLATIONS = array( "Backup (Replica) Port" => "Porto da copia de seguranza (Réplica)", "Disable Main Server" => "Desactivar o servidor principal", "Only connect to the replica server." => "Conectar só co servidor de réplica.", -"Case insensitve LDAP server (Windows)" => "Servidor LDAP que non distingue entre maiúsculas e minúsculas (Windows)", "Turn off SSL certificate validation." => "Desactiva a validación do certificado SSL.", "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "Non recomendado, utilizar só para probas! Se a conexión só funciona con esta opción importa o certificado SSL do servidor LDAP no seu servidor %s.", "Cache Time-To-Live" => "Tempo de persistencia da caché", diff --git a/apps/user_ldap/l10n/hu_HU.php b/apps/user_ldap/l10n/hu_HU.php index 277ae96fcd4..34daa25ce68 100644 --- a/apps/user_ldap/l10n/hu_HU.php +++ b/apps/user_ldap/l10n/hu_HU.php @@ -67,7 +67,6 @@ $TRANSLATIONS = array( "Backup (Replica) Port" => "A másodkiszolgáló (replika) portszáma", "Disable Main Server" => "A fő szerver kihagyása", "Only connect to the replica server." => "Csak a másodlagos (másolati) kiszolgálóhoz kapcsolódjunk.", -"Case insensitve LDAP server (Windows)" => "Az LDAP-kiszolgáló nem tesz különbséget a kis- és nagybetűk között (Windows)", "Turn off SSL certificate validation." => "Ne ellenőrizzük az SSL-tanúsítvány érvényességét", "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." => "Használata nem javasolt (kivéve tesztelési céllal). Ha a kapcsolat csak ezzel a beállítással működik, akkor importálja az LDAP-kiszolgáló SSL tanúsítványát a(z) %s kiszolgálóra!", "Cache Time-To-Live" => "A gyorsítótár tárolási időtartama", diff --git a/apps/user_ldap/l10n/id.php b/apps/user_ldap/l10n/id.php index 03071bb1d0f..1d42031a498 100644 --- a/apps/user_ldap/l10n/id.php +++ b/apps/user_ldap/l10n/id.php @@ -39,7 +39,6 @@ $TRANSLATIONS = array( "Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Berikan pilihan host cadangan. Harus merupakan replika dari server LDAP/AD utama.", "Backup (Replica) Port" => "Port Cadangan (Replika)", "Disable Main Server" => "Nonaktifkan Server Utama", -"Case insensitve LDAP server (Windows)" => "Server LDAP dengan kapitalisasi tidak sensitif (Windows)", "Turn off SSL certificate validation." => "matikan validasi sertivikat SSL", "Cache Time-To-Live" => "Gunakan Tembolok untuk Time-To-Live", "in seconds. A change empties the cache." => "dalam detik. perubahan mengosongkan cache", diff --git a/apps/user_ldap/l10n/it.php b/apps/user_ldap/l10n/it.php index de540f22821..cd8c88814aa 100644 --- a/apps/user_ldap/l10n/it.php +++ b/apps/user_ldap/l10n/it.php @@ -70,7 +70,6 @@ $TRANSLATIONS = array( "Backup (Replica) Port" => "Porta di backup (Replica)", "Disable Main Server" => "Disabilita server principale", "Only connect to the replica server." => "Collegati solo al server di replica.", -"Case insensitve LDAP server (Windows)" => "Case insensitve LDAP server (Windows)", "Turn off SSL certificate validation." => "Disattiva il controllo del certificato 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." => "Non consigliata, da utilizzare solo per test! Se la connessione funziona solo con questa opzione, importa il certificate SSL del server LDAP sul tuo server %s.", "Cache Time-To-Live" => "Tempo di vita della cache", diff --git a/apps/user_ldap/l10n/ja.php b/apps/user_ldap/l10n/ja.php index d13deafe6c3..e7e4706c46a 100644 --- a/apps/user_ldap/l10n/ja.php +++ b/apps/user_ldap/l10n/ja.php @@ -70,7 +70,6 @@ $TRANSLATIONS = array( "Backup (Replica) Port" => "バックアップ（レプリカ）ポート", "Disable Main Server" => "メインサーバーを無効にする", "Only connect to the replica server." => "レプリカサーバーにのみ接続します。", -"Case insensitve 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." => "推奨されません、テストにおいてのみ使用してください！このオプションでのみ接続が動作する場合は、LDAP サーバーのSSL証明書を %s サーバーにインポートしてください。", "Cache Time-To-Live" => "キャッシュのTTL", diff --git a/apps/user_ldap/l10n/ka_GE.php b/apps/user_ldap/l10n/ka_GE.php index ffdf7655517..3ee307b55cc 100644 --- a/apps/user_ldap/l10n/ka_GE.php +++ b/apps/user_ldap/l10n/ka_GE.php @@ -37,7 +37,6 @@ $TRANSLATIONS = array( "Give an optional backup host. It must be a replica of the main LDAP/AD server." => "მიუთითეთ რაიმე ბექაფ ჰოსტი. ის უნდა იყოს ძირითადი LDAP/AD სერვერის რეპლიკა.", "Backup (Replica) Port" => "ბექაფ (რეპლიკა) პორტი", "Disable Main Server" => "გამორთეთ ძირითადი სერვერი", -"Case insensitve LDAP server (Windows)" => "LDAP server (Windows)", "Turn off SSL certificate validation." => "გამორთეთ SSL სერთიფიკატის ვალიდაცია.", "Cache Time-To-Live" => "ქეშის სიცოცხლის ხანგრძლივობა", "in seconds. A change empties the cache." => "წამებში. ცვლილება ასუფთავებს ქეშს.", diff --git a/apps/user_ldap/l10n/ko.php b/apps/user_ldap/l10n/ko.php index 5dd2151a411..1ae63bd4d21 100644 --- a/apps/user_ldap/l10n/ko.php +++ b/apps/user_ldap/l10n/ko.php @@ -67,7 +67,6 @@ $TRANSLATIONS = array( "Backup (Replica) Port" => "백업 (복제) 포트", "Disable Main Server" => "주 서버 비활성화", "Only connect to the replica server." => "복제 서버에만 연결합니다.", -"Case insensitve LDAP server (Windows)" => "서버에서 대소문자를 구분하지 않음 (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" => "캐시 유지 시간", diff --git a/apps/user_ldap/l10n/lv.php b/apps/user_ldap/l10n/lv.php index 769f17e6338..e3cb206e2d6 100644 --- a/apps/user_ldap/l10n/lv.php +++ b/apps/user_ldap/l10n/lv.php @@ -36,7 +36,6 @@ $TRANSLATIONS = array( "Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Norādi rezerves serveri (nav obligāti). Tam ir jābūt galvenā LDAP/AD servera kopijai.", "Backup (Replica) Port" => "Rezerves (kopijas) ports", "Disable Main Server" => "Deaktivēt galveno serveri", -"Case insensitve LDAP server (Windows)" => "Reģistrnejutīgs LDAP serveris (Windows)", "Turn off SSL certificate validation." => "Izslēgt SSL sertifikātu validēšanu.", "Cache Time-To-Live" => "Kešatmiņas dzīvlaiks", "in seconds. A change empties the cache." => "sekundēs. Izmaiņas iztukšos kešatmiņu.", diff --git a/apps/user_ldap/l10n/nb_NO.php b/apps/user_ldap/l10n/nb_NO.php index 0b60752e9d9..dd4af3e759e 100644 --- a/apps/user_ldap/l10n/nb_NO.php +++ b/apps/user_ldap/l10n/nb_NO.php @@ -67,7 +67,6 @@ $TRANSLATIONS = array( "Backup (Replica) Port" => "Reserve (Replika) Port", "Disable Main Server" => "Deaktiver hovedtjeneren", "Only connect to the replica server." => "Koble til bare replika-tjeneren.", -"Case insensitve LDAP server (Windows)" => "Case-insensitiv LDAP tjener (Windows)", "Turn off SSL certificate validation." => "Slå av SSL-sertifikat validering", "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." => "Ikke anbefalt, bruk kun for testing! Hvis tilkobling bare virker med dette valget, importer LDAP-tjenerens SSL-sertifikat i %s-serveren din.", "Cache Time-To-Live" => "Levetid i mellomlager", diff --git a/apps/user_ldap/l10n/nl.php b/apps/user_ldap/l10n/nl.php index d1ffd4f00d4..5698f8a6f1d 100644 --- a/apps/user_ldap/l10n/nl.php +++ b/apps/user_ldap/l10n/nl.php @@ -70,7 +70,6 @@ $TRANSLATIONS = array( "Backup (Replica) Port" => "Backup (Replica) Poort", "Disable Main Server" => "Deactiveren hoofdserver", "Only connect to the replica server." => "Maak alleen een verbinding met de replica server.", -"Case insensitve LDAP server (Windows)" => "Niet-hoofdlettergevoelige LDAP server (Windows)", "Turn off SSL certificate validation." => "Schakel SSL certificaat validatie uit.", "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." => "Niet aanbevolen, gebruik alleen om te testen! Als de connectie alleen werkt met deze optie, importeer dan het SSL-certificaat van de LDAP-server naar uw %s server.", "Cache Time-To-Live" => "Cache time-to-live", diff --git a/apps/user_ldap/l10n/pl.php b/apps/user_ldap/l10n/pl.php index 69a94ec693c..877dff4d97f 100644 --- a/apps/user_ldap/l10n/pl.php +++ b/apps/user_ldap/l10n/pl.php @@ -70,7 +70,6 @@ $TRANSLATIONS = array( "Backup (Replica) Port" => "Kopia zapasowa (repliki) Port", "Disable Main Server" => "Wyłącz serwer główny", "Only connect to the replica server." => "Połącz tylko do repliki serwera.", -"Case insensitve LDAP server (Windows)" => "Wielkość liter serwera LDAP (Windows)", "Turn off SSL certificate validation." => "Wyłączyć sprawdzanie poprawności certyfikatu 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." => "Nie polecane, używać tylko w celu testowania! Jeśli połączenie działa tylko z tą opcją, zaimportuj certyfikat SSL serwera LDAP na swój %s.", "Cache Time-To-Live" => "Przechowuj czas życia", diff --git a/apps/user_ldap/l10n/pt_BR.php b/apps/user_ldap/l10n/pt_BR.php index 844024a953d..1cfdce7cabd 100644 --- a/apps/user_ldap/l10n/pt_BR.php +++ b/apps/user_ldap/l10n/pt_BR.php @@ -70,7 +70,6 @@ $TRANSLATIONS = array( "Backup (Replica) Port" => "Porta do Backup (Réplica)", "Disable Main Server" => "Desativar Servidor Principal", "Only connect to the replica server." => "Conectar-se somente ao servidor de réplica.", -"Case insensitve LDAP server (Windows)" => "Servidor LDAP sensível à caixa alta (Windows)", "Turn off SSL certificate validation." => "Desligar validação de certificado SSL.", "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "Não recomendado, use-o somente para teste! Se a conexão só funciona com esta opção, importar o certificado SSL do servidor LDAP em seu servidor %s.", "Cache Time-To-Live" => "Cache Time-To-Live", diff --git a/apps/user_ldap/l10n/pt_PT.php b/apps/user_ldap/l10n/pt_PT.php index 37142c8175a..e2754785c65 100644 --- a/apps/user_ldap/l10n/pt_PT.php +++ b/apps/user_ldap/l10n/pt_PT.php @@ -65,7 +65,6 @@ $TRANSLATIONS = array( "Backup (Replica) Port" => "Porta do servidor de backup (Replica)", "Disable Main Server" => "Desactivar servidor principal", "Only connect to the replica server." => "Ligar apenas ao servidor de réplicas.", -"Case insensitve LDAP server (Windows)" => "Servidor LDAP (Windows) não sensível a maiúsculas.", "Turn off SSL certificate validation." => "Desligar a validação de certificado SSL.", "Cache Time-To-Live" => "Cache do tempo de vida dos objetos no servidor", "in seconds. A change empties the cache." => "em segundos. Uma alteração esvazia a cache.", diff --git a/apps/user_ldap/l10n/ro.php b/apps/user_ldap/l10n/ro.php index 0214be3f787..26394db0f85 100644 --- a/apps/user_ldap/l10n/ro.php +++ b/apps/user_ldap/l10n/ro.php @@ -19,7 +19,6 @@ $TRANSLATIONS = array( "Back" => "Înapoi", "Continue" => "Continuă", "Warning: The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "Atenție Modulul PHP LDAP nu este instalat, infrastructura nu va funcționa. Contactează administratorul sistemului pentru al instala.", -"Case insensitve LDAP server (Windows)" => "Server LDAP insensibil la majuscule (Windows)", "Turn off SSL certificate validation." => "Oprește validarea certificatelor SSL ", "in seconds. A change empties the cache." => "în secunde. O schimbare curăță memoria tampon.", "User Display Name Field" => "Câmpul cu numele vizibil al utilizatorului", diff --git a/apps/user_ldap/l10n/ru.php b/apps/user_ldap/l10n/ru.php index d9685368cbc..2cf331d24c0 100644 --- a/apps/user_ldap/l10n/ru.php +++ b/apps/user_ldap/l10n/ru.php @@ -67,7 +67,6 @@ $TRANSLATIONS = array( "Backup (Replica) Port" => "Порт резервного сервера", "Disable Main Server" => "Отключить главный сервер", "Only connect to the replica server." => "Подключаться только к серверу-реплике.", -"Case insensitve 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" => "Кэш времени жизни", diff --git a/apps/user_ldap/l10n/sk_SK.php b/apps/user_ldap/l10n/sk_SK.php index 460064593ee..edda4244336 100644 --- a/apps/user_ldap/l10n/sk_SK.php +++ b/apps/user_ldap/l10n/sk_SK.php @@ -67,7 +67,6 @@ $TRANSLATIONS = array( "Backup (Replica) Port" => "Záložný server (kópia) port", "Disable Main Server" => "Zakázať hlavný server", "Only connect to the replica server." => "Pripojiť sa len k záložnému serveru.", -"Case insensitve LDAP server (Windows)" => "LDAP server nerozlišuje veľkosť znakov (Windows)", "Turn off SSL certificate validation." => "Vypnúť overovanie SSL certifikátu.", "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "Neodporúčané, použite iba pri testovaní! Pokiaľ spojenie funguje iba z daným nastavením, importujte SSL certifikát LDAP servera do vášho %s servera.", "Cache Time-To-Live" => "Životnosť objektov vo vyrovnávacej pamäti", diff --git a/apps/user_ldap/l10n/sl.php b/apps/user_ldap/l10n/sl.php index b6df62ffb79..54c91103a3e 100644 --- a/apps/user_ldap/l10n/sl.php +++ b/apps/user_ldap/l10n/sl.php @@ -67,7 +67,6 @@ $TRANSLATIONS = array( "Backup (Replica) Port" => "Vrata varnostne kopije (replike)", "Disable Main Server" => "Onemogoči glavni strežnik", "Only connect to the replica server." => "Poveži le s podvojenim strežnikom.", -"Case insensitve LDAP server (Windows)" => "Strežnik LDAP ne upošteva velikosti črk (Windows)", "Turn off SSL certificate validation." => "Onemogoči določanje veljavnosti potrdila 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." => "Možnosti ni priporočljivo uporabiti; namenjena je zgolj preizkušanju! Če deluje povezava le s to možnostjo, je treba uvoziti potrdilo SSL strežnika LDAP na strežnik %s.", "Cache Time-To-Live" => "Predpomni podatke TTL", diff --git a/apps/user_ldap/l10n/sq.php b/apps/user_ldap/l10n/sq.php index 0f18ac02351..03ff204bbca 100644 --- a/apps/user_ldap/l10n/sq.php +++ b/apps/user_ldap/l10n/sq.php @@ -38,7 +38,6 @@ $TRANSLATIONS = array( "Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Jepni një pritës rezervë. Duhet të jetë replikimi i serverit AD/LDAP kryesor.", "Backup (Replica) Port" => "Porta rezervë (Replika)", "Disable Main Server" => "Ç'aktivizoni serverin kryesor", -"Case insensitve LDAP server (Windows)" => " Server LDAP i pavëmëndshëm ndaj gërmëzimit të madh apo jo (Windows)", "Turn off SSL certificate validation." => "Ç'aktivizoni kontrollin e certifikatës SSL.", "Cache Time-To-Live" => "Cache Time-To-Live", "in seconds. A change empties the cache." => "në sekonda Ndryshimi boshatis 'cache'-n.", diff --git a/apps/user_ldap/l10n/sr.php b/apps/user_ldap/l10n/sr.php index d2ce2cf08b6..fb016fdd17e 100644 --- a/apps/user_ldap/l10n/sr.php +++ b/apps/user_ldap/l10n/sr.php @@ -14,7 +14,6 @@ $TRANSLATIONS = array( "Password" => "Лозинка", "For anonymous access, leave DN and Password empty." => "За анониман приступ, оставите поља DN и лозинка празним.", "Back" => "Назад", -"Case insensitve LDAP server (Windows)" => "LDAP сервер осетљив на велика и мала слова (Windows)", "Turn off SSL certificate validation." => "Искључите потврду SSL сертификата.", "in seconds. A change empties the cache." => "у секундама. Промена испражњава кеш меморију.", "User Display Name Field" => "Име приказа корисника", diff --git a/apps/user_ldap/l10n/sv.php b/apps/user_ldap/l10n/sv.php index 6a4ed0c7204..1283b16c7d1 100644 --- a/apps/user_ldap/l10n/sv.php +++ b/apps/user_ldap/l10n/sv.php @@ -70,7 +70,6 @@ $TRANSLATIONS = array( "Backup (Replica) Port" => "Säkerhetskopierins-port (Replika)", "Disable Main Server" => "Inaktivera huvudserver", "Only connect to the replica server." => "Anslut endast till replikaservern.", -"Case insensitve LDAP server (Windows)" => "LDAP-servern är okänslig för gemener och versaler (Windows)", "Turn off SSL certificate validation." => "Stäng av verifiering av SSL-certifikat.", "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "Rekommenderas inte, använd endast för test! Om anslutningen bara fungerar med denna inställning behöver du importera LDAP-serverns SSL-certifikat till din %s server.", "Cache Time-To-Live" => "Cache Time-To-Live", diff --git a/apps/user_ldap/l10n/ta_LK.php b/apps/user_ldap/l10n/ta_LK.php index c7efcf05894..27a3068f963 100644 --- a/apps/user_ldap/l10n/ta_LK.php +++ b/apps/user_ldap/l10n/ta_LK.php @@ -13,7 +13,6 @@ $TRANSLATIONS = array( "Password" => "கடவுச்சொல்", "You can specify Base DN for users and groups in the Advanced tab" => "நீங்கள் பயனாளர்களுக்கும் மேன்மை தத்தலில் உள்ள குழுவிற்கும் தள DN ஐ குறிப்பிடலாம் ", "Back" => "பின்னுக்கு", -"Case insensitve LDAP server (Windows)" => "உணர்ச்சியான LDAP சேவையகம் (சாளரங்கள்)", "Turn off SSL certificate validation." => "SSL சான்றிதழின் செல்லுபடியை நிறுத்திவிடவும்", "in seconds. A change empties the cache." => "செக்கன்களில். ஒரு மாற்றம் இடைமாற்றுநினைவகத்தை வெற்றிடமாக்கும்.", "User Display Name Field" => "பயனாளர் காட்சிப்பெயர் புலம்", diff --git a/apps/user_ldap/l10n/th_TH.php b/apps/user_ldap/l10n/th_TH.php index 2202a2f0a83..1c6dbe0473f 100644 --- a/apps/user_ldap/l10n/th_TH.php +++ b/apps/user_ldap/l10n/th_TH.php @@ -31,7 +31,6 @@ $TRANSLATIONS = array( "Warning: The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "คำเตือน: โมดูล PHP LDAP ยังไม่ได้ถูกติดตั้ง, ระบบด้านหลังจะไม่สามารถทำงานได้ กรุณาติดต่อผู้ดูแลระบบของคุณเพื่อทำการติดตั้งโมดูลดังกล่าว", "Connection Settings" => "ตั้งค่าการเชื่อมต่อ", "Disable Main Server" => "ปิดใช้งานเซิร์ฟเวอร์หลัก", -"Case insensitve LDAP server (Windows)" => "เซิร์ฟเวอร์ LDAP ประเภท Case insensitive (วินโดวส์)", "Turn off SSL certificate validation." => "ปิดใช้งานการตรวจสอบความถูกต้องของใบรับรองความปลอดภัย SSL", "in seconds. A change empties the cache." => "ในอีกไม่กี่วินาที ระบบจะเปลี่ยนแปลงข้อมูลในแคชให้ว่างเปล่า", "Directory Settings" => "ตั้งค่าไดเร็กทอรี่", diff --git a/apps/user_ldap/l10n/tr.php b/apps/user_ldap/l10n/tr.php index d654b4e2416..fde3db85d48 100644 --- a/apps/user_ldap/l10n/tr.php +++ b/apps/user_ldap/l10n/tr.php @@ -45,48 +45,47 @@ $TRANSLATIONS = array( "LDAP Email Address:" => "LDAP E-posta Adresi:", "Other Attributes:" => "Diğer Nitelikler", "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" => "Oturum açma girişimi olduğunda uygulanacak filtreyi tanımlar. %%uid, oturum işleminde kullanıcı adı ile değiştirilir. Örneğin: \"uid=%%uid\"", -"Add Server Configuration" => "Sunucu Uyunlama birlemek ", +"Add Server Configuration" => "Sunucu Yapılandırması Ekle", "Host" => "Sunucu", -"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Protokol atlamak edesin, sadece SSL istiyorsaniz. O zaman, idapsile baslamak. ", +"You can omit the protocol, except you require SSL. Then start with ldaps://" => "SSL gerektirmediğiniz takdirde protokol belirtmeyebilirsiniz. Ardından ldaps:// ile başlayın", "Port" => "Port", "User DN" => "Kullanıcı 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 musterinin, kimle baglamaya yapacagiz,meselâ uid=agent.dc mesela, dc=com Gecinme adisiz ici, DN ve Parola bos birakmak. ", +"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." => "İstemci kullanıcısının yapılacağı atamanın DN'i örn. uid=agent,dc=örnek,dc=com. Anonim erişim için DN ve Parolayı boş bırakın.", "Password" => "Parola", "For anonymous access, leave DN and Password empty." => "Anonim erişim için DN ve Parola alanlarını boş bırakın.", -"One Base DN per line" => "Bir Tabani DN herbir dizi. ", -"You can specify Base DN for users and groups in the Advanced tab" => "Base DN kullanicileri ve kaynaklari icin tablosu Advanced tayin etmek ederiz. ", +"One Base DN per line" => "Her satırda tek bir Base DN", +"You can specify Base DN for users and groups in the Advanced tab" => "Gelişmiş sekmesinde kullanıcılar ve gruplar için Base DN belirtebilirsiniz.", "Limit %s access to users meeting these criteria:" => "%s erişimini, şu kriterle eşleşen kullanıcılara sınırla:", "The filter specifies which LDAP users shall have access to the %s instance." => "Filtre, %s örneğine erişmesi gereken LDAP kullanıcılarını belirtir.", "users found" => "kullanıcı bulundu", "Back" => "Geri", "Continue" => "Devam et", "Warning: Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." => "Uyarı: user_ldap ve user_webdavauth uygulamaları uyumlu değil. Beklenmedik bir davranışla karşılaşabilirsiniz. Lütfen ikisinden birini devre dışı bırakmak için sistem yöneticinizle iletişime geçin.", -"Warning: The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "Ihbar Modulu PHP LDAP yuklemdi degil, backend calismacak. Lutfen sistem yonetici sormak yuklemek icin.", +"Warning: The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "Uyarı: PHP LDAP modülü kurulu değil, arka uç çalışmayacak. Lütfen kurulumu için sistem yöneticinizle iletişime geçin.", "Connection Settings" => "Bağlantı ayarları", "Configuration Active" => "Yapılandırma Etkin", -"When unchecked, this configuration will be skipped." => "Ne zaman iptal, bu uynnlama isletici ", -"Backup (Replica) Host" => "Sigorta Kopya Cephe ", -"Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Bir kopya cevre vermek, kopya sunucu onemli olmali. ", -"Backup (Replica) Port" => "Kopya Port ", +"When unchecked, this configuration will be skipped." => "İşaretli değilse, bu yapılandırma atlanacaktır.", +"Backup (Replica) Host" => "Yedek (Replica) Sunucu", +"Give an optional backup host. It must be a replica of the main LDAP/AD server." => "İsteğe bağlı bir yedek sunucusu belirtin. Ana LDAP/AD sunucusunun bir kopyası olmalıdır.", +"Backup (Replica) Port" => "Yedek (Replica) Bağlantı Noktası", "Disable Main Server" => "Ana sunucuyu devredışı birak", "Only connect to the replica server." => "Sadece kopya sunucuya bağlan.", -"Case insensitve LDAP server (Windows)" => "Dusme sunucu LDAP zor degil. (Windows)", "Turn off SSL certificate validation." => "SSL sertifika doğrulamasını kapat.", "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." => "Önerilmez, sadece test için kullanın! Eğer bağlantı sadece bu seçenekle çalışıyorsa %s sunucunuza LDAP sunucusunun SSL sertifikasını ekleyin.", -"Cache Time-To-Live" => "Cache Time-To-Live ", +"Cache Time-To-Live" => "Önbellek Time-To-Live Değeri", "in seconds. A change empties the cache." => "saniye cinsinden. Bir değişiklik önbelleği temizleyecektir.", -"Directory Settings" => "Parametrar Listesin Adresinin ", -"User Display Name Field" => "Ekran Adi Kullanici, (Alan Adi Kullanici Ekrane)", +"Directory Settings" => "Dizin Ayarları", +"User Display Name Field" => "Kullanıcı Görünen Ad Alanı", "The LDAP attribute to use to generate the user's display name." => "Kullanıcının görünen adını oluşturmak için kullanılacak LDAP niteliği.", "Base User Tree" => "Temel Kullanıcı Ağacı", -"One User Base DN per line" => "Bir Temel Kullanici DN her dizgi ", -"User Search Attributes" => "Kategorii Arama Kullanici ", +"One User Base DN per line" => "Her satırda Tek Kullanıcı Base DN'i", +"User Search Attributes" => "Kullanıcı Arama Nitelikleri", "Optional; one attribute per line" => "Tercihe bağlı; her bir satırda bir öznitelik", -"Group Display Name Field" => "Grub Ekrane Alani Adi", +"Group Display Name Field" => "Grup Görünen Ad Alanı", "The LDAP attribute to use to generate the groups's display name." => "Grubun görünen adını oluşturmak için kullanılacak LDAP niteliği.", "Base Group Tree" => "Temel Grup Ağacı", -"One Group Base DN per line" => "Bir Grubu Tabani DN her dizgi. ", -"Group Search Attributes" => "Kategorii Arama Grubu", +"One Group Base DN per line" => "Her satırda Tek Grup Base DN'i", +"Group Search Attributes" => "Grup Arama Nitelikleri", "Group-Member association" => "Grup-Üye işbirliği", "Nested Groups" => "İç içe Gruplar", "When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" => "Etkinleştirildiğinde, grup içeren gruplar desteklenir (Sadece grup üyesi DN niteliği içeriyorsa çalışır).", diff --git a/apps/user_ldap/l10n/uk.php b/apps/user_ldap/l10n/uk.php index e87348ec44d..5f4db6d5a03 100644 --- a/apps/user_ldap/l10n/uk.php +++ b/apps/user_ldap/l10n/uk.php @@ -39,7 +39,6 @@ $TRANSLATIONS = array( "Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Вкажіть додатковий резервний сервер. Він повинен бути копією головного LDAP/AD сервера.", "Backup (Replica) Port" => "Порт сервера для резервних копій", "Disable Main Server" => "Вимкнути Головний Сервер", -"Case insensitve LDAP server (Windows)" => "Нечутливий до регістру LDAP сервер (Windows)", "Turn off SSL certificate validation." => "Вимкнути перевірку SSL сертифіката.", "Cache Time-To-Live" => "Час актуальності Кеша", "in seconds. A change empties the cache." => "в секундах. Зміна очищує кеш.", diff --git a/apps/user_ldap/l10n/vi.php b/apps/user_ldap/l10n/vi.php index 84d001cb596..21b9783897e 100644 --- a/apps/user_ldap/l10n/vi.php +++ b/apps/user_ldap/l10n/vi.php @@ -21,7 +21,6 @@ $TRANSLATIONS = array( "Connection Settings" => "Connection Settings", "Backup (Replica) Port" => "Cổng sao lưu (Replica)", "Disable Main Server" => "Tắt máy chủ chính", -"Case insensitve LDAP server (Windows)" => "Trường hợp insensitve LDAP máy chủ (Windows)", "Turn off SSL certificate validation." => "Tắt xác thực chứng nhận SSL", "in seconds. A change empties the cache." => "trong vài giây. Một sự thay đổi bộ nhớ cache.", "Directory Settings" => "Directory Settings", diff --git a/apps/user_ldap/l10n/zh_CN.php b/apps/user_ldap/l10n/zh_CN.php index aae100ef9ad..d56f394f644 100644 --- a/apps/user_ldap/l10n/zh_CN.php +++ b/apps/user_ldap/l10n/zh_CN.php @@ -42,7 +42,6 @@ $TRANSLATIONS = array( "Backup (Replica) Port" => "备份 (镜像) 端口", "Disable Main Server" => "禁用主服务器", "Only connect to the replica server." => "只能连接到复制服务器", -"Case insensitve LDAP server (Windows)" => "大小写敏感LDAP服务器(Windows)", "Turn off SSL certificate validation." => "关闭SSL证书验证", "Cache Time-To-Live" => "缓存存活时间", "in seconds. A change empties the cache." => "以秒计。修改将清空缓存。", diff --git a/apps/user_ldap/l10n/zh_TW.php b/apps/user_ldap/l10n/zh_TW.php index a7ae04cd167..a0975b92238 100644 --- a/apps/user_ldap/l10n/zh_TW.php +++ b/apps/user_ldap/l10n/zh_TW.php @@ -41,7 +41,6 @@ $TRANSLATIONS = array( "Give an optional backup host. It must be a replica of the main LDAP/AD server." => "可以選擇性設定備用主機，必須是 LDAP/AD 中央伺服器的複本。", "Backup (Replica) Port" => "備用（複本）連接埠", "Disable Main Server" => "停用主伺服器", -"Case insensitve LDAP server (Windows)" => "不區分大小寫的 LDAP 伺服器 (Windows)", "Turn off SSL certificate validation." => "關閉 SSL 憑證檢查", "Cache Time-To-Live" => "快取的存活時間", "in seconds. A change empties the cache." => "以秒為單位。變更後會清空快取。", diff --git a/l10n/ach/settings.po b/l10n/ach/settings.po index ebba9b13098..155b27a4f72 100644 --- a/l10n/ach/settings.po +++ b/l10n/ach/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-03-26 01:55-0400\n" -"PO-Revision-Date: 2014-03-26 05:55+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Acoli (http://www.transifex.com/projects/p/owncloud/language/ach/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159 +#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149 msgid "Encryption" msgstr "" @@ -64,7 +64,7 @@ msgid "Unable to load list from App Store" msgstr "" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 changepassword/controller.php:55 +#: ajax/togglegroups.php:20 changepassword/controller.php:49 msgid "Authentication error" msgstr "" @@ -84,6 +84,20 @@ msgstr "" msgid "Unable to add group" msgstr "" +#: ajax/decryptall.php:31 +msgid "Files decrypted successfully" +msgstr "" + +#: ajax/decryptall.php:33 +msgid "" +"Couldn't decrypt your files, please check your owncloud.log or ask your " +"administrator" +msgstr "" + +#: ajax/decryptall.php:36 +msgid "Couldn't decrypt your files, check your password and try again" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -126,32 +140,32 @@ msgstr "" msgid "Couldn't update app." msgstr "" -#: changepassword/controller.php:20 +#: changepassword/controller.php:17 msgid "Wrong password" msgstr "" -#: changepassword/controller.php:42 +#: changepassword/controller.php:36 msgid "No user supplied" msgstr "" -#: changepassword/controller.php:74 +#: changepassword/controller.php:68 msgid "" "Please provide an admin recovery password, otherwise all user data will be " "lost" msgstr "" -#: changepassword/controller.php:79 +#: changepassword/controller.php:73 msgid "" "Wrong admin recovery password. Please check the password and try again." msgstr "" -#: changepassword/controller.php:87 +#: changepassword/controller.php:81 msgid "" "Back-end doesn't support password change, but the users encryption key was " "successfully updated." msgstr "" -#: changepassword/controller.php:92 changepassword/controller.php:103 +#: changepassword/controller.php:86 changepassword/controller.php:97 msgid "Unable to change password" msgstr "" @@ -203,7 +217,7 @@ msgstr "" msgid "Error" msgstr "" -#: js/apps.js:153 templates/apps.php:54 +#: js/apps.js:153 templates/apps.php:55 msgid "Update" msgstr "" @@ -211,31 +225,31 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:246 +#: js/personal.js:243 msgid "Select a profile picture" msgstr "" -#: js/personal.js:277 +#: js/personal.js:274 msgid "Very weak password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:275 msgid "Weak password" msgstr "" -#: js/personal.js:279 +#: js/personal.js:276 msgid "So-so password" msgstr "" -#: js/personal.js:280 +#: js/personal.js:277 msgid "Good password" msgstr "" -#: js/personal.js:281 +#: js/personal.js:278 msgid "Strong password" msgstr "" -#: js/personal.js:316 +#: js/personal.js:313 msgid "Decrypting files... Please wait, this can take some time." msgstr "" @@ -284,7 +298,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:49 personal.php:50 +#: personal.php:48 personal.php:49 msgid "__language_name__" msgstr "" @@ -589,11 +603,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:416 templates/personal.php:181 +#: templates/admin.php:416 templates/personal.php:171 msgid "Version" msgstr "" -#: templates/admin.php:420 templates/personal.php:184 +#: templates/admin.php:420 templates/personal.php:174 msgid "" "Developed by the ownCloud community, the -licensed by " msgstr "" @@ -664,108 +678,108 @@ msgstr "" msgid "You have used %s of the available %s" msgstr "" -#: templates/personal.php:39 templates/users.php:21 templates/users.php:87 +#: templates/personal.php:38 templates/users.php:21 templates/users.php:87 msgid "Password" msgstr "" -#: templates/personal.php:40 +#: templates/personal.php:39 msgid "Your password was changed" msgstr "" -#: templates/personal.php:41 +#: templates/personal.php:40 msgid "Unable to change your password" msgstr "" -#: templates/personal.php:43 +#: templates/personal.php:42 msgid "Current password" msgstr "" -#: templates/personal.php:46 +#: templates/personal.php:45 msgid "New password" msgstr "" -#: templates/personal.php:50 +#: templates/personal.php:49 msgid "Change password" msgstr "" -#: templates/personal.php:64 templates/users.php:86 +#: templates/personal.php:61 templates/users.php:86 msgid "Full Name" msgstr "" -#: templates/personal.php:81 +#: templates/personal.php:76 msgid "Email" msgstr "" -#: templates/personal.php:83 +#: templates/personal.php:78 msgid "Your email address" msgstr "" -#: templates/personal.php:86 +#: templates/personal.php:81 msgid "" "Fill in an email address to enable password recovery and receive " "notifications" msgstr "" -#: templates/personal.php:96 +#: templates/personal.php:89 msgid "Profile picture" msgstr "" -#: templates/personal.php:101 +#: templates/personal.php:94 msgid "Upload new" msgstr "" -#: templates/personal.php:103 +#: templates/personal.php:96 msgid "Select new from Files" msgstr "" -#: templates/personal.php:104 +#: templates/personal.php:97 msgid "Remove image" msgstr "" -#: templates/personal.php:105 +#: templates/personal.php:98 msgid "Either png or jpg. Ideally square but you will be able to crop it." msgstr "" -#: templates/personal.php:107 +#: templates/personal.php:100 msgid "Your avatar is provided by your original account." msgstr "" -#: templates/personal.php:111 +#: templates/personal.php:104 msgid "Cancel" msgstr "" -#: templates/personal.php:112 +#: templates/personal.php:105 msgid "Choose as profile image" msgstr "" -#: templates/personal.php:120 templates/personal.php:121 +#: templates/personal.php:111 templates/personal.php:112 msgid "Language" msgstr "" -#: templates/personal.php:140 +#: templates/personal.php:131 msgid "Help translate" msgstr "" -#: templates/personal.php:147 +#: templates/personal.php:137 msgid "WebDAV" msgstr "" -#: templates/personal.php:149 +#: templates/personal.php:139 #, php-format msgid "" "Use this address to access your Files via " "WebDAV" msgstr "" -#: templates/personal.php:161 +#: templates/personal.php:151 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:167 +#: templates/personal.php:157 msgid "Log-in password" msgstr "" -#: templates/personal.php:172 +#: templates/personal.php:162 msgid "Decrypt all Files" msgstr "" diff --git a/l10n/ach/user_ldap.po b/l10n/ach/user_ldap.po index 8ca354d2020..5b84c3724ba 100644 --- a/l10n/ach/user_ldap.po +++ b/l10n/ach/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-08 01:56-0400\n" -"PO-Revision-Date: 2014-04-08 05:56+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:55+0000\n" "Last-Translator: I Robot\n" "Language-Team: Acoli (http://www.transifex.com/projects/p/owncloud/language/ach/)\n" "MIME-Version: 1.0\n" @@ -144,7 +144,7 @@ msgstr[1] "" msgid "Invalid Host" msgstr "" -#: lib/wizard.php:963 +#: lib/wizard.php:983 msgid "Could not find the desired feature" msgstr "" @@ -335,7 +335,7 @@ msgid "Only connect to the replica server." msgstr "" #: templates/settings.php:26 -msgid "Case insensitve LDAP server (Windows)" +msgid "Case insensitive LDAP server (Windows)" msgstr "" #: templates/settings.php:27 diff --git a/l10n/ady/settings.po b/l10n/ady/settings.po index 334e9c42e7f..4a8e95a3bed 100644 --- a/l10n/ady/settings.po +++ b/l10n/ady/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-03-26 01:55-0400\n" -"PO-Revision-Date: 2014-03-26 05:55+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Adyghe (http://www.transifex.com/projects/p/owncloud/language/ady/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159 +#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149 msgid "Encryption" msgstr "" @@ -64,7 +64,7 @@ msgid "Unable to load list from App Store" msgstr "" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 changepassword/controller.php:55 +#: ajax/togglegroups.php:20 changepassword/controller.php:49 msgid "Authentication error" msgstr "" @@ -84,6 +84,20 @@ msgstr "" msgid "Unable to add group" msgstr "" +#: ajax/decryptall.php:31 +msgid "Files decrypted successfully" +msgstr "" + +#: ajax/decryptall.php:33 +msgid "" +"Couldn't decrypt your files, please check your owncloud.log or ask your " +"administrator" +msgstr "" + +#: ajax/decryptall.php:36 +msgid "Couldn't decrypt your files, check your password and try again" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -126,32 +140,32 @@ msgstr "" msgid "Couldn't update app." msgstr "" -#: changepassword/controller.php:20 +#: changepassword/controller.php:17 msgid "Wrong password" msgstr "" -#: changepassword/controller.php:42 +#: changepassword/controller.php:36 msgid "No user supplied" msgstr "" -#: changepassword/controller.php:74 +#: changepassword/controller.php:68 msgid "" "Please provide an admin recovery password, otherwise all user data will be " "lost" msgstr "" -#: changepassword/controller.php:79 +#: changepassword/controller.php:73 msgid "" "Wrong admin recovery password. Please check the password and try again." msgstr "" -#: changepassword/controller.php:87 +#: changepassword/controller.php:81 msgid "" "Back-end doesn't support password change, but the users encryption key was " "successfully updated." msgstr "" -#: changepassword/controller.php:92 changepassword/controller.php:103 +#: changepassword/controller.php:86 changepassword/controller.php:97 msgid "Unable to change password" msgstr "" @@ -203,7 +217,7 @@ msgstr "" msgid "Error" msgstr "" -#: js/apps.js:153 templates/apps.php:54 +#: js/apps.js:153 templates/apps.php:55 msgid "Update" msgstr "" @@ -211,31 +225,31 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:246 +#: js/personal.js:243 msgid "Select a profile picture" msgstr "" -#: js/personal.js:277 +#: js/personal.js:274 msgid "Very weak password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:275 msgid "Weak password" msgstr "" -#: js/personal.js:279 +#: js/personal.js:276 msgid "So-so password" msgstr "" -#: js/personal.js:280 +#: js/personal.js:277 msgid "Good password" msgstr "" -#: js/personal.js:281 +#: js/personal.js:278 msgid "Strong password" msgstr "" -#: js/personal.js:316 +#: js/personal.js:313 msgid "Decrypting files... Please wait, this can take some time." msgstr "" @@ -284,7 +298,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:49 personal.php:50 +#: personal.php:48 personal.php:49 msgid "__language_name__" msgstr "" @@ -589,11 +603,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:416 templates/personal.php:181 +#: templates/admin.php:416 templates/personal.php:171 msgid "Version" msgstr "" -#: templates/admin.php:420 templates/personal.php:184 +#: templates/admin.php:420 templates/personal.php:174 msgid "" "Developed by the ownCloud community, the -licensed by " msgstr "" @@ -664,108 +678,108 @@ msgstr "" msgid "You have used %s of the available %s" msgstr "" -#: templates/personal.php:39 templates/users.php:21 templates/users.php:87 +#: templates/personal.php:38 templates/users.php:21 templates/users.php:87 msgid "Password" msgstr "" -#: templates/personal.php:40 +#: templates/personal.php:39 msgid "Your password was changed" msgstr "" -#: templates/personal.php:41 +#: templates/personal.php:40 msgid "Unable to change your password" msgstr "" -#: templates/personal.php:43 +#: templates/personal.php:42 msgid "Current password" msgstr "" -#: templates/personal.php:46 +#: templates/personal.php:45 msgid "New password" msgstr "" -#: templates/personal.php:50 +#: templates/personal.php:49 msgid "Change password" msgstr "" -#: templates/personal.php:64 templates/users.php:86 +#: templates/personal.php:61 templates/users.php:86 msgid "Full Name" msgstr "" -#: templates/personal.php:81 +#: templates/personal.php:76 msgid "Email" msgstr "" -#: templates/personal.php:83 +#: templates/personal.php:78 msgid "Your email address" msgstr "" -#: templates/personal.php:86 +#: templates/personal.php:81 msgid "" "Fill in an email address to enable password recovery and receive " "notifications" msgstr "" -#: templates/personal.php:96 +#: templates/personal.php:89 msgid "Profile picture" msgstr "" -#: templates/personal.php:101 +#: templates/personal.php:94 msgid "Upload new" msgstr "" -#: templates/personal.php:103 +#: templates/personal.php:96 msgid "Select new from Files" msgstr "" -#: templates/personal.php:104 +#: templates/personal.php:97 msgid "Remove image" msgstr "" -#: templates/personal.php:105 +#: templates/personal.php:98 msgid "Either png or jpg. Ideally square but you will be able to crop it." msgstr "" -#: templates/personal.php:107 +#: templates/personal.php:100 msgid "Your avatar is provided by your original account." msgstr "" -#: templates/personal.php:111 +#: templates/personal.php:104 msgid "Cancel" msgstr "" -#: templates/personal.php:112 +#: templates/personal.php:105 msgid "Choose as profile image" msgstr "" -#: templates/personal.php:120 templates/personal.php:121 +#: templates/personal.php:111 templates/personal.php:112 msgid "Language" msgstr "" -#: templates/personal.php:140 +#: templates/personal.php:131 msgid "Help translate" msgstr "" -#: templates/personal.php:147 +#: templates/personal.php:137 msgid "WebDAV" msgstr "" -#: templates/personal.php:149 +#: templates/personal.php:139 #, php-format msgid "" "Use this address to access your Files via " "WebDAV" msgstr "" -#: templates/personal.php:161 +#: templates/personal.php:151 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:167 +#: templates/personal.php:157 msgid "Log-in password" msgstr "" -#: templates/personal.php:172 +#: templates/personal.php:162 msgid "Decrypt all Files" msgstr "" diff --git a/l10n/ady/user_ldap.po b/l10n/ady/user_ldap.po index 04cdd0397c4..d4f2a71490e 100644 --- a/l10n/ady/user_ldap.po +++ b/l10n/ady/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-08 01:56-0400\n" -"PO-Revision-Date: 2014-04-08 05:56+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:55+0000\n" "Last-Translator: I Robot\n" "Language-Team: Adyghe (http://www.transifex.com/projects/p/owncloud/language/ady/)\n" "MIME-Version: 1.0\n" @@ -144,7 +144,7 @@ msgstr[1] "" msgid "Invalid Host" msgstr "" -#: lib/wizard.php:963 +#: lib/wizard.php:983 msgid "Could not find the desired feature" msgstr "" @@ -335,7 +335,7 @@ msgid "Only connect to the replica server." msgstr "" #: templates/settings.php:26 -msgid "Case insensitve LDAP server (Windows)" +msgid "Case insensitive LDAP server (Windows)" msgstr "" #: templates/settings.php:27 diff --git a/l10n/af/settings.po b/l10n/af/settings.po index d312d89bbf6..a8e15047a71 100644 --- a/l10n/af/settings.po +++ b/l10n/af/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-03-26 01:55-0400\n" -"PO-Revision-Date: 2014-03-26 05:55+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Afrikaans (http://www.transifex.com/projects/p/owncloud/language/af/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159 +#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149 msgid "Encryption" msgstr "" @@ -64,7 +64,7 @@ msgid "Unable to load list from App Store" msgstr "" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 changepassword/controller.php:55 +#: ajax/togglegroups.php:20 changepassword/controller.php:49 msgid "Authentication error" msgstr "" @@ -84,6 +84,20 @@ msgstr "" msgid "Unable to add group" msgstr "" +#: ajax/decryptall.php:31 +msgid "Files decrypted successfully" +msgstr "" + +#: ajax/decryptall.php:33 +msgid "" +"Couldn't decrypt your files, please check your owncloud.log or ask your " +"administrator" +msgstr "" + +#: ajax/decryptall.php:36 +msgid "Couldn't decrypt your files, check your password and try again" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -126,32 +140,32 @@ msgstr "" msgid "Couldn't update app." msgstr "" -#: changepassword/controller.php:20 +#: changepassword/controller.php:17 msgid "Wrong password" msgstr "" -#: changepassword/controller.php:42 +#: changepassword/controller.php:36 msgid "No user supplied" msgstr "" -#: changepassword/controller.php:74 +#: changepassword/controller.php:68 msgid "" "Please provide an admin recovery password, otherwise all user data will be " "lost" msgstr "" -#: changepassword/controller.php:79 +#: changepassword/controller.php:73 msgid "" "Wrong admin recovery password. Please check the password and try again." msgstr "" -#: changepassword/controller.php:87 +#: changepassword/controller.php:81 msgid "" "Back-end doesn't support password change, but the users encryption key was " "successfully updated." msgstr "" -#: changepassword/controller.php:92 changepassword/controller.php:103 +#: changepassword/controller.php:86 changepassword/controller.php:97 msgid "Unable to change password" msgstr "" @@ -203,7 +217,7 @@ msgstr "" msgid "Error" msgstr "" -#: js/apps.js:153 templates/apps.php:54 +#: js/apps.js:153 templates/apps.php:55 msgid "Update" msgstr "" @@ -211,31 +225,31 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:246 +#: js/personal.js:243 msgid "Select a profile picture" msgstr "" -#: js/personal.js:277 +#: js/personal.js:274 msgid "Very weak password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:275 msgid "Weak password" msgstr "" -#: js/personal.js:279 +#: js/personal.js:276 msgid "So-so password" msgstr "" -#: js/personal.js:280 +#: js/personal.js:277 msgid "Good password" msgstr "" -#: js/personal.js:281 +#: js/personal.js:278 msgid "Strong password" msgstr "" -#: js/personal.js:316 +#: js/personal.js:313 msgid "Decrypting files... Please wait, this can take some time." msgstr "" @@ -284,7 +298,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:49 personal.php:50 +#: personal.php:48 personal.php:49 msgid "__language_name__" msgstr "" @@ -589,11 +603,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:416 templates/personal.php:181 +#: templates/admin.php:416 templates/personal.php:171 msgid "Version" msgstr "" -#: templates/admin.php:420 templates/personal.php:184 +#: templates/admin.php:420 templates/personal.php:174 msgid "" "Developed by the ownCloud community, the -licensed by " msgstr "" @@ -664,108 +678,108 @@ msgstr "" msgid "You have used %s of the available %s" msgstr "" -#: templates/personal.php:39 templates/users.php:21 templates/users.php:87 +#: templates/personal.php:38 templates/users.php:21 templates/users.php:87 msgid "Password" msgstr "" -#: templates/personal.php:40 +#: templates/personal.php:39 msgid "Your password was changed" msgstr "" -#: templates/personal.php:41 +#: templates/personal.php:40 msgid "Unable to change your password" msgstr "" -#: templates/personal.php:43 +#: templates/personal.php:42 msgid "Current password" msgstr "" -#: templates/personal.php:46 +#: templates/personal.php:45 msgid "New password" msgstr "" -#: templates/personal.php:50 +#: templates/personal.php:49 msgid "Change password" msgstr "" -#: templates/personal.php:64 templates/users.php:86 +#: templates/personal.php:61 templates/users.php:86 msgid "Full Name" msgstr "" -#: templates/personal.php:81 +#: templates/personal.php:76 msgid "Email" msgstr "" -#: templates/personal.php:83 +#: templates/personal.php:78 msgid "Your email address" msgstr "" -#: templates/personal.php:86 +#: templates/personal.php:81 msgid "" "Fill in an email address to enable password recovery and receive " "notifications" msgstr "" -#: templates/personal.php:96 +#: templates/personal.php:89 msgid "Profile picture" msgstr "" -#: templates/personal.php:101 +#: templates/personal.php:94 msgid "Upload new" msgstr "" -#: templates/personal.php:103 +#: templates/personal.php:96 msgid "Select new from Files" msgstr "" -#: templates/personal.php:104 +#: templates/personal.php:97 msgid "Remove image" msgstr "" -#: templates/personal.php:105 +#: templates/personal.php:98 msgid "Either png or jpg. Ideally square but you will be able to crop it." msgstr "" -#: templates/personal.php:107 +#: templates/personal.php:100 msgid "Your avatar is provided by your original account." msgstr "" -#: templates/personal.php:111 +#: templates/personal.php:104 msgid "Cancel" msgstr "" -#: templates/personal.php:112 +#: templates/personal.php:105 msgid "Choose as profile image" msgstr "" -#: templates/personal.php:120 templates/personal.php:121 +#: templates/personal.php:111 templates/personal.php:112 msgid "Language" msgstr "" -#: templates/personal.php:140 +#: templates/personal.php:131 msgid "Help translate" msgstr "" -#: templates/personal.php:147 +#: templates/personal.php:137 msgid "WebDAV" msgstr "" -#: templates/personal.php:149 +#: templates/personal.php:139 #, php-format msgid "" "Use this address to access your Files via " "WebDAV" msgstr "" -#: templates/personal.php:161 +#: templates/personal.php:151 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:167 +#: templates/personal.php:157 msgid "Log-in password" msgstr "" -#: templates/personal.php:172 +#: templates/personal.php:162 msgid "Decrypt all Files" msgstr "" diff --git a/l10n/af/user_ldap.po b/l10n/af/user_ldap.po index b0e9bc1b3ab..f4e1df7a951 100644 --- a/l10n/af/user_ldap.po +++ b/l10n/af/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-08 01:56-0400\n" -"PO-Revision-Date: 2014-04-08 05:56+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:55+0000\n" "Last-Translator: I Robot\n" "Language-Team: Afrikaans (http://www.transifex.com/projects/p/owncloud/language/af/)\n" "MIME-Version: 1.0\n" @@ -144,7 +144,7 @@ msgstr[1] "" msgid "Invalid Host" msgstr "" -#: lib/wizard.php:963 +#: lib/wizard.php:983 msgid "Could not find the desired feature" msgstr "" @@ -335,7 +335,7 @@ msgid "Only connect to the replica server." msgstr "" #: templates/settings.php:26 -msgid "Case insensitve LDAP server (Windows)" +msgid "Case insensitive LDAP server (Windows)" msgstr "" #: templates/settings.php:27 diff --git a/l10n/af_ZA/settings.po b/l10n/af_ZA/settings.po index 92e777a3d53..de9915079a2 100644 --- a/l10n/af_ZA/settings.po +++ b/l10n/af_ZA/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-03-26 01:55-0400\n" -"PO-Revision-Date: 2014-03-26 05:55+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159 +#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149 msgid "Encryption" msgstr "" @@ -64,7 +64,7 @@ msgid "Unable to load list from App Store" msgstr "" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 changepassword/controller.php:55 +#: ajax/togglegroups.php:20 changepassword/controller.php:49 msgid "Authentication error" msgstr "" @@ -84,6 +84,20 @@ msgstr "" msgid "Unable to add group" msgstr "" +#: ajax/decryptall.php:31 +msgid "Files decrypted successfully" +msgstr "" + +#: ajax/decryptall.php:33 +msgid "" +"Couldn't decrypt your files, please check your owncloud.log or ask your " +"administrator" +msgstr "" + +#: ajax/decryptall.php:36 +msgid "Couldn't decrypt your files, check your password and try again" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -126,32 +140,32 @@ msgstr "" msgid "Couldn't update app." msgstr "" -#: changepassword/controller.php:20 +#: changepassword/controller.php:17 msgid "Wrong password" msgstr "" -#: changepassword/controller.php:42 +#: changepassword/controller.php:36 msgid "No user supplied" msgstr "" -#: changepassword/controller.php:74 +#: changepassword/controller.php:68 msgid "" "Please provide an admin recovery password, otherwise all user data will be " "lost" msgstr "" -#: changepassword/controller.php:79 +#: changepassword/controller.php:73 msgid "" "Wrong admin recovery password. Please check the password and try again." msgstr "" -#: changepassword/controller.php:87 +#: changepassword/controller.php:81 msgid "" "Back-end doesn't support password change, but the users encryption key was " "successfully updated." msgstr "" -#: changepassword/controller.php:92 changepassword/controller.php:103 +#: changepassword/controller.php:86 changepassword/controller.php:97 msgid "Unable to change password" msgstr "" @@ -203,7 +217,7 @@ msgstr "" msgid "Error" msgstr "" -#: js/apps.js:153 templates/apps.php:54 +#: js/apps.js:153 templates/apps.php:55 msgid "Update" msgstr "" @@ -211,31 +225,31 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:246 +#: js/personal.js:243 msgid "Select a profile picture" msgstr "" -#: js/personal.js:277 +#: js/personal.js:274 msgid "Very weak password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:275 msgid "Weak password" msgstr "" -#: js/personal.js:279 +#: js/personal.js:276 msgid "So-so password" msgstr "" -#: js/personal.js:280 +#: js/personal.js:277 msgid "Good password" msgstr "" -#: js/personal.js:281 +#: js/personal.js:278 msgid "Strong password" msgstr "" -#: js/personal.js:316 +#: js/personal.js:313 msgid "Decrypting files... Please wait, this can take some time." msgstr "" @@ -284,7 +298,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:49 personal.php:50 +#: personal.php:48 personal.php:49 msgid "__language_name__" msgstr "" @@ -589,11 +603,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:416 templates/personal.php:181 +#: templates/admin.php:416 templates/personal.php:171 msgid "Version" msgstr "" -#: templates/admin.php:420 templates/personal.php:184 +#: templates/admin.php:420 templates/personal.php:174 msgid "" "Developed by the ownCloud community, the -licensed by " msgstr "" @@ -664,108 +678,108 @@ msgstr "" msgid "You have used %s of the available %s" msgstr "" -#: templates/personal.php:39 templates/users.php:21 templates/users.php:87 +#: templates/personal.php:38 templates/users.php:21 templates/users.php:87 msgid "Password" msgstr "Wagwoord" -#: templates/personal.php:40 +#: templates/personal.php:39 msgid "Your password was changed" msgstr "" -#: templates/personal.php:41 +#: templates/personal.php:40 msgid "Unable to change your password" msgstr "" -#: templates/personal.php:43 +#: templates/personal.php:42 msgid "Current password" msgstr "" -#: templates/personal.php:46 +#: templates/personal.php:45 msgid "New password" msgstr "Nuwe wagwoord" -#: templates/personal.php:50 +#: templates/personal.php:49 msgid "Change password" msgstr "" -#: templates/personal.php:64 templates/users.php:86 +#: templates/personal.php:61 templates/users.php:86 msgid "Full Name" msgstr "" -#: templates/personal.php:81 +#: templates/personal.php:76 msgid "Email" msgstr "" -#: templates/personal.php:83 +#: templates/personal.php:78 msgid "Your email address" msgstr "" -#: templates/personal.php:86 +#: templates/personal.php:81 msgid "" "Fill in an email address to enable password recovery and receive " "notifications" msgstr "" -#: templates/personal.php:96 +#: templates/personal.php:89 msgid "Profile picture" msgstr "" -#: templates/personal.php:101 +#: templates/personal.php:94 msgid "Upload new" msgstr "" -#: templates/personal.php:103 +#: templates/personal.php:96 msgid "Select new from Files" msgstr "" -#: templates/personal.php:104 +#: templates/personal.php:97 msgid "Remove image" msgstr "" -#: templates/personal.php:105 +#: templates/personal.php:98 msgid "Either png or jpg. Ideally square but you will be able to crop it." msgstr "" -#: templates/personal.php:107 +#: templates/personal.php:100 msgid "Your avatar is provided by your original account." msgstr "" -#: templates/personal.php:111 +#: templates/personal.php:104 msgid "Cancel" msgstr "" -#: templates/personal.php:112 +#: templates/personal.php:105 msgid "Choose as profile image" msgstr "" -#: templates/personal.php:120 templates/personal.php:121 +#: templates/personal.php:111 templates/personal.php:112 msgid "Language" msgstr "" -#: templates/personal.php:140 +#: templates/personal.php:131 msgid "Help translate" msgstr "" -#: templates/personal.php:147 +#: templates/personal.php:137 msgid "WebDAV" msgstr "" -#: templates/personal.php:149 +#: templates/personal.php:139 #, php-format msgid "" "Use this address to access your Files via " "WebDAV" msgstr "" -#: templates/personal.php:161 +#: templates/personal.php:151 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:167 +#: templates/personal.php:157 msgid "Log-in password" msgstr "" -#: templates/personal.php:172 +#: templates/personal.php:162 msgid "Decrypt all Files" msgstr "" diff --git a/l10n/af_ZA/user_ldap.po b/l10n/af_ZA/user_ldap.po index 581eb34d236..a22ec0c215a 100644 --- a/l10n/af_ZA/user_ldap.po +++ b/l10n/af_ZA/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-08 01:56-0400\n" -"PO-Revision-Date: 2014-04-08 05:56+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:55+0000\n" "Last-Translator: I Robot\n" "Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n" "MIME-Version: 1.0\n" @@ -144,7 +144,7 @@ msgstr[1] "" msgid "Invalid Host" msgstr "" -#: lib/wizard.php:963 +#: lib/wizard.php:983 msgid "Could not find the desired feature" msgstr "" @@ -335,7 +335,7 @@ msgid "Only connect to the replica server." msgstr "" #: templates/settings.php:26 -msgid "Case insensitve LDAP server (Windows)" +msgid "Case insensitive LDAP server (Windows)" msgstr "" #: templates/settings.php:27 diff --git a/l10n/ak/settings.po b/l10n/ak/settings.po index cb7953cc98c..27711c91512 100644 --- a/l10n/ak/settings.po +++ b/l10n/ak/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-03-26 01:55-0400\n" -"PO-Revision-Date: 2014-03-26 05:55+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Akan (http://www.transifex.com/projects/p/owncloud/language/ak/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159 +#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149 msgid "Encryption" msgstr "" @@ -64,7 +64,7 @@ msgid "Unable to load list from App Store" msgstr "" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 changepassword/controller.php:55 +#: ajax/togglegroups.php:20 changepassword/controller.php:49 msgid "Authentication error" msgstr "" @@ -84,6 +84,20 @@ msgstr "" msgid "Unable to add group" msgstr "" +#: ajax/decryptall.php:31 +msgid "Files decrypted successfully" +msgstr "" + +#: ajax/decryptall.php:33 +msgid "" +"Couldn't decrypt your files, please check your owncloud.log or ask your " +"administrator" +msgstr "" + +#: ajax/decryptall.php:36 +msgid "Couldn't decrypt your files, check your password and try again" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -126,32 +140,32 @@ msgstr "" msgid "Couldn't update app." msgstr "" -#: changepassword/controller.php:20 +#: changepassword/controller.php:17 msgid "Wrong password" msgstr "" -#: changepassword/controller.php:42 +#: changepassword/controller.php:36 msgid "No user supplied" msgstr "" -#: changepassword/controller.php:74 +#: changepassword/controller.php:68 msgid "" "Please provide an admin recovery password, otherwise all user data will be " "lost" msgstr "" -#: changepassword/controller.php:79 +#: changepassword/controller.php:73 msgid "" "Wrong admin recovery password. Please check the password and try again." msgstr "" -#: changepassword/controller.php:87 +#: changepassword/controller.php:81 msgid "" "Back-end doesn't support password change, but the users encryption key was " "successfully updated." msgstr "" -#: changepassword/controller.php:92 changepassword/controller.php:103 +#: changepassword/controller.php:86 changepassword/controller.php:97 msgid "Unable to change password" msgstr "" @@ -203,7 +217,7 @@ msgstr "" msgid "Error" msgstr "" -#: js/apps.js:153 templates/apps.php:54 +#: js/apps.js:153 templates/apps.php:55 msgid "Update" msgstr "" @@ -211,31 +225,31 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:246 +#: js/personal.js:243 msgid "Select a profile picture" msgstr "" -#: js/personal.js:277 +#: js/personal.js:274 msgid "Very weak password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:275 msgid "Weak password" msgstr "" -#: js/personal.js:279 +#: js/personal.js:276 msgid "So-so password" msgstr "" -#: js/personal.js:280 +#: js/personal.js:277 msgid "Good password" msgstr "" -#: js/personal.js:281 +#: js/personal.js:278 msgid "Strong password" msgstr "" -#: js/personal.js:316 +#: js/personal.js:313 msgid "Decrypting files... Please wait, this can take some time." msgstr "" @@ -284,7 +298,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:49 personal.php:50 +#: personal.php:48 personal.php:49 msgid "__language_name__" msgstr "" @@ -589,11 +603,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:416 templates/personal.php:181 +#: templates/admin.php:416 templates/personal.php:171 msgid "Version" msgstr "" -#: templates/admin.php:420 templates/personal.php:184 +#: templates/admin.php:420 templates/personal.php:174 msgid "" "Developed by the ownCloud community, the -licensed by " msgstr "" @@ -664,108 +678,108 @@ msgstr "" msgid "You have used %s of the available %s" msgstr "" -#: templates/personal.php:39 templates/users.php:21 templates/users.php:87 +#: templates/personal.php:38 templates/users.php:21 templates/users.php:87 msgid "Password" msgstr "" -#: templates/personal.php:40 +#: templates/personal.php:39 msgid "Your password was changed" msgstr "" -#: templates/personal.php:41 +#: templates/personal.php:40 msgid "Unable to change your password" msgstr "" -#: templates/personal.php:43 +#: templates/personal.php:42 msgid "Current password" msgstr "" -#: templates/personal.php:46 +#: templates/personal.php:45 msgid "New password" msgstr "" -#: templates/personal.php:50 +#: templates/personal.php:49 msgid "Change password" msgstr "" -#: templates/personal.php:64 templates/users.php:86 +#: templates/personal.php:61 templates/users.php:86 msgid "Full Name" msgstr "" -#: templates/personal.php:81 +#: templates/personal.php:76 msgid "Email" msgstr "" -#: templates/personal.php:83 +#: templates/personal.php:78 msgid "Your email address" msgstr "" -#: templates/personal.php:86 +#: templates/personal.php:81 msgid "" "Fill in an email address to enable password recovery and receive " "notifications" msgstr "" -#: templates/personal.php:96 +#: templates/personal.php:89 msgid "Profile picture" msgstr "" -#: templates/personal.php:101 +#: templates/personal.php:94 msgid "Upload new" msgstr "" -#: templates/personal.php:103 +#: templates/personal.php:96 msgid "Select new from Files" msgstr "" -#: templates/personal.php:104 +#: templates/personal.php:97 msgid "Remove image" msgstr "" -#: templates/personal.php:105 +#: templates/personal.php:98 msgid "Either png or jpg. Ideally square but you will be able to crop it." msgstr "" -#: templates/personal.php:107 +#: templates/personal.php:100 msgid "Your avatar is provided by your original account." msgstr "" -#: templates/personal.php:111 +#: templates/personal.php:104 msgid "Cancel" msgstr "" -#: templates/personal.php:112 +#: templates/personal.php:105 msgid "Choose as profile image" msgstr "" -#: templates/personal.php:120 templates/personal.php:121 +#: templates/personal.php:111 templates/personal.php:112 msgid "Language" msgstr "" -#: templates/personal.php:140 +#: templates/personal.php:131 msgid "Help translate" msgstr "" -#: templates/personal.php:147 +#: templates/personal.php:137 msgid "WebDAV" msgstr "" -#: templates/personal.php:149 +#: templates/personal.php:139 #, php-format msgid "" "Use this address to access your Files via " "WebDAV" msgstr "" -#: templates/personal.php:161 +#: templates/personal.php:151 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:167 +#: templates/personal.php:157 msgid "Log-in password" msgstr "" -#: templates/personal.php:172 +#: templates/personal.php:162 msgid "Decrypt all Files" msgstr "" diff --git a/l10n/ak/user_ldap.po b/l10n/ak/user_ldap.po index 2dae2aaf95c..8e625a32174 100644 --- a/l10n/ak/user_ldap.po +++ b/l10n/ak/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-08 01:56-0400\n" -"PO-Revision-Date: 2014-04-08 05:56+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:55+0000\n" "Last-Translator: I Robot\n" "Language-Team: Akan (http://www.transifex.com/projects/p/owncloud/language/ak/)\n" "MIME-Version: 1.0\n" @@ -144,7 +144,7 @@ msgstr[1] "" msgid "Invalid Host" msgstr "" -#: lib/wizard.php:963 +#: lib/wizard.php:983 msgid "Could not find the desired feature" msgstr "" @@ -335,7 +335,7 @@ msgid "Only connect to the replica server." msgstr "" #: templates/settings.php:26 -msgid "Case insensitve LDAP server (Windows)" +msgid "Case insensitive LDAP server (Windows)" msgstr "" #: templates/settings.php:27 diff --git a/l10n/am_ET/settings.po b/l10n/am_ET/settings.po index f2886d1023c..6aa770b32ef 100644 --- a/l10n/am_ET/settings.po +++ b/l10n/am_ET/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-03-26 01:55-0400\n" -"PO-Revision-Date: 2014-03-26 05:55+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Amharic (Ethiopia) (http://www.transifex.com/projects/p/owncloud/language/am_ET/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159 +#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149 msgid "Encryption" msgstr "" @@ -64,7 +64,7 @@ msgid "Unable to load list from App Store" msgstr "" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 changepassword/controller.php:55 +#: ajax/togglegroups.php:20 changepassword/controller.php:49 msgid "Authentication error" msgstr "" @@ -84,6 +84,20 @@ msgstr "" msgid "Unable to add group" msgstr "" +#: ajax/decryptall.php:31 +msgid "Files decrypted successfully" +msgstr "" + +#: ajax/decryptall.php:33 +msgid "" +"Couldn't decrypt your files, please check your owncloud.log or ask your " +"administrator" +msgstr "" + +#: ajax/decryptall.php:36 +msgid "Couldn't decrypt your files, check your password and try again" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -126,32 +140,32 @@ msgstr "" msgid "Couldn't update app." msgstr "" -#: changepassword/controller.php:20 +#: changepassword/controller.php:17 msgid "Wrong password" msgstr "" -#: changepassword/controller.php:42 +#: changepassword/controller.php:36 msgid "No user supplied" msgstr "" -#: changepassword/controller.php:74 +#: changepassword/controller.php:68 msgid "" "Please provide an admin recovery password, otherwise all user data will be " "lost" msgstr "" -#: changepassword/controller.php:79 +#: changepassword/controller.php:73 msgid "" "Wrong admin recovery password. Please check the password and try again." msgstr "" -#: changepassword/controller.php:87 +#: changepassword/controller.php:81 msgid "" "Back-end doesn't support password change, but the users encryption key was " "successfully updated." msgstr "" -#: changepassword/controller.php:92 changepassword/controller.php:103 +#: changepassword/controller.php:86 changepassword/controller.php:97 msgid "Unable to change password" msgstr "" @@ -203,7 +217,7 @@ msgstr "" msgid "Error" msgstr "" -#: js/apps.js:153 templates/apps.php:54 +#: js/apps.js:153 templates/apps.php:55 msgid "Update" msgstr "" @@ -211,31 +225,31 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:246 +#: js/personal.js:243 msgid "Select a profile picture" msgstr "" -#: js/personal.js:277 +#: js/personal.js:274 msgid "Very weak password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:275 msgid "Weak password" msgstr "" -#: js/personal.js:279 +#: js/personal.js:276 msgid "So-so password" msgstr "" -#: js/personal.js:280 +#: js/personal.js:277 msgid "Good password" msgstr "" -#: js/personal.js:281 +#: js/personal.js:278 msgid "Strong password" msgstr "" -#: js/personal.js:316 +#: js/personal.js:313 msgid "Decrypting files... Please wait, this can take some time." msgstr "" @@ -284,7 +298,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:49 personal.php:50 +#: personal.php:48 personal.php:49 msgid "__language_name__" msgstr "" @@ -589,11 +603,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:416 templates/personal.php:181 +#: templates/admin.php:416 templates/personal.php:171 msgid "Version" msgstr "" -#: templates/admin.php:420 templates/personal.php:184 +#: templates/admin.php:420 templates/personal.php:174 msgid "" "Developed by the ownCloud community, the -licensed by " msgstr "" @@ -664,108 +678,108 @@ msgstr "" msgid "You have used %s of the available %s" msgstr "" -#: templates/personal.php:39 templates/users.php:21 templates/users.php:87 +#: templates/personal.php:38 templates/users.php:21 templates/users.php:87 msgid "Password" msgstr "" -#: templates/personal.php:40 +#: templates/personal.php:39 msgid "Your password was changed" msgstr "" -#: templates/personal.php:41 +#: templates/personal.php:40 msgid "Unable to change your password" msgstr "" -#: templates/personal.php:43 +#: templates/personal.php:42 msgid "Current password" msgstr "" -#: templates/personal.php:46 +#: templates/personal.php:45 msgid "New password" msgstr "" -#: templates/personal.php:50 +#: templates/personal.php:49 msgid "Change password" msgstr "" -#: templates/personal.php:64 templates/users.php:86 +#: templates/personal.php:61 templates/users.php:86 msgid "Full Name" msgstr "" -#: templates/personal.php:81 +#: templates/personal.php:76 msgid "Email" msgstr "" -#: templates/personal.php:83 +#: templates/personal.php:78 msgid "Your email address" msgstr "" -#: templates/personal.php:86 +#: templates/personal.php:81 msgid "" "Fill in an email address to enable password recovery and receive " "notifications" msgstr "" -#: templates/personal.php:96 +#: templates/personal.php:89 msgid "Profile picture" msgstr "" -#: templates/personal.php:101 +#: templates/personal.php:94 msgid "Upload new" msgstr "" -#: templates/personal.php:103 +#: templates/personal.php:96 msgid "Select new from Files" msgstr "" -#: templates/personal.php:104 +#: templates/personal.php:97 msgid "Remove image" msgstr "" -#: templates/personal.php:105 +#: templates/personal.php:98 msgid "Either png or jpg. Ideally square but you will be able to crop it." msgstr "" -#: templates/personal.php:107 +#: templates/personal.php:100 msgid "Your avatar is provided by your original account." msgstr "" -#: templates/personal.php:111 +#: templates/personal.php:104 msgid "Cancel" msgstr "" -#: templates/personal.php:112 +#: templates/personal.php:105 msgid "Choose as profile image" msgstr "" -#: templates/personal.php:120 templates/personal.php:121 +#: templates/personal.php:111 templates/personal.php:112 msgid "Language" msgstr "" -#: templates/personal.php:140 +#: templates/personal.php:131 msgid "Help translate" msgstr "" -#: templates/personal.php:147 +#: templates/personal.php:137 msgid "WebDAV" msgstr "" -#: templates/personal.php:149 +#: templates/personal.php:139 #, php-format msgid "" "Use this address to access your Files via " "WebDAV" msgstr "" -#: templates/personal.php:161 +#: templates/personal.php:151 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:167 +#: templates/personal.php:157 msgid "Log-in password" msgstr "" -#: templates/personal.php:172 +#: templates/personal.php:162 msgid "Decrypt all Files" msgstr "" diff --git a/l10n/am_ET/user_ldap.po b/l10n/am_ET/user_ldap.po index 0dc3459fe7e..ba789c234bc 100644 --- a/l10n/am_ET/user_ldap.po +++ b/l10n/am_ET/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-08 01:56-0400\n" -"PO-Revision-Date: 2014-04-08 05:56+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:55+0000\n" "Last-Translator: I Robot\n" "Language-Team: Amharic (Ethiopia) (http://www.transifex.com/projects/p/owncloud/language/am_ET/)\n" "MIME-Version: 1.0\n" @@ -144,7 +144,7 @@ msgstr[1] "" msgid "Invalid Host" msgstr "" -#: lib/wizard.php:963 +#: lib/wizard.php:983 msgid "Could not find the desired feature" msgstr "" @@ -335,7 +335,7 @@ msgid "Only connect to the replica server." msgstr "" #: templates/settings.php:26 -msgid "Case insensitve LDAP server (Windows)" +msgid "Case insensitive LDAP server (Windows)" msgstr "" #: templates/settings.php:27 diff --git a/l10n/ar/settings.po b/l10n/ar/settings.po index 9a4af6d1886..a060a79595e 100644 --- a/l10n/ar/settings.po +++ b/l10n/ar/settings.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-10 01:54-0400\n" -"PO-Revision-Date: 2014-04-09 06:10+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n" "MIME-Version: 1.0\n" @@ -87,6 +87,20 @@ msgstr "المجموعة موجودة مسبقاً" msgid "Unable to add group" msgstr "فشل إضافة المجموعة" +#: ajax/decryptall.php:31 +msgid "Files decrypted successfully" +msgstr "" + +#: ajax/decryptall.php:33 +msgid "" +"Couldn't decrypt your files, please check your owncloud.log or ask your " +"administrator" +msgstr "" + +#: ajax/decryptall.php:36 +msgid "Couldn't decrypt your files, check your password and try again" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "تم حفظ البريد الإلكتروني" diff --git a/l10n/ar/user_ldap.po b/l10n/ar/user_ldap.po index 3b92bebccea..099e7c57dbb 100644 --- a/l10n/ar/user_ldap.po +++ b/l10n/ar/user_ldap.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-08 01:56-0400\n" -"PO-Revision-Date: 2014-04-08 05:56+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:55+0000\n" "Last-Translator: I Robot\n" "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n" "MIME-Version: 1.0\n" @@ -153,7 +153,7 @@ msgstr[5] "" msgid "Invalid Host" msgstr "" -#: lib/wizard.php:963 +#: lib/wizard.php:983 msgid "Could not find the desired feature" msgstr "" @@ -344,7 +344,7 @@ msgid "Only connect to the replica server." msgstr "" #: templates/settings.php:26 -msgid "Case insensitve LDAP server (Windows)" +msgid "Case insensitive LDAP server (Windows)" msgstr "" #: templates/settings.php:27 diff --git a/l10n/ast/settings.po b/l10n/ast/settings.po index 0c2cf566e17..4213935f560 100644 --- a/l10n/ast/settings.po +++ b/l10n/ast/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-10 01:54-0400\n" -"PO-Revision-Date: 2014-04-09 21:20+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Asturian (http://www.transifex.com/projects/p/owncloud/language/ast/)\n" "MIME-Version: 1.0\n" @@ -84,6 +84,20 @@ msgstr "" msgid "Unable to add group" msgstr "" +#: ajax/decryptall.php:31 +msgid "Files decrypted successfully" +msgstr "" + +#: ajax/decryptall.php:33 +msgid "" +"Couldn't decrypt your files, please check your owncloud.log or ask your " +"administrator" +msgstr "" + +#: ajax/decryptall.php:36 +msgid "Couldn't decrypt your files, check your password and try again" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" diff --git a/l10n/ast/user_ldap.po b/l10n/ast/user_ldap.po index 2ee3b4bb024..b5982a3e6ee 100644 --- a/l10n/ast/user_ldap.po +++ b/l10n/ast/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-10 01:54-0400\n" -"PO-Revision-Date: 2014-04-09 21:20+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:55+0000\n" "Last-Translator: I Robot\n" "Language-Team: Asturian (http://www.transifex.com/projects/p/owncloud/language/ast/)\n" "MIME-Version: 1.0\n" @@ -335,7 +335,7 @@ msgid "Only connect to the replica server." msgstr "" #: templates/settings.php:26 -msgid "Case insensitve LDAP server (Windows)" +msgid "Case insensitive LDAP server (Windows)" msgstr "" #: templates/settings.php:27 diff --git a/l10n/az/settings.po b/l10n/az/settings.po index b43ce968a40..fbc31d71164 100644 --- a/l10n/az/settings.po +++ b/l10n/az/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-03-26 01:55-0400\n" -"PO-Revision-Date: 2014-03-26 05:55+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Azerbaijani (http://www.transifex.com/projects/p/owncloud/language/az/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159 +#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149 msgid "Encryption" msgstr "" @@ -64,7 +64,7 @@ msgid "Unable to load list from App Store" msgstr "" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 changepassword/controller.php:55 +#: ajax/togglegroups.php:20 changepassword/controller.php:49 msgid "Authentication error" msgstr "" @@ -84,6 +84,20 @@ msgstr "" msgid "Unable to add group" msgstr "" +#: ajax/decryptall.php:31 +msgid "Files decrypted successfully" +msgstr "" + +#: ajax/decryptall.php:33 +msgid "" +"Couldn't decrypt your files, please check your owncloud.log or ask your " +"administrator" +msgstr "" + +#: ajax/decryptall.php:36 +msgid "Couldn't decrypt your files, check your password and try again" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -126,32 +140,32 @@ msgstr "" msgid "Couldn't update app." msgstr "" -#: changepassword/controller.php:20 +#: changepassword/controller.php:17 msgid "Wrong password" msgstr "" -#: changepassword/controller.php:42 +#: changepassword/controller.php:36 msgid "No user supplied" msgstr "" -#: changepassword/controller.php:74 +#: changepassword/controller.php:68 msgid "" "Please provide an admin recovery password, otherwise all user data will be " "lost" msgstr "" -#: changepassword/controller.php:79 +#: changepassword/controller.php:73 msgid "" "Wrong admin recovery password. Please check the password and try again." msgstr "" -#: changepassword/controller.php:87 +#: changepassword/controller.php:81 msgid "" "Back-end doesn't support password change, but the users encryption key was " "successfully updated." msgstr "" -#: changepassword/controller.php:92 changepassword/controller.php:103 +#: changepassword/controller.php:86 changepassword/controller.php:97 msgid "Unable to change password" msgstr "" @@ -203,7 +217,7 @@ msgstr "" msgid "Error" msgstr "" -#: js/apps.js:153 templates/apps.php:54 +#: js/apps.js:153 templates/apps.php:55 msgid "Update" msgstr "" @@ -211,31 +225,31 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:246 +#: js/personal.js:243 msgid "Select a profile picture" msgstr "" -#: js/personal.js:277 +#: js/personal.js:274 msgid "Very weak password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:275 msgid "Weak password" msgstr "" -#: js/personal.js:279 +#: js/personal.js:276 msgid "So-so password" msgstr "" -#: js/personal.js:280 +#: js/personal.js:277 msgid "Good password" msgstr "" -#: js/personal.js:281 +#: js/personal.js:278 msgid "Strong password" msgstr "" -#: js/personal.js:316 +#: js/personal.js:313 msgid "Decrypting files... Please wait, this can take some time." msgstr "" @@ -284,7 +298,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:49 personal.php:50 +#: personal.php:48 personal.php:49 msgid "__language_name__" msgstr "" @@ -589,11 +603,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:416 templates/personal.php:181 +#: templates/admin.php:416 templates/personal.php:171 msgid "Version" msgstr "" -#: templates/admin.php:420 templates/personal.php:184 +#: templates/admin.php:420 templates/personal.php:174 msgid "" "Developed by the ownCloud community, the -licensed by " msgstr "" @@ -664,108 +678,108 @@ msgstr "" msgid "You have used %s of the available %s" msgstr "" -#: templates/personal.php:39 templates/users.php:21 templates/users.php:87 +#: templates/personal.php:38 templates/users.php:21 templates/users.php:87 msgid "Password" msgstr "" -#: templates/personal.php:40 +#: templates/personal.php:39 msgid "Your password was changed" msgstr "" -#: templates/personal.php:41 +#: templates/personal.php:40 msgid "Unable to change your password" msgstr "" -#: templates/personal.php:43 +#: templates/personal.php:42 msgid "Current password" msgstr "" -#: templates/personal.php:46 +#: templates/personal.php:45 msgid "New password" msgstr "" -#: templates/personal.php:50 +#: templates/personal.php:49 msgid "Change password" msgstr "" -#: templates/personal.php:64 templates/users.php:86 +#: templates/personal.php:61 templates/users.php:86 msgid "Full Name" msgstr "" -#: templates/personal.php:81 +#: templates/personal.php:76 msgid "Email" msgstr "" -#: templates/personal.php:83 +#: templates/personal.php:78 msgid "Your email address" msgstr "" -#: templates/personal.php:86 +#: templates/personal.php:81 msgid "" "Fill in an email address to enable password recovery and receive " "notifications" msgstr "" -#: templates/personal.php:96 +#: templates/personal.php:89 msgid "Profile picture" msgstr "" -#: templates/personal.php:101 +#: templates/personal.php:94 msgid "Upload new" msgstr "" -#: templates/personal.php:103 +#: templates/personal.php:96 msgid "Select new from Files" msgstr "" -#: templates/personal.php:104 +#: templates/personal.php:97 msgid "Remove image" msgstr "" -#: templates/personal.php:105 +#: templates/personal.php:98 msgid "Either png or jpg. Ideally square but you will be able to crop it." msgstr "" -#: templates/personal.php:107 +#: templates/personal.php:100 msgid "Your avatar is provided by your original account." msgstr "" -#: templates/personal.php:111 +#: templates/personal.php:104 msgid "Cancel" msgstr "" -#: templates/personal.php:112 +#: templates/personal.php:105 msgid "Choose as profile image" msgstr "" -#: templates/personal.php:120 templates/personal.php:121 +#: templates/personal.php:111 templates/personal.php:112 msgid "Language" msgstr "" -#: templates/personal.php:140 +#: templates/personal.php:131 msgid "Help translate" msgstr "" -#: templates/personal.php:147 +#: templates/personal.php:137 msgid "WebDAV" msgstr "" -#: templates/personal.php:149 +#: templates/personal.php:139 #, php-format msgid "" "Use this address to access your Files via " "WebDAV" msgstr "" -#: templates/personal.php:161 +#: templates/personal.php:151 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:167 +#: templates/personal.php:157 msgid "Log-in password" msgstr "" -#: templates/personal.php:172 +#: templates/personal.php:162 msgid "Decrypt all Files" msgstr "" diff --git a/l10n/az/user_ldap.po b/l10n/az/user_ldap.po index df36a475ca0..1da919a2bd9 100644 --- a/l10n/az/user_ldap.po +++ b/l10n/az/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-08 01:56-0400\n" -"PO-Revision-Date: 2014-04-08 05:56+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:55+0000\n" "Last-Translator: I Robot\n" "Language-Team: Azerbaijani (http://www.transifex.com/projects/p/owncloud/language/az/)\n" "MIME-Version: 1.0\n" @@ -144,7 +144,7 @@ msgstr[1] "" msgid "Invalid Host" msgstr "" -#: lib/wizard.php:963 +#: lib/wizard.php:983 msgid "Could not find the desired feature" msgstr "" @@ -335,7 +335,7 @@ msgid "Only connect to the replica server." msgstr "" #: templates/settings.php:26 -msgid "Case insensitve LDAP server (Windows)" +msgid "Case insensitive LDAP server (Windows)" msgstr "" #: templates/settings.php:27 diff --git a/l10n/be/settings.po b/l10n/be/settings.po index 1209b101c88..5e4b84e7979 100644 --- a/l10n/be/settings.po +++ b/l10n/be/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-03-26 01:55-0400\n" -"PO-Revision-Date: 2014-03-26 05:55+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159 +#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149 msgid "Encryption" msgstr "" @@ -64,7 +64,7 @@ msgid "Unable to load list from App Store" msgstr "" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 changepassword/controller.php:55 +#: ajax/togglegroups.php:20 changepassword/controller.php:49 msgid "Authentication error" msgstr "" @@ -84,6 +84,20 @@ msgstr "" msgid "Unable to add group" msgstr "" +#: ajax/decryptall.php:31 +msgid "Files decrypted successfully" +msgstr "" + +#: ajax/decryptall.php:33 +msgid "" +"Couldn't decrypt your files, please check your owncloud.log or ask your " +"administrator" +msgstr "" + +#: ajax/decryptall.php:36 +msgid "Couldn't decrypt your files, check your password and try again" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -126,32 +140,32 @@ msgstr "" msgid "Couldn't update app." msgstr "" -#: changepassword/controller.php:20 +#: changepassword/controller.php:17 msgid "Wrong password" msgstr "" -#: changepassword/controller.php:42 +#: changepassword/controller.php:36 msgid "No user supplied" msgstr "" -#: changepassword/controller.php:74 +#: changepassword/controller.php:68 msgid "" "Please provide an admin recovery password, otherwise all user data will be " "lost" msgstr "" -#: changepassword/controller.php:79 +#: changepassword/controller.php:73 msgid "" "Wrong admin recovery password. Please check the password and try again." msgstr "" -#: changepassword/controller.php:87 +#: changepassword/controller.php:81 msgid "" "Back-end doesn't support password change, but the users encryption key was " "successfully updated." msgstr "" -#: changepassword/controller.php:92 changepassword/controller.php:103 +#: changepassword/controller.php:86 changepassword/controller.php:97 msgid "Unable to change password" msgstr "" @@ -203,7 +217,7 @@ msgstr "" msgid "Error" msgstr "Памылка" -#: js/apps.js:153 templates/apps.php:54 +#: js/apps.js:153 templates/apps.php:55 msgid "Update" msgstr "" @@ -211,31 +225,31 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:246 +#: js/personal.js:243 msgid "Select a profile picture" msgstr "" -#: js/personal.js:277 +#: js/personal.js:274 msgid "Very weak password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:275 msgid "Weak password" msgstr "" -#: js/personal.js:279 +#: js/personal.js:276 msgid "So-so password" msgstr "" -#: js/personal.js:280 +#: js/personal.js:277 msgid "Good password" msgstr "" -#: js/personal.js:281 +#: js/personal.js:278 msgid "Strong password" msgstr "" -#: js/personal.js:316 +#: js/personal.js:313 msgid "Decrypting files... Please wait, this can take some time." msgstr "" @@ -284,7 +298,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:49 personal.php:50 +#: personal.php:48 personal.php:49 msgid "__language_name__" msgstr "" @@ -589,11 +603,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:416 templates/personal.php:181 +#: templates/admin.php:416 templates/personal.php:171 msgid "Version" msgstr "" -#: templates/admin.php:420 templates/personal.php:184 +#: templates/admin.php:420 templates/personal.php:174 msgid "" "Developed by the ownCloud community, the -licensed by " msgstr "" @@ -664,108 +678,108 @@ msgstr "" msgid "You have used %s of the available %s" msgstr "" -#: templates/personal.php:39 templates/users.php:21 templates/users.php:87 +#: templates/personal.php:38 templates/users.php:21 templates/users.php:87 msgid "Password" msgstr "" -#: templates/personal.php:40 +#: templates/personal.php:39 msgid "Your password was changed" msgstr "" -#: templates/personal.php:41 +#: templates/personal.php:40 msgid "Unable to change your password" msgstr "" -#: templates/personal.php:43 +#: templates/personal.php:42 msgid "Current password" msgstr "" -#: templates/personal.php:46 +#: templates/personal.php:45 msgid "New password" msgstr "" -#: templates/personal.php:50 +#: templates/personal.php:49 msgid "Change password" msgstr "" -#: templates/personal.php:64 templates/users.php:86 +#: templates/personal.php:61 templates/users.php:86 msgid "Full Name" msgstr "" -#: templates/personal.php:81 +#: templates/personal.php:76 msgid "Email" msgstr "" -#: templates/personal.php:83 +#: templates/personal.php:78 msgid "Your email address" msgstr "" -#: templates/personal.php:86 +#: templates/personal.php:81 msgid "" "Fill in an email address to enable password recovery and receive " "notifications" msgstr "" -#: templates/personal.php:96 +#: templates/personal.php:89 msgid "Profile picture" msgstr "" -#: templates/personal.php:101 +#: templates/personal.php:94 msgid "Upload new" msgstr "" -#: templates/personal.php:103 +#: templates/personal.php:96 msgid "Select new from Files" msgstr "" -#: templates/personal.php:104 +#: templates/personal.php:97 msgid "Remove image" msgstr "" -#: templates/personal.php:105 +#: templates/personal.php:98 msgid "Either png or jpg. Ideally square but you will be able to crop it." msgstr "" -#: templates/personal.php:107 +#: templates/personal.php:100 msgid "Your avatar is provided by your original account." msgstr "" -#: templates/personal.php:111 +#: templates/personal.php:104 msgid "Cancel" msgstr "" -#: templates/personal.php:112 +#: templates/personal.php:105 msgid "Choose as profile image" msgstr "" -#: templates/personal.php:120 templates/personal.php:121 +#: templates/personal.php:111 templates/personal.php:112 msgid "Language" msgstr "" -#: templates/personal.php:140 +#: templates/personal.php:131 msgid "Help translate" msgstr "" -#: templates/personal.php:147 +#: templates/personal.php:137 msgid "WebDAV" msgstr "" -#: templates/personal.php:149 +#: templates/personal.php:139 #, php-format msgid "" "Use this address to access your Files via " "WebDAV" msgstr "" -#: templates/personal.php:161 +#: templates/personal.php:151 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:167 +#: templates/personal.php:157 msgid "Log-in password" msgstr "" -#: templates/personal.php:172 +#: templates/personal.php:162 msgid "Decrypt all Files" msgstr "" diff --git a/l10n/be/user_ldap.po b/l10n/be/user_ldap.po index ba05cf01fbb..1f41c805ed0 100644 --- a/l10n/be/user_ldap.po +++ b/l10n/be/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-08 01:56-0400\n" -"PO-Revision-Date: 2014-04-08 05:56+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:55+0000\n" "Last-Translator: I Robot\n" "Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n" "MIME-Version: 1.0\n" @@ -148,7 +148,7 @@ msgstr[3] "" msgid "Invalid Host" msgstr "" -#: lib/wizard.php:963 +#: lib/wizard.php:983 msgid "Could not find the desired feature" msgstr "" @@ -339,7 +339,7 @@ msgid "Only connect to the replica server." msgstr "" #: templates/settings.php:26 -msgid "Case insensitve LDAP server (Windows)" +msgid "Case insensitive LDAP server (Windows)" msgstr "" #: templates/settings.php:27 diff --git a/l10n/bg_BG/settings.po b/l10n/bg_BG/settings.po index 1b3b08d1c86..2664120b65b 100644 --- a/l10n/bg_BG/settings.po +++ b/l10n/bg_BG/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-03-26 01:55-0400\n" -"PO-Revision-Date: 2014-03-26 05:55+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159 +#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149 msgid "Encryption" msgstr "Криптиране" @@ -64,7 +64,7 @@ msgid "Unable to load list from App Store" msgstr "" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 changepassword/controller.php:55 +#: ajax/togglegroups.php:20 changepassword/controller.php:49 msgid "Authentication error" msgstr "Възникна проблем с идентификацията" @@ -84,6 +84,20 @@ msgstr "Групата вече съществува" msgid "Unable to add group" msgstr "Невъзможно добавяне на група" +#: ajax/decryptall.php:31 +msgid "Files decrypted successfully" +msgstr "" + +#: ajax/decryptall.php:33 +msgid "" +"Couldn't decrypt your files, please check your owncloud.log or ask your " +"administrator" +msgstr "" + +#: ajax/decryptall.php:36 +msgid "Couldn't decrypt your files, check your password and try again" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "Email адреса е записан" @@ -126,32 +140,32 @@ msgstr "" msgid "Couldn't update app." msgstr "" -#: changepassword/controller.php:20 +#: changepassword/controller.php:17 msgid "Wrong password" msgstr "" -#: changepassword/controller.php:42 +#: changepassword/controller.php:36 msgid "No user supplied" msgstr "" -#: changepassword/controller.php:74 +#: changepassword/controller.php:68 msgid "" "Please provide an admin recovery password, otherwise all user data will be " "lost" msgstr "" -#: changepassword/controller.php:79 +#: changepassword/controller.php:73 msgid "" "Wrong admin recovery password. Please check the password and try again." msgstr "" -#: changepassword/controller.php:87 +#: changepassword/controller.php:81 msgid "" "Back-end doesn't support password change, but the users encryption key was " "successfully updated." msgstr "" -#: changepassword/controller.php:92 changepassword/controller.php:103 +#: changepassword/controller.php:86 changepassword/controller.php:97 msgid "Unable to change password" msgstr "" @@ -203,7 +217,7 @@ msgstr "" msgid "Error" msgstr "Грешка" -#: js/apps.js:153 templates/apps.php:54 +#: js/apps.js:153 templates/apps.php:55 msgid "Update" msgstr "Обновяване" @@ -211,31 +225,31 @@ msgstr "Обновяване" msgid "Updated" msgstr "Обновено" -#: js/personal.js:246 +#: js/personal.js:243 msgid "Select a profile picture" msgstr "" -#: js/personal.js:277 +#: js/personal.js:274 msgid "Very weak password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:275 msgid "Weak password" msgstr "" -#: js/personal.js:279 +#: js/personal.js:276 msgid "So-so password" msgstr "" -#: js/personal.js:280 +#: js/personal.js:277 msgid "Good password" msgstr "" -#: js/personal.js:281 +#: js/personal.js:278 msgid "Strong password" msgstr "" -#: js/personal.js:316 +#: js/personal.js:313 msgid "Decrypting files... Please wait, this can take some time." msgstr "" @@ -284,7 +298,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:49 personal.php:50 +#: personal.php:48 personal.php:49 msgid "__language_name__" msgstr "__language_name__" @@ -589,11 +603,11 @@ msgstr "Още" msgid "Less" msgstr "По-малко" -#: templates/admin.php:416 templates/personal.php:181 +#: templates/admin.php:416 templates/personal.php:171 msgid "Version" msgstr "Версия" -#: templates/admin.php:420 templates/personal.php:184 +#: templates/admin.php:420 templates/personal.php:174 msgid "" "Developed by the ownCloud community, the -licensed by " msgstr "" @@ -664,108 +678,108 @@ msgstr "Покажи настройките за първоначално зар msgid "You have used %s of the available %s" msgstr "" -#: templates/personal.php:39 templates/users.php:21 templates/users.php:87 +#: templates/personal.php:38 templates/users.php:21 templates/users.php:87 msgid "Password" msgstr "Парола" -#: templates/personal.php:40 +#: templates/personal.php:39 msgid "Your password was changed" msgstr "" -#: templates/personal.php:41 +#: templates/personal.php:40 msgid "Unable to change your password" msgstr "Промяната на паролата не беше извършена" -#: templates/personal.php:43 +#: templates/personal.php:42 msgid "Current password" msgstr "Текуща парола" -#: templates/personal.php:46 +#: templates/personal.php:45 msgid "New password" msgstr "Нова парола" -#: templates/personal.php:50 +#: templates/personal.php:49 msgid "Change password" msgstr "Промяна на паролата" -#: templates/personal.php:64 templates/users.php:86 +#: templates/personal.php:61 templates/users.php:86 msgid "Full Name" msgstr "" -#: templates/personal.php:81 +#: templates/personal.php:76 msgid "Email" msgstr "E-mail" -#: templates/personal.php:83 +#: templates/personal.php:78 msgid "Your email address" msgstr "Вашия email адрес" -#: templates/personal.php:86 +#: templates/personal.php:81 msgid "" "Fill in an email address to enable password recovery and receive " "notifications" msgstr "" -#: templates/personal.php:96 +#: templates/personal.php:89 msgid "Profile picture" msgstr "" -#: templates/personal.php:101 +#: templates/personal.php:94 msgid "Upload new" msgstr "" -#: templates/personal.php:103 +#: templates/personal.php:96 msgid "Select new from Files" msgstr "" -#: templates/personal.php:104 +#: templates/personal.php:97 msgid "Remove image" msgstr "" -#: templates/personal.php:105 +#: templates/personal.php:98 msgid "Either png or jpg. Ideally square but you will be able to crop it." msgstr "" -#: templates/personal.php:107 +#: templates/personal.php:100 msgid "Your avatar is provided by your original account." msgstr "" -#: templates/personal.php:111 +#: templates/personal.php:104 msgid "Cancel" msgstr "Отказ" -#: templates/personal.php:112 +#: templates/personal.php:105 msgid "Choose as profile image" msgstr "" -#: templates/personal.php:120 templates/personal.php:121 +#: templates/personal.php:111 templates/personal.php:112 msgid "Language" msgstr "Език" -#: templates/personal.php:140 +#: templates/personal.php:131 msgid "Help translate" msgstr "Помогнете с превода" -#: templates/personal.php:147 +#: templates/personal.php:137 msgid "WebDAV" msgstr "WebDAV" -#: templates/personal.php:149 +#: templates/personal.php:139 #, php-format msgid "" "Use this address to access your Files via " "WebDAV" msgstr "" -#: templates/personal.php:161 +#: templates/personal.php:151 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:167 +#: templates/personal.php:157 msgid "Log-in password" msgstr "" -#: templates/personal.php:172 +#: templates/personal.php:162 msgid "Decrypt all Files" msgstr "" diff --git a/l10n/bg_BG/user_ldap.po b/l10n/bg_BG/user_ldap.po index 240293f936f..8d6fc125002 100644 --- a/l10n/bg_BG/user_ldap.po +++ b/l10n/bg_BG/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-08 01:56-0400\n" -"PO-Revision-Date: 2014-04-08 05:56+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:55+0000\n" "Last-Translator: I Robot\n" "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n" "MIME-Version: 1.0\n" @@ -144,7 +144,7 @@ msgstr[1] "" msgid "Invalid Host" msgstr "" -#: lib/wizard.php:963 +#: lib/wizard.php:983 msgid "Could not find the desired feature" msgstr "" @@ -335,7 +335,7 @@ msgid "Only connect to the replica server." msgstr "" #: templates/settings.php:26 -msgid "Case insensitve LDAP server (Windows)" +msgid "Case insensitive LDAP server (Windows)" msgstr "" #: templates/settings.php:27 diff --git a/l10n/bn_BD/settings.po b/l10n/bn_BD/settings.po index 6262dfa6513..714eea5d5db 100644 --- a/l10n/bn_BD/settings.po +++ b/l10n/bn_BD/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-03-26 01:55-0400\n" -"PO-Revision-Date: 2014-03-26 05:55+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159 +#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149 msgid "Encryption" msgstr "সংকেতায়ন" @@ -64,7 +64,7 @@ msgid "Unable to load list from App Store" msgstr "অ্যাপস্টোর থেকে তালিকা লোড করতে সক্ষম নয়" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 changepassword/controller.php:55 +#: ajax/togglegroups.php:20 changepassword/controller.php:49 msgid "Authentication error" msgstr "অনুমোদন ঘটিত সমস্যা" @@ -84,6 +84,20 @@ msgstr "গোষ্ঠীটি পূর্ব থেকেই বিদ্য msgid "Unable to add group" msgstr "গোষ্ঠী যোগ করা সম্ভব হলো না" +#: ajax/decryptall.php:31 +msgid "Files decrypted successfully" +msgstr "" + +#: ajax/decryptall.php:33 +msgid "" +"Couldn't decrypt your files, please check your owncloud.log or ask your " +"administrator" +msgstr "" + +#: ajax/decryptall.php:36 +msgid "Couldn't decrypt your files, check your password and try again" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "ই-মেইল সংরক্ষন করা হয়েছে" @@ -126,32 +140,32 @@ msgstr "%s গোষ্ঠী থেকে ব্যবহারকারীক msgid "Couldn't update app." msgstr "" -#: changepassword/controller.php:20 +#: changepassword/controller.php:17 msgid "Wrong password" msgstr "" -#: changepassword/controller.php:42 +#: changepassword/controller.php:36 msgid "No user supplied" msgstr "" -#: changepassword/controller.php:74 +#: changepassword/controller.php:68 msgid "" "Please provide an admin recovery password, otherwise all user data will be " "lost" msgstr "" -#: changepassword/controller.php:79 +#: changepassword/controller.php:73 msgid "" "Wrong admin recovery password. Please check the password and try again." msgstr "" -#: changepassword/controller.php:87 +#: changepassword/controller.php:81 msgid "" "Back-end doesn't support password change, but the users encryption key was " "successfully updated." msgstr "" -#: changepassword/controller.php:92 changepassword/controller.php:103 +#: changepassword/controller.php:86 changepassword/controller.php:97 msgid "Unable to change password" msgstr "" @@ -203,7 +217,7 @@ msgstr "" msgid "Error" msgstr "সমস্যা" -#: js/apps.js:153 templates/apps.php:54 +#: js/apps.js:153 templates/apps.php:55 msgid "Update" msgstr "পরিবর্ধন" @@ -211,31 +225,31 @@ msgstr "পরিবর্ধন" msgid "Updated" msgstr "" -#: js/personal.js:246 +#: js/personal.js:243 msgid "Select a profile picture" msgstr "" -#: js/personal.js:277 +#: js/personal.js:274 msgid "Very weak password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:275 msgid "Weak password" msgstr "" -#: js/personal.js:279 +#: js/personal.js:276 msgid "So-so password" msgstr "" -#: js/personal.js:280 +#: js/personal.js:277 msgid "Good password" msgstr "" -#: js/personal.js:281 +#: js/personal.js:278 msgid "Strong password" msgstr "" -#: js/personal.js:316 +#: js/personal.js:313 msgid "Decrypting files... Please wait, this can take some time." msgstr "" @@ -284,7 +298,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:49 personal.php:50 +#: personal.php:48 personal.php:49 msgid "__language_name__" msgstr "__language_name__" @@ -589,11 +603,11 @@ msgstr "বেশী" msgid "Less" msgstr "কম" -#: templates/admin.php:416 templates/personal.php:181 +#: templates/admin.php:416 templates/personal.php:171 msgid "Version" msgstr "ভার্সন" -#: templates/admin.php:420 templates/personal.php:184 +#: templates/admin.php:420 templates/personal.php:174 msgid "" "Developed by the ownCloud community, the -licensed by " msgstr "-লাইসেন্সধারী " @@ -664,108 +678,108 @@ msgstr "প্রথমবার চালানোর যাদুকর পূ msgid "You have used %s of the available %s" msgstr "আপনি ব্যবহার করছেন %s, সুলভ %s এর মধ্যে।" -#: templates/personal.php:39 templates/users.php:21 templates/users.php:87 +#: templates/personal.php:38 templates/users.php:21 templates/users.php:87 msgid "Password" msgstr "কূটশব্দ" -#: templates/personal.php:40 +#: templates/personal.php:39 msgid "Your password was changed" msgstr "আপনার কূটশব্দটি পরিবর্তন করা হয়েছে " -#: templates/personal.php:41 +#: templates/personal.php:40 msgid "Unable to change your password" msgstr "আপনার কূটশব্দটি পরিবর্তন করতে সক্ষম নয়" -#: templates/personal.php:43 +#: templates/personal.php:42 msgid "Current password" msgstr "বর্তমান কূটশব্দ" -#: templates/personal.php:46 +#: templates/personal.php:45 msgid "New password" msgstr "নতুন কূটশব্দ" -#: templates/personal.php:50 +#: templates/personal.php:49 msgid "Change password" msgstr "কূটশব্দ পরিবর্তন করুন" -#: templates/personal.php:64 templates/users.php:86 +#: templates/personal.php:61 templates/users.php:86 msgid "Full Name" msgstr "" -#: templates/personal.php:81 +#: templates/personal.php:76 msgid "Email" msgstr "ইমেইল" -#: templates/personal.php:83 +#: templates/personal.php:78 msgid "Your email address" msgstr "আপনার ই-মেইল ঠিকানা" -#: templates/personal.php:86 +#: templates/personal.php:81 msgid "" "Fill in an email address to enable password recovery and receive " "notifications" msgstr "" -#: templates/personal.php:96 +#: templates/personal.php:89 msgid "Profile picture" msgstr "" -#: templates/personal.php:101 +#: templates/personal.php:94 msgid "Upload new" msgstr "" -#: templates/personal.php:103 +#: templates/personal.php:96 msgid "Select new from Files" msgstr "" -#: templates/personal.php:104 +#: templates/personal.php:97 msgid "Remove image" msgstr "" -#: templates/personal.php:105 +#: templates/personal.php:98 msgid "Either png or jpg. Ideally square but you will be able to crop it." msgstr "" -#: templates/personal.php:107 +#: templates/personal.php:100 msgid "Your avatar is provided by your original account." msgstr "" -#: templates/personal.php:111 +#: templates/personal.php:104 msgid "Cancel" msgstr "বাতির" -#: templates/personal.php:112 +#: templates/personal.php:105 msgid "Choose as profile image" msgstr "" -#: templates/personal.php:120 templates/personal.php:121 +#: templates/personal.php:111 templates/personal.php:112 msgid "Language" msgstr "ভাষা" -#: templates/personal.php:140 +#: templates/personal.php:131 msgid "Help translate" msgstr "অনুবাদ করতে সহায়তা করুন" -#: templates/personal.php:147 +#: templates/personal.php:137 msgid "WebDAV" msgstr "WebDAV" -#: templates/personal.php:149 +#: templates/personal.php:139 #, php-format msgid "" "Use this address to access your Files via " "WebDAV" msgstr "" -#: templates/personal.php:161 +#: templates/personal.php:151 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:167 +#: templates/personal.php:157 msgid "Log-in password" msgstr "" -#: templates/personal.php:172 +#: templates/personal.php:162 msgid "Decrypt all Files" msgstr "" diff --git a/l10n/bn_BD/user_ldap.po b/l10n/bn_BD/user_ldap.po index 4c9a205b7bf..fc175fe7b19 100644 --- a/l10n/bn_BD/user_ldap.po +++ b/l10n/bn_BD/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-08 01:56-0400\n" -"PO-Revision-Date: 2014-04-08 05:56+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:55+0000\n" "Last-Translator: I Robot\n" "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n" "MIME-Version: 1.0\n" @@ -144,7 +144,7 @@ msgstr[1] "" msgid "Invalid Host" msgstr "" -#: lib/wizard.php:963 +#: lib/wizard.php:983 msgid "Could not find the desired feature" msgstr "" @@ -335,8 +335,8 @@ msgid "Only connect to the replica server." msgstr "" #: templates/settings.php:26 -msgid "Case insensitve LDAP server (Windows)" -msgstr "বর্ণ অসংবেদী LDAP সার্ভার (উইন্ডোজ)" +msgid "Case insensitive LDAP server (Windows)" +msgstr "" #: templates/settings.php:27 msgid "Turn off SSL certificate validation." diff --git a/l10n/bs/settings.po b/l10n/bs/settings.po index 42c0053daf9..8ec5e987328 100644 --- a/l10n/bs/settings.po +++ b/l10n/bs/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-03-26 01:55-0400\n" -"PO-Revision-Date: 2014-03-26 05:55+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Bosnian (http://www.transifex.com/projects/p/owncloud/language/bs/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159 +#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149 msgid "Encryption" msgstr "" @@ -64,7 +64,7 @@ msgid "Unable to load list from App Store" msgstr "" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 changepassword/controller.php:55 +#: ajax/togglegroups.php:20 changepassword/controller.php:49 msgid "Authentication error" msgstr "" @@ -84,6 +84,20 @@ msgstr "" msgid "Unable to add group" msgstr "" +#: ajax/decryptall.php:31 +msgid "Files decrypted successfully" +msgstr "" + +#: ajax/decryptall.php:33 +msgid "" +"Couldn't decrypt your files, please check your owncloud.log or ask your " +"administrator" +msgstr "" + +#: ajax/decryptall.php:36 +msgid "Couldn't decrypt your files, check your password and try again" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -126,32 +140,32 @@ msgstr "" msgid "Couldn't update app." msgstr "" -#: changepassword/controller.php:20 +#: changepassword/controller.php:17 msgid "Wrong password" msgstr "" -#: changepassword/controller.php:42 +#: changepassword/controller.php:36 msgid "No user supplied" msgstr "" -#: changepassword/controller.php:74 +#: changepassword/controller.php:68 msgid "" "Please provide an admin recovery password, otherwise all user data will be " "lost" msgstr "" -#: changepassword/controller.php:79 +#: changepassword/controller.php:73 msgid "" "Wrong admin recovery password. Please check the password and try again." msgstr "" -#: changepassword/controller.php:87 +#: changepassword/controller.php:81 msgid "" "Back-end doesn't support password change, but the users encryption key was " "successfully updated." msgstr "" -#: changepassword/controller.php:92 changepassword/controller.php:103 +#: changepassword/controller.php:86 changepassword/controller.php:97 msgid "Unable to change password" msgstr "" @@ -203,7 +217,7 @@ msgstr "" msgid "Error" msgstr "" -#: js/apps.js:153 templates/apps.php:54 +#: js/apps.js:153 templates/apps.php:55 msgid "Update" msgstr "" @@ -211,31 +225,31 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:246 +#: js/personal.js:243 msgid "Select a profile picture" msgstr "" -#: js/personal.js:277 +#: js/personal.js:274 msgid "Very weak password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:275 msgid "Weak password" msgstr "" -#: js/personal.js:279 +#: js/personal.js:276 msgid "So-so password" msgstr "" -#: js/personal.js:280 +#: js/personal.js:277 msgid "Good password" msgstr "" -#: js/personal.js:281 +#: js/personal.js:278 msgid "Strong password" msgstr "" -#: js/personal.js:316 +#: js/personal.js:313 msgid "Decrypting files... Please wait, this can take some time." msgstr "" @@ -284,7 +298,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:49 personal.php:50 +#: personal.php:48 personal.php:49 msgid "__language_name__" msgstr "" @@ -589,11 +603,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:416 templates/personal.php:181 +#: templates/admin.php:416 templates/personal.php:171 msgid "Version" msgstr "" -#: templates/admin.php:420 templates/personal.php:184 +#: templates/admin.php:420 templates/personal.php:174 msgid "" "Developed by the ownCloud community, the -licensed by " msgstr "" @@ -664,108 +678,108 @@ msgstr "" msgid "You have used %s of the available %s" msgstr "" -#: templates/personal.php:39 templates/users.php:21 templates/users.php:87 +#: templates/personal.php:38 templates/users.php:21 templates/users.php:87 msgid "Password" msgstr "" -#: templates/personal.php:40 +#: templates/personal.php:39 msgid "Your password was changed" msgstr "" -#: templates/personal.php:41 +#: templates/personal.php:40 msgid "Unable to change your password" msgstr "" -#: templates/personal.php:43 +#: templates/personal.php:42 msgid "Current password" msgstr "" -#: templates/personal.php:46 +#: templates/personal.php:45 msgid "New password" msgstr "" -#: templates/personal.php:50 +#: templates/personal.php:49 msgid "Change password" msgstr "" -#: templates/personal.php:64 templates/users.php:86 +#: templates/personal.php:61 templates/users.php:86 msgid "Full Name" msgstr "" -#: templates/personal.php:81 +#: templates/personal.php:76 msgid "Email" msgstr "" -#: templates/personal.php:83 +#: templates/personal.php:78 msgid "Your email address" msgstr "" -#: templates/personal.php:86 +#: templates/personal.php:81 msgid "" "Fill in an email address to enable password recovery and receive " "notifications" msgstr "" -#: templates/personal.php:96 +#: templates/personal.php:89 msgid "Profile picture" msgstr "" -#: templates/personal.php:101 +#: templates/personal.php:94 msgid "Upload new" msgstr "" -#: templates/personal.php:103 +#: templates/personal.php:96 msgid "Select new from Files" msgstr "" -#: templates/personal.php:104 +#: templates/personal.php:97 msgid "Remove image" msgstr "" -#: templates/personal.php:105 +#: templates/personal.php:98 msgid "Either png or jpg. Ideally square but you will be able to crop it." msgstr "" -#: templates/personal.php:107 +#: templates/personal.php:100 msgid "Your avatar is provided by your original account." msgstr "" -#: templates/personal.php:111 +#: templates/personal.php:104 msgid "Cancel" msgstr "" -#: templates/personal.php:112 +#: templates/personal.php:105 msgid "Choose as profile image" msgstr "" -#: templates/personal.php:120 templates/personal.php:121 +#: templates/personal.php:111 templates/personal.php:112 msgid "Language" msgstr "" -#: templates/personal.php:140 +#: templates/personal.php:131 msgid "Help translate" msgstr "" -#: templates/personal.php:147 +#: templates/personal.php:137 msgid "WebDAV" msgstr "" -#: templates/personal.php:149 +#: templates/personal.php:139 #, php-format msgid "" "Use this address to access your Files via " "WebDAV" msgstr "" -#: templates/personal.php:161 +#: templates/personal.php:151 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:167 +#: templates/personal.php:157 msgid "Log-in password" msgstr "" -#: templates/personal.php:172 +#: templates/personal.php:162 msgid "Decrypt all Files" msgstr "" diff --git a/l10n/bs/user_ldap.po b/l10n/bs/user_ldap.po index b4625092d33..e1eafb2bda3 100644 --- a/l10n/bs/user_ldap.po +++ b/l10n/bs/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-08 01:56-0400\n" -"PO-Revision-Date: 2014-04-08 05:56+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:55+0000\n" "Last-Translator: I Robot\n" "Language-Team: Bosnian (http://www.transifex.com/projects/p/owncloud/language/bs/)\n" "MIME-Version: 1.0\n" @@ -146,7 +146,7 @@ msgstr[2] "" msgid "Invalid Host" msgstr "" -#: lib/wizard.php:963 +#: lib/wizard.php:983 msgid "Could not find the desired feature" msgstr "" @@ -337,7 +337,7 @@ msgid "Only connect to the replica server." msgstr "" #: templates/settings.php:26 -msgid "Case insensitve LDAP server (Windows)" +msgid "Case insensitive LDAP server (Windows)" msgstr "" #: templates/settings.php:27 diff --git a/l10n/ca/settings.po b/l10n/ca/settings.po index ec8cf451845..7ffe58d8430 100644 --- a/l10n/ca/settings.po +++ b/l10n/ca/settings.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-10 01:54-0400\n" -"PO-Revision-Date: 2014-04-09 06:10+0000\n" -"Last-Translator: Josep Torné \n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:54+0000\n" +"Last-Translator: I Robot\n" "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -87,6 +87,20 @@ msgstr "El grup ja existeix" msgid "Unable to add group" msgstr "No es pot afegir el grup" +#: ajax/decryptall.php:31 +msgid "Files decrypted successfully" +msgstr "" + +#: ajax/decryptall.php:33 +msgid "" +"Couldn't decrypt your files, please check your owncloud.log or ask your " +"administrator" +msgstr "" + +#: ajax/decryptall.php:36 +msgid "Couldn't decrypt your files, check your password and try again" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "S'ha desat el correu electrònic" diff --git a/l10n/ca/user_ldap.po b/l10n/ca/user_ldap.po index 30ed5e7f450..aef03207a47 100644 --- a/l10n/ca/user_ldap.po +++ b/l10n/ca/user_ldap.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-08 01:56-0400\n" -"PO-Revision-Date: 2014-04-08 05:56+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:55+0000\n" "Last-Translator: I Robot\n" "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n" "MIME-Version: 1.0\n" @@ -147,7 +147,7 @@ msgstr[1] "S'han trobat %s usuaris" msgid "Invalid Host" msgstr "Ordinador central no vàlid" -#: lib/wizard.php:963 +#: lib/wizard.php:983 msgid "Could not find the desired feature" msgstr "La característica desitjada no s'ha trobat" @@ -338,8 +338,8 @@ msgid "Only connect to the replica server." msgstr "Connecta només al servidor rèplica." #: templates/settings.php:26 -msgid "Case insensitve LDAP server (Windows)" -msgstr "Servidor LDAP sense distinció entre majúscules i minúscules (Windows)" +msgid "Case insensitive LDAP server (Windows)" +msgstr "" #: templates/settings.php:27 msgid "Turn off SSL certificate validation." diff --git a/l10n/cs_CZ/settings.po b/l10n/cs_CZ/settings.po index b9a259d6d43..bec55e22dce 100644 --- a/l10n/cs_CZ/settings.po +++ b/l10n/cs_CZ/settings.po @@ -14,9 +14,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-10 01:54-0400\n" -"PO-Revision-Date: 2014-04-09 06:10+0000\n" -"Last-Translator: m23 \n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:54+0000\n" +"Last-Translator: I Robot\n" "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -91,6 +91,20 @@ msgstr "Skupina již existuje" msgid "Unable to add group" msgstr "Nelze přidat skupinu" +#: ajax/decryptall.php:31 +msgid "Files decrypted successfully" +msgstr "" + +#: ajax/decryptall.php:33 +msgid "" +"Couldn't decrypt your files, please check your owncloud.log or ask your " +"administrator" +msgstr "" + +#: ajax/decryptall.php:36 +msgid "Couldn't decrypt your files, check your password and try again" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "E-mail uložen" diff --git a/l10n/cs_CZ/user_ldap.po b/l10n/cs_CZ/user_ldap.po index c2845ec7a58..43b906dd51f 100644 --- a/l10n/cs_CZ/user_ldap.po +++ b/l10n/cs_CZ/user_ldap.po @@ -13,8 +13,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-08 01:56-0400\n" -"PO-Revision-Date: 2014-04-08 05:56+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:55+0000\n" "Last-Translator: I Robot\n" "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n" "MIME-Version: 1.0\n" @@ -152,7 +152,7 @@ msgstr[2] "nalezeno %s uživatelů" msgid "Invalid Host" msgstr "Neplatný hostitel" -#: lib/wizard.php:963 +#: lib/wizard.php:983 msgid "Could not find the desired feature" msgstr "Nelze nalézt požadovanou vlastnost" @@ -343,8 +343,8 @@ msgid "Only connect to the replica server." msgstr "Připojit jen k záložnímu serveru." #: templates/settings.php:26 -msgid "Case insensitve LDAP server (Windows)" -msgstr "LDAP server nerozlišující velikost znaků (Windows)" +msgid "Case insensitive LDAP server (Windows)" +msgstr "" #: templates/settings.php:27 msgid "Turn off SSL certificate validation." diff --git a/l10n/cy_GB/settings.po b/l10n/cy_GB/settings.po index d9646c0cc2e..b87749dd3cc 100644 --- a/l10n/cy_GB/settings.po +++ b/l10n/cy_GB/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-03-26 01:55-0400\n" -"PO-Revision-Date: 2014-03-26 05:55+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159 +#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149 msgid "Encryption" msgstr "Amgryptiad" @@ -64,7 +64,7 @@ msgid "Unable to load list from App Store" msgstr "" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 changepassword/controller.php:55 +#: ajax/togglegroups.php:20 changepassword/controller.php:49 msgid "Authentication error" msgstr "Gwall dilysu" @@ -84,6 +84,20 @@ msgstr "" msgid "Unable to add group" msgstr "" +#: ajax/decryptall.php:31 +msgid "Files decrypted successfully" +msgstr "" + +#: ajax/decryptall.php:33 +msgid "" +"Couldn't decrypt your files, please check your owncloud.log or ask your " +"administrator" +msgstr "" + +#: ajax/decryptall.php:36 +msgid "Couldn't decrypt your files, check your password and try again" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -126,32 +140,32 @@ msgstr "" msgid "Couldn't update app." msgstr "" -#: changepassword/controller.php:20 +#: changepassword/controller.php:17 msgid "Wrong password" msgstr "" -#: changepassword/controller.php:42 +#: changepassword/controller.php:36 msgid "No user supplied" msgstr "" -#: changepassword/controller.php:74 +#: changepassword/controller.php:68 msgid "" "Please provide an admin recovery password, otherwise all user data will be " "lost" msgstr "" -#: changepassword/controller.php:79 +#: changepassword/controller.php:73 msgid "" "Wrong admin recovery password. Please check the password and try again." msgstr "" -#: changepassword/controller.php:87 +#: changepassword/controller.php:81 msgid "" "Back-end doesn't support password change, but the users encryption key was " "successfully updated." msgstr "" -#: changepassword/controller.php:92 changepassword/controller.php:103 +#: changepassword/controller.php:86 changepassword/controller.php:97 msgid "Unable to change password" msgstr "" @@ -203,7 +217,7 @@ msgstr "" msgid "Error" msgstr "Gwall" -#: js/apps.js:153 templates/apps.php:54 +#: js/apps.js:153 templates/apps.php:55 msgid "Update" msgstr "" @@ -211,31 +225,31 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:246 +#: js/personal.js:243 msgid "Select a profile picture" msgstr "" -#: js/personal.js:277 +#: js/personal.js:274 msgid "Very weak password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:275 msgid "Weak password" msgstr "" -#: js/personal.js:279 +#: js/personal.js:276 msgid "So-so password" msgstr "" -#: js/personal.js:280 +#: js/personal.js:277 msgid "Good password" msgstr "" -#: js/personal.js:281 +#: js/personal.js:278 msgid "Strong password" msgstr "" -#: js/personal.js:316 +#: js/personal.js:313 msgid "Decrypting files... Please wait, this can take some time." msgstr "" @@ -284,7 +298,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:49 personal.php:50 +#: personal.php:48 personal.php:49 msgid "__language_name__" msgstr "" @@ -589,11 +603,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:416 templates/personal.php:181 +#: templates/admin.php:416 templates/personal.php:171 msgid "Version" msgstr "" -#: templates/admin.php:420 templates/personal.php:184 +#: templates/admin.php:420 templates/personal.php:174 msgid "" "Developed by the ownCloud community, the -licensed by " msgstr "" @@ -664,108 +678,108 @@ msgstr "" msgid "You have used %s of the available %s" msgstr "" -#: templates/personal.php:39 templates/users.php:21 templates/users.php:87 +#: templates/personal.php:38 templates/users.php:21 templates/users.php:87 msgid "Password" msgstr "Cyfrinair" -#: templates/personal.php:40 +#: templates/personal.php:39 msgid "Your password was changed" msgstr "" -#: templates/personal.php:41 +#: templates/personal.php:40 msgid "Unable to change your password" msgstr "" -#: templates/personal.php:43 +#: templates/personal.php:42 msgid "Current password" msgstr "" -#: templates/personal.php:46 +#: templates/personal.php:45 msgid "New password" msgstr "Cyfrinair newydd" -#: templates/personal.php:50 +#: templates/personal.php:49 msgid "Change password" msgstr "" -#: templates/personal.php:64 templates/users.php:86 +#: templates/personal.php:61 templates/users.php:86 msgid "Full Name" msgstr "" -#: templates/personal.php:81 +#: templates/personal.php:76 msgid "Email" msgstr "E-bost" -#: templates/personal.php:83 +#: templates/personal.php:78 msgid "Your email address" msgstr "" -#: templates/personal.php:86 +#: templates/personal.php:81 msgid "" "Fill in an email address to enable password recovery and receive " "notifications" msgstr "" -#: templates/personal.php:96 +#: templates/personal.php:89 msgid "Profile picture" msgstr "" -#: templates/personal.php:101 +#: templates/personal.php:94 msgid "Upload new" msgstr "" -#: templates/personal.php:103 +#: templates/personal.php:96 msgid "Select new from Files" msgstr "" -#: templates/personal.php:104 +#: templates/personal.php:97 msgid "Remove image" msgstr "" -#: templates/personal.php:105 +#: templates/personal.php:98 msgid "Either png or jpg. Ideally square but you will be able to crop it." msgstr "" -#: templates/personal.php:107 +#: templates/personal.php:100 msgid "Your avatar is provided by your original account." msgstr "" -#: templates/personal.php:111 +#: templates/personal.php:104 msgid "Cancel" msgstr "Diddymu" -#: templates/personal.php:112 +#: templates/personal.php:105 msgid "Choose as profile image" msgstr "" -#: templates/personal.php:120 templates/personal.php:121 +#: templates/personal.php:111 templates/personal.php:112 msgid "Language" msgstr "" -#: templates/personal.php:140 +#: templates/personal.php:131 msgid "Help translate" msgstr "" -#: templates/personal.php:147 +#: templates/personal.php:137 msgid "WebDAV" msgstr "" -#: templates/personal.php:149 +#: templates/personal.php:139 #, php-format msgid "" "Use this address to access your Files via " "WebDAV" msgstr "" -#: templates/personal.php:161 +#: templates/personal.php:151 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:167 +#: templates/personal.php:157 msgid "Log-in password" msgstr "" -#: templates/personal.php:172 +#: templates/personal.php:162 msgid "Decrypt all Files" msgstr "" diff --git a/l10n/cy_GB/user_ldap.po b/l10n/cy_GB/user_ldap.po index e7a8c333fd3..63aa7c5f7f0 100644 --- a/l10n/cy_GB/user_ldap.po +++ b/l10n/cy_GB/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-08 01:56-0400\n" -"PO-Revision-Date: 2014-04-08 05:56+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:55+0000\n" "Last-Translator: I Robot\n" "Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n" "MIME-Version: 1.0\n" @@ -148,7 +148,7 @@ msgstr[3] "" msgid "Invalid Host" msgstr "" -#: lib/wizard.php:963 +#: lib/wizard.php:983 msgid "Could not find the desired feature" msgstr "" @@ -339,7 +339,7 @@ msgid "Only connect to the replica server." msgstr "" #: templates/settings.php:26 -msgid "Case insensitve LDAP server (Windows)" +msgid "Case insensitive LDAP server (Windows)" msgstr "" #: templates/settings.php:27 diff --git a/l10n/da/settings.po b/l10n/da/settings.po index 2841b8d5188..9ca89c1f9f6 100644 --- a/l10n/da/settings.po +++ b/l10n/da/settings.po @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-10 01:54-0400\n" -"PO-Revision-Date: 2014-04-09 06:10+0000\n" -"Last-Translator: Sappe\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:54+0000\n" +"Last-Translator: I Robot\n" "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -88,6 +88,20 @@ msgstr "Gruppen findes allerede" msgid "Unable to add group" msgstr "Gruppen kan ikke oprettes" +#: ajax/decryptall.php:31 +msgid "Files decrypted successfully" +msgstr "" + +#: ajax/decryptall.php:33 +msgid "" +"Couldn't decrypt your files, please check your owncloud.log or ask your " +"administrator" +msgstr "" + +#: ajax/decryptall.php:36 +msgid "Couldn't decrypt your files, check your password and try again" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "Email adresse gemt" diff --git a/l10n/da/user_ldap.po b/l10n/da/user_ldap.po index d97bda300db..0ad1952c0f8 100644 --- a/l10n/da/user_ldap.po +++ b/l10n/da/user_ldap.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-08 01:56-0400\n" -"PO-Revision-Date: 2014-04-08 05:56+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:55+0000\n" "Last-Translator: I Robot\n" "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n" "MIME-Version: 1.0\n" @@ -145,7 +145,7 @@ msgstr[1] "" msgid "Invalid Host" msgstr "" -#: lib/wizard.php:963 +#: lib/wizard.php:983 msgid "Could not find the desired feature" msgstr "" @@ -336,8 +336,8 @@ msgid "Only connect to the replica server." msgstr "Forbind kun til replika serveren." #: templates/settings.php:26 -msgid "Case insensitve LDAP server (Windows)" -msgstr "Ikke versalfølsom LDAP server (Windows)" +msgid "Case insensitive LDAP server (Windows)" +msgstr "" #: templates/settings.php:27 msgid "Turn off SSL certificate validation." diff --git a/l10n/de/settings.po b/l10n/de/settings.po index bee681657b5..36bbb05b66f 100644 --- a/l10n/de/settings.po +++ b/l10n/de/settings.po @@ -16,9 +16,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-10 01:54-0400\n" -"PO-Revision-Date: 2014-04-09 06:10+0000\n" -"Last-Translator: kabum \n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:54+0000\n" +"Last-Translator: I Robot\n" "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -93,6 +93,20 @@ msgstr "Gruppe existiert bereits" msgid "Unable to add group" msgstr "Gruppe konnte nicht angelegt werden" +#: ajax/decryptall.php:31 +msgid "Files decrypted successfully" +msgstr "" + +#: ajax/decryptall.php:33 +msgid "" +"Couldn't decrypt your files, please check your owncloud.log or ask your " +"administrator" +msgstr "" + +#: ajax/decryptall.php:36 +msgid "Couldn't decrypt your files, check your password and try again" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "E-Mail Adresse gespeichert" diff --git a/l10n/de/user_ldap.po b/l10n/de/user_ldap.po index 527d5f8dce6..a91c8c7e8ef 100644 --- a/l10n/de/user_ldap.po +++ b/l10n/de/user_ldap.po @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-11 01:54-0400\n" -"PO-Revision-Date: 2014-04-10 18:40+0000\n" -"Last-Translator: Mario Siegmann \n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:55+0000\n" +"Last-Translator: I Robot\n" "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -339,8 +339,8 @@ msgid "Only connect to the replica server." msgstr "Nur zum Replikat-Server verbinden." #: templates/settings.php:26 -msgid "Case insensitve LDAP server (Windows)" -msgstr "LDAP-Server (Windows: Groß- und Kleinschreibung bleibt unbeachtet)" +msgid "Case insensitive LDAP server (Windows)" +msgstr "" #: templates/settings.php:27 msgid "Turn off SSL certificate validation." diff --git a/l10n/de_AT/settings.po b/l10n/de_AT/settings.po index 567f670a464..83997bae597 100644 --- a/l10n/de_AT/settings.po +++ b/l10n/de_AT/settings.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-03-26 01:55-0400\n" -"PO-Revision-Date: 2014-03-26 05:55+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: German (Austria) (http://www.transifex.com/projects/p/owncloud/language/de_AT/)\n" "MIME-Version: 1.0\n" @@ -52,7 +52,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159 +#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149 msgid "Encryption" msgstr "" @@ -65,7 +65,7 @@ msgid "Unable to load list from App Store" msgstr "" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 changepassword/controller.php:55 +#: ajax/togglegroups.php:20 changepassword/controller.php:49 msgid "Authentication error" msgstr "" @@ -85,6 +85,20 @@ msgstr "" msgid "Unable to add group" msgstr "" +#: ajax/decryptall.php:31 +msgid "Files decrypted successfully" +msgstr "" + +#: ajax/decryptall.php:33 +msgid "" +"Couldn't decrypt your files, please check your owncloud.log or ask your " +"administrator" +msgstr "" + +#: ajax/decryptall.php:36 +msgid "Couldn't decrypt your files, check your password and try again" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -127,32 +141,32 @@ msgstr "" msgid "Couldn't update app." msgstr "" -#: changepassword/controller.php:20 +#: changepassword/controller.php:17 msgid "Wrong password" msgstr "" -#: changepassword/controller.php:42 +#: changepassword/controller.php:36 msgid "No user supplied" msgstr "" -#: changepassword/controller.php:74 +#: changepassword/controller.php:68 msgid "" "Please provide an admin recovery password, otherwise all user data will be " "lost" msgstr "" -#: changepassword/controller.php:79 +#: changepassword/controller.php:73 msgid "" "Wrong admin recovery password. Please check the password and try again." msgstr "" -#: changepassword/controller.php:87 +#: changepassword/controller.php:81 msgid "" "Back-end doesn't support password change, but the users encryption key was " "successfully updated." msgstr "" -#: changepassword/controller.php:92 changepassword/controller.php:103 +#: changepassword/controller.php:86 changepassword/controller.php:97 msgid "Unable to change password" msgstr "" @@ -204,7 +218,7 @@ msgstr "" msgid "Error" msgstr "" -#: js/apps.js:153 templates/apps.php:54 +#: js/apps.js:153 templates/apps.php:55 msgid "Update" msgstr "" @@ -212,31 +226,31 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:246 +#: js/personal.js:243 msgid "Select a profile picture" msgstr "" -#: js/personal.js:277 +#: js/personal.js:274 msgid "Very weak password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:275 msgid "Weak password" msgstr "" -#: js/personal.js:279 +#: js/personal.js:276 msgid "So-so password" msgstr "" -#: js/personal.js:280 +#: js/personal.js:277 msgid "Good password" msgstr "" -#: js/personal.js:281 +#: js/personal.js:278 msgid "Strong password" msgstr "" -#: js/personal.js:316 +#: js/personal.js:313 msgid "Decrypting files... Please wait, this can take some time." msgstr "" @@ -285,7 +299,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:49 personal.php:50 +#: personal.php:48 personal.php:49 msgid "__language_name__" msgstr "Deutsch (Österreich)" @@ -590,11 +604,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:416 templates/personal.php:181 +#: templates/admin.php:416 templates/personal.php:171 msgid "Version" msgstr "" -#: templates/admin.php:420 templates/personal.php:184 +#: templates/admin.php:420 templates/personal.php:174 msgid "" "Developed by the ownCloud community, the -licensed by " msgstr "" @@ -665,108 +679,108 @@ msgstr "" msgid "You have used %s of the available %s" msgstr "" -#: templates/personal.php:39 templates/users.php:21 templates/users.php:87 +#: templates/personal.php:38 templates/users.php:21 templates/users.php:87 msgid "Password" msgstr "Passwort" -#: templates/personal.php:40 +#: templates/personal.php:39 msgid "Your password was changed" msgstr "" -#: templates/personal.php:41 +#: templates/personal.php:40 msgid "Unable to change your password" msgstr "" -#: templates/personal.php:43 +#: templates/personal.php:42 msgid "Current password" msgstr "" -#: templates/personal.php:46 +#: templates/personal.php:45 msgid "New password" msgstr "" -#: templates/personal.php:50 +#: templates/personal.php:49 msgid "Change password" msgstr "" -#: templates/personal.php:64 templates/users.php:86 +#: templates/personal.php:61 templates/users.php:86 msgid "Full Name" msgstr "" -#: templates/personal.php:81 +#: templates/personal.php:76 msgid "Email" msgstr "E-Mail" -#: templates/personal.php:83 +#: templates/personal.php:78 msgid "Your email address" msgstr "" -#: templates/personal.php:86 +#: templates/personal.php:81 msgid "" "Fill in an email address to enable password recovery and receive " "notifications" msgstr "" -#: templates/personal.php:96 +#: templates/personal.php:89 msgid "Profile picture" msgstr "" -#: templates/personal.php:101 +#: templates/personal.php:94 msgid "Upload new" msgstr "" -#: templates/personal.php:103 +#: templates/personal.php:96 msgid "Select new from Files" msgstr "" -#: templates/personal.php:104 +#: templates/personal.php:97 msgid "Remove image" msgstr "" -#: templates/personal.php:105 +#: templates/personal.php:98 msgid "Either png or jpg. Ideally square but you will be able to crop it." msgstr "" -#: templates/personal.php:107 +#: templates/personal.php:100 msgid "Your avatar is provided by your original account." msgstr "" -#: templates/personal.php:111 +#: templates/personal.php:104 msgid "Cancel" msgstr "Abbrechen" -#: templates/personal.php:112 +#: templates/personal.php:105 msgid "Choose as profile image" msgstr "" -#: templates/personal.php:120 templates/personal.php:121 +#: templates/personal.php:111 templates/personal.php:112 msgid "Language" msgstr "" -#: templates/personal.php:140 +#: templates/personal.php:131 msgid "Help translate" msgstr "" -#: templates/personal.php:147 +#: templates/personal.php:137 msgid "WebDAV" msgstr "" -#: templates/personal.php:149 +#: templates/personal.php:139 #, php-format msgid "" "Use this address to access your Files via " "WebDAV" msgstr "" -#: templates/personal.php:161 +#: templates/personal.php:151 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:167 +#: templates/personal.php:157 msgid "Log-in password" msgstr "" -#: templates/personal.php:172 +#: templates/personal.php:162 msgid "Decrypt all Files" msgstr "" diff --git a/l10n/de_AT/user_ldap.po b/l10n/de_AT/user_ldap.po index 23ae3177db3..9b848e6179d 100644 --- a/l10n/de_AT/user_ldap.po +++ b/l10n/de_AT/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-08 01:56-0400\n" -"PO-Revision-Date: 2014-04-08 05:56+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:55+0000\n" "Last-Translator: I Robot\n" "Language-Team: German (Austria) (http://www.transifex.com/projects/p/owncloud/language/de_AT/)\n" "MIME-Version: 1.0\n" @@ -144,7 +144,7 @@ msgstr[1] "" msgid "Invalid Host" msgstr "" -#: lib/wizard.php:963 +#: lib/wizard.php:983 msgid "Could not find the desired feature" msgstr "" @@ -335,7 +335,7 @@ msgid "Only connect to the replica server." msgstr "" #: templates/settings.php:26 -msgid "Case insensitve LDAP server (Windows)" +msgid "Case insensitive LDAP server (Windows)" msgstr "" #: templates/settings.php:27 diff --git a/l10n/de_CH/settings.po b/l10n/de_CH/settings.po index adc54611f07..5ed5677b350 100644 --- a/l10n/de_CH/settings.po +++ b/l10n/de_CH/settings.po @@ -16,8 +16,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-10 01:54-0400\n" -"PO-Revision-Date: 2014-04-09 06:10+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/owncloud/language/de_CH/)\n" "MIME-Version: 1.0\n" @@ -93,6 +93,20 @@ msgstr "Die Gruppe existiert bereits" msgid "Unable to add group" msgstr "Die Gruppe konnte nicht angelegt werden" +#: ajax/decryptall.php:31 +msgid "Files decrypted successfully" +msgstr "" + +#: ajax/decryptall.php:33 +msgid "" +"Couldn't decrypt your files, please check your owncloud.log or ask your " +"administrator" +msgstr "" + +#: ajax/decryptall.php:36 +msgid "Couldn't decrypt your files, check your password and try again" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "E-Mail-Adresse gespeichert" diff --git a/l10n/de_CH/user_ldap.po b/l10n/de_CH/user_ldap.po index 2ae224c6325..58abb62b246 100644 --- a/l10n/de_CH/user_ldap.po +++ b/l10n/de_CH/user_ldap.po @@ -15,8 +15,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-08 01:56-0400\n" -"PO-Revision-Date: 2014-04-08 05:56+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:55+0000\n" "Last-Translator: I Robot\n" "Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/owncloud/language/de_CH/)\n" "MIME-Version: 1.0\n" @@ -152,7 +152,7 @@ msgstr[1] "" msgid "Invalid Host" msgstr "" -#: lib/wizard.php:963 +#: lib/wizard.php:983 msgid "Could not find the desired feature" msgstr "" @@ -343,8 +343,8 @@ msgid "Only connect to the replica server." msgstr "Nur zum Replikat-Server verbinden." #: templates/settings.php:26 -msgid "Case insensitve LDAP server (Windows)" -msgstr "LDAP-Server (Windows: Gross- und Kleinschreibung bleibt unbeachtet)" +msgid "Case insensitive LDAP server (Windows)" +msgstr "" #: templates/settings.php:27 msgid "Turn off SSL certificate validation." diff --git a/l10n/de_DE/settings.po b/l10n/de_DE/settings.po index 6dfc08877fd..cfca7fb3af9 100644 --- a/l10n/de_DE/settings.po +++ b/l10n/de_DE/settings.po @@ -16,9 +16,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-10 01:54-0400\n" -"PO-Revision-Date: 2014-04-09 06:10+0000\n" -"Last-Translator: kabum \n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:54+0000\n" +"Last-Translator: I Robot\n" "Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -93,6 +93,20 @@ msgstr "Die Gruppe existiert bereits" msgid "Unable to add group" msgstr "Die Gruppe konnte nicht angelegt werden" +#: ajax/decryptall.php:31 +msgid "Files decrypted successfully" +msgstr "" + +#: ajax/decryptall.php:33 +msgid "" +"Couldn't decrypt your files, please check your owncloud.log or ask your " +"administrator" +msgstr "" + +#: ajax/decryptall.php:36 +msgid "Couldn't decrypt your files, check your password and try again" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "E-Mail-Adresse gespeichert" diff --git a/l10n/de_DE/user_ldap.po b/l10n/de_DE/user_ldap.po index cfcb1ae0423..f82937c17bb 100644 --- a/l10n/de_DE/user_ldap.po +++ b/l10n/de_DE/user_ldap.po @@ -13,9 +13,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-11 01:54-0400\n" -"PO-Revision-Date: 2014-04-10 18:40+0000\n" -"Last-Translator: Mario Siegmann \n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:55+0000\n" +"Last-Translator: I Robot\n" "Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -341,8 +341,8 @@ msgid "Only connect to the replica server." msgstr "Nur zum Replikat-Server verbinden." #: templates/settings.php:26 -msgid "Case insensitve LDAP server (Windows)" -msgstr "LDAP-Server (Windows: Groß- und Kleinschreibung bleibt unbeachtet)" +msgid "Case insensitive LDAP server (Windows)" +msgstr "" #: templates/settings.php:27 msgid "Turn off SSL certificate validation." diff --git a/l10n/el/settings.po b/l10n/el/settings.po index e59b95e37c3..1c0ee4b025c 100644 --- a/l10n/el/settings.po +++ b/l10n/el/settings.po @@ -16,9 +16,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-10 01:54-0400\n" -"PO-Revision-Date: 2014-04-09 06:10+0000\n" -"Last-Translator: pe_ppe \n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:54+0000\n" +"Last-Translator: I Robot\n" "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -93,6 +93,20 @@ msgstr "Η ομάδα υπάρχει ήδη" msgid "Unable to add group" msgstr "Αδυναμία προσθήκης ομάδας" +#: ajax/decryptall.php:31 +msgid "Files decrypted successfully" +msgstr "" + +#: ajax/decryptall.php:33 +msgid "" +"Couldn't decrypt your files, please check your owncloud.log or ask your " +"administrator" +msgstr "" + +#: ajax/decryptall.php:36 +msgid "Couldn't decrypt your files, check your password and try again" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "Το email αποθηκεύτηκε " diff --git a/l10n/el/user_ldap.po b/l10n/el/user_ldap.po index 690afb7856d..b4d3fa0005e 100644 --- a/l10n/el/user_ldap.po +++ b/l10n/el/user_ldap.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-08 01:56-0400\n" -"PO-Revision-Date: 2014-04-08 05:56+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:55+0000\n" "Last-Translator: I Robot\n" "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n" "MIME-Version: 1.0\n" @@ -147,7 +147,7 @@ msgstr[1] "%s χρήστες βρέθηκαν" msgid "Invalid Host" msgstr "Άκυρος εξυπηρετητής" -#: lib/wizard.php:963 +#: lib/wizard.php:983 msgid "Could not find the desired feature" msgstr "Αδυναμία εύρεσης επιθυμητου χαρακτηριστικού" @@ -338,8 +338,8 @@ msgid "Only connect to the replica server." msgstr "Σύνδεση μόνο με το διακομιστή-αντίγραφο." #: templates/settings.php:26 -msgid "Case insensitve LDAP server (Windows)" -msgstr "LDAP server (Windows) με διάκριση πεζών-ΚΕΦΑΛΑΙΩΝ" +msgid "Case insensitive LDAP server (Windows)" +msgstr "" #: templates/settings.php:27 msgid "Turn off SSL certificate validation." diff --git a/l10n/en@pirate/settings.po b/l10n/en@pirate/settings.po index 5860fa8a930..a654ee294bc 100644 --- a/l10n/en@pirate/settings.po +++ b/l10n/en@pirate/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-03-26 01:55-0400\n" -"PO-Revision-Date: 2014-03-26 05:55+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159 +#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149 msgid "Encryption" msgstr "" @@ -64,7 +64,7 @@ msgid "Unable to load list from App Store" msgstr "" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 changepassword/controller.php:55 +#: ajax/togglegroups.php:20 changepassword/controller.php:49 msgid "Authentication error" msgstr "" @@ -84,6 +84,20 @@ msgstr "" msgid "Unable to add group" msgstr "" +#: ajax/decryptall.php:31 +msgid "Files decrypted successfully" +msgstr "" + +#: ajax/decryptall.php:33 +msgid "" +"Couldn't decrypt your files, please check your owncloud.log or ask your " +"administrator" +msgstr "" + +#: ajax/decryptall.php:36 +msgid "Couldn't decrypt your files, check your password and try again" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -126,32 +140,32 @@ msgstr "" msgid "Couldn't update app." msgstr "" -#: changepassword/controller.php:20 +#: changepassword/controller.php:17 msgid "Wrong password" msgstr "" -#: changepassword/controller.php:42 +#: changepassword/controller.php:36 msgid "No user supplied" msgstr "" -#: changepassword/controller.php:74 +#: changepassword/controller.php:68 msgid "" "Please provide an admin recovery password, otherwise all user data will be " "lost" msgstr "" -#: changepassword/controller.php:79 +#: changepassword/controller.php:73 msgid "" "Wrong admin recovery password. Please check the password and try again." msgstr "" -#: changepassword/controller.php:87 +#: changepassword/controller.php:81 msgid "" "Back-end doesn't support password change, but the users encryption key was " "successfully updated." msgstr "" -#: changepassword/controller.php:92 changepassword/controller.php:103 +#: changepassword/controller.php:86 changepassword/controller.php:97 msgid "Unable to change password" msgstr "" @@ -203,7 +217,7 @@ msgstr "" msgid "Error" msgstr "" -#: js/apps.js:153 templates/apps.php:54 +#: js/apps.js:153 templates/apps.php:55 msgid "Update" msgstr "" @@ -211,31 +225,31 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:246 +#: js/personal.js:243 msgid "Select a profile picture" msgstr "" -#: js/personal.js:277 +#: js/personal.js:274 msgid "Very weak password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:275 msgid "Weak password" msgstr "" -#: js/personal.js:279 +#: js/personal.js:276 msgid "So-so password" msgstr "" -#: js/personal.js:280 +#: js/personal.js:277 msgid "Good password" msgstr "" -#: js/personal.js:281 +#: js/personal.js:278 msgid "Strong password" msgstr "" -#: js/personal.js:316 +#: js/personal.js:313 msgid "Decrypting files... Please wait, this can take some time." msgstr "" @@ -284,7 +298,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:49 personal.php:50 +#: personal.php:48 personal.php:49 msgid "__language_name__" msgstr "" @@ -589,11 +603,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:416 templates/personal.php:181 +#: templates/admin.php:416 templates/personal.php:171 msgid "Version" msgstr "" -#: templates/admin.php:420 templates/personal.php:184 +#: templates/admin.php:420 templates/personal.php:174 msgid "" "Developed by the ownCloud community, the -licensed by " msgstr "" @@ -664,108 +678,108 @@ msgstr "" msgid "You have used %s of the available %s" msgstr "" -#: templates/personal.php:39 templates/users.php:21 templates/users.php:87 +#: templates/personal.php:38 templates/users.php:21 templates/users.php:87 msgid "Password" msgstr "Passcode" -#: templates/personal.php:40 +#: templates/personal.php:39 msgid "Your password was changed" msgstr "" -#: templates/personal.php:41 +#: templates/personal.php:40 msgid "Unable to change your password" msgstr "" -#: templates/personal.php:43 +#: templates/personal.php:42 msgid "Current password" msgstr "" -#: templates/personal.php:46 +#: templates/personal.php:45 msgid "New password" msgstr "" -#: templates/personal.php:50 +#: templates/personal.php:49 msgid "Change password" msgstr "" -#: templates/personal.php:64 templates/users.php:86 +#: templates/personal.php:61 templates/users.php:86 msgid "Full Name" msgstr "" -#: templates/personal.php:81 +#: templates/personal.php:76 msgid "Email" msgstr "" -#: templates/personal.php:83 +#: templates/personal.php:78 msgid "Your email address" msgstr "" -#: templates/personal.php:86 +#: templates/personal.php:81 msgid "" "Fill in an email address to enable password recovery and receive " "notifications" msgstr "" -#: templates/personal.php:96 +#: templates/personal.php:89 msgid "Profile picture" msgstr "" -#: templates/personal.php:101 +#: templates/personal.php:94 msgid "Upload new" msgstr "" -#: templates/personal.php:103 +#: templates/personal.php:96 msgid "Select new from Files" msgstr "" -#: templates/personal.php:104 +#: templates/personal.php:97 msgid "Remove image" msgstr "" -#: templates/personal.php:105 +#: templates/personal.php:98 msgid "Either png or jpg. Ideally square but you will be able to crop it." msgstr "" -#: templates/personal.php:107 +#: templates/personal.php:100 msgid "Your avatar is provided by your original account." msgstr "" -#: templates/personal.php:111 +#: templates/personal.php:104 msgid "Cancel" msgstr "" -#: templates/personal.php:112 +#: templates/personal.php:105 msgid "Choose as profile image" msgstr "" -#: templates/personal.php:120 templates/personal.php:121 +#: templates/personal.php:111 templates/personal.php:112 msgid "Language" msgstr "" -#: templates/personal.php:140 +#: templates/personal.php:131 msgid "Help translate" msgstr "" -#: templates/personal.php:147 +#: templates/personal.php:137 msgid "WebDAV" msgstr "" -#: templates/personal.php:149 +#: templates/personal.php:139 #, php-format msgid "" "Use this address to access your Files via " "WebDAV" msgstr "" -#: templates/personal.php:161 +#: templates/personal.php:151 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:167 +#: templates/personal.php:157 msgid "Log-in password" msgstr "" -#: templates/personal.php:172 +#: templates/personal.php:162 msgid "Decrypt all Files" msgstr "" diff --git a/l10n/en@pirate/user_ldap.po b/l10n/en@pirate/user_ldap.po index dc0cd36afee..68f450bd8db 100644 --- a/l10n/en@pirate/user_ldap.po +++ b/l10n/en@pirate/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-08 01:56-0400\n" -"PO-Revision-Date: 2014-04-08 05:56+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:55+0000\n" "Last-Translator: I Robot\n" "Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n" "MIME-Version: 1.0\n" @@ -144,7 +144,7 @@ msgstr[1] "" msgid "Invalid Host" msgstr "" -#: lib/wizard.php:963 +#: lib/wizard.php:983 msgid "Could not find the desired feature" msgstr "" @@ -335,7 +335,7 @@ msgid "Only connect to the replica server." msgstr "" #: templates/settings.php:26 -msgid "Case insensitve LDAP server (Windows)" +msgid "Case insensitive LDAP server (Windows)" msgstr "" #: templates/settings.php:27 diff --git a/l10n/en_GB/settings.po b/l10n/en_GB/settings.po index 5d7ff3543fd..33774c3efd8 100644 --- a/l10n/en_GB/settings.po +++ b/l10n/en_GB/settings.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-10 01:54-0400\n" -"PO-Revision-Date: 2014-04-09 06:10+0000\n" -"Last-Translator: mnestis \n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:54+0000\n" +"Last-Translator: I Robot\n" "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/en_GB/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -85,6 +85,20 @@ msgstr "Group already exists" msgid "Unable to add group" msgstr "Unable to add group" +#: ajax/decryptall.php:31 +msgid "Files decrypted successfully" +msgstr "" + +#: ajax/decryptall.php:33 +msgid "" +"Couldn't decrypt your files, please check your owncloud.log or ask your " +"administrator" +msgstr "" + +#: ajax/decryptall.php:36 +msgid "Couldn't decrypt your files, check your password and try again" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "Email saved" diff --git a/l10n/en_GB/user_ldap.po b/l10n/en_GB/user_ldap.po index 005aa3cebae..eafbc2431a7 100644 --- a/l10n/en_GB/user_ldap.po +++ b/l10n/en_GB/user_ldap.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-09 01:55-0400\n" -"PO-Revision-Date: 2014-04-08 12:10+0000\n" -"Last-Translator: mnestis \n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:55+0000\n" +"Last-Translator: I Robot\n" "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/en_GB/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -145,7 +145,7 @@ msgstr[1] "%s users found" msgid "Invalid Host" msgstr "Invalid Host" -#: lib/wizard.php:963 +#: lib/wizard.php:983 msgid "Could not find the desired feature" msgstr "Could not find the desired feature" @@ -336,8 +336,8 @@ msgid "Only connect to the replica server." msgstr "Only connect to the replica server." #: templates/settings.php:26 -msgid "Case insensitve LDAP server (Windows)" -msgstr "Case insensitve LDAP server (Windows)" +msgid "Case insensitive LDAP server (Windows)" +msgstr "" #: templates/settings.php:27 msgid "Turn off SSL certificate validation." diff --git a/l10n/eo/settings.po b/l10n/eo/settings.po index 74f444b43e9..1e6a1f5730c 100644 --- a/l10n/eo/settings.po +++ b/l10n/eo/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-03-26 01:55-0400\n" -"PO-Revision-Date: 2014-03-26 05:55+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159 +#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149 msgid "Encryption" msgstr "Ĉifrado" @@ -64,7 +64,7 @@ msgid "Unable to load list from App Store" msgstr "Ne eblis ŝargi liston el aplikaĵovendejo" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 changepassword/controller.php:55 +#: ajax/togglegroups.php:20 changepassword/controller.php:49 msgid "Authentication error" msgstr "Aŭtentiga eraro" @@ -84,6 +84,20 @@ msgstr "La grupo jam ekzistas" msgid "Unable to add group" msgstr "Ne eblis aldoni la grupon" +#: ajax/decryptall.php:31 +msgid "Files decrypted successfully" +msgstr "" + +#: ajax/decryptall.php:33 +msgid "" +"Couldn't decrypt your files, please check your owncloud.log or ask your " +"administrator" +msgstr "" + +#: ajax/decryptall.php:36 +msgid "Couldn't decrypt your files, check your password and try again" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "La retpoŝtadreso konserviĝis" @@ -126,32 +140,32 @@ msgstr "Ne eblis forigi la uzantan el la grupo %s" msgid "Couldn't update app." msgstr "" -#: changepassword/controller.php:20 +#: changepassword/controller.php:17 msgid "Wrong password" msgstr "" -#: changepassword/controller.php:42 +#: changepassword/controller.php:36 msgid "No user supplied" msgstr "" -#: changepassword/controller.php:74 +#: changepassword/controller.php:68 msgid "" "Please provide an admin recovery password, otherwise all user data will be " "lost" msgstr "" -#: changepassword/controller.php:79 +#: changepassword/controller.php:73 msgid "" "Wrong admin recovery password. Please check the password and try again." msgstr "" -#: changepassword/controller.php:87 +#: changepassword/controller.php:81 msgid "" "Back-end doesn't support password change, but the users encryption key was " "successfully updated." msgstr "" -#: changepassword/controller.php:92 changepassword/controller.php:103 +#: changepassword/controller.php:86 changepassword/controller.php:97 msgid "Unable to change password" msgstr "" @@ -203,7 +217,7 @@ msgstr "" msgid "Error" msgstr "Eraro" -#: js/apps.js:153 templates/apps.php:54 +#: js/apps.js:153 templates/apps.php:55 msgid "Update" msgstr "Ĝisdatigi" @@ -211,31 +225,31 @@ msgstr "Ĝisdatigi" msgid "Updated" msgstr "" -#: js/personal.js:246 +#: js/personal.js:243 msgid "Select a profile picture" msgstr "" -#: js/personal.js:277 +#: js/personal.js:274 msgid "Very weak password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:275 msgid "Weak password" msgstr "" -#: js/personal.js:279 +#: js/personal.js:276 msgid "So-so password" msgstr "" -#: js/personal.js:280 +#: js/personal.js:277 msgid "Good password" msgstr "" -#: js/personal.js:281 +#: js/personal.js:278 msgid "Strong password" msgstr "" -#: js/personal.js:316 +#: js/personal.js:313 msgid "Decrypting files... Please wait, this can take some time." msgstr "" @@ -284,7 +298,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:49 personal.php:50 +#: personal.php:48 personal.php:49 msgid "__language_name__" msgstr "Esperanto" @@ -589,11 +603,11 @@ msgstr "Pli" msgid "Less" msgstr "Malpli" -#: templates/admin.php:416 templates/personal.php:181 +#: templates/admin.php:416 templates/personal.php:171 msgid "Version" msgstr "Eldono" -#: templates/admin.php:420 templates/personal.php:184 +#: templates/admin.php:420 templates/personal.php:174 msgid "" "Developed by the ownCloud community, the -licensed by " msgstr "-permesilhavigita de " @@ -664,108 +678,108 @@ msgstr "" msgid "You have used %s of the available %s" msgstr "Vi uzas %s el la haveblaj %s" -#: templates/personal.php:39 templates/users.php:21 templates/users.php:87 +#: templates/personal.php:38 templates/users.php:21 templates/users.php:87 msgid "Password" msgstr "Pasvorto" -#: templates/personal.php:40 +#: templates/personal.php:39 msgid "Your password was changed" msgstr "Via pasvorto ŝanĝiĝis" -#: templates/personal.php:41 +#: templates/personal.php:40 msgid "Unable to change your password" msgstr "Ne eblis ŝanĝi vian pasvorton" -#: templates/personal.php:43 +#: templates/personal.php:42 msgid "Current password" msgstr "Nuna pasvorto" -#: templates/personal.php:46 +#: templates/personal.php:45 msgid "New password" msgstr "Nova pasvorto" -#: templates/personal.php:50 +#: templates/personal.php:49 msgid "Change password" msgstr "Ŝanĝi la pasvorton" -#: templates/personal.php:64 templates/users.php:86 +#: templates/personal.php:61 templates/users.php:86 msgid "Full Name" msgstr "" -#: templates/personal.php:81 +#: templates/personal.php:76 msgid "Email" msgstr "Retpoŝto" -#: templates/personal.php:83 +#: templates/personal.php:78 msgid "Your email address" msgstr "Via retpoŝta adreso" -#: templates/personal.php:86 +#: templates/personal.php:81 msgid "" "Fill in an email address to enable password recovery and receive " "notifications" msgstr "" -#: templates/personal.php:96 +#: templates/personal.php:89 msgid "Profile picture" msgstr "Profila bildo" -#: templates/personal.php:101 +#: templates/personal.php:94 msgid "Upload new" msgstr "" -#: templates/personal.php:103 +#: templates/personal.php:96 msgid "Select new from Files" msgstr "" -#: templates/personal.php:104 +#: templates/personal.php:97 msgid "Remove image" msgstr "" -#: templates/personal.php:105 +#: templates/personal.php:98 msgid "Either png or jpg. Ideally square but you will be able to crop it." msgstr "" -#: templates/personal.php:107 +#: templates/personal.php:100 msgid "Your avatar is provided by your original account." msgstr "" -#: templates/personal.php:111 +#: templates/personal.php:104 msgid "Cancel" msgstr "Nuligi" -#: templates/personal.php:112 +#: templates/personal.php:105 msgid "Choose as profile image" msgstr "" -#: templates/personal.php:120 templates/personal.php:121 +#: templates/personal.php:111 templates/personal.php:112 msgid "Language" msgstr "Lingvo" -#: templates/personal.php:140 +#: templates/personal.php:131 msgid "Help translate" msgstr "Helpu traduki" -#: templates/personal.php:147 +#: templates/personal.php:137 msgid "WebDAV" msgstr "WebDAV" -#: templates/personal.php:149 +#: templates/personal.php:139 #, php-format msgid "" "Use this address to access your Files via " "WebDAV" msgstr "" -#: templates/personal.php:161 +#: templates/personal.php:151 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:167 +#: templates/personal.php:157 msgid "Log-in password" msgstr "" -#: templates/personal.php:172 +#: templates/personal.php:162 msgid "Decrypt all Files" msgstr "" diff --git a/l10n/eo/user_ldap.po b/l10n/eo/user_ldap.po index 83e2dc3b628..4f72ee12141 100644 --- a/l10n/eo/user_ldap.po +++ b/l10n/eo/user_ldap.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-08 01:56-0400\n" -"PO-Revision-Date: 2014-04-08 05:56+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:55+0000\n" "Last-Translator: I Robot\n" "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n" "MIME-Version: 1.0\n" @@ -145,7 +145,7 @@ msgstr[1] "%s uzanto troviĝis" msgid "Invalid Host" msgstr "Nevalida gastigo" -#: lib/wizard.php:963 +#: lib/wizard.php:983 msgid "Could not find the desired feature" msgstr "" @@ -336,8 +336,8 @@ msgid "Only connect to the replica server." msgstr "" #: templates/settings.php:26 -msgid "Case insensitve LDAP server (Windows)" -msgstr "LDAP-servilo blinda je litergrandeco (Vindozo)" +msgid "Case insensitive LDAP server (Windows)" +msgstr "" #: templates/settings.php:27 msgid "Turn off SSL certificate validation." diff --git a/l10n/es/settings.po b/l10n/es/settings.po index 058eac2fa3c..1f0cc298254 100644 --- a/l10n/es/settings.po +++ b/l10n/es/settings.po @@ -21,9 +21,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-10 01:54-0400\n" -"PO-Revision-Date: 2014-04-09 06:10+0000\n" -"Last-Translator: juanman \n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:54+0000\n" +"Last-Translator: I Robot\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -98,6 +98,20 @@ msgstr "El grupo ya existe" msgid "Unable to add group" msgstr "No se pudo añadir el grupo" +#: ajax/decryptall.php:31 +msgid "Files decrypted successfully" +msgstr "" + +#: ajax/decryptall.php:33 +msgid "" +"Couldn't decrypt your files, please check your owncloud.log or ask your " +"administrator" +msgstr "" + +#: ajax/decryptall.php:36 +msgid "Couldn't decrypt your files, check your password and try again" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "Correo electrónico guardado" diff --git a/l10n/es/user_ldap.po b/l10n/es/user_ldap.po index 836a65c92ac..bad5b163ae3 100644 --- a/l10n/es/user_ldap.po +++ b/l10n/es/user_ldap.po @@ -16,8 +16,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-08 01:56-0400\n" -"PO-Revision-Date: 2014-04-08 05:56+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:55+0000\n" "Last-Translator: I Robot\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n" "MIME-Version: 1.0\n" @@ -153,7 +153,7 @@ msgstr[1] "Usuarios %s encontrados" msgid "Invalid Host" msgstr "Host inválido" -#: lib/wizard.php:963 +#: lib/wizard.php:983 msgid "Could not find the desired feature" msgstr "No se puede encontrar la función deseada." @@ -344,8 +344,8 @@ msgid "Only connect to the replica server." msgstr "Conectar sólo con el servidor de réplica." #: templates/settings.php:26 -msgid "Case insensitve LDAP server (Windows)" -msgstr "Servidor de LDAP no sensible a mayúsculas/minúsculas (Windows)" +msgid "Case insensitive LDAP server (Windows)" +msgstr "" #: templates/settings.php:27 msgid "Turn off SSL certificate validation." diff --git a/l10n/es_AR/settings.po b/l10n/es_AR/settings.po index 3b2f8487931..9b4824686fb 100644 --- a/l10n/es_AR/settings.po +++ b/l10n/es_AR/settings.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-10 01:54-0400\n" -"PO-Revision-Date: 2014-04-09 06:10+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n" "MIME-Version: 1.0\n" @@ -87,6 +87,20 @@ msgstr "El grupo ya existe" msgid "Unable to add group" msgstr "No fue posible añadir el grupo" +#: ajax/decryptall.php:31 +msgid "Files decrypted successfully" +msgstr "" + +#: ajax/decryptall.php:33 +msgid "" +"Couldn't decrypt your files, please check your owncloud.log or ask your " +"administrator" +msgstr "" + +#: ajax/decryptall.php:36 +msgid "Couldn't decrypt your files, check your password and try again" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "e-mail guardado" diff --git a/l10n/es_AR/user_ldap.po b/l10n/es_AR/user_ldap.po index 797a098e3a8..73731cacaba 100644 --- a/l10n/es_AR/user_ldap.po +++ b/l10n/es_AR/user_ldap.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-08 01:56-0400\n" -"PO-Revision-Date: 2014-04-08 05:56+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:55+0000\n" "Last-Translator: I Robot\n" "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n" "MIME-Version: 1.0\n" @@ -146,7 +146,7 @@ msgstr[1] "%s usuarios encontrados" msgid "Invalid Host" msgstr "Host inválido" -#: lib/wizard.php:963 +#: lib/wizard.php:983 msgid "Could not find the desired feature" msgstr "No se pudo encontrar la característica deseada" @@ -337,8 +337,8 @@ msgid "Only connect to the replica server." msgstr "Conectarse únicamente al servidor de réplica." #: templates/settings.php:26 -msgid "Case insensitve LDAP server (Windows)" -msgstr "Servidor de LDAP sensible a mayúsculas/minúsculas (Windows)" +msgid "Case insensitive LDAP server (Windows)" +msgstr "" #: templates/settings.php:27 msgid "Turn off SSL certificate validation." diff --git a/l10n/es_CL/settings.po b/l10n/es_CL/settings.po index 602def0e1ee..872b1688798 100644 --- a/l10n/es_CL/settings.po +++ b/l10n/es_CL/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-03-26 01:55-0400\n" -"PO-Revision-Date: 2014-03-26 05:55+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Spanish (Chile) (http://www.transifex.com/projects/p/owncloud/language/es_CL/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159 +#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149 msgid "Encryption" msgstr "" @@ -64,7 +64,7 @@ msgid "Unable to load list from App Store" msgstr "" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 changepassword/controller.php:55 +#: ajax/togglegroups.php:20 changepassword/controller.php:49 msgid "Authentication error" msgstr "" @@ -84,6 +84,20 @@ msgstr "" msgid "Unable to add group" msgstr "" +#: ajax/decryptall.php:31 +msgid "Files decrypted successfully" +msgstr "" + +#: ajax/decryptall.php:33 +msgid "" +"Couldn't decrypt your files, please check your owncloud.log or ask your " +"administrator" +msgstr "" + +#: ajax/decryptall.php:36 +msgid "Couldn't decrypt your files, check your password and try again" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -126,32 +140,32 @@ msgstr "" msgid "Couldn't update app." msgstr "" -#: changepassword/controller.php:20 +#: changepassword/controller.php:17 msgid "Wrong password" msgstr "" -#: changepassword/controller.php:42 +#: changepassword/controller.php:36 msgid "No user supplied" msgstr "" -#: changepassword/controller.php:74 +#: changepassword/controller.php:68 msgid "" "Please provide an admin recovery password, otherwise all user data will be " "lost" msgstr "" -#: changepassword/controller.php:79 +#: changepassword/controller.php:73 msgid "" "Wrong admin recovery password. Please check the password and try again." msgstr "" -#: changepassword/controller.php:87 +#: changepassword/controller.php:81 msgid "" "Back-end doesn't support password change, but the users encryption key was " "successfully updated." msgstr "" -#: changepassword/controller.php:92 changepassword/controller.php:103 +#: changepassword/controller.php:86 changepassword/controller.php:97 msgid "Unable to change password" msgstr "" @@ -203,7 +217,7 @@ msgstr "" msgid "Error" msgstr "Error" -#: js/apps.js:153 templates/apps.php:54 +#: js/apps.js:153 templates/apps.php:55 msgid "Update" msgstr "" @@ -211,31 +225,31 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:246 +#: js/personal.js:243 msgid "Select a profile picture" msgstr "" -#: js/personal.js:277 +#: js/personal.js:274 msgid "Very weak password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:275 msgid "Weak password" msgstr "" -#: js/personal.js:279 +#: js/personal.js:276 msgid "So-so password" msgstr "" -#: js/personal.js:280 +#: js/personal.js:277 msgid "Good password" msgstr "" -#: js/personal.js:281 +#: js/personal.js:278 msgid "Strong password" msgstr "" -#: js/personal.js:316 +#: js/personal.js:313 msgid "Decrypting files... Please wait, this can take some time." msgstr "" @@ -284,7 +298,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:49 personal.php:50 +#: personal.php:48 personal.php:49 msgid "__language_name__" msgstr "" @@ -589,11 +603,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:416 templates/personal.php:181 +#: templates/admin.php:416 templates/personal.php:171 msgid "Version" msgstr "" -#: templates/admin.php:420 templates/personal.php:184 +#: templates/admin.php:420 templates/personal.php:174 msgid "" "Developed by the ownCloud community, the -licensed by " msgstr "" @@ -664,108 +678,108 @@ msgstr "" msgid "You have used %s of the available %s" msgstr "" -#: templates/personal.php:39 templates/users.php:21 templates/users.php:87 +#: templates/personal.php:38 templates/users.php:21 templates/users.php:87 msgid "Password" msgstr "Clave" -#: templates/personal.php:40 +#: templates/personal.php:39 msgid "Your password was changed" msgstr "" -#: templates/personal.php:41 +#: templates/personal.php:40 msgid "Unable to change your password" msgstr "" -#: templates/personal.php:43 +#: templates/personal.php:42 msgid "Current password" msgstr "" -#: templates/personal.php:46 +#: templates/personal.php:45 msgid "New password" msgstr "" -#: templates/personal.php:50 +#: templates/personal.php:49 msgid "Change password" msgstr "" -#: templates/personal.php:64 templates/users.php:86 +#: templates/personal.php:61 templates/users.php:86 msgid "Full Name" msgstr "" -#: templates/personal.php:81 +#: templates/personal.php:76 msgid "Email" msgstr "" -#: templates/personal.php:83 +#: templates/personal.php:78 msgid "Your email address" msgstr "" -#: templates/personal.php:86 +#: templates/personal.php:81 msgid "" "Fill in an email address to enable password recovery and receive " "notifications" msgstr "" -#: templates/personal.php:96 +#: templates/personal.php:89 msgid "Profile picture" msgstr "" -#: templates/personal.php:101 +#: templates/personal.php:94 msgid "Upload new" msgstr "" -#: templates/personal.php:103 +#: templates/personal.php:96 msgid "Select new from Files" msgstr "" -#: templates/personal.php:104 +#: templates/personal.php:97 msgid "Remove image" msgstr "" -#: templates/personal.php:105 +#: templates/personal.php:98 msgid "Either png or jpg. Ideally square but you will be able to crop it." msgstr "" -#: templates/personal.php:107 +#: templates/personal.php:100 msgid "Your avatar is provided by your original account." msgstr "" -#: templates/personal.php:111 +#: templates/personal.php:104 msgid "Cancel" msgstr "Cancelar" -#: templates/personal.php:112 +#: templates/personal.php:105 msgid "Choose as profile image" msgstr "" -#: templates/personal.php:120 templates/personal.php:121 +#: templates/personal.php:111 templates/personal.php:112 msgid "Language" msgstr "" -#: templates/personal.php:140 +#: templates/personal.php:131 msgid "Help translate" msgstr "" -#: templates/personal.php:147 +#: templates/personal.php:137 msgid "WebDAV" msgstr "" -#: templates/personal.php:149 +#: templates/personal.php:139 #, php-format msgid "" "Use this address to access your Files via " "WebDAV" msgstr "" -#: templates/personal.php:161 +#: templates/personal.php:151 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:167 +#: templates/personal.php:157 msgid "Log-in password" msgstr "" -#: templates/personal.php:172 +#: templates/personal.php:162 msgid "Decrypt all Files" msgstr "" diff --git a/l10n/es_CL/user_ldap.po b/l10n/es_CL/user_ldap.po index f1d3cad48fb..2885d87d485 100644 --- a/l10n/es_CL/user_ldap.po +++ b/l10n/es_CL/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-08 01:56-0400\n" -"PO-Revision-Date: 2014-04-08 05:56+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:55+0000\n" "Last-Translator: I Robot\n" "Language-Team: Spanish (Chile) (http://www.transifex.com/projects/p/owncloud/language/es_CL/)\n" "MIME-Version: 1.0\n" @@ -144,7 +144,7 @@ msgstr[1] "" msgid "Invalid Host" msgstr "" -#: lib/wizard.php:963 +#: lib/wizard.php:983 msgid "Could not find the desired feature" msgstr "" @@ -335,7 +335,7 @@ msgid "Only connect to the replica server." msgstr "" #: templates/settings.php:26 -msgid "Case insensitve LDAP server (Windows)" +msgid "Case insensitive LDAP server (Windows)" msgstr "" #: templates/settings.php:27 diff --git a/l10n/es_MX/settings.po b/l10n/es_MX/settings.po index a2f997aea52..1e159b062bf 100644 --- a/l10n/es_MX/settings.po +++ b/l10n/es_MX/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-10 01:54-0400\n" -"PO-Revision-Date: 2014-04-09 06:10+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/owncloud/language/es_MX/)\n" "MIME-Version: 1.0\n" @@ -84,6 +84,20 @@ msgstr "El grupo ya existe" msgid "Unable to add group" msgstr "No se pudo añadir el grupo" +#: ajax/decryptall.php:31 +msgid "Files decrypted successfully" +msgstr "" + +#: ajax/decryptall.php:33 +msgid "" +"Couldn't decrypt your files, please check your owncloud.log or ask your " +"administrator" +msgstr "" + +#: ajax/decryptall.php:36 +msgid "Couldn't decrypt your files, check your password and try again" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "Correo electrónico guardado" diff --git a/l10n/es_MX/user_ldap.po b/l10n/es_MX/user_ldap.po index 7687611cb1c..d38b34e41c1 100644 --- a/l10n/es_MX/user_ldap.po +++ b/l10n/es_MX/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-08 01:56-0400\n" -"PO-Revision-Date: 2014-04-08 05:56+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:55+0000\n" "Last-Translator: I Robot\n" "Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/owncloud/language/es_MX/)\n" "MIME-Version: 1.0\n" @@ -144,7 +144,7 @@ msgstr[1] "Usuarios %s encontrados" msgid "Invalid Host" msgstr "Host inválido" -#: lib/wizard.php:963 +#: lib/wizard.php:983 msgid "Could not find the desired feature" msgstr "No se puede encontrar la función deseada." @@ -335,8 +335,8 @@ msgid "Only connect to the replica server." msgstr "Conectar sólo con el servidor de réplica." #: templates/settings.php:26 -msgid "Case insensitve LDAP server (Windows)" -msgstr "Servidor de LDAP no sensible a mayúsculas/minúsculas (Windows)" +msgid "Case insensitive LDAP server (Windows)" +msgstr "" #: templates/settings.php:27 msgid "Turn off SSL certificate validation." diff --git a/l10n/et_EE/settings.po b/l10n/et_EE/settings.po index 031b5521718..9da15a03581 100644 --- a/l10n/et_EE/settings.po +++ b/l10n/et_EE/settings.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-10 01:54-0400\n" -"PO-Revision-Date: 2014-04-09 06:10+0000\n" -"Last-Translator: pisike.sipelgas \n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:54+0000\n" +"Last-Translator: I Robot\n" "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -86,6 +86,20 @@ msgstr "Grupp on juba olemas" msgid "Unable to add group" msgstr "Keela grupi lisamine" +#: ajax/decryptall.php:31 +msgid "Files decrypted successfully" +msgstr "" + +#: ajax/decryptall.php:33 +msgid "" +"Couldn't decrypt your files, please check your owncloud.log or ask your " +"administrator" +msgstr "" + +#: ajax/decryptall.php:36 +msgid "Couldn't decrypt your files, check your password and try again" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "Kiri on salvestatud" diff --git a/l10n/et_EE/user_ldap.po b/l10n/et_EE/user_ldap.po index 01175efd2a3..fbb1bfb0860 100644 --- a/l10n/et_EE/user_ldap.po +++ b/l10n/et_EE/user_ldap.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-08 01:56-0400\n" -"PO-Revision-Date: 2014-04-08 05:56+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:55+0000\n" "Last-Translator: I Robot\n" "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n" "MIME-Version: 1.0\n" @@ -146,7 +146,7 @@ msgstr[1] "%s kasutajat leitud" msgid "Invalid Host" msgstr "Vigane server" -#: lib/wizard.php:963 +#: lib/wizard.php:983 msgid "Could not find the desired feature" msgstr "Ei suuda leida soovitud funktsioonaalsust" @@ -337,8 +337,8 @@ msgid "Only connect to the replica server." msgstr "Ühendu ainult replitseeriva serveriga." #: templates/settings.php:26 -msgid "Case insensitve LDAP server (Windows)" -msgstr "Mittetõstutundlik LDAP server (Windows)" +msgid "Case insensitive LDAP server (Windows)" +msgstr "" #: templates/settings.php:27 msgid "Turn off SSL certificate validation." diff --git a/l10n/eu/settings.po b/l10n/eu/settings.po index 136a7c70e61..f9c9078b716 100644 --- a/l10n/eu/settings.po +++ b/l10n/eu/settings.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-10 01:54-0400\n" -"PO-Revision-Date: 2014-04-09 06:10+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n" "MIME-Version: 1.0\n" @@ -87,6 +87,20 @@ msgstr "Taldea dagoeneko existitzenda" msgid "Unable to add group" msgstr "Ezin izan da taldea gehitu" +#: ajax/decryptall.php:31 +msgid "Files decrypted successfully" +msgstr "" + +#: ajax/decryptall.php:33 +msgid "" +"Couldn't decrypt your files, please check your owncloud.log or ask your " +"administrator" +msgstr "" + +#: ajax/decryptall.php:36 +msgid "Couldn't decrypt your files, check your password and try again" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "Eposta gorde da" diff --git a/l10n/eu/user_ldap.po b/l10n/eu/user_ldap.po index 2b4fbff486d..980129d3920 100644 --- a/l10n/eu/user_ldap.po +++ b/l10n/eu/user_ldap.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-08 01:56-0400\n" -"PO-Revision-Date: 2014-04-08 05:56+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:55+0000\n" "Last-Translator: I Robot\n" "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n" "MIME-Version: 1.0\n" @@ -145,7 +145,7 @@ msgstr[1] "%s erabiltzaile aurkitu dira" msgid "Invalid Host" msgstr "Baliogabeko hostalaria" -#: lib/wizard.php:963 +#: lib/wizard.php:983 msgid "Could not find the desired feature" msgstr "Ezin izan da nahi zen ezaugarria aurkitu" @@ -336,8 +336,8 @@ msgid "Only connect to the replica server." msgstr "Konektatu bakarrik erreplika zerbitzarira" #: templates/settings.php:26 -msgid "Case insensitve LDAP server (Windows)" -msgstr "Maiuskulak eta minuskulak ezberditzen ez dituen LDAP zerbitzaria (windows)" +msgid "Case insensitive LDAP server (Windows)" +msgstr "" #: templates/settings.php:27 msgid "Turn off SSL certificate validation." diff --git a/l10n/eu_ES/settings.po b/l10n/eu_ES/settings.po index 4aa0c3e54f7..e0571110ac9 100644 --- a/l10n/eu_ES/settings.po +++ b/l10n/eu_ES/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-03-26 01:55-0400\n" -"PO-Revision-Date: 2014-03-26 05:55+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/owncloud/language/eu_ES/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159 +#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149 msgid "Encryption" msgstr "" @@ -64,7 +64,7 @@ msgid "Unable to load list from App Store" msgstr "" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 changepassword/controller.php:55 +#: ajax/togglegroups.php:20 changepassword/controller.php:49 msgid "Authentication error" msgstr "" @@ -84,6 +84,20 @@ msgstr "" msgid "Unable to add group" msgstr "" +#: ajax/decryptall.php:31 +msgid "Files decrypted successfully" +msgstr "" + +#: ajax/decryptall.php:33 +msgid "" +"Couldn't decrypt your files, please check your owncloud.log or ask your " +"administrator" +msgstr "" + +#: ajax/decryptall.php:36 +msgid "Couldn't decrypt your files, check your password and try again" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -126,32 +140,32 @@ msgstr "" msgid "Couldn't update app." msgstr "" -#: changepassword/controller.php:20 +#: changepassword/controller.php:17 msgid "Wrong password" msgstr "" -#: changepassword/controller.php:42 +#: changepassword/controller.php:36 msgid "No user supplied" msgstr "" -#: changepassword/controller.php:74 +#: changepassword/controller.php:68 msgid "" "Please provide an admin recovery password, otherwise all user data will be " "lost" msgstr "" -#: changepassword/controller.php:79 +#: changepassword/controller.php:73 msgid "" "Wrong admin recovery password. Please check the password and try again." msgstr "" -#: changepassword/controller.php:87 +#: changepassword/controller.php:81 msgid "" "Back-end doesn't support password change, but the users encryption key was " "successfully updated." msgstr "" -#: changepassword/controller.php:92 changepassword/controller.php:103 +#: changepassword/controller.php:86 changepassword/controller.php:97 msgid "Unable to change password" msgstr "" @@ -203,7 +217,7 @@ msgstr "" msgid "Error" msgstr "" -#: js/apps.js:153 templates/apps.php:54 +#: js/apps.js:153 templates/apps.php:55 msgid "Update" msgstr "" @@ -211,31 +225,31 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:246 +#: js/personal.js:243 msgid "Select a profile picture" msgstr "" -#: js/personal.js:277 +#: js/personal.js:274 msgid "Very weak password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:275 msgid "Weak password" msgstr "" -#: js/personal.js:279 +#: js/personal.js:276 msgid "So-so password" msgstr "" -#: js/personal.js:280 +#: js/personal.js:277 msgid "Good password" msgstr "" -#: js/personal.js:281 +#: js/personal.js:278 msgid "Strong password" msgstr "" -#: js/personal.js:316 +#: js/personal.js:313 msgid "Decrypting files... Please wait, this can take some time." msgstr "" @@ -284,7 +298,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:49 personal.php:50 +#: personal.php:48 personal.php:49 msgid "__language_name__" msgstr "" @@ -589,11 +603,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:416 templates/personal.php:181 +#: templates/admin.php:416 templates/personal.php:171 msgid "Version" msgstr "" -#: templates/admin.php:420 templates/personal.php:184 +#: templates/admin.php:420 templates/personal.php:174 msgid "" "Developed by the ownCloud community, the -licensed by " msgstr "" @@ -664,108 +678,108 @@ msgstr "" msgid "You have used %s of the available %s" msgstr "" -#: templates/personal.php:39 templates/users.php:21 templates/users.php:87 +#: templates/personal.php:38 templates/users.php:21 templates/users.php:87 msgid "Password" msgstr "" -#: templates/personal.php:40 +#: templates/personal.php:39 msgid "Your password was changed" msgstr "" -#: templates/personal.php:41 +#: templates/personal.php:40 msgid "Unable to change your password" msgstr "" -#: templates/personal.php:43 +#: templates/personal.php:42 msgid "Current password" msgstr "" -#: templates/personal.php:46 +#: templates/personal.php:45 msgid "New password" msgstr "" -#: templates/personal.php:50 +#: templates/personal.php:49 msgid "Change password" msgstr "" -#: templates/personal.php:64 templates/users.php:86 +#: templates/personal.php:61 templates/users.php:86 msgid "Full Name" msgstr "" -#: templates/personal.php:81 +#: templates/personal.php:76 msgid "Email" msgstr "" -#: templates/personal.php:83 +#: templates/personal.php:78 msgid "Your email address" msgstr "" -#: templates/personal.php:86 +#: templates/personal.php:81 msgid "" "Fill in an email address to enable password recovery and receive " "notifications" msgstr "" -#: templates/personal.php:96 +#: templates/personal.php:89 msgid "Profile picture" msgstr "" -#: templates/personal.php:101 +#: templates/personal.php:94 msgid "Upload new" msgstr "" -#: templates/personal.php:103 +#: templates/personal.php:96 msgid "Select new from Files" msgstr "" -#: templates/personal.php:104 +#: templates/personal.php:97 msgid "Remove image" msgstr "" -#: templates/personal.php:105 +#: templates/personal.php:98 msgid "Either png or jpg. Ideally square but you will be able to crop it." msgstr "" -#: templates/personal.php:107 +#: templates/personal.php:100 msgid "Your avatar is provided by your original account." msgstr "" -#: templates/personal.php:111 +#: templates/personal.php:104 msgid "Cancel" msgstr "Ezeztatu" -#: templates/personal.php:112 +#: templates/personal.php:105 msgid "Choose as profile image" msgstr "" -#: templates/personal.php:120 templates/personal.php:121 +#: templates/personal.php:111 templates/personal.php:112 msgid "Language" msgstr "" -#: templates/personal.php:140 +#: templates/personal.php:131 msgid "Help translate" msgstr "" -#: templates/personal.php:147 +#: templates/personal.php:137 msgid "WebDAV" msgstr "" -#: templates/personal.php:149 +#: templates/personal.php:139 #, php-format msgid "" "Use this address to access your Files via " "WebDAV" msgstr "" -#: templates/personal.php:161 +#: templates/personal.php:151 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:167 +#: templates/personal.php:157 msgid "Log-in password" msgstr "" -#: templates/personal.php:172 +#: templates/personal.php:162 msgid "Decrypt all Files" msgstr "" diff --git a/l10n/eu_ES/user_ldap.po b/l10n/eu_ES/user_ldap.po index 8e28c9a6557..2b77e0e7f41 100644 --- a/l10n/eu_ES/user_ldap.po +++ b/l10n/eu_ES/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-08 01:56-0400\n" -"PO-Revision-Date: 2014-04-08 05:56+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:55+0000\n" "Last-Translator: I Robot\n" "Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/owncloud/language/eu_ES/)\n" "MIME-Version: 1.0\n" @@ -144,7 +144,7 @@ msgstr[1] "" msgid "Invalid Host" msgstr "" -#: lib/wizard.php:963 +#: lib/wizard.php:983 msgid "Could not find the desired feature" msgstr "" @@ -335,7 +335,7 @@ msgid "Only connect to the replica server." msgstr "" #: templates/settings.php:26 -msgid "Case insensitve LDAP server (Windows)" +msgid "Case insensitive LDAP server (Windows)" msgstr "" #: templates/settings.php:27 diff --git a/l10n/fa/settings.po b/l10n/fa/settings.po index f963e25c9aa..7ca8e8d50e6 100644 --- a/l10n/fa/settings.po +++ b/l10n/fa/settings.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-10 01:54-0400\n" -"PO-Revision-Date: 2014-04-09 06:10+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n" "MIME-Version: 1.0\n" @@ -87,6 +87,20 @@ msgstr "این گروه در حال حاضر موجود است" msgid "Unable to add group" msgstr "افزودن گروه امکان پذیر نیست" +#: ajax/decryptall.php:31 +msgid "Files decrypted successfully" +msgstr "" + +#: ajax/decryptall.php:33 +msgid "" +"Couldn't decrypt your files, please check your owncloud.log or ask your " +"administrator" +msgstr "" + +#: ajax/decryptall.php:36 +msgid "Couldn't decrypt your files, check your password and try again" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "ایمیل ذخیره شد" diff --git a/l10n/fa/user_ldap.po b/l10n/fa/user_ldap.po index 1a904629e87..4067fcff5aa 100644 --- a/l10n/fa/user_ldap.po +++ b/l10n/fa/user_ldap.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-08 01:56-0400\n" -"PO-Revision-Date: 2014-04-08 05:56+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:55+0000\n" "Last-Translator: I Robot\n" "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n" "MIME-Version: 1.0\n" @@ -143,7 +143,7 @@ msgstr[0] "" msgid "Invalid Host" msgstr "" -#: lib/wizard.php:963 +#: lib/wizard.php:983 msgid "Could not find the desired feature" msgstr "" @@ -334,8 +334,8 @@ msgid "Only connect to the replica server." msgstr "" #: templates/settings.php:26 -msgid "Case insensitve LDAP server (Windows)" -msgstr "غیر حساس به بزرگی و کوچکی حروف LDAP سرور (ویندوز)" +msgid "Case insensitive LDAP server (Windows)" +msgstr "" #: templates/settings.php:27 msgid "Turn off SSL certificate validation." diff --git a/l10n/fi_FI/settings.po b/l10n/fi_FI/settings.po index 12029fb7fc9..b5422267fb5 100644 --- a/l10n/fi_FI/settings.po +++ b/l10n/fi_FI/settings.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-10 01:54-0400\n" -"PO-Revision-Date: 2014-04-09 06:10+0000\n" -"Last-Translator: Jiri Grönroos \n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:54+0000\n" +"Last-Translator: I Robot\n" "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -85,6 +85,20 @@ msgstr "Ryhmä on jo olemassa" msgid "Unable to add group" msgstr "Ryhmän lisäys epäonnistui" +#: ajax/decryptall.php:31 +msgid "Files decrypted successfully" +msgstr "" + +#: ajax/decryptall.php:33 +msgid "" +"Couldn't decrypt your files, please check your owncloud.log or ask your " +"administrator" +msgstr "" + +#: ajax/decryptall.php:36 +msgid "Couldn't decrypt your files, check your password and try again" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "Sähköposti tallennettu" diff --git a/l10n/fi_FI/user_ldap.po b/l10n/fi_FI/user_ldap.po index 4bd3ca6c6ae..a407df61fba 100644 --- a/l10n/fi_FI/user_ldap.po +++ b/l10n/fi_FI/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-08 01:56-0400\n" -"PO-Revision-Date: 2014-04-08 05:56+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:55+0000\n" "Last-Translator: I Robot\n" "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n" "MIME-Version: 1.0\n" @@ -144,7 +144,7 @@ msgstr[1] "" msgid "Invalid Host" msgstr "" -#: lib/wizard.php:963 +#: lib/wizard.php:983 msgid "Could not find the desired feature" msgstr "" @@ -335,8 +335,8 @@ msgid "Only connect to the replica server." msgstr "" #: templates/settings.php:26 -msgid "Case insensitve LDAP server (Windows)" -msgstr "Kirjainkoosta piittamaton LDAP-palvelin (Windows)" +msgid "Case insensitive LDAP server (Windows)" +msgstr "" #: templates/settings.php:27 msgid "Turn off SSL certificate validation." diff --git a/l10n/fr/settings.po b/l10n/fr/settings.po index 364745b1f33..858a81483c6 100644 --- a/l10n/fr/settings.po +++ b/l10n/fr/settings.po @@ -18,9 +18,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-10 01:54-0400\n" -"PO-Revision-Date: 2014-04-09 06:10+0000\n" -"Last-Translator: Christophe Lherieau \n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:54+0000\n" +"Last-Translator: I Robot\n" "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -95,6 +95,20 @@ msgstr "Ce groupe existe déjà" msgid "Unable to add group" msgstr "Impossible d'ajouter le groupe" +#: ajax/decryptall.php:31 +msgid "Files decrypted successfully" +msgstr "" + +#: ajax/decryptall.php:33 +msgid "" +"Couldn't decrypt your files, please check your owncloud.log or ask your " +"administrator" +msgstr "" + +#: ajax/decryptall.php:36 +msgid "Couldn't decrypt your files, check your password and try again" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "E-mail sauvegardé" diff --git a/l10n/fr/user_ldap.po b/l10n/fr/user_ldap.po index fb2c06ad2d8..7d63bd7bc47 100644 --- a/l10n/fr/user_ldap.po +++ b/l10n/fr/user_ldap.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-11 01:54-0400\n" -"PO-Revision-Date: 2014-04-10 12:40+0000\n" -"Last-Translator: Christophe Lherieau \n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:55+0000\n" +"Last-Translator: I Robot\n" "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -338,8 +338,8 @@ msgid "Only connect to the replica server." msgstr "Se connecter uniquement au serveur de replica." #: templates/settings.php:26 -msgid "Case insensitve LDAP server (Windows)" -msgstr "Serveur LDAP insensible à la casse (Windows)" +msgid "Case insensitive LDAP server (Windows)" +msgstr "" #: templates/settings.php:27 msgid "Turn off SSL certificate validation." diff --git a/l10n/fr_CA/settings.po b/l10n/fr_CA/settings.po index 845f2fc237a..dab733306ef 100644 --- a/l10n/fr_CA/settings.po +++ b/l10n/fr_CA/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-03-26 01:55-0400\n" -"PO-Revision-Date: 2014-03-26 05:55+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: French (Canada) (http://www.transifex.com/projects/p/owncloud/language/fr_CA/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159 +#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149 msgid "Encryption" msgstr "" @@ -64,7 +64,7 @@ msgid "Unable to load list from App Store" msgstr "" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 changepassword/controller.php:55 +#: ajax/togglegroups.php:20 changepassword/controller.php:49 msgid "Authentication error" msgstr "" @@ -84,6 +84,20 @@ msgstr "" msgid "Unable to add group" msgstr "" +#: ajax/decryptall.php:31 +msgid "Files decrypted successfully" +msgstr "" + +#: ajax/decryptall.php:33 +msgid "" +"Couldn't decrypt your files, please check your owncloud.log or ask your " +"administrator" +msgstr "" + +#: ajax/decryptall.php:36 +msgid "Couldn't decrypt your files, check your password and try again" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -126,32 +140,32 @@ msgstr "" msgid "Couldn't update app." msgstr "" -#: changepassword/controller.php:20 +#: changepassword/controller.php:17 msgid "Wrong password" msgstr "" -#: changepassword/controller.php:42 +#: changepassword/controller.php:36 msgid "No user supplied" msgstr "" -#: changepassword/controller.php:74 +#: changepassword/controller.php:68 msgid "" "Please provide an admin recovery password, otherwise all user data will be " "lost" msgstr "" -#: changepassword/controller.php:79 +#: changepassword/controller.php:73 msgid "" "Wrong admin recovery password. Please check the password and try again." msgstr "" -#: changepassword/controller.php:87 +#: changepassword/controller.php:81 msgid "" "Back-end doesn't support password change, but the users encryption key was " "successfully updated." msgstr "" -#: changepassword/controller.php:92 changepassword/controller.php:103 +#: changepassword/controller.php:86 changepassword/controller.php:97 msgid "Unable to change password" msgstr "" @@ -203,7 +217,7 @@ msgstr "" msgid "Error" msgstr "" -#: js/apps.js:153 templates/apps.php:54 +#: js/apps.js:153 templates/apps.php:55 msgid "Update" msgstr "" @@ -211,31 +225,31 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:246 +#: js/personal.js:243 msgid "Select a profile picture" msgstr "" -#: js/personal.js:277 +#: js/personal.js:274 msgid "Very weak password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:275 msgid "Weak password" msgstr "" -#: js/personal.js:279 +#: js/personal.js:276 msgid "So-so password" msgstr "" -#: js/personal.js:280 +#: js/personal.js:277 msgid "Good password" msgstr "" -#: js/personal.js:281 +#: js/personal.js:278 msgid "Strong password" msgstr "" -#: js/personal.js:316 +#: js/personal.js:313 msgid "Decrypting files... Please wait, this can take some time." msgstr "" @@ -284,7 +298,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:49 personal.php:50 +#: personal.php:48 personal.php:49 msgid "__language_name__" msgstr "" @@ -589,11 +603,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:416 templates/personal.php:181 +#: templates/admin.php:416 templates/personal.php:171 msgid "Version" msgstr "" -#: templates/admin.php:420 templates/personal.php:184 +#: templates/admin.php:420 templates/personal.php:174 msgid "" "Developed by the ownCloud community, the -licensed by " msgstr "" @@ -664,108 +678,108 @@ msgstr "" msgid "You have used %s of the available %s" msgstr "" -#: templates/personal.php:39 templates/users.php:21 templates/users.php:87 +#: templates/personal.php:38 templates/users.php:21 templates/users.php:87 msgid "Password" msgstr "" -#: templates/personal.php:40 +#: templates/personal.php:39 msgid "Your password was changed" msgstr "" -#: templates/personal.php:41 +#: templates/personal.php:40 msgid "Unable to change your password" msgstr "" -#: templates/personal.php:43 +#: templates/personal.php:42 msgid "Current password" msgstr "" -#: templates/personal.php:46 +#: templates/personal.php:45 msgid "New password" msgstr "" -#: templates/personal.php:50 +#: templates/personal.php:49 msgid "Change password" msgstr "" -#: templates/personal.php:64 templates/users.php:86 +#: templates/personal.php:61 templates/users.php:86 msgid "Full Name" msgstr "" -#: templates/personal.php:81 +#: templates/personal.php:76 msgid "Email" msgstr "" -#: templates/personal.php:83 +#: templates/personal.php:78 msgid "Your email address" msgstr "" -#: templates/personal.php:86 +#: templates/personal.php:81 msgid "" "Fill in an email address to enable password recovery and receive " "notifications" msgstr "" -#: templates/personal.php:96 +#: templates/personal.php:89 msgid "Profile picture" msgstr "" -#: templates/personal.php:101 +#: templates/personal.php:94 msgid "Upload new" msgstr "" -#: templates/personal.php:103 +#: templates/personal.php:96 msgid "Select new from Files" msgstr "" -#: templates/personal.php:104 +#: templates/personal.php:97 msgid "Remove image" msgstr "" -#: templates/personal.php:105 +#: templates/personal.php:98 msgid "Either png or jpg. Ideally square but you will be able to crop it." msgstr "" -#: templates/personal.php:107 +#: templates/personal.php:100 msgid "Your avatar is provided by your original account." msgstr "" -#: templates/personal.php:111 +#: templates/personal.php:104 msgid "Cancel" msgstr "" -#: templates/personal.php:112 +#: templates/personal.php:105 msgid "Choose as profile image" msgstr "" -#: templates/personal.php:120 templates/personal.php:121 +#: templates/personal.php:111 templates/personal.php:112 msgid "Language" msgstr "" -#: templates/personal.php:140 +#: templates/personal.php:131 msgid "Help translate" msgstr "" -#: templates/personal.php:147 +#: templates/personal.php:137 msgid "WebDAV" msgstr "" -#: templates/personal.php:149 +#: templates/personal.php:139 #, php-format msgid "" "Use this address to access your Files via " "WebDAV" msgstr "" -#: templates/personal.php:161 +#: templates/personal.php:151 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:167 +#: templates/personal.php:157 msgid "Log-in password" msgstr "" -#: templates/personal.php:172 +#: templates/personal.php:162 msgid "Decrypt all Files" msgstr "" diff --git a/l10n/fr_CA/user_ldap.po b/l10n/fr_CA/user_ldap.po index 193204b8c23..2c1745b5fce 100644 --- a/l10n/fr_CA/user_ldap.po +++ b/l10n/fr_CA/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-08 01:56-0400\n" -"PO-Revision-Date: 2014-04-08 05:56+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:55+0000\n" "Last-Translator: I Robot\n" "Language-Team: French (Canada) (http://www.transifex.com/projects/p/owncloud/language/fr_CA/)\n" "MIME-Version: 1.0\n" @@ -144,7 +144,7 @@ msgstr[1] "" msgid "Invalid Host" msgstr "" -#: lib/wizard.php:963 +#: lib/wizard.php:983 msgid "Could not find the desired feature" msgstr "" @@ -335,7 +335,7 @@ msgid "Only connect to the replica server." msgstr "" #: templates/settings.php:26 -msgid "Case insensitve LDAP server (Windows)" +msgid "Case insensitive LDAP server (Windows)" msgstr "" #: templates/settings.php:27 diff --git a/l10n/gl/settings.po b/l10n/gl/settings.po index c89f5caaf81..e3e5afbf144 100644 --- a/l10n/gl/settings.po +++ b/l10n/gl/settings.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-10 01:54-0400\n" -"PO-Revision-Date: 2014-04-09 06:10+0000\n" -"Last-Translator: mbouzada \n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:54+0000\n" +"Last-Translator: I Robot\n" "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -86,6 +86,20 @@ msgstr "O grupo xa existe" msgid "Unable to add group" msgstr "Non é posíbel engadir o grupo" +#: ajax/decryptall.php:31 +msgid "Files decrypted successfully" +msgstr "" + +#: ajax/decryptall.php:33 +msgid "" +"Couldn't decrypt your files, please check your owncloud.log or ask your " +"administrator" +msgstr "" + +#: ajax/decryptall.php:36 +msgid "Couldn't decrypt your files, check your password and try again" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "Correo gardado" diff --git a/l10n/gl/user_ldap.po b/l10n/gl/user_ldap.po index f9723ef2270..cf1287f612b 100644 --- a/l10n/gl/user_ldap.po +++ b/l10n/gl/user_ldap.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-09 01:55-0400\n" -"PO-Revision-Date: 2014-04-08 11:00+0000\n" -"Last-Translator: mbouzada \n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:55+0000\n" +"Last-Translator: I Robot\n" "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -146,7 +146,7 @@ msgstr[1] "Atopáronse %s usuarios" msgid "Invalid Host" msgstr "Máquina incorrecta" -#: lib/wizard.php:963 +#: lib/wizard.php:983 msgid "Could not find the desired feature" msgstr "Non foi posíbel atopar a función desexada" @@ -337,8 +337,8 @@ msgid "Only connect to the replica server." msgstr "Conectar só co servidor de réplica." #: templates/settings.php:26 -msgid "Case insensitve LDAP server (Windows)" -msgstr "Servidor LDAP que non distingue entre maiúsculas e minúsculas (Windows)" +msgid "Case insensitive LDAP server (Windows)" +msgstr "" #: templates/settings.php:27 msgid "Turn off SSL certificate validation." diff --git a/l10n/he/settings.po b/l10n/he/settings.po index 1fa7bd0336e..81b69cc64db 100644 --- a/l10n/he/settings.po +++ b/l10n/he/settings.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-10 01:54-0400\n" -"PO-Revision-Date: 2014-04-09 06:10+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n" "MIME-Version: 1.0\n" @@ -85,6 +85,20 @@ msgstr "הקבוצה כבר קיימת" msgid "Unable to add group" msgstr "לא ניתן להוסיף קבוצה" +#: ajax/decryptall.php:31 +msgid "Files decrypted successfully" +msgstr "" + +#: ajax/decryptall.php:33 +msgid "" +"Couldn't decrypt your files, please check your owncloud.log or ask your " +"administrator" +msgstr "" + +#: ajax/decryptall.php:36 +msgid "Couldn't decrypt your files, check your password and try again" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "הדוא״ל נשמר" diff --git a/l10n/he/user_ldap.po b/l10n/he/user_ldap.po index 761cc4181c9..5f680c4b2df 100644 --- a/l10n/he/user_ldap.po +++ b/l10n/he/user_ldap.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-08 01:56-0400\n" -"PO-Revision-Date: 2014-04-08 05:56+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:55+0000\n" "Last-Translator: I Robot\n" "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n" "MIME-Version: 1.0\n" @@ -145,7 +145,7 @@ msgstr[1] "" msgid "Invalid Host" msgstr "" -#: lib/wizard.php:963 +#: lib/wizard.php:983 msgid "Could not find the desired feature" msgstr "" @@ -336,7 +336,7 @@ msgid "Only connect to the replica server." msgstr "" #: templates/settings.php:26 -msgid "Case insensitve LDAP server (Windows)" +msgid "Case insensitive LDAP server (Windows)" msgstr "" #: templates/settings.php:27 diff --git a/l10n/hi/settings.po b/l10n/hi/settings.po index 9b0da8d64aa..5bf71a571fd 100644 --- a/l10n/hi/settings.po +++ b/l10n/hi/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-03-26 01:55-0400\n" -"PO-Revision-Date: 2014-03-26 05:55+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159 +#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149 msgid "Encryption" msgstr "" @@ -64,7 +64,7 @@ msgid "Unable to load list from App Store" msgstr "" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 changepassword/controller.php:55 +#: ajax/togglegroups.php:20 changepassword/controller.php:49 msgid "Authentication error" msgstr "" @@ -84,6 +84,20 @@ msgstr "" msgid "Unable to add group" msgstr "" +#: ajax/decryptall.php:31 +msgid "Files decrypted successfully" +msgstr "" + +#: ajax/decryptall.php:33 +msgid "" +"Couldn't decrypt your files, please check your owncloud.log or ask your " +"administrator" +msgstr "" + +#: ajax/decryptall.php:36 +msgid "Couldn't decrypt your files, check your password and try again" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -126,32 +140,32 @@ msgstr "" msgid "Couldn't update app." msgstr "" -#: changepassword/controller.php:20 +#: changepassword/controller.php:17 msgid "Wrong password" msgstr "" -#: changepassword/controller.php:42 +#: changepassword/controller.php:36 msgid "No user supplied" msgstr "" -#: changepassword/controller.php:74 +#: changepassword/controller.php:68 msgid "" "Please provide an admin recovery password, otherwise all user data will be " "lost" msgstr "" -#: changepassword/controller.php:79 +#: changepassword/controller.php:73 msgid "" "Wrong admin recovery password. Please check the password and try again." msgstr "" -#: changepassword/controller.php:87 +#: changepassword/controller.php:81 msgid "" "Back-end doesn't support password change, but the users encryption key was " "successfully updated." msgstr "" -#: changepassword/controller.php:92 changepassword/controller.php:103 +#: changepassword/controller.php:86 changepassword/controller.php:97 msgid "Unable to change password" msgstr "" @@ -203,7 +217,7 @@ msgstr "" msgid "Error" msgstr "त्रुटि" -#: js/apps.js:153 templates/apps.php:54 +#: js/apps.js:153 templates/apps.php:55 msgid "Update" msgstr "अद्यतन" @@ -211,31 +225,31 @@ msgstr "अद्यतन" msgid "Updated" msgstr "" -#: js/personal.js:246 +#: js/personal.js:243 msgid "Select a profile picture" msgstr "" -#: js/personal.js:277 +#: js/personal.js:274 msgid "Very weak password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:275 msgid "Weak password" msgstr "" -#: js/personal.js:279 +#: js/personal.js:276 msgid "So-so password" msgstr "" -#: js/personal.js:280 +#: js/personal.js:277 msgid "Good password" msgstr "" -#: js/personal.js:281 +#: js/personal.js:278 msgid "Strong password" msgstr "" -#: js/personal.js:316 +#: js/personal.js:313 msgid "Decrypting files... Please wait, this can take some time." msgstr "" @@ -284,7 +298,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:49 personal.php:50 +#: personal.php:48 personal.php:49 msgid "__language_name__" msgstr "" @@ -589,11 +603,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:416 templates/personal.php:181 +#: templates/admin.php:416 templates/personal.php:171 msgid "Version" msgstr "" -#: templates/admin.php:420 templates/personal.php:184 +#: templates/admin.php:420 templates/personal.php:174 msgid "" "Developed by the ownCloud community, the -licensed by " msgstr "" @@ -664,108 +678,108 @@ msgstr "" msgid "You have used %s of the available %s" msgstr "" -#: templates/personal.php:39 templates/users.php:21 templates/users.php:87 +#: templates/personal.php:38 templates/users.php:21 templates/users.php:87 msgid "Password" msgstr "पासवर्ड" -#: templates/personal.php:40 +#: templates/personal.php:39 msgid "Your password was changed" msgstr "" -#: templates/personal.php:41 +#: templates/personal.php:40 msgid "Unable to change your password" msgstr "" -#: templates/personal.php:43 +#: templates/personal.php:42 msgid "Current password" msgstr "" -#: templates/personal.php:46 +#: templates/personal.php:45 msgid "New password" msgstr "नया पासवर्ड" -#: templates/personal.php:50 +#: templates/personal.php:49 msgid "Change password" msgstr "" -#: templates/personal.php:64 templates/users.php:86 +#: templates/personal.php:61 templates/users.php:86 msgid "Full Name" msgstr "" -#: templates/personal.php:81 +#: templates/personal.php:76 msgid "Email" msgstr "" -#: templates/personal.php:83 +#: templates/personal.php:78 msgid "Your email address" msgstr "" -#: templates/personal.php:86 +#: templates/personal.php:81 msgid "" "Fill in an email address to enable password recovery and receive " "notifications" msgstr "" -#: templates/personal.php:96 +#: templates/personal.php:89 msgid "Profile picture" msgstr "" -#: templates/personal.php:101 +#: templates/personal.php:94 msgid "Upload new" msgstr "" -#: templates/personal.php:103 +#: templates/personal.php:96 msgid "Select new from Files" msgstr "" -#: templates/personal.php:104 +#: templates/personal.php:97 msgid "Remove image" msgstr "" -#: templates/personal.php:105 +#: templates/personal.php:98 msgid "Either png or jpg. Ideally square but you will be able to crop it." msgstr "" -#: templates/personal.php:107 +#: templates/personal.php:100 msgid "Your avatar is provided by your original account." msgstr "" -#: templates/personal.php:111 +#: templates/personal.php:104 msgid "Cancel" msgstr "" -#: templates/personal.php:112 +#: templates/personal.php:105 msgid "Choose as profile image" msgstr "" -#: templates/personal.php:120 templates/personal.php:121 +#: templates/personal.php:111 templates/personal.php:112 msgid "Language" msgstr "" -#: templates/personal.php:140 +#: templates/personal.php:131 msgid "Help translate" msgstr "" -#: templates/personal.php:147 +#: templates/personal.php:137 msgid "WebDAV" msgstr "" -#: templates/personal.php:149 +#: templates/personal.php:139 #, php-format msgid "" "Use this address to access your Files via " "WebDAV" msgstr "" -#: templates/personal.php:161 +#: templates/personal.php:151 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:167 +#: templates/personal.php:157 msgid "Log-in password" msgstr "" -#: templates/personal.php:172 +#: templates/personal.php:162 msgid "Decrypt all Files" msgstr "" diff --git a/l10n/hi/user_ldap.po b/l10n/hi/user_ldap.po index 904a9c1fab6..5cf8c009329 100644 --- a/l10n/hi/user_ldap.po +++ b/l10n/hi/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-08 01:56-0400\n" -"PO-Revision-Date: 2014-04-08 05:56+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:55+0000\n" "Last-Translator: I Robot\n" "Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n" "MIME-Version: 1.0\n" @@ -144,7 +144,7 @@ msgstr[1] "" msgid "Invalid Host" msgstr "" -#: lib/wizard.php:963 +#: lib/wizard.php:983 msgid "Could not find the desired feature" msgstr "" @@ -335,7 +335,7 @@ msgid "Only connect to the replica server." msgstr "" #: templates/settings.php:26 -msgid "Case insensitve LDAP server (Windows)" +msgid "Case insensitive LDAP server (Windows)" msgstr "" #: templates/settings.php:27 diff --git a/l10n/hr/settings.po b/l10n/hr/settings.po index c1b59f382cd..0fa0737b754 100644 --- a/l10n/hr/settings.po +++ b/l10n/hr/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-03-26 01:55-0400\n" -"PO-Revision-Date: 2014-03-26 05:55+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159 +#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149 msgid "Encryption" msgstr "" @@ -64,7 +64,7 @@ msgid "Unable to load list from App Store" msgstr "Nemogićnost učitavanja liste sa Apps Stora" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 changepassword/controller.php:55 +#: ajax/togglegroups.php:20 changepassword/controller.php:49 msgid "Authentication error" msgstr "Greška kod autorizacije" @@ -84,6 +84,20 @@ msgstr "" msgid "Unable to add group" msgstr "" +#: ajax/decryptall.php:31 +msgid "Files decrypted successfully" +msgstr "" + +#: ajax/decryptall.php:33 +msgid "" +"Couldn't decrypt your files, please check your owncloud.log or ask your " +"administrator" +msgstr "" + +#: ajax/decryptall.php:36 +msgid "Couldn't decrypt your files, check your password and try again" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "Email spremljen" @@ -126,32 +140,32 @@ msgstr "" msgid "Couldn't update app." msgstr "" -#: changepassword/controller.php:20 +#: changepassword/controller.php:17 msgid "Wrong password" msgstr "" -#: changepassword/controller.php:42 +#: changepassword/controller.php:36 msgid "No user supplied" msgstr "" -#: changepassword/controller.php:74 +#: changepassword/controller.php:68 msgid "" "Please provide an admin recovery password, otherwise all user data will be " "lost" msgstr "" -#: changepassword/controller.php:79 +#: changepassword/controller.php:73 msgid "" "Wrong admin recovery password. Please check the password and try again." msgstr "" -#: changepassword/controller.php:87 +#: changepassword/controller.php:81 msgid "" "Back-end doesn't support password change, but the users encryption key was " "successfully updated." msgstr "" -#: changepassword/controller.php:92 changepassword/controller.php:103 +#: changepassword/controller.php:86 changepassword/controller.php:97 msgid "Unable to change password" msgstr "" @@ -203,7 +217,7 @@ msgstr "" msgid "Error" msgstr "Greška" -#: js/apps.js:153 templates/apps.php:54 +#: js/apps.js:153 templates/apps.php:55 msgid "Update" msgstr "" @@ -211,31 +225,31 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:246 +#: js/personal.js:243 msgid "Select a profile picture" msgstr "" -#: js/personal.js:277 +#: js/personal.js:274 msgid "Very weak password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:275 msgid "Weak password" msgstr "" -#: js/personal.js:279 +#: js/personal.js:276 msgid "So-so password" msgstr "" -#: js/personal.js:280 +#: js/personal.js:277 msgid "Good password" msgstr "" -#: js/personal.js:281 +#: js/personal.js:278 msgid "Strong password" msgstr "" -#: js/personal.js:316 +#: js/personal.js:313 msgid "Decrypting files... Please wait, this can take some time." msgstr "" @@ -284,7 +298,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:49 personal.php:50 +#: personal.php:48 personal.php:49 msgid "__language_name__" msgstr "__ime_jezika__" @@ -589,11 +603,11 @@ msgstr "više" msgid "Less" msgstr "" -#: templates/admin.php:416 templates/personal.php:181 +#: templates/admin.php:416 templates/personal.php:171 msgid "Version" msgstr "" -#: templates/admin.php:420 templates/personal.php:184 +#: templates/admin.php:420 templates/personal.php:174 msgid "" "Developed by the ownCloud community, the -licensed by " msgstr "" @@ -664,108 +678,108 @@ msgstr "" msgid "You have used %s of the available %s" msgstr "" -#: templates/personal.php:39 templates/users.php:21 templates/users.php:87 +#: templates/personal.php:38 templates/users.php:21 templates/users.php:87 msgid "Password" msgstr "Lozinka" -#: templates/personal.php:40 +#: templates/personal.php:39 msgid "Your password was changed" msgstr "" -#: templates/personal.php:41 +#: templates/personal.php:40 msgid "Unable to change your password" msgstr "Nemoguće promijeniti lozinku" -#: templates/personal.php:43 +#: templates/personal.php:42 msgid "Current password" msgstr "Trenutna lozinka" -#: templates/personal.php:46 +#: templates/personal.php:45 msgid "New password" msgstr "Nova lozinka" -#: templates/personal.php:50 +#: templates/personal.php:49 msgid "Change password" msgstr "Izmjena lozinke" -#: templates/personal.php:64 templates/users.php:86 +#: templates/personal.php:61 templates/users.php:86 msgid "Full Name" msgstr "" -#: templates/personal.php:81 +#: templates/personal.php:76 msgid "Email" msgstr "e-mail adresa" -#: templates/personal.php:83 +#: templates/personal.php:78 msgid "Your email address" msgstr "Vaša e-mail adresa" -#: templates/personal.php:86 +#: templates/personal.php:81 msgid "" "Fill in an email address to enable password recovery and receive " "notifications" msgstr "" -#: templates/personal.php:96 +#: templates/personal.php:89 msgid "Profile picture" msgstr "" -#: templates/personal.php:101 +#: templates/personal.php:94 msgid "Upload new" msgstr "" -#: templates/personal.php:103 +#: templates/personal.php:96 msgid "Select new from Files" msgstr "" -#: templates/personal.php:104 +#: templates/personal.php:97 msgid "Remove image" msgstr "" -#: templates/personal.php:105 +#: templates/personal.php:98 msgid "Either png or jpg. Ideally square but you will be able to crop it." msgstr "" -#: templates/personal.php:107 +#: templates/personal.php:100 msgid "Your avatar is provided by your original account." msgstr "" -#: templates/personal.php:111 +#: templates/personal.php:104 msgid "Cancel" msgstr "Odustani" -#: templates/personal.php:112 +#: templates/personal.php:105 msgid "Choose as profile image" msgstr "" -#: templates/personal.php:120 templates/personal.php:121 +#: templates/personal.php:111 templates/personal.php:112 msgid "Language" msgstr "Jezik" -#: templates/personal.php:140 +#: templates/personal.php:131 msgid "Help translate" msgstr "Pomoć prevesti" -#: templates/personal.php:147 +#: templates/personal.php:137 msgid "WebDAV" msgstr "" -#: templates/personal.php:149 +#: templates/personal.php:139 #, php-format msgid "" "Use this address to access your Files via " "WebDAV" msgstr "" -#: templates/personal.php:161 +#: templates/personal.php:151 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:167 +#: templates/personal.php:157 msgid "Log-in password" msgstr "" -#: templates/personal.php:172 +#: templates/personal.php:162 msgid "Decrypt all Files" msgstr "" diff --git a/l10n/hr/user_ldap.po b/l10n/hr/user_ldap.po index 110b3e10c6c..d2da2123936 100644 --- a/l10n/hr/user_ldap.po +++ b/l10n/hr/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-08 01:56-0400\n" -"PO-Revision-Date: 2014-04-08 05:56+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:55+0000\n" "Last-Translator: I Robot\n" "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n" "MIME-Version: 1.0\n" @@ -146,7 +146,7 @@ msgstr[2] "" msgid "Invalid Host" msgstr "" -#: lib/wizard.php:963 +#: lib/wizard.php:983 msgid "Could not find the desired feature" msgstr "" @@ -337,7 +337,7 @@ msgid "Only connect to the replica server." msgstr "" #: templates/settings.php:26 -msgid "Case insensitve LDAP server (Windows)" +msgid "Case insensitive LDAP server (Windows)" msgstr "" #: templates/settings.php:27 diff --git a/l10n/hu_HU/settings.po b/l10n/hu_HU/settings.po index e0457774ded..0f77a8e7a02 100644 --- a/l10n/hu_HU/settings.po +++ b/l10n/hu_HU/settings.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-10 01:54-0400\n" -"PO-Revision-Date: 2014-04-09 06:10+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n" "MIME-Version: 1.0\n" @@ -88,6 +88,20 @@ msgstr "A csoport már létezik" msgid "Unable to add group" msgstr "A csoport nem hozható létre" +#: ajax/decryptall.php:31 +msgid "Files decrypted successfully" +msgstr "" + +#: ajax/decryptall.php:33 +msgid "" +"Couldn't decrypt your files, please check your owncloud.log or ask your " +"administrator" +msgstr "" + +#: ajax/decryptall.php:36 +msgid "Couldn't decrypt your files, check your password and try again" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "Email mentve" diff --git a/l10n/hu_HU/user_ldap.po b/l10n/hu_HU/user_ldap.po index 47568fd0f88..09f453e54f1 100644 --- a/l10n/hu_HU/user_ldap.po +++ b/l10n/hu_HU/user_ldap.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-08 01:56-0400\n" -"PO-Revision-Date: 2014-04-08 05:56+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:55+0000\n" "Last-Translator: I Robot\n" "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n" "MIME-Version: 1.0\n" @@ -146,7 +146,7 @@ msgstr[1] "%s felhasználó van" msgid "Invalid Host" msgstr "Érvénytelen gépnév" -#: lib/wizard.php:963 +#: lib/wizard.php:983 msgid "Could not find the desired feature" msgstr "A kívánt funkció nem található" @@ -337,8 +337,8 @@ msgid "Only connect to the replica server." msgstr "Csak a másodlagos (másolati) kiszolgálóhoz kapcsolódjunk." #: templates/settings.php:26 -msgid "Case insensitve LDAP server (Windows)" -msgstr "Az LDAP-kiszolgáló nem tesz különbséget a kis- és nagybetűk között (Windows)" +msgid "Case insensitive LDAP server (Windows)" +msgstr "" #: templates/settings.php:27 msgid "Turn off SSL certificate validation." diff --git a/l10n/hy/settings.po b/l10n/hy/settings.po index 5d2492a437c..b2d395b9e79 100644 --- a/l10n/hy/settings.po +++ b/l10n/hy/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-03-26 01:55-0400\n" -"PO-Revision-Date: 2014-03-26 05:55+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159 +#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149 msgid "Encryption" msgstr "" @@ -64,7 +64,7 @@ msgid "Unable to load list from App Store" msgstr "" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 changepassword/controller.php:55 +#: ajax/togglegroups.php:20 changepassword/controller.php:49 msgid "Authentication error" msgstr "" @@ -84,6 +84,20 @@ msgstr "" msgid "Unable to add group" msgstr "" +#: ajax/decryptall.php:31 +msgid "Files decrypted successfully" +msgstr "" + +#: ajax/decryptall.php:33 +msgid "" +"Couldn't decrypt your files, please check your owncloud.log or ask your " +"administrator" +msgstr "" + +#: ajax/decryptall.php:36 +msgid "Couldn't decrypt your files, check your password and try again" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -126,32 +140,32 @@ msgstr "" msgid "Couldn't update app." msgstr "" -#: changepassword/controller.php:20 +#: changepassword/controller.php:17 msgid "Wrong password" msgstr "" -#: changepassword/controller.php:42 +#: changepassword/controller.php:36 msgid "No user supplied" msgstr "" -#: changepassword/controller.php:74 +#: changepassword/controller.php:68 msgid "" "Please provide an admin recovery password, otherwise all user data will be " "lost" msgstr "" -#: changepassword/controller.php:79 +#: changepassword/controller.php:73 msgid "" "Wrong admin recovery password. Please check the password and try again." msgstr "" -#: changepassword/controller.php:87 +#: changepassword/controller.php:81 msgid "" "Back-end doesn't support password change, but the users encryption key was " "successfully updated." msgstr "" -#: changepassword/controller.php:92 changepassword/controller.php:103 +#: changepassword/controller.php:86 changepassword/controller.php:97 msgid "Unable to change password" msgstr "" @@ -203,7 +217,7 @@ msgstr "" msgid "Error" msgstr "" -#: js/apps.js:153 templates/apps.php:54 +#: js/apps.js:153 templates/apps.php:55 msgid "Update" msgstr "" @@ -211,31 +225,31 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:246 +#: js/personal.js:243 msgid "Select a profile picture" msgstr "" -#: js/personal.js:277 +#: js/personal.js:274 msgid "Very weak password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:275 msgid "Weak password" msgstr "" -#: js/personal.js:279 +#: js/personal.js:276 msgid "So-so password" msgstr "" -#: js/personal.js:280 +#: js/personal.js:277 msgid "Good password" msgstr "" -#: js/personal.js:281 +#: js/personal.js:278 msgid "Strong password" msgstr "" -#: js/personal.js:316 +#: js/personal.js:313 msgid "Decrypting files... Please wait, this can take some time." msgstr "" @@ -284,7 +298,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:49 personal.php:50 +#: personal.php:48 personal.php:49 msgid "__language_name__" msgstr "" @@ -589,11 +603,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:416 templates/personal.php:181 +#: templates/admin.php:416 templates/personal.php:171 msgid "Version" msgstr "" -#: templates/admin.php:420 templates/personal.php:184 +#: templates/admin.php:420 templates/personal.php:174 msgid "" "Developed by the ownCloud community, the -licensed by " msgstr "" @@ -664,108 +678,108 @@ msgstr "" msgid "You have used %s of the available %s" msgstr "" -#: templates/personal.php:39 templates/users.php:21 templates/users.php:87 +#: templates/personal.php:38 templates/users.php:21 templates/users.php:87 msgid "Password" msgstr "" -#: templates/personal.php:40 +#: templates/personal.php:39 msgid "Your password was changed" msgstr "" -#: templates/personal.php:41 +#: templates/personal.php:40 msgid "Unable to change your password" msgstr "" -#: templates/personal.php:43 +#: templates/personal.php:42 msgid "Current password" msgstr "" -#: templates/personal.php:46 +#: templates/personal.php:45 msgid "New password" msgstr "" -#: templates/personal.php:50 +#: templates/personal.php:49 msgid "Change password" msgstr "" -#: templates/personal.php:64 templates/users.php:86 +#: templates/personal.php:61 templates/users.php:86 msgid "Full Name" msgstr "" -#: templates/personal.php:81 +#: templates/personal.php:76 msgid "Email" msgstr "" -#: templates/personal.php:83 +#: templates/personal.php:78 msgid "Your email address" msgstr "" -#: templates/personal.php:86 +#: templates/personal.php:81 msgid "" "Fill in an email address to enable password recovery and receive " "notifications" msgstr "" -#: templates/personal.php:96 +#: templates/personal.php:89 msgid "Profile picture" msgstr "" -#: templates/personal.php:101 +#: templates/personal.php:94 msgid "Upload new" msgstr "" -#: templates/personal.php:103 +#: templates/personal.php:96 msgid "Select new from Files" msgstr "" -#: templates/personal.php:104 +#: templates/personal.php:97 msgid "Remove image" msgstr "" -#: templates/personal.php:105 +#: templates/personal.php:98 msgid "Either png or jpg. Ideally square but you will be able to crop it." msgstr "" -#: templates/personal.php:107 +#: templates/personal.php:100 msgid "Your avatar is provided by your original account." msgstr "" -#: templates/personal.php:111 +#: templates/personal.php:104 msgid "Cancel" msgstr "" -#: templates/personal.php:112 +#: templates/personal.php:105 msgid "Choose as profile image" msgstr "" -#: templates/personal.php:120 templates/personal.php:121 +#: templates/personal.php:111 templates/personal.php:112 msgid "Language" msgstr "" -#: templates/personal.php:140 +#: templates/personal.php:131 msgid "Help translate" msgstr "" -#: templates/personal.php:147 +#: templates/personal.php:137 msgid "WebDAV" msgstr "" -#: templates/personal.php:149 +#: templates/personal.php:139 #, php-format msgid "" "Use this address to access your Files via " "WebDAV" msgstr "" -#: templates/personal.php:161 +#: templates/personal.php:151 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:167 +#: templates/personal.php:157 msgid "Log-in password" msgstr "" -#: templates/personal.php:172 +#: templates/personal.php:162 msgid "Decrypt all Files" msgstr "" diff --git a/l10n/hy/user_ldap.po b/l10n/hy/user_ldap.po index 21b936379d0..62b00150312 100644 --- a/l10n/hy/user_ldap.po +++ b/l10n/hy/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-08 01:56-0400\n" -"PO-Revision-Date: 2014-04-08 05:56+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:55+0000\n" "Last-Translator: I Robot\n" "Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n" "MIME-Version: 1.0\n" @@ -144,7 +144,7 @@ msgstr[1] "" msgid "Invalid Host" msgstr "" -#: lib/wizard.php:963 +#: lib/wizard.php:983 msgid "Could not find the desired feature" msgstr "" @@ -335,7 +335,7 @@ msgid "Only connect to the replica server." msgstr "" #: templates/settings.php:26 -msgid "Case insensitve LDAP server (Windows)" +msgid "Case insensitive LDAP server (Windows)" msgstr "" #: templates/settings.php:27 diff --git a/l10n/ia/settings.po b/l10n/ia/settings.po index e3e14d2e0b2..29fa98e3ad4 100644 --- a/l10n/ia/settings.po +++ b/l10n/ia/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-03-26 01:55-0400\n" -"PO-Revision-Date: 2014-03-26 05:55+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159 +#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149 msgid "Encryption" msgstr "" @@ -64,7 +64,7 @@ msgid "Unable to load list from App Store" msgstr "" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 changepassword/controller.php:55 +#: ajax/togglegroups.php:20 changepassword/controller.php:49 msgid "Authentication error" msgstr "" @@ -84,6 +84,20 @@ msgstr "" msgid "Unable to add group" msgstr "" +#: ajax/decryptall.php:31 +msgid "Files decrypted successfully" +msgstr "" + +#: ajax/decryptall.php:33 +msgid "" +"Couldn't decrypt your files, please check your owncloud.log or ask your " +"administrator" +msgstr "" + +#: ajax/decryptall.php:36 +msgid "Couldn't decrypt your files, check your password and try again" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -126,32 +140,32 @@ msgstr "" msgid "Couldn't update app." msgstr "" -#: changepassword/controller.php:20 +#: changepassword/controller.php:17 msgid "Wrong password" msgstr "" -#: changepassword/controller.php:42 +#: changepassword/controller.php:36 msgid "No user supplied" msgstr "" -#: changepassword/controller.php:74 +#: changepassword/controller.php:68 msgid "" "Please provide an admin recovery password, otherwise all user data will be " "lost" msgstr "" -#: changepassword/controller.php:79 +#: changepassword/controller.php:73 msgid "" "Wrong admin recovery password. Please check the password and try again." msgstr "" -#: changepassword/controller.php:87 +#: changepassword/controller.php:81 msgid "" "Back-end doesn't support password change, but the users encryption key was " "successfully updated." msgstr "" -#: changepassword/controller.php:92 changepassword/controller.php:103 +#: changepassword/controller.php:86 changepassword/controller.php:97 msgid "Unable to change password" msgstr "" @@ -203,7 +217,7 @@ msgstr "" msgid "Error" msgstr "Error" -#: js/apps.js:153 templates/apps.php:54 +#: js/apps.js:153 templates/apps.php:55 msgid "Update" msgstr "Actualisar" @@ -211,31 +225,31 @@ msgstr "Actualisar" msgid "Updated" msgstr "" -#: js/personal.js:246 +#: js/personal.js:243 msgid "Select a profile picture" msgstr "" -#: js/personal.js:277 +#: js/personal.js:274 msgid "Very weak password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:275 msgid "Weak password" msgstr "" -#: js/personal.js:279 +#: js/personal.js:276 msgid "So-so password" msgstr "" -#: js/personal.js:280 +#: js/personal.js:277 msgid "Good password" msgstr "" -#: js/personal.js:281 +#: js/personal.js:278 msgid "Strong password" msgstr "" -#: js/personal.js:316 +#: js/personal.js:313 msgid "Decrypting files... Please wait, this can take some time." msgstr "" @@ -284,7 +298,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:49 personal.php:50 +#: personal.php:48 personal.php:49 msgid "__language_name__" msgstr "Interlingua" @@ -589,11 +603,11 @@ msgstr "Plus" msgid "Less" msgstr "" -#: templates/admin.php:416 templates/personal.php:181 +#: templates/admin.php:416 templates/personal.php:171 msgid "Version" msgstr "" -#: templates/admin.php:420 templates/personal.php:184 +#: templates/admin.php:420 templates/personal.php:174 msgid "" "Developed by the ownCloud community, the -licensed by " msgstr "" @@ -664,108 +678,108 @@ msgstr "" msgid "You have used %s of the available %s" msgstr "" -#: templates/personal.php:39 templates/users.php:21 templates/users.php:87 +#: templates/personal.php:38 templates/users.php:21 templates/users.php:87 msgid "Password" msgstr "Contrasigno" -#: templates/personal.php:40 +#: templates/personal.php:39 msgid "Your password was changed" msgstr "" -#: templates/personal.php:41 +#: templates/personal.php:40 msgid "Unable to change your password" msgstr "Non pote cambiar tu contrasigno" -#: templates/personal.php:43 +#: templates/personal.php:42 msgid "Current password" msgstr "Contrasigno currente" -#: templates/personal.php:46 +#: templates/personal.php:45 msgid "New password" msgstr "Nove contrasigno" -#: templates/personal.php:50 +#: templates/personal.php:49 msgid "Change password" msgstr "Cambiar contrasigno" -#: templates/personal.php:64 templates/users.php:86 +#: templates/personal.php:61 templates/users.php:86 msgid "Full Name" msgstr "" -#: templates/personal.php:81 +#: templates/personal.php:76 msgid "Email" msgstr "E-posta" -#: templates/personal.php:83 +#: templates/personal.php:78 msgid "Your email address" msgstr "Tu adresse de e-posta" -#: templates/personal.php:86 +#: templates/personal.php:81 msgid "" "Fill in an email address to enable password recovery and receive " "notifications" msgstr "" -#: templates/personal.php:96 +#: templates/personal.php:89 msgid "Profile picture" msgstr "Imagine de profilo" -#: templates/personal.php:101 +#: templates/personal.php:94 msgid "Upload new" msgstr "" -#: templates/personal.php:103 +#: templates/personal.php:96 msgid "Select new from Files" msgstr "" -#: templates/personal.php:104 +#: templates/personal.php:97 msgid "Remove image" msgstr "" -#: templates/personal.php:105 +#: templates/personal.php:98 msgid "Either png or jpg. Ideally square but you will be able to crop it." msgstr "" -#: templates/personal.php:107 +#: templates/personal.php:100 msgid "Your avatar is provided by your original account." msgstr "" -#: templates/personal.php:111 +#: templates/personal.php:104 msgid "Cancel" msgstr "Cancellar" -#: templates/personal.php:112 +#: templates/personal.php:105 msgid "Choose as profile image" msgstr "" -#: templates/personal.php:120 templates/personal.php:121 +#: templates/personal.php:111 templates/personal.php:112 msgid "Language" msgstr "Linguage" -#: templates/personal.php:140 +#: templates/personal.php:131 msgid "Help translate" msgstr "Adjuta a traducer" -#: templates/personal.php:147 +#: templates/personal.php:137 msgid "WebDAV" msgstr "" -#: templates/personal.php:149 +#: templates/personal.php:139 #, php-format msgid "" "Use this address to access your Files via " "WebDAV" msgstr "" -#: templates/personal.php:161 +#: templates/personal.php:151 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:167 +#: templates/personal.php:157 msgid "Log-in password" msgstr "" -#: templates/personal.php:172 +#: templates/personal.php:162 msgid "Decrypt all Files" msgstr "" diff --git a/l10n/ia/user_ldap.po b/l10n/ia/user_ldap.po index 6109e27e981..eba9f5be06a 100644 --- a/l10n/ia/user_ldap.po +++ b/l10n/ia/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-08 01:56-0400\n" -"PO-Revision-Date: 2014-04-08 05:56+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:55+0000\n" "Last-Translator: I Robot\n" "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n" "MIME-Version: 1.0\n" @@ -144,7 +144,7 @@ msgstr[1] "" msgid "Invalid Host" msgstr "" -#: lib/wizard.php:963 +#: lib/wizard.php:983 msgid "Could not find the desired feature" msgstr "" @@ -335,7 +335,7 @@ msgid "Only connect to the replica server." msgstr "" #: templates/settings.php:26 -msgid "Case insensitve LDAP server (Windows)" +msgid "Case insensitive LDAP server (Windows)" msgstr "" #: templates/settings.php:27 diff --git a/l10n/id/settings.po b/l10n/id/settings.po index 551731125a2..e5b36822dfa 100644 --- a/l10n/id/settings.po +++ b/l10n/id/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-10 01:54-0400\n" -"PO-Revision-Date: 2014-04-09 06:10+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n" "MIME-Version: 1.0\n" @@ -84,6 +84,20 @@ msgstr "Grup sudah ada" msgid "Unable to add group" msgstr "Tidak dapat menambah grup" +#: ajax/decryptall.php:31 +msgid "Files decrypted successfully" +msgstr "" + +#: ajax/decryptall.php:33 +msgid "" +"Couldn't decrypt your files, please check your owncloud.log or ask your " +"administrator" +msgstr "" + +#: ajax/decryptall.php:36 +msgid "Couldn't decrypt your files, check your password and try again" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "Email disimpan" diff --git a/l10n/id/user_ldap.po b/l10n/id/user_ldap.po index 8317de9115d..9ddcdfa9c68 100644 --- a/l10n/id/user_ldap.po +++ b/l10n/id/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-08 01:56-0400\n" -"PO-Revision-Date: 2014-04-08 05:56+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:55+0000\n" "Last-Translator: I Robot\n" "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n" "MIME-Version: 1.0\n" @@ -142,7 +142,7 @@ msgstr[0] "" msgid "Invalid Host" msgstr "" -#: lib/wizard.php:963 +#: lib/wizard.php:983 msgid "Could not find the desired feature" msgstr "" @@ -333,8 +333,8 @@ msgid "Only connect to the replica server." msgstr "" #: templates/settings.php:26 -msgid "Case insensitve LDAP server (Windows)" -msgstr "Server LDAP dengan kapitalisasi tidak sensitif (Windows)" +msgid "Case insensitive LDAP server (Windows)" +msgstr "" #: templates/settings.php:27 msgid "Turn off SSL certificate validation." diff --git a/l10n/is/settings.po b/l10n/is/settings.po index 0d1a019ba82..835206d3ff5 100644 --- a/l10n/is/settings.po +++ b/l10n/is/settings.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-03-26 01:55-0400\n" -"PO-Revision-Date: 2014-03-26 05:55+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n" "MIME-Version: 1.0\n" @@ -52,7 +52,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159 +#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149 msgid "Encryption" msgstr "Dulkóðun" @@ -65,7 +65,7 @@ msgid "Unable to load list from App Store" msgstr "Ekki tókst að hlaða lista frá forrita síðu" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 changepassword/controller.php:55 +#: ajax/togglegroups.php:20 changepassword/controller.php:49 msgid "Authentication error" msgstr "Villa við auðkenningu" @@ -85,6 +85,20 @@ msgstr "Hópur er þegar til" msgid "Unable to add group" msgstr "Ekki tókst að bæta við hóp" +#: ajax/decryptall.php:31 +msgid "Files decrypted successfully" +msgstr "" + +#: ajax/decryptall.php:33 +msgid "" +"Couldn't decrypt your files, please check your owncloud.log or ask your " +"administrator" +msgstr "" + +#: ajax/decryptall.php:36 +msgid "Couldn't decrypt your files, check your password and try again" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "Netfang vistað" @@ -127,32 +141,32 @@ msgstr "Ekki tókst að fjarlægja notanda úr hópnum %s" msgid "Couldn't update app." msgstr "" -#: changepassword/controller.php:20 +#: changepassword/controller.php:17 msgid "Wrong password" msgstr "" -#: changepassword/controller.php:42 +#: changepassword/controller.php:36 msgid "No user supplied" msgstr "" -#: changepassword/controller.php:74 +#: changepassword/controller.php:68 msgid "" "Please provide an admin recovery password, otherwise all user data will be " "lost" msgstr "" -#: changepassword/controller.php:79 +#: changepassword/controller.php:73 msgid "" "Wrong admin recovery password. Please check the password and try again." msgstr "" -#: changepassword/controller.php:87 +#: changepassword/controller.php:81 msgid "" "Back-end doesn't support password change, but the users encryption key was " "successfully updated." msgstr "" -#: changepassword/controller.php:92 changepassword/controller.php:103 +#: changepassword/controller.php:86 changepassword/controller.php:97 msgid "Unable to change password" msgstr "" @@ -204,7 +218,7 @@ msgstr "" msgid "Error" msgstr "Villa" -#: js/apps.js:153 templates/apps.php:54 +#: js/apps.js:153 templates/apps.php:55 msgid "Update" msgstr "Uppfæra" @@ -212,31 +226,31 @@ msgstr "Uppfæra" msgid "Updated" msgstr "Uppfært" -#: js/personal.js:246 +#: js/personal.js:243 msgid "Select a profile picture" msgstr "" -#: js/personal.js:277 +#: js/personal.js:274 msgid "Very weak password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:275 msgid "Weak password" msgstr "" -#: js/personal.js:279 +#: js/personal.js:276 msgid "So-so password" msgstr "" -#: js/personal.js:280 +#: js/personal.js:277 msgid "Good password" msgstr "" -#: js/personal.js:281 +#: js/personal.js:278 msgid "Strong password" msgstr "" -#: js/personal.js:316 +#: js/personal.js:313 msgid "Decrypting files... Please wait, this can take some time." msgstr "" @@ -285,7 +299,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:49 personal.php:50 +#: personal.php:48 personal.php:49 msgid "__language_name__" msgstr "__nafn_tungumáls__" @@ -590,11 +604,11 @@ msgstr "Meira" msgid "Less" msgstr "Minna" -#: templates/admin.php:416 templates/personal.php:181 +#: templates/admin.php:416 templates/personal.php:171 msgid "Version" msgstr "Útgáfa" -#: templates/admin.php:420 templates/personal.php:184 +#: templates/admin.php:420 templates/personal.php:174 msgid "" "Developed by the ownCloud community, the -licensed by " msgstr "-leyfi skráð af " @@ -665,108 +679,108 @@ msgstr "" msgid "You have used %s of the available %s" msgstr "Þú hefur notað %s af tiltæku %s" -#: templates/personal.php:39 templates/users.php:21 templates/users.php:87 +#: templates/personal.php:38 templates/users.php:21 templates/users.php:87 msgid "Password" msgstr "Lykilorð" -#: templates/personal.php:40 +#: templates/personal.php:39 msgid "Your password was changed" msgstr "Lykilorði þínu hefur verið breytt" -#: templates/personal.php:41 +#: templates/personal.php:40 msgid "Unable to change your password" msgstr "Ekki tókst að breyta lykilorðinu þínu" -#: templates/personal.php:43 +#: templates/personal.php:42 msgid "Current password" msgstr "Núverandi lykilorð" -#: templates/personal.php:46 +#: templates/personal.php:45 msgid "New password" msgstr "Nýtt lykilorð" -#: templates/personal.php:50 +#: templates/personal.php:49 msgid "Change password" msgstr "Breyta lykilorði" -#: templates/personal.php:64 templates/users.php:86 +#: templates/personal.php:61 templates/users.php:86 msgid "Full Name" msgstr "" -#: templates/personal.php:81 +#: templates/personal.php:76 msgid "Email" msgstr "Netfang" -#: templates/personal.php:83 +#: templates/personal.php:78 msgid "Your email address" msgstr "Netfangið þitt" -#: templates/personal.php:86 +#: templates/personal.php:81 msgid "" "Fill in an email address to enable password recovery and receive " "notifications" msgstr "" -#: templates/personal.php:96 +#: templates/personal.php:89 msgid "Profile picture" msgstr "" -#: templates/personal.php:101 +#: templates/personal.php:94 msgid "Upload new" msgstr "" -#: templates/personal.php:103 +#: templates/personal.php:96 msgid "Select new from Files" msgstr "" -#: templates/personal.php:104 +#: templates/personal.php:97 msgid "Remove image" msgstr "" -#: templates/personal.php:105 +#: templates/personal.php:98 msgid "Either png or jpg. Ideally square but you will be able to crop it." msgstr "" -#: templates/personal.php:107 +#: templates/personal.php:100 msgid "Your avatar is provided by your original account." msgstr "" -#: templates/personal.php:111 +#: templates/personal.php:104 msgid "Cancel" msgstr "Hætta við" -#: templates/personal.php:112 +#: templates/personal.php:105 msgid "Choose as profile image" msgstr "" -#: templates/personal.php:120 templates/personal.php:121 +#: templates/personal.php:111 templates/personal.php:112 msgid "Language" msgstr "Tungumál" -#: templates/personal.php:140 +#: templates/personal.php:131 msgid "Help translate" msgstr "Hjálpa við þýðingu" -#: templates/personal.php:147 +#: templates/personal.php:137 msgid "WebDAV" msgstr "WebDAV" -#: templates/personal.php:149 +#: templates/personal.php:139 #, php-format msgid "" "Use this address to access your Files via " "WebDAV" msgstr "" -#: templates/personal.php:161 +#: templates/personal.php:151 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:167 +#: templates/personal.php:157 msgid "Log-in password" msgstr "" -#: templates/personal.php:172 +#: templates/personal.php:162 msgid "Decrypt all Files" msgstr "" diff --git a/l10n/is/user_ldap.po b/l10n/is/user_ldap.po index 71cca1d2e03..b33abc1b2b6 100644 --- a/l10n/is/user_ldap.po +++ b/l10n/is/user_ldap.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-08 01:56-0400\n" -"PO-Revision-Date: 2014-04-08 05:56+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:55+0000\n" "Last-Translator: I Robot\n" "Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n" "MIME-Version: 1.0\n" @@ -145,7 +145,7 @@ msgstr[1] "" msgid "Invalid Host" msgstr "" -#: lib/wizard.php:963 +#: lib/wizard.php:983 msgid "Could not find the desired feature" msgstr "" @@ -336,7 +336,7 @@ msgid "Only connect to the replica server." msgstr "" #: templates/settings.php:26 -msgid "Case insensitve LDAP server (Windows)" +msgid "Case insensitive LDAP server (Windows)" msgstr "" #: templates/settings.php:27 diff --git a/l10n/it/settings.po b/l10n/it/settings.po index 358818292cb..a2a0ae488f7 100644 --- a/l10n/it/settings.po +++ b/l10n/it/settings.po @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-10 01:54-0400\n" -"PO-Revision-Date: 2014-04-09 06:10+0000\n" -"Last-Translator: Vincenzo Reale \n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:54+0000\n" +"Last-Translator: I Robot\n" "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -88,6 +88,20 @@ msgstr "Il gruppo esiste già" msgid "Unable to add group" msgstr "Impossibile aggiungere il gruppo" +#: ajax/decryptall.php:31 +msgid "Files decrypted successfully" +msgstr "" + +#: ajax/decryptall.php:33 +msgid "" +"Couldn't decrypt your files, please check your owncloud.log or ask your " +"administrator" +msgstr "" + +#: ajax/decryptall.php:36 +msgid "Couldn't decrypt your files, check your password and try again" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "Email salvata" diff --git a/l10n/it/user_ldap.po b/l10n/it/user_ldap.po index b7958a71cae..ef4f4d218f6 100644 --- a/l10n/it/user_ldap.po +++ b/l10n/it/user_ldap.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-11 01:54-0400\n" -"PO-Revision-Date: 2014-04-10 22:50+0000\n" -"Last-Translator: Vincenzo Reale \n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:55+0000\n" +"Last-Translator: I Robot\n" "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -338,8 +338,8 @@ msgid "Only connect to the replica server." msgstr "Collegati solo al server di replica." #: templates/settings.php:26 -msgid "Case insensitve LDAP server (Windows)" -msgstr "Case insensitve LDAP server (Windows)" +msgid "Case insensitive LDAP server (Windows)" +msgstr "" #: templates/settings.php:27 msgid "Turn off SSL certificate validation." diff --git a/l10n/ja/settings.po b/l10n/ja/settings.po index 539a9c1e798..ae2dcf59d1d 100644 --- a/l10n/ja/settings.po +++ b/l10n/ja/settings.po @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-10 01:54-0400\n" -"PO-Revision-Date: 2014-04-09 06:10+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n" "MIME-Version: 1.0\n" @@ -89,6 +89,20 @@ msgstr "グループはすでに存在します" msgid "Unable to add group" msgstr "グループを追加できません" +#: ajax/decryptall.php:31 +msgid "Files decrypted successfully" +msgstr "" + +#: ajax/decryptall.php:33 +msgid "" +"Couldn't decrypt your files, please check your owncloud.log or ask your " +"administrator" +msgstr "" + +#: ajax/decryptall.php:36 +msgid "Couldn't decrypt your files, check your password and try again" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "メールアドレスを保存しました" diff --git a/l10n/ja/user_ldap.po b/l10n/ja/user_ldap.po index 3a893d0ed2c..f5a0f629f92 100644 --- a/l10n/ja/user_ldap.po +++ b/l10n/ja/user_ldap.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-08 01:56-0400\n" -"PO-Revision-Date: 2014-04-08 05:56+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:55+0000\n" "Last-Translator: I Robot\n" "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n" "MIME-Version: 1.0\n" @@ -146,7 +146,7 @@ msgstr[0] "%s ユーザーが見つかりました" msgid "Invalid Host" msgstr "無効なホスト" -#: lib/wizard.php:963 +#: lib/wizard.php:983 msgid "Could not find the desired feature" msgstr "望ましい機能は見つかりませんでした" @@ -337,8 +337,8 @@ msgid "Only connect to the replica server." msgstr "レプリカサーバーにのみ接続します。" #: templates/settings.php:26 -msgid "Case insensitve LDAP server (Windows)" -msgstr "大文字／小文字を区別しないLDAPサーバー（Windows）" +msgid "Case insensitive LDAP server (Windows)" +msgstr "" #: templates/settings.php:27 msgid "Turn off SSL certificate validation." diff --git a/l10n/jv/settings.po b/l10n/jv/settings.po index 7cba8a701d0..fad4b719109 100644 --- a/l10n/jv/settings.po +++ b/l10n/jv/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-08 01:56-0400\n" -"PO-Revision-Date: 2014-04-07 17:00+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Javanese (http://www.transifex.com/projects/p/owncloud/language/jv/)\n" "MIME-Version: 1.0\n" @@ -84,6 +84,20 @@ msgstr "" msgid "Unable to add group" msgstr "" +#: ajax/decryptall.php:31 +msgid "Files decrypted successfully" +msgstr "" + +#: ajax/decryptall.php:33 +msgid "" +"Couldn't decrypt your files, please check your owncloud.log or ask your " +"administrator" +msgstr "" + +#: ajax/decryptall.php:36 +msgid "Couldn't decrypt your files, check your password and try again" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" diff --git a/l10n/jv/user_ldap.po b/l10n/jv/user_ldap.po index 2371aadaeb6..78b1071347a 100644 --- a/l10n/jv/user_ldap.po +++ b/l10n/jv/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-08 01:56-0400\n" -"PO-Revision-Date: 2014-04-08 05:56+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:55+0000\n" "Last-Translator: I Robot\n" "Language-Team: Javanese (http://www.transifex.com/projects/p/owncloud/language/jv/)\n" "MIME-Version: 1.0\n" @@ -144,7 +144,7 @@ msgstr[1] "" msgid "Invalid Host" msgstr "" -#: lib/wizard.php:963 +#: lib/wizard.php:983 msgid "Could not find the desired feature" msgstr "" @@ -335,7 +335,7 @@ msgid "Only connect to the replica server." msgstr "" #: templates/settings.php:26 -msgid "Case insensitve LDAP server (Windows)" +msgid "Case insensitive LDAP server (Windows)" msgstr "" #: templates/settings.php:27 diff --git a/l10n/ka_GE/settings.po b/l10n/ka_GE/settings.po index deed78e7873..6f126c61254 100644 --- a/l10n/ka_GE/settings.po +++ b/l10n/ka_GE/settings.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-10 01:54-0400\n" -"PO-Revision-Date: 2014-04-09 06:10+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n" "MIME-Version: 1.0\n" @@ -85,6 +85,20 @@ msgstr "ჯგუფი უკვე არსებობს" msgid "Unable to add group" msgstr "ჯგუფის დამატება ვერ მოხერხდა" +#: ajax/decryptall.php:31 +msgid "Files decrypted successfully" +msgstr "" + +#: ajax/decryptall.php:33 +msgid "" +"Couldn't decrypt your files, please check your owncloud.log or ask your " +"administrator" +msgstr "" + +#: ajax/decryptall.php:36 +msgid "Couldn't decrypt your files, check your password and try again" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "იმეილი შენახულია" diff --git a/l10n/ka_GE/user_ldap.po b/l10n/ka_GE/user_ldap.po index 5dc273c6b7e..35cef142b50 100644 --- a/l10n/ka_GE/user_ldap.po +++ b/l10n/ka_GE/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-08 01:56-0400\n" -"PO-Revision-Date: 2014-04-08 05:56+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:55+0000\n" "Last-Translator: I Robot\n" "Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n" "MIME-Version: 1.0\n" @@ -142,7 +142,7 @@ msgstr[0] "" msgid "Invalid Host" msgstr "" -#: lib/wizard.php:963 +#: lib/wizard.php:983 msgid "Could not find the desired feature" msgstr "" @@ -333,8 +333,8 @@ msgid "Only connect to the replica server." msgstr "" #: templates/settings.php:26 -msgid "Case insensitve LDAP server (Windows)" -msgstr "LDAP server (Windows)" +msgid "Case insensitive LDAP server (Windows)" +msgstr "" #: templates/settings.php:27 msgid "Turn off SSL certificate validation." diff --git a/l10n/km/settings.po b/l10n/km/settings.po index f551450fbe0..6df2774fdeb 100644 --- a/l10n/km/settings.po +++ b/l10n/km/settings.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-10 01:54-0400\n" -"PO-Revision-Date: 2014-04-09 06:10+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Khmer (http://www.transifex.com/projects/p/owncloud/language/km/)\n" "MIME-Version: 1.0\n" @@ -86,6 +86,20 @@ msgstr "មាន​ក្រុម​នេះ​រួច​ហើយ" msgid "Unable to add group" msgstr "មិន​អាច​បន្ថែម​ក្រុម" +#: ajax/decryptall.php:31 +msgid "Files decrypted successfully" +msgstr "" + +#: ajax/decryptall.php:33 +msgid "" +"Couldn't decrypt your files, please check your owncloud.log or ask your " +"administrator" +msgstr "" + +#: ajax/decryptall.php:36 +msgid "Couldn't decrypt your files, check your password and try again" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "បាន​រក្សា​ទុក​អ៊ីមែល" diff --git a/l10n/km/user_ldap.po b/l10n/km/user_ldap.po index 5a41e124531..22fd03e089d 100644 --- a/l10n/km/user_ldap.po +++ b/l10n/km/user_ldap.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-08 01:56-0400\n" -"PO-Revision-Date: 2014-04-08 05:56+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:55+0000\n" "Last-Translator: I Robot\n" "Language-Team: Khmer (http://www.transifex.com/projects/p/owncloud/language/km/)\n" "MIME-Version: 1.0\n" @@ -143,7 +143,7 @@ msgstr[0] "" msgid "Invalid Host" msgstr "" -#: lib/wizard.php:963 +#: lib/wizard.php:983 msgid "Could not find the desired feature" msgstr "" @@ -334,7 +334,7 @@ msgid "Only connect to the replica server." msgstr "" #: templates/settings.php:26 -msgid "Case insensitve LDAP server (Windows)" +msgid "Case insensitive LDAP server (Windows)" msgstr "" #: templates/settings.php:27 diff --git a/l10n/kn/settings.po b/l10n/kn/settings.po index cfb8736938b..c8d82c665e4 100644 --- a/l10n/kn/settings.po +++ b/l10n/kn/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-03-26 01:55-0400\n" -"PO-Revision-Date: 2014-03-26 05:55+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159 +#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149 msgid "Encryption" msgstr "" @@ -64,7 +64,7 @@ msgid "Unable to load list from App Store" msgstr "" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 changepassword/controller.php:55 +#: ajax/togglegroups.php:20 changepassword/controller.php:49 msgid "Authentication error" msgstr "" @@ -84,6 +84,20 @@ msgstr "" msgid "Unable to add group" msgstr "" +#: ajax/decryptall.php:31 +msgid "Files decrypted successfully" +msgstr "" + +#: ajax/decryptall.php:33 +msgid "" +"Couldn't decrypt your files, please check your owncloud.log or ask your " +"administrator" +msgstr "" + +#: ajax/decryptall.php:36 +msgid "Couldn't decrypt your files, check your password and try again" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -126,32 +140,32 @@ msgstr "" msgid "Couldn't update app." msgstr "" -#: changepassword/controller.php:20 +#: changepassword/controller.php:17 msgid "Wrong password" msgstr "" -#: changepassword/controller.php:42 +#: changepassword/controller.php:36 msgid "No user supplied" msgstr "" -#: changepassword/controller.php:74 +#: changepassword/controller.php:68 msgid "" "Please provide an admin recovery password, otherwise all user data will be " "lost" msgstr "" -#: changepassword/controller.php:79 +#: changepassword/controller.php:73 msgid "" "Wrong admin recovery password. Please check the password and try again." msgstr "" -#: changepassword/controller.php:87 +#: changepassword/controller.php:81 msgid "" "Back-end doesn't support password change, but the users encryption key was " "successfully updated." msgstr "" -#: changepassword/controller.php:92 changepassword/controller.php:103 +#: changepassword/controller.php:86 changepassword/controller.php:97 msgid "Unable to change password" msgstr "" @@ -203,7 +217,7 @@ msgstr "" msgid "Error" msgstr "" -#: js/apps.js:153 templates/apps.php:54 +#: js/apps.js:153 templates/apps.php:55 msgid "Update" msgstr "" @@ -211,31 +225,31 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:246 +#: js/personal.js:243 msgid "Select a profile picture" msgstr "" -#: js/personal.js:277 +#: js/personal.js:274 msgid "Very weak password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:275 msgid "Weak password" msgstr "" -#: js/personal.js:279 +#: js/personal.js:276 msgid "So-so password" msgstr "" -#: js/personal.js:280 +#: js/personal.js:277 msgid "Good password" msgstr "" -#: js/personal.js:281 +#: js/personal.js:278 msgid "Strong password" msgstr "" -#: js/personal.js:316 +#: js/personal.js:313 msgid "Decrypting files... Please wait, this can take some time." msgstr "" @@ -284,7 +298,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:49 personal.php:50 +#: personal.php:48 personal.php:49 msgid "__language_name__" msgstr "" @@ -589,11 +603,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:416 templates/personal.php:181 +#: templates/admin.php:416 templates/personal.php:171 msgid "Version" msgstr "" -#: templates/admin.php:420 templates/personal.php:184 +#: templates/admin.php:420 templates/personal.php:174 msgid "" "Developed by the ownCloud community, the -licensed by " msgstr "" @@ -664,108 +678,108 @@ msgstr "" msgid "You have used %s of the available %s" msgstr "" -#: templates/personal.php:39 templates/users.php:21 templates/users.php:87 +#: templates/personal.php:38 templates/users.php:21 templates/users.php:87 msgid "Password" msgstr "" -#: templates/personal.php:40 +#: templates/personal.php:39 msgid "Your password was changed" msgstr "" -#: templates/personal.php:41 +#: templates/personal.php:40 msgid "Unable to change your password" msgstr "" -#: templates/personal.php:43 +#: templates/personal.php:42 msgid "Current password" msgstr "" -#: templates/personal.php:46 +#: templates/personal.php:45 msgid "New password" msgstr "" -#: templates/personal.php:50 +#: templates/personal.php:49 msgid "Change password" msgstr "" -#: templates/personal.php:64 templates/users.php:86 +#: templates/personal.php:61 templates/users.php:86 msgid "Full Name" msgstr "" -#: templates/personal.php:81 +#: templates/personal.php:76 msgid "Email" msgstr "" -#: templates/personal.php:83 +#: templates/personal.php:78 msgid "Your email address" msgstr "" -#: templates/personal.php:86 +#: templates/personal.php:81 msgid "" "Fill in an email address to enable password recovery and receive " "notifications" msgstr "" -#: templates/personal.php:96 +#: templates/personal.php:89 msgid "Profile picture" msgstr "" -#: templates/personal.php:101 +#: templates/personal.php:94 msgid "Upload new" msgstr "" -#: templates/personal.php:103 +#: templates/personal.php:96 msgid "Select new from Files" msgstr "" -#: templates/personal.php:104 +#: templates/personal.php:97 msgid "Remove image" msgstr "" -#: templates/personal.php:105 +#: templates/personal.php:98 msgid "Either png or jpg. Ideally square but you will be able to crop it." msgstr "" -#: templates/personal.php:107 +#: templates/personal.php:100 msgid "Your avatar is provided by your original account." msgstr "" -#: templates/personal.php:111 +#: templates/personal.php:104 msgid "Cancel" msgstr "" -#: templates/personal.php:112 +#: templates/personal.php:105 msgid "Choose as profile image" msgstr "" -#: templates/personal.php:120 templates/personal.php:121 +#: templates/personal.php:111 templates/personal.php:112 msgid "Language" msgstr "" -#: templates/personal.php:140 +#: templates/personal.php:131 msgid "Help translate" msgstr "" -#: templates/personal.php:147 +#: templates/personal.php:137 msgid "WebDAV" msgstr "" -#: templates/personal.php:149 +#: templates/personal.php:139 #, php-format msgid "" "Use this address to access your Files via " "WebDAV" msgstr "" -#: templates/personal.php:161 +#: templates/personal.php:151 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:167 +#: templates/personal.php:157 msgid "Log-in password" msgstr "" -#: templates/personal.php:172 +#: templates/personal.php:162 msgid "Decrypt all Files" msgstr "" diff --git a/l10n/kn/user_ldap.po b/l10n/kn/user_ldap.po index 4c39375aee3..9254257e36c 100644 --- a/l10n/kn/user_ldap.po +++ b/l10n/kn/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-08 01:56-0400\n" -"PO-Revision-Date: 2014-04-08 05:56+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:55+0000\n" "Last-Translator: I Robot\n" "Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n" "MIME-Version: 1.0\n" @@ -142,7 +142,7 @@ msgstr[0] "" msgid "Invalid Host" msgstr "" -#: lib/wizard.php:963 +#: lib/wizard.php:983 msgid "Could not find the desired feature" msgstr "" @@ -333,7 +333,7 @@ msgid "Only connect to the replica server." msgstr "" #: templates/settings.php:26 -msgid "Case insensitve LDAP server (Windows)" +msgid "Case insensitive LDAP server (Windows)" msgstr "" #: templates/settings.php:27 diff --git a/l10n/ko/settings.po b/l10n/ko/settings.po index 7ede0d46667..e056694af0a 100644 --- a/l10n/ko/settings.po +++ b/l10n/ko/settings.po @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-10 01:54-0400\n" -"PO-Revision-Date: 2014-04-09 06:10+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n" "MIME-Version: 1.0\n" @@ -89,6 +89,20 @@ msgstr "그룹이 이미 존재함" msgid "Unable to add group" msgstr "그룹을 추가할 수 없음" +#: ajax/decryptall.php:31 +msgid "Files decrypted successfully" +msgstr "" + +#: ajax/decryptall.php:33 +msgid "" +"Couldn't decrypt your files, please check your owncloud.log or ask your " +"administrator" +msgstr "" + +#: ajax/decryptall.php:36 +msgid "Couldn't decrypt your files, check your password and try again" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "이메일 저장됨" diff --git a/l10n/ko/user_ldap.po b/l10n/ko/user_ldap.po index b8de7e931fc..0c91c72192d 100644 --- a/l10n/ko/user_ldap.po +++ b/l10n/ko/user_ldap.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-08 01:56-0400\n" -"PO-Revision-Date: 2014-04-08 05:56+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:55+0000\n" "Last-Translator: I Robot\n" "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n" "MIME-Version: 1.0\n" @@ -145,7 +145,7 @@ msgstr[0] "사용자 %s명 찾음" msgid "Invalid Host" msgstr "잘못된 호스트" -#: lib/wizard.php:963 +#: lib/wizard.php:983 msgid "Could not find the desired feature" msgstr "필요한 기능을 찾을 수 없음" @@ -336,8 +336,8 @@ msgid "Only connect to the replica server." msgstr "복제 서버에만 연결합니다." #: templates/settings.php:26 -msgid "Case insensitve LDAP server (Windows)" -msgstr "서버에서 대소문자를 구분하지 않음 (Windows)" +msgid "Case insensitive LDAP server (Windows)" +msgstr "" #: templates/settings.php:27 msgid "Turn off SSL certificate validation." diff --git a/l10n/ku_IQ/settings.po b/l10n/ku_IQ/settings.po index 2ce49de9cc1..5947cd8a09f 100644 --- a/l10n/ku_IQ/settings.po +++ b/l10n/ku_IQ/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-03-26 01:55-0400\n" -"PO-Revision-Date: 2014-03-26 05:55+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159 +#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149 msgid "Encryption" msgstr "نهێنیکردن" @@ -64,7 +64,7 @@ msgid "Unable to load list from App Store" msgstr "" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 changepassword/controller.php:55 +#: ajax/togglegroups.php:20 changepassword/controller.php:49 msgid "Authentication error" msgstr "" @@ -84,6 +84,20 @@ msgstr "" msgid "Unable to add group" msgstr "" +#: ajax/decryptall.php:31 +msgid "Files decrypted successfully" +msgstr "" + +#: ajax/decryptall.php:33 +msgid "" +"Couldn't decrypt your files, please check your owncloud.log or ask your " +"administrator" +msgstr "" + +#: ajax/decryptall.php:36 +msgid "Couldn't decrypt your files, check your password and try again" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -126,32 +140,32 @@ msgstr "" msgid "Couldn't update app." msgstr "" -#: changepassword/controller.php:20 +#: changepassword/controller.php:17 msgid "Wrong password" msgstr "" -#: changepassword/controller.php:42 +#: changepassword/controller.php:36 msgid "No user supplied" msgstr "" -#: changepassword/controller.php:74 +#: changepassword/controller.php:68 msgid "" "Please provide an admin recovery password, otherwise all user data will be " "lost" msgstr "" -#: changepassword/controller.php:79 +#: changepassword/controller.php:73 msgid "" "Wrong admin recovery password. Please check the password and try again." msgstr "" -#: changepassword/controller.php:87 +#: changepassword/controller.php:81 msgid "" "Back-end doesn't support password change, but the users encryption key was " "successfully updated." msgstr "" -#: changepassword/controller.php:92 changepassword/controller.php:103 +#: changepassword/controller.php:86 changepassword/controller.php:97 msgid "Unable to change password" msgstr "" @@ -203,7 +217,7 @@ msgstr "" msgid "Error" msgstr "هه‌ڵه" -#: js/apps.js:153 templates/apps.php:54 +#: js/apps.js:153 templates/apps.php:55 msgid "Update" msgstr "نوێکردنه‌وه" @@ -211,31 +225,31 @@ msgstr "نوێکردنه‌وه" msgid "Updated" msgstr "" -#: js/personal.js:246 +#: js/personal.js:243 msgid "Select a profile picture" msgstr "" -#: js/personal.js:277 +#: js/personal.js:274 msgid "Very weak password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:275 msgid "Weak password" msgstr "" -#: js/personal.js:279 +#: js/personal.js:276 msgid "So-so password" msgstr "" -#: js/personal.js:280 +#: js/personal.js:277 msgid "Good password" msgstr "" -#: js/personal.js:281 +#: js/personal.js:278 msgid "Strong password" msgstr "" -#: js/personal.js:316 +#: js/personal.js:313 msgid "Decrypting files... Please wait, this can take some time." msgstr "" @@ -284,7 +298,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:49 personal.php:50 +#: personal.php:48 personal.php:49 msgid "__language_name__" msgstr "" @@ -589,11 +603,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:416 templates/personal.php:181 +#: templates/admin.php:416 templates/personal.php:171 msgid "Version" msgstr "" -#: templates/admin.php:420 templates/personal.php:184 +#: templates/admin.php:420 templates/personal.php:174 msgid "" "Developed by the ownCloud community, the -licensed by " msgstr "" @@ -664,108 +678,108 @@ msgstr "" msgid "You have used %s of the available %s" msgstr "" -#: templates/personal.php:39 templates/users.php:21 templates/users.php:87 +#: templates/personal.php:38 templates/users.php:21 templates/users.php:87 msgid "Password" msgstr "وشەی تێپەربو" -#: templates/personal.php:40 +#: templates/personal.php:39 msgid "Your password was changed" msgstr "" -#: templates/personal.php:41 +#: templates/personal.php:40 msgid "Unable to change your password" msgstr "" -#: templates/personal.php:43 +#: templates/personal.php:42 msgid "Current password" msgstr "" -#: templates/personal.php:46 +#: templates/personal.php:45 msgid "New password" msgstr "وشەی نهێنی نوێ" -#: templates/personal.php:50 +#: templates/personal.php:49 msgid "Change password" msgstr "" -#: templates/personal.php:64 templates/users.php:86 +#: templates/personal.php:61 templates/users.php:86 msgid "Full Name" msgstr "" -#: templates/personal.php:81 +#: templates/personal.php:76 msgid "Email" msgstr "ئیمه‌یل" -#: templates/personal.php:83 +#: templates/personal.php:78 msgid "Your email address" msgstr "" -#: templates/personal.php:86 +#: templates/personal.php:81 msgid "" "Fill in an email address to enable password recovery and receive " "notifications" msgstr "" -#: templates/personal.php:96 +#: templates/personal.php:89 msgid "Profile picture" msgstr "" -#: templates/personal.php:101 +#: templates/personal.php:94 msgid "Upload new" msgstr "" -#: templates/personal.php:103 +#: templates/personal.php:96 msgid "Select new from Files" msgstr "" -#: templates/personal.php:104 +#: templates/personal.php:97 msgid "Remove image" msgstr "" -#: templates/personal.php:105 +#: templates/personal.php:98 msgid "Either png or jpg. Ideally square but you will be able to crop it." msgstr "" -#: templates/personal.php:107 +#: templates/personal.php:100 msgid "Your avatar is provided by your original account." msgstr "" -#: templates/personal.php:111 +#: templates/personal.php:104 msgid "Cancel" msgstr "لابردن" -#: templates/personal.php:112 +#: templates/personal.php:105 msgid "Choose as profile image" msgstr "" -#: templates/personal.php:120 templates/personal.php:121 +#: templates/personal.php:111 templates/personal.php:112 msgid "Language" msgstr "" -#: templates/personal.php:140 +#: templates/personal.php:131 msgid "Help translate" msgstr "" -#: templates/personal.php:147 +#: templates/personal.php:137 msgid "WebDAV" msgstr "" -#: templates/personal.php:149 +#: templates/personal.php:139 #, php-format msgid "" "Use this address to access your Files via " "WebDAV" msgstr "" -#: templates/personal.php:161 +#: templates/personal.php:151 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:167 +#: templates/personal.php:157 msgid "Log-in password" msgstr "" -#: templates/personal.php:172 +#: templates/personal.php:162 msgid "Decrypt all Files" msgstr "" diff --git a/l10n/ku_IQ/user_ldap.po b/l10n/ku_IQ/user_ldap.po index e006b5932ac..a7fb0b19ba6 100644 --- a/l10n/ku_IQ/user_ldap.po +++ b/l10n/ku_IQ/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-08 01:56-0400\n" -"PO-Revision-Date: 2014-04-08 05:56+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:55+0000\n" "Last-Translator: I Robot\n" "Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n" "MIME-Version: 1.0\n" @@ -144,7 +144,7 @@ msgstr[1] "" msgid "Invalid Host" msgstr "" -#: lib/wizard.php:963 +#: lib/wizard.php:983 msgid "Could not find the desired feature" msgstr "" @@ -335,7 +335,7 @@ msgid "Only connect to the replica server." msgstr "" #: templates/settings.php:26 -msgid "Case insensitve LDAP server (Windows)" +msgid "Case insensitive LDAP server (Windows)" msgstr "" #: templates/settings.php:27 diff --git a/l10n/lb/settings.po b/l10n/lb/settings.po index dc9db7025c8..8555b5acccb 100644 --- a/l10n/lb/settings.po +++ b/l10n/lb/settings.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-03-26 01:55-0400\n" -"PO-Revision-Date: 2014-03-26 05:55+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n" "MIME-Version: 1.0\n" @@ -52,7 +52,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159 +#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149 msgid "Encryption" msgstr "" @@ -65,7 +65,7 @@ msgid "Unable to load list from App Store" msgstr "Konnt Lescht net vum App Store lueden" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 changepassword/controller.php:55 +#: ajax/togglegroups.php:20 changepassword/controller.php:49 msgid "Authentication error" msgstr "Authentifikatioun's Fehler" @@ -85,6 +85,20 @@ msgstr "Group existeiert schon." msgid "Unable to add group" msgstr "Onmeiglech Grupp beizefügen." +#: ajax/decryptall.php:31 +msgid "Files decrypted successfully" +msgstr "" + +#: ajax/decryptall.php:33 +msgid "" +"Couldn't decrypt your files, please check your owncloud.log or ask your " +"administrator" +msgstr "" + +#: ajax/decryptall.php:36 +msgid "Couldn't decrypt your files, check your password and try again" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "E-mail gespäichert" @@ -127,32 +141,32 @@ msgstr "" msgid "Couldn't update app." msgstr "" -#: changepassword/controller.php:20 +#: changepassword/controller.php:17 msgid "Wrong password" msgstr "" -#: changepassword/controller.php:42 +#: changepassword/controller.php:36 msgid "No user supplied" msgstr "" -#: changepassword/controller.php:74 +#: changepassword/controller.php:68 msgid "" "Please provide an admin recovery password, otherwise all user data will be " "lost" msgstr "" -#: changepassword/controller.php:79 +#: changepassword/controller.php:73 msgid "" "Wrong admin recovery password. Please check the password and try again." msgstr "" -#: changepassword/controller.php:87 +#: changepassword/controller.php:81 msgid "" "Back-end doesn't support password change, but the users encryption key was " "successfully updated." msgstr "" -#: changepassword/controller.php:92 changepassword/controller.php:103 +#: changepassword/controller.php:86 changepassword/controller.php:97 msgid "Unable to change password" msgstr "" @@ -204,7 +218,7 @@ msgstr "" msgid "Error" msgstr "Fehler" -#: js/apps.js:153 templates/apps.php:54 +#: js/apps.js:153 templates/apps.php:55 msgid "Update" msgstr "Update" @@ -212,31 +226,31 @@ msgstr "Update" msgid "Updated" msgstr "" -#: js/personal.js:246 +#: js/personal.js:243 msgid "Select a profile picture" msgstr "" -#: js/personal.js:277 +#: js/personal.js:274 msgid "Very weak password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:275 msgid "Weak password" msgstr "" -#: js/personal.js:279 +#: js/personal.js:276 msgid "So-so password" msgstr "" -#: js/personal.js:280 +#: js/personal.js:277 msgid "Good password" msgstr "" -#: js/personal.js:281 +#: js/personal.js:278 msgid "Strong password" msgstr "" -#: js/personal.js:316 +#: js/personal.js:313 msgid "Decrypting files... Please wait, this can take some time." msgstr "" @@ -285,7 +299,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:49 personal.php:50 +#: personal.php:48 personal.php:49 msgid "__language_name__" msgstr "__language_name__" @@ -590,11 +604,11 @@ msgstr "Méi" msgid "Less" msgstr "Manner" -#: templates/admin.php:416 templates/personal.php:181 +#: templates/admin.php:416 templates/personal.php:171 msgid "Version" msgstr "" -#: templates/admin.php:420 templates/personal.php:184 +#: templates/admin.php:420 templates/personal.php:174 msgid "" "Developed by the ownCloud community, the -licensed by " msgstr "" @@ -665,108 +679,108 @@ msgstr "" msgid "You have used %s of the available %s" msgstr "" -#: templates/personal.php:39 templates/users.php:21 templates/users.php:87 +#: templates/personal.php:38 templates/users.php:21 templates/users.php:87 msgid "Password" msgstr "Passwuert" -#: templates/personal.php:40 +#: templates/personal.php:39 msgid "Your password was changed" msgstr "" -#: templates/personal.php:41 +#: templates/personal.php:40 msgid "Unable to change your password" msgstr "Konnt däin Passwuert net änneren" -#: templates/personal.php:43 +#: templates/personal.php:42 msgid "Current password" msgstr "Momentan 't Passwuert" -#: templates/personal.php:46 +#: templates/personal.php:45 msgid "New password" msgstr "Neit Passwuert" -#: templates/personal.php:50 +#: templates/personal.php:49 msgid "Change password" msgstr "Passwuert änneren" -#: templates/personal.php:64 templates/users.php:86 +#: templates/personal.php:61 templates/users.php:86 msgid "Full Name" msgstr "" -#: templates/personal.php:81 +#: templates/personal.php:76 msgid "Email" msgstr "Email" -#: templates/personal.php:83 +#: templates/personal.php:78 msgid "Your email address" msgstr "Deng Email Adress" -#: templates/personal.php:86 +#: templates/personal.php:81 msgid "" "Fill in an email address to enable password recovery and receive " "notifications" msgstr "" -#: templates/personal.php:96 +#: templates/personal.php:89 msgid "Profile picture" msgstr "" -#: templates/personal.php:101 +#: templates/personal.php:94 msgid "Upload new" msgstr "" -#: templates/personal.php:103 +#: templates/personal.php:96 msgid "Select new from Files" msgstr "" -#: templates/personal.php:104 +#: templates/personal.php:97 msgid "Remove image" msgstr "" -#: templates/personal.php:105 +#: templates/personal.php:98 msgid "Either png or jpg. Ideally square but you will be able to crop it." msgstr "" -#: templates/personal.php:107 +#: templates/personal.php:100 msgid "Your avatar is provided by your original account." msgstr "" -#: templates/personal.php:111 +#: templates/personal.php:104 msgid "Cancel" msgstr "Ofbriechen" -#: templates/personal.php:112 +#: templates/personal.php:105 msgid "Choose as profile image" msgstr "" -#: templates/personal.php:120 templates/personal.php:121 +#: templates/personal.php:111 templates/personal.php:112 msgid "Language" msgstr "Sprooch" -#: templates/personal.php:140 +#: templates/personal.php:131 msgid "Help translate" msgstr "Hëllef iwwersetzen" -#: templates/personal.php:147 +#: templates/personal.php:137 msgid "WebDAV" msgstr "" -#: templates/personal.php:149 +#: templates/personal.php:139 #, php-format msgid "" "Use this address to access your Files via " "WebDAV" msgstr "" -#: templates/personal.php:161 +#: templates/personal.php:151 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:167 +#: templates/personal.php:157 msgid "Log-in password" msgstr "" -#: templates/personal.php:172 +#: templates/personal.php:162 msgid "Decrypt all Files" msgstr "" diff --git a/l10n/lb/user_ldap.po b/l10n/lb/user_ldap.po index 7ffaec0adf3..0489c90be38 100644 --- a/l10n/lb/user_ldap.po +++ b/l10n/lb/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-08 01:56-0400\n" -"PO-Revision-Date: 2014-04-08 05:56+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:55+0000\n" "Last-Translator: I Robot\n" "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n" "MIME-Version: 1.0\n" @@ -144,7 +144,7 @@ msgstr[1] "" msgid "Invalid Host" msgstr "" -#: lib/wizard.php:963 +#: lib/wizard.php:983 msgid "Could not find the desired feature" msgstr "" @@ -335,7 +335,7 @@ msgid "Only connect to the replica server." msgstr "" #: templates/settings.php:26 -msgid "Case insensitve LDAP server (Windows)" +msgid "Case insensitive LDAP server (Windows)" msgstr "" #: templates/settings.php:27 diff --git a/l10n/lt_LT/settings.po b/l10n/lt_LT/settings.po index 4b4e306f816..a3da64d25e4 100644 --- a/l10n/lt_LT/settings.po +++ b/l10n/lt_LT/settings.po @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-10 01:54-0400\n" -"PO-Revision-Date: 2014-04-09 06:10+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n" "MIME-Version: 1.0\n" @@ -89,6 +89,20 @@ msgstr "Grupė jau egzistuoja" msgid "Unable to add group" msgstr "Nepavyko pridėti grupės" +#: ajax/decryptall.php:31 +msgid "Files decrypted successfully" +msgstr "" + +#: ajax/decryptall.php:33 +msgid "" +"Couldn't decrypt your files, please check your owncloud.log or ask your " +"administrator" +msgstr "" + +#: ajax/decryptall.php:36 +msgid "Couldn't decrypt your files, check your password and try again" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "El. paštas išsaugotas" diff --git a/l10n/lt_LT/user_ldap.po b/l10n/lt_LT/user_ldap.po index 1e9fab49ec4..9ea5c5787b7 100644 --- a/l10n/lt_LT/user_ldap.po +++ b/l10n/lt_LT/user_ldap.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-08 01:56-0400\n" -"PO-Revision-Date: 2014-04-08 05:56+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:55+0000\n" "Last-Translator: I Robot\n" "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n" "MIME-Version: 1.0\n" @@ -148,7 +148,7 @@ msgstr[2] "" msgid "Invalid Host" msgstr "" -#: lib/wizard.php:963 +#: lib/wizard.php:983 msgid "Could not find the desired feature" msgstr "" @@ -339,7 +339,7 @@ msgid "Only connect to the replica server." msgstr "Tik prisijungti prie reprodukcinio (replica) serverio." #: templates/settings.php:26 -msgid "Case insensitve LDAP server (Windows)" +msgid "Case insensitive LDAP server (Windows)" msgstr "" #: templates/settings.php:27 diff --git a/l10n/lv/settings.po b/l10n/lv/settings.po index 13c92ee1a70..2c0d304b01d 100644 --- a/l10n/lv/settings.po +++ b/l10n/lv/settings.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-10 01:54-0400\n" -"PO-Revision-Date: 2014-04-09 06:10+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n" "MIME-Version: 1.0\n" @@ -85,6 +85,20 @@ msgstr "Grupa jau eksistē" msgid "Unable to add group" msgstr "Nevar pievienot grupu" +#: ajax/decryptall.php:31 +msgid "Files decrypted successfully" +msgstr "" + +#: ajax/decryptall.php:33 +msgid "" +"Couldn't decrypt your files, please check your owncloud.log or ask your " +"administrator" +msgstr "" + +#: ajax/decryptall.php:36 +msgid "Couldn't decrypt your files, check your password and try again" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "E-pasts tika saglabāts" diff --git a/l10n/lv/user_ldap.po b/l10n/lv/user_ldap.po index 6861a984e01..1b2ef1684bd 100644 --- a/l10n/lv/user_ldap.po +++ b/l10n/lv/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-08 01:56-0400\n" -"PO-Revision-Date: 2014-04-08 05:56+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:55+0000\n" "Last-Translator: I Robot\n" "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n" "MIME-Version: 1.0\n" @@ -146,7 +146,7 @@ msgstr[2] "" msgid "Invalid Host" msgstr "" -#: lib/wizard.php:963 +#: lib/wizard.php:983 msgid "Could not find the desired feature" msgstr "" @@ -337,8 +337,8 @@ msgid "Only connect to the replica server." msgstr "" #: templates/settings.php:26 -msgid "Case insensitve LDAP server (Windows)" -msgstr "Reģistrnejutīgs LDAP serveris (Windows)" +msgid "Case insensitive LDAP server (Windows)" +msgstr "" #: templates/settings.php:27 msgid "Turn off SSL certificate validation." diff --git a/l10n/mk/settings.po b/l10n/mk/settings.po index e6096b1af4f..4808e45f47e 100644 --- a/l10n/mk/settings.po +++ b/l10n/mk/settings.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-10 01:54-0400\n" -"PO-Revision-Date: 2014-04-09 06:10+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n" "MIME-Version: 1.0\n" @@ -85,6 +85,20 @@ msgstr "Групата веќе постои" msgid "Unable to add group" msgstr "Неможе да додадам група" +#: ajax/decryptall.php:31 +msgid "Files decrypted successfully" +msgstr "" + +#: ajax/decryptall.php:33 +msgid "" +"Couldn't decrypt your files, please check your owncloud.log or ask your " +"administrator" +msgstr "" + +#: ajax/decryptall.php:36 +msgid "Couldn't decrypt your files, check your password and try again" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "Електронската пошта е снимена" diff --git a/l10n/mk/user_ldap.po b/l10n/mk/user_ldap.po index 5550ed99dd9..1fdce7b75a4 100644 --- a/l10n/mk/user_ldap.po +++ b/l10n/mk/user_ldap.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-08 01:56-0400\n" -"PO-Revision-Date: 2014-04-08 05:56+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:55+0000\n" "Last-Translator: I Robot\n" "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n" "MIME-Version: 1.0\n" @@ -145,7 +145,7 @@ msgstr[1] "" msgid "Invalid Host" msgstr "" -#: lib/wizard.php:963 +#: lib/wizard.php:983 msgid "Could not find the desired feature" msgstr "" @@ -336,7 +336,7 @@ msgid "Only connect to the replica server." msgstr "" #: templates/settings.php:26 -msgid "Case insensitve LDAP server (Windows)" +msgid "Case insensitive LDAP server (Windows)" msgstr "" #: templates/settings.php:27 diff --git a/l10n/ml/settings.po b/l10n/ml/settings.po index 49290f8d798..648904e1221 100644 --- a/l10n/ml/settings.po +++ b/l10n/ml/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-03-26 01:55-0400\n" -"PO-Revision-Date: 2014-03-26 05:55+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Malayalam (http://www.transifex.com/projects/p/owncloud/language/ml/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159 +#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149 msgid "Encryption" msgstr "" @@ -64,7 +64,7 @@ msgid "Unable to load list from App Store" msgstr "" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 changepassword/controller.php:55 +#: ajax/togglegroups.php:20 changepassword/controller.php:49 msgid "Authentication error" msgstr "" @@ -84,6 +84,20 @@ msgstr "" msgid "Unable to add group" msgstr "" +#: ajax/decryptall.php:31 +msgid "Files decrypted successfully" +msgstr "" + +#: ajax/decryptall.php:33 +msgid "" +"Couldn't decrypt your files, please check your owncloud.log or ask your " +"administrator" +msgstr "" + +#: ajax/decryptall.php:36 +msgid "Couldn't decrypt your files, check your password and try again" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -126,32 +140,32 @@ msgstr "" msgid "Couldn't update app." msgstr "" -#: changepassword/controller.php:20 +#: changepassword/controller.php:17 msgid "Wrong password" msgstr "" -#: changepassword/controller.php:42 +#: changepassword/controller.php:36 msgid "No user supplied" msgstr "" -#: changepassword/controller.php:74 +#: changepassword/controller.php:68 msgid "" "Please provide an admin recovery password, otherwise all user data will be " "lost" msgstr "" -#: changepassword/controller.php:79 +#: changepassword/controller.php:73 msgid "" "Wrong admin recovery password. Please check the password and try again." msgstr "" -#: changepassword/controller.php:87 +#: changepassword/controller.php:81 msgid "" "Back-end doesn't support password change, but the users encryption key was " "successfully updated." msgstr "" -#: changepassword/controller.php:92 changepassword/controller.php:103 +#: changepassword/controller.php:86 changepassword/controller.php:97 msgid "Unable to change password" msgstr "" @@ -203,7 +217,7 @@ msgstr "" msgid "Error" msgstr "" -#: js/apps.js:153 templates/apps.php:54 +#: js/apps.js:153 templates/apps.php:55 msgid "Update" msgstr "" @@ -211,31 +225,31 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:246 +#: js/personal.js:243 msgid "Select a profile picture" msgstr "" -#: js/personal.js:277 +#: js/personal.js:274 msgid "Very weak password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:275 msgid "Weak password" msgstr "" -#: js/personal.js:279 +#: js/personal.js:276 msgid "So-so password" msgstr "" -#: js/personal.js:280 +#: js/personal.js:277 msgid "Good password" msgstr "" -#: js/personal.js:281 +#: js/personal.js:278 msgid "Strong password" msgstr "" -#: js/personal.js:316 +#: js/personal.js:313 msgid "Decrypting files... Please wait, this can take some time." msgstr "" @@ -284,7 +298,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:49 personal.php:50 +#: personal.php:48 personal.php:49 msgid "__language_name__" msgstr "" @@ -589,11 +603,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:416 templates/personal.php:181 +#: templates/admin.php:416 templates/personal.php:171 msgid "Version" msgstr "" -#: templates/admin.php:420 templates/personal.php:184 +#: templates/admin.php:420 templates/personal.php:174 msgid "" "Developed by the ownCloud community, the -licensed by " msgstr "" @@ -664,108 +678,108 @@ msgstr "" msgid "You have used %s of the available %s" msgstr "" -#: templates/personal.php:39 templates/users.php:21 templates/users.php:87 +#: templates/personal.php:38 templates/users.php:21 templates/users.php:87 msgid "Password" msgstr "" -#: templates/personal.php:40 +#: templates/personal.php:39 msgid "Your password was changed" msgstr "" -#: templates/personal.php:41 +#: templates/personal.php:40 msgid "Unable to change your password" msgstr "" -#: templates/personal.php:43 +#: templates/personal.php:42 msgid "Current password" msgstr "" -#: templates/personal.php:46 +#: templates/personal.php:45 msgid "New password" msgstr "" -#: templates/personal.php:50 +#: templates/personal.php:49 msgid "Change password" msgstr "" -#: templates/personal.php:64 templates/users.php:86 +#: templates/personal.php:61 templates/users.php:86 msgid "Full Name" msgstr "" -#: templates/personal.php:81 +#: templates/personal.php:76 msgid "Email" msgstr "" -#: templates/personal.php:83 +#: templates/personal.php:78 msgid "Your email address" msgstr "" -#: templates/personal.php:86 +#: templates/personal.php:81 msgid "" "Fill in an email address to enable password recovery and receive " "notifications" msgstr "" -#: templates/personal.php:96 +#: templates/personal.php:89 msgid "Profile picture" msgstr "" -#: templates/personal.php:101 +#: templates/personal.php:94 msgid "Upload new" msgstr "" -#: templates/personal.php:103 +#: templates/personal.php:96 msgid "Select new from Files" msgstr "" -#: templates/personal.php:104 +#: templates/personal.php:97 msgid "Remove image" msgstr "" -#: templates/personal.php:105 +#: templates/personal.php:98 msgid "Either png or jpg. Ideally square but you will be able to crop it." msgstr "" -#: templates/personal.php:107 +#: templates/personal.php:100 msgid "Your avatar is provided by your original account." msgstr "" -#: templates/personal.php:111 +#: templates/personal.php:104 msgid "Cancel" msgstr "" -#: templates/personal.php:112 +#: templates/personal.php:105 msgid "Choose as profile image" msgstr "" -#: templates/personal.php:120 templates/personal.php:121 +#: templates/personal.php:111 templates/personal.php:112 msgid "Language" msgstr "" -#: templates/personal.php:140 +#: templates/personal.php:131 msgid "Help translate" msgstr "" -#: templates/personal.php:147 +#: templates/personal.php:137 msgid "WebDAV" msgstr "" -#: templates/personal.php:149 +#: templates/personal.php:139 #, php-format msgid "" "Use this address to access your Files via " "WebDAV" msgstr "" -#: templates/personal.php:161 +#: templates/personal.php:151 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:167 +#: templates/personal.php:157 msgid "Log-in password" msgstr "" -#: templates/personal.php:172 +#: templates/personal.php:162 msgid "Decrypt all Files" msgstr "" diff --git a/l10n/ml/user_ldap.po b/l10n/ml/user_ldap.po index 74e585ae93b..51de77c3900 100644 --- a/l10n/ml/user_ldap.po +++ b/l10n/ml/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-08 01:56-0400\n" -"PO-Revision-Date: 2014-04-08 05:56+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:55+0000\n" "Last-Translator: I Robot\n" "Language-Team: Malayalam (http://www.transifex.com/projects/p/owncloud/language/ml/)\n" "MIME-Version: 1.0\n" @@ -144,7 +144,7 @@ msgstr[1] "" msgid "Invalid Host" msgstr "" -#: lib/wizard.php:963 +#: lib/wizard.php:983 msgid "Could not find the desired feature" msgstr "" @@ -335,7 +335,7 @@ msgid "Only connect to the replica server." msgstr "" #: templates/settings.php:26 -msgid "Case insensitve LDAP server (Windows)" +msgid "Case insensitive LDAP server (Windows)" msgstr "" #: templates/settings.php:27 diff --git a/l10n/ml_IN/settings.po b/l10n/ml_IN/settings.po index 5a9922292b9..31883d001e2 100644 --- a/l10n/ml_IN/settings.po +++ b/l10n/ml_IN/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-03-26 01:55-0400\n" -"PO-Revision-Date: 2014-03-26 05:55+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Malayalam (India) (http://www.transifex.com/projects/p/owncloud/language/ml_IN/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159 +#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149 msgid "Encryption" msgstr "" @@ -64,7 +64,7 @@ msgid "Unable to load list from App Store" msgstr "" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 changepassword/controller.php:55 +#: ajax/togglegroups.php:20 changepassword/controller.php:49 msgid "Authentication error" msgstr "" @@ -84,6 +84,20 @@ msgstr "" msgid "Unable to add group" msgstr "" +#: ajax/decryptall.php:31 +msgid "Files decrypted successfully" +msgstr "" + +#: ajax/decryptall.php:33 +msgid "" +"Couldn't decrypt your files, please check your owncloud.log or ask your " +"administrator" +msgstr "" + +#: ajax/decryptall.php:36 +msgid "Couldn't decrypt your files, check your password and try again" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -126,32 +140,32 @@ msgstr "" msgid "Couldn't update app." msgstr "" -#: changepassword/controller.php:20 +#: changepassword/controller.php:17 msgid "Wrong password" msgstr "" -#: changepassword/controller.php:42 +#: changepassword/controller.php:36 msgid "No user supplied" msgstr "" -#: changepassword/controller.php:74 +#: changepassword/controller.php:68 msgid "" "Please provide an admin recovery password, otherwise all user data will be " "lost" msgstr "" -#: changepassword/controller.php:79 +#: changepassword/controller.php:73 msgid "" "Wrong admin recovery password. Please check the password and try again." msgstr "" -#: changepassword/controller.php:87 +#: changepassword/controller.php:81 msgid "" "Back-end doesn't support password change, but the users encryption key was " "successfully updated." msgstr "" -#: changepassword/controller.php:92 changepassword/controller.php:103 +#: changepassword/controller.php:86 changepassword/controller.php:97 msgid "Unable to change password" msgstr "" @@ -203,7 +217,7 @@ msgstr "" msgid "Error" msgstr "" -#: js/apps.js:153 templates/apps.php:54 +#: js/apps.js:153 templates/apps.php:55 msgid "Update" msgstr "" @@ -211,31 +225,31 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:246 +#: js/personal.js:243 msgid "Select a profile picture" msgstr "" -#: js/personal.js:277 +#: js/personal.js:274 msgid "Very weak password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:275 msgid "Weak password" msgstr "" -#: js/personal.js:279 +#: js/personal.js:276 msgid "So-so password" msgstr "" -#: js/personal.js:280 +#: js/personal.js:277 msgid "Good password" msgstr "" -#: js/personal.js:281 +#: js/personal.js:278 msgid "Strong password" msgstr "" -#: js/personal.js:316 +#: js/personal.js:313 msgid "Decrypting files... Please wait, this can take some time." msgstr "" @@ -284,7 +298,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:49 personal.php:50 +#: personal.php:48 personal.php:49 msgid "__language_name__" msgstr "" @@ -589,11 +603,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:416 templates/personal.php:181 +#: templates/admin.php:416 templates/personal.php:171 msgid "Version" msgstr "" -#: templates/admin.php:420 templates/personal.php:184 +#: templates/admin.php:420 templates/personal.php:174 msgid "" "Developed by the ownCloud community, the -licensed by " msgstr "" @@ -664,108 +678,108 @@ msgstr "" msgid "You have used %s of the available %s" msgstr "" -#: templates/personal.php:39 templates/users.php:21 templates/users.php:87 +#: templates/personal.php:38 templates/users.php:21 templates/users.php:87 msgid "Password" msgstr "" -#: templates/personal.php:40 +#: templates/personal.php:39 msgid "Your password was changed" msgstr "" -#: templates/personal.php:41 +#: templates/personal.php:40 msgid "Unable to change your password" msgstr "" -#: templates/personal.php:43 +#: templates/personal.php:42 msgid "Current password" msgstr "" -#: templates/personal.php:46 +#: templates/personal.php:45 msgid "New password" msgstr "" -#: templates/personal.php:50 +#: templates/personal.php:49 msgid "Change password" msgstr "" -#: templates/personal.php:64 templates/users.php:86 +#: templates/personal.php:61 templates/users.php:86 msgid "Full Name" msgstr "" -#: templates/personal.php:81 +#: templates/personal.php:76 msgid "Email" msgstr "" -#: templates/personal.php:83 +#: templates/personal.php:78 msgid "Your email address" msgstr "" -#: templates/personal.php:86 +#: templates/personal.php:81 msgid "" "Fill in an email address to enable password recovery and receive " "notifications" msgstr "" -#: templates/personal.php:96 +#: templates/personal.php:89 msgid "Profile picture" msgstr "" -#: templates/personal.php:101 +#: templates/personal.php:94 msgid "Upload new" msgstr "" -#: templates/personal.php:103 +#: templates/personal.php:96 msgid "Select new from Files" msgstr "" -#: templates/personal.php:104 +#: templates/personal.php:97 msgid "Remove image" msgstr "" -#: templates/personal.php:105 +#: templates/personal.php:98 msgid "Either png or jpg. Ideally square but you will be able to crop it." msgstr "" -#: templates/personal.php:107 +#: templates/personal.php:100 msgid "Your avatar is provided by your original account." msgstr "" -#: templates/personal.php:111 +#: templates/personal.php:104 msgid "Cancel" msgstr "" -#: templates/personal.php:112 +#: templates/personal.php:105 msgid "Choose as profile image" msgstr "" -#: templates/personal.php:120 templates/personal.php:121 +#: templates/personal.php:111 templates/personal.php:112 msgid "Language" msgstr "" -#: templates/personal.php:140 +#: templates/personal.php:131 msgid "Help translate" msgstr "" -#: templates/personal.php:147 +#: templates/personal.php:137 msgid "WebDAV" msgstr "" -#: templates/personal.php:149 +#: templates/personal.php:139 #, php-format msgid "" "Use this address to access your Files via " "WebDAV" msgstr "" -#: templates/personal.php:161 +#: templates/personal.php:151 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:167 +#: templates/personal.php:157 msgid "Log-in password" msgstr "" -#: templates/personal.php:172 +#: templates/personal.php:162 msgid "Decrypt all Files" msgstr "" diff --git a/l10n/ml_IN/user_ldap.po b/l10n/ml_IN/user_ldap.po index 39c0ec79a26..90c87e5cabf 100644 --- a/l10n/ml_IN/user_ldap.po +++ b/l10n/ml_IN/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-08 01:56-0400\n" -"PO-Revision-Date: 2014-04-08 05:56+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:55+0000\n" "Last-Translator: I Robot\n" "Language-Team: Malayalam (India) (http://www.transifex.com/projects/p/owncloud/language/ml_IN/)\n" "MIME-Version: 1.0\n" @@ -144,7 +144,7 @@ msgstr[1] "" msgid "Invalid Host" msgstr "" -#: lib/wizard.php:963 +#: lib/wizard.php:983 msgid "Could not find the desired feature" msgstr "" @@ -335,7 +335,7 @@ msgid "Only connect to the replica server." msgstr "" #: templates/settings.php:26 -msgid "Case insensitve LDAP server (Windows)" +msgid "Case insensitive LDAP server (Windows)" msgstr "" #: templates/settings.php:27 diff --git a/l10n/mn/settings.po b/l10n/mn/settings.po index f2b9550b985..122a7b465ec 100644 --- a/l10n/mn/settings.po +++ b/l10n/mn/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-03-26 01:55-0400\n" -"PO-Revision-Date: 2014-03-26 05:55+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Mongolian (http://www.transifex.com/projects/p/owncloud/language/mn/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159 +#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149 msgid "Encryption" msgstr "" @@ -64,7 +64,7 @@ msgid "Unable to load list from App Store" msgstr "" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 changepassword/controller.php:55 +#: ajax/togglegroups.php:20 changepassword/controller.php:49 msgid "Authentication error" msgstr "" @@ -84,6 +84,20 @@ msgstr "" msgid "Unable to add group" msgstr "" +#: ajax/decryptall.php:31 +msgid "Files decrypted successfully" +msgstr "" + +#: ajax/decryptall.php:33 +msgid "" +"Couldn't decrypt your files, please check your owncloud.log or ask your " +"administrator" +msgstr "" + +#: ajax/decryptall.php:36 +msgid "Couldn't decrypt your files, check your password and try again" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -126,32 +140,32 @@ msgstr "" msgid "Couldn't update app." msgstr "" -#: changepassword/controller.php:20 +#: changepassword/controller.php:17 msgid "Wrong password" msgstr "" -#: changepassword/controller.php:42 +#: changepassword/controller.php:36 msgid "No user supplied" msgstr "" -#: changepassword/controller.php:74 +#: changepassword/controller.php:68 msgid "" "Please provide an admin recovery password, otherwise all user data will be " "lost" msgstr "" -#: changepassword/controller.php:79 +#: changepassword/controller.php:73 msgid "" "Wrong admin recovery password. Please check the password and try again." msgstr "" -#: changepassword/controller.php:87 +#: changepassword/controller.php:81 msgid "" "Back-end doesn't support password change, but the users encryption key was " "successfully updated." msgstr "" -#: changepassword/controller.php:92 changepassword/controller.php:103 +#: changepassword/controller.php:86 changepassword/controller.php:97 msgid "Unable to change password" msgstr "" @@ -203,7 +217,7 @@ msgstr "" msgid "Error" msgstr "" -#: js/apps.js:153 templates/apps.php:54 +#: js/apps.js:153 templates/apps.php:55 msgid "Update" msgstr "" @@ -211,31 +225,31 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:246 +#: js/personal.js:243 msgid "Select a profile picture" msgstr "" -#: js/personal.js:277 +#: js/personal.js:274 msgid "Very weak password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:275 msgid "Weak password" msgstr "" -#: js/personal.js:279 +#: js/personal.js:276 msgid "So-so password" msgstr "" -#: js/personal.js:280 +#: js/personal.js:277 msgid "Good password" msgstr "" -#: js/personal.js:281 +#: js/personal.js:278 msgid "Strong password" msgstr "" -#: js/personal.js:316 +#: js/personal.js:313 msgid "Decrypting files... Please wait, this can take some time." msgstr "" @@ -284,7 +298,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:49 personal.php:50 +#: personal.php:48 personal.php:49 msgid "__language_name__" msgstr "" @@ -589,11 +603,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:416 templates/personal.php:181 +#: templates/admin.php:416 templates/personal.php:171 msgid "Version" msgstr "" -#: templates/admin.php:420 templates/personal.php:184 +#: templates/admin.php:420 templates/personal.php:174 msgid "" "Developed by the ownCloud community, the -licensed by " msgstr "" @@ -664,108 +678,108 @@ msgstr "" msgid "You have used %s of the available %s" msgstr "" -#: templates/personal.php:39 templates/users.php:21 templates/users.php:87 +#: templates/personal.php:38 templates/users.php:21 templates/users.php:87 msgid "Password" msgstr "" -#: templates/personal.php:40 +#: templates/personal.php:39 msgid "Your password was changed" msgstr "" -#: templates/personal.php:41 +#: templates/personal.php:40 msgid "Unable to change your password" msgstr "" -#: templates/personal.php:43 +#: templates/personal.php:42 msgid "Current password" msgstr "" -#: templates/personal.php:46 +#: templates/personal.php:45 msgid "New password" msgstr "" -#: templates/personal.php:50 +#: templates/personal.php:49 msgid "Change password" msgstr "" -#: templates/personal.php:64 templates/users.php:86 +#: templates/personal.php:61 templates/users.php:86 msgid "Full Name" msgstr "" -#: templates/personal.php:81 +#: templates/personal.php:76 msgid "Email" msgstr "" -#: templates/personal.php:83 +#: templates/personal.php:78 msgid "Your email address" msgstr "" -#: templates/personal.php:86 +#: templates/personal.php:81 msgid "" "Fill in an email address to enable password recovery and receive " "notifications" msgstr "" -#: templates/personal.php:96 +#: templates/personal.php:89 msgid "Profile picture" msgstr "" -#: templates/personal.php:101 +#: templates/personal.php:94 msgid "Upload new" msgstr "" -#: templates/personal.php:103 +#: templates/personal.php:96 msgid "Select new from Files" msgstr "" -#: templates/personal.php:104 +#: templates/personal.php:97 msgid "Remove image" msgstr "" -#: templates/personal.php:105 +#: templates/personal.php:98 msgid "Either png or jpg. Ideally square but you will be able to crop it." msgstr "" -#: templates/personal.php:107 +#: templates/personal.php:100 msgid "Your avatar is provided by your original account." msgstr "" -#: templates/personal.php:111 +#: templates/personal.php:104 msgid "Cancel" msgstr "" -#: templates/personal.php:112 +#: templates/personal.php:105 msgid "Choose as profile image" msgstr "" -#: templates/personal.php:120 templates/personal.php:121 +#: templates/personal.php:111 templates/personal.php:112 msgid "Language" msgstr "" -#: templates/personal.php:140 +#: templates/personal.php:131 msgid "Help translate" msgstr "" -#: templates/personal.php:147 +#: templates/personal.php:137 msgid "WebDAV" msgstr "" -#: templates/personal.php:149 +#: templates/personal.php:139 #, php-format msgid "" "Use this address to access your Files via " "WebDAV" msgstr "" -#: templates/personal.php:161 +#: templates/personal.php:151 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:167 +#: templates/personal.php:157 msgid "Log-in password" msgstr "" -#: templates/personal.php:172 +#: templates/personal.php:162 msgid "Decrypt all Files" msgstr "" diff --git a/l10n/mn/user_ldap.po b/l10n/mn/user_ldap.po index 51f10319473..57ae6aeee20 100644 --- a/l10n/mn/user_ldap.po +++ b/l10n/mn/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-08 01:56-0400\n" -"PO-Revision-Date: 2014-04-08 05:56+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:55+0000\n" "Last-Translator: I Robot\n" "Language-Team: Mongolian (http://www.transifex.com/projects/p/owncloud/language/mn/)\n" "MIME-Version: 1.0\n" @@ -144,7 +144,7 @@ msgstr[1] "" msgid "Invalid Host" msgstr "" -#: lib/wizard.php:963 +#: lib/wizard.php:983 msgid "Could not find the desired feature" msgstr "" @@ -335,7 +335,7 @@ msgid "Only connect to the replica server." msgstr "" #: templates/settings.php:26 -msgid "Case insensitve LDAP server (Windows)" +msgid "Case insensitive LDAP server (Windows)" msgstr "" #: templates/settings.php:27 diff --git a/l10n/ms_MY/settings.po b/l10n/ms_MY/settings.po index e76e534f068..7c28e4cd32c 100644 --- a/l10n/ms_MY/settings.po +++ b/l10n/ms_MY/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-03-26 01:55-0400\n" -"PO-Revision-Date: 2014-03-26 05:55+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159 +#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149 msgid "Encryption" msgstr "" @@ -64,7 +64,7 @@ msgid "Unable to load list from App Store" msgstr "" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 changepassword/controller.php:55 +#: ajax/togglegroups.php:20 changepassword/controller.php:49 msgid "Authentication error" msgstr "Ralat pengesahan" @@ -84,6 +84,20 @@ msgstr "" msgid "Unable to add group" msgstr "" +#: ajax/decryptall.php:31 +msgid "Files decrypted successfully" +msgstr "" + +#: ajax/decryptall.php:33 +msgid "" +"Couldn't decrypt your files, please check your owncloud.log or ask your " +"administrator" +msgstr "" + +#: ajax/decryptall.php:36 +msgid "Couldn't decrypt your files, check your password and try again" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "Emel disimpan" @@ -126,32 +140,32 @@ msgstr "" msgid "Couldn't update app." msgstr "" -#: changepassword/controller.php:20 +#: changepassword/controller.php:17 msgid "Wrong password" msgstr "" -#: changepassword/controller.php:42 +#: changepassword/controller.php:36 msgid "No user supplied" msgstr "" -#: changepassword/controller.php:74 +#: changepassword/controller.php:68 msgid "" "Please provide an admin recovery password, otherwise all user data will be " "lost" msgstr "" -#: changepassword/controller.php:79 +#: changepassword/controller.php:73 msgid "" "Wrong admin recovery password. Please check the password and try again." msgstr "" -#: changepassword/controller.php:87 +#: changepassword/controller.php:81 msgid "" "Back-end doesn't support password change, but the users encryption key was " "successfully updated." msgstr "" -#: changepassword/controller.php:92 changepassword/controller.php:103 +#: changepassword/controller.php:86 changepassword/controller.php:97 msgid "Unable to change password" msgstr "" @@ -203,7 +217,7 @@ msgstr "" msgid "Error" msgstr "Ralat" -#: js/apps.js:153 templates/apps.php:54 +#: js/apps.js:153 templates/apps.php:55 msgid "Update" msgstr "Kemaskini" @@ -211,31 +225,31 @@ msgstr "Kemaskini" msgid "Updated" msgstr "" -#: js/personal.js:246 +#: js/personal.js:243 msgid "Select a profile picture" msgstr "" -#: js/personal.js:277 +#: js/personal.js:274 msgid "Very weak password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:275 msgid "Weak password" msgstr "" -#: js/personal.js:279 +#: js/personal.js:276 msgid "So-so password" msgstr "" -#: js/personal.js:280 +#: js/personal.js:277 msgid "Good password" msgstr "" -#: js/personal.js:281 +#: js/personal.js:278 msgid "Strong password" msgstr "" -#: js/personal.js:316 +#: js/personal.js:313 msgid "Decrypting files... Please wait, this can take some time." msgstr "" @@ -284,7 +298,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:49 personal.php:50 +#: personal.php:48 personal.php:49 msgid "__language_name__" msgstr "_nama_bahasa_" @@ -589,11 +603,11 @@ msgstr "Lanjutan" msgid "Less" msgstr "" -#: templates/admin.php:416 templates/personal.php:181 +#: templates/admin.php:416 templates/personal.php:171 msgid "Version" msgstr "" -#: templates/admin.php:420 templates/personal.php:184 +#: templates/admin.php:420 templates/personal.php:174 msgid "" "Developed by the ownCloud community, the -licensed by " msgstr "" @@ -664,108 +678,108 @@ msgstr "" msgid "You have used %s of the available %s" msgstr "" -#: templates/personal.php:39 templates/users.php:21 templates/users.php:87 +#: templates/personal.php:38 templates/users.php:21 templates/users.php:87 msgid "Password" msgstr "Kata laluan" -#: templates/personal.php:40 +#: templates/personal.php:39 msgid "Your password was changed" msgstr "" -#: templates/personal.php:41 +#: templates/personal.php:40 msgid "Unable to change your password" msgstr "Gagal mengubah kata laluan anda " -#: templates/personal.php:43 +#: templates/personal.php:42 msgid "Current password" msgstr "Kata laluan semasa" -#: templates/personal.php:46 +#: templates/personal.php:45 msgid "New password" msgstr "Kata laluan baru" -#: templates/personal.php:50 +#: templates/personal.php:49 msgid "Change password" msgstr "Ubah kata laluan" -#: templates/personal.php:64 templates/users.php:86 +#: templates/personal.php:61 templates/users.php:86 msgid "Full Name" msgstr "" -#: templates/personal.php:81 +#: templates/personal.php:76 msgid "Email" msgstr "Email" -#: templates/personal.php:83 +#: templates/personal.php:78 msgid "Your email address" msgstr "Alamat emel anda" -#: templates/personal.php:86 +#: templates/personal.php:81 msgid "" "Fill in an email address to enable password recovery and receive " "notifications" msgstr "" -#: templates/personal.php:96 +#: templates/personal.php:89 msgid "Profile picture" msgstr "Gambar profil" -#: templates/personal.php:101 +#: templates/personal.php:94 msgid "Upload new" msgstr "" -#: templates/personal.php:103 +#: templates/personal.php:96 msgid "Select new from Files" msgstr "" -#: templates/personal.php:104 +#: templates/personal.php:97 msgid "Remove image" msgstr "" -#: templates/personal.php:105 +#: templates/personal.php:98 msgid "Either png or jpg. Ideally square but you will be able to crop it." msgstr "" -#: templates/personal.php:107 +#: templates/personal.php:100 msgid "Your avatar is provided by your original account." msgstr "" -#: templates/personal.php:111 +#: templates/personal.php:104 msgid "Cancel" msgstr "Batal" -#: templates/personal.php:112 +#: templates/personal.php:105 msgid "Choose as profile image" msgstr "" -#: templates/personal.php:120 templates/personal.php:121 +#: templates/personal.php:111 templates/personal.php:112 msgid "Language" msgstr "Bahasa" -#: templates/personal.php:140 +#: templates/personal.php:131 msgid "Help translate" msgstr "Bantu terjemah" -#: templates/personal.php:147 +#: templates/personal.php:137 msgid "WebDAV" msgstr "" -#: templates/personal.php:149 +#: templates/personal.php:139 #, php-format msgid "" "Use this address to access your Files via " "WebDAV" msgstr "" -#: templates/personal.php:161 +#: templates/personal.php:151 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:167 +#: templates/personal.php:157 msgid "Log-in password" msgstr "" -#: templates/personal.php:172 +#: templates/personal.php:162 msgid "Decrypt all Files" msgstr "" diff --git a/l10n/ms_MY/user_ldap.po b/l10n/ms_MY/user_ldap.po index f99f0580f35..d1462e5a4ba 100644 --- a/l10n/ms_MY/user_ldap.po +++ b/l10n/ms_MY/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-08 01:56-0400\n" -"PO-Revision-Date: 2014-04-08 05:56+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:55+0000\n" "Last-Translator: I Robot\n" "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n" "MIME-Version: 1.0\n" @@ -142,7 +142,7 @@ msgstr[0] "" msgid "Invalid Host" msgstr "" -#: lib/wizard.php:963 +#: lib/wizard.php:983 msgid "Could not find the desired feature" msgstr "" @@ -333,7 +333,7 @@ msgid "Only connect to the replica server." msgstr "" #: templates/settings.php:26 -msgid "Case insensitve LDAP server (Windows)" +msgid "Case insensitive LDAP server (Windows)" msgstr "" #: templates/settings.php:27 diff --git a/l10n/my_MM/settings.po b/l10n/my_MM/settings.po index e40126e75ae..0776a88e668 100644 --- a/l10n/my_MM/settings.po +++ b/l10n/my_MM/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-03-26 01:55-0400\n" -"PO-Revision-Date: 2014-03-26 05:55+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159 +#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149 msgid "Encryption" msgstr "" @@ -64,7 +64,7 @@ msgid "Unable to load list from App Store" msgstr "" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 changepassword/controller.php:55 +#: ajax/togglegroups.php:20 changepassword/controller.php:49 msgid "Authentication error" msgstr "ခွင့်ပြုချက်မအောင်မြင်" @@ -84,6 +84,20 @@ msgstr "" msgid "Unable to add group" msgstr "" +#: ajax/decryptall.php:31 +msgid "Files decrypted successfully" +msgstr "" + +#: ajax/decryptall.php:33 +msgid "" +"Couldn't decrypt your files, please check your owncloud.log or ask your " +"administrator" +msgstr "" + +#: ajax/decryptall.php:36 +msgid "Couldn't decrypt your files, check your password and try again" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -126,32 +140,32 @@ msgstr "" msgid "Couldn't update app." msgstr "" -#: changepassword/controller.php:20 +#: changepassword/controller.php:17 msgid "Wrong password" msgstr "" -#: changepassword/controller.php:42 +#: changepassword/controller.php:36 msgid "No user supplied" msgstr "" -#: changepassword/controller.php:74 +#: changepassword/controller.php:68 msgid "" "Please provide an admin recovery password, otherwise all user data will be " "lost" msgstr "" -#: changepassword/controller.php:79 +#: changepassword/controller.php:73 msgid "" "Wrong admin recovery password. Please check the password and try again." msgstr "" -#: changepassword/controller.php:87 +#: changepassword/controller.php:81 msgid "" "Back-end doesn't support password change, but the users encryption key was " "successfully updated." msgstr "" -#: changepassword/controller.php:92 changepassword/controller.php:103 +#: changepassword/controller.php:86 changepassword/controller.php:97 msgid "Unable to change password" msgstr "" @@ -203,7 +217,7 @@ msgstr "" msgid "Error" msgstr "" -#: js/apps.js:153 templates/apps.php:54 +#: js/apps.js:153 templates/apps.php:55 msgid "Update" msgstr "" @@ -211,31 +225,31 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:246 +#: js/personal.js:243 msgid "Select a profile picture" msgstr "" -#: js/personal.js:277 +#: js/personal.js:274 msgid "Very weak password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:275 msgid "Weak password" msgstr "" -#: js/personal.js:279 +#: js/personal.js:276 msgid "So-so password" msgstr "" -#: js/personal.js:280 +#: js/personal.js:277 msgid "Good password" msgstr "" -#: js/personal.js:281 +#: js/personal.js:278 msgid "Strong password" msgstr "" -#: js/personal.js:316 +#: js/personal.js:313 msgid "Decrypting files... Please wait, this can take some time." msgstr "" @@ -284,7 +298,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:49 personal.php:50 +#: personal.php:48 personal.php:49 msgid "__language_name__" msgstr "" @@ -589,11 +603,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:416 templates/personal.php:181 +#: templates/admin.php:416 templates/personal.php:171 msgid "Version" msgstr "" -#: templates/admin.php:420 templates/personal.php:184 +#: templates/admin.php:420 templates/personal.php:174 msgid "" "Developed by the ownCloud community, the -licensed by " msgstr "" @@ -664,108 +678,108 @@ msgstr "" msgid "You have used %s of the available %s" msgstr "" -#: templates/personal.php:39 templates/users.php:21 templates/users.php:87 +#: templates/personal.php:38 templates/users.php:21 templates/users.php:87 msgid "Password" msgstr "စကားဝှက်" -#: templates/personal.php:40 +#: templates/personal.php:39 msgid "Your password was changed" msgstr "" -#: templates/personal.php:41 +#: templates/personal.php:40 msgid "Unable to change your password" msgstr "" -#: templates/personal.php:43 +#: templates/personal.php:42 msgid "Current password" msgstr "" -#: templates/personal.php:46 +#: templates/personal.php:45 msgid "New password" msgstr "စကားဝှက်အသစ်" -#: templates/personal.php:50 +#: templates/personal.php:49 msgid "Change password" msgstr "" -#: templates/personal.php:64 templates/users.php:86 +#: templates/personal.php:61 templates/users.php:86 msgid "Full Name" msgstr "" -#: templates/personal.php:81 +#: templates/personal.php:76 msgid "Email" msgstr "" -#: templates/personal.php:83 +#: templates/personal.php:78 msgid "Your email address" msgstr "" -#: templates/personal.php:86 +#: templates/personal.php:81 msgid "" "Fill in an email address to enable password recovery and receive " "notifications" msgstr "" -#: templates/personal.php:96 +#: templates/personal.php:89 msgid "Profile picture" msgstr "" -#: templates/personal.php:101 +#: templates/personal.php:94 msgid "Upload new" msgstr "" -#: templates/personal.php:103 +#: templates/personal.php:96 msgid "Select new from Files" msgstr "" -#: templates/personal.php:104 +#: templates/personal.php:97 msgid "Remove image" msgstr "" -#: templates/personal.php:105 +#: templates/personal.php:98 msgid "Either png or jpg. Ideally square but you will be able to crop it." msgstr "" -#: templates/personal.php:107 +#: templates/personal.php:100 msgid "Your avatar is provided by your original account." msgstr "" -#: templates/personal.php:111 +#: templates/personal.php:104 msgid "Cancel" msgstr "ပယ်ဖျက်မည်" -#: templates/personal.php:112 +#: templates/personal.php:105 msgid "Choose as profile image" msgstr "" -#: templates/personal.php:120 templates/personal.php:121 +#: templates/personal.php:111 templates/personal.php:112 msgid "Language" msgstr "" -#: templates/personal.php:140 +#: templates/personal.php:131 msgid "Help translate" msgstr "" -#: templates/personal.php:147 +#: templates/personal.php:137 msgid "WebDAV" msgstr "" -#: templates/personal.php:149 +#: templates/personal.php:139 #, php-format msgid "" "Use this address to access your Files via " "WebDAV" msgstr "" -#: templates/personal.php:161 +#: templates/personal.php:151 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:167 +#: templates/personal.php:157 msgid "Log-in password" msgstr "" -#: templates/personal.php:172 +#: templates/personal.php:162 msgid "Decrypt all Files" msgstr "" diff --git a/l10n/my_MM/user_ldap.po b/l10n/my_MM/user_ldap.po index e251fa3611f..fa01baccda3 100644 --- a/l10n/my_MM/user_ldap.po +++ b/l10n/my_MM/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-08 01:56-0400\n" -"PO-Revision-Date: 2014-04-08 05:56+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:55+0000\n" "Last-Translator: I Robot\n" "Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n" "MIME-Version: 1.0\n" @@ -142,7 +142,7 @@ msgstr[0] "" msgid "Invalid Host" msgstr "" -#: lib/wizard.php:963 +#: lib/wizard.php:983 msgid "Could not find the desired feature" msgstr "" @@ -333,7 +333,7 @@ msgid "Only connect to the replica server." msgstr "" #: templates/settings.php:26 -msgid "Case insensitve LDAP server (Windows)" +msgid "Case insensitive LDAP server (Windows)" msgstr "" #: templates/settings.php:27 diff --git a/l10n/nb_NO/settings.po b/l10n/nb_NO/settings.po index 5a36f04ddb2..6943f76fe20 100644 --- a/l10n/nb_NO/settings.po +++ b/l10n/nb_NO/settings.po @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-10 01:54-0400\n" -"PO-Revision-Date: 2014-04-09 06:10+0000\n" -"Last-Translator: espenbye \n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:54+0000\n" +"Last-Translator: I Robot\n" "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -88,6 +88,20 @@ msgstr "Gruppen finnes allerede" msgid "Unable to add group" msgstr "Kan ikke legge til gruppe" +#: ajax/decryptall.php:31 +msgid "Files decrypted successfully" +msgstr "" + +#: ajax/decryptall.php:33 +msgid "" +"Couldn't decrypt your files, please check your owncloud.log or ask your " +"administrator" +msgstr "" + +#: ajax/decryptall.php:36 +msgid "Couldn't decrypt your files, check your password and try again" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "Epost lagret" diff --git a/l10n/nb_NO/user_ldap.po b/l10n/nb_NO/user_ldap.po index 50adfe578c7..c2097b948ff 100644 --- a/l10n/nb_NO/user_ldap.po +++ b/l10n/nb_NO/user_ldap.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-08 01:56-0400\n" -"PO-Revision-Date: 2014-04-08 05:56+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:55+0000\n" "Last-Translator: I Robot\n" "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n" "MIME-Version: 1.0\n" @@ -145,7 +145,7 @@ msgstr[1] "%s brukere funnet" msgid "Invalid Host" msgstr "Ugyldig tjener" -#: lib/wizard.php:963 +#: lib/wizard.php:983 msgid "Could not find the desired feature" msgstr "Fant ikke den ønskede funksjonaliteten" @@ -336,8 +336,8 @@ msgid "Only connect to the replica server." msgstr "Koble til bare replika-tjeneren." #: templates/settings.php:26 -msgid "Case insensitve LDAP server (Windows)" -msgstr "Case-insensitiv LDAP tjener (Windows)" +msgid "Case insensitive LDAP server (Windows)" +msgstr "" #: templates/settings.php:27 msgid "Turn off SSL certificate validation." diff --git a/l10n/nds/settings.po b/l10n/nds/settings.po index 5224f83aa48..bf175932a29 100644 --- a/l10n/nds/settings.po +++ b/l10n/nds/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-03-26 01:55-0400\n" -"PO-Revision-Date: 2014-03-26 05:55+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Low German (http://www.transifex.com/projects/p/owncloud/language/nds/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159 +#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149 msgid "Encryption" msgstr "" @@ -64,7 +64,7 @@ msgid "Unable to load list from App Store" msgstr "" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 changepassword/controller.php:55 +#: ajax/togglegroups.php:20 changepassword/controller.php:49 msgid "Authentication error" msgstr "" @@ -84,6 +84,20 @@ msgstr "" msgid "Unable to add group" msgstr "" +#: ajax/decryptall.php:31 +msgid "Files decrypted successfully" +msgstr "" + +#: ajax/decryptall.php:33 +msgid "" +"Couldn't decrypt your files, please check your owncloud.log or ask your " +"administrator" +msgstr "" + +#: ajax/decryptall.php:36 +msgid "Couldn't decrypt your files, check your password and try again" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -126,32 +140,32 @@ msgstr "" msgid "Couldn't update app." msgstr "" -#: changepassword/controller.php:20 +#: changepassword/controller.php:17 msgid "Wrong password" msgstr "" -#: changepassword/controller.php:42 +#: changepassword/controller.php:36 msgid "No user supplied" msgstr "" -#: changepassword/controller.php:74 +#: changepassword/controller.php:68 msgid "" "Please provide an admin recovery password, otherwise all user data will be " "lost" msgstr "" -#: changepassword/controller.php:79 +#: changepassword/controller.php:73 msgid "" "Wrong admin recovery password. Please check the password and try again." msgstr "" -#: changepassword/controller.php:87 +#: changepassword/controller.php:81 msgid "" "Back-end doesn't support password change, but the users encryption key was " "successfully updated." msgstr "" -#: changepassword/controller.php:92 changepassword/controller.php:103 +#: changepassword/controller.php:86 changepassword/controller.php:97 msgid "Unable to change password" msgstr "" @@ -203,7 +217,7 @@ msgstr "" msgid "Error" msgstr "" -#: js/apps.js:153 templates/apps.php:54 +#: js/apps.js:153 templates/apps.php:55 msgid "Update" msgstr "" @@ -211,31 +225,31 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:246 +#: js/personal.js:243 msgid "Select a profile picture" msgstr "" -#: js/personal.js:277 +#: js/personal.js:274 msgid "Very weak password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:275 msgid "Weak password" msgstr "" -#: js/personal.js:279 +#: js/personal.js:276 msgid "So-so password" msgstr "" -#: js/personal.js:280 +#: js/personal.js:277 msgid "Good password" msgstr "" -#: js/personal.js:281 +#: js/personal.js:278 msgid "Strong password" msgstr "" -#: js/personal.js:316 +#: js/personal.js:313 msgid "Decrypting files... Please wait, this can take some time." msgstr "" @@ -284,7 +298,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:49 personal.php:50 +#: personal.php:48 personal.php:49 msgid "__language_name__" msgstr "" @@ -589,11 +603,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:416 templates/personal.php:181 +#: templates/admin.php:416 templates/personal.php:171 msgid "Version" msgstr "" -#: templates/admin.php:420 templates/personal.php:184 +#: templates/admin.php:420 templates/personal.php:174 msgid "" "Developed by the ownCloud community, the -licensed by " msgstr "" @@ -664,108 +678,108 @@ msgstr "" msgid "You have used %s of the available %s" msgstr "" -#: templates/personal.php:39 templates/users.php:21 templates/users.php:87 +#: templates/personal.php:38 templates/users.php:21 templates/users.php:87 msgid "Password" msgstr "" -#: templates/personal.php:40 +#: templates/personal.php:39 msgid "Your password was changed" msgstr "" -#: templates/personal.php:41 +#: templates/personal.php:40 msgid "Unable to change your password" msgstr "" -#: templates/personal.php:43 +#: templates/personal.php:42 msgid "Current password" msgstr "" -#: templates/personal.php:46 +#: templates/personal.php:45 msgid "New password" msgstr "" -#: templates/personal.php:50 +#: templates/personal.php:49 msgid "Change password" msgstr "" -#: templates/personal.php:64 templates/users.php:86 +#: templates/personal.php:61 templates/users.php:86 msgid "Full Name" msgstr "" -#: templates/personal.php:81 +#: templates/personal.php:76 msgid "Email" msgstr "" -#: templates/personal.php:83 +#: templates/personal.php:78 msgid "Your email address" msgstr "" -#: templates/personal.php:86 +#: templates/personal.php:81 msgid "" "Fill in an email address to enable password recovery and receive " "notifications" msgstr "" -#: templates/personal.php:96 +#: templates/personal.php:89 msgid "Profile picture" msgstr "" -#: templates/personal.php:101 +#: templates/personal.php:94 msgid "Upload new" msgstr "" -#: templates/personal.php:103 +#: templates/personal.php:96 msgid "Select new from Files" msgstr "" -#: templates/personal.php:104 +#: templates/personal.php:97 msgid "Remove image" msgstr "" -#: templates/personal.php:105 +#: templates/personal.php:98 msgid "Either png or jpg. Ideally square but you will be able to crop it." msgstr "" -#: templates/personal.php:107 +#: templates/personal.php:100 msgid "Your avatar is provided by your original account." msgstr "" -#: templates/personal.php:111 +#: templates/personal.php:104 msgid "Cancel" msgstr "" -#: templates/personal.php:112 +#: templates/personal.php:105 msgid "Choose as profile image" msgstr "" -#: templates/personal.php:120 templates/personal.php:121 +#: templates/personal.php:111 templates/personal.php:112 msgid "Language" msgstr "" -#: templates/personal.php:140 +#: templates/personal.php:131 msgid "Help translate" msgstr "" -#: templates/personal.php:147 +#: templates/personal.php:137 msgid "WebDAV" msgstr "" -#: templates/personal.php:149 +#: templates/personal.php:139 #, php-format msgid "" "Use this address to access your Files via " "WebDAV" msgstr "" -#: templates/personal.php:161 +#: templates/personal.php:151 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:167 +#: templates/personal.php:157 msgid "Log-in password" msgstr "" -#: templates/personal.php:172 +#: templates/personal.php:162 msgid "Decrypt all Files" msgstr "" diff --git a/l10n/nds/user_ldap.po b/l10n/nds/user_ldap.po index 87f72df86c2..6ad765a099a 100644 --- a/l10n/nds/user_ldap.po +++ b/l10n/nds/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-08 01:56-0400\n" -"PO-Revision-Date: 2014-04-08 05:56+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:55+0000\n" "Last-Translator: I Robot\n" "Language-Team: Low German (http://www.transifex.com/projects/p/owncloud/language/nds/)\n" "MIME-Version: 1.0\n" @@ -144,7 +144,7 @@ msgstr[1] "" msgid "Invalid Host" msgstr "" -#: lib/wizard.php:963 +#: lib/wizard.php:983 msgid "Could not find the desired feature" msgstr "" @@ -335,7 +335,7 @@ msgid "Only connect to the replica server." msgstr "" #: templates/settings.php:26 -msgid "Case insensitve LDAP server (Windows)" +msgid "Case insensitive LDAP server (Windows)" msgstr "" #: templates/settings.php:27 diff --git a/l10n/ne/settings.po b/l10n/ne/settings.po index 45cc088491c..e84cb840e89 100644 --- a/l10n/ne/settings.po +++ b/l10n/ne/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-03-26 01:55-0400\n" -"PO-Revision-Date: 2014-03-26 05:55+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159 +#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149 msgid "Encryption" msgstr "" @@ -64,7 +64,7 @@ msgid "Unable to load list from App Store" msgstr "" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 changepassword/controller.php:55 +#: ajax/togglegroups.php:20 changepassword/controller.php:49 msgid "Authentication error" msgstr "" @@ -84,6 +84,20 @@ msgstr "" msgid "Unable to add group" msgstr "" +#: ajax/decryptall.php:31 +msgid "Files decrypted successfully" +msgstr "" + +#: ajax/decryptall.php:33 +msgid "" +"Couldn't decrypt your files, please check your owncloud.log or ask your " +"administrator" +msgstr "" + +#: ajax/decryptall.php:36 +msgid "Couldn't decrypt your files, check your password and try again" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -126,32 +140,32 @@ msgstr "" msgid "Couldn't update app." msgstr "" -#: changepassword/controller.php:20 +#: changepassword/controller.php:17 msgid "Wrong password" msgstr "" -#: changepassword/controller.php:42 +#: changepassword/controller.php:36 msgid "No user supplied" msgstr "" -#: changepassword/controller.php:74 +#: changepassword/controller.php:68 msgid "" "Please provide an admin recovery password, otherwise all user data will be " "lost" msgstr "" -#: changepassword/controller.php:79 +#: changepassword/controller.php:73 msgid "" "Wrong admin recovery password. Please check the password and try again." msgstr "" -#: changepassword/controller.php:87 +#: changepassword/controller.php:81 msgid "" "Back-end doesn't support password change, but the users encryption key was " "successfully updated." msgstr "" -#: changepassword/controller.php:92 changepassword/controller.php:103 +#: changepassword/controller.php:86 changepassword/controller.php:97 msgid "Unable to change password" msgstr "" @@ -203,7 +217,7 @@ msgstr "" msgid "Error" msgstr "" -#: js/apps.js:153 templates/apps.php:54 +#: js/apps.js:153 templates/apps.php:55 msgid "Update" msgstr "" @@ -211,31 +225,31 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:246 +#: js/personal.js:243 msgid "Select a profile picture" msgstr "" -#: js/personal.js:277 +#: js/personal.js:274 msgid "Very weak password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:275 msgid "Weak password" msgstr "" -#: js/personal.js:279 +#: js/personal.js:276 msgid "So-so password" msgstr "" -#: js/personal.js:280 +#: js/personal.js:277 msgid "Good password" msgstr "" -#: js/personal.js:281 +#: js/personal.js:278 msgid "Strong password" msgstr "" -#: js/personal.js:316 +#: js/personal.js:313 msgid "Decrypting files... Please wait, this can take some time." msgstr "" @@ -284,7 +298,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:49 personal.php:50 +#: personal.php:48 personal.php:49 msgid "__language_name__" msgstr "" @@ -589,11 +603,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:416 templates/personal.php:181 +#: templates/admin.php:416 templates/personal.php:171 msgid "Version" msgstr "" -#: templates/admin.php:420 templates/personal.php:184 +#: templates/admin.php:420 templates/personal.php:174 msgid "" "Developed by the ownCloud community, the -licensed by " msgstr "" @@ -664,108 +678,108 @@ msgstr "" msgid "You have used %s of the available %s" msgstr "" -#: templates/personal.php:39 templates/users.php:21 templates/users.php:87 +#: templates/personal.php:38 templates/users.php:21 templates/users.php:87 msgid "Password" msgstr "" -#: templates/personal.php:40 +#: templates/personal.php:39 msgid "Your password was changed" msgstr "" -#: templates/personal.php:41 +#: templates/personal.php:40 msgid "Unable to change your password" msgstr "" -#: templates/personal.php:43 +#: templates/personal.php:42 msgid "Current password" msgstr "" -#: templates/personal.php:46 +#: templates/personal.php:45 msgid "New password" msgstr "" -#: templates/personal.php:50 +#: templates/personal.php:49 msgid "Change password" msgstr "" -#: templates/personal.php:64 templates/users.php:86 +#: templates/personal.php:61 templates/users.php:86 msgid "Full Name" msgstr "" -#: templates/personal.php:81 +#: templates/personal.php:76 msgid "Email" msgstr "" -#: templates/personal.php:83 +#: templates/personal.php:78 msgid "Your email address" msgstr "" -#: templates/personal.php:86 +#: templates/personal.php:81 msgid "" "Fill in an email address to enable password recovery and receive " "notifications" msgstr "" -#: templates/personal.php:96 +#: templates/personal.php:89 msgid "Profile picture" msgstr "" -#: templates/personal.php:101 +#: templates/personal.php:94 msgid "Upload new" msgstr "" -#: templates/personal.php:103 +#: templates/personal.php:96 msgid "Select new from Files" msgstr "" -#: templates/personal.php:104 +#: templates/personal.php:97 msgid "Remove image" msgstr "" -#: templates/personal.php:105 +#: templates/personal.php:98 msgid "Either png or jpg. Ideally square but you will be able to crop it." msgstr "" -#: templates/personal.php:107 +#: templates/personal.php:100 msgid "Your avatar is provided by your original account." msgstr "" -#: templates/personal.php:111 +#: templates/personal.php:104 msgid "Cancel" msgstr "" -#: templates/personal.php:112 +#: templates/personal.php:105 msgid "Choose as profile image" msgstr "" -#: templates/personal.php:120 templates/personal.php:121 +#: templates/personal.php:111 templates/personal.php:112 msgid "Language" msgstr "" -#: templates/personal.php:140 +#: templates/personal.php:131 msgid "Help translate" msgstr "" -#: templates/personal.php:147 +#: templates/personal.php:137 msgid "WebDAV" msgstr "" -#: templates/personal.php:149 +#: templates/personal.php:139 #, php-format msgid "" "Use this address to access your Files via " "WebDAV" msgstr "" -#: templates/personal.php:161 +#: templates/personal.php:151 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:167 +#: templates/personal.php:157 msgid "Log-in password" msgstr "" -#: templates/personal.php:172 +#: templates/personal.php:162 msgid "Decrypt all Files" msgstr "" diff --git a/l10n/ne/user_ldap.po b/l10n/ne/user_ldap.po index 2837bbbb4c5..da064c9e5fa 100644 --- a/l10n/ne/user_ldap.po +++ b/l10n/ne/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-08 01:56-0400\n" -"PO-Revision-Date: 2014-04-08 05:56+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:55+0000\n" "Last-Translator: I Robot\n" "Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n" "MIME-Version: 1.0\n" @@ -144,7 +144,7 @@ msgstr[1] "" msgid "Invalid Host" msgstr "" -#: lib/wizard.php:963 +#: lib/wizard.php:983 msgid "Could not find the desired feature" msgstr "" @@ -335,7 +335,7 @@ msgid "Only connect to the replica server." msgstr "" #: templates/settings.php:26 -msgid "Case insensitve LDAP server (Windows)" +msgid "Case insensitive LDAP server (Windows)" msgstr "" #: templates/settings.php:27 diff --git a/l10n/nl/settings.po b/l10n/nl/settings.po index 0c10ccf3c4d..c766add1cc7 100644 --- a/l10n/nl/settings.po +++ b/l10n/nl/settings.po @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-10 01:54-0400\n" -"PO-Revision-Date: 2014-04-09 06:10+0000\n" -"Last-Translator: André Koot \n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:54+0000\n" +"Last-Translator: I Robot\n" "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -88,6 +88,20 @@ msgstr "Groep bestaat al" msgid "Unable to add group" msgstr "Niet in staat om groep toe te voegen" +#: ajax/decryptall.php:31 +msgid "Files decrypted successfully" +msgstr "" + +#: ajax/decryptall.php:33 +msgid "" +"Couldn't decrypt your files, please check your owncloud.log or ask your " +"administrator" +msgstr "" + +#: ajax/decryptall.php:36 +msgid "Couldn't decrypt your files, check your password and try again" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "E-mail bewaard" diff --git a/l10n/nl/user_ldap.po b/l10n/nl/user_ldap.po index 9a66b674e93..37767238162 100644 --- a/l10n/nl/user_ldap.po +++ b/l10n/nl/user_ldap.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-09 01:55-0400\n" -"PO-Revision-Date: 2014-04-08 08:10+0000\n" -"Last-Translator: André Koot \n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:55+0000\n" +"Last-Translator: I Robot\n" "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -147,7 +147,7 @@ msgstr[1] "%s gebruikers gevonden" msgid "Invalid Host" msgstr "Ongeldige server" -#: lib/wizard.php:963 +#: lib/wizard.php:983 msgid "Could not find the desired feature" msgstr "Kon de gewenste functie niet vinden" @@ -338,8 +338,8 @@ msgid "Only connect to the replica server." msgstr "Maak alleen een verbinding met de replica server." #: templates/settings.php:26 -msgid "Case insensitve LDAP server (Windows)" -msgstr "Niet-hoofdlettergevoelige LDAP server (Windows)" +msgid "Case insensitive LDAP server (Windows)" +msgstr "" #: templates/settings.php:27 msgid "Turn off SSL certificate validation." diff --git a/l10n/nn_NO/settings.po b/l10n/nn_NO/settings.po index f0a4f6ec449..ca46e7a70f7 100644 --- a/l10n/nn_NO/settings.po +++ b/l10n/nn_NO/settings.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-10 01:54-0400\n" -"PO-Revision-Date: 2014-04-09 06:10+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n" "MIME-Version: 1.0\n" @@ -87,6 +87,20 @@ msgstr "Gruppa finst allereie" msgid "Unable to add group" msgstr "Klarte ikkje leggja til gruppa" +#: ajax/decryptall.php:31 +msgid "Files decrypted successfully" +msgstr "" + +#: ajax/decryptall.php:33 +msgid "" +"Couldn't decrypt your files, please check your owncloud.log or ask your " +"administrator" +msgstr "" + +#: ajax/decryptall.php:36 +msgid "Couldn't decrypt your files, check your password and try again" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "E-postadresse lagra" diff --git a/l10n/nn_NO/user_ldap.po b/l10n/nn_NO/user_ldap.po index 403a8918af4..0061f938c03 100644 --- a/l10n/nn_NO/user_ldap.po +++ b/l10n/nn_NO/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-08 01:56-0400\n" -"PO-Revision-Date: 2014-04-08 05:56+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:55+0000\n" "Last-Translator: I Robot\n" "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n" "MIME-Version: 1.0\n" @@ -144,7 +144,7 @@ msgstr[1] "" msgid "Invalid Host" msgstr "" -#: lib/wizard.php:963 +#: lib/wizard.php:983 msgid "Could not find the desired feature" msgstr "" @@ -335,7 +335,7 @@ msgid "Only connect to the replica server." msgstr "" #: templates/settings.php:26 -msgid "Case insensitve LDAP server (Windows)" +msgid "Case insensitive LDAP server (Windows)" msgstr "" #: templates/settings.php:27 diff --git a/l10n/nqo/settings.po b/l10n/nqo/settings.po index 9845d1695c9..5dcb3b4cdb9 100644 --- a/l10n/nqo/settings.po +++ b/l10n/nqo/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-03-26 01:55-0400\n" -"PO-Revision-Date: 2014-03-26 05:55+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: N'ko (http://www.transifex.com/projects/p/owncloud/language/nqo/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159 +#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149 msgid "Encryption" msgstr "" @@ -64,7 +64,7 @@ msgid "Unable to load list from App Store" msgstr "" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 changepassword/controller.php:55 +#: ajax/togglegroups.php:20 changepassword/controller.php:49 msgid "Authentication error" msgstr "" @@ -84,6 +84,20 @@ msgstr "" msgid "Unable to add group" msgstr "" +#: ajax/decryptall.php:31 +msgid "Files decrypted successfully" +msgstr "" + +#: ajax/decryptall.php:33 +msgid "" +"Couldn't decrypt your files, please check your owncloud.log or ask your " +"administrator" +msgstr "" + +#: ajax/decryptall.php:36 +msgid "Couldn't decrypt your files, check your password and try again" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -126,32 +140,32 @@ msgstr "" msgid "Couldn't update app." msgstr "" -#: changepassword/controller.php:20 +#: changepassword/controller.php:17 msgid "Wrong password" msgstr "" -#: changepassword/controller.php:42 +#: changepassword/controller.php:36 msgid "No user supplied" msgstr "" -#: changepassword/controller.php:74 +#: changepassword/controller.php:68 msgid "" "Please provide an admin recovery password, otherwise all user data will be " "lost" msgstr "" -#: changepassword/controller.php:79 +#: changepassword/controller.php:73 msgid "" "Wrong admin recovery password. Please check the password and try again." msgstr "" -#: changepassword/controller.php:87 +#: changepassword/controller.php:81 msgid "" "Back-end doesn't support password change, but the users encryption key was " "successfully updated." msgstr "" -#: changepassword/controller.php:92 changepassword/controller.php:103 +#: changepassword/controller.php:86 changepassword/controller.php:97 msgid "Unable to change password" msgstr "" @@ -203,7 +217,7 @@ msgstr "" msgid "Error" msgstr "" -#: js/apps.js:153 templates/apps.php:54 +#: js/apps.js:153 templates/apps.php:55 msgid "Update" msgstr "" @@ -211,31 +225,31 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:246 +#: js/personal.js:243 msgid "Select a profile picture" msgstr "" -#: js/personal.js:277 +#: js/personal.js:274 msgid "Very weak password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:275 msgid "Weak password" msgstr "" -#: js/personal.js:279 +#: js/personal.js:276 msgid "So-so password" msgstr "" -#: js/personal.js:280 +#: js/personal.js:277 msgid "Good password" msgstr "" -#: js/personal.js:281 +#: js/personal.js:278 msgid "Strong password" msgstr "" -#: js/personal.js:316 +#: js/personal.js:313 msgid "Decrypting files... Please wait, this can take some time." msgstr "" @@ -284,7 +298,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:49 personal.php:50 +#: personal.php:48 personal.php:49 msgid "__language_name__" msgstr "" @@ -589,11 +603,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:416 templates/personal.php:181 +#: templates/admin.php:416 templates/personal.php:171 msgid "Version" msgstr "" -#: templates/admin.php:420 templates/personal.php:184 +#: templates/admin.php:420 templates/personal.php:174 msgid "" "Developed by the ownCloud community, the -licensed by " msgstr "" @@ -664,108 +678,108 @@ msgstr "" msgid "You have used %s of the available %s" msgstr "" -#: templates/personal.php:39 templates/users.php:21 templates/users.php:87 +#: templates/personal.php:38 templates/users.php:21 templates/users.php:87 msgid "Password" msgstr "" -#: templates/personal.php:40 +#: templates/personal.php:39 msgid "Your password was changed" msgstr "" -#: templates/personal.php:41 +#: templates/personal.php:40 msgid "Unable to change your password" msgstr "" -#: templates/personal.php:43 +#: templates/personal.php:42 msgid "Current password" msgstr "" -#: templates/personal.php:46 +#: templates/personal.php:45 msgid "New password" msgstr "" -#: templates/personal.php:50 +#: templates/personal.php:49 msgid "Change password" msgstr "" -#: templates/personal.php:64 templates/users.php:86 +#: templates/personal.php:61 templates/users.php:86 msgid "Full Name" msgstr "" -#: templates/personal.php:81 +#: templates/personal.php:76 msgid "Email" msgstr "" -#: templates/personal.php:83 +#: templates/personal.php:78 msgid "Your email address" msgstr "" -#: templates/personal.php:86 +#: templates/personal.php:81 msgid "" "Fill in an email address to enable password recovery and receive " "notifications" msgstr "" -#: templates/personal.php:96 +#: templates/personal.php:89 msgid "Profile picture" msgstr "" -#: templates/personal.php:101 +#: templates/personal.php:94 msgid "Upload new" msgstr "" -#: templates/personal.php:103 +#: templates/personal.php:96 msgid "Select new from Files" msgstr "" -#: templates/personal.php:104 +#: templates/personal.php:97 msgid "Remove image" msgstr "" -#: templates/personal.php:105 +#: templates/personal.php:98 msgid "Either png or jpg. Ideally square but you will be able to crop it." msgstr "" -#: templates/personal.php:107 +#: templates/personal.php:100 msgid "Your avatar is provided by your original account." msgstr "" -#: templates/personal.php:111 +#: templates/personal.php:104 msgid "Cancel" msgstr "" -#: templates/personal.php:112 +#: templates/personal.php:105 msgid "Choose as profile image" msgstr "" -#: templates/personal.php:120 templates/personal.php:121 +#: templates/personal.php:111 templates/personal.php:112 msgid "Language" msgstr "" -#: templates/personal.php:140 +#: templates/personal.php:131 msgid "Help translate" msgstr "" -#: templates/personal.php:147 +#: templates/personal.php:137 msgid "WebDAV" msgstr "" -#: templates/personal.php:149 +#: templates/personal.php:139 #, php-format msgid "" "Use this address to access your Files via " "WebDAV" msgstr "" -#: templates/personal.php:161 +#: templates/personal.php:151 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:167 +#: templates/personal.php:157 msgid "Log-in password" msgstr "" -#: templates/personal.php:172 +#: templates/personal.php:162 msgid "Decrypt all Files" msgstr "" diff --git a/l10n/nqo/user_ldap.po b/l10n/nqo/user_ldap.po index aa3ecec450f..ea2c1a10a68 100644 --- a/l10n/nqo/user_ldap.po +++ b/l10n/nqo/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-08 01:56-0400\n" -"PO-Revision-Date: 2014-04-08 05:56+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:55+0000\n" "Last-Translator: I Robot\n" "Language-Team: N'ko (http://www.transifex.com/projects/p/owncloud/language/nqo/)\n" "MIME-Version: 1.0\n" @@ -142,7 +142,7 @@ msgstr[0] "" msgid "Invalid Host" msgstr "" -#: lib/wizard.php:963 +#: lib/wizard.php:983 msgid "Could not find the desired feature" msgstr "" @@ -333,7 +333,7 @@ msgid "Only connect to the replica server." msgstr "" #: templates/settings.php:26 -msgid "Case insensitve LDAP server (Windows)" +msgid "Case insensitive LDAP server (Windows)" msgstr "" #: templates/settings.php:27 diff --git a/l10n/oc/settings.po b/l10n/oc/settings.po index d71b89eca0a..2b6ea533467 100644 --- a/l10n/oc/settings.po +++ b/l10n/oc/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-03-26 01:55-0400\n" -"PO-Revision-Date: 2014-03-26 05:55+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159 +#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149 msgid "Encryption" msgstr "" @@ -64,7 +64,7 @@ msgid "Unable to load list from App Store" msgstr "Pas possible de cargar la tièra dempuèi App Store" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 changepassword/controller.php:55 +#: ajax/togglegroups.php:20 changepassword/controller.php:49 msgid "Authentication error" msgstr "Error d'autentificacion" @@ -84,6 +84,20 @@ msgstr "Lo grop existís ja" msgid "Unable to add group" msgstr "Pas capable d'apondre un grop" +#: ajax/decryptall.php:31 +msgid "Files decrypted successfully" +msgstr "" + +#: ajax/decryptall.php:33 +msgid "" +"Couldn't decrypt your files, please check your owncloud.log or ask your " +"administrator" +msgstr "" + +#: ajax/decryptall.php:36 +msgid "Couldn't decrypt your files, check your password and try again" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "Corrièl enregistrat" @@ -126,32 +140,32 @@ msgstr "Pas capable de tira un usancièr del grop %s" msgid "Couldn't update app." msgstr "" -#: changepassword/controller.php:20 +#: changepassword/controller.php:17 msgid "Wrong password" msgstr "" -#: changepassword/controller.php:42 +#: changepassword/controller.php:36 msgid "No user supplied" msgstr "" -#: changepassword/controller.php:74 +#: changepassword/controller.php:68 msgid "" "Please provide an admin recovery password, otherwise all user data will be " "lost" msgstr "" -#: changepassword/controller.php:79 +#: changepassword/controller.php:73 msgid "" "Wrong admin recovery password. Please check the password and try again." msgstr "" -#: changepassword/controller.php:87 +#: changepassword/controller.php:81 msgid "" "Back-end doesn't support password change, but the users encryption key was " "successfully updated." msgstr "" -#: changepassword/controller.php:92 changepassword/controller.php:103 +#: changepassword/controller.php:86 changepassword/controller.php:97 msgid "Unable to change password" msgstr "" @@ -203,7 +217,7 @@ msgstr "" msgid "Error" msgstr "Error" -#: js/apps.js:153 templates/apps.php:54 +#: js/apps.js:153 templates/apps.php:55 msgid "Update" msgstr "" @@ -211,31 +225,31 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:246 +#: js/personal.js:243 msgid "Select a profile picture" msgstr "" -#: js/personal.js:277 +#: js/personal.js:274 msgid "Very weak password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:275 msgid "Weak password" msgstr "" -#: js/personal.js:279 +#: js/personal.js:276 msgid "So-so password" msgstr "" -#: js/personal.js:280 +#: js/personal.js:277 msgid "Good password" msgstr "" -#: js/personal.js:281 +#: js/personal.js:278 msgid "Strong password" msgstr "" -#: js/personal.js:316 +#: js/personal.js:313 msgid "Decrypting files... Please wait, this can take some time." msgstr "" @@ -284,7 +298,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:49 personal.php:50 +#: personal.php:48 personal.php:49 msgid "__language_name__" msgstr "__language_name__" @@ -589,11 +603,11 @@ msgstr "Mai d'aquò" msgid "Less" msgstr "" -#: templates/admin.php:416 templates/personal.php:181 +#: templates/admin.php:416 templates/personal.php:171 msgid "Version" msgstr "" -#: templates/admin.php:420 templates/personal.php:184 +#: templates/admin.php:420 templates/personal.php:174 msgid "" "Developed by the ownCloud community, the -licensed by " msgstr "-licençiat per " @@ -664,108 +678,108 @@ msgstr "" msgid "You have used %s of the available %s" msgstr "" -#: templates/personal.php:39 templates/users.php:21 templates/users.php:87 +#: templates/personal.php:38 templates/users.php:21 templates/users.php:87 msgid "Password" msgstr "Senhal" -#: templates/personal.php:40 +#: templates/personal.php:39 msgid "Your password was changed" msgstr "Ton senhal a cambiat" -#: templates/personal.php:41 +#: templates/personal.php:40 msgid "Unable to change your password" msgstr "Pas possible de cambiar ton senhal" -#: templates/personal.php:43 +#: templates/personal.php:42 msgid "Current password" msgstr "Senhal en cors" -#: templates/personal.php:46 +#: templates/personal.php:45 msgid "New password" msgstr "Senhal novèl" -#: templates/personal.php:50 +#: templates/personal.php:49 msgid "Change password" msgstr "Cambia lo senhal" -#: templates/personal.php:64 templates/users.php:86 +#: templates/personal.php:61 templates/users.php:86 msgid "Full Name" msgstr "" -#: templates/personal.php:81 +#: templates/personal.php:76 msgid "Email" msgstr "Corrièl" -#: templates/personal.php:83 +#: templates/personal.php:78 msgid "Your email address" msgstr "Ton adreiça de corrièl" -#: templates/personal.php:86 +#: templates/personal.php:81 msgid "" "Fill in an email address to enable password recovery and receive " "notifications" msgstr "" -#: templates/personal.php:96 +#: templates/personal.php:89 msgid "Profile picture" msgstr "" -#: templates/personal.php:101 +#: templates/personal.php:94 msgid "Upload new" msgstr "" -#: templates/personal.php:103 +#: templates/personal.php:96 msgid "Select new from Files" msgstr "" -#: templates/personal.php:104 +#: templates/personal.php:97 msgid "Remove image" msgstr "" -#: templates/personal.php:105 +#: templates/personal.php:98 msgid "Either png or jpg. Ideally square but you will be able to crop it." msgstr "" -#: templates/personal.php:107 +#: templates/personal.php:100 msgid "Your avatar is provided by your original account." msgstr "" -#: templates/personal.php:111 +#: templates/personal.php:104 msgid "Cancel" msgstr "Annula" -#: templates/personal.php:112 +#: templates/personal.php:105 msgid "Choose as profile image" msgstr "" -#: templates/personal.php:120 templates/personal.php:121 +#: templates/personal.php:111 templates/personal.php:112 msgid "Language" msgstr "Lenga" -#: templates/personal.php:140 +#: templates/personal.php:131 msgid "Help translate" msgstr "Ajuda a la revirada" -#: templates/personal.php:147 +#: templates/personal.php:137 msgid "WebDAV" msgstr "" -#: templates/personal.php:149 +#: templates/personal.php:139 #, php-format msgid "" "Use this address to access your Files via " "WebDAV" msgstr "" -#: templates/personal.php:161 +#: templates/personal.php:151 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:167 +#: templates/personal.php:157 msgid "Log-in password" msgstr "" -#: templates/personal.php:172 +#: templates/personal.php:162 msgid "Decrypt all Files" msgstr "" diff --git a/l10n/oc/user_ldap.po b/l10n/oc/user_ldap.po index 5bf21b613f8..3a32a009110 100644 --- a/l10n/oc/user_ldap.po +++ b/l10n/oc/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-08 01:56-0400\n" -"PO-Revision-Date: 2014-04-08 05:56+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:55+0000\n" "Last-Translator: I Robot\n" "Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n" "MIME-Version: 1.0\n" @@ -144,7 +144,7 @@ msgstr[1] "" msgid "Invalid Host" msgstr "" -#: lib/wizard.php:963 +#: lib/wizard.php:983 msgid "Could not find the desired feature" msgstr "" @@ -335,7 +335,7 @@ msgid "Only connect to the replica server." msgstr "" #: templates/settings.php:26 -msgid "Case insensitve LDAP server (Windows)" +msgid "Case insensitive LDAP server (Windows)" msgstr "" #: templates/settings.php:27 diff --git a/l10n/pa/settings.po b/l10n/pa/settings.po index 8f1df1750df..aecc54150c8 100644 --- a/l10n/pa/settings.po +++ b/l10n/pa/settings.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-03-26 01:55-0400\n" -"PO-Revision-Date: 2014-03-26 05:55+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Panjabi (Punjabi) (http://www.transifex.com/projects/p/owncloud/language/pa/)\n" "MIME-Version: 1.0\n" @@ -52,7 +52,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159 +#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149 msgid "Encryption" msgstr "" @@ -65,7 +65,7 @@ msgid "Unable to load list from App Store" msgstr "" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 changepassword/controller.php:55 +#: ajax/togglegroups.php:20 changepassword/controller.php:49 msgid "Authentication error" msgstr "" @@ -85,6 +85,20 @@ msgstr "" msgid "Unable to add group" msgstr "" +#: ajax/decryptall.php:31 +msgid "Files decrypted successfully" +msgstr "" + +#: ajax/decryptall.php:33 +msgid "" +"Couldn't decrypt your files, please check your owncloud.log or ask your " +"administrator" +msgstr "" + +#: ajax/decryptall.php:36 +msgid "Couldn't decrypt your files, check your password and try again" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -127,32 +141,32 @@ msgstr "" msgid "Couldn't update app." msgstr "" -#: changepassword/controller.php:20 +#: changepassword/controller.php:17 msgid "Wrong password" msgstr "" -#: changepassword/controller.php:42 +#: changepassword/controller.php:36 msgid "No user supplied" msgstr "" -#: changepassword/controller.php:74 +#: changepassword/controller.php:68 msgid "" "Please provide an admin recovery password, otherwise all user data will be " "lost" msgstr "" -#: changepassword/controller.php:79 +#: changepassword/controller.php:73 msgid "" "Wrong admin recovery password. Please check the password and try again." msgstr "" -#: changepassword/controller.php:87 +#: changepassword/controller.php:81 msgid "" "Back-end doesn't support password change, but the users encryption key was " "successfully updated." msgstr "" -#: changepassword/controller.php:92 changepassword/controller.php:103 +#: changepassword/controller.php:86 changepassword/controller.php:97 msgid "Unable to change password" msgstr "" @@ -204,7 +218,7 @@ msgstr "" msgid "Error" msgstr "ਗਲਤੀ" -#: js/apps.js:153 templates/apps.php:54 +#: js/apps.js:153 templates/apps.php:55 msgid "Update" msgstr "" @@ -212,31 +226,31 @@ msgstr "" msgid "Updated" msgstr "ਅੱਪਡੇਟ ਕੀਤਾ" -#: js/personal.js:246 +#: js/personal.js:243 msgid "Select a profile picture" msgstr "" -#: js/personal.js:277 +#: js/personal.js:274 msgid "Very weak password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:275 msgid "Weak password" msgstr "" -#: js/personal.js:279 +#: js/personal.js:276 msgid "So-so password" msgstr "" -#: js/personal.js:280 +#: js/personal.js:277 msgid "Good password" msgstr "" -#: js/personal.js:281 +#: js/personal.js:278 msgid "Strong password" msgstr "" -#: js/personal.js:316 +#: js/personal.js:313 msgid "Decrypting files... Please wait, this can take some time." msgstr "" @@ -285,7 +299,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:49 personal.php:50 +#: personal.php:48 personal.php:49 msgid "__language_name__" msgstr "__ਭਾਸ਼ਾ_ਨਾਂ__" @@ -590,11 +604,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:416 templates/personal.php:181 +#: templates/admin.php:416 templates/personal.php:171 msgid "Version" msgstr "" -#: templates/admin.php:420 templates/personal.php:184 +#: templates/admin.php:420 templates/personal.php:174 msgid "" "Developed by the ownCloud community, the -licensed by " msgstr "" @@ -665,108 +679,108 @@ msgstr "" msgid "You have used %s of the available %s" msgstr "" -#: templates/personal.php:39 templates/users.php:21 templates/users.php:87 +#: templates/personal.php:38 templates/users.php:21 templates/users.php:87 msgid "Password" msgstr "ਪਾਸਵਰ" -#: templates/personal.php:40 +#: templates/personal.php:39 msgid "Your password was changed" msgstr "" -#: templates/personal.php:41 +#: templates/personal.php:40 msgid "Unable to change your password" msgstr "" -#: templates/personal.php:43 +#: templates/personal.php:42 msgid "Current password" msgstr "" -#: templates/personal.php:46 +#: templates/personal.php:45 msgid "New password" msgstr "" -#: templates/personal.php:50 +#: templates/personal.php:49 msgid "Change password" msgstr "ਪਾਸਵਰਡ ਬਦਲੋ" -#: templates/personal.php:64 templates/users.php:86 +#: templates/personal.php:61 templates/users.php:86 msgid "Full Name" msgstr "" -#: templates/personal.php:81 +#: templates/personal.php:76 msgid "Email" msgstr "" -#: templates/personal.php:83 +#: templates/personal.php:78 msgid "Your email address" msgstr "" -#: templates/personal.php:86 +#: templates/personal.php:81 msgid "" "Fill in an email address to enable password recovery and receive " "notifications" msgstr "" -#: templates/personal.php:96 +#: templates/personal.php:89 msgid "Profile picture" msgstr "" -#: templates/personal.php:101 +#: templates/personal.php:94 msgid "Upload new" msgstr "" -#: templates/personal.php:103 +#: templates/personal.php:96 msgid "Select new from Files" msgstr "" -#: templates/personal.php:104 +#: templates/personal.php:97 msgid "Remove image" msgstr "" -#: templates/personal.php:105 +#: templates/personal.php:98 msgid "Either png or jpg. Ideally square but you will be able to crop it." msgstr "" -#: templates/personal.php:107 +#: templates/personal.php:100 msgid "Your avatar is provided by your original account." msgstr "" -#: templates/personal.php:111 +#: templates/personal.php:104 msgid "Cancel" msgstr "ਰੱਦ ਕਰੋ" -#: templates/personal.php:112 +#: templates/personal.php:105 msgid "Choose as profile image" msgstr "" -#: templates/personal.php:120 templates/personal.php:121 +#: templates/personal.php:111 templates/personal.php:112 msgid "Language" msgstr "" -#: templates/personal.php:140 +#: templates/personal.php:131 msgid "Help translate" msgstr "" -#: templates/personal.php:147 +#: templates/personal.php:137 msgid "WebDAV" msgstr "" -#: templates/personal.php:149 +#: templates/personal.php:139 #, php-format msgid "" "Use this address to access your Files via " "WebDAV" msgstr "" -#: templates/personal.php:161 +#: templates/personal.php:151 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:167 +#: templates/personal.php:157 msgid "Log-in password" msgstr "" -#: templates/personal.php:172 +#: templates/personal.php:162 msgid "Decrypt all Files" msgstr "" diff --git a/l10n/pa/user_ldap.po b/l10n/pa/user_ldap.po index 37579bfed80..5cabb027e07 100644 --- a/l10n/pa/user_ldap.po +++ b/l10n/pa/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-08 01:56-0400\n" -"PO-Revision-Date: 2014-04-08 05:56+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:55+0000\n" "Last-Translator: I Robot\n" "Language-Team: Panjabi (Punjabi) (http://www.transifex.com/projects/p/owncloud/language/pa/)\n" "MIME-Version: 1.0\n" @@ -144,7 +144,7 @@ msgstr[1] "" msgid "Invalid Host" msgstr "" -#: lib/wizard.php:963 +#: lib/wizard.php:983 msgid "Could not find the desired feature" msgstr "" @@ -335,7 +335,7 @@ msgid "Only connect to the replica server." msgstr "" #: templates/settings.php:26 -msgid "Case insensitve LDAP server (Windows)" +msgid "Case insensitive LDAP server (Windows)" msgstr "" #: templates/settings.php:27 diff --git a/l10n/pl/settings.po b/l10n/pl/settings.po index 8c1c418c8e7..ef51e8010b7 100644 --- a/l10n/pl/settings.po +++ b/l10n/pl/settings.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-10 01:54-0400\n" -"PO-Revision-Date: 2014-04-09 06:10+0000\n" -"Last-Translator: bobie \n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:54+0000\n" +"Last-Translator: I Robot\n" "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -87,6 +87,20 @@ msgstr "Grupa już istnieje" msgid "Unable to add group" msgstr "Nie można dodać grupy" +#: ajax/decryptall.php:31 +msgid "Files decrypted successfully" +msgstr "" + +#: ajax/decryptall.php:33 +msgid "" +"Couldn't decrypt your files, please check your owncloud.log or ask your " +"administrator" +msgstr "" + +#: ajax/decryptall.php:36 +msgid "Couldn't decrypt your files, check your password and try again" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "E-mail zapisany" diff --git a/l10n/pl/user_ldap.po b/l10n/pl/user_ldap.po index 498a323e540..2009fd7cc60 100644 --- a/l10n/pl/user_ldap.po +++ b/l10n/pl/user_ldap.po @@ -12,9 +12,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-09 01:55-0400\n" -"PO-Revision-Date: 2014-04-08 06:02+0000\n" -"Last-Translator: bobie \n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:55+0000\n" +"Last-Translator: I Robot\n" "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -151,7 +151,7 @@ msgstr[2] "%s znalezionych użytkowników" msgid "Invalid Host" msgstr "Niepoprawny Host" -#: lib/wizard.php:963 +#: lib/wizard.php:983 msgid "Could not find the desired feature" msgstr "Nie można znaleźć żądanej funkcji" @@ -342,8 +342,8 @@ msgid "Only connect to the replica server." msgstr "Połącz tylko do repliki serwera." #: templates/settings.php:26 -msgid "Case insensitve LDAP server (Windows)" -msgstr "Wielkość liter serwera LDAP (Windows)" +msgid "Case insensitive LDAP server (Windows)" +msgstr "" #: templates/settings.php:27 msgid "Turn off SSL certificate validation." diff --git a/l10n/pt_BR/settings.po b/l10n/pt_BR/settings.po index c94e167dc92..cc7719d2303 100644 --- a/l10n/pt_BR/settings.po +++ b/l10n/pt_BR/settings.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-10 01:54-0400\n" -"PO-Revision-Date: 2014-04-09 06:10+0000\n" -"Last-Translator: Flávio Veras \n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:54+0000\n" +"Last-Translator: I Robot\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -86,6 +86,20 @@ msgstr "Grupo já existe" msgid "Unable to add group" msgstr "Não foi possível adicionar grupo" +#: ajax/decryptall.php:31 +msgid "Files decrypted successfully" +msgstr "" + +#: ajax/decryptall.php:33 +msgid "" +"Couldn't decrypt your files, please check your owncloud.log or ask your " +"administrator" +msgstr "" + +#: ajax/decryptall.php:36 +msgid "Couldn't decrypt your files, check your password and try again" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "E-mail salvo" diff --git a/l10n/pt_BR/user_ldap.po b/l10n/pt_BR/user_ldap.po index a50f34a3474..887cae75e9b 100644 --- a/l10n/pt_BR/user_ldap.po +++ b/l10n/pt_BR/user_ldap.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-09 01:55-0400\n" -"PO-Revision-Date: 2014-04-08 10:51+0000\n" -"Last-Translator: Flávio Veras \n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:55+0000\n" +"Last-Translator: I Robot\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -146,7 +146,7 @@ msgstr[1] "usuários %s encontrados" msgid "Invalid Host" msgstr "Host inválido" -#: lib/wizard.php:963 +#: lib/wizard.php:983 msgid "Could not find the desired feature" msgstr "Não foi possível encontrar a função desejada" @@ -337,8 +337,8 @@ msgid "Only connect to the replica server." msgstr "Conectar-se somente ao servidor de réplica." #: templates/settings.php:26 -msgid "Case insensitve LDAP server (Windows)" -msgstr "Servidor LDAP sensível à caixa alta (Windows)" +msgid "Case insensitive LDAP server (Windows)" +msgstr "" #: templates/settings.php:27 msgid "Turn off SSL certificate validation." diff --git a/l10n/pt_PT/settings.po b/l10n/pt_PT/settings.po index ea6ff1bc02c..a1b1ad3373b 100644 --- a/l10n/pt_PT/settings.po +++ b/l10n/pt_PT/settings.po @@ -14,8 +14,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-10 01:54-0400\n" -"PO-Revision-Date: 2014-04-09 06:10+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n" "MIME-Version: 1.0\n" @@ -91,6 +91,20 @@ msgstr "O grupo já existe" msgid "Unable to add group" msgstr "Impossível acrescentar o grupo" +#: ajax/decryptall.php:31 +msgid "Files decrypted successfully" +msgstr "" + +#: ajax/decryptall.php:33 +msgid "" +"Couldn't decrypt your files, please check your owncloud.log or ask your " +"administrator" +msgstr "" + +#: ajax/decryptall.php:36 +msgid "Couldn't decrypt your files, check your password and try again" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "Email guardado" diff --git a/l10n/pt_PT/user_ldap.po b/l10n/pt_PT/user_ldap.po index 24be2d824ab..ca466d20d14 100644 --- a/l10n/pt_PT/user_ldap.po +++ b/l10n/pt_PT/user_ldap.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-08 01:56-0400\n" -"PO-Revision-Date: 2014-04-08 05:56+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:55+0000\n" "Last-Translator: I Robot\n" "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n" "MIME-Version: 1.0\n" @@ -148,7 +148,7 @@ msgstr[1] "%s utilizadores encontrados" msgid "Invalid Host" msgstr "Hospedeiro Inválido" -#: lib/wizard.php:963 +#: lib/wizard.php:983 msgid "Could not find the desired feature" msgstr "Não se encontrou a função desejada" @@ -339,8 +339,8 @@ msgid "Only connect to the replica server." msgstr "Ligar apenas ao servidor de réplicas." #: templates/settings.php:26 -msgid "Case insensitve LDAP server (Windows)" -msgstr "Servidor LDAP (Windows) não sensível a maiúsculas." +msgid "Case insensitive LDAP server (Windows)" +msgstr "" #: templates/settings.php:27 msgid "Turn off SSL certificate validation." diff --git a/l10n/ro/settings.po b/l10n/ro/settings.po index 7358fd44fc6..8e050f69398 100644 --- a/l10n/ro/settings.po +++ b/l10n/ro/settings.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-10 01:54-0400\n" -"PO-Revision-Date: 2014-04-09 06:10+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n" "MIME-Version: 1.0\n" @@ -86,6 +86,20 @@ msgstr "Grupul există deja" msgid "Unable to add group" msgstr "Nu s-a putut adăuga grupul" +#: ajax/decryptall.php:31 +msgid "Files decrypted successfully" +msgstr "" + +#: ajax/decryptall.php:33 +msgid "" +"Couldn't decrypt your files, please check your owncloud.log or ask your " +"administrator" +msgstr "" + +#: ajax/decryptall.php:36 +msgid "Couldn't decrypt your files, check your password and try again" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "E-mail salvat" diff --git a/l10n/ro/user_ldap.po b/l10n/ro/user_ldap.po index 8d75f9248c8..83048aebc9f 100644 --- a/l10n/ro/user_ldap.po +++ b/l10n/ro/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-08 01:56-0400\n" -"PO-Revision-Date: 2014-04-08 05:56+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:55+0000\n" "Last-Translator: I Robot\n" "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n" "MIME-Version: 1.0\n" @@ -146,7 +146,7 @@ msgstr[2] "" msgid "Invalid Host" msgstr "" -#: lib/wizard.php:963 +#: lib/wizard.php:983 msgid "Could not find the desired feature" msgstr "" @@ -337,8 +337,8 @@ msgid "Only connect to the replica server." msgstr "" #: templates/settings.php:26 -msgid "Case insensitve LDAP server (Windows)" -msgstr "Server LDAP insensibil la majuscule (Windows)" +msgid "Case insensitive LDAP server (Windows)" +msgstr "" #: templates/settings.php:27 msgid "Turn off SSL certificate validation." diff --git a/l10n/ru/settings.po b/l10n/ru/settings.po index 4e3067464e0..70641d2e4e0 100644 --- a/l10n/ru/settings.po +++ b/l10n/ru/settings.po @@ -22,8 +22,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-10 01:54-0400\n" -"PO-Revision-Date: 2014-04-09 06:10+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n" "MIME-Version: 1.0\n" @@ -99,6 +99,20 @@ msgstr "Группа уже существует" msgid "Unable to add group" msgstr "Невозможно добавить группу" +#: ajax/decryptall.php:31 +msgid "Files decrypted successfully" +msgstr "" + +#: ajax/decryptall.php:33 +msgid "" +"Couldn't decrypt your files, please check your owncloud.log or ask your " +"administrator" +msgstr "" + +#: ajax/decryptall.php:36 +msgid "Couldn't decrypt your files, check your password and try again" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "Email сохранен" diff --git a/l10n/ru/user_ldap.po b/l10n/ru/user_ldap.po index feb3e9d1eb9..82633992ec2 100644 --- a/l10n/ru/user_ldap.po +++ b/l10n/ru/user_ldap.po @@ -17,8 +17,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-08 01:56-0400\n" -"PO-Revision-Date: 2014-04-08 05:56+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:55+0000\n" "Last-Translator: I Robot\n" "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n" "MIME-Version: 1.0\n" @@ -156,7 +156,7 @@ msgstr[2] "%s пользователей найдено" msgid "Invalid Host" msgstr "Неверный сервер" -#: lib/wizard.php:963 +#: lib/wizard.php:983 msgid "Could not find the desired feature" msgstr "Не могу найти требуемой функциональности" @@ -347,8 +347,8 @@ msgid "Only connect to the replica server." msgstr "Подключаться только к серверу-реплике." #: templates/settings.php:26 -msgid "Case insensitve LDAP server (Windows)" -msgstr "Нечувствительный к регистру сервер LDAP (Windows)" +msgid "Case insensitive LDAP server (Windows)" +msgstr "" #: templates/settings.php:27 msgid "Turn off SSL certificate validation." diff --git a/l10n/si_LK/settings.po b/l10n/si_LK/settings.po index 6fd34786768..2b1066d995d 100644 --- a/l10n/si_LK/settings.po +++ b/l10n/si_LK/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-03-26 01:55-0400\n" -"PO-Revision-Date: 2014-03-26 05:55+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159 +#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149 msgid "Encryption" msgstr "ගුප්ත කේතනය" @@ -64,7 +64,7 @@ msgid "Unable to load list from App Store" msgstr "" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 changepassword/controller.php:55 +#: ajax/togglegroups.php:20 changepassword/controller.php:49 msgid "Authentication error" msgstr "සත්‍යාපන දෝෂයක්" @@ -84,6 +84,20 @@ msgstr "කණ්ඩායම දැනටමත් තිබේ" msgid "Unable to add group" msgstr "කාණඩයක් එක් කළ නොහැකි විය" +#: ajax/decryptall.php:31 +msgid "Files decrypted successfully" +msgstr "" + +#: ajax/decryptall.php:33 +msgid "" +"Couldn't decrypt your files, please check your owncloud.log or ask your " +"administrator" +msgstr "" + +#: ajax/decryptall.php:36 +msgid "Couldn't decrypt your files, check your password and try again" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "වි-තැපෑල සුරකින ලදී" @@ -126,32 +140,32 @@ msgstr "පරිශීලකයා %s කණ්ඩායමින් ඉවත msgid "Couldn't update app." msgstr "" -#: changepassword/controller.php:20 +#: changepassword/controller.php:17 msgid "Wrong password" msgstr "" -#: changepassword/controller.php:42 +#: changepassword/controller.php:36 msgid "No user supplied" msgstr "" -#: changepassword/controller.php:74 +#: changepassword/controller.php:68 msgid "" "Please provide an admin recovery password, otherwise all user data will be " "lost" msgstr "" -#: changepassword/controller.php:79 +#: changepassword/controller.php:73 msgid "" "Wrong admin recovery password. Please check the password and try again." msgstr "" -#: changepassword/controller.php:87 +#: changepassword/controller.php:81 msgid "" "Back-end doesn't support password change, but the users encryption key was " "successfully updated." msgstr "" -#: changepassword/controller.php:92 changepassword/controller.php:103 +#: changepassword/controller.php:86 changepassword/controller.php:97 msgid "Unable to change password" msgstr "" @@ -203,7 +217,7 @@ msgstr "" msgid "Error" msgstr "දෝෂයක්" -#: js/apps.js:153 templates/apps.php:54 +#: js/apps.js:153 templates/apps.php:55 msgid "Update" msgstr "යාවත්කාල කිරීම" @@ -211,31 +225,31 @@ msgstr "යාවත්කාල කිරීම" msgid "Updated" msgstr "" -#: js/personal.js:246 +#: js/personal.js:243 msgid "Select a profile picture" msgstr "" -#: js/personal.js:277 +#: js/personal.js:274 msgid "Very weak password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:275 msgid "Weak password" msgstr "" -#: js/personal.js:279 +#: js/personal.js:276 msgid "So-so password" msgstr "" -#: js/personal.js:280 +#: js/personal.js:277 msgid "Good password" msgstr "" -#: js/personal.js:281 +#: js/personal.js:278 msgid "Strong password" msgstr "" -#: js/personal.js:316 +#: js/personal.js:313 msgid "Decrypting files... Please wait, this can take some time." msgstr "" @@ -284,7 +298,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:49 personal.php:50 +#: personal.php:48 personal.php:49 msgid "__language_name__" msgstr "" @@ -589,11 +603,11 @@ msgstr "වැඩි" msgid "Less" msgstr "අඩු" -#: templates/admin.php:416 templates/personal.php:181 +#: templates/admin.php:416 templates/personal.php:171 msgid "Version" msgstr "" -#: templates/admin.php:420 templates/personal.php:184 +#: templates/admin.php:420 templates/personal.php:174 msgid "" "Developed by the ownCloud community, the -licensed by " msgstr "" @@ -664,108 +678,108 @@ msgstr "" msgid "You have used %s of the available %s" msgstr "" -#: templates/personal.php:39 templates/users.php:21 templates/users.php:87 +#: templates/personal.php:38 templates/users.php:21 templates/users.php:87 msgid "Password" msgstr "මුර පදය" -#: templates/personal.php:40 +#: templates/personal.php:39 msgid "Your password was changed" msgstr "ඔබගේ මුර පදය වෙනස් කෙරුණි" -#: templates/personal.php:41 +#: templates/personal.php:40 msgid "Unable to change your password" msgstr "මුර පදය වෙනස් කළ නොහැකි විය" -#: templates/personal.php:43 +#: templates/personal.php:42 msgid "Current password" msgstr "වත්මන් මුරපදය" -#: templates/personal.php:46 +#: templates/personal.php:45 msgid "New password" msgstr "නව මුරපදය" -#: templates/personal.php:50 +#: templates/personal.php:49 msgid "Change password" msgstr "මුරපදය වෙනස් කිරීම" -#: templates/personal.php:64 templates/users.php:86 +#: templates/personal.php:61 templates/users.php:86 msgid "Full Name" msgstr "" -#: templates/personal.php:81 +#: templates/personal.php:76 msgid "Email" msgstr "විද්‍යුත් තැපෑල" -#: templates/personal.php:83 +#: templates/personal.php:78 msgid "Your email address" msgstr "ඔබගේ විද්‍යුත් තැපෑල" -#: templates/personal.php:86 +#: templates/personal.php:81 msgid "" "Fill in an email address to enable password recovery and receive " "notifications" msgstr "" -#: templates/personal.php:96 +#: templates/personal.php:89 msgid "Profile picture" msgstr "" -#: templates/personal.php:101 +#: templates/personal.php:94 msgid "Upload new" msgstr "" -#: templates/personal.php:103 +#: templates/personal.php:96 msgid "Select new from Files" msgstr "" -#: templates/personal.php:104 +#: templates/personal.php:97 msgid "Remove image" msgstr "" -#: templates/personal.php:105 +#: templates/personal.php:98 msgid "Either png or jpg. Ideally square but you will be able to crop it." msgstr "" -#: templates/personal.php:107 +#: templates/personal.php:100 msgid "Your avatar is provided by your original account." msgstr "" -#: templates/personal.php:111 +#: templates/personal.php:104 msgid "Cancel" msgstr "එපා" -#: templates/personal.php:112 +#: templates/personal.php:105 msgid "Choose as profile image" msgstr "" -#: templates/personal.php:120 templates/personal.php:121 +#: templates/personal.php:111 templates/personal.php:112 msgid "Language" msgstr "භාෂාව" -#: templates/personal.php:140 +#: templates/personal.php:131 msgid "Help translate" msgstr "පරිවර්ථන සහය" -#: templates/personal.php:147 +#: templates/personal.php:137 msgid "WebDAV" msgstr "" -#: templates/personal.php:149 +#: templates/personal.php:139 #, php-format msgid "" "Use this address to access your Files via " "WebDAV" msgstr "" -#: templates/personal.php:161 +#: templates/personal.php:151 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:167 +#: templates/personal.php:157 msgid "Log-in password" msgstr "" -#: templates/personal.php:172 +#: templates/personal.php:162 msgid "Decrypt all Files" msgstr "" diff --git a/l10n/si_LK/user_ldap.po b/l10n/si_LK/user_ldap.po index ed0af373d58..122cf026241 100644 --- a/l10n/si_LK/user_ldap.po +++ b/l10n/si_LK/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-08 01:56-0400\n" -"PO-Revision-Date: 2014-04-08 05:56+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:55+0000\n" "Last-Translator: I Robot\n" "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n" "MIME-Version: 1.0\n" @@ -144,7 +144,7 @@ msgstr[1] "" msgid "Invalid Host" msgstr "" -#: lib/wizard.php:963 +#: lib/wizard.php:983 msgid "Could not find the desired feature" msgstr "" @@ -335,7 +335,7 @@ msgid "Only connect to the replica server." msgstr "" #: templates/settings.php:26 -msgid "Case insensitve LDAP server (Windows)" +msgid "Case insensitive LDAP server (Windows)" msgstr "" #: templates/settings.php:27 diff --git a/l10n/sk/settings.po b/l10n/sk/settings.po index c4904394fe3..bff1d720434 100644 --- a/l10n/sk/settings.po +++ b/l10n/sk/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-03-26 01:55-0400\n" -"PO-Revision-Date: 2014-03-26 05:55+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159 +#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149 msgid "Encryption" msgstr "" @@ -64,7 +64,7 @@ msgid "Unable to load list from App Store" msgstr "" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 changepassword/controller.php:55 +#: ajax/togglegroups.php:20 changepassword/controller.php:49 msgid "Authentication error" msgstr "" @@ -84,6 +84,20 @@ msgstr "" msgid "Unable to add group" msgstr "" +#: ajax/decryptall.php:31 +msgid "Files decrypted successfully" +msgstr "" + +#: ajax/decryptall.php:33 +msgid "" +"Couldn't decrypt your files, please check your owncloud.log or ask your " +"administrator" +msgstr "" + +#: ajax/decryptall.php:36 +msgid "Couldn't decrypt your files, check your password and try again" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -126,32 +140,32 @@ msgstr "" msgid "Couldn't update app." msgstr "" -#: changepassword/controller.php:20 +#: changepassword/controller.php:17 msgid "Wrong password" msgstr "" -#: changepassword/controller.php:42 +#: changepassword/controller.php:36 msgid "No user supplied" msgstr "" -#: changepassword/controller.php:74 +#: changepassword/controller.php:68 msgid "" "Please provide an admin recovery password, otherwise all user data will be " "lost" msgstr "" -#: changepassword/controller.php:79 +#: changepassword/controller.php:73 msgid "" "Wrong admin recovery password. Please check the password and try again." msgstr "" -#: changepassword/controller.php:87 +#: changepassword/controller.php:81 msgid "" "Back-end doesn't support password change, but the users encryption key was " "successfully updated." msgstr "" -#: changepassword/controller.php:92 changepassword/controller.php:103 +#: changepassword/controller.php:86 changepassword/controller.php:97 msgid "Unable to change password" msgstr "" @@ -203,7 +217,7 @@ msgstr "" msgid "Error" msgstr "" -#: js/apps.js:153 templates/apps.php:54 +#: js/apps.js:153 templates/apps.php:55 msgid "Update" msgstr "" @@ -211,31 +225,31 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:246 +#: js/personal.js:243 msgid "Select a profile picture" msgstr "" -#: js/personal.js:277 +#: js/personal.js:274 msgid "Very weak password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:275 msgid "Weak password" msgstr "" -#: js/personal.js:279 +#: js/personal.js:276 msgid "So-so password" msgstr "" -#: js/personal.js:280 +#: js/personal.js:277 msgid "Good password" msgstr "" -#: js/personal.js:281 +#: js/personal.js:278 msgid "Strong password" msgstr "" -#: js/personal.js:316 +#: js/personal.js:313 msgid "Decrypting files... Please wait, this can take some time." msgstr "" @@ -284,7 +298,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:49 personal.php:50 +#: personal.php:48 personal.php:49 msgid "__language_name__" msgstr "" @@ -589,11 +603,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:416 templates/personal.php:181 +#: templates/admin.php:416 templates/personal.php:171 msgid "Version" msgstr "" -#: templates/admin.php:420 templates/personal.php:184 +#: templates/admin.php:420 templates/personal.php:174 msgid "" "Developed by the ownCloud community, the -licensed by " msgstr "" @@ -664,108 +678,108 @@ msgstr "" msgid "You have used %s of the available %s" msgstr "" -#: templates/personal.php:39 templates/users.php:21 templates/users.php:87 +#: templates/personal.php:38 templates/users.php:21 templates/users.php:87 msgid "Password" msgstr "" -#: templates/personal.php:40 +#: templates/personal.php:39 msgid "Your password was changed" msgstr "" -#: templates/personal.php:41 +#: templates/personal.php:40 msgid "Unable to change your password" msgstr "" -#: templates/personal.php:43 +#: templates/personal.php:42 msgid "Current password" msgstr "" -#: templates/personal.php:46 +#: templates/personal.php:45 msgid "New password" msgstr "" -#: templates/personal.php:50 +#: templates/personal.php:49 msgid "Change password" msgstr "" -#: templates/personal.php:64 templates/users.php:86 +#: templates/personal.php:61 templates/users.php:86 msgid "Full Name" msgstr "" -#: templates/personal.php:81 +#: templates/personal.php:76 msgid "Email" msgstr "" -#: templates/personal.php:83 +#: templates/personal.php:78 msgid "Your email address" msgstr "" -#: templates/personal.php:86 +#: templates/personal.php:81 msgid "" "Fill in an email address to enable password recovery and receive " "notifications" msgstr "" -#: templates/personal.php:96 +#: templates/personal.php:89 msgid "Profile picture" msgstr "" -#: templates/personal.php:101 +#: templates/personal.php:94 msgid "Upload new" msgstr "" -#: templates/personal.php:103 +#: templates/personal.php:96 msgid "Select new from Files" msgstr "" -#: templates/personal.php:104 +#: templates/personal.php:97 msgid "Remove image" msgstr "" -#: templates/personal.php:105 +#: templates/personal.php:98 msgid "Either png or jpg. Ideally square but you will be able to crop it." msgstr "" -#: templates/personal.php:107 +#: templates/personal.php:100 msgid "Your avatar is provided by your original account." msgstr "" -#: templates/personal.php:111 +#: templates/personal.php:104 msgid "Cancel" msgstr "Zrušiť" -#: templates/personal.php:112 +#: templates/personal.php:105 msgid "Choose as profile image" msgstr "" -#: templates/personal.php:120 templates/personal.php:121 +#: templates/personal.php:111 templates/personal.php:112 msgid "Language" msgstr "" -#: templates/personal.php:140 +#: templates/personal.php:131 msgid "Help translate" msgstr "" -#: templates/personal.php:147 +#: templates/personal.php:137 msgid "WebDAV" msgstr "" -#: templates/personal.php:149 +#: templates/personal.php:139 #, php-format msgid "" "Use this address to access your Files via " "WebDAV" msgstr "" -#: templates/personal.php:161 +#: templates/personal.php:151 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:167 +#: templates/personal.php:157 msgid "Log-in password" msgstr "" -#: templates/personal.php:172 +#: templates/personal.php:162 msgid "Decrypt all Files" msgstr "" diff --git a/l10n/sk/user_ldap.po b/l10n/sk/user_ldap.po index 76ac5cd2ac8..bc1a911c868 100644 --- a/l10n/sk/user_ldap.po +++ b/l10n/sk/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-08 01:56-0400\n" -"PO-Revision-Date: 2014-04-08 05:56+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:55+0000\n" "Last-Translator: I Robot\n" "Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n" "MIME-Version: 1.0\n" @@ -146,7 +146,7 @@ msgstr[2] "" msgid "Invalid Host" msgstr "" -#: lib/wizard.php:963 +#: lib/wizard.php:983 msgid "Could not find the desired feature" msgstr "" @@ -337,7 +337,7 @@ msgid "Only connect to the replica server." msgstr "" #: templates/settings.php:26 -msgid "Case insensitve LDAP server (Windows)" +msgid "Case insensitive LDAP server (Windows)" msgstr "" #: templates/settings.php:27 diff --git a/l10n/sk_SK/settings.po b/l10n/sk_SK/settings.po index 8aecaab335b..7b4826cc736 100644 --- a/l10n/sk_SK/settings.po +++ b/l10n/sk_SK/settings.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-10 01:54-0400\n" -"PO-Revision-Date: 2014-04-09 06:10+0000\n" -"Last-Translator: mhh \n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:54+0000\n" +"Last-Translator: I Robot\n" "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -86,6 +86,20 @@ msgstr "Skupina už existuje" msgid "Unable to add group" msgstr "Nie je možné pridať skupinu" +#: ajax/decryptall.php:31 +msgid "Files decrypted successfully" +msgstr "" + +#: ajax/decryptall.php:33 +msgid "" +"Couldn't decrypt your files, please check your owncloud.log or ask your " +"administrator" +msgstr "" + +#: ajax/decryptall.php:36 +msgid "Couldn't decrypt your files, check your password and try again" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "Email uložený" diff --git a/l10n/sk_SK/user_ldap.po b/l10n/sk_SK/user_ldap.po index 38484ed97b5..cc437b8734b 100644 --- a/l10n/sk_SK/user_ldap.po +++ b/l10n/sk_SK/user_ldap.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-08 01:56-0400\n" -"PO-Revision-Date: 2014-04-08 05:56+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:55+0000\n" "Last-Translator: I Robot\n" "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n" "MIME-Version: 1.0\n" @@ -148,7 +148,7 @@ msgstr[2] "%s nájdených používateľov" msgid "Invalid Host" msgstr "Neplatný hostiteľ" -#: lib/wizard.php:963 +#: lib/wizard.php:983 msgid "Could not find the desired feature" msgstr "Nemožno nájsť požadovanú funkciu" @@ -339,8 +339,8 @@ msgid "Only connect to the replica server." msgstr "Pripojiť sa len k záložnému serveru." #: templates/settings.php:26 -msgid "Case insensitve LDAP server (Windows)" -msgstr "LDAP server nerozlišuje veľkosť znakov (Windows)" +msgid "Case insensitive LDAP server (Windows)" +msgstr "" #: templates/settings.php:27 msgid "Turn off SSL certificate validation." diff --git a/l10n/sl/settings.po b/l10n/sl/settings.po index 23a92432934..fcc8f3ca12d 100644 --- a/l10n/sl/settings.po +++ b/l10n/sl/settings.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-10 01:54-0400\n" -"PO-Revision-Date: 2014-04-09 06:10+0000\n" -"Last-Translator: mateju <>\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:54+0000\n" +"Last-Translator: I Robot\n" "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -86,6 +86,20 @@ msgstr "Skupina že obstaja" msgid "Unable to add group" msgstr "Skupine ni mogoče dodati" +#: ajax/decryptall.php:31 +msgid "Files decrypted successfully" +msgstr "" + +#: ajax/decryptall.php:33 +msgid "" +"Couldn't decrypt your files, please check your owncloud.log or ask your " +"administrator" +msgstr "" + +#: ajax/decryptall.php:36 +msgid "Couldn't decrypt your files, check your password and try again" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "Elektronski naslov je shranjen" diff --git a/l10n/sl/user_ldap.po b/l10n/sl/user_ldap.po index ecfe45ca6b2..aeb27061fcb 100644 --- a/l10n/sl/user_ldap.po +++ b/l10n/sl/user_ldap.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-08 01:56-0400\n" -"PO-Revision-Date: 2014-04-08 05:56+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:55+0000\n" "Last-Translator: I Robot\n" "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n" "MIME-Version: 1.0\n" @@ -150,7 +150,7 @@ msgstr[3] "%s najdenih uporabnikov" msgid "Invalid Host" msgstr "Neveljaven gostitelj" -#: lib/wizard.php:963 +#: lib/wizard.php:983 msgid "Could not find the desired feature" msgstr "Želene zmožnosti ni mogoče najti" @@ -341,8 +341,8 @@ msgid "Only connect to the replica server." msgstr "Poveži le s podvojenim strežnikom." #: templates/settings.php:26 -msgid "Case insensitve LDAP server (Windows)" -msgstr "Strežnik LDAP ne upošteva velikosti črk (Windows)" +msgid "Case insensitive LDAP server (Windows)" +msgstr "" #: templates/settings.php:27 msgid "Turn off SSL certificate validation." diff --git a/l10n/sq/settings.po b/l10n/sq/settings.po index 8d2970bcdc2..f837939e7b7 100644 --- a/l10n/sq/settings.po +++ b/l10n/sq/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-10 01:54-0400\n" -"PO-Revision-Date: 2014-04-09 06:10+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n" "MIME-Version: 1.0\n" @@ -84,6 +84,20 @@ msgstr "Grupi ekziston" msgid "Unable to add group" msgstr "E pamundur të shtohet grupi" +#: ajax/decryptall.php:31 +msgid "Files decrypted successfully" +msgstr "" + +#: ajax/decryptall.php:33 +msgid "" +"Couldn't decrypt your files, please check your owncloud.log or ask your " +"administrator" +msgstr "" + +#: ajax/decryptall.php:36 +msgid "Couldn't decrypt your files, check your password and try again" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "Email u ruajt" diff --git a/l10n/sq/user_ldap.po b/l10n/sq/user_ldap.po index 963d74c361b..af3fdebe113 100644 --- a/l10n/sq/user_ldap.po +++ b/l10n/sq/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-08 01:56-0400\n" -"PO-Revision-Date: 2014-04-08 05:56+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:55+0000\n" "Last-Translator: I Robot\n" "Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n" "MIME-Version: 1.0\n" @@ -144,7 +144,7 @@ msgstr[1] "" msgid "Invalid Host" msgstr "" -#: lib/wizard.php:963 +#: lib/wizard.php:983 msgid "Could not find the desired feature" msgstr "" @@ -335,8 +335,8 @@ msgid "Only connect to the replica server." msgstr "" #: templates/settings.php:26 -msgid "Case insensitve LDAP server (Windows)" -msgstr " Server LDAP i pavëmëndshëm ndaj gërmëzimit të madh apo jo (Windows)" +msgid "Case insensitive LDAP server (Windows)" +msgstr "" #: templates/settings.php:27 msgid "Turn off SSL certificate validation." diff --git a/l10n/sr/settings.po b/l10n/sr/settings.po index ad83bcb144a..339f9626c26 100644 --- a/l10n/sr/settings.po +++ b/l10n/sr/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-10 01:54-0400\n" -"PO-Revision-Date: 2014-04-09 06:10+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n" "MIME-Version: 1.0\n" @@ -84,6 +84,20 @@ msgstr "Група већ постоји" msgid "Unable to add group" msgstr "Не могу да додам групу" +#: ajax/decryptall.php:31 +msgid "Files decrypted successfully" +msgstr "" + +#: ajax/decryptall.php:33 +msgid "" +"Couldn't decrypt your files, please check your owncloud.log or ask your " +"administrator" +msgstr "" + +#: ajax/decryptall.php:36 +msgid "Couldn't decrypt your files, check your password and try again" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "Е-порука сачувана" diff --git a/l10n/sr/user_ldap.po b/l10n/sr/user_ldap.po index 3e050f44943..e0f3aec7e6c 100644 --- a/l10n/sr/user_ldap.po +++ b/l10n/sr/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-08 01:56-0400\n" -"PO-Revision-Date: 2014-04-08 05:56+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:55+0000\n" "Last-Translator: I Robot\n" "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n" "MIME-Version: 1.0\n" @@ -146,7 +146,7 @@ msgstr[2] "" msgid "Invalid Host" msgstr "" -#: lib/wizard.php:963 +#: lib/wizard.php:983 msgid "Could not find the desired feature" msgstr "" @@ -337,8 +337,8 @@ msgid "Only connect to the replica server." msgstr "" #: templates/settings.php:26 -msgid "Case insensitve LDAP server (Windows)" -msgstr "LDAP сервер осетљив на велика и мала слова (Windows)" +msgid "Case insensitive LDAP server (Windows)" +msgstr "" #: templates/settings.php:27 msgid "Turn off SSL certificate validation." diff --git a/l10n/sr@latin/settings.po b/l10n/sr@latin/settings.po index 61ac8239bce..8a850e96d0d 100644 --- a/l10n/sr@latin/settings.po +++ b/l10n/sr@latin/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-03-26 01:55-0400\n" -"PO-Revision-Date: 2014-03-26 05:55+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159 +#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149 msgid "Encryption" msgstr "" @@ -64,7 +64,7 @@ msgid "Unable to load list from App Store" msgstr "" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 changepassword/controller.php:55 +#: ajax/togglegroups.php:20 changepassword/controller.php:49 msgid "Authentication error" msgstr "Greška pri autentifikaciji" @@ -84,6 +84,20 @@ msgstr "" msgid "Unable to add group" msgstr "" +#: ajax/decryptall.php:31 +msgid "Files decrypted successfully" +msgstr "" + +#: ajax/decryptall.php:33 +msgid "" +"Couldn't decrypt your files, please check your owncloud.log or ask your " +"administrator" +msgstr "" + +#: ajax/decryptall.php:36 +msgid "Couldn't decrypt your files, check your password and try again" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -126,32 +140,32 @@ msgstr "" msgid "Couldn't update app." msgstr "" -#: changepassword/controller.php:20 +#: changepassword/controller.php:17 msgid "Wrong password" msgstr "" -#: changepassword/controller.php:42 +#: changepassword/controller.php:36 msgid "No user supplied" msgstr "" -#: changepassword/controller.php:74 +#: changepassword/controller.php:68 msgid "" "Please provide an admin recovery password, otherwise all user data will be " "lost" msgstr "" -#: changepassword/controller.php:79 +#: changepassword/controller.php:73 msgid "" "Wrong admin recovery password. Please check the password and try again." msgstr "" -#: changepassword/controller.php:87 +#: changepassword/controller.php:81 msgid "" "Back-end doesn't support password change, but the users encryption key was " "successfully updated." msgstr "" -#: changepassword/controller.php:92 changepassword/controller.php:103 +#: changepassword/controller.php:86 changepassword/controller.php:97 msgid "Unable to change password" msgstr "" @@ -203,7 +217,7 @@ msgstr "" msgid "Error" msgstr "Greška" -#: js/apps.js:153 templates/apps.php:54 +#: js/apps.js:153 templates/apps.php:55 msgid "Update" msgstr "" @@ -211,31 +225,31 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:246 +#: js/personal.js:243 msgid "Select a profile picture" msgstr "" -#: js/personal.js:277 +#: js/personal.js:274 msgid "Very weak password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:275 msgid "Weak password" msgstr "" -#: js/personal.js:279 +#: js/personal.js:276 msgid "So-so password" msgstr "" -#: js/personal.js:280 +#: js/personal.js:277 msgid "Good password" msgstr "" -#: js/personal.js:281 +#: js/personal.js:278 msgid "Strong password" msgstr "" -#: js/personal.js:316 +#: js/personal.js:313 msgid "Decrypting files... Please wait, this can take some time." msgstr "" @@ -284,7 +298,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:49 personal.php:50 +#: personal.php:48 personal.php:49 msgid "__language_name__" msgstr "" @@ -589,11 +603,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:416 templates/personal.php:181 +#: templates/admin.php:416 templates/personal.php:171 msgid "Version" msgstr "" -#: templates/admin.php:420 templates/personal.php:184 +#: templates/admin.php:420 templates/personal.php:174 msgid "" "Developed by the ownCloud community, the -licensed by " msgstr "" @@ -664,108 +678,108 @@ msgstr "" msgid "You have used %s of the available %s" msgstr "" -#: templates/personal.php:39 templates/users.php:21 templates/users.php:87 +#: templates/personal.php:38 templates/users.php:21 templates/users.php:87 msgid "Password" msgstr "Lozinka" -#: templates/personal.php:40 +#: templates/personal.php:39 msgid "Your password was changed" msgstr "" -#: templates/personal.php:41 +#: templates/personal.php:40 msgid "Unable to change your password" msgstr "Ne mogu da izmenim vašu lozinku" -#: templates/personal.php:43 +#: templates/personal.php:42 msgid "Current password" msgstr "Trenutna lozinka" -#: templates/personal.php:46 +#: templates/personal.php:45 msgid "New password" msgstr "Nova lozinka" -#: templates/personal.php:50 +#: templates/personal.php:49 msgid "Change password" msgstr "Izmeni lozinku" -#: templates/personal.php:64 templates/users.php:86 +#: templates/personal.php:61 templates/users.php:86 msgid "Full Name" msgstr "" -#: templates/personal.php:81 +#: templates/personal.php:76 msgid "Email" msgstr "E-mail" -#: templates/personal.php:83 +#: templates/personal.php:78 msgid "Your email address" msgstr "" -#: templates/personal.php:86 +#: templates/personal.php:81 msgid "" "Fill in an email address to enable password recovery and receive " "notifications" msgstr "" -#: templates/personal.php:96 +#: templates/personal.php:89 msgid "Profile picture" msgstr "" -#: templates/personal.php:101 +#: templates/personal.php:94 msgid "Upload new" msgstr "" -#: templates/personal.php:103 +#: templates/personal.php:96 msgid "Select new from Files" msgstr "" -#: templates/personal.php:104 +#: templates/personal.php:97 msgid "Remove image" msgstr "" -#: templates/personal.php:105 +#: templates/personal.php:98 msgid "Either png or jpg. Ideally square but you will be able to crop it." msgstr "" -#: templates/personal.php:107 +#: templates/personal.php:100 msgid "Your avatar is provided by your original account." msgstr "" -#: templates/personal.php:111 +#: templates/personal.php:104 msgid "Cancel" msgstr "Otkaži" -#: templates/personal.php:112 +#: templates/personal.php:105 msgid "Choose as profile image" msgstr "" -#: templates/personal.php:120 templates/personal.php:121 +#: templates/personal.php:111 templates/personal.php:112 msgid "Language" msgstr "Jezik" -#: templates/personal.php:140 +#: templates/personal.php:131 msgid "Help translate" msgstr "" -#: templates/personal.php:147 +#: templates/personal.php:137 msgid "WebDAV" msgstr "" -#: templates/personal.php:149 +#: templates/personal.php:139 #, php-format msgid "" "Use this address to access your Files via " "WebDAV" msgstr "" -#: templates/personal.php:161 +#: templates/personal.php:151 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:167 +#: templates/personal.php:157 msgid "Log-in password" msgstr "" -#: templates/personal.php:172 +#: templates/personal.php:162 msgid "Decrypt all Files" msgstr "" diff --git a/l10n/sr@latin/user_ldap.po b/l10n/sr@latin/user_ldap.po index ff6b66a5c7d..82538a4f5e3 100644 --- a/l10n/sr@latin/user_ldap.po +++ b/l10n/sr@latin/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-08 01:56-0400\n" -"PO-Revision-Date: 2014-04-08 05:56+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:55+0000\n" "Last-Translator: I Robot\n" "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n" "MIME-Version: 1.0\n" @@ -146,7 +146,7 @@ msgstr[2] "" msgid "Invalid Host" msgstr "" -#: lib/wizard.php:963 +#: lib/wizard.php:983 msgid "Could not find the desired feature" msgstr "" @@ -337,7 +337,7 @@ msgid "Only connect to the replica server." msgstr "" #: templates/settings.php:26 -msgid "Case insensitve LDAP server (Windows)" +msgid "Case insensitive LDAP server (Windows)" msgstr "" #: templates/settings.php:27 diff --git a/l10n/su/settings.po b/l10n/su/settings.po index f93147a8bca..b5fd5ad46fd 100644 --- a/l10n/su/settings.po +++ b/l10n/su/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-03-26 01:55-0400\n" -"PO-Revision-Date: 2014-03-26 05:55+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Sundanese (http://www.transifex.com/projects/p/owncloud/language/su/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159 +#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149 msgid "Encryption" msgstr "" @@ -64,7 +64,7 @@ msgid "Unable to load list from App Store" msgstr "" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 changepassword/controller.php:55 +#: ajax/togglegroups.php:20 changepassword/controller.php:49 msgid "Authentication error" msgstr "" @@ -84,6 +84,20 @@ msgstr "" msgid "Unable to add group" msgstr "" +#: ajax/decryptall.php:31 +msgid "Files decrypted successfully" +msgstr "" + +#: ajax/decryptall.php:33 +msgid "" +"Couldn't decrypt your files, please check your owncloud.log or ask your " +"administrator" +msgstr "" + +#: ajax/decryptall.php:36 +msgid "Couldn't decrypt your files, check your password and try again" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -126,32 +140,32 @@ msgstr "" msgid "Couldn't update app." msgstr "" -#: changepassword/controller.php:20 +#: changepassword/controller.php:17 msgid "Wrong password" msgstr "" -#: changepassword/controller.php:42 +#: changepassword/controller.php:36 msgid "No user supplied" msgstr "" -#: changepassword/controller.php:74 +#: changepassword/controller.php:68 msgid "" "Please provide an admin recovery password, otherwise all user data will be " "lost" msgstr "" -#: changepassword/controller.php:79 +#: changepassword/controller.php:73 msgid "" "Wrong admin recovery password. Please check the password and try again." msgstr "" -#: changepassword/controller.php:87 +#: changepassword/controller.php:81 msgid "" "Back-end doesn't support password change, but the users encryption key was " "successfully updated." msgstr "" -#: changepassword/controller.php:92 changepassword/controller.php:103 +#: changepassword/controller.php:86 changepassword/controller.php:97 msgid "Unable to change password" msgstr "" @@ -203,7 +217,7 @@ msgstr "" msgid "Error" msgstr "" -#: js/apps.js:153 templates/apps.php:54 +#: js/apps.js:153 templates/apps.php:55 msgid "Update" msgstr "" @@ -211,31 +225,31 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:246 +#: js/personal.js:243 msgid "Select a profile picture" msgstr "" -#: js/personal.js:277 +#: js/personal.js:274 msgid "Very weak password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:275 msgid "Weak password" msgstr "" -#: js/personal.js:279 +#: js/personal.js:276 msgid "So-so password" msgstr "" -#: js/personal.js:280 +#: js/personal.js:277 msgid "Good password" msgstr "" -#: js/personal.js:281 +#: js/personal.js:278 msgid "Strong password" msgstr "" -#: js/personal.js:316 +#: js/personal.js:313 msgid "Decrypting files... Please wait, this can take some time." msgstr "" @@ -284,7 +298,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:49 personal.php:50 +#: personal.php:48 personal.php:49 msgid "__language_name__" msgstr "" @@ -589,11 +603,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:416 templates/personal.php:181 +#: templates/admin.php:416 templates/personal.php:171 msgid "Version" msgstr "" -#: templates/admin.php:420 templates/personal.php:184 +#: templates/admin.php:420 templates/personal.php:174 msgid "" "Developed by the ownCloud community, the -licensed by " msgstr "" @@ -664,108 +678,108 @@ msgstr "" msgid "You have used %s of the available %s" msgstr "" -#: templates/personal.php:39 templates/users.php:21 templates/users.php:87 +#: templates/personal.php:38 templates/users.php:21 templates/users.php:87 msgid "Password" msgstr "" -#: templates/personal.php:40 +#: templates/personal.php:39 msgid "Your password was changed" msgstr "" -#: templates/personal.php:41 +#: templates/personal.php:40 msgid "Unable to change your password" msgstr "" -#: templates/personal.php:43 +#: templates/personal.php:42 msgid "Current password" msgstr "" -#: templates/personal.php:46 +#: templates/personal.php:45 msgid "New password" msgstr "" -#: templates/personal.php:50 +#: templates/personal.php:49 msgid "Change password" msgstr "" -#: templates/personal.php:64 templates/users.php:86 +#: templates/personal.php:61 templates/users.php:86 msgid "Full Name" msgstr "" -#: templates/personal.php:81 +#: templates/personal.php:76 msgid "Email" msgstr "" -#: templates/personal.php:83 +#: templates/personal.php:78 msgid "Your email address" msgstr "" -#: templates/personal.php:86 +#: templates/personal.php:81 msgid "" "Fill in an email address to enable password recovery and receive " "notifications" msgstr "" -#: templates/personal.php:96 +#: templates/personal.php:89 msgid "Profile picture" msgstr "" -#: templates/personal.php:101 +#: templates/personal.php:94 msgid "Upload new" msgstr "" -#: templates/personal.php:103 +#: templates/personal.php:96 msgid "Select new from Files" msgstr "" -#: templates/personal.php:104 +#: templates/personal.php:97 msgid "Remove image" msgstr "" -#: templates/personal.php:105 +#: templates/personal.php:98 msgid "Either png or jpg. Ideally square but you will be able to crop it." msgstr "" -#: templates/personal.php:107 +#: templates/personal.php:100 msgid "Your avatar is provided by your original account." msgstr "" -#: templates/personal.php:111 +#: templates/personal.php:104 msgid "Cancel" msgstr "" -#: templates/personal.php:112 +#: templates/personal.php:105 msgid "Choose as profile image" msgstr "" -#: templates/personal.php:120 templates/personal.php:121 +#: templates/personal.php:111 templates/personal.php:112 msgid "Language" msgstr "" -#: templates/personal.php:140 +#: templates/personal.php:131 msgid "Help translate" msgstr "" -#: templates/personal.php:147 +#: templates/personal.php:137 msgid "WebDAV" msgstr "" -#: templates/personal.php:149 +#: templates/personal.php:139 #, php-format msgid "" "Use this address to access your Files via " "WebDAV" msgstr "" -#: templates/personal.php:161 +#: templates/personal.php:151 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:167 +#: templates/personal.php:157 msgid "Log-in password" msgstr "" -#: templates/personal.php:172 +#: templates/personal.php:162 msgid "Decrypt all Files" msgstr "" diff --git a/l10n/su/user_ldap.po b/l10n/su/user_ldap.po index b7878fb8312..9265d4f0983 100644 --- a/l10n/su/user_ldap.po +++ b/l10n/su/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-08 01:56-0400\n" -"PO-Revision-Date: 2014-04-08 05:56+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:55+0000\n" "Last-Translator: I Robot\n" "Language-Team: Sundanese (http://www.transifex.com/projects/p/owncloud/language/su/)\n" "MIME-Version: 1.0\n" @@ -142,7 +142,7 @@ msgstr[0] "" msgid "Invalid Host" msgstr "" -#: lib/wizard.php:963 +#: lib/wizard.php:983 msgid "Could not find the desired feature" msgstr "" @@ -333,7 +333,7 @@ msgid "Only connect to the replica server." msgstr "" #: templates/settings.php:26 -msgid "Case insensitve LDAP server (Windows)" +msgid "Case insensitive LDAP server (Windows)" msgstr "" #: templates/settings.php:27 diff --git a/l10n/sv/settings.po b/l10n/sv/settings.po index af537045197..8cd4062d844 100644 --- a/l10n/sv/settings.po +++ b/l10n/sv/settings.po @@ -17,9 +17,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-10 01:54-0400\n" -"PO-Revision-Date: 2014-04-09 06:10+0000\n" -"Last-Translator: AsavarTzeth \n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:54+0000\n" +"Last-Translator: I Robot\n" "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -94,6 +94,20 @@ msgstr "Gruppen finns redan" msgid "Unable to add group" msgstr "Kan inte lägga till grupp" +#: ajax/decryptall.php:31 +msgid "Files decrypted successfully" +msgstr "" + +#: ajax/decryptall.php:33 +msgid "" +"Couldn't decrypt your files, please check your owncloud.log or ask your " +"administrator" +msgstr "" + +#: ajax/decryptall.php:36 +msgid "Couldn't decrypt your files, check your password and try again" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "E-post sparad" diff --git a/l10n/sv/user_ldap.po b/l10n/sv/user_ldap.po index dc65893d02e..5a1b50527e2 100644 --- a/l10n/sv/user_ldap.po +++ b/l10n/sv/user_ldap.po @@ -16,9 +16,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-09 01:55-0400\n" -"PO-Revision-Date: 2014-04-08 17:30+0000\n" -"Last-Translator: AsavarTzeth \n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:55+0000\n" +"Last-Translator: I Robot\n" "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -153,7 +153,7 @@ msgstr[1] "%s användare hittade" msgid "Invalid Host" msgstr "Felaktig Host" -#: lib/wizard.php:963 +#: lib/wizard.php:983 msgid "Could not find the desired feature" msgstr "Det gick inte hitta den önskade funktionen" @@ -344,8 +344,8 @@ msgid "Only connect to the replica server." msgstr "Anslut endast till replikaservern." #: templates/settings.php:26 -msgid "Case insensitve LDAP server (Windows)" -msgstr "LDAP-servern är okänslig för gemener och versaler (Windows)" +msgid "Case insensitive LDAP server (Windows)" +msgstr "" #: templates/settings.php:27 msgid "Turn off SSL certificate validation." diff --git a/l10n/sw_KE/settings.po b/l10n/sw_KE/settings.po index 2703facb88a..51475acbd40 100644 --- a/l10n/sw_KE/settings.po +++ b/l10n/sw_KE/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-03-26 01:55-0400\n" -"PO-Revision-Date: 2014-03-26 05:55+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159 +#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149 msgid "Encryption" msgstr "" @@ -64,7 +64,7 @@ msgid "Unable to load list from App Store" msgstr "" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 changepassword/controller.php:55 +#: ajax/togglegroups.php:20 changepassword/controller.php:49 msgid "Authentication error" msgstr "" @@ -84,6 +84,20 @@ msgstr "" msgid "Unable to add group" msgstr "" +#: ajax/decryptall.php:31 +msgid "Files decrypted successfully" +msgstr "" + +#: ajax/decryptall.php:33 +msgid "" +"Couldn't decrypt your files, please check your owncloud.log or ask your " +"administrator" +msgstr "" + +#: ajax/decryptall.php:36 +msgid "Couldn't decrypt your files, check your password and try again" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -126,32 +140,32 @@ msgstr "" msgid "Couldn't update app." msgstr "" -#: changepassword/controller.php:20 +#: changepassword/controller.php:17 msgid "Wrong password" msgstr "" -#: changepassword/controller.php:42 +#: changepassword/controller.php:36 msgid "No user supplied" msgstr "" -#: changepassword/controller.php:74 +#: changepassword/controller.php:68 msgid "" "Please provide an admin recovery password, otherwise all user data will be " "lost" msgstr "" -#: changepassword/controller.php:79 +#: changepassword/controller.php:73 msgid "" "Wrong admin recovery password. Please check the password and try again." msgstr "" -#: changepassword/controller.php:87 +#: changepassword/controller.php:81 msgid "" "Back-end doesn't support password change, but the users encryption key was " "successfully updated." msgstr "" -#: changepassword/controller.php:92 changepassword/controller.php:103 +#: changepassword/controller.php:86 changepassword/controller.php:97 msgid "Unable to change password" msgstr "" @@ -203,7 +217,7 @@ msgstr "" msgid "Error" msgstr "" -#: js/apps.js:153 templates/apps.php:54 +#: js/apps.js:153 templates/apps.php:55 msgid "Update" msgstr "" @@ -211,31 +225,31 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:246 +#: js/personal.js:243 msgid "Select a profile picture" msgstr "" -#: js/personal.js:277 +#: js/personal.js:274 msgid "Very weak password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:275 msgid "Weak password" msgstr "" -#: js/personal.js:279 +#: js/personal.js:276 msgid "So-so password" msgstr "" -#: js/personal.js:280 +#: js/personal.js:277 msgid "Good password" msgstr "" -#: js/personal.js:281 +#: js/personal.js:278 msgid "Strong password" msgstr "" -#: js/personal.js:316 +#: js/personal.js:313 msgid "Decrypting files... Please wait, this can take some time." msgstr "" @@ -284,7 +298,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:49 personal.php:50 +#: personal.php:48 personal.php:49 msgid "__language_name__" msgstr "" @@ -589,11 +603,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:416 templates/personal.php:181 +#: templates/admin.php:416 templates/personal.php:171 msgid "Version" msgstr "" -#: templates/admin.php:420 templates/personal.php:184 +#: templates/admin.php:420 templates/personal.php:174 msgid "" "Developed by the ownCloud community, the -licensed by " msgstr "" @@ -664,108 +678,108 @@ msgstr "" msgid "You have used %s of the available %s" msgstr "" -#: templates/personal.php:39 templates/users.php:21 templates/users.php:87 +#: templates/personal.php:38 templates/users.php:21 templates/users.php:87 msgid "Password" msgstr "" -#: templates/personal.php:40 +#: templates/personal.php:39 msgid "Your password was changed" msgstr "" -#: templates/personal.php:41 +#: templates/personal.php:40 msgid "Unable to change your password" msgstr "" -#: templates/personal.php:43 +#: templates/personal.php:42 msgid "Current password" msgstr "" -#: templates/personal.php:46 +#: templates/personal.php:45 msgid "New password" msgstr "" -#: templates/personal.php:50 +#: templates/personal.php:49 msgid "Change password" msgstr "" -#: templates/personal.php:64 templates/users.php:86 +#: templates/personal.php:61 templates/users.php:86 msgid "Full Name" msgstr "" -#: templates/personal.php:81 +#: templates/personal.php:76 msgid "Email" msgstr "" -#: templates/personal.php:83 +#: templates/personal.php:78 msgid "Your email address" msgstr "" -#: templates/personal.php:86 +#: templates/personal.php:81 msgid "" "Fill in an email address to enable password recovery and receive " "notifications" msgstr "" -#: templates/personal.php:96 +#: templates/personal.php:89 msgid "Profile picture" msgstr "" -#: templates/personal.php:101 +#: templates/personal.php:94 msgid "Upload new" msgstr "" -#: templates/personal.php:103 +#: templates/personal.php:96 msgid "Select new from Files" msgstr "" -#: templates/personal.php:104 +#: templates/personal.php:97 msgid "Remove image" msgstr "" -#: templates/personal.php:105 +#: templates/personal.php:98 msgid "Either png or jpg. Ideally square but you will be able to crop it." msgstr "" -#: templates/personal.php:107 +#: templates/personal.php:100 msgid "Your avatar is provided by your original account." msgstr "" -#: templates/personal.php:111 +#: templates/personal.php:104 msgid "Cancel" msgstr "" -#: templates/personal.php:112 +#: templates/personal.php:105 msgid "Choose as profile image" msgstr "" -#: templates/personal.php:120 templates/personal.php:121 +#: templates/personal.php:111 templates/personal.php:112 msgid "Language" msgstr "" -#: templates/personal.php:140 +#: templates/personal.php:131 msgid "Help translate" msgstr "" -#: templates/personal.php:147 +#: templates/personal.php:137 msgid "WebDAV" msgstr "" -#: templates/personal.php:149 +#: templates/personal.php:139 #, php-format msgid "" "Use this address to access your Files via " "WebDAV" msgstr "" -#: templates/personal.php:161 +#: templates/personal.php:151 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:167 +#: templates/personal.php:157 msgid "Log-in password" msgstr "" -#: templates/personal.php:172 +#: templates/personal.php:162 msgid "Decrypt all Files" msgstr "" diff --git a/l10n/sw_KE/user_ldap.po b/l10n/sw_KE/user_ldap.po index 3dffd9f58ac..2249c487160 100644 --- a/l10n/sw_KE/user_ldap.po +++ b/l10n/sw_KE/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-08 01:56-0400\n" -"PO-Revision-Date: 2014-04-08 05:56+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:55+0000\n" "Last-Translator: I Robot\n" "Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n" "MIME-Version: 1.0\n" @@ -144,7 +144,7 @@ msgstr[1] "" msgid "Invalid Host" msgstr "" -#: lib/wizard.php:963 +#: lib/wizard.php:983 msgid "Could not find the desired feature" msgstr "" @@ -335,7 +335,7 @@ msgid "Only connect to the replica server." msgstr "" #: templates/settings.php:26 -msgid "Case insensitve LDAP server (Windows)" +msgid "Case insensitive LDAP server (Windows)" msgstr "" #: templates/settings.php:27 diff --git a/l10n/ta_LK/settings.po b/l10n/ta_LK/settings.po index aec5ad9de2f..df61ff7f5b4 100644 --- a/l10n/ta_LK/settings.po +++ b/l10n/ta_LK/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-03-26 01:55-0400\n" -"PO-Revision-Date: 2014-03-26 05:55+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159 +#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149 msgid "Encryption" msgstr "மறைக்குறியீடு" @@ -64,7 +64,7 @@ msgid "Unable to load list from App Store" msgstr "செயலி சேமிப்பிலிருந்து பட்டியலை ஏற்றமுடியாதுள்ளது" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 changepassword/controller.php:55 +#: ajax/togglegroups.php:20 changepassword/controller.php:49 msgid "Authentication error" msgstr "அத்தாட்சிப்படுத்தலில் வழு" @@ -84,6 +84,20 @@ msgstr "குழு ஏற்கனவே உள்ளது" msgid "Unable to add group" msgstr "குழுவை சேர்க்க முடியாது" +#: ajax/decryptall.php:31 +msgid "Files decrypted successfully" +msgstr "" + +#: ajax/decryptall.php:33 +msgid "" +"Couldn't decrypt your files, please check your owncloud.log or ask your " +"administrator" +msgstr "" + +#: ajax/decryptall.php:36 +msgid "Couldn't decrypt your files, check your password and try again" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "மின்னஞ்சல் சேமிக்கப்பட்டது" @@ -126,32 +140,32 @@ msgstr "குழு %s இலிருந்து பயனாளரை நீ msgid "Couldn't update app." msgstr "" -#: changepassword/controller.php:20 +#: changepassword/controller.php:17 msgid "Wrong password" msgstr "" -#: changepassword/controller.php:42 +#: changepassword/controller.php:36 msgid "No user supplied" msgstr "" -#: changepassword/controller.php:74 +#: changepassword/controller.php:68 msgid "" "Please provide an admin recovery password, otherwise all user data will be " "lost" msgstr "" -#: changepassword/controller.php:79 +#: changepassword/controller.php:73 msgid "" "Wrong admin recovery password. Please check the password and try again." msgstr "" -#: changepassword/controller.php:87 +#: changepassword/controller.php:81 msgid "" "Back-end doesn't support password change, but the users encryption key was " "successfully updated." msgstr "" -#: changepassword/controller.php:92 changepassword/controller.php:103 +#: changepassword/controller.php:86 changepassword/controller.php:97 msgid "Unable to change password" msgstr "" @@ -203,7 +217,7 @@ msgstr "" msgid "Error" msgstr "வழு" -#: js/apps.js:153 templates/apps.php:54 +#: js/apps.js:153 templates/apps.php:55 msgid "Update" msgstr "இற்றைப்படுத்தல்" @@ -211,31 +225,31 @@ msgstr "இற்றைப்படுத்தல்" msgid "Updated" msgstr "" -#: js/personal.js:246 +#: js/personal.js:243 msgid "Select a profile picture" msgstr "" -#: js/personal.js:277 +#: js/personal.js:274 msgid "Very weak password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:275 msgid "Weak password" msgstr "" -#: js/personal.js:279 +#: js/personal.js:276 msgid "So-so password" msgstr "" -#: js/personal.js:280 +#: js/personal.js:277 msgid "Good password" msgstr "" -#: js/personal.js:281 +#: js/personal.js:278 msgid "Strong password" msgstr "" -#: js/personal.js:316 +#: js/personal.js:313 msgid "Decrypting files... Please wait, this can take some time." msgstr "" @@ -284,7 +298,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:49 personal.php:50 +#: personal.php:48 personal.php:49 msgid "__language_name__" msgstr "_மொழி_பெயர்_" @@ -589,11 +603,11 @@ msgstr "மேலதிக" msgid "Less" msgstr "குறைவான" -#: templates/admin.php:416 templates/personal.php:181 +#: templates/admin.php:416 templates/personal.php:171 msgid "Version" msgstr "" -#: templates/admin.php:420 templates/personal.php:184 +#: templates/admin.php:420 templates/personal.php:174 msgid "" "Developed by the ownCloud community, the -licensed by " msgstr "-அனுமதி பெற்ற " @@ -664,108 +678,108 @@ msgstr "" msgid "You have used %s of the available %s" msgstr "நீங்கள் %s இலுள்ள %sபயன்படுத்தியுள்ளீர்கள்" -#: templates/personal.php:39 templates/users.php:21 templates/users.php:87 +#: templates/personal.php:38 templates/users.php:21 templates/users.php:87 msgid "Password" msgstr "கடவுச்சொல்" -#: templates/personal.php:40 +#: templates/personal.php:39 msgid "Your password was changed" msgstr "உங்களுடைய கடவுச்சொல் மாற்றப்பட்டுள்ளது" -#: templates/personal.php:41 +#: templates/personal.php:40 msgid "Unable to change your password" msgstr "உங்களுடைய கடவுச்சொல்லை மாற்றமுடியாது" -#: templates/personal.php:43 +#: templates/personal.php:42 msgid "Current password" msgstr "தற்போதைய கடவுச்சொல்" -#: templates/personal.php:46 +#: templates/personal.php:45 msgid "New password" msgstr "புதிய கடவுச்சொல்" -#: templates/personal.php:50 +#: templates/personal.php:49 msgid "Change password" msgstr "கடவுச்சொல்லை மாற்றுக" -#: templates/personal.php:64 templates/users.php:86 +#: templates/personal.php:61 templates/users.php:86 msgid "Full Name" msgstr "" -#: templates/personal.php:81 +#: templates/personal.php:76 msgid "Email" msgstr "மின்னஞ்சல்" -#: templates/personal.php:83 +#: templates/personal.php:78 msgid "Your email address" msgstr "உங்களுடைய மின்னஞ்சல் முகவரி" -#: templates/personal.php:86 +#: templates/personal.php:81 msgid "" "Fill in an email address to enable password recovery and receive " "notifications" msgstr "" -#: templates/personal.php:96 +#: templates/personal.php:89 msgid "Profile picture" msgstr "" -#: templates/personal.php:101 +#: templates/personal.php:94 msgid "Upload new" msgstr "" -#: templates/personal.php:103 +#: templates/personal.php:96 msgid "Select new from Files" msgstr "" -#: templates/personal.php:104 +#: templates/personal.php:97 msgid "Remove image" msgstr "" -#: templates/personal.php:105 +#: templates/personal.php:98 msgid "Either png or jpg. Ideally square but you will be able to crop it." msgstr "" -#: templates/personal.php:107 +#: templates/personal.php:100 msgid "Your avatar is provided by your original account." msgstr "" -#: templates/personal.php:111 +#: templates/personal.php:104 msgid "Cancel" msgstr "இரத்து செய்க" -#: templates/personal.php:112 +#: templates/personal.php:105 msgid "Choose as profile image" msgstr "" -#: templates/personal.php:120 templates/personal.php:121 +#: templates/personal.php:111 templates/personal.php:112 msgid "Language" msgstr "மொழி" -#: templates/personal.php:140 +#: templates/personal.php:131 msgid "Help translate" msgstr "மொழிபெயர்க்க உதவி" -#: templates/personal.php:147 +#: templates/personal.php:137 msgid "WebDAV" msgstr "" -#: templates/personal.php:149 +#: templates/personal.php:139 #, php-format msgid "" "Use this address to access your Files via " "WebDAV" msgstr "" -#: templates/personal.php:161 +#: templates/personal.php:151 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:167 +#: templates/personal.php:157 msgid "Log-in password" msgstr "" -#: templates/personal.php:172 +#: templates/personal.php:162 msgid "Decrypt all Files" msgstr "" diff --git a/l10n/ta_LK/user_ldap.po b/l10n/ta_LK/user_ldap.po index 4e168a7dcc4..df71f1244bf 100644 --- a/l10n/ta_LK/user_ldap.po +++ b/l10n/ta_LK/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-08 01:56-0400\n" -"PO-Revision-Date: 2014-04-08 05:56+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:55+0000\n" "Last-Translator: I Robot\n" "Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n" "MIME-Version: 1.0\n" @@ -144,7 +144,7 @@ msgstr[1] "" msgid "Invalid Host" msgstr "" -#: lib/wizard.php:963 +#: lib/wizard.php:983 msgid "Could not find the desired feature" msgstr "" @@ -335,8 +335,8 @@ msgid "Only connect to the replica server." msgstr "" #: templates/settings.php:26 -msgid "Case insensitve LDAP server (Windows)" -msgstr "உணர்ச்சியான LDAP சேவையகம் (சாளரங்கள்)" +msgid "Case insensitive LDAP server (Windows)" +msgstr "" #: templates/settings.php:27 msgid "Turn off SSL certificate validation." diff --git a/l10n/te/settings.po b/l10n/te/settings.po index b8c07e59ad2..ba7e8d94181 100644 --- a/l10n/te/settings.po +++ b/l10n/te/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-03-26 01:55-0400\n" -"PO-Revision-Date: 2014-03-26 05:55+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159 +#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149 msgid "Encryption" msgstr "" @@ -64,7 +64,7 @@ msgid "Unable to load list from App Store" msgstr "" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 changepassword/controller.php:55 +#: ajax/togglegroups.php:20 changepassword/controller.php:49 msgid "Authentication error" msgstr "" @@ -84,6 +84,20 @@ msgstr "" msgid "Unable to add group" msgstr "" +#: ajax/decryptall.php:31 +msgid "Files decrypted successfully" +msgstr "" + +#: ajax/decryptall.php:33 +msgid "" +"Couldn't decrypt your files, please check your owncloud.log or ask your " +"administrator" +msgstr "" + +#: ajax/decryptall.php:36 +msgid "Couldn't decrypt your files, check your password and try again" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -126,32 +140,32 @@ msgstr "" msgid "Couldn't update app." msgstr "" -#: changepassword/controller.php:20 +#: changepassword/controller.php:17 msgid "Wrong password" msgstr "" -#: changepassword/controller.php:42 +#: changepassword/controller.php:36 msgid "No user supplied" msgstr "" -#: changepassword/controller.php:74 +#: changepassword/controller.php:68 msgid "" "Please provide an admin recovery password, otherwise all user data will be " "lost" msgstr "" -#: changepassword/controller.php:79 +#: changepassword/controller.php:73 msgid "" "Wrong admin recovery password. Please check the password and try again." msgstr "" -#: changepassword/controller.php:87 +#: changepassword/controller.php:81 msgid "" "Back-end doesn't support password change, but the users encryption key was " "successfully updated." msgstr "" -#: changepassword/controller.php:92 changepassword/controller.php:103 +#: changepassword/controller.php:86 changepassword/controller.php:97 msgid "Unable to change password" msgstr "" @@ -203,7 +217,7 @@ msgstr "" msgid "Error" msgstr "పొరపాటు" -#: js/apps.js:153 templates/apps.php:54 +#: js/apps.js:153 templates/apps.php:55 msgid "Update" msgstr "" @@ -211,31 +225,31 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:246 +#: js/personal.js:243 msgid "Select a profile picture" msgstr "" -#: js/personal.js:277 +#: js/personal.js:274 msgid "Very weak password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:275 msgid "Weak password" msgstr "" -#: js/personal.js:279 +#: js/personal.js:276 msgid "So-so password" msgstr "" -#: js/personal.js:280 +#: js/personal.js:277 msgid "Good password" msgstr "" -#: js/personal.js:281 +#: js/personal.js:278 msgid "Strong password" msgstr "" -#: js/personal.js:316 +#: js/personal.js:313 msgid "Decrypting files... Please wait, this can take some time." msgstr "" @@ -284,7 +298,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:49 personal.php:50 +#: personal.php:48 personal.php:49 msgid "__language_name__" msgstr "" @@ -589,11 +603,11 @@ msgstr "మరిన్ని" msgid "Less" msgstr "" -#: templates/admin.php:416 templates/personal.php:181 +#: templates/admin.php:416 templates/personal.php:171 msgid "Version" msgstr "" -#: templates/admin.php:420 templates/personal.php:184 +#: templates/admin.php:420 templates/personal.php:174 msgid "" "Developed by the ownCloud community, the -licensed by " msgstr "" @@ -664,108 +678,108 @@ msgstr "" msgid "You have used %s of the available %s" msgstr "" -#: templates/personal.php:39 templates/users.php:21 templates/users.php:87 +#: templates/personal.php:38 templates/users.php:21 templates/users.php:87 msgid "Password" msgstr "సంకేతపదం" -#: templates/personal.php:40 +#: templates/personal.php:39 msgid "Your password was changed" msgstr "" -#: templates/personal.php:41 +#: templates/personal.php:40 msgid "Unable to change your password" msgstr "" -#: templates/personal.php:43 +#: templates/personal.php:42 msgid "Current password" msgstr "" -#: templates/personal.php:46 +#: templates/personal.php:45 msgid "New password" msgstr "కొత్త సంకేతపదం" -#: templates/personal.php:50 +#: templates/personal.php:49 msgid "Change password" msgstr "" -#: templates/personal.php:64 templates/users.php:86 +#: templates/personal.php:61 templates/users.php:86 msgid "Full Name" msgstr "" -#: templates/personal.php:81 +#: templates/personal.php:76 msgid "Email" msgstr "ఈమెయిలు" -#: templates/personal.php:83 +#: templates/personal.php:78 msgid "Your email address" msgstr "మీ ఈమెయిలు చిరునామా" -#: templates/personal.php:86 +#: templates/personal.php:81 msgid "" "Fill in an email address to enable password recovery and receive " "notifications" msgstr "" -#: templates/personal.php:96 +#: templates/personal.php:89 msgid "Profile picture" msgstr "" -#: templates/personal.php:101 +#: templates/personal.php:94 msgid "Upload new" msgstr "" -#: templates/personal.php:103 +#: templates/personal.php:96 msgid "Select new from Files" msgstr "" -#: templates/personal.php:104 +#: templates/personal.php:97 msgid "Remove image" msgstr "" -#: templates/personal.php:105 +#: templates/personal.php:98 msgid "Either png or jpg. Ideally square but you will be able to crop it." msgstr "" -#: templates/personal.php:107 +#: templates/personal.php:100 msgid "Your avatar is provided by your original account." msgstr "" -#: templates/personal.php:111 +#: templates/personal.php:104 msgid "Cancel" msgstr "రద్దుచేయి" -#: templates/personal.php:112 +#: templates/personal.php:105 msgid "Choose as profile image" msgstr "" -#: templates/personal.php:120 templates/personal.php:121 +#: templates/personal.php:111 templates/personal.php:112 msgid "Language" msgstr "భాష" -#: templates/personal.php:140 +#: templates/personal.php:131 msgid "Help translate" msgstr "" -#: templates/personal.php:147 +#: templates/personal.php:137 msgid "WebDAV" msgstr "" -#: templates/personal.php:149 +#: templates/personal.php:139 #, php-format msgid "" "Use this address to access your Files via " "WebDAV" msgstr "" -#: templates/personal.php:161 +#: templates/personal.php:151 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:167 +#: templates/personal.php:157 msgid "Log-in password" msgstr "" -#: templates/personal.php:172 +#: templates/personal.php:162 msgid "Decrypt all Files" msgstr "" diff --git a/l10n/te/user_ldap.po b/l10n/te/user_ldap.po index 515b88f3503..65ed23e9c53 100644 --- a/l10n/te/user_ldap.po +++ b/l10n/te/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-08 01:56-0400\n" -"PO-Revision-Date: 2014-04-08 05:56+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:55+0000\n" "Last-Translator: I Robot\n" "Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n" "MIME-Version: 1.0\n" @@ -144,7 +144,7 @@ msgstr[1] "" msgid "Invalid Host" msgstr "" -#: lib/wizard.php:963 +#: lib/wizard.php:983 msgid "Could not find the desired feature" msgstr "" @@ -335,7 +335,7 @@ msgid "Only connect to the replica server." msgstr "" #: templates/settings.php:26 -msgid "Case insensitve LDAP server (Windows)" +msgid "Case insensitive LDAP server (Windows)" msgstr "" #: templates/settings.php:27 diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot index 5c36d44feb1..3c44e623bf1 100644 --- a/l10n/templates/core.pot +++ b/l10n/templates/core.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-11 01:54-0400\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot index 97d8aaf0ab0..64c808c5c7a 100644 --- a/l10n/templates/files.pot +++ b/l10n/templates/files.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-11 01:54-0400\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot index 09f5900a03a..4b990827d0d 100644 --- a/l10n/templates/files_encryption.pot +++ b/l10n/templates/files_encryption.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-11 01:54-0400\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot index 446829a7066..1a4337a741e 100644 --- a/l10n/templates/files_external.pot +++ b/l10n/templates/files_external.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-11 01:54-0400\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot index 335843470ba..6b65617ab19 100644 --- a/l10n/templates/files_sharing.pot +++ b/l10n/templates/files_sharing.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-11 01:54-0400\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_trashbin.pot b/l10n/templates/files_trashbin.pot index 9800a9ad3f7..0bbe995ada6 100644 --- a/l10n/templates/files_trashbin.pot +++ b/l10n/templates/files_trashbin.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-11 01:54-0400\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot index eca1e25e0df..a15d33b1b93 100644 --- a/l10n/templates/files_versions.pot +++ b/l10n/templates/files_versions.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-11 01:54-0400\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot index df8dcaa8041..b13e7788d02 100644 --- a/l10n/templates/lib.pot +++ b/l10n/templates/lib.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-11 01:54-0400\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/private.pot b/l10n/templates/private.pot index c7c39e54af5..fe151138b41 100644 --- a/l10n/templates/private.pot +++ b/l10n/templates/private.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-11 01:54-0400\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot index 9095c16f9f7..4691fc81540 100644 --- a/l10n/templates/settings.pot +++ b/l10n/templates/settings.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-11 01:54-0400\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -84,6 +84,20 @@ msgstr "" msgid "Unable to add group" msgstr "" +#: ajax/decryptall.php:31 +msgid "Files decrypted successfully" +msgstr "" + +#: ajax/decryptall.php:33 +msgid "" +"Couldn't decrypt your files, please check your owncloud.log or ask your " +"administrator" +msgstr "" + +#: ajax/decryptall.php:36 +msgid "Couldn't decrypt your files, check your password and try again" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot index 9418a90de14..a1bd167ca18 100644 --- a/l10n/templates/user_ldap.pot +++ b/l10n/templates/user_ldap.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-11 01:54-0400\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -335,7 +335,7 @@ msgid "Only connect to the replica server." msgstr "" #: templates/settings.php:26 -msgid "Case insensitve LDAP server (Windows)" +msgid "Case insensitive LDAP server (Windows)" msgstr "" #: templates/settings.php:27 diff --git a/l10n/templates/user_webdavauth.pot b/l10n/templates/user_webdavauth.pot index e858ef7740c..25424884d02 100644 --- a/l10n/templates/user_webdavauth.pot +++ b/l10n/templates/user_webdavauth.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-11 01:54-0400\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/th_TH/settings.po b/l10n/th_TH/settings.po index 050e1588f9d..8e0b4bf03ec 100644 --- a/l10n/th_TH/settings.po +++ b/l10n/th_TH/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-03-26 01:55-0400\n" -"PO-Revision-Date: 2014-03-26 05:55+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159 +#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149 msgid "Encryption" msgstr "การเข้ารหัส" @@ -64,7 +64,7 @@ msgid "Unable to load list from App Store" msgstr "ไม่สามารถโหลดรายการจาก App Store ได้" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 changepassword/controller.php:55 +#: ajax/togglegroups.php:20 changepassword/controller.php:49 msgid "Authentication error" msgstr "เกิดข้อผิดพลาดในสิทธิ์การเข้าใช้งาน" @@ -84,6 +84,20 @@ msgstr "มีกลุ่มดังกล่าวอยู่ในระบ msgid "Unable to add group" msgstr "ไม่สามารถเพิ่มกลุ่มได้" +#: ajax/decryptall.php:31 +msgid "Files decrypted successfully" +msgstr "" + +#: ajax/decryptall.php:33 +msgid "" +"Couldn't decrypt your files, please check your owncloud.log or ask your " +"administrator" +msgstr "" + +#: ajax/decryptall.php:36 +msgid "Couldn't decrypt your files, check your password and try again" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "อีเมลถูกบันทึกแล้ว" @@ -126,32 +140,32 @@ msgstr "ไม่สามารถลบผู้ใช้งานออกจ msgid "Couldn't update app." msgstr "ไม่สามารถอัพเดทแอปฯ" -#: changepassword/controller.php:20 +#: changepassword/controller.php:17 msgid "Wrong password" msgstr "" -#: changepassword/controller.php:42 +#: changepassword/controller.php:36 msgid "No user supplied" msgstr "" -#: changepassword/controller.php:74 +#: changepassword/controller.php:68 msgid "" "Please provide an admin recovery password, otherwise all user data will be " "lost" msgstr "" -#: changepassword/controller.php:79 +#: changepassword/controller.php:73 msgid "" "Wrong admin recovery password. Please check the password and try again." msgstr "" -#: changepassword/controller.php:87 +#: changepassword/controller.php:81 msgid "" "Back-end doesn't support password change, but the users encryption key was " "successfully updated." msgstr "" -#: changepassword/controller.php:92 changepassword/controller.php:103 +#: changepassword/controller.php:86 changepassword/controller.php:97 msgid "Unable to change password" msgstr "" @@ -203,7 +217,7 @@ msgstr "เกิดข้อผิดพลาดในระหว่างก msgid "Error" msgstr "ข้อผิดพลาด" -#: js/apps.js:153 templates/apps.php:54 +#: js/apps.js:153 templates/apps.php:55 msgid "Update" msgstr "อัพเดท" @@ -211,31 +225,31 @@ msgstr "อัพเดท" msgid "Updated" msgstr "อัพเดทแล้ว" -#: js/personal.js:246 +#: js/personal.js:243 msgid "Select a profile picture" msgstr "" -#: js/personal.js:277 +#: js/personal.js:274 msgid "Very weak password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:275 msgid "Weak password" msgstr "" -#: js/personal.js:279 +#: js/personal.js:276 msgid "So-so password" msgstr "" -#: js/personal.js:280 +#: js/personal.js:277 msgid "Good password" msgstr "" -#: js/personal.js:281 +#: js/personal.js:278 msgid "Strong password" msgstr "" -#: js/personal.js:316 +#: js/personal.js:313 msgid "Decrypting files... Please wait, this can take some time." msgstr "" @@ -284,7 +298,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:49 personal.php:50 +#: personal.php:48 personal.php:49 msgid "__language_name__" msgstr "ภาษาไทย" @@ -589,11 +603,11 @@ msgstr "มาก" msgid "Less" msgstr "น้อย" -#: templates/admin.php:416 templates/personal.php:181 +#: templates/admin.php:416 templates/personal.php:171 msgid "Version" msgstr "รุ่น" -#: templates/admin.php:420 templates/personal.php:184 +#: templates/admin.php:420 templates/personal.php:174 msgid "" "Developed by the ownCloud community, the -licensed by " msgstr "-ลิขสิทธิ์การใช้งานโดย " @@ -664,108 +678,108 @@ msgstr "แสดงหน้าจอวิซาร์ดนำทางคร msgid "You have used %s of the available %s" msgstr "คุณได้ใช้งานไปแล้ว %s จากจำนวนที่สามารถใช้ได้ %s" -#: templates/personal.php:39 templates/users.php:21 templates/users.php:87 +#: templates/personal.php:38 templates/users.php:21 templates/users.php:87 msgid "Password" msgstr "รหัสผ่าน" -#: templates/personal.php:40 +#: templates/personal.php:39 msgid "Your password was changed" msgstr "รหัสผ่านของคุณถูกเปลี่ยนแล้ว" -#: templates/personal.php:41 +#: templates/personal.php:40 msgid "Unable to change your password" msgstr "ไม่สามารถเปลี่ยนรหัสผ่านของคุณได้" -#: templates/personal.php:43 +#: templates/personal.php:42 msgid "Current password" msgstr "รหัสผ่านปัจจุบัน" -#: templates/personal.php:46 +#: templates/personal.php:45 msgid "New password" msgstr "รหัสผ่านใหม่" -#: templates/personal.php:50 +#: templates/personal.php:49 msgid "Change password" msgstr "เปลี่ยนรหัสผ่าน" -#: templates/personal.php:64 templates/users.php:86 +#: templates/personal.php:61 templates/users.php:86 msgid "Full Name" msgstr "" -#: templates/personal.php:81 +#: templates/personal.php:76 msgid "Email" msgstr "อีเมล" -#: templates/personal.php:83 +#: templates/personal.php:78 msgid "Your email address" msgstr "ที่อยู่อีเมล์ของคุณ" -#: templates/personal.php:86 +#: templates/personal.php:81 msgid "" "Fill in an email address to enable password recovery and receive " "notifications" msgstr "" -#: templates/personal.php:96 +#: templates/personal.php:89 msgid "Profile picture" msgstr "รูปภาพโปรไฟล์" -#: templates/personal.php:101 +#: templates/personal.php:94 msgid "Upload new" msgstr "" -#: templates/personal.php:103 +#: templates/personal.php:96 msgid "Select new from Files" msgstr "" -#: templates/personal.php:104 +#: templates/personal.php:97 msgid "Remove image" msgstr "" -#: templates/personal.php:105 +#: templates/personal.php:98 msgid "Either png or jpg. Ideally square but you will be able to crop it." msgstr "" -#: templates/personal.php:107 +#: templates/personal.php:100 msgid "Your avatar is provided by your original account." msgstr "" -#: templates/personal.php:111 +#: templates/personal.php:104 msgid "Cancel" msgstr "ยกเลิก" -#: templates/personal.php:112 +#: templates/personal.php:105 msgid "Choose as profile image" msgstr "" -#: templates/personal.php:120 templates/personal.php:121 +#: templates/personal.php:111 templates/personal.php:112 msgid "Language" msgstr "ภาษา" -#: templates/personal.php:140 +#: templates/personal.php:131 msgid "Help translate" msgstr "ช่วยกันแปล" -#: templates/personal.php:147 +#: templates/personal.php:137 msgid "WebDAV" msgstr "WebDAV" -#: templates/personal.php:149 +#: templates/personal.php:139 #, php-format msgid "" "Use this address to access your Files via " "WebDAV" msgstr "" -#: templates/personal.php:161 +#: templates/personal.php:151 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:167 +#: templates/personal.php:157 msgid "Log-in password" msgstr "" -#: templates/personal.php:172 +#: templates/personal.php:162 msgid "Decrypt all Files" msgstr "" diff --git a/l10n/th_TH/user_ldap.po b/l10n/th_TH/user_ldap.po index 1dd27e0b070..bf395b92e17 100644 --- a/l10n/th_TH/user_ldap.po +++ b/l10n/th_TH/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-08 01:56-0400\n" -"PO-Revision-Date: 2014-04-08 05:56+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:55+0000\n" "Last-Translator: I Robot\n" "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n" "MIME-Version: 1.0\n" @@ -142,7 +142,7 @@ msgstr[0] "" msgid "Invalid Host" msgstr "" -#: lib/wizard.php:963 +#: lib/wizard.php:983 msgid "Could not find the desired feature" msgstr "" @@ -333,8 +333,8 @@ msgid "Only connect to the replica server." msgstr "" #: templates/settings.php:26 -msgid "Case insensitve LDAP server (Windows)" -msgstr "เซิร์ฟเวอร์ LDAP ประเภท Case insensitive (วินโดวส์)" +msgid "Case insensitive LDAP server (Windows)" +msgstr "" #: templates/settings.php:27 msgid "Turn off SSL certificate validation." diff --git a/l10n/tr/lib.po b/l10n/tr/lib.po index f067d809632..fa1e63236ea 100644 --- a/l10n/tr/lib.po +++ b/l10n/tr/lib.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-10 01:54-0400\n" -"PO-Revision-Date: 2014-04-09 21:00+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-11 14:15+0000\n" "Last-Translator: volkangezer \n" "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n" "MIME-Version: 1.0\n" @@ -199,7 +199,7 @@ msgstr "MS SQL kullanıcı adı ve/veya parolası geçersiz: %s" #: private/setup/oci.php:114 private/setup/postgresql.php:31 #: private/setup/postgresql.php:84 msgid "You need to enter either an existing account or the administrator." -msgstr "Bir konto veya kullanici birlemek ihtiyacin. " +msgstr "Siz veya yönetici mevcut bir hesap girmeli." #: private/setup/mysql.php:12 msgid "MySQL/MariaDB username and/or password not valid" @@ -215,7 +215,7 @@ msgstr "MySQL/MariaDB kullanıcı adı ve/veya parolası geçersiz" #: private/setup/postgresql.php:139 private/setup/postgresql.php:148 #, php-format msgid "DB Error: \"%s\"" -msgstr "DB Hata: ''%s''" +msgstr "VT Hatası: \"%s\"" #: private/setup/mysql.php:68 private/setup/oci.php:55 #: private/setup/oci.php:122 private/setup/oci.php:145 @@ -226,7 +226,7 @@ msgstr "DB Hata: ''%s''" #: private/setup/postgresql.php:140 private/setup/postgresql.php:149 #, php-format msgid "Offending command was: \"%s\"" -msgstr "Komut rahasiz ''%s''. " +msgstr "Saldırgan komut: \"%s\"" #: private/setup/mysql.php:85 #, php-format @@ -252,7 +252,7 @@ msgstr "Oracle bağlantısı kurulamadı" #: private/setup/oci.php:41 private/setup/oci.php:113 msgid "Oracle username and/or password not valid" -msgstr "Adi klullanici ve/veya parola Oracle mantikli değildir. " +msgstr "Oracle kullanıcı adı ve/veya parolası geçerli değil" #: private/setup/oci.php:170 private/setup/oci.php:202 #, php-format @@ -261,15 +261,15 @@ msgstr "Hatalı komut: \"%s\", ad: %s, parola: %s" #: private/setup/postgresql.php:30 private/setup/postgresql.php:83 msgid "PostgreSQL username and/or password not valid" -msgstr "PostgreSQL adi kullanici ve/veya parola yasal degildir. " +msgstr "PostgreSQL kullanıcı adı ve/veya parolası geçerli değil" #: private/setup.php:28 msgid "Set an admin username." -msgstr "Bir adi kullanici vermek. " +msgstr "Bir yönetici kullanıcı adı ayarlayın." #: private/setup.php:31 msgid "Set an admin password." -msgstr "Parola yonetici birlemek. " +msgstr "Bir yönetici kullanıcı parolası ayarlayın." #: private/setup.php:202 msgid "" diff --git a/l10n/tr/settings.po b/l10n/tr/settings.po index 3f8e26a01f5..d69df3145be 100644 --- a/l10n/tr/settings.po +++ b/l10n/tr/settings.po @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-10 01:54-0400\n" -"PO-Revision-Date: 2014-04-09 06:10+0000\n" -"Last-Translator: volkangezer \n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:54+0000\n" +"Last-Translator: I Robot\n" "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -88,6 +88,20 @@ msgstr "Grup zaten mevcut" msgid "Unable to add group" msgstr "Gruba eklenemiyor" +#: ajax/decryptall.php:31 +msgid "Files decrypted successfully" +msgstr "" + +#: ajax/decryptall.php:33 +msgid "" +"Couldn't decrypt your files, please check your owncloud.log or ask your " +"administrator" +msgstr "" + +#: ajax/decryptall.php:36 +msgid "Couldn't decrypt your files, check your password and try again" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "E-posta kaydedildi" diff --git a/l10n/tr/user_ldap.po b/l10n/tr/user_ldap.po index 612e836a609..2617ea1b58f 100644 --- a/l10n/tr/user_ldap.po +++ b/l10n/tr/user_ldap.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-09 01:55-0400\n" -"PO-Revision-Date: 2014-04-08 23:30+0000\n" -"Last-Translator: volkangezer \n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:55+0000\n" +"Last-Translator: I Robot\n" "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -147,7 +147,7 @@ msgstr[1] "%s kullanıcı bulundu" msgid "Invalid Host" msgstr "Geçersiz Makine" -#: lib/wizard.php:963 +#: lib/wizard.php:983 msgid "Could not find the desired feature" msgstr "İstenen özellik bulunamadı" @@ -225,7 +225,7 @@ msgstr "Oturum açma girişimi olduğunda uygulanacak filtreyi tanımlar. %%uid, #: templates/part.wizard-server.php:18 msgid "Add Server Configuration" -msgstr "Sunucu Uyunlama birlemek " +msgstr "Sunucu Yapılandırması Ekle" #: templates/part.wizard-server.php:30 msgid "Host" @@ -234,7 +234,7 @@ msgstr "Sunucu" #: templates/part.wizard-server.php:31 msgid "" "You can omit the protocol, except you require SSL. Then start with ldaps://" -msgstr "Protokol atlamak edesin, sadece SSL istiyorsaniz. O zaman, idapsile baslamak. " +msgstr "SSL gerektirmediğiniz takdirde protokol belirtmeyebilirsiniz. Ardından ldaps:// ile başlayın" #: templates/part.wizard-server.php:36 msgid "Port" @@ -249,7 +249,7 @@ msgid "" "The DN of the client user with which the bind shall be done, e.g. " "uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password " "empty." -msgstr "DN musterinin, kimle baglamaya yapacagiz,meselâ uid=agent.dc mesela, dc=com Gecinme adisiz ici, DN ve Parola bos birakmak. " +msgstr "İstemci kullanıcısının yapılacağı atamanın DN'i örn. uid=agent,dc=örnek,dc=com. Anonim erişim için DN ve Parolayı boş bırakın." #: templates/part.wizard-server.php:52 msgid "Password" @@ -261,11 +261,11 @@ msgstr "Anonim erişim için DN ve Parola alanlarını boş bırakın." #: templates/part.wizard-server.php:60 msgid "One Base DN per line" -msgstr "Bir Tabani DN herbir dizi. " +msgstr "Her satırda tek bir Base DN" #: templates/part.wizard-server.php:61 msgid "You can specify Base DN for users and groups in the Advanced tab" -msgstr "Base DN kullanicileri ve kaynaklari icin tablosu Advanced tayin etmek ederiz. " +msgstr "Gelişmiş sekmesinde kullanıcılar ve gruplar için Base DN belirtebilirsiniz." #: templates/part.wizard-userfilter.php:4 #, php-format @@ -301,7 +301,7 @@ msgstr "Uyarı: user_ldap ve user_webdavauth uygulamaları uyumlu değil. msgid "" "Warning: The PHP LDAP module is not installed, the backend will not " "work. Please ask your system administrator to install it." -msgstr "Ihbar Modulu PHP LDAP yuklemdi degil, backend calismacak. Lutfen sistem yonetici sormak yuklemek icin." +msgstr "Uyarı: PHP LDAP modülü kurulu değil, arka uç çalışmayacak. Lütfen kurulumu için sistem yöneticinizle iletişime geçin." #: templates/settings.php:20 msgid "Connection Settings" @@ -313,21 +313,21 @@ msgstr "Yapılandırma Etkin" #: templates/settings.php:22 msgid "When unchecked, this configuration will be skipped." -msgstr "Ne zaman iptal, bu uynnlama isletici " +msgstr "İşaretli değilse, bu yapılandırma atlanacaktır." #: templates/settings.php:23 msgid "Backup (Replica) Host" -msgstr "Sigorta Kopya Cephe " +msgstr "Yedek (Replica) Sunucu" #: templates/settings.php:23 msgid "" "Give an optional backup host. It must be a replica of the main LDAP/AD " "server." -msgstr "Bir kopya cevre vermek, kopya sunucu onemli olmali. " +msgstr "İsteğe bağlı bir yedek sunucusu belirtin. Ana LDAP/AD sunucusunun bir kopyası olmalıdır." #: templates/settings.php:24 msgid "Backup (Replica) Port" -msgstr "Kopya Port " +msgstr "Yedek (Replica) Bağlantı Noktası" #: templates/settings.php:25 msgid "Disable Main Server" @@ -338,8 +338,8 @@ msgid "Only connect to the replica server." msgstr "Sadece kopya sunucuya bağlan." #: templates/settings.php:26 -msgid "Case insensitve LDAP server (Windows)" -msgstr "Dusme sunucu LDAP zor degil. (Windows)" +msgid "Case insensitive LDAP server (Windows)" +msgstr "" #: templates/settings.php:27 msgid "Turn off SSL certificate validation." @@ -354,7 +354,7 @@ msgstr "Önerilmez, sadece test için kullanın! Eğer bağlantı sadece bu seç #: templates/settings.php:28 msgid "Cache Time-To-Live" -msgstr "Cache Time-To-Live " +msgstr "Önbellek Time-To-Live Değeri" #: templates/settings.php:28 msgid "in seconds. A change empties the cache." @@ -362,11 +362,11 @@ msgstr "saniye cinsinden. Bir değişiklik önbelleği temizleyecektir." #: templates/settings.php:30 msgid "Directory Settings" -msgstr "Parametrar Listesin Adresinin " +msgstr "Dizin Ayarları" #: templates/settings.php:32 msgid "User Display Name Field" -msgstr "Ekran Adi Kullanici, (Alan Adi Kullanici Ekrane)" +msgstr "Kullanıcı Görünen Ad Alanı" #: templates/settings.php:32 msgid "The LDAP attribute to use to generate the user's display name." @@ -378,11 +378,11 @@ msgstr "Temel Kullanıcı Ağacı" #: templates/settings.php:33 msgid "One User Base DN per line" -msgstr "Bir Temel Kullanici DN her dizgi " +msgstr "Her satırda Tek Kullanıcı Base DN'i" #: templates/settings.php:34 msgid "User Search Attributes" -msgstr "Kategorii Arama Kullanici " +msgstr "Kullanıcı Arama Nitelikleri" #: templates/settings.php:34 templates/settings.php:37 msgid "Optional; one attribute per line" @@ -390,7 +390,7 @@ msgstr "Tercihe bağlı; her bir satırda bir öznitelik" #: templates/settings.php:35 msgid "Group Display Name Field" -msgstr "Grub Ekrane Alani Adi" +msgstr "Grup Görünen Ad Alanı" #: templates/settings.php:35 msgid "The LDAP attribute to use to generate the groups's display name." @@ -402,11 +402,11 @@ msgstr "Temel Grup Ağacı" #: templates/settings.php:36 msgid "One Group Base DN per line" -msgstr "Bir Grubu Tabani DN her dizgi. " +msgstr "Her satırda Tek Grup Base DN'i" #: templates/settings.php:37 msgid "Group Search Attributes" -msgstr "Kategorii Arama Grubu" +msgstr "Grup Arama Nitelikleri" #: templates/settings.php:38 msgid "Group-Member association" diff --git a/l10n/tzm/settings.po b/l10n/tzm/settings.po index c8ed5177a5a..614dba76775 100644 --- a/l10n/tzm/settings.po +++ b/l10n/tzm/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-03-26 01:55-0400\n" -"PO-Revision-Date: 2014-03-26 05:55+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Central Atlas Tamazight (http://www.transifex.com/projects/p/owncloud/language/tzm/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159 +#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149 msgid "Encryption" msgstr "" @@ -64,7 +64,7 @@ msgid "Unable to load list from App Store" msgstr "" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 changepassword/controller.php:55 +#: ajax/togglegroups.php:20 changepassword/controller.php:49 msgid "Authentication error" msgstr "" @@ -84,6 +84,20 @@ msgstr "" msgid "Unable to add group" msgstr "" +#: ajax/decryptall.php:31 +msgid "Files decrypted successfully" +msgstr "" + +#: ajax/decryptall.php:33 +msgid "" +"Couldn't decrypt your files, please check your owncloud.log or ask your " +"administrator" +msgstr "" + +#: ajax/decryptall.php:36 +msgid "Couldn't decrypt your files, check your password and try again" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -126,32 +140,32 @@ msgstr "" msgid "Couldn't update app." msgstr "" -#: changepassword/controller.php:20 +#: changepassword/controller.php:17 msgid "Wrong password" msgstr "" -#: changepassword/controller.php:42 +#: changepassword/controller.php:36 msgid "No user supplied" msgstr "" -#: changepassword/controller.php:74 +#: changepassword/controller.php:68 msgid "" "Please provide an admin recovery password, otherwise all user data will be " "lost" msgstr "" -#: changepassword/controller.php:79 +#: changepassword/controller.php:73 msgid "" "Wrong admin recovery password. Please check the password and try again." msgstr "" -#: changepassword/controller.php:87 +#: changepassword/controller.php:81 msgid "" "Back-end doesn't support password change, but the users encryption key was " "successfully updated." msgstr "" -#: changepassword/controller.php:92 changepassword/controller.php:103 +#: changepassword/controller.php:86 changepassword/controller.php:97 msgid "Unable to change password" msgstr "" @@ -203,7 +217,7 @@ msgstr "" msgid "Error" msgstr "" -#: js/apps.js:153 templates/apps.php:54 +#: js/apps.js:153 templates/apps.php:55 msgid "Update" msgstr "" @@ -211,31 +225,31 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:246 +#: js/personal.js:243 msgid "Select a profile picture" msgstr "" -#: js/personal.js:277 +#: js/personal.js:274 msgid "Very weak password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:275 msgid "Weak password" msgstr "" -#: js/personal.js:279 +#: js/personal.js:276 msgid "So-so password" msgstr "" -#: js/personal.js:280 +#: js/personal.js:277 msgid "Good password" msgstr "" -#: js/personal.js:281 +#: js/personal.js:278 msgid "Strong password" msgstr "" -#: js/personal.js:316 +#: js/personal.js:313 msgid "Decrypting files... Please wait, this can take some time." msgstr "" @@ -284,7 +298,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:49 personal.php:50 +#: personal.php:48 personal.php:49 msgid "__language_name__" msgstr "" @@ -589,11 +603,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:416 templates/personal.php:181 +#: templates/admin.php:416 templates/personal.php:171 msgid "Version" msgstr "" -#: templates/admin.php:420 templates/personal.php:184 +#: templates/admin.php:420 templates/personal.php:174 msgid "" "Developed by the ownCloud community, the -licensed by " msgstr "" @@ -664,108 +678,108 @@ msgstr "" msgid "You have used %s of the available %s" msgstr "" -#: templates/personal.php:39 templates/users.php:21 templates/users.php:87 +#: templates/personal.php:38 templates/users.php:21 templates/users.php:87 msgid "Password" msgstr "" -#: templates/personal.php:40 +#: templates/personal.php:39 msgid "Your password was changed" msgstr "" -#: templates/personal.php:41 +#: templates/personal.php:40 msgid "Unable to change your password" msgstr "" -#: templates/personal.php:43 +#: templates/personal.php:42 msgid "Current password" msgstr "" -#: templates/personal.php:46 +#: templates/personal.php:45 msgid "New password" msgstr "" -#: templates/personal.php:50 +#: templates/personal.php:49 msgid "Change password" msgstr "" -#: templates/personal.php:64 templates/users.php:86 +#: templates/personal.php:61 templates/users.php:86 msgid "Full Name" msgstr "" -#: templates/personal.php:81 +#: templates/personal.php:76 msgid "Email" msgstr "" -#: templates/personal.php:83 +#: templates/personal.php:78 msgid "Your email address" msgstr "" -#: templates/personal.php:86 +#: templates/personal.php:81 msgid "" "Fill in an email address to enable password recovery and receive " "notifications" msgstr "" -#: templates/personal.php:96 +#: templates/personal.php:89 msgid "Profile picture" msgstr "" -#: templates/personal.php:101 +#: templates/personal.php:94 msgid "Upload new" msgstr "" -#: templates/personal.php:103 +#: templates/personal.php:96 msgid "Select new from Files" msgstr "" -#: templates/personal.php:104 +#: templates/personal.php:97 msgid "Remove image" msgstr "" -#: templates/personal.php:105 +#: templates/personal.php:98 msgid "Either png or jpg. Ideally square but you will be able to crop it." msgstr "" -#: templates/personal.php:107 +#: templates/personal.php:100 msgid "Your avatar is provided by your original account." msgstr "" -#: templates/personal.php:111 +#: templates/personal.php:104 msgid "Cancel" msgstr "" -#: templates/personal.php:112 +#: templates/personal.php:105 msgid "Choose as profile image" msgstr "" -#: templates/personal.php:120 templates/personal.php:121 +#: templates/personal.php:111 templates/personal.php:112 msgid "Language" msgstr "" -#: templates/personal.php:140 +#: templates/personal.php:131 msgid "Help translate" msgstr "" -#: templates/personal.php:147 +#: templates/personal.php:137 msgid "WebDAV" msgstr "" -#: templates/personal.php:149 +#: templates/personal.php:139 #, php-format msgid "" "Use this address to access your Files via " "WebDAV" msgstr "" -#: templates/personal.php:161 +#: templates/personal.php:151 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:167 +#: templates/personal.php:157 msgid "Log-in password" msgstr "" -#: templates/personal.php:172 +#: templates/personal.php:162 msgid "Decrypt all Files" msgstr "" diff --git a/l10n/tzm/user_ldap.po b/l10n/tzm/user_ldap.po index 33f053cd3f6..3a134d5e973 100644 --- a/l10n/tzm/user_ldap.po +++ b/l10n/tzm/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-08 01:56-0400\n" -"PO-Revision-Date: 2014-04-08 05:56+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:55+0000\n" "Last-Translator: I Robot\n" "Language-Team: Central Atlas Tamazight (http://www.transifex.com/projects/p/owncloud/language/tzm/)\n" "MIME-Version: 1.0\n" @@ -144,7 +144,7 @@ msgstr[1] "" msgid "Invalid Host" msgstr "" -#: lib/wizard.php:963 +#: lib/wizard.php:983 msgid "Could not find the desired feature" msgstr "" @@ -335,7 +335,7 @@ msgid "Only connect to the replica server." msgstr "" #: templates/settings.php:26 -msgid "Case insensitve LDAP server (Windows)" +msgid "Case insensitive LDAP server (Windows)" msgstr "" #: templates/settings.php:27 diff --git a/l10n/ug/settings.po b/l10n/ug/settings.po index 384a913c7f0..cea36863190 100644 --- a/l10n/ug/settings.po +++ b/l10n/ug/settings.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-10 01:54-0400\n" -"PO-Revision-Date: 2014-04-09 06:10+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Uighur (http://www.transifex.com/projects/p/owncloud/language/ug/)\n" "MIME-Version: 1.0\n" @@ -85,6 +85,20 @@ msgstr "گۇرۇپپا مەۋجۇت" msgid "Unable to add group" msgstr "گۇرۇپپا قوشقىلى بولمايدۇ" +#: ajax/decryptall.php:31 +msgid "Files decrypted successfully" +msgstr "" + +#: ajax/decryptall.php:33 +msgid "" +"Couldn't decrypt your files, please check your owncloud.log or ask your " +"administrator" +msgstr "" + +#: ajax/decryptall.php:36 +msgid "Couldn't decrypt your files, check your password and try again" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "تورخەت ساقلاندى" diff --git a/l10n/ug/user_ldap.po b/l10n/ug/user_ldap.po index 31a16bcc3d1..a2512c6187a 100644 --- a/l10n/ug/user_ldap.po +++ b/l10n/ug/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-08 01:56-0400\n" -"PO-Revision-Date: 2014-04-08 05:56+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:55+0000\n" "Last-Translator: I Robot\n" "Language-Team: Uighur (http://www.transifex.com/projects/p/owncloud/language/ug/)\n" "MIME-Version: 1.0\n" @@ -142,7 +142,7 @@ msgstr[0] "" msgid "Invalid Host" msgstr "" -#: lib/wizard.php:963 +#: lib/wizard.php:983 msgid "Could not find the desired feature" msgstr "" @@ -333,7 +333,7 @@ msgid "Only connect to the replica server." msgstr "" #: templates/settings.php:26 -msgid "Case insensitve LDAP server (Windows)" +msgid "Case insensitive LDAP server (Windows)" msgstr "" #: templates/settings.php:27 diff --git a/l10n/uk/settings.po b/l10n/uk/settings.po index 5408c4789aa..79039c8f7df 100644 --- a/l10n/uk/settings.po +++ b/l10n/uk/settings.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-10 01:54-0400\n" -"PO-Revision-Date: 2014-04-09 06:10+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n" "MIME-Version: 1.0\n" @@ -85,6 +85,20 @@ msgstr "Група вже існує" msgid "Unable to add group" msgstr "Не вдалося додати групу" +#: ajax/decryptall.php:31 +msgid "Files decrypted successfully" +msgstr "" + +#: ajax/decryptall.php:33 +msgid "" +"Couldn't decrypt your files, please check your owncloud.log or ask your " +"administrator" +msgstr "" + +#: ajax/decryptall.php:36 +msgid "Couldn't decrypt your files, check your password and try again" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "Адресу збережено" diff --git a/l10n/uk/user_ldap.po b/l10n/uk/user_ldap.po index 189454a8bba..dd1dd64f7db 100644 --- a/l10n/uk/user_ldap.po +++ b/l10n/uk/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-08 01:56-0400\n" -"PO-Revision-Date: 2014-04-08 05:56+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:55+0000\n" "Last-Translator: I Robot\n" "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n" "MIME-Version: 1.0\n" @@ -146,7 +146,7 @@ msgstr[2] "" msgid "Invalid Host" msgstr "" -#: lib/wizard.php:963 +#: lib/wizard.php:983 msgid "Could not find the desired feature" msgstr "" @@ -337,8 +337,8 @@ msgid "Only connect to the replica server." msgstr "" #: templates/settings.php:26 -msgid "Case insensitve LDAP server (Windows)" -msgstr "Нечутливий до регістру LDAP сервер (Windows)" +msgid "Case insensitive LDAP server (Windows)" +msgstr "" #: templates/settings.php:27 msgid "Turn off SSL certificate validation." diff --git a/l10n/ur/settings.po b/l10n/ur/settings.po index 4461002aca5..ce88154e1b7 100644 --- a/l10n/ur/settings.po +++ b/l10n/ur/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-03-26 01:55-0400\n" -"PO-Revision-Date: 2014-03-26 05:55+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Urdu (http://www.transifex.com/projects/p/owncloud/language/ur/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159 +#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149 msgid "Encryption" msgstr "" @@ -64,7 +64,7 @@ msgid "Unable to load list from App Store" msgstr "" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 changepassword/controller.php:55 +#: ajax/togglegroups.php:20 changepassword/controller.php:49 msgid "Authentication error" msgstr "" @@ -84,6 +84,20 @@ msgstr "" msgid "Unable to add group" msgstr "" +#: ajax/decryptall.php:31 +msgid "Files decrypted successfully" +msgstr "" + +#: ajax/decryptall.php:33 +msgid "" +"Couldn't decrypt your files, please check your owncloud.log or ask your " +"administrator" +msgstr "" + +#: ajax/decryptall.php:36 +msgid "Couldn't decrypt your files, check your password and try again" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -126,32 +140,32 @@ msgstr "" msgid "Couldn't update app." msgstr "" -#: changepassword/controller.php:20 +#: changepassword/controller.php:17 msgid "Wrong password" msgstr "" -#: changepassword/controller.php:42 +#: changepassword/controller.php:36 msgid "No user supplied" msgstr "" -#: changepassword/controller.php:74 +#: changepassword/controller.php:68 msgid "" "Please provide an admin recovery password, otherwise all user data will be " "lost" msgstr "" -#: changepassword/controller.php:79 +#: changepassword/controller.php:73 msgid "" "Wrong admin recovery password. Please check the password and try again." msgstr "" -#: changepassword/controller.php:87 +#: changepassword/controller.php:81 msgid "" "Back-end doesn't support password change, but the users encryption key was " "successfully updated." msgstr "" -#: changepassword/controller.php:92 changepassword/controller.php:103 +#: changepassword/controller.php:86 changepassword/controller.php:97 msgid "Unable to change password" msgstr "" @@ -203,7 +217,7 @@ msgstr "" msgid "Error" msgstr "" -#: js/apps.js:153 templates/apps.php:54 +#: js/apps.js:153 templates/apps.php:55 msgid "Update" msgstr "" @@ -211,31 +225,31 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:246 +#: js/personal.js:243 msgid "Select a profile picture" msgstr "" -#: js/personal.js:277 +#: js/personal.js:274 msgid "Very weak password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:275 msgid "Weak password" msgstr "" -#: js/personal.js:279 +#: js/personal.js:276 msgid "So-so password" msgstr "" -#: js/personal.js:280 +#: js/personal.js:277 msgid "Good password" msgstr "" -#: js/personal.js:281 +#: js/personal.js:278 msgid "Strong password" msgstr "" -#: js/personal.js:316 +#: js/personal.js:313 msgid "Decrypting files... Please wait, this can take some time." msgstr "" @@ -284,7 +298,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:49 personal.php:50 +#: personal.php:48 personal.php:49 msgid "__language_name__" msgstr "" @@ -589,11 +603,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:416 templates/personal.php:181 +#: templates/admin.php:416 templates/personal.php:171 msgid "Version" msgstr "" -#: templates/admin.php:420 templates/personal.php:184 +#: templates/admin.php:420 templates/personal.php:174 msgid "" "Developed by the ownCloud community, the -licensed by " msgstr "" @@ -664,108 +678,108 @@ msgstr "" msgid "You have used %s of the available %s" msgstr "" -#: templates/personal.php:39 templates/users.php:21 templates/users.php:87 +#: templates/personal.php:38 templates/users.php:21 templates/users.php:87 msgid "Password" msgstr "" -#: templates/personal.php:40 +#: templates/personal.php:39 msgid "Your password was changed" msgstr "" -#: templates/personal.php:41 +#: templates/personal.php:40 msgid "Unable to change your password" msgstr "" -#: templates/personal.php:43 +#: templates/personal.php:42 msgid "Current password" msgstr "" -#: templates/personal.php:46 +#: templates/personal.php:45 msgid "New password" msgstr "" -#: templates/personal.php:50 +#: templates/personal.php:49 msgid "Change password" msgstr "" -#: templates/personal.php:64 templates/users.php:86 +#: templates/personal.php:61 templates/users.php:86 msgid "Full Name" msgstr "" -#: templates/personal.php:81 +#: templates/personal.php:76 msgid "Email" msgstr "" -#: templates/personal.php:83 +#: templates/personal.php:78 msgid "Your email address" msgstr "" -#: templates/personal.php:86 +#: templates/personal.php:81 msgid "" "Fill in an email address to enable password recovery and receive " "notifications" msgstr "" -#: templates/personal.php:96 +#: templates/personal.php:89 msgid "Profile picture" msgstr "" -#: templates/personal.php:101 +#: templates/personal.php:94 msgid "Upload new" msgstr "" -#: templates/personal.php:103 +#: templates/personal.php:96 msgid "Select new from Files" msgstr "" -#: templates/personal.php:104 +#: templates/personal.php:97 msgid "Remove image" msgstr "" -#: templates/personal.php:105 +#: templates/personal.php:98 msgid "Either png or jpg. Ideally square but you will be able to crop it." msgstr "" -#: templates/personal.php:107 +#: templates/personal.php:100 msgid "Your avatar is provided by your original account." msgstr "" -#: templates/personal.php:111 +#: templates/personal.php:104 msgid "Cancel" msgstr "" -#: templates/personal.php:112 +#: templates/personal.php:105 msgid "Choose as profile image" msgstr "" -#: templates/personal.php:120 templates/personal.php:121 +#: templates/personal.php:111 templates/personal.php:112 msgid "Language" msgstr "" -#: templates/personal.php:140 +#: templates/personal.php:131 msgid "Help translate" msgstr "" -#: templates/personal.php:147 +#: templates/personal.php:137 msgid "WebDAV" msgstr "" -#: templates/personal.php:149 +#: templates/personal.php:139 #, php-format msgid "" "Use this address to access your Files via " "WebDAV" msgstr "" -#: templates/personal.php:161 +#: templates/personal.php:151 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:167 +#: templates/personal.php:157 msgid "Log-in password" msgstr "" -#: templates/personal.php:172 +#: templates/personal.php:162 msgid "Decrypt all Files" msgstr "" diff --git a/l10n/ur/user_ldap.po b/l10n/ur/user_ldap.po index 5cac65d044b..1483a29d7a1 100644 --- a/l10n/ur/user_ldap.po +++ b/l10n/ur/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-08 01:56-0400\n" -"PO-Revision-Date: 2014-04-08 05:56+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:55+0000\n" "Last-Translator: I Robot\n" "Language-Team: Urdu (http://www.transifex.com/projects/p/owncloud/language/ur/)\n" "MIME-Version: 1.0\n" @@ -144,7 +144,7 @@ msgstr[1] "" msgid "Invalid Host" msgstr "" -#: lib/wizard.php:963 +#: lib/wizard.php:983 msgid "Could not find the desired feature" msgstr "" @@ -335,7 +335,7 @@ msgid "Only connect to the replica server." msgstr "" #: templates/settings.php:26 -msgid "Case insensitve LDAP server (Windows)" +msgid "Case insensitive LDAP server (Windows)" msgstr "" #: templates/settings.php:27 diff --git a/l10n/ur_PK/settings.po b/l10n/ur_PK/settings.po index 302512f11a2..bb3d35d7437 100644 --- a/l10n/ur_PK/settings.po +++ b/l10n/ur_PK/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-03-26 01:55-0400\n" -"PO-Revision-Date: 2014-03-26 05:55+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159 +#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149 msgid "Encryption" msgstr "" @@ -64,7 +64,7 @@ msgid "Unable to load list from App Store" msgstr "" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 changepassword/controller.php:55 +#: ajax/togglegroups.php:20 changepassword/controller.php:49 msgid "Authentication error" msgstr "" @@ -84,6 +84,20 @@ msgstr "" msgid "Unable to add group" msgstr "" +#: ajax/decryptall.php:31 +msgid "Files decrypted successfully" +msgstr "" + +#: ajax/decryptall.php:33 +msgid "" +"Couldn't decrypt your files, please check your owncloud.log or ask your " +"administrator" +msgstr "" + +#: ajax/decryptall.php:36 +msgid "Couldn't decrypt your files, check your password and try again" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -126,32 +140,32 @@ msgstr "" msgid "Couldn't update app." msgstr "" -#: changepassword/controller.php:20 +#: changepassword/controller.php:17 msgid "Wrong password" msgstr "" -#: changepassword/controller.php:42 +#: changepassword/controller.php:36 msgid "No user supplied" msgstr "" -#: changepassword/controller.php:74 +#: changepassword/controller.php:68 msgid "" "Please provide an admin recovery password, otherwise all user data will be " "lost" msgstr "" -#: changepassword/controller.php:79 +#: changepassword/controller.php:73 msgid "" "Wrong admin recovery password. Please check the password and try again." msgstr "" -#: changepassword/controller.php:87 +#: changepassword/controller.php:81 msgid "" "Back-end doesn't support password change, but the users encryption key was " "successfully updated." msgstr "" -#: changepassword/controller.php:92 changepassword/controller.php:103 +#: changepassword/controller.php:86 changepassword/controller.php:97 msgid "Unable to change password" msgstr "" @@ -203,7 +217,7 @@ msgstr "" msgid "Error" msgstr "ایرر" -#: js/apps.js:153 templates/apps.php:54 +#: js/apps.js:153 templates/apps.php:55 msgid "Update" msgstr "" @@ -211,31 +225,31 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:246 +#: js/personal.js:243 msgid "Select a profile picture" msgstr "" -#: js/personal.js:277 +#: js/personal.js:274 msgid "Very weak password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:275 msgid "Weak password" msgstr "" -#: js/personal.js:279 +#: js/personal.js:276 msgid "So-so password" msgstr "" -#: js/personal.js:280 +#: js/personal.js:277 msgid "Good password" msgstr "" -#: js/personal.js:281 +#: js/personal.js:278 msgid "Strong password" msgstr "" -#: js/personal.js:316 +#: js/personal.js:313 msgid "Decrypting files... Please wait, this can take some time." msgstr "" @@ -284,7 +298,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:49 personal.php:50 +#: personal.php:48 personal.php:49 msgid "__language_name__" msgstr "" @@ -589,11 +603,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:416 templates/personal.php:181 +#: templates/admin.php:416 templates/personal.php:171 msgid "Version" msgstr "" -#: templates/admin.php:420 templates/personal.php:184 +#: templates/admin.php:420 templates/personal.php:174 msgid "" "Developed by the ownCloud community, the -licensed by " msgstr "" @@ -664,108 +678,108 @@ msgstr "" msgid "You have used %s of the available %s" msgstr "" -#: templates/personal.php:39 templates/users.php:21 templates/users.php:87 +#: templates/personal.php:38 templates/users.php:21 templates/users.php:87 msgid "Password" msgstr "پاسورڈ" -#: templates/personal.php:40 +#: templates/personal.php:39 msgid "Your password was changed" msgstr "" -#: templates/personal.php:41 +#: templates/personal.php:40 msgid "Unable to change your password" msgstr "" -#: templates/personal.php:43 +#: templates/personal.php:42 msgid "Current password" msgstr "" -#: templates/personal.php:46 +#: templates/personal.php:45 msgid "New password" msgstr "نیا پاسورڈ" -#: templates/personal.php:50 +#: templates/personal.php:49 msgid "Change password" msgstr "" -#: templates/personal.php:64 templates/users.php:86 +#: templates/personal.php:61 templates/users.php:86 msgid "Full Name" msgstr "" -#: templates/personal.php:81 +#: templates/personal.php:76 msgid "Email" msgstr "" -#: templates/personal.php:83 +#: templates/personal.php:78 msgid "Your email address" msgstr "" -#: templates/personal.php:86 +#: templates/personal.php:81 msgid "" "Fill in an email address to enable password recovery and receive " "notifications" msgstr "" -#: templates/personal.php:96 +#: templates/personal.php:89 msgid "Profile picture" msgstr "" -#: templates/personal.php:101 +#: templates/personal.php:94 msgid "Upload new" msgstr "" -#: templates/personal.php:103 +#: templates/personal.php:96 msgid "Select new from Files" msgstr "" -#: templates/personal.php:104 +#: templates/personal.php:97 msgid "Remove image" msgstr "" -#: templates/personal.php:105 +#: templates/personal.php:98 msgid "Either png or jpg. Ideally square but you will be able to crop it." msgstr "" -#: templates/personal.php:107 +#: templates/personal.php:100 msgid "Your avatar is provided by your original account." msgstr "" -#: templates/personal.php:111 +#: templates/personal.php:104 msgid "Cancel" msgstr "منسوخ کریں" -#: templates/personal.php:112 +#: templates/personal.php:105 msgid "Choose as profile image" msgstr "" -#: templates/personal.php:120 templates/personal.php:121 +#: templates/personal.php:111 templates/personal.php:112 msgid "Language" msgstr "" -#: templates/personal.php:140 +#: templates/personal.php:131 msgid "Help translate" msgstr "" -#: templates/personal.php:147 +#: templates/personal.php:137 msgid "WebDAV" msgstr "" -#: templates/personal.php:149 +#: templates/personal.php:139 #, php-format msgid "" "Use this address to access your Files via " "WebDAV" msgstr "" -#: templates/personal.php:161 +#: templates/personal.php:151 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:167 +#: templates/personal.php:157 msgid "Log-in password" msgstr "" -#: templates/personal.php:172 +#: templates/personal.php:162 msgid "Decrypt all Files" msgstr "" diff --git a/l10n/ur_PK/user_ldap.po b/l10n/ur_PK/user_ldap.po index 7fcccee2a11..8e90c3b5bc8 100644 --- a/l10n/ur_PK/user_ldap.po +++ b/l10n/ur_PK/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-08 01:56-0400\n" -"PO-Revision-Date: 2014-04-08 05:56+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:55+0000\n" "Last-Translator: I Robot\n" "Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n" "MIME-Version: 1.0\n" @@ -144,7 +144,7 @@ msgstr[1] "" msgid "Invalid Host" msgstr "" -#: lib/wizard.php:963 +#: lib/wizard.php:983 msgid "Could not find the desired feature" msgstr "" @@ -335,7 +335,7 @@ msgid "Only connect to the replica server." msgstr "" #: templates/settings.php:26 -msgid "Case insensitve LDAP server (Windows)" +msgid "Case insensitive LDAP server (Windows)" msgstr "" #: templates/settings.php:27 diff --git a/l10n/uz/settings.po b/l10n/uz/settings.po index 0e253ad5c70..bd278d7cf08 100644 --- a/l10n/uz/settings.po +++ b/l10n/uz/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-03-26 01:55-0400\n" -"PO-Revision-Date: 2014-03-26 05:55+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Uzbek (http://www.transifex.com/projects/p/owncloud/language/uz/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159 +#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149 msgid "Encryption" msgstr "" @@ -64,7 +64,7 @@ msgid "Unable to load list from App Store" msgstr "" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 changepassword/controller.php:55 +#: ajax/togglegroups.php:20 changepassword/controller.php:49 msgid "Authentication error" msgstr "" @@ -84,6 +84,20 @@ msgstr "" msgid "Unable to add group" msgstr "" +#: ajax/decryptall.php:31 +msgid "Files decrypted successfully" +msgstr "" + +#: ajax/decryptall.php:33 +msgid "" +"Couldn't decrypt your files, please check your owncloud.log or ask your " +"administrator" +msgstr "" + +#: ajax/decryptall.php:36 +msgid "Couldn't decrypt your files, check your password and try again" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -126,32 +140,32 @@ msgstr "" msgid "Couldn't update app." msgstr "" -#: changepassword/controller.php:20 +#: changepassword/controller.php:17 msgid "Wrong password" msgstr "" -#: changepassword/controller.php:42 +#: changepassword/controller.php:36 msgid "No user supplied" msgstr "" -#: changepassword/controller.php:74 +#: changepassword/controller.php:68 msgid "" "Please provide an admin recovery password, otherwise all user data will be " "lost" msgstr "" -#: changepassword/controller.php:79 +#: changepassword/controller.php:73 msgid "" "Wrong admin recovery password. Please check the password and try again." msgstr "" -#: changepassword/controller.php:87 +#: changepassword/controller.php:81 msgid "" "Back-end doesn't support password change, but the users encryption key was " "successfully updated." msgstr "" -#: changepassword/controller.php:92 changepassword/controller.php:103 +#: changepassword/controller.php:86 changepassword/controller.php:97 msgid "Unable to change password" msgstr "" @@ -203,7 +217,7 @@ msgstr "" msgid "Error" msgstr "" -#: js/apps.js:153 templates/apps.php:54 +#: js/apps.js:153 templates/apps.php:55 msgid "Update" msgstr "" @@ -211,31 +225,31 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:246 +#: js/personal.js:243 msgid "Select a profile picture" msgstr "" -#: js/personal.js:277 +#: js/personal.js:274 msgid "Very weak password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:275 msgid "Weak password" msgstr "" -#: js/personal.js:279 +#: js/personal.js:276 msgid "So-so password" msgstr "" -#: js/personal.js:280 +#: js/personal.js:277 msgid "Good password" msgstr "" -#: js/personal.js:281 +#: js/personal.js:278 msgid "Strong password" msgstr "" -#: js/personal.js:316 +#: js/personal.js:313 msgid "Decrypting files... Please wait, this can take some time." msgstr "" @@ -284,7 +298,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:49 personal.php:50 +#: personal.php:48 personal.php:49 msgid "__language_name__" msgstr "" @@ -589,11 +603,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:416 templates/personal.php:181 +#: templates/admin.php:416 templates/personal.php:171 msgid "Version" msgstr "" -#: templates/admin.php:420 templates/personal.php:184 +#: templates/admin.php:420 templates/personal.php:174 msgid "" "Developed by the ownCloud community, the -licensed by " msgstr "" @@ -664,108 +678,108 @@ msgstr "" msgid "You have used %s of the available %s" msgstr "" -#: templates/personal.php:39 templates/users.php:21 templates/users.php:87 +#: templates/personal.php:38 templates/users.php:21 templates/users.php:87 msgid "Password" msgstr "" -#: templates/personal.php:40 +#: templates/personal.php:39 msgid "Your password was changed" msgstr "" -#: templates/personal.php:41 +#: templates/personal.php:40 msgid "Unable to change your password" msgstr "" -#: templates/personal.php:43 +#: templates/personal.php:42 msgid "Current password" msgstr "" -#: templates/personal.php:46 +#: templates/personal.php:45 msgid "New password" msgstr "" -#: templates/personal.php:50 +#: templates/personal.php:49 msgid "Change password" msgstr "" -#: templates/personal.php:64 templates/users.php:86 +#: templates/personal.php:61 templates/users.php:86 msgid "Full Name" msgstr "" -#: templates/personal.php:81 +#: templates/personal.php:76 msgid "Email" msgstr "" -#: templates/personal.php:83 +#: templates/personal.php:78 msgid "Your email address" msgstr "" -#: templates/personal.php:86 +#: templates/personal.php:81 msgid "" "Fill in an email address to enable password recovery and receive " "notifications" msgstr "" -#: templates/personal.php:96 +#: templates/personal.php:89 msgid "Profile picture" msgstr "" -#: templates/personal.php:101 +#: templates/personal.php:94 msgid "Upload new" msgstr "" -#: templates/personal.php:103 +#: templates/personal.php:96 msgid "Select new from Files" msgstr "" -#: templates/personal.php:104 +#: templates/personal.php:97 msgid "Remove image" msgstr "" -#: templates/personal.php:105 +#: templates/personal.php:98 msgid "Either png or jpg. Ideally square but you will be able to crop it." msgstr "" -#: templates/personal.php:107 +#: templates/personal.php:100 msgid "Your avatar is provided by your original account." msgstr "" -#: templates/personal.php:111 +#: templates/personal.php:104 msgid "Cancel" msgstr "" -#: templates/personal.php:112 +#: templates/personal.php:105 msgid "Choose as profile image" msgstr "" -#: templates/personal.php:120 templates/personal.php:121 +#: templates/personal.php:111 templates/personal.php:112 msgid "Language" msgstr "" -#: templates/personal.php:140 +#: templates/personal.php:131 msgid "Help translate" msgstr "" -#: templates/personal.php:147 +#: templates/personal.php:137 msgid "WebDAV" msgstr "" -#: templates/personal.php:149 +#: templates/personal.php:139 #, php-format msgid "" "Use this address to access your Files via " "WebDAV" msgstr "" -#: templates/personal.php:161 +#: templates/personal.php:151 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:167 +#: templates/personal.php:157 msgid "Log-in password" msgstr "" -#: templates/personal.php:172 +#: templates/personal.php:162 msgid "Decrypt all Files" msgstr "" diff --git a/l10n/uz/user_ldap.po b/l10n/uz/user_ldap.po index 33dee47c293..d76bcd178b7 100644 --- a/l10n/uz/user_ldap.po +++ b/l10n/uz/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-08 01:56-0400\n" -"PO-Revision-Date: 2014-04-08 05:56+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:55+0000\n" "Last-Translator: I Robot\n" "Language-Team: Uzbek (http://www.transifex.com/projects/p/owncloud/language/uz/)\n" "MIME-Version: 1.0\n" @@ -142,7 +142,7 @@ msgstr[0] "" msgid "Invalid Host" msgstr "" -#: lib/wizard.php:963 +#: lib/wizard.php:983 msgid "Could not find the desired feature" msgstr "" @@ -333,7 +333,7 @@ msgid "Only connect to the replica server." msgstr "" #: templates/settings.php:26 -msgid "Case insensitve LDAP server (Windows)" +msgid "Case insensitive LDAP server (Windows)" msgstr "" #: templates/settings.php:27 diff --git a/l10n/vi/settings.po b/l10n/vi/settings.po index fb289628500..6095c604043 100644 --- a/l10n/vi/settings.po +++ b/l10n/vi/settings.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-03-26 01:55-0400\n" -"PO-Revision-Date: 2014-03-26 05:55+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n" "MIME-Version: 1.0\n" @@ -52,7 +52,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159 +#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149 msgid "Encryption" msgstr "Mã hóa" @@ -65,7 +65,7 @@ msgid "Unable to load list from App Store" msgstr "Không thể tải danh sách ứng dụng từ App Store" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 changepassword/controller.php:55 +#: ajax/togglegroups.php:20 changepassword/controller.php:49 msgid "Authentication error" msgstr "Lỗi xác thực" @@ -85,6 +85,20 @@ msgstr "Nhóm đã tồn tại" msgid "Unable to add group" msgstr "Không thể thêm nhóm" +#: ajax/decryptall.php:31 +msgid "Files decrypted successfully" +msgstr "" + +#: ajax/decryptall.php:33 +msgid "" +"Couldn't decrypt your files, please check your owncloud.log or ask your " +"administrator" +msgstr "" + +#: ajax/decryptall.php:36 +msgid "Couldn't decrypt your files, check your password and try again" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "Lưu email" @@ -127,32 +141,32 @@ msgstr "Không thể xóa người dùng từ nhóm %s" msgid "Couldn't update app." msgstr "Không thể cập nhật ứng dụng" -#: changepassword/controller.php:20 +#: changepassword/controller.php:17 msgid "Wrong password" msgstr "" -#: changepassword/controller.php:42 +#: changepassword/controller.php:36 msgid "No user supplied" msgstr "" -#: changepassword/controller.php:74 +#: changepassword/controller.php:68 msgid "" "Please provide an admin recovery password, otherwise all user data will be " "lost" msgstr "" -#: changepassword/controller.php:79 +#: changepassword/controller.php:73 msgid "" "Wrong admin recovery password. Please check the password and try again." msgstr "" -#: changepassword/controller.php:87 +#: changepassword/controller.php:81 msgid "" "Back-end doesn't support password change, but the users encryption key was " "successfully updated." msgstr "" -#: changepassword/controller.php:92 changepassword/controller.php:103 +#: changepassword/controller.php:86 changepassword/controller.php:97 msgid "Unable to change password" msgstr "" @@ -204,7 +218,7 @@ msgstr "Lỗi khi cập nhật ứng dụng" msgid "Error" msgstr "Lỗi" -#: js/apps.js:153 templates/apps.php:54 +#: js/apps.js:153 templates/apps.php:55 msgid "Update" msgstr "Cập nhật" @@ -212,31 +226,31 @@ msgstr "Cập nhật" msgid "Updated" msgstr "Đã cập nhật" -#: js/personal.js:246 +#: js/personal.js:243 msgid "Select a profile picture" msgstr "" -#: js/personal.js:277 +#: js/personal.js:274 msgid "Very weak password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:275 msgid "Weak password" msgstr "" -#: js/personal.js:279 +#: js/personal.js:276 msgid "So-so password" msgstr "" -#: js/personal.js:280 +#: js/personal.js:277 msgid "Good password" msgstr "" -#: js/personal.js:281 +#: js/personal.js:278 msgid "Strong password" msgstr "" -#: js/personal.js:316 +#: js/personal.js:313 msgid "Decrypting files... Please wait, this can take some time." msgstr "" @@ -285,7 +299,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:49 personal.php:50 +#: personal.php:48 personal.php:49 msgid "__language_name__" msgstr "__Ngôn ngữ___" @@ -590,11 +604,11 @@ msgstr "hơn" msgid "Less" msgstr "ít" -#: templates/admin.php:416 templates/personal.php:181 +#: templates/admin.php:416 templates/personal.php:171 msgid "Version" msgstr "Phiên bản" -#: templates/admin.php:420 templates/personal.php:184 +#: templates/admin.php:420 templates/personal.php:174 msgid "" "Developed by the ownCloud community, the -licensed by " msgstr "-Giấy phép được cấp bởi " @@ -665,108 +679,108 @@ msgstr "Hiện lại việc chạy đồ thuật khởi đầu" msgid "You have used %s of the available %s" msgstr "Bạn đã sử dụng %s có sẵn %s " -#: templates/personal.php:39 templates/users.php:21 templates/users.php:87 +#: templates/personal.php:38 templates/users.php:21 templates/users.php:87 msgid "Password" msgstr "Mật khẩu" -#: templates/personal.php:40 +#: templates/personal.php:39 msgid "Your password was changed" msgstr "Mật khẩu của bạn đã được thay đổi." -#: templates/personal.php:41 +#: templates/personal.php:40 msgid "Unable to change your password" msgstr "Không thể đổi mật khẩu" -#: templates/personal.php:43 +#: templates/personal.php:42 msgid "Current password" msgstr "Mật khẩu cũ" -#: templates/personal.php:46 +#: templates/personal.php:45 msgid "New password" msgstr "Mật khẩu mới" -#: templates/personal.php:50 +#: templates/personal.php:49 msgid "Change password" msgstr "Đổi mật khẩu" -#: templates/personal.php:64 templates/users.php:86 +#: templates/personal.php:61 templates/users.php:86 msgid "Full Name" msgstr "Họ và tên" -#: templates/personal.php:81 +#: templates/personal.php:76 msgid "Email" msgstr "Email" -#: templates/personal.php:83 +#: templates/personal.php:78 msgid "Your email address" msgstr "Email của bạn" -#: templates/personal.php:86 +#: templates/personal.php:81 msgid "" "Fill in an email address to enable password recovery and receive " "notifications" msgstr "" -#: templates/personal.php:96 +#: templates/personal.php:89 msgid "Profile picture" msgstr "" -#: templates/personal.php:101 +#: templates/personal.php:94 msgid "Upload new" msgstr "Tải lên" -#: templates/personal.php:103 +#: templates/personal.php:96 msgid "Select new from Files" msgstr "" -#: templates/personal.php:104 +#: templates/personal.php:97 msgid "Remove image" msgstr "Xóa " -#: templates/personal.php:105 +#: templates/personal.php:98 msgid "Either png or jpg. Ideally square but you will be able to crop it." msgstr "" -#: templates/personal.php:107 +#: templates/personal.php:100 msgid "Your avatar is provided by your original account." msgstr "" -#: templates/personal.php:111 +#: templates/personal.php:104 msgid "Cancel" msgstr "Hủy" -#: templates/personal.php:112 +#: templates/personal.php:105 msgid "Choose as profile image" msgstr "Chọn hình ảnh như hồ sơ cá nhân" -#: templates/personal.php:120 templates/personal.php:121 +#: templates/personal.php:111 templates/personal.php:112 msgid "Language" msgstr "Ngôn ngữ" -#: templates/personal.php:140 +#: templates/personal.php:131 msgid "Help translate" msgstr "Hỗ trợ dịch thuật" -#: templates/personal.php:147 +#: templates/personal.php:137 msgid "WebDAV" msgstr "WebDAV" -#: templates/personal.php:149 +#: templates/personal.php:139 #, php-format msgid "" "Use this address to access your Files via " "WebDAV" msgstr "" -#: templates/personal.php:161 +#: templates/personal.php:151 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:167 +#: templates/personal.php:157 msgid "Log-in password" msgstr "" -#: templates/personal.php:172 +#: templates/personal.php:162 msgid "Decrypt all Files" msgstr "" diff --git a/l10n/vi/user_ldap.po b/l10n/vi/user_ldap.po index 04ba1f8caa4..5cdee3dcf77 100644 --- a/l10n/vi/user_ldap.po +++ b/l10n/vi/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-08 01:56-0400\n" -"PO-Revision-Date: 2014-04-08 05:56+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:55+0000\n" "Last-Translator: I Robot\n" "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n" "MIME-Version: 1.0\n" @@ -142,7 +142,7 @@ msgstr[0] "" msgid "Invalid Host" msgstr "" -#: lib/wizard.php:963 +#: lib/wizard.php:983 msgid "Could not find the desired feature" msgstr "" @@ -333,8 +333,8 @@ msgid "Only connect to the replica server." msgstr "" #: templates/settings.php:26 -msgid "Case insensitve LDAP server (Windows)" -msgstr "Trường hợp insensitve LDAP máy chủ (Windows)" +msgid "Case insensitive LDAP server (Windows)" +msgstr "" #: templates/settings.php:27 msgid "Turn off SSL certificate validation." diff --git a/l10n/zh_CN/settings.po b/l10n/zh_CN/settings.po index 4b19e0c792f..5ef03b66e03 100644 --- a/l10n/zh_CN/settings.po +++ b/l10n/zh_CN/settings.po @@ -14,8 +14,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-10 01:54-0400\n" -"PO-Revision-Date: 2014-04-09 06:10+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n" "MIME-Version: 1.0\n" @@ -91,6 +91,20 @@ msgstr "已存在该组" msgid "Unable to add group" msgstr "无法添加组" +#: ajax/decryptall.php:31 +msgid "Files decrypted successfully" +msgstr "" + +#: ajax/decryptall.php:33 +msgid "" +"Couldn't decrypt your files, please check your owncloud.log or ask your " +"administrator" +msgstr "" + +#: ajax/decryptall.php:36 +msgid "Couldn't decrypt your files, check your password and try again" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "电子邮件已保存" diff --git a/l10n/zh_CN/user_ldap.po b/l10n/zh_CN/user_ldap.po index d58c0a99e59..1cf0e124432 100644 --- a/l10n/zh_CN/user_ldap.po +++ b/l10n/zh_CN/user_ldap.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-08 01:56-0400\n" -"PO-Revision-Date: 2014-04-08 05:56+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:55+0000\n" "Last-Translator: I Robot\n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n" "MIME-Version: 1.0\n" @@ -144,7 +144,7 @@ msgstr[0] "" msgid "Invalid Host" msgstr "" -#: lib/wizard.php:963 +#: lib/wizard.php:983 msgid "Could not find the desired feature" msgstr "" @@ -335,8 +335,8 @@ msgid "Only connect to the replica server." msgstr "只能连接到复制服务器" #: templates/settings.php:26 -msgid "Case insensitve LDAP server (Windows)" -msgstr "大小写敏感LDAP服务器(Windows)" +msgid "Case insensitive LDAP server (Windows)" +msgstr "" #: templates/settings.php:27 msgid "Turn off SSL certificate validation." diff --git a/l10n/zh_HK/settings.po b/l10n/zh_HK/settings.po index abc1f449b54..378dc0a4b10 100644 --- a/l10n/zh_HK/settings.po +++ b/l10n/zh_HK/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-03-26 01:55-0400\n" -"PO-Revision-Date: 2014-03-26 05:55+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159 +#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149 msgid "Encryption" msgstr "加密" @@ -64,7 +64,7 @@ msgid "Unable to load list from App Store" msgstr "" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 changepassword/controller.php:55 +#: ajax/togglegroups.php:20 changepassword/controller.php:49 msgid "Authentication error" msgstr "" @@ -84,6 +84,20 @@ msgstr "" msgid "Unable to add group" msgstr "" +#: ajax/decryptall.php:31 +msgid "Files decrypted successfully" +msgstr "" + +#: ajax/decryptall.php:33 +msgid "" +"Couldn't decrypt your files, please check your owncloud.log or ask your " +"administrator" +msgstr "" + +#: ajax/decryptall.php:36 +msgid "Couldn't decrypt your files, check your password and try again" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -126,32 +140,32 @@ msgstr "" msgid "Couldn't update app." msgstr "" -#: changepassword/controller.php:20 +#: changepassword/controller.php:17 msgid "Wrong password" msgstr "" -#: changepassword/controller.php:42 +#: changepassword/controller.php:36 msgid "No user supplied" msgstr "" -#: changepassword/controller.php:74 +#: changepassword/controller.php:68 msgid "" "Please provide an admin recovery password, otherwise all user data will be " "lost" msgstr "" -#: changepassword/controller.php:79 +#: changepassword/controller.php:73 msgid "" "Wrong admin recovery password. Please check the password and try again." msgstr "" -#: changepassword/controller.php:87 +#: changepassword/controller.php:81 msgid "" "Back-end doesn't support password change, but the users encryption key was " "successfully updated." msgstr "" -#: changepassword/controller.php:92 changepassword/controller.php:103 +#: changepassword/controller.php:86 changepassword/controller.php:97 msgid "Unable to change password" msgstr "" @@ -203,7 +217,7 @@ msgstr "" msgid "Error" msgstr "錯誤" -#: js/apps.js:153 templates/apps.php:54 +#: js/apps.js:153 templates/apps.php:55 msgid "Update" msgstr "" @@ -211,31 +225,31 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:246 +#: js/personal.js:243 msgid "Select a profile picture" msgstr "" -#: js/personal.js:277 +#: js/personal.js:274 msgid "Very weak password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:275 msgid "Weak password" msgstr "" -#: js/personal.js:279 +#: js/personal.js:276 msgid "So-so password" msgstr "" -#: js/personal.js:280 +#: js/personal.js:277 msgid "Good password" msgstr "" -#: js/personal.js:281 +#: js/personal.js:278 msgid "Strong password" msgstr "" -#: js/personal.js:316 +#: js/personal.js:313 msgid "Decrypting files... Please wait, this can take some time." msgstr "" @@ -284,7 +298,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:49 personal.php:50 +#: personal.php:48 personal.php:49 msgid "__language_name__" msgstr "" @@ -589,11 +603,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:416 templates/personal.php:181 +#: templates/admin.php:416 templates/personal.php:171 msgid "Version" msgstr "" -#: templates/admin.php:420 templates/personal.php:184 +#: templates/admin.php:420 templates/personal.php:174 msgid "" "Developed by the ownCloud community, the -licensed by " msgstr "" @@ -664,108 +678,108 @@ msgstr "" msgid "You have used %s of the available %s" msgstr "" -#: templates/personal.php:39 templates/users.php:21 templates/users.php:87 +#: templates/personal.php:38 templates/users.php:21 templates/users.php:87 msgid "Password" msgstr "密碼" -#: templates/personal.php:40 +#: templates/personal.php:39 msgid "Your password was changed" msgstr "" -#: templates/personal.php:41 +#: templates/personal.php:40 msgid "Unable to change your password" msgstr "" -#: templates/personal.php:43 +#: templates/personal.php:42 msgid "Current password" msgstr "" -#: templates/personal.php:46 +#: templates/personal.php:45 msgid "New password" msgstr "新密碼" -#: templates/personal.php:50 +#: templates/personal.php:49 msgid "Change password" msgstr "" -#: templates/personal.php:64 templates/users.php:86 +#: templates/personal.php:61 templates/users.php:86 msgid "Full Name" msgstr "" -#: templates/personal.php:81 +#: templates/personal.php:76 msgid "Email" msgstr "電郵" -#: templates/personal.php:83 +#: templates/personal.php:78 msgid "Your email address" msgstr "" -#: templates/personal.php:86 +#: templates/personal.php:81 msgid "" "Fill in an email address to enable password recovery and receive " "notifications" msgstr "" -#: templates/personal.php:96 +#: templates/personal.php:89 msgid "Profile picture" msgstr "" -#: templates/personal.php:101 +#: templates/personal.php:94 msgid "Upload new" msgstr "" -#: templates/personal.php:103 +#: templates/personal.php:96 msgid "Select new from Files" msgstr "" -#: templates/personal.php:104 +#: templates/personal.php:97 msgid "Remove image" msgstr "" -#: templates/personal.php:105 +#: templates/personal.php:98 msgid "Either png or jpg. Ideally square but you will be able to crop it." msgstr "" -#: templates/personal.php:107 +#: templates/personal.php:100 msgid "Your avatar is provided by your original account." msgstr "" -#: templates/personal.php:111 +#: templates/personal.php:104 msgid "Cancel" msgstr "取消" -#: templates/personal.php:112 +#: templates/personal.php:105 msgid "Choose as profile image" msgstr "" -#: templates/personal.php:120 templates/personal.php:121 +#: templates/personal.php:111 templates/personal.php:112 msgid "Language" msgstr "" -#: templates/personal.php:140 +#: templates/personal.php:131 msgid "Help translate" msgstr "" -#: templates/personal.php:147 +#: templates/personal.php:137 msgid "WebDAV" msgstr "" -#: templates/personal.php:149 +#: templates/personal.php:139 #, php-format msgid "" "Use this address to access your Files via " "WebDAV" msgstr "" -#: templates/personal.php:161 +#: templates/personal.php:151 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:167 +#: templates/personal.php:157 msgid "Log-in password" msgstr "" -#: templates/personal.php:172 +#: templates/personal.php:162 msgid "Decrypt all Files" msgstr "" diff --git a/l10n/zh_HK/user_ldap.po b/l10n/zh_HK/user_ldap.po index 96105f465a5..b2f150dcbf3 100644 --- a/l10n/zh_HK/user_ldap.po +++ b/l10n/zh_HK/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-08 01:56-0400\n" -"PO-Revision-Date: 2014-04-08 05:56+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:55+0000\n" "Last-Translator: I Robot\n" "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n" "MIME-Version: 1.0\n" @@ -142,7 +142,7 @@ msgstr[0] "" msgid "Invalid Host" msgstr "" -#: lib/wizard.php:963 +#: lib/wizard.php:983 msgid "Could not find the desired feature" msgstr "" @@ -333,7 +333,7 @@ msgid "Only connect to the replica server." msgstr "" #: templates/settings.php:26 -msgid "Case insensitve LDAP server (Windows)" +msgid "Case insensitive LDAP server (Windows)" msgstr "" #: templates/settings.php:27 diff --git a/l10n/zh_TW/settings.po b/l10n/zh_TW/settings.po index df741fa89fc..fe7643d20dc 100644 --- a/l10n/zh_TW/settings.po +++ b/l10n/zh_TW/settings.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-10 01:54-0400\n" -"PO-Revision-Date: 2014-04-09 06:10+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n" "MIME-Version: 1.0\n" @@ -85,6 +85,20 @@ msgstr "群組已存在" msgid "Unable to add group" msgstr "群組增加失敗" +#: ajax/decryptall.php:31 +msgid "Files decrypted successfully" +msgstr "" + +#: ajax/decryptall.php:33 +msgid "" +"Couldn't decrypt your files, please check your owncloud.log or ask your " +"administrator" +msgstr "" + +#: ajax/decryptall.php:36 +msgid "Couldn't decrypt your files, check your password and try again" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "Email已儲存" diff --git a/l10n/zh_TW/user_ldap.po b/l10n/zh_TW/user_ldap.po index 8f76848a295..dd95586e561 100644 --- a/l10n/zh_TW/user_ldap.po +++ b/l10n/zh_TW/user_ldap.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-08 01:56-0400\n" -"PO-Revision-Date: 2014-04-08 05:56+0000\n" +"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 05:55+0000\n" "Last-Translator: I Robot\n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n" "MIME-Version: 1.0\n" @@ -144,7 +144,7 @@ msgstr[0] "" msgid "Invalid Host" msgstr "" -#: lib/wizard.php:963 +#: lib/wizard.php:983 msgid "Could not find the desired feature" msgstr "" @@ -335,8 +335,8 @@ msgid "Only connect to the replica server." msgstr "" #: templates/settings.php:26 -msgid "Case insensitve LDAP server (Windows)" -msgstr "不區分大小寫的 LDAP 伺服器 (Windows)" +msgid "Case insensitive LDAP server (Windows)" +msgstr "" #: templates/settings.php:27 msgid "Turn off SSL certificate validation." diff --git a/lib/l10n/tr.php b/lib/l10n/tr.php index 83dc1e0ac8c..0be1c4b186a 100644 --- a/lib/l10n/tr.php +++ b/lib/l10n/tr.php @@ -39,20 +39,20 @@ $TRANSLATIONS = array( "%s enter the database name." => "%s veritabanı adını girin.", "%s you may not use dots in the database name" => "%s veritabanı adında nokta kullanamayabilirsiniz", "MS SQL username and/or password not valid: %s" => "MS SQL kullanıcı adı ve/veya parolası geçersiz: %s", -"You need to enter either an existing account or the administrator." => "Bir konto veya kullanici birlemek ihtiyacin. ", +"You need to enter either an existing account or the administrator." => "Siz veya yönetici mevcut bir hesap girmeli.", "MySQL/MariaDB username and/or password not valid" => "MySQL/MariaDB kullanıcı adı ve/veya parolası geçersiz", -"DB Error: \"%s\"" => "DB Hata: ''%s''", -"Offending command was: \"%s\"" => "Komut rahasiz ''%s''. ", +"DB Error: \"%s\"" => "VT Hatası: \"%s\"", +"Offending command was: \"%s\"" => "Saldırgan komut: \"%s\"", "MySQL/MariaDB user '%s'@'localhost' exists already." => "MySQL/MariaDB kullanıcı '%s'@'localhost' zaten mevcut.", "Drop this user from MySQL/MariaDB" => "Bu kullanıcıyı MySQL/MariaDB'dan at (drop)", "MySQL/MariaDB user '%s'@'%%' already exists" => "MySQL/MariaDB kullanıcısı '%s'@'%%' zaten mevcut", "Drop this user from MySQL/MariaDB." => "Bu kullanıcıyı MySQL/MariaDB'dan at (drop)", "Oracle connection could not be established" => "Oracle bağlantısı kurulamadı", -"Oracle username and/or password not valid" => "Adi klullanici ve/veya parola Oracle mantikli değildir. ", +"Oracle username and/or password not valid" => "Oracle kullanıcı adı ve/veya parolası geçerli değil", "Offending command was: \"%s\", name: %s, password: %s" => "Hatalı komut: \"%s\", ad: %s, parola: %s", -"PostgreSQL username and/or password not valid" => "PostgreSQL adi kullanici ve/veya parola yasal degildir. ", -"Set an admin username." => "Bir adi kullanici vermek. ", -"Set an admin password." => "Parola yonetici birlemek. ", +"PostgreSQL username and/or password not valid" => "PostgreSQL kullanıcı adı ve/veya parolası geçerli değil", +"Set an admin username." => "Bir yönetici kullanıcı adı ayarlayın.", +"Set an admin password." => "Bir yönetici kullanıcı parolası ayarlayın.", "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Web sunucunuz dosya aktarımı için düzgün bir şekilde yapılandırılmamış. WevDAV arayüzü sorunlu görünüyor.", "Please double check the installation guides." => "Lütfen kurulum kılavuzlarını iki kez kontrol edin.", "%s shared »%s« with you" => "%s sizinle »%s« paylaşımında bulundu", -- GitLab From e7fa2790f39a5c120d4f935139c1210258a1472a Mon Sep 17 00:00:00 2001 From: Bernhard Posselt Date: Sat, 12 Apr 2014 15:02:19 +0200 Subject: [PATCH 099/253] Correctly process request parameters other than GET or POST, dont use globals in the class but inject it --- lib/private/appframework/http/request.php | 80 +++++++++-------------- lib/private/server.php | 9 ++- 2 files changed, 39 insertions(+), 50 deletions(-) diff --git a/lib/private/appframework/http/request.php b/lib/private/appframework/http/request.php index 40f47a7bd2f..43631697d3a 100644 --- a/lib/private/appframework/http/request.php +++ b/lib/private/appframework/http/request.php @@ -60,7 +60,10 @@ class Request implements \ArrayAccess, \Countable, IRequest { * @param string|false 'requesttoken' the requesttoken or false when not available * @see http://www.php.net/manual/en/reserved.variables.php */ - public function __construct(array $vars=array()) { + public function __construct(array $vars=array(), $stream='php://input') { + + $this->inputStream = $stream; + $this->items['params'] = array(); foreach($this->allowedKeys as $name) { $this->items[$name] = isset($vars[$name]) @@ -68,25 +71,29 @@ class Request implements \ArrayAccess, \Countable, IRequest { : array(); } - if (defined('PHPUNIT_RUN') && PHPUNIT_RUN - && in_array('fakeinput', stream_get_wrappers())) { - $this->inputStream = 'fakeinput://data'; - } else { - $this->inputStream = 'php://input'; - } - - // Only 'application/x-www-form-urlencoded' requests are automatically - // transformed by PHP, 'application/json' must be decoded manually. - if ($this->method === 'POST' - && strpos($this->getHeader('Content-Type'), 'application/json') !== false - ) { - $this->items['params'] = $this->items['post'] = json_decode(file_get_contents($this->inputStream), true); - } + // 'application/json' must be decoded manually. + if (strpos($this->getHeader('Content-Type'), 'application/json') !== false) { + $params = json_decode(file_get_contents($this->inputStream), true); + if(count($params) > 0) { + $this->items['params'] = $params; + } + // Handle application/x-www-form-urlencoded for methods other than GET + // or post correctly + } elseif($vars['method'] !== 'GET' + && $vars['method'] !== 'POST' + && strpos($this->getHeader('Content-Type'), 'application/x-www-form-urlencoded') !== false) { + + parse_str(file_get_contents($this->inputStream), $params); + if(is_array($params)) { + $this->items['params'] = $params; + } + } $this->items['parameters'] = array_merge( $this->items['get'], $this->items['post'], - $this->items['urlParams'] + $this->items['urlParams'], + $this->items['params'] ); } @@ -313,47 +320,22 @@ class Request implements \ArrayAccess, \Countable, IRequest { * @throws \LogicException */ protected function getContent() { - if ($this->content === false && $this->method === 'PUT') { - throw new \LogicException( - '"put" can only be accessed once if not ' - . 'application/x-www-form-urlencoded or application/json.' - ); - } - // If the content can't be parsed into an array then return a stream resource. if ($this->method === 'PUT' && strpos($this->getHeader('Content-Type'), 'application/x-www-form-urlencoded') === false && strpos($this->getHeader('Content-Type'), 'application/json') === false ) { + if ($this->content === false) { + throw new \LogicException( + '"put" can only be accessed once if not ' + . 'application/x-www-form-urlencoded or application/json.' + ); + } $this->content = false; return fopen($this->inputStream, 'rb'); + } else { + return $this->parameters; } - - if (is_null($this->content)) { - $this->content = file_get_contents($this->inputStream); - - /* - * Normal jquery ajax requests are sent as application/x-www-form-urlencoded - * and in $_GET and $_POST PHP transformes the data into an array. - * The first condition mimics this. - * The second condition allows for sending raw application/json data while - * still getting the result as an array. - * - */ - if (strpos($this->getHeader('Content-Type'), 'application/x-www-form-urlencoded') !== false) { - parse_str($this->content, $content); - if(is_array($content)) { - $this->content = $content; - } - } elseif (strpos($this->getHeader('Content-Type'), 'application/json') !== false) { - $content = json_decode($this->content, true); - if(is_array($content)) { - $this->content = $content; - } - } - } - - return $this->content; } /** diff --git a/lib/private/server.php b/lib/private/server.php index 3517d7b3548..5d90a0b19fc 100644 --- a/lib/private/server.php +++ b/lib/private/server.php @@ -35,6 +35,13 @@ class Server extends SimpleContainer implements IServerContainer { $requesttoken = false; } + if (defined('PHPUNIT_RUN') && PHPUNIT_RUN + && in_array('fakeinput', stream_get_wrappers())) { + $stream = 'fakeinput://data'; + } else { + $stream = 'php://input'; + } + return new Request( array( 'get' => $_GET, @@ -48,7 +55,7 @@ class Server extends SimpleContainer implements IServerContainer { : null, 'urlParams' => $urlParams, 'requesttoken' => $requesttoken, - ) + ), $stream ); }); $this->registerService('PreviewManager', function($c) { -- GitLab From 62cce982bbd66c11ddb7867b516bc13f95eaf9a5 Mon Sep 17 00:00:00 2001 From: Bernhard Posselt Date: Sat, 12 Apr 2014 16:17:49 +0200 Subject: [PATCH 100/253] default to GET request when no method is set to fix unittests, also set parsed json parameters on the post attribute --- lib/private/appframework/http/request.php | 7 +++++ .../dependencyinjection/DIContainerTest.php | 2 +- tests/lib/appframework/http/RequestTest.php | 28 +++++++++++-------- .../middleware/MiddlewareDispatcherTest.php | 2 +- 4 files changed, 25 insertions(+), 14 deletions(-) diff --git a/lib/private/appframework/http/request.php b/lib/private/appframework/http/request.php index 43631697d3a..643fa685adc 100644 --- a/lib/private/appframework/http/request.php +++ b/lib/private/appframework/http/request.php @@ -65,6 +65,10 @@ class Request implements \ArrayAccess, \Countable, IRequest { $this->inputStream = $stream; $this->items['params'] = array(); + if(!array_key_exists('method', $vars)) { + $vars['method'] = 'GET'; + } + foreach($this->allowedKeys as $name) { $this->items[$name] = isset($vars[$name]) ? $vars[$name] @@ -76,6 +80,9 @@ class Request implements \ArrayAccess, \Countable, IRequest { $params = json_decode(file_get_contents($this->inputStream), true); if(count($params) > 0) { $this->items['params'] = $params; + if($vars['method'] === 'POST') { + $this->items['post'] = $params; + } } // Handle application/x-www-form-urlencoded for methods other than GET // or post correctly diff --git a/tests/lib/appframework/dependencyinjection/DIContainerTest.php b/tests/lib/appframework/dependencyinjection/DIContainerTest.php index f3ebff0207f..d1bc900fb28 100644 --- a/tests/lib/appframework/dependencyinjection/DIContainerTest.php +++ b/tests/lib/appframework/dependencyinjection/DIContainerTest.php @@ -70,7 +70,7 @@ class DIContainerTest extends \PHPUnit_Framework_TestCase { public function testMiddlewareDispatcherIncludesSecurityMiddleware(){ - $this->container['Request'] = new Request(); + $this->container['Request'] = new Request(array('method' => 'GET')); $security = $this->container['SecurityMiddleware']; $dispatcher = $this->container['MiddlewareDispatcher']; diff --git a/tests/lib/appframework/http/RequestTest.php b/tests/lib/appframework/http/RequestTest.php index 00473a8c44f..58828d17bb2 100644 --- a/tests/lib/appframework/http/RequestTest.php +++ b/tests/lib/appframework/http/RequestTest.php @@ -18,6 +18,7 @@ class RequestTest extends \PHPUnit_Framework_TestCase { stream_wrapper_unregister('fakeinput'); } stream_wrapper_register('fakeinput', 'RequestStream'); + $this->stream = 'fakeinput://data'; } public function tearDown() { @@ -30,7 +31,7 @@ class RequestTest extends \PHPUnit_Framework_TestCase { 'method' => 'GET', ); - $request = new Request($vars); + $request = new Request($vars, $this->stream); // Countable $this->assertEquals(2, count($request)); @@ -54,9 +55,10 @@ class RequestTest extends \PHPUnit_Framework_TestCase { 'get' => array('name' => 'John Q. Public', 'nickname' => 'Joey'), 'post' => array('name' => 'Jane Doe', 'nickname' => 'Janey'), 'urlParams' => array('user' => 'jw', 'name' => 'Johnny Weissmüller'), + 'method' => 'GET' ); - $request = new Request($vars); + $request = new Request($vars, $this->stream); $this->assertEquals(3, count($request)); $this->assertEquals('Janey', $request->{'nickname'}); @@ -70,9 +72,10 @@ class RequestTest extends \PHPUnit_Framework_TestCase { public function testImmutableArrayAccess() { $vars = array( 'get' => array('name' => 'John Q. Public', 'nickname' => 'Joey'), + 'method' => 'GET' ); - $request = new Request($vars); + $request = new Request($vars, $this->stream); $request['nickname'] = 'Janey'; } @@ -82,9 +85,10 @@ class RequestTest extends \PHPUnit_Framework_TestCase { public function testImmutableMagicAccess() { $vars = array( 'get' => array('name' => 'John Q. Public', 'nickname' => 'Joey'), + 'method' => 'GET' ); - $request = new Request($vars); + $request = new Request($vars, $this->stream); $request->{'nickname'} = 'Janey'; } @@ -97,7 +101,7 @@ class RequestTest extends \PHPUnit_Framework_TestCase { 'method' => 'GET', ); - $request = new Request($vars); + $request = new Request($vars, $this->stream); $result = $request->post; } @@ -107,7 +111,7 @@ class RequestTest extends \PHPUnit_Framework_TestCase { 'method' => 'GET', ); - $request = new Request($vars); + $request = new Request($vars, $this->stream); $this->assertEquals('GET', $request->method); $result = $request->get; $this->assertEquals('John Q. Public', $result['name']); @@ -119,10 +123,10 @@ class RequestTest extends \PHPUnit_Framework_TestCase { $data = '{"name": "John Q. Public", "nickname": "Joey"}'; $vars = array( 'method' => 'POST', - 'server' => array('CONTENT_TYPE' => 'application/json; utf-8'), + 'server' => array('CONTENT_TYPE' => 'application/json; utf-8') ); - $request = new Request($vars); + $request = new Request($vars, $this->stream); $this->assertEquals('POST', $request->method); $result = $request->post; $this->assertEquals('John Q. Public', $result['name']); @@ -140,7 +144,7 @@ class RequestTest extends \PHPUnit_Framework_TestCase { 'server' => array('CONTENT_TYPE' => 'application/x-www-form-urlencoded'), ); - $request = new Request($vars); + $request = new Request($vars, $this->stream); $this->assertEquals('PATCH', $request->method); $result = $request->patch; @@ -159,7 +163,7 @@ class RequestTest extends \PHPUnit_Framework_TestCase { 'server' => array('CONTENT_TYPE' => 'application/json; utf-8'), ); - $request = new Request($vars); + $request = new Request($vars, $this->stream); $this->assertEquals('PUT', $request->method); $result = $request->put; @@ -174,7 +178,7 @@ class RequestTest extends \PHPUnit_Framework_TestCase { 'server' => array('CONTENT_TYPE' => 'application/json; utf-8'), ); - $request = new Request($vars); + $request = new Request($vars, $this->stream); $this->assertEquals('PATCH', $request->method); $result = $request->patch; @@ -193,7 +197,7 @@ class RequestTest extends \PHPUnit_Framework_TestCase { 'server' => array('CONTENT_TYPE' => 'image/png'), ); - $request = new Request($vars); + $request = new Request($vars, $this->stream); $this->assertEquals('PUT', $request->method); $resource = $request->put; $contents = stream_get_contents($resource); diff --git a/tests/lib/appframework/middleware/MiddlewareDispatcherTest.php b/tests/lib/appframework/middleware/MiddlewareDispatcherTest.php index f16b14150c3..935f97d2a6f 100644 --- a/tests/lib/appframework/middleware/MiddlewareDispatcherTest.php +++ b/tests/lib/appframework/middleware/MiddlewareDispatcherTest.php @@ -132,7 +132,7 @@ class MiddlewareDispatcherTest extends \PHPUnit_Framework_TestCase { private function getControllerMock(){ return $this->getMock('OCP\AppFramework\Controller', array('method'), - array($this->getAPIMock(), new Request())); + array($this->getAPIMock(), new Request(array('method' => 'GET')))); } -- GitLab From 4d4db237458d4c05de868ab99b7f44af6e67d02b Mon Sep 17 00:00:00 2001 From: Volkan Gezer Date: Sat, 12 Apr 2014 23:47:32 +0200 Subject: [PATCH 101/253] fix contribute link --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 032a7e987f2..56fd9942c16 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ Quality: [![Scrutinizer Quality Score](https://scrutinizer-ci.com/g/owncloud/cor http://doc.owncloud.org/server/6.0/developer_manual/app/index.html ### Contribution Guidelines -http://owncloud.org/dev/contribute/ +http://owncloud.org/contribute/ ### Get in touch * [Forum](http://forum.owncloud.org) -- GitLab From b92f411a366a2f150ad9c4405e60d3a73d69ddf8 Mon Sep 17 00:00:00 2001 From: Volkan Gezer Date: Sun, 13 Apr 2014 01:45:10 +0200 Subject: [PATCH 102/253] upda mailinglist address --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 56fd9942c16..23a2563e895 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ http://owncloud.org/contribute/ ### Get in touch * [Forum](http://forum.owncloud.org) -* [Mailing list](https://mail.kde.org/mailman/listinfo/owncloud) +* [Mailing list](http://mailman.owncloud.org/mailman/listinfo) * [IRC channel](https://webchat.freenode.net/?channels=owncloud) * [Twitter](https://twitter.com/ownClouders) -- GitLab From 7fa0c3b7b72acdc0bf7321827a5195cc2a8af1e1 Mon Sep 17 00:00:00 2001 From: Volkan Gezer Date: Sun, 13 Apr 2014 01:47:03 +0200 Subject: [PATCH 103/253] fix translation link --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 23a2563e895..618aa8d2009 100644 --- a/README.md +++ b/README.md @@ -25,4 +25,4 @@ Please submit translations via Transifex: https://www.transifex.com/projects/p/owncloud/ For more detailed information about translations: -http://owncloud.org/dev/translation/ +http://doc.owncloud.org/server/6.0/developer_manual/core/translation.html -- GitLab From d98ae4f9b25db6c3aa40ca254bc079ace710d0c0 Mon Sep 17 00:00:00 2001 From: kondou Date: Sun, 13 Apr 2014 05:21:29 +0200 Subject: [PATCH 104/253] Fix a wrong WebDAV Warning with self-signed-certs Occuring in the admin interface --- lib/private/davclient.php | 13 +++++++++++++ lib/private/util.php | 2 ++ 2 files changed, 15 insertions(+) diff --git a/lib/private/davclient.php b/lib/private/davclient.php index afa4e1103b4..916dc11d17a 100644 --- a/lib/private/davclient.php +++ b/lib/private/davclient.php @@ -29,6 +29,8 @@ class OC_DAVClient extends \Sabre_DAV_Client { protected $requestTimeout; + protected $verifyHost; + /** * @brief Sets the request timeout or 0 to disable timeout. * @param integer $timeout in seconds or 0 to disable @@ -37,10 +39,21 @@ class OC_DAVClient extends \Sabre_DAV_Client { $this->requestTimeout = (int)$timeout; } + /** + * @brief Sets the CURLOPT_SSL_VERIFYHOST setting + * @param integer $value value to set CURLOPT_SSL_VERIFYHOST to + */ + public function setVerifyHost($value) { + $this->verifyHost = $value; + } + protected function curlRequest($url, $settings) { if ($this->requestTimeout > 0) { $settings[CURLOPT_TIMEOUT] = $this->requestTimeout; } + if (!is_null($this->verifyHost)) { + $settings[CURLOPT_SSL_VERIFYHOST] = $this->verifyHost; + } return parent::curlRequest($url, $settings); } } diff --git a/lib/private/util.php b/lib/private/util.php index a744644b39c..e20de308e87 100755 --- a/lib/private/util.php +++ b/lib/private/util.php @@ -902,6 +902,8 @@ class OC_Util { // for this self test we don't care if the ssl certificate is self signed and the peer cannot be verified. $client->setVerifyPeer(false); + // also don't care if the host can't be verified + $client->setVerifyHost(0); $return = true; try { -- GitLab From 982d2bcc5b829e7d9e8db5f1111570d80f537c5f Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Sun, 13 Apr 2014 01:55:12 -0400 Subject: [PATCH 105/253] [tx-robot] updated from transifex --- apps/files_external/l10n/sv.php | 5 ++ apps/user_ldap/l10n/de.php | 1 + apps/user_ldap/l10n/de_DE.php | 1 + apps/user_ldap/l10n/es.php | 1 + apps/user_ldap/l10n/fr.php | 1 + apps/user_ldap/l10n/gl.php | 1 + apps/user_ldap/l10n/it.php | 1 + apps/user_ldap/l10n/pl.php | 1 + apps/user_ldap/l10n/pt_BR.php | 1 + apps/user_ldap/l10n/sv.php | 1 + apps/user_ldap/l10n/tr.php | 1 + l10n/de/settings.po | 12 ++-- l10n/de/user_ldap.po | 8 +-- l10n/de_DE/settings.po | 12 ++-- l10n/de_DE/user_ldap.po | 8 +-- l10n/es/settings.po | 12 ++-- l10n/es/user_ldap.po | 9 +-- l10n/fi_FI/settings.po | 12 ++-- l10n/fr/settings.po | 14 ++--- l10n/fr/user_ldap.po | 9 +-- l10n/gl/settings.po | 12 ++-- l10n/gl/user_ldap.po | 8 +-- l10n/it/settings.po | 12 ++-- l10n/it/user_ldap.po | 8 +-- l10n/pl/settings.po | 12 ++-- l10n/pl/user_ldap.po | 8 +-- l10n/pt_BR/core.po | 98 ++++++++++++++--------------- l10n/pt_BR/settings.po | 12 ++-- l10n/pt_BR/user_ldap.po | 8 +-- l10n/sv/files_external.po | 17 ++--- l10n/sv/lib.po | 11 ++-- l10n/sv/settings.po | 13 ++-- l10n/sv/user_ldap.po | 9 +-- l10n/templates/core.pot | 2 +- l10n/templates/files.pot | 2 +- l10n/templates/files_encryption.pot | 2 +- l10n/templates/files_external.pot | 2 +- l10n/templates/files_sharing.pot | 2 +- l10n/templates/files_trashbin.pot | 2 +- l10n/templates/files_versions.pot | 2 +- l10n/templates/lib.pot | 2 +- l10n/templates/private.pot | 2 +- l10n/templates/settings.pot | 2 +- l10n/templates/user_ldap.pot | 2 +- l10n/templates/user_webdavauth.pot | 2 +- l10n/tr/settings.po | 12 ++-- l10n/tr/user_ldap.po | 8 +-- lib/l10n/sv.php | 4 +- settings/l10n/de.php | 3 + settings/l10n/de_DE.php | 3 + settings/l10n/es.php | 3 + settings/l10n/fi_FI.php | 3 + settings/l10n/fr.php | 3 + settings/l10n/gl.php | 3 + settings/l10n/it.php | 3 + settings/l10n/pl.php | 3 + settings/l10n/pt_BR.php | 3 + settings/l10n/sv.php | 3 + settings/l10n/tr.php | 3 + 59 files changed, 238 insertions(+), 182 deletions(-) diff --git a/apps/files_external/l10n/sv.php b/apps/files_external/l10n/sv.php index ad5e6ad050c..2992460d283 100644 --- a/apps/files_external/l10n/sv.php +++ b/apps/files_external/l10n/sv.php @@ -6,6 +6,11 @@ $TRANSLATIONS = array( "Please provide a valid Dropbox app key and secret." => "Ange en giltig Dropbox nyckel och hemlighet.", "Error configuring Google Drive storage" => "Fel vid konfigurering av Google Drive", "Saved" => "Sparad", +"Note: " => " OBS: ", +" and " => "och", +"Note: The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => " OBS: cURL stöd i PHP inte är aktiverat eller installeras. Montering av %s är inte möjlig. Be din systemadministratör för att installera det.", +"Note: The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => " OBS: Den FTP-stöd i PHP inte är aktiverat eller installeras. Montering av %s är inte möjlig. Be din systemadministratör för att installera det.", +"Note: \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." => " OBS: \"%s\" är inte installerat. Montering av %s är inte möjlig. Be din systemadministratör för att installera det.", "External Storage" => "Extern lagring", "Folder name" => "Mappnamn", "External storage" => "Extern lagring", diff --git a/apps/user_ldap/l10n/de.php b/apps/user_ldap/l10n/de.php index 15c8d21687d..43336520739 100644 --- a/apps/user_ldap/l10n/de.php +++ b/apps/user_ldap/l10n/de.php @@ -70,6 +70,7 @@ $TRANSLATIONS = array( "Backup (Replica) Port" => "Backup Port", "Disable Main Server" => "Hauptserver deaktivieren", "Only connect to the replica server." => "Nur zum Replikat-Server verbinden.", +"Case insensitive LDAP server (Windows)" => "LDAP-Server (Windows - Groß- und Kleinschreibung bleibt unbeachtet)", "Turn off SSL certificate validation." => "Schalte die SSL-Zertifikatsprüfung aus.", "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." => "Nur für Testzwecke geeignet, sollte Standardmäßig nicht verwendet werden. Falls die Verbindung nur mit dieser Option funktioniert, importiere das SSL-Zertifikat des LDAP-Servers in deinen %s Server.", "Cache Time-To-Live" => "Speichere Time-To-Live zwischen", diff --git a/apps/user_ldap/l10n/de_DE.php b/apps/user_ldap/l10n/de_DE.php index 60d52cd30f6..21c149d1a1d 100644 --- a/apps/user_ldap/l10n/de_DE.php +++ b/apps/user_ldap/l10n/de_DE.php @@ -70,6 +70,7 @@ $TRANSLATIONS = array( "Backup (Replica) Port" => "Backup Port", "Disable Main Server" => "Hauptserver deaktivieren", "Only connect to the replica server." => "Nur zum Replikat-Server verbinden.", +"Case insensitive LDAP server (Windows)" => "LDAP-Server (Windows: Groß- und Kleinschreibung bleibt unbeachtet)", "Turn off SSL certificate validation." => "Schalten Sie die SSL-Zertifikatsprüfung aus.", "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." => "Nur für Testzwecke geeignet, sollte Standardmäßig nicht verwendet werden. Falls die Verbindung nur mit dieser Option funktioniert, importieren Sie das SSL-Zertifikat des LDAP-Servers in Ihren %s Server.", "Cache Time-To-Live" => "Speichere Time-To-Live zwischen", diff --git a/apps/user_ldap/l10n/es.php b/apps/user_ldap/l10n/es.php index 6034b4fb635..2c294aff785 100644 --- a/apps/user_ldap/l10n/es.php +++ b/apps/user_ldap/l10n/es.php @@ -70,6 +70,7 @@ $TRANSLATIONS = array( "Backup (Replica) Port" => "Puerto para copias de seguridad (Replica)", "Disable Main Server" => "Deshabilitar servidor principal", "Only connect to the replica server." => "Conectar sólo con el servidor de réplica.", +"Case insensitive LDAP server (Windows)" => "Servidor de LDAP insensible a mayúsculas/minúsculas (Windows)", "Turn off SSL certificate validation." => "Apagar la validación por certificado SSL.", "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "No se recomienda, ¡utilízalo únicamente para pruebas! Si la conexión únicamente funciona con esta opción, importa el certificado SSL del servidor LDAP en tu servidor %s.", "Cache Time-To-Live" => "Cache TTL", diff --git a/apps/user_ldap/l10n/fr.php b/apps/user_ldap/l10n/fr.php index 468297ca1f3..44b92077b92 100644 --- a/apps/user_ldap/l10n/fr.php +++ b/apps/user_ldap/l10n/fr.php @@ -70,6 +70,7 @@ $TRANSLATIONS = array( "Backup (Replica) Port" => "Port du serveur de backup (réplique)", "Disable Main Server" => "Désactiver le serveur principal", "Only connect to the replica server." => "Se connecter uniquement au serveur de replica.", +"Case insensitive LDAP server (Windows)" => "Serveur LDAP insensible à la casse (Windows)", "Turn off SSL certificate validation." => "Désactiver la validation du certificat SSL.", "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "Non recommandé, à utiliser à des fins de tests uniquement. Si la connexion ne fonctionne qu'avec cette option, importez le certificat SSL du serveur LDAP dans le serveur %s.", "Cache Time-To-Live" => "Durée de vie du cache", diff --git a/apps/user_ldap/l10n/gl.php b/apps/user_ldap/l10n/gl.php index f27f8eb7bb1..82c484bb95d 100644 --- a/apps/user_ldap/l10n/gl.php +++ b/apps/user_ldap/l10n/gl.php @@ -70,6 +70,7 @@ $TRANSLATIONS = array( "Backup (Replica) Port" => "Porto da copia de seguranza (Réplica)", "Disable Main Server" => "Desactivar o servidor principal", "Only connect to the replica server." => "Conectar só co servidor de réplica.", +"Case insensitive LDAP server (Windows)" => "Servidor LDAP non sensíbel a maiúsculas (Windows)", "Turn off SSL certificate validation." => "Desactiva a validación do certificado SSL.", "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "Non recomendado, utilizar só para probas! Se a conexión só funciona con esta opción importa o certificado SSL do servidor LDAP no seu servidor %s.", "Cache Time-To-Live" => "Tempo de persistencia da caché", diff --git a/apps/user_ldap/l10n/it.php b/apps/user_ldap/l10n/it.php index cd8c88814aa..095a0619ee1 100644 --- a/apps/user_ldap/l10n/it.php +++ b/apps/user_ldap/l10n/it.php @@ -70,6 +70,7 @@ $TRANSLATIONS = array( "Backup (Replica) Port" => "Porta di backup (Replica)", "Disable Main Server" => "Disabilita server principale", "Only connect to the replica server." => "Collegati solo al server di replica.", +"Case insensitive LDAP server (Windows)" => "Server LDAP non sensibile alle maiuscole (Windows)", "Turn off SSL certificate validation." => "Disattiva il controllo del certificato 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." => "Non consigliata, da utilizzare solo per test! Se la connessione funziona solo con questa opzione, importa il certificate SSL del server LDAP sul tuo server %s.", "Cache Time-To-Live" => "Tempo di vita della cache", diff --git a/apps/user_ldap/l10n/pl.php b/apps/user_ldap/l10n/pl.php index 877dff4d97f..988e44dbe38 100644 --- a/apps/user_ldap/l10n/pl.php +++ b/apps/user_ldap/l10n/pl.php @@ -70,6 +70,7 @@ $TRANSLATIONS = array( "Backup (Replica) Port" => "Kopia zapasowa (repliki) Port", "Disable Main Server" => "Wyłącz serwer główny", "Only connect to the replica server." => "Połącz tylko do repliki serwera.", +"Case insensitive LDAP server (Windows)" => "Serwer LDAP nie rozróżniający wielkości liter (Windows)", "Turn off SSL certificate validation." => "Wyłączyć sprawdzanie poprawności certyfikatu 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." => "Nie polecane, używać tylko w celu testowania! Jeśli połączenie działa tylko z tą opcją, zaimportuj certyfikat SSL serwera LDAP na swój %s.", "Cache Time-To-Live" => "Przechowuj czas życia", diff --git a/apps/user_ldap/l10n/pt_BR.php b/apps/user_ldap/l10n/pt_BR.php index 1cfdce7cabd..0c15694e3ff 100644 --- a/apps/user_ldap/l10n/pt_BR.php +++ b/apps/user_ldap/l10n/pt_BR.php @@ -70,6 +70,7 @@ $TRANSLATIONS = array( "Backup (Replica) Port" => "Porta do Backup (Réplica)", "Disable Main Server" => "Desativar Servidor Principal", "Only connect to the replica server." => "Conectar-se somente ao servidor de réplica.", +"Case insensitive LDAP server (Windows)" => "Servidor LDAP(Windows) não distigue maiúscula de minúscula", "Turn off SSL certificate validation." => "Desligar validação de certificado SSL.", "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "Não recomendado, use-o somente para teste! Se a conexão só funciona com esta opção, importar o certificado SSL do servidor LDAP em seu servidor %s.", "Cache Time-To-Live" => "Cache Time-To-Live", diff --git a/apps/user_ldap/l10n/sv.php b/apps/user_ldap/l10n/sv.php index 1283b16c7d1..2a4f8b19655 100644 --- a/apps/user_ldap/l10n/sv.php +++ b/apps/user_ldap/l10n/sv.php @@ -70,6 +70,7 @@ $TRANSLATIONS = array( "Backup (Replica) Port" => "Säkerhetskopierins-port (Replika)", "Disable Main Server" => "Inaktivera huvudserver", "Only connect to the replica server." => "Anslut endast till replikaservern.", +"Case insensitive LDAP server (Windows)" => "om okänslig LDAP-server (Windows)", "Turn off SSL certificate validation." => "Stäng av verifiering av SSL-certifikat.", "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "Rekommenderas inte, använd endast för test! Om anslutningen bara fungerar med denna inställning behöver du importera LDAP-serverns SSL-certifikat till din %s server.", "Cache Time-To-Live" => "Cache Time-To-Live", diff --git a/apps/user_ldap/l10n/tr.php b/apps/user_ldap/l10n/tr.php index fde3db85d48..48e39c8523c 100644 --- a/apps/user_ldap/l10n/tr.php +++ b/apps/user_ldap/l10n/tr.php @@ -70,6 +70,7 @@ $TRANSLATIONS = array( "Backup (Replica) Port" => "Yedek (Replica) Bağlantı Noktası", "Disable Main Server" => "Ana sunucuyu devredışı birak", "Only connect to the replica server." => "Sadece kopya sunucuya bağlan.", +"Case insensitive LDAP server (Windows)" => "Büyük küçük harf duyarsız LDAP sunucusu (Windows)", "Turn off SSL certificate validation." => "SSL sertifika doğrulamasını kapat.", "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." => "Önerilmez, sadece test için kullanın! Eğer bağlantı sadece bu seçenekle çalışıyorsa %s sunucunuza LDAP sunucusunun SSL sertifikasını ekleyin.", "Cache Time-To-Live" => "Önbellek Time-To-Live Değeri", diff --git a/l10n/de/settings.po b/l10n/de/settings.po index 36bbb05b66f..8f73c65cc25 100644 --- a/l10n/de/settings.po +++ b/l10n/de/settings.po @@ -16,9 +16,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-12 01:54-0400\n" -"PO-Revision-Date: 2014-04-12 05:54+0000\n" -"Last-Translator: I Robot\n" +"POT-Creation-Date: 2014-04-13 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 10:00+0000\n" +"Last-Translator: Mario Siegmann \n" "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -95,17 +95,17 @@ msgstr "Gruppe konnte nicht angelegt werden" #: ajax/decryptall.php:31 msgid "Files decrypted successfully" -msgstr "" +msgstr "Dateien erfolgreich entschlüsselt" #: ajax/decryptall.php:33 msgid "" "Couldn't decrypt your files, please check your owncloud.log or ask your " "administrator" -msgstr "" +msgstr "Dateien konnten nicht entschlüsselt werden, prüfe bitte Dein owncloud.log oder frage Deinen Administrator" #: ajax/decryptall.php:36 msgid "Couldn't decrypt your files, check your password and try again" -msgstr "" +msgstr "Dateien konnten nicht entschlüsselt werden, bitte prüfe Dein Passwort und versuche es erneut." #: ajax/lostpassword.php:12 msgid "Email saved" diff --git a/l10n/de/user_ldap.po b/l10n/de/user_ldap.po index a91c8c7e8ef..f581aad6417 100644 --- a/l10n/de/user_ldap.po +++ b/l10n/de/user_ldap.po @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-12 01:54-0400\n" -"PO-Revision-Date: 2014-04-12 05:55+0000\n" -"Last-Translator: I Robot\n" +"POT-Creation-Date: 2014-04-13 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 10:00+0000\n" +"Last-Translator: Mario Siegmann \n" "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -340,7 +340,7 @@ msgstr "Nur zum Replikat-Server verbinden." #: templates/settings.php:26 msgid "Case insensitive LDAP server (Windows)" -msgstr "" +msgstr "LDAP-Server (Windows - Groß- und Kleinschreibung bleibt unbeachtet)" #: templates/settings.php:27 msgid "Turn off SSL certificate validation." diff --git a/l10n/de_DE/settings.po b/l10n/de_DE/settings.po index cfca7fb3af9..a3d2c9d70a7 100644 --- a/l10n/de_DE/settings.po +++ b/l10n/de_DE/settings.po @@ -16,9 +16,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-12 01:54-0400\n" -"PO-Revision-Date: 2014-04-12 05:54+0000\n" -"Last-Translator: I Robot\n" +"POT-Creation-Date: 2014-04-13 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 10:00+0000\n" +"Last-Translator: Mario Siegmann \n" "Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -95,17 +95,17 @@ msgstr "Die Gruppe konnte nicht angelegt werden" #: ajax/decryptall.php:31 msgid "Files decrypted successfully" -msgstr "" +msgstr "Dateien erfolgreich entschlüsselt" #: ajax/decryptall.php:33 msgid "" "Couldn't decrypt your files, please check your owncloud.log or ask your " "administrator" -msgstr "" +msgstr "Dateien konnten nicht entschlüsselt werden, prüfen Sie bitte Ihre owncloud.log oder fragen Sie Ihren Administrator" #: ajax/decryptall.php:36 msgid "Couldn't decrypt your files, check your password and try again" -msgstr "" +msgstr "Dateien konnten nicht entschlüsselt werden, bitte prüfen Sie Ihr Passwort und versuchen Sie es erneut." #: ajax/lostpassword.php:12 msgid "Email saved" diff --git a/l10n/de_DE/user_ldap.po b/l10n/de_DE/user_ldap.po index f82937c17bb..be3a9259eee 100644 --- a/l10n/de_DE/user_ldap.po +++ b/l10n/de_DE/user_ldap.po @@ -13,9 +13,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-12 01:54-0400\n" -"PO-Revision-Date: 2014-04-12 05:55+0000\n" -"Last-Translator: I Robot\n" +"POT-Creation-Date: 2014-04-13 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 10:00+0000\n" +"Last-Translator: Mario Siegmann \n" "Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -342,7 +342,7 @@ msgstr "Nur zum Replikat-Server verbinden." #: templates/settings.php:26 msgid "Case insensitive LDAP server (Windows)" -msgstr "" +msgstr "LDAP-Server (Windows: Groß- und Kleinschreibung bleibt unbeachtet)" #: templates/settings.php:27 msgid "Turn off SSL certificate validation." diff --git a/l10n/es/settings.po b/l10n/es/settings.po index 1f0cc298254..dbe7b978706 100644 --- a/l10n/es/settings.po +++ b/l10n/es/settings.po @@ -21,9 +21,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-12 01:54-0400\n" -"PO-Revision-Date: 2014-04-12 05:54+0000\n" -"Last-Translator: I Robot\n" +"POT-Creation-Date: 2014-04-13 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 17:10+0000\n" +"Last-Translator: Art O. Pal \n" "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -100,17 +100,17 @@ msgstr "No se pudo añadir el grupo" #: ajax/decryptall.php:31 msgid "Files decrypted successfully" -msgstr "" +msgstr "Los archivos fueron descifrados" #: ajax/decryptall.php:33 msgid "" "Couldn't decrypt your files, please check your owncloud.log or ask your " "administrator" -msgstr "" +msgstr "No se pudo descifrar sus archivos. Revise el owncloud.log o consulte con su administrador" #: ajax/decryptall.php:36 msgid "Couldn't decrypt your files, check your password and try again" -msgstr "" +msgstr "No se pudo descifrar sus archivos. Revise su contraseña e inténtelo de nuevo" #: ajax/lostpassword.php:12 msgid "Email saved" diff --git a/l10n/es/user_ldap.po b/l10n/es/user_ldap.po index bad5b163ae3..c666da13051 100644 --- a/l10n/es/user_ldap.po +++ b/l10n/es/user_ldap.po @@ -4,6 +4,7 @@ # # Translators: # Agustin Ferrario , 2013 +# Art O. Pal , 2014 # Jose Luis Tirado , 2014 # Maenso , 2013 # Raul Fernandez Garcia , 2013 @@ -16,9 +17,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-12 01:54-0400\n" -"PO-Revision-Date: 2014-04-12 05:55+0000\n" -"Last-Translator: I Robot\n" +"POT-Creation-Date: 2014-04-13 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 17:10+0000\n" +"Last-Translator: Art O. Pal \n" "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -345,7 +346,7 @@ msgstr "Conectar sólo con el servidor de réplica." #: templates/settings.php:26 msgid "Case insensitive LDAP server (Windows)" -msgstr "" +msgstr "Servidor de LDAP insensible a mayúsculas/minúsculas (Windows)" #: templates/settings.php:27 msgid "Turn off SSL certificate validation." diff --git a/l10n/fi_FI/settings.po b/l10n/fi_FI/settings.po index b5422267fb5..52eee42c968 100644 --- a/l10n/fi_FI/settings.po +++ b/l10n/fi_FI/settings.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-12 01:54-0400\n" -"PO-Revision-Date: 2014-04-12 05:54+0000\n" -"Last-Translator: I Robot\n" +"POT-Creation-Date: 2014-04-13 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 15:20+0000\n" +"Last-Translator: Jiri Grönroos \n" "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -87,17 +87,17 @@ msgstr "Ryhmän lisäys epäonnistui" #: ajax/decryptall.php:31 msgid "Files decrypted successfully" -msgstr "" +msgstr "Tiedostojen salaus purettiin onnistuneesti" #: ajax/decryptall.php:33 msgid "" "Couldn't decrypt your files, please check your owncloud.log or ask your " "administrator" -msgstr "" +msgstr "Tiedostojen salauksen purkaminen epäonnistui. Tarkista owncloud.log-tiedosto tai ota yhteys ylläpitäjään" #: ajax/decryptall.php:36 msgid "Couldn't decrypt your files, check your password and try again" -msgstr "" +msgstr "Tiedostojen salauksen purkaminen epäonnistui. Tarkista salasanasi ja yritä uudelleen" #: ajax/lostpassword.php:12 msgid "Email saved" diff --git a/l10n/fr/settings.po b/l10n/fr/settings.po index 858a81483c6..adcb6304380 100644 --- a/l10n/fr/settings.po +++ b/l10n/fr/settings.po @@ -11,16 +11,16 @@ # Mystyle , 2013 # ogre_sympathique , 2013 # red0ne , 2013 -# RyDroid , 2013 +# RyDroid , 2013-2014 # tcit , 2014 # PVince81 , 2014 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-12 01:54-0400\n" -"PO-Revision-Date: 2014-04-12 05:54+0000\n" -"Last-Translator: I Robot\n" +"POT-Creation-Date: 2014-04-13 01:54-0400\n" +"PO-Revision-Date: 2014-04-13 03:10+0000\n" +"Last-Translator: RyDroid \n" "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -97,17 +97,17 @@ msgstr "Impossible d'ajouter le groupe" #: ajax/decryptall.php:31 msgid "Files decrypted successfully" -msgstr "" +msgstr "Fichiers décryptés avec succès" #: ajax/decryptall.php:33 msgid "" "Couldn't decrypt your files, please check your owncloud.log or ask your " "administrator" -msgstr "" +msgstr "Impossible de décrypter vos fichiers, veuillez vérifier votre owncloud.log ou demander à votre administrateur" #: ajax/decryptall.php:36 msgid "Couldn't decrypt your files, check your password and try again" -msgstr "" +msgstr "Impossible de décrypter vos fichiers, vérifiez votre mot de passe et essayez à nouveau" #: ajax/lostpassword.php:12 msgid "Email saved" diff --git a/l10n/fr/user_ldap.po b/l10n/fr/user_ldap.po index 7d63bd7bc47..241e7c34217 100644 --- a/l10n/fr/user_ldap.po +++ b/l10n/fr/user_ldap.po @@ -6,13 +6,14 @@ # Christophe Lherieau , 2013-2014 # etiess , 2013 # plachance , 2013 +# RyDroid , 2014 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-12 01:54-0400\n" -"PO-Revision-Date: 2014-04-12 05:55+0000\n" -"Last-Translator: I Robot\n" +"POT-Creation-Date: 2014-04-13 01:54-0400\n" +"PO-Revision-Date: 2014-04-13 03:10+0000\n" +"Last-Translator: RyDroid \n" "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -339,7 +340,7 @@ msgstr "Se connecter uniquement au serveur de replica." #: templates/settings.php:26 msgid "Case insensitive LDAP server (Windows)" -msgstr "" +msgstr "Serveur LDAP insensible à la casse (Windows)" #: templates/settings.php:27 msgid "Turn off SSL certificate validation." diff --git a/l10n/gl/settings.po b/l10n/gl/settings.po index e3e5afbf144..cccd98ddb2b 100644 --- a/l10n/gl/settings.po +++ b/l10n/gl/settings.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-12 01:54-0400\n" -"PO-Revision-Date: 2014-04-12 05:54+0000\n" -"Last-Translator: I Robot\n" +"POT-Creation-Date: 2014-04-13 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 06:50+0000\n" +"Last-Translator: mbouzada \n" "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -88,17 +88,17 @@ msgstr "Non é posíbel engadir o grupo" #: ajax/decryptall.php:31 msgid "Files decrypted successfully" -msgstr "" +msgstr "Ficheiros descifrados satisfactoriamente" #: ajax/decryptall.php:33 msgid "" "Couldn't decrypt your files, please check your owncloud.log or ask your " "administrator" -msgstr "" +msgstr "Non foi posíbel descifrar os seus ficheiros. revise o ficheiro de rexistro owncloud.log, ou pregúntelle ao administrador" #: ajax/decryptall.php:36 msgid "Couldn't decrypt your files, check your password and try again" -msgstr "" +msgstr "Non foi posíbel descifrar os seus ficheiros. revise o seu contrasinal e ténteo de novo" #: ajax/lostpassword.php:12 msgid "Email saved" diff --git a/l10n/gl/user_ldap.po b/l10n/gl/user_ldap.po index cf1287f612b..572a9987f57 100644 --- a/l10n/gl/user_ldap.po +++ b/l10n/gl/user_ldap.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-12 01:54-0400\n" -"PO-Revision-Date: 2014-04-12 05:55+0000\n" -"Last-Translator: I Robot\n" +"POT-Creation-Date: 2014-04-13 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 06:50+0000\n" +"Last-Translator: mbouzada \n" "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -338,7 +338,7 @@ msgstr "Conectar só co servidor de réplica." #: templates/settings.php:26 msgid "Case insensitive LDAP server (Windows)" -msgstr "" +msgstr "Servidor LDAP non sensíbel a maiúsculas (Windows)" #: templates/settings.php:27 msgid "Turn off SSL certificate validation." diff --git a/l10n/it/settings.po b/l10n/it/settings.po index a2a0ae488f7..0a00b4fb4f4 100644 --- a/l10n/it/settings.po +++ b/l10n/it/settings.po @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-12 01:54-0400\n" -"PO-Revision-Date: 2014-04-12 05:54+0000\n" -"Last-Translator: I Robot\n" +"POT-Creation-Date: 2014-04-13 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 06:20+0000\n" +"Last-Translator: Vincenzo Reale \n" "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -90,17 +90,17 @@ msgstr "Impossibile aggiungere il gruppo" #: ajax/decryptall.php:31 msgid "Files decrypted successfully" -msgstr "" +msgstr "File decifrato correttamente" #: ajax/decryptall.php:33 msgid "" "Couldn't decrypt your files, please check your owncloud.log or ask your " "administrator" -msgstr "" +msgstr "Impossibile decifrare i tuoi file, controlla il file owncloud.log o chiedi al tuo amministratore" #: ajax/decryptall.php:36 msgid "Couldn't decrypt your files, check your password and try again" -msgstr "" +msgstr "Impossibile decifrare i tuoi file, controlla la password e prova ancora" #: ajax/lostpassword.php:12 msgid "Email saved" diff --git a/l10n/it/user_ldap.po b/l10n/it/user_ldap.po index ef4f4d218f6..f35b94fd38f 100644 --- a/l10n/it/user_ldap.po +++ b/l10n/it/user_ldap.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-12 01:54-0400\n" -"PO-Revision-Date: 2014-04-12 05:55+0000\n" -"Last-Translator: I Robot\n" +"POT-Creation-Date: 2014-04-13 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 06:20+0000\n" +"Last-Translator: Vincenzo Reale \n" "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -339,7 +339,7 @@ msgstr "Collegati solo al server di replica." #: templates/settings.php:26 msgid "Case insensitive LDAP server (Windows)" -msgstr "" +msgstr "Server LDAP non sensibile alle maiuscole (Windows)" #: templates/settings.php:27 msgid "Turn off SSL certificate validation." diff --git a/l10n/pl/settings.po b/l10n/pl/settings.po index ef51e8010b7..e82c049724d 100644 --- a/l10n/pl/settings.po +++ b/l10n/pl/settings.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-12 01:54-0400\n" -"PO-Revision-Date: 2014-04-12 05:54+0000\n" -"Last-Translator: I Robot\n" +"POT-Creation-Date: 2014-04-13 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 15:10+0000\n" +"Last-Translator: bobie \n" "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -89,17 +89,17 @@ msgstr "Nie można dodać grupy" #: ajax/decryptall.php:31 msgid "Files decrypted successfully" -msgstr "" +msgstr "Pliki zostały poprawnie zdeszyfrowane" #: ajax/decryptall.php:33 msgid "" "Couldn't decrypt your files, please check your owncloud.log or ask your " "administrator" -msgstr "" +msgstr "Nie można zdeszyfrować Twoich plików, proszę sprawdzić owncloud.log lub zapytać administratora" #: ajax/decryptall.php:36 msgid "Couldn't decrypt your files, check your password and try again" -msgstr "" +msgstr "Nie można zdeszyfrować Twoich plików, sprawdź swoje hasło i spróbuj ponownie" #: ajax/lostpassword.php:12 msgid "Email saved" diff --git a/l10n/pl/user_ldap.po b/l10n/pl/user_ldap.po index 2009fd7cc60..b758ae5b78f 100644 --- a/l10n/pl/user_ldap.po +++ b/l10n/pl/user_ldap.po @@ -12,9 +12,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-12 01:54-0400\n" -"PO-Revision-Date: 2014-04-12 05:55+0000\n" -"Last-Translator: I Robot\n" +"POT-Creation-Date: 2014-04-13 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 15:10+0000\n" +"Last-Translator: bobie \n" "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -343,7 +343,7 @@ msgstr "Połącz tylko do repliki serwera." #: templates/settings.php:26 msgid "Case insensitive LDAP server (Windows)" -msgstr "" +msgstr "Serwer LDAP nie rozróżniający wielkości liter (Windows)" #: templates/settings.php:27 msgid "Turn off SSL certificate validation." diff --git a/l10n/pt_BR/core.po b/l10n/pt_BR/core.po index a48b9dd777a..6e559dd45ac 100644 --- a/l10n/pt_BR/core.po +++ b/l10n/pt_BR/core.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-09 01:55-0400\n" -"PO-Revision-Date: 2014-04-08 10:40+0000\n" +"POT-Creation-Date: 2014-04-13 01:54-0400\n" +"PO-Revision-Date: 2014-04-13 03:10+0000\n" "Last-Translator: Flávio Veras \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n" "MIME-Version: 1.0\n" @@ -144,127 +144,127 @@ msgstr "Ajustes" msgid "Saving..." msgstr "Salvando..." -#: js/js.js:1124 +#: js/js.js:1099 msgid "seconds ago" msgstr "segundos atrás" -#: js/js.js:1125 +#: js/js.js:1100 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] " ha %n minuto" msgstr[1] "ha %n minutos" -#: js/js.js:1126 +#: js/js.js:1101 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "ha %n hora" msgstr[1] "ha %n horas" -#: js/js.js:1127 +#: js/js.js:1102 msgid "today" msgstr "hoje" -#: js/js.js:1128 +#: js/js.js:1103 msgid "yesterday" msgstr "ontem" -#: js/js.js:1129 +#: js/js.js:1104 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "ha %n dia" msgstr[1] "ha %n dias" -#: js/js.js:1130 +#: js/js.js:1105 msgid "last month" msgstr "último mês" -#: js/js.js:1131 +#: js/js.js:1106 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "ha %n mês" msgstr[1] "ha %n meses" -#: js/js.js:1132 +#: js/js.js:1107 msgid "months ago" msgstr "meses atrás" -#: js/js.js:1133 +#: js/js.js:1108 msgid "last year" msgstr "último ano" -#: js/js.js:1134 +#: js/js.js:1109 msgid "years ago" msgstr "anos atrás" -#: js/oc-dialogs.js:123 +#: js/oc-dialogs.js:125 msgid "Choose" msgstr "Escolha" -#: js/oc-dialogs.js:146 +#: js/oc-dialogs.js:151 msgid "Error loading file picker template: {error}" msgstr "Erro no seletor de carregamento modelo de arquivos: {error}" -#: js/oc-dialogs.js:172 +#: js/oc-dialogs.js:177 msgid "Yes" msgstr "Sim" -#: js/oc-dialogs.js:182 +#: js/oc-dialogs.js:187 msgid "No" msgstr "Não" -#: js/oc-dialogs.js:199 +#: js/oc-dialogs.js:204 msgid "Ok" msgstr "Ok" -#: js/oc-dialogs.js:219 +#: js/oc-dialogs.js:224 msgid "Error loading message template: {error}" msgstr "Erro no carregamento de modelo de mensagem: {error}" -#: js/oc-dialogs.js:347 +#: js/oc-dialogs.js:352 msgid "{count} file conflict" msgid_plural "{count} file conflicts" msgstr[0] "{count} conflito de arquivo" msgstr[1] "{count} conflitos de arquivos" -#: js/oc-dialogs.js:361 +#: js/oc-dialogs.js:366 msgid "One file conflict" msgstr "Conflito em um arquivo" -#: js/oc-dialogs.js:367 +#: js/oc-dialogs.js:372 msgid "New Files" msgstr "Novos Arquivos" -#: js/oc-dialogs.js:368 +#: js/oc-dialogs.js:373 msgid "Already existing files" msgstr "Arquivos já existentes" -#: js/oc-dialogs.js:370 +#: js/oc-dialogs.js:375 msgid "Which files do you want to keep?" msgstr "Qual arquivo você quer manter?" -#: js/oc-dialogs.js:371 +#: js/oc-dialogs.js:376 msgid "" "If you select both versions, the copied file will have a number added to its" " name." msgstr "Se você selecionar ambas as versões, o arquivo copiado terá um número adicionado ao seu nome." -#: js/oc-dialogs.js:379 +#: js/oc-dialogs.js:384 msgid "Cancel" msgstr "Cancelar" -#: js/oc-dialogs.js:389 +#: js/oc-dialogs.js:394 msgid "Continue" msgstr "Continuar" -#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +#: js/oc-dialogs.js:441 js/oc-dialogs.js:454 msgid "(all selected)" msgstr "(todos os selecionados)" -#: js/oc-dialogs.js:439 js/oc-dialogs.js:452 +#: js/oc-dialogs.js:444 js/oc-dialogs.js:457 msgid "({count} selected)" msgstr "({count} selecionados)" -#: js/oc-dialogs.js:460 +#: js/oc-dialogs.js:465 msgid "Error loading file exists template" msgstr "Erro ao carregar arquivo existe modelo" @@ -296,12 +296,12 @@ msgstr "Compartilhados" msgid "Share" msgstr "Compartilhar" -#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711 +#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:731 #: templates/installation.php:10 msgid "Error" msgstr "Erro" -#: js/share.js:160 js/share.js:767 +#: js/share.js:160 js/share.js:787 msgid "Error while sharing" msgstr "Erro ao compartilhar" @@ -365,71 +365,71 @@ msgstr "Compartilhar via e-mail:" msgid "No people found" msgstr "Nenhuma pessoa encontrada" -#: js/share.js:324 js/share.js:363 +#: js/share.js:324 js/share.js:383 msgid "group" msgstr "grupo" -#: js/share.js:335 +#: js/share.js:355 msgid "Resharing is not allowed" msgstr "Não é permitido re-compartilhar" -#: js/share.js:379 +#: js/share.js:399 msgid "Shared in {item} with {user}" msgstr "Compartilhado em {item} com {user}" -#: js/share.js:401 +#: js/share.js:421 msgid "Unshare" msgstr "Descompartilhar" -#: js/share.js:409 +#: js/share.js:429 msgid "notify by email" msgstr "notificar por e-mail" -#: js/share.js:412 +#: js/share.js:432 msgid "can edit" msgstr "pode editar" -#: js/share.js:414 +#: js/share.js:434 msgid "access control" msgstr "controle de acesso" -#: js/share.js:417 +#: js/share.js:437 msgid "create" msgstr "criar" -#: js/share.js:420 +#: js/share.js:440 msgid "update" msgstr "atualizar" -#: js/share.js:423 +#: js/share.js:443 msgid "delete" msgstr "remover" -#: js/share.js:426 +#: js/share.js:446 msgid "share" msgstr "compartilhar" -#: js/share.js:698 +#: js/share.js:718 msgid "Password protected" msgstr "Protegido com senha" -#: js/share.js:711 +#: js/share.js:731 msgid "Error unsetting expiration date" msgstr "Erro ao remover data de expiração" -#: js/share.js:729 +#: js/share.js:749 msgid "Error setting expiration date" msgstr "Erro ao definir data de expiração" -#: js/share.js:754 +#: js/share.js:774 msgid "Sending ..." msgstr "Enviando ..." -#: js/share.js:765 +#: js/share.js:785 msgid "Email sent" msgstr "E-mail enviado" -#: js/share.js:789 +#: js/share.js:809 msgid "Warning" msgstr "Aviso" diff --git a/l10n/pt_BR/settings.po b/l10n/pt_BR/settings.po index cc7719d2303..3bf361c5433 100644 --- a/l10n/pt_BR/settings.po +++ b/l10n/pt_BR/settings.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-12 01:54-0400\n" -"PO-Revision-Date: 2014-04-12 05:54+0000\n" -"Last-Translator: I Robot\n" +"POT-Creation-Date: 2014-04-13 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 16:30+0000\n" +"Last-Translator: Flávio Veras \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -88,17 +88,17 @@ msgstr "Não foi possível adicionar grupo" #: ajax/decryptall.php:31 msgid "Files decrypted successfully" -msgstr "" +msgstr "Arquivos descriptografados com sucesso" #: ajax/decryptall.php:33 msgid "" "Couldn't decrypt your files, please check your owncloud.log or ask your " "administrator" -msgstr "" +msgstr "Não foi possível descriptografar os arquivos, verifique a sua owncloud.log ou pergunte ao seu administrador" #: ajax/decryptall.php:36 msgid "Couldn't decrypt your files, check your password and try again" -msgstr "" +msgstr "Não foi possível descriptografar os arquivos, verifique sua senha e tente novamente" #: ajax/lostpassword.php:12 msgid "Email saved" diff --git a/l10n/pt_BR/user_ldap.po b/l10n/pt_BR/user_ldap.po index 887cae75e9b..b86ca612be9 100644 --- a/l10n/pt_BR/user_ldap.po +++ b/l10n/pt_BR/user_ldap.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-12 01:54-0400\n" -"PO-Revision-Date: 2014-04-12 05:55+0000\n" -"Last-Translator: I Robot\n" +"POT-Creation-Date: 2014-04-13 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 16:30+0000\n" +"Last-Translator: Flávio Veras \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -338,7 +338,7 @@ msgstr "Conectar-se somente ao servidor de réplica." #: templates/settings.php:26 msgid "Case insensitive LDAP server (Windows)" -msgstr "" +msgstr "Servidor LDAP(Windows) não distigue maiúscula de minúscula" #: templates/settings.php:27 msgid "Turn off SSL certificate validation." diff --git a/l10n/sv/files_external.po b/l10n/sv/files_external.po index a39d6384c3d..6fc4c5c725a 100644 --- a/l10n/sv/files_external.po +++ b/l10n/sv/files_external.po @@ -4,14 +4,15 @@ # # Translators: # AsavarTzeth , 2014 +# henrikhjelm , 2014 # medialabs, 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-09 01:55-0400\n" -"PO-Revision-Date: 2014-04-09 05:55+0000\n" -"Last-Translator: I Robot\n" +"POT-Creation-Date: 2014-04-13 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 11:30+0000\n" +"Last-Translator: henrikhjelm \n" "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -45,32 +46,32 @@ msgstr "Sparad" #: lib/config.php:592 msgid "Note: " -msgstr "" +msgstr " OBS: " #: lib/config.php:602 msgid " and " -msgstr "" +msgstr "och" #: lib/config.php:624 #, php-format msgid "" "Note: The cURL support in PHP is not enabled or installed. Mounting " "of %s is not possible. Please ask your system administrator to install it." -msgstr "" +msgstr " OBS: cURL stöd i PHP inte är aktiverat eller installeras. Montering av %s är inte möjlig. Be din systemadministratör för att installera det." #: lib/config.php:626 #, php-format msgid "" "Note: The FTP support in PHP is not enabled or installed. Mounting of" " %s is not possible. Please ask your system administrator to install it." -msgstr "" +msgstr " OBS: Den FTP-stöd i PHP inte är aktiverat eller installeras. Montering av %s är inte möjlig. Be din systemadministratör för att installera det." #: lib/config.php:628 #, php-format msgid "" "Note: \"%s\" is not installed. Mounting of %s is not possible. Please" " ask your system administrator to install it." -msgstr "" +msgstr " OBS: \"%s\" är inte installerat. Montering av %s är inte möjlig. Be din systemadministratör för att installera det." #: templates/settings.php:2 msgid "External Storage" diff --git a/l10n/sv/lib.po b/l10n/sv/lib.po index 07600270a14..3516cdfdd77 100644 --- a/l10n/sv/lib.po +++ b/l10n/sv/lib.po @@ -5,6 +5,7 @@ # Translators: # AsavarTzeth , 2014 # Daniel Sandman , 2013 +# henrikhjelm , 2014 # medialabs, 2013 # kallemooo , 2013 # Magnus Höglund , 2013 @@ -13,9 +14,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-10 01:54-0400\n" -"PO-Revision-Date: 2014-04-09 06:10+0000\n" -"Last-Translator: I Robot\n" +"POT-Creation-Date: 2014-04-13 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 11:20+0000\n" +"Last-Translator: henrikhjelm \n" "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -347,7 +348,7 @@ msgstr "år sedan" msgid "" "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", " "\"0-9\", and \"_.@-\"" -msgstr "" +msgstr "Endast följande tecken är tillåtna i ett användarnamn: \"az\", \"AZ\", \"0-9\", och \"_ @ -.\"" #: private/user/manager.php:251 msgid "A valid username must be provided" @@ -359,4 +360,4 @@ msgstr "Ett giltigt lösenord måste anges" #: private/user/manager.php:260 msgid "The username is already being used" -msgstr "" +msgstr "Användarnamnet används redan" diff --git a/l10n/sv/settings.po b/l10n/sv/settings.po index 8cd4062d844..fee602b13ca 100644 --- a/l10n/sv/settings.po +++ b/l10n/sv/settings.po @@ -7,6 +7,7 @@ # Daniel Sandman , 2013 # Gunnar Norin , 2013 # Gustav Smedberg , 2013 +# henrikhjelm , 2014 # Jan Busk, 2013 # Jan Busk, 2013 # medialabs, 2013 @@ -17,9 +18,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-12 01:54-0400\n" -"PO-Revision-Date: 2014-04-12 05:54+0000\n" -"Last-Translator: I Robot\n" +"POT-Creation-Date: 2014-04-13 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 11:20+0000\n" +"Last-Translator: henrikhjelm \n" "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -96,17 +97,17 @@ msgstr "Kan inte lägga till grupp" #: ajax/decryptall.php:31 msgid "Files decrypted successfully" -msgstr "" +msgstr "Filer dekrypteras utan fel" #: ajax/decryptall.php:33 msgid "" "Couldn't decrypt your files, please check your owncloud.log or ask your " "administrator" -msgstr "" +msgstr "Det gick inte att dekryptera dina filer, kontrollera din owncloud.log eller fråga administratören" #: ajax/decryptall.php:36 msgid "Couldn't decrypt your files, check your password and try again" -msgstr "" +msgstr "Det gick inte att dekryptera filerna, kontrollera ditt lösenord och försök igen" #: ajax/lostpassword.php:12 msgid "Email saved" diff --git a/l10n/sv/user_ldap.po b/l10n/sv/user_ldap.po index 5a1b50527e2..14716892026 100644 --- a/l10n/sv/user_ldap.po +++ b/l10n/sv/user_ldap.po @@ -6,6 +6,7 @@ # AsavarTzeth , 2014 # DanielMalmgren , 2013 # Gustav Smedberg , 2013 +# henrikhjelm , 2014 # Jan Busk, 2013 # Jonas Erlandsson , 2013 # kallemooo , 2013 @@ -16,9 +17,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-12 01:54-0400\n" -"PO-Revision-Date: 2014-04-12 05:55+0000\n" -"Last-Translator: I Robot\n" +"POT-Creation-Date: 2014-04-13 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 11:43+0000\n" +"Last-Translator: henrikhjelm \n" "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -345,7 +346,7 @@ msgstr "Anslut endast till replikaservern." #: templates/settings.php:26 msgid "Case insensitive LDAP server (Windows)" -msgstr "" +msgstr "om okänslig LDAP-server (Windows)" #: templates/settings.php:27 msgid "Turn off SSL certificate validation." diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot index 3c44e623bf1..41999c5c635 100644 --- a/l10n/templates/core.pot +++ b/l10n/templates/core.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"POT-Creation-Date: 2014-04-13 01:54-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot index 64c808c5c7a..ad5a0f5cf2d 100644 --- a/l10n/templates/files.pot +++ b/l10n/templates/files.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"POT-Creation-Date: 2014-04-13 01:54-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot index 4b990827d0d..fbc14254acf 100644 --- a/l10n/templates/files_encryption.pot +++ b/l10n/templates/files_encryption.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"POT-Creation-Date: 2014-04-13 01:54-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot index 1a4337a741e..3310a94ddcc 100644 --- a/l10n/templates/files_external.pot +++ b/l10n/templates/files_external.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"POT-Creation-Date: 2014-04-13 01:54-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot index 6b65617ab19..d13ba28969c 100644 --- a/l10n/templates/files_sharing.pot +++ b/l10n/templates/files_sharing.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"POT-Creation-Date: 2014-04-13 01:54-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_trashbin.pot b/l10n/templates/files_trashbin.pot index 0bbe995ada6..4d206960525 100644 --- a/l10n/templates/files_trashbin.pot +++ b/l10n/templates/files_trashbin.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"POT-Creation-Date: 2014-04-13 01:54-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot index a15d33b1b93..5fb1e4f151a 100644 --- a/l10n/templates/files_versions.pot +++ b/l10n/templates/files_versions.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"POT-Creation-Date: 2014-04-13 01:54-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot index b13e7788d02..bb59a77e49f 100644 --- a/l10n/templates/lib.pot +++ b/l10n/templates/lib.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"POT-Creation-Date: 2014-04-13 01:54-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/private.pot b/l10n/templates/private.pot index fe151138b41..81964303b21 100644 --- a/l10n/templates/private.pot +++ b/l10n/templates/private.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"POT-Creation-Date: 2014-04-13 01:54-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot index 4691fc81540..d89379830c4 100644 --- a/l10n/templates/settings.pot +++ b/l10n/templates/settings.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"POT-Creation-Date: 2014-04-13 01:54-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot index a1bd167ca18..489bfbbbb8f 100644 --- a/l10n/templates/user_ldap.pot +++ b/l10n/templates/user_ldap.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"POT-Creation-Date: 2014-04-13 01:54-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/user_webdavauth.pot b/l10n/templates/user_webdavauth.pot index 25424884d02..62ca0e1c873 100644 --- a/l10n/templates/user_webdavauth.pot +++ b/l10n/templates/user_webdavauth.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-12 01:54-0400\n" +"POT-Creation-Date: 2014-04-13 01:54-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/tr/settings.po b/l10n/tr/settings.po index d69df3145be..68115565daa 100644 --- a/l10n/tr/settings.po +++ b/l10n/tr/settings.po @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-12 01:54-0400\n" -"PO-Revision-Date: 2014-04-12 05:54+0000\n" -"Last-Translator: I Robot\n" +"POT-Creation-Date: 2014-04-13 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 13:40+0000\n" +"Last-Translator: volkangezer \n" "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -90,17 +90,17 @@ msgstr "Gruba eklenemiyor" #: ajax/decryptall.php:31 msgid "Files decrypted successfully" -msgstr "" +msgstr "Dosya şifresi başarıyla çözüldü" #: ajax/decryptall.php:33 msgid "" "Couldn't decrypt your files, please check your owncloud.log or ask your " "administrator" -msgstr "" +msgstr "Dosyalarınızın şifresi kaldırılamadı, lütfen owncloud.log dosyasına bakın veya yöneticinizle iletişime geçin." #: ajax/decryptall.php:36 msgid "Couldn't decrypt your files, check your password and try again" -msgstr "" +msgstr "Dosyalarınızın şifresi kaldırılamadı, parolanızı denetleyip yeniden deneyin." #: ajax/lostpassword.php:12 msgid "Email saved" diff --git a/l10n/tr/user_ldap.po b/l10n/tr/user_ldap.po index 2617ea1b58f..d5252c96abb 100644 --- a/l10n/tr/user_ldap.po +++ b/l10n/tr/user_ldap.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-12 01:54-0400\n" -"PO-Revision-Date: 2014-04-12 05:55+0000\n" -"Last-Translator: I Robot\n" +"POT-Creation-Date: 2014-04-13 01:54-0400\n" +"PO-Revision-Date: 2014-04-12 13:40+0000\n" +"Last-Translator: volkangezer \n" "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -339,7 +339,7 @@ msgstr "Sadece kopya sunucuya bağlan." #: templates/settings.php:26 msgid "Case insensitive LDAP server (Windows)" -msgstr "" +msgstr "Büyük küçük harf duyarsız LDAP sunucusu (Windows)" #: templates/settings.php:27 msgid "Turn off SSL certificate validation." diff --git a/lib/l10n/sv.php b/lib/l10n/sv.php index d8d47cc9666..70ca0bed383 100644 --- a/lib/l10n/sv.php +++ b/lib/l10n/sv.php @@ -67,7 +67,9 @@ $TRANSLATIONS = array( "_%n month ago_::_%n months ago_" => array("%n månad sedan","%n månader sedan"), "last year" => "förra året", "years ago" => "år sedan", +"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" => "Endast följande tecken är tillåtna i ett användarnamn: \"az\", \"AZ\", \"0-9\", och \"_ @ -.\"", "A valid username must be provided" => "Ett giltigt användarnamn måste anges", -"A valid password must be provided" => "Ett giltigt lösenord måste anges" +"A valid password must be provided" => "Ett giltigt lösenord måste anges", +"The username is already being used" => "Användarnamnet används redan" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/settings/l10n/de.php b/settings/l10n/de.php index 5af482b51a5..13395d20523 100644 --- a/settings/l10n/de.php +++ b/settings/l10n/de.php @@ -16,6 +16,9 @@ $TRANSLATIONS = array( "Unable to change full name" => "Der vollständige Name konnte nicht geändert werden", "Group already exists" => "Gruppe existiert bereits", "Unable to add group" => "Gruppe konnte nicht angelegt werden", +"Files decrypted successfully" => "Dateien erfolgreich entschlüsselt", +"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Dateien konnten nicht entschlüsselt werden, prüfe bitte Dein owncloud.log oder frage Deinen Administrator", +"Couldn't decrypt your files, check your password and try again" => "Dateien konnten nicht entschlüsselt werden, bitte prüfe Dein Passwort und versuche es erneut.", "Email saved" => "E-Mail Adresse gespeichert", "Invalid email" => "Ungültige E-Mail Adresse", "Unable to delete group" => "Gruppe konnte nicht gelöscht werden", diff --git a/settings/l10n/de_DE.php b/settings/l10n/de_DE.php index f79a8f174b2..2cfffdd374d 100644 --- a/settings/l10n/de_DE.php +++ b/settings/l10n/de_DE.php @@ -16,6 +16,9 @@ $TRANSLATIONS = array( "Unable to change full name" => "Der vollständige Name konnte nicht geändert werden", "Group already exists" => "Die Gruppe existiert bereits", "Unable to add group" => "Die Gruppe konnte nicht angelegt werden", +"Files decrypted successfully" => "Dateien erfolgreich entschlüsselt", +"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Dateien konnten nicht entschlüsselt werden, prüfen Sie bitte Ihre owncloud.log oder fragen Sie Ihren Administrator", +"Couldn't decrypt your files, check your password and try again" => "Dateien konnten nicht entschlüsselt werden, bitte prüfen Sie Ihr Passwort und versuchen Sie es erneut.", "Email saved" => "E-Mail-Adresse gespeichert", "Invalid email" => "Ungültige E-Mail-Adresse", "Unable to delete group" => "Die Gruppe konnte nicht gelöscht werden", diff --git a/settings/l10n/es.php b/settings/l10n/es.php index 5139b36e1b4..313808cdc78 100644 --- a/settings/l10n/es.php +++ b/settings/l10n/es.php @@ -16,6 +16,9 @@ $TRANSLATIONS = array( "Unable to change full name" => "No se puede cambiar el nombre completo", "Group already exists" => "El grupo ya existe", "Unable to add group" => "No se pudo añadir el grupo", +"Files decrypted successfully" => "Los archivos fueron descifrados", +"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "No se pudo descifrar sus archivos. Revise el owncloud.log o consulte con su administrador", +"Couldn't decrypt your files, check your password and try again" => "No se pudo descifrar sus archivos. Revise su contraseña e inténtelo de nuevo", "Email saved" => "Correo electrónico guardado", "Invalid email" => "Correo electrónico no válido", "Unable to delete group" => "No se pudo eliminar el grupo", diff --git a/settings/l10n/fi_FI.php b/settings/l10n/fi_FI.php index 7bef4092a43..bbceeb1983f 100644 --- a/settings/l10n/fi_FI.php +++ b/settings/l10n/fi_FI.php @@ -16,6 +16,9 @@ $TRANSLATIONS = array( "Unable to change full name" => "Koko nimen muuttaminen epäonnistui", "Group already exists" => "Ryhmä on jo olemassa", "Unable to add group" => "Ryhmän lisäys epäonnistui", +"Files decrypted successfully" => "Tiedostojen salaus purettiin onnistuneesti", +"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Tiedostojen salauksen purkaminen epäonnistui. Tarkista owncloud.log-tiedosto tai ota yhteys ylläpitäjään", +"Couldn't decrypt your files, check your password and try again" => "Tiedostojen salauksen purkaminen epäonnistui. Tarkista salasanasi ja yritä uudelleen", "Email saved" => "Sähköposti tallennettu", "Invalid email" => "Virheellinen sähköposti", "Unable to delete group" => "Ryhmän poisto epäonnistui", diff --git a/settings/l10n/fr.php b/settings/l10n/fr.php index 5c48c7fd75f..9475f6017fa 100644 --- a/settings/l10n/fr.php +++ b/settings/l10n/fr.php @@ -16,6 +16,9 @@ $TRANSLATIONS = array( "Unable to change full name" => "Impossible de changer le nom complet", "Group already exists" => "Ce groupe existe déjà", "Unable to add group" => "Impossible d'ajouter le groupe", +"Files decrypted successfully" => "Fichiers décryptés avec succès", +"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Impossible de décrypter vos fichiers, veuillez vérifier votre owncloud.log ou demander à votre administrateur", +"Couldn't decrypt your files, check your password and try again" => "Impossible de décrypter vos fichiers, vérifiez votre mot de passe et essayez à nouveau", "Email saved" => "E-mail sauvegardé", "Invalid email" => "E-mail invalide", "Unable to delete group" => "Impossible de supprimer le groupe", diff --git a/settings/l10n/gl.php b/settings/l10n/gl.php index 2d23efd96a3..e0abc8e95b8 100644 --- a/settings/l10n/gl.php +++ b/settings/l10n/gl.php @@ -16,6 +16,9 @@ $TRANSLATIONS = array( "Unable to change full name" => "Non é posíbel cambiar o nome completo", "Group already exists" => "O grupo xa existe", "Unable to add group" => "Non é posíbel engadir o grupo", +"Files decrypted successfully" => "Ficheiros descifrados satisfactoriamente", +"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Non foi posíbel descifrar os seus ficheiros. revise o ficheiro de rexistro owncloud.log, ou pregúntelle ao administrador", +"Couldn't decrypt your files, check your password and try again" => "Non foi posíbel descifrar os seus ficheiros. revise o seu contrasinal e ténteo de novo", "Email saved" => "Correo gardado", "Invalid email" => "Correo incorrecto", "Unable to delete group" => "Non é posíbel eliminar o grupo.", diff --git a/settings/l10n/it.php b/settings/l10n/it.php index 12fa6d097af..dd32d4029de 100644 --- a/settings/l10n/it.php +++ b/settings/l10n/it.php @@ -16,6 +16,9 @@ $TRANSLATIONS = array( "Unable to change full name" => "Impossibile cambiare il nome completo", "Group already exists" => "Il gruppo esiste già", "Unable to add group" => "Impossibile aggiungere il gruppo", +"Files decrypted successfully" => "File decifrato correttamente", +"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Impossibile decifrare i tuoi file, controlla il file owncloud.log o chiedi al tuo amministratore", +"Couldn't decrypt your files, check your password and try again" => "Impossibile decifrare i tuoi file, controlla la password e prova ancora", "Email saved" => "Email salvata", "Invalid email" => "Email non valida", "Unable to delete group" => "Impossibile eliminare il gruppo", diff --git a/settings/l10n/pl.php b/settings/l10n/pl.php index 640e1df9585..15df48bb311 100644 --- a/settings/l10n/pl.php +++ b/settings/l10n/pl.php @@ -16,6 +16,9 @@ $TRANSLATIONS = array( "Unable to change full name" => "Nie można zmienić pełnej nazwy", "Group already exists" => "Grupa już istnieje", "Unable to add group" => "Nie można dodać grupy", +"Files decrypted successfully" => "Pliki zostały poprawnie zdeszyfrowane", +"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Nie można zdeszyfrować Twoich plików, proszę sprawdzić owncloud.log lub zapytać administratora", +"Couldn't decrypt your files, check your password and try again" => "Nie można zdeszyfrować Twoich plików, sprawdź swoje hasło i spróbuj ponownie", "Email saved" => "E-mail zapisany", "Invalid email" => "Nieprawidłowy e-mail", "Unable to delete group" => "Nie można usunąć grupy", diff --git a/settings/l10n/pt_BR.php b/settings/l10n/pt_BR.php index dad6773d6af..bf15e99d426 100644 --- a/settings/l10n/pt_BR.php +++ b/settings/l10n/pt_BR.php @@ -16,6 +16,9 @@ $TRANSLATIONS = array( "Unable to change full name" => "Não é possível alterar o nome completo", "Group already exists" => "Grupo já existe", "Unable to add group" => "Não foi possível adicionar grupo", +"Files decrypted successfully" => "Arquivos descriptografados com sucesso", +"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Não foi possível descriptografar os arquivos, verifique a sua owncloud.log ou pergunte ao seu administrador", +"Couldn't decrypt your files, check your password and try again" => "Não foi possível descriptografar os arquivos, verifique sua senha e tente novamente", "Email saved" => "E-mail salvo", "Invalid email" => "E-mail inválido", "Unable to delete group" => "Não foi possível remover grupo", diff --git a/settings/l10n/sv.php b/settings/l10n/sv.php index 48f4428303c..b5c87945580 100644 --- a/settings/l10n/sv.php +++ b/settings/l10n/sv.php @@ -16,6 +16,9 @@ $TRANSLATIONS = array( "Unable to change full name" => "Kunde inte ändra hela namnet", "Group already exists" => "Gruppen finns redan", "Unable to add group" => "Kan inte lägga till grupp", +"Files decrypted successfully" => "Filer dekrypteras utan fel", +"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Det gick inte att dekryptera dina filer, kontrollera din owncloud.log eller fråga administratören", +"Couldn't decrypt your files, check your password and try again" => "Det gick inte att dekryptera filerna, kontrollera ditt lösenord och försök igen", "Email saved" => "E-post sparad", "Invalid email" => "Ogiltig e-post", "Unable to delete group" => "Kan inte radera grupp", diff --git a/settings/l10n/tr.php b/settings/l10n/tr.php index 728e573be2f..fa163ed137d 100644 --- a/settings/l10n/tr.php +++ b/settings/l10n/tr.php @@ -16,6 +16,9 @@ $TRANSLATIONS = array( "Unable to change full name" => "Tam adınız değiştirilirken hata", "Group already exists" => "Grup zaten mevcut", "Unable to add group" => "Gruba eklenemiyor", +"Files decrypted successfully" => "Dosya şifresi başarıyla çözüldü", +"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Dosyalarınızın şifresi kaldırılamadı, lütfen owncloud.log dosyasına bakın veya yöneticinizle iletişime geçin.", +"Couldn't decrypt your files, check your password and try again" => "Dosyalarınızın şifresi kaldırılamadı, parolanızı denetleyip yeniden deneyin.", "Email saved" => "E-posta kaydedildi", "Invalid email" => "Geçersiz e-posta", "Unable to delete group" => "Grup silinemiyor", -- GitLab From 2454759af785e89b1852e381ad9249db98dd304b Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Sun, 13 Apr 2014 11:01:50 +0200 Subject: [PATCH 106/253] Check whether the user has permissions to add personal storage backends --- apps/files_external/lib/config.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php index 613f0b2609c..71f6ae78878 100755 --- a/apps/files_external/lib/config.php +++ b/apps/files_external/lib/config.php @@ -206,6 +206,12 @@ class OC_Mount_Config { */ public static function getPersonalBackends() { + // Check whether the user has permissions to add personal storage backends + // return an empty array if this is not the case + if(OCP\Config::getAppValue('files_external', 'allow_user_mounting', 'yes') !== 'yes') { + return array(); + } + $backEnds = self::getBackends(); // Remove local storage and other disabled storages -- GitLab From df67a04385e64d2e14a7c0385289904d04b53301 Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Sun, 13 Apr 2014 11:51:03 +0200 Subject: [PATCH 107/253] Move security headers to base.php Some headers were currently only added to the templates but not to other components (e.g. SabreDAV / JSON / etc...) The migration to base.php ensures that the headers are served to all requests passing base.php --- lib/base.php | 31 +++++++++++++++++++++++++++++++ lib/private/template.php | 26 +------------------------- 2 files changed, 32 insertions(+), 25 deletions(-) diff --git a/lib/base.php b/lib/base.php index 6ea77aa7a58..34baba69d4c 100644 --- a/lib/base.php +++ b/lib/base.php @@ -213,6 +213,36 @@ class OC { } } + /* + * This function adds some security related headers to all requests + * served via base.php + * The implementation of this function as to happen here to ensure that + * all third-party components (e.g. SabreDAV) also benefit from this + * headers + */ + public static function addSecurityHeaders() { + header('X-XSS-Protection: 1; mode=block'); // Enforce browser based XSS filters + header('X-Content-Type-Options: nosniff'); // Disable sniffing the content type for IE + + // iFrame Restriction Policy + $xFramePolicy = OC_Config::getValue('xframe_restriction', true); + if($xFramePolicy) { + header('X-Frame-Options: Sameorigin'); // Disallow iFraming from other domains + } + + // Content Security Policy + // If you change the standard policy, please also change it in config.sample.php + $policy = OC_Config::getValue('custom_csp_policy', + 'default-src \'self\'; ' + .'script-src \'self\' \'unsafe-eval\'; ' + .'style-src \'self\' \'unsafe-inline\'; ' + .'frame-src *; ' + .'img-src *; ' + .'font-src \'self\' data:; ' + .'media-src *'); + header('Content-Security-Policy:'.$policy); + } + public static function checkSSL() { // redirect to https site if configured if (OC_Config::getValue("forcessl", false)) { @@ -512,6 +542,7 @@ class OC { self::checkConfig(); self::checkInstalled(); self::checkSSL(); + self::addSecurityHeaders(); $errors = OC_Util::checkServer(); if (count($errors) > 0) { diff --git a/lib/private/template.php b/lib/private/template.php index c6851c6cc8d..b7db5690955 100644 --- a/lib/private/template.php +++ b/lib/private/template.php @@ -64,31 +64,7 @@ class OC_Template extends \OC\Template\Base { $this->path = $path; parent::__construct($template, $requesttoken, $l10n, $themeDefaults); - - // Some headers to enhance security - header('X-XSS-Protection: 1; mode=block'); // Enforce browser based XSS filters - header('X-Content-Type-Options: nosniff'); // Disable sniffing the content type for IE - - // iFrame Restriction Policy - $xFramePolicy = OC_Config::getValue('xframe_restriction', true); - if($xFramePolicy) { - header('X-Frame-Options: Sameorigin'); // Disallow iFraming from other domains - } - - // Content Security Policy - // If you change the standard policy, please also change it in config.sample.php - $policy = OC_Config::getValue('custom_csp_policy', - 'default-src \'self\'; ' - .'script-src \'self\' \'unsafe-eval\'; ' - .'style-src \'self\' \'unsafe-inline\'; ' - .'frame-src *; ' - .'img-src *; ' - .'font-src \'self\' data:; ' - .'media-src *'); - header('Content-Security-Policy:'.$policy); // Standard - - } - +} /** * autodetect the formfactor of the used device * default -> the normal desktop browser interface -- GitLab From a2a850dd91664cbfeba50186d5219d90d62eadd2 Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Sun, 13 Apr 2014 11:52:31 +0200 Subject: [PATCH 108/253] Fix indentation --- lib/private/template.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/private/template.php b/lib/private/template.php index b7db5690955..610d5fbc8e5 100644 --- a/lib/private/template.php +++ b/lib/private/template.php @@ -64,7 +64,8 @@ class OC_Template extends \OC\Template\Base { $this->path = $path; parent::__construct($template, $requesttoken, $l10n, $themeDefaults); -} + } + /** * autodetect the formfactor of the used device * default -> the normal desktop browser interface -- GitLab From b04d95b1160673dbaa80ce214f22e931e8c93178 Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Sun, 13 Apr 2014 12:48:16 +0200 Subject: [PATCH 109/253] Remove uneeded usages of nosniff --- lib/private/json.php | 2 -- lib/public/appframework/http/jsonresponse.php | 1 - tests/lib/appframework/http/JSONResponseTest.php | 7 ------- 3 files changed, 10 deletions(-) diff --git a/lib/private/json.php b/lib/private/json.php index 4ccdb490a6c..34f81c3b8cf 100644 --- a/lib/private/json.php +++ b/lib/private/json.php @@ -119,8 +119,6 @@ class OC_JSON{ * Encode and print $data in json format */ public static function encodedPrint($data, $setContentType=true) { - // Disable mimesniffing, don't move this to setContentTypeHeader! - header( 'X-Content-Type-Options: nosniff' ); if($setContentType) { self::setContentTypeHeader(); } diff --git a/lib/public/appframework/http/jsonresponse.php b/lib/public/appframework/http/jsonresponse.php index 6628c4514d9..6d029b7464a 100644 --- a/lib/public/appframework/http/jsonresponse.php +++ b/lib/public/appframework/http/jsonresponse.php @@ -49,7 +49,6 @@ class JSONResponse extends Response { public function __construct($data=array(), $statusCode=Http::STATUS_OK) { $this->data = $data; $this->setStatus($statusCode); - $this->addHeader('X-Content-Type-Options', 'nosniff'); $this->addHeader('Content-type', 'application/json; charset=utf-8'); } diff --git a/tests/lib/appframework/http/JSONResponseTest.php b/tests/lib/appframework/http/JSONResponseTest.php index b9b7c7d6382..fbaae1b9227 100644 --- a/tests/lib/appframework/http/JSONResponseTest.php +++ b/tests/lib/appframework/http/JSONResponseTest.php @@ -79,13 +79,6 @@ class JSONResponseTest extends \PHPUnit_Framework_TestCase { $this->assertEquals($expected, $this->json->render()); } - - public function testShouldHaveXContentHeaderByDefault() { - $headers = $this->json->getHeaders(); - $this->assertEquals('nosniff', $headers['X-Content-Type-Options']); - } - - public function testConstructorAllowsToSetData() { $data = array('hi'); $code = 300; -- GitLab From 387d46cb988ba2e617de9ede0ff6fb8430e59758 Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Sun, 13 Apr 2014 12:54:26 +0200 Subject: [PATCH 110/253] Typo + Line breaks --- lib/base.php | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/lib/base.php b/lib/base.php index 34baba69d4c..5fb7b0b4675 100644 --- a/lib/base.php +++ b/lib/base.php @@ -214,11 +214,9 @@ class OC { } /* - * This function adds some security related headers to all requests - * served via base.php - * The implementation of this function as to happen here to ensure that - * all third-party components (e.g. SabreDAV) also benefit from this - * headers + * This function adds some security related headers to all requests served via base.php + * The implementation of this function as hto happen here to ensure that all third-party + * components (e.g. SabreDAV) also benefit from this headers. */ public static function addSecurityHeaders() { header('X-XSS-Protection: 1; mode=block'); // Enforce browser based XSS filters -- GitLab From fa8814902e9012880179e61ea846a7d85e3079f8 Mon Sep 17 00:00:00 2001 From: Robin McCorkell Date: Sun, 13 Apr 2014 13:47:08 +0100 Subject: [PATCH 111/253] Adjust logic for deciding if trashbin empty Any error in opening the trashbin directory returns 'true' for isEmpty. An error is prevented by checking if the directory exists before trying to open it. --- apps/files_trashbin/lib/trashbin.php | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/apps/files_trashbin/lib/trashbin.php b/apps/files_trashbin/lib/trashbin.php index 7b14a4ec081..bf8d465e5de 100644 --- a/apps/files_trashbin/lib/trashbin.php +++ b/apps/files_trashbin/lib/trashbin.php @@ -921,13 +921,11 @@ class Trashbin { public static function isEmpty($user) { $view = new \OC\Files\View('/' . $user . '/files_trashbin'); - $dh = $view->opendir('/files'); - if (!$dh) { - return false; - } - while ($file = readdir($dh)) { - if ($file !== '.' and $file !== '..') { - return false; + if ($view->is_dir('/files') && $dh = $view->opendir('/files')) { + while ($file = readdir($dh)) { + if ($file !== '.' and $file !== '..') { + return false; + } } } return true; -- GitLab From 869e7a51f0ed5b24c1ee0714112edb71e7dd1b62 Mon Sep 17 00:00:00 2001 From: Robin McCorkell Date: Sun, 13 Apr 2014 14:46:37 +0100 Subject: [PATCH 112/253] Prevent error in files_trashbin `glob` can return FALSE when the directory is empty, instead of an empty array, causing an error at `foreach`. "Note: On some systems it is impossible to distinguish between empty match and an error." See http://www.php.net/manual/en/function.glob.php -> Return Values --- apps/files_trashbin/lib/trashbin.php | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/apps/files_trashbin/lib/trashbin.php b/apps/files_trashbin/lib/trashbin.php index bf8d465e5de..9b931333b7f 100644 --- a/apps/files_trashbin/lib/trashbin.php +++ b/apps/files_trashbin/lib/trashbin.php @@ -824,13 +824,15 @@ class Trashbin { $matches = glob($escapedVersionsName . '*'); } - foreach ($matches as $ma) { - if ($timestamp) { - $parts = explode('.v', substr($ma, 0, $offset)); - $versions[] = (end($parts)); - } else { - $parts = explode('.v', $ma); - $versions[] = (end($parts)); + if (is_array($matches)) { + foreach ($matches as $ma) { + if ($timestamp) { + $parts = explode('.v', substr($ma, 0, $offset)); + $versions[] = (end($parts)); + } else { + $parts = explode('.v', $ma); + $versions[] = (end($parts)); + } } } return $versions; -- GitLab From eecc40069822cc0be03c5521c67d22b08887c847 Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Sun, 13 Apr 2014 16:18:05 +0200 Subject: [PATCH 113/253] p() and print_unescaped() also take arrays as parameter This fixes some scrutinizer issues. --- lib/private/template/functions.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/private/template/functions.php b/lib/private/template/functions.php index a72d41f72da..3c42d441efa 100644 --- a/lib/private/template/functions.php +++ b/lib/private/template/functions.php @@ -7,16 +7,17 @@ */ /** - * Prints an XSS escaped string - * @param string $string the string which will be escaped and printed + * Prints a sanitized string + * @param string|array $string the string which will be escaped and printed */ function p($string) { print(OC_Util::sanitizeHTML($string)); } /** - * Prints an unescaped string - * @param string $string the string which will be printed as it is + * Prints an unsanitized string - usage of this function may result into XSS. + * Consider using p() instead. + * @param string|array $string the string which will be printed as it is */ function print_unescaped($string) { print($string); -- GitLab From eeee9eacea333035e22ef3ed938e36f56bc762cd Mon Sep 17 00:00:00 2001 From: Robin McCorkell Date: Sun, 13 Apr 2014 16:17:13 +0100 Subject: [PATCH 114/253] Prevent error from cache update on deleted files --- lib/private/files/storage/local.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/private/files/storage/local.php b/lib/private/files/storage/local.php index 571bf7f97c1..ff2949d33b6 100644 --- a/lib/private/files/storage/local.php +++ b/lib/private/files/storage/local.php @@ -305,7 +305,11 @@ if (\OC_Util::runningOnWindows()) { * @return bool */ public function hasUpdated($path, $time) { - return $this->filemtime($path) > $time; + if ($this->file_exists($path)) { + return $this->filemtime($path) > $time; + } else { + return true; + } } /** -- GitLab From 8bb003868c9f319e387bf464a035a3b2fd123531 Mon Sep 17 00:00:00 2001 From: Robin McCorkell Date: Sun, 13 Apr 2014 16:49:23 +0100 Subject: [PATCH 115/253] Fix user_ldap default setting value --- apps/user_ldap/templates/settings.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/user_ldap/templates/settings.php b/apps/user_ldap/templates/settings.php index 0a111225a70..03f2b8db090 100644 --- a/apps/user_ldap/templates/settings.php +++ b/apps/user_ldap/templates/settings.php @@ -37,7 +37,7 @@

    -

    +

    t('Special Attributes'));?>

    -- GitLab From 440c040ffca1bd1a646d6664f6db15ed49e8dc4d Mon Sep 17 00:00:00 2001 From: Volkan Gezer Date: Sun, 13 Apr 2014 22:10:38 +0200 Subject: [PATCH 116/253] The latest developer manual link --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 618aa8d2009..1a832092776 100644 --- a/README.md +++ b/README.md @@ -25,4 +25,4 @@ Please submit translations via Transifex: https://www.transifex.com/projects/p/owncloud/ For more detailed information about translations: -http://doc.owncloud.org/server/6.0/developer_manual/core/translation.html +http://doc.owncloud.org/server/7.0/developer_manual/core/translation.html -- GitLab From d93b5f9927a063ef35305e3da833302a2b6ab235 Mon Sep 17 00:00:00 2001 From: Volkan Gezer Date: Sun, 13 Apr 2014 23:24:00 +0200 Subject: [PATCH 117/253] The latest developer manual link --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1a832092776..0b13f11e768 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ Git master: [![Build Status](https://ci.owncloud.org/job/server-master-linux/bad Quality: [![Scrutinizer Quality Score](https://scrutinizer-ci.com/g/owncloud/core/badges/quality-score.png?s=ce2f5ded03d4ac628e9ee5c767243fa7412e644f)](https://scrutinizer-ci.com/g/owncloud/core/) ### Installation instructions -http://doc.owncloud.org/server/6.0/developer_manual/app/index.html +http://doc.owncloud.org/server/7.0/developer_manual/app/index.html ### Contribution Guidelines http://owncloud.org/contribute/ -- GitLab From 2a2aabbdafc11fac687cb69d4804e6d03df882c2 Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Mon, 14 Apr 2014 01:55:09 -0400 Subject: [PATCH 118/253] [tx-robot] updated from transifex --- apps/files_encryption/l10n/km.php | 11 +++ apps/files_external/l10n/km.php | 1 + apps/user_ldap/l10n/nl.php | 1 + l10n/cs_CZ/core.po | 100 ++++++++++++++-------------- l10n/cs_CZ/files_encryption.po | 46 ++++++------- l10n/cs_CZ/lib.po | 26 ++++---- l10n/cs_CZ/settings.po | 12 ++-- l10n/cs_CZ/user_ldap.po | 6 +- l10n/de/lib.po | 24 +++---- l10n/de_DE/lib.po | 24 +++---- l10n/km/files_encryption.po | 63 +++++++++--------- l10n/km/files_external.po | 16 ++--- l10n/km/settings.po | 10 +-- l10n/nl/settings.po | 12 ++-- l10n/nl/user_ldap.po | 8 +-- l10n/templates/core.pot | 2 +- l10n/templates/files.pot | 2 +- l10n/templates/files_encryption.pot | 2 +- l10n/templates/files_external.pot | 12 ++-- l10n/templates/files_sharing.pot | 2 +- l10n/templates/files_trashbin.pot | 2 +- l10n/templates/files_versions.pot | 2 +- l10n/templates/lib.pot | 22 +++--- l10n/templates/private.pot | 22 +++--- l10n/templates/settings.pot | 2 +- l10n/templates/user_ldap.pot | 2 +- l10n/templates/user_webdavauth.pot | 2 +- settings/l10n/cs_CZ.php | 6 +- settings/l10n/km.php | 2 + settings/l10n/nl.php | 3 + 30 files changed, 232 insertions(+), 213 deletions(-) create mode 100644 apps/files_encryption/l10n/km.php diff --git a/apps/files_encryption/l10n/km.php b/apps/files_encryption/l10n/km.php new file mode 100644 index 00000000000..0defe6c5388 --- /dev/null +++ b/apps/files_encryption/l10n/km.php @@ -0,0 +1,11 @@ + "បាន​ប្ដូរ​ពាក្យ​សម្ងាត់​ដោយ​ជោគជ័យ។", +"Could not change the password. Maybe the old password was not correct." => "មិន​អាច​ប្ដូរ​ពាក្យ​សម្ងាត់​បាន​ទេ។ ប្រហែល​ពាក្យ​សម្ងាត់​ចាស់​មិន​ត្រឹម​ត្រូវ។", +"personal settings" => "ការ​កំណត់​ផ្ទាល់​ខ្លួន", +"Encryption" => "កូដនីយកម្ម", +"Enabled" => "បាន​បើក", +"Disabled" => "បាន​បិទ", +"Change Password" => "ប្ដូរ​ពាក្យ​សម្ងាត់" +); +$PLURAL_FORMS = "nplurals=1; plural=0;"; diff --git a/apps/files_external/l10n/km.php b/apps/files_external/l10n/km.php index 4586f866a74..75879f2300e 100644 --- a/apps/files_external/l10n/km.php +++ b/apps/files_external/l10n/km.php @@ -1,6 +1,7 @@ "ឈ្មោះ​ថត", +"Options" => "ជម្រើស", "Groups" => "ក្រុ", "Users" => "អ្នកប្រើ", "Delete" => "លុប" diff --git a/apps/user_ldap/l10n/nl.php b/apps/user_ldap/l10n/nl.php index 5698f8a6f1d..196e5a52d12 100644 --- a/apps/user_ldap/l10n/nl.php +++ b/apps/user_ldap/l10n/nl.php @@ -70,6 +70,7 @@ $TRANSLATIONS = array( "Backup (Replica) Port" => "Backup (Replica) Poort", "Disable Main Server" => "Deactiveren hoofdserver", "Only connect to the replica server." => "Maak alleen een verbinding met de replica server.", +"Case insensitive LDAP server (Windows)" => "Niet-hoofdlettergevoelige LDAP server (Windows)", "Turn off SSL certificate validation." => "Schakel SSL certificaat validatie uit.", "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." => "Niet aanbevolen, gebruik alleen om te testen! Als de connectie alleen werkt met deze optie, importeer dan het SSL-certificaat van de LDAP-server naar uw %s server.", "Cache Time-To-Live" => "Cache time-to-live", diff --git a/l10n/cs_CZ/core.po b/l10n/cs_CZ/core.po index b57e1632d7e..8f7ae14b9d5 100644 --- a/l10n/cs_CZ/core.po +++ b/l10n/cs_CZ/core.po @@ -15,9 +15,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-09 01:55-0400\n" -"PO-Revision-Date: 2014-04-08 06:10+0000\n" -"Last-Translator: I Robot\n" +"POT-Creation-Date: 2014-04-14 01:54-0400\n" +"PO-Revision-Date: 2014-04-14 04:55+0000\n" +"Last-Translator: pstast \n" "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -150,132 +150,132 @@ msgstr "Nastavení" msgid "Saving..." msgstr "Ukládám..." -#: js/js.js:1124 +#: js/js.js:1099 msgid "seconds ago" msgstr "před pár vteřinami" -#: js/js.js:1125 +#: js/js.js:1100 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "před %n minutou" msgstr[1] "před %n minutami" msgstr[2] "před %n minutami" -#: js/js.js:1126 +#: js/js.js:1101 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "před %n hodinou" msgstr[1] "před %n hodinami" msgstr[2] "před %n hodinami" -#: js/js.js:1127 +#: js/js.js:1102 msgid "today" msgstr "dnes" -#: js/js.js:1128 +#: js/js.js:1103 msgid "yesterday" msgstr "včera" -#: js/js.js:1129 +#: js/js.js:1104 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "před %n dnem" msgstr[1] "před %n dny" msgstr[2] "před %n dny" -#: js/js.js:1130 +#: js/js.js:1105 msgid "last month" msgstr "minulý měsíc" -#: js/js.js:1131 +#: js/js.js:1106 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "před %n měsícem" msgstr[1] "před %n měsíci" msgstr[2] "před %n měsíci" -#: js/js.js:1132 +#: js/js.js:1107 msgid "months ago" msgstr "před měsíci" -#: js/js.js:1133 +#: js/js.js:1108 msgid "last year" msgstr "minulý rok" -#: js/js.js:1134 +#: js/js.js:1109 msgid "years ago" msgstr "před lety" -#: js/oc-dialogs.js:123 +#: js/oc-dialogs.js:125 msgid "Choose" msgstr "Vybrat" -#: js/oc-dialogs.js:146 +#: js/oc-dialogs.js:151 msgid "Error loading file picker template: {error}" msgstr "Chyba při nahrávání šablony výběru souborů: {error}" -#: js/oc-dialogs.js:172 +#: js/oc-dialogs.js:177 msgid "Yes" msgstr "Ano" -#: js/oc-dialogs.js:182 +#: js/oc-dialogs.js:187 msgid "No" msgstr "Ne" -#: js/oc-dialogs.js:199 +#: js/oc-dialogs.js:204 msgid "Ok" msgstr "Ok" -#: js/oc-dialogs.js:219 +#: js/oc-dialogs.js:224 msgid "Error loading message template: {error}" msgstr "Chyba při nahrávání šablony zprávy: {error}" -#: js/oc-dialogs.js:347 +#: js/oc-dialogs.js:352 msgid "{count} file conflict" msgid_plural "{count} file conflicts" msgstr[0] "{count} souborový konflikt" msgstr[1] "{count} souborové konflikty" msgstr[2] "{count} souborových konfliktů" -#: js/oc-dialogs.js:361 +#: js/oc-dialogs.js:366 msgid "One file conflict" msgstr "Jeden konflikt souboru" -#: js/oc-dialogs.js:367 +#: js/oc-dialogs.js:372 msgid "New Files" msgstr "Nové soubory" -#: js/oc-dialogs.js:368 +#: js/oc-dialogs.js:373 msgid "Already existing files" msgstr "" -#: js/oc-dialogs.js:370 +#: js/oc-dialogs.js:375 msgid "Which files do you want to keep?" msgstr "Které soubory chcete ponechat?" -#: js/oc-dialogs.js:371 +#: js/oc-dialogs.js:376 msgid "" "If you select both versions, the copied file will have a number added to its" " name." msgstr "Pokud zvolíte obě verze, zkopírovaný soubor bude mít název doplněný o číslo." -#: js/oc-dialogs.js:379 +#: js/oc-dialogs.js:384 msgid "Cancel" msgstr "Zrušit" -#: js/oc-dialogs.js:389 +#: js/oc-dialogs.js:394 msgid "Continue" msgstr "Pokračovat" -#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +#: js/oc-dialogs.js:441 js/oc-dialogs.js:454 msgid "(all selected)" msgstr "(vybráno vše)" -#: js/oc-dialogs.js:439 js/oc-dialogs.js:452 +#: js/oc-dialogs.js:444 js/oc-dialogs.js:457 msgid "({count} selected)" msgstr "(vybráno {count})" -#: js/oc-dialogs.js:460 +#: js/oc-dialogs.js:465 msgid "Error loading file exists template" msgstr "Chyba při nahrávání šablony existence souboru" @@ -307,12 +307,12 @@ msgstr "Sdílené" msgid "Share" msgstr "Sdílet" -#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711 +#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:731 #: templates/installation.php:10 msgid "Error" msgstr "Chyba" -#: js/share.js:160 js/share.js:767 +#: js/share.js:160 js/share.js:787 msgid "Error while sharing" msgstr "Chyba při sdílení" @@ -376,71 +376,71 @@ msgstr "Sdílet e-mailem:" msgid "No people found" msgstr "Žádní lidé nenalezeni" -#: js/share.js:324 js/share.js:363 +#: js/share.js:324 js/share.js:383 msgid "group" msgstr "skupina" -#: js/share.js:335 +#: js/share.js:355 msgid "Resharing is not allowed" msgstr "Sdílení již sdílené položky není povoleno" -#: js/share.js:379 +#: js/share.js:399 msgid "Shared in {item} with {user}" msgstr "Sdíleno v {item} s {user}" -#: js/share.js:401 +#: js/share.js:421 msgid "Unshare" msgstr "Zrušit sdílení" -#: js/share.js:409 +#: js/share.js:429 msgid "notify by email" msgstr "upozornit e-mailem" -#: js/share.js:412 +#: js/share.js:432 msgid "can edit" msgstr "lze upravovat" -#: js/share.js:414 +#: js/share.js:434 msgid "access control" msgstr "řízení přístupu" -#: js/share.js:417 +#: js/share.js:437 msgid "create" msgstr "vytvořit" -#: js/share.js:420 +#: js/share.js:440 msgid "update" msgstr "aktualizovat" -#: js/share.js:423 +#: js/share.js:443 msgid "delete" msgstr "smazat" -#: js/share.js:426 +#: js/share.js:446 msgid "share" msgstr "sdílet" -#: js/share.js:698 +#: js/share.js:718 msgid "Password protected" msgstr "Chráněno heslem" -#: js/share.js:711 +#: js/share.js:731 msgid "Error unsetting expiration date" msgstr "Chyba při odstraňování data vypršení platnosti" -#: js/share.js:729 +#: js/share.js:749 msgid "Error setting expiration date" msgstr "Chyba při nastavení data vypršení platnosti" -#: js/share.js:754 +#: js/share.js:774 msgid "Sending ..." msgstr "Odesílám ..." -#: js/share.js:765 +#: js/share.js:785 msgid "Email sent" msgstr "E-mail odeslán" -#: js/share.js:789 +#: js/share.js:809 msgid "Warning" msgstr "Varování" diff --git a/l10n/cs_CZ/files_encryption.po b/l10n/cs_CZ/files_encryption.po index 27f50770daf..79a16d3cee8 100644 --- a/l10n/cs_CZ/files_encryption.po +++ b/l10n/cs_CZ/files_encryption.po @@ -13,8 +13,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-03-24 01:55-0400\n" -"PO-Revision-Date: 2014-03-23 22:41+0000\n" +"POT-Creation-Date: 2014-04-14 01:54-0400\n" +"PO-Revision-Date: 2014-04-14 04:55+0000\n" "Last-Translator: pstast \n" "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n" "MIME-Version: 1.0\n" @@ -117,91 +117,91 @@ msgstr "Běžte přímo do vašeho" msgid "personal settings" msgstr "osobní nastavení" -#: templates/settings-admin.php:4 templates/settings-personal.php:3 +#: templates/settings-admin.php:2 templates/settings-personal.php:2 msgid "Encryption" msgstr "Šifrování" -#: templates/settings-admin.php:7 +#: templates/settings-admin.php:5 msgid "" "Enable recovery key (allow to recover users files in case of password loss):" msgstr "Povolit klíč pro obnovu (umožňuje obnovu uživatelských souborů v případě ztráty hesla)" -#: templates/settings-admin.php:11 +#: templates/settings-admin.php:9 msgid "Recovery key password" msgstr "Heslo klíče pro obnovu" -#: templates/settings-admin.php:14 +#: templates/settings-admin.php:12 msgid "Repeat Recovery key password" msgstr "Zopakujte heslo klíče pro obnovu" -#: templates/settings-admin.php:21 templates/settings-personal.php:51 +#: templates/settings-admin.php:19 templates/settings-personal.php:50 msgid "Enabled" msgstr "Povoleno" -#: templates/settings-admin.php:29 templates/settings-personal.php:59 +#: templates/settings-admin.php:27 templates/settings-personal.php:58 msgid "Disabled" msgstr "Zakázáno" -#: templates/settings-admin.php:34 +#: templates/settings-admin.php:32 msgid "Change recovery key password:" msgstr "Změna hesla klíče pro obnovu:" -#: templates/settings-admin.php:40 +#: templates/settings-admin.php:38 msgid "Old Recovery key password" msgstr "Původní heslo klíče pro obnovu" -#: templates/settings-admin.php:47 +#: templates/settings-admin.php:45 msgid "New Recovery key password" msgstr "Nové heslo klíče pro obnovu" -#: templates/settings-admin.php:53 +#: templates/settings-admin.php:51 msgid "Repeat New Recovery key password" msgstr "Zopakujte nové heslo klíče pro obnovu" -#: templates/settings-admin.php:58 +#: templates/settings-admin.php:56 msgid "Change Password" msgstr "Změnit heslo" -#: templates/settings-personal.php:9 +#: templates/settings-personal.php:8 msgid "Your private key password no longer match your log-in password:" msgstr "Heslo vašeho soukromého klíče se již neshoduje s vaším přihlašovacím heslem:" -#: templates/settings-personal.php:12 +#: templates/settings-personal.php:11 msgid "Set your old private key password to your current log-in password." msgstr "Změňte heslo vaše soukromého klíče na stejné jako vaše přihlašovací heslo." -#: templates/settings-personal.php:14 +#: templates/settings-personal.php:13 msgid "" " If you don't remember your old password you can ask your administrator to " "recover your files." msgstr "Pokud si nepamatujete vaše původní heslo, můžete požádat správce o obnovu vašich souborů." -#: templates/settings-personal.php:22 +#: templates/settings-personal.php:21 msgid "Old log-in password" msgstr "Původní přihlašovací heslo" -#: templates/settings-personal.php:28 +#: templates/settings-personal.php:27 msgid "Current log-in password" msgstr "Aktuální přihlašovací heslo" -#: templates/settings-personal.php:33 +#: templates/settings-personal.php:32 msgid "Update Private Key Password" msgstr "Změnit heslo soukromého klíče" -#: templates/settings-personal.php:42 +#: templates/settings-personal.php:41 msgid "Enable password recovery:" msgstr "Povolit obnovu hesla:" -#: templates/settings-personal.php:44 +#: templates/settings-personal.php:43 msgid "" "Enabling this option will allow you to reobtain access to your encrypted " "files in case of password loss" msgstr "Zapnutí této volby vám umožní znovu získat přístup k vašim zašifrovaným souborům pokud ztratíte heslo" -#: templates/settings-personal.php:60 +#: templates/settings-personal.php:59 msgid "File recovery settings updated" msgstr "Možnosti záchrany souborů aktualizovány" -#: templates/settings-personal.php:61 +#: templates/settings-personal.php:60 msgid "Could not update file recovery" msgstr "Nelze nastavit záchranu souborů" diff --git a/l10n/cs_CZ/lib.po b/l10n/cs_CZ/lib.po index 92e8e85cb40..18418dadda2 100644 --- a/l10n/cs_CZ/lib.po +++ b/l10n/cs_CZ/lib.po @@ -12,9 +12,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-10 01:54-0400\n" -"PO-Revision-Date: 2014-04-09 06:10+0000\n" -"Last-Translator: I Robot\n" +"POT-Creation-Date: 2014-04-14 01:54-0400\n" +"PO-Revision-Date: 2014-04-14 04:55+0000\n" +"Last-Translator: pstast \n" "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -294,55 +294,55 @@ msgstr "%s s vámi sdílí »%s«" msgid "Could not find category \"%s\"" msgstr "Nelze nalézt kategorii \"%s\"" -#: private/template/functions.php:133 +#: private/template/functions.php:134 msgid "seconds ago" msgstr "před pár sekundami" -#: private/template/functions.php:134 +#: private/template/functions.php:135 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "před %n minutou" msgstr[1] "před %n minutami" msgstr[2] "před %n minutami" -#: private/template/functions.php:135 +#: private/template/functions.php:136 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "před %n hodinou" msgstr[1] "před %n hodinami" msgstr[2] "před %n hodinami" -#: private/template/functions.php:136 +#: private/template/functions.php:137 msgid "today" msgstr "dnes" -#: private/template/functions.php:137 +#: private/template/functions.php:138 msgid "yesterday" msgstr "včera" -#: private/template/functions.php:139 +#: private/template/functions.php:140 msgid "%n day go" msgid_plural "%n days ago" msgstr[0] "před %n dnem" msgstr[1] "před %n dny" msgstr[2] "před %n dny" -#: private/template/functions.php:141 +#: private/template/functions.php:142 msgid "last month" msgstr "minulý měsíc" -#: private/template/functions.php:142 +#: private/template/functions.php:143 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "před %n měsícem" msgstr[1] "před %n měsíci" msgstr[2] "před %n měsíci" -#: private/template/functions.php:144 +#: private/template/functions.php:145 msgid "last year" msgstr "minulý rok" -#: private/template/functions.php:145 +#: private/template/functions.php:146 msgid "years ago" msgstr "před lety" diff --git a/l10n/cs_CZ/settings.po b/l10n/cs_CZ/settings.po index bec55e22dce..9d72db957be 100644 --- a/l10n/cs_CZ/settings.po +++ b/l10n/cs_CZ/settings.po @@ -14,9 +14,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-12 01:54-0400\n" -"PO-Revision-Date: 2014-04-12 05:54+0000\n" -"Last-Translator: I Robot\n" +"POT-Creation-Date: 2014-04-14 01:54-0400\n" +"PO-Revision-Date: 2014-04-14 05:10+0000\n" +"Last-Translator: pstast \n" "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -450,14 +450,14 @@ msgstr "Cron" #: templates/admin.php:167 #, php-format msgid "Last cron was executed at %s." -msgstr "Poslední cron byl spuštěn v %s." +msgstr "Poslední cron byl spuštěn v %s" #: templates/admin.php:170 #, php-format msgid "" "Last cron was executed at %s. This is more than an hour ago, something seems" " wrong." -msgstr "Poslední cron byl spuštěn v %s. To se stalo před více než hodinu. Vypadá to, že není něco v pořádku." +msgstr "Poslední cron byl spuštěn v %s. To je více než před hodinou. Vypadá to, že není něco v pořádku." #: templates/admin.php:174 msgid "Cron was not executed yet!" @@ -725,7 +725,7 @@ msgstr "Vaše e-mailová adresa" msgid "" "Fill in an email address to enable password recovery and receive " "notifications" -msgstr "Zadejte e-mailovou adresu pro umožnění obnovy zapomenutého hesla a pro přijímání upozornění." +msgstr "Zadejte e-mailovou adresu pro umožnění obnovy zapomenutého hesla a pro přijímání upozornění" #: templates/personal.php:89 msgid "Profile picture" diff --git a/l10n/cs_CZ/user_ldap.po b/l10n/cs_CZ/user_ldap.po index 43b906dd51f..47968c19eec 100644 --- a/l10n/cs_CZ/user_ldap.po +++ b/l10n/cs_CZ/user_ldap.po @@ -13,9 +13,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-12 01:54-0400\n" -"PO-Revision-Date: 2014-04-12 05:55+0000\n" -"Last-Translator: I Robot\n" +"POT-Creation-Date: 2014-04-14 01:54-0400\n" +"PO-Revision-Date: 2014-04-14 05:06+0000\n" +"Last-Translator: pstast \n" "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff --git a/l10n/de/lib.po b/l10n/de/lib.po index 1c19e3ca284..6325eb843cc 100644 --- a/l10n/de/lib.po +++ b/l10n/de/lib.po @@ -13,8 +13,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-10 01:54-0400\n" -"PO-Revision-Date: 2014-04-09 08:50+0000\n" +"POT-Creation-Date: 2014-04-14 01:54-0400\n" +"PO-Revision-Date: 2014-04-13 20:56+0000\n" "Last-Translator: I Robot\n" "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n" "MIME-Version: 1.0\n" @@ -295,51 +295,51 @@ msgstr "%s teilte »%s« mit Dir" msgid "Could not find category \"%s\"" msgstr "Die Kategorie \"%s\" konnte nicht gefunden werden." -#: private/template/functions.php:133 +#: private/template/functions.php:134 msgid "seconds ago" msgstr "Gerade eben" -#: private/template/functions.php:134 +#: private/template/functions.php:135 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "Vor %n Minute" msgstr[1] "Vor %n Minuten" -#: private/template/functions.php:135 +#: private/template/functions.php:136 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "Vor %n Stunde" msgstr[1] "Vor %n Stunden" -#: private/template/functions.php:136 +#: private/template/functions.php:137 msgid "today" msgstr "Heute" -#: private/template/functions.php:137 +#: private/template/functions.php:138 msgid "yesterday" msgstr "Gestern" -#: private/template/functions.php:139 +#: private/template/functions.php:140 msgid "%n day go" msgid_plural "%n days ago" msgstr[0] "Vor %n Tag" msgstr[1] "Vor %n Tagen" -#: private/template/functions.php:141 +#: private/template/functions.php:142 msgid "last month" msgstr "Letzten Monat" -#: private/template/functions.php:142 +#: private/template/functions.php:143 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "Vor %n Monat" msgstr[1] "Vor %n Monaten" -#: private/template/functions.php:144 +#: private/template/functions.php:145 msgid "last year" msgstr "Letztes Jahr" -#: private/template/functions.php:145 +#: private/template/functions.php:146 msgid "years ago" msgstr "Vor Jahren" diff --git a/l10n/de_DE/lib.po b/l10n/de_DE/lib.po index 94fe0bdbef2..a33e633646b 100644 --- a/l10n/de_DE/lib.po +++ b/l10n/de_DE/lib.po @@ -13,8 +13,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-10 01:54-0400\n" -"PO-Revision-Date: 2014-04-09 08:50+0000\n" +"POT-Creation-Date: 2014-04-14 01:54-0400\n" +"PO-Revision-Date: 2014-04-13 20:58+0000\n" "Last-Translator: I Robot\n" "Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n" "MIME-Version: 1.0\n" @@ -295,51 +295,51 @@ msgstr "%s hat »%s« mit Ihnen geteilt" msgid "Could not find category \"%s\"" msgstr "Die Kategorie \"%s\" konnte nicht gefunden werden." -#: private/template/functions.php:133 +#: private/template/functions.php:134 msgid "seconds ago" msgstr "Gerade eben" -#: private/template/functions.php:134 +#: private/template/functions.php:135 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "Vor %n Minute" msgstr[1] "Vor %n Minuten" -#: private/template/functions.php:135 +#: private/template/functions.php:136 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "Vor %n Stunde" msgstr[1] "Vor %n Stunden" -#: private/template/functions.php:136 +#: private/template/functions.php:137 msgid "today" msgstr "Heute" -#: private/template/functions.php:137 +#: private/template/functions.php:138 msgid "yesterday" msgstr "Gestern" -#: private/template/functions.php:139 +#: private/template/functions.php:140 msgid "%n day go" msgid_plural "%n days ago" msgstr[0] "Vor %n Tag" msgstr[1] "Vor %n Tagen" -#: private/template/functions.php:141 +#: private/template/functions.php:142 msgid "last month" msgstr "Letzten Monat" -#: private/template/functions.php:142 +#: private/template/functions.php:143 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "Vor %n Monat" msgstr[1] "Vor %n Monaten" -#: private/template/functions.php:144 +#: private/template/functions.php:145 msgid "last year" msgstr "Letztes Jahr" -#: private/template/functions.php:145 +#: private/template/functions.php:146 msgid "years ago" msgstr "Vor Jahren" diff --git a/l10n/km/files_encryption.po b/l10n/km/files_encryption.po index 15f1b5bf059..0a25d900949 100644 --- a/l10n/km/files_encryption.po +++ b/l10n/km/files_encryption.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# សុវិចិត្រ Sovichet ទេព Tep, 2014 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-03-11 01:54-0400\n" -"PO-Revision-Date: 2014-03-11 05:55+0000\n" -"Last-Translator: I Robot\n" +"POT-Creation-Date: 2014-04-14 01:54-0400\n" +"PO-Revision-Date: 2014-04-13 09:20+0000\n" +"Last-Translator: សុវិចិត្រ Sovichet ទេព Tep\n" "Language-Team: Khmer (http://www.transifex.com/projects/p/owncloud/language/km/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -37,11 +38,11 @@ msgstr "" #: ajax/changeRecoveryPassword.php:49 msgid "Password successfully changed." -msgstr "" +msgstr "បាន​ប្ដូរ​ពាក្យ​សម្ងាត់​ដោយ​ជោគជ័យ។" #: ajax/changeRecoveryPassword.php:51 msgid "Could not change the password. Maybe the old password was not correct." -msgstr "" +msgstr "មិន​អាច​ប្ដូរ​ពាក្យ​សម្ងាត់​បាន​ទេ។ ប្រហែល​ពាក្យ​សម្ងាត់​ចាស់​មិន​ត្រឹម​ត្រូវ។" #: ajax/updatePrivateKeyPassword.php:52 msgid "Private key password successfully updated." @@ -109,93 +110,93 @@ msgstr "" #: templates/invalid_private_key.php:8 msgid "personal settings" -msgstr "" +msgstr "ការ​កំណត់​ផ្ទាល់​ខ្លួន" -#: templates/settings-admin.php:4 templates/settings-personal.php:3 +#: templates/settings-admin.php:2 templates/settings-personal.php:2 msgid "Encryption" -msgstr "" +msgstr "កូដនីយកម្ម" -#: templates/settings-admin.php:7 +#: templates/settings-admin.php:5 msgid "" "Enable recovery key (allow to recover users files in case of password loss):" msgstr "" -#: templates/settings-admin.php:11 +#: templates/settings-admin.php:9 msgid "Recovery key password" msgstr "" -#: templates/settings-admin.php:14 +#: templates/settings-admin.php:12 msgid "Repeat Recovery key password" msgstr "" -#: templates/settings-admin.php:21 templates/settings-personal.php:51 +#: templates/settings-admin.php:19 templates/settings-personal.php:50 msgid "Enabled" -msgstr "" +msgstr "បាន​បើក" -#: templates/settings-admin.php:29 templates/settings-personal.php:59 +#: templates/settings-admin.php:27 templates/settings-personal.php:58 msgid "Disabled" -msgstr "" +msgstr "បាន​បិទ" -#: templates/settings-admin.php:34 +#: templates/settings-admin.php:32 msgid "Change recovery key password:" msgstr "" -#: templates/settings-admin.php:40 +#: templates/settings-admin.php:38 msgid "Old Recovery key password" msgstr "" -#: templates/settings-admin.php:47 +#: templates/settings-admin.php:45 msgid "New Recovery key password" msgstr "" -#: templates/settings-admin.php:53 +#: templates/settings-admin.php:51 msgid "Repeat New Recovery key password" msgstr "" -#: templates/settings-admin.php:58 +#: templates/settings-admin.php:56 msgid "Change Password" -msgstr "" +msgstr "ប្ដូរ​ពាក្យ​សម្ងាត់" -#: templates/settings-personal.php:9 +#: templates/settings-personal.php:8 msgid "Your private key password no longer match your log-in password:" msgstr "" -#: templates/settings-personal.php:12 +#: templates/settings-personal.php:11 msgid "Set your old private key password to your current log-in password." msgstr "" -#: templates/settings-personal.php:14 +#: templates/settings-personal.php:13 msgid "" " If you don't remember your old password you can ask your administrator to " "recover your files." msgstr "" -#: templates/settings-personal.php:22 +#: templates/settings-personal.php:21 msgid "Old log-in password" msgstr "" -#: templates/settings-personal.php:28 +#: templates/settings-personal.php:27 msgid "Current log-in password" msgstr "" -#: templates/settings-personal.php:33 +#: templates/settings-personal.php:32 msgid "Update Private Key Password" msgstr "" -#: templates/settings-personal.php:42 +#: templates/settings-personal.php:41 msgid "Enable password recovery:" msgstr "" -#: templates/settings-personal.php:44 +#: templates/settings-personal.php:43 msgid "" "Enabling this option will allow you to reobtain access to your encrypted " "files in case of password loss" msgstr "" -#: templates/settings-personal.php:60 +#: templates/settings-personal.php:59 msgid "File recovery settings updated" msgstr "" -#: templates/settings-personal.php:61 +#: templates/settings-personal.php:60 msgid "Could not update file recovery" msgstr "" diff --git a/l10n/km/files_external.po b/l10n/km/files_external.po index 3b8216e3de5..06a546e4e79 100644 --- a/l10n/km/files_external.po +++ b/l10n/km/files_external.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-09 01:55-0400\n" -"PO-Revision-Date: 2014-04-09 05:55+0000\n" +"POT-Creation-Date: 2014-04-14 01:54-0400\n" +"PO-Revision-Date: 2014-04-13 09:30+0000\n" "Last-Translator: I Robot\n" "Language-Team: Khmer (http://www.transifex.com/projects/p/owncloud/language/km/)\n" "MIME-Version: 1.0\n" @@ -41,29 +41,29 @@ msgstr "" msgid "Saved" msgstr "" -#: lib/config.php:592 +#: lib/config.php:598 msgid "Note: " msgstr "" -#: lib/config.php:602 +#: lib/config.php:608 msgid " and " msgstr "" -#: lib/config.php:624 +#: lib/config.php:630 #, php-format msgid "" "Note: The cURL support in PHP is not enabled or installed. Mounting " "of %s is not possible. Please ask your system administrator to install it." msgstr "" -#: lib/config.php:626 +#: lib/config.php:632 #, php-format msgid "" "Note: The FTP support in PHP is not enabled or installed. Mounting of" " %s is not possible. Please ask your system administrator to install it." msgstr "" -#: lib/config.php:628 +#: lib/config.php:634 #, php-format msgid "" "Note: \"%s\" is not installed. Mounting of %s is not possible. Please" @@ -88,7 +88,7 @@ msgstr "" #: templates/settings.php:11 msgid "Options" -msgstr "" +msgstr "ជម្រើស" #: templates/settings.php:12 msgid "Available for" diff --git a/l10n/km/settings.po b/l10n/km/settings.po index 6df2774fdeb..ac4641686bc 100644 --- a/l10n/km/settings.po +++ b/l10n/km/settings.po @@ -4,13 +4,13 @@ # # Translators: # Pongsametrey SOK , 2014 -# សុវិចិត្រ Sovichet ទេព Tep , 2014 +# សុវិចិត្រ Sovichet ទេព Tep, 2014 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-12 01:54-0400\n" -"PO-Revision-Date: 2014-04-12 05:54+0000\n" +"POT-Creation-Date: 2014-04-14 01:54-0400\n" +"PO-Revision-Date: 2014-04-13 09:30+0000\n" "Last-Translator: I Robot\n" "Language-Team: Khmer (http://www.transifex.com/projects/p/owncloud/language/km/)\n" "MIME-Version: 1.0\n" @@ -55,7 +55,7 @@ msgstr "" #: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149 msgid "Encryption" -msgstr "" +msgstr "កូដនីយកម្ម" #: admin/controller.php:120 templates/admin.php:336 msgid "Authentication method" @@ -791,7 +791,7 @@ msgstr "ចូល" #: templates/users.php:28 msgid "Create" -msgstr "" +msgstr "បង្កើត" #: templates/users.php:34 msgid "Admin Recovery Password" diff --git a/l10n/nl/settings.po b/l10n/nl/settings.po index c766add1cc7..a40738991f8 100644 --- a/l10n/nl/settings.po +++ b/l10n/nl/settings.po @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-12 01:54-0400\n" -"PO-Revision-Date: 2014-04-12 05:54+0000\n" -"Last-Translator: I Robot\n" +"POT-Creation-Date: 2014-04-14 01:54-0400\n" +"PO-Revision-Date: 2014-04-13 12:00+0000\n" +"Last-Translator: André Koot \n" "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -90,17 +90,17 @@ msgstr "Niet in staat om groep toe te voegen" #: ajax/decryptall.php:31 msgid "Files decrypted successfully" -msgstr "" +msgstr "Bestanden succesvol ontsleuteld" #: ajax/decryptall.php:33 msgid "" "Couldn't decrypt your files, please check your owncloud.log or ask your " "administrator" -msgstr "" +msgstr "Kon uw bestanden niet ontsleutelem. Controleer uw owncloud logs of vraag het uw beheerder" #: ajax/decryptall.php:36 msgid "Couldn't decrypt your files, check your password and try again" -msgstr "" +msgstr "Kon uw bestanden niet ontsleutelen. Controleer uw wachtwoord en probeer het opnieuw" #: ajax/lostpassword.php:12 msgid "Email saved" diff --git a/l10n/nl/user_ldap.po b/l10n/nl/user_ldap.po index 37767238162..caaa23c3ae7 100644 --- a/l10n/nl/user_ldap.po +++ b/l10n/nl/user_ldap.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-12 01:54-0400\n" -"PO-Revision-Date: 2014-04-12 05:55+0000\n" -"Last-Translator: I Robot\n" +"POT-Creation-Date: 2014-04-14 01:54-0400\n" +"PO-Revision-Date: 2014-04-13 11:50+0000\n" +"Last-Translator: André Koot \n" "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -339,7 +339,7 @@ msgstr "Maak alleen een verbinding met de replica server." #: templates/settings.php:26 msgid "Case insensitive LDAP server (Windows)" -msgstr "" +msgstr "Niet-hoofdlettergevoelige LDAP server (Windows)" #: templates/settings.php:27 msgid "Turn off SSL certificate validation." diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot index 41999c5c635..bf059e31682 100644 --- a/l10n/templates/core.pot +++ b/l10n/templates/core.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-13 01:54-0400\n" +"POT-Creation-Date: 2014-04-14 01:54-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot index ad5a0f5cf2d..e834586bf09 100644 --- a/l10n/templates/files.pot +++ b/l10n/templates/files.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-13 01:54-0400\n" +"POT-Creation-Date: 2014-04-14 01:54-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot index fbc14254acf..fccd89208c0 100644 --- a/l10n/templates/files_encryption.pot +++ b/l10n/templates/files_encryption.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-13 01:54-0400\n" +"POT-Creation-Date: 2014-04-14 01:54-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot index 3310a94ddcc..3ba52385852 100644 --- a/l10n/templates/files_external.pot +++ b/l10n/templates/files_external.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-13 01:54-0400\n" +"POT-Creation-Date: 2014-04-14 01:54-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -41,29 +41,29 @@ msgstr "" msgid "Saved" msgstr "" -#: lib/config.php:592 +#: lib/config.php:598 msgid "Note: " msgstr "" -#: lib/config.php:602 +#: lib/config.php:608 msgid " and " msgstr "" -#: lib/config.php:624 +#: lib/config.php:630 #, php-format msgid "" "Note: The cURL support in PHP is not enabled or installed. Mounting " "of %s is not possible. Please ask your system administrator to install it." msgstr "" -#: lib/config.php:626 +#: lib/config.php:632 #, php-format msgid "" "Note: The FTP support in PHP is not enabled or installed. Mounting of " "%s is not possible. Please ask your system administrator to install it." msgstr "" -#: lib/config.php:628 +#: lib/config.php:634 #, php-format msgid "" "Note: \"%s\" is not installed. Mounting of %s is not possible. Please " diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot index d13ba28969c..93ce6bbac4c 100644 --- a/l10n/templates/files_sharing.pot +++ b/l10n/templates/files_sharing.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-13 01:54-0400\n" +"POT-Creation-Date: 2014-04-14 01:54-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_trashbin.pot b/l10n/templates/files_trashbin.pot index 4d206960525..c5ad152aa8d 100644 --- a/l10n/templates/files_trashbin.pot +++ b/l10n/templates/files_trashbin.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-13 01:54-0400\n" +"POT-Creation-Date: 2014-04-14 01:54-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot index 5fb1e4f151a..2a195ae047c 100644 --- a/l10n/templates/files_versions.pot +++ b/l10n/templates/files_versions.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-13 01:54-0400\n" +"POT-Creation-Date: 2014-04-14 01:54-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot index bb59a77e49f..ec5fc6f7d55 100644 --- a/l10n/templates/lib.pot +++ b/l10n/templates/lib.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-13 01:54-0400\n" +"POT-Creation-Date: 2014-04-14 01:54-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -290,51 +290,51 @@ msgstr "" msgid "Could not find category \"%s\"" msgstr "" -#: private/template/functions.php:133 +#: private/template/functions.php:134 msgid "seconds ago" msgstr "" -#: private/template/functions.php:134 +#: private/template/functions.php:135 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: private/template/functions.php:135 +#: private/template/functions.php:136 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: private/template/functions.php:136 +#: private/template/functions.php:137 msgid "today" msgstr "" -#: private/template/functions.php:137 +#: private/template/functions.php:138 msgid "yesterday" msgstr "" -#: private/template/functions.php:139 +#: private/template/functions.php:140 msgid "%n day go" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: private/template/functions.php:141 +#: private/template/functions.php:142 msgid "last month" msgstr "" -#: private/template/functions.php:142 +#: private/template/functions.php:143 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: private/template/functions.php:144 +#: private/template/functions.php:145 msgid "last year" msgstr "" -#: private/template/functions.php:145 +#: private/template/functions.php:146 msgid "years ago" msgstr "" diff --git a/l10n/templates/private.pot b/l10n/templates/private.pot index 81964303b21..8e753ca798d 100644 --- a/l10n/templates/private.pot +++ b/l10n/templates/private.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-13 01:54-0400\n" +"POT-Creation-Date: 2014-04-14 01:54-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -282,51 +282,51 @@ msgstr "" msgid "Could not find category \"%s\"" msgstr "" -#: template/functions.php:133 +#: template/functions.php:134 msgid "seconds ago" msgstr "" -#: template/functions.php:134 +#: template/functions.php:135 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: template/functions.php:135 +#: template/functions.php:136 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: template/functions.php:136 +#: template/functions.php:137 msgid "today" msgstr "" -#: template/functions.php:137 +#: template/functions.php:138 msgid "yesterday" msgstr "" -#: template/functions.php:139 +#: template/functions.php:140 msgid "%n day go" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: template/functions.php:141 +#: template/functions.php:142 msgid "last month" msgstr "" -#: template/functions.php:142 +#: template/functions.php:143 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: template/functions.php:144 +#: template/functions.php:145 msgid "last year" msgstr "" -#: template/functions.php:145 +#: template/functions.php:146 msgid "years ago" msgstr "" diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot index d89379830c4..213afd533e2 100644 --- a/l10n/templates/settings.pot +++ b/l10n/templates/settings.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-13 01:54-0400\n" +"POT-Creation-Date: 2014-04-14 01:54-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot index 489bfbbbb8f..bd416c1968c 100644 --- a/l10n/templates/user_ldap.pot +++ b/l10n/templates/user_ldap.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-13 01:54-0400\n" +"POT-Creation-Date: 2014-04-14 01:54-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/user_webdavauth.pot b/l10n/templates/user_webdavauth.pot index 62ca0e1c873..2b6bc836ea8 100644 --- a/l10n/templates/user_webdavauth.pot +++ b/l10n/templates/user_webdavauth.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-13 01:54-0400\n" +"POT-Creation-Date: 2014-04-14 01:54-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/settings/l10n/cs_CZ.php b/settings/l10n/cs_CZ.php index 960938b1c68..1f3c111a17d 100644 --- a/settings/l10n/cs_CZ.php +++ b/settings/l10n/cs_CZ.php @@ -93,8 +93,8 @@ $TRANSLATIONS = array( "Internet connection not working" => "Připojení k internetu nefunguje", "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "Server nemá funkční připojení k internetu. Některé moduly jako např. externí úložiště, oznámení o dostupných aktualizacích nebo instalace aplikací třetích stran nebudou fungovat. Přístup k souborům z jiných míst a odesílání oznamovacích e-mailů také nemusí fungovat. Pokud si přejete využívat všech vlastností ownCloud, doporučujeme povolit připojení k internetu tomuto serveru.", "Cron" => "Cron", -"Last cron was executed at %s." => "Poslední cron byl spuštěn v %s.", -"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "Poslední cron byl spuštěn v %s. To se stalo před více než hodinu. Vypadá to, že není něco v pořádku.", +"Last cron was executed at %s." => "Poslední cron byl spuštěn v %s", +"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "Poslední cron byl spuštěn v %s. To je více než před hodinou. Vypadá to, že není něco v pořádku.", "Cron was not executed yet!" => "Cron ještě nebyl spuštěn!", "Execute one task with each page loaded" => "Spustit jednu úlohu s každým načtením stránky", "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." => "cron.php je registrován u služby webcron, aby volal cron.php jednou za 15 minut přes http.", @@ -157,7 +157,7 @@ $TRANSLATIONS = array( "Full Name" => "Celé jméno", "Email" => "E-mail", "Your email address" => "Vaše e-mailová adresa", -"Fill in an email address to enable password recovery and receive notifications" => "Zadejte e-mailovou adresu pro umožnění obnovy zapomenutého hesla a pro přijímání upozornění.", +"Fill in an email address to enable password recovery and receive notifications" => "Zadejte e-mailovou adresu pro umožnění obnovy zapomenutého hesla a pro přijímání upozornění", "Profile picture" => "Profilový obrázek", "Upload new" => "Nahrát nový", "Select new from Files" => "Vyberte nový ze souborů", diff --git a/settings/l10n/km.php b/settings/l10n/km.php index 37bebc1c6fa..679c7cd3901 100644 --- a/settings/l10n/km.php +++ b/settings/l10n/km.php @@ -1,6 +1,7 @@ "បាន​ផ្ញើ​អ៊ីមែល", +"Encryption" => "កូដនីយកម្ម", "Unable to load list from App Store" => "មិនអាចផ្ទុកបញ្ជីកម្មវិធីពី App Store", "Authentication error" => "កំហុស​ការ​ផ្ទៀង​ផ្ទាត់​ភាព​ត្រឹម​ត្រូវ", "Group already exists" => "មាន​ក្រុម​នេះ​រួច​ហើយ", @@ -76,6 +77,7 @@ $TRANSLATIONS = array( "Help translate" => "ជួយ​បក​ប្រែ", "WebDAV" => "WebDAV", "Login Name" => "ចូល", +"Create" => "បង្កើត", "Other" => "ផ្សេងៗ", "Username" => "ឈ្មោះ​អ្នកប្រើ" ); diff --git a/settings/l10n/nl.php b/settings/l10n/nl.php index c497eb12a68..1f8342df6c5 100644 --- a/settings/l10n/nl.php +++ b/settings/l10n/nl.php @@ -16,6 +16,9 @@ $TRANSLATIONS = array( "Unable to change full name" => "Kan de volledige naam niet wijzigen", "Group already exists" => "Groep bestaat al", "Unable to add group" => "Niet in staat om groep toe te voegen", +"Files decrypted successfully" => "Bestanden succesvol ontsleuteld", +"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Kon uw bestanden niet ontsleutelem. Controleer uw owncloud logs of vraag het uw beheerder", +"Couldn't decrypt your files, check your password and try again" => "Kon uw bestanden niet ontsleutelen. Controleer uw wachtwoord en probeer het opnieuw", "Email saved" => "E-mail bewaard", "Invalid email" => "Ongeldige e-mail", "Unable to delete group" => "Niet in staat om groep te verwijderen", -- GitLab From c123dc7de4d9dde46bd31dbf6211704f1b4bb82d Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Mon, 14 Apr 2014 10:15:31 +0200 Subject: [PATCH 119/253] Fix typo Thanks @DeepDiver1975 --- lib/base.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/base.php b/lib/base.php index 5fb7b0b4675..7098f480e27 100644 --- a/lib/base.php +++ b/lib/base.php @@ -215,7 +215,7 @@ class OC { /* * This function adds some security related headers to all requests served via base.php - * The implementation of this function as hto happen here to ensure that all third-party + * The implementation of this function has to happen here to ensure that all third-party * components (e.g. SabreDAV) also benefit from this headers. */ public static function addSecurityHeaders() { -- GitLab From 51e47319ef2ab37d458dc96ba33a26bb851102be Mon Sep 17 00:00:00 2001 From: Thomas Tanghus Date: Mon, 14 Apr 2014 17:17:50 +0200 Subject: [PATCH 120/253] White-list known secure mime types. Refs. #8184 --- lib/private/connector/sabre/file.php | 6 +- lib/private/files/type/detection.php | 40 ++++- lib/private/helper.php | 10 ++ lib/private/mimetypes.list.php | 210 +++++++++++++-------------- tests/lib/helper.php | 12 ++ 5 files changed, 166 insertions(+), 112 deletions(-) diff --git a/lib/private/connector/sabre/file.php b/lib/private/connector/sabre/file.php index ef6caaf22a7..750d646a8f5 100644 --- a/lib/private/connector/sabre/file.php +++ b/lib/private/connector/sabre/file.php @@ -205,10 +205,12 @@ class OC_Connector_Sabre_File extends OC_Connector_Sabre_Node implements Sabre_D */ public function getContentType() { if (isset($this->fileinfo_cache['mimetype'])) { - return $this->fileinfo_cache['mimetype']; + $mimeType = $this->fileinfo_cache['mimetype']; + } else { + $mimeType = \OC\Files\Filesystem::getMimeType($this->path); } - return \OC\Files\Filesystem::getMimeType($this->path); + return \OC_Helper::getSecureMimeType($mimeType); } diff --git a/lib/private/files/type/detection.php b/lib/private/files/type/detection.php index 11e439032ce..8ee53917814 100644 --- a/lib/private/files/type/detection.php +++ b/lib/private/files/type/detection.php @@ -17,24 +17,40 @@ namespace OC\Files\Type; */ class Detection { protected $mimetypes = array(); + protected $secureMimeTypes = array(); /** - * add an extension -> mimetype mapping + * Add an extension -> mimetype mapping + * + * $mimetype is the assumed correct mime type + * The optional $secureMimeType is an alternative to send to send + * to avoid potential XSS. * * @param string $extension * @param string $mimetype + * @param string|null $secureMimeType */ - public function registerType($extension, $mimetype) { - $this->mimetypes[$extension] = $mimetype; + public function registerType($extension, $mimetype, $secureMimeType = null) { + $this->mimetypes[$extension] = array($mimetype, $secureMimeType); + $this->secureMimeTypes[$mimetype] = $secureMimeType ?: $mimetype; } /** - * add an array of extension -> mimetype mappings + * Add an array of extension -> mimetype mappings + * + * The mimetype value is in itself an array where the first index is + * the assumed correct mimetype and the second is either a secure alternative + * or null if the correct is considered secure. * * @param array $types */ public function registerTypeArray($types) { $this->mimetypes = array_merge($this->mimetypes, $types); + + // Update the alternative mimetypes to avoid having to look them up each time. + foreach ($this->mimetypes as $mimeType) { + $this->secureMimeTypes[$mimeType[0]] = $mimeType[1] ?: $mimeType[0]; + } } /** @@ -48,7 +64,9 @@ class Detection { //try to guess the type by the file extension $extension = strtolower(strrchr(basename($path), ".")); $extension = substr($extension, 1); //remove leading . - return (isset($this->mimetypes[$extension])) ? $this->mimetypes[$extension] : 'application/octet-stream'; + return (isset($this->mimetypes[$extension]) && isset($this->mimetypes[$extension][0])) + ? $this->mimetypes[$extension][0] + : 'application/octet-stream'; } else { return 'application/octet-stream'; } @@ -123,4 +141,16 @@ class Detection { return $mime; } } + + /** + * Get a secure mimetype that won't expose potential XSS. + * + * @param string $mimeType + * @return string + */ + public function getSecureMimeType($mimeType) { + return isset($this->secureMimeTypes[$mimeType]) + ? $this->secureMimeTypes[$mimeType] + : 'application/octet-stream'; + } } diff --git a/lib/private/helper.php b/lib/private/helper.php index da3d3cd1c6e..d5214823de9 100644 --- a/lib/private/helper.php +++ b/lib/private/helper.php @@ -430,6 +430,16 @@ class OC_Helper { return self::getMimetypeDetector()->detect($path); } + /** + * Get a secure mimetype that won't expose potential XSS. + * + * @param string $mimeType + * @return string + */ + static function getSecureMimeType($mimeType) { + return self::getMimetypeDetector()->getSecureMimeType($mimeType); + } + /** * get the mimetype form a data string * diff --git a/lib/private/mimetypes.list.php b/lib/private/mimetypes.list.php index 91bcf584267..cdfd2ec0fdd 100644 --- a/lib/private/mimetypes.list.php +++ b/lib/private/mimetypes.list.php @@ -24,109 +24,109 @@ * Array mapping file extensions to mimetypes (in alphabetical order). */ return array( - '7z' => 'application/x-7z-compressed', - 'accdb' => 'application/msaccess', - 'ai' => 'application/illustrator', - 'avi' => 'video/x-msvideo', - 'bash' => 'text/x-shellscript', - 'blend' => 'application/x-blender', - 'bin' => 'application/x-bin', - 'bmp' => 'image/bmp', - 'cb7' => 'application/x-cbr', - 'cba' => 'application/x-cbr', - 'cbr' => 'application/x-cbr', - 'cbt' => 'application/x-cbr', - 'cbtc' => 'application/x-cbr', - 'cbz' => 'application/x-cbr', - 'cc' => 'text/x-c', - 'cdr' => 'application/coreldraw', - 'cpp' => 'text/x-c++src', - 'css' => 'text/css', - 'csv' => 'text/csv', - 'cvbdl' => 'application/x-cbr', - 'c' => 'text/x-c', - 'c++' => 'text/x-c++src', - 'deb' => 'application/x-deb', - 'doc' => 'application/msword', - 'docx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', - 'dot' => 'application/msword', - 'dotx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.template', - 'dv' => 'video/dv', - 'eot' => 'application/vnd.ms-fontobject', - 'epub' => 'application/epub+zip', - 'exe' => 'application/x-ms-dos-executable', - 'flac' => 'audio/flac', - 'gif' => 'image/gif', - 'gz' => 'application/x-gzip', - 'gzip' => 'application/x-gzip', - 'html' => 'text/html', - 'htm' => 'text/html', - 'ical' => 'text/calendar', - 'ics' => 'text/calendar', - 'impress' => 'text/impress', - 'jpeg' => 'image/jpeg', - 'jpg' => 'image/jpeg', - 'js' => 'application/javascript', - 'json' => 'application/json', - 'keynote' => 'application/x-iwork-keynote-sffkey', - 'kra' => 'application/x-krita', - 'm2t' => 'video/mp2t', - 'm4v' => 'video/mp4', - 'markdown' => 'text/markdown', - 'mdown' => 'text/markdown', - 'md' => 'text/markdown', - 'mdb' => 'application/msaccess', - 'mdwn' => 'text/markdown', - 'mkv' => 'video/x-matroska', - 'mobi' => 'application/x-mobipocket-ebook', - 'mov' => 'video/quicktime', - 'mp3' => 'audio/mpeg', - 'mp4' => 'video/mp4', - 'mpeg' => 'video/mpeg', - 'mpg' => 'video/mpeg', - 'msi' => 'application/x-msi', - 'numbers' => 'application/x-iwork-numbers-sffnumbers', - 'odg' => 'application/vnd.oasis.opendocument.graphics', - 'odp' => 'application/vnd.oasis.opendocument.presentation', - 'ods' => 'application/vnd.oasis.opendocument.spreadsheet', - 'odt' => 'application/vnd.oasis.opendocument.text', - 'oga' => 'audio/ogg', - 'ogg' => 'audio/ogg', - 'ogv' => 'video/ogg', - 'otf' => 'font/opentype', - 'pages' => 'application/x-iwork-pages-sffpages', - 'pdf' => 'application/pdf', - 'php' => 'application/x-php', - 'pl' => 'application/x-perl', - 'png' => 'image/png', - 'ppt' => 'application/mspowerpoint', - 'pptx' => 'application/vnd.openxmlformats-officedocument.presentationml.presentation', - 'psd' => 'application/x-photoshop', - 'py' => 'text/x-python', - 'rar' => 'application/x-rar-compressed', - 'reveal' => 'text/reveal', - 'sgf' => 'application/sgf', - 'sh-lib' => 'text/x-shellscript', - 'sh' => 'text/x-shellscript', - 'svg' => 'image/svg+xml', - 'swf' => 'application/x-shockwave-flash', - 'tar' => 'application/x-tar', - 'tar.gz' => 'application/x-compressed', - 'tex' => 'application/x-tex', - 'tgz' => 'application/x-compressed', - 'tiff' => 'image/tiff', - 'tif' => 'image/tiff', - 'ttf' => 'application/x-font-ttf', - 'txt' => 'text/plain', - 'vcard' => 'text/vcard', - 'vcf' => 'text/vcard', - 'wav' => 'audio/wav', - 'webm' => 'video/webm', - 'woff' => 'application/font-woff', - 'wmv' => 'video/x-ms-asf', - 'xcf' => 'application/x-gimp', - 'xls' => 'application/msexcel', - 'xlsx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', - 'xml' => 'application/xml', - 'zip' => 'application/zip', + '7z' => array('application/x-7z-compressed', null), + 'accdb' => array('application/msaccess', null), + 'ai' => array('application/illustrator', null), + 'avi' => array('video/x-msvideo', null), + 'bash' => array('text/x-shellscript', null), + 'blend' => array('application/x-blender', null), + 'bin' => array('application/x-bin', null), + 'bmp' => array('image/bmp', null), + 'cb7' => array('application/x-cbr', null), + 'cba' => array('application/x-cbr', null), + 'cbr' => array('application/x-cbr', null), + 'cbt' => array('application/x-cbr', null), + 'cbtc' => array('application/x-cbr', null), + 'cbz' => array('application/x-cbr', null), + 'cc' => array('text/x-c', null), + 'cdr' => array('application/coreldraw', null), + 'cpp' => array('text/x-c++src', null), + 'css' => array('text/css', null), + 'csv' => array('text/csv', null), + 'cvbdl' => array('application/x-cbr', null), + 'c' => array('text/x-c', null), + 'c++' => array('text/x-c++src', null), + 'deb' => array('application/x-deb', null), + 'doc' => array('application/msword', null), + 'docx' => array('application/vnd.openxmlformats-officedocument.wordprocessingml.document', null), + 'dot' => array('application/msword', null), + 'dotx' => array('application/vnd.openxmlformats-officedocument.wordprocessingml.template', null), + 'dv' => array('video/dv', null), + 'eot' => array('application/vnd.ms-fontobject', null), + 'epub' => array('application/epub+zip', null), + 'exe' => array('application/x-ms-dos-executable', null), + 'flac' => array('audio/flac', null), + 'gif' => array('image/gif', null), + 'gz' => array('application/x-gzip', null), + 'gzip' => array('application/x-gzip', null), + 'html' => array('text/html', 'text/plain'), + 'htm' => array('text/html', 'text/plain'), + 'ical' => array('text/calendar', null), + 'ics' => array('text/calendar', null), + 'impress' => array('text/impress', null), + 'jpeg' => array('image/jpeg', null), + 'jpg' => array('image/jpeg', null), + 'js' => array('application/javascript', 'text/plain'), + 'json' => array('application/json', 'text/plain'), + 'keynote' => array('application/x-iwork-keynote-sffkey', null), + 'kra' => array('application/x-krita', null), + 'm2t' => array('video/mp2t', null), + 'm4v' => array('video/mp4', null), + 'markdown' => array('text/markdown', null), + 'mdown' => array('text/markdown', null), + 'md' => array('text/markdown', null), + 'mdb' => array('application/msaccess', null), + 'mdwn' => array('text/markdown', null), + 'mkv' => array('video/x-matroska', null), + 'mobi' => array('application/x-mobipocket-ebook', null), + 'mov' => array('video/quicktime', null), + 'mp3' => array('audio/mpeg', null), + 'mp4' => array('video/mp4', null), + 'mpeg' => array('video/mpeg', null), + 'mpg' => array('video/mpeg', null), + 'msi' => array('application/x-msi', null), + 'numbers' => array('application/x-iwork-numbers-sffnumbers', null), + 'odg' => array('application/vnd.oasis.opendocument.graphics', null), + 'odp' => array('application/vnd.oasis.opendocument.presentation', null), + 'ods' => array('application/vnd.oasis.opendocument.spreadsheet', null), + 'odt' => array('application/vnd.oasis.opendocument.text', null), + 'oga' => array('audio/ogg', null), + 'ogg' => array('audio/ogg', null), + 'ogv' => array('video/ogg', null), + 'otf' => array('font/opentype', null), + 'pages' => array('application/x-iwork-pages-sffpages', null), + 'pdf' => array('application/pdf', null), + 'php' => array('application/x-php', null), + 'pl' => array('application/x-perl', null), + 'png' => array('image/png', null), + 'ppt' => array('application/mspowerpoint', null), + 'pptx' => array('application/vnd.openxmlformats-officedocument.presentationml.presentation', null), + 'psd' => array('application/x-photoshop', null), + 'py' => array('text/x-python', null), + 'rar' => array('application/x-rar-compressed', null), + 'reveal' => array('text/reveal', null), + 'sgf' => array('application/sgf', null), + 'sh-lib' => array('text/x-shellscript', null), + 'sh' => array('text/x-shellscript', null), + 'svg' => array('image/svg+xml', 'text/plain'), + 'swf' => array('application/x-shockwave-flash', 'application/octet-stream'), + 'tar' => array('application/x-tar', null), + 'tar.gz' => array('application/x-compressed', null), + 'tex' => array('application/x-tex', null), + 'tgz' => array('application/x-compressed', null), + 'tiff' => array('image/tiff', null), + 'tif' => array('image/tiff', null), + 'ttf' => array('application/x-font-ttf', null), + 'txt' => array('text/plain', null), + 'vcard' => array('text/vcard', null), + 'vcf' => array('text/vcard', null), + 'wav' => array('audio/wav', null), + 'webm' => array('video/webm', null), + 'woff' => array('application/font-woff', null), + 'wmv' => array('video/x-ms-asf', null), + 'xcf' => array('application/x-gimp', null), + 'xls' => array('application/msexcel', null), + 'xlsx' => array('application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', null), + 'xml' => array('application/xml', 'text/plain'), + 'zip' => array('application/zip', null), ); diff --git a/tests/lib/helper.php b/tests/lib/helper.php index 0943e6bc1b9..5d319e40f02 100644 --- a/tests/lib/helper.php +++ b/tests/lib/helper.php @@ -71,6 +71,18 @@ class Test_Helper extends PHPUnit_Framework_TestCase { $this->assertEquals($result, $expected); } + function testGetSecureMimeType() { + $dir=OC::$SERVERROOT.'/tests/data'; + + $result = OC_Helper::getSecureMimeType('image/svg+xml'); + $expected = 'text/plain'; + $this->assertEquals($result, $expected); + + $result = OC_Helper::getSecureMimeType('image/png'); + $expected = 'image/png'; + $this->assertEquals($result, $expected); + } + function testGetFileNameMimeType() { $this->assertEquals('text/plain', OC_Helper::getFileNameMimeType('foo.txt')); $this->assertEquals('image/png', OC_Helper::getFileNameMimeType('foo.png')); -- GitLab From 2fb68c120b0b1f9c6d7ed9e3f10d595ffd080ddb Mon Sep 17 00:00:00 2001 From: Thomas Tanghus Date: Mon, 14 Apr 2014 18:21:19 +0200 Subject: [PATCH 121/253] Added explanation to mimetypes.list.php to avoid future confusion. --- lib/private/mimetypes.list.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/private/mimetypes.list.php b/lib/private/mimetypes.list.php index cdfd2ec0fdd..07e2391c116 100644 --- a/lib/private/mimetypes.list.php +++ b/lib/private/mimetypes.list.php @@ -22,6 +22,10 @@ /** * Array mapping file extensions to mimetypes (in alphabetical order). + * + * The first index in the mime type array is the assumed correct mimetype + * and the second is either a secure alternative or null if the correct + * is considered secure. */ return array( '7z' => array('application/x-7z-compressed', null), -- GitLab From 3bc3d4c9f346b378853ccf36f49e2f3816ea721d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian=20M=C3=BCller?= Date: Mon, 14 Apr 2014 18:26:45 +0200 Subject: [PATCH 122/253] close-button for share_dropdown --- core/js/share.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/core/js/share.js b/core/js/share.js index 5cabc614563..8210dd5d45f 100644 --- a/core/js/share.js +++ b/core/js/share.js @@ -211,6 +211,7 @@ OC.Share={ } }); + html += '