diff options
Diffstat (limited to 'lib')
116 files changed, 1124 insertions, 766 deletions
diff --git a/lib/app.php b/lib/app.php index 2f5a952d9f8..1b5979107db 100644 --- a/lib/app.php +++ b/lib/app.php @@ -666,7 +666,7 @@ class OC_App{ } $dh = opendir( $apps_dir['path'] ); - while( $file = readdir( $dh ) ) { + while (($file = readdir($dh)) !== false) { if ($file[0] != '.' and is_file($apps_dir['path'].'/'.$file.'/appinfo/app.php')) { diff --git a/lib/archive.php b/lib/archive.php index 70615db714e..364cd5a74a1 100644 --- a/lib/archive.php +++ b/lib/archive.php @@ -121,7 +121,7 @@ abstract class OC_Archive{ function addRecursive($path, $source) { if($dh=opendir($source)) { $this->addFolder($path); - while($file=readdir($dh)) { + while (($file = readdir($dh)) !== false) { if($file=='.' or $file=='..') { continue; } diff --git a/lib/autoloader.php b/lib/autoloader.php index 21170639092..01841f831be 100644 --- a/lib/autoloader.php +++ b/lib/autoloader.php @@ -111,15 +111,39 @@ class Autoloader { * @param string $class * @return bool */ + protected $memoryCache = null; + protected $constructingMemoryCache = true; // hack to prevent recursion public function load($class) { - $paths = $this->findClass($class); + // Does this PHP have an in-memory cache? We cache the paths there + if ($this->constructingMemoryCache && !$this->memoryCache) { + $this->constructingMemoryCache = false; + $this->memoryCache = \OC\Memcache\Factory::createLowLatency('Autoloader'); + } + if ($this->memoryCache) { + $pathsToRequire = $this->memoryCache->get($class); + if (is_array($pathsToRequire)) { + foreach ($pathsToRequire as $path) { + require_once $path; + } + return false; + } + } + // Use the normal class loading path + $paths = $this->findClass($class); if (is_array($paths)) { + $pathsToRequire = array(); foreach ($paths as $path) { if ($fullPath = stream_resolve_include_path($path)) { require_once $fullPath; + $pathsToRequire[] = $fullPath; } } + + // Save in our memory cache + if ($this->memoryCache) { + $this->memoryCache->set($class, $pathsToRequire, 60); // cache 60 sec + } } return false; } diff --git a/lib/base.php b/lib/base.php index 32e0ebe27e9..a59fe8b7a48 100644 --- a/lib/base.php +++ b/lib/base.php @@ -91,7 +91,7 @@ class OC { // ensure we can find OC_Config set_include_path( OC::$SERVERROOT . '/lib' . PATH_SEPARATOR . - get_include_path() + get_include_path() ); OC::$SUBURI = str_replace("\\", "/", substr(realpath($_SERVER["SCRIPT_FILENAME"]), strlen(OC::$SERVERROOT))); @@ -160,11 +160,11 @@ class OC { // set the right include path set_include_path( OC::$SERVERROOT . '/lib' . PATH_SEPARATOR . - OC::$SERVERROOT . '/config' . PATH_SEPARATOR . - OC::$THIRDPARTYROOT . '/3rdparty' . PATH_SEPARATOR . - implode($paths, PATH_SEPARATOR) . PATH_SEPARATOR . - get_include_path() . PATH_SEPARATOR . - OC::$SERVERROOT + OC::$SERVERROOT . '/config' . PATH_SEPARATOR . + OC::$THIRDPARTYROOT . '/3rdparty' . PATH_SEPARATOR . + implode($paths, PATH_SEPARATOR) . PATH_SEPARATOR . + get_include_path() . PATH_SEPARATOR . + OC::$SERVERROOT ); } @@ -278,17 +278,17 @@ class OC { ini_set('session.cookie_httponly', '1;'); // set the cookie path to the ownCloud directory - $cookie_path = OC::$WEBROOT ?: '/'; + $cookie_path = OC::$WEBROOT ? : '/'; ini_set('session.cookie_path', $cookie_path); //set the session object to a dummy session so code relying on the session existing still works self::$session = new \OC\Session\Memory(''); - - try{ + + try { // set the session name to the instance id - which is unique self::$session = new \OC\Session\Internal(OC_Util::getInstanceId()); // if session cant be started break with http 500 error - }catch (Exception $e){ + } catch (Exception $e) { OC_Log::write('core', 'Session could not be initialized', OC_Log::ERROR); @@ -352,7 +352,7 @@ class OC { public static function init() { // register autoloader require_once __DIR__ . '/autoloader.php'; - self::$loader=new \OC\Autoloader(); + self::$loader = new \OC\Autoloader(); self::$loader->registerPrefix('Doctrine\\Common', 'doctrine/common/lib'); self::$loader->registerPrefix('Doctrine\\DBAL', 'doctrine/dbal/lib'); self::$loader->registerPrefix('Symfony\\Component\\Routing', 'symfony/routing'); @@ -373,7 +373,7 @@ class OC { ini_set('arg_separator.output', '&'); // try to switch magic quotes off. - if (get_magic_quotes_gpc()==1) { + if (get_magic_quotes_gpc() == 1) { ini_set('magic_quotes_runtime', 0); } @@ -398,7 +398,8 @@ class OC { //set http auth headers for apache+php-cgi work around if (isset($_SERVER['HTTP_AUTHORIZATION']) - && preg_match('/Basic\s+(.*)$/i', $_SERVER['HTTP_AUTHORIZATION'], $matches)) { + && preg_match('/Basic\s+(.*)$/i', $_SERVER['HTTP_AUTHORIZATION'], $matches) + ) { list($name, $password) = explode(':', base64_decode($matches[1]), 2); $_SERVER['PHP_AUTH_USER'] = strip_tags($name); $_SERVER['PHP_AUTH_PW'] = strip_tags($password); @@ -406,7 +407,8 @@ class OC { //set http auth headers for apache+php-cgi work around if variable gets renamed by apache if (isset($_SERVER['REDIRECT_HTTP_AUTHORIZATION']) - && preg_match('/Basic\s+(.*)$/i', $_SERVER['REDIRECT_HTTP_AUTHORIZATION'], $matches)) { + && preg_match('/Basic\s+(.*)$/i', $_SERVER['REDIRECT_HTTP_AUTHORIZATION'], $matches) + ) { list($name, $password) = explode(':', base64_decode($matches[1]), 2); $_SERVER['PHP_AUTH_USER'] = strip_tags($name); $_SERVER['PHP_AUTH_PW'] = strip_tags($password); @@ -435,10 +437,11 @@ class OC { stream_wrapper_register('fakedir', 'OC\Files\Stream\Dir'); stream_wrapper_register('static', 'OC\Files\Stream\StaticStream'); stream_wrapper_register('close', 'OC\Files\Stream\Close'); + stream_wrapper_register('quota', 'OC\Files\Stream\Quota'); stream_wrapper_register('oc', 'OC\Files\Stream\OC'); self::initTemplateEngine(); - if ( !self::$CLI ) { + if (!self::$CLI) { self::initSession(); } else { self::$session = new \OC\Session\Memory(''); @@ -459,7 +462,7 @@ class OC { // User and Groups if (!OC_Config::getValue("installed", false)) { - self::$session->set('user_id',''); + self::$session->set('user_id', ''); } OC_User::useBackend(new OC_User_Database()); diff --git a/lib/cache/file.php b/lib/cache/file.php index ba3dedaf8f3..9fee6034a71 100644 --- a/lib/cache/file.php +++ b/lib/cache/file.php @@ -80,7 +80,7 @@ class OC_Cache_File{ $storage = $this->getStorage(); if($storage and $storage->is_dir('/')) { $dh=$storage->opendir('/'); - while($file=readdir($dh)) { + while (($file = readdir($dh)) !== false) { if($file!='.' and $file!='..' and ($prefix==='' || strpos($file, $prefix) === 0)) { $storage->unlink('/'.$file); } @@ -94,7 +94,7 @@ class OC_Cache_File{ if($storage and $storage->is_dir('/')) { $now = time(); $dh=$storage->opendir('/'); - while($file=readdir($dh)) { + while (($file = readdir($dh)) !== false) { if($file!='.' and $file!='..') { $mtime = $storage->filemtime('/'.$file); if ($mtime < $now) { diff --git a/lib/cache/fileglobal.php b/lib/cache/fileglobal.php index 6d01964e185..2fbd8ca3edb 100644 --- a/lib/cache/fileglobal.php +++ b/lib/cache/fileglobal.php @@ -69,7 +69,7 @@ class OC_Cache_FileGlobal{ $prefix = $this->fixKey($prefix); if($cache_dir and is_dir($cache_dir)) { $dh=opendir($cache_dir); - while($file=readdir($dh)) { + while (($file = readdir($dh)) !== false) { if($file!='.' and $file!='..' and ($prefix==='' || strpos($file, $prefix) === 0)) { unlink($cache_dir.$file); } @@ -88,7 +88,7 @@ class OC_Cache_FileGlobal{ $cache_dir = self::getCacheDir(); if($cache_dir and is_dir($cache_dir)) { $dh=opendir($cache_dir); - while($file=readdir($dh)) { + while (($file = readdir($dh)) !== false) { if($file!='.' and $file!='..') { $mtime = filemtime($cache_dir.$file); if ($mtime < $now) { diff --git a/lib/connector/sabre/file.php b/lib/connector/sabre/file.php index 06ab73e3e4d..61bdcd5e0ae 100644 --- a/lib/connector/sabre/file.php +++ b/lib/connector/sabre/file.php @@ -50,6 +50,11 @@ class OC_Connector_Sabre_File extends OC_Connector_Sabre_Node implements Sabre_D throw new \Sabre_DAV_Exception_Forbidden(); } + // throw an exception if encryption was disabled but the files are still encrypted + if (\OC_Util::encryptedFiles()) { + throw new \Sabre_DAV_Exception_ServiceUnavailable(); + } + // mark file as partial while uploading (ignored by the scanner) $partpath = $this->path . '.part'; @@ -89,7 +94,12 @@ class OC_Connector_Sabre_File extends OC_Connector_Sabre_Node implements Sabre_D */ public function get() { - return \OC\Files\Filesystem::fopen($this->path, 'rb'); + //throw execption if encryption is disabled but files are still encrypted + if (\OC_Util::encryptedFiles()) { + throw new \Sabre_DAV_Exception_ServiceUnavailable(); + } else { + return \OC\Files\Filesystem::fopen($this->path, 'rb'); + } } diff --git a/lib/connector/sabre/objecttree.php b/lib/connector/sabre/objecttree.php index c4ddcbecbb8..b298813a202 100644 --- a/lib/connector/sabre/objecttree.php +++ b/lib/connector/sabre/objecttree.php @@ -88,7 +88,7 @@ class ObjectTree extends \Sabre_DAV_ObjectTree { } else { Filesystem::mkdir($destination); $dh = Filesystem::opendir($source); - while ($subnode = readdir($dh)) { + while (($subnode = readdir($dh)) !== false) { if ($subnode == '.' || $subnode == '..') continue; $this->copy($source . '/' . $subnode, $destination . '/' . $subnode); diff --git a/lib/connector/sabre/principal.php b/lib/connector/sabre/principal.php index 16c88b96ea6..59a96797c16 100644 --- a/lib/connector/sabre/principal.php +++ b/lib/connector/sabre/principal.php @@ -66,13 +66,13 @@ class OC_Connector_Sabre_Principal implements Sabre_DAVACL_IPrincipalBackend { */ public function getGroupMemberSet($principal) { // TODO: for now the group principal has only one member, the user itself - list($prefix, $name) = Sabre_DAV_URLUtil::splitPath($principal); - - $principal = $this->getPrincipalByPath($prefix); - if (!$principal) throw new Sabre_DAV_Exception('Principal not found'); + $principal = $this->getPrincipalByPath($principal); + if (!$principal) { + throw new Sabre_DAV_Exception('Principal not found'); + } return array( - $prefix + $principal['uri'] ); } @@ -88,7 +88,9 @@ class OC_Connector_Sabre_Principal implements Sabre_DAVACL_IPrincipalBackend { $group_membership = array(); if ($prefix == 'principals') { $principal = $this->getPrincipalByPath($principal); - if (!$principal) throw new Sabre_DAV_Exception('Principal not found'); + if (!$principal) { + throw new Sabre_DAV_Exception('Principal not found'); + } // TODO: for now the user principal has only its own groups return array( diff --git a/lib/connector/sabre/quotaplugin.php b/lib/connector/sabre/quotaplugin.php index c80a33d04b1..34d4b676157 100644 --- a/lib/connector/sabre/quotaplugin.php +++ b/lib/connector/sabre/quotaplugin.php @@ -51,7 +51,7 @@ class OC_Connector_Sabre_QuotaPlugin extends Sabre_DAV_ServerPlugin { } list($parentUri, $newName) = Sabre_DAV_URLUtil::splitPath($uri); $freeSpace = \OC\Files\Filesystem::free_space($parentUri); - if ($freeSpace !== \OC\Files\FREE_SPACE_UNKNOWN && $length > $freeSpace) { + if ($freeSpace !== \OC\Files\SPACE_UNKNOWN && $length > $freeSpace) { throw new Sabre_DAV_Exception_InsufficientStorage(); } } diff --git a/lib/fileproxy/quota.php b/lib/fileproxy/quota.php deleted file mode 100644 index 3dac3264fbe..00000000000 --- a/lib/fileproxy/quota.php +++ /dev/null @@ -1,114 +0,0 @@ -<?php - -/** -* ownCloud -* -* @author Robin Appelman -* @copyright 2011 Robin Appelman icewind1991@gmail.com -* -* This library is free software; you can redistribute it and/or -* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE -* License as published by the Free Software Foundation; either -* version 3 of the License, or any later version. -* -* This library is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU AFFERO GENERAL PUBLIC LICENSE for more details. -* -* You should have received a copy of the GNU Affero General Public -* License along with this library. If not, see <http://www.gnu.org/licenses/>. -* -*/ - -/** - * user quota management - */ - -class OC_FileProxy_Quota extends OC_FileProxy{ - static $rootView; - private $userQuota=array(); - - /** - * get the quota for the user - * @param user - * @return int - */ - private function getQuota($user) { - if(in_array($user, $this->userQuota)) { - return $this->userQuota[$user]; - } - $userQuota=OC_Preferences::getValue($user, 'files', 'quota', 'default'); - if($userQuota=='default') { - $userQuota=OC_AppConfig::getValue('files', 'default_quota', 'none'); - } - if($userQuota=='none') { - $this->userQuota[$user]=-1; - }else{ - $this->userQuota[$user]=OC_Helper::computerFileSize($userQuota); - } - return $this->userQuota[$user]; - - } - - /** - * get the free space in the path's owner home folder - * @param path - * @return int - */ - private function getFreeSpace($path) { - /** - * @var \OC\Files\Storage\Storage $storage - * @var string $internalPath - */ - list($storage, $internalPath) = \OC\Files\Filesystem::resolvePath($path); - $owner = $storage->getOwner($internalPath); - if (!$owner) { - return -1; - } - - $totalSpace = $this->getQuota($owner); - if($totalSpace == -1) { - return -1; - } - - $view = new \OC\Files\View("/".$owner."/files"); - - $rootInfo = $view->getFileInfo('/'); - $usedSpace = isset($rootInfo['size'])?$rootInfo['size']:0; - return $totalSpace - $usedSpace; - } - - public function postFree_space($path, $space) { - $free=$this->getFreeSpace($path); - if($free==-1) { - return $space; - } - if ($space < 0){ - return $free; - } - return min($free, $space); - } - - public function preFile_put_contents($path, $data) { - if (is_resource($data)) { - $data = '';//TODO: find a way to get the length of the stream without emptying it - } - return (strlen($data)<$this->getFreeSpace($path) or $this->getFreeSpace($path)==-1); - } - - public function preCopy($path1, $path2) { - if(!self::$rootView) { - self::$rootView = new \OC\Files\View(''); - } - return (self::$rootView->filesize($path1)<$this->getFreeSpace($path2) or $this->getFreeSpace($path2)==-1); - } - - public function preFromTmpFile($tmpfile, $path) { - return (filesize($tmpfile)<$this->getFreeSpace($path) or $this->getFreeSpace($path)==-1); - } - - public function preFromUploadedFile($tmpfile, $path) { - return (filesize($tmpfile)<$this->getFreeSpace($path) or $this->getFreeSpace($path)==-1); - } -} diff --git a/lib/files/cache/scanner.php b/lib/files/cache/scanner.php index 597eabecf54..87fa7c1365a 100644 --- a/lib/files/cache/scanner.php +++ b/lib/files/cache/scanner.php @@ -159,7 +159,7 @@ class Scanner extends BasicEmitter { $newChildren = array(); if ($this->storage->is_dir($path) && ($dh = $this->storage->opendir($path))) { \OC_DB::beginTransaction(); - while ($file = readdir($dh)) { + while (($file = readdir($dh)) !== false) { $child = ($path) ? $path . '/' . $file : $file; if (!Filesystem::isIgnoredDir($file)) { $newChildren[] = $file; diff --git a/lib/files/filesystem.php b/lib/files/filesystem.php index d6ebe7d629a..10ec5c41d11 100644 --- a/lib/files/filesystem.php +++ b/lib/files/filesystem.php @@ -31,8 +31,9 @@ namespace OC\Files; use OC\Files\Storage\Loader; -const FREE_SPACE_UNKNOWN = -2; -const FREE_SPACE_UNLIMITED = -3; +const SPACE_NOT_COMPUTED = -1; +const SPACE_UNKNOWN = -2; +const SPACE_UNLIMITED = -3; class Filesystem { /** @@ -148,6 +149,18 @@ class Filesystem { */ private static $loader; + /** + * @param callable $wrapper + */ + public static function addStorageWrapper($wrapper) { + self::getLoader()->addStorageWrapper($wrapper); + + $mounts = self::getMountManager()->getAll(); + foreach ($mounts as $mount) { + $mount->wrapStorage($wrapper); + } + } + public static function getLoader() { if (!self::$loader) { self::$loader = new Loader(); diff --git a/lib/files/mount/manager.php b/lib/files/mount/manager.php index 25a5fe241cc..4c432dcf724 100644 --- a/lib/files/mount/manager.php +++ b/lib/files/mount/manager.php @@ -96,6 +96,13 @@ class Manager { } /** + * @return Mount[] + */ + public function getAll() { + return $this->mounts; + } + + /** * Find mounts by numeric storage id * * @param string $id diff --git a/lib/files/mount/mount.php b/lib/files/mount/mount.php index 17b0055ee84..0ce2f5975c7 100644 --- a/lib/files/mount/mount.php +++ b/lib/files/mount/mount.php @@ -138,4 +138,11 @@ class Mount { } return $path; } + + /** + * @param callable $wrapper + */ + public function wrapStorage($wrapper) { + $this->storage = $wrapper($this->mountPoint, $this->storage); + } } diff --git a/lib/files/storage/common.php b/lib/files/storage/common.php index 3da13ac4df0..01560f34fde 100644 --- a/lib/files/storage/common.php +++ b/lib/files/storage/common.php @@ -142,7 +142,7 @@ abstract class Common implements \OC\Files\Storage\Storage { return false; } else { $directoryHandle = $this->opendir($directory); - while ($contents = readdir($directoryHandle)) { + while (($contents = readdir($directoryHandle)) !== false) { if (!\OC\Files\Filesystem::isIgnoredDir($contents)) { $path = $directory . '/' . $contents; if ($this->is_dir($path)) { @@ -225,7 +225,7 @@ abstract class Common implements \OC\Files\Storage\Storage { private function addLocalFolder($path, $target) { if ($dh = $this->opendir($path)) { - while ($file = readdir($dh)) { + while (($file = readdir($dh)) !== false) { if ($file !== '.' and $file !== '..') { if ($this->is_dir($path . '/' . $file)) { mkdir($target . '/' . $file); @@ -243,7 +243,7 @@ abstract class Common implements \OC\Files\Storage\Storage { $files = array(); $dh = $this->opendir($dir); if ($dh) { - while ($item = readdir($dh)) { + while (($item = readdir($dh)) !== false) { if ($item == '.' || $item == '..') continue; if (strstr(strtolower($item), strtolower($query)) !== false) { $files[] = $dir . '/' . $item; @@ -366,6 +366,6 @@ abstract class Common implements \OC\Files\Storage\Storage { * @return int */ public function free_space($path) { - return \OC\Files\FREE_SPACE_UNKNOWN; + return \OC\Files\SPACE_UNKNOWN; } } diff --git a/lib/files/storage/commontest.php b/lib/files/storage/commontest.php index fbdb7fbf110..c3f1eb31955 100644 --- a/lib/files/storage/commontest.php +++ b/lib/files/storage/commontest.php @@ -77,4 +77,4 @@ class CommonTest extends \OC\Files\Storage\Common{ public function touch($path, $mtime=null) { return $this->storage->touch($path, $mtime); } -}
\ No newline at end of file +} diff --git a/lib/files/storage/local.php b/lib/files/storage/local.php index b08fd73ce19..5209fabc30a 100644 --- a/lib/files/storage/local.php +++ b/lib/files/storage/local.php @@ -265,7 +265,7 @@ if (\OC_Util::runningOnWindows()) { public function free_space($path) { $space = @disk_free_space($this->datadir . $path); if ($space === false) { - return \OC\Files\FREE_SPACE_UNKNOWN; + return \OC\Files\SPACE_UNKNOWN; } return $space; } diff --git a/lib/files/storage/wrapper/quota.php b/lib/files/storage/wrapper/quota.php new file mode 100644 index 00000000000..e2da8cf2e05 --- /dev/null +++ b/lib/files/storage/wrapper/quota.php @@ -0,0 +1,104 @@ +<?php +/** + * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com> + * This file is licensed under the Affero General Public License version 3 or + * later. + * See the COPYING-README file. + */ + +namespace OC\Files\Storage\Wrapper; + +class Quota extends Wrapper { + + /** + * @var int $quota + */ + protected $quota; + + /** + * @param array $parameters + */ + public function __construct($parameters) { + $this->storage = $parameters['storage']; + $this->quota = $parameters['quota']; + } + + protected function getSize($path) { + $cache = $this->getCache(); + $data = $cache->get($path); + if (is_array($data) and isset($data['size'])) { + return $data['size']; + } else { + return \OC\Files\SPACE_NOT_COMPUTED; + } + } + + /** + * Get free space as limited by the quota + * + * @param string $path + * @return int + */ + public function free_space($path) { + if ($this->quota < 0) { + return $this->storage->free_space($path); + } else { + $used = $this->getSize(''); + if ($used < 0) { + return \OC\Files\SPACE_NOT_COMPUTED; + } else { + $free = $this->storage->free_space($path); + return min($free, (max($this->quota - $used, 0))); + } + } + } + + /** + * see http://php.net/manual/en/function.file_put_contents.php + * + * @param string $path + * @param string $data + * @return bool + */ + public function file_put_contents($path, $data) { + $free = $this->free_space(''); + if ($free < 0 or strlen($data) < $free) { + return $this->storage->file_put_contents($path, $data); + } else { + return false; + } + } + + /** + * see http://php.net/manual/en/function.copy.php + * + * @param string $source + * @param string $target + * @return bool + */ + public function copy($source, $target) { + $free = $this->free_space(''); + if ($free < 0 or $this->getSize($source) < $free) { + return $this->storage->copy($source, $target); + } else { + return false; + } + } + + /** + * see http://php.net/manual/en/function.fopen.php + * + * @param string $path + * @param string $mode + * @return resource + */ + public function fopen($path, $mode) { + $source = $this->storage->fopen($path, $mode); + $free = $this->free_space(''); + if ($free >= 0) { + return \OC\Files\Stream\Quota::wrap($source, $free); + } else { + return $source; + } + } +} diff --git a/lib/files/storage/wrapper/wrapper.php b/lib/files/storage/wrapper/wrapper.php index 4feb0520f12..0336c27efa1 100644 --- a/lib/files/storage/wrapper/wrapper.php +++ b/lib/files/storage/wrapper/wrapper.php @@ -395,7 +395,7 @@ class Wrapper implements \OC\Files\Storage\Storage { * @return \OC\Files\Cache\Permissions */ public function getPermissionsCache($path = '') { - return $this->storage->getPermissions($path); + return $this->storage->getPermissionsCache($path); } /** diff --git a/lib/files/stream/quota.php b/lib/files/stream/quota.php new file mode 100644 index 00000000000..53d8a03d30f --- /dev/null +++ b/lib/files/stream/quota.php @@ -0,0 +1,128 @@ +<?php +/** + * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com> + * This file is licensed under the Affero General Public License version 3 or + * later. + * See the COPYING-README file. + */ + +namespace OC\Files\Stream; + +/** + * stream wrapper limits the amount of data that can be written to a stream + * + * usage: void \OC\Files\Stream\Quota::register($id, $stream, $limit) + * or: resource \OC\Files\Stream\Quota::wrap($stream, $limit) + */ +class Quota { + private static $streams = array(); + + /** + * @var resource $source + */ + private $source; + + /** + * @var int $limit + */ + private $limit; + + /** + * @param string $id + * @param resource $stream + * @param int $limit + */ + public static function register($id, $stream, $limit) { + self::$streams[$id] = array($stream, $limit); + } + + /** + * remove all registered streams + */ + public static function clear() { + self::$streams = array(); + } + + /** + * @param resource $stream + * @param int $limit + * @return resource + */ + static public function wrap($stream, $limit) { + $id = uniqid(); + self::register($id, $stream, $limit); + $meta = stream_get_meta_data($stream); + return fopen('quota://' . $id, $meta['mode']); + } + + public function stream_open($path, $mode, $options, &$opened_path) { + $id = substr($path, strlen('quota://')); + if (isset(self::$streams[$id])) { + list($this->source, $this->limit) = self::$streams[$id]; + return true; + } else { + return false; + } + } + + public function stream_seek($offset, $whence = SEEK_SET) { + if ($whence === SEEK_SET) { + $this->limit += $this->stream_tell() - $offset; + } else { + $this->limit -= $offset; + } + fseek($this->source, $offset, $whence); + } + + public function stream_tell() { + return ftell($this->source); + } + + public function stream_read($count) { + $this->limit -= $count; + return fread($this->source, $count); + } + + public function stream_write($data) { + $size = strlen($data); + if ($size > $this->limit) { + $data = substr($data, 0, $this->limit); + $size = $this->limit; + } + $this->limit -= $size; + return fwrite($this->source, $data); + } + + public function stream_set_option($option, $arg1, $arg2) { + switch ($option) { + case STREAM_OPTION_BLOCKING: + stream_set_blocking($this->source, $arg1); + break; + case STREAM_OPTION_READ_TIMEOUT: + stream_set_timeout($this->source, $arg1, $arg2); + break; + case STREAM_OPTION_WRITE_BUFFER: + stream_set_write_buffer($this->source, $arg1, $arg2); + } + } + + public function stream_stat() { + return fstat($this->source); + } + + public function stream_lock($mode) { + flock($this->source, $mode); + } + + public function stream_flush() { + return fflush($this->source); + } + + public function stream_eof() { + return feof($this->source); + } + + public function stream_close() { + fclose($this->source); + } +} diff --git a/lib/files/type/detection.php b/lib/files/type/detection.php new file mode 100644 index 00000000000..242a81cb5a4 --- /dev/null +++ b/lib/files/type/detection.php @@ -0,0 +1,121 @@ +<?php +/** + * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com> + * This file is licensed under the Affero General Public License version 3 or + * later. + * See the COPYING-README file. + */ + +namespace OC\Files\Type; + +/** + * Class Detection + * + * Mimetype detection + * + * @package OC\Files\Type + */ +class Detection { + protected $mimetypes = array(); + + /** + * add an extension -> mimetype mapping + * + * @param string $extension + * @param string $mimetype + */ + public function registerType($extension, $mimetype) { + $this->mimetypes[$extension] = $mimetype; + } + + /** + * add an array of extension -> mimetype mappings + * + * @param array $types + */ + public function registerTypeArray($types) { + $this->mimetypes = array_merge($this->mimetypes, $types); + } + + /** + * detect mimetype only based on filename, content of file is not used + * + * @param string $path + * @return string + */ + public function detectPath($path) { + if (strpos($path, '.')) { + //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'; + } else { + return 'application/octet-stream'; + } + } + + /** + * detect mimetype based on both filename and content + * + * @param string $path + * @return string + */ + public function detect($path) { + $isWrapped = (strpos($path, '://') !== false) and (substr($path, 0, 7) === 'file://'); + + if (@is_dir($path)) { + // directories are easy + return "httpd/unix-directory"; + } + + $mimeType = $this->detectPath($path); + + if ($mimeType === 'application/octet-stream' and function_exists('finfo_open') + and function_exists('finfo_file') and $finfo = finfo_open(FILEINFO_MIME) + ) { + $info = @strtolower(finfo_file($finfo, $path)); + if ($info) { + $mimeType = substr($info, 0, strpos($info, ';')); + } + finfo_close($finfo); + } + if (!$isWrapped and $mimeType === 'application/octet-stream' && function_exists("mime_content_type")) { + // use mime magic extension if available + $mimeType = mime_content_type($path); + } + if (!$isWrapped and $mimeType === 'application/octet-stream' && \OC_Helper::canExecute("file")) { + // it looks like we have a 'file' command, + // lets see if it does have mime support + $path = escapeshellarg($path); + $fp = popen("file -b --mime-type $path 2>/dev/null", "r"); + $reply = fgets($fp); + pclose($fp); + + //trim the newline + $mimeType = trim($reply); + + } + return $mimeType; + } + + /** + * detect mimetype based on the content of a string + * + * @param string $data + * @return string + */ + public function detectString($data) { + if (function_exists('finfo_open') and function_exists('finfo_file')) { + $finfo = finfo_open(FILEINFO_MIME); + return finfo_buffer($finfo, $data); + } else { + $tmpFile = \OC_Helper::tmpFile(); + $fh = fopen($tmpFile, 'wb'); + fwrite($fh, $data, 8024); + fclose($fh); + $mime = $this->detect($tmpFile); + unset($tmpFile); + return $mime; + } + } +} diff --git a/lib/files/type/templatemanager.php b/lib/files/type/templatemanager.php new file mode 100644 index 00000000000..cd1536d2732 --- /dev/null +++ b/lib/files/type/templatemanager.php @@ -0,0 +1,46 @@ +<?php +/** + * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com> + * This file is licensed under the Affero General Public License version 3 or + * later. + * See the COPYING-README file. + */ + +namespace OC\Files\Type; + +class TemplateManager { + protected $templates = array(); + + public function registerTemplate($mimetype, $path) { + $this->templates[$mimetype] = $path; + } + + /** + * get the path of the template for a mimetype + * + * @param string $mimetype + * @return string | null + */ + public function getTemplatePath($mimetype) { + if (isset($this->templates[$mimetype])) { + return $this->templates[$mimetype]; + } else { + return null; + } + } + + /** + * get the template content for a mimetype + * + * @param string $mimetype + * @return string + */ + public function getTemplate($mimetype) { + $path = $this->getTemplatePath($mimetype); + if ($path) { + return file_get_contents($path); + } else { + return ''; + } + } +} diff --git a/lib/files/view.php b/lib/files/view.php index c9727fe4984..bb737f19ef8 100644 --- a/lib/files/view.php +++ b/lib/files/view.php @@ -499,7 +499,7 @@ class View { } else { if ($this->is_dir($path1) && ($dh = $this->opendir($path1))) { $result = $this->mkdir($path2); - while ($file = readdir($dh)) { + while (($file = readdir($dh)) !== false) { if (!Filesystem::isIgnoredDir($file)) { $result = $this->copy($path1 . '/' . $file, $path2 . '/' . $file); } diff --git a/lib/geo.php b/lib/geo.php index 4eb785da355..ed01ad0b616 100644 --- a/lib/geo.php +++ b/lib/geo.php @@ -28,4 +28,4 @@ class OC_Geo{ reset($variances); return current($variances); } -}
\ No newline at end of file +} diff --git a/lib/helper.php b/lib/helper.php index ca508e1d933..1024a570e36 100644 --- a/lib/helper.php +++ b/lib/helper.php @@ -25,9 +25,10 @@ * Collection of useful functions */ class OC_Helper { - private static $mimetypes=array(); - private static $tmpFiles=array(); + private static $tmpFiles = array(); private static $mimetypeIcons = array(); + private static $mimetypeDetector; + private static $templateManager; /** * @brief Creates an url using a defined route @@ -39,7 +40,7 @@ class OC_Helper { * * Returns a url to the given app and file. */ - public static function linkToRoute( $route, $parameters = array() ) { + public static function linkToRoute($route, $parameters = array()) { $urlLinkTo = OC::getRouter()->generate($route, $parameters); return $urlLinkTo; } @@ -49,7 +50,7 @@ class OC_Helper { * @param string $app app * @param string $file file * @param array $args array with param=>value, will be appended to the returned url - * The value of $args will be urlencoded + * The value of $args will be urlencoded * @return string the url * * Returns a url to the given app and file. @@ -58,29 +59,26 @@ class OC_Helper { if( $app != '' ) { $app_path = OC_App::getAppPath($app); // Check if the app is in the app folder - if( $app_path && file_exists( $app_path.'/'.$file )) { - if(substr($file, -3) == 'php' || substr($file, -3) == 'css') { - $urlLinkTo = OC::$WEBROOT . '/index.php/apps/' . $app; - $urlLinkTo .= ($file!='index.php') ? '/' . $file : ''; - }else{ - $urlLinkTo = OC_App::getAppWebPath($app) . '/' . $file; + if ($app_path && file_exists($app_path . '/' . $file)) { + if (substr($file, -3) == 'php' || substr($file, -3) == 'css') { + $urlLinkTo = OC::$WEBROOT . '/index.php/apps/' . $app; + $urlLinkTo .= ($file != 'index.php') ? '/' . $file : ''; + } else { + $urlLinkTo = OC_App::getAppWebPath($app) . '/' . $file; } + } else { + $urlLinkTo = OC::$WEBROOT . '/' . $app . '/' . $file; } - else{ - $urlLinkTo = OC::$WEBROOT . '/' . $app . '/' . $file; - } - } - else{ - if( file_exists( OC::$SERVERROOT . '/core/'. $file )) { - $urlLinkTo = OC::$WEBROOT . '/core/'.$file; - } - else{ - $urlLinkTo = OC::$WEBROOT . '/'.$file; + } else { + if (file_exists(OC::$SERVERROOT . '/core/' . $file)) { + $urlLinkTo = OC::$WEBROOT . '/core/' . $file; + } else { + $urlLinkTo = OC::$WEBROOT . '/' . $file; } } if ($args && $query = http_build_query($args, '', '&')) { - $urlLinkTo .= '?'.$query; + $urlLinkTo .= '?' . $query; } return $urlLinkTo; @@ -91,13 +89,13 @@ class OC_Helper { * @param string $app app * @param string $file file * @param array $args array with param=>value, will be appended to the returned url - * The value of $args will be urlencoded + * The value of $args will be urlencoded * @return string the url * * Returns a absolute url to the given app and file. */ - public static function linkToAbsolute( $app, $file, $args = array() ) { - $urlLinkTo = self::linkTo( $app, $file, $args ); + public static function linkToAbsolute($app, $file, $args = array()) { + $urlLinkTo = self::linkTo($app, $file, $args); return self::makeURLAbsolute($urlLinkTo); } @@ -108,9 +106,8 @@ class OC_Helper { * * Returns a absolute url to the given app and file. */ - public static function makeURLAbsolute( $url ) - { - return OC_Request::serverProtocol(). '://' . OC_Request::serverHost() . $url; + public static function makeURLAbsolute($url) { + return OC_Request::serverProtocol() . '://' . OC_Request::serverHost() . $url; } /** @@ -120,8 +117,8 @@ class OC_Helper { * * Returns a url to the given service. */ - public static function linkToRemoteBase( $service ) { - return self::linkTo( '', 'remote.php') . '/' . $service; + public static function linkToRemoteBase($service) { + return self::linkTo('', 'remote.php') . '/' . $service; } /** @@ -132,9 +129,9 @@ class OC_Helper { * * Returns a absolute url to the given service. */ - public static function linkToRemote( $service, $add_slash = true ) { + public static function linkToRemote($service, $add_slash = true) { return self::makeURLAbsolute(self::linkToRemoteBase($service)) - . (($add_slash && $service[strlen($service)-1]!='/')?'/':''); + . (($add_slash && $service[strlen($service) - 1] != '/') ? '/' : ''); } /** @@ -146,8 +143,8 @@ class OC_Helper { * Returns a absolute url to the given service. */ public static function linkToPublic($service, $add_slash = false) { - return self::linkToAbsolute( '', 'public.php') . '?service=' . $service - . (($add_slash && $service[strlen($service)-1]!='/')?'/':''); + return self::linkToAbsolute('', 'public.php') . '?service=' . $service + . (($add_slash && $service[strlen($service) - 1] != '/') ? '/' : ''); } /** @@ -158,25 +155,25 @@ class OC_Helper { * * Returns the path to the image. */ - public static function imagePath( $app, $image ) { + public static function imagePath($app, $image) { // Read the selected theme from the config file $theme = OC_Util::getTheme(); // Check if the app is in the app folder - if( file_exists( OC::$SERVERROOT."/themes/$theme/apps/$app/img/$image" )) { - return OC::$WEBROOT."/themes/$theme/apps/$app/img/$image"; - }elseif( file_exists(OC_App::getAppPath($app)."/img/$image" )) { - return OC_App::getAppWebPath($app)."/img/$image"; - }elseif( !empty( $app ) and file_exists( OC::$SERVERROOT."/themes/$theme/$app/img/$image" )) { - return OC::$WEBROOT."/themes/$theme/$app/img/$image"; - }elseif( !empty( $app ) and file_exists( OC::$SERVERROOT."/$app/img/$image" )) { - return OC::$WEBROOT."/$app/img/$image"; - }elseif( file_exists( OC::$SERVERROOT."/themes/$theme/core/img/$image" )) { - return OC::$WEBROOT."/themes/$theme/core/img/$image"; - }elseif( file_exists( OC::$SERVERROOT."/core/img/$image" )) { - return OC::$WEBROOT."/core/img/$image"; - }else{ - throw new RuntimeException('image not found: image:'.$image.' webroot:'.OC::$WEBROOT.' serverroot:'.OC::$SERVERROOT); + if (file_exists(OC::$SERVERROOT . "/themes/$theme/apps/$app/img/$image")) { + return OC::$WEBROOT . "/themes/$theme/apps/$app/img/$image"; + } elseif (file_exists(OC_App::getAppPath($app) . "/img/$image")) { + return OC_App::getAppWebPath($app) . "/img/$image"; + } elseif (!empty($app) and file_exists(OC::$SERVERROOT . "/themes/$theme/$app/img/$image")) { + return OC::$WEBROOT . "/themes/$theme/$app/img/$image"; + } elseif (!empty($app) and file_exists(OC::$SERVERROOT . "/$app/img/$image")) { + return OC::$WEBROOT . "/$app/img/$image"; + } elseif (file_exists(OC::$SERVERROOT . "/themes/$theme/core/img/$image")) { + return OC::$WEBROOT . "/themes/$theme/core/img/$image"; + } elseif (file_exists(OC::$SERVERROOT . "/core/img/$image")) { + return OC::$WEBROOT . "/core/img/$image"; + } else { + throw new RuntimeException('image not found: image:' . $image . ' webroot:' . OC::$WEBROOT . ' serverroot:' . OC::$SERVERROOT); } } @@ -197,28 +194,28 @@ class OC_Helper { } // Replace slash and backslash with a minus $icon = str_replace('/', '-', $mimetype); - $icon = str_replace( '\\', '-', $icon); + $icon = str_replace('\\', '-', $icon); // Is it a dir? if ($mimetype === 'dir') { - self::$mimetypeIcons[$mimetype] = OC::$WEBROOT.'/core/img/filetypes/folder.png'; - return OC::$WEBROOT.'/core/img/filetypes/folder.png'; + self::$mimetypeIcons[$mimetype] = OC::$WEBROOT . '/core/img/filetypes/folder.png'; + return OC::$WEBROOT . '/core/img/filetypes/folder.png'; } // Icon exists? - if (file_exists(OC::$SERVERROOT.'/core/img/filetypes/'.$icon.'.png')) { - self::$mimetypeIcons[$mimetype] = OC::$WEBROOT.'/core/img/filetypes/'.$icon.'.png'; - return OC::$WEBROOT.'/core/img/filetypes/'.$icon.'.png'; + if (file_exists(OC::$SERVERROOT . '/core/img/filetypes/' . $icon . '.png')) { + self::$mimetypeIcons[$mimetype] = OC::$WEBROOT . '/core/img/filetypes/' . $icon . '.png'; + return OC::$WEBROOT . '/core/img/filetypes/' . $icon . '.png'; } // Try only the first part of the filetype $mimePart = substr($icon, 0, strpos($icon, '-')); - if (file_exists(OC::$SERVERROOT.'/core/img/filetypes/'.$mimePart.'.png')) { - self::$mimetypeIcons[$mimetype] = OC::$WEBROOT.'/core/img/filetypes/'.$mimePart.'.png'; - return OC::$WEBROOT.'/core/img/filetypes/'.$mimePart.'.png'; + if (file_exists(OC::$SERVERROOT . '/core/img/filetypes/' . $mimePart . '.png')) { + self::$mimetypeIcons[$mimetype] = OC::$WEBROOT . '/core/img/filetypes/' . $mimePart . '.png'; + return OC::$WEBROOT . '/core/img/filetypes/' . $mimePart . '.png'; } else { - self::$mimetypeIcons[$mimetype] = OC::$WEBROOT.'/core/img/filetypes/file.png'; - return OC::$WEBROOT.'/core/img/filetypes/file.png'; + self::$mimetypeIcons[$mimetype] = OC::$WEBROOT . '/core/img/filetypes/file.png'; + return OC::$WEBROOT . '/core/img/filetypes/file.png'; } } @@ -229,25 +226,25 @@ class OC_Helper { * * Makes 2048 to 2 kB. */ - public static function humanFileSize( $bytes ) { - if( $bytes < 0 ) { + public static function humanFileSize($bytes) { + if ($bytes < 0) { $l = OC_L10N::get('lib'); - return $l->t("couldn't be determined"); + return "?"; } - if( $bytes < 1024 ) { + if ($bytes < 1024) { return "$bytes B"; } - $bytes = round( $bytes / 1024, 1 ); - if( $bytes < 1024 ) { + $bytes = round($bytes / 1024, 1); + if ($bytes < 1024) { return "$bytes kB"; } - $bytes = round( $bytes / 1024, 1 ); - if( $bytes < 1024 ) { + $bytes = round($bytes / 1024, 1); + if ($bytes < 1024) { return "$bytes MB"; } // Wow, heavy duty for owncloud - $bytes = round( $bytes / 1024, 1 ); + $bytes = round($bytes / 1024, 1); return "$bytes GB"; } @@ -260,21 +257,21 @@ class OC_Helper { * * Inspired by: http://www.php.net/manual/en/function.filesize.php#92418 */ - public static function computerFileSize( $str ) { - $str=strtolower($str); + public static function computerFileSize($str) { + $str = strtolower($str); $bytes_array = array( 'b' => 1, 'k' => 1024, 'kb' => 1024, 'mb' => 1024 * 1024, - 'm' => 1024 * 1024, + 'm' => 1024 * 1024, 'gb' => 1024 * 1024 * 1024, - 'g' => 1024 * 1024 * 1024, + 'g' => 1024 * 1024 * 1024, 'tb' => 1024 * 1024 * 1024 * 1024, - 't' => 1024 * 1024 * 1024 * 1024, + 't' => 1024 * 1024 * 1024 * 1024, 'pb' => 1024 * 1024 * 1024 * 1024 * 1024, - 'p' => 1024 * 1024 * 1024 * 1024 * 1024, + 'p' => 1024 * 1024 * 1024 * 1024 * 1024, ); $bytes = floatval($str); @@ -299,18 +296,17 @@ class OC_Helper { return chmod($path, $filemode); $dh = opendir($path); while (($file = readdir($dh)) !== false) { - if($file != '.' && $file != '..') { - $fullpath = $path.'/'.$file; - if(is_link($fullpath)) + if ($file != '.' && $file != '..') { + $fullpath = $path . '/' . $file; + if (is_link($fullpath)) return false; - elseif(!is_dir($fullpath) && !@chmod($fullpath, $filemode)) - return false; - elseif(!self::chmodr($fullpath, $filemode)) + elseif (!is_dir($fullpath) && !@chmod($fullpath, $filemode)) + return false; elseif (!self::chmodr($fullpath, $filemode)) return false; } } closedir($dh); - if(@chmod($path, $filemode)) + if (@chmod($path, $filemode)) return true; else return false; @@ -323,8 +319,8 @@ class OC_Helper { * */ static function copyr($src, $dest) { - if(is_dir($src)) { - if(!is_dir($dest)) { + if (is_dir($src)) { + if (!is_dir($dest)) { mkdir($dest); } $files = scandir($src); @@ -333,7 +329,7 @@ class OC_Helper { self::copyr("$src/$file", "$dest/$file"); } } - }elseif(file_exists($src) && !\OC\Files\Filesystem::isFileBlacklisted($src)) { + } elseif (file_exists($src) && !\OC\Files\Filesystem::isFileBlacklisted($src)) { copy($src, $dest); } } @@ -344,105 +340,74 @@ class OC_Helper { * @return bool */ static function rmdirr($dir) { - if(is_dir($dir)) { - $files=scandir($dir); - foreach($files as $file) { + if (is_dir($dir)) { + $files = scandir($dir); + foreach ($files as $file) { if ($file != "." && $file != "..") { self::rmdirr("$dir/$file"); } } rmdir($dir); - }elseif(file_exists($dir)) { + } elseif (file_exists($dir)) { unlink($dir); } - if(file_exists($dir)) { + if (file_exists($dir)) { return false; - }else{ + } else { return true; } } /** + * @return \OC\Files\Type\Detection + */ + static public function getMimetypeDetector() { + if (!self::$mimetypeDetector) { + self::$mimetypeDetector = new \OC\Files\Type\Detection(); + self::$mimetypeDetector->registerTypeArray(include 'mimetypes.list.php'); + } + return self::$mimetypeDetector; + } + + /** + * @return \OC\Files\Type\TemplateManager + */ + static public function getFileTemplateManager() { + if (!self::$templateManager) { + self::$templateManager = new \OC\Files\Type\TemplateManager(); + } + return self::$templateManager; + } + + /** * Try to guess the mimetype based on filename * * @param string $path * @return string */ - static public function getFileNameMimeType($path){ - if(strpos($path, '.')) { - //try to guess the type by the file extension - if(!self::$mimetypes || self::$mimetypes != include 'mimetypes.list.php') { - self::$mimetypes=include 'mimetypes.list.php'; - } - $extension=strtolower(strrchr(basename($path), ".")); - $extension=substr($extension, 1);//remove leading . - return (isset(self::$mimetypes[$extension]))?self::$mimetypes[$extension]:'application/octet-stream'; - }else{ - return 'application/octet-stream'; - } + static public function getFileNameMimeType($path) { + return self::getMimetypeDetector()->detectPath($path); } /** * get the mimetype form a local file + * * @param string $path * @return string * does NOT work for ownClouds filesystem, use OC_FileSystem::getMimeType instead */ static function getMimeType($path) { - $isWrapped=(strpos($path, '://')!==false) and (substr($path, 0, 7)=='file://'); - - if (@is_dir($path)) { - // directories are easy - return "httpd/unix-directory"; - } - - $mimeType = self::getFileNameMimeType($path); - - if($mimeType=='application/octet-stream' and function_exists('finfo_open') - and function_exists('finfo_file') and $finfo=finfo_open(FILEINFO_MIME)) { - $info = @strtolower(finfo_file($finfo, $path)); - if($info) { - $mimeType=substr($info, 0, strpos($info, ';')); - } - finfo_close($finfo); - } - if (!$isWrapped and $mimeType=='application/octet-stream' && function_exists("mime_content_type")) { - // use mime magic extension if available - $mimeType = mime_content_type($path); - } - if (!$isWrapped and $mimeType=='application/octet-stream' && OC_Helper::canExecute("file")) { - // it looks like we have a 'file' command, - // lets see if it does have mime support - $path=escapeshellarg($path); - $fp = popen("file -b --mime-type $path 2>/dev/null", "r"); - $reply = fgets($fp); - pclose($fp); - - //trim the newline - $mimeType = trim($reply); - - } - return $mimeType; + return self::getMimetypeDetector()->detect($path); } /** * get the mimetype form a data string + * * @param string $data * @return string */ static function getStringMimeType($data) { - if(function_exists('finfo_open') and function_exists('finfo_file')) { - $finfo=finfo_open(FILEINFO_MIME); - return finfo_buffer($finfo, $data); - }else{ - $tmpFile=OC_Helper::tmpFile(); - $fh=fopen($tmpFile, 'wb'); - fwrite($fh, $data, 8024); - fclose($fh); - $mime=self::getMimeType($tmpFile); - unset($tmpFile); - return $mime; - } + return self::getMimetypeDetector()->detectString($data); } /** @@ -454,9 +419,9 @@ class OC_Helper { */ //FIXME: should also check for value validation (i.e. the email is an email). - public static function init_var($s, $d="") { + public static function init_var($s, $d = "") { $r = $d; - if(isset($_REQUEST[$s]) && !empty($_REQUEST[$s])) { + if (isset($_REQUEST[$s]) && !empty($_REQUEST[$s])) { $r = OC_Util::sanitizeHTML($_REQUEST[$s]); } @@ -466,12 +431,13 @@ class OC_Helper { /** * returns "checked"-attribute if request contains selected radio element * OR if radio element is the default one -- maybe? + * * @param string $s Name of radio-button element name * @param string $v Value of current radio-button element * @param string $d Value of default radio-button element */ public static function init_radio($s, $v, $d) { - if((isset($_REQUEST[$s]) && $_REQUEST[$s]==$v) || (!isset($_REQUEST[$s]) && $v == $d)) + if ((isset($_REQUEST[$s]) && $_REQUEST[$s] == $v) || (!isset($_REQUEST[$s]) && $v == $d)) print "checked=\"checked\" "; } @@ -503,17 +469,17 @@ class OC_Helper { $dirs = explode(PATH_SEPARATOR, $path); // WARNING : We have to check if open_basedir is enabled : $obd = ini_get('open_basedir'); - if($obd != "none") { + if ($obd != "none") { $obd_values = explode(PATH_SEPARATOR, $obd); - if(count($obd_values) > 0 and $obd_values[0]) { + if (count($obd_values) > 0 and $obd_values[0]) { // open_basedir is in effect ! // We need to check if the program is in one of these dirs : $dirs = $obd_values; } } - foreach($dirs as $dir) { - foreach($exts as $ext) { - if($check_fn("$dir/$name".$ext)) + foreach ($dirs as $dir) { + foreach ($exts as $ext) { + if ($check_fn("$dir/$name" . $ext)) return true; } } @@ -522,18 +488,19 @@ class OC_Helper { /** * copy the contents of one stream to another + * * @param resource $source * @param resource $target * @return int the number of bytes copied */ public static function streamCopy($source, $target) { - if(!$source or !$target) { + if (!$source or !$target) { return false; } $result = true; $count = 0; - while(!feof($source)) { - if ( ( $c = fwrite($target, fread($source, 8192)) ) === false) { + while (!feof($source)) { + if (($c = fwrite($target, fread($source, 8192))) === false) { $result = false; } else { $count += $c; @@ -544,37 +511,39 @@ class OC_Helper { /** * create a temporary file with an unique filename + * * @param string $postfix * @return string * * temporary files are automatically cleaned up after the script is finished */ - public static function tmpFile($postfix='') { - $file=get_temp_dir().'/'.md5(time().rand()).$postfix; - $fh=fopen($file, 'w'); + public static function tmpFile($postfix = '') { + $file = get_temp_dir() . '/' . md5(time() . rand()) . $postfix; + $fh = fopen($file, 'w'); fclose($fh); - self::$tmpFiles[]=$file; + self::$tmpFiles[] = $file; return $file; } /** * move a file to oc-noclean temp dir + * * @param string $filename * @return mixed * */ - public static function moveToNoClean($filename='') { + public static function moveToNoClean($filename = '') { if ($filename == '') { return false; } - $tmpDirNoClean=get_temp_dir().'/oc-noclean/'; + $tmpDirNoClean = get_temp_dir() . '/oc-noclean/'; if (!file_exists($tmpDirNoClean) || !is_dir($tmpDirNoClean)) { if (file_exists($tmpDirNoClean)) { unlink($tmpDirNoClean); } mkdir($tmpDirNoClean); } - $newname=$tmpDirNoClean.basename($filename); + $newname = $tmpDirNoClean . basename($filename); if (rename($filename, $newname)) { return $newname; } else { @@ -584,34 +553,35 @@ class OC_Helper { /** * create a temporary folder with an unique filename + * * @return string * * temporary files are automatically cleaned up after the script is finished */ public static function tmpFolder() { - $path=get_temp_dir().'/'.md5(time().rand()); + $path = get_temp_dir() . '/' . md5(time() . rand()); mkdir($path); - self::$tmpFiles[]=$path; - return $path.'/'; + self::$tmpFiles[] = $path; + return $path . '/'; } /** * remove all files created by self::tmpFile */ public static function cleanTmp() { - $leftoversFile=get_temp_dir().'/oc-not-deleted'; - if(file_exists($leftoversFile)) { - $leftovers=file($leftoversFile); - foreach($leftovers as $file) { + $leftoversFile = get_temp_dir() . '/oc-not-deleted'; + if (file_exists($leftoversFile)) { + $leftovers = file($leftoversFile); + foreach ($leftovers as $file) { self::rmdirr($file); } unlink($leftoversFile); } - foreach(self::$tmpFiles as $file) { - if(file_exists($file)) { - if(!self::rmdirr($file)) { - file_put_contents($leftoversFile, $file."\n", FILE_APPEND); + foreach (self::$tmpFiles as $file) { + if (file_exists($file)) { + if (!self::rmdirr($file)) { + file_put_contents($leftoversFile, $file . "\n", FILE_APPEND); } } } @@ -621,34 +591,34 @@ class OC_Helper { * remove all files in PHP /oc-noclean temp dir */ public static function cleanTmpNoClean() { - $tmpDirNoCleanFile=get_temp_dir().'/oc-noclean/'; - if(file_exists($tmpDirNoCleanFile)) { + $tmpDirNoCleanFile = get_temp_dir() . '/oc-noclean/'; + if (file_exists($tmpDirNoCleanFile)) { self::rmdirr($tmpDirNoCleanFile); } } /** - * Adds a suffix to the name in case the file exists - * - * @param $path - * @param $filename - * @return string - */ + * Adds a suffix to the name in case the file exists + * + * @param $path + * @param $filename + * @return string + */ public static function buildNotExistingFileName($path, $filename) { $view = \OC\Files\Filesystem::getView(); return self::buildNotExistingFileNameForView($path, $filename, $view); } /** - * Adds a suffix to the name in case the file exists - * - * @param $path - * @param $filename - * @return string - */ + * Adds a suffix to the name in case the file exists + * + * @param $path + * @param $filename + * @return string + */ public static function buildNotExistingFileNameForView($path, $filename, \OC\Files\View $view) { - if($path==='/') { - $path=''; + if ($path === '/') { + $path = ''; } if ($pos = strrpos($filename, '.')) { $name = substr($filename, 0, $pos); @@ -660,10 +630,10 @@ class OC_Helper { $newpath = $path . '/' . $filename; if ($view->file_exists($newpath)) { - if(preg_match_all('/\((\d+)\)/', $name, $matches, PREG_OFFSET_CAPTURE)) { + if (preg_match_all('/\((\d+)\)/', $name, $matches, PREG_OFFSET_CAPTURE)) { //Replace the last "(number)" with "(number+1)" - $last_match = count($matches[0])-1; - $counter = $matches[1][$last_match][0]+1; + $last_match = count($matches[0]) - 1; + $counter = $matches[1][$last_match][0] + 1; $offset = $matches[0][$last_match][1]; $match_length = strlen($matches[0][$last_match][0]); } else { @@ -671,9 +641,9 @@ class OC_Helper { $offset = false; } do { - if($offset) { + if ($offset) { //Replace the last "(number)" with "(number+1)" - $newname = substr_replace($name, '('.$counter.')', $offset, $match_length); + $newname = substr_replace($name, '(' . $counter . ')', $offset, $match_length); } else { $newname = $name . ' (' . $counter . ')'; } @@ -700,17 +670,17 @@ class OC_Helper { } /** - * @brief Returns an array with all keys from input lowercased or uppercased. Numbered indices are left as is. - * - * @param array $input The array to work on - * @param int $case Either MB_CASE_UPPER or MB_CASE_LOWER (default) - * @param string $encoding The encoding parameter is the character encoding. Defaults to UTF-8 - * @return array - * - * Returns an array with all keys from input lowercased or uppercased. Numbered indices are left as is. - * based on http://www.php.net/manual/en/function.array-change-key-case.php#107715 - * - */ + * @brief Returns an array with all keys from input lowercased or uppercased. Numbered indices are left as is. + * + * @param array $input The array to work on + * @param int $case Either MB_CASE_UPPER or MB_CASE_LOWER (default) + * @param string $encoding The encoding parameter is the character encoding. Defaults to UTF-8 + * @return array + * + * Returns an array with all keys from input lowercased or uppercased. Numbered indices are left as is. + * based on http://www.php.net/manual/en/function.array-change-key-case.php#107715 + * + */ public static function mb_array_change_key_case($input, $case = MB_CASE_LOWER, $encoding = 'UTF-8') { $case = ($case != MB_CASE_UPPER) ? MB_CASE_LOWER : MB_CASE_UPPER; $ret = array(); @@ -736,26 +706,26 @@ class OC_Helper { $length = intval($length); $string = mb_substr($string, 0, $start, $encoding) . $replacement . - mb_substr($string, $start+$length, mb_strlen($string, 'UTF-8')-$start, $encoding); + mb_substr($string, $start + $length, mb_strlen($string, 'UTF-8') - $start, $encoding); return $string; } /** - * @brief Replace all occurrences of the search string with the replacement string - * - * @param string $search The value being searched for, otherwise known as the needle. - * @param string $replace The replacement - * @param string $subject The string or array being searched and replaced on, otherwise known as the haystack. - * @param string $encoding The encoding parameter is the character encoding. Defaults to UTF-8 - * @param int $count If passed, this will be set to the number of replacements performed. - * @return string - * - */ + * @brief Replace all occurrences of the search string with the replacement string + * + * @param string $search The value being searched for, otherwise known as the needle. + * @param string $replace The replacement + * @param string $subject The string or array being searched and replaced on, otherwise known as the haystack. + * @param string $encoding The encoding parameter is the character encoding. Defaults to UTF-8 + * @param int $count If passed, this will be set to the number of replacements performed. + * @return string + * + */ public static function mb_str_replace($search, $replace, $subject, $encoding = 'UTF-8', &$count = null) { $offset = -1; $length = mb_strlen($search, $encoding); - while(($i = mb_strrpos($subject, $search, $offset, $encoding)) !== false ) { + while (($i = mb_strrpos($subject, $search, $offset, $encoding)) !== false) { $subject = OC_Helper::mb_substr_replace($subject, $replace, $i, $length); $offset = $i - mb_strlen($subject, $encoding); $count++; @@ -764,21 +734,21 @@ class OC_Helper { } /** - * @brief performs a search in a nested array - * @param array $haystack the array to be searched - * @param string $needle the search string - * @param string $index optional, only search this key name - * @return mixed the key of the matching field, otherwise false - * - * performs a search in a nested array - * - * taken from http://www.php.net/manual/en/function.array-search.php#97645 - */ + * @brief performs a search in a nested array + * @param array $haystack the array to be searched + * @param string $needle the search string + * @param string $index optional, only search this key name + * @return mixed the key of the matching field, otherwise false + * + * performs a search in a nested array + * + * taken from http://www.php.net/manual/en/function.array-search.php#97645 + */ public static function recursiveArraySearch($haystack, $needle, $index = null) { $aIt = new RecursiveArrayIterator($haystack); $it = new RecursiveIteratorIterator($aIt); - while($it->valid()) { + while ($it->valid()) { if (((isset($index) AND ($it->key() == $index)) OR (!isset($index))) AND ($it->current() == $needle)) { return $aIt->key(); } @@ -792,6 +762,7 @@ class OC_Helper { /** * Shortens str to maxlen by replacing characters in the middle with '...', eg. * ellipsis('a very long string with lots of useless info to make a better example', 14) becomes 'a very ...example' + * * @param string $str the string * @param string $maxlen the maximum length of the result * @return string with at most maxlen characters @@ -815,14 +786,14 @@ class OC_Helper { $post_max_size = OCP\Util::computerFileSize(ini_get('post_max_size')); $freeSpace = \OC\Files\Filesystem::free_space($dir); if ((int)$upload_max_filesize === 0 and (int)$post_max_size === 0) { - $maxUploadFilesize = \OC\Files\FREE_SPACE_UNLIMITED; + $maxUploadFilesize = \OC\Files\SPACE_UNLIMITED; } elseif ((int)$upload_max_filesize === 0 or (int)$post_max_size === 0) { $maxUploadFilesize = max($upload_max_filesize, $post_max_size); //only the non 0 value counts } else { $maxUploadFilesize = min($upload_max_filesize, $post_max_size); } - if($freeSpace !== \OC\Files\FREE_SPACE_UNKNOWN){ + if ($freeSpace !== \OC\Files\SPACE_UNKNOWN) { $freeSpace = max($freeSpace, 0); return min($maxUploadFilesize, $freeSpace); @@ -833,6 +804,7 @@ class OC_Helper { /** * Checks if a function is available + * * @param string $function_name * @return bool */ @@ -861,7 +833,7 @@ class OC_Helper { $used = 0; } $free = \OC\Files\Filesystem::free_space(); - if ($free >= 0){ + if ($free >= 0) { $total = $free + $used; } else { $total = $free; //either unknown or unlimited @@ -869,7 +841,7 @@ class OC_Helper { if ($total == 0) { $total = 1; // prevent division by zero } - if ($total >= 0){ + if ($total >= 0) { $relative = round(($used / $total) * 10000) / 100; } else { $relative = 0; diff --git a/lib/installer.php b/lib/installer.php index dcd29f9e1ad..c29f9ec8982 100644 --- a/lib/installer.php +++ b/lib/installer.php @@ -109,7 +109,7 @@ class OC_Installer{ if(!is_file($extractDir.'/appinfo/info.xml')) { //try to find it in a subdir $dh=opendir($extractDir); - while($folder=readdir($dh)) { + while (($folder = readdir($dh)) !== false) { if($folder[0]!='.' and is_dir($extractDir.'/'.$folder)) { if(is_file($extractDir.'/'.$folder.'/appinfo/info.xml')) { $extractDir.='/'.$folder; diff --git a/lib/l10n/af_ZA.php b/lib/l10n/af_ZA.php index a1fa3c848d2..d6bf5771e8d 100644 --- a/lib/l10n/af_ZA.php +++ b/lib/l10n/af_ZA.php @@ -6,9 +6,9 @@ $TRANSLATIONS = array( "Users" => "Gebruikers", "Admin" => "Admin", "web services under your control" => "webdienste onder jou beheer", -"_%n minute ago_::_%n minutes ago_" => array(,), -"_%n hour ago_::_%n hours ago_" => array(,), -"_%n day go_::_%n days ago_" => array(,), -"_%n month ago_::_%n months ago_" => array(,) +"_%n minute ago_::_%n minutes ago_" => array("",""), +"_%n hour ago_::_%n hours ago_" => array("",""), +"_%n day go_::_%n days ago_" => array("",""), +"_%n month ago_::_%n months ago_" => array("","") ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/lib/l10n/ar.php b/lib/l10n/ar.php index 8225fd17a2f..f626dcdfda6 100644 --- a/lib/l10n/ar.php +++ b/lib/l10n/ar.php @@ -10,7 +10,6 @@ $TRANSLATIONS = array( "Files need to be downloaded one by one." => "الملفات بحاجة الى ان يتم تحميلها واحد تلو الاخر", "Back to Files" => "العودة الى الملفات", "Selected files too large to generate zip file." => "الملفات المحددة كبيرة جدا ليتم ضغطها في ملف zip", -"couldn't be determined" => "تعذّر تحديده", "Application is not enabled" => "التطبيق غير مفعّل", "Authentication error" => "لم يتم التأكد من الشخصية بنجاح", "Token expired. Please reload page." => "انتهت صلاحية الكلمة , يرجى اعادة تحميل الصفحة", @@ -37,13 +36,13 @@ $TRANSLATIONS = array( "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "اعدادات خادمك غير صحيحة بشكل تسمح لك بمزامنة ملفاتك وذلك بسبب أن واجهة WebDAV تبدو معطلة", "Please double check the <a href='%s'>installation guides</a>." => "الرجاء التحقق من <a href='%s'>دليل التنصيب</a>.", "seconds ago" => "منذ ثواني", -"_%n minute ago_::_%n minutes ago_" => array(,), -"_%n hour ago_::_%n hours ago_" => array(,), +"_%n minute ago_::_%n minutes ago_" => array("","","","","",""), +"_%n hour ago_::_%n hours ago_" => array("","","","","",""), "today" => "اليوم", "yesterday" => "يوم أمس", -"_%n day go_::_%n days ago_" => array(,), +"_%n day go_::_%n days ago_" => array("","","","","",""), "last month" => "الشهر الماضي", -"_%n month ago_::_%n months ago_" => array(,), +"_%n month ago_::_%n months ago_" => array("","","","","",""), "last year" => "السنةالماضية", "years ago" => "سنة مضت", "Could not find category \"%s\"" => "تعذر العثور على المجلد \"%s\"" diff --git a/lib/l10n/be.php b/lib/l10n/be.php index a5d399a3105..1570411eb86 100644 --- a/lib/l10n/be.php +++ b/lib/l10n/be.php @@ -1,8 +1,8 @@ <?php $TRANSLATIONS = array( -"_%n minute ago_::_%n minutes ago_" => array(,), -"_%n hour ago_::_%n hours ago_" => array(,), -"_%n day go_::_%n days ago_" => array(,), -"_%n month ago_::_%n months ago_" => array(,) +"_%n minute ago_::_%n minutes ago_" => array("","","",""), +"_%n hour ago_::_%n hours ago_" => array("","","",""), +"_%n day go_::_%n days ago_" => array("","","",""), +"_%n month ago_::_%n months ago_" => array("","","","") ); $PLURAL_FORMS = "nplurals=4; 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/bg_BG.php b/lib/l10n/bg_BG.php index 021d924d380..b6cc949eb8a 100644 --- a/lib/l10n/bg_BG.php +++ b/lib/l10n/bg_BG.php @@ -10,7 +10,6 @@ $TRANSLATIONS = array( "Files need to be downloaded one by one." => "Файловете трябва да се изтеглят един по един.", "Back to Files" => "Назад към файловете", "Selected files too large to generate zip file." => "Избраните файлове са прекалено големи за генерирането на ZIP архив.", -"couldn't be determined" => "не може да се определи", "Application is not enabled" => "Приложението не е включено.", "Authentication error" => "Възникна проблем с идентификацията", "Token expired. Please reload page." => "Ключът е изтекъл, моля презаредете страницата", @@ -38,13 +37,13 @@ $TRANSLATIONS = array( "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Вашият web сървър все още не е удачно настроен да позволява синхронизация на файлове, защото WebDAV интерфейсът изглежда не работи.", "Please double check the <a href='%s'>installation guides</a>." => "Моля направете повторна справка с <a href='%s'>ръководството за инсталиране</a>.", "seconds ago" => "преди секунди", -"_%n minute ago_::_%n minutes ago_" => array(,), -"_%n hour ago_::_%n hours ago_" => array(,), +"_%n minute ago_::_%n minutes ago_" => array("",""), +"_%n hour ago_::_%n hours ago_" => array("",""), "today" => "днес", "yesterday" => "вчера", -"_%n day go_::_%n days ago_" => array(,), +"_%n day go_::_%n days ago_" => array("",""), "last month" => "последният месец", -"_%n month ago_::_%n months ago_" => array(,), +"_%n month ago_::_%n months ago_" => array("",""), "last year" => "последната година", "years ago" => "последните години", "Could not find category \"%s\"" => "Невъзможно откриване на категорията \"%s\"" diff --git a/lib/l10n/bn_BD.php b/lib/l10n/bn_BD.php index 5b3610d9846..a42435a2a47 100644 --- a/lib/l10n/bn_BD.php +++ b/lib/l10n/bn_BD.php @@ -16,13 +16,13 @@ $TRANSLATIONS = array( "Files" => "ফাইল", "Text" => "টেক্সট", "seconds ago" => "সেকেন্ড পূর্বে", -"_%n minute ago_::_%n minutes ago_" => array(,), -"_%n hour ago_::_%n hours ago_" => array(,), +"_%n minute ago_::_%n minutes ago_" => array("",""), +"_%n hour ago_::_%n hours ago_" => array("",""), "today" => "আজ", "yesterday" => "গতকাল", -"_%n day go_::_%n days ago_" => array(,), +"_%n day go_::_%n days ago_" => array("",""), "last month" => "গত মাস", -"_%n month ago_::_%n months ago_" => array(,), +"_%n month ago_::_%n months ago_" => array("",""), "last year" => "গত বছর", "years ago" => "বছর পূর্বে" ); diff --git a/lib/l10n/bs.php b/lib/l10n/bs.php index aa8e01b803d..3cb98906e62 100644 --- a/lib/l10n/bs.php +++ b/lib/l10n/bs.php @@ -1,8 +1,8 @@ <?php $TRANSLATIONS = array( -"_%n minute ago_::_%n minutes ago_" => array(,), -"_%n hour ago_::_%n hours ago_" => array(,), -"_%n day go_::_%n days ago_" => array(,), -"_%n month ago_::_%n months ago_" => array(,) +"_%n minute ago_::_%n minutes ago_" => array("","",""), +"_%n hour ago_::_%n hours ago_" => array("","",""), +"_%n day go_::_%n days ago_" => array("","",""), +"_%n month ago_::_%n months ago_" => array("","","") ); $PLURAL_FORMS = "nplurals=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/ca.php b/lib/l10n/ca.php index a14c12ba964..67ccdabc636 100644 --- a/lib/l10n/ca.php +++ b/lib/l10n/ca.php @@ -13,7 +13,6 @@ $TRANSLATIONS = array( "Back to Files" => "Torna a Fitxers", "Selected files too large to generate zip file." => "Els fitxers seleccionats son massa grans per generar un fitxer zip.", "Download the files in smaller chunks, seperately or kindly ask your administrator." => "Baixeu els fitxers en trossos petits, de forma separada, o pregunteu a l'administrador.", -"couldn't be determined" => "no s'ha pogut determinar", "Application is not enabled" => "L'aplicació no està habilitada", "Authentication error" => "Error d'autenticació", "Token expired. Please reload page." => "El testimoni ha expirat. Torneu a carregar la pàgina.", @@ -41,13 +40,13 @@ $TRANSLATIONS = array( "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "El servidor web no està configurat correctament per permetre la sincronització de fitxers perquè la interfície WebDAV sembla no funcionar correctament.", "Please double check the <a href='%s'>installation guides</a>." => "Comproveu les <a href='%s'>guies d'instal·lació</a>.", "seconds ago" => "segons enrere", -"_%n minute ago_::_%n minutes ago_" => array(,), -"_%n hour ago_::_%n hours ago_" => array(,), +"_%n minute ago_::_%n minutes ago_" => array("",""), +"_%n hour ago_::_%n hours ago_" => array("",""), "today" => "avui", "yesterday" => "ahir", -"_%n day go_::_%n days ago_" => array(,), +"_%n day go_::_%n days ago_" => array("",""), "last month" => "el mes passat", -"_%n month ago_::_%n months ago_" => array(,), +"_%n month ago_::_%n months ago_" => array("",""), "last year" => "l'any passat", "years ago" => "anys enrere", "Caused by:" => "Provocat per:", diff --git a/lib/l10n/cs_CZ.php b/lib/l10n/cs_CZ.php index 48f51361eef..1a80fc78bb6 100644 --- a/lib/l10n/cs_CZ.php +++ b/lib/l10n/cs_CZ.php @@ -13,7 +13,6 @@ $TRANSLATIONS = array( "Back to Files" => "Zpět k souborům", "Selected files too large to generate zip file." => "Vybrané soubory jsou příliš velké pro vytvoření ZIP souboru.", "Download the files in smaller chunks, seperately or kindly ask your administrator." => "Stáhněte soubory po menších částech, samostatně, nebo se obraťte na správce.", -"couldn't be determined" => "nelze zjistit", "Application is not enabled" => "Aplikace není povolena", "Authentication error" => "Chyba ověření", "Token expired. Please reload page." => "Token vypršel. Obnovte prosím stránku.", @@ -41,13 +40,13 @@ $TRANSLATIONS = array( "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Váš webový server není správně nastaven pro umožnění synchronizace, rozhraní WebDAV se zdá být rozbité.", "Please double check the <a href='%s'>installation guides</a>." => "Zkonzultujte, prosím, <a href='%s'>průvodce instalací</a>.", "seconds ago" => "před pár sekundami", -"_%n minute ago_::_%n minutes ago_" => array(,), -"_%n hour ago_::_%n hours ago_" => array(,), +"_%n minute ago_::_%n minutes ago_" => array("před %n minutou","před %n minutami","před %n minutami"), +"_%n hour ago_::_%n hours ago_" => array("před %n hodinou","před %n hodinami","před %n hodinami"), "today" => "dnes", "yesterday" => "včera", -"_%n day go_::_%n days ago_" => array(,), +"_%n day go_::_%n days ago_" => array("před %n dnem","před %n dny","před %n dny"), "last month" => "minulý měsíc", -"_%n month ago_::_%n months ago_" => array(,), +"_%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", "Caused by:" => "Příčina:", diff --git a/lib/l10n/cy_GB.php b/lib/l10n/cy_GB.php index 9070897b164..6973b51878f 100644 --- a/lib/l10n/cy_GB.php +++ b/lib/l10n/cy_GB.php @@ -10,7 +10,6 @@ $TRANSLATIONS = array( "Files need to be downloaded one by one." => "Mae angen llwytho ffeiliau i lawr fesul un.", "Back to Files" => "Nôl i Ffeiliau", "Selected files too large to generate zip file." => "Mae'r ffeiliau ddewiswyd yn rhy fawr i gynhyrchu ffeil zip.", -"couldn't be determined" => "methwyd pennu", "Application is not enabled" => "Nid yw'r pecyn wedi'i alluogi", "Authentication error" => "Gwall dilysu", "Token expired. Please reload page." => "Tocyn wedi dod i ben. Ail-lwythwch y dudalen.", @@ -37,13 +36,13 @@ $TRANSLATIONS = array( "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Nid yw eich gweinydd wedi'i gyflunio eto i ganiatáu cydweddu ffeiliau oherwydd bod y rhyngwyneb WebDAV wedi torri.", "Please double check the <a href='%s'>installation guides</a>." => "Gwiriwch y <a href='%s'>canllawiau gosod</a> eto.", "seconds ago" => "eiliad yn ôl", -"_%n minute ago_::_%n minutes ago_" => array(,), -"_%n hour ago_::_%n hours ago_" => array(,), +"_%n minute ago_::_%n minutes ago_" => array("","","",""), +"_%n hour ago_::_%n hours ago_" => array("","","",""), "today" => "heddiw", "yesterday" => "ddoe", -"_%n day go_::_%n days ago_" => array(,), +"_%n day go_::_%n days ago_" => array("","","",""), "last month" => "mis diwethaf", -"_%n month ago_::_%n months ago_" => array(,), +"_%n month ago_::_%n months ago_" => array("","","",""), "last year" => "y llynedd", "years ago" => "blwyddyn yn ôl", "Could not find category \"%s\"" => "Methu canfod categori \"%s\"" diff --git a/lib/l10n/da.php b/lib/l10n/da.php index 62a4bfda9e1..78859b08745 100644 --- a/lib/l10n/da.php +++ b/lib/l10n/da.php @@ -13,7 +13,6 @@ $TRANSLATIONS = array( "Back to Files" => "Tilbage til Filer", "Selected files too large to generate zip file." => "De markerede filer er for store til at generere en ZIP-fil.", "Download the files in smaller chunks, seperately or kindly ask your administrator." => "Download filerne i små bider, seperat, eller kontakt venligst din administrator.", -"couldn't be determined" => "kunne ikke fastslås", "Application is not enabled" => "Programmet er ikke aktiveret", "Authentication error" => "Adgangsfejl", "Token expired. Please reload page." => "Adgang er udløbet. Genindlæs siden.", @@ -41,13 +40,13 @@ $TRANSLATIONS = array( "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Din webserver er endnu ikke sat op til at tillade fil synkronisering fordi WebDAV grænsefladen virker ødelagt.", "Please double check the <a href='%s'>installation guides</a>." => "Dobbelttjek venligst <a href='%s'>installations vejledningerne</a>.", "seconds ago" => "sekunder siden", -"_%n minute ago_::_%n minutes ago_" => array(,), -"_%n hour ago_::_%n hours ago_" => array(,), +"_%n minute ago_::_%n minutes ago_" => array("%n minut siden","%n minutter siden"), +"_%n hour ago_::_%n hours ago_" => array("%n time siden","%n timer siden"), "today" => "i dag", "yesterday" => "i går", -"_%n day go_::_%n days ago_" => array(,), +"_%n day go_::_%n days ago_" => array("%n dag siden","%n dage siden"), "last month" => "sidste måned", -"_%n month ago_::_%n months ago_" => array(,), +"_%n month ago_::_%n months ago_" => array("%n måned siden","%n måneder siden"), "last year" => "sidste år", "years ago" => "år siden", "Caused by:" => "Forårsaget af:", diff --git a/lib/l10n/de.php b/lib/l10n/de.php index 2a0eed151fa..01fe5ee0583 100644 --- a/lib/l10n/de.php +++ b/lib/l10n/de.php @@ -13,7 +13,6 @@ $TRANSLATIONS = array( "Back to Files" => "Zurück zu \"Dateien\"", "Selected files too large to generate zip file." => "Die gewählten Dateien sind zu groß, um eine ZIP-Datei zu erstellen.", "Download the files in smaller chunks, seperately or kindly ask your administrator." => "Lade die Dateien in kleineren, separaten, Stücken herunter oder bitte deinen Administrator.", -"couldn't be determined" => "konnte nicht festgestellt werden", "Application is not enabled" => "Die Anwendung ist nicht aktiviert", "Authentication error" => "Fehler bei der Anmeldung", "Token expired. Please reload page." => "Token abgelaufen. Bitte lade die Seite neu.", @@ -41,13 +40,13 @@ $TRANSLATIONS = array( "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Dein Web-Server ist noch nicht für Datei-Synchronisation bereit, weil die WebDAV-Schnittstelle vermutlich defekt ist.", "Please double check the <a href='%s'>installation guides</a>." => "Bitte prüfe die <a href='%s'>Installationsanleitungen</a>.", "seconds ago" => "Gerade eben", -"_%n minute ago_::_%n minutes ago_" => array(,), -"_%n hour ago_::_%n hours ago_" => array(,), +"_%n minute ago_::_%n minutes ago_" => array("","Vor %n Minuten"), +"_%n hour ago_::_%n hours ago_" => array("","Vor %n Stunden"), "today" => "Heute", "yesterday" => "Gestern", -"_%n day go_::_%n days ago_" => array(,), +"_%n day go_::_%n days ago_" => array("","Vor %n Tagen"), "last month" => "Letzten Monat", -"_%n month ago_::_%n months ago_" => array(,), +"_%n month ago_::_%n months ago_" => array("","Vor %n Monaten"), "last year" => "Letztes Jahr", "years ago" => "Vor Jahren", "Caused by:" => "Verursacht durch:", diff --git a/lib/l10n/de_AT.php b/lib/l10n/de_AT.php index b2de92ed491..15f78e0bce6 100644 --- a/lib/l10n/de_AT.php +++ b/lib/l10n/de_AT.php @@ -1,8 +1,8 @@ <?php $TRANSLATIONS = array( -"_%n minute ago_::_%n minutes ago_" => array(,), -"_%n hour ago_::_%n hours ago_" => array(,), -"_%n day go_::_%n days ago_" => array(,), -"_%n month ago_::_%n months ago_" => array(,) +"_%n minute ago_::_%n minutes ago_" => array("",""), +"_%n hour ago_::_%n hours ago_" => array("",""), +"_%n day go_::_%n days ago_" => array("",""), +"_%n month ago_::_%n months ago_" => array("","") ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/lib/l10n/de_CH.php b/lib/l10n/de_CH.php index b98e1dc2f9c..188ea4e2fc0 100644 --- a/lib/l10n/de_CH.php +++ b/lib/l10n/de_CH.php @@ -13,7 +13,6 @@ $TRANSLATIONS = array( "Back to Files" => "Zurück zu \"Dateien\"", "Selected files too large to generate zip file." => "Die gewählten Dateien sind zu gross, um eine ZIP-Datei zu erstellen.", "Download the files in smaller chunks, seperately or kindly ask your administrator." => "Laden Sie die Dateien in kleineren, separaten, Stücken herunter oder bitten Sie Ihren Administrator.", -"couldn't be determined" => "konnte nicht ermittelt werden", "Application is not enabled" => "Die Anwendung ist nicht aktiviert", "Authentication error" => "Authentifizierungs-Fehler", "Token expired. Please reload page." => "Token abgelaufen. Bitte laden Sie die Seite neu.", @@ -41,13 +40,13 @@ $TRANSLATIONS = array( "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Ihr Web-Server ist noch nicht für eine Datei-Synchronisation konfiguriert, weil die WebDAV-Schnittstelle vermutlich defekt ist.", "Please double check the <a href='%s'>installation guides</a>." => "Bitte prüfen Sie die <a href='%s'>Installationsanleitungen</a>.", "seconds ago" => "Gerade eben", -"_%n minute ago_::_%n minutes ago_" => array(,), -"_%n hour ago_::_%n hours ago_" => array(,), +"_%n minute ago_::_%n minutes ago_" => array("",""), +"_%n hour ago_::_%n hours ago_" => array("",""), "today" => "Heute", "yesterday" => "Gestern", -"_%n day go_::_%n days ago_" => array(,), +"_%n day go_::_%n days ago_" => array("",""), "last month" => "Letzten Monat", -"_%n month ago_::_%n months ago_" => array(,), +"_%n month ago_::_%n months ago_" => array("",""), "last year" => "Letztes Jahr", "years ago" => "Vor Jahren", "Caused by:" => "Verursacht durch:", diff --git a/lib/l10n/de_DE.php b/lib/l10n/de_DE.php index 104ca305208..9fd319b7e1b 100644 --- a/lib/l10n/de_DE.php +++ b/lib/l10n/de_DE.php @@ -13,7 +13,6 @@ $TRANSLATIONS = array( "Back to Files" => "Zurück zu \"Dateien\"", "Selected files too large to generate zip file." => "Die gewählten Dateien sind zu groß, um eine ZIP-Datei zu erstellen.", "Download the files in smaller chunks, seperately or kindly ask your administrator." => "Laden Sie die Dateien in kleineren, separaten, Stücken herunter oder bitten Sie Ihren Administrator.", -"couldn't be determined" => "konnte nicht ermittelt werden", "Application is not enabled" => "Die Anwendung ist nicht aktiviert", "Authentication error" => "Authentifizierungs-Fehler", "Token expired. Please reload page." => "Token abgelaufen. Bitte laden Sie die Seite neu.", @@ -41,13 +40,13 @@ $TRANSLATIONS = array( "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Ihr Web-Server ist noch nicht für eine Datei-Synchronisation konfiguriert, weil die WebDAV-Schnittstelle vermutlich defekt ist.", "Please double check the <a href='%s'>installation guides</a>." => "Bitte prüfen Sie die <a href='%s'>Installationsanleitungen</a>.", "seconds ago" => "Gerade eben", -"_%n minute ago_::_%n minutes ago_" => array(,), -"_%n hour ago_::_%n hours ago_" => array(,), +"_%n minute ago_::_%n minutes ago_" => array("Vor %n Minute","Vor %n Minuten"), +"_%n hour ago_::_%n hours ago_" => array("Vor %n Stunde","Vor %n Stunden"), "today" => "Heute", "yesterday" => "Gestern", -"_%n day go_::_%n days ago_" => array(,), +"_%n day go_::_%n days ago_" => array("Vor %n Tag","Vor %n Tagen"), "last month" => "Letzten Monat", -"_%n month ago_::_%n months ago_" => array(,), +"_%n month ago_::_%n months ago_" => array("Vor %n Monat","Vor %n Monaten"), "last year" => "Letztes Jahr", "years ago" => "Vor Jahren", "Caused by:" => "Verursacht durch:", diff --git a/lib/l10n/el.php b/lib/l10n/el.php index 12b718d183f..dcbf82d4a4b 100644 --- a/lib/l10n/el.php +++ b/lib/l10n/el.php @@ -13,7 +13,6 @@ $TRANSLATIONS = array( "Back to Files" => "Πίσω στα Αρχεία", "Selected files too large to generate zip file." => "Τα επιλεγμένα αρχεία είναι μεγάλα ώστε να δημιουργηθεί αρχείο zip.", "Download the files in smaller chunks, seperately or kindly ask your administrator." => "Λήψη των αρχείων σε μικρότερα κομμάτια, χωριστά ή ρωτήστε τον διαχειριστή σας.", -"couldn't be determined" => "δεν μπορούσε να προσδιορισθεί", "Application is not enabled" => "Δεν ενεργοποιήθηκε η εφαρμογή", "Authentication error" => "Σφάλμα πιστοποίησης", "Token expired. Please reload page." => "Το αναγνωριστικό έληξε. Παρακαλώ φορτώστε ξανά την σελίδα.", @@ -41,13 +40,13 @@ $TRANSLATIONS = array( "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Ο διακομιστής σας δεν έχει ρυθμιστεί κατάλληλα ώστε να επιτρέπει τον συγχρονισμό αρχείων γιατί η διεπαφή WebDAV πιθανόν να είναι κατεστραμμένη.", "Please double check the <a href='%s'>installation guides</a>." => "Ελέγξτε ξανά τις <a href='%s'>οδηγίες εγκατάστασης</a>.", "seconds ago" => "δευτερόλεπτα πριν", -"_%n minute ago_::_%n minutes ago_" => array(,), -"_%n hour ago_::_%n hours ago_" => array(,), +"_%n minute ago_::_%n minutes ago_" => array("",""), +"_%n hour ago_::_%n hours ago_" => array("",""), "today" => "σήμερα", "yesterday" => "χτες", -"_%n day go_::_%n days ago_" => array(,), +"_%n day go_::_%n days ago_" => array("",""), "last month" => "τελευταίο μήνα", -"_%n month ago_::_%n months ago_" => array(,), +"_%n month ago_::_%n months ago_" => array("",""), "last year" => "τελευταίο χρόνο", "years ago" => "χρόνια πριν", "Caused by:" => "Προκλήθηκε από:", diff --git a/lib/l10n/en@pirate.php b/lib/l10n/en@pirate.php index 15f8256f3b3..a8175b1400f 100644 --- a/lib/l10n/en@pirate.php +++ b/lib/l10n/en@pirate.php @@ -1,9 +1,9 @@ <?php $TRANSLATIONS = array( "web services under your control" => "web services under your control", -"_%n minute ago_::_%n minutes ago_" => array(,), -"_%n hour ago_::_%n hours ago_" => array(,), -"_%n day go_::_%n days ago_" => array(,), -"_%n month ago_::_%n months ago_" => array(,) +"_%n minute ago_::_%n minutes ago_" => array("",""), +"_%n hour ago_::_%n hours ago_" => array("",""), +"_%n day go_::_%n days ago_" => array("",""), +"_%n month ago_::_%n months ago_" => array("","") ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/lib/l10n/eo.php b/lib/l10n/eo.php index b769292b8f8..5311dd6eb15 100644 --- a/lib/l10n/eo.php +++ b/lib/l10n/eo.php @@ -34,13 +34,13 @@ $TRANSLATIONS = array( "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Via TTT-servilo ankoraŭ ne ĝuste agordiĝis por permesi sinkronigi dosierojn ĉar la WebDAV-interfaco ŝajnas rompita.", "Please double check the <a href='%s'>installation guides</a>." => "Bonvolu duoble kontroli la <a href='%s'>gvidilon por instalo</a>.", "seconds ago" => "sekundoj antaŭe", -"_%n minute ago_::_%n minutes ago_" => array(,), -"_%n hour ago_::_%n hours ago_" => array(,), +"_%n minute ago_::_%n minutes ago_" => array("",""), +"_%n hour ago_::_%n hours ago_" => array("",""), "today" => "hodiaŭ", "yesterday" => "hieraŭ", -"_%n day go_::_%n days ago_" => array(,), +"_%n day go_::_%n days ago_" => array("",""), "last month" => "lastamonate", -"_%n month ago_::_%n months ago_" => array(,), +"_%n month ago_::_%n months ago_" => array("",""), "last year" => "lastajare", "years ago" => "jaroj antaŭe", "Could not find category \"%s\"" => "Ne troviĝis kategorio “%s”" diff --git a/lib/l10n/es.php b/lib/l10n/es.php index 36857786487..14bbf6f6a13 100644 --- a/lib/l10n/es.php +++ b/lib/l10n/es.php @@ -13,7 +13,6 @@ $TRANSLATIONS = array( "Back to Files" => "Volver a Archivos", "Selected files too large to generate zip file." => "Los archivos seleccionados son demasiado grandes para generar el archivo zip.", "Download the files in smaller chunks, seperately or kindly ask your administrator." => "Descargue los archivos en trozos más pequeños, por separado o solicítelos amablemente su administrador.", -"couldn't be determined" => "no pudo ser determinado", "Application is not enabled" => "La aplicación no está habilitada", "Authentication error" => "Error de autenticación", "Token expired. Please reload page." => "Token expirado. Por favor, recarga la página.", @@ -41,13 +40,13 @@ $TRANSLATIONS = array( "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Su servidor web aún no está configurado adecuadamente para permitir sincronización de archivos ya que la interfaz WebDAV parece no estar funcionando.", "Please double check the <a href='%s'>installation guides</a>." => "Por favor, vuelva a comprobar las <a href='%s'>guías de instalación</a>.", "seconds ago" => "hace segundos", -"_%n minute ago_::_%n minutes ago_" => array(,), -"_%n hour ago_::_%n hours ago_" => array(,), +"_%n minute ago_::_%n minutes ago_" => array("",""), +"_%n hour ago_::_%n hours ago_" => array("",""), "today" => "hoy", "yesterday" => "ayer", -"_%n day go_::_%n days ago_" => array(,), +"_%n day go_::_%n days ago_" => array("",""), "last month" => "mes pasado", -"_%n month ago_::_%n months ago_" => array(,), +"_%n month ago_::_%n months ago_" => array("",""), "last year" => "año pasado", "years ago" => "hace años", "Caused by:" => "Causado por:", diff --git a/lib/l10n/es_AR.php b/lib/l10n/es_AR.php index 5e27a74b5db..26f1e4ecd5e 100644 --- a/lib/l10n/es_AR.php +++ b/lib/l10n/es_AR.php @@ -13,7 +13,6 @@ $TRANSLATIONS = array( "Back to Files" => "Volver a Archivos", "Selected files too large to generate zip file." => "Los archivos seleccionados son demasiado grandes para generar el archivo zip.", "Download the files in smaller chunks, seperately or kindly ask your administrator." => "Descargá los archivos en partes más chicas, de forma separada, o pedíselos al administrador", -"couldn't be determined" => "no se pudo determinar", "Application is not enabled" => "La aplicación no está habilitada", "Authentication error" => "Error al autenticar", "Token expired. Please reload page." => "Token expirado. Por favor, recargá la página.", @@ -41,13 +40,13 @@ $TRANSLATIONS = array( "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Tu servidor web no está configurado todavía para permitir sincronización de archivos porque la interfaz WebDAV parece no funcionar.", "Please double check the <a href='%s'>installation guides</a>." => "Por favor, comprobá nuevamente la <a href='%s'>guía de instalación</a>.", "seconds ago" => "segundos atrás", -"_%n minute ago_::_%n minutes ago_" => array(,), -"_%n hour ago_::_%n hours ago_" => array(,), +"_%n minute ago_::_%n minutes ago_" => array("",""), +"_%n hour ago_::_%n hours ago_" => array("",""), "today" => "hoy", "yesterday" => "ayer", -"_%n day go_::_%n days ago_" => array(,), +"_%n day go_::_%n days ago_" => array("",""), "last month" => "el mes pasado", -"_%n month ago_::_%n months ago_" => array(,), +"_%n month ago_::_%n months ago_" => array("",""), "last year" => "el año pasado", "years ago" => "años atrás", "Caused by:" => "Provocado por:", diff --git a/lib/l10n/et_EE.php b/lib/l10n/et_EE.php index cf6bf919158..912ef37a935 100644 --- a/lib/l10n/et_EE.php +++ b/lib/l10n/et_EE.php @@ -13,7 +13,6 @@ $TRANSLATIONS = array( "Back to Files" => "Tagasi failide juurde", "Selected files too large to generate zip file." => "Valitud failid on ZIP-faili loomiseks liiga suured.", "Download the files in smaller chunks, seperately or kindly ask your administrator." => "Laadi failid alla eraldi väiksemate osadena või küsi nõu oma süsteemiadminstraatorilt.", -"couldn't be determined" => "ei suudetud tuvastada", "Application is not enabled" => "Rakendus pole sisse lülitatud", "Authentication error" => "Autentimise viga", "Token expired. Please reload page." => "Kontrollkood aegus. Paelun lae leht uuesti.", @@ -41,13 +40,13 @@ $TRANSLATIONS = array( "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Veebiserveri ei ole veel korralikult seadistatud võimaldamaks failide sünkroniseerimist, kuna WebDAV liides näib olevat mittetoimiv.", "Please double check the <a href='%s'>installation guides</a>." => "Palun tutvu veelkord <a href='%s'>paigalduse juhenditega</a>.", "seconds ago" => "sekundit tagasi", -"_%n minute ago_::_%n minutes ago_" => array(,), -"_%n hour ago_::_%n hours ago_" => array(,), +"_%n minute ago_::_%n minutes ago_" => array("",""), +"_%n hour ago_::_%n hours ago_" => array("",""), "today" => "täna", "yesterday" => "eile", -"_%n day go_::_%n days ago_" => array(,), +"_%n day go_::_%n days ago_" => array("",""), "last month" => "viimasel kuul", -"_%n month ago_::_%n months ago_" => array(,), +"_%n month ago_::_%n months ago_" => array("",""), "last year" => "viimasel aastal", "years ago" => "aastat tagasi", "Caused by:" => "Põhjustaja:", diff --git a/lib/l10n/eu.php b/lib/l10n/eu.php index b03e1868912..8f967314f4b 100644 --- a/lib/l10n/eu.php +++ b/lib/l10n/eu.php @@ -13,7 +13,6 @@ $TRANSLATIONS = array( "Back to Files" => "Itzuli fitxategietara", "Selected files too large to generate zip file." => "Hautatuko fitxategiak oso handiak dira zip fitxategia sortzeko.", "Download the files in smaller chunks, seperately or kindly ask your administrator." => "Deskargatu fitzategiak zati txikiagoetan, banan-banan edo eskatu mesedez zure administradoreari", -"couldn't be determined" => "ezin izan da zehaztu", "Application is not enabled" => "Aplikazioa ez dago gaituta", "Authentication error" => "Autentifikazio errorea", "Token expired. Please reload page." => "Tokena iraungitu da. Mesedez birkargatu orria.", @@ -41,13 +40,13 @@ $TRANSLATIONS = array( "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Zure web zerbitzaria ez dago oraindik ongi konfiguratuta fitxategien sinkronizazioa egiteko, WebDAV interfazea ongi ez dagoela dirudi.", "Please double check the <a href='%s'>installation guides</a>." => "Mesedez begiratu <a href='%s'>instalazio gidak</a>.", "seconds ago" => "segundu", -"_%n minute ago_::_%n minutes ago_" => array(,), -"_%n hour ago_::_%n hours ago_" => array(,), +"_%n minute ago_::_%n minutes ago_" => array("",""), +"_%n hour ago_::_%n hours ago_" => array("",""), "today" => "gaur", "yesterday" => "atzo", -"_%n day go_::_%n days ago_" => array(,), +"_%n day go_::_%n days ago_" => array("",""), "last month" => "joan den hilabetean", -"_%n month ago_::_%n months ago_" => array(,), +"_%n month ago_::_%n months ago_" => array("",""), "last year" => "joan den urtean", "years ago" => "urte", "Caused by:" => "Honek eraginda:", diff --git a/lib/l10n/fa.php b/lib/l10n/fa.php index 66c464cce39..e9cb695bade 100644 --- a/lib/l10n/fa.php +++ b/lib/l10n/fa.php @@ -10,7 +10,6 @@ $TRANSLATIONS = array( "Files need to be downloaded one by one." => "فایل ها باید به صورت یکی یکی دانلود شوند", "Back to Files" => "بازگشت به فایل ها", "Selected files too large to generate zip file." => "فایل های انتخاب شده بزرگتر از آن هستند که بتوان یک فایل فشرده تولید کرد", -"couldn't be determined" => "نمیتواند مشخص شود", "Application is not enabled" => "برنامه فعال نشده است", "Authentication error" => "خطا در اعتبار سنجی", "Token expired. Please reload page." => "رمز منقضی شده است. لطفا دوباره صفحه را بارگذاری نمایید.", @@ -38,13 +37,13 @@ $TRANSLATIONS = array( "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "احتمالاً وب سرور شما طوری تنظیم نشده است که اجازه ی همگام سازی فایلها را بدهد زیرا به نظر میرسد رابط WebDAV از کار افتاده است.", "Please double check the <a href='%s'>installation guides</a>." => "لطفاً دوباره <a href='%s'>راهنمای نصب</a>را بررسی کنید.", "seconds ago" => "ثانیهها پیش", -"_%n minute ago_::_%n minutes ago_" => array(,), -"_%n hour ago_::_%n hours ago_" => array(,), +"_%n minute ago_::_%n minutes ago_" => array(""), +"_%n hour ago_::_%n hours ago_" => array(""), "today" => "امروز", "yesterday" => "دیروز", -"_%n day go_::_%n days ago_" => array(,), +"_%n day go_::_%n days ago_" => array(""), "last month" => "ماه قبل", -"_%n month ago_::_%n months ago_" => array(,), +"_%n month ago_::_%n months ago_" => array(""), "last year" => "سال قبل", "years ago" => "سالهای قبل", "Could not find category \"%s\"" => "دسته بندی %s یافت نشد" diff --git a/lib/l10n/fi_FI.php b/lib/l10n/fi_FI.php index 50342caa098..4552d4627c0 100644 --- a/lib/l10n/fi_FI.php +++ b/lib/l10n/fi_FI.php @@ -10,7 +10,6 @@ $TRANSLATIONS = array( "Files need to be downloaded one by one." => "Tiedostot on ladattava yksittäin.", "Back to Files" => "Takaisin tiedostoihin", "Selected files too large to generate zip file." => "Valitut tiedostot ovat liian suurikokoisia mahtuakseen zip-tiedostoon.", -"couldn't be determined" => "ei voitu määrittää", "Application is not enabled" => "Sovellusta ei ole otettu käyttöön", "Authentication error" => "Tunnistautumisvirhe", "Token expired. Please reload page." => "Valtuutus vanheni. Lataa sivu uudelleen.", @@ -34,15 +33,16 @@ $TRANSLATIONS = array( "Set an admin password." => "Aseta ylläpitäjän salasana.", "Please double check the <a href='%s'>installation guides</a>." => "Lue tarkasti <a href='%s'>asennusohjeet</a>.", "seconds ago" => "sekuntia sitten", -"_%n minute ago_::_%n minutes ago_" => array(,), -"_%n hour ago_::_%n hours ago_" => array(,), +"_%n minute ago_::_%n minutes ago_" => array("%n minuutti sitten","%n minuuttia sitten"), +"_%n hour ago_::_%n hours ago_" => array("%n tunti sitten","%n tuntia sitten"), "today" => "tänään", "yesterday" => "eilen", -"_%n day go_::_%n days ago_" => array(,), +"_%n day go_::_%n days ago_" => array("%n päivä sitten","%n päivää sitten"), "last month" => "viime kuussa", -"_%n month ago_::_%n months ago_" => array(,), +"_%n month ago_::_%n months ago_" => array("%n kuukausi sitten","%n kuukautta sitten"), "last year" => "viime vuonna", "years ago" => "vuotta sitten", +"Caused by:" => "Aiheuttaja:", "Could not find category \"%s\"" => "Luokkaa \"%s\" ei löytynyt" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/lib/l10n/fr.php b/lib/l10n/fr.php index 21e4b561df5..cfcca28d5f8 100644 --- a/lib/l10n/fr.php +++ b/lib/l10n/fr.php @@ -10,7 +10,6 @@ $TRANSLATIONS = array( "Files need to be downloaded one by one." => "Les fichiers nécessitent d'être téléchargés un par un.", "Back to Files" => "Retour aux Fichiers", "Selected files too large to generate zip file." => "Les fichiers sélectionnés sont trop volumineux pour être compressés.", -"couldn't be determined" => "impossible à déterminer", "Application is not enabled" => "L'application n'est pas activée", "Authentication error" => "Erreur d'authentification", "Token expired. Please reload page." => "La session a expiré. Veuillez recharger la page.", @@ -38,13 +37,13 @@ $TRANSLATIONS = array( "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Votre serveur web, n'est pas correctement configuré pour permettre la synchronisation des fichiers, car l'interface WebDav ne fonctionne pas comme il faut.", "Please double check the <a href='%s'>installation guides</a>." => "Veuillez vous référer au <a href='%s'>guide d'installation</a>.", "seconds ago" => "il y a quelques secondes", -"_%n minute ago_::_%n minutes ago_" => array(,), -"_%n hour ago_::_%n hours ago_" => array(,), +"_%n minute ago_::_%n minutes ago_" => array("",""), +"_%n hour ago_::_%n hours ago_" => array("",""), "today" => "aujourd'hui", "yesterday" => "hier", -"_%n day go_::_%n days ago_" => array(,), +"_%n day go_::_%n days ago_" => array("",""), "last month" => "le mois dernier", -"_%n month ago_::_%n months ago_" => array(,), +"_%n month ago_::_%n months ago_" => array("",""), "last year" => "l'année dernière", "years ago" => "il y a plusieurs années", "Could not find category \"%s\"" => "Impossible de trouver la catégorie \"%s\"" diff --git a/lib/l10n/gl.php b/lib/l10n/gl.php index 9196fc6b6cf..4d92e89ebba 100644 --- a/lib/l10n/gl.php +++ b/lib/l10n/gl.php @@ -13,7 +13,6 @@ $TRANSLATIONS = array( "Back to Files" => "Volver aos ficheiros", "Selected files too large to generate zip file." => "Os ficheiros seleccionados son demasiado grandes como para xerar un ficheiro zip.", "Download the files in smaller chunks, seperately or kindly ask your administrator." => "Descargue os ficheiros en cachos máis pequenos e por separado, ou pídallos amabelmente ao seu administrador.", -"couldn't be determined" => "non foi posíbel determinalo", "Application is not enabled" => "O aplicativo non está activado", "Authentication error" => "Produciuse un erro de autenticación", "Token expired. Please reload page." => "Testemuña caducada. Recargue a páxina.", @@ -41,13 +40,13 @@ $TRANSLATIONS = array( "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "O seu servidor web non está aínda configurado adecuadamente para permitir a sincronización de ficheiros xa que semella que a interface WebDAV non está a funcionar.", "Please double check the <a href='%s'>installation guides</a>." => "Volva comprobar as <a href='%s'>guías de instalación</a>", "seconds ago" => "segundos atrás", -"_%n minute ago_::_%n minutes ago_" => array(,), -"_%n hour ago_::_%n hours ago_" => array(,), +"_%n minute ago_::_%n minutes ago_" => array("hai %n minuto","hai %n minutos"), +"_%n hour ago_::_%n hours ago_" => array("hai %n hora","hai %n horas"), "today" => "hoxe", "yesterday" => "onte", -"_%n day go_::_%n days ago_" => array(,), +"_%n day go_::_%n days ago_" => array("hai %n día","hai %n días"), "last month" => "último mes", -"_%n month ago_::_%n months ago_" => array(,), +"_%n month ago_::_%n months ago_" => array("hai %n mes","hai %n meses"), "last year" => "último ano", "years ago" => "anos atrás", "Caused by:" => "Causado por:", diff --git a/lib/l10n/he.php b/lib/l10n/he.php index 4190769f2b7..bab1a6ff424 100644 --- a/lib/l10n/he.php +++ b/lib/l10n/he.php @@ -19,13 +19,13 @@ $TRANSLATIONS = array( "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "שרת האינטרנט שלך אינו מוגדר לצורכי סנכרון קבצים עדיין כיוון שמנשק ה־WebDAV כנראה אינו תקין.", "Please double check the <a href='%s'>installation guides</a>." => "נא לעיין שוב ב<a href='%s'>מדריכי ההתקנה</a>.", "seconds ago" => "שניות", -"_%n minute ago_::_%n minutes ago_" => array(,), -"_%n hour ago_::_%n hours ago_" => array(,), +"_%n minute ago_::_%n minutes ago_" => array("",""), +"_%n hour ago_::_%n hours ago_" => array("",""), "today" => "היום", "yesterday" => "אתמול", -"_%n day go_::_%n days ago_" => array(,), +"_%n day go_::_%n days ago_" => array("",""), "last month" => "חודש שעבר", -"_%n month ago_::_%n months ago_" => array(,), +"_%n month ago_::_%n months ago_" => array("",""), "last year" => "שנה שעברה", "years ago" => "שנים", "Could not find category \"%s\"" => "לא ניתן למצוא את הקטגוריה „%s“" diff --git a/lib/l10n/hi.php b/lib/l10n/hi.php index 1e7605e4bbf..039dfa4465d 100644 --- a/lib/l10n/hi.php +++ b/lib/l10n/hi.php @@ -4,9 +4,9 @@ $TRANSLATIONS = array( "Personal" => "यक्तिगत", "Settings" => "सेटिंग्स", "Users" => "उपयोगकर्ता", -"_%n minute ago_::_%n minutes ago_" => array(,), -"_%n hour ago_::_%n hours ago_" => array(,), -"_%n day go_::_%n days ago_" => array(,), -"_%n month ago_::_%n months ago_" => array(,) +"_%n minute ago_::_%n minutes ago_" => array("",""), +"_%n hour ago_::_%n hours ago_" => array("",""), +"_%n day go_::_%n days ago_" => array("",""), +"_%n month ago_::_%n months ago_" => array("","") ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/lib/l10n/hr.php b/lib/l10n/hr.php index 39298b4ccff..d217f924099 100644 --- a/lib/l10n/hr.php +++ b/lib/l10n/hr.php @@ -10,13 +10,13 @@ $TRANSLATIONS = array( "Files" => "Datoteke", "Text" => "Tekst", "seconds ago" => "sekundi prije", -"_%n minute ago_::_%n minutes ago_" => array(,), -"_%n hour ago_::_%n hours ago_" => array(,), +"_%n minute ago_::_%n minutes ago_" => array("","",""), +"_%n hour ago_::_%n hours ago_" => array("","",""), "today" => "danas", "yesterday" => "jučer", -"_%n day go_::_%n days ago_" => array(,), +"_%n day go_::_%n days ago_" => array("","",""), "last month" => "prošli mjesec", -"_%n month ago_::_%n months ago_" => array(,), +"_%n month ago_::_%n months ago_" => array("","",""), "last year" => "prošlu godinu", "years ago" => "godina" ); diff --git a/lib/l10n/hu_HU.php b/lib/l10n/hu_HU.php index e3dc649b3a6..7ec7621a655 100644 --- a/lib/l10n/hu_HU.php +++ b/lib/l10n/hu_HU.php @@ -13,7 +13,6 @@ $TRANSLATIONS = array( "Back to Files" => "Vissza a Fájlokhoz", "Selected files too large to generate zip file." => "A kiválasztott fájlok túl nagyok a zip tömörítéshez.", "Download the files in smaller chunks, seperately or kindly ask your administrator." => "Tölts le a fileokat kisebb chunkokban, kölün vagy kérj segitséget a rendszergazdádtól.", -"couldn't be determined" => "nem határozható meg", "Application is not enabled" => "Az alkalmazás nincs engedélyezve", "Authentication error" => "Azonosítási hiba", "Token expired. Please reload page." => "A token lejárt. Frissítse az oldalt.", @@ -41,13 +40,13 @@ $TRANSLATIONS = array( "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Az Ön webkiszolgálója nincs megfelelően beállítva az állományok szinkronizálásához, mert a WebDAV-elérés úgy tűnik, nem működik.", "Please double check the <a href='%s'>installation guides</a>." => "Kérjük tüzetesen tanulmányozza át a <a href='%s'>telepítési útmutatót</a>.", "seconds ago" => "pár másodperce", -"_%n minute ago_::_%n minutes ago_" => array(,), -"_%n hour ago_::_%n hours ago_" => array(,), +"_%n minute ago_::_%n minutes ago_" => array("",""), +"_%n hour ago_::_%n hours ago_" => array("",""), "today" => "ma", "yesterday" => "tegnap", -"_%n day go_::_%n days ago_" => array(,), +"_%n day go_::_%n days ago_" => array("",""), "last month" => "múlt hónapban", -"_%n month ago_::_%n months ago_" => array(,), +"_%n month ago_::_%n months ago_" => array("",""), "last year" => "tavaly", "years ago" => "több éve", "Caused by:" => "Okozta:", diff --git a/lib/l10n/hy.php b/lib/l10n/hy.php index b2de92ed491..15f78e0bce6 100644 --- a/lib/l10n/hy.php +++ b/lib/l10n/hy.php @@ -1,8 +1,8 @@ <?php $TRANSLATIONS = array( -"_%n minute ago_::_%n minutes ago_" => array(,), -"_%n hour ago_::_%n hours ago_" => array(,), -"_%n day go_::_%n days ago_" => array(,), -"_%n month ago_::_%n months ago_" => array(,) +"_%n minute ago_::_%n minutes ago_" => array("",""), +"_%n hour ago_::_%n hours ago_" => array("",""), +"_%n day go_::_%n days ago_" => array("",""), +"_%n month ago_::_%n months ago_" => array("","") ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/lib/l10n/ia.php b/lib/l10n/ia.php index 57ec37f4f4e..34f43bc424a 100644 --- a/lib/l10n/ia.php +++ b/lib/l10n/ia.php @@ -8,9 +8,9 @@ $TRANSLATIONS = array( "web services under your control" => "servicios web sub tu controlo", "Files" => "Files", "Text" => "Texto", -"_%n minute ago_::_%n minutes ago_" => array(,), -"_%n hour ago_::_%n hours ago_" => array(,), -"_%n day go_::_%n days ago_" => array(,), -"_%n month ago_::_%n months ago_" => array(,) +"_%n minute ago_::_%n minutes ago_" => array("",""), +"_%n hour ago_::_%n hours ago_" => array("",""), +"_%n day go_::_%n days ago_" => array("",""), +"_%n month ago_::_%n months ago_" => array("","") ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/lib/l10n/id.php b/lib/l10n/id.php index 4d2a10c3b85..080faddb321 100644 --- a/lib/l10n/id.php +++ b/lib/l10n/id.php @@ -10,7 +10,6 @@ $TRANSLATIONS = array( "Files need to be downloaded one by one." => "Berkas harus diunduh satu persatu.", "Back to Files" => "Kembali ke Daftar Berkas", "Selected files too large to generate zip file." => "Berkas yang dipilih terlalu besar untuk dibuat berkas zip-nya.", -"couldn't be determined" => "tidak dapat ditentukan", "Application is not enabled" => "Aplikasi tidak diaktifkan", "Authentication error" => "Galat saat autentikasi", "Token expired. Please reload page." => "Token kedaluwarsa. Silakan muat ulang halaman.", @@ -37,13 +36,13 @@ $TRANSLATIONS = array( "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Web server Anda belum dikonfigurasikan dengan baik untuk mengizinkan sinkronisasi berkas karena tampaknya antarmuka WebDAV rusak.", "Please double check the <a href='%s'>installation guides</a>." => "Silakan periksa ulang <a href='%s'>panduan instalasi</a>.", "seconds ago" => "beberapa detik yang lalu", -"_%n minute ago_::_%n minutes ago_" => array(,), -"_%n hour ago_::_%n hours ago_" => array(,), +"_%n minute ago_::_%n minutes ago_" => array(""), +"_%n hour ago_::_%n hours ago_" => array(""), "today" => "hari ini", "yesterday" => "kemarin", -"_%n day go_::_%n days ago_" => array(,), +"_%n day go_::_%n days ago_" => array(""), "last month" => "bulan kemarin", -"_%n month ago_::_%n months ago_" => array(,), +"_%n month ago_::_%n months ago_" => array(""), "last year" => "tahun kemarin", "years ago" => "beberapa tahun lalu", "Could not find category \"%s\"" => "Tidak dapat menemukan kategori \"%s\"" diff --git a/lib/l10n/is.php b/lib/l10n/is.php index b3d63b060a7..7512d278fb8 100644 --- a/lib/l10n/is.php +++ b/lib/l10n/is.php @@ -17,13 +17,13 @@ $TRANSLATIONS = array( "Text" => "Texti", "Images" => "Myndir", "seconds ago" => "sek.", -"_%n minute ago_::_%n minutes ago_" => array(,), -"_%n hour ago_::_%n hours ago_" => array(,), +"_%n minute ago_::_%n minutes ago_" => array("",""), +"_%n hour ago_::_%n hours ago_" => array("",""), "today" => "í dag", "yesterday" => "í gær", -"_%n day go_::_%n days ago_" => array(,), +"_%n day go_::_%n days ago_" => array("",""), "last month" => "síðasta mánuði", -"_%n month ago_::_%n months ago_" => array(,), +"_%n month ago_::_%n months ago_" => array("",""), "last year" => "síðasta ári", "years ago" => "einhverjum árum", "Could not find category \"%s\"" => "Fann ekki flokkinn \"%s\"" diff --git a/lib/l10n/it.php b/lib/l10n/it.php index 3975eeebfac..e734fbdbb9b 100644 --- a/lib/l10n/it.php +++ b/lib/l10n/it.php @@ -13,7 +13,6 @@ $TRANSLATIONS = array( "Back to Files" => "Torna ai file", "Selected files too large to generate zip file." => "I file selezionati sono troppo grandi per generare un file zip.", "Download the files in smaller chunks, seperately or kindly ask your administrator." => "Scarica i file in blocchi più piccoli, separatamente o chiedi al tuo amministratore.", -"couldn't be determined" => "non può essere determinato", "Application is not enabled" => "L'applicazione non è abilitata", "Authentication error" => "Errore di autenticazione", "Token expired. Please reload page." => "Token scaduto. Ricarica la pagina.", @@ -41,13 +40,13 @@ $TRANSLATIONS = array( "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Il tuo server web non è configurato correttamente per consentire la sincronizzazione dei file poiché l'interfaccia WebDAV sembra essere danneggiata.", "Please double check the <a href='%s'>installation guides</a>." => "Leggi attentamente le <a href='%s'>guide d'installazione</a>.", "seconds ago" => "secondi fa", -"_%n minute ago_::_%n minutes ago_" => array(,), -"_%n hour ago_::_%n hours ago_" => array(,), +"_%n minute ago_::_%n minutes ago_" => array("",""), +"_%n hour ago_::_%n hours ago_" => array("",""), "today" => "oggi", "yesterday" => "ieri", -"_%n day go_::_%n days ago_" => array(,), +"_%n day go_::_%n days ago_" => array("",""), "last month" => "mese scorso", -"_%n month ago_::_%n months ago_" => array(,), +"_%n month ago_::_%n months ago_" => array("",""), "last year" => "anno scorso", "years ago" => "anni fa", "Caused by:" => "Causato da:", diff --git a/lib/l10n/ja_JP.php b/lib/l10n/ja_JP.php index 6724a2c5ae2..902170524b9 100644 --- a/lib/l10n/ja_JP.php +++ b/lib/l10n/ja_JP.php @@ -13,7 +13,6 @@ $TRANSLATIONS = array( "Back to Files" => "ファイルに戻る", "Selected files too large to generate zip file." => "選択したファイルはZIPファイルの生成には大きすぎます。", "Download the files in smaller chunks, seperately or kindly ask your administrator." => "ファイルは、小さいファイルに分割されてダウンロードされます。もしくは、管理者にお尋ねください。", -"couldn't be determined" => "測定できませんでした", "Application is not enabled" => "アプリケーションは無効です", "Authentication error" => "認証エラー", "Token expired. Please reload page." => "トークンが無効になりました。ページを再読込してください。", @@ -41,13 +40,13 @@ $TRANSLATIONS = array( "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "WebDAVインタフェースが動作していないと考えられるため、あなたのWEBサーバはまだファイルの同期を許可するように適切な設定がされていません。", "Please double check the <a href='%s'>installation guides</a>." => "<a href='%s'>インストールガイド</a>をよく確認してください。", "seconds ago" => "数秒前", -"_%n minute ago_::_%n minutes ago_" => array(,), -"_%n hour ago_::_%n hours ago_" => array(,), +"_%n minute ago_::_%n minutes ago_" => array("%n 分前"), +"_%n hour ago_::_%n hours ago_" => array("%n 時間後"), "today" => "今日", "yesterday" => "昨日", -"_%n day go_::_%n days ago_" => array(,), +"_%n day go_::_%n days ago_" => array("%n 日後"), "last month" => "一月前", -"_%n month ago_::_%n months ago_" => array(,), +"_%n month ago_::_%n months ago_" => array("%n カ月後"), "last year" => "一年前", "years ago" => "年前", "Caused by:" => "原因は以下:", diff --git a/lib/l10n/ka.php b/lib/l10n/ka.php index d5f9c783b65..04fefe8bdf1 100644 --- a/lib/l10n/ka.php +++ b/lib/l10n/ka.php @@ -7,11 +7,11 @@ $TRANSLATIONS = array( "ZIP download is turned off." => "ZIP გადმოწერა გამორთულია", "Files" => "ფაილები", "seconds ago" => "წამის წინ", -"_%n minute ago_::_%n minutes ago_" => array(,), -"_%n hour ago_::_%n hours ago_" => array(,), +"_%n minute ago_::_%n minutes ago_" => array(""), +"_%n hour ago_::_%n hours ago_" => array(""), "today" => "დღეს", "yesterday" => "გუშინ", -"_%n day go_::_%n days ago_" => array(,), -"_%n month ago_::_%n months ago_" => array(,) +"_%n day go_::_%n days ago_" => array(""), +"_%n month ago_::_%n months ago_" => array("") ); $PLURAL_FORMS = "nplurals=1; plural=0;"; diff --git a/lib/l10n/ka_GE.php b/lib/l10n/ka_GE.php index 83a8f0415e1..8fbe34e6786 100644 --- a/lib/l10n/ka_GE.php +++ b/lib/l10n/ka_GE.php @@ -10,7 +10,6 @@ $TRANSLATIONS = array( "Files need to be downloaded one by one." => "ფაილები უნდა გადმოიტვირთოს სათითაოდ.", "Back to Files" => "უკან ფაილებში", "Selected files too large to generate zip file." => "არჩეული ფაილები ძალიან დიდია zip ფაილის გენერაციისთვის.", -"couldn't be determined" => "ვერ განისაზღვრა", "Application is not enabled" => "აპლიკაცია არ არის აქტიური", "Authentication error" => "ავთენტიფიკაციის შეცდომა", "Token expired. Please reload page." => "Token–ს ვადა გაუვიდა. გთხოვთ განაახლოთ გვერდი.", @@ -37,13 +36,13 @@ $TRANSLATIONS = array( "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "თქვენი web სერვერი არ არის კონფიგურირებული ფაილ სინქრონიზაციისთვის, რადგან WebDAV ინტერფეისი შეიძლება იყოს გატეხილი.", "Please double check the <a href='%s'>installation guides</a>." => "გთხოვთ გადაათვალიეროთ <a href='%s'>ინსტალაციის გზამკვლევი</a>.", "seconds ago" => "წამის წინ", -"_%n minute ago_::_%n minutes ago_" => array(,), -"_%n hour ago_::_%n hours ago_" => array(,), +"_%n minute ago_::_%n minutes ago_" => array(""), +"_%n hour ago_::_%n hours ago_" => array(""), "today" => "დღეს", "yesterday" => "გუშინ", -"_%n day go_::_%n days ago_" => array(,), +"_%n day go_::_%n days ago_" => array(""), "last month" => "გასულ თვეში", -"_%n month ago_::_%n months ago_" => array(,), +"_%n month ago_::_%n months ago_" => array(""), "last year" => "ბოლო წელს", "years ago" => "წლის წინ", "Could not find category \"%s\"" => "\"%s\" კატეგორიის მოძებნა ვერ მოხერხდა" diff --git a/lib/l10n/kn.php b/lib/l10n/kn.php index 7ffe04ae962..e7b09649a24 100644 --- a/lib/l10n/kn.php +++ b/lib/l10n/kn.php @@ -1,8 +1,8 @@ <?php $TRANSLATIONS = array( -"_%n minute ago_::_%n minutes ago_" => array(,), -"_%n hour ago_::_%n hours ago_" => array(,), -"_%n day go_::_%n days ago_" => array(,), -"_%n month ago_::_%n months ago_" => array(,) +"_%n minute ago_::_%n minutes ago_" => array(""), +"_%n hour ago_::_%n hours ago_" => array(""), +"_%n day go_::_%n days ago_" => array(""), +"_%n month ago_::_%n months ago_" => array("") ); $PLURAL_FORMS = "nplurals=1; plural=0;"; diff --git a/lib/l10n/ko.php b/lib/l10n/ko.php index d23dd51665a..4dab8b816bf 100644 --- a/lib/l10n/ko.php +++ b/lib/l10n/ko.php @@ -10,7 +10,6 @@ $TRANSLATIONS = array( "Files need to be downloaded one by one." => "파일을 개별적으로 다운로드해야 합니다.", "Back to Files" => "파일로 돌아가기", "Selected files too large to generate zip file." => "선택한 파일들은 ZIP 파일을 생성하기에 너무 큽니다.", -"couldn't be determined" => "결정할 수 없음", "Application is not enabled" => "앱이 활성화되지 않았습니다", "Authentication error" => "인증 오류", "Token expired. Please reload page." => "토큰이 만료되었습니다. 페이지를 새로 고치십시오.", @@ -27,13 +26,13 @@ $TRANSLATIONS = array( "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "WebDAV 인터페이스가 제대로 작동하지 않습니다. 웹 서버에서 파일 동기화를 사용할 수 있도록 설정이 제대로 되지 않은 것 같습니다.", "Please double check the <a href='%s'>installation guides</a>." => "<a href='%s'>설치 가이드</a>를 다시 한 번 확인하십시오.", "seconds ago" => "초 전", -"_%n minute ago_::_%n minutes ago_" => array(,), -"_%n hour ago_::_%n hours ago_" => array(,), +"_%n minute ago_::_%n minutes ago_" => array(""), +"_%n hour ago_::_%n hours ago_" => array(""), "today" => "오늘", "yesterday" => "어제", -"_%n day go_::_%n days ago_" => array(,), +"_%n day go_::_%n days ago_" => array(""), "last month" => "지난 달", -"_%n month ago_::_%n months ago_" => array(,), +"_%n month ago_::_%n months ago_" => array(""), "last year" => "작년", "years ago" => "년 전", "Could not find category \"%s\"" => "분류 \"%s\"을(를) 찾을 수 없습니다." diff --git a/lib/l10n/ku_IQ.php b/lib/l10n/ku_IQ.php index b17b3a86992..c99f9dd2a12 100644 --- a/lib/l10n/ku_IQ.php +++ b/lib/l10n/ku_IQ.php @@ -5,9 +5,9 @@ $TRANSLATIONS = array( "Users" => "بهكارهێنهر", "Admin" => "بهڕێوهبهری سهرهكی", "web services under your control" => "ڕاژهی وێب لهژێر چاودێریت دایه", -"_%n minute ago_::_%n minutes ago_" => array(,), -"_%n hour ago_::_%n hours ago_" => array(,), -"_%n day go_::_%n days ago_" => array(,), -"_%n month ago_::_%n months ago_" => array(,) +"_%n minute ago_::_%n minutes ago_" => array("",""), +"_%n hour ago_::_%n hours ago_" => array("",""), +"_%n day go_::_%n days ago_" => array("",""), +"_%n month ago_::_%n months ago_" => array("","") ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/lib/l10n/lb.php b/lib/l10n/lb.php index a32a1fe8647..c25f5b55bd5 100644 --- a/lib/l10n/lb.php +++ b/lib/l10n/lb.php @@ -10,13 +10,13 @@ $TRANSLATIONS = array( "Files" => "Dateien", "Text" => "SMS", "seconds ago" => "Sekonnen hir", -"_%n minute ago_::_%n minutes ago_" => array(,), -"_%n hour ago_::_%n hours ago_" => array(,), +"_%n minute ago_::_%n minutes ago_" => array("",""), +"_%n hour ago_::_%n hours ago_" => array("",""), "today" => "haut", "yesterday" => "gëschter", -"_%n day go_::_%n days ago_" => array(,), +"_%n day go_::_%n days ago_" => array("",""), "last month" => "Läschte Mount", -"_%n month ago_::_%n months ago_" => array(,), +"_%n month ago_::_%n months ago_" => array("",""), "last year" => "Läscht Joer", "years ago" => "Joren hier" ); diff --git a/lib/l10n/lt_LT.php b/lib/l10n/lt_LT.php index 8d90cf52a70..fb109b86339 100644 --- a/lib/l10n/lt_LT.php +++ b/lib/l10n/lt_LT.php @@ -17,13 +17,13 @@ $TRANSLATIONS = array( "Text" => "Žinučių", "Images" => "Paveikslėliai", "seconds ago" => "prieš sekundę", -"_%n minute ago_::_%n minutes ago_" => array(,), -"_%n hour ago_::_%n hours ago_" => array(,), +"_%n minute ago_::_%n minutes ago_" => array("","",""), +"_%n hour ago_::_%n hours ago_" => array("","",""), "today" => "šiandien", "yesterday" => "vakar", -"_%n day go_::_%n days ago_" => array(,), +"_%n day go_::_%n days ago_" => array("","",""), "last month" => "praeitą mėnesį", -"_%n month ago_::_%n months ago_" => array(,), +"_%n month ago_::_%n months ago_" => array("","",""), "last year" => "praeitais metais", "years ago" => "prieš metus" ); diff --git a/lib/l10n/lv.php b/lib/l10n/lv.php index 8031cd027da..4090a36edcc 100644 --- a/lib/l10n/lv.php +++ b/lib/l10n/lv.php @@ -5,12 +5,14 @@ $TRANSLATIONS = array( "Settings" => "Iestatījumi", "Users" => "Lietotāji", "Admin" => "Administratori", +"Failed to upgrade \"%s\"." => "Kļūda atjauninot \"%s\"", "web services under your control" => "tīmekļa servisi tavā varā", +"cannot open \"%s\"" => "Nevar atvērt \"%s\"", "ZIP download is turned off." => "ZIP lejupielādēšana ir izslēgta.", "Files need to be downloaded one by one." => "Datnes var lejupielādēt tikai katru atsevišķi.", "Back to Files" => "Atpakaļ pie datnēm", "Selected files too large to generate zip file." => "Izvēlētās datnes ir pārāk lielas, lai izveidotu zip datni.", -"couldn't be determined" => "nevarēja noteikt", +"Download the files in smaller chunks, seperately or kindly ask your administrator." => "Lejupielādējiet savus failus mazākās daļās, atsevišķi vai palūdziet tos administratoram.", "Application is not enabled" => "Lietotne nav aktivēta", "Authentication error" => "Autentifikācijas kļūda", "Token expired. Please reload page." => "Pilnvarai ir beidzies termiņš. Lūdzu, pārlādējiet lapu.", @@ -29,6 +31,7 @@ $TRANSLATIONS = array( "Drop this user from MySQL" => "Izmest šo lietotāju no MySQL", "MySQL user '%s'@'%%' already exists" => "MySQL lietotājs '%s'@'%%' jau eksistē", "Drop this user from MySQL." => "Izmest šo lietotāju no MySQL.", +"Oracle connection could not be established" => "Nevar izveidot savienojumu ar Oracle", "Oracle username and/or password not valid" => "Nav derīga Oracle parole un/vai lietotājvārds", "Offending command was: \"%s\", name: %s, password: %s" => "Vainīgā komanda bija \"%s\", vārds: %s, parole: %s", "PostgreSQL username and/or password not valid" => "Nav derīga PostgreSQL parole un/vai lietotājvārds", @@ -37,15 +40,16 @@ $TRANSLATIONS = array( "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Jūsu serveris vēl nav pareizi iestatīts, lai ļautu sinhronizēt datnes, jo izskatās, ka WebDAV saskarne ir salauzta.", "Please double check the <a href='%s'>installation guides</a>." => "Lūdzu, vēlreiz pārbaudiet <a href='%s'>instalēšanas palīdzību</a>.", "seconds ago" => "sekundes atpakaļ", -"_%n minute ago_::_%n minutes ago_" => array(,), -"_%n hour ago_::_%n hours ago_" => array(,), +"_%n minute ago_::_%n minutes ago_" => array("","","Pirms %n minūtēm"), +"_%n hour ago_::_%n hours ago_" => array("","","Pirms %n stundām"), "today" => "šodien", "yesterday" => "vakar", -"_%n day go_::_%n days ago_" => array(,), +"_%n day go_::_%n days ago_" => array("","","Pirms %n dienām"), "last month" => "pagājušajā mēnesī", -"_%n month ago_::_%n months ago_" => array(,), +"_%n month ago_::_%n months ago_" => array("","","Pirms %n mēnešiem"), "last year" => "gājušajā gadā", "years ago" => "gadus atpakaļ", +"Caused by:" => "Cēlonis:", "Could not find category \"%s\"" => "Nevarēja atrast kategoriju “%s”" ); $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 847dcd637d1..69d4a1cb694 100644 --- a/lib/l10n/mk.php +++ b/lib/l10n/mk.php @@ -17,13 +17,13 @@ $TRANSLATIONS = array( "Text" => "Текст", "Images" => "Слики", "seconds ago" => "пред секунди", -"_%n minute ago_::_%n minutes ago_" => array(,), -"_%n hour ago_::_%n hours ago_" => array(,), +"_%n minute ago_::_%n minutes ago_" => array("",""), +"_%n hour ago_::_%n hours ago_" => array("",""), "today" => "денеска", "yesterday" => "вчера", -"_%n day go_::_%n days ago_" => array(,), +"_%n day go_::_%n days ago_" => array("",""), "last month" => "минатиот месец", -"_%n month ago_::_%n months ago_" => array(,), +"_%n month ago_::_%n months ago_" => array("",""), "last year" => "минатата година", "years ago" => "пред години", "Could not find category \"%s\"" => "Не можам да најдам категорија „%s“" diff --git a/lib/l10n/ml_IN.php b/lib/l10n/ml_IN.php index b2de92ed491..15f78e0bce6 100644 --- a/lib/l10n/ml_IN.php +++ b/lib/l10n/ml_IN.php @@ -1,8 +1,8 @@ <?php $TRANSLATIONS = array( -"_%n minute ago_::_%n minutes ago_" => array(,), -"_%n hour ago_::_%n hours ago_" => array(,), -"_%n day go_::_%n days ago_" => array(,), -"_%n month ago_::_%n months ago_" => array(,) +"_%n minute ago_::_%n minutes ago_" => array("",""), +"_%n hour ago_::_%n hours ago_" => array("",""), +"_%n day go_::_%n days ago_" => array("",""), +"_%n month ago_::_%n months ago_" => array("","") ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/lib/l10n/ms_MY.php b/lib/l10n/ms_MY.php index bdd6bdb2b38..17ef07f83dd 100644 --- a/lib/l10n/ms_MY.php +++ b/lib/l10n/ms_MY.php @@ -9,9 +9,9 @@ $TRANSLATIONS = array( "Authentication error" => "Ralat pengesahan", "Files" => "Fail-fail", "Text" => "Teks", -"_%n minute ago_::_%n minutes ago_" => array(,), -"_%n hour ago_::_%n hours ago_" => array(,), -"_%n day go_::_%n days ago_" => array(,), -"_%n month ago_::_%n months ago_" => array(,) +"_%n minute ago_::_%n minutes ago_" => array(""), +"_%n hour ago_::_%n hours ago_" => array(""), +"_%n day go_::_%n days ago_" => array(""), +"_%n month ago_::_%n months ago_" => array("") ); $PLURAL_FORMS = "nplurals=1; plural=0;"; diff --git a/lib/l10n/my_MM.php b/lib/l10n/my_MM.php index c70fef857f8..5f4b6ddc820 100644 --- a/lib/l10n/my_MM.php +++ b/lib/l10n/my_MM.php @@ -8,19 +8,18 @@ $TRANSLATIONS = array( "Files need to be downloaded one by one." => "ဖိုင်များသည် တစ်ခုပြီး တစ်ခုဒေါင်းလုတ်ချရန်လိုအပ်သည်", "Back to Files" => "ဖိုင်သို့ပြန်သွားမည်", "Selected files too large to generate zip file." => "zip ဖိုင်အဖြစ်ပြုလုပ်ရန် ရွေးချယ်ထားသောဖိုင်များသည် အရမ်းကြီးလွန်းသည်", -"couldn't be determined" => "မဆုံးဖြတ်နိုင်ပါ။", "Authentication error" => "ခွင့်ပြုချက်မအောင်မြင်", "Files" => "ဖိုင်များ", "Text" => "စာသား", "Images" => "ပုံရိပ်များ", "seconds ago" => "စက္ကန့်အနည်းငယ်က", -"_%n minute ago_::_%n minutes ago_" => array(,), -"_%n hour ago_::_%n hours ago_" => array(,), +"_%n minute ago_::_%n minutes ago_" => array(""), +"_%n hour ago_::_%n hours ago_" => array(""), "today" => "ယနေ့", "yesterday" => "မနေ့က", -"_%n day go_::_%n days ago_" => array(,), +"_%n day go_::_%n days ago_" => array(""), "last month" => "ပြီးခဲ့သောလ", -"_%n month ago_::_%n months ago_" => array(,), +"_%n month ago_::_%n months ago_" => array(""), "last year" => "မနှစ်က", "years ago" => "နှစ် အရင်က", "Could not find category \"%s\"" => "\"%s\"ခေါင်းစဉ်ကို ရှာမတွေ့ပါ" diff --git a/lib/l10n/nb_NO.php b/lib/l10n/nb_NO.php index 69787c400f2..8e7d095d369 100644 --- a/lib/l10n/nb_NO.php +++ b/lib/l10n/nb_NO.php @@ -19,13 +19,13 @@ $TRANSLATIONS = array( "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Din nettservev er ikke konfigurert korrekt for filsynkronisering. WebDAV ser ut til å ikke funkere.", "Please double check the <a href='%s'>installation guides</a>." => "Vennligst dobbelsjekk <a href='%s'>installasjonsguiden</a>.", "seconds ago" => "sekunder siden", -"_%n minute ago_::_%n minutes ago_" => array(,), -"_%n hour ago_::_%n hours ago_" => array(,), +"_%n minute ago_::_%n minutes ago_" => array("",""), +"_%n hour ago_::_%n hours ago_" => array("",""), "today" => "i dag", "yesterday" => "i går", -"_%n day go_::_%n days ago_" => array(,), +"_%n day go_::_%n days ago_" => array("",""), "last month" => "forrige måned", -"_%n month ago_::_%n months ago_" => array(,), +"_%n month ago_::_%n months ago_" => array("",""), "last year" => "forrige år", "years ago" => "år siden", "Could not find category \"%s\"" => "Kunne ikke finne kategori \"%s\"" diff --git a/lib/l10n/ne.php b/lib/l10n/ne.php index b2de92ed491..15f78e0bce6 100644 --- a/lib/l10n/ne.php +++ b/lib/l10n/ne.php @@ -1,8 +1,8 @@ <?php $TRANSLATIONS = array( -"_%n minute ago_::_%n minutes ago_" => array(,), -"_%n hour ago_::_%n hours ago_" => array(,), -"_%n day go_::_%n days ago_" => array(,), -"_%n month ago_::_%n months ago_" => array(,) +"_%n minute ago_::_%n minutes ago_" => array("",""), +"_%n hour ago_::_%n hours ago_" => array("",""), +"_%n day go_::_%n days ago_" => array("",""), +"_%n month ago_::_%n months ago_" => array("","") ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/lib/l10n/nl.php b/lib/l10n/nl.php index c8616fcbb85..338c3673c5b 100644 --- a/lib/l10n/nl.php +++ b/lib/l10n/nl.php @@ -13,7 +13,6 @@ $TRANSLATIONS = array( "Back to Files" => "Terug naar bestanden", "Selected files too large to generate zip file." => "De geselecteerde bestanden zijn te groot om een zip bestand te maken.", "Download the files in smaller chunks, seperately or kindly ask your administrator." => "Download de bestanden in kleinere brokken, appart of vraag uw administrator.", -"couldn't be determined" => "kon niet worden vastgesteld", "Application is not enabled" => "De applicatie is niet actief", "Authentication error" => "Authenticatie fout", "Token expired. Please reload page." => "Token verlopen. Herlaad de pagina.", @@ -41,13 +40,13 @@ $TRANSLATIONS = array( "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Uw webserver is nog niet goed ingesteld voor bestandssynchronisatie omdat de WebDAV interface verbroken lijkt.", "Please double check the <a href='%s'>installation guides</a>." => "Controleer de <a href='%s'>installatiehandleiding</a> goed.", "seconds ago" => "seconden geleden", -"_%n minute ago_::_%n minutes ago_" => array(,), -"_%n hour ago_::_%n hours ago_" => array(,), +"_%n minute ago_::_%n minutes ago_" => array("%n minuut geleden","%n minuten geleden"), +"_%n hour ago_::_%n hours ago_" => array("%n uur geleden","%n uur geleden"), "today" => "vandaag", "yesterday" => "gisteren", -"_%n day go_::_%n days ago_" => array(,), +"_%n day go_::_%n days ago_" => array("%n dag terug","%n dagen geleden"), "last month" => "vorige maand", -"_%n month ago_::_%n months ago_" => array(,), +"_%n month ago_::_%n months ago_" => array("%n maand geleden","%n maanden geleden"), "last year" => "vorig jaar", "years ago" => "jaar geleden", "Caused by:" => "Gekomen door:", diff --git a/lib/l10n/nn_NO.php b/lib/l10n/nn_NO.php index 4efc4f8e0d6..28b4f7b7d94 100644 --- a/lib/l10n/nn_NO.php +++ b/lib/l10n/nn_NO.php @@ -12,13 +12,13 @@ $TRANSLATIONS = array( "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Tenaren din er ikkje enno rett innstilt til å tilby filsynkronisering sidan WebDAV-grensesnittet ser ut til å vera øydelagt.", "Please double check the <a href='%s'>installation guides</a>." => "Ver vennleg og dobbeltsjekk <a href='%s'>installasjonsrettleiinga</a>.", "seconds ago" => "sekund sidan", -"_%n minute ago_::_%n minutes ago_" => array(,), -"_%n hour ago_::_%n hours ago_" => array(,), +"_%n minute ago_::_%n minutes ago_" => array("",""), +"_%n hour ago_::_%n hours ago_" => array("",""), "today" => "i dag", "yesterday" => "i går", -"_%n day go_::_%n days ago_" => array(,), +"_%n day go_::_%n days ago_" => array("",""), "last month" => "førre månad", -"_%n month ago_::_%n months ago_" => array(,), +"_%n month ago_::_%n months ago_" => array("",""), "last year" => "i fjor", "years ago" => "år sidan" ); diff --git a/lib/l10n/oc.php b/lib/l10n/oc.php index 0fc38d0ff2c..40a527cc76c 100644 --- a/lib/l10n/oc.php +++ b/lib/l10n/oc.php @@ -12,13 +12,13 @@ $TRANSLATIONS = array( "Authentication error" => "Error d'autentificacion", "Files" => "Fichièrs", "seconds ago" => "segonda a", -"_%n minute ago_::_%n minutes ago_" => array(,), -"_%n hour ago_::_%n hours ago_" => array(,), +"_%n minute ago_::_%n minutes ago_" => array("",""), +"_%n hour ago_::_%n hours ago_" => array("",""), "today" => "uèi", "yesterday" => "ièr", -"_%n day go_::_%n days ago_" => array(,), +"_%n day go_::_%n days ago_" => array("",""), "last month" => "mes passat", -"_%n month ago_::_%n months ago_" => array(,), +"_%n month ago_::_%n months ago_" => array("",""), "last year" => "an passat", "years ago" => "ans a" ); diff --git a/lib/l10n/pl.php b/lib/l10n/pl.php index edbddeeace5..984043aa0be 100644 --- a/lib/l10n/pl.php +++ b/lib/l10n/pl.php @@ -13,7 +13,6 @@ $TRANSLATIONS = array( "Back to Files" => "Wróć do plików", "Selected files too large to generate zip file." => "Wybrane pliki są zbyt duże, aby wygenerować plik zip.", "Download the files in smaller chunks, seperately or kindly ask your administrator." => "Pobierz pliki w mniejszy kawałkach, oddzielnie lub poproś administratora o zwiększenie limitu.", -"couldn't be determined" => "nie może zostać znaleziony", "Application is not enabled" => "Aplikacja nie jest włączona", "Authentication error" => "Błąd uwierzytelniania", "Token expired. Please reload page." => "Token wygasł. Proszę ponownie załadować stronę.", @@ -41,13 +40,13 @@ $TRANSLATIONS = array( "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Serwer internetowy nie jest jeszcze poprawnie skonfigurowany, aby umożliwić synchronizację plików, ponieważ interfejs WebDAV wydaje się być uszkodzony.", "Please double check the <a href='%s'>installation guides</a>." => "Sprawdź ponownie <a href='%s'>przewodniki instalacji</a>.", "seconds ago" => "sekund temu", -"_%n minute ago_::_%n minutes ago_" => array(,), -"_%n hour ago_::_%n hours ago_" => array(,), +"_%n minute ago_::_%n minutes ago_" => array("","",""), +"_%n hour ago_::_%n hours ago_" => array("","",""), "today" => "dziś", "yesterday" => "wczoraj", -"_%n day go_::_%n days ago_" => array(,), +"_%n day go_::_%n days ago_" => array("","",""), "last month" => "w zeszłym miesiącu", -"_%n month ago_::_%n months ago_" => array(,), +"_%n month ago_::_%n months ago_" => array("","",""), "last year" => "w zeszłym roku", "years ago" => "lat temu", "Caused by:" => "Spowodowane przez:", diff --git a/lib/l10n/pt_BR.php b/lib/l10n/pt_BR.php index 75987409e70..52329667174 100644 --- a/lib/l10n/pt_BR.php +++ b/lib/l10n/pt_BR.php @@ -13,7 +13,6 @@ $TRANSLATIONS = array( "Back to Files" => "Voltar para Arquivos", "Selected files too large to generate zip file." => "Arquivos selecionados são muito grandes para gerar arquivo zip.", "Download the files in smaller chunks, seperately or kindly ask your administrator." => "Baixe os arquivos em pedaços menores, separadamente ou solicite educadamente ao seu administrador.", -"couldn't be determined" => "não pôde ser determinado", "Application is not enabled" => "Aplicação não está habilitada", "Authentication error" => "Erro de autenticação", "Token expired. Please reload page." => "Token expirou. Por favor recarregue a página.", @@ -41,13 +40,13 @@ $TRANSLATIONS = array( "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Seu servidor web não está configurado corretamente para permitir sincronização de arquivos porque a interface WebDAV parece estar quebrada.", "Please double check the <a href='%s'>installation guides</a>." => "Por favor, confira os <a href='%s'>guias de instalação</a>.", "seconds ago" => "segundos atrás", -"_%n minute ago_::_%n minutes ago_" => array(,), -"_%n hour ago_::_%n hours ago_" => array(,), +"_%n minute ago_::_%n minutes ago_" => array("",""), +"_%n hour ago_::_%n hours ago_" => array("",""), "today" => "hoje", "yesterday" => "ontem", -"_%n day go_::_%n days ago_" => array(,), +"_%n day go_::_%n days ago_" => array("",""), "last month" => "último mês", -"_%n month ago_::_%n months ago_" => array(,), +"_%n month ago_::_%n months ago_" => array("",""), "last year" => "último ano", "years ago" => "anos atrás", "Caused by:" => "Causados por:", diff --git a/lib/l10n/pt_PT.php b/lib/l10n/pt_PT.php index 7518aba2a41..c8a2f78cbf5 100644 --- a/lib/l10n/pt_PT.php +++ b/lib/l10n/pt_PT.php @@ -13,7 +13,6 @@ $TRANSLATIONS = array( "Back to Files" => "Voltar a Ficheiros", "Selected files too large to generate zip file." => "Os ficheiros seleccionados são grandes demais para gerar um ficheiro zip.", "Download the files in smaller chunks, seperately or kindly ask your administrator." => "Descarregue os ficheiros em partes menores, separados ou peça gentilmente ao seu administrador.", -"couldn't be determined" => "Não foi possível determinar", "Application is not enabled" => "A aplicação não está activada", "Authentication error" => "Erro na autenticação", "Token expired. Please reload page." => "O token expirou. Por favor recarregue a página.", @@ -41,13 +40,13 @@ $TRANSLATIONS = array( "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "O seu servidor web não está configurado correctamente para autorizar sincronização de ficheiros, pois o interface WebDAV parece estar com problemas.", "Please double check the <a href='%s'>installation guides</a>." => "Por favor verifique <a href='%s'>installation guides</a>.", "seconds ago" => "Minutos atrás", -"_%n minute ago_::_%n minutes ago_" => array(,), -"_%n hour ago_::_%n hours ago_" => array(,), +"_%n minute ago_::_%n minutes ago_" => array("",""), +"_%n hour ago_::_%n hours ago_" => array("",""), "today" => "hoje", "yesterday" => "ontem", -"_%n day go_::_%n days ago_" => array(,), +"_%n day go_::_%n days ago_" => array("",""), "last month" => "ultímo mês", -"_%n month ago_::_%n months ago_" => array(,), +"_%n month ago_::_%n months ago_" => array("",""), "last year" => "ano passado", "years ago" => "anos atrás", "Caused by:" => "Causado por:", diff --git a/lib/l10n/ro.php b/lib/l10n/ro.php index 788e57f1703..b338b349239 100644 --- a/lib/l10n/ro.php +++ b/lib/l10n/ro.php @@ -10,7 +10,6 @@ $TRANSLATIONS = array( "Files need to be downloaded one by one." => "Fișierele trebuie descărcate unul câte unul.", "Back to Files" => "Înapoi la fișiere", "Selected files too large to generate zip file." => "Fișierele selectate sunt prea mari pentru a genera un fișier zip.", -"couldn't be determined" => "nu poate fi determinat", "Application is not enabled" => "Aplicația nu este activată", "Authentication error" => "Eroare la autentificare", "Token expired. Please reload page." => "Token expirat. Te rugăm să reîncarci pagina.", @@ -18,15 +17,15 @@ $TRANSLATIONS = array( "Text" => "Text", "Images" => "Imagini", "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Serverul de web nu este încă setat corespunzător pentru a permite sincronizarea fișierelor deoarece interfața WebDAV pare a fi întreruptă.", -"Please double check the <a href='%s'>installation guides</a>." => "Vă rugăm să verificați <a href='%s'>ghiduri de instalare</ a>.", +"Please double check the <a href='%s'>installation guides</a>." => "Vă rugăm să verificați <a href='%s'>ghiduri de instalare</a>.", "seconds ago" => "secunde în urmă", -"_%n minute ago_::_%n minutes ago_" => array(,), -"_%n hour ago_::_%n hours ago_" => array(,), +"_%n minute ago_::_%n minutes ago_" => array("","",""), +"_%n hour ago_::_%n hours ago_" => array("","",""), "today" => "astăzi", "yesterday" => "ieri", -"_%n day go_::_%n days ago_" => array(,), +"_%n day go_::_%n days ago_" => array("","",""), "last month" => "ultima lună", -"_%n month ago_::_%n months ago_" => array(,), +"_%n month ago_::_%n months ago_" => array("","",""), "last year" => "ultimul an", "years ago" => "ani în urmă", "Could not find category \"%s\"" => "Cloud nu a gasit categoria \"%s\"" diff --git a/lib/l10n/ru.php b/lib/l10n/ru.php index a723dfc1113..c3b6a077b72 100644 --- a/lib/l10n/ru.php +++ b/lib/l10n/ru.php @@ -13,7 +13,6 @@ $TRANSLATIONS = array( "Back to Files" => "Назад к файлам", "Selected files too large to generate zip file." => "Выбранные файлы слишком велики, чтобы создать zip файл.", "Download the files in smaller chunks, seperately or kindly ask your administrator." => "Загрузите файл маленьшими порциями, раздельно или вежливо попросите Вашего администратора.", -"couldn't be determined" => "Невозможно установить", "Application is not enabled" => "Приложение не разрешено", "Authentication error" => "Ошибка аутентификации", "Token expired. Please reload page." => "Токен просрочен. Перезагрузите страницу.", @@ -41,13 +40,13 @@ $TRANSLATIONS = array( "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Ваш веб сервер до сих пор не настроен правильно для возможности синхронизации файлов, похоже что проблема в неисправности интерфейса WebDAV.", "Please double check the <a href='%s'>installation guides</a>." => "Пожалуйста, дважды просмотрите <a href='%s'>инструкции по установке</a>.", "seconds ago" => "несколько секунд назад", -"_%n minute ago_::_%n minutes ago_" => array(,), -"_%n hour ago_::_%n hours ago_" => array(,), +"_%n minute ago_::_%n minutes ago_" => array("%n минута назад","%n минуты назад","%n минут назад"), +"_%n hour ago_::_%n hours ago_" => array("%n час назад","%n часа назад","%n часов назад"), "today" => "сегодня", "yesterday" => "вчера", -"_%n day go_::_%n days ago_" => array(,), +"_%n day go_::_%n days ago_" => array("%n день назад","%n дня назад","%n дней назад"), "last month" => "в прошлом месяце", -"_%n month ago_::_%n months ago_" => array(,), +"_%n month ago_::_%n months ago_" => array("%n месяц назад","%n месяца назад","%n месяцев назад"), "last year" => "в прошлом году", "years ago" => "несколько лет назад", "Caused by:" => "Вызвано:", diff --git a/lib/l10n/ru_RU.php b/lib/l10n/ru_RU.php deleted file mode 100644 index 1761c1ebf3b..00000000000 --- a/lib/l10n/ru_RU.php +++ /dev/null @@ -1,6 +0,0 @@ -<?php -$TRANSLATIONS = array( -"Settings" => "Настройки", -"Text" => "Текст" -); -$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/si_LK.php b/lib/l10n/si_LK.php index 6f0d96f044e..d10804cae69 100644 --- a/lib/l10n/si_LK.php +++ b/lib/l10n/si_LK.php @@ -17,13 +17,13 @@ $TRANSLATIONS = array( "Text" => "පෙළ", "Images" => "අනු රූ", "seconds ago" => "තත්පරයන්ට පෙර", -"_%n minute ago_::_%n minutes ago_" => array(,), -"_%n hour ago_::_%n hours ago_" => array(,), +"_%n minute ago_::_%n minutes ago_" => array("",""), +"_%n hour ago_::_%n hours ago_" => array("",""), "today" => "අද", "yesterday" => "ඊයේ", -"_%n day go_::_%n days ago_" => array(,), +"_%n day go_::_%n days ago_" => array("",""), "last month" => "පෙර මාසයේ", -"_%n month ago_::_%n months ago_" => array(,), +"_%n month ago_::_%n months ago_" => array("",""), "last year" => "පෙර අවුරුද්දේ", "years ago" => "අවුරුදු කීපයකට පෙර" ); diff --git a/lib/l10n/sk.php b/lib/l10n/sk.php index abc5a2556c9..54812b15a6f 100644 --- a/lib/l10n/sk.php +++ b/lib/l10n/sk.php @@ -1,8 +1,8 @@ <?php $TRANSLATIONS = array( -"_%n minute ago_::_%n minutes ago_" => array(,), -"_%n hour ago_::_%n hours ago_" => array(,), -"_%n day go_::_%n days ago_" => array(,), -"_%n month ago_::_%n months ago_" => array(,) +"_%n minute ago_::_%n minutes ago_" => array("","",""), +"_%n hour ago_::_%n hours ago_" => array("","",""), +"_%n day go_::_%n days ago_" => array("","",""), +"_%n month ago_::_%n months ago_" => array("","","") ); $PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"; diff --git a/lib/l10n/sk_SK.php b/lib/l10n/sk_SK.php index b1a6ee07a5c..43a4b4a0bee 100644 --- a/lib/l10n/sk_SK.php +++ b/lib/l10n/sk_SK.php @@ -13,7 +13,6 @@ $TRANSLATIONS = array( "Back to Files" => "Späť na súbory", "Selected files too large to generate zip file." => "Zvolené súbory sú príliš veľké na vygenerovanie zip súboru.", "Download the files in smaller chunks, seperately or kindly ask your administrator." => "Stiahnite súbory po menších častiach, samostatne, alebo sa obráťte na správcu.", -"couldn't be determined" => "nedá sa zistiť", "Application is not enabled" => "Aplikácia nie je zapnutá", "Authentication error" => "Chyba autentifikácie", "Token expired. Please reload page." => "Token vypršal. Obnovte, prosím, stránku.", @@ -41,13 +40,13 @@ $TRANSLATIONS = array( "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Váš webový server nie je správne nastavený na synchronizáciu, pretože rozhranie WebDAV je poškodené.", "Please double check the <a href='%s'>installation guides</a>." => "Prosím skontrolujte <a href='%s'>inštalačnú príručku</a>.", "seconds ago" => "pred sekundami", -"_%n minute ago_::_%n minutes ago_" => array(,), -"_%n hour ago_::_%n hours ago_" => array(,), +"_%n minute ago_::_%n minutes ago_" => array("","",""), +"_%n hour ago_::_%n hours ago_" => array("","",""), "today" => "dnes", "yesterday" => "včera", -"_%n day go_::_%n days ago_" => array(,), +"_%n day go_::_%n days ago_" => array("","",""), "last month" => "minulý mesiac", -"_%n month ago_::_%n months ago_" => array(,), +"_%n month ago_::_%n months ago_" => array("","",""), "last year" => "minulý rok", "years ago" => "pred rokmi", "Caused by:" => "Príčina:", diff --git a/lib/l10n/sl.php b/lib/l10n/sl.php index 0e918a9f156..5722191aedf 100644 --- a/lib/l10n/sl.php +++ b/lib/l10n/sl.php @@ -10,7 +10,6 @@ $TRANSLATIONS = array( "Files need to be downloaded one by one." => "Datoteke je mogoče prejeti le posamično.", "Back to Files" => "Nazaj na datoteke", "Selected files too large to generate zip file." => "Izbrane datoteke so prevelike za ustvarjanje datoteke arhiva zip.", -"couldn't be determined" => "ni mogoče določiti", "Application is not enabled" => "Program ni omogočen", "Authentication error" => "Napaka pri overjanju", "Token expired. Please reload page." => "Žeton je potekel. Stran je treba ponovno naložiti.", @@ -38,13 +37,13 @@ $TRANSLATIONS = array( "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Spletni stražnik še ni ustrezno nastavljen in ne omogoča usklajevanja, saj je nastavitev WebDAV okvarjena.", "Please double check the <a href='%s'>installation guides</a>." => "Preverite <a href='%s'>navodila namestitve</a>.", "seconds ago" => "pred nekaj sekundami", -"_%n minute ago_::_%n minutes ago_" => array(,), -"_%n hour ago_::_%n hours ago_" => array(,), +"_%n minute ago_::_%n minutes ago_" => array("","","",""), +"_%n hour ago_::_%n hours ago_" => array("","","",""), "today" => "danes", "yesterday" => "včeraj", -"_%n day go_::_%n days ago_" => array(,), +"_%n day go_::_%n days ago_" => array("","","",""), "last month" => "zadnji mesec", -"_%n month ago_::_%n months ago_" => array(,), +"_%n month ago_::_%n months ago_" => array("","","",""), "last year" => "lansko leto", "years ago" => "let nazaj", "Could not find category \"%s\"" => "Kategorije \"%s\" ni mogoče najti." diff --git a/lib/l10n/sq.php b/lib/l10n/sq.php index a992d10ddb4..c2447b7ea23 100644 --- a/lib/l10n/sq.php +++ b/lib/l10n/sq.php @@ -10,7 +10,6 @@ $TRANSLATIONS = array( "Files need to be downloaded one by one." => "Skedarët duhet të shkarkohen një nga një.", "Back to Files" => "Kthehu tek skedarët", "Selected files too large to generate zip file." => "Skedarët e selektuar janë shumë të mëdhenj për të krijuar një skedar ZIP.", -"couldn't be determined" => "nuk u vendos dot", "Application is not enabled" => "Programi nuk është i aktivizuar.", "Authentication error" => "Veprim i gabuar gjatë vërtetimit të identitetit", "Token expired. Please reload page." => "Përmbajtja ka skaduar. Ju lutemi ringarkoni faqen.", @@ -37,13 +36,13 @@ $TRANSLATIONS = array( "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Serveri web i juaji nuk është konfiguruar akoma për të lejuar sinkronizimin e skedarëve sepse ndërfaqja WebDAV mund të jetë e dëmtuar.", "Please double check the <a href='%s'>installation guides</a>." => "Ju lutemi kontrolloni mirë <a href='%s'>shoqëruesin e instalimit</a>.", "seconds ago" => "sekonda më parë", -"_%n minute ago_::_%n minutes ago_" => array(,), -"_%n hour ago_::_%n hours ago_" => array(,), +"_%n minute ago_::_%n minutes ago_" => array("",""), +"_%n hour ago_::_%n hours ago_" => array("",""), "today" => "sot", "yesterday" => "dje", -"_%n day go_::_%n days ago_" => array(,), +"_%n day go_::_%n days ago_" => array("",""), "last month" => "muajin e shkuar", -"_%n month ago_::_%n months ago_" => array(,), +"_%n month ago_::_%n months ago_" => array("",""), "last year" => "vitin e shkuar", "years ago" => "vite më parë", "Could not find category \"%s\"" => "Kategoria \"%s\" nuk u gjet" diff --git a/lib/l10n/sr.php b/lib/l10n/sr.php index 85b7cfea646..9441d0578fc 100644 --- a/lib/l10n/sr.php +++ b/lib/l10n/sr.php @@ -10,7 +10,6 @@ $TRANSLATIONS = array( "Files need to be downloaded one by one." => "Датотеке морате преузимати једну по једну.", "Back to Files" => "Назад на датотеке", "Selected files too large to generate zip file." => "Изабране датотеке су превелике да бисте направили ZIP датотеку.", -"couldn't be determined" => "није одређено", "Application is not enabled" => "Апликација није омогућена", "Authentication error" => "Грешка при провери идентитета", "Token expired. Please reload page." => "Жетон је истекао. Поново учитајте страницу.", @@ -20,13 +19,13 @@ $TRANSLATIONS = array( "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Ваш веб сервер тренутно не подржава синхронизацију датотека јер се чини да је WebDAV сучеље неисправно.", "Please double check the <a href='%s'>installation guides</a>." => "Погледајте <a href='%s'>водиче за инсталацију</a>.", "seconds ago" => "пре неколико секунди", -"_%n minute ago_::_%n minutes ago_" => array(,), -"_%n hour ago_::_%n hours ago_" => array(,), +"_%n minute ago_::_%n minutes ago_" => array("","",""), +"_%n hour ago_::_%n hours ago_" => array("","",""), "today" => "данас", "yesterday" => "јуче", -"_%n day go_::_%n days ago_" => array(,), +"_%n day go_::_%n days ago_" => array("","",""), "last month" => "прошлог месеца", -"_%n month ago_::_%n months ago_" => array(,), +"_%n month ago_::_%n months ago_" => array("","",""), "last year" => "прошле године", "years ago" => "година раније", "Could not find category \"%s\"" => "Не могу да пронађем категорију „%s“." diff --git a/lib/l10n/sr@latin.php b/lib/l10n/sr@latin.php index 3a205bc56ee..5ba51bc0ba7 100644 --- a/lib/l10n/sr@latin.php +++ b/lib/l10n/sr@latin.php @@ -8,9 +8,9 @@ $TRANSLATIONS = array( "Authentication error" => "Greška pri autentifikaciji", "Files" => "Fajlovi", "Text" => "Tekst", -"_%n minute ago_::_%n minutes ago_" => array(,), -"_%n hour ago_::_%n hours ago_" => array(,), -"_%n day go_::_%n days ago_" => array(,), -"_%n month ago_::_%n months ago_" => array(,) +"_%n minute ago_::_%n minutes ago_" => array("","",""), +"_%n hour ago_::_%n hours ago_" => array("","",""), +"_%n day go_::_%n days ago_" => array("","",""), +"_%n month ago_::_%n months ago_" => array("","","") ); $PLURAL_FORMS = "nplurals=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 64efa94242f..dd54e6ca5d3 100644 --- a/lib/l10n/sv.php +++ b/lib/l10n/sv.php @@ -13,7 +13,6 @@ $TRANSLATIONS = array( "Back to Files" => "Tillbaka till Filer", "Selected files too large to generate zip file." => "Valda filer är för stora för att skapa zip-fil.", "Download the files in smaller chunks, seperately or kindly ask your administrator." => "Ladda ner filerna i mindre bitar, separat eller fråga din administratör.", -"couldn't be determined" => "kunde inte bestämmas", "Application is not enabled" => "Applikationen är inte aktiverad", "Authentication error" => "Fel vid autentisering", "Token expired. Please reload page." => "Ogiltig token. Ladda om sidan.", @@ -41,13 +40,13 @@ $TRANSLATIONS = array( "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Din webbserver är inte korrekt konfigurerad för att tillåta filsynkronisering eftersom WebDAV inte verkar fungera.", "Please double check the <a href='%s'>installation guides</a>." => "Var god kontrollera <a href='%s'>installationsguiden</a>.", "seconds ago" => "sekunder sedan", -"_%n minute ago_::_%n minutes ago_" => array(,), -"_%n hour ago_::_%n hours ago_" => array(,), +"_%n minute ago_::_%n minutes ago_" => array("%n minut sedan","%n minuter sedan"), +"_%n hour ago_::_%n hours ago_" => array("%n timme sedan","%n timmar sedan"), "today" => "i dag", "yesterday" => "i går", -"_%n day go_::_%n days ago_" => array(,), +"_%n day go_::_%n days ago_" => array("%n dag sedan","%n dagar sedan"), "last month" => "förra månaden", -"_%n month ago_::_%n months ago_" => 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", "Caused by:" => "Orsakad av:", diff --git a/lib/l10n/sw_KE.php b/lib/l10n/sw_KE.php index b2de92ed491..15f78e0bce6 100644 --- a/lib/l10n/sw_KE.php +++ b/lib/l10n/sw_KE.php @@ -1,8 +1,8 @@ <?php $TRANSLATIONS = array( -"_%n minute ago_::_%n minutes ago_" => array(,), -"_%n hour ago_::_%n hours ago_" => array(,), -"_%n day go_::_%n days ago_" => array(,), -"_%n month ago_::_%n months ago_" => array(,) +"_%n minute ago_::_%n minutes ago_" => array("",""), +"_%n hour ago_::_%n hours ago_" => array("",""), +"_%n day go_::_%n days ago_" => array("",""), +"_%n month ago_::_%n months ago_" => array("","") ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/lib/l10n/ta_LK.php b/lib/l10n/ta_LK.php index 72d47ebee48..e70e65845be 100644 --- a/lib/l10n/ta_LK.php +++ b/lib/l10n/ta_LK.php @@ -17,13 +17,13 @@ $TRANSLATIONS = array( "Text" => "உரை", "Images" => "படங்கள்", "seconds ago" => "செக்கன்களுக்கு முன்", -"_%n minute ago_::_%n minutes ago_" => array(,), -"_%n hour ago_::_%n hours ago_" => array(,), +"_%n minute ago_::_%n minutes ago_" => array("",""), +"_%n hour ago_::_%n hours ago_" => array("",""), "today" => "இன்று", "yesterday" => "நேற்று", -"_%n day go_::_%n days ago_" => array(,), +"_%n day go_::_%n days ago_" => array("",""), "last month" => "கடந்த மாதம்", -"_%n month ago_::_%n months ago_" => array(,), +"_%n month ago_::_%n months ago_" => array("",""), "last year" => "கடந்த வருடம்", "years ago" => "வருடங்களுக்கு முன்", "Could not find category \"%s\"" => "பிரிவு \"%s\" ஐ கண்டுப்பிடிக்க முடியவில்லை" diff --git a/lib/l10n/te.php b/lib/l10n/te.php index 77cc16307e1..524ea0c6024 100644 --- a/lib/l10n/te.php +++ b/lib/l10n/te.php @@ -4,13 +4,13 @@ $TRANSLATIONS = array( "Settings" => "అమరికలు", "Users" => "వాడుకరులు", "seconds ago" => "క్షణాల క్రితం", -"_%n minute ago_::_%n minutes ago_" => array(,), -"_%n hour ago_::_%n hours ago_" => array(,), +"_%n minute ago_::_%n minutes ago_" => array("",""), +"_%n hour ago_::_%n hours ago_" => array("",""), "today" => "ఈరోజు", "yesterday" => "నిన్న", -"_%n day go_::_%n days ago_" => array(,), +"_%n day go_::_%n days ago_" => array("",""), "last month" => "పోయిన నెల", -"_%n month ago_::_%n months ago_" => array(,), +"_%n month ago_::_%n months ago_" => array("",""), "last year" => "పోయిన సంవత్సరం", "years ago" => "సంవత్సరాల క్రితం" ); diff --git a/lib/l10n/th_TH.php b/lib/l10n/th_TH.php index 656e492394c..3344d0bb18e 100644 --- a/lib/l10n/th_TH.php +++ b/lib/l10n/th_TH.php @@ -10,7 +10,6 @@ $TRANSLATIONS = array( "Files need to be downloaded one by one." => "ไฟล์สามารถดาวน์โหลดได้ทีละครั้งเท่านั้น", "Back to Files" => "กลับไปที่ไฟล์", "Selected files too large to generate zip file." => "ไฟล์ที่เลือกมีขนาดใหญ่เกินกว่าที่จะสร้างเป็นไฟล์ zip", -"couldn't be determined" => "ไม่สามารถกำหนดได้", "Application is not enabled" => "แอพพลิเคชั่นดังกล่าวยังไม่ได้เปิดใช้งาน", "Authentication error" => "เกิดข้อผิดพลาดในสิทธิ์การเข้าใช้งาน", "Token expired. Please reload page." => "รหัสยืนยันความถูกต้องหมดอายุแล้ว กรุณาโหลดหน้าเว็บใหม่อีกครั้ง", @@ -18,13 +17,13 @@ $TRANSLATIONS = array( "Text" => "ข้อความ", "Images" => "รูปภาพ", "seconds ago" => "วินาที ก่อนหน้านี้", -"_%n minute ago_::_%n minutes ago_" => array(,), -"_%n hour ago_::_%n hours ago_" => array(,), +"_%n minute ago_::_%n minutes ago_" => array(""), +"_%n hour ago_::_%n hours ago_" => array(""), "today" => "วันนี้", "yesterday" => "เมื่อวานนี้", -"_%n day go_::_%n days ago_" => array(,), +"_%n day go_::_%n days ago_" => array(""), "last month" => "เดือนที่แล้ว", -"_%n month ago_::_%n months ago_" => array(,), +"_%n month ago_::_%n months ago_" => array(""), "last year" => "ปีที่แล้ว", "years ago" => "ปี ที่ผ่านมา", "Could not find category \"%s\"" => "ไม่พบหมวดหมู่ \"%s\"" diff --git a/lib/l10n/tr.php b/lib/l10n/tr.php index 11e04c04157..498469ea8b1 100644 --- a/lib/l10n/tr.php +++ b/lib/l10n/tr.php @@ -5,12 +5,14 @@ $TRANSLATIONS = array( "Settings" => "Ayarlar", "Users" => "Kullanıcılar", "Admin" => "Yönetici", +"Failed to upgrade \"%s\"." => "\"%s\" yükseltme başarısız oldu.", "web services under your control" => "Bilgileriniz güvenli ve şifreli", +"cannot open \"%s\"" => "\"%s\" açılamıyor", "ZIP download is turned off." => "ZIP indirmeleri kapatılmıştır.", "Files need to be downloaded one by one." => "Dosyaların birer birer indirilmesi gerekmektedir.", "Back to Files" => "Dosyalara dön", "Selected files too large to generate zip file." => "Seçilen dosyalar bir zip dosyası oluşturmak için fazla büyüktür.", -"couldn't be determined" => "tespit edilemedi", +"Download the files in smaller chunks, seperately or kindly ask your administrator." => "Dosyaları ayrı ayrı, küçük parçalar halinde indirin ya da yöneticinizden yardım isteyin. ", "Application is not enabled" => "Uygulama etkinleştirilmedi", "Authentication error" => "Kimlik doğrulama hatası", "Token expired. Please reload page." => "Jetonun süresi geçti. Lütfen sayfayı yenileyin.", @@ -38,15 +40,16 @@ $TRANSLATIONS = array( "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Web sunucunuz dosya transferi için düzgün bir şekilde yapılandırılmamış. WevDAV arabirimini sorunlu gözüküyor.", "Please double check the <a href='%s'>installation guides</a>." => "Lütfen <a href='%s'>kurulum kılavuzlarını</a> iki kez kontrol edin.", "seconds ago" => "saniye önce", -"_%n minute ago_::_%n minutes ago_" => array(,), -"_%n hour ago_::_%n hours ago_" => array(,), +"_%n minute ago_::_%n minutes ago_" => array("","%n dakika önce"), +"_%n hour ago_::_%n hours ago_" => array("","%n saat önce"), "today" => "bugün", "yesterday" => "dün", -"_%n day go_::_%n days ago_" => array(,), +"_%n day go_::_%n days ago_" => array("","%n gün önce"), "last month" => "geçen ay", -"_%n month ago_::_%n months ago_" => array(,), +"_%n month ago_::_%n months ago_" => array("","%n ay önce"), "last year" => "geçen yıl", "years ago" => "yıl önce", +"Caused by:" => "Neden olan:", "Could not find category \"%s\"" => "\"%s\" kategorisi bulunamadı" ); $PLURAL_FORMS = "nplurals=2; plural=(n > 1);"; diff --git a/lib/l10n/ug.php b/lib/l10n/ug.php index d5b714a7a07..731ad904d7e 100644 --- a/lib/l10n/ug.php +++ b/lib/l10n/ug.php @@ -8,11 +8,11 @@ $TRANSLATIONS = array( "Files" => "ھۆججەتلەر", "Text" => "قىسقا ئۇچۇر", "Images" => "سۈرەتلەر", -"_%n minute ago_::_%n minutes ago_" => array(,), -"_%n hour ago_::_%n hours ago_" => array(,), +"_%n minute ago_::_%n minutes ago_" => array(""), +"_%n hour ago_::_%n hours ago_" => array(""), "today" => "بۈگۈن", "yesterday" => "تۈنۈگۈن", -"_%n day go_::_%n days ago_" => array(,), -"_%n month ago_::_%n months ago_" => array(,) +"_%n day go_::_%n days ago_" => array(""), +"_%n month ago_::_%n months ago_" => array("") ); $PLURAL_FORMS = "nplurals=1; plural=0;"; diff --git a/lib/l10n/uk.php b/lib/l10n/uk.php index 0c0f1bc1a9b..c1513c5bb79 100644 --- a/lib/l10n/uk.php +++ b/lib/l10n/uk.php @@ -10,7 +10,6 @@ $TRANSLATIONS = array( "Files need to be downloaded one by one." => "Файли повинні бути завантаженні послідовно.", "Back to Files" => "Повернутися до файлів", "Selected files too large to generate zip file." => "Вибрані фали завеликі для генерування zip файлу.", -"couldn't be determined" => "не може бути визначено", "Application is not enabled" => "Додаток не увімкнений", "Authentication error" => "Помилка автентифікації", "Token expired. Please reload page." => "Строк дії токена скінчився. Будь ласка, перезавантажте сторінку.", @@ -37,13 +36,13 @@ $TRANSLATIONS = array( "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Ваш Web-сервер ще не налаштований належним чином для того, щоб дозволити синхронізацію файлів, через те що інтерфейс WebDAV, здається, зламаний.", "Please double check the <a href='%s'>installation guides</a>." => "Будь ласка, перевірте <a href='%s'>інструкції по встановленню</a>.", "seconds ago" => "секунди тому", -"_%n minute ago_::_%n minutes ago_" => array(,), -"_%n hour ago_::_%n hours ago_" => array(,), +"_%n minute ago_::_%n minutes ago_" => array("","",""), +"_%n hour ago_::_%n hours ago_" => array("","",""), "today" => "сьогодні", "yesterday" => "вчора", -"_%n day go_::_%n days ago_" => array(,), +"_%n day go_::_%n days ago_" => array("","",""), "last month" => "минулого місяця", -"_%n month ago_::_%n months ago_" => array(,), +"_%n month ago_::_%n months ago_" => array("","",""), "last year" => "минулого року", "years ago" => "роки тому", "Could not find category \"%s\"" => "Не вдалося знайти категорію \"%s\"" diff --git a/lib/l10n/ur_PK.php b/lib/l10n/ur_PK.php index 73b7eed9f83..7dc967ccd93 100644 --- a/lib/l10n/ur_PK.php +++ b/lib/l10n/ur_PK.php @@ -6,9 +6,9 @@ $TRANSLATIONS = array( "Users" => "یوزرز", "Admin" => "ایڈمن", "web services under your control" => "آپ کے اختیار میں ویب سروسیز", -"_%n minute ago_::_%n minutes ago_" => array(,), -"_%n hour ago_::_%n hours ago_" => array(,), -"_%n day go_::_%n days ago_" => array(,), -"_%n month ago_::_%n months ago_" => array(,) +"_%n minute ago_::_%n minutes ago_" => array("",""), +"_%n hour ago_::_%n hours ago_" => array("",""), +"_%n day go_::_%n days ago_" => array("",""), +"_%n month ago_::_%n months ago_" => array("","") ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/lib/l10n/vi.php b/lib/l10n/vi.php index 68cb6b5c341..dc0045c35ca 100644 --- a/lib/l10n/vi.php +++ b/lib/l10n/vi.php @@ -10,7 +10,6 @@ $TRANSLATIONS = array( "Files need to be downloaded one by one." => "Tập tin cần phải được tải về từng người một.", "Back to Files" => "Trở lại tập tin", "Selected files too large to generate zip file." => "Tập tin được chọn quá lớn để tạo tập tin ZIP.", -"couldn't be determined" => "không thể phát hiện được", "Application is not enabled" => "Ứng dụng không được BẬT", "Authentication error" => "Lỗi xác thực", "Token expired. Please reload page." => "Mã Token đã hết hạn. Hãy tải lại trang.", @@ -18,13 +17,13 @@ $TRANSLATIONS = array( "Text" => "Văn bản", "Images" => "Hình ảnh", "seconds ago" => "vài giây trước", -"_%n minute ago_::_%n minutes ago_" => array(,), -"_%n hour ago_::_%n hours ago_" => array(,), +"_%n minute ago_::_%n minutes ago_" => array(""), +"_%n hour ago_::_%n hours ago_" => array(""), "today" => "hôm nay", "yesterday" => "hôm qua", -"_%n day go_::_%n days ago_" => array(,), +"_%n day go_::_%n days ago_" => array(""), "last month" => "tháng trước", -"_%n month ago_::_%n months ago_" => array(,), +"_%n month ago_::_%n months ago_" => array(""), "last year" => "năm trước", "years ago" => "năm trước", "Could not find category \"%s\"" => "không thể tìm thấy mục \"%s\"" diff --git a/lib/l10n/zh_CN.GB2312.php b/lib/l10n/zh_CN.GB2312.php index 63fffaac782..bc81ff8fe1b 100644 --- a/lib/l10n/zh_CN.GB2312.php +++ b/lib/l10n/zh_CN.GB2312.php @@ -19,13 +19,13 @@ $TRANSLATIONS = array( "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "因WebDAV接口故障，您的网络服务器好像并未允许文件同步。", "Please double check the <a href='%s'>installation guides</a>." => "请双击<a href='%s'>安装向导</a>。", "seconds ago" => "秒前", -"_%n minute ago_::_%n minutes ago_" => array(,), -"_%n hour ago_::_%n hours ago_" => array(,), +"_%n minute ago_::_%n minutes ago_" => array("%n 分钟以前"), +"_%n hour ago_::_%n hours ago_" => array("%n 小时以前"), "today" => "今天", "yesterday" => "昨天", -"_%n day go_::_%n days ago_" => array(,), +"_%n day go_::_%n days ago_" => array("%n 天以前"), "last month" => "上个月", -"_%n month ago_::_%n months ago_" => array(,), +"_%n month ago_::_%n months ago_" => array("%n 个月以前"), "last year" => "去年", "years ago" => "年前" ); diff --git a/lib/l10n/zh_CN.php b/lib/l10n/zh_CN.php index 3311ae7de17..03bd48de74b 100644 --- a/lib/l10n/zh_CN.php +++ b/lib/l10n/zh_CN.php @@ -10,7 +10,6 @@ $TRANSLATIONS = array( "Files need to be downloaded one by one." => "需要逐一下载文件", "Back to Files" => "回到文件", "Selected files too large to generate zip file." => "选择的文件太大，无法生成 zip 文件。", -"couldn't be determined" => "无法确定", "Application is not enabled" => "应用程序未启用", "Authentication error" => "认证出错", "Token expired. Please reload page." => "Token 过期，请刷新页面。", @@ -38,13 +37,13 @@ $TRANSLATIONS = array( "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "您的Web服务器尚未正确设置以允许文件同步, 因为WebDAV的接口似乎已损坏.", "Please double check the <a href='%s'>installation guides</a>." => "请认真检查<a href='%s'>安装指南</a>.", "seconds ago" => "秒前", -"_%n minute ago_::_%n minutes ago_" => array(,), -"_%n hour ago_::_%n hours ago_" => array(,), +"_%n minute ago_::_%n minutes ago_" => array("%n 分钟前"), +"_%n hour ago_::_%n hours ago_" => array(""), "today" => "今天", "yesterday" => "昨天", -"_%n day go_::_%n days ago_" => array(,), +"_%n day go_::_%n days ago_" => array(""), "last month" => "上月", -"_%n month ago_::_%n months ago_" => array(,), +"_%n month ago_::_%n months ago_" => array(""), "last year" => "去年", "years ago" => "年前", "Could not find category \"%s\"" => "无法找到分类 \"%s\"" diff --git a/lib/l10n/zh_HK.php b/lib/l10n/zh_HK.php index 8609987fd6f..ca3e6d504e7 100644 --- a/lib/l10n/zh_HK.php +++ b/lib/l10n/zh_HK.php @@ -7,12 +7,12 @@ $TRANSLATIONS = array( "Admin" => "管理", "Files" => "文件", "Text" => "文字", -"_%n minute ago_::_%n minutes ago_" => array(,), -"_%n hour ago_::_%n hours ago_" => array(,), +"_%n minute ago_::_%n minutes ago_" => array(""), +"_%n hour ago_::_%n hours ago_" => array(""), "today" => "今日", "yesterday" => "昨日", -"_%n day go_::_%n days ago_" => array(,), +"_%n day go_::_%n days ago_" => array(""), "last month" => "前一月", -"_%n month ago_::_%n months ago_" => array(,) +"_%n month ago_::_%n months ago_" => array("") ); $PLURAL_FORMS = "nplurals=1; plural=0;"; diff --git a/lib/l10n/zh_TW.php b/lib/l10n/zh_TW.php index 65f38d30dd6..f405eb88ae9 100644 --- a/lib/l10n/zh_TW.php +++ b/lib/l10n/zh_TW.php @@ -10,7 +10,6 @@ $TRANSLATIONS = array( "Files need to be downloaded one by one." => "檔案需要逐一下載。", "Back to Files" => "回到檔案列表", "Selected files too large to generate zip file." => "選擇的檔案太大以致於無法產生壓縮檔。", -"couldn't be determined" => "無法判斷", "Application is not enabled" => "應用程式未啟用", "Authentication error" => "認證錯誤", "Token expired. Please reload page." => "Token 過期，請重新整理頁面。", @@ -38,13 +37,13 @@ $TRANSLATIONS = array( "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "您的網頁伺服器尚未被正確設定來進行檔案同步，因為您的 WebDAV 界面似乎無法使用。", "Please double check the <a href='%s'>installation guides</a>." => "請參考<a href='%s'>安裝指南</a>。", "seconds ago" => "幾秒前", -"_%n minute ago_::_%n minutes ago_" => array(,), -"_%n hour ago_::_%n hours ago_" => array(,), +"_%n minute ago_::_%n minutes ago_" => array(""), +"_%n hour ago_::_%n hours ago_" => array(""), "today" => "今天", "yesterday" => "昨天", -"_%n day go_::_%n days ago_" => array(,), +"_%n day go_::_%n days ago_" => array(""), "last month" => "上個月", -"_%n month ago_::_%n months ago_" => array(,), +"_%n month ago_::_%n months ago_" => array(""), "last year" => "去年", "years ago" => "幾年前", "Could not find category \"%s\"" => "找不到分類：\"%s\"" diff --git a/lib/memcache/factory.php b/lib/memcache/factory.php index 4c1b1ab207f..fde7d947567 100644 --- a/lib/memcache/factory.php +++ b/lib/memcache/factory.php @@ -37,4 +37,33 @@ class Factory { public function isAvailable() { return XCache::isAvailable() || APCu::isAvailable() || APC::isAvailable() || Memcached::isAvailable(); } + + /** + * get a in-server cache instance, will return null if no backend is available + * + * @param string $prefix + * @return \OC\Memcache\Cache + */ + public static function createLowLatency($prefix = '') { + if (XCache::isAvailable()) { + return new XCache($prefix); + } elseif (APCu::isAvailable()) { + return new APCu($prefix); + } elseif (APC::isAvailable()) { + return new APC($prefix); + } else { + return null; + } + } + + /** + * check if there is a in-server backend available + * + * @return bool + */ + public static function isAvailableLowLatency() { + return XCache::isAvailable() || APCu::isAvailable() || APC::isAvailable(); + } + + } diff --git a/lib/ocs/result.php b/lib/ocs/result.php index 729c39056d9..84f06fa01c7 100644 --- a/lib/ocs/result.php +++ b/lib/ocs/result.php @@ -94,4 +94,4 @@ class OC_OCS_Result{ } -}
\ No newline at end of file +} diff --git a/lib/public/groupinterface.php b/lib/public/groupinterface.php index 97833028118..5603faa8265 100644 --- a/lib/public/groupinterface.php +++ b/lib/public/groupinterface.php @@ -28,4 +28,4 @@ namespace OCP; -interface GroupInterface extends \OC_Group_Interface {}
\ No newline at end of file +interface GroupInterface extends \OC_Group_Interface {} diff --git a/lib/public/userinterface.php b/lib/public/userinterface.php index b73a8f8d8b0..53d9faf7a5e 100644 --- a/lib/public/userinterface.php +++ b/lib/public/userinterface.php @@ -28,4 +28,4 @@ namespace OCP; -interface UserInterface extends \OC_User_Interface {}
\ No newline at end of file +interface UserInterface extends \OC_User_Interface {} diff --git a/lib/public/util.php b/lib/public/util.php index 693805946ea..b33f07b55e6 100644 --- a/lib/public/util.php +++ b/lib/public/util.php @@ -123,6 +123,14 @@ class Util { } /** + * @brief check if some encrypted files are stored + * @return bool + */ + public static function encryptedFiles() { + return \OC_Util::encryptedFiles(); + } + + /** * @brief Creates an absolute url * @param string $app app * @param string $file file diff --git a/lib/user/http.php b/lib/user/http.php index 944ede73a0b..1e044ed4188 100644 --- a/lib/user/http.php +++ b/lib/user/http.php @@ -103,4 +103,4 @@ class OC_User_HTTP extends OC_User_Backend { return false; } } -}
\ No newline at end of file +} diff --git a/lib/user/interface.php b/lib/user/interface.php index b1e19aea7fb..c72bdfaf3fd 100644 --- a/lib/user/interface.php +++ b/lib/user/interface.php @@ -77,4 +77,4 @@ interface OC_User_Interface { * @return boolean if users can be listed or not */ public function hasUserListings(); -}
\ No newline at end of file +} diff --git a/lib/util.php b/lib/util.php index 10b526ef6b3..dbda3ac0ad0 100755 --- a/lib/util.php +++ b/lib/util.php @@ -52,6 +52,16 @@ class OC_Util { } if( $user != "" ) { //if we aren't logged in, there is no use to set up the filesystem + $quota = self::getUserQuota($user); + if ($quota !== \OC\Files\SPACE_UNLIMITED) { + \OC\Files\Filesystem::addStorageWrapper(function($mountPoint, $storage) use ($quota, $user) { + if ($mountPoint === '/' . $user . '/'){ + return new \OC\Files\Storage\Wrapper\Quota(array('storage' => $storage, 'quota' => $quota)); + } else { + return $storage; + } + }); + } $userDir = '/'.$user.'/files'; $userRoot = OC_User::getHome($user); $userDirectory = $userRoot . '/files'; @@ -61,9 +71,7 @@ class OC_Util { //jail the user into his "home" directory \OC\Files\Filesystem::init($user, $userDir); - $quotaProxy = new OC_FileProxy_Quota(); $fileOperationProxy = new OC_FileProxy_FileOperations(); - OC_FileProxy::register($quotaProxy); OC_FileProxy::register($fileOperationProxy); OC_Hook::emit('OC_Filesystem', 'setup', array('user' => $user, 'user_dir' => $userDir)); @@ -71,6 +79,18 @@ class OC_Util { return true; } + public static function getUserQuota($user){ + $userQuota = OC_Preferences::getValue($user, 'files', 'quota', 'default'); + if($userQuota === 'default') { + $userQuota = OC_AppConfig::getValue('files', 'default_quota', 'none'); + } + if($userQuota === 'none') { + return \OC\Files\SPACE_UNLIMITED; + }else{ + return OC_Helper::computerFileSize($userQuota); + } + } + /** * @return void */ @@ -381,6 +401,23 @@ class OC_Util { } /** + * @brief check if there are still some encrypted files stored + * @return boolean + */ + public static function encryptedFiles() { + //check if encryption was enabled in the past + $encryptedFiles = false; + if (OC_App::isEnabled('files_encryption') === false) { + $view = new OC\Files\View('/' . OCP\User::getUser()); + if ($view->file_exists('/files_encryption/keyfiles')) { + $encryptedFiles = true; + } + } + + return $encryptedFiles; + } + + /** * Check for correct file permissions of data directory * @return array arrays with error messages and hints */ diff --git a/lib/vobject/compoundproperty.php b/lib/vobject/compoundproperty.php index d702ab802e0..7fe42574bed 100644 --- a/lib/vobject/compoundproperty.php +++ b/lib/vobject/compoundproperty.php @@ -67,4 +67,4 @@ class CompoundProperty extends \Sabre\VObject\Property\Compound { } -}
\ No newline at end of file +} diff --git a/lib/vobject/stringproperty.php b/lib/vobject/stringproperty.php index b98a8f26c2b..a9d63a0a789 100644 --- a/lib/vobject/stringproperty.php +++ b/lib/vobject/stringproperty.php @@ -77,4 +77,4 @@ class StringProperty extends \Sabre\VObject\Property { } -}
\ No newline at end of file +} |