diff --git a/VERSION b/VERSION index 8e8299d..276cbf9 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.4.2 +2.3.0 diff --git a/composer.json b/composer.json index 6331252..df85fd1 100644 --- a/composer.json +++ b/composer.json @@ -22,11 +22,10 @@ "boronczyk/localization-middleware": "^1.4", "byjg/migration": "^4.0", "byjg/uri": "^1.0.4", + "byjg/webrequest": "^1.0", "gettext/gettext": "^4.6", - "gofabian/negotiation-middleware": "dev-master", - "guzzlehttp/guzzle": "^6.5", + "gofabian/negotiation-middleware": "^0.1.3", "laminas/laminas-escaper": "^2.6", - "laminas/laminas-zendframework-bridge": "^1.4", "masterminds/html5": "^2.3", "monolog/monolog": "^1.17", "mrpetovan/net_ping": "^1.2", @@ -56,7 +55,7 @@ }, "config": { "platform": { - "php": "7.3.0" + "php": "7.1.0" }, "process-timeout" : 0, "autoloader-suffix": "FriendicaDirectory", diff --git a/composer.lock b/composer.lock index 15ccbdf..381151a 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "e695909f6c6a475770dfc28266571d9a", + "content-hash": "a8bc1750aa6136e10ea28799a0974f6b", "packages": [ { "name": "asika/simple-console", @@ -41,16 +41,16 @@ }, { "name": "atlas/pdo", - "version": "1.2.0", + "version": "1.1.2", "source": { "type": "git", "url": "https://github.com/atlasphp/Atlas.Pdo.git", - "reference": "b64a164290b93bffd2e034dc6e49535afc7dea80" + "reference": "69b7c968b6c685043d215c1ddbe48e526a73ca80" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/atlasphp/Atlas.Pdo/zipball/b64a164290b93bffd2e034dc6e49535afc7dea80", - "reference": "b64a164290b93bffd2e034dc6e49535afc7dea80", + "url": "https://api.github.com/repos/atlasphp/Atlas.Pdo/zipball/69b7c968b6c685043d215c1ddbe48e526a73ca80", + "reference": "69b7c968b6c685043d215c1ddbe48e526a73ca80", "shasum": "" }, "require": { @@ -84,7 +84,7 @@ "pdo", "sql" ], - "time": "2020-12-31T16:08:34+00:00" + "time": "2019-12-23T15:09:02+00:00" }, { "name": "boronczyk/localization-middleware", @@ -173,16 +173,16 @@ }, { "name": "bower-asset/fontawesome", - "version": "5.15.4", + "version": "5.13.1", "source": { "type": "git", "url": "https://github.com/FortAwesome/Font-Awesome.git", - "reference": "7d3d774145ac38663f6d1effc6def0334b68ab7e" + "reference": "1147d199a35293b391152ee85e2d30988439157f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FortAwesome/Font-Awesome/zipball/7d3d774145ac38663f6d1effc6def0334b68ab7e", - "reference": "7d3d774145ac38663f6d1effc6def0334b68ab7e", + "url": "https://api.github.com/repos/FortAwesome/Font-Awesome/zipball/1147d199a35293b391152ee85e2d30988439157f", + "reference": "1147d199a35293b391152ee85e2d30988439157f", "shasum": "" }, "type": "bower-asset-library" @@ -447,6 +447,46 @@ "description": "An implementation of PSR UriInterface ", "time": "2018-03-09T01:56:58+00:00" }, + { + "name": "byjg/webrequest", + "version": "1.0.7", + "source": { + "type": "git", + "url": "https://github.com/byjg/webrequest.git", + "reference": "a307e4e21525c9dc0f116b5cf8657318ef2a44e8" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/byjg/webrequest/zipball/a307e4e21525c9dc0f116b5cf8657318ef2a44e8", + "reference": "a307e4e21525c9dc0f116b5cf8657318ef2a44e8", + "shasum": "" + }, + "require": { + "ext-curl": "*", + "php": ">=5.4.0" + }, + "require-dev": { + "phpunit/phpunit": ">5.7" + }, + "type": "library", + "autoload": { + "psr-4": { + "ByJG\\Util\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "João Gilberto Magalhães", + "email": "joao@byjg.com.br" + } + ], + "description": "A lightweight and highly customized CURL wrapper for making RESt calls and a wrapper for call dynamically SOAP requests.", + "time": "2018-03-09T02:53:33+00:00" + }, { "name": "byjg/xmlutil", "version": "1.0.6", @@ -486,6 +526,62 @@ "description": "A utility class to make easy work with XML in PHP.", "time": "2018-03-10T14:43:36+00:00" }, + { + "name": "doctrine/instantiator", + "version": "1.3.1", + "source": { + "type": "git", + "url": "https://github.com/doctrine/instantiator.git", + "reference": "f350df0268e904597e3bd9c4685c53e0e333feea" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/doctrine/instantiator/zipball/f350df0268e904597e3bd9c4685c53e0e333feea", + "reference": "f350df0268e904597e3bd9c4685c53e0e333feea", + "shasum": "" + }, + "require": { + "php": "^7.1 || ^8.0" + }, + "require-dev": { + "doctrine/coding-standard": "^6.0", + "ext-pdo": "*", + "ext-phar": "*", + "phpbench/phpbench": "^0.13", + "phpstan/phpstan-phpunit": "^0.11", + "phpstan/phpstan-shim": "^0.11", + "phpunit/phpunit": "^7.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.2.x-dev" + } + }, + "autoload": { + "psr-4": { + "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Marco Pivetta", + "email": "ocramius@gmail.com", + "homepage": "http://ocramius.github.com/" + } + ], + "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors", + "homepage": "https://www.doctrine-project.org/projects/instantiator.html", + "keywords": [ + "constructor", + "instantiate" + ], + "time": "2020-05-29T17:27:14+00:00" + }, { "name": "fxp/composer-asset-plugin", "version": "v1.4.6", @@ -547,16 +643,16 @@ }, { "name": "gettext/gettext", - "version": "v4.8.8", + "version": "v4.8.2", "source": { "type": "git", "url": "https://github.com/php-gettext/Gettext.git", - "reference": "302a00aa9d6762c92c884d879c15d3ed05d6a37d" + "reference": "e474f872f2c8636cf53fd283ec4ce1218f3d236a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-gettext/Gettext/zipball/302a00aa9d6762c92c884d879c15d3ed05d6a37d", - "reference": "302a00aa9d6762c92c884d879c15d3ed05d6a37d", + "url": "https://api.github.com/repos/php-gettext/Gettext/zipball/e474f872f2c8636cf53fd283ec4ce1218f3d236a", + "reference": "e474f872f2c8636cf53fd283ec4ce1218f3d236a", "shasum": "" }, "require": { @@ -564,7 +660,7 @@ "php": ">=5.4.0" }, "require-dev": { - "illuminate/view": "^5.0.x-dev", + "illuminate/view": "*", "phpunit/phpunit": "^4.8|^5.7|^6.5", "squizlabs/php_codesniffer": "^3.0", "symfony/yaml": "~2", @@ -605,40 +701,27 @@ "po", "translation" ], - "funding": [ - { - "url": "https://paypal.me/oscarotero", - "type": "custom" - }, - { - "url": "https://github.com/oscarotero", - "type": "github" - }, - { - "url": "https://www.patreon.com/misteroom", - "type": "patreon" - } - ], - "time": "2022-12-08T11:59:50+00:00" + "time": "2019-12-02T10:21:14+00:00" }, { "name": "gettext/languages", - "version": "2.10.0", + "version": "2.6.0", "source": { "type": "git", "url": "https://github.com/php-gettext/Languages.git", - "reference": "4d61d67fe83a2ad85959fe6133d6d9ba7dddd1ab" + "reference": "38ea0482f649e0802e475f0ed19fa993bcb7a618" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-gettext/Languages/zipball/4d61d67fe83a2ad85959fe6133d6d9ba7dddd1ab", - "reference": "4d61d67fe83a2ad85959fe6133d6d9ba7dddd1ab", + "url": "https://api.github.com/repos/php-gettext/Languages/zipball/38ea0482f649e0802e475f0ed19fa993bcb7a618", + "reference": "38ea0482f649e0802e475f0ed19fa993bcb7a618", "shasum": "" }, "require": { "php": ">=5.3" }, "require-dev": { + "friendsofphp/php-cs-fixer": "^2.16.0", "phpunit/phpunit": "^4.8 || ^5.7 || ^6.5 || ^7.5 || ^8.4" }, "bin": [ @@ -679,40 +762,30 @@ "translations", "unicode" ], - "funding": [ - { - "url": "https://paypal.me/mlocati", - "type": "custom" - }, - { - "url": "https://github.com/mlocati", - "type": "github" - } - ], - "time": "2022-10-18T15:00:10+00:00" + "time": "2019-11-13T10:30:21+00:00" }, { "name": "gofabian/negotiation-middleware", - "version": "dev-master", + "version": "v0.1.3", "source": { "type": "git", "url": "https://github.com/gofabian/negotiation-middleware.git", - "reference": "4d3cda5425eb2b74709a6510815f6c40d6c74ff7" + "reference": "23d80fa1b00bbadded515df837c5a84517374b50" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/gofabian/negotiation-middleware/zipball/4d3cda5425eb2b74709a6510815f6c40d6c74ff7", - "reference": "4d3cda5425eb2b74709a6510815f6c40d6c74ff7", + "url": "https://api.github.com/repos/gofabian/negotiation-middleware/zipball/23d80fa1b00bbadded515df837c5a84517374b50", + "reference": "23d80fa1b00bbadded515df837c5a84517374b50", "shasum": "" }, "require": { - "php": ">=7.3", + "php": ">=5.4.0", "psr/http-message": "^1.0", - "willdurand/negotiation": "^3.0" + "willdurand/negotiation": "^2.0" }, "require-dev": { - "php-coveralls/php-coveralls": "^2.4.3", - "phpunit/phpunit": "^9.5" + "phpunit/phpunit": "^4.8", + "satooshi/php-coveralls": "0.6.1" }, "suggest": { "slim/slim": "The negotiation middleware is compatible to Slim 3.x" @@ -741,326 +814,40 @@ "psr-7", "slim" ], - "time": "2021-05-16T18:42:02+00:00" + "time": "2017-02-22T18:45:01+00:00" }, { - "name": "guzzlehttp/guzzle", - "version": "6.5.8", + "name": "laminas/laminas-escaper", + "version": "2.6.1", "source": { "type": "git", - "url": "https://github.com/guzzle/guzzle.git", - "reference": "a52f0440530b54fa079ce76e8c5d196a42cad981" + "url": "https://github.com/laminas/laminas-escaper.git", + "reference": "25f2a053eadfa92ddacb609dcbbc39362610da70" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/a52f0440530b54fa079ce76e8c5d196a42cad981", - "reference": "a52f0440530b54fa079ce76e8c5d196a42cad981", + "url": "https://api.github.com/repos/laminas/laminas-escaper/zipball/25f2a053eadfa92ddacb609dcbbc39362610da70", + "reference": "25f2a053eadfa92ddacb609dcbbc39362610da70", "shasum": "" }, "require": { - "ext-json": "*", - "guzzlehttp/promises": "^1.0", - "guzzlehttp/psr7": "^1.9", - "php": ">=5.5", - "symfony/polyfill-intl-idn": "^1.17" + "laminas/laminas-zendframework-bridge": "^1.0", + "php": "^5.6 || ^7.0" + }, + "replace": { + "zendframework/zend-escaper": "self.version" }, "require-dev": { - "ext-curl": "*", - "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.4 || ^7.0", - "psr/log": "^1.1" - }, - "suggest": { - "psr/log": "Required for using the Log middleware" + "laminas/laminas-coding-standard": "~1.0.0", + "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "6.5-dev" + "dev-master": "2.6.x-dev", + "dev-develop": "2.7.x-dev" } }, - "autoload": { - "files": [ - "src/functions_include.php" - ], - "psr-4": { - "GuzzleHttp\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Graham Campbell", - "email": "hello@gjcampbell.co.uk", - "homepage": "https://github.com/GrahamCampbell" - }, - { - "name": "Michael Dowling", - "email": "mtdowling@gmail.com", - "homepage": "https://github.com/mtdowling" - }, - { - "name": "Jeremy Lindblom", - "email": "jeremeamia@gmail.com", - "homepage": "https://github.com/jeremeamia" - }, - { - "name": "George Mponos", - "email": "gmponos@gmail.com", - "homepage": "https://github.com/gmponos" - }, - { - "name": "Tobias Nyholm", - "email": "tobias.nyholm@gmail.com", - "homepage": "https://github.com/Nyholm" - }, - { - "name": "Márk Sági-Kazár", - "email": "mark.sagikazar@gmail.com", - "homepage": "https://github.com/sagikazarmark" - }, - { - "name": "Tobias Schultze", - "email": "webmaster@tubo-world.de", - "homepage": "https://github.com/Tobion" - } - ], - "description": "Guzzle is a PHP HTTP client library", - "homepage": "http://guzzlephp.org/", - "keywords": [ - "client", - "curl", - "framework", - "http", - "http client", - "rest", - "web service" - ], - "funding": [ - { - "url": "https://github.com/GrahamCampbell", - "type": "github" - }, - { - "url": "https://github.com/Nyholm", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/guzzle", - "type": "tidelift" - } - ], - "time": "2022-06-20T22:16:07+00:00" - }, - { - "name": "guzzlehttp/promises", - "version": "1.5.3", - "source": { - "type": "git", - "url": "https://github.com/guzzle/promises.git", - "reference": "67ab6e18aaa14d753cc148911d273f6e6cb6721e" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/guzzle/promises/zipball/67ab6e18aaa14d753cc148911d273f6e6cb6721e", - "reference": "67ab6e18aaa14d753cc148911d273f6e6cb6721e", - "shasum": "" - }, - "require": { - "php": ">=5.5" - }, - "require-dev": { - "symfony/phpunit-bridge": "^4.4 || ^5.1" - }, - "type": "library", - "autoload": { - "files": [ - "src/functions_include.php" - ], - "psr-4": { - "GuzzleHttp\\Promise\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Graham Campbell", - "email": "hello@gjcampbell.co.uk", - "homepage": "https://github.com/GrahamCampbell" - }, - { - "name": "Michael Dowling", - "email": "mtdowling@gmail.com", - "homepage": "https://github.com/mtdowling" - }, - { - "name": "Tobias Nyholm", - "email": "tobias.nyholm@gmail.com", - "homepage": "https://github.com/Nyholm" - }, - { - "name": "Tobias Schultze", - "email": "webmaster@tubo-world.de", - "homepage": "https://github.com/Tobion" - } - ], - "description": "Guzzle promises library", - "keywords": [ - "promise" - ], - "funding": [ - { - "url": "https://github.com/GrahamCampbell", - "type": "github" - }, - { - "url": "https://github.com/Nyholm", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/promises", - "type": "tidelift" - } - ], - "time": "2023-05-21T12:31:43+00:00" - }, - { - "name": "guzzlehttp/psr7", - "version": "1.9.1", - "source": { - "type": "git", - "url": "https://github.com/guzzle/psr7.git", - "reference": "e4490cabc77465aaee90b20cfc9a770f8c04be6b" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/guzzle/psr7/zipball/e4490cabc77465aaee90b20cfc9a770f8c04be6b", - "reference": "e4490cabc77465aaee90b20cfc9a770f8c04be6b", - "shasum": "" - }, - "require": { - "php": ">=5.4.0", - "psr/http-message": "~1.0", - "ralouphie/getallheaders": "^2.0.5 || ^3.0.0" - }, - "provide": { - "psr/http-message-implementation": "1.0" - }, - "require-dev": { - "ext-zlib": "*", - "phpunit/phpunit": "~4.8.36 || ^5.7.27 || ^6.5.14 || ^7.5.20 || ^8.5.8 || ^9.3.10" - }, - "suggest": { - "laminas/laminas-httphandlerrunner": "Emit PSR-7 responses" - }, - "type": "library", - "autoload": { - "files": [ - "src/functions_include.php" - ], - "psr-4": { - "GuzzleHttp\\Psr7\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Graham Campbell", - "email": "hello@gjcampbell.co.uk", - "homepage": "https://github.com/GrahamCampbell" - }, - { - "name": "Michael Dowling", - "email": "mtdowling@gmail.com", - "homepage": "https://github.com/mtdowling" - }, - { - "name": "George Mponos", - "email": "gmponos@gmail.com", - "homepage": "https://github.com/gmponos" - }, - { - "name": "Tobias Nyholm", - "email": "tobias.nyholm@gmail.com", - "homepage": "https://github.com/Nyholm" - }, - { - "name": "Márk Sági-Kazár", - "email": "mark.sagikazar@gmail.com", - "homepage": "https://github.com/sagikazarmark" - }, - { - "name": "Tobias Schultze", - "email": "webmaster@tubo-world.de", - "homepage": "https://github.com/Tobion" - } - ], - "description": "PSR-7 message implementation that also provides common utility methods", - "keywords": [ - "http", - "message", - "psr-7", - "request", - "response", - "stream", - "uri", - "url" - ], - "funding": [ - { - "url": "https://github.com/GrahamCampbell", - "type": "github" - }, - { - "url": "https://github.com/Nyholm", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/psr7", - "type": "tidelift" - } - ], - "time": "2023-04-17T16:00:37+00:00" - }, - { - "name": "laminas/laminas-escaper", - "version": "2.9.0", - "source": { - "type": "git", - "url": "https://github.com/laminas/laminas-escaper.git", - "reference": "891ad70986729e20ed2e86355fcf93c9dc238a5f" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-escaper/zipball/891ad70986729e20ed2e86355fcf93c9dc238a5f", - "reference": "891ad70986729e20ed2e86355fcf93c9dc238a5f", - "shasum": "" - }, - "require": { - "php": "^7.3 || ~8.0.0 || ~8.1.0" - }, - "conflict": { - "zendframework/zend-escaper": "*" - }, - "require-dev": { - "laminas/laminas-coding-standard": "~2.3.0", - "phpunit/phpunit": "^9.3", - "psalm/plugin-phpunit": "^0.12.2", - "vimeo/psalm": "^3.16" - }, - "suggest": { - "ext-iconv": "*", - "ext-mbstring": "*" - }, - "type": "library", "autoload": { "psr-4": { "Laminas\\Escaper\\": "src/" @@ -1076,39 +863,35 @@ "escaper", "laminas" ], - "funding": [ - { - "url": "https://funding.communitybridge.org/projects/laminas-project", - "type": "community_bridge" - } - ], - "time": "2021-09-02T17:10:53+00:00" + "time": "2019-12-31T16:43:30+00:00" }, { "name": "laminas/laminas-zendframework-bridge", - "version": "1.4.1", + "version": "1.0.4", "source": { "type": "git", "url": "https://github.com/laminas/laminas-zendframework-bridge.git", - "reference": "88bf037259869891afce6504cacc4f8a07b24d0f" + "reference": "fcd87520e4943d968557803919523772475e8ea3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-zendframework-bridge/zipball/88bf037259869891afce6504cacc4f8a07b24d0f", - "reference": "88bf037259869891afce6504cacc4f8a07b24d0f", + "url": "https://api.github.com/repos/laminas/laminas-zendframework-bridge/zipball/fcd87520e4943d968557803919523772475e8ea3", + "reference": "fcd87520e4943d968557803919523772475e8ea3", "shasum": "" }, "require": { - "php": "^7.3 || ~8.0.0 || ~8.1.0" + "php": "^5.6 || ^7.0" }, "require-dev": { - "phpunit/phpunit": "^9.3", - "psalm/plugin-phpunit": "^0.15.1", - "squizlabs/php_codesniffer": "^3.5", - "vimeo/psalm": "^4.6" + "phpunit/phpunit": "^5.7 || ^6.5 || ^7.5 || ^8.1", + "squizlabs/php_codesniffer": "^3.5" }, "type": "library", "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev", + "dev-develop": "1.1.x-dev" + }, "laminas": { "module": "Laminas\\ZendFrameworkBridge" } @@ -1132,34 +915,32 @@ "laminas", "zf" ], - "funding": [ - { - "url": "https://funding.communitybridge.org/projects/laminas-project", - "type": "community_bridge" - } - ], - "time": "2021-12-21T14:34:37+00:00" + "time": "2020-05-20T16:45:56+00:00" }, { "name": "masterminds/html5", - "version": "2.8.0", + "version": "2.7.1", "source": { "type": "git", "url": "https://github.com/Masterminds/html5-php.git", - "reference": "3c5d5a56d56f48a1ca08a0670f0f80c1dad368f3" + "reference": "a3edfe52f9e7380e498d33157e1330e85386645d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Masterminds/html5-php/zipball/3c5d5a56d56f48a1ca08a0670f0f80c1dad368f3", - "reference": "3c5d5a56d56f48a1ca08a0670f0f80c1dad368f3", + "url": "https://api.github.com/repos/Masterminds/html5-php/zipball/a3edfe52f9e7380e498d33157e1330e85386645d", + "reference": "a3edfe52f9e7380e498d33157e1330e85386645d", "shasum": "" }, "require": { + "ext-ctype": "*", "ext-dom": "*", + "ext-libxml": "*", "php": ">=5.3.0" }, "require-dev": { - "phpunit/phpunit": "^4.8.35 || ^5.7.21 || ^6 || ^7 || ^8" + "phpunit/phpunit": "^4.8.35", + "sami/sami": "~2.0", + "satooshi/php-coveralls": "1.0.*" }, "type": "library", "extra": { @@ -1201,20 +982,20 @@ "serializer", "xml" ], - "time": "2023-04-26T07:27:39+00:00" + "time": "2020-02-06T11:39:04+00:00" }, { "name": "monolog/monolog", - "version": "1.27.1", + "version": "1.25.4", "source": { "type": "git", "url": "https://github.com/Seldaek/monolog.git", - "reference": "904713c5929655dc9b97288b69cfeedad610c9a1" + "reference": "3022efff205e2448b560c833c6fbbf91c3139168" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/904713c5929655dc9b97288b69cfeedad610c9a1", - "reference": "904713c5929655dc9b97288b69cfeedad610c9a1", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/3022efff205e2448b560c833c6fbbf91c3139168", + "reference": "3022efff205e2448b560c833c6fbbf91c3139168", "shasum": "" }, "require": { @@ -1230,7 +1011,7 @@ "graylog2/gelf-php": "~1.0", "php-amqplib/php-amqplib": "~2.4", "php-console/php-console": "^3.1.3", - "phpstan/phpstan": "^0.12.59", + "php-parallel-lint/php-parallel-lint": "^1.0", "phpunit/phpunit": "~4.5", "ruflin/elastica": ">=0.90 <3.0", "sentry/sentry": "^0.13", @@ -1250,6 +1031,11 @@ "sentry/sentry": "Allow sending log messages to a Sentry server" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0.x-dev" + } + }, "autoload": { "psr-4": { "Monolog\\": "src/Monolog" @@ -1273,17 +1059,7 @@ "logging", "psr-3" ], - "funding": [ - { - "url": "https://github.com/Seldaek", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/monolog/monolog", - "type": "tidelift" - } - ], - "time": "2022-06-09T08:53:42+00:00" + "time": "2020-05-22T07:31:27+00:00" }, { "name": "mrpetovan/net_ping", @@ -1446,16 +1222,16 @@ }, { "name": "pear/pear-core-minimal", - "version": "v1.10.13", + "version": "v1.10.10", "source": { "type": "git", "url": "https://github.com/pear/pear-core-minimal.git", - "reference": "aed862e95fd286c53cc546734868dc38ff4b5b1d" + "reference": "625a3c429d9b2c1546438679074cac1b089116a7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pear/pear-core-minimal/zipball/aed862e95fd286c53cc546734868dc38ff4b5b1d", - "reference": "aed862e95fd286c53cc546734868dc38ff4b5b1d", + "url": "https://api.github.com/repos/pear/pear-core-minimal/zipball/625a3c429d9b2c1546438679074cac1b089116a7", + "reference": "625a3c429d9b2c1546438679074cac1b089116a7", "shasum": "" }, "require": { @@ -1486,27 +1262,27 @@ } ], "description": "Minimal set of PEAR core files to be used as composer dependency", - "time": "2023-04-19T19:15:47+00:00" + "time": "2019-11-19T19:00:24+00:00" }, { "name": "pear/pear_exception", - "version": "v1.0.2", + "version": "v1.0.1", "source": { "type": "git", "url": "https://github.com/pear/PEAR_Exception.git", - "reference": "b14fbe2ddb0b9f94f5b24cf08783d599f776fff0" + "reference": "dbb42a5a0e45f3adcf99babfb2a1ba77b8ac36a7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pear/PEAR_Exception/zipball/b14fbe2ddb0b9f94f5b24cf08783d599f776fff0", - "reference": "b14fbe2ddb0b9f94f5b24cf08783d599f776fff0", + "url": "https://api.github.com/repos/pear/PEAR_Exception/zipball/dbb42a5a0e45f3adcf99babfb2a1ba77b8ac36a7", + "reference": "dbb42a5a0e45f3adcf99babfb2a1ba77b8ac36a7", "shasum": "" }, "require": { - "php": ">=5.2.0" + "php": ">=4.4.0" }, "require-dev": { - "phpunit/phpunit": "<9" + "phpunit/phpunit": "*" }, "type": "class", "extra": { @@ -1541,1416 +1317,29 @@ "keywords": [ "exception" ], - "time": "2021-03-21T15:43:46+00:00" - }, - { - "name": "pimple/pimple", - "version": "v3.5.0", - "source": { - "type": "git", - "url": "https://github.com/silexphp/Pimple.git", - "reference": "a94b3a4db7fb774b3d78dad2315ddc07629e1bed" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/silexphp/Pimple/zipball/a94b3a4db7fb774b3d78dad2315ddc07629e1bed", - "reference": "a94b3a4db7fb774b3d78dad2315ddc07629e1bed", - "shasum": "" - }, - "require": { - "php": ">=7.2.5", - "psr/container": "^1.1 || ^2.0" - }, - "require-dev": { - "symfony/phpunit-bridge": "^5.4@dev" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.4.x-dev" - } - }, - "autoload": { - "psr-0": { - "Pimple": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - } - ], - "description": "Pimple, a simple Dependency Injection Container", - "homepage": "https://pimple.symfony.com", - "keywords": [ - "container", - "dependency injection" - ], - "time": "2021-10-28T11:13:42+00:00" - }, - { - "name": "psr/cache", - "version": "1.0.1", - "source": { - "type": "git", - "url": "https://github.com/php-fig/cache.git", - "reference": "d11b50ad223250cf17b86e38383413f5a6764bf8" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/php-fig/cache/zipball/d11b50ad223250cf17b86e38383413f5a6764bf8", - "reference": "d11b50ad223250cf17b86e38383413f5a6764bf8", - "shasum": "" - }, - "require": { - "php": ">=5.3.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0.x-dev" - } - }, - "autoload": { - "psr-4": { - "Psr\\Cache\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" - } - ], - "description": "Common interface for caching libraries", - "keywords": [ - "cache", - "psr", - "psr-6" - ], - "time": "2016-08-06T20:24:11+00:00" - }, - { - "name": "psr/container", - "version": "1.1.1", - "source": { - "type": "git", - "url": "https://github.com/php-fig/container.git", - "reference": "8622567409010282b7aeebe4bb841fe98b58dcaf" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/php-fig/container/zipball/8622567409010282b7aeebe4bb841fe98b58dcaf", - "reference": "8622567409010282b7aeebe4bb841fe98b58dcaf", - "shasum": "" - }, - "require": { - "php": ">=7.2.0" - }, - "type": "library", - "autoload": { - "psr-4": { - "Psr\\Container\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "PHP-FIG", - "homepage": "https://www.php-fig.org/" - } - ], - "description": "Common Container Interface (PHP FIG PSR-11)", - "homepage": "https://github.com/php-fig/container", - "keywords": [ - "PSR-11", - "container", - "container-interface", - "container-interop", - "psr" - ], - "time": "2021-03-05T17:36:06+00:00" - }, - { - "name": "psr/http-message", - "version": "1.1", - "source": { - "type": "git", - "url": "https://github.com/php-fig/http-message.git", - "reference": "cb6ce4845ce34a8ad9e68117c10ee90a29919eba" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/php-fig/http-message/zipball/cb6ce4845ce34a8ad9e68117c10ee90a29919eba", - "reference": "cb6ce4845ce34a8ad9e68117c10ee90a29919eba", - "shasum": "" - }, - "require": { - "php": "^7.2 || ^8.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.1.x-dev" - } - }, - "autoload": { - "psr-4": { - "Psr\\Http\\Message\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" - } - ], - "description": "Common interface for HTTP messages", - "homepage": "https://github.com/php-fig/http-message", - "keywords": [ - "http", - "http-message", - "psr", - "psr-7", - "request", - "response" - ], - "time": "2023-04-04T09:50:52+00:00" - }, - { - "name": "psr/log", - "version": "1.1.4", - "source": { - "type": "git", - "url": "https://github.com/php-fig/log.git", - "reference": "d49695b909c3b7628b6289db5479a1c204601f11" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/d49695b909c3b7628b6289db5479a1c204601f11", - "reference": "d49695b909c3b7628b6289db5479a1c204601f11", - "shasum": "" - }, - "require": { - "php": ">=5.3.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.1.x-dev" - } - }, - "autoload": { - "psr-4": { - "Psr\\Log\\": "Psr/Log/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "PHP-FIG", - "homepage": "https://www.php-fig.org/" - } - ], - "description": "Common interface for logging libraries", - "homepage": "https://github.com/php-fig/log", - "keywords": [ - "log", - "psr", - "psr-3" - ], - "time": "2021-05-03T11:20:27+00:00" - }, - { - "name": "psr/simple-cache", - "version": "1.0.1", - "source": { - "type": "git", - "url": "https://github.com/php-fig/simple-cache.git", - "reference": "408d5eafb83c57f6365a3ca330ff23aa4a5fa39b" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/php-fig/simple-cache/zipball/408d5eafb83c57f6365a3ca330ff23aa4a5fa39b", - "reference": "408d5eafb83c57f6365a3ca330ff23aa4a5fa39b", - "shasum": "" - }, - "require": { - "php": ">=5.3.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0.x-dev" - } - }, - "autoload": { - "psr-4": { - "Psr\\SimpleCache\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" - } - ], - "description": "Common interfaces for simple caching", - "keywords": [ - "cache", - "caching", - "psr", - "psr-16", - "simple-cache" - ], - "time": "2017-10-23T01:57:42+00:00" - }, - { - "name": "ralouphie/getallheaders", - "version": "3.0.3", - "source": { - "type": "git", - "url": "https://github.com/ralouphie/getallheaders.git", - "reference": "120b605dfeb996808c31b6477290a714d356e822" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/ralouphie/getallheaders/zipball/120b605dfeb996808c31b6477290a714d356e822", - "reference": "120b605dfeb996808c31b6477290a714d356e822", - "shasum": "" - }, - "require": { - "php": ">=5.6" - }, - "require-dev": { - "php-coveralls/php-coveralls": "^2.1", - "phpunit/phpunit": "^5 || ^6.5" - }, - "type": "library", - "autoload": { - "files": [ - "src/getallheaders.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Ralph Khattar", - "email": "ralph.khattar@gmail.com" - } - ], - "description": "A polyfill for getallheaders.", - "time": "2019-03-08T08:55:37+00:00" - }, - { - "name": "sarahman/simple-filesystem-cache", - "version": "1.0.2", - "source": { - "type": "git", - "url": "https://github.com/sarahman/simple-filesystem-cache.git", - "reference": "adb8f79a3890e51692db02aadeaa42999f7ff5e3" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sarahman/simple-filesystem-cache/zipball/adb8f79a3890e51692db02aadeaa42999f7ff5e3", - "reference": "adb8f79a3890e51692db02aadeaa42999f7ff5e3", - "shasum": "" - }, - "require": { - "ext-json": "*", - "psr/simple-cache": "*" - }, - "provide": { - "psr/simple-cache-implementation": "1.0" - }, - "require-dev": { - "phpunit/phpunit": "^4.8" - }, - "type": "library", - "autoload": { - "psr-4": { - "Sarahman\\SimpleCache\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Syed Abidur Rahman", - "email": "aabid048@gmail.com" - } - ], - "description": "Simple file system cache library for PHP built on top of PSR-16.", - "time": "2020-08-09T05:14:17+00:00" - }, - { - "name": "seld/cli-prompt", - "version": "1.0.4", - "source": { - "type": "git", - "url": "https://github.com/Seldaek/cli-prompt.git", - "reference": "b8dfcf02094b8c03b40322c229493bb2884423c5" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/Seldaek/cli-prompt/zipball/b8dfcf02094b8c03b40322c229493bb2884423c5", - "reference": "b8dfcf02094b8c03b40322c229493bb2884423c5", - "shasum": "" - }, - "require": { - "php": ">=5.3" - }, - "require-dev": { - "phpstan/phpstan": "^0.12.63" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.x-dev" - } - }, - "autoload": { - "psr-4": { - "Seld\\CliPrompt\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Jordi Boggiano", - "email": "j.boggiano@seld.be" - } - ], - "description": "Allows you to prompt for user input on the command line, and optionally hide the characters they type", - "keywords": [ - "cli", - "console", - "hidden", - "input", - "prompt" - ], - "time": "2020-12-15T21:32:01+00:00" - }, - { - "name": "slim/php-view", - "version": "2.2.1", - "source": { - "type": "git", - "url": "https://github.com/slimphp/PHP-View.git", - "reference": "a13ada9d7962ca1b48799c0d9ffbca4c33245aed" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/slimphp/PHP-View/zipball/a13ada9d7962ca1b48799c0d9ffbca4c33245aed", - "reference": "a13ada9d7962ca1b48799c0d9ffbca4c33245aed", - "shasum": "" - }, - "require": { - "psr/http-message": "^1.0" - }, - "require-dev": { - "phpunit/phpunit": "^4.8", - "slim/slim": "^3.0" - }, - "type": "library", - "autoload": { - "psr-4": { - "Slim\\Views\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Glenn Eggleton", - "email": "geggleto@gmail.com" - } - ], - "description": "Render PHP view scripts into a PSR-7 Response object.", - "keywords": [ - "framework", - "php", - "phtml", - "renderer", - "slim", - "template", - "view" - ], - "time": "2019-04-15T20:43:28+00:00" - }, - { - "name": "slim/slim", - "version": "3.12.5", - "source": { - "type": "git", - "url": "https://github.com/slimphp/Slim.git", - "reference": "565632b2d9b64ecedf89546edbbf4f3648089f0c" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/slimphp/Slim/zipball/565632b2d9b64ecedf89546edbbf4f3648089f0c", - "reference": "565632b2d9b64ecedf89546edbbf4f3648089f0c", - "shasum": "" - }, - "require": { - "ext-json": "*", - "ext-libxml": "*", - "ext-simplexml": "*", - "nikic/fast-route": "^1.0", - "php": ">=5.5.0", - "pimple/pimple": "^3.0", - "psr/container": "^1.0", - "psr/http-message": "^1.0" - }, - "provide": { - "psr/http-message-implementation": "1.0" - }, - "require-dev": { - "phpunit/phpunit": "^4.0", - "squizlabs/php_codesniffer": "^3.6.0" - }, - "type": "library", - "autoload": { - "psr-4": { - "Slim\\": "Slim" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Josh Lockhart", - "email": "hello@joshlockhart.com", - "homepage": "https://joshlockhart.com" - }, - { - "name": "Andrew Smith", - "email": "a.smith@silentworks.co.uk", - "homepage": "http://silentworks.co.uk" - }, - { - "name": "Rob Allen", - "email": "rob@akrabat.com", - "homepage": "http://akrabat.com" - }, - { - "name": "Gabriel Manricks", - "email": "gmanricks@me.com", - "homepage": "http://gabrielmanricks.com" - } - ], - "description": "Slim is a PHP micro framework that helps you quickly write simple yet powerful web applications and APIs", - "homepage": "https://slimframework.com", - "keywords": [ - "api", - "framework", - "micro", - "router" - ], - "funding": [ - { - "url": "https://opencollective.com/slimphp", - "type": "open_collective" - }, - { - "url": "https://tidelift.com/funding/github/packagist/slim/slim", - "type": "tidelift" - } - ], - "time": "2023-07-23T04:32:51+00:00" - }, - { - "name": "symfony/polyfill-intl-idn", - "version": "v1.27.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-intl-idn.git", - "reference": "639084e360537a19f9ee352433b84ce831f3d2da" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/639084e360537a19f9ee352433b84ce831f3d2da", - "reference": "639084e360537a19f9ee352433b84ce831f3d2da", - "shasum": "" - }, - "require": { - "php": ">=7.1", - "symfony/polyfill-intl-normalizer": "^1.10", - "symfony/polyfill-php72": "^1.10" - }, - "suggest": { - "ext-intl": "For best performance" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-main": "1.27-dev" - }, - "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" - } - }, - "autoload": { - "files": [ - "bootstrap.php" - ], - "psr-4": { - "Symfony\\Polyfill\\Intl\\Idn\\": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Laurent Bassin", - "email": "laurent@bassin.info" - }, - { - "name": "Trevor Rowbotham", - "email": "trevor.rowbotham@pm.me" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony polyfill for intl's idn_to_ascii and idn_to_utf8 functions", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "idn", - "intl", - "polyfill", - "portable", - "shim" - ], - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2022-11-03T14:55:06+00:00" - }, - { - "name": "symfony/polyfill-intl-normalizer", - "version": "v1.27.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-intl-normalizer.git", - "reference": "19bd1e4fcd5b91116f14d8533c57831ed00571b6" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/19bd1e4fcd5b91116f14d8533c57831ed00571b6", - "reference": "19bd1e4fcd5b91116f14d8533c57831ed00571b6", - "shasum": "" - }, - "require": { - "php": ">=7.1" - }, - "suggest": { - "ext-intl": "For best performance" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-main": "1.27-dev" - }, - "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" - } - }, - "autoload": { - "files": [ - "bootstrap.php" - ], - "psr-4": { - "Symfony\\Polyfill\\Intl\\Normalizer\\": "" - }, - "classmap": [ - "Resources/stubs" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony polyfill for intl's Normalizer class and related functions", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "intl", - "normalizer", - "polyfill", - "portable", - "shim" - ], - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2022-11-03T14:55:06+00:00" - }, - { - "name": "symfony/polyfill-php72", - "version": "v1.27.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-php72.git", - "reference": "869329b1e9894268a8a61dabb69153029b7a8c97" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/869329b1e9894268a8a61dabb69153029b7a8c97", - "reference": "869329b1e9894268a8a61dabb69153029b7a8c97", - "shasum": "" - }, - "require": { - "php": ">=7.1" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-main": "1.27-dev" - }, - "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" - } - }, - "autoload": { - "files": [ - "bootstrap.php" - ], - "psr-4": { - "Symfony\\Polyfill\\Php72\\": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony polyfill backporting some PHP 7.2+ features to lower PHP versions", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "polyfill", - "portable", - "shim" - ], - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2022-11-03T14:55:06+00:00" - }, - { - "name": "willdurand/negotiation", - "version": "3.1.0", - "source": { - "type": "git", - "url": "https://github.com/willdurand/Negotiation.git", - "reference": "68e9ea0553ef6e2ee8db5c1d98829f111e623ec2" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/willdurand/Negotiation/zipball/68e9ea0553ef6e2ee8db5c1d98829f111e623ec2", - "reference": "68e9ea0553ef6e2ee8db5c1d98829f111e623ec2", - "shasum": "" - }, - "require": { - "php": ">=7.1.0" - }, - "require-dev": { - "symfony/phpunit-bridge": "^5.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.0-dev" - } - }, - "autoload": { - "psr-4": { - "Negotiation\\": "src/Negotiation" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "William Durand", - "email": "will+git@drnd.me" - } - ], - "description": "Content Negotiation tools for PHP provided as a standalone library.", - "homepage": "http://williamdurand.fr/Negotiation/", - "keywords": [ - "accept", - "content", - "format", - "header", - "negotiation" - ], - "time": "2022-01-30T20:08:53+00:00" - } - ], - "packages-dev": [ - { - "name": "bower-asset/bootstrap", - "version": "v4.6.2", - "source": { - "type": "git", - "url": "https://github.com/twbs/bootstrap.git", - "reference": "e5643aaa89eb67327a5b4abe7db976f0ea276b70" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/twbs/bootstrap/zipball/e5643aaa89eb67327a5b4abe7db976f0ea276b70", - "reference": "e5643aaa89eb67327a5b4abe7db976f0ea276b70", - "shasum": "" - }, - "type": "bower-asset-library" - }, - { - "name": "composer/xdebug-handler", - "version": "1.4.6", - "source": { - "type": "git", - "url": "https://github.com/composer/xdebug-handler.git", - "reference": "f27e06cd9675801df441b3656569b328e04aa37c" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/f27e06cd9675801df441b3656569b328e04aa37c", - "reference": "f27e06cd9675801df441b3656569b328e04aa37c", - "shasum": "" - }, - "require": { - "php": "^5.3.2 || ^7.0 || ^8.0", - "psr/log": "^1.0" - }, - "require-dev": { - "phpstan/phpstan": "^0.12.55", - "symfony/phpunit-bridge": "^4.2 || ^5" - }, - "type": "library", - "autoload": { - "psr-4": { - "Composer\\XdebugHandler\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "John Stevenson", - "email": "john-stevenson@blueyonder.co.uk" - } - ], - "description": "Restarts a process without Xdebug.", - "keywords": [ - "Xdebug", - "performance" - ], - "funding": [ - { - "url": "https://packagist.com", - "type": "custom" - }, - { - "url": "https://github.com/composer", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/composer/composer", - "type": "tidelift" - } - ], - "time": "2021-03-25T17:01:18+00:00" - }, - { - "name": "doctrine/instantiator", - "version": "1.5.0", - "source": { - "type": "git", - "url": "https://github.com/doctrine/instantiator.git", - "reference": "0a0fa9780f5d4e507415a065172d26a98d02047b" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/doctrine/instantiator/zipball/0a0fa9780f5d4e507415a065172d26a98d02047b", - "reference": "0a0fa9780f5d4e507415a065172d26a98d02047b", - "shasum": "" - }, - "require": { - "php": "^7.1 || ^8.0" - }, - "require-dev": { - "doctrine/coding-standard": "^9 || ^11", - "ext-pdo": "*", - "ext-phar": "*", - "phpbench/phpbench": "^0.16 || ^1", - "phpstan/phpstan": "^1.4", - "phpstan/phpstan-phpunit": "^1", - "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", - "vimeo/psalm": "^4.30 || ^5.4" - }, - "type": "library", - "autoload": { - "psr-4": { - "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Marco Pivetta", - "email": "ocramius@gmail.com", - "homepage": "https://ocramius.github.io/" - } - ], - "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors", - "homepage": "https://www.doctrine-project.org/projects/instantiator.html", - "keywords": [ - "constructor", - "instantiate" - ], - "funding": [ - { - "url": "https://www.doctrine-project.org/sponsorship.html", - "type": "custom" - }, - { - "url": "https://www.patreon.com/phpdoctrine", - "type": "patreon" - }, - { - "url": "https://tidelift.com/funding/github/packagist/doctrine%2Finstantiator", - "type": "tidelift" - } - ], - "time": "2022-12-30T00:15:36+00:00" - }, - { - "name": "felixfbecker/advanced-json-rpc", - "version": "v3.2.1", - "source": { - "type": "git", - "url": "https://github.com/felixfbecker/php-advanced-json-rpc.git", - "reference": "b5f37dbff9a8ad360ca341f3240dc1c168b45447" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/felixfbecker/php-advanced-json-rpc/zipball/b5f37dbff9a8ad360ca341f3240dc1c168b45447", - "reference": "b5f37dbff9a8ad360ca341f3240dc1c168b45447", - "shasum": "" - }, - "require": { - "netresearch/jsonmapper": "^1.0 || ^2.0 || ^3.0 || ^4.0", - "php": "^7.1 || ^8.0", - "phpdocumentor/reflection-docblock": "^4.3.4 || ^5.0.0" - }, - "require-dev": { - "phpunit/phpunit": "^7.0 || ^8.0" - }, - "type": "library", - "autoload": { - "psr-4": { - "AdvancedJsonRpc\\": "lib/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "ISC" - ], - "authors": [ - { - "name": "Felix Becker", - "email": "felix.b@outlook.com" - } - ], - "description": "A more advanced JSONRPC implementation", - "time": "2021-06-11T22:34:44+00:00" - }, - { - "name": "felixfbecker/language-server-protocol", - "version": "v1.5.2", - "source": { - "type": "git", - "url": "https://github.com/felixfbecker/php-language-server-protocol.git", - "reference": "6e82196ffd7c62f7794d778ca52b69feec9f2842" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/felixfbecker/php-language-server-protocol/zipball/6e82196ffd7c62f7794d778ca52b69feec9f2842", - "reference": "6e82196ffd7c62f7794d778ca52b69feec9f2842", - "shasum": "" - }, - "require": { - "php": ">=7.1" - }, - "require-dev": { - "phpstan/phpstan": "*", - "squizlabs/php_codesniffer": "^3.1", - "vimeo/psalm": "^4.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.x-dev" - } - }, - "autoload": { - "psr-4": { - "LanguageServerProtocol\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "ISC" - ], - "authors": [ - { - "name": "Felix Becker", - "email": "felix.b@outlook.com" - } - ], - "description": "PHP classes for the Language Server Protocol", - "keywords": [ - "language", - "microsoft", - "php", - "server" - ], - "time": "2022-03-02T22:36:06+00:00" - }, - { - "name": "muglug/package-versions-56", - "version": "1.2.4", - "source": { - "type": "git", - "url": "https://github.com/muglug/PackageVersions.git", - "reference": "a67bed26deaaf9269a348e53063bc8d4dcc60ffd" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/muglug/PackageVersions/zipball/a67bed26deaaf9269a348e53063bc8d4dcc60ffd", - "reference": "a67bed26deaaf9269a348e53063bc8d4dcc60ffd", - "shasum": "" - }, - "require": { - "composer-plugin-api": "^1.0", - "php": "^5.6 || ^7.0" - }, - "require-dev": { - "composer/composer": "^1.3", - "ext-zip": "*", - "phpunit/phpunit": "^5.7.5" - }, - "type": "composer-plugin", - "extra": { - "class": "Muglug\\PackageVersions\\Installer", - "branch-alias": { - "dev-master": "2.0.x-dev" - } - }, - "autoload": { - "psr-4": { - "Muglug\\PackageVersions\\": "src/PackageVersions" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Marco Pivetta", - "email": "ocramius@gmail.com" - }, - { - "name": "Abdul Malik Ikhsan", - "email": "samsonasik@gmail.com" - }, - { - "name": "Matt Brown", - "email": "github@muglug.com" - } - ], - "description": "A backport of ocramius/package-versions that supports php ^5.6. Composer plugin that provides efficient querying for installed package versions (no runtime IO)", - "time": "2018-03-26T03:22:13+00:00" - }, - { - "name": "myclabs/deep-copy", - "version": "1.11.1", - "source": { - "type": "git", - "url": "https://github.com/myclabs/DeepCopy.git", - "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/7284c22080590fb39f2ffa3e9057f10a4ddd0e0c", - "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c", - "shasum": "" - }, - "require": { - "php": "^7.1 || ^8.0" - }, - "conflict": { - "doctrine/collections": "<1.6.8", - "doctrine/common": "<2.13.3 || >=3,<3.2.2" - }, - "require-dev": { - "doctrine/collections": "^1.6.8", - "doctrine/common": "^2.13.3 || ^3.2.2", - "phpunit/phpunit": "^7.5.20 || ^8.5.23 || ^9.5.13" - }, - "type": "library", - "autoload": { - "files": [ - "src/DeepCopy/deep_copy.php" - ], - "psr-4": { - "DeepCopy\\": "src/DeepCopy/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "description": "Create deep copies (clones) of your objects", - "keywords": [ - "clone", - "copy", - "duplicate", - "object", - "object graph" - ], - "funding": [ - { - "url": "https://tidelift.com/funding/github/packagist/myclabs/deep-copy", - "type": "tidelift" - } - ], - "time": "2023-03-08T13:26:56+00:00" - }, - { - "name": "netresearch/jsonmapper", - "version": "v1.6.0", - "source": { - "type": "git", - "url": "https://github.com/cweiske/jsonmapper.git", - "reference": "0d4d1b48d682a93b6bfedf60b88c7750e9cb0b06" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/cweiske/jsonmapper/zipball/0d4d1b48d682a93b6bfedf60b88c7750e9cb0b06", - "reference": "0d4d1b48d682a93b6bfedf60b88c7750e9cb0b06", - "shasum": "" - }, - "require": { - "ext-json": "*", - "ext-pcre": "*", - "ext-reflection": "*", - "ext-spl": "*", - "php": ">=5.6" - }, - "require-dev": { - "phpunit/phpunit": "~4.8.35 || ~5.7 || ~6.4", - "squizlabs/php_codesniffer": "~1.5" - }, - "type": "library", - "autoload": { - "psr-0": { - "JsonMapper": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "OSL-3.0" - ], - "authors": [ - { - "name": "Christian Weiske", - "email": "cweiske@cweiske.de", - "homepage": "http://github.com/cweiske/jsonmapper/", - "role": "Developer" - } - ], - "description": "Map nested JSON structures onto PHP classes", - "time": "2019-08-15T19:41:25+00:00" - }, - { - "name": "nikic/php-parser", - "version": "v4.16.0", - "source": { - "type": "git", - "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "19526a33fb561ef417e822e85f08a00db4059c17" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/19526a33fb561ef417e822e85f08a00db4059c17", - "reference": "19526a33fb561ef417e822e85f08a00db4059c17", - "shasum": "" - }, - "require": { - "ext-tokenizer": "*", - "php": ">=7.0" - }, - "require-dev": { - "ircmaxell/php-yacc": "^0.0.7", - "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0 || ^9.0" - }, - "bin": [ - "bin/php-parse" - ], - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "4.9-dev" - } - }, - "autoload": { - "psr-4": { - "PhpParser\\": "lib/PhpParser" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Nikita Popov" - } - ], - "description": "A PHP parser written in PHP", - "keywords": [ - "parser", - "php" - ], - "time": "2023-06-25T14:52:30+00:00" - }, - { - "name": "openlss/lib-array2xml", - "version": "0.5.1", - "source": { - "type": "git", - "url": "https://github.com/nullivex/lib-array2xml.git", - "reference": "c8b5998a342d7861f2e921403f44e0a2f3ef2be0" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/nullivex/lib-array2xml/zipball/c8b5998a342d7861f2e921403f44e0a2f3ef2be0", - "reference": "c8b5998a342d7861f2e921403f44e0a2f3ef2be0", - "shasum": "" - }, - "require": { - "php": ">=5.3.2" - }, - "type": "library", - "autoload": { - "psr-0": { - "LSS": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "Apache-2.0" - ], - "authors": [ - { - "name": "Bryan Tong", - "email": "contact@nullivex.com", - "homepage": "http://bryantong.com" - }, - { - "name": "Tony Butler", - "email": "spudz76@gmail.com", - "homepage": "http://openlss.org" - } - ], - "description": "Array2XML conversion library credit to lalit.org", - "homepage": "http://openlss.org", - "keywords": [ - "array", - "array conversion", - "xml", - "xml conversion" - ], - "time": "2016-11-10T19:10:18+00:00" - }, - { - "name": "php-cs-fixer/diff", - "version": "v1.3.1", - "source": { - "type": "git", - "url": "https://github.com/PHP-CS-Fixer/diff.git", - "reference": "dbd31aeb251639ac0b9e7e29405c1441907f5759" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/PHP-CS-Fixer/diff/zipball/dbd31aeb251639ac0b9e7e29405c1441907f5759", - "reference": "dbd31aeb251639ac0b9e7e29405c1441907f5759", - "shasum": "" - }, - "require": { - "php": "^5.6 || ^7.0 || ^8.0" - }, - "require-dev": { - "phpunit/phpunit": "^5.7.23 || ^6.4.3 || ^7.0", - "symfony/process": "^3.3" - }, - "type": "library", - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" - }, - { - "name": "Kore Nordmann", - "email": "mail@kore-nordmann.de" - }, - { - "name": "SpacePossum" - } - ], - "description": "sebastian/diff v2 backport support for PHP5.6", - "homepage": "https://github.com/PHP-CS-Fixer", - "keywords": [ - "diff" - ], - "abandoned": true, - "time": "2020-10-14T08:39:05+00:00" + "time": "2019-12-10T10:24:42+00:00" }, { "name": "phpdocumentor/reflection-common", - "version": "2.2.0", + "version": "2.1.0", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionCommon.git", - "reference": "1d01c49d4ed62f25aa84a747ad35d5a16924662b" + "reference": "6568f4687e5b41b054365f9ae03fcb1ed5f2069b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/1d01c49d4ed62f25aa84a747ad35d5a16924662b", - "reference": "1d01c49d4ed62f25aa84a747ad35d5a16924662b", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/6568f4687e5b41b054365f9ae03fcb1ed5f2069b", + "reference": "6568f4687e5b41b054365f9ae03fcb1ed5f2069b", "shasum": "" }, "require": { - "php": "^7.2 || ^8.0" + "php": ">=7.1" }, "type": "library", "extra": { "branch-alias": { - "dev-2.x": "2.x-dev" + "dev-master": "2.x-dev" } }, "autoload": { @@ -2977,42 +1366,45 @@ "reflection", "static analysis" ], - "time": "2020-06-27T09:03:43+00:00" + "time": "2020-04-27T09:25:28+00:00" }, { "name": "phpdocumentor/reflection-docblock", - "version": "5.1.0", + "version": "4.3.4", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "cd72d394ca794d3466a3b2fc09d5a6c1dc86b47e" + "reference": "da3fd972d6bafd628114f7e7e036f45944b62e9c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/cd72d394ca794d3466a3b2fc09d5a6c1dc86b47e", - "reference": "cd72d394ca794d3466a3b2fc09d5a6c1dc86b47e", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/da3fd972d6bafd628114f7e7e036f45944b62e9c", + "reference": "da3fd972d6bafd628114f7e7e036f45944b62e9c", "shasum": "" }, "require": { - "ext-filter": "^7.1", - "php": "^7.2", - "phpdocumentor/reflection-common": "^2.0", - "phpdocumentor/type-resolver": "^1.0", - "webmozart/assert": "^1" + "php": "^7.0", + "phpdocumentor/reflection-common": "^1.0.0 || ^2.0.0", + "phpdocumentor/type-resolver": "~0.4 || ^1.0.0", + "webmozart/assert": "^1.0" }, "require-dev": { - "doctrine/instantiator": "^1", - "mockery/mockery": "^1" + "doctrine/instantiator": "^1.0.5", + "mockery/mockery": "^1.0", + "phpdocumentor/type-resolver": "0.4.*", + "phpunit/phpunit": "^6.4" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "5.x-dev" + "dev-master": "4.x-dev" } }, "autoload": { "psr-4": { - "phpDocumentor\\Reflection\\": "src" + "phpDocumentor\\Reflection\\": [ + "src/" + ] } }, "notification-url": "https://packagist.org/downloads/", @@ -3023,41 +1415,38 @@ { "name": "Mike van Riel", "email": "me@mikevanriel.com" - }, - { - "name": "Jaap van Otterdijk", - "email": "account@ijaap.nl" } ], "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", - "time": "2020-02-22T12:28:44+00:00" + "time": "2019-12-28T18:55:12+00:00" }, { "name": "phpdocumentor/type-resolver", - "version": "1.6.1", + "version": "1.0.1", "source": { "type": "git", "url": "https://github.com/phpDocumentor/TypeResolver.git", - "reference": "77a32518733312af16a44300404e945338981de3" + "reference": "2e32a6d48972b2c1976ed5d8967145b6cec4a4a9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/77a32518733312af16a44300404e945338981de3", - "reference": "77a32518733312af16a44300404e945338981de3", + "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/2e32a6d48972b2c1976ed5d8967145b6cec4a4a9", + "reference": "2e32a6d48972b2c1976ed5d8967145b6cec4a4a9", "shasum": "" }, "require": { - "php": "^7.2 || ^8.0", + "php": "^7.1", "phpdocumentor/reflection-common": "^2.0" }, "require-dev": { - "ext-tokenizer": "*", - "psalm/phar": "^4.8" + "ext-tokenizer": "^7.1", + "mockery/mockery": "~1", + "phpunit/phpunit": "^7.0" }, "type": "library", "extra": { "branch-alias": { - "dev-1.x": "1.x-dev" + "dev-master": "1.x-dev" } }, "autoload": { @@ -3076,7 +1465,7 @@ } ], "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names", - "time": "2022-03-15T21:29:03+00:00" + "time": "2019-08-22T18:11:29+00:00" }, { "name": "phpspec/prophecy", @@ -3143,40 +1532,39 @@ }, { "name": "phpunit/php-code-coverage", - "version": "4.0.8", + "version": "2.2.4", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "ef7b2f56815df854e66ceaee8ebe9393ae36a40d" + "reference": "eabf68b476ac7d0f73793aada060f1c1a9bf8979" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/ef7b2f56815df854e66ceaee8ebe9393ae36a40d", - "reference": "ef7b2f56815df854e66ceaee8ebe9393ae36a40d", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/eabf68b476ac7d0f73793aada060f1c1a9bf8979", + "reference": "eabf68b476ac7d0f73793aada060f1c1a9bf8979", "shasum": "" }, "require": { - "ext-dom": "*", - "ext-xmlwriter": "*", - "php": "^5.6 || ^7.0", - "phpunit/php-file-iterator": "^1.3", - "phpunit/php-text-template": "^1.2", - "phpunit/php-token-stream": "^1.4.2 || ^2.0", - "sebastian/code-unit-reverse-lookup": "^1.0", - "sebastian/environment": "^1.3.2 || ^2.0", - "sebastian/version": "^1.0 || ^2.0" + "php": ">=5.3.3", + "phpunit/php-file-iterator": "~1.3", + "phpunit/php-text-template": "~1.2", + "phpunit/php-token-stream": "~1.3", + "sebastian/environment": "^1.3.2", + "sebastian/version": "~1.0" }, "require-dev": { - "ext-xdebug": "^2.1.4", - "phpunit/phpunit": "^5.7" + "ext-xdebug": ">=2.1.4", + "phpunit/phpunit": "~4" }, "suggest": { - "ext-xdebug": "^2.5.1" + "ext-dom": "*", + "ext-xdebug": ">=2.2.1", + "ext-xmlwriter": "*" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "4.0.x-dev" + "dev-master": "2.2.x-dev" } }, "autoload": { @@ -3202,7 +1590,7 @@ "testing", "xunit" ], - "time": "2017-04-02T07:44:40+00:00" + "time": "2015-10-06T15:47:00+00:00" }, { "name": "phpunit/php-file-iterator", @@ -3343,29 +1731,29 @@ }, { "name": "phpunit/php-token-stream", - "version": "2.0.2", + "version": "1.4.12", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-token-stream.git", - "reference": "791198a2c6254db10131eecfe8c06670700904db" + "reference": "1ce90ba27c42e4e44e6d8458241466380b51fa16" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/791198a2c6254db10131eecfe8c06670700904db", - "reference": "791198a2c6254db10131eecfe8c06670700904db", + "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/1ce90ba27c42e4e44e6d8458241466380b51fa16", + "reference": "1ce90ba27c42e4e44e6d8458241466380b51fa16", "shasum": "" }, "require": { "ext-tokenizer": "*", - "php": "^7.0" + "php": ">=5.3.3" }, "require-dev": { - "phpunit/phpunit": "^6.2.4" + "phpunit/phpunit": "~4.2" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0-dev" + "dev-master": "1.4-dev" } }, "autoload": { @@ -3389,54 +1777,44 @@ "tokenizer" ], "abandoned": true, - "time": "2017-11-27T05:48:46+00:00" + "time": "2017-12-04T08:55:13+00:00" }, { "name": "phpunit/phpunit", - "version": "5.7.27", + "version": "4.8.36", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "b7803aeca3ccb99ad0a506fa80b64cd6a56bbc0c" + "reference": "46023de9a91eec7dfb06cc56cb4e260017298517" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/b7803aeca3ccb99ad0a506fa80b64cd6a56bbc0c", - "reference": "b7803aeca3ccb99ad0a506fa80b64cd6a56bbc0c", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/46023de9a91eec7dfb06cc56cb4e260017298517", + "reference": "46023de9a91eec7dfb06cc56cb4e260017298517", "shasum": "" }, "require": { "ext-dom": "*", "ext-json": "*", - "ext-libxml": "*", - "ext-mbstring": "*", - "ext-xml": "*", - "myclabs/deep-copy": "~1.3", - "php": "^5.6 || ^7.0", - "phpspec/prophecy": "^1.6.2", - "phpunit/php-code-coverage": "^4.0.4", + "ext-pcre": "*", + "ext-reflection": "*", + "ext-spl": "*", + "php": ">=5.3.3", + "phpspec/prophecy": "^1.3.1", + "phpunit/php-code-coverage": "~2.1", "phpunit/php-file-iterator": "~1.4", "phpunit/php-text-template": "~1.2", "phpunit/php-timer": "^1.0.6", - "phpunit/phpunit-mock-objects": "^3.2", - "sebastian/comparator": "^1.2.4", - "sebastian/diff": "^1.4.3", - "sebastian/environment": "^1.3.4 || ^2.0", - "sebastian/exporter": "~2.0", - "sebastian/global-state": "^1.1", - "sebastian/object-enumerator": "~2.0", - "sebastian/resource-operations": "~1.0", - "sebastian/version": "^1.0.6|^2.0.1", - "symfony/yaml": "~2.1|~3.0|~4.0" - }, - "conflict": { - "phpdocumentor/reflection-docblock": "3.0.2" - }, - "require-dev": { - "ext-pdo": "*" + "phpunit/phpunit-mock-objects": "~2.3", + "sebastian/comparator": "~1.2.2", + "sebastian/diff": "~1.2", + "sebastian/environment": "~1.3", + "sebastian/exporter": "~1.2", + "sebastian/global-state": "~1.0", + "sebastian/version": "~1.0", + "symfony/yaml": "~2.1|~3.0" }, "suggest": { - "ext-xdebug": "*", "phpunit/php-invoker": "~1.1" }, "bin": [ @@ -3445,7 +1823,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "5.7.x-dev" + "dev-master": "4.8.x-dev" } }, "autoload": { @@ -3471,33 +1849,30 @@ "testing", "xunit" ], - "time": "2018-02-01T05:50:59+00:00" + "time": "2017-06-21T08:07:12+00:00" }, { "name": "phpunit/phpunit-mock-objects", - "version": "3.4.4", + "version": "2.3.8", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git", - "reference": "a23b761686d50a560cc56233b9ecf49597cc9118" + "reference": "ac8e7a3db35738d56ee9a76e78a4e03d97628983" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/a23b761686d50a560cc56233b9ecf49597cc9118", - "reference": "a23b761686d50a560cc56233b9ecf49597cc9118", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/ac8e7a3db35738d56ee9a76e78a4e03d97628983", + "reference": "ac8e7a3db35738d56ee9a76e78a4e03d97628983", "shasum": "" }, "require": { "doctrine/instantiator": "^1.0.2", - "php": "^5.6 || ^7.0", - "phpunit/php-text-template": "^1.2", - "sebastian/exporter": "^1.2 || ^2.0" - }, - "conflict": { - "phpunit/phpunit": "<5.4.0" + "php": ">=5.3.3", + "phpunit/php-text-template": "~1.2", + "sebastian/exporter": "~1.2" }, "require-dev": { - "phpunit/phpunit": "^5.4" + "phpunit/phpunit": "~4.4" }, "suggest": { "ext-soap": "*" @@ -3505,7 +1880,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.2.x-dev" + "dev-master": "2.3.x-dev" } }, "autoload": { @@ -3531,168 +1906,38 @@ "xunit" ], "abandoned": true, - "time": "2017-06-30T09:13:00+00:00" + "time": "2015-10-02T06:51:40+00:00" }, { - "name": "sabre/event", - "version": "5.1.4", + "name": "pimple/pimple", + "version": "v3.2.3", "source": { "type": "git", - "url": "https://github.com/sabre-io/event.git", - "reference": "d7da22897125d34d7eddf7977758191c06a74497" + "url": "https://github.com/silexphp/Pimple.git", + "reference": "9e403941ef9d65d20cba7d54e29fe906db42cf32" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sabre-io/event/zipball/d7da22897125d34d7eddf7977758191c06a74497", - "reference": "d7da22897125d34d7eddf7977758191c06a74497", + "url": "https://api.github.com/repos/silexphp/Pimple/zipball/9e403941ef9d65d20cba7d54e29fe906db42cf32", + "reference": "9e403941ef9d65d20cba7d54e29fe906db42cf32", "shasum": "" }, "require": { - "php": "^7.1 || ^8.0" + "php": ">=5.3.0", + "psr/container": "^1.0" }, "require-dev": { - "friendsofphp/php-cs-fixer": "~2.17.1", - "phpstan/phpstan": "^0.12", - "phpunit/phpunit": "^7.5 || ^8.5 || ^9.0" + "symfony/phpunit-bridge": "^3.2" }, "type": "library", - "autoload": { - "files": [ - "lib/coroutine.php", - "lib/Loop/functions.php", - "lib/Promise/functions.php" - ], - "psr-4": { - "Sabre\\Event\\": "lib/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Evert Pot", - "email": "me@evertpot.com", - "homepage": "http://evertpot.com/", - "role": "Developer" - } - ], - "description": "sabre/event is a library for lightweight event-based programming", - "homepage": "http://sabre.io/event/", - "keywords": [ - "EventEmitter", - "async", - "coroutine", - "eventloop", - "events", - "hooks", - "plugin", - "promise", - "reactor", - "signal" - ], - "time": "2021-11-04T06:51:17+00:00" - }, - { - "name": "sabre/uri", - "version": "2.2.4", - "source": { - "type": "git", - "url": "https://github.com/sabre-io/uri.git", - "reference": "c0c9af9f7754e60a49ebd760e1708adc6d1510c0" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sabre-io/uri/zipball/c0c9af9f7754e60a49ebd760e1708adc6d1510c0", - "reference": "c0c9af9f7754e60a49ebd760e1708adc6d1510c0", - "shasum": "" - }, - "require": { - "php": "^7.1 || ^8.0" - }, - "require-dev": { - "friendsofphp/php-cs-fixer": "~2.19.3", - "phpstan/phpstan": "^0.12", - "phpunit/phpunit": "^7.5 || ^8.5 || ^9.0" - }, - "type": "library", - "autoload": { - "files": [ - "lib/functions.php" - ], - "psr-4": { - "Sabre\\Uri\\": "lib/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Evert Pot", - "email": "me@evertpot.com", - "homepage": "http://evertpot.com/", - "role": "Developer" - } - ], - "description": "Functions for making sense out of URIs.", - "homepage": "http://sabre.io/uri/", - "keywords": [ - "rfc3986", - "uri", - "url" - ], - "time": "2022-09-19T12:25:28+00:00" - }, - { - "name": "scssphp/scssphp", - "version": "v1.11.0", - "source": { - "type": "git", - "url": "https://github.com/scssphp/scssphp.git", - "reference": "33749d12c2569bb24071f94e9af828662dabb068" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/scssphp/scssphp/zipball/33749d12c2569bb24071f94e9af828662dabb068", - "reference": "33749d12c2569bb24071f94e9af828662dabb068", - "shasum": "" - }, - "require": { - "ext-ctype": "*", - "ext-json": "*", - "php": ">=5.6.0" - }, - "require-dev": { - "bamarni/composer-bin-plugin": "^1.4", - "phpunit/phpunit": "^5.7 || ^6.5 || ^7.5 || ^8.3 || ^9.4", - "sass/sass-spec": "*", - "squizlabs/php_codesniffer": "~3.5", - "symfony/phpunit-bridge": "^5.1", - "thoughtbot/bourbon": "^7.0", - "twbs/bootstrap": "~5.0", - "twbs/bootstrap4": "4.6.1", - "zurb/foundation": "~6.5" - }, - "suggest": { - "ext-iconv": "Can be used as fallback when ext-mbstring is not available", - "ext-mbstring": "For best performance, mbstring should be installed as it is faster than ext-iconv" - }, - "bin": [ - "bin/pscss" - ], - "type": "library", "extra": { - "bamarni-bin": { - "forward-command": false, - "bin-links": false + "branch-alias": { + "dev-master": "3.2.x-dev" } }, "autoload": { - "psr-4": { - "ScssPhp\\ScssPhp\\": "src/" + "psr-0": { + "Pimple": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -3701,46 +1946,34 @@ ], "authors": [ { - "name": "Anthon Pang", - "email": "apang@softwaredevelopment.ca", - "homepage": "https://github.com/robocoder" - }, - { - "name": "Cédric Morin", - "email": "cedric@yterium.com", - "homepage": "https://github.com/Cerdic" + "name": "Fabien Potencier", + "email": "fabien@symfony.com" } ], - "description": "scssphp is a compiler for SCSS written in PHP.", - "homepage": "http://scssphp.github.io/scssphp/", + "description": "Pimple, a simple Dependency Injection Container", + "homepage": "http://pimple.sensiolabs.org", "keywords": [ - "css", - "less", - "sass", - "scss", - "stylesheet" + "container", + "dependency injection" ], - "time": "2022-09-02T21:24:55+00:00" + "time": "2018-01-21T07:42:36+00:00" }, { - "name": "sebastian/code-unit-reverse-lookup", - "version": "1.0.2", + "name": "psr/cache", + "version": "1.0.1", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git", - "reference": "1de8cd5c010cb153fcd68b8d0f64606f523f7619" + "url": "https://github.com/php-fig/cache.git", + "reference": "d11b50ad223250cf17b86e38383413f5a6764bf8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/1de8cd5c010cb153fcd68b8d0f64606f523f7619", - "reference": "1de8cd5c010cb153fcd68b8d0f64606f523f7619", + "url": "https://api.github.com/repos/php-fig/cache/zipball/d11b50ad223250cf17b86e38383413f5a6764bf8", + "reference": "d11b50ad223250cf17b86e38383413f5a6764bf8", "shasum": "" }, "require": { - "php": ">=5.6" - }, - "require-dev": { - "phpunit/phpunit": "^8.5" + "php": ">=5.3.0" }, "type": "library", "extra": { @@ -3749,29 +1982,262 @@ } }, "autoload": { - "classmap": [ - "src/" - ] + "psr-4": { + "Psr\\Cache\\": "src/" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ - "BSD-3-Clause" + "MIT" ], "authors": [ { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" + "name": "PHP-FIG", + "homepage": "http://www.php-fig.org/" } ], - "description": "Looks up which function or method a line of code belongs to", - "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/", - "funding": [ + "description": "Common interface for caching libraries", + "keywords": [ + "cache", + "psr", + "psr-6" + ], + "time": "2016-08-06T20:24:11+00:00" + }, + { + "name": "psr/container", + "version": "1.0.0", + "source": { + "type": "git", + "url": "https://github.com/php-fig/container.git", + "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/container/zipball/b7ce3b176482dbbc1245ebf52b181af44c2cf55f", + "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\Container\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ { - "url": "https://github.com/sebastianbergmann", - "type": "github" + "name": "PHP-FIG", + "homepage": "http://www.php-fig.org/" } ], - "time": "2020-11-30T08:15:22+00:00" + "description": "Common Container Interface (PHP FIG PSR-11)", + "homepage": "https://github.com/php-fig/container", + "keywords": [ + "PSR-11", + "container", + "container-interface", + "container-interop", + "psr" + ], + "time": "2017-02-14T16:28:37+00:00" + }, + { + "name": "psr/http-message", + "version": "1.0.1", + "source": { + "type": "git", + "url": "https://github.com/php-fig/http-message.git", + "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363", + "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\Http\\Message\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "http://www.php-fig.org/" + } + ], + "description": "Common interface for HTTP messages", + "homepage": "https://github.com/php-fig/http-message", + "keywords": [ + "http", + "http-message", + "psr", + "psr-7", + "request", + "response" + ], + "time": "2016-08-06T14:39:51+00:00" + }, + { + "name": "psr/log", + "version": "1.1.3", + "source": { + "type": "git", + "url": "https://github.com/php-fig/log.git", + "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/log/zipball/0f73288fd15629204f9d42b7055f72dacbe811fc", + "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.1.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\Log\\": "Psr/Log/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "http://www.php-fig.org/" + } + ], + "description": "Common interface for logging libraries", + "homepage": "https://github.com/php-fig/log", + "keywords": [ + "log", + "psr", + "psr-3" + ], + "time": "2020-03-23T09:12:05+00:00" + }, + { + "name": "psr/simple-cache", + "version": "1.0.1", + "source": { + "type": "git", + "url": "https://github.com/php-fig/simple-cache.git", + "reference": "408d5eafb83c57f6365a3ca330ff23aa4a5fa39b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/simple-cache/zipball/408d5eafb83c57f6365a3ca330ff23aa4a5fa39b", + "reference": "408d5eafb83c57f6365a3ca330ff23aa4a5fa39b", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\SimpleCache\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "http://www.php-fig.org/" + } + ], + "description": "Common interfaces for simple caching", + "keywords": [ + "cache", + "caching", + "psr", + "psr-16", + "simple-cache" + ], + "time": "2017-10-23T01:57:42+00:00" + }, + { + "name": "sarahman/simple-filesystem-cache", + "version": "1.0.1", + "source": { + "type": "git", + "url": "https://github.com/sarahman/simple-filesystem-cache.git", + "reference": "0cf570831c11887335d2b901067086cc0a2023e9" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sarahman/simple-filesystem-cache/zipball/0cf570831c11887335d2b901067086cc0a2023e9", + "reference": "0cf570831c11887335d2b901067086cc0a2023e9", + "shasum": "" + }, + "require": { + "ext-json": "*", + "phpunit/phpunit": "^4.8", + "psr/simple-cache": "*" + }, + "provide": { + "psr/simple-cache-implementation": "1.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Sarahman\\SimpleCache\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Syed Abidur Rahman", + "email": "aabid048@gmail.com" + } + ], + "description": "Simple file system cache library for PHP built on top of PSR-16.", + "time": "2019-04-04T12:48:29+00:00" }, { "name": "sebastian/comparator", @@ -3891,28 +2357,28 @@ }, { "name": "sebastian/environment", - "version": "2.0.0", + "version": "1.3.8", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/environment.git", - "reference": "5795ffe5dc5b02460c3e34222fee8cbe245d8fac" + "reference": "be2c607e43ce4c89ecd60e75c6a85c126e754aea" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/5795ffe5dc5b02460c3e34222fee8cbe245d8fac", - "reference": "5795ffe5dc5b02460c3e34222fee8cbe245d8fac", + "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/be2c607e43ce4c89ecd60e75c6a85c126e754aea", + "reference": "be2c607e43ce4c89ecd60e75c6a85c126e754aea", "shasum": "" }, "require": { - "php": "^5.6 || ^7.0" + "php": "^5.3.3 || ^7.0" }, "require-dev": { - "phpunit/phpunit": "^5.0" + "phpunit/phpunit": "^4.8 || ^5.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0.x-dev" + "dev-master": "1.3.x-dev" } }, "autoload": { @@ -3937,25 +2403,25 @@ "environment", "hhvm" ], - "time": "2016-11-26T07:53:53+00:00" + "time": "2016-08-18T05:49:44+00:00" }, { "name": "sebastian/exporter", - "version": "2.0.0", + "version": "1.2.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/exporter.git", - "reference": "ce474bdd1a34744d7ac5d6aad3a46d48d9bac4c4" + "reference": "42c4c2eec485ee3e159ec9884f95b431287edde4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/ce474bdd1a34744d7ac5d6aad3a46d48d9bac4c4", - "reference": "ce474bdd1a34744d7ac5d6aad3a46d48d9bac4c4", + "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/42c4c2eec485ee3e159ec9884f95b431287edde4", + "reference": "42c4c2eec485ee3e159ec9884f95b431287edde4", "shasum": "" }, "require": { "php": ">=5.3.3", - "sebastian/recursion-context": "~2.0" + "sebastian/recursion-context": "~1.0" }, "require-dev": { "ext-mbstring": "*", @@ -3964,7 +2430,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0.x-dev" + "dev-master": "1.3.x-dev" } }, "autoload": { @@ -4004,7 +2470,7 @@ "export", "exporter" ], - "time": "2016-11-19T08:54:04+00:00" + "time": "2016-06-17T09:04:28+00:00" }, { "name": "sebastian/global-state", @@ -4057,64 +2523,18 @@ ], "time": "2015-10-12T03:26:01+00:00" }, - { - "name": "sebastian/object-enumerator", - "version": "2.0.1", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/object-enumerator.git", - "reference": "1311872ac850040a79c3c058bea3e22d0f09cbb7" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/1311872ac850040a79c3c058bea3e22d0f09cbb7", - "reference": "1311872ac850040a79c3c058bea3e22d0f09cbb7", - "shasum": "" - }, - "require": { - "php": ">=5.6", - "sebastian/recursion-context": "~2.0" - }, - "require-dev": { - "phpunit/phpunit": "~5" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.0.x-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" - } - ], - "description": "Traverses array structures and object graphs to enumerate all referenced objects", - "homepage": "https://github.com/sebastianbergmann/object-enumerator/", - "time": "2017-02-18T15:18:39+00:00" - }, { "name": "sebastian/recursion-context", - "version": "2.0.0", + "version": "1.0.5", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/recursion-context.git", - "reference": "2c3ba150cbec723aa057506e73a8d33bdb286c9a" + "reference": "b19cc3298482a335a95f3016d2f8a6950f0fbcd7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/2c3ba150cbec723aa057506e73a8d33bdb286c9a", - "reference": "2c3ba150cbec723aa057506e73a8d33bdb286c9a", + "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/b19cc3298482a335a95f3016d2f8a6950f0fbcd7", + "reference": "b19cc3298482a335a95f3016d2f8a6950f0fbcd7", "shasum": "" }, "require": { @@ -4126,7 +2546,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0.x-dev" + "dev-master": "1.0.x-dev" } }, "autoload": { @@ -4154,73 +2574,23 @@ ], "description": "Provides functionality to recursively process PHP variables", "homepage": "http://www.github.com/sebastianbergmann/recursion-context", - "time": "2016-11-19T07:33:16+00:00" - }, - { - "name": "sebastian/resource-operations", - "version": "1.0.0", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/resource-operations.git", - "reference": "ce990bb21759f94aeafd30209e8cfcdfa8bc3f52" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/ce990bb21759f94aeafd30209e8cfcdfa8bc3f52", - "reference": "ce990bb21759f94aeafd30209e8cfcdfa8bc3f52", - "shasum": "" - }, - "require": { - "php": ">=5.6.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0.x-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" - } - ], - "description": "Provides a list of PHP built-in functions that operate on resources", - "homepage": "https://www.github.com/sebastianbergmann/resource-operations", - "time": "2015-07-28T20:34:47+00:00" + "time": "2016-10-03T07:41:43+00:00" }, { "name": "sebastian/version", - "version": "2.0.1", + "version": "1.0.6", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/version.git", - "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019" + "reference": "58b3a85e7999757d6ad81c787a1fbf5ff6c628c6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/99732be0ddb3361e16ad77b68ba41efc8e979019", - "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019", + "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/58b3a85e7999757d6ad81c787a1fbf5ff6c628c6", + "reference": "58b3a85e7999757d6ad81c787a1fbf5ff6c628c6", "shasum": "" }, - "require": { - "php": ">=5.6" - }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.0.x-dev" - } - }, "autoload": { "classmap": [ "src/" @@ -4239,27 +2609,194 @@ ], "description": "Library that helps with managing the version number of Git-hosted PHP projects", "homepage": "https://github.com/sebastianbergmann/version", - "time": "2016-10-03T07:35:21+00:00" + "time": "2015-06-21T13:59:46+00:00" }, { - "name": "symfony/polyfill-ctype", - "version": "v1.27.0", + "name": "seld/cli-prompt", + "version": "1.0.3", "source": { "type": "git", - "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "5bbc823adecdae860bb64756d639ecfec17b050a" + "url": "https://github.com/Seldaek/cli-prompt.git", + "reference": "a19a7376a4689d4d94cab66ab4f3c816019ba8dd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/5bbc823adecdae860bb64756d639ecfec17b050a", - "reference": "5bbc823adecdae860bb64756d639ecfec17b050a", + "url": "https://api.github.com/repos/Seldaek/cli-prompt/zipball/a19a7376a4689d4d94cab66ab4f3c816019ba8dd", + "reference": "a19a7376a4689d4d94cab66ab4f3c816019ba8dd", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=5.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.x-dev" + } + }, + "autoload": { + "psr-4": { + "Seld\\CliPrompt\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jordi Boggiano", + "email": "j.boggiano@seld.be" + } + ], + "description": "Allows you to prompt for user input on the command line, and optionally hide the characters they type", + "keywords": [ + "cli", + "console", + "hidden", + "input", + "prompt" + ], + "time": "2017-03-18T11:32:45+00:00" + }, + { + "name": "slim/php-view", + "version": "2.2.1", + "source": { + "type": "git", + "url": "https://github.com/slimphp/PHP-View.git", + "reference": "a13ada9d7962ca1b48799c0d9ffbca4c33245aed" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/slimphp/PHP-View/zipball/a13ada9d7962ca1b48799c0d9ffbca4c33245aed", + "reference": "a13ada9d7962ca1b48799c0d9ffbca4c33245aed", + "shasum": "" + }, + "require": { + "psr/http-message": "^1.0" + }, + "require-dev": { + "phpunit/phpunit": "^4.8", + "slim/slim": "^3.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Slim\\Views\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Glenn Eggleton", + "email": "geggleto@gmail.com" + } + ], + "description": "Render PHP view scripts into a PSR-7 Response object.", + "keywords": [ + "framework", + "php", + "phtml", + "renderer", + "slim", + "template", + "view" + ], + "time": "2019-04-15T20:43:28+00:00" + }, + { + "name": "slim/slim", + "version": "3.12.3", + "source": { + "type": "git", + "url": "https://github.com/slimphp/Slim.git", + "reference": "1c9318a84ffb890900901136d620b4f03a59da38" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/slimphp/Slim/zipball/1c9318a84ffb890900901136d620b4f03a59da38", + "reference": "1c9318a84ffb890900901136d620b4f03a59da38", + "shasum": "" + }, + "require": { + "ext-json": "*", + "ext-libxml": "*", + "ext-simplexml": "*", + "nikic/fast-route": "^1.0", + "php": ">=5.5.0", + "pimple/pimple": "^3.0", + "psr/container": "^1.0", + "psr/http-message": "^1.0" }, "provide": { - "ext-ctype": "*" + "psr/http-message-implementation": "1.0" + }, + "require-dev": { + "phpunit/phpunit": "^4.0", + "squizlabs/php_codesniffer": "^2.5" + }, + "type": "library", + "autoload": { + "psr-4": { + "Slim\\": "Slim" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Josh Lockhart", + "email": "hello@joshlockhart.com", + "homepage": "https://joshlockhart.com" + }, + { + "name": "Andrew Smith", + "email": "a.smith@silentworks.co.uk", + "homepage": "http://silentworks.co.uk" + }, + { + "name": "Rob Allen", + "email": "rob@akrabat.com", + "homepage": "http://akrabat.com" + }, + { + "name": "Gabriel Manricks", + "email": "gmanricks@me.com", + "homepage": "http://gabrielmanricks.com" + } + ], + "description": "Slim is a PHP micro framework that helps you quickly write simple yet powerful web applications and APIs", + "homepage": "https://slimframework.com", + "keywords": [ + "api", + "framework", + "micro", + "router" + ], + "time": "2019-11-28T17:40:33+00:00" + }, + { + "name": "symfony/polyfill-ctype", + "version": "v1.17.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-ctype.git", + "reference": "e94c8b1bbe2bc77507a1056cdb06451c75b427f9" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/e94c8b1bbe2bc77507a1056cdb06451c75b427f9", + "reference": "e94c8b1bbe2bc77507a1056cdb06451c75b427f9", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" }, "suggest": { "ext-ctype": "For best performance" @@ -4267,20 +2804,16 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.27-dev" - }, - "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" + "dev-master": "1.17-dev" } }, "autoload": { - "files": [ - "bootstrap.php" - ], "psr-4": { "Symfony\\Polyfill\\Ctype\\": "" - } + }, + "files": [ + "bootstrap.php" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -4304,50 +2837,41 @@ "polyfill", "portable" ], - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2020-05-12T16:14:59+00:00" }, { "name": "symfony/yaml", - "version": "v4.4.45", + "version": "v3.4.42", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "aeccc4dc52a9e634f1d1eebeb21eacfdcff1053d" + "reference": "7233ac2bfdde24d672f5305f2b3f6b5d741ef8eb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/aeccc4dc52a9e634f1d1eebeb21eacfdcff1053d", - "reference": "aeccc4dc52a9e634f1d1eebeb21eacfdcff1053d", + "url": "https://api.github.com/repos/symfony/yaml/zipball/7233ac2bfdde24d672f5305f2b3f6b5d741ef8eb", + "reference": "7233ac2bfdde24d672f5305f2b3f6b5d741ef8eb", "shasum": "" }, "require": { - "php": ">=7.1.3", + "php": "^5.5.9|>=7.0.8", "symfony/polyfill-ctype": "~1.8" }, "conflict": { "symfony/console": "<3.4" }, "require-dev": { - "symfony/console": "^3.4|^4.0|^5.0" + "symfony/console": "~3.4|~4.0" }, "suggest": { "symfony/console": "For validating YAML files using the lint command" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.4-dev" + } + }, "autoload": { "psr-4": { "Symfony\\Component\\Yaml\\": "" @@ -4370,23 +2894,701 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Loads and dumps YAML files", + "description": "Symfony Yaml Component", "homepage": "https://symfony.com", + "time": "2020-05-11T07:51:54+00:00" + }, + { + "name": "webmozart/assert", + "version": "1.5.0", + "source": { + "type": "git", + "url": "https://github.com/webmozarts/assert.git", + "reference": "88e6d84706d09a236046d686bbea96f07b3a34f4" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/webmozarts/assert/zipball/88e6d84706d09a236046d686bbea96f07b3a34f4", + "reference": "88e6d84706d09a236046d686bbea96f07b3a34f4", + "shasum": "" + }, + "require": { + "php": "^5.3.3 || ^7.0", + "symfony/polyfill-ctype": "^1.8" + }, + "require-dev": { + "phpunit/phpunit": "^4.8.36 || ^7.5.13" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.3-dev" + } + }, + "autoload": { + "psr-4": { + "Webmozart\\Assert\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Bernhard Schussek", + "email": "bschussek@gmail.com" + } + ], + "description": "Assertions to validate method input/output with nice error messages.", + "keywords": [ + "assert", + "check", + "validate" + ], + "time": "2019-08-24T08:43:50+00:00" + }, + { + "name": "willdurand/negotiation", + "version": "v2.3.1", + "source": { + "type": "git", + "url": "https://github.com/willdurand/Negotiation.git", + "reference": "03436ededa67c6e83b9b12defac15384cb399dc9" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/willdurand/Negotiation/zipball/03436ededa67c6e83b9b12defac15384cb399dc9", + "reference": "03436ededa67c6e83b9b12defac15384cb399dc9", + "shasum": "" + }, + "require": { + "php": ">=5.4.0" + }, + "require-dev": { + "phpunit/phpunit": "~4.5" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.3-dev" + } + }, + "autoload": { + "psr-4": { + "Negotiation\\": "src/Negotiation" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "William Durand", + "email": "will+git@drnd.me" + } + ], + "description": "Content Negotiation tools for PHP provided as a standalone library.", + "homepage": "http://williamdurand.fr/Negotiation/", + "keywords": [ + "accept", + "content", + "format", + "header", + "negotiation" + ], + "time": "2017-05-14T17:21:12+00:00" + } + ], + "packages-dev": [ + { + "name": "bower-asset/bootstrap", + "version": "v4.5.0", + "source": { + "type": "git", + "url": "https://github.com/twbs/bootstrap.git", + "reference": "7a6da5e3e7ad7c749dde806546a35d4d4259d965" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/twbs/bootstrap/zipball/7a6da5e3e7ad7c749dde806546a35d4d4259d965", + "reference": "7a6da5e3e7ad7c749dde806546a35d4d4259d965", + "shasum": "" + }, + "type": "bower-asset-library" + }, + { + "name": "composer/xdebug-handler", + "version": "1.4.2", + "source": { + "type": "git", + "url": "https://github.com/composer/xdebug-handler.git", + "reference": "fa2aaf99e2087f013a14f7432c1cd2dd7d8f1f51" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/fa2aaf99e2087f013a14f7432c1cd2dd7d8f1f51", + "reference": "fa2aaf99e2087f013a14f7432c1cd2dd7d8f1f51", + "shasum": "" + }, + "require": { + "php": "^5.3.2 || ^7.0 || ^8.0", + "psr/log": "^1.0" + }, + "require-dev": { + "phpunit/phpunit": "^4.8.35 || ^5.7 || 6.5 - 8" + }, + "type": "library", + "autoload": { + "psr-4": { + "Composer\\XdebugHandler\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "John Stevenson", + "email": "john-stevenson@blueyonder.co.uk" + } + ], + "description": "Restarts a process without Xdebug.", + "keywords": [ + "Xdebug", + "performance" + ], "funding": [ { - "url": "https://symfony.com/sponsor", + "url": "https://packagist.com", "type": "custom" }, { - "url": "https://github.com/fabpot", + "url": "https://github.com/composer", "type": "github" }, { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "url": "https://tidelift.com/funding/github/packagist/composer/composer", "type": "tidelift" } ], - "time": "2022-08-02T15:47:23+00:00" + "time": "2020-06-04T11:16:35+00:00" + }, + { + "name": "felixfbecker/advanced-json-rpc", + "version": "v3.1.1", + "source": { + "type": "git", + "url": "https://github.com/felixfbecker/php-advanced-json-rpc.git", + "reference": "0ed363f8de17d284d479ec813c9ad3f6834b5c40" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/felixfbecker/php-advanced-json-rpc/zipball/0ed363f8de17d284d479ec813c9ad3f6834b5c40", + "reference": "0ed363f8de17d284d479ec813c9ad3f6834b5c40", + "shasum": "" + }, + "require": { + "netresearch/jsonmapper": "^1.0 || ^2.0", + "php": ">=7.0", + "phpdocumentor/reflection-docblock": "^4.0.0 || ^5.0.0" + }, + "require-dev": { + "phpunit/phpunit": "^6.0.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "AdvancedJsonRpc\\": "lib/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "ISC" + ], + "authors": [ + { + "name": "Felix Becker", + "email": "felix.b@outlook.com" + } + ], + "description": "A more advanced JSONRPC implementation", + "time": "2020-03-11T15:21:41+00:00" + }, + { + "name": "felixfbecker/language-server-protocol", + "version": "v1.4.0", + "source": { + "type": "git", + "url": "https://github.com/felixfbecker/php-language-server-protocol.git", + "reference": "378801f6139bb74ac215d81cca1272af61df9a9f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/felixfbecker/php-language-server-protocol/zipball/378801f6139bb74ac215d81cca1272af61df9a9f", + "reference": "378801f6139bb74ac215d81cca1272af61df9a9f", + "shasum": "" + }, + "require": { + "php": "^7.0" + }, + "require-dev": { + "phpstan/phpstan": "*", + "phpunit/phpunit": "^6.3", + "squizlabs/php_codesniffer": "^3.1" + }, + "type": "library", + "autoload": { + "psr-4": { + "LanguageServerProtocol\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "ISC" + ], + "authors": [ + { + "name": "Felix Becker", + "email": "felix.b@outlook.com" + } + ], + "description": "PHP classes for the Language Server Protocol", + "keywords": [ + "language", + "microsoft", + "php", + "server" + ], + "time": "2019-06-23T21:03:50+00:00" + }, + { + "name": "muglug/package-versions-56", + "version": "1.2.4", + "source": { + "type": "git", + "url": "https://github.com/muglug/PackageVersions.git", + "reference": "a67bed26deaaf9269a348e53063bc8d4dcc60ffd" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/muglug/PackageVersions/zipball/a67bed26deaaf9269a348e53063bc8d4dcc60ffd", + "reference": "a67bed26deaaf9269a348e53063bc8d4dcc60ffd", + "shasum": "" + }, + "require": { + "composer-plugin-api": "^1.0", + "php": "^5.6 || ^7.0" + }, + "require-dev": { + "composer/composer": "^1.3", + "ext-zip": "*", + "phpunit/phpunit": "^5.7.5" + }, + "type": "composer-plugin", + "extra": { + "class": "Muglug\\PackageVersions\\Installer", + "branch-alias": { + "dev-master": "2.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Muglug\\PackageVersions\\": "src/PackageVersions" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Marco Pivetta", + "email": "ocramius@gmail.com" + }, + { + "name": "Abdul Malik Ikhsan", + "email": "samsonasik@gmail.com" + }, + { + "name": "Matt Brown", + "email": "github@muglug.com" + } + ], + "description": "A backport of ocramius/package-versions that supports php ^5.6. Composer plugin that provides efficient querying for installed package versions (no runtime IO)", + "time": "2018-03-26T03:22:13+00:00" + }, + { + "name": "netresearch/jsonmapper", + "version": "v1.6.0", + "source": { + "type": "git", + "url": "https://github.com/cweiske/jsonmapper.git", + "reference": "0d4d1b48d682a93b6bfedf60b88c7750e9cb0b06" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/cweiske/jsonmapper/zipball/0d4d1b48d682a93b6bfedf60b88c7750e9cb0b06", + "reference": "0d4d1b48d682a93b6bfedf60b88c7750e9cb0b06", + "shasum": "" + }, + "require": { + "ext-json": "*", + "ext-pcre": "*", + "ext-reflection": "*", + "ext-spl": "*", + "php": ">=5.6" + }, + "require-dev": { + "phpunit/phpunit": "~4.8.35 || ~5.7 || ~6.4", + "squizlabs/php_codesniffer": "~1.5" + }, + "type": "library", + "autoload": { + "psr-0": { + "JsonMapper": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "OSL-3.0" + ], + "authors": [ + { + "name": "Christian Weiske", + "email": "cweiske@cweiske.de", + "homepage": "http://github.com/cweiske/jsonmapper/", + "role": "Developer" + } + ], + "description": "Map nested JSON structures onto PHP classes", + "time": "2019-08-15T19:41:25+00:00" + }, + { + "name": "nikic/php-parser", + "version": "v4.5.0", + "source": { + "type": "git", + "url": "https://github.com/nikic/PHP-Parser.git", + "reference": "53c2753d756f5adb586dca79c2ec0e2654dd9463" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/53c2753d756f5adb586dca79c2ec0e2654dd9463", + "reference": "53c2753d756f5adb586dca79c2ec0e2654dd9463", + "shasum": "" + }, + "require": { + "ext-tokenizer": "*", + "php": ">=7.0" + }, + "require-dev": { + "ircmaxell/php-yacc": "0.0.5", + "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0" + }, + "bin": [ + "bin/php-parse" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.3-dev" + } + }, + "autoload": { + "psr-4": { + "PhpParser\\": "lib/PhpParser" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Nikita Popov" + } + ], + "description": "A PHP parser written in PHP", + "keywords": [ + "parser", + "php" + ], + "time": "2020-06-03T07:24:19+00:00" + }, + { + "name": "openlss/lib-array2xml", + "version": "0.5.1", + "source": { + "type": "git", + "url": "https://github.com/nullivex/lib-array2xml.git", + "reference": "c8b5998a342d7861f2e921403f44e0a2f3ef2be0" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/nullivex/lib-array2xml/zipball/c8b5998a342d7861f2e921403f44e0a2f3ef2be0", + "reference": "c8b5998a342d7861f2e921403f44e0a2f3ef2be0", + "shasum": "" + }, + "require": { + "php": ">=5.3.2" + }, + "type": "library", + "autoload": { + "psr-0": { + "LSS": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "Apache-2.0" + ], + "authors": [ + { + "name": "Bryan Tong", + "email": "contact@nullivex.com", + "homepage": "http://bryantong.com" + }, + { + "name": "Tony Butler", + "email": "spudz76@gmail.com", + "homepage": "http://openlss.org" + } + ], + "description": "Array2XML conversion library credit to lalit.org", + "homepage": "http://openlss.org", + "keywords": [ + "array", + "array conversion", + "xml", + "xml conversion" + ], + "time": "2016-11-10T19:10:18+00:00" + }, + { + "name": "php-cs-fixer/diff", + "version": "v1.3.0", + "source": { + "type": "git", + "url": "https://github.com/PHP-CS-Fixer/diff.git", + "reference": "78bb099e9c16361126c86ce82ec4405ebab8e756" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/PHP-CS-Fixer/diff/zipball/78bb099e9c16361126c86ce82ec4405ebab8e756", + "reference": "78bb099e9c16361126c86ce82ec4405ebab8e756", + "shasum": "" + }, + "require": { + "php": "^5.6 || ^7.0" + }, + "require-dev": { + "phpunit/phpunit": "^5.7.23 || ^6.4.3", + "symfony/process": "^3.3" + }, + "type": "library", + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Kore Nordmann", + "email": "mail@kore-nordmann.de" + }, + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + }, + { + "name": "SpacePossum" + } + ], + "description": "sebastian/diff v2 backport support for PHP5.6", + "homepage": "https://github.com/PHP-CS-Fixer", + "keywords": [ + "diff" + ], + "time": "2018-02-15T16:58:55+00:00" + }, + { + "name": "sabre/event", + "version": "5.1.0", + "source": { + "type": "git", + "url": "https://github.com/sabre-io/event.git", + "reference": "d00a17507af0e7544cfe17096372f5d733e3b276" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sabre-io/event/zipball/d00a17507af0e7544cfe17096372f5d733e3b276", + "reference": "d00a17507af0e7544cfe17096372f5d733e3b276", + "shasum": "" + }, + "require": { + "php": "^7.1" + }, + "require-dev": { + "friendsofphp/php-cs-fixer": "~2.16.1", + "phpunit/phpunit": "^7 || ^8" + }, + "type": "library", + "autoload": { + "psr-4": { + "Sabre\\Event\\": "lib/" + }, + "files": [ + "lib/coroutine.php", + "lib/Loop/functions.php", + "lib/Promise/functions.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Evert Pot", + "email": "me@evertpot.com", + "homepage": "http://evertpot.com/", + "role": "Developer" + } + ], + "description": "sabre/event is a library for lightweight event-based programming", + "homepage": "http://sabre.io/event/", + "keywords": [ + "EventEmitter", + "async", + "coroutine", + "eventloop", + "events", + "hooks", + "plugin", + "promise", + "reactor", + "signal" + ], + "time": "2020-01-31T18:52:29+00:00" + }, + { + "name": "sabre/uri", + "version": "2.2.0", + "source": { + "type": "git", + "url": "https://github.com/sabre-io/uri.git", + "reference": "059d11012603be2e32ddb7543602965563ddbb09" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sabre-io/uri/zipball/059d11012603be2e32ddb7543602965563ddbb09", + "reference": "059d11012603be2e32ddb7543602965563ddbb09", + "shasum": "" + }, + "require": { + "php": "^7.1" + }, + "require-dev": { + "friendsofphp/php-cs-fixer": "~2.16.1", + "phpunit/phpunit": "^7 || ^8" + }, + "type": "library", + "autoload": { + "files": [ + "lib/functions.php" + ], + "psr-4": { + "Sabre\\Uri\\": "lib/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Evert Pot", + "email": "me@evertpot.com", + "homepage": "http://evertpot.com/", + "role": "Developer" + } + ], + "description": "Functions for making sense out of URIs.", + "homepage": "http://sabre.io/uri/", + "keywords": [ + "rfc3986", + "uri", + "url" + ], + "time": "2020-01-31T18:53:43+00:00" + }, + { + "name": "scssphp/scssphp", + "version": "1.1.1", + "source": { + "type": "git", + "url": "https://github.com/scssphp/scssphp.git", + "reference": "824e4cec10b2bfa88eec5dac23991cb9106622c1" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/scssphp/scssphp/zipball/824e4cec10b2bfa88eec5dac23991cb9106622c1", + "reference": "824e4cec10b2bfa88eec5dac23991cb9106622c1", + "shasum": "" + }, + "require": { + "ext-ctype": "*", + "ext-json": "*", + "php": ">=5.6.0" + }, + "require-dev": { + "phpunit/phpunit": "^5.7 || ^6.5 || ^7.5 || ^8.3", + "squizlabs/php_codesniffer": "~3.5", + "twbs/bootstrap": "~4.3", + "zurb/foundation": "~6.5" + }, + "bin": [ + "bin/pscss" + ], + "type": "library", + "autoload": { + "psr-4": { + "ScssPhp\\ScssPhp\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Anthon Pang", + "email": "apang@softwaredevelopment.ca", + "homepage": "https://github.com/robocoder" + }, + { + "name": "Cédric Morin", + "email": "cedric@yterium.com", + "homepage": "https://github.com/Cerdic" + } + ], + "description": "scssphp is a compiler for SCSS written in PHP.", + "homepage": "http://scssphp.github.io/scssphp/", + "keywords": [ + "css", + "less", + "sass", + "scss", + "stylesheet" + ], + "time": "2020-06-04T17:30:40+00:00" }, { "name": "vimeo/psalm", @@ -4463,76 +3665,28 @@ ], "time": "2018-11-09T19:18:46+00:00" }, - { - "name": "webmozart/assert", - "version": "1.5.0", - "source": { - "type": "git", - "url": "https://github.com/webmozarts/assert.git", - "reference": "88e6d84706d09a236046d686bbea96f07b3a34f4" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/webmozarts/assert/zipball/88e6d84706d09a236046d686bbea96f07b3a34f4", - "reference": "88e6d84706d09a236046d686bbea96f07b3a34f4", - "shasum": "" - }, - "require": { - "php": "^5.3.3 || ^7.0", - "symfony/polyfill-ctype": "^1.8" - }, - "require-dev": { - "phpunit/phpunit": "^4.8.36 || ^7.5.13" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.3-dev" - } - }, - "autoload": { - "psr-4": { - "Webmozart\\Assert\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Bernhard Schussek", - "email": "bschussek@gmail.com" - } - ], - "description": "Assertions to validate method input/output with nice error messages.", - "keywords": [ - "assert", - "check", - "validate" - ], - "time": "2019-08-24T08:43:50+00:00" - }, { "name": "webmozart/glob", - "version": "4.6.0", + "version": "4.1.0", "source": { "type": "git", "url": "https://github.com/webmozarts/glob.git", - "reference": "3c17f7dec3d9d0e87b575026011f2e75a56ed655" + "reference": "3cbf63d4973cf9d780b93d2da8eec7e4a9e63bbe" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/webmozarts/glob/zipball/3c17f7dec3d9d0e87b575026011f2e75a56ed655", - "reference": "3c17f7dec3d9d0e87b575026011f2e75a56ed655", + "url": "https://api.github.com/repos/webmozarts/glob/zipball/3cbf63d4973cf9d780b93d2da8eec7e4a9e63bbe", + "reference": "3cbf63d4973cf9d780b93d2da8eec7e4a9e63bbe", "shasum": "" }, "require": { - "php": "^7.3 || ^8.0.0" + "php": "^5.3.3|^7.0", + "webmozart/path-util": "^2.2" }, "require-dev": { - "phpunit/phpunit": "^9.5", - "symfony/filesystem": "^5.3" + "phpunit/phpunit": "^4.6", + "sebastian/version": "^1.0.1", + "symfony/filesystem": "^2.5" }, "type": "library", "extra": { @@ -4556,7 +3710,7 @@ } ], "description": "A PHP implementation of Ant's glob.", - "time": "2022-05-24T19:45:58+00:00" + "time": "2015-12-29T11:14:33+00:00" }, { "name": "webmozart/path-util", @@ -4602,15 +3756,12 @@ } ], "description": "A robust cross-platform utility for normalizing, comparing and modifying file paths.", - "abandoned": "symfony/filesystem", "time": "2015-12-17T08:42:14+00:00" } ], "aliases": [], "minimum-stability": "stable", - "stability-flags": { - "gofabian/negotiation-middleware": 20 - }, + "stability-flags": [], "prefer-stable": false, "prefer-lowest": false, "platform": { @@ -4622,7 +3773,7 @@ }, "platform-dev": [], "platform-overrides": { - "php": "7.3.0" + "php": "7.1.0" }, "plugin-api-version": "1.1.0" } diff --git a/docs/Protocol.md b/docs/Protocol.md index 2e1c74f..35d397b 100644 --- a/docs/Protocol.md +++ b/docs/Protocol.md @@ -16,7 +16,7 @@ Accept: application/json ``` URI Parameter: -- `account_type` (optional): An arbitrary account type string. Expected values are `all`, `people`, `news`, `organization` and `group`. Default is `all`. +- `account_type` (optional): An arbitrary account type string. Expected values are `all`, `people`, `news`, `organization` and `forum`. Default is `all`. Query parameters: - `q`: The search query. - `page` (optional): The page number, default is 1. @@ -44,11 +44,10 @@ Example: "region": "New York", "country": "USA", "profile_url": "https://friendica.mrpetovan.com/profile/hypolite", + "dfrn_request": "https://friendica.mrpetovan.com/dfrn_request/hypolite", "photo": "https://friendica.mrpetovan.com/photo/27330388315ae4ed2b03e3c116980490-4.jpg?ts=1541567135", "tags": "videogame gaming boardgame politics philosophy development programming php", - "last_activity": "2018-45", - "remote_follow": "https://friendica.mrpetovan.com/remote_follow/hypolite", - "subscribe": null + "last_activity": "2018-45" }, ... ] diff --git a/public/assets/images/default-profile-sm.jpg b/public/assets/images/default-profile-sm.jpg index 5733602..ea0030e 100644 Binary files a/public/assets/images/default-profile-sm.jpg and b/public/assets/images/default-profile-sm.jpg differ diff --git a/src/classes/Controllers/Api/MatchSearch.php b/src/classes/Controllers/Api/MatchSearch.php index ba97311..28971ae 100644 --- a/src/classes/Controllers/Api/MatchSearch.php +++ b/src/classes/Controllers/Api/MatchSearch.php @@ -11,6 +11,10 @@ use Psr\Http\Message\ServerRequestInterface; */ class MatchSearch { + /** + * @var \Atlas\Pdo\Connection + */ + private $atlas; /** * @var \Friendica\Directory\Models\Profile */ @@ -21,10 +25,12 @@ class MatchSearch private $l10n; public function __construct( + \Atlas\Pdo\Connection $atlas, \Friendica\Directory\Models\Profile $profileModel, \Gettext\TranslatorInterface $l10n ) { + $this->atlas = $atlas; $this->profileModel = $profileModel; $this->l10n = $l10n; } @@ -47,13 +53,7 @@ class MatchSearch $values = ['query' => $query]; - $profiles = $this->profileModel->getListForDisplay( - null, - $pager->getItemsPerPage(), - $pager->getStart(), - $sql_where, - $values, - ); + $profiles = $this->profileModel->getListForDisplay($pager->getItemsPerPage(), $pager->getStart(), $sql_where, $values); $results = []; foreach ($profiles as $profile) { diff --git a/src/classes/Controllers/Api/Photo.php b/src/classes/Controllers/Api/Photo.php index d7d8572..52ae50f 100644 --- a/src/classes/Controllers/Api/Photo.php +++ b/src/classes/Controllers/Api/Photo.php @@ -14,18 +14,12 @@ class Photo * @var \Atlas\Pdo\Connection */ private $atlas; - /** - * @var string - */ - private $defaultProfilePictureSmallPath; public function __construct( - \Atlas\Pdo\Connection $atlas, - string $defaultProfilePictureSmallPath + \Atlas\Pdo\Connection $atlas ) { $this->atlas = $atlas; - $this->defaultProfilePictureSmallPath = $defaultProfilePictureSmallPath; } public function render(Request $request, Response $response, array $args): Response @@ -36,7 +30,7 @@ class Photo ); if (!$data) { - $data = file_get_contents($this->defaultProfilePictureSmallPath); + $data = file_get_contents('public/images/default-profile-sm.jpg'); } //Try and cache our result. diff --git a/src/classes/Controllers/Api/Search.php b/src/classes/Controllers/Api/Search.php index ea39dd7..a27fa82 100644 --- a/src/classes/Controllers/Api/Search.php +++ b/src/classes/Controllers/Api/Search.php @@ -11,6 +11,10 @@ use Psr\Http\Message\ServerRequestInterface; */ class Search { + /** + * @var \Atlas\Pdo\Connection + */ + private $atlas; /** * @var \Friendica\Directory\Models\Profile */ @@ -21,10 +25,12 @@ class Search private $l10n; public function __construct( + \Atlas\Pdo\Connection $atlas, \Friendica\Directory\Models\Profile $profileModel, \Gettext\TranslatorInterface $l10n ) { + $this->atlas = $atlas; $this->profileModel = $profileModel; $this->l10n = $l10n; } @@ -58,13 +64,7 @@ AND `account_type` = :account_type'; $values['account_type'] = $account_type; } - $profiles = $this->profileModel->getListForDisplay( - null, - $pager->getItemsPerPage(), - $pager->getStart(), - $sql_where, - $values, - ); + $profiles = $this->profileModel->getListForDisplay($pager->getItemsPerPage(), $pager->getStart(), $sql_where, $values); $count = $this->profileModel->getCountForDisplay($sql_where, $values); diff --git a/src/classes/Controllers/Console/Install.php b/src/classes/Controllers/Console/Install.php index 3e3fb3c..4de2e05 100644 --- a/src/classes/Controllers/Console/Install.php +++ b/src/classes/Controllers/Console/Install.php @@ -31,9 +31,9 @@ class Install extends \Asika\SimpleConsole\Console protected function getHelp() { $help = << [-h|--help|-?] [-v] Description Install directory diff --git a/src/classes/Controllers/Console/UpdateDb.php b/src/classes/Controllers/Console/UpdateDb.php index 9ac7c76..0f2c32e 100644 --- a/src/classes/Controllers/Console/UpdateDb.php +++ b/src/classes/Controllers/Console/UpdateDb.php @@ -37,14 +37,12 @@ class UpdateDb extends \Asika\SimpleConsole\Console $help = <<] [-h|--help|-?] [-v] + bin/console updatedb [-h|--help|-?] [-v] Description Update database schema Options - Optional target version number, default is the latest version. - Do not use this parameter if you're not sure what you're doing, it will result in data loss! -h|--help|-? Show help information -v Show more debug information. HELP; @@ -58,38 +56,16 @@ HELP; return 0; } - if (count($this->args) > 2) { + if (count($this->args) > 1) { throw new \Asika\SimpleConsole\CommandArgsException('Too many arguments'); } - $currentVersion = $this->migration->getCurrentVersion()['version']; + $this->out('Updating database schema to latest version...'); - $this->out('Database schema currently in version ' . $currentVersion); + $this->migration->up(); - if (count($this->args) == 1) { - $this->out('Updating database schema to latest version...'); - $this->migration->up(); - $this->out('Database schema migrated to version ' . $this->migration->getCurrentVersion()['version']); - return 0; - } + $this->out('Database schema migrated to version ' . $this->migration->getCurrentVersion()['version']); - $target = $this->getArgument(1); - - if ($target > $currentVersion) { - $this->out('Updating database schema to version ' . $target); - $this->migration->up($target); - $this->out('Database schema migrated up to version ' . $this->migration->getCurrentVersion()['version']); - return 0; - } - - if ($target < $currentVersion) { - $this->out('Downgrading database schema to version ' . $target); - $this->migration->down($target); - $this->out('Database schema migrated down to version ' . $this->migration->getCurrentVersion()['version']); - return 0; - } - - $this->out('Target version equal to current version, exiting.'); return 0; } } diff --git a/src/classes/Controllers/Web/Directory.php b/src/classes/Controllers/Web/Directory.php index 84c5a1f..f4aaaec 100644 --- a/src/classes/Controllers/Web/Directory.php +++ b/src/classes/Controllers/Web/Directory.php @@ -18,10 +18,6 @@ class Directory extends BaseController * @var \Atlas\Pdo\Connection */ private $atlas; - /** - * @var \Friendica\Directory\Models\Server - */ - private $serverModel; /** * @var \Friendica\Directory\Models\Profile */ @@ -41,7 +37,6 @@ class Directory extends BaseController public function __construct( \Atlas\Pdo\Connection $atlas, - \Friendica\Directory\Models\Server $serverModel, \Friendica\Directory\Models\Profile $profileModel, \Friendica\Directory\Views\Widget\AccountTypeTabs $accountTypeTabs, \Friendica\Directory\Views\PhpRenderer $renderer, @@ -49,7 +44,6 @@ class Directory extends BaseController ) { $this->atlas = $atlas; - $this->serverModel = $serverModel; $this->profileModel = $profileModel; $this->accountTypeTabs = $accountTypeTabs; $this->renderer = $renderer; @@ -64,22 +58,16 @@ class Directory extends BaseController $pager = new Pager($this->l10n, $request, 20); - $sql_where = ''; + $condition = ''; $values = []; if (!empty($args['account_type'])) { - $sql_where = '`account_type` = :account_type'; + $condition = '`account_type` = :account_type'; $values = ['account_type' => $args['account_type']]; } - $profiles = $this->profileModel->getListForDisplay( - $this->serverModel->getSubscribeUrlByProfile($request->getQueryParam('zrl', '')), - $pager->getItemsPerPage(), - $pager->getStart(), - $sql_where, - $values, - ); + $profiles = $this->profileModel->getListForDisplay($pager->getItemsPerPage(), $pager->getStart(), $condition, $values); - $count = $this->profileModel->getCountForDisplay($sql_where, $values); + $count = $this->profileModel->getCountForDisplay($condition, $values); $vars = [ 'title' => $this->l10n->gettext('People'), @@ -94,6 +82,7 @@ class Directory extends BaseController $content = $this->renderer->fetch('directory.phtml', $vars); + // Render index view return ['content' => $content]; } } diff --git a/src/classes/Controllers/Web/Search.php b/src/classes/Controllers/Web/Search.php index fc6f5ff..d70925a 100644 --- a/src/classes/Controllers/Web/Search.php +++ b/src/classes/Controllers/Web/Search.php @@ -13,10 +13,6 @@ class Search extends BaseController * @var \Atlas\Pdo\Connection */ private $atlas; - /** - * @var \Friendica\Directory\Models\Server - */ - private $serverModel; /** * @var \Friendica\Directory\Models\Profile */ @@ -36,7 +32,6 @@ class Search extends BaseController public function __construct( \Atlas\Pdo\Connection $atlas, - \Friendica\Directory\Models\Server $serverModel, \Friendica\Directory\Models\Profile $profileModel, \Friendica\Directory\Views\Widget\AccountTypeTabs $accountTypeTabs, \Friendica\Directory\Views\PhpRenderer $renderer, @@ -44,7 +39,6 @@ class Search extends BaseController ) { $this->atlas = $atlas; - $this->serverModel = $serverModel; $this->profileModel = $profileModel; $this->accountTypeTabs = $accountTypeTabs; $this->renderer = $renderer; @@ -95,13 +89,7 @@ AND `account_type` = :account_type'; $values['account_type'] = $account_type; } - $profiles = $this->profileModel->getListForDisplay( - $this->serverModel->getSubscribeUrlByProfile($request->getQueryParam('zrl', '')), - $pager->getItemsPerPage(), - $pager->getStart(), - $sql_where, - $values, - ); + $profiles = $this->profileModel->getListForDisplay($pager->getItemsPerPage(), $pager->getStart(), $sql_where, $values); $count = $this->profileModel->getCountForDisplay($sql_where, $values); @@ -118,6 +106,7 @@ AND `account_type` = :account_type'; $content = $this->renderer->fetch('search.phtml', $vars); + // Render index view return ['content' => $content, 'noNavSearch' => true]; } } diff --git a/src/classes/Controllers/Web/Servers.php b/src/classes/Controllers/Web/Servers.php index 580edb9..a4c1d78 100644 --- a/src/classes/Controllers/Web/Servers.php +++ b/src/classes/Controllers/Web/Servers.php @@ -66,7 +66,7 @@ class Servers extends BaseController $sql_where = ''; $values = []; - if (!empty($args['language'])) { + if ($args['language']) { $sql_where .= ' AND LEFT(`language`, 2) = LEFT(:language, 2)'; $values['language'] = $args['language']; @@ -104,7 +104,7 @@ AND NOT `hidden` $vars = [ 'title' => $this->l10n->gettext('Public Servers'), 'total' => $count, - 'language' => $args['language'] ?? null, + 'language' => $args['language'], 'servers' => $servers, 'pager' => $pager->renderFull($count), 'stable_version' => $stable_version, diff --git a/src/classes/Models/Profile.php b/src/classes/Models/Profile.php index f2cc6a3..e8e5324 100644 --- a/src/classes/Models/Profile.php +++ b/src/classes/Models/Profile.php @@ -7,13 +7,6 @@ namespace Friendica\Directory\Models; */ class Profile extends \Friendica\Directory\Model { - const ACCOUNT_TYPE_PERSON = 0; - const ACCOUNT_TYPE_ORGANISATION = 1; - const ACCOUNT_TYPE_NEWS = 2; - const ACCOUNT_TYPE_COMMUNITY = 3; - const ACCOUNT_TYPE_RELAY = 4; - const ACCOUNT_TYPE_DELETED = 127; - public function deleteById(int $profile_id): bool { $this->atlas->perform('DELETE FROM `photo` WHERE `profile_id` = :profile_id', @@ -81,7 +74,7 @@ class Profile extends \Friendica\Directory\Model ]; } - public function getListForDisplay(string $subscribeUrl = null, int $limit = 30, int $start = 0, string $condition = '', array $values = []): array + public function getListForDisplay(int $limit = 30, int $start = 0, string $condition = '', array $values = []): array { if ($condition) { $condition = 'AND ' . $condition; @@ -93,8 +86,8 @@ class Profile extends \Friendica\Directory\Model ]); $stmt = 'SELECT p.`id`, p.`name`, p.`username`, p.`addr`, p.`account_type`, p.`language`, - p.`pdesc`, p.`locality`, p.`region`, p.`country`, p.`profile_url`, - p.`photo`, p.`tags`, p.`last_activity`, s.`version` + p.`pdesc`, p.`locality`, p.`region`, p.`country`, p.`profile_url`, p.`dfrn_request`, + p.`photo`, p.`tags`, p.`last_activity` FROM `profile` p JOIN `server` s ON s.`id` = p.`server_id` AND s.`available` AND NOT s.`hidden` WHERE p.`available` @@ -105,12 +98,6 @@ class Profile extends \Friendica\Directory\Model LIMIT :start, :limit'; $profiles = $this->atlas->fetchAll($stmt, $values); - array_walk($profiles, function (array &$profile) use ($subscribeUrl) { - $profile['remote_follow'] = version_compare($profile['version'], '2020.03', '>=') ? str_replace('/profile/', '/remote_follow/', $profile['profile_url']) : null; - $profile['subscribe'] = $subscribeUrl ? str_replace('{uri}', urlencode($profile['profile_url']), $subscribeUrl): null; - unset($profile['version']); - }); - return $profiles; } diff --git a/src/classes/Models/Server.php b/src/classes/Models/Server.php index 3e89603..9f1ec5c 100644 --- a/src/classes/Models/Server.php +++ b/src/classes/Models/Server.php @@ -41,20 +41,4 @@ class Server extends \Friendica\Directory\Model 'alias' => strtolower($server_alias) ]); } - - /** - * Returns the complete subscribe URL of the given profile URL if we have it for the related server - * - * @param string $profile_url - * @return mixed|null - */ - public function getSubscribeUrlByProfile(string $profile_url) - { - if (preg_match('#^(.+)/profile/#', $profile_url, $matches)) { - $server = $this->getByUrlAlias($matches[1]); - return $server['subscribe_url'] ?? null; - } - - return null; - } } diff --git a/src/classes/Pollers/Directory.php b/src/classes/Pollers/Directory.php index 68a9f38..53c0f9e 100644 --- a/src/classes/Pollers/Directory.php +++ b/src/classes/Pollers/Directory.php @@ -10,9 +10,9 @@ use Friendica\Directory\Utils\Network; class Directory { /** - * @var \GuzzleHttp\ClientInterface + * @var \Atlas\Pdo\Connection */ - private $http; + private $atlas; /** * @var \Friendica\Directory\Models\ProfilePollQueue */ @@ -30,12 +30,12 @@ class Directory ]; public function __construct( - \GuzzleHttp\ClientInterface $http, + \Atlas\Pdo\Connection $atlas, \Friendica\Directory\Models\ProfilePollQueue $profilePollQueueModel, \Psr\Log\LoggerInterface $logger, array $settings) { - $this->http = $http; + $this->atlas = $atlas; $this->profilePollQueueModel = $profilePollQueueModel; $this->logger = $logger; $this->settings = array_merge($this->settings, $settings); @@ -82,7 +82,35 @@ class Directory $path = '/sync/pull/since/' . $last_polled; } - $pull_data = $this->http->get($directory_url . $path, ['timeout' => max($this->settings['probe_timeout'], 1)])->getBody()->getContents(); + //Prepare the CURL call. + $handle = curl_init(); + $options = array( + //Timeouts + CURLOPT_TIMEOUT => max($this->settings['probe_timeout'], 1), //Minimum of 1 second timeout. + CURLOPT_CONNECTTIMEOUT => 1, + //Redirecting + CURLOPT_FOLLOWLOCATION => true, + CURLOPT_MAXREDIRS => 8, + //SSL + CURLOPT_SSL_VERIFYPEER => true, + // CURLOPT_VERBOSE => true, + // CURLOPT_CERTINFO => true, + CURLOPT_SSL_VERIFYHOST => 2, + CURLOPT_PROTOCOLS => CURLPROTO_HTTP | CURLPROTO_HTTPS, + //Basic request + CURLOPT_USERAGENT => Network::USER_AGENT, + CURLOPT_RETURNTRANSFER => true, + CURLOPT_URL => $directory_url . $path + ); + curl_setopt_array($handle, $options); + + $this->logger->info('Pulling profiles from directory URL: ' . $directory_url . $path); + + //Probe the site. + $pull_data = curl_exec($handle); + + //Done with CURL now. + curl_close($handle); $data = json_decode($pull_data, true); diff --git a/src/classes/Pollers/Profile.php b/src/classes/Pollers/Profile.php index 4d35d60..70db56e 100644 --- a/src/classes/Pollers/Profile.php +++ b/src/classes/Pollers/Profile.php @@ -2,15 +2,14 @@ namespace Friendica\Directory\Pollers; -use Friendica\Directory\Models; -use Friendica\Directory\Utils; -use GuzzleHttp\Exception\RequestException; +use Friendica\Directory\Utils\Network; /** * @author Hypolite Petovan */ class Profile { + const PROFILE_MISSING_REQUEST = 1; const PROFILE_MISSING_CONFIRM = 2; const PROFILE_MISSING_NOTIFY = 4; const PROFILE_MISSING_POLL = 8; @@ -21,17 +20,12 @@ class Profile private $atlas; /** - * @var \GuzzleHttp\ClientInterface - */ - private $http; - - /** - * @var Models\Server + * @var \Friendica\Directory\Models\Server */ private $serverModel; /** - * @var Models\Profile + * @var \Friendica\Directory\Models\Profile */ private $profileModel; @@ -50,15 +44,13 @@ class Profile public function __construct( \Atlas\Pdo\Connection $atlas, - \GuzzleHttp\ClientInterface $http, - Models\Server $serverModel, - Models\Profile $profileModel, + \Friendica\Directory\Models\Server $serverModel, + \Friendica\Directory\Models\Profile $profileModel, \Psr\Log\LoggerInterface $logger, array $settings ) { $this->atlas = $atlas; - $this->http = $http; $this->serverModel = $serverModel; $this->profileModel = $profileModel; $this->logger = $logger; @@ -83,12 +75,12 @@ class Profile return false; } - if (!Utils\Network::isPublicHost($host)) { + if (!\Friendica\Directory\Utils\Network::isPublicHost($host)) { $this->logger->warning('Private/reserved IP in polled profile URL: ' . $profile_uri); return false; } - $profileUriInfo = Models\Profile::extractInfoFromProfileUrl($profile_uri); + $profileUriInfo = \Friendica\Directory\Models\Profile::extractInfoFromProfileUrl($profile_uri); if (!$profileUriInfo) { $this->logger->warning('Profile URI invalid'); return false; @@ -131,38 +123,25 @@ class Profile ); } - $available = false; + //Skip the profile scrape? + $noscrape = $server['noscrape_url']; $params = []; - - //Skip the profile scrape? - if ($server['noscrape_url']) { + if ($noscrape) { $this->logger->debug('Calling ' . $server['noscrape_url'] . '/' . $username); - try { - $params = Utils\Scrape::retrieveNoScrapeData($this->http, $server['noscrape_url'] . '/' . $username); - } catch (RequestException $e) { - $this->logger->info('Request failed with error code ' . $e->getCode()); - } catch (\Throwable $e) { - $this->logger->warning('Request failed with exception ' . get_class($e)); - $this->logger->warning(var_export($e, true)); - } - - $available = !!$params; //If the result was false, do a scrape after all. + $params = \Friendica\Directory\Utils\Scrape::retrieveNoScrapeData($server['noscrape_url'] . '/' . $username); + $noscrape = !!$params; //If the result was false, do a scrape after all. } - if (!$available) { - $this->logger->info('Parsing profile page ' . $profile_uri); - try { - $params = Utils\Scrape::retrieveProfileData($this->http, $profile_uri); - } catch (RequestException $e) { - $this->logger->info('Request failed with error code ' . $e->getCode()); - } catch (\Throwable $e) { - $this->logger->warning('Request failed with exception ' . get_class($e)); - $this->logger->warning(var_export($e, true)); - } - $params['language'] = $server['language']; + $available = true; - $available = !empty($params['fn']); + if ($noscrape) { + $available = Network::testURL($profile_uri); + $this->logger->debug('Testing ' . $profile_uri . ': ' . ($available?'Success':'Failure')); + } else { + $this->logger->notice('Parsing profile page ' . $profile_uri); + $params = \Friendica\Directory\Utils\Scrape::retrieveProfileData($profile_uri); + $params['language'] = $server['language']; } // Empty result is due to an offline site. @@ -198,6 +177,9 @@ class Profile // This is most likely a problem with the site configuration. Ignore. if ($error = self::validateParams($params)) { $this->logger->warning('Poll aborted, parameters invalid.', ['params' => $params]); + if ($error & Profile::PROFILE_MISSING_REQUEST) { + $this->logger->notice('dfrn-request parameter is empty.'); + } if ($error & Profile::PROFILE_MISSING_CONFIRM) { $this->logger->notice('dfrn-confirm parameter is empty.'); } @@ -211,22 +193,16 @@ class Profile return false; } - switch ($params['account-type'] ?? Models\Profile::ACCOUNT_TYPE_PERSON) { - case Models\Profile::ACCOUNT_TYPE_ORGANISATION: $account_type = 'Organization'; break; - case Models\Profile::ACCOUNT_TYPE_NEWS : $account_type = 'News'; break; - case Models\Profile::ACCOUNT_TYPE_COMMUNITY : $account_type = 'Group'; break; - case Models\Profile::ACCOUNT_TYPE_RELAY : $account_type = 'Relay'; break; - case Models\Profile::ACCOUNT_TYPE_DELETED : $account_type = 'Deleted'; break; - - case Models\Profile::ACCOUNT_TYPE_PERSON: { + switch ($params['account-type'] ?? 0) { + case 1: $account_type = 'News'; break; + case 2: $account_type = 'Organization'; break; + case 3: $account_type = 'Forum'; break; + case 0: + default: $account_type = 'People'; if (!empty($params['comm'])) { - $account_type = 'Group'; + $account_type = 'Forum'; } - break; - } - - default: $account_type = 'Unknown'; break; } $tags = []; @@ -256,6 +232,7 @@ class Profile 'region' => $params['region'] ?? '', 'country' => $params['country-name'] ?? '', 'profile_url' => $profile_uri, + 'dfrn_request' => $params['dfrn-request'] ?? null, 'photo' => $params['photo'], 'tags' => implode(' ', $tags), 'addr' => $addr, @@ -263,7 +240,7 @@ class Profile 'language' => $params['language'] ?? null, 'filled_fields'=> $filled_fields, 'last_activity'=> $params['last-activity'] ?? null, - 'available' => [$available, \PDO::PARAM_BOOL], + 'available' => $available, ]; $this->logger->debug(var_export($values, true)); @@ -277,6 +254,7 @@ class Profile `region` = :region, `country` = :country, `profile_url` = :profile_url, + `dfrn_request` = :dfrn_request, `photo` = :photo, `tags` = :tags, `addr` = :addr, @@ -296,6 +274,7 @@ class Profile `region` = :region, `country` = :country, `profile_url` = :profile_url, + `dfrn_request` = :dfrn_request, `photo` = :photo, `tags` = :tags, `addr` = :addr, @@ -329,27 +308,23 @@ class Profile $status = false; if ($profile_id) { - try { - $img_str = $this->http->get($params['photo'])->getBody()->getContents(); - $img = new Utils\Photo($img_str); - if ($img->getImage()) { - $img->scaleImageSquare(80); + $img_str = \Friendica\Directory\Utils\Network::fetchURL($params['photo'], true); + $img = new \Friendica\Directory\Utils\Photo($img_str); + if ($img->getImage()) { + $img->scaleImageSquare(80); - $this->atlas->perform('INSERT INTO `photo` SET - `profile_id` = :profile_id, - `data` = :data - ON DUPLICATE KEY UPDATE - `data` = :data', - [ - 'profile_id' => $profile_id, - 'data' => $img->imageString() - ] - ); - } - $status = true; - } catch (RequestException $e) { - $this->logger->info('Photo retrieval unsuccessful', ['url' => $params['photo'], 'code' => $e->getCode()]); + $this->atlas->perform('INSERT INTO `photo` SET + `profile_id` = :profile_id, + `data` = :data + ON DUPLICATE KEY UPDATE + `data` = :data', + [ + 'profile_id' => $profile_id, + 'data' => $img->imageString() + ] + ); } + $status = true; } $submit_end = microtime(true); @@ -386,6 +361,9 @@ class Profile private static function validateParams(array $params): int { $errors = 0; + if (empty($params['dfrn-request'])) { + $errors &= self::PROFILE_MISSING_REQUEST; + } if (empty($params['dfrn-confirm'])) { $errors &= self::PROFILE_MISSING_CONFIRM; } diff --git a/src/classes/Pollers/Server.php b/src/classes/Pollers/Server.php index 2b3d9be..e6c160c 100644 --- a/src/classes/Pollers/Server.php +++ b/src/classes/Pollers/Server.php @@ -2,9 +2,8 @@ namespace Friendica\Directory\Pollers; -use GuzzleHttp\Psr7\Uri; -use GuzzleHttp\Exception\RequestException; -use GuzzleHttp\TransferStats; +use ByJG\Util\WebRequest; +use Friendica\Directory\Utils\Network; /** * @author Hypolite Petovan @@ -15,10 +14,6 @@ class Server * @var \Atlas\Pdo\Connection */ private $atlas; - /** - * @var \GuzzleHttp\ClientInterface - */ - private $http; /** * @var \Friendica\Directory\Models\ProfilePollQueue */ @@ -46,7 +41,6 @@ class Server public function __construct( \Atlas\Pdo\Connection $atlas, - \GuzzleHttp\ClientInterface $http, \Friendica\Directory\Models\ProfilePollQueue $profilePollQueueModel, \Friendica\Directory\Models\Server $serverModel, \Psr\SimpleCache\CacheInterface $simplecache, @@ -54,7 +48,6 @@ class Server array $settings) { $this->atlas = $atlas; - $this->http = $http; $this->profilePollQueueModel = $profilePollQueueModel; $this->serverModel = $serverModel; $this->simplecache = $simplecache; @@ -154,10 +147,6 @@ class Server $addons = $probe_result['data']['plugins']; } - if (!empty($probe_result['data']['admin']['profile'])) { - $subscribe = $this->getSubscribeUrl($probe_result['data']['url'], $probe_result['data']['admin']['profile']); - } - $this->atlas->perform( 'UPDATE `server` SET `available` = 1, @@ -172,22 +161,20 @@ class Server `admin_name` = :admin_name, `admin_profile` = :admin_profile, `noscrape_url` = :noscrape_url, - `subscribe_url` = :subscribe_url, `ssl_state` = :ssl_state WHERE `id` = :server_id', [ 'server_id' => $server['id'], 'base_url' => strtolower($probe_result['data']['url']), - 'name' => substr($probe_result['data']['site_name'], 0, 255), + 'name' => $probe_result['data']['site_name'], 'language' => $probe_result['data']['language'] ?? null, 'version' => $probe_result['data']['version'], 'addons' => implode(',', $addons), 'reg_policy' => $probe_result['data']['register_policy'], 'info' => $probe_result['data']['info'], - 'admin_name' => $probe_result['data']['admin']['name'] ?? null, - 'admin_profile' => $probe_result['data']['admin']['profile'] ?? null, + 'admin_name' => $probe_result['data']['admin']['name'], + 'admin_profile' => $probe_result['data']['admin']['profile'], 'noscrape_url' => $probe_result['data']['no_scrape_url'] ?? null, - 'subscribe_url' => $subscribe ?? null, 'ssl_state' => $probe_result['ssl_state'] ] ); @@ -254,50 +241,65 @@ class Server private function getProbeResult(string $base_url): array { - $curl_info = null; - - $options = [ - 'timeout' => max($this->settings['probe_timeout'], 1), - 'on_stats' => function (TransferStats $transferStats) use (&$curl_info) { - $curl_info = $transferStats->getHandlerStats(); - } - ]; - - $sslcert_issues = false; + //Prepare the CURL call. + $handle = curl_init(); + $options = array( + //Timeouts + CURLOPT_TIMEOUT => max($this->settings['probe_timeout'], 1), //Minimum of 1 second timeout. + CURLOPT_CONNECTTIMEOUT => 1, + //Redirecting + CURLOPT_FOLLOWLOCATION => true, + CURLOPT_MAXREDIRS => 8, + //SSL + CURLOPT_SSL_VERIFYPEER => true, + // CURLOPT_VERBOSE => true, + // CURLOPT_CERTINFO => true, + CURLOPT_SSL_VERIFYHOST => 2, + CURLOPT_PROTOCOLS => CURLPROTO_HTTP | CURLPROTO_HTTPS, + //Basic request + CURLOPT_USERAGENT => Network::USER_AGENT, + CURLOPT_RETURNTRANSFER => true, + CURLOPT_URL => $base_url . '/friendica/json' + ); + curl_setopt_array($handle, $options); + //Probe the site. $probe_start = microtime(true); - $probe_data = null; - try { - //Probe the site. - $probe_data = $this->http->get($base_url . '/friendica/json', $options)->getBody()->getContents(); - } catch (RequestException $e) { - if (in_array($e->getHandlerContext()['errno'] ?? 0, [ - 60, //Could not authenticate certificate with known CA's - 83 //Issuer check failed - ])) { - $sslcert_issues = true; - - //When it's the certificate that doesn't work, we probe again without strict SSL. - $options['verify'] = false; - - $probe_start = microtime(true); - try { - $probe_data = $this->http->get($base_url . '/friendica/json', $options)->getBody()->getContents(); - } catch(RequestException $e) { - // Collects 404, 500 errors - $this->logger->info('SSL-non-verified URL probe failed with error code: ' . $e->getCode()); - } - } else { - $this->logger->info('SSL-verified URL probe failed with error code: ' . $e->getCode()); - } - } catch (\InvalidArgumentException $e) { - $this->logger->error('Invalid argument provided to HTTP client', ['base_url' => $base_url, 'exception' => $e]); - return ['data' => false, 'time' => 0, 'curl_info' => [], 'ssl_state' => null]; - } - + $probe_data = curl_exec($handle); $probe_end = microtime(true); + //Check for SSL problems. + $curl_statuscode = curl_errno($handle); + $sslcert_issues = in_array($curl_statuscode, array( + 60, //Could not authenticate certificate with known CA's + 83 //Issuer check failed + )); + + //When it's the certificate that doesn't work. + if ($sslcert_issues) { + //Probe again, without strict SSL. + $options[CURLOPT_SSL_VERIFYPEER] = false; + + //Replace the handle. + curl_close($handle); + $handle = curl_init(); + curl_setopt_array($handle, $options); + + //Probe. + $probe_start = microtime(true); + $probe_data = curl_exec($handle); + $probe_end = microtime(true); + + //Store new status. + $curl_statuscode = curl_errno($handle); + } + + //Gather more meta. $time = round(($probe_end - $probe_start) * 1000); + $curl_info = curl_getinfo($handle); + + //Done with CURL now. + curl_close($handle); try { $data = json_decode($probe_data, true); @@ -411,24 +413,27 @@ class Server function discoverPoco($base_url): void { - $uri = Uri::withQueryValues(new Uri($base_url . '/poco'), ['fields' => 'urls', 'count' => 1000]); + $pocoUrl = $base_url . '/poco'; - try { - $response = $this->http->request('GET', $uri); - } catch (RequestException $e) { - $this->logger->info('Unsuccessful poco request: ' . $uri); + $webrequest = new WebRequest($pocoUrl); + $pocoJsonData = $webrequest->get(['fields' => 'urls', 'count' => 1000]); + + $this->logger->debug('WebRequest: ' . $webrequest->getLastFetchedUrl() . ' Status: ' . $webrequest->getLastStatus()); + + if ($webrequest->getLastStatus() != 200) { + $this->logger->info('Unsuccessful poco request: ' . $webrequest->getLastFetchedUrl()); return; } try { - $pocoFetchData = json_decode($response->getBody()->getContents()); + $pocoFetchData = json_decode($pocoJsonData); } catch (\Throwable $e) { - $this->logger->notice('Invalid JSON string for PoCo URL: ' . $uri); + $this->logger->notice('Invalid JSON string for PoCo URL: ' . $webrequest->getLastFetchedUrl()); return; } if (!isset($pocoFetchData->entry)) { - $this->logger->notice('Invalid JSON structure for PoCo URL: ' . $uri); + $this->logger->notice('Invalid JSON structure for PoCo URL: ' . $webrequest->getLastFetchedUrl()); return; } @@ -447,45 +452,4 @@ class Server } } } - - public function getSubscribeUrl($base_url, $profile) - { - $uri = Uri::withQueryValues(new Uri($base_url . '/xrd'), ['uri' => $profile]); - - try { - $response = $this->http->request('GET', $uri, ['headers' => ['Accept' => 'application/jrd+json']]); - } catch (RequestException $e) { - $this->logger->info('Unsuccessful xrd request: ' . $uri); - return null; - } - - $xrdJsonData = $response->getBody()->getContents(); - - $this->logger->debug('WebRequest: ' . $uri . ' Status: ' . $response->getStatusCode()); - - if ($response->getStatusCode() != 200) { - $this->logger->info('Unsuccessful XRD request: ' . $uri); - return null; - } - - try { - $xrdData = json_decode($xrdJsonData); - } catch (\Throwable $e) { - $this->logger->notice('Invalid JSON string for XRD URL: ' . $uri); - return null; - } - - if (!isset($xrdData->links)) { - $this->logger->notice('Invalid JSON structure for XRD URL: ' . $uri); - return null; - } - - foreach ($xrdData->links as $link) { - if ($link->rel == 'http://ostatus.org/schema/1.0/subscribe') { - return $link->template ?? null; - } - } - - return null; - } } diff --git a/src/classes/Routes/Http/MatchSearch.php b/src/classes/Routes/Http/MatchSearch.php index 1c70ba6..7590b71 100644 --- a/src/classes/Routes/Http/MatchSearch.php +++ b/src/classes/Routes/Http/MatchSearch.php @@ -10,6 +10,7 @@ class MatchSearch extends BaseRoute public function __invoke(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args): \Slim\Http\Response { return (new \Friendica\Directory\Controllers\Api\MatchSearch( + $this->container->atlas, $this->container->get(\Friendica\Directory\Models\Profile::class), $this->container->l10n ))->render($request, $response, $args); diff --git a/src/classes/Routes/Http/Photo.php b/src/classes/Routes/Http/Photo.php index 8b1e6e1..6afb643 100644 --- a/src/classes/Routes/Http/Photo.php +++ b/src/classes/Routes/Http/Photo.php @@ -10,8 +10,7 @@ class Photo extends BaseRoute public function __invoke(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args): \Slim\Http\Response { return (new \Friendica\Directory\Controllers\Api\Photo( - $this->container->atlas, - $this->container->get('defaultProfilePictureSmallPath') + $this->container->atlas ))->render($request, $response, $args); } } diff --git a/src/classes/Routes/Http/Search.php b/src/classes/Routes/Http/Search.php index ba4a533..b9db49d 100644 --- a/src/classes/Routes/Http/Search.php +++ b/src/classes/Routes/Http/Search.php @@ -10,6 +10,7 @@ class Search extends BaseRoute public function __invoke(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args): \Slim\Http\Response { return (new \Friendica\Directory\Controllers\Api\Search( + $this->container->atlas, $this->container->get(\Friendica\Directory\Models\Profile::class), $this->container->l10n ))->render($request, $response, $args); diff --git a/src/classes/Routes/Web/Directory.php b/src/classes/Routes/Web/Directory.php index f5228b2..5d70edc 100644 --- a/src/classes/Routes/Web/Directory.php +++ b/src/classes/Routes/Web/Directory.php @@ -13,7 +13,6 @@ class Directory extends BaseRoute $this->controller = new \Friendica\Directory\Controllers\Web\Directory( $this->container->atlas, - $this->container->get(\Friendica\Directory\Models\Server::class), $this->container->get(\Friendica\Directory\Models\Profile::class), $this->container->get(\Friendica\Directory\Views\Widget\AccountTypeTabs::class), $this->container->renderer, diff --git a/src/classes/Routes/Web/Search.php b/src/classes/Routes/Web/Search.php index 324c5ba..d758053 100644 --- a/src/classes/Routes/Web/Search.php +++ b/src/classes/Routes/Web/Search.php @@ -13,7 +13,6 @@ class Search extends BaseRoute $this->controller = new \Friendica\Directory\Controllers\Web\Search( $this->container->atlas, - $this->container->get(\Friendica\Directory\Models\Server::class), $this->container->get(\Friendica\Directory\Models\Profile::class), $this->container->get(\Friendica\Directory\Views\Widget\AccountTypeTabs::class), $this->container->renderer, diff --git a/src/classes/Utils/L10n.php b/src/classes/Utils/L10n.php index b2b37a9..849b8f9 100644 --- a/src/classes/Utils/L10n.php +++ b/src/classes/Utils/L10n.php @@ -165,12 +165,12 @@ class L10n $foundLang = $language; } if (strtolower($key) == strtolower(str_replace('-', '_', $locale))) { - $foundLocale = $language; + $foundLocale = true; break; } } - return $foundLocale ?: $foundLang ?: $locale; + return $foundLocale ? $language : $foundLang ?: $locale; } /** diff --git a/src/classes/Utils/Network.php b/src/classes/Utils/Network.php index 1542fc8..14b0c13 100644 --- a/src/classes/Utils/Network.php +++ b/src/classes/Utils/Network.php @@ -15,6 +15,56 @@ namespace Friendica\Directory\Utils; */ class Network { + const USER_AGENT = 'friendica-directory-probe-1.0'; + + public static function fetchURL(string $url, bool $binary = false, int $timeout = 20): string + { + $ch = curl_init($url); + if (!$ch) { + return false; + } + + curl_setopt($ch, CURLOPT_HEADER, 0); + curl_setopt($ch, CURLOPT_TIMEOUT, max($timeout, 1)); //Minimum of 1 second timeout. + curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true); + curl_setopt($ch, CURLOPT_MAXREDIRS, 8); + curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); + curl_setopt($ch, CURLOPT_USERAGENT, self::USER_AGENT); + if ($binary) { + curl_setopt($ch, CURLOPT_BINARYTRANSFER, 1); + } + curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false); + $s = curl_exec($ch); + curl_close($ch); + return $s; + } + + public static function testURL(string $url, int $timeout = 20): bool + { + $ch = curl_init($url); + if (!$ch) { + return false; + } + + curl_setopt($ch, CURLOPT_HEADER , 0); + curl_setopt($ch, CURLOPT_TIMEOUT , max($timeout, 1)); //Minimum of 1 second timeout. + curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true); + curl_setopt($ch, CURLOPT_MAXREDIRS , 8); + curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, true); + curl_setopt($ch, CURLOPT_NOBODY , true); + curl_setopt($ch, CURLOPT_USERAGENT , self::USER_AGENT); + + curl_exec($ch); + + $responseCode = intval(curl_getinfo($ch, CURLINFO_RESPONSE_CODE)); + + $testSuccess = curl_errno($ch) === 0 && $responseCode < 400; + + curl_close($ch); + + return $testSuccess; + } + /** * Check if a hostname is public and non-reserved * diff --git a/src/classes/Utils/Scrape.php b/src/classes/Utils/Scrape.php index f9f31ac..2189b58 100644 --- a/src/classes/Utils/Scrape.php +++ b/src/classes/Utils/Scrape.php @@ -2,8 +2,6 @@ namespace Friendica\Directory\Utils; -use GuzzleHttp\ClientInterface; - /** * @author Hypolite Petovan */ @@ -14,10 +12,10 @@ class Scrape * @param string $url * @return array|false */ - public static function retrieveNoScrapeData(ClientInterface $http, string $url) + public static function retrieveNoScrapeData(string $url) { $submit_noscrape_start = microtime(true); - $data = $http->get($url)->getBody()->getContents(); + $data = Network::fetchURL($url); $submit_noscrape_request_end = microtime(true); if (empty($data)) { @@ -44,7 +42,7 @@ class Scrape return $params; } - public static function retrieveProfileData(ClientInterface $http, string $url, int $max_nodes = 3500): array + public static function retrieveProfileData(string $url, int $max_nodes = 3500): array { $minNodes = 100; //Lets do at least 100 nodes per type. @@ -58,7 +56,7 @@ class Scrape $scrape_start = microtime(true); $params = []; - $html = $http->get($url, ['timeout' => $timeout])->getBody()->getContents();; + $html = Network::fetchURL($url, false, $timeout); $scrape_fetch_end = microtime(true); diff --git a/src/classes/Views/PhpRenderer.php b/src/classes/Views/PhpRenderer.php index 43205ad..3df40ac 100644 --- a/src/classes/Views/PhpRenderer.php +++ b/src/classes/Views/PhpRenderer.php @@ -206,7 +206,7 @@ class PhpRenderer extends \Slim\Views\PhpRenderer { if ($this->getAttribute('zrl')) { $uri = new \ByJG\Util\Uri($url); - $uri->withQueryKeyValue('zrl', $this->getAttribute('zrl'), false); + $uri->withQueryKeyValue('zrl', $this->getAttribute('zrl')); $url = $uri->__toString(); } diff --git a/src/classes/Views/Widget/AccountTypeTabs.php b/src/classes/Views/Widget/AccountTypeTabs.php index 0dc234d..b0b6c09 100644 --- a/src/classes/Views/Widget/AccountTypeTabs.php +++ b/src/classes/Views/Widget/AccountTypeTabs.php @@ -56,9 +56,7 @@ class AccountTypeTabs case 'People' : $title = $this->renderer->np__('account-type', 'People (%d)' , 'People (%d)' , $account_type['count']); break; case 'News' : $title = $this->renderer->np__('account-type', 'News (%d)' , 'News (%d)' , $account_type['count']); break; case 'Organization': $title = $this->renderer->np__('account-type', 'Organization (%d)', 'Organizations (%d)', $account_type['count']); break; - // Kept for backward compatibility - case 'Forum' : - case 'Group' : $title = $this->renderer->np__('account-type', 'Group (%d)' , 'Groups (%d)' , $account_type['count']); break; + case 'Forum' : $title = $this->renderer->np__('account-type', 'Forum (%d)' , 'Forums (%d)' , $account_type['count']); break; default: $title = $this->renderer->np__('account-type', $account_type['account_type']. ' (%d)', $account_type['account_type']. ' (%d)', $account_type['count']); } diff --git a/src/dependencies.php b/src/dependencies.php index 5ab5608..162ace8 100644 --- a/src/dependencies.php +++ b/src/dependencies.php @@ -89,18 +89,6 @@ $container['migration'] = function (ContainerInterface $c): ByJG\DbMigration\Mig return $migration; }; -$container['http'] = function (ContainerInterface $c): GuzzleHttp\ClientInterface { - $version = file_get_contents(__DIR__ . '/../VERSION'); - - if (!$version || !preg_match('/^\s*\d\.\d\.\d\s*$/', $version)) { - $version = '0.0.0'; - } - - return new GuzzleHttp\Client(['timeout' => 20, 'headers' => ['User-Agent' => 'FriendicaDirectory/' . trim($version) . ' ' . \GuzzleHttp\default_user_agent()]]); -}; - -$container['defaultProfilePictureSmallPath'] = __DIR__ . '/../public/assets/images/default-profile-sm.jpg'; - // Internal Dependency Injection $container[\Friendica\Directory\Models\Profile::class] = function (ContainerInterface $c): Friendica\Directory\Models\Profile { @@ -118,7 +106,7 @@ $container[\Friendica\Directory\Models\Server::class] = function (ContainerInter $container[\Friendica\Directory\Pollers\Directory::class] = function (ContainerInterface $c): Friendica\Directory\Pollers\Directory { $settings = $c->get('settings')['poller']; return new Friendica\Directory\Pollers\Directory( - $c->get('http'), + $c->get('atlas'), $c->get(\Friendica\Directory\Models\ProfilePollQueue::class), $c->get('logger'), $settings ?: [] @@ -129,7 +117,6 @@ $container[\Friendica\Directory\Pollers\Profile::class] = function (ContainerInt $settings = $c->get('settings')['poller']; return new Friendica\Directory\Pollers\Profile( $c->get('atlas'), - $c->get('http'), $c->get(\Friendica\Directory\Models\Server::class), $c->get(\Friendica\Directory\Models\Profile::class), $c->get('logger'), @@ -141,7 +128,6 @@ $container[\Friendica\Directory\Pollers\Server::class] = function (ContainerInte $settings = $c->get('settings')['poller']; return new Friendica\Directory\Pollers\Server( $c->get('atlas'), - $c->get('http'), $c->get(\Friendica\Directory\Models\ProfilePollQueue::class), $c->get(\Friendica\Directory\Models\Server::class), $c->get('simplecache'), diff --git a/src/lang/ar/LC_MESSAGES/strings.mo b/src/lang/ar/LC_MESSAGES/strings.mo index 8a39c18..a5cca22 100644 Binary files a/src/lang/ar/LC_MESSAGES/strings.mo and b/src/lang/ar/LC_MESSAGES/strings.mo differ diff --git a/src/lang/ar/LC_MESSAGES/strings.po b/src/lang/ar/LC_MESSAGES/strings.po index 0526737..0e59837 100644 --- a/src/lang/ar/LC_MESSAGES/strings.po +++ b/src/lang/ar/LC_MESSAGES/strings.po @@ -1,25 +1,27 @@ +# +# Translators: +# ButterflyOfFire, 2019 +# msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"Last-Translator: abidin toumi , 2021\n" +"POT-Creation-Date: 2018-11-16T04:17:37+00:00\n" +"PO-Revision-Date: 2018-11-16 20:30+0000\n" +"Last-Translator: ButterflyOfFire, 2019\n" "Language-Team: Arabic (https://www.transifex.com/Friendica/teams/12172/ar/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"POT-Creation-Date: 2018-11-16T04:17:37+00:00\n" -"PO-Revision-Date: 2018-11-16 20:30+0000\n" "Language: ar\n" "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n" "X-Generator: Poedit 2.2\n" -#: src\classes\Content\Pager.php:168 -#: src\classes\Content\Pager.php:216 +#: src\classes\Content\Pager.php:168 src\classes\Content\Pager.php:216 msgid "Previous" msgstr "السابقة" -#: src\classes\Content\Pager.php:173 -#: src\classes\Content\Pager.php:273 +#: src\classes\Content\Pager.php:173 src\classes\Content\Pager.php:273 msgid "Next" msgstr "التالية" @@ -31,69 +33,63 @@ msgstr "الأولى" msgid "Last" msgstr "الأخيرة" -#: src\classes\Controllers\Web\Directory.php:85 +#: src\classes\Controllers\Web\Directory.php:73 msgid "People" msgstr "أشخاص" -#: src\classes\Controllers\Web\Search.php:72 +#: src\classes\Controllers\Web\Search.php:64 msgctxt "field" msgid "Language" msgstr "اللغة" -#: src\classes\Controllers\Web\Search.php:73 +#: src\classes\Controllers\Web\Search.php:65 msgctxt "field" msgid "Locality" -msgstr "المنطقة" +msgstr "" -#: src\classes\Controllers\Web\Search.php:74 +#: src\classes\Controllers\Web\Search.php:66 msgctxt "field" msgid "Region" -msgstr "الإقليم" +msgstr "المنطقة" -#: src\classes\Controllers\Web\Search.php:75 +#: src\classes\Controllers\Web\Search.php:67 msgctxt "field" msgid "Country" msgstr "البلد" -#: src\classes\Controllers\Web\Servers.php:105 +#: src\classes\Controllers\Web\Servers.php:90 msgid "Public Servers" msgstr "الخوادم العمومية" -#: src\templates\layout.phtml:4 -#: src\templates\layout.phtml:18 +#: src\templates\layout.phtml:4 src\templates\layout.phtml:18 msgid "Friendica Directory" -msgstr "دليل فرنديكا" +msgstr "" -#: src\templates\layout.phtml:23 -#: src\templates\layout.phtml:25 -#: src\templates\layout.phtml:43 -#: src\templates\layout.phtml:45 -#: src\templates\search.phtml:4 -#: src\templates\search.phtml:12 +#: src\templates\layout.phtml:23 src\templates\layout.phtml:25 +#: src\templates\layout.phtml:43 src\templates\layout.phtml:45 +#: src\templates\search.phtml:4 src\templates\search.phtml:12 msgid "Search terms" -msgstr "مصطلحات البحث" +msgstr "" -#: src\templates\layout.phtml:24 -#: src\templates\layout.phtml:45 +#: src\templates\layout.phtml:24 src\templates\layout.phtml:45 #: src\templates\search.phtml:11 msgctxt "noun" msgid "Search" -msgstr "ابحث" +msgstr "البحث" -#: src\templates\layout.phtml:27 -#: src\templates\layout.phtml:47 +#: src\templates\layout.phtml:27 src\templates\layout.phtml:47 #: src\templates\search.phtml:14 msgctxt "verb" msgid "Search" -msgstr "ابحث" +msgstr "البحث" #: src\templates\layout.phtml:33 msgid "Toggle navigation" -msgstr "بدل التصفح" +msgstr "" #: src\templates\layout.phtml:55 msgid "Directory" -msgstr "الدليل" +msgstr "" #: src\templates\layout.phtml:60 msgid "Public servers" @@ -102,95 +98,87 @@ msgstr "الخوادم العمومية" #: src\templates\search.phtml:19 msgid "%d result for \"%s\"" msgid_plural "%d results for \"%s\"" -msgstr[0] "%d نتائج لـ \"%s\"" -msgstr[1] "نتيجة %d لـ \"%s\"" -msgstr[2] "نتيجتان %d لـ \"%s\"" -msgstr[3] "%d نتائج لـ \"%s\"" -msgstr[4] "%d نتيجة لـ \"%s\"" -msgstr[5] "%dنتيجة لـ \"%s\"" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" +msgstr[4] "" +msgstr[5] "" -#: src\templates\servers.phtml:7 +#: src\templates\servers.phtml:2 msgid "Top servers pagination" msgstr "" -#: src\templates\servers.phtml:17 +#: src\templates\servers.phtml:12 msgid "Bottom servers pagination" msgstr "" #: src\templates\sub\profile.phtml:5 msgid "Filter by locality" -msgstr "رشح حسب المنطقة" +msgstr "" #: src\templates\sub\profile.phtml:11 msgid "Filter by region" -msgstr "رشح حسب الإقليم" +msgstr "تصفية حسب المنطقة" #: src\templates\sub\profile.phtml:17 msgid "Filter by country" -msgstr "رشح حسب الدولة" +msgstr "تصفية حسب الدولة" #: src\templates\sub\profile.phtml:31 -#: src\templates\sub\profile.phtml:35 -#: src\templates\sub\profile.phtml:39 msgctxt "verb" msgid "Follow" -msgstr "تابع" +msgstr "اتبع" -#: src\templates\layout.phtml:65 -#: src\templates\sub\profile.phtml:57 +#: src\templates\layout.phtml:65 src\templates\sub\profile.phtml:47 msgid "Language" msgstr "اللغة" -#: src\templates\sub\profile.phtml:60 -#: src\templates\widget\popularserverlanguages.phtml:2 +#: src\templates\sub\profile.phtml:50 msgid "Filter by language" -msgstr "رشح حسب اللغة" +msgstr "تصفية حسب اللغة" -#: src\templates\sub\profile.phtml:66 +#: src\templates\sub\profile.phtml:56 msgid "Location" -msgstr "الموقع" +msgstr "" -#: src\templates\sub\profile.phtml:79 +#: src\templates\sub\profile.phtml:69 msgid "Search Tag" -msgstr "ابحث عن وسم" +msgstr "" #: src\templates\sub\profiles.phtml:1 msgid "Account type tabs" -msgstr "ألسنة نوع الحساب" +msgstr "" -#: src\templates\sub\profiles.phtml:4 -#: src\templates\sub\profiles.phtml:7 +#: src\templates\sub\profiles.phtml:4 src\templates\sub\profiles.phtml:7 msgid "Top %s pagination" msgstr "" -#: src\templates\sub\profiles.phtml:13 -#: src\templates\sub\profiles.phtml:16 +#: src\templates\sub\profiles.phtml:13 src\templates\sub\profiles.phtml:16 msgid "Bottom %s pagination" msgstr "" -#: src\templates\statistics.phtml:66 -#: src\templates\sub\server.phtml:15 +#: src\templates\statistics.phtml:66 src\templates\sub\server.phtml:15 msgid "Stable Version" -msgstr "الإصدار المستقر" +msgstr "إصدار ثابت" -#: src\templates\statistics.phtml:68 -#: src\templates\sub\server.phtml:17 +#: src\templates\statistics.phtml:68 src\templates\sub\server.phtml:17 msgid "Develop Version" -msgstr "الإصدار الاختباري" +msgstr "إصدار قيد التطوير" #: src\templates\sub\server.phtml:19 msgid "Outdated Version" msgstr "إصدار قديم" -#: src\templates\sub\server.phtml:69 +#: src\templates\sub\server.phtml:55 msgid "Admin" msgstr "المدير" -#: src\templates\sub\server.phtml:76 +#: src\templates\sub\server.phtml:62 msgid "No description provided" -msgstr "لم يقدم أي وصف" +msgstr "لم يتم تقديم أي وصف" -#: src\templates\sub\server.phtml:79 +#: src\templates\sub\server.phtml:65 msgid "Visit Server" msgstr "زُر الخادم" @@ -198,7 +186,7 @@ msgstr "زُر الخادم" msgid "Popular Countries" msgstr "البلدان الشائعة" -#: src\templates\widget\popularprofilelanguages.phtml:2 +#: src\templates\widget\popularlanguages.phtml:2 msgid "Popular Languages" msgstr "اللغات الشائعة" @@ -206,8 +194,7 @@ msgstr "اللغات الشائعة" msgid "Popular Tags" msgstr "الوسوم الشائعة" -#: src\templates\sub\server.phtml:44 -#: src\templates\sub\server.phtml:45 +#: src\templates\sub\server.phtml:44 src\templates\sub\server.phtml:45 msgid "Default Language" msgstr "اللغة الافتراضية" @@ -224,143 +211,6 @@ msgstr "الكل" msgctxt "account-type" msgid "People (%d)" msgid_plural "People (%d)" -msgstr[0] "أشخاص (%d)" -msgstr[1] "أشخاص (%d)" -msgstr[2] "أشخاص (%d)" -msgstr[3] "أشخاص (%d)" -msgstr[4] "أشخاص (%d)" -msgstr[5] "أشخاص (%d)" - -#: src\templates\layout.phtml:97 -msgid "Stats" -msgstr "الإحصائيات" - -#: src\templates\statistics.phtml:4 -msgid "Directory statistics" -msgstr "إحصائيات الدليل" - -#: src\templates\statistics.phtml:5 -msgid "Profiles" -msgstr "الملفات الشخصية" - -#: src\templates\statistics.phtml:6 -msgid "This directory knows about %s distinct potential profile URLs." -msgstr "" - -#: src\templates\statistics.phtml:16 -#: src\templates\statistics.phtml:46 -msgid "Languages" -msgstr "اللغات" - -#: src\templates\statistics.phtml:17 -msgid "Out of %s profiles reporting their language there are:" -msgstr "من بين %s ملفا شخصيا عرف عن لغته هناك:" - -#: src\templates\statistics.phtml:27 -msgid "Servers" -msgstr "الخوادم" - -#: src\templates\statistics.phtml:28 -msgid "This directory knows about %s distinct potential server URLs." -msgstr "" - -#: src\templates\statistics.phtml:29 -msgid "Out of those, there are %s domains (%s) that have been a Friendica server at least once." -msgstr "" - -#: src\templates\statistics.phtml:33 -msgid "Out of those, there are:" -msgstr "من بين هؤلاء هناك:" - -#: src\templates\statistics.phtml:47 -msgid "Out of %s servers reporting their language there are:" -msgstr "من بين %s خادما عرف عن لغته هناك:" - -#: src\templates\statistics.phtml:57 -msgid "Versions" -msgstr "الإصدارات" - -#: src\templates\statistics.phtml:58 -msgid "Out of %s servers reporting their version there are:" -msgstr "من بين %s خادما عرف عن إصداره هناك:" - -#: src\templates\statistics.phtml:7 -msgid "Out of those, there are %s profiles (%s) that opted in the public directory at least once." -msgstr "" - -#: src\templates\statistics.phtml:35 -msgid "%s available servers (%s)" -msgstr "%s خادم متوفر (%s)" - -#: src\templates\layout.phtml:91 -msgid "Friendica Directory version %s" -msgstr "إصدار دليل فرنديكا %s" - -#: src\templates\statistics.phtml:11 -msgid "Out of those, there currently are %s available profiles (%s). Check them out!" -msgstr "" - -#: src\templates\statistics.phtml:39 -msgid "%s public servers (%s) currently open for registration. Check them out!" -msgstr "يوجد %s خادم عمومي (%s) مفتوح للستجيل. ألق نظرة عليهم!" - -#: src\classes\Views\Widget\AccountTypeTabs.php:57 -msgctxt "account-type" -msgid "News (%d)" -msgid_plural "News (%d)" -msgstr[0] "أخبار (%d)" -msgstr[1] "أخبار (%d)" -msgstr[2] "أخبار (%d)" -msgstr[3] "أخبار (%d)" -msgstr[4] "أخبار (%d)" -msgstr[5] "أخبار (%d)" - -#: src\classes\Views\Widget\AccountTypeTabs.php:58 -msgctxt "account-type" -msgid "Organization (%d)" -msgid_plural "Organizations (%d)" -msgstr[0] "منظمات (%d)" -msgstr[1] "منظمات (%d)" -msgstr[2] "منظمات (%d)" -msgstr[3] "منظمات (%d)" -msgstr[4] "منظمات (%d)" -msgstr[5] "منظمات (%d)" - -#: src\templates\sub\server.phtml:40 -msgid "Health Score" -msgstr "تقييم الصحة" - -#: src\templates\sub\server.phtml:52 -msgid "%s User" -msgid_plural "%s Users" -msgstr[0] "لا مستخدمين %s" -msgstr[1] "مستخدم %s" -msgstr[2] "مستخدمان %s" -msgstr[3] "%s مستخدمين" -msgstr[4] "%s مستخدما" -msgstr[5] "%s مستخدم" - -#: src\templates\sub\server.phtml:54 -msgid "None" -msgstr "لا شيء" - -#: src\templates\sub\server.phtml:58 -#: src\templates\sub\server.phtml:62 -msgid "Registration Policy" -msgstr "سياسة التسجيل" - -#: src\templates\sub\server.phtml:59 -msgid "By Approval" -msgstr "يحتاج الموافقة" - -#: src\templates\sub\server.phtml:63 -msgid "Open" -msgstr "مفتوح" - -#: src\classes\Views\Widget\AccountTypeTabs.php:61 -msgctxt "account-type" -msgid "Group (%d)" -msgid_plural "Groups (%d)" msgstr[0] "" msgstr[1] "" msgstr[2] "" @@ -368,14 +218,102 @@ msgstr[3] "" msgstr[4] "" msgstr[5] "" -#: src\templates\servers.phtml:3 -msgid "Filtered by language:" +#: src\classes\Views\Widget\AccountTypeTabs.php:57 +msgctxt "account-type" +msgid "Forum (%d)" +msgid_plural "Forums (%d)" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" +msgstr[4] "" +msgstr[5] "" + +#: src\templates\layout.phtml:97 +msgid "Stats" +msgstr "الإحصائيات" + +#: src\templates\statistics.phtml:4 +msgid "Directory statistics" +msgstr "إحصائيات السِجِل" + +#: src\templates\statistics.phtml:5 +msgid "Profiles" +msgstr "الملفات الشخصية" + +#: src\templates\statistics.phtml:6 +msgid "" +"This directory knows about %s distinct potential profile " +"URLs." msgstr "" -#: src\templates\servers.phtml:3 -msgid "Clear language filter" +#: src\templates\statistics.phtml:16 src\templates\statistics.phtml:46 +msgid "Languages" +msgstr "اللغات" + +#: src\templates\statistics.phtml:17 +msgid "" +"Out of %s profiles reporting their language there are:" +msgstr "" + +#: src\templates\statistics.phtml:27 +msgid "Servers" +msgstr "الخوادم" + +#: src\templates\statistics.phtml:28 +msgid "" +"This directory knows about %s distinct potential server " +"URLs." +msgstr "" + +#: src\templates\statistics.phtml:29 +msgid "" +"Out of those, there are %s domains (%s) that have been a " +"Friendica server at least once." +msgstr "" + +#: src\templates\statistics.phtml:33 +msgid "Out of those, there are:" +msgstr "" + +#: src\templates\statistics.phtml:47 +msgid "Out of %s servers reporting their language there are:" +msgstr "" + +#: src\templates\statistics.phtml:57 +msgid "Versions" +msgstr "الإصدارات" + +#: src\templates\statistics.phtml:58 +msgid "Out of %s servers reporting their version there are:" +msgstr "" + +#: src\templates\statistics.phtml:7 +msgid "" +"Out of those, there are %s profiles (%s) that opted in the " +"public directory at least once." +msgstr "" + +#: src\templates\statistics.phtml:35 +msgid "%s available servers (%s)" +msgstr "" + +#: src\templates\layout.phtml:91 +msgid "Friendica Directory version %s" msgstr "" #: src\templates\layout.phtml:94 -msgid "Source Code on Friendica's Forgejo" +msgid "Source Code on GitHub" +msgstr "الشفرة المصدرية على غيت هب" + +#: src\templates\statistics.phtml:11 +msgid "" +"Out of those, there currently are %s available profiles " +"(%s). Check them out!" +msgstr "" + +#: src\templates\statistics.phtml:39 +msgid "" +"%s public servers (%s) currently open for registration. Check them out!" msgstr "" diff --git a/src/lang/ca/LC_MESSAGES/strings.po b/src/lang/ca/LC_MESSAGES/strings.po index c9ab323..518c6fd 100644 --- a/src/lang/ca/LC_MESSAGES/strings.po +++ b/src/lang/ca/LC_MESSAGES/strings.po @@ -1,25 +1,27 @@ +# +# Translators: +# Joan Bar , 2019 +# msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2018-11-16T04:17:37+00:00\n" +"PO-Revision-Date: 2018-11-16 20:30+0000\n" "Last-Translator: Joan Bar , 2019\n" "Language-Team: Catalan (https://www.transifex.com/Friendica/teams/12172/ca/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"POT-Creation-Date: 2018-11-16T04:17:37+00:00\n" -"PO-Revision-Date: 2018-11-16 20:30+0000\n" "Language: ca\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Poedit 2.2\n" -#: src\classes\Content\Pager.php:168 -#: src\classes\Content\Pager.php:216 +#: src\classes\Content\Pager.php:168 src\classes\Content\Pager.php:216 msgid "Previous" msgstr "prèvia" -#: src\classes\Content\Pager.php:173 -#: src\classes\Content\Pager.php:273 +#: src\classes\Content\Pager.php:173 src\classes\Content\Pager.php:273 msgid "Next" msgstr "següent" @@ -31,57 +33,51 @@ msgstr "Primer" msgid "Last" msgstr "Ultim" -#: src\classes\Controllers\Web\Directory.php:85 +#: src\classes\Controllers\Web\Directory.php:73 msgid "People" msgstr "gent" -#: src\classes\Controllers\Web\Search.php:72 +#: src\classes\Controllers\Web\Search.php:64 msgctxt "field" msgid "Language" msgstr "Llengua" -#: src\classes\Controllers\Web\Search.php:73 +#: src\classes\Controllers\Web\Search.php:65 msgctxt "field" msgid "Locality" msgstr "Localitat" -#: src\classes\Controllers\Web\Search.php:74 +#: src\classes\Controllers\Web\Search.php:66 msgctxt "field" msgid "Region" msgstr "Regió" -#: src\classes\Controllers\Web\Search.php:75 +#: src\classes\Controllers\Web\Search.php:67 msgctxt "field" msgid "Country" msgstr "País" -#: src\classes\Controllers\Web\Servers.php:105 +#: src\classes\Controllers\Web\Servers.php:90 msgid "Public Servers" msgstr "Servidors públics" -#: src\templates\layout.phtml:4 -#: src\templates\layout.phtml:18 +#: src\templates\layout.phtml:4 src\templates\layout.phtml:18 msgid "Friendica Directory" msgstr "Directori de Friendica" -#: src\templates\layout.phtml:23 -#: src\templates\layout.phtml:25 -#: src\templates\layout.phtml:43 -#: src\templates\layout.phtml:45 -#: src\templates\search.phtml:4 -#: src\templates\search.phtml:12 +#: src\templates\layout.phtml:23 src\templates\layout.phtml:25 +#: src\templates\layout.phtml:43 src\templates\layout.phtml:45 +#: src\templates\search.phtml:4 src\templates\search.phtml:12 msgid "Search terms" msgstr "Termes de cerca" -#: src\templates\layout.phtml:24 -#: src\templates\layout.phtml:45 +#: src\templates\layout.phtml:24 src\templates\layout.phtml:45 #: src\templates\search.phtml:11 msgctxt "noun" msgid "Search" msgstr "Buscar" -#: src\templates\layout.phtml:27 -#: src\templates\layout.phtml:47 +#: src\templates\layout.phtml:27 src\templates\layout.phtml:47 #: src\templates\search.phtml:14 msgctxt "verb" msgid "Search" @@ -105,11 +101,11 @@ msgid_plural "%d results for \"%s\"" msgstr[0] "" msgstr[1] "" -#: src\templates\servers.phtml:7 +#: src\templates\servers.phtml:2 msgid "Top servers pagination" msgstr "Paginació dels servidors principals" -#: src\templates\servers.phtml:17 +#: src\templates\servers.phtml:12 msgid "Bottom servers pagination" msgstr "Paginació dels servidors principals" @@ -126,27 +122,23 @@ msgid "Filter by country" msgstr "Filtra per País" #: src\templates\sub\profile.phtml:31 -#: src\templates\sub\profile.phtml:35 -#: src\templates\sub\profile.phtml:39 msgctxt "verb" msgid "Follow" msgstr "seguir" -#: src\templates\layout.phtml:65 -#: src\templates\sub\profile.phtml:57 +#: src\templates\layout.phtml:65 src\templates\sub\profile.phtml:47 msgid "Language" msgstr "Llenguatge " -#: src\templates\sub\profile.phtml:60 -#: src\templates\widget\popularserverlanguages.phtml:2 +#: src\templates\sub\profile.phtml:50 msgid "Filter by language" msgstr "" -#: src\templates\sub\profile.phtml:66 +#: src\templates\sub\profile.phtml:56 msgid "Location" msgstr "Localitat" -#: src\templates\sub\profile.phtml:79 +#: src\templates\sub\profile.phtml:69 msgid "Search Tag" msgstr "Etiqueta de cerca" @@ -154,23 +146,19 @@ msgstr "Etiqueta de cerca" msgid "Account type tabs" msgstr "Pestanyes tipus compte" -#: src\templates\sub\profiles.phtml:4 -#: src\templates\sub\profiles.phtml:7 +#: src\templates\sub\profiles.phtml:4 src\templates\sub\profiles.phtml:7 msgid "Top %s pagination" msgstr "Superior%s Paginació" -#: src\templates\sub\profiles.phtml:13 -#: src\templates\sub\profiles.phtml:16 +#: src\templates\sub\profiles.phtml:13 src\templates\sub\profiles.phtml:16 msgid "Bottom %s pagination" msgstr "" -#: src\templates\statistics.phtml:66 -#: src\templates\sub\server.phtml:15 +#: src\templates\statistics.phtml:66 src\templates\sub\server.phtml:15 msgid "Stable Version" msgstr "" -#: src\templates\statistics.phtml:68 -#: src\templates\sub\server.phtml:17 +#: src\templates\statistics.phtml:68 src\templates\sub\server.phtml:17 msgid "Develop Version" msgstr "Desenvolupar la versió" @@ -178,15 +166,15 @@ msgstr "Desenvolupar la versió" msgid "Outdated Version" msgstr "Versió obsoleta" -#: src\templates\sub\server.phtml:69 +#: src\templates\sub\server.phtml:55 msgid "Admin" msgstr "Administrador" -#: src\templates\sub\server.phtml:76 +#: src\templates\sub\server.phtml:62 msgid "No description provided" msgstr "No es proporciona cap descripció" -#: src\templates\sub\server.phtml:79 +#: src\templates\sub\server.phtml:65 msgid "Visit Server" msgstr "Visita servidor" @@ -194,7 +182,7 @@ msgstr "Visita servidor" msgid "Popular Countries" msgstr "Països populars" -#: src\templates\widget\popularprofilelanguages.phtml:2 +#: src\templates\widget\popularlanguages.phtml:2 msgid "Popular Languages" msgstr "Idiomes populars" @@ -202,8 +190,7 @@ msgstr "Idiomes populars" msgid "Popular Tags" msgstr "Etiquetes populars" -#: src\templates\sub\server.phtml:44 -#: src\templates\sub\server.phtml:45 +#: src\templates\sub\server.phtml:44 src\templates\sub\server.phtml:45 msgid "Default Language" msgstr "Idioma per defecte" @@ -223,6 +210,13 @@ msgid_plural "People (%d)" msgstr[0] "" msgstr[1] "" +#: src\classes\Views\Widget\AccountTypeTabs.php:57 +msgctxt "account-type" +msgid "Forum (%d)" +msgid_plural "Forums (%d)" +msgstr[0] "" +msgstr[1] "" + #: src\templates\layout.phtml:97 msgid "Stats" msgstr "Estadístiques" @@ -236,29 +230,39 @@ msgid "Profiles" msgstr "perfil" #: src\templates\statistics.phtml:6 -msgid "This directory knows about %s distinct potential profile URLs." +msgid "" +"This directory knows about %s distinct potential profile " +"URLs." msgstr "Aquest directori en sap %s URL de perfil diferents." -#: src\templates\statistics.phtml:16 -#: src\templates\statistics.phtml:46 +#: src\templates\statistics.phtml:16 src\templates\statistics.phtml:46 msgid "Languages" msgstr "Idiomes" #: src\templates\statistics.phtml:17 -msgid "Out of %s profiles reporting their language there are:" -msgstr "Fora de%s Els perfils que informen el seu idioma hi ha:" +msgid "" +"Out of %s profiles reporting their language there are:" +msgstr "" +"Fora de%s Els perfils que informen el seu idioma hi ha:" #: src\templates\statistics.phtml:27 msgid "Servers" msgstr "Servidors" #: src\templates\statistics.phtml:28 -msgid "This directory knows about %s distinct potential server URLs." -msgstr "Aquest directori en sap %s URL de servidor diferents." +msgid "" +"This directory knows about %s distinct potential server " +"URLs." +msgstr "" +"Aquest directori en sap %s URL de servidor diferents." #: src\templates\statistics.phtml:29 -msgid "Out of those, there are %s domains (%s) that have been a Friendica server at least once." -msgstr "D’aquests, n’hi ha %s dominis (%s) que han estat un servidor Friendica com a mínim una vegada." +msgid "" +"Out of those, there are %s domains (%s) that have been a " +"Friendica server at least once." +msgstr "" +"D’aquests, n’hi ha %s dominis (%s) que han estat un " +"servidor Friendica com a mínim una vegada." #: src\templates\statistics.phtml:33 msgid "Out of those, there are:" @@ -266,7 +270,8 @@ msgstr "D'aquests, hi ha:" #: src\templates\statistics.phtml:47 msgid "Out of %s servers reporting their language there are:" -msgstr "Fora de %s hi ha servidors que informen del seu idioma:" +msgstr "" +"Fora de %s hi ha servidors que informen del seu idioma:" #: src\templates\statistics.phtml:57 msgid "Versions" @@ -274,11 +279,16 @@ msgstr "Versions" #: src\templates\statistics.phtml:58 msgid "Out of %s servers reporting their version there are:" -msgstr "Fora de%s Hi ha servidors que informen de la seva versió:" +msgstr "" +"Fora de%s Hi ha servidors que informen de la seva versió:" #: src\templates\statistics.phtml:7 -msgid "Out of those, there are %s profiles (%s) that opted in the public directory at least once." -msgstr "D’aquests, n’hi ha %s perfil (%s) que va optar al directori públic almenys una vegada." +msgid "" +"Out of those, there are %s profiles (%s) that opted in the " +"public directory at least once." +msgstr "" +"D’aquests, n’hi ha %s perfil (%s) que va optar al directori" +" públic almenys una vegada." #: src\templates\statistics.phtml:35 msgid "%s available servers (%s)" @@ -288,70 +298,18 @@ msgstr "%s servidors disponibles (%s)" msgid "Friendica Directory version %s" msgstr "Versió del directori Friendica" +#: src\templates\layout.phtml:94 +msgid "Source Code on GitHub" +msgstr "Codi font a GitHub" + #: src\templates\statistics.phtml:11 -msgid "Out of those, there currently are %s available profiles (%s). Check them out!" +msgid "" +"Out of those, there currently are %s available profiles " +"(%s). Check them out!" msgstr "" #: src\templates\statistics.phtml:39 -msgid "%s public servers (%s) currently open for registration. Check them out!" -msgstr "" - -#: src\classes\Views\Widget\AccountTypeTabs.php:57 -msgctxt "account-type" -msgid "News (%d)" -msgid_plural "News (%d)" -msgstr[0] "" -msgstr[1] "" - -#: src\classes\Views\Widget\AccountTypeTabs.php:58 -msgctxt "account-type" -msgid "Organization (%d)" -msgid_plural "Organizations (%d)" -msgstr[0] "" -msgstr[1] "" - -#: src\classes\Views\Widget\AccountTypeTabs.php:61 -msgctxt "account-type" -msgid "Group (%d)" -msgid_plural "Groups (%d)" -msgstr[0] "" -msgstr[1] "" - -#: src\templates\servers.phtml:3 -msgid "Filtered by language:" -msgstr "" - -#: src\templates\servers.phtml:3 -msgid "Clear language filter" -msgstr "" - -#: src\templates\sub\server.phtml:40 -msgid "Health Score" -msgstr "" - -#: src\templates\sub\server.phtml:52 -msgid "%s User" -msgid_plural "%s Users" -msgstr[0] "" -msgstr[1] "" - -#: src\templates\sub\server.phtml:54 -msgid "None" -msgstr "" - -#: src\templates\sub\server.phtml:58 -#: src\templates\sub\server.phtml:62 -msgid "Registration Policy" -msgstr "" - -#: src\templates\sub\server.phtml:59 -msgid "By Approval" -msgstr "" - -#: src\templates\sub\server.phtml:63 -msgid "Open" -msgstr "" - -#: src\templates\layout.phtml:94 -msgid "Source Code on Friendica's Forgejo" +msgid "" +"%s public servers (%s) currently open for registration. Check them out!" msgstr "" diff --git a/src/lang/cs/LC_MESSAGES/strings.po b/src/lang/cs/LC_MESSAGES/strings.po index 082c5b4..737b6ed 100644 --- a/src/lang/cs/LC_MESSAGES/strings.po +++ b/src/lang/cs/LC_MESSAGES/strings.po @@ -1,25 +1,27 @@ +# +# Translators: +# Aditoo, 2019 +# msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2018-11-16T04:17:37+00:00\n" +"PO-Revision-Date: 2018-11-16 20:30+0000\n" "Last-Translator: Aditoo, 2019\n" "Language-Team: Czech (https://www.transifex.com/Friendica/teams/12172/cs/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"POT-Creation-Date: 2018-11-16T04:17:37+00:00\n" -"PO-Revision-Date: 2018-11-16 20:30+0000\n" "Language: cs\n" "Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n" "X-Generator: Poedit 2.2\n" -#: src\classes\Content\Pager.php:168 -#: src\classes\Content\Pager.php:216 +#: src\classes\Content\Pager.php:168 src\classes\Content\Pager.php:216 msgid "Previous" msgstr "Předchozí" -#: src\classes\Content\Pager.php:173 -#: src\classes\Content\Pager.php:273 +#: src\classes\Content\Pager.php:173 src\classes\Content\Pager.php:273 msgid "Next" msgstr "Další" @@ -31,57 +33,51 @@ msgstr "První" msgid "Last" msgstr "Poslední" -#: src\classes\Controllers\Web\Directory.php:85 +#: src\classes\Controllers\Web\Directory.php:73 msgid "People" msgstr "Lidé" -#: src\classes\Controllers\Web\Search.php:72 +#: src\classes\Controllers\Web\Search.php:64 msgctxt "field" msgid "Language" msgstr "Jazyk" -#: src\classes\Controllers\Web\Search.php:73 +#: src\classes\Controllers\Web\Search.php:65 msgctxt "field" msgid "Locality" msgstr "Poloha" -#: src\classes\Controllers\Web\Search.php:74 +#: src\classes\Controllers\Web\Search.php:66 msgctxt "field" msgid "Region" msgstr "Region/kraj" -#: src\classes\Controllers\Web\Search.php:75 +#: src\classes\Controllers\Web\Search.php:67 msgctxt "field" msgid "Country" msgstr "Země" -#: src\classes\Controllers\Web\Servers.php:105 +#: src\classes\Controllers\Web\Servers.php:90 msgid "Public Servers" msgstr "Veřejné servery" -#: src\templates\layout.phtml:4 -#: src\templates\layout.phtml:18 +#: src\templates\layout.phtml:4 src\templates\layout.phtml:18 msgid "Friendica Directory" msgstr "Adresář Friendica" -#: src\templates\layout.phtml:23 -#: src\templates\layout.phtml:25 -#: src\templates\layout.phtml:43 -#: src\templates\layout.phtml:45 -#: src\templates\search.phtml:4 -#: src\templates\search.phtml:12 +#: src\templates\layout.phtml:23 src\templates\layout.phtml:25 +#: src\templates\layout.phtml:43 src\templates\layout.phtml:45 +#: src\templates\search.phtml:4 src\templates\search.phtml:12 msgid "Search terms" msgstr "Termíny vyhledávání" -#: src\templates\layout.phtml:24 -#: src\templates\layout.phtml:45 +#: src\templates\layout.phtml:24 src\templates\layout.phtml:45 #: src\templates\search.phtml:11 msgctxt "noun" msgid "Search" msgstr "Hledání" -#: src\templates\layout.phtml:27 -#: src\templates\layout.phtml:47 +#: src\templates\layout.phtml:27 src\templates\layout.phtml:47 #: src\templates\search.phtml:14 msgctxt "verb" msgid "Search" @@ -107,11 +103,11 @@ msgstr[1] "%d výsledky pro „%s“" msgstr[2] "%d výsledku pro „%s“" msgstr[3] "%d výsledků pro „%s“" -#: src\templates\servers.phtml:7 +#: src\templates\servers.phtml:2 msgid "Top servers pagination" msgstr "Horní stránkování serverů" -#: src\templates\servers.phtml:17 +#: src\templates\servers.phtml:12 msgid "Bottom servers pagination" msgstr "Spodní stránkování serverů" @@ -128,27 +124,23 @@ msgid "Filter by country" msgstr "Filtrovat dle země" #: src\templates\sub\profile.phtml:31 -#: src\templates\sub\profile.phtml:35 -#: src\templates\sub\profile.phtml:39 msgctxt "verb" msgid "Follow" msgstr "Sledovat" -#: src\templates\layout.phtml:65 -#: src\templates\sub\profile.phtml:57 +#: src\templates\layout.phtml:65 src\templates\sub\profile.phtml:47 msgid "Language" msgstr "Jazyk" -#: src\templates\sub\profile.phtml:60 -#: src\templates\widget\popularserverlanguages.phtml:2 +#: src\templates\sub\profile.phtml:50 msgid "Filter by language" msgstr "Filtrovat dle jazyka" -#: src\templates\sub\profile.phtml:66 +#: src\templates\sub\profile.phtml:56 msgid "Location" msgstr "Poloha" -#: src\templates\sub\profile.phtml:79 +#: src\templates\sub\profile.phtml:69 msgid "Search Tag" msgstr "Hledat podle štítku" @@ -156,23 +148,19 @@ msgstr "Hledat podle štítku" msgid "Account type tabs" msgstr "Záložky typů účtů" -#: src\templates\sub\profiles.phtml:4 -#: src\templates\sub\profiles.phtml:7 +#: src\templates\sub\profiles.phtml:4 src\templates\sub\profiles.phtml:7 msgid "Top %s pagination" msgstr "Horní stránkování %s" -#: src\templates\sub\profiles.phtml:13 -#: src\templates\sub\profiles.phtml:16 +#: src\templates\sub\profiles.phtml:13 src\templates\sub\profiles.phtml:16 msgid "Bottom %s pagination" msgstr "Spodní stránkování %s" -#: src\templates\statistics.phtml:66 -#: src\templates\sub\server.phtml:15 +#: src\templates\statistics.phtml:66 src\templates\sub\server.phtml:15 msgid "Stable Version" msgstr "Stabilní verze" -#: src\templates\statistics.phtml:68 -#: src\templates\sub\server.phtml:17 +#: src\templates\statistics.phtml:68 src\templates\sub\server.phtml:17 msgid "Develop Version" msgstr "Vývojová verze" @@ -180,15 +168,15 @@ msgstr "Vývojová verze" msgid "Outdated Version" msgstr "Neaktuální verze" -#: src\templates\sub\server.phtml:69 +#: src\templates\sub\server.phtml:55 msgid "Admin" msgstr "Administrátor" -#: src\templates\sub\server.phtml:76 +#: src\templates\sub\server.phtml:62 msgid "No description provided" msgstr "Není zadán žádný popis" -#: src\templates\sub\server.phtml:79 +#: src\templates\sub\server.phtml:65 msgid "Visit Server" msgstr "Navštívit server" @@ -196,7 +184,7 @@ msgstr "Navštívit server" msgid "Popular Countries" msgstr "Populární země" -#: src\templates\widget\popularprofilelanguages.phtml:2 +#: src\templates\widget\popularlanguages.phtml:2 msgid "Popular Languages" msgstr "Populární jazyky" @@ -204,8 +192,7 @@ msgstr "Populární jazyky" msgid "Popular Tags" msgstr "Populární štítky" -#: src\templates\sub\server.phtml:44 -#: src\templates\sub\server.phtml:45 +#: src\templates\sub\server.phtml:44 src\templates\sub\server.phtml:45 msgid "Default Language" msgstr "Výchozí jazyk" @@ -227,6 +214,15 @@ msgstr[1] "Lidé (%d)" msgstr[2] "Lidé (%d)" msgstr[3] "Lidé (%d)" +#: src\classes\Views\Widget\AccountTypeTabs.php:57 +msgctxt "account-type" +msgid "Forum (%d)" +msgid_plural "Forums (%d)" +msgstr[0] "Fóra (%d)" +msgstr[1] "Fóra (%d)" +msgstr[2] "Fóra (%d)" +msgstr[3] "Fóra (%d)" + #: src\templates\layout.phtml:97 msgid "Stats" msgstr "Statistika" @@ -240,16 +236,20 @@ msgid "Profiles" msgstr "Profily" #: src\templates\statistics.phtml:6 -msgid "This directory knows about %s distinct potential profile URLs." -msgstr "Tento adresář ví o %s zřetelných potenciálních profilových URL adresách." +msgid "" +"This directory knows about %s distinct potential profile " +"URLs." +msgstr "" +"Tento adresář ví o %s zřetelných potenciálních profilových URL " +"adresách." -#: src\templates\statistics.phtml:16 -#: src\templates\statistics.phtml:46 +#: src\templates\statistics.phtml:16 src\templates\statistics.phtml:46 msgid "Languages" msgstr "Jazyky" #: src\templates\statistics.phtml:17 -msgid "Out of %s profiles reporting their language there are:" +msgid "" +"Out of %s profiles reporting their language there are:" msgstr "Ze všech %s profilů hlásících svůj jazyk je tu:" #: src\templates\statistics.phtml:27 @@ -257,12 +257,20 @@ msgid "Servers" msgstr "Servery" #: src\templates\statistics.phtml:28 -msgid "This directory knows about %s distinct potential server URLs." -msgstr "Tento adresář ví o %s zřetelných potenciálních serverových URL adresách." +msgid "" +"This directory knows about %s distinct potential server " +"URLs." +msgstr "" +"Tento adresář ví o %s zřetelných potenciálních serverových URL " +"adresách." #: src\templates\statistics.phtml:29 -msgid "Out of those, there are %s domains (%s) that have been a Friendica server at least once." -msgstr "Z těch je tu %s domén (%s), které byly alespoň jednou serverem Friendica." +msgid "" +"Out of those, there are %s domains (%s) that have been a " +"Friendica server at least once." +msgstr "" +"Z těch je tu %s domén (%s), které byly alespoň jednou " +"serverem Friendica." #: src\templates\statistics.phtml:33 msgid "Out of those, there are:" @@ -281,8 +289,12 @@ msgid "Out of %s servers reporting their version there are:" msgstr "Ze všech %s serverů hlásících svou verzi je tu:" #: src\templates\statistics.phtml:7 -msgid "Out of those, there are %s profiles (%s) that opted in the public directory at least once." -msgstr "Z těch je tu %s profilů (%s), které byly alespoň jednou publikovány ve veřejném adresáři." +msgid "" +"Out of those, there are %s profiles (%s) that opted in the " +"public directory at least once." +msgstr "" +"Z těch je tu %s profilů (%s), které byly alespoň jednou " +"publikovány ve veřejném adresáři." #: src\templates\statistics.phtml:35 msgid "%s available servers (%s)" @@ -292,78 +304,18 @@ msgstr "%s dostupných serverů (%s)" msgid "Friendica Directory version %s" msgstr "Adresář Friendica, verze %s" +#: src\templates\layout.phtml:94 +msgid "Source Code on GitHub" +msgstr "Zdrojový kód na GitHubu" + #: src\templates\statistics.phtml:11 -msgid "Out of those, there currently are %s available profiles (%s). Check them out!" +msgid "" +"Out of those, there currently are %s available profiles " +"(%s). Check them out!" msgstr "" #: src\templates\statistics.phtml:39 -msgid "%s public servers (%s) currently open for registration. Check them out!" -msgstr "" - -#: src\classes\Views\Widget\AccountTypeTabs.php:57 -msgctxt "account-type" -msgid "News (%d)" -msgid_plural "News (%d)" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" - -#: src\classes\Views\Widget\AccountTypeTabs.php:58 -msgctxt "account-type" -msgid "Organization (%d)" -msgid_plural "Organizations (%d)" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" - -#: src\classes\Views\Widget\AccountTypeTabs.php:61 -msgctxt "account-type" -msgid "Group (%d)" -msgid_plural "Groups (%d)" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" - -#: src\templates\servers.phtml:3 -msgid "Filtered by language:" -msgstr "" - -#: src\templates\servers.phtml:3 -msgid "Clear language filter" -msgstr "" - -#: src\templates\sub\server.phtml:40 -msgid "Health Score" -msgstr "" - -#: src\templates\sub\server.phtml:52 -msgid "%s User" -msgid_plural "%s Users" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" - -#: src\templates\sub\server.phtml:54 -msgid "None" -msgstr "" - -#: src\templates\sub\server.phtml:58 -#: src\templates\sub\server.phtml:62 -msgid "Registration Policy" -msgstr "" - -#: src\templates\sub\server.phtml:59 -msgid "By Approval" -msgstr "" - -#: src\templates\sub\server.phtml:63 -msgid "Open" -msgstr "" - -#: src\templates\layout.phtml:94 -msgid "Source Code on Friendica's Forgejo" +msgid "" +"%s public servers (%s) currently open for registration. Check them out!" msgstr "" diff --git a/src/lang/da_DK/LC_MESSAGES/strings.mo b/src/lang/da_DK/LC_MESSAGES/strings.mo deleted file mode 100644 index b3aa05f..0000000 Binary files a/src/lang/da_DK/LC_MESSAGES/strings.mo and /dev/null differ diff --git a/src/lang/da_DK/LC_MESSAGES/strings.po b/src/lang/da_DK/LC_MESSAGES/strings.po deleted file mode 100644 index 5e5a60e..0000000 --- a/src/lang/da_DK/LC_MESSAGES/strings.po +++ /dev/null @@ -1,357 +0,0 @@ -msgid "" -msgstr "" -"Project-Id-Version: \n" -"Report-Msgid-Bugs-To: \n" -"Last-Translator: Anton , 2022\n" -"Language-Team: Danish (Denmark) (https://www.transifex.com/Friendica/teams/12172/da_DK/)\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"POT-Creation-Date: 2018-11-16T04:17:37+00:00\n" -"PO-Revision-Date: 2018-11-16 20:30+0000\n" -"Language: da_DK\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 2.2\n" - -#: src\classes\Content\Pager.php:168 -#: src\classes\Content\Pager.php:216 -msgid "Previous" -msgstr "Forrige" - -#: src\classes\Content\Pager.php:173 -#: src\classes\Content\Pager.php:273 -msgid "Next" -msgstr "Næste" - -#: src\classes\Content\Pager.php:211 -msgid "First" -msgstr "Første" - -#: src\classes\Content\Pager.php:278 -msgid "Last" -msgstr "Sidste" - -#: src\classes\Controllers\Web\Directory.php:85 -msgid "People" -msgstr "Mennesker" - -#: src\classes\Controllers\Web\Search.php:72 -msgctxt "field" -msgid "Language" -msgstr "Sprog" - -#: src\classes\Controllers\Web\Search.php:73 -msgctxt "field" -msgid "Locality" -msgstr "Lokalitet" - -#: src\classes\Controllers\Web\Search.php:74 -msgctxt "field" -msgid "Region" -msgstr "Region" - -#: src\classes\Controllers\Web\Search.php:75 -msgctxt "field" -msgid "Country" -msgstr "Land" - -#: src\classes\Controllers\Web\Servers.php:105 -msgid "Public Servers" -msgstr "Offentlige servere" - -#: src\templates\layout.phtml:4 -#: src\templates\layout.phtml:18 -msgid "Friendica Directory" -msgstr "Friendica adressebog" - -#: src\templates\layout.phtml:23 -#: src\templates\layout.phtml:25 -#: src\templates\layout.phtml:43 -#: src\templates\layout.phtml:45 -#: src\templates\search.phtml:4 -#: src\templates\search.phtml:12 -msgid "Search terms" -msgstr "Søgetermer" - -#: src\templates\layout.phtml:24 -#: src\templates\layout.phtml:45 -#: src\templates\search.phtml:11 -msgctxt "noun" -msgid "Search" -msgstr "Søg" - -#: src\templates\layout.phtml:27 -#: src\templates\layout.phtml:47 -#: src\templates\search.phtml:14 -msgctxt "verb" -msgid "Search" -msgstr "Søg" - -#: src\templates\layout.phtml:33 -msgid "Toggle navigation" -msgstr "Skift navigation" - -#: src\templates\layout.phtml:55 -msgid "Directory" -msgstr "Adressebog" - -#: src\templates\layout.phtml:60 -msgid "Public servers" -msgstr "Offentlige servere" - -#: src\templates\search.phtml:19 -msgid "%d result for \"%s\"" -msgid_plural "%d results for \"%s\"" -msgstr[0] "%d resultat for \"%s\"" -msgstr[1] "%d resultater for \"%s\"" - -#: src\templates\servers.phtml:7 -msgid "Top servers pagination" -msgstr "Top servere sideopdeling" - -#: src\templates\servers.phtml:17 -msgid "Bottom servers pagination" -msgstr "Bundservere sideopdeling" - -#: src\templates\sub\profile.phtml:5 -msgid "Filter by locality" -msgstr "Filtrer efter lokalitet" - -#: src\templates\sub\profile.phtml:11 -msgid "Filter by region" -msgstr "Filtrer efter region" - -#: src\templates\sub\profile.phtml:17 -msgid "Filter by country" -msgstr "Filtrer efter land" - -#: src\templates\sub\profile.phtml:31 -#: src\templates\sub\profile.phtml:35 -#: src\templates\sub\profile.phtml:39 -msgctxt "verb" -msgid "Follow" -msgstr "Følg" - -#: src\templates\layout.phtml:65 -#: src\templates\sub\profile.phtml:57 -msgid "Language" -msgstr "Sprog" - -#: src\templates\sub\profile.phtml:60 -#: src\templates\widget\popularserverlanguages.phtml:2 -msgid "Filter by language" -msgstr "Filtrer efter sprog" - -#: src\templates\sub\profile.phtml:66 -msgid "Location" -msgstr "Placering" - -#: src\templates\sub\profile.phtml:79 -msgid "Search Tag" -msgstr "Søgetag" - -#: src\templates\sub\profiles.phtml:1 -msgid "Account type tabs" -msgstr "Kontotypefaner" - -#: src\templates\sub\profiles.phtml:4 -#: src\templates\sub\profiles.phtml:7 -msgid "Top %s pagination" -msgstr "Top %s sideopdeling" - -#: src\templates\sub\profiles.phtml:13 -#: src\templates\sub\profiles.phtml:16 -msgid "Bottom %s pagination" -msgstr "Bund %s sideopdeling" - -#: src\templates\statistics.phtml:66 -#: src\templates\sub\server.phtml:15 -msgid "Stable Version" -msgstr "Stabil version" - -#: src\templates\statistics.phtml:68 -#: src\templates\sub\server.phtml:17 -msgid "Develop Version" -msgstr "Udviklingsversion" - -#: src\templates\sub\server.phtml:19 -msgid "Outdated Version" -msgstr "Forældet version" - -#: src\templates\sub\server.phtml:69 -msgid "Admin" -msgstr "Admin" - -#: src\templates\sub\server.phtml:76 -msgid "No description provided" -msgstr "Ingen beskrivelse givet" - -#: src\templates\sub\server.phtml:79 -msgid "Visit Server" -msgstr "Besøg server" - -#: src\templates\widget\popularcountries.phtml:2 -msgid "Popular Countries" -msgstr "Populære lande" - -#: src\templates\widget\popularprofilelanguages.phtml:2 -msgid "Popular Languages" -msgstr "Populære sprog" - -#: src\templates\widget\populartags.phtml:2 -msgid "Popular Tags" -msgstr "Populære tags" - -#: src\templates\sub\server.phtml:44 -#: src\templates\sub\server.phtml:45 -msgid "Default Language" -msgstr "Standard sprog" - -#: src\templates\sub\server.phtml:49 -msgid "Known Users" -msgstr "Kendte brugere" - -#: src\classes\Views\Widget\AccountTypeTabs.php:48 -msgctxt "account-type" -msgid "All" -msgstr "Alle" - -#: src\classes\Views\Widget\AccountTypeTabs.php:56 -msgctxt "account-type" -msgid "People (%d)" -msgid_plural "People (%d)" -msgstr[0] "Mennesker (%d)" -msgstr[1] "Mennesker (%d)" - -#: src\templates\layout.phtml:97 -msgid "Stats" -msgstr "Statistik" - -#: src\templates\statistics.phtml:4 -msgid "Directory statistics" -msgstr "Adressebog statistik" - -#: src\templates\statistics.phtml:5 -msgid "Profiles" -msgstr "Profiler" - -#: src\templates\statistics.phtml:6 -msgid "This directory knows about %s distinct potential profile URLs." -msgstr "Denne adressebog kender til %s særskilte potentielle profil-URL'er." - -#: src\templates\statistics.phtml:16 -#: src\templates\statistics.phtml:46 -msgid "Languages" -msgstr "Sprog" - -#: src\templates\statistics.phtml:17 -msgid "Out of %s profiles reporting their language there are:" -msgstr "Ud af %s profiler som rapporterer deres sprog, er der:" - -#: src\templates\statistics.phtml:27 -msgid "Servers" -msgstr "Servere" - -#: src\templates\statistics.phtml:28 -msgid "This directory knows about %s distinct potential server URLs." -msgstr "Denne adressebog kender til %s særskilte potentielle server-URL'er." - -#: src\templates\statistics.phtml:29 -msgid "Out of those, there are %s domains (%s) that have been a Friendica server at least once." -msgstr "Ud af dem er der %s domæner (%s) som har været en Friendica server mindst én gang." - -#: src\templates\statistics.phtml:33 -msgid "Out of those, there are:" -msgstr "Ud af dem er der:" - -#: src\templates\statistics.phtml:47 -msgid "Out of %s servers reporting their language there are:" -msgstr "Ud af %s servere som rapporterer deres sprog, er der:" - -#: src\templates\statistics.phtml:57 -msgid "Versions" -msgstr "Versioner" - -#: src\templates\statistics.phtml:58 -msgid "Out of %s servers reporting their version there are:" -msgstr "Ud af %s servere som rapporterer deres version, er der:" - -#: src\templates\statistics.phtml:7 -msgid "Out of those, there are %s profiles (%s) that opted in the public directory at least once." -msgstr "Ud af dem er der %s profiler (%s) som tilvalgte den offentlige adressebog mindst én gang." - -#: src\templates\statistics.phtml:35 -msgid "%s available servers (%s)" -msgstr "%s tilgængelige servere (%s)" - -#: src\templates\layout.phtml:91 -msgid "Friendica Directory version %s" -msgstr "Friendica adressebogsversion %s" - -#: src\templates\statistics.phtml:11 -msgid "Out of those, there currently are %s available profiles (%s). Check them out!" -msgstr "Ud af dem er der i øjeblikket %s tilgængelige profiler (%s). Tjek dem ud!" - -#: src\templates\statistics.phtml:39 -msgid "%s public servers (%s) currently open for registration. Check them out!" -msgstr "%s offentlige servere (%s) åben for registrering lige nu. Tjek dem ud!" - -#: src\classes\Views\Widget\AccountTypeTabs.php:57 -msgctxt "account-type" -msgid "News (%d)" -msgid_plural "News (%d)" -msgstr[0] "Nyheder (%d)" -msgstr[1] "Nyheder (%d)" - -#: src\classes\Views\Widget\AccountTypeTabs.php:58 -msgctxt "account-type" -msgid "Organization (%d)" -msgid_plural "Organizations (%d)" -msgstr[0] "Organisationer (%d)" -msgstr[1] "Organisationer (%d)" - -#: src\templates\sub\server.phtml:40 -msgid "Health Score" -msgstr "Sundhedsscore" - -#: src\templates\sub\server.phtml:52 -msgid "%s User" -msgid_plural "%s Users" -msgstr[0] "%s bruger" -msgstr[1] "%s brugere" - -#: src\templates\sub\server.phtml:54 -msgid "None" -msgstr "Ingen" - -#: src\templates\sub\server.phtml:58 -#: src\templates\sub\server.phtml:62 -msgid "Registration Policy" -msgstr "Registreringspolitik" - -#: src\templates\sub\server.phtml:59 -msgid "By Approval" -msgstr "Ved godkendelse" - -#: src\templates\sub\server.phtml:63 -msgid "Open" -msgstr "Åben" - -#: src\classes\Views\Widget\AccountTypeTabs.php:61 -msgctxt "account-type" -msgid "Group (%d)" -msgid_plural "Groups (%d)" -msgstr[0] "" -msgstr[1] "" - -#: src\templates\servers.phtml:3 -msgid "Filtered by language:" -msgstr "" - -#: src\templates\servers.phtml:3 -msgid "Clear language filter" -msgstr "" - -#: src\templates\layout.phtml:94 -msgid "Source Code on Friendica's Forgejo" -msgstr "" diff --git a/src/lang/de/LC_MESSAGES/strings.po b/src/lang/de/LC_MESSAGES/strings.po index 4b40c88..e4016e4 100644 --- a/src/lang/de/LC_MESSAGES/strings.po +++ b/src/lang/de/LC_MESSAGES/strings.po @@ -1,25 +1,29 @@ +# +# Translators: +# Andreas H., 2018 +# Ulf Rompe , 2019 +# Tobias Diekershoff , 2020 +# msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2018-11-16T04:17:37+00:00\n" +"PO-Revision-Date: 2018-11-16 20:30+0000\n" "Last-Translator: Tobias Diekershoff , 2020\n" "Language-Team: German (https://www.transifex.com/Friendica/teams/12172/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"POT-Creation-Date: 2018-11-16T04:17:37+00:00\n" -"PO-Revision-Date: 2018-11-16 20:30+0000\n" "Language: de\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Poedit 2.2\n" -#: src\classes\Content\Pager.php:168 -#: src\classes\Content\Pager.php:216 +#: src\classes\Content\Pager.php:168 src\classes\Content\Pager.php:216 msgid "Previous" msgstr "Vorherige" -#: src\classes\Content\Pager.php:173 -#: src\classes\Content\Pager.php:273 +#: src\classes\Content\Pager.php:173 src\classes\Content\Pager.php:273 msgid "Next" msgstr "Nächste" @@ -31,57 +35,51 @@ msgstr "Erste" msgid "Last" msgstr "Letzte" -#: src\classes\Controllers\Web\Directory.php:85 +#: src\classes\Controllers\Web\Directory.php:73 msgid "People" msgstr "Leute" -#: src\classes\Controllers\Web\Search.php:72 +#: src\classes\Controllers\Web\Search.php:64 msgctxt "field" msgid "Language" msgstr "Sprache" -#: src\classes\Controllers\Web\Search.php:73 +#: src\classes\Controllers\Web\Search.php:65 msgctxt "field" msgid "Locality" msgstr "Wohnort" -#: src\classes\Controllers\Web\Search.php:74 +#: src\classes\Controllers\Web\Search.php:66 msgctxt "field" msgid "Region" msgstr "Region" -#: src\classes\Controllers\Web\Search.php:75 +#: src\classes\Controllers\Web\Search.php:67 msgctxt "field" msgid "Country" msgstr "Land" -#: src\classes\Controllers\Web\Servers.php:105 +#: src\classes\Controllers\Web\Servers.php:90 msgid "Public Servers" msgstr "Öffentlicher Server" -#: src\templates\layout.phtml:4 -#: src\templates\layout.phtml:18 +#: src\templates\layout.phtml:4 src\templates\layout.phtml:18 msgid "Friendica Directory" msgstr "Friendica Verzeichnis" -#: src\templates\layout.phtml:23 -#: src\templates\layout.phtml:25 -#: src\templates\layout.phtml:43 -#: src\templates\layout.phtml:45 -#: src\templates\search.phtml:4 -#: src\templates\search.phtml:12 +#: src\templates\layout.phtml:23 src\templates\layout.phtml:25 +#: src\templates\layout.phtml:43 src\templates\layout.phtml:45 +#: src\templates\search.phtml:4 src\templates\search.phtml:12 msgid "Search terms" msgstr "Suchbegriff" -#: src\templates\layout.phtml:24 -#: src\templates\layout.phtml:45 +#: src\templates\layout.phtml:24 src\templates\layout.phtml:45 #: src\templates\search.phtml:11 msgctxt "noun" msgid "Search" msgstr "Suche" -#: src\templates\layout.phtml:27 -#: src\templates\layout.phtml:47 +#: src\templates\layout.phtml:27 src\templates\layout.phtml:47 #: src\templates\search.phtml:14 msgctxt "verb" msgid "Search" @@ -105,11 +103,11 @@ msgid_plural "%d results for \"%s\"" msgstr[0] "%d Ergebnisse für \"%s\"" msgstr[1] "%d Ergebnisse für \"%s\"" -#: src\templates\servers.phtml:7 +#: src\templates\servers.phtml:2 msgid "Top servers pagination" msgstr "Höchste Serverwertung" -#: src\templates\servers.phtml:17 +#: src\templates\servers.phtml:12 msgid "Bottom servers pagination" msgstr "Niedrigste Serverwertung" @@ -126,27 +124,23 @@ msgid "Filter by country" msgstr "Filter nach Land" #: src\templates\sub\profile.phtml:31 -#: src\templates\sub\profile.phtml:35 -#: src\templates\sub\profile.phtml:39 msgctxt "verb" msgid "Follow" msgstr "Folge" -#: src\templates\layout.phtml:65 -#: src\templates\sub\profile.phtml:57 +#: src\templates\layout.phtml:65 src\templates\sub\profile.phtml:47 msgid "Language" msgstr "Sprache" -#: src\templates\sub\profile.phtml:60 -#: src\templates\widget\popularserverlanguages.phtml:2 +#: src\templates\sub\profile.phtml:50 msgid "Filter by language" msgstr "Filter nach Sprache" -#: src\templates\sub\profile.phtml:66 +#: src\templates\sub\profile.phtml:56 msgid "Location" msgstr "Ort" -#: src\templates\sub\profile.phtml:79 +#: src\templates\sub\profile.phtml:69 msgid "Search Tag" msgstr "Suchbegriff" @@ -154,23 +148,19 @@ msgstr "Suchbegriff" msgid "Account type tabs" msgstr "Konto-Typ Register" -#: src\templates\sub\profiles.phtml:4 -#: src\templates\sub\profiles.phtml:7 +#: src\templates\sub\profiles.phtml:4 src\templates\sub\profiles.phtml:7 msgid "Top %s pagination" msgstr "Top %s pagination" -#: src\templates\sub\profiles.phtml:13 -#: src\templates\sub\profiles.phtml:16 +#: src\templates\sub\profiles.phtml:13 src\templates\sub\profiles.phtml:16 msgid "Bottom %s pagination" msgstr "Bottom %s pagination" -#: src\templates\statistics.phtml:66 -#: src\templates\sub\server.phtml:15 +#: src\templates\statistics.phtml:66 src\templates\sub\server.phtml:15 msgid "Stable Version" msgstr "Stabile Version" -#: src\templates\statistics.phtml:68 -#: src\templates\sub\server.phtml:17 +#: src\templates\statistics.phtml:68 src\templates\sub\server.phtml:17 msgid "Develop Version" msgstr "Entwickler Version" @@ -178,15 +168,15 @@ msgstr "Entwickler Version" msgid "Outdated Version" msgstr "Abgelaufene Version" -#: src\templates\sub\server.phtml:69 +#: src\templates\sub\server.phtml:55 msgid "Admin" msgstr "Admin" -#: src\templates\sub\server.phtml:76 +#: src\templates\sub\server.phtml:62 msgid "No description provided" msgstr "Keine Beschreibung angeboten" -#: src\templates\sub\server.phtml:79 +#: src\templates\sub\server.phtml:65 msgid "Visit Server" msgstr "Besuche den Server" @@ -194,7 +184,7 @@ msgstr "Besuche den Server" msgid "Popular Countries" msgstr "Häufige Länder" -#: src\templates\widget\popularprofilelanguages.phtml:2 +#: src\templates\widget\popularlanguages.phtml:2 msgid "Popular Languages" msgstr "Häufige Sprachen" @@ -202,8 +192,7 @@ msgstr "Häufige Sprachen" msgid "Popular Tags" msgstr "Beliebte Tags" -#: src\templates\sub\server.phtml:44 -#: src\templates\sub\server.phtml:45 +#: src\templates\sub\server.phtml:44 src\templates\sub\server.phtml:45 msgid "Default Language" msgstr "Standard Sprache" @@ -223,6 +212,13 @@ msgid_plural "People (%d)" msgstr[0] "Personen (%d)" msgstr[1] "Personen (%d)" +#: src\classes\Views\Widget\AccountTypeTabs.php:57 +msgctxt "account-type" +msgid "Forum (%d)" +msgid_plural "Forums (%d)" +msgstr[0] "Foren (%d)" +msgstr[1] "Foren (%d)" + #: src\templates\layout.phtml:97 msgid "Stats" msgstr "Statistik" @@ -236,16 +232,20 @@ msgid "Profiles" msgstr "Profile" #: src\templates\statistics.phtml:6 -msgid "This directory knows about %s distinct potential profile URLs." -msgstr "Dieses Verzeichnis kennt %s unterschiedliche, potentielle Profil URLs" +msgid "" +"This directory knows about %s distinct potential profile " +"URLs." +msgstr "" +"Dieses Verzeichnis kennt %s unterschiedliche, potentielle Profil " +"URLs" -#: src\templates\statistics.phtml:16 -#: src\templates\statistics.phtml:46 +#: src\templates\statistics.phtml:16 src\templates\statistics.phtml:46 msgid "Languages" msgstr "Sprachen" #: src\templates\statistics.phtml:17 -msgid "Out of %s profiles reporting their language there are:" +msgid "" +"Out of %s profiles reporting their language there are:" msgstr "Von den %s Profilen, die ihre Sprache angeben, sind:" #: src\templates\statistics.phtml:27 @@ -253,12 +253,20 @@ msgid "Servers" msgstr "Server" #: src\templates\statistics.phtml:28 -msgid "This directory knows about %s distinct potential server URLs." -msgstr "Dieses Verzeichnis kennt %s unterschiedliche, potentielle Server URLs" +msgid "" +"This directory knows about %s distinct potential server " +"URLs." +msgstr "" +"Dieses Verzeichnis kennt %s unterschiedliche, potentielle Server " +"URLs" #: src\templates\statistics.phtml:29 -msgid "Out of those, there are %s domains (%s) that have been a Friendica server at least once." -msgstr "Von diesen gibt es %sDomänen(%s), die zumindest einmal Friendica Knoten gewesen sind." +msgid "" +"Out of those, there are %s domains (%s) that have been a " +"Friendica server at least once." +msgstr "" +"Von diesen gibt es %sDomänen(%s), die zumindest einmal " +"Friendica Knoten gewesen sind." #: src\templates\statistics.phtml:33 msgid "Out of those, there are:" @@ -266,7 +274,9 @@ msgstr "Von diesen sind:" #: src\templates\statistics.phtml:47 msgid "Out of %s servers reporting their language there are:" -msgstr "Von den %s Servern, die ihre Spracheinstellung angeben, sind:" +msgstr "" +"Von den %s Servern, die ihre Spracheinstellung angeben, " +"sind:" #: src\templates\statistics.phtml:57 msgid "Versions" @@ -277,8 +287,12 @@ msgid "Out of %s servers reporting their version there are:" msgstr "Von den %s Servern, die ihre Version angeben, sind:" #: src\templates\statistics.phtml:7 -msgid "Out of those, there are %s profiles (%s) that opted in the public directory at least once." -msgstr "Von diesen gibt es %sProfile (%s) die sich, zumindest einmal, für die Aufnahme in das öffentliche Verzeichnis entschlossen haben." +msgid "" +"Out of those, there are %s profiles (%s) that opted in the " +"public directory at least once." +msgstr "" +"Von diesen gibt es %sProfile (%s) die sich, zumindest " +"einmal, für die Aufnahme in das öffentliche Verzeichnis entschlossen haben." #: src\templates\statistics.phtml:35 msgid "%s available servers (%s)" @@ -288,70 +302,22 @@ msgstr "%sverfügbare Server (%s)" msgid "Friendica Directory version %s" msgstr "Friendica Verzeichnis Version %s" +#: src\templates\layout.phtml:94 +msgid "Source Code on GitHub" +msgstr "Quellcode auf GitHub" + #: src\templates\statistics.phtml:11 -msgid "Out of those, there currently are %s available profiles (%s). Check them out!" -msgstr "Von diesen sind derzeit %sverfügbare Profile (%s). Schaue sie dir an!" +msgid "" +"Out of those, there currently are %s available profiles " +"(%s). Check them out!" +msgstr "" +"Von diesen sind derzeit %sverfügbare Profile (%s). Schaue sie dir an!" #: src\templates\statistics.phtml:39 -msgid "%s public servers (%s) currently open for registration. Check them out!" -msgstr "%s öffentliche Server (%s) erlauben derzeit die Anmeldung. Schau sie dir an!" - -#: src\classes\Views\Widget\AccountTypeTabs.php:57 -msgctxt "account-type" -msgid "News (%d)" -msgid_plural "News (%d)" -msgstr[0] "" -msgstr[1] "" - -#: src\classes\Views\Widget\AccountTypeTabs.php:58 -msgctxt "account-type" -msgid "Organization (%d)" -msgid_plural "Organizations (%d)" -msgstr[0] "" -msgstr[1] "" - -#: src\classes\Views\Widget\AccountTypeTabs.php:61 -msgctxt "account-type" -msgid "Group (%d)" -msgid_plural "Groups (%d)" -msgstr[0] "" -msgstr[1] "" - -#: src\templates\servers.phtml:3 -msgid "Filtered by language:" -msgstr "" - -#: src\templates\servers.phtml:3 -msgid "Clear language filter" -msgstr "" - -#: src\templates\sub\server.phtml:40 -msgid "Health Score" -msgstr "" - -#: src\templates\sub\server.phtml:52 -msgid "%s User" -msgid_plural "%s Users" -msgstr[0] "" -msgstr[1] "" - -#: src\templates\sub\server.phtml:54 -msgid "None" -msgstr "" - -#: src\templates\sub\server.phtml:58 -#: src\templates\sub\server.phtml:62 -msgid "Registration Policy" -msgstr "" - -#: src\templates\sub\server.phtml:59 -msgid "By Approval" -msgstr "" - -#: src\templates\sub\server.phtml:63 -msgid "Open" -msgstr "" - -#: src\templates\layout.phtml:94 -msgid "Source Code on Friendica's Forgejo" +msgid "" +"%s public servers (%s) currently open for registration. Check them out!" msgstr "" +"%s öffentliche Server (%s) erlauben derzeit die Anmeldung. " +"Schau sie dir an!" diff --git a/src/lang/en/LC_MESSAGES/strings.po b/src/lang/en/LC_MESSAGES/strings.po index 5aa9f2b..2742946 100644 --- a/src/lang/en/LC_MESSAGES/strings.po +++ b/src/lang/en/LC_MESSAGES/strings.po @@ -31,31 +31,31 @@ msgstr "" msgid "Last" msgstr "" -#: src\classes\Controllers\Web\Directory.php:85 +#: src\classes\Controllers\Web\Directory.php:73 msgid "People" msgstr "" -#: src\classes\Controllers\Web\Search.php:72 +#: src\classes\Controllers\Web\Search.php:64 msgctxt "field" msgid "Language" msgstr "" -#: src\classes\Controllers\Web\Search.php:73 +#: src\classes\Controllers\Web\Search.php:65 msgctxt "field" msgid "Locality" msgstr "" -#: src\classes\Controllers\Web\Search.php:74 +#: src\classes\Controllers\Web\Search.php:66 msgctxt "field" msgid "Region" msgstr "" -#: src\classes\Controllers\Web\Search.php:75 +#: src\classes\Controllers\Web\Search.php:67 msgctxt "field" msgid "Country" msgstr "" -#: src\classes\Controllers\Web\Servers.php:105 +#: src\classes\Controllers\Web\Servers.php:90 msgid "Public Servers" msgstr "" @@ -105,11 +105,11 @@ msgid_plural "%d results for \"%s\"" msgstr[0] "" msgstr[1] "" -#: src\templates\servers.phtml:7 +#: src\templates\servers.phtml:2 msgid "Top servers pagination" msgstr "" -#: src\templates\servers.phtml:17 +#: src\templates\servers.phtml:12 msgid "Bottom servers pagination" msgstr "" @@ -126,27 +126,24 @@ msgid "Filter by country" msgstr "" #: src\templates\sub\profile.phtml:31 -#: src\templates\sub\profile.phtml:35 -#: src\templates\sub\profile.phtml:39 msgctxt "verb" msgid "Follow" msgstr "" #: src\templates\layout.phtml:65 -#: src\templates\sub\profile.phtml:57 +#: src\templates\sub\profile.phtml:47 msgid "Language" msgstr "" -#: src\templates\sub\profile.phtml:60 -#: src\templates\widget\popularserverlanguages.phtml:2 +#: src\templates\sub\profile.phtml:50 msgid "Filter by language" msgstr "" -#: src\templates\sub\profile.phtml:66 +#: src\templates\sub\profile.phtml:56 msgid "Location" msgstr "" -#: src\templates\sub\profile.phtml:79 +#: src\templates\sub\profile.phtml:69 msgid "Search Tag" msgstr "" @@ -178,15 +175,15 @@ msgstr "" msgid "Outdated Version" msgstr "" -#: src\templates\sub\server.phtml:69 +#: src\templates\sub\server.phtml:72 msgid "Admin" msgstr "" -#: src\templates\sub\server.phtml:76 +#: src\templates\sub\server.phtml:79 msgid "No description provided" msgstr "" -#: src\templates\sub\server.phtml:79 +#: src\templates\sub\server.phtml:82 msgid "Visit Server" msgstr "" @@ -194,7 +191,7 @@ msgstr "" msgid "Popular Countries" msgstr "" -#: src\templates\widget\popularprofilelanguages.phtml:2 +#: src\templates\widget\popularlanguages.phtml:2 msgid "Popular Languages" msgstr "" @@ -223,6 +220,13 @@ msgid_plural "People (%d)" msgstr[0] "" msgstr[1] "" +#: src\classes\Views\Widget\AccountTypeTabs.php:59 +msgctxt "account-type" +msgid "Forum (%d)" +msgid_plural "Forums (%d)" +msgstr[0] "" +msgstr[1] "" + #: src\templates\layout.phtml:97 msgid "Stats" msgstr "" @@ -288,6 +292,10 @@ msgstr "" msgid "Friendica Directory version %s" msgstr "" +#: src\templates\layout.phtml:94 +msgid "Source Code on GitHub" +msgstr "" + #: src\templates\statistics.phtml:11 msgid "Out of those, there currently are %s available profiles (%s). Check them out!" msgstr "" @@ -324,34 +332,15 @@ msgstr[1] "" msgid "None" msgstr "" -#: src\templates\sub\server.phtml:58 -#: src\templates\sub\server.phtml:62 +#: src\templates\sub\server.phtml:59 +#: src\templates\sub\server.phtml:63 msgid "Registration Policy" msgstr "" -#: src\templates\sub\server.phtml:59 +#: src\templates\sub\server.phtml:60 msgid "By Approval" msgstr "" -#: src\templates\sub\server.phtml:63 +#: src\templates\sub\server.phtml:64 msgid "Open" msgstr "" - -#: src\classes\Views\Widget\AccountTypeTabs.php:61 -msgctxt "account-type" -msgid "Group (%d)" -msgid_plural "Groups (%d)" -msgstr[0] "" -msgstr[1] "" - -#: src\templates\servers.phtml:3 -msgid "Filtered by language:" -msgstr "" - -#: src\templates\servers.phtml:3 -msgid "Clear language filter" -msgstr "" - -#: src\templates\layout.phtml:94 -msgid "Source Code on Friendica's Forgejo" -msgstr "" diff --git a/src/lang/en_GB/LC_MESSAGES/strings.po b/src/lang/en_GB/LC_MESSAGES/strings.po index 7738ced..2638e34 100644 --- a/src/lang/en_GB/LC_MESSAGES/strings.po +++ b/src/lang/en_GB/LC_MESSAGES/strings.po @@ -1,25 +1,27 @@ +# +# Translators: +# Andy H3 , 2020 +# msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2018-11-16T04:17:37+00:00\n" +"PO-Revision-Date: 2018-11-16 20:30+0000\n" "Last-Translator: Andy H3 , 2020\n" "Language-Team: English (United Kingdom) (https://www.transifex.com/Friendica/teams/12172/en_GB/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"POT-Creation-Date: 2018-11-16T04:17:37+00:00\n" -"PO-Revision-Date: 2018-11-16 20:30+0000\n" "Language: en_GB\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Poedit 2.2\n" -#: src\classes\Content\Pager.php:168 -#: src\classes\Content\Pager.php:216 +#: src\classes\Content\Pager.php:168 src\classes\Content\Pager.php:216 msgid "Previous" msgstr "Previous" -#: src\classes\Content\Pager.php:173 -#: src\classes\Content\Pager.php:273 +#: src\classes\Content\Pager.php:173 src\classes\Content\Pager.php:273 msgid "Next" msgstr "Next" @@ -31,57 +33,51 @@ msgstr "First" msgid "Last" msgstr "Last" -#: src\classes\Controllers\Web\Directory.php:85 +#: src\classes\Controllers\Web\Directory.php:73 msgid "People" msgstr "People" -#: src\classes\Controllers\Web\Search.php:72 +#: src\classes\Controllers\Web\Search.php:64 msgctxt "field" msgid "Language" msgstr "Language" -#: src\classes\Controllers\Web\Search.php:73 +#: src\classes\Controllers\Web\Search.php:65 msgctxt "field" msgid "Locality" msgstr "Locality" -#: src\classes\Controllers\Web\Search.php:74 +#: src\classes\Controllers\Web\Search.php:66 msgctxt "field" msgid "Region" msgstr "Region" -#: src\classes\Controllers\Web\Search.php:75 +#: src\classes\Controllers\Web\Search.php:67 msgctxt "field" msgid "Country" msgstr "Country" -#: src\classes\Controllers\Web\Servers.php:105 +#: src\classes\Controllers\Web\Servers.php:90 msgid "Public Servers" msgstr "Public servers" -#: src\templates\layout.phtml:4 -#: src\templates\layout.phtml:18 +#: src\templates\layout.phtml:4 src\templates\layout.phtml:18 msgid "Friendica Directory" msgstr "Friendica directory" -#: src\templates\layout.phtml:23 -#: src\templates\layout.phtml:25 -#: src\templates\layout.phtml:43 -#: src\templates\layout.phtml:45 -#: src\templates\search.phtml:4 -#: src\templates\search.phtml:12 +#: src\templates\layout.phtml:23 src\templates\layout.phtml:25 +#: src\templates\layout.phtml:43 src\templates\layout.phtml:45 +#: src\templates\search.phtml:4 src\templates\search.phtml:12 msgid "Search terms" msgstr "Search terms" -#: src\templates\layout.phtml:24 -#: src\templates\layout.phtml:45 +#: src\templates\layout.phtml:24 src\templates\layout.phtml:45 #: src\templates\search.phtml:11 msgctxt "noun" msgid "Search" msgstr "Search" -#: src\templates\layout.phtml:27 -#: src\templates\layout.phtml:47 +#: src\templates\layout.phtml:27 src\templates\layout.phtml:47 #: src\templates\search.phtml:14 msgctxt "verb" msgid "Search" @@ -105,11 +101,11 @@ msgid_plural "%d results for \"%s\"" msgstr[0] "%d result for \"%s\"" msgstr[1] "%d results for \"%s\"" -#: src\templates\servers.phtml:7 +#: src\templates\servers.phtml:2 msgid "Top servers pagination" msgstr "Top servers pagination" -#: src\templates\servers.phtml:17 +#: src\templates\servers.phtml:12 msgid "Bottom servers pagination" msgstr "Bottom servers pagination" @@ -126,27 +122,23 @@ msgid "Filter by country" msgstr "Filter by country" #: src\templates\sub\profile.phtml:31 -#: src\templates\sub\profile.phtml:35 -#: src\templates\sub\profile.phtml:39 msgctxt "verb" msgid "Follow" msgstr "Follow" -#: src\templates\layout.phtml:65 -#: src\templates\sub\profile.phtml:57 +#: src\templates\layout.phtml:65 src\templates\sub\profile.phtml:47 msgid "Language" msgstr "Language" -#: src\templates\sub\profile.phtml:60 -#: src\templates\widget\popularserverlanguages.phtml:2 +#: src\templates\sub\profile.phtml:50 msgid "Filter by language" msgstr "Filter by language" -#: src\templates\sub\profile.phtml:66 +#: src\templates\sub\profile.phtml:56 msgid "Location" msgstr "Location" -#: src\templates\sub\profile.phtml:79 +#: src\templates\sub\profile.phtml:69 msgid "Search Tag" msgstr "Search tag" @@ -154,23 +146,19 @@ msgstr "Search tag" msgid "Account type tabs" msgstr "Account type tabs" -#: src\templates\sub\profiles.phtml:4 -#: src\templates\sub\profiles.phtml:7 +#: src\templates\sub\profiles.phtml:4 src\templates\sub\profiles.phtml:7 msgid "Top %s pagination" msgstr "Top %s pagination" -#: src\templates\sub\profiles.phtml:13 -#: src\templates\sub\profiles.phtml:16 +#: src\templates\sub\profiles.phtml:13 src\templates\sub\profiles.phtml:16 msgid "Bottom %s pagination" msgstr "Bottom %s pagination" -#: src\templates\statistics.phtml:66 -#: src\templates\sub\server.phtml:15 +#: src\templates\statistics.phtml:66 src\templates\sub\server.phtml:15 msgid "Stable Version" msgstr "Stable version" -#: src\templates\statistics.phtml:68 -#: src\templates\sub\server.phtml:17 +#: src\templates\statistics.phtml:68 src\templates\sub\server.phtml:17 msgid "Develop Version" msgstr "Develop version" @@ -178,15 +166,15 @@ msgstr "Develop version" msgid "Outdated Version" msgstr "Outdated version" -#: src\templates\sub\server.phtml:69 +#: src\templates\sub\server.phtml:55 msgid "Admin" msgstr "Admin" -#: src\templates\sub\server.phtml:76 +#: src\templates\sub\server.phtml:62 msgid "No description provided" msgstr "No description provided" -#: src\templates\sub\server.phtml:79 +#: src\templates\sub\server.phtml:65 msgid "Visit Server" msgstr "Visit server" @@ -194,7 +182,7 @@ msgstr "Visit server" msgid "Popular Countries" msgstr "Popular countries" -#: src\templates\widget\popularprofilelanguages.phtml:2 +#: src\templates\widget\popularlanguages.phtml:2 msgid "Popular Languages" msgstr "Popular languages" @@ -202,8 +190,7 @@ msgstr "Popular languages" msgid "Popular Tags" msgstr "Popular tags" -#: src\templates\sub\server.phtml:44 -#: src\templates\sub\server.phtml:45 +#: src\templates\sub\server.phtml:44 src\templates\sub\server.phtml:45 msgid "Default Language" msgstr "Default language" @@ -223,6 +210,13 @@ msgid_plural "People (%d)" msgstr[0] "People (%d)" msgstr[1] "People (%d)" +#: src\classes\Views\Widget\AccountTypeTabs.php:57 +msgctxt "account-type" +msgid "Forum (%d)" +msgid_plural "Forums (%d)" +msgstr[0] "Forum (%d)" +msgstr[1] "Forums (%d)" + #: src\templates\layout.phtml:97 msgid "Stats" msgstr "Stats" @@ -236,29 +230,42 @@ msgid "Profiles" msgstr "Profiles" #: src\templates\statistics.phtml:6 -msgid "This directory knows about %s distinct potential profile URLs." -msgstr "This directory knows about %s distinct potential profile URLs." +msgid "" +"This directory knows about %s distinct potential profile " +"URLs." +msgstr "" +"This directory knows about %s distinct potential profile " +"URLs." -#: src\templates\statistics.phtml:16 -#: src\templates\statistics.phtml:46 +#: src\templates\statistics.phtml:16 src\templates\statistics.phtml:46 msgid "Languages" msgstr "Languages" #: src\templates\statistics.phtml:17 -msgid "Out of %s profiles reporting their language there are:" -msgstr "Out of %s profiles reporting their language there are:" +msgid "" +"Out of %s profiles reporting their language there are:" +msgstr "" +"Out of %s profiles reporting their language there are:" #: src\templates\statistics.phtml:27 msgid "Servers" msgstr "Servers" #: src\templates\statistics.phtml:28 -msgid "This directory knows about %s distinct potential server URLs." -msgstr "This directory knows about %s distinct potential server URLs." +msgid "" +"This directory knows about %s distinct potential server " +"URLs." +msgstr "" +"This directory knows about %s distinct potential server " +"URLs." #: src\templates\statistics.phtml:29 -msgid "Out of those, there are %s domains (%s) that have been a Friendica server at least once." -msgstr "Out of those, there are %s domains (%s) that have been a Friendica server at least once." +msgid "" +"Out of those, there are %s domains (%s) that have been a " +"Friendica server at least once." +msgstr "" +"Out of those, there are %s domains (%s) that have been a " +"Friendica server at least once." #: src\templates\statistics.phtml:33 msgid "Out of those, there are:" @@ -266,7 +273,8 @@ msgstr "Out of those, there are:" #: src\templates\statistics.phtml:47 msgid "Out of %s servers reporting their language there are:" -msgstr "Out of %s servers reporting their language there are:" +msgstr "" +"Out of %s servers reporting their language there are:" #: src\templates\statistics.phtml:57 msgid "Versions" @@ -277,8 +285,12 @@ msgid "Out of %s servers reporting their version there are:" msgstr "Out of %s servers reporting their version there are:" #: src\templates\statistics.phtml:7 -msgid "Out of those, there are %s profiles (%s) that opted in the public directory at least once." -msgstr "Out of those, there are %s profiles (%s) that opted in the public directory at least once." +msgid "" +"Out of those, there are %s profiles (%s) that opted in the " +"public directory at least once." +msgstr "" +"Out of those, there are %s profiles (%s) that opted in the " +"public directory at least once." #: src\templates\statistics.phtml:35 msgid "%s available servers (%s)" @@ -288,70 +300,22 @@ msgstr "%s available servers (%s)" msgid "Friendica Directory version %s" msgstr "Friendica directory version %s" +#: src\templates\layout.phtml:94 +msgid "Source Code on GitHub" +msgstr "Source code on GitHub" + #: src\templates\statistics.phtml:11 -msgid "Out of those, there currently are %s available profiles (%s). Check them out!" -msgstr "Out of those, there currently are %s available profiles (%s). Check them out!" +msgid "" +"Out of those, there currently are %s available profiles " +"(%s). Check them out!" +msgstr "" +"Out of those, there currently are %s available profiles " +"(%s). Check them out!" #: src\templates\statistics.phtml:39 -msgid "%s public servers (%s) currently open for registration. Check them out!" -msgstr "%s public servers (%s) currently open for registration. Check them out!" - -#: src\classes\Views\Widget\AccountTypeTabs.php:57 -msgctxt "account-type" -msgid "News (%d)" -msgid_plural "News (%d)" -msgstr[0] "" -msgstr[1] "" - -#: src\classes\Views\Widget\AccountTypeTabs.php:58 -msgctxt "account-type" -msgid "Organization (%d)" -msgid_plural "Organizations (%d)" -msgstr[0] "" -msgstr[1] "" - -#: src\classes\Views\Widget\AccountTypeTabs.php:61 -msgctxt "account-type" -msgid "Group (%d)" -msgid_plural "Groups (%d)" -msgstr[0] "" -msgstr[1] "" - -#: src\templates\servers.phtml:3 -msgid "Filtered by language:" -msgstr "" - -#: src\templates\servers.phtml:3 -msgid "Clear language filter" -msgstr "" - -#: src\templates\sub\server.phtml:40 -msgid "Health Score" -msgstr "" - -#: src\templates\sub\server.phtml:52 -msgid "%s User" -msgid_plural "%s Users" -msgstr[0] "" -msgstr[1] "" - -#: src\templates\sub\server.phtml:54 -msgid "None" -msgstr "" - -#: src\templates\sub\server.phtml:58 -#: src\templates\sub\server.phtml:62 -msgid "Registration Policy" -msgstr "" - -#: src\templates\sub\server.phtml:59 -msgid "By Approval" -msgstr "" - -#: src\templates\sub\server.phtml:63 -msgid "Open" -msgstr "" - -#: src\templates\layout.phtml:94 -msgid "Source Code on Friendica's Forgejo" +msgid "" +"%s public servers (%s) currently open for registration. Check them out!" msgstr "" +"%s public servers (%s) currently open for registration. Check them out!" diff --git a/src/lang/et/LC_MESSAGES/strings.po b/src/lang/et/LC_MESSAGES/strings.po index 1cc51e4..34142c5 100644 --- a/src/lang/et/LC_MESSAGES/strings.po +++ b/src/lang/et/LC_MESSAGES/strings.po @@ -1,25 +1,27 @@ +# +# Translators: +# Rain Hawk, 2019 +# msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2018-11-16T04:17:37+00:00\n" +"PO-Revision-Date: 2018-11-16 20:30+0000\n" "Last-Translator: Rain Hawk, 2019\n" "Language-Team: Estonian (https://www.transifex.com/Friendica/teams/12172/et/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"POT-Creation-Date: 2018-11-16T04:17:37+00:00\n" -"PO-Revision-Date: 2018-11-16 20:30+0000\n" "Language: et\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Poedit 2.2\n" -#: src\classes\Content\Pager.php:168 -#: src\classes\Content\Pager.php:216 +#: src\classes\Content\Pager.php:168 src\classes\Content\Pager.php:216 msgid "Previous" msgstr "Eelmine" -#: src\classes\Content\Pager.php:173 -#: src\classes\Content\Pager.php:273 +#: src\classes\Content\Pager.php:173 src\classes\Content\Pager.php:273 msgid "Next" msgstr "Järgmine" @@ -31,57 +33,51 @@ msgstr "Esimene" msgid "Last" msgstr "Viimane" -#: src\classes\Controllers\Web\Directory.php:85 +#: src\classes\Controllers\Web\Directory.php:73 msgid "People" msgstr "Inimesed" -#: src\classes\Controllers\Web\Search.php:72 +#: src\classes\Controllers\Web\Search.php:64 msgctxt "field" msgid "Language" msgstr "Keel" -#: src\classes\Controllers\Web\Search.php:73 +#: src\classes\Controllers\Web\Search.php:65 msgctxt "field" msgid "Locality" msgstr "Asukoht" -#: src\classes\Controllers\Web\Search.php:74 +#: src\classes\Controllers\Web\Search.php:66 msgctxt "field" msgid "Region" msgstr "Regioon" -#: src\classes\Controllers\Web\Search.php:75 +#: src\classes\Controllers\Web\Search.php:67 msgctxt "field" msgid "Country" msgstr "Riik" -#: src\classes\Controllers\Web\Servers.php:105 +#: src\classes\Controllers\Web\Servers.php:90 msgid "Public Servers" msgstr "Avalikud serverid" -#: src\templates\layout.phtml:4 -#: src\templates\layout.phtml:18 +#: src\templates\layout.phtml:4 src\templates\layout.phtml:18 msgid "Friendica Directory" msgstr "Friendica Kataloog" -#: src\templates\layout.phtml:23 -#: src\templates\layout.phtml:25 -#: src\templates\layout.phtml:43 -#: src\templates\layout.phtml:45 -#: src\templates\search.phtml:4 -#: src\templates\search.phtml:12 +#: src\templates\layout.phtml:23 src\templates\layout.phtml:25 +#: src\templates\layout.phtml:43 src\templates\layout.phtml:45 +#: src\templates\search.phtml:4 src\templates\search.phtml:12 msgid "Search terms" msgstr "Otsingu tingimused" -#: src\templates\layout.phtml:24 -#: src\templates\layout.phtml:45 +#: src\templates\layout.phtml:24 src\templates\layout.phtml:45 #: src\templates\search.phtml:11 msgctxt "noun" msgid "Search" msgstr "Otsi" -#: src\templates\layout.phtml:27 -#: src\templates\layout.phtml:47 +#: src\templates\layout.phtml:27 src\templates\layout.phtml:47 #: src\templates\search.phtml:14 msgctxt "verb" msgid "Search" @@ -105,11 +101,11 @@ msgid_plural "%d results for \"%s\"" msgstr[0] "" msgstr[1] "" -#: src\templates\servers.phtml:7 +#: src\templates\servers.phtml:2 msgid "Top servers pagination" msgstr "" -#: src\templates\servers.phtml:17 +#: src\templates\servers.phtml:12 msgid "Bottom servers pagination" msgstr "" @@ -126,27 +122,23 @@ msgid "Filter by country" msgstr "Filtreeri riigi järgi" #: src\templates\sub\profile.phtml:31 -#: src\templates\sub\profile.phtml:35 -#: src\templates\sub\profile.phtml:39 msgctxt "verb" msgid "Follow" msgstr "Järgi" -#: src\templates\layout.phtml:65 -#: src\templates\sub\profile.phtml:57 +#: src\templates\layout.phtml:65 src\templates\sub\profile.phtml:47 msgid "Language" msgstr "Keel" -#: src\templates\sub\profile.phtml:60 -#: src\templates\widget\popularserverlanguages.phtml:2 +#: src\templates\sub\profile.phtml:50 msgid "Filter by language" msgstr "Filtreeri keele järgi" -#: src\templates\sub\profile.phtml:66 +#: src\templates\sub\profile.phtml:56 msgid "Location" msgstr "Asukoht" -#: src\templates\sub\profile.phtml:79 +#: src\templates\sub\profile.phtml:69 msgid "Search Tag" msgstr "Otsingu tag" @@ -154,23 +146,19 @@ msgstr "Otsingu tag" msgid "Account type tabs" msgstr "Konto tüübi sakid" -#: src\templates\sub\profiles.phtml:4 -#: src\templates\sub\profiles.phtml:7 +#: src\templates\sub\profiles.phtml:4 src\templates\sub\profiles.phtml:7 msgid "Top %s pagination" msgstr "" -#: src\templates\sub\profiles.phtml:13 -#: src\templates\sub\profiles.phtml:16 +#: src\templates\sub\profiles.phtml:13 src\templates\sub\profiles.phtml:16 msgid "Bottom %s pagination" msgstr "" -#: src\templates\statistics.phtml:66 -#: src\templates\sub\server.phtml:15 +#: src\templates\statistics.phtml:66 src\templates\sub\server.phtml:15 msgid "Stable Version" msgstr "Stabiilne versioon" -#: src\templates\statistics.phtml:68 -#: src\templates\sub\server.phtml:17 +#: src\templates\statistics.phtml:68 src\templates\sub\server.phtml:17 msgid "Develop Version" msgstr "Arendusversioon" @@ -178,15 +166,15 @@ msgstr "Arendusversioon" msgid "Outdated Version" msgstr "Aegunud versioon" -#: src\templates\sub\server.phtml:69 +#: src\templates\sub\server.phtml:55 msgid "Admin" msgstr "Adminn" -#: src\templates\sub\server.phtml:76 +#: src\templates\sub\server.phtml:62 msgid "No description provided" msgstr "Kirjeldus pole saadaval" -#: src\templates\sub\server.phtml:79 +#: src\templates\sub\server.phtml:65 msgid "Visit Server" msgstr "Külasta serverit" @@ -194,7 +182,7 @@ msgstr "Külasta serverit" msgid "Popular Countries" msgstr "Populaarsed riigid" -#: src\templates\widget\popularprofilelanguages.phtml:2 +#: src\templates\widget\popularlanguages.phtml:2 msgid "Popular Languages" msgstr "Populaarsed keeled" @@ -202,8 +190,7 @@ msgstr "Populaarsed keeled" msgid "Popular Tags" msgstr "Polulaarsed tag`id" -#: src\templates\sub\server.phtml:44 -#: src\templates\sub\server.phtml:45 +#: src\templates\sub\server.phtml:44 src\templates\sub\server.phtml:45 msgid "Default Language" msgstr "Peamine keel" @@ -223,6 +210,13 @@ msgid_plural "People (%d)" msgstr[0] "Inimesed ( %d )" msgstr[1] "Inimesed (%d)" +#: src\classes\Views\Widget\AccountTypeTabs.php:57 +msgctxt "account-type" +msgid "Forum (%d)" +msgid_plural "Forums (%d)" +msgstr[0] "Foorumid ( %d ) " +msgstr[1] "Foorumid ( %d )" + #: src\templates\layout.phtml:97 msgid "Stats" msgstr "Statistika" @@ -236,16 +230,18 @@ msgid "Profiles" msgstr "Profiilid" #: src\templates\statistics.phtml:6 -msgid "This directory knows about %s distinct potential profile URLs." +msgid "" +"This directory knows about %s distinct potential profile " +"URLs." msgstr "" -#: src\templates\statistics.phtml:16 -#: src\templates\statistics.phtml:46 +#: src\templates\statistics.phtml:16 src\templates\statistics.phtml:46 msgid "Languages" msgstr "Keeled" #: src\templates\statistics.phtml:17 -msgid "Out of %s profiles reporting their language there are:" +msgid "" +"Out of %s profiles reporting their language there are:" msgstr "" #: src\templates\statistics.phtml:27 @@ -253,11 +249,15 @@ msgid "Servers" msgstr "Serverid" #: src\templates\statistics.phtml:28 -msgid "This directory knows about %s distinct potential server URLs." +msgid "" +"This directory knows about %s distinct potential server " +"URLs." msgstr "" #: src\templates\statistics.phtml:29 -msgid "Out of those, there are %s domains (%s) that have been a Friendica server at least once." +msgid "" +"Out of those, there are %s domains (%s) that have been a " +"Friendica server at least once." msgstr "" #: src\templates\statistics.phtml:33 @@ -277,7 +277,9 @@ msgid "Out of %s servers reporting their version there are:" msgstr "" #: src\templates\statistics.phtml:7 -msgid "Out of those, there are %s profiles (%s) that opted in the public directory at least once." +msgid "" +"Out of those, there are %s profiles (%s) that opted in the " +"public directory at least once." msgstr "" #: src\templates\statistics.phtml:35 @@ -288,70 +290,18 @@ msgstr "" msgid "Friendica Directory version %s" msgstr "" +#: src\templates\layout.phtml:94 +msgid "Source Code on GitHub" +msgstr "" + #: src\templates\statistics.phtml:11 -msgid "Out of those, there currently are %s available profiles (%s). Check them out!" +msgid "" +"Out of those, there currently are %s available profiles " +"(%s). Check them out!" msgstr "" #: src\templates\statistics.phtml:39 -msgid "%s public servers (%s) currently open for registration. Check them out!" -msgstr "" - -#: src\classes\Views\Widget\AccountTypeTabs.php:57 -msgctxt "account-type" -msgid "News (%d)" -msgid_plural "News (%d)" -msgstr[0] "" -msgstr[1] "" - -#: src\classes\Views\Widget\AccountTypeTabs.php:58 -msgctxt "account-type" -msgid "Organization (%d)" -msgid_plural "Organizations (%d)" -msgstr[0] "" -msgstr[1] "" - -#: src\classes\Views\Widget\AccountTypeTabs.php:61 -msgctxt "account-type" -msgid "Group (%d)" -msgid_plural "Groups (%d)" -msgstr[0] "" -msgstr[1] "" - -#: src\templates\servers.phtml:3 -msgid "Filtered by language:" -msgstr "" - -#: src\templates\servers.phtml:3 -msgid "Clear language filter" -msgstr "" - -#: src\templates\sub\server.phtml:40 -msgid "Health Score" -msgstr "" - -#: src\templates\sub\server.phtml:52 -msgid "%s User" -msgid_plural "%s Users" -msgstr[0] "" -msgstr[1] "" - -#: src\templates\sub\server.phtml:54 -msgid "None" -msgstr "" - -#: src\templates\sub\server.phtml:58 -#: src\templates\sub\server.phtml:62 -msgid "Registration Policy" -msgstr "" - -#: src\templates\sub\server.phtml:59 -msgid "By Approval" -msgstr "" - -#: src\templates\sub\server.phtml:63 -msgid "Open" -msgstr "" - -#: src\templates\layout.phtml:94 -msgid "Source Code on Friendica's Forgejo" +msgid "" +"%s public servers (%s) currently open for registration. Check them out!" msgstr "" diff --git a/src/lang/fr/LC_MESSAGES/strings.po b/src/lang/fr/LC_MESSAGES/strings.po index 7b8b4af..4a7ef93 100644 --- a/src/lang/fr/LC_MESSAGES/strings.po +++ b/src/lang/fr/LC_MESSAGES/strings.po @@ -1,25 +1,28 @@ +# +# Translators: +# Tobias Diekershoff , 2018 +# Vladimir Núñez , 2018 +# msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2018-11-16T04:17:37+00:00\n" +"PO-Revision-Date: 2018-11-16 20:30+0000\n" "Last-Translator: Vladimir Núñez , 2018\n" "Language-Team: French (https://www.transifex.com/Friendica/teams/12172/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"POT-Creation-Date: 2018-11-16T04:17:37+00:00\n" -"PO-Revision-Date: 2018-11-16 20:30+0000\n" "Language: fr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: Poedit 2.2\n" -#: src\classes\Content\Pager.php:168 -#: src\classes\Content\Pager.php:216 +#: src\classes\Content\Pager.php:168 src\classes\Content\Pager.php:216 msgid "Previous" msgstr "Précédent" -#: src\classes\Content\Pager.php:173 -#: src\classes\Content\Pager.php:273 +#: src\classes\Content\Pager.php:173 src\classes\Content\Pager.php:273 msgid "Next" msgstr "Suivant" @@ -31,57 +34,51 @@ msgstr "Début" msgid "Last" msgstr "Fin" -#: src\classes\Controllers\Web\Directory.php:85 +#: src\classes\Controllers\Web\Directory.php:73 msgid "People" msgstr "Utilisateurs" -#: src\classes\Controllers\Web\Search.php:72 +#: src\classes\Controllers\Web\Search.php:64 msgctxt "field" msgid "Language" msgstr "Langue" -#: src\classes\Controllers\Web\Search.php:73 +#: src\classes\Controllers\Web\Search.php:65 msgctxt "field" msgid "Locality" msgstr "Localité" -#: src\classes\Controllers\Web\Search.php:74 +#: src\classes\Controllers\Web\Search.php:66 msgctxt "field" msgid "Region" msgstr "Région" -#: src\classes\Controllers\Web\Search.php:75 +#: src\classes\Controllers\Web\Search.php:67 msgctxt "field" msgid "Country" msgstr "Pays" -#: src\classes\Controllers\Web\Servers.php:105 +#: src\classes\Controllers\Web\Servers.php:90 msgid "Public Servers" msgstr "Serveurs publics" -#: src\templates\layout.phtml:4 -#: src\templates\layout.phtml:18 +#: src\templates\layout.phtml:4 src\templates\layout.phtml:18 msgid "Friendica Directory" msgstr "Répertoire Friendica" -#: src\templates\layout.phtml:23 -#: src\templates\layout.phtml:25 -#: src\templates\layout.phtml:43 -#: src\templates\layout.phtml:45 -#: src\templates\search.phtml:4 -#: src\templates\search.phtml:12 +#: src\templates\layout.phtml:23 src\templates\layout.phtml:25 +#: src\templates\layout.phtml:43 src\templates\layout.phtml:45 +#: src\templates\search.phtml:4 src\templates\search.phtml:12 msgid "Search terms" msgstr "Mots-clés" -#: src\templates\layout.phtml:24 -#: src\templates\layout.phtml:45 +#: src\templates\layout.phtml:24 src\templates\layout.phtml:45 #: src\templates\search.phtml:11 msgctxt "noun" msgid "Search" msgstr "Recherche" -#: src\templates\layout.phtml:27 -#: src\templates\layout.phtml:47 +#: src\templates\layout.phtml:27 src\templates\layout.phtml:47 #: src\templates\search.phtml:14 msgctxt "verb" msgid "Search" @@ -105,11 +102,11 @@ msgid_plural "%d results for \"%s\"" msgstr[0] "%d résultat pour \"%s\"" msgstr[1] "%d résultats pour \"%s\"" -#: src\templates\servers.phtml:7 +#: src\templates\servers.phtml:2 msgid "Top servers pagination" msgstr "Pagination des serveurs haute" -#: src\templates\servers.phtml:17 +#: src\templates\servers.phtml:12 msgid "Bottom servers pagination" msgstr "Pagination des serveurs basse" @@ -126,27 +123,23 @@ msgid "Filter by country" msgstr "Filtrer par pays" #: src\templates\sub\profile.phtml:31 -#: src\templates\sub\profile.phtml:35 -#: src\templates\sub\profile.phtml:39 msgctxt "verb" msgid "Follow" msgstr "Suivre" -#: src\templates\layout.phtml:65 -#: src\templates\sub\profile.phtml:57 +#: src\templates\layout.phtml:65 src\templates\sub\profile.phtml:47 msgid "Language" msgstr "Langue" -#: src\templates\sub\profile.phtml:60 -#: src\templates\widget\popularserverlanguages.phtml:2 +#: src\templates\sub\profile.phtml:50 msgid "Filter by language" msgstr "Filtrer par langue" -#: src\templates\sub\profile.phtml:66 +#: src\templates\sub\profile.phtml:56 msgid "Location" msgstr "Localisation" -#: src\templates\sub\profile.phtml:79 +#: src\templates\sub\profile.phtml:69 msgid "Search Tag" msgstr "Rechercher ce tag" @@ -154,23 +147,19 @@ msgstr "Rechercher ce tag" msgid "Account type tabs" msgstr "Onglets de type de compte" -#: src\templates\sub\profiles.phtml:4 -#: src\templates\sub\profiles.phtml:7 +#: src\templates\sub\profiles.phtml:4 src\templates\sub\profiles.phtml:7 msgid "Top %s pagination" msgstr "Pagination %s haute" -#: src\templates\sub\profiles.phtml:13 -#: src\templates\sub\profiles.phtml:16 +#: src\templates\sub\profiles.phtml:13 src\templates\sub\profiles.phtml:16 msgid "Bottom %s pagination" msgstr "Pagination %s basse" -#: src\templates\statistics.phtml:66 -#: src\templates\sub\server.phtml:15 +#: src\templates\statistics.phtml:66 src\templates\sub\server.phtml:15 msgid "Stable Version" msgstr "Version stable" -#: src\templates\statistics.phtml:68 -#: src\templates\sub\server.phtml:17 +#: src\templates\statistics.phtml:68 src\templates\sub\server.phtml:17 msgid "Develop Version" msgstr "Version instable" @@ -178,15 +167,15 @@ msgstr "Version instable" msgid "Outdated Version" msgstr "Version périmée" -#: src\templates\sub\server.phtml:69 +#: src\templates\sub\server.phtml:55 msgid "Admin" msgstr "Administrateur" -#: src\templates\sub\server.phtml:76 +#: src\templates\sub\server.phtml:62 msgid "No description provided" msgstr "Pas de description fournie" -#: src\templates\sub\server.phtml:79 +#: src\templates\sub\server.phtml:65 msgid "Visit Server" msgstr "Visiter ce serveur" @@ -194,7 +183,7 @@ msgstr "Visiter ce serveur" msgid "Popular Countries" msgstr "Pays populaires" -#: src\templates\widget\popularprofilelanguages.phtml:2 +#: src\templates\widget\popularlanguages.phtml:2 msgid "Popular Languages" msgstr "Language populaires" @@ -202,8 +191,7 @@ msgstr "Language populaires" msgid "Popular Tags" msgstr "Tags populaires" -#: src\templates\sub\server.phtml:44 -#: src\templates\sub\server.phtml:45 +#: src\templates\sub\server.phtml:44 src\templates\sub\server.phtml:45 msgid "Default Language" msgstr "Langage de base" @@ -223,6 +211,13 @@ msgid_plural "People (%d)" msgstr[0] "" msgstr[1] "" +#: src\classes\Views\Widget\AccountTypeTabs.php:57 +msgctxt "account-type" +msgid "Forum (%d)" +msgid_plural "Forums (%d)" +msgstr[0] "" +msgstr[1] "" + #: src\templates\layout.phtml:97 msgid "Stats" msgstr "Statistiques" @@ -236,16 +231,18 @@ msgid "Profiles" msgstr "Profils" #: src\templates\statistics.phtml:6 -msgid "This directory knows about %s distinct potential profile URLs." +msgid "" +"This directory knows about %s distinct potential profile " +"URLs." msgstr "" -#: src\templates\statistics.phtml:16 -#: src\templates\statistics.phtml:46 +#: src\templates\statistics.phtml:16 src\templates\statistics.phtml:46 msgid "Languages" msgstr "Langages" #: src\templates\statistics.phtml:17 -msgid "Out of %s profiles reporting their language there are:" +msgid "" +"Out of %s profiles reporting their language there are:" msgstr "parmi %sprofil mentionnant leur langage il y a:" #: src\templates\statistics.phtml:27 @@ -253,11 +250,15 @@ msgid "Servers" msgstr "Serveurs" #: src\templates\statistics.phtml:28 -msgid "This directory knows about %s distinct potential server URLs." +msgid "" +"This directory knows about %s distinct potential server " +"URLs." msgstr "" #: src\templates\statistics.phtml:29 -msgid "Out of those, there are %s domains (%s) that have been a Friendica server at least once." +msgid "" +"Out of those, there are %s domains (%s) that have been a " +"Friendica server at least once." msgstr "" #: src\templates\statistics.phtml:33 @@ -277,7 +278,9 @@ msgid "Out of %s servers reporting their version there are:" msgstr "Parmi %s serveurs mentionnant leur version il y a:" #: src\templates\statistics.phtml:7 -msgid "Out of those, there are %s profiles (%s) that opted in the public directory at least once." +msgid "" +"Out of those, there are %s profiles (%s) that opted in the " +"public directory at least once." msgstr "" #: src\templates\statistics.phtml:35 @@ -288,70 +291,18 @@ msgstr "%sserveurs disponibles(%s)" msgid "Friendica Directory version %s" msgstr "Friendica Annuaire version %s" +#: src\templates\layout.phtml:94 +msgid "Source Code on GitHub" +msgstr "Code source sur GitHub" + #: src\templates\statistics.phtml:11 -msgid "Out of those, there currently are %s available profiles (%s). Check them out!" +msgid "" +"Out of those, there currently are %s available profiles " +"(%s). Check them out!" msgstr "" #: src\templates\statistics.phtml:39 -msgid "%s public servers (%s) currently open for registration. Check them out!" -msgstr "" - -#: src\classes\Views\Widget\AccountTypeTabs.php:57 -msgctxt "account-type" -msgid "News (%d)" -msgid_plural "News (%d)" -msgstr[0] "" -msgstr[1] "" - -#: src\classes\Views\Widget\AccountTypeTabs.php:58 -msgctxt "account-type" -msgid "Organization (%d)" -msgid_plural "Organizations (%d)" -msgstr[0] "" -msgstr[1] "" - -#: src\classes\Views\Widget\AccountTypeTabs.php:61 -msgctxt "account-type" -msgid "Group (%d)" -msgid_plural "Groups (%d)" -msgstr[0] "" -msgstr[1] "" - -#: src\templates\servers.phtml:3 -msgid "Filtered by language:" -msgstr "" - -#: src\templates\servers.phtml:3 -msgid "Clear language filter" -msgstr "" - -#: src\templates\sub\server.phtml:40 -msgid "Health Score" -msgstr "" - -#: src\templates\sub\server.phtml:52 -msgid "%s User" -msgid_plural "%s Users" -msgstr[0] "" -msgstr[1] "" - -#: src\templates\sub\server.phtml:54 -msgid "None" -msgstr "" - -#: src\templates\sub\server.phtml:58 -#: src\templates\sub\server.phtml:62 -msgid "Registration Policy" -msgstr "" - -#: src\templates\sub\server.phtml:59 -msgid "By Approval" -msgstr "" - -#: src\templates\sub\server.phtml:63 -msgid "Open" -msgstr "" - -#: src\templates\layout.phtml:94 -msgid "Source Code on Friendica's Forgejo" +msgid "" +"%s public servers (%s) currently open for registration. Check them out!" msgstr "" diff --git a/src/lang/gd/LC_MESSAGES/strings.po b/src/lang/gd/LC_MESSAGES/strings.po index 75d4baf..f5cb24a 100644 --- a/src/lang/gd/LC_MESSAGES/strings.po +++ b/src/lang/gd/LC_MESSAGES/strings.po @@ -1,25 +1,27 @@ +# +# Translators: +# GunChleoc, 2021 +# msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2018-11-16T04:17:37+00:00\n" +"PO-Revision-Date: 2018-11-16 20:30+0000\n" "Last-Translator: GunChleoc, 2021\n" "Language-Team: Gaelic, Scottish (https://www.transifex.com/Friendica/teams/12172/gd/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"POT-Creation-Date: 2018-11-16T04:17:37+00:00\n" -"PO-Revision-Date: 2018-11-16 20:30+0000\n" "Language: gd\n" "Plural-Forms: nplurals=4; plural=(n==1 || n==11) ? 0 : (n==2 || n==12) ? 1 : (n > 2 && n < 20) ? 2 : 3;\n" "X-Generator: Poedit 2.2\n" -#: src\classes\Content\Pager.php:168 -#: src\classes\Content\Pager.php:216 +#: src\classes\Content\Pager.php:168 src\classes\Content\Pager.php:216 msgid "Previous" msgstr "Air ais" -#: src\classes\Content\Pager.php:173 -#: src\classes\Content\Pager.php:273 +#: src\classes\Content\Pager.php:173 src\classes\Content\Pager.php:273 msgid "Next" msgstr "Air adhart" @@ -31,57 +33,51 @@ msgstr "Toiseach" msgid "Last" msgstr "Deireadh" -#: src\classes\Controllers\Web\Directory.php:85 +#: src\classes\Controllers\Web\Directory.php:73 msgid "People" msgstr "Daoine" -#: src\classes\Controllers\Web\Search.php:72 +#: src\classes\Controllers\Web\Search.php:64 msgctxt "field" msgid "Language" msgstr "Cànan" -#: src\classes\Controllers\Web\Search.php:73 +#: src\classes\Controllers\Web\Search.php:65 msgctxt "field" msgid "Locality" msgstr "Ionad" -#: src\classes\Controllers\Web\Search.php:74 +#: src\classes\Controllers\Web\Search.php:66 msgctxt "field" msgid "Region" msgstr "Sgìre" -#: src\classes\Controllers\Web\Search.php:75 +#: src\classes\Controllers\Web\Search.php:67 msgctxt "field" msgid "Country" msgstr "Dùthaich" -#: src\classes\Controllers\Web\Servers.php:105 +#: src\classes\Controllers\Web\Servers.php:90 msgid "Public Servers" msgstr "Frithealaichean poblach" -#: src\templates\layout.phtml:4 -#: src\templates\layout.phtml:18 +#: src\templates\layout.phtml:4 src\templates\layout.phtml:18 msgid "Friendica Directory" msgstr "Eòlaire Friendica" -#: src\templates\layout.phtml:23 -#: src\templates\layout.phtml:25 -#: src\templates\layout.phtml:43 -#: src\templates\layout.phtml:45 -#: src\templates\search.phtml:4 -#: src\templates\search.phtml:12 +#: src\templates\layout.phtml:23 src\templates\layout.phtml:25 +#: src\templates\layout.phtml:43 src\templates\layout.phtml:45 +#: src\templates\search.phtml:4 src\templates\search.phtml:12 msgid "Search terms" msgstr "Faclan-luirg" -#: src\templates\layout.phtml:24 -#: src\templates\layout.phtml:45 +#: src\templates\layout.phtml:24 src\templates\layout.phtml:45 #: src\templates\search.phtml:11 msgctxt "noun" msgid "Search" msgstr "Lorg" -#: src\templates\layout.phtml:27 -#: src\templates\layout.phtml:47 +#: src\templates\layout.phtml:27 src\templates\layout.phtml:47 #: src\templates\search.phtml:14 msgctxt "verb" msgid "Search" @@ -107,11 +103,11 @@ msgstr[1] "%d thoradh airson “%s”" msgstr[2] "%d thoraidhean airson “%s”" msgstr[3] "%d toradh airson “%s”" -#: src\templates\servers.phtml:7 +#: src\templates\servers.phtml:2 msgid "Top servers pagination" msgstr "Duilleagachadh fhrithealaichean aig a’ bhàrr" -#: src\templates\servers.phtml:17 +#: src\templates\servers.phtml:12 msgid "Bottom servers pagination" msgstr "Duilleagachadh fhrithealaichean aig a’ bhonn" @@ -128,27 +124,23 @@ msgid "Filter by country" msgstr "Criathraich a-rèir dùthcha" #: src\templates\sub\profile.phtml:31 -#: src\templates\sub\profile.phtml:35 -#: src\templates\sub\profile.phtml:39 msgctxt "verb" msgid "Follow" msgstr "Lean air" -#: src\templates\layout.phtml:65 -#: src\templates\sub\profile.phtml:57 +#: src\templates\layout.phtml:65 src\templates\sub\profile.phtml:47 msgid "Language" msgstr "Cànan" -#: src\templates\sub\profile.phtml:60 -#: src\templates\widget\popularserverlanguages.phtml:2 +#: src\templates\sub\profile.phtml:50 msgid "Filter by language" msgstr "Criathraich a-rèir cànain" -#: src\templates\sub\profile.phtml:66 +#: src\templates\sub\profile.phtml:56 msgid "Location" msgstr "Ionad" -#: src\templates\sub\profile.phtml:79 +#: src\templates\sub\profile.phtml:69 msgid "Search Tag" msgstr "Taga luirg" @@ -156,23 +148,19 @@ msgstr "Taga luirg" msgid "Account type tabs" msgstr "Tabaichean seòrsa a’ chunntais" -#: src\templates\sub\profiles.phtml:4 -#: src\templates\sub\profiles.phtml:7 +#: src\templates\sub\profiles.phtml:4 src\templates\sub\profiles.phtml:7 msgid "Top %s pagination" msgstr "Duilleagachadh %s aig a’ bhàrr" -#: src\templates\sub\profiles.phtml:13 -#: src\templates\sub\profiles.phtml:16 +#: src\templates\sub\profiles.phtml:13 src\templates\sub\profiles.phtml:16 msgid "Bottom %s pagination" msgstr "Duilleagachadh %s aig a’ bhonn" -#: src\templates\statistics.phtml:66 -#: src\templates\sub\server.phtml:15 +#: src\templates\statistics.phtml:66 src\templates\sub\server.phtml:15 msgid "Stable Version" msgstr "Tionndadh seasmhach" -#: src\templates\statistics.phtml:68 -#: src\templates\sub\server.phtml:17 +#: src\templates\statistics.phtml:68 src\templates\sub\server.phtml:17 msgid "Develop Version" msgstr "Tionndadh leasachaidh" @@ -180,15 +168,15 @@ msgstr "Tionndadh leasachaidh" msgid "Outdated Version" msgstr "Seann-tionndadh" -#: src\templates\sub\server.phtml:69 +#: src\templates\sub\server.phtml:72 msgid "Admin" msgstr "Rianaire" -#: src\templates\sub\server.phtml:76 +#: src\templates\sub\server.phtml:79 msgid "No description provided" msgstr "Cha deach tuairisgeul a sholarachadh" -#: src\templates\sub\server.phtml:79 +#: src\templates\sub\server.phtml:82 msgid "Visit Server" msgstr "Tadhail air frithealaiche" @@ -196,7 +184,7 @@ msgstr "Tadhail air frithealaiche" msgid "Popular Countries" msgstr "Dùthchannan fèillmhor" -#: src\templates\widget\popularprofilelanguages.phtml:2 +#: src\templates\widget\popularlanguages.phtml:2 msgid "Popular Languages" msgstr "Cànanan fèillmhor" @@ -204,8 +192,7 @@ msgstr "Cànanan fèillmhor" msgid "Popular Tags" msgstr "Tagaichean fèillmhor" -#: src\templates\sub\server.phtml:44 -#: src\templates\sub\server.phtml:45 +#: src\templates\sub\server.phtml:44 src\templates\sub\server.phtml:45 msgid "Default Language" msgstr "An cànan tùsail" @@ -227,6 +214,15 @@ msgstr[1] "Daoine (%d)" msgstr[2] "Daoine (%d)" msgstr[3] "Daoine (%d)" +#: src\classes\Views\Widget\AccountTypeTabs.php:59 +msgctxt "account-type" +msgid "Forum (%d)" +msgid_plural "Forums (%d)" +msgstr[0] "Fòraman (%d)" +msgstr[1] "Fòraman (%d)" +msgstr[2] "Fòraman (%d)" +msgstr[3] "Fòraman (%d)" + #: src\templates\layout.phtml:97 msgid "Stats" msgstr "Stadastaireachd" @@ -240,16 +236,19 @@ msgid "Profiles" msgstr "Pròifilean" #: src\templates\statistics.phtml:6 -msgid "This directory knows about %s distinct potential profile URLs." -msgstr "Fhuair an t-eòlaire lorg air %s URL gu pròifilean fa leth." +msgid "" +"This directory knows about %s distinct potential profile " +"URLs." +msgstr "" +"Fhuair an t-eòlaire lorg air %s URL gu pròifilean fa leth." -#: src\templates\statistics.phtml:16 -#: src\templates\statistics.phtml:46 +#: src\templates\statistics.phtml:16 src\templates\statistics.phtml:46 msgid "Languages" msgstr "Cànanan" #: src\templates\statistics.phtml:17 -msgid "Out of %s profiles reporting their language there are:" +msgid "" +"Out of %s profiles reporting their language there are:" msgstr "Am measg %s pròifil a dh’innseas an cànan, tha:" #: src\templates\statistics.phtml:27 @@ -257,12 +256,20 @@ msgid "Servers" msgstr "Frithealaichean" #: src\templates\statistics.phtml:28 -msgid "This directory knows about %s distinct potential server URLs." -msgstr "Fhuair an t-eòlaire lorg air %s URL gu frithealaichean fa leth." +msgid "" +"This directory knows about %s distinct potential server " +"URLs." +msgstr "" +"Fhuair an t-eòlaire lorg air %s URL gu frithealaichean fa " +"leth." #: src\templates\statistics.phtml:29 -msgid "Out of those, there are %s domains (%s) that have been a Friendica server at least once." -msgstr "Tha %s àrainn (%s) ’nam measg a tha ’nam frithealaichean Friendica no a bha uair." +msgid "" +"Out of those, there are %s domains (%s) that have been a " +"Friendica server at least once." +msgstr "" +"Tha %s àrainn (%s) ’nam measg a tha ’nam frithealaichean " +"Friendica no a bha uair." #: src\templates\statistics.phtml:33 msgid "Out of those, there are:" @@ -270,7 +277,8 @@ msgstr "Am measg an fheadhainn sin, tha:" #: src\templates\statistics.phtml:47 msgid "Out of %s servers reporting their language there are:" -msgstr "Am measg %s frithealaiche a dh’innseas an cànan, tha:" +msgstr "" +"Am measg %s frithealaiche a dh’innseas an cànan, tha:" #: src\templates\statistics.phtml:57 msgid "Versions" @@ -278,11 +286,17 @@ msgstr "Tionndaidhean" #: src\templates\statistics.phtml:58 msgid "Out of %s servers reporting their version there are:" -msgstr "Am measg %s frithealaiche a dh’innseas an tionndadh, tha:" +msgstr "" +"Am measg %s frithealaiche a dh’innseas an tionndadh, tha:" #: src\templates\statistics.phtml:7 -msgid "Out of those, there are %s profiles (%s) that opted in the public directory at least once." -msgstr "Am measg an fhadhainn sin, tha %s pròifil (%s) a tha ag aontachadh ri gabhail a-steach dhan eòlaire poblach no a dh’aontaich ris uair." +msgid "" +"Out of those, there are %s profiles (%s) that opted in the " +"public directory at least once." +msgstr "" +"Am measg an fhadhainn sin, tha %s pròifil (%s) a tha ag " +"aontachadh ri gabhail a-steach dhan eòlaire poblach no a dh’aontaich ris " +"uair." #: src\templates\statistics.phtml:35 msgid "%s available servers (%s)" @@ -292,13 +306,25 @@ msgstr "%s frithealaiche ri fhaighinn (%s)" msgid "Friendica Directory version %s" msgstr "Eòlaire Friendica tionndadh %s" +#: src\templates\layout.phtml:94 +msgid "Source Code on GitHub" +msgstr "Bun-tùs air GitHub" + #: src\templates\statistics.phtml:11 -msgid "Out of those, there currently are %s available profiles (%s). Check them out!" -msgstr "Am measg an fheadhainn sin, tha %s pròifilean rim faighinn (%s). Nach doir thu sùil orra?" +msgid "" +"Out of those, there currently are %s available profiles " +"(%s). Check them out!" +msgstr "" +"Am measg an fheadhainn sin, tha %s pròifilean rim faighinn " +"(%s). Nach doir thu sùil orra?" #: src\templates\statistics.phtml:39 -msgid "%s public servers (%s) currently open for registration. Check them out!" -msgstr "Tha %s frithealaichean poblach (%s) fosgailte airson clàradh. Nach doir thu sùil orra?" +msgid "" +"%s public servers (%s) currently open for registration. Check them out!" +msgstr "" +"Tha %s frithealaichean poblach (%s) fosgailte airson " +"clàradh. Nach doir thu sùil orra?" #: src\classes\Views\Widget\AccountTypeTabs.php:57 msgctxt "account-type" @@ -334,36 +360,14 @@ msgstr[3] "%s cleachdaiche" msgid "None" msgstr "Chan eil gin" -#: src\templates\sub\server.phtml:58 -#: src\templates\sub\server.phtml:62 +#: src\templates\sub\server.phtml:59 src\templates\sub\server.phtml:63 msgid "Registration Policy" msgstr "Poileasaidh clàraidh" -#: src\templates\sub\server.phtml:59 +#: src\templates\sub\server.phtml:60 msgid "By Approval" msgstr "Le aontachadh" -#: src\templates\sub\server.phtml:63 +#: src\templates\sub\server.phtml:64 msgid "Open" msgstr "Fosgailte" - -#: src\classes\Views\Widget\AccountTypeTabs.php:61 -msgctxt "account-type" -msgid "Group (%d)" -msgid_plural "Groups (%d)" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" - -#: src\templates\servers.phtml:3 -msgid "Filtered by language:" -msgstr "" - -#: src\templates\servers.phtml:3 -msgid "Clear language filter" -msgstr "" - -#: src\templates\layout.phtml:94 -msgid "Source Code on Friendica's Forgejo" -msgstr "" diff --git a/src/lang/hu/LC_MESSAGES/strings.mo b/src/lang/hu/LC_MESSAGES/strings.mo deleted file mode 100644 index 3598ddd..0000000 Binary files a/src/lang/hu/LC_MESSAGES/strings.mo and /dev/null differ diff --git a/src/lang/hu/LC_MESSAGES/strings.po b/src/lang/hu/LC_MESSAGES/strings.po deleted file mode 100644 index 541e26a..0000000 --- a/src/lang/hu/LC_MESSAGES/strings.po +++ /dev/null @@ -1,357 +0,0 @@ -msgid "" -msgstr "" -"Project-Id-Version: \n" -"Report-Msgid-Bugs-To: \n" -"Last-Translator: Balázs Úr, 2021\n" -"Language-Team: Hungarian (https://www.transifex.com/Friendica/teams/12172/hu/)\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"POT-Creation-Date: 2018-11-16T04:17:37+00:00\n" -"PO-Revision-Date: 2018-11-16 20:30+0000\n" -"Language: hu\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 2.2\n" - -#: src\classes\Content\Pager.php:168 -#: src\classes\Content\Pager.php:216 -msgid "Previous" -msgstr "Előző" - -#: src\classes\Content\Pager.php:173 -#: src\classes\Content\Pager.php:273 -msgid "Next" -msgstr "Következő" - -#: src\classes\Content\Pager.php:211 -msgid "First" -msgstr "Első" - -#: src\classes\Content\Pager.php:278 -msgid "Last" -msgstr "Utolsó" - -#: src\classes\Controllers\Web\Directory.php:85 -msgid "People" -msgstr "Emberek" - -#: src\classes\Controllers\Web\Search.php:72 -msgctxt "field" -msgid "Language" -msgstr "Nyelv" - -#: src\classes\Controllers\Web\Search.php:73 -msgctxt "field" -msgid "Locality" -msgstr "Helység" - -#: src\classes\Controllers\Web\Search.php:74 -msgctxt "field" -msgid "Region" -msgstr "Régió" - -#: src\classes\Controllers\Web\Search.php:75 -msgctxt "field" -msgid "Country" -msgstr "Ország" - -#: src\classes\Controllers\Web\Servers.php:105 -msgid "Public Servers" -msgstr "Nyilvános kiszolgálók" - -#: src\templates\layout.phtml:4 -#: src\templates\layout.phtml:18 -msgid "Friendica Directory" -msgstr "Friendica könyvtár" - -#: src\templates\layout.phtml:23 -#: src\templates\layout.phtml:25 -#: src\templates\layout.phtml:43 -#: src\templates\layout.phtml:45 -#: src\templates\search.phtml:4 -#: src\templates\search.phtml:12 -msgid "Search terms" -msgstr "Kifejezések keresése" - -#: src\templates\layout.phtml:24 -#: src\templates\layout.phtml:45 -#: src\templates\search.phtml:11 -msgctxt "noun" -msgid "Search" -msgstr "Keresés" - -#: src\templates\layout.phtml:27 -#: src\templates\layout.phtml:47 -#: src\templates\search.phtml:14 -msgctxt "verb" -msgid "Search" -msgstr "Keresés" - -#: src\templates\layout.phtml:33 -msgid "Toggle navigation" -msgstr "Navigáció ki- és bekapcsolása" - -#: src\templates\layout.phtml:55 -msgid "Directory" -msgstr "Könyvtár" - -#: src\templates\layout.phtml:60 -msgid "Public servers" -msgstr "Nyilvános kiszolgálók" - -#: src\templates\search.phtml:19 -msgid "%d result for \"%s\"" -msgid_plural "%d results for \"%s\"" -msgstr[0] "%d találat erre: „%s”" -msgstr[1] "%d találat erre: „%s”" - -#: src\templates\servers.phtml:7 -msgid "Top servers pagination" -msgstr "Kiszolgálók lapszámozása felül" - -#: src\templates\servers.phtml:17 -msgid "Bottom servers pagination" -msgstr "Kiszolgálók lapszámozása alul" - -#: src\templates\sub\profile.phtml:5 -msgid "Filter by locality" -msgstr "Szűrés helység szerint" - -#: src\templates\sub\profile.phtml:11 -msgid "Filter by region" -msgstr "Szűrés régió szerint" - -#: src\templates\sub\profile.phtml:17 -msgid "Filter by country" -msgstr "Szűrés ország szerint" - -#: src\templates\sub\profile.phtml:31 -#: src\templates\sub\profile.phtml:35 -#: src\templates\sub\profile.phtml:39 -msgctxt "verb" -msgid "Follow" -msgstr "Követés" - -#: src\templates\layout.phtml:65 -#: src\templates\sub\profile.phtml:57 -msgid "Language" -msgstr "Nyelv" - -#: src\templates\sub\profile.phtml:60 -#: src\templates\widget\popularserverlanguages.phtml:2 -msgid "Filter by language" -msgstr "Szűrés nyelv szerint" - -#: src\templates\sub\profile.phtml:66 -msgid "Location" -msgstr "Hely" - -#: src\templates\sub\profile.phtml:79 -msgid "Search Tag" -msgstr "Címke keresése" - -#: src\templates\sub\profiles.phtml:1 -msgid "Account type tabs" -msgstr "Fióktípus lapok" - -#: src\templates\sub\profiles.phtml:4 -#: src\templates\sub\profiles.phtml:7 -msgid "Top %s pagination" -msgstr "%s lapszámozása felül" - -#: src\templates\sub\profiles.phtml:13 -#: src\templates\sub\profiles.phtml:16 -msgid "Bottom %s pagination" -msgstr "%s lapszámozása alul" - -#: src\templates\statistics.phtml:66 -#: src\templates\sub\server.phtml:15 -msgid "Stable Version" -msgstr "Stabil verzió" - -#: src\templates\statistics.phtml:68 -#: src\templates\sub\server.phtml:17 -msgid "Develop Version" -msgstr "Fejlesztői verzió" - -#: src\templates\sub\server.phtml:19 -msgid "Outdated Version" -msgstr "Elavult verzió" - -#: src\templates\sub\server.phtml:69 -msgid "Admin" -msgstr "Adminisztrátor" - -#: src\templates\sub\server.phtml:76 -msgid "No description provided" -msgstr "Nincs leírás megadva" - -#: src\templates\sub\server.phtml:79 -msgid "Visit Server" -msgstr "Kiszolgáló meglátogatása" - -#: src\templates\widget\popularcountries.phtml:2 -msgid "Popular Countries" -msgstr "Népszerű országok" - -#: src\templates\widget\popularprofilelanguages.phtml:2 -msgid "Popular Languages" -msgstr "Népszerű nyelvek" - -#: src\templates\widget\populartags.phtml:2 -msgid "Popular Tags" -msgstr "Népszerű címkék" - -#: src\templates\sub\server.phtml:44 -#: src\templates\sub\server.phtml:45 -msgid "Default Language" -msgstr "Alapértelmezett nyelv" - -#: src\templates\sub\server.phtml:49 -msgid "Known Users" -msgstr "Ismert felhasználók" - -#: src\classes\Views\Widget\AccountTypeTabs.php:48 -msgctxt "account-type" -msgid "All" -msgstr "Összes" - -#: src\classes\Views\Widget\AccountTypeTabs.php:56 -msgctxt "account-type" -msgid "People (%d)" -msgid_plural "People (%d)" -msgstr[0] "Emberek (%d)" -msgstr[1] "Emberek (%d)" - -#: src\templates\layout.phtml:97 -msgid "Stats" -msgstr "Statisztikák" - -#: src\templates\statistics.phtml:4 -msgid "Directory statistics" -msgstr "Könyvtárstatisztikák" - -#: src\templates\statistics.phtml:5 -msgid "Profiles" -msgstr "Profilok" - -#: src\templates\statistics.phtml:6 -msgid "This directory knows about %s distinct potential profile URLs." -msgstr "Ez a könyvtár körülbelül %s különböző lehetséges profil URL-t ismer." - -#: src\templates\statistics.phtml:16 -#: src\templates\statistics.phtml:46 -msgid "Languages" -msgstr "Nyelvek" - -#: src\templates\statistics.phtml:17 -msgid "Out of %s profiles reporting their language there are:" -msgstr "A nyelvüket jelentő %s profil közül ezek az alábbiak:" - -#: src\templates\statistics.phtml:27 -msgid "Servers" -msgstr "Kiszolgálók" - -#: src\templates\statistics.phtml:28 -msgid "This directory knows about %s distinct potential server URLs." -msgstr "Ez a könyvtár körülbelül %s különböző lehetséges kiszolgáló URL-t ismer." - -#: src\templates\statistics.phtml:29 -msgid "Out of those, there are %s domains (%s) that have been a Friendica server at least once." -msgstr "Ezek közül %s tartomány (%s) van, amelyek legalább egyszer Friendica kiszolgálók voltak." - -#: src\templates\statistics.phtml:33 -msgid "Out of those, there are:" -msgstr "Ezek közül ezek az alábbiak:" - -#: src\templates\statistics.phtml:47 -msgid "Out of %s servers reporting their language there are:" -msgstr "A nyelvüket jelentő %s kiszolgáló közül ezek az alábbiak:" - -#: src\templates\statistics.phtml:57 -msgid "Versions" -msgstr "Verziók" - -#: src\templates\statistics.phtml:58 -msgid "Out of %s servers reporting their version there are:" -msgstr "A verziójukat jelentő %s kiszolgáló közül ezek az alábbiak:" - -#: src\templates\statistics.phtml:7 -msgid "Out of those, there are %s profiles (%s) that opted in the public directory at least once." -msgstr "Ezek közül %s profil (%s) van, amelyek legalább egyszer beléptek a nyilvános könyvtárba." - -#: src\templates\statistics.phtml:35 -msgid "%s available servers (%s)" -msgstr "%s elérhető kiszolgáló (%s)" - -#: src\templates\layout.phtml:91 -msgid "Friendica Directory version %s" -msgstr "Friendica könyvtár verzió: %s" - -#: src\templates\statistics.phtml:11 -msgid "Out of those, there currently are %s available profiles (%s). Check them out!" -msgstr "Ezek közül jelenleg %s elérhető profil (%s) van. Nézze meg őket!" - -#: src\templates\statistics.phtml:39 -msgid "%s public servers (%s) currently open for registration. Check them out!" -msgstr "%s nyilvános kiszolgáló (%s) jelenleg nyitott a regisztrációra. Nézze meg azokat!" - -#: src\classes\Views\Widget\AccountTypeTabs.php:57 -msgctxt "account-type" -msgid "News (%d)" -msgid_plural "News (%d)" -msgstr[0] "Hírek (%d)" -msgstr[1] "Hírek (%d)" - -#: src\classes\Views\Widget\AccountTypeTabs.php:58 -msgctxt "account-type" -msgid "Organization (%d)" -msgid_plural "Organizations (%d)" -msgstr[0] "Szervezet (%d)" -msgstr[1] "Szervezetek (%d)" - -#: src\templates\sub\server.phtml:40 -msgid "Health Score" -msgstr "Egészségpont" - -#: src\templates\sub\server.phtml:52 -msgid "%s User" -msgid_plural "%s Users" -msgstr[0] "%s felhasználó" -msgstr[1] "%s felhasználó" - -#: src\templates\sub\server.phtml:54 -msgid "None" -msgstr "Nincs" - -#: src\templates\sub\server.phtml:58 -#: src\templates\sub\server.phtml:62 -msgid "Registration Policy" -msgstr "Regisztrációs irányelv" - -#: src\templates\sub\server.phtml:59 -msgid "By Approval" -msgstr "Jóváhagyás által" - -#: src\templates\sub\server.phtml:63 -msgid "Open" -msgstr "Nyitott" - -#: src\classes\Views\Widget\AccountTypeTabs.php:61 -msgctxt "account-type" -msgid "Group (%d)" -msgid_plural "Groups (%d)" -msgstr[0] "" -msgstr[1] "" - -#: src\templates\servers.phtml:3 -msgid "Filtered by language:" -msgstr "" - -#: src\templates\servers.phtml:3 -msgid "Clear language filter" -msgstr "" - -#: src\templates\layout.phtml:94 -msgid "Source Code on Friendica's Forgejo" -msgstr "" diff --git a/src/lang/it/LC_MESSAGES/strings.po b/src/lang/it/LC_MESSAGES/strings.po index 0abaa1f..0bbdbad 100644 --- a/src/lang/it/LC_MESSAGES/strings.po +++ b/src/lang/it/LC_MESSAGES/strings.po @@ -1,25 +1,28 @@ +# +# Translators: +# fabrixxm , 2019 +# Sylke Vicious , 2020 +# msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2018-11-16T04:17:37+00:00\n" +"PO-Revision-Date: 2018-11-16 20:30+0000\n" "Last-Translator: Sylke Vicious , 2020\n" "Language-Team: Italian (https://www.transifex.com/Friendica/teams/12172/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"POT-Creation-Date: 2018-11-16T04:17:37+00:00\n" -"PO-Revision-Date: 2018-11-16 20:30+0000\n" "Language: it\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Poedit 2.2\n" -#: src\classes\Content\Pager.php:168 -#: src\classes\Content\Pager.php:216 +#: src\classes\Content\Pager.php:168 src\classes\Content\Pager.php:216 msgid "Previous" msgstr "Precedente" -#: src\classes\Content\Pager.php:173 -#: src\classes\Content\Pager.php:273 +#: src\classes\Content\Pager.php:173 src\classes\Content\Pager.php:273 msgid "Next" msgstr "Successivo" @@ -31,57 +34,51 @@ msgstr "Primo" msgid "Last" msgstr "Ultimo" -#: src\classes\Controllers\Web\Directory.php:85 +#: src\classes\Controllers\Web\Directory.php:73 msgid "People" msgstr "Persone" -#: src\classes\Controllers\Web\Search.php:72 +#: src\classes\Controllers\Web\Search.php:64 msgctxt "field" msgid "Language" msgstr "Lingua" -#: src\classes\Controllers\Web\Search.php:73 +#: src\classes\Controllers\Web\Search.php:65 msgctxt "field" msgid "Locality" msgstr "Località" -#: src\classes\Controllers\Web\Search.php:74 +#: src\classes\Controllers\Web\Search.php:66 msgctxt "field" msgid "Region" msgstr "Regione" -#: src\classes\Controllers\Web\Search.php:75 +#: src\classes\Controllers\Web\Search.php:67 msgctxt "field" msgid "Country" msgstr "Nazione" -#: src\classes\Controllers\Web\Servers.php:105 +#: src\classes\Controllers\Web\Servers.php:90 msgid "Public Servers" msgstr "Server Pubblici" -#: src\templates\layout.phtml:4 -#: src\templates\layout.phtml:18 +#: src\templates\layout.phtml:4 src\templates\layout.phtml:18 msgid "Friendica Directory" msgstr "Directory Friendica" -#: src\templates\layout.phtml:23 -#: src\templates\layout.phtml:25 -#: src\templates\layout.phtml:43 -#: src\templates\layout.phtml:45 -#: src\templates\search.phtml:4 -#: src\templates\search.phtml:12 +#: src\templates\layout.phtml:23 src\templates\layout.phtml:25 +#: src\templates\layout.phtml:43 src\templates\layout.phtml:45 +#: src\templates\search.phtml:4 src\templates\search.phtml:12 msgid "Search terms" msgstr "Termini di ricerca" -#: src\templates\layout.phtml:24 -#: src\templates\layout.phtml:45 +#: src\templates\layout.phtml:24 src\templates\layout.phtml:45 #: src\templates\search.phtml:11 msgctxt "noun" msgid "Search" msgstr "Cerca" -#: src\templates\layout.phtml:27 -#: src\templates\layout.phtml:47 +#: src\templates\layout.phtml:27 src\templates\layout.phtml:47 #: src\templates\search.phtml:14 msgctxt "verb" msgid "Search" @@ -105,11 +102,11 @@ msgid_plural "%d results for \"%s\"" msgstr[0] "%drisultato per \"%s\"" msgstr[1] "%d risultati per \"%s\"" -#: src\templates\servers.phtml:7 +#: src\templates\servers.phtml:2 msgid "Top servers pagination" msgstr "Paginazione superiore server" -#: src\templates\servers.phtml:17 +#: src\templates\servers.phtml:12 msgid "Bottom servers pagination" msgstr "Paginazione inferiore server" @@ -126,27 +123,23 @@ msgid "Filter by country" msgstr "Filtra per nazioen" #: src\templates\sub\profile.phtml:31 -#: src\templates\sub\profile.phtml:35 -#: src\templates\sub\profile.phtml:39 msgctxt "verb" msgid "Follow" msgstr "Segui" -#: src\templates\layout.phtml:65 -#: src\templates\sub\profile.phtml:57 +#: src\templates\layout.phtml:65 src\templates\sub\profile.phtml:47 msgid "Language" msgstr "Lingua" -#: src\templates\sub\profile.phtml:60 -#: src\templates\widget\popularserverlanguages.phtml:2 +#: src\templates\sub\profile.phtml:50 msgid "Filter by language" msgstr "Filtra per lingua" -#: src\templates\sub\profile.phtml:66 +#: src\templates\sub\profile.phtml:56 msgid "Location" msgstr "Posizione" -#: src\templates\sub\profile.phtml:79 +#: src\templates\sub\profile.phtml:69 msgid "Search Tag" msgstr "Cerca Tag" @@ -154,23 +147,19 @@ msgstr "Cerca Tag" msgid "Account type tabs" msgstr "Tab tipo account" -#: src\templates\sub\profiles.phtml:4 -#: src\templates\sub\profiles.phtml:7 +#: src\templates\sub\profiles.phtml:4 src\templates\sub\profiles.phtml:7 msgid "Top %s pagination" msgstr "Paginazione superiore %s" -#: src\templates\sub\profiles.phtml:13 -#: src\templates\sub\profiles.phtml:16 +#: src\templates\sub\profiles.phtml:13 src\templates\sub\profiles.phtml:16 msgid "Bottom %s pagination" msgstr "Paginazione inferiore %s" -#: src\templates\statistics.phtml:66 -#: src\templates\sub\server.phtml:15 +#: src\templates\statistics.phtml:66 src\templates\sub\server.phtml:15 msgid "Stable Version" msgstr "Versione Stabile" -#: src\templates\statistics.phtml:68 -#: src\templates\sub\server.phtml:17 +#: src\templates\statistics.phtml:68 src\templates\sub\server.phtml:17 msgid "Develop Version" msgstr "Versione di Sviluppo" @@ -178,15 +167,15 @@ msgstr "Versione di Sviluppo" msgid "Outdated Version" msgstr "Versione Obsoleta" -#: src\templates\sub\server.phtml:69 +#: src\templates\sub\server.phtml:55 msgid "Admin" msgstr "Amministratore" -#: src\templates\sub\server.phtml:76 +#: src\templates\sub\server.phtml:62 msgid "No description provided" msgstr "Nessuna descrizione fornita" -#: src\templates\sub\server.phtml:79 +#: src\templates\sub\server.phtml:65 msgid "Visit Server" msgstr "Visita il Server" @@ -194,7 +183,7 @@ msgstr "Visita il Server" msgid "Popular Countries" msgstr "Nazioni Popolari" -#: src\templates\widget\popularprofilelanguages.phtml:2 +#: src\templates\widget\popularlanguages.phtml:2 msgid "Popular Languages" msgstr "Lingue Popolari" @@ -202,8 +191,7 @@ msgstr "Lingue Popolari" msgid "Popular Tags" msgstr "Tag Popolari" -#: src\templates\sub\server.phtml:44 -#: src\templates\sub\server.phtml:45 +#: src\templates\sub\server.phtml:44 src\templates\sub\server.phtml:45 msgid "Default Language" msgstr "Lingua di Default" @@ -223,6 +211,13 @@ msgid_plural "People (%d)" msgstr[0] "Persona (%d)" msgstr[1] "Persone (%d)" +#: src\classes\Views\Widget\AccountTypeTabs.php:57 +msgctxt "account-type" +msgid "Forum (%d)" +msgid_plural "Forums (%d)" +msgstr[0] "Forum (%d)" +msgstr[1] "Forum (%d)" + #: src\templates\layout.phtml:97 msgid "Stats" msgstr "Statistiche" @@ -236,16 +231,20 @@ msgid "Profiles" msgstr "Profili" #: src\templates\statistics.phtml:6 -msgid "This directory knows about %s distinct potential profile URLs." -msgstr "Questa directory conosce %s distinti URL profili potenziali." +msgid "" +"This directory knows about %s distinct potential profile " +"URLs." +msgstr "" +"Questa directory conosce %s distinti URL profili " +"potenziali." -#: src\templates\statistics.phtml:16 -#: src\templates\statistics.phtml:46 +#: src\templates\statistics.phtml:16 src\templates\statistics.phtml:46 msgid "Languages" msgstr "Lingue" #: src\templates\statistics.phtml:17 -msgid "Out of %s profiles reporting their language there are:" +msgid "" +"Out of %s profiles reporting their language there are:" msgstr "Di %s profili che riportano la loro lingua, ci sono:" #: src\templates\statistics.phtml:27 @@ -253,12 +252,20 @@ msgid "Servers" msgstr "Server" #: src\templates\statistics.phtml:28 -msgid "This directory knows about %s distinct potential server URLs." -msgstr "Questa directory conosce %s distinti URL di server potenziali." +msgid "" +"This directory knows about %s distinct potential server " +"URLs." +msgstr "" +"Questa directory conosce %s distinti URL di server " +"potenziali." #: src\templates\statistics.phtml:29 -msgid "Out of those, there are %s domains (%s) that have been a Friendica server at least once." -msgstr "Di questi, ci sono %s domini (%s) che sono stati un server Friendica almeno una volta." +msgid "" +"Out of those, there are %s domains (%s) that have been a " +"Friendica server at least once." +msgstr "" +"Di questi, ci sono %s domini (%s) che sono stati un server " +"Friendica almeno una volta." #: src\templates\statistics.phtml:33 msgid "Out of those, there are:" @@ -274,11 +281,16 @@ msgstr "Versioni" #: src\templates\statistics.phtml:58 msgid "Out of %s servers reporting their version there are:" -msgstr "Di %s server che riportano la loro versione, ci sono:" +msgstr "" +"Di %s server che riportano la loro versione, ci sono:" #: src\templates\statistics.phtml:7 -msgid "Out of those, there are %s profiles (%s) that opted in the public directory at least once." -msgstr "Di questi, ci sono %s profili (%s che hanno deciso di venir pubblicati nella directory pubblica almeno una volta." +msgid "" +"Out of those, there are %s profiles (%s) that opted in the " +"public directory at least once." +msgstr "" +"Di questi, ci sono %s profili (%s che hanno deciso di venir" +" pubblicati nella directory pubblica almeno una volta." #: src\templates\statistics.phtml:35 msgid "%s available servers (%s)" @@ -288,70 +300,22 @@ msgstr "%s server disponibili (%s)" msgid "Friendica Directory version %s" msgstr "Friendica Directory versione %s" +#: src\templates\layout.phtml:94 +msgid "Source Code on GitHub" +msgstr "Codice Sorgente su GitHub" + #: src\templates\statistics.phtml:11 -msgid "Out of those, there currently are %s available profiles (%s). Check them out!" -msgstr "Di questi, ci sono %s profili disponibili (%s). Dacci un'occhiata!" +msgid "" +"Out of those, there currently are %s available profiles " +"(%s). Check them out!" +msgstr "" +"Di questi, ci sono %s profili disponibili (%s). Dacci un'occhiata!" #: src\templates\statistics.phtml:39 -msgid "%s public servers (%s) currently open for registration. Check them out!" -msgstr "%s server pubblici (%s) attualmente con registrazione libera. Dacci un'occhiata!" - -#: src\classes\Views\Widget\AccountTypeTabs.php:57 -msgctxt "account-type" -msgid "News (%d)" -msgid_plural "News (%d)" -msgstr[0] "" -msgstr[1] "" - -#: src\classes\Views\Widget\AccountTypeTabs.php:58 -msgctxt "account-type" -msgid "Organization (%d)" -msgid_plural "Organizations (%d)" -msgstr[0] "" -msgstr[1] "" - -#: src\classes\Views\Widget\AccountTypeTabs.php:61 -msgctxt "account-type" -msgid "Group (%d)" -msgid_plural "Groups (%d)" -msgstr[0] "" -msgstr[1] "" - -#: src\templates\servers.phtml:3 -msgid "Filtered by language:" -msgstr "" - -#: src\templates\servers.phtml:3 -msgid "Clear language filter" -msgstr "" - -#: src\templates\sub\server.phtml:40 -msgid "Health Score" -msgstr "" - -#: src\templates\sub\server.phtml:52 -msgid "%s User" -msgid_plural "%s Users" -msgstr[0] "" -msgstr[1] "" - -#: src\templates\sub\server.phtml:54 -msgid "None" -msgstr "" - -#: src\templates\sub\server.phtml:58 -#: src\templates\sub\server.phtml:62 -msgid "Registration Policy" -msgstr "" - -#: src\templates\sub\server.phtml:59 -msgid "By Approval" -msgstr "" - -#: src\templates\sub\server.phtml:63 -msgid "Open" -msgstr "" - -#: src\templates\layout.phtml:94 -msgid "Source Code on Friendica's Forgejo" +msgid "" +"%s public servers (%s) currently open for registration. Check them out!" msgstr "" +"%s server pubblici (%s) attualmente con registrazione " +"libera. Dacci un'occhiata!" diff --git a/src/lang/ja/LC_MESSAGES/strings.po b/src/lang/ja/LC_MESSAGES/strings.po index 1c20ff8..ae93aad 100644 --- a/src/lang/ja/LC_MESSAGES/strings.po +++ b/src/lang/ja/LC_MESSAGES/strings.po @@ -1,25 +1,27 @@ +# +# Translators: +# ozero dien , 2019 +# msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2018-11-16T04:17:37+00:00\n" +"PO-Revision-Date: 2018-11-16 20:30+0000\n" "Last-Translator: ozero dien , 2019\n" "Language-Team: Japanese (https://www.transifex.com/Friendica/teams/12172/ja/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"POT-Creation-Date: 2018-11-16T04:17:37+00:00\n" -"PO-Revision-Date: 2018-11-16 20:30+0000\n" "Language: ja\n" "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Poedit 2.2\n" -#: src\classes\Content\Pager.php:168 -#: src\classes\Content\Pager.php:216 +#: src\classes\Content\Pager.php:168 src\classes\Content\Pager.php:216 msgid "Previous" msgstr "前" -#: src\classes\Content\Pager.php:173 -#: src\classes\Content\Pager.php:273 +#: src\classes\Content\Pager.php:173 src\classes\Content\Pager.php:273 msgid "Next" msgstr "次" @@ -31,57 +33,51 @@ msgstr "最初" msgid "Last" msgstr "最終" -#: src\classes\Controllers\Web\Directory.php:85 +#: src\classes\Controllers\Web\Directory.php:73 msgid "People" msgstr "人" -#: src\classes\Controllers\Web\Search.php:72 +#: src\classes\Controllers\Web\Search.php:64 msgctxt "field" msgid "Language" msgstr "言語" -#: src\classes\Controllers\Web\Search.php:73 +#: src\classes\Controllers\Web\Search.php:65 msgctxt "field" msgid "Locality" msgstr "局所性" -#: src\classes\Controllers\Web\Search.php:74 +#: src\classes\Controllers\Web\Search.php:66 msgctxt "field" msgid "Region" msgstr "地域" -#: src\classes\Controllers\Web\Search.php:75 +#: src\classes\Controllers\Web\Search.php:67 msgctxt "field" msgid "Country" msgstr "国" -#: src\classes\Controllers\Web\Servers.php:105 +#: src\classes\Controllers\Web\Servers.php:90 msgid "Public Servers" msgstr "パブリックサーバー" -#: src\templates\layout.phtml:4 -#: src\templates\layout.phtml:18 +#: src\templates\layout.phtml:4 src\templates\layout.phtml:18 msgid "Friendica Directory" msgstr "Friendicaディレクトリ" -#: src\templates\layout.phtml:23 -#: src\templates\layout.phtml:25 -#: src\templates\layout.phtml:43 -#: src\templates\layout.phtml:45 -#: src\templates\search.phtml:4 -#: src\templates\search.phtml:12 +#: src\templates\layout.phtml:23 src\templates\layout.phtml:25 +#: src\templates\layout.phtml:43 src\templates\layout.phtml:45 +#: src\templates\search.phtml:4 src\templates\search.phtml:12 msgid "Search terms" msgstr "検索ワード" -#: src\templates\layout.phtml:24 -#: src\templates\layout.phtml:45 +#: src\templates\layout.phtml:24 src\templates\layout.phtml:45 #: src\templates\search.phtml:11 msgctxt "noun" msgid "Search" msgstr "サーチ" -#: src\templates\layout.phtml:27 -#: src\templates\layout.phtml:47 +#: src\templates\layout.phtml:27 src\templates\layout.phtml:47 #: src\templates\search.phtml:14 msgctxt "verb" msgid "Search" @@ -104,11 +100,11 @@ msgid "%d result for \"%s\"" msgid_plural "%d results for \"%s\"" msgstr[0] " \"%s\" : %d 件の結果" -#: src\templates\servers.phtml:7 +#: src\templates\servers.phtml:2 msgid "Top servers pagination" msgstr "トップサーバーのページネーション" -#: src\templates\servers.phtml:17 +#: src\templates\servers.phtml:12 msgid "Bottom servers pagination" msgstr "下部サーバーのページネーション" @@ -125,27 +121,23 @@ msgid "Filter by country" msgstr "国で絞り込む" #: src\templates\sub\profile.phtml:31 -#: src\templates\sub\profile.phtml:35 -#: src\templates\sub\profile.phtml:39 msgctxt "verb" msgid "Follow" msgstr "フォロー" -#: src\templates\layout.phtml:65 -#: src\templates\sub\profile.phtml:57 +#: src\templates\layout.phtml:65 src\templates\sub\profile.phtml:47 msgid "Language" msgstr "言語" -#: src\templates\sub\profile.phtml:60 -#: src\templates\widget\popularserverlanguages.phtml:2 +#: src\templates\sub\profile.phtml:50 msgid "Filter by language" msgstr "言語でフィルター" -#: src\templates\sub\profile.phtml:66 +#: src\templates\sub\profile.phtml:56 msgid "Location" msgstr "ロケーション" -#: src\templates\sub\profile.phtml:79 +#: src\templates\sub\profile.phtml:69 msgid "Search Tag" msgstr "検索タグ" @@ -153,23 +145,19 @@ msgstr "検索タグ" msgid "Account type tabs" msgstr "アカウントタイプタブ" -#: src\templates\sub\profiles.phtml:4 -#: src\templates\sub\profiles.phtml:7 +#: src\templates\sub\profiles.phtml:4 src\templates\sub\profiles.phtml:7 msgid "Top %s pagination" msgstr "トップ %s のページネーション" -#: src\templates\sub\profiles.phtml:13 -#: src\templates\sub\profiles.phtml:16 +#: src\templates\sub\profiles.phtml:13 src\templates\sub\profiles.phtml:16 msgid "Bottom %s pagination" msgstr "下位 %s のページネーション" -#: src\templates\statistics.phtml:66 -#: src\templates\sub\server.phtml:15 +#: src\templates\statistics.phtml:66 src\templates\sub\server.phtml:15 msgid "Stable Version" msgstr "安定版" -#: src\templates\statistics.phtml:68 -#: src\templates\sub\server.phtml:17 +#: src\templates\statistics.phtml:68 src\templates\sub\server.phtml:17 msgid "Develop Version" msgstr "バージョンを開発" @@ -177,15 +165,15 @@ msgstr "バージョンを開発" msgid "Outdated Version" msgstr "古いバージョン" -#: src\templates\sub\server.phtml:69 +#: src\templates\sub\server.phtml:55 msgid "Admin" msgstr "管理者" -#: src\templates\sub\server.phtml:76 +#: src\templates\sub\server.phtml:62 msgid "No description provided" msgstr "説明なし" -#: src\templates\sub\server.phtml:79 +#: src\templates\sub\server.phtml:65 msgid "Visit Server" msgstr "サーバーにアクセス" @@ -193,7 +181,7 @@ msgstr "サーバーにアクセス" msgid "Popular Countries" msgstr "人気の国" -#: src\templates\widget\popularprofilelanguages.phtml:2 +#: src\templates\widget\popularlanguages.phtml:2 msgid "Popular Languages" msgstr "人気のある言語" @@ -201,8 +189,7 @@ msgstr "人気のある言語" msgid "Popular Tags" msgstr "人気のタグ" -#: src\templates\sub\server.phtml:44 -#: src\templates\sub\server.phtml:45 +#: src\templates\sub\server.phtml:44 src\templates\sub\server.phtml:45 msgid "Default Language" msgstr "既定の言語" @@ -221,6 +208,12 @@ msgid "People (%d)" msgid_plural "People (%d)" msgstr[0] "個人（ %d ）" +#: src\classes\Views\Widget\AccountTypeTabs.php:57 +msgctxt "account-type" +msgid "Forum (%d)" +msgid_plural "Forums (%d)" +msgstr[0] "フォーラム（ %d ）" + #: src\templates\layout.phtml:97 msgid "Stats" msgstr "統計" @@ -234,16 +227,18 @@ msgid "Profiles" msgstr "プロフィール" #: src\templates\statistics.phtml:6 -msgid "This directory knows about %s distinct potential profile URLs." +msgid "" +"This directory knows about %s distinct potential profile " +"URLs." msgstr "このディレクトリは、 %s の異なる潜在的なプロファイルURL を認識しています。" -#: src\templates\statistics.phtml:16 -#: src\templates\statistics.phtml:46 +#: src\templates\statistics.phtml:16 src\templates\statistics.phtml:46 msgid "Languages" msgstr "言語" #: src\templates\statistics.phtml:17 -msgid "Out of %s profiles reporting their language there are:" +msgid "" +"Out of %s profiles reporting their language there are:" msgstr " %s の言語を報告するプロフィールには、次のものがあります。" #: src\templates\statistics.phtml:27 @@ -251,12 +246,17 @@ msgid "Servers" msgstr "サーバー" #: src\templates\statistics.phtml:28 -msgid "This directory knows about %s distinct potential server URLs." +msgid "" +"This directory knows about %s distinct potential server " +"URLs." msgstr "このディレクトリは、 %s の異なる潜在的なサーバーURL を認識しています。" #: src\templates\statistics.phtml:29 -msgid "Out of those, there are %s domains (%s) that have been a Friendica server at least once." -msgstr "それらのうち、少なくとも一度はFriendicaサーバーであった %s のドメイン（ %s ）があります。" +msgid "" +"Out of those, there are %s domains (%s) that have been a " +"Friendica server at least once." +msgstr "" +"それらのうち、少なくとも一度はFriendicaサーバーであった %s のドメイン（ %s ）があります。" #: src\templates\statistics.phtml:33 msgid "Out of those, there are:" @@ -275,8 +275,11 @@ msgid "Out of %s servers reporting their version there are:" msgstr "バージョンを報告している %s のサーバーのうち、次のものがあります。" #: src\templates\statistics.phtml:7 -msgid "Out of those, there are %s profiles (%s) that opted in the public directory at least once." -msgstr "これらのうち、 %s のプロファイル（ %s ）があり、パブリックディレクトリで少なくとも1回選択しました。" +msgid "" +"Out of those, there are %s profiles (%s) that opted in the " +"public directory at least once." +msgstr "" +"これらのうち、 %s のプロファイル（ %s ）があり、パブリックディレクトリで少なくとも1回選択しました。" #: src\templates\statistics.phtml:35 msgid "%s available servers (%s)" @@ -286,66 +289,18 @@ msgstr " %s のサーバが利用可能（ %s ）" msgid "Friendica Directory version %s" msgstr "Friendica Directory バージョン %s" +#: src\templates\layout.phtml:94 +msgid "Source Code on GitHub" +msgstr "GitHubのソースコード" + #: src\templates\statistics.phtml:11 -msgid "Out of those, there currently are %s available profiles (%s). Check them out!" +msgid "" +"Out of those, there currently are %s available profiles " +"(%s). Check them out!" msgstr "" #: src\templates\statistics.phtml:39 -msgid "%s public servers (%s) currently open for registration. Check them out!" -msgstr "" - -#: src\classes\Views\Widget\AccountTypeTabs.php:57 -msgctxt "account-type" -msgid "News (%d)" -msgid_plural "News (%d)" -msgstr[0] "" - -#: src\classes\Views\Widget\AccountTypeTabs.php:58 -msgctxt "account-type" -msgid "Organization (%d)" -msgid_plural "Organizations (%d)" -msgstr[0] "" - -#: src\classes\Views\Widget\AccountTypeTabs.php:61 -msgctxt "account-type" -msgid "Group (%d)" -msgid_plural "Groups (%d)" -msgstr[0] "" - -#: src\templates\servers.phtml:3 -msgid "Filtered by language:" -msgstr "" - -#: src\templates\servers.phtml:3 -msgid "Clear language filter" -msgstr "" - -#: src\templates\sub\server.phtml:40 -msgid "Health Score" -msgstr "" - -#: src\templates\sub\server.phtml:52 -msgid "%s User" -msgid_plural "%s Users" -msgstr[0] "" - -#: src\templates\sub\server.phtml:54 -msgid "None" -msgstr "" - -#: src\templates\sub\server.phtml:58 -#: src\templates\sub\server.phtml:62 -msgid "Registration Policy" -msgstr "" - -#: src\templates\sub\server.phtml:59 -msgid "By Approval" -msgstr "" - -#: src\templates\sub\server.phtml:63 -msgid "Open" -msgstr "" - -#: src\templates\layout.phtml:94 -msgid "Source Code on Friendica's Forgejo" +msgid "" +"%s public servers (%s) currently open for registration. Check them out!" msgstr "" diff --git a/src/lang/nl/LC_MESSAGES/strings.po b/src/lang/nl/LC_MESSAGES/strings.po index 21e426a..59c2d72 100644 --- a/src/lang/nl/LC_MESSAGES/strings.po +++ b/src/lang/nl/LC_MESSAGES/strings.po @@ -1,25 +1,27 @@ +# +# Translators: +# Jeroen De Meerleer , 2018 +# msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2018-11-16T04:17:37+00:00\n" +"PO-Revision-Date: 2018-11-16 20:30+0000\n" "Last-Translator: Jeroen De Meerleer , 2018\n" "Language-Team: Dutch (https://www.transifex.com/Friendica/teams/12172/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"POT-Creation-Date: 2018-11-16T04:17:37+00:00\n" -"PO-Revision-Date: 2018-11-16 20:30+0000\n" "Language: nl\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Poedit 2.2\n" -#: src\classes\Content\Pager.php:168 -#: src\classes\Content\Pager.php:216 +#: src\classes\Content\Pager.php:168 src\classes\Content\Pager.php:216 msgid "Previous" msgstr "Vorige" -#: src\classes\Content\Pager.php:173 -#: src\classes\Content\Pager.php:273 +#: src\classes\Content\Pager.php:173 src\classes\Content\Pager.php:273 msgid "Next" msgstr "Volgende" @@ -31,57 +33,51 @@ msgstr "Eerste" msgid "Last" msgstr "Laatste" -#: src\classes\Controllers\Web\Directory.php:85 +#: src\classes\Controllers\Web\Directory.php:73 msgid "People" msgstr "Mensen" -#: src\classes\Controllers\Web\Search.php:72 +#: src\classes\Controllers\Web\Search.php:64 msgctxt "field" msgid "Language" msgstr "Taal" -#: src\classes\Controllers\Web\Search.php:73 +#: src\classes\Controllers\Web\Search.php:65 msgctxt "field" msgid "Locality" msgstr "Stad" -#: src\classes\Controllers\Web\Search.php:74 +#: src\classes\Controllers\Web\Search.php:66 msgctxt "field" msgid "Region" msgstr "Regio" -#: src\classes\Controllers\Web\Search.php:75 +#: src\classes\Controllers\Web\Search.php:67 msgctxt "field" msgid "Country" msgstr "Land" -#: src\classes\Controllers\Web\Servers.php:105 +#: src\classes\Controllers\Web\Servers.php:90 msgid "Public Servers" msgstr "Publieke servers" -#: src\templates\layout.phtml:4 -#: src\templates\layout.phtml:18 +#: src\templates\layout.phtml:4 src\templates\layout.phtml:18 msgid "Friendica Directory" msgstr "Friendica gids" -#: src\templates\layout.phtml:23 -#: src\templates\layout.phtml:25 -#: src\templates\layout.phtml:43 -#: src\templates\layout.phtml:45 -#: src\templates\search.phtml:4 -#: src\templates\search.phtml:12 +#: src\templates\layout.phtml:23 src\templates\layout.phtml:25 +#: src\templates\layout.phtml:43 src\templates\layout.phtml:45 +#: src\templates\search.phtml:4 src\templates\search.phtml:12 msgid "Search terms" msgstr "Zoektermen" -#: src\templates\layout.phtml:24 -#: src\templates\layout.phtml:45 +#: src\templates\layout.phtml:24 src\templates\layout.phtml:45 #: src\templates\search.phtml:11 msgctxt "noun" msgid "Search" msgstr "Zoeken" -#: src\templates\layout.phtml:27 -#: src\templates\layout.phtml:47 +#: src\templates\layout.phtml:27 src\templates\layout.phtml:47 #: src\templates\search.phtml:14 msgctxt "verb" msgid "Search" @@ -105,11 +101,11 @@ msgid_plural "%d results for \"%s\"" msgstr[0] "%d resultaten voor \"%s\"" msgstr[1] "%d resultaten voor \"%s\"" -#: src\templates\servers.phtml:7 +#: src\templates\servers.phtml:2 msgid "Top servers pagination" msgstr "Server pagina boven" -#: src\templates\servers.phtml:17 +#: src\templates\servers.phtml:12 msgid "Bottom servers pagination" msgstr "Server paginatie beneden" @@ -126,27 +122,23 @@ msgid "Filter by country" msgstr "Filter op land" #: src\templates\sub\profile.phtml:31 -#: src\templates\sub\profile.phtml:35 -#: src\templates\sub\profile.phtml:39 msgctxt "verb" msgid "Follow" msgstr "Volg" -#: src\templates\layout.phtml:65 -#: src\templates\sub\profile.phtml:57 +#: src\templates\layout.phtml:65 src\templates\sub\profile.phtml:47 msgid "Language" msgstr "Taal" -#: src\templates\sub\profile.phtml:60 -#: src\templates\widget\popularserverlanguages.phtml:2 +#: src\templates\sub\profile.phtml:50 msgid "Filter by language" msgstr "Filter op taal" -#: src\templates\sub\profile.phtml:66 +#: src\templates\sub\profile.phtml:56 msgid "Location" msgstr "Locatie" -#: src\templates\sub\profile.phtml:79 +#: src\templates\sub\profile.phtml:69 msgid "Search Tag" msgstr "Zoekwoord" @@ -154,23 +146,19 @@ msgstr "Zoekwoord" msgid "Account type tabs" msgstr "Accounttype tabs" -#: src\templates\sub\profiles.phtml:4 -#: src\templates\sub\profiles.phtml:7 +#: src\templates\sub\profiles.phtml:4 src\templates\sub\profiles.phtml:7 msgid "Top %s pagination" msgstr "%s paginatie boven" -#: src\templates\sub\profiles.phtml:13 -#: src\templates\sub\profiles.phtml:16 +#: src\templates\sub\profiles.phtml:13 src\templates\sub\profiles.phtml:16 msgid "Bottom %s pagination" msgstr "%s paginatie beneden" -#: src\templates\statistics.phtml:66 -#: src\templates\sub\server.phtml:15 +#: src\templates\statistics.phtml:66 src\templates\sub\server.phtml:15 msgid "Stable Version" msgstr "Stabiele versie" -#: src\templates\statistics.phtml:68 -#: src\templates\sub\server.phtml:17 +#: src\templates\statistics.phtml:68 src\templates\sub\server.phtml:17 msgid "Develop Version" msgstr "Ontwikkelingsversie" @@ -178,15 +166,15 @@ msgstr "Ontwikkelingsversie" msgid "Outdated Version" msgstr "Oude versie" -#: src\templates\sub\server.phtml:69 +#: src\templates\sub\server.phtml:55 msgid "Admin" msgstr "Administrator" -#: src\templates\sub\server.phtml:76 +#: src\templates\sub\server.phtml:62 msgid "No description provided" msgstr "Geen omschrijving toegevoegd" -#: src\templates\sub\server.phtml:79 +#: src\templates\sub\server.phtml:65 msgid "Visit Server" msgstr "Bezoek server" @@ -194,7 +182,7 @@ msgstr "Bezoek server" msgid "Popular Countries" msgstr "Populaire landen" -#: src\templates\widget\popularprofilelanguages.phtml:2 +#: src\templates\widget\popularlanguages.phtml:2 msgid "Popular Languages" msgstr "Populaire talen" @@ -202,8 +190,7 @@ msgstr "Populaire talen" msgid "Popular Tags" msgstr "Populaire tags" -#: src\templates\sub\server.phtml:44 -#: src\templates\sub\server.phtml:45 +#: src\templates\sub\server.phtml:44 src\templates\sub\server.phtml:45 msgid "Default Language" msgstr "Standaard taal" @@ -223,6 +210,13 @@ msgid_plural "People (%d)" msgstr[0] "" msgstr[1] "" +#: src\classes\Views\Widget\AccountTypeTabs.php:57 +msgctxt "account-type" +msgid "Forum (%d)" +msgid_plural "Forums (%d)" +msgstr[0] "" +msgstr[1] "" + #: src\templates\layout.phtml:97 msgid "Stats" msgstr "" @@ -236,16 +230,18 @@ msgid "Profiles" msgstr "" #: src\templates\statistics.phtml:6 -msgid "This directory knows about %s distinct potential profile URLs." +msgid "" +"This directory knows about %s distinct potential profile " +"URLs." msgstr "" -#: src\templates\statistics.phtml:16 -#: src\templates\statistics.phtml:46 +#: src\templates\statistics.phtml:16 src\templates\statistics.phtml:46 msgid "Languages" msgstr "" #: src\templates\statistics.phtml:17 -msgid "Out of %s profiles reporting their language there are:" +msgid "" +"Out of %s profiles reporting their language there are:" msgstr "" #: src\templates\statistics.phtml:27 @@ -253,11 +249,15 @@ msgid "Servers" msgstr "" #: src\templates\statistics.phtml:28 -msgid "This directory knows about %s distinct potential server URLs." +msgid "" +"This directory knows about %s distinct potential server " +"URLs." msgstr "" #: src\templates\statistics.phtml:29 -msgid "Out of those, there are %s domains (%s) that have been a Friendica server at least once." +msgid "" +"Out of those, there are %s domains (%s) that have been a " +"Friendica server at least once." msgstr "" #: src\templates\statistics.phtml:33 @@ -277,7 +277,9 @@ msgid "Out of %s servers reporting their version there are:" msgstr "" #: src\templates\statistics.phtml:7 -msgid "Out of those, there are %s profiles (%s) that opted in the public directory at least once." +msgid "" +"Out of those, there are %s profiles (%s) that opted in the " +"public directory at least once." msgstr "" #: src\templates\statistics.phtml:35 @@ -288,70 +290,18 @@ msgstr "" msgid "Friendica Directory version %s" msgstr "" +#: src\templates\layout.phtml:94 +msgid "Source Code on GitHub" +msgstr "" + #: src\templates\statistics.phtml:11 -msgid "Out of those, there currently are %s available profiles (%s). Check them out!" +msgid "" +"Out of those, there currently are %s available profiles " +"(%s). Check them out!" msgstr "" #: src\templates\statistics.phtml:39 -msgid "%s public servers (%s) currently open for registration. Check them out!" -msgstr "" - -#: src\classes\Views\Widget\AccountTypeTabs.php:57 -msgctxt "account-type" -msgid "News (%d)" -msgid_plural "News (%d)" -msgstr[0] "" -msgstr[1] "" - -#: src\classes\Views\Widget\AccountTypeTabs.php:58 -msgctxt "account-type" -msgid "Organization (%d)" -msgid_plural "Organizations (%d)" -msgstr[0] "" -msgstr[1] "" - -#: src\classes\Views\Widget\AccountTypeTabs.php:61 -msgctxt "account-type" -msgid "Group (%d)" -msgid_plural "Groups (%d)" -msgstr[0] "" -msgstr[1] "" - -#: src\templates\servers.phtml:3 -msgid "Filtered by language:" -msgstr "" - -#: src\templates\servers.phtml:3 -msgid "Clear language filter" -msgstr "" - -#: src\templates\sub\server.phtml:40 -msgid "Health Score" -msgstr "" - -#: src\templates\sub\server.phtml:52 -msgid "%s User" -msgid_plural "%s Users" -msgstr[0] "" -msgstr[1] "" - -#: src\templates\sub\server.phtml:54 -msgid "None" -msgstr "" - -#: src\templates\sub\server.phtml:58 -#: src\templates\sub\server.phtml:62 -msgid "Registration Policy" -msgstr "" - -#: src\templates\sub\server.phtml:59 -msgid "By Approval" -msgstr "" - -#: src\templates\sub\server.phtml:63 -msgid "Open" -msgstr "" - -#: src\templates\layout.phtml:94 -msgid "Source Code on Friendica's Forgejo" +msgid "" +"%s public servers (%s) currently open for registration. Check them out!" msgstr "" diff --git a/src/lang/pl/LC_MESSAGES/strings.mo b/src/lang/pl/LC_MESSAGES/strings.mo index ec9d60c..f4b847e 100644 Binary files a/src/lang/pl/LC_MESSAGES/strings.mo and b/src/lang/pl/LC_MESSAGES/strings.mo differ diff --git a/src/lang/pl/LC_MESSAGES/strings.po b/src/lang/pl/LC_MESSAGES/strings.po index 3d7bf08..c1d03b7 100644 --- a/src/lang/pl/LC_MESSAGES/strings.po +++ b/src/lang/pl/LC_MESSAGES/strings.po @@ -1,87 +1,84 @@ +# +# Translators: +# Karol Kosek, 2018 +# Waldemar Stoczkowski, 2020 +# msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"Last-Translator: Piotr Strębski , 2022\n" +"POT-Creation-Date: 2018-11-16T04:17:37+00:00\n" +"PO-Revision-Date: 2018-11-16 20:30+0000\n" +"Last-Translator: Waldemar Stoczkowski, 2020\n" "Language-Team: Polish (https://www.transifex.com/Friendica/teams/12172/pl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"POT-Creation-Date: 2018-11-16T04:17:37+00:00\n" -"PO-Revision-Date: 2018-11-16 20:30+0000\n" "Language: pl\n" "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n" "X-Generator: Poedit 2.2\n" -#: src\classes\Content\Pager.php:168 -#: src\classes\Content\Pager.php:216 +#: src\classes\Content\Pager.php:168 src\classes\Content\Pager.php:216 msgid "Previous" -msgstr "Poprzednia" +msgstr "Poprzedni" -#: src\classes\Content\Pager.php:173 -#: src\classes\Content\Pager.php:273 +#: src\classes\Content\Pager.php:173 src\classes\Content\Pager.php:273 msgid "Next" -msgstr "Następna" +msgstr "Następny" #: src\classes\Content\Pager.php:211 msgid "First" -msgstr "Pierwsza" +msgstr "Pierwszy" #: src\classes\Content\Pager.php:278 msgid "Last" -msgstr "Ostatnia" +msgstr "Ostatni" -#: src\classes\Controllers\Web\Directory.php:85 +#: src\classes\Controllers\Web\Directory.php:73 msgid "People" -msgstr "Ludzie" +msgstr "Przyjaciele" -#: src\classes\Controllers\Web\Search.php:72 +#: src\classes\Controllers\Web\Search.php:64 msgctxt "field" msgid "Language" msgstr "Język" -#: src\classes\Controllers\Web\Search.php:73 +#: src\classes\Controllers\Web\Search.php:65 msgctxt "field" msgid "Locality" msgstr "Miejscowość" -#: src\classes\Controllers\Web\Search.php:74 +#: src\classes\Controllers\Web\Search.php:66 msgctxt "field" msgid "Region" msgstr "Region" -#: src\classes\Controllers\Web\Search.php:75 +#: src\classes\Controllers\Web\Search.php:67 msgctxt "field" msgid "Country" msgstr "Kraj" -#: src\classes\Controllers\Web\Servers.php:105 +#: src\classes\Controllers\Web\Servers.php:90 msgid "Public Servers" msgstr "Serwery publiczne" -#: src\templates\layout.phtml:4 -#: src\templates\layout.phtml:18 +#: src\templates\layout.phtml:4 src\templates\layout.phtml:18 msgid "Friendica Directory" msgstr "Katalog Friendica" -#: src\templates\layout.phtml:23 -#: src\templates\layout.phtml:25 -#: src\templates\layout.phtml:43 -#: src\templates\layout.phtml:45 -#: src\templates\search.phtml:4 -#: src\templates\search.phtml:12 +#: src\templates\layout.phtml:23 src\templates\layout.phtml:25 +#: src\templates\layout.phtml:43 src\templates\layout.phtml:45 +#: src\templates\search.phtml:4 src\templates\search.phtml:12 msgid "Search terms" -msgstr "Wyszukiwanie hasła" +msgstr "Wyszukiwane hasła" -#: src\templates\layout.phtml:24 -#: src\templates\layout.phtml:45 +#: src\templates\layout.phtml:24 src\templates\layout.phtml:45 #: src\templates\search.phtml:11 msgctxt "noun" msgid "Search" msgstr "Szukaj" -#: src\templates\layout.phtml:27 -#: src\templates\layout.phtml:47 +#: src\templates\layout.phtml:27 src\templates\layout.phtml:47 #: src\templates\search.phtml:14 msgctxt "verb" msgid "Search" @@ -93,7 +90,7 @@ msgstr "Przełącz nawigację" #: src\templates\layout.phtml:55 msgid "Directory" -msgstr "Katalog" +msgstr "Katalogi" #: src\templates\layout.phtml:60 msgid "Public servers" @@ -107,17 +104,17 @@ msgstr[1] "%d wyniki dla \"%s\"" msgstr[2] "%d wyników dla \"%s\"" msgstr[3] "%d wyników dla \"%s\"" -#: src\templates\servers.phtml:7 +#: src\templates\servers.phtml:2 msgid "Top servers pagination" -msgstr "Górna paginacja serwerów" +msgstr "Topowa paginacja serwerów" -#: src\templates\servers.phtml:17 +#: src\templates\servers.phtml:12 msgid "Bottom servers pagination" -msgstr "Dolna paginacja serwerów" +msgstr "Dolny podział na serwery" #: src\templates\sub\profile.phtml:5 msgid "Filter by locality" -msgstr "Filtruj według położenia" +msgstr "Filtruj według lokalizacji" #: src\templates\sub\profile.phtml:11 msgid "Filter by region" @@ -128,67 +125,59 @@ msgid "Filter by country" msgstr "Filtruj według kraju" #: src\templates\sub\profile.phtml:31 -#: src\templates\sub\profile.phtml:35 -#: src\templates\sub\profile.phtml:39 msgctxt "verb" msgid "Follow" -msgstr "Obserwuj" +msgstr "Śledzenie" -#: src\templates\layout.phtml:65 -#: src\templates\sub\profile.phtml:57 +#: src\templates\layout.phtml:65 src\templates\sub\profile.phtml:47 msgid "Language" msgstr "Język" -#: src\templates\sub\profile.phtml:60 -#: src\templates\widget\popularserverlanguages.phtml:2 +#: src\templates\sub\profile.phtml:50 msgid "Filter by language" msgstr "Filtruj według języka" -#: src\templates\sub\profile.phtml:66 +#: src\templates\sub\profile.phtml:56 msgid "Location" -msgstr "Położenie" +msgstr "Lokalizacja" -#: src\templates\sub\profile.phtml:79 +#: src\templates\sub\profile.phtml:69 msgid "Search Tag" -msgstr "Wyszukaj znacznik" +msgstr "Wyszukaj tag" #: src\templates\sub\profiles.phtml:1 msgid "Account type tabs" -msgstr "Karty rodzajów kont" +msgstr "Konta typu karty" -#: src\templates\sub\profiles.phtml:4 -#: src\templates\sub\profiles.phtml:7 +#: src\templates\sub\profiles.phtml:4 src\templates\sub\profiles.phtml:7 msgid "Top %s pagination" -msgstr "Górna paginacja %s" +msgstr "Górna %s paginacja" -#: src\templates\sub\profiles.phtml:13 -#: src\templates\sub\profiles.phtml:16 +#: src\templates\sub\profiles.phtml:13 src\templates\sub\profiles.phtml:16 msgid "Bottom %s pagination" -msgstr "Dolna paginacja %s" +msgstr "Dolna %s paginacja" -#: src\templates\statistics.phtml:66 -#: src\templates\sub\server.phtml:15 +#: src\templates\statistics.phtml:66 src\templates\sub\server.phtml:15 msgid "Stable Version" msgstr "Wersja stabilna" -#: src\templates\statistics.phtml:68 -#: src\templates\sub\server.phtml:17 +#: src\templates\statistics.phtml:68 src\templates\sub\server.phtml:17 msgid "Develop Version" -msgstr "Wersja rozwojowa" +msgstr "Rozwój wersji" #: src\templates\sub\server.phtml:19 msgid "Outdated Version" msgstr "Przestarzała wersja" -#: src\templates\sub\server.phtml:69 +#: src\templates\sub\server.phtml:55 msgid "Admin" -msgstr "Administrator" +msgstr "Admin" -#: src\templates\sub\server.phtml:76 +#: src\templates\sub\server.phtml:62 msgid "No description provided" msgstr "Nie podano opisu" -#: src\templates\sub\server.phtml:79 +#: src\templates\sub\server.phtml:65 msgid "Visit Server" msgstr "Odwiedź serwer" @@ -196,18 +185,17 @@ msgstr "Odwiedź serwer" msgid "Popular Countries" msgstr "Popularne kraje" -#: src\templates\widget\popularprofilelanguages.phtml:2 +#: src\templates\widget\popularlanguages.phtml:2 msgid "Popular Languages" msgstr "Popularne języki" #: src\templates\widget\populartags.phtml:2 msgid "Popular Tags" -msgstr "Popularne znaczniki" +msgstr "Popularne tagi" -#: src\templates\sub\server.phtml:44 -#: src\templates\sub\server.phtml:45 +#: src\templates\sub\server.phtml:44 src\templates\sub\server.phtml:45 msgid "Default Language" -msgstr "Domyślny język" +msgstr "Domyślny Język" #: src\templates\sub\server.phtml:49 msgid "Known Users" @@ -222,10 +210,19 @@ msgstr "Wszystko" msgctxt "account-type" msgid "People (%d)" msgid_plural "People (%d)" -msgstr[0] "Osoba (%d)" -msgstr[1] "Osoby (%d)" -msgstr[2] "Osób (%d)" -msgstr[3] "Osób (%d)" +msgstr[0] "(%d) Osoba" +msgstr[1] " (%d) Osoby" +msgstr[2] "(%d) Osób" +msgstr[3] "(%d) Osób" + +#: src\classes\Views\Widget\AccountTypeTabs.php:57 +msgctxt "account-type" +msgid "Forum (%d)" +msgid_plural "Forums (%d)" +msgstr[0] "Forum (%d)" +msgstr[1] "Fora (%d)" +msgstr[2] "Forum (%d)" +msgstr[3] "Forów (%d)" #: src\templates\layout.phtml:97 msgid "Stats" @@ -240,16 +237,19 @@ msgid "Profiles" msgstr "Profile" #: src\templates\statistics.phtml:6 -msgid "This directory knows about %s distinct potential profile URLs." -msgstr "Ten katalog zna %s różne adresy URL potencjalnych profilów." +msgid "" +"This directory knows about %s distinct potential profile " +"URLs." +msgstr "" +"Ten katalog zna %s różne adresy URL potencjalnych adresów." -#: src\templates\statistics.phtml:16 -#: src\templates\statistics.phtml:46 +#: src\templates\statistics.phtml:16 src\templates\statistics.phtml:46 msgid "Languages" msgstr "Języki" #: src\templates\statistics.phtml:17 -msgid "Out of %s profiles reporting their language there are:" +msgid "" +"Out of %s profiles reporting their language there are:" msgstr "Poza %s profilami zgłaszającymi swój język są:" #: src\templates\statistics.phtml:27 @@ -257,12 +257,20 @@ msgid "Servers" msgstr "Serwery" #: src\templates\statistics.phtml:28 -msgid "This directory knows about %s distinct potential server URLs." -msgstr "Ten katalog wie o %s różnych potencjalnych adresach URL serwera." +msgid "" +"This directory knows about %s distinct potential server " +"URLs." +msgstr "" +"Ten katalog wie o %s różnych potencjalnych adresach URL " +"serwera." #: src\templates\statistics.phtml:29 -msgid "Out of those, there are %s domains (%s) that have been a Friendica server at least once." -msgstr "Spośród nich są %s domeny (%s), które były serwerem Friendica co najmniej raz." +msgid "" +"Out of those, there are %s domains (%s) that have been a " +"Friendica server at least once." +msgstr "" +"Spośród nich są %s domeny (%s) które były serwerem " +"Friendica co najmniej raz." #: src\templates\statistics.phtml:33 msgid "Out of those, there are:" @@ -281,8 +289,12 @@ msgid "Out of %s servers reporting their version there are:" msgstr "Poza %s serwerami raportującymi ich wersję są:" #: src\templates\statistics.phtml:7 -msgid "Out of those, there are %s profiles (%s) that opted in the public directory at least once." -msgstr "Spośród nich są %s profile (%s) które wybrały katalog publiczny co najmniej raz." +msgid "" +"Out of those, there are %s profiles (%s) that opted in the " +"public directory at least once." +msgstr "" +"Spośród nich są %s profile (%s) które wybrały katalog " +"publiczny co najmniej raz." #: src\templates\statistics.phtml:35 msgid "%s available servers (%s)" @@ -292,78 +304,22 @@ msgstr "%s dostępne serwery (%s)" msgid "Friendica Directory version %s" msgstr "Katalog Friendica wersja %s" +#: src\templates\layout.phtml:94 +msgid "Source Code on GitHub" +msgstr "Kod źródłowy na GitHub" + #: src\templates\statistics.phtml:11 -msgid "Out of those, there currently are %s available profiles (%s). Check them out!" -msgstr "Spośród nich obecnie są %s dostępne profile (%s). Sprawdź je!" +msgid "" +"Out of those, there currently are %s available profiles " +"(%s). Check them out!" +msgstr "" +"Spośród nich obecnie są %s dostępne profile (%s). Sprawdź je!" #: src\templates\statistics.phtml:39 -msgid "%s public servers (%s) currently open for registration. Check them out!" -msgstr "%s serwery publiczne (%s) obecnie otwarte do rejestracji. Sprawdź je!" - -#: src\classes\Views\Widget\AccountTypeTabs.php:57 -msgctxt "account-type" -msgid "News (%d)" -msgid_plural "News (%d)" -msgstr[0] "Wiadomość (%d)" -msgstr[1] "Wiadomości (%d)" -msgstr[2] "Wiadomości (%d)" -msgstr[3] "Wiadomości (%d)" - -#: src\classes\Views\Widget\AccountTypeTabs.php:58 -msgctxt "account-type" -msgid "Organization (%d)" -msgid_plural "Organizations (%d)" -msgstr[0] "Organizacja (%d)" -msgstr[1] "Organizacje (%d)" -msgstr[2] "Organizacji (%d)" -msgstr[3] "Organizacji (%d)" - -#: src\templates\sub\server.phtml:40 -msgid "Health Score" -msgstr "Ocena zdrowia" - -#: src\templates\sub\server.phtml:52 -msgid "%s User" -msgid_plural "%s Users" -msgstr[0] "%s użytkownik" -msgstr[1] "%s użytkowników" -msgstr[2] "%s użytkowników" -msgstr[3] "%s użytkowników" - -#: src\templates\sub\server.phtml:54 -msgid "None" -msgstr "Brak" - -#: src\templates\sub\server.phtml:58 -#: src\templates\sub\server.phtml:62 -msgid "Registration Policy" -msgstr "Polityka rejestracji" - -#: src\templates\sub\server.phtml:59 -msgid "By Approval" -msgstr "Przez zatwierdzenie" - -#: src\templates\sub\server.phtml:63 -msgid "Open" -msgstr "Otwarta" - -#: src\classes\Views\Widget\AccountTypeTabs.php:61 -msgctxt "account-type" -msgid "Group (%d)" -msgid_plural "Groups (%d)" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" - -#: src\templates\servers.phtml:3 -msgid "Filtered by language:" -msgstr "" - -#: src\templates\servers.phtml:3 -msgid "Clear language filter" -msgstr "" - -#: src\templates\layout.phtml:94 -msgid "Source Code on Friendica's Forgejo" +msgid "" +"%s public servers (%s) currently open for registration. Check them out!" msgstr "" +"%s serwery publiczne (%s) obecnie otwarte do rejestracji. " +"Sprawdź je!" diff --git a/src/lang/ru/LC_MESSAGES/strings.po b/src/lang/ru/LC_MESSAGES/strings.po index c8d57fd..13be9c1 100644 --- a/src/lang/ru/LC_MESSAGES/strings.po +++ b/src/lang/ru/LC_MESSAGES/strings.po @@ -1,25 +1,27 @@ +# +# Translators: +# Alexander An , 2020 +# msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2018-11-16T04:17:37+00:00\n" +"PO-Revision-Date: 2018-11-16 20:30+0000\n" "Last-Translator: Alexander An , 2020\n" "Language-Team: Russian (https://www.transifex.com/Friendica/teams/12172/ru/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"POT-Creation-Date: 2018-11-16T04:17:37+00:00\n" -"PO-Revision-Date: 2018-11-16 20:30+0000\n" "Language: ru\n" "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n" "X-Generator: Poedit 2.2\n" -#: src\classes\Content\Pager.php:168 -#: src\classes\Content\Pager.php:216 +#: src\classes\Content\Pager.php:168 src\classes\Content\Pager.php:216 msgid "Previous" msgstr "Назад" -#: src\classes\Content\Pager.php:173 -#: src\classes\Content\Pager.php:273 +#: src\classes\Content\Pager.php:173 src\classes\Content\Pager.php:273 msgid "Next" msgstr "Вперёд" @@ -31,57 +33,51 @@ msgstr "Начало" msgid "Last" msgstr "Конец" -#: src\classes\Controllers\Web\Directory.php:85 +#: src\classes\Controllers\Web\Directory.php:73 msgid "People" msgstr "Люди" -#: src\classes\Controllers\Web\Search.php:72 +#: src\classes\Controllers\Web\Search.php:64 msgctxt "field" msgid "Language" msgstr "Язык" -#: src\classes\Controllers\Web\Search.php:73 +#: src\classes\Controllers\Web\Search.php:65 msgctxt "field" msgid "Locality" msgstr "Область" -#: src\classes\Controllers\Web\Search.php:74 +#: src\classes\Controllers\Web\Search.php:66 msgctxt "field" msgid "Region" msgstr "Регион" -#: src\classes\Controllers\Web\Search.php:75 +#: src\classes\Controllers\Web\Search.php:67 msgctxt "field" msgid "Country" msgstr "Страна" -#: src\classes\Controllers\Web\Servers.php:105 +#: src\classes\Controllers\Web\Servers.php:90 msgid "Public Servers" msgstr "Публичные серверы" -#: src\templates\layout.phtml:4 -#: src\templates\layout.phtml:18 +#: src\templates\layout.phtml:4 src\templates\layout.phtml:18 msgid "Friendica Directory" msgstr "Каталог Friendica" -#: src\templates\layout.phtml:23 -#: src\templates\layout.phtml:25 -#: src\templates\layout.phtml:43 -#: src\templates\layout.phtml:45 -#: src\templates\search.phtml:4 -#: src\templates\search.phtml:12 +#: src\templates\layout.phtml:23 src\templates\layout.phtml:25 +#: src\templates\layout.phtml:43 src\templates\layout.phtml:45 +#: src\templates\search.phtml:4 src\templates\search.phtml:12 msgid "Search terms" msgstr "Искать записи" -#: src\templates\layout.phtml:24 -#: src\templates\layout.phtml:45 +#: src\templates\layout.phtml:24 src\templates\layout.phtml:45 #: src\templates\search.phtml:11 msgctxt "noun" msgid "Search" msgstr "Искать" -#: src\templates\layout.phtml:27 -#: src\templates\layout.phtml:47 +#: src\templates\layout.phtml:27 src\templates\layout.phtml:47 #: src\templates\search.phtml:14 msgctxt "verb" msgid "Search" @@ -107,11 +103,11 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: src\templates\servers.phtml:7 +#: src\templates\servers.phtml:2 msgid "Top servers pagination" msgstr "" -#: src\templates\servers.phtml:17 +#: src\templates\servers.phtml:12 msgid "Bottom servers pagination" msgstr "" @@ -128,27 +124,23 @@ msgid "Filter by country" msgstr "Фильтр по стране" #: src\templates\sub\profile.phtml:31 -#: src\templates\sub\profile.phtml:35 -#: src\templates\sub\profile.phtml:39 msgctxt "verb" msgid "Follow" msgstr "Подписаться" -#: src\templates\layout.phtml:65 -#: src\templates\sub\profile.phtml:57 +#: src\templates\layout.phtml:65 src\templates\sub\profile.phtml:47 msgid "Language" msgstr "Язык" -#: src\templates\sub\profile.phtml:60 -#: src\templates\widget\popularserverlanguages.phtml:2 +#: src\templates\sub\profile.phtml:50 msgid "Filter by language" msgstr "Фильтр по языку" -#: src\templates\sub\profile.phtml:66 +#: src\templates\sub\profile.phtml:56 msgid "Location" msgstr "Расположение" -#: src\templates\sub\profile.phtml:79 +#: src\templates\sub\profile.phtml:69 msgid "Search Tag" msgstr "" @@ -156,23 +148,19 @@ msgstr "" msgid "Account type tabs" msgstr "" -#: src\templates\sub\profiles.phtml:4 -#: src\templates\sub\profiles.phtml:7 +#: src\templates\sub\profiles.phtml:4 src\templates\sub\profiles.phtml:7 msgid "Top %s pagination" msgstr "" -#: src\templates\sub\profiles.phtml:13 -#: src\templates\sub\profiles.phtml:16 +#: src\templates\sub\profiles.phtml:13 src\templates\sub\profiles.phtml:16 msgid "Bottom %s pagination" msgstr "" -#: src\templates\statistics.phtml:66 -#: src\templates\sub\server.phtml:15 +#: src\templates\statistics.phtml:66 src\templates\sub\server.phtml:15 msgid "Stable Version" msgstr "" -#: src\templates\statistics.phtml:68 -#: src\templates\sub\server.phtml:17 +#: src\templates\statistics.phtml:68 src\templates\sub\server.phtml:17 msgid "Develop Version" msgstr "" @@ -180,15 +168,15 @@ msgstr "" msgid "Outdated Version" msgstr "" -#: src\templates\sub\server.phtml:69 +#: src\templates\sub\server.phtml:55 msgid "Admin" msgstr "" -#: src\templates\sub\server.phtml:76 +#: src\templates\sub\server.phtml:62 msgid "No description provided" msgstr "" -#: src\templates\sub\server.phtml:79 +#: src\templates\sub\server.phtml:65 msgid "Visit Server" msgstr "" @@ -196,7 +184,7 @@ msgstr "" msgid "Popular Countries" msgstr "" -#: src\templates\widget\popularprofilelanguages.phtml:2 +#: src\templates\widget\popularlanguages.phtml:2 msgid "Popular Languages" msgstr "" @@ -204,8 +192,7 @@ msgstr "" msgid "Popular Tags" msgstr "" -#: src\templates\sub\server.phtml:44 -#: src\templates\sub\server.phtml:45 +#: src\templates\sub\server.phtml:44 src\templates\sub\server.phtml:45 msgid "Default Language" msgstr "" @@ -227,6 +214,15 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" +#: src\classes\Views\Widget\AccountTypeTabs.php:57 +msgctxt "account-type" +msgid "Forum (%d)" +msgid_plural "Forums (%d)" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + #: src\templates\layout.phtml:97 msgid "Stats" msgstr "" @@ -240,16 +236,18 @@ msgid "Profiles" msgstr "" #: src\templates\statistics.phtml:6 -msgid "This directory knows about %s distinct potential profile URLs." +msgid "" +"This directory knows about %s distinct potential profile " +"URLs." msgstr "" -#: src\templates\statistics.phtml:16 -#: src\templates\statistics.phtml:46 +#: src\templates\statistics.phtml:16 src\templates\statistics.phtml:46 msgid "Languages" msgstr "" #: src\templates\statistics.phtml:17 -msgid "Out of %s profiles reporting their language there are:" +msgid "" +"Out of %s profiles reporting their language there are:" msgstr "" #: src\templates\statistics.phtml:27 @@ -257,11 +255,15 @@ msgid "Servers" msgstr "" #: src\templates\statistics.phtml:28 -msgid "This directory knows about %s distinct potential server URLs." +msgid "" +"This directory knows about %s distinct potential server " +"URLs." msgstr "" #: src\templates\statistics.phtml:29 -msgid "Out of those, there are %s domains (%s) that have been a Friendica server at least once." +msgid "" +"Out of those, there are %s domains (%s) that have been a " +"Friendica server at least once." msgstr "" #: src\templates\statistics.phtml:33 @@ -281,7 +283,9 @@ msgid "Out of %s servers reporting their version there are:" msgstr "" #: src\templates\statistics.phtml:7 -msgid "Out of those, there are %s profiles (%s) that opted in the public directory at least once." +msgid "" +"Out of those, there are %s profiles (%s) that opted in the " +"public directory at least once." msgstr "" #: src\templates\statistics.phtml:35 @@ -292,78 +296,18 @@ msgstr "" msgid "Friendica Directory version %s" msgstr "" +#: src\templates\layout.phtml:94 +msgid "Source Code on GitHub" +msgstr "" + #: src\templates\statistics.phtml:11 -msgid "Out of those, there currently are %s available profiles (%s). Check them out!" +msgid "" +"Out of those, there currently are %s available profiles " +"(%s). Check them out!" msgstr "" #: src\templates\statistics.phtml:39 -msgid "%s public servers (%s) currently open for registration. Check them out!" -msgstr "" - -#: src\classes\Views\Widget\AccountTypeTabs.php:57 -msgctxt "account-type" -msgid "News (%d)" -msgid_plural "News (%d)" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" - -#: src\classes\Views\Widget\AccountTypeTabs.php:58 -msgctxt "account-type" -msgid "Organization (%d)" -msgid_plural "Organizations (%d)" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" - -#: src\classes\Views\Widget\AccountTypeTabs.php:61 -msgctxt "account-type" -msgid "Group (%d)" -msgid_plural "Groups (%d)" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" - -#: src\templates\servers.phtml:3 -msgid "Filtered by language:" -msgstr "" - -#: src\templates\servers.phtml:3 -msgid "Clear language filter" -msgstr "" - -#: src\templates\sub\server.phtml:40 -msgid "Health Score" -msgstr "" - -#: src\templates\sub\server.phtml:52 -msgid "%s User" -msgid_plural "%s Users" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" - -#: src\templates\sub\server.phtml:54 -msgid "None" -msgstr "" - -#: src\templates\sub\server.phtml:58 -#: src\templates\sub\server.phtml:62 -msgid "Registration Policy" -msgstr "" - -#: src\templates\sub\server.phtml:59 -msgid "By Approval" -msgstr "" - -#: src\templates\sub\server.phtml:63 -msgid "Open" -msgstr "" - -#: src\templates\layout.phtml:94 -msgid "Source Code on Friendica's Forgejo" +msgid "" +"%s public servers (%s) currently open for registration. Check them out!" msgstr "" diff --git a/src/lang/sv/LC_MESSAGES/strings.mo b/src/lang/sv/LC_MESSAGES/strings.mo deleted file mode 100644 index 3a9a145..0000000 Binary files a/src/lang/sv/LC_MESSAGES/strings.mo and /dev/null differ diff --git a/src/lang/sv/LC_MESSAGES/strings.po b/src/lang/sv/LC_MESSAGES/strings.po deleted file mode 100644 index d7036df..0000000 --- a/src/lang/sv/LC_MESSAGES/strings.po +++ /dev/null @@ -1,357 +0,0 @@ -msgid "" -msgstr "" -"Project-Id-Version: \n" -"Report-Msgid-Bugs-To: \n" -"Last-Translator: Kristoffer Grundström , 2022\n" -"Language-Team: Swedish (https://www.transifex.com/Friendica/teams/12172/sv/)\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"POT-Creation-Date: 2018-11-16T04:17:37+00:00\n" -"PO-Revision-Date: 2018-11-16 20:30+0000\n" -"Language: sv\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 2.2\n" - -#: src\classes\Content\Pager.php:168 -#: src\classes\Content\Pager.php:216 -msgid "Previous" -msgstr "Föregående" - -#: src\classes\Content\Pager.php:173 -#: src\classes\Content\Pager.php:273 -msgid "Next" -msgstr "Nästa" - -#: src\classes\Content\Pager.php:211 -msgid "First" -msgstr "Första" - -#: src\classes\Content\Pager.php:278 -msgid "Last" -msgstr "Sista" - -#: src\classes\Controllers\Web\Directory.php:85 -msgid "People" -msgstr "Personer" - -#: src\classes\Controllers\Web\Search.php:72 -msgctxt "field" -msgid "Language" -msgstr "Språk" - -#: src\classes\Controllers\Web\Search.php:73 -msgctxt "field" -msgid "Locality" -msgstr "" - -#: src\classes\Controllers\Web\Search.php:74 -msgctxt "field" -msgid "Region" -msgstr "Region" - -#: src\classes\Controllers\Web\Search.php:75 -msgctxt "field" -msgid "Country" -msgstr "Land" - -#: src\classes\Controllers\Web\Servers.php:105 -msgid "Public Servers" -msgstr "Publika servrar" - -#: src\templates\layout.phtml:4 -#: src\templates\layout.phtml:18 -msgid "Friendica Directory" -msgstr "Friendica-mapp" - -#: src\templates\layout.phtml:23 -#: src\templates\layout.phtml:25 -#: src\templates\layout.phtml:43 -#: src\templates\layout.phtml:45 -#: src\templates\search.phtml:4 -#: src\templates\search.phtml:12 -msgid "Search terms" -msgstr "" - -#: src\templates\layout.phtml:24 -#: src\templates\layout.phtml:45 -#: src\templates\search.phtml:11 -msgctxt "noun" -msgid "Search" -msgstr "Sök" - -#: src\templates\layout.phtml:27 -#: src\templates\layout.phtml:47 -#: src\templates\search.phtml:14 -msgctxt "verb" -msgid "Search" -msgstr "Sök" - -#: src\templates\layout.phtml:33 -msgid "Toggle navigation" -msgstr "Växla navigering" - -#: src\templates\layout.phtml:55 -msgid "Directory" -msgstr "Mapp" - -#: src\templates\layout.phtml:60 -msgid "Public servers" -msgstr "Publika servrar" - -#: src\templates\search.phtml:19 -msgid "%d result for \"%s\"" -msgid_plural "%d results for \"%s\"" -msgstr[0] "%d resultat för \"%s\"" -msgstr[1] "%d resultat för \"%s\"" - -#: src\templates\servers.phtml:7 -msgid "Top servers pagination" -msgstr "" - -#: src\templates\servers.phtml:17 -msgid "Bottom servers pagination" -msgstr "" - -#: src\templates\sub\profile.phtml:5 -msgid "Filter by locality" -msgstr "" - -#: src\templates\sub\profile.phtml:11 -msgid "Filter by region" -msgstr "Filtrera efter region" - -#: src\templates\sub\profile.phtml:17 -msgid "Filter by country" -msgstr "Filtrera efter land" - -#: src\templates\sub\profile.phtml:31 -#: src\templates\sub\profile.phtml:35 -#: src\templates\sub\profile.phtml:39 -msgctxt "verb" -msgid "Follow" -msgstr "Följ" - -#: src\templates\layout.phtml:65 -#: src\templates\sub\profile.phtml:57 -msgid "Language" -msgstr "Språk" - -#: src\templates\sub\profile.phtml:60 -#: src\templates\widget\popularserverlanguages.phtml:2 -msgid "Filter by language" -msgstr "Filtrera efter språk" - -#: src\templates\sub\profile.phtml:66 -msgid "Location" -msgstr "Plats" - -#: src\templates\sub\profile.phtml:79 -msgid "Search Tag" -msgstr "Söktagg" - -#: src\templates\sub\profiles.phtml:1 -msgid "Account type tabs" -msgstr "" - -#: src\templates\sub\profiles.phtml:4 -#: src\templates\sub\profiles.phtml:7 -msgid "Top %s pagination" -msgstr "" - -#: src\templates\sub\profiles.phtml:13 -#: src\templates\sub\profiles.phtml:16 -msgid "Bottom %s pagination" -msgstr "" - -#: src\templates\statistics.phtml:66 -#: src\templates\sub\server.phtml:15 -msgid "Stable Version" -msgstr "Stabil version" - -#: src\templates\statistics.phtml:68 -#: src\templates\sub\server.phtml:17 -msgid "Develop Version" -msgstr "Utvecklarversion" - -#: src\templates\sub\server.phtml:19 -msgid "Outdated Version" -msgstr "Utdaterad version" - -#: src\templates\sub\server.phtml:69 -msgid "Admin" -msgstr "Admin" - -#: src\templates\sub\server.phtml:76 -msgid "No description provided" -msgstr "Ingen beskrivning tillhandahölls" - -#: src\templates\sub\server.phtml:79 -msgid "Visit Server" -msgstr "Besök servern" - -#: src\templates\widget\popularcountries.phtml:2 -msgid "Popular Countries" -msgstr "Populära länder" - -#: src\templates\widget\popularprofilelanguages.phtml:2 -msgid "Popular Languages" -msgstr "Populära språk" - -#: src\templates\widget\populartags.phtml:2 -msgid "Popular Tags" -msgstr "Populära taggar" - -#: src\templates\sub\server.phtml:44 -#: src\templates\sub\server.phtml:45 -msgid "Default Language" -msgstr "Standardspråk" - -#: src\templates\sub\server.phtml:49 -msgid "Known Users" -msgstr "Kända användare" - -#: src\classes\Views\Widget\AccountTypeTabs.php:48 -msgctxt "account-type" -msgid "All" -msgstr "Alla" - -#: src\classes\Views\Widget\AccountTypeTabs.php:56 -msgctxt "account-type" -msgid "People (%d)" -msgid_plural "People (%d)" -msgstr[0] "Person (%d)" -msgstr[1] "Personer (%d)" - -#: src\templates\layout.phtml:97 -msgid "Stats" -msgstr "Statistik" - -#: src\templates\statistics.phtml:4 -msgid "Directory statistics" -msgstr "" - -#: src\templates\statistics.phtml:5 -msgid "Profiles" -msgstr "Profiler" - -#: src\templates\statistics.phtml:6 -msgid "This directory knows about %s distinct potential profile URLs." -msgstr "" - -#: src\templates\statistics.phtml:16 -#: src\templates\statistics.phtml:46 -msgid "Languages" -msgstr "Språk" - -#: src\templates\statistics.phtml:17 -msgid "Out of %s profiles reporting their language there are:" -msgstr "" - -#: src\templates\statistics.phtml:27 -msgid "Servers" -msgstr "Servrar" - -#: src\templates\statistics.phtml:28 -msgid "This directory knows about %s distinct potential server URLs." -msgstr "" - -#: src\templates\statistics.phtml:29 -msgid "Out of those, there are %s domains (%s) that have been a Friendica server at least once." -msgstr "" - -#: src\templates\statistics.phtml:33 -msgid "Out of those, there are:" -msgstr "Utav dessa så finns det:" - -#: src\templates\statistics.phtml:47 -msgid "Out of %s servers reporting their language there are:" -msgstr "" - -#: src\templates\statistics.phtml:57 -msgid "Versions" -msgstr "Versioner" - -#: src\templates\statistics.phtml:58 -msgid "Out of %s servers reporting their version there are:" -msgstr "" - -#: src\templates\statistics.phtml:7 -msgid "Out of those, there are %s profiles (%s) that opted in the public directory at least once." -msgstr "" - -#: src\templates\statistics.phtml:35 -msgid "%s available servers (%s)" -msgstr "%s tillgängliga servrar (%s)" - -#: src\templates\layout.phtml:91 -msgid "Friendica Directory version %s" -msgstr "" - -#: src\templates\statistics.phtml:11 -msgid "Out of those, there currently are %s available profiles (%s). Check them out!" -msgstr "" - -#: src\templates\statistics.phtml:39 -msgid "%s public servers (%s) currently open for registration. Check them out!" -msgstr "" - -#: src\classes\Views\Widget\AccountTypeTabs.php:57 -msgctxt "account-type" -msgid "News (%d)" -msgid_plural "News (%d)" -msgstr[0] "Nyhet (%d)" -msgstr[1] "Nyheterna (%d)" - -#: src\classes\Views\Widget\AccountTypeTabs.php:58 -msgctxt "account-type" -msgid "Organization (%d)" -msgid_plural "Organizations (%d)" -msgstr[0] "Organisation (%d)" -msgstr[1] "Organisationer (%d)" - -#: src\templates\sub\server.phtml:40 -msgid "Health Score" -msgstr "" - -#: src\templates\sub\server.phtml:52 -msgid "%s User" -msgid_plural "%s Users" -msgstr[0] "%s Användare" -msgstr[1] "%s Användare" - -#: src\templates\sub\server.phtml:54 -msgid "None" -msgstr "Ingen" - -#: src\templates\sub\server.phtml:58 -#: src\templates\sub\server.phtml:62 -msgid "Registration Policy" -msgstr "Registreringspolicy" - -#: src\templates\sub\server.phtml:59 -msgid "By Approval" -msgstr "Genom godkännande" - -#: src\templates\sub\server.phtml:63 -msgid "Open" -msgstr "Öppna" - -#: src\classes\Views\Widget\AccountTypeTabs.php:61 -msgctxt "account-type" -msgid "Group (%d)" -msgid_plural "Groups (%d)" -msgstr[0] "" -msgstr[1] "" - -#: src\templates\servers.phtml:3 -msgid "Filtered by language:" -msgstr "" - -#: src\templates\servers.phtml:3 -msgid "Clear language filter" -msgstr "" - -#: src\templates\layout.phtml:94 -msgid "Source Code on Friendica's Forgejo" -msgstr "" diff --git a/src/lang/th/LC_MESSAGES/strings.po b/src/lang/th/LC_MESSAGES/strings.po index 0b9e754..fc68ff9 100644 --- a/src/lang/th/LC_MESSAGES/strings.po +++ b/src/lang/th/LC_MESSAGES/strings.po @@ -1,25 +1,27 @@ +# +# Translators: +# Andy H3 , 2018 +# msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2018-11-16T04:17:37+00:00\n" +"PO-Revision-Date: 2018-11-16 20:30+0000\n" "Last-Translator: Andy H3 , 2018\n" "Language-Team: Thai (Thailand) (https://www.transifex.com/Friendica/teams/12172/th_TH/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"POT-Creation-Date: 2018-11-16T04:17:37+00:00\n" -"PO-Revision-Date: 2018-11-16 20:30+0000\n" "Language: th_TH\n" "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Poedit 2.2\n" -#: src\classes\Content\Pager.php:168 -#: src\classes\Content\Pager.php:216 +#: src\classes\Content\Pager.php:168 src\classes\Content\Pager.php:216 msgid "Previous" msgstr "ก่อนหน้า" -#: src\classes\Content\Pager.php:173 -#: src\classes\Content\Pager.php:273 +#: src\classes\Content\Pager.php:173 src\classes\Content\Pager.php:273 msgid "Next" msgstr "ถัดไป" @@ -31,57 +33,51 @@ msgstr "แรก" msgid "Last" msgstr "สุดท้าย" -#: src\classes\Controllers\Web\Directory.php:85 +#: src\classes\Controllers\Web\Directory.php:73 msgid "People" msgstr "คน" -#: src\classes\Controllers\Web\Search.php:72 +#: src\classes\Controllers\Web\Search.php:64 msgctxt "field" msgid "Language" msgstr "ภาษา" -#: src\classes\Controllers\Web\Search.php:73 +#: src\classes\Controllers\Web\Search.php:65 msgctxt "field" msgid "Locality" msgstr "สถาน" -#: src\classes\Controllers\Web\Search.php:74 +#: src\classes\Controllers\Web\Search.php:66 msgctxt "field" msgid "Region" msgstr "แดน" -#: src\classes\Controllers\Web\Search.php:75 +#: src\classes\Controllers\Web\Search.php:67 msgctxt "field" msgid "Country" msgstr "ประเทศ" -#: src\classes\Controllers\Web\Servers.php:105 +#: src\classes\Controllers\Web\Servers.php:90 msgid "Public Servers" msgstr "เซอร์เวอร์เปิด" -#: src\templates\layout.phtml:4 -#: src\templates\layout.phtml:18 +#: src\templates\layout.phtml:4 src\templates\layout.phtml:18 msgid "Friendica Directory" msgstr "Friendica ทำเนียบ" -#: src\templates\layout.phtml:23 -#: src\templates\layout.phtml:25 -#: src\templates\layout.phtml:43 -#: src\templates\layout.phtml:45 -#: src\templates\search.phtml:4 -#: src\templates\search.phtml:12 +#: src\templates\layout.phtml:23 src\templates\layout.phtml:25 +#: src\templates\layout.phtml:43 src\templates\layout.phtml:45 +#: src\templates\search.phtml:4 src\templates\search.phtml:12 msgid "Search terms" msgstr "ค้น หา" -#: src\templates\layout.phtml:24 -#: src\templates\layout.phtml:45 +#: src\templates\layout.phtml:24 src\templates\layout.phtml:45 #: src\templates\search.phtml:11 msgctxt "noun" msgid "Search" msgstr "ค้น" -#: src\templates\layout.phtml:27 -#: src\templates\layout.phtml:47 +#: src\templates\layout.phtml:27 src\templates\layout.phtml:47 #: src\templates\search.phtml:14 msgctxt "verb" msgid "Search" @@ -104,11 +100,11 @@ msgid "%d result for \"%s\"" msgid_plural "%d results for \"%s\"" msgstr[0] "%d ผลลัพธ์สำหรับ \"%s\"" -#: src\templates\servers.phtml:7 +#: src\templates\servers.phtml:2 msgid "Top servers pagination" msgstr "" -#: src\templates\servers.phtml:17 +#: src\templates\servers.phtml:12 msgid "Bottom servers pagination" msgstr "" @@ -125,27 +121,23 @@ msgid "Filter by country" msgstr "กรองตามประเทศ" #: src\templates\sub\profile.phtml:31 -#: src\templates\sub\profile.phtml:35 -#: src\templates\sub\profile.phtml:39 msgctxt "verb" msgid "Follow" msgstr "ตาม" -#: src\templates\layout.phtml:65 -#: src\templates\sub\profile.phtml:57 +#: src\templates\layout.phtml:65 src\templates\sub\profile.phtml:47 msgid "Language" msgstr "ภาษา" -#: src\templates\sub\profile.phtml:60 -#: src\templates\widget\popularserverlanguages.phtml:2 +#: src\templates\sub\profile.phtml:50 msgid "Filter by language" msgstr "กรองตามภาษา" -#: src\templates\sub\profile.phtml:66 +#: src\templates\sub\profile.phtml:56 msgid "Location" msgstr "สถาน" -#: src\templates\sub\profile.phtml:79 +#: src\templates\sub\profile.phtml:69 msgid "Search Tag" msgstr "ค้นหาด้วยแท็ก" @@ -153,23 +145,19 @@ msgstr "ค้นหาด้วยแท็ก" msgid "Account type tabs" msgstr "" -#: src\templates\sub\profiles.phtml:4 -#: src\templates\sub\profiles.phtml:7 +#: src\templates\sub\profiles.phtml:4 src\templates\sub\profiles.phtml:7 msgid "Top %s pagination" msgstr "" -#: src\templates\sub\profiles.phtml:13 -#: src\templates\sub\profiles.phtml:16 +#: src\templates\sub\profiles.phtml:13 src\templates\sub\profiles.phtml:16 msgid "Bottom %s pagination" msgstr "" -#: src\templates\statistics.phtml:66 -#: src\templates\sub\server.phtml:15 +#: src\templates\statistics.phtml:66 src\templates\sub\server.phtml:15 msgid "Stable Version" msgstr "เวอร์ชันเสถียร" -#: src\templates\statistics.phtml:68 -#: src\templates\sub\server.phtml:17 +#: src\templates\statistics.phtml:68 src\templates\sub\server.phtml:17 msgid "Develop Version" msgstr "เวอร์ชันพัฒนา" @@ -177,15 +165,15 @@ msgstr "เวอร์ชันพัฒนา" msgid "Outdated Version" msgstr "เวอร์ชันล้าสมัย" -#: src\templates\sub\server.phtml:69 +#: src\templates\sub\server.phtml:55 msgid "Admin" msgstr "ผู้ดูแลระบบ" -#: src\templates\sub\server.phtml:76 +#: src\templates\sub\server.phtml:62 msgid "No description provided" msgstr "ไม่มีคำอธิบาย" -#: src\templates\sub\server.phtml:79 +#: src\templates\sub\server.phtml:65 msgid "Visit Server" msgstr "ไปที่เซิร์ฟเวอร์" @@ -193,7 +181,7 @@ msgstr "ไปที่เซิร์ฟเวอร์" msgid "Popular Countries" msgstr "ประเทศยอดนิยม" -#: src\templates\widget\popularprofilelanguages.phtml:2 +#: src\templates\widget\popularlanguages.phtml:2 msgid "Popular Languages" msgstr "ภาษายอดนิยม" @@ -201,8 +189,7 @@ msgstr "ภาษายอดนิยม" msgid "Popular Tags" msgstr "แท็กยอดนิยม" -#: src\templates\sub\server.phtml:44 -#: src\templates\sub\server.phtml:45 +#: src\templates\sub\server.phtml:44 src\templates\sub\server.phtml:45 msgid "Default Language" msgstr "ภาษาเริ่มต้น" @@ -221,6 +208,12 @@ msgid "People (%d)" msgid_plural "People (%d)" msgstr[0] "" +#: src\classes\Views\Widget\AccountTypeTabs.php:57 +msgctxt "account-type" +msgid "Forum (%d)" +msgid_plural "Forums (%d)" +msgstr[0] "" + #: src\templates\layout.phtml:97 msgid "Stats" msgstr "" @@ -234,16 +227,18 @@ msgid "Profiles" msgstr "" #: src\templates\statistics.phtml:6 -msgid "This directory knows about %s distinct potential profile URLs." +msgid "" +"This directory knows about %s distinct potential profile " +"URLs." msgstr "" -#: src\templates\statistics.phtml:16 -#: src\templates\statistics.phtml:46 +#: src\templates\statistics.phtml:16 src\templates\statistics.phtml:46 msgid "Languages" msgstr "" #: src\templates\statistics.phtml:17 -msgid "Out of %s profiles reporting their language there are:" +msgid "" +"Out of %s profiles reporting their language there are:" msgstr "" #: src\templates\statistics.phtml:27 @@ -251,11 +246,15 @@ msgid "Servers" msgstr "" #: src\templates\statistics.phtml:28 -msgid "This directory knows about %s distinct potential server URLs." +msgid "" +"This directory knows about %s distinct potential server " +"URLs." msgstr "" #: src\templates\statistics.phtml:29 -msgid "Out of those, there are %s domains (%s) that have been a Friendica server at least once." +msgid "" +"Out of those, there are %s domains (%s) that have been a " +"Friendica server at least once." msgstr "" #: src\templates\statistics.phtml:33 @@ -275,7 +274,9 @@ msgid "Out of %s servers reporting their version there are:" msgstr "" #: src\templates\statistics.phtml:7 -msgid "Out of those, there are %s profiles (%s) that opted in the public directory at least once." +msgid "" +"Out of those, there are %s profiles (%s) that opted in the " +"public directory at least once." msgstr "" #: src\templates\statistics.phtml:35 @@ -286,66 +287,18 @@ msgstr "" msgid "Friendica Directory version %s" msgstr "" +#: src\templates\layout.phtml:94 +msgid "Source Code on GitHub" +msgstr "" + #: src\templates\statistics.phtml:11 -msgid "Out of those, there currently are %s available profiles (%s). Check them out!" +msgid "" +"Out of those, there currently are %s available profiles " +"(%s). Check them out!" msgstr "" #: src\templates\statistics.phtml:39 -msgid "%s public servers (%s) currently open for registration. Check them out!" -msgstr "" - -#: src\classes\Views\Widget\AccountTypeTabs.php:57 -msgctxt "account-type" -msgid "News (%d)" -msgid_plural "News (%d)" -msgstr[0] "" - -#: src\classes\Views\Widget\AccountTypeTabs.php:58 -msgctxt "account-type" -msgid "Organization (%d)" -msgid_plural "Organizations (%d)" -msgstr[0] "" - -#: src\classes\Views\Widget\AccountTypeTabs.php:61 -msgctxt "account-type" -msgid "Group (%d)" -msgid_plural "Groups (%d)" -msgstr[0] "" - -#: src\templates\servers.phtml:3 -msgid "Filtered by language:" -msgstr "" - -#: src\templates\servers.phtml:3 -msgid "Clear language filter" -msgstr "" - -#: src\templates\sub\server.phtml:40 -msgid "Health Score" -msgstr "" - -#: src\templates\sub\server.phtml:52 -msgid "%s User" -msgid_plural "%s Users" -msgstr[0] "" - -#: src\templates\sub\server.phtml:54 -msgid "None" -msgstr "" - -#: src\templates\sub\server.phtml:58 -#: src\templates\sub\server.phtml:62 -msgid "Registration Policy" -msgstr "" - -#: src\templates\sub\server.phtml:59 -msgid "By Approval" -msgstr "" - -#: src\templates\sub\server.phtml:63 -msgid "Open" -msgstr "" - -#: src\templates\layout.phtml:94 -msgid "Source Code on Friendica's Forgejo" +msgid "" +"%s public servers (%s) currently open for registration. Check them out!" msgstr "" diff --git a/src/lang/zh_CN/LC_MESSAGES/strings.po b/src/lang/zh_CN/LC_MESSAGES/strings.po index cb0980b..e00e241 100644 --- a/src/lang/zh_CN/LC_MESSAGES/strings.po +++ b/src/lang/zh_CN/LC_MESSAGES/strings.po @@ -1,25 +1,27 @@ +# +# Translators: +# 朱陈锬 , 2019 +# msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2018-11-16T04:17:37+00:00\n" +"PO-Revision-Date: 2018-11-16 20:30+0000\n" "Last-Translator: 朱陈锬 , 2019\n" "Language-Team: Chinese (China) (https://www.transifex.com/Friendica/teams/12172/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"POT-Creation-Date: 2018-11-16T04:17:37+00:00\n" -"PO-Revision-Date: 2018-11-16 20:30+0000\n" "Language: zh_CN\n" "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Poedit 2.2\n" -#: src\classes\Content\Pager.php:168 -#: src\classes\Content\Pager.php:216 +#: src\classes\Content\Pager.php:168 src\classes\Content\Pager.php:216 msgid "Previous" msgstr "上一页" -#: src\classes\Content\Pager.php:173 -#: src\classes\Content\Pager.php:273 +#: src\classes\Content\Pager.php:173 src\classes\Content\Pager.php:273 msgid "Next" msgstr "下一页" @@ -31,57 +33,51 @@ msgstr "第一页" msgid "Last" msgstr "最后一页" -#: src\classes\Controllers\Web\Directory.php:85 +#: src\classes\Controllers\Web\Directory.php:73 msgid "People" msgstr "" -#: src\classes\Controllers\Web\Search.php:72 +#: src\classes\Controllers\Web\Search.php:64 msgctxt "field" msgid "Language" msgstr "语言" -#: src\classes\Controllers\Web\Search.php:73 +#: src\classes\Controllers\Web\Search.php:65 msgctxt "field" msgid "Locality" msgstr "" -#: src\classes\Controllers\Web\Search.php:74 +#: src\classes\Controllers\Web\Search.php:66 msgctxt "field" msgid "Region" msgstr "地区" -#: src\classes\Controllers\Web\Search.php:75 +#: src\classes\Controllers\Web\Search.php:67 msgctxt "field" msgid "Country" msgstr "国家" -#: src\classes\Controllers\Web\Servers.php:105 +#: src\classes\Controllers\Web\Servers.php:90 msgid "Public Servers" msgstr "公共服务器" -#: src\templates\layout.phtml:4 -#: src\templates\layout.phtml:18 +#: src\templates\layout.phtml:4 src\templates\layout.phtml:18 msgid "Friendica Directory" msgstr "Friendica 目录" -#: src\templates\layout.phtml:23 -#: src\templates\layout.phtml:25 -#: src\templates\layout.phtml:43 -#: src\templates\layout.phtml:45 -#: src\templates\search.phtml:4 -#: src\templates\search.phtml:12 +#: src\templates\layout.phtml:23 src\templates\layout.phtml:25 +#: src\templates\layout.phtml:43 src\templates\layout.phtml:45 +#: src\templates\search.phtml:4 src\templates\search.phtml:12 msgid "Search terms" msgstr "" -#: src\templates\layout.phtml:24 -#: src\templates\layout.phtml:45 +#: src\templates\layout.phtml:24 src\templates\layout.phtml:45 #: src\templates\search.phtml:11 msgctxt "noun" msgid "Search" msgstr "搜索" -#: src\templates\layout.phtml:27 -#: src\templates\layout.phtml:47 +#: src\templates\layout.phtml:27 src\templates\layout.phtml:47 #: src\templates\search.phtml:14 msgctxt "verb" msgid "Search" @@ -104,11 +100,11 @@ msgid "%d result for \"%s\"" msgid_plural "%d results for \"%s\"" msgstr[0] "" -#: src\templates\servers.phtml:7 +#: src\templates\servers.phtml:2 msgid "Top servers pagination" msgstr "" -#: src\templates\servers.phtml:17 +#: src\templates\servers.phtml:12 msgid "Bottom servers pagination" msgstr "" @@ -125,27 +121,23 @@ msgid "Filter by country" msgstr "按国家筛选" #: src\templates\sub\profile.phtml:31 -#: src\templates\sub\profile.phtml:35 -#: src\templates\sub\profile.phtml:39 msgctxt "verb" msgid "Follow" msgstr "" -#: src\templates\layout.phtml:65 -#: src\templates\sub\profile.phtml:57 +#: src\templates\layout.phtml:65 src\templates\sub\profile.phtml:47 msgid "Language" msgstr "语言" -#: src\templates\sub\profile.phtml:60 -#: src\templates\widget\popularserverlanguages.phtml:2 +#: src\templates\sub\profile.phtml:50 msgid "Filter by language" msgstr "按语言筛选" -#: src\templates\sub\profile.phtml:66 +#: src\templates\sub\profile.phtml:56 msgid "Location" msgstr "" -#: src\templates\sub\profile.phtml:79 +#: src\templates\sub\profile.phtml:69 msgid "Search Tag" msgstr "搜索标签" @@ -153,23 +145,19 @@ msgstr "搜索标签" msgid "Account type tabs" msgstr "" -#: src\templates\sub\profiles.phtml:4 -#: src\templates\sub\profiles.phtml:7 +#: src\templates\sub\profiles.phtml:4 src\templates\sub\profiles.phtml:7 msgid "Top %s pagination" msgstr "" -#: src\templates\sub\profiles.phtml:13 -#: src\templates\sub\profiles.phtml:16 +#: src\templates\sub\profiles.phtml:13 src\templates\sub\profiles.phtml:16 msgid "Bottom %s pagination" msgstr "" -#: src\templates\statistics.phtml:66 -#: src\templates\sub\server.phtml:15 +#: src\templates\statistics.phtml:66 src\templates\sub\server.phtml:15 msgid "Stable Version" msgstr "稳定版" -#: src\templates\statistics.phtml:68 -#: src\templates\sub\server.phtml:17 +#: src\templates\statistics.phtml:68 src\templates\sub\server.phtml:17 msgid "Develop Version" msgstr "开发版" @@ -177,15 +165,15 @@ msgstr "开发版" msgid "Outdated Version" msgstr "旧稳定版" -#: src\templates\sub\server.phtml:69 +#: src\templates\sub\server.phtml:55 msgid "Admin" msgstr "管理员" -#: src\templates\sub\server.phtml:76 +#: src\templates\sub\server.phtml:62 msgid "No description provided" msgstr "没有提供说明" -#: src\templates\sub\server.phtml:79 +#: src\templates\sub\server.phtml:65 msgid "Visit Server" msgstr "访问服务" @@ -193,7 +181,7 @@ msgstr "访问服务" msgid "Popular Countries" msgstr "热门国家" -#: src\templates\widget\popularprofilelanguages.phtml:2 +#: src\templates\widget\popularlanguages.phtml:2 msgid "Popular Languages" msgstr "热门语言" @@ -201,8 +189,7 @@ msgstr "热门语言" msgid "Popular Tags" msgstr "热门标签" -#: src\templates\sub\server.phtml:44 -#: src\templates\sub\server.phtml:45 +#: src\templates\sub\server.phtml:44 src\templates\sub\server.phtml:45 msgid "Default Language" msgstr "默认语言" @@ -221,6 +208,12 @@ msgid "People (%d)" msgid_plural "People (%d)" msgstr[0] "" +#: src\classes\Views\Widget\AccountTypeTabs.php:57 +msgctxt "account-type" +msgid "Forum (%d)" +msgid_plural "Forums (%d)" +msgstr[0] "" + #: src\templates\layout.phtml:97 msgid "Stats" msgstr "" @@ -234,16 +227,18 @@ msgid "Profiles" msgstr "" #: src\templates\statistics.phtml:6 -msgid "This directory knows about %s distinct potential profile URLs." +msgid "" +"This directory knows about %s distinct potential profile " +"URLs." msgstr "" -#: src\templates\statistics.phtml:16 -#: src\templates\statistics.phtml:46 +#: src\templates\statistics.phtml:16 src\templates\statistics.phtml:46 msgid "Languages" msgstr "语言" #: src\templates\statistics.phtml:17 -msgid "Out of %s profiles reporting their language there are:" +msgid "" +"Out of %s profiles reporting their language there are:" msgstr "" #: src\templates\statistics.phtml:27 @@ -251,11 +246,15 @@ msgid "Servers" msgstr "服务器" #: src\templates\statistics.phtml:28 -msgid "This directory knows about %s distinct potential server URLs." +msgid "" +"This directory knows about %s distinct potential server " +"URLs." msgstr "" #: src\templates\statistics.phtml:29 -msgid "Out of those, there are %s domains (%s) that have been a Friendica server at least once." +msgid "" +"Out of those, there are %s domains (%s) that have been a " +"Friendica server at least once." msgstr "" #: src\templates\statistics.phtml:33 @@ -275,7 +274,9 @@ msgid "Out of %s servers reporting their version there are:" msgstr "" #: src\templates\statistics.phtml:7 -msgid "Out of those, there are %s profiles (%s) that opted in the public directory at least once." +msgid "" +"Out of those, there are %s profiles (%s) that opted in the " +"public directory at least once." msgstr "" #: src\templates\statistics.phtml:35 @@ -286,66 +287,18 @@ msgstr "" msgid "Friendica Directory version %s" msgstr "Friendica 目录版本 %s" +#: src\templates\layout.phtml:94 +msgid "Source Code on GitHub" +msgstr "源码托管于 GitHub" + #: src\templates\statistics.phtml:11 -msgid "Out of those, there currently are %s available profiles (%s). Check them out!" +msgid "" +"Out of those, there currently are %s available profiles " +"(%s). Check them out!" msgstr "" #: src\templates\statistics.phtml:39 -msgid "%s public servers (%s) currently open for registration. Check them out!" -msgstr "" - -#: src\classes\Views\Widget\AccountTypeTabs.php:57 -msgctxt "account-type" -msgid "News (%d)" -msgid_plural "News (%d)" -msgstr[0] "" - -#: src\classes\Views\Widget\AccountTypeTabs.php:58 -msgctxt "account-type" -msgid "Organization (%d)" -msgid_plural "Organizations (%d)" -msgstr[0] "" - -#: src\classes\Views\Widget\AccountTypeTabs.php:61 -msgctxt "account-type" -msgid "Group (%d)" -msgid_plural "Groups (%d)" -msgstr[0] "" - -#: src\templates\servers.phtml:3 -msgid "Filtered by language:" -msgstr "" - -#: src\templates\servers.phtml:3 -msgid "Clear language filter" -msgstr "" - -#: src\templates\sub\server.phtml:40 -msgid "Health Score" -msgstr "" - -#: src\templates\sub\server.phtml:52 -msgid "%s User" -msgid_plural "%s Users" -msgstr[0] "" - -#: src\templates\sub\server.phtml:54 -msgid "None" -msgstr "" - -#: src\templates\sub\server.phtml:58 -#: src\templates\sub\server.phtml:62 -msgid "Registration Policy" -msgstr "" - -#: src\templates\sub\server.phtml:59 -msgid "By Approval" -msgstr "" - -#: src\templates\sub\server.phtml:63 -msgid "Open" -msgstr "" - -#: src\templates\layout.phtml:94 -msgid "Source Code on Friendica's Forgejo" +msgid "" +"%s public servers (%s) currently open for registration. Check them out!" msgstr "" diff --git a/src/settings.php b/src/settings.php index a1dd220..a7d1751 100644 --- a/src/settings.php +++ b/src/settings.php @@ -19,7 +19,7 @@ $settings = [ 'displayErrorDetails' => false, // set to false in production 'addContentLengthHeader' => false, // Allow the web server to send the content-length header 'i18n' => [ - 'locales' => ['en_US', 'fr_FR', 'cs_CZ', 'de_DE', 'pl_PL', 'ja_JP', 'en_GB', 'it_IT', 'fr_FR', 'et_EE', 'nl_NL', 'th_TH', 'zh_CN', 'ar', 'gd', 'hu', 'sv', 'da_DK'], + 'locales' => ['en_US', 'fr_FR', 'cs_CZ', 'de_DE', 'pl_PL', 'ja_JP', 'en_GB', 'it_IT', 'fr_FR', 'et_EE', 'nl_NL', 'th_TH', 'zh_CN', 'ar', 'gd'], 'default' => 'en_US', 'path' => __DIR__ . '/lang' ], diff --git a/src/sql/migrations/down/0008.sql b/src/sql/migrations/down/0008.sql deleted file mode 100644 index f69fc74..0000000 --- a/src/sql/migrations/down/0008.sql +++ /dev/null @@ -1,3 +0,0 @@ -BEGIN; -ALTER TABLE `server` DROP `subscribe_url`; -COMMIT; \ No newline at end of file diff --git a/src/sql/migrations/down/0009.sql b/src/sql/migrations/down/0009.sql deleted file mode 100644 index fd6ce4a..0000000 --- a/src/sql/migrations/down/0009.sql +++ /dev/null @@ -1,3 +0,0 @@ -BEGIN; -ALTER TABLE `profile` ADD `dfrn_request` VARCHAR(250) DEFAULT NULL AFTER `profile_url`; -COMMIT; \ No newline at end of file diff --git a/src/sql/migrations/up/0009.sql b/src/sql/migrations/up/0009.sql deleted file mode 100644 index d0cc568..0000000 --- a/src/sql/migrations/up/0009.sql +++ /dev/null @@ -1,3 +0,0 @@ -BEGIN; -ALTER TABLE `server` ADD `subscribe_url` VARCHAR(250) NULL AFTER `noscrape_url`; -COMMIT; diff --git a/src/sql/migrations/up/0010.sql b/src/sql/migrations/up/0010.sql deleted file mode 100644 index 3875c11..0000000 --- a/src/sql/migrations/up/0010.sql +++ /dev/null @@ -1,3 +0,0 @@ -BEGIN; -ALTER TABLE `profile` DROP `dfrn_request`; -COMMIT; \ No newline at end of file diff --git a/src/templates/layout.phtml b/src/templates/layout.phtml index 9ac9af6..5ac846d 100644 --- a/src/templates/layout.phtml +++ b/src/templates/layout.phtml @@ -91,7 +91,7 @@ __('Friendica Directory version %s', $version)?>
  • - __("Source Code on Friendica's Forgejo")?> + __('Source Code on GitHub')?>
  • __('Stats')?> diff --git a/src/templates/statistics.phtml b/src/templates/statistics.phtml index 237e143..bf29ff5 100644 --- a/src/templates/statistics.phtml +++ b/src/templates/statistics.phtml @@ -65,7 +65,7 @@ use \Friendica\Directory\Utils\L10n; __('Stable Version')?> - __('Develop Version')?> + __('Develop Version')?>
    • diff --git a/src/templates/sub/profile.phtml b/src/templates/sub/profile.phtml index 68c67c0..5a651b3 100644 --- a/src/templates/sub/profile.phtml +++ b/src/templates/sub/profile.phtml @@ -26,22 +26,12 @@ if (!empty($profile['country'])) {
    - - + + p__('verb', 'Follow')?> - - - p__('verb', 'Follow')?> - - - - p__('verb', 'Follow')?> - - - - escapeHtml($profile['name']) ?> - + + escapeHtml($profile['name']) ?>

    @@ -52,7 +42,7 @@ if (!empty($profile['country'])) {

    escapeHtml($profile['pdesc']) ?>

    - +
    e(Friendica\Directory\Utils\L10n::localeToLanguageString($profile['language'])) ?> @@ -60,26 +50,26 @@ if (!empty($profile['country'])) {
    - +
    - + - - + +
    - +
    - + escapeHtml($tag) ?> - +
    - + diff --git a/src/templates/sub/server.phtml b/src/templates/sub/server.phtml index b92d7ed..f1cf79d 100644 --- a/src/templates/sub/server.phtml +++ b/src/templates/sub/server.phtml @@ -14,7 +14,7 @@ if ($server['health_score'] <= 0) { if ($server['version'] == $stable_version) { $version_badge = ' ' . $this->__('Stable Version') . ''; } elseif ($server['version'] == $dev_version || $server['version'] == $rc_version) { - $version_badge = ' ' . $this->__('Develop Version') . ''; + $version_badge = ' ' . $this->__('Develop Version') . ''; } else { $version_badge = ' ' . $this->__('Outdated Version') . ''; } @@ -26,10 +26,7 @@ $base_url_display = substr($base_url, strpos($base_url, '/') + 2);
    - - e($server['name']); ?> - - + e($server['name']); ?>
    @@ -59,7 +56,7 @@ $base_url_display = substr($base_url, strpos($base_url, '/') + 2); - __('By Approval')?> + __('By Approval')?> @@ -78,6 +75,8 @@ $base_url_display = substr($base_url, strpos($base_url, '/') + 2);

    <__('No description provided')?>>

    + + __('Visit Server')?>