diff --git a/VERSION b/VERSION index 3f684d2..8e8299d 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.3.4 +2.4.2 diff --git a/composer.json b/composer.json index df85fd1..6331252 100644 --- a/composer.json +++ b/composer.json @@ -22,10 +22,11 @@ "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": "^0.1.3", + "gofabian/negotiation-middleware": "dev-master", + "guzzlehttp/guzzle": "^6.5", "laminas/laminas-escaper": "^2.6", + "laminas/laminas-zendframework-bridge": "^1.4", "masterminds/html5": "^2.3", "monolog/monolog": "^1.17", "mrpetovan/net_ping": "^1.2", @@ -55,7 +56,7 @@ }, "config": { "platform": { - "php": "7.1.0" + "php": "7.3.0" }, "process-timeout" : 0, "autoloader-suffix": "FriendicaDirectory", diff --git a/composer.lock b/composer.lock index 972e764..15ccbdf 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": "a8bc1750aa6136e10ea28799a0974f6b", + "content-hash": "e695909f6c6a475770dfc28266571d9a", "packages": [ { "name": "asika/simple-console", @@ -447,46 +447,6 @@ "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", @@ -587,16 +547,16 @@ }, { "name": "gettext/gettext", - "version": "v4.8.6", + "version": "v4.8.8", "source": { "type": "git", "url": "https://github.com/php-gettext/Gettext.git", - "reference": "bbeb8f4d3077663739aecb4551b22e720c0e9efe" + "reference": "302a00aa9d6762c92c884d879c15d3ed05d6a37d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-gettext/Gettext/zipball/bbeb8f4d3077663739aecb4551b22e720c0e9efe", - "reference": "bbeb8f4d3077663739aecb4551b22e720c0e9efe", + "url": "https://api.github.com/repos/php-gettext/Gettext/zipball/302a00aa9d6762c92c884d879c15d3ed05d6a37d", + "reference": "302a00aa9d6762c92c884d879c15d3ed05d6a37d", "shasum": "" }, "require": { @@ -659,20 +619,20 @@ "type": "patreon" } ], - "time": "2021-10-19T10:44:53+00:00" + "time": "2022-12-08T11:59:50+00:00" }, { "name": "gettext/languages", - "version": "2.9.0", + "version": "2.10.0", "source": { "type": "git", "url": "https://github.com/php-gettext/Languages.git", - "reference": "ed56dd2c7f4024cc953ed180d25f02f2640e3ffa" + "reference": "4d61d67fe83a2ad85959fe6133d6d9ba7dddd1ab" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-gettext/Languages/zipball/ed56dd2c7f4024cc953ed180d25f02f2640e3ffa", - "reference": "ed56dd2c7f4024cc953ed180d25f02f2640e3ffa", + "url": "https://api.github.com/repos/php-gettext/Languages/zipball/4d61d67fe83a2ad85959fe6133d6d9ba7dddd1ab", + "reference": "4d61d67fe83a2ad85959fe6133d6d9ba7dddd1ab", "shasum": "" }, "require": { @@ -729,30 +689,30 @@ "type": "github" } ], - "time": "2021-11-11T17:30:39+00:00" + "time": "2022-10-18T15:00:10+00:00" }, { "name": "gofabian/negotiation-middleware", - "version": "v0.1.3", + "version": "dev-master", "source": { "type": "git", "url": "https://github.com/gofabian/negotiation-middleware.git", - "reference": "23d80fa1b00bbadded515df837c5a84517374b50" + "reference": "4d3cda5425eb2b74709a6510815f6c40d6c74ff7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/gofabian/negotiation-middleware/zipball/23d80fa1b00bbadded515df837c5a84517374b50", - "reference": "23d80fa1b00bbadded515df837c5a84517374b50", + "url": "https://api.github.com/repos/gofabian/negotiation-middleware/zipball/4d3cda5425eb2b74709a6510815f6c40d6c74ff7", + "reference": "4d3cda5425eb2b74709a6510815f6c40d6c74ff7", "shasum": "" }, "require": { - "php": ">=5.4.0", + "php": ">=7.3", "psr/http-message": "^1.0", - "willdurand/negotiation": "^2.0" + "willdurand/negotiation": "^3.0" }, "require-dev": { - "phpunit/phpunit": "^4.8", - "satooshi/php-coveralls": "0.6.1" + "php-coveralls/php-coveralls": "^2.4.3", + "phpunit/phpunit": "^9.5" }, "suggest": { "slim/slim": "The negotiation middleware is compatible to Slim 3.x" @@ -781,40 +741,326 @@ "psr-7", "slim" ], - "time": "2017-02-22T18:45:01+00:00" + "time": "2021-05-16T18:42:02+00:00" }, { - "name": "laminas/laminas-escaper", - "version": "2.6.1", + "name": "guzzlehttp/guzzle", + "version": "6.5.8", "source": { "type": "git", - "url": "https://github.com/laminas/laminas-escaper.git", - "reference": "25f2a053eadfa92ddacb609dcbbc39362610da70" + "url": "https://github.com/guzzle/guzzle.git", + "reference": "a52f0440530b54fa079ce76e8c5d196a42cad981" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-escaper/zipball/25f2a053eadfa92ddacb609dcbbc39362610da70", - "reference": "25f2a053eadfa92ddacb609dcbbc39362610da70", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/a52f0440530b54fa079ce76e8c5d196a42cad981", + "reference": "a52f0440530b54fa079ce76e8c5d196a42cad981", "shasum": "" }, "require": { - "laminas/laminas-zendframework-bridge": "^1.0", - "php": "^5.6 || ^7.0" - }, - "replace": { - "zendframework/zend-escaper": "self.version" + "ext-json": "*", + "guzzlehttp/promises": "^1.0", + "guzzlehttp/psr7": "^1.9", + "php": ">=5.5", + "symfony/polyfill-intl-idn": "^1.17" }, "require-dev": { - "laminas/laminas-coding-standard": "~1.0.0", - "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2" + "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" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.6.x-dev", - "dev-develop": "2.7.x-dev" + "dev-master": "6.5-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/" @@ -830,28 +1076,36 @@ "escaper", "laminas" ], - "time": "2019-12-31T16:43:30+00:00" + "funding": [ + { + "url": "https://funding.communitybridge.org/projects/laminas-project", + "type": "community_bridge" + } + ], + "time": "2021-09-02T17:10:53+00:00" }, { "name": "laminas/laminas-zendframework-bridge", - "version": "1.1.1", + "version": "1.4.1", "source": { "type": "git", "url": "https://github.com/laminas/laminas-zendframework-bridge.git", - "reference": "6ede70583e101030bcace4dcddd648f760ddf642" + "reference": "88bf037259869891afce6504cacc4f8a07b24d0f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-zendframework-bridge/zipball/6ede70583e101030bcace4dcddd648f760ddf642", - "reference": "6ede70583e101030bcace4dcddd648f760ddf642", + "url": "https://api.github.com/repos/laminas/laminas-zendframework-bridge/zipball/88bf037259869891afce6504cacc4f8a07b24d0f", + "reference": "88bf037259869891afce6504cacc4f8a07b24d0f", "shasum": "" }, "require": { - "php": "^5.6 || ^7.0 || ^8.0" + "php": "^7.3 || ~8.0.0 || ~8.1.0" }, "require-dev": { - "phpunit/phpunit": "^5.7 || ^6.5 || ^7.5 || ^8.1 || ^9.3", - "squizlabs/php_codesniffer": "^3.5" + "phpunit/phpunit": "^9.3", + "psalm/plugin-phpunit": "^0.15.1", + "squizlabs/php_codesniffer": "^3.5", + "vimeo/psalm": "^4.6" }, "type": "library", "extra": { @@ -884,30 +1138,28 @@ "type": "community_bridge" } ], - "time": "2020-09-14T14:23:00+00:00" + "time": "2021-12-21T14:34:37+00:00" }, { "name": "masterminds/html5", - "version": "2.7.5", + "version": "2.8.0", "source": { "type": "git", "url": "https://github.com/Masterminds/html5-php.git", - "reference": "f640ac1bdddff06ea333a920c95bbad8872429ab" + "reference": "3c5d5a56d56f48a1ca08a0670f0f80c1dad368f3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Masterminds/html5-php/zipball/f640ac1bdddff06ea333a920c95bbad8872429ab", - "reference": "f640ac1bdddff06ea333a920c95bbad8872429ab", + "url": "https://api.github.com/repos/Masterminds/html5-php/zipball/3c5d5a56d56f48a1ca08a0670f0f80c1dad368f3", + "reference": "3c5d5a56d56f48a1ca08a0670f0f80c1dad368f3", "shasum": "" }, "require": { - "ext-ctype": "*", "ext-dom": "*", - "ext-libxml": "*", "php": ">=5.3.0" }, "require-dev": { - "phpunit/phpunit": "^4.8.35 || ^5.7.21 || ^6 || ^7" + "phpunit/phpunit": "^4.8.35 || ^5.7.21 || ^6 || ^7 || ^8" }, "type": "library", "extra": { @@ -949,20 +1201,20 @@ "serializer", "xml" ], - "time": "2021-07-01T14:25:37+00:00" + "time": "2023-04-26T07:27:39+00:00" }, { "name": "monolog/monolog", - "version": "1.26.1", + "version": "1.27.1", "source": { "type": "git", "url": "https://github.com/Seldaek/monolog.git", - "reference": "c6b00f05152ae2c9b04a448f99c7590beb6042f5" + "reference": "904713c5929655dc9b97288b69cfeedad610c9a1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/c6b00f05152ae2c9b04a448f99c7590beb6042f5", - "reference": "c6b00f05152ae2c9b04a448f99c7590beb6042f5", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/904713c5929655dc9b97288b69cfeedad610c9a1", + "reference": "904713c5929655dc9b97288b69cfeedad610c9a1", "shasum": "" }, "require": { @@ -1031,7 +1283,7 @@ "type": "tidelift" } ], - "time": "2021-05-28T08:32:12+00:00" + "time": "2022-06-09T08:53:42+00:00" }, { "name": "mrpetovan/net_ping", @@ -1194,16 +1446,16 @@ }, { "name": "pear/pear-core-minimal", - "version": "v1.10.11", + "version": "v1.10.13", "source": { "type": "git", "url": "https://github.com/pear/pear-core-minimal.git", - "reference": "68d0d32ada737153b7e93b8d3c710ebe70ac867d" + "reference": "aed862e95fd286c53cc546734868dc38ff4b5b1d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pear/pear-core-minimal/zipball/68d0d32ada737153b7e93b8d3c710ebe70ac867d", - "reference": "68d0d32ada737153b7e93b8d3c710ebe70ac867d", + "url": "https://api.github.com/repos/pear/pear-core-minimal/zipball/aed862e95fd286c53cc546734868dc38ff4b5b1d", + "reference": "aed862e95fd286c53cc546734868dc38ff4b5b1d", "shasum": "" }, "require": { @@ -1234,7 +1486,7 @@ } ], "description": "Minimal set of PEAR core files to be used as composer dependency", - "time": "2021-08-10T22:31:03+00:00" + "time": "2023-04-19T19:15:47+00:00" }, { "name": "pear/pear_exception", @@ -1293,29 +1545,29 @@ }, { "name": "pimple/pimple", - "version": "v3.2.3", + "version": "v3.5.0", "source": { "type": "git", "url": "https://github.com/silexphp/Pimple.git", - "reference": "9e403941ef9d65d20cba7d54e29fe906db42cf32" + "reference": "a94b3a4db7fb774b3d78dad2315ddc07629e1bed" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/silexphp/Pimple/zipball/9e403941ef9d65d20cba7d54e29fe906db42cf32", - "reference": "9e403941ef9d65d20cba7d54e29fe906db42cf32", + "url": "https://api.github.com/repos/silexphp/Pimple/zipball/a94b3a4db7fb774b3d78dad2315ddc07629e1bed", + "reference": "a94b3a4db7fb774b3d78dad2315ddc07629e1bed", "shasum": "" }, "require": { - "php": ">=5.3.0", - "psr/container": "^1.0" + "php": ">=7.2.5", + "psr/container": "^1.1 || ^2.0" }, "require-dev": { - "symfony/phpunit-bridge": "^3.2" + "symfony/phpunit-bridge": "^5.4@dev" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.2.x-dev" + "dev-master": "3.4.x-dev" } }, "autoload": { @@ -1334,12 +1586,12 @@ } ], "description": "Pimple, a simple Dependency Injection Container", - "homepage": "http://pimple.sensiolabs.org", + "homepage": "https://pimple.symfony.com", "keywords": [ "container", "dependency injection" ], - "time": "2018-01-21T07:42:36+00:00" + "time": "2021-10-28T11:13:42+00:00" }, { "name": "psr/cache", @@ -1389,27 +1641,22 @@ }, { "name": "psr/container", - "version": "1.0.0", + "version": "1.1.1", "source": { "type": "git", "url": "https://github.com/php-fig/container.git", - "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f" + "reference": "8622567409010282b7aeebe4bb841fe98b58dcaf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/container/zipball/b7ce3b176482dbbc1245ebf52b181af44c2cf55f", - "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f", + "url": "https://api.github.com/repos/php-fig/container/zipball/8622567409010282b7aeebe4bb841fe98b58dcaf", + "reference": "8622567409010282b7aeebe4bb841fe98b58dcaf", "shasum": "" }, "require": { - "php": ">=5.3.0" + "php": ">=7.2.0" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0.x-dev" - } - }, "autoload": { "psr-4": { "Psr\\Container\\": "src/" @@ -1422,7 +1669,7 @@ "authors": [ { "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" + "homepage": "https://www.php-fig.org/" } ], "description": "Common Container Interface (PHP FIG PSR-11)", @@ -1434,29 +1681,29 @@ "container-interop", "psr" ], - "time": "2017-02-14T16:28:37+00:00" + "time": "2021-03-05T17:36:06+00:00" }, { "name": "psr/http-message", - "version": "1.0.1", + "version": "1.1", "source": { "type": "git", "url": "https://github.com/php-fig/http-message.git", - "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363" + "reference": "cb6ce4845ce34a8ad9e68117c10ee90a29919eba" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363", - "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363", + "url": "https://api.github.com/repos/php-fig/http-message/zipball/cb6ce4845ce34a8ad9e68117c10ee90a29919eba", + "reference": "cb6ce4845ce34a8ad9e68117c10ee90a29919eba", "shasum": "" }, "require": { - "php": ">=5.3.0" + "php": "^7.2 || ^8.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "1.1.x-dev" } }, "autoload": { @@ -1484,7 +1731,7 @@ "request", "response" ], - "time": "2016-08-06T14:39:51+00:00" + "time": "2023-04-04T09:50:52+00:00" }, { "name": "psr/log", @@ -1581,6 +1828,46 @@ ], "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", @@ -1726,16 +2013,16 @@ }, { "name": "slim/slim", - "version": "3.12.3", + "version": "3.12.5", "source": { "type": "git", "url": "https://github.com/slimphp/Slim.git", - "reference": "1c9318a84ffb890900901136d620b4f03a59da38" + "reference": "565632b2d9b64ecedf89546edbbf4f3648089f0c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/slimphp/Slim/zipball/1c9318a84ffb890900901136d620b4f03a59da38", - "reference": "1c9318a84ffb890900901136d620b4f03a59da38", + "url": "https://api.github.com/repos/slimphp/Slim/zipball/565632b2d9b64ecedf89546edbbf4f3648089f0c", + "reference": "565632b2d9b64ecedf89546edbbf4f3648089f0c", "shasum": "" }, "require": { @@ -1753,7 +2040,7 @@ }, "require-dev": { "phpunit/phpunit": "^4.0", - "squizlabs/php_codesniffer": "^2.5" + "squizlabs/php_codesniffer": "^3.6.0" }, "type": "library", "autoload": { @@ -1795,32 +2082,280 @@ "micro", "router" ], - "time": "2019-11-28T17:40:33+00:00" + "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": "willdurand/negotiation", - "version": "v2.3.1", + "name": "symfony/polyfill-intl-idn", + "version": "v1.27.0", "source": { "type": "git", - "url": "https://github.com/willdurand/Negotiation.git", - "reference": "03436ededa67c6e83b9b12defac15384cb399dc9" + "url": "https://github.com/symfony/polyfill-intl-idn.git", + "reference": "639084e360537a19f9ee352433b84ce831f3d2da" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/willdurand/Negotiation/zipball/03436ededa67c6e83b9b12defac15384cb399dc9", - "reference": "03436ededa67c6e83b9b12defac15384cb399dc9", + "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/639084e360537a19f9ee352433b84ce831f3d2da", + "reference": "639084e360537a19f9ee352433b84ce831f3d2da", "shasum": "" }, "require": { - "php": ">=5.4.0" + "php": ">=7.1", + "symfony/polyfill-intl-normalizer": "^1.10", + "symfony/polyfill-php72": "^1.10" }, - "require-dev": { - "phpunit/phpunit": "~4.5" + "suggest": { + "ext-intl": "For best performance" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.3-dev" + "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": { @@ -1847,22 +2382,22 @@ "header", "negotiation" ], - "time": "2017-05-14T17:21:12+00:00" + "time": "2022-01-30T20:08:53+00:00" } ], "packages-dev": [ { "name": "bower-asset/bootstrap", - "version": "v4.6.1", + "version": "v4.6.2", "source": { "type": "git", "url": "https://github.com/twbs/bootstrap.git", - "reference": "043a03c95a2ad6738f85b65e53b9dbdfb03b8d10" + "reference": "e5643aaa89eb67327a5b4abe7db976f0ea276b70" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twbs/bootstrap/zipball/043a03c95a2ad6738f85b65e53b9dbdfb03b8d10", - "reference": "043a03c95a2ad6738f85b65e53b9dbdfb03b8d10", + "url": "https://api.github.com/repos/twbs/bootstrap/zipball/e5643aaa89eb67327a5b4abe7db976f0ea276b70", + "reference": "e5643aaa89eb67327a5b4abe7db976f0ea276b70", "shasum": "" }, "type": "bower-asset-library" @@ -1928,29 +2463,30 @@ }, { "name": "doctrine/instantiator", - "version": "1.4.0", + "version": "1.5.0", "source": { "type": "git", "url": "https://github.com/doctrine/instantiator.git", - "reference": "d56bf6102915de5702778fe20f2de3b2fe570b5b" + "reference": "0a0fa9780f5d4e507415a065172d26a98d02047b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/instantiator/zipball/d56bf6102915de5702778fe20f2de3b2fe570b5b", - "reference": "d56bf6102915de5702778fe20f2de3b2fe570b5b", + "url": "https://api.github.com/repos/doctrine/instantiator/zipball/0a0fa9780f5d4e507415a065172d26a98d02047b", + "reference": "0a0fa9780f5d4e507415a065172d26a98d02047b", "shasum": "" }, "require": { "php": "^7.1 || ^8.0" }, "require-dev": { - "doctrine/coding-standard": "^8.0", + "doctrine/coding-standard": "^9 || ^11", "ext-pdo": "*", "ext-phar": "*", - "phpbench/phpbench": "^0.13 || 1.0.0-alpha2", - "phpstan/phpstan": "^0.12", - "phpstan/phpstan-phpunit": "^0.12", - "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0" + "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": { @@ -1989,7 +2525,7 @@ "type": "tidelift" } ], - "time": "2020-11-10T18:47:58+00:00" + "time": "2022-12-30T00:15:36+00:00" }, { "name": "felixfbecker/advanced-json-rpc", @@ -2034,16 +2570,16 @@ }, { "name": "felixfbecker/language-server-protocol", - "version": "1.5.1", + "version": "v1.5.2", "source": { "type": "git", "url": "https://github.com/felixfbecker/php-language-server-protocol.git", - "reference": "9d846d1f5cf101deee7a61c8ba7caa0a975cd730" + "reference": "6e82196ffd7c62f7794d778ca52b69feec9f2842" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/felixfbecker/php-language-server-protocol/zipball/9d846d1f5cf101deee7a61c8ba7caa0a975cd730", - "reference": "9d846d1f5cf101deee7a61c8ba7caa0a975cd730", + "url": "https://api.github.com/repos/felixfbecker/php-language-server-protocol/zipball/6e82196ffd7c62f7794d778ca52b69feec9f2842", + "reference": "6e82196ffd7c62f7794d778ca52b69feec9f2842", "shasum": "" }, "require": { @@ -2082,7 +2618,7 @@ "php", "server" ], - "time": "2021-02-22T14:02:09+00:00" + "time": "2022-03-02T22:36:06+00:00" }, { "name": "muglug/package-versions-56", @@ -2142,37 +2678,38 @@ }, { "name": "myclabs/deep-copy", - "version": "1.10.2", + "version": "1.11.1", "source": { "type": "git", "url": "https://github.com/myclabs/DeepCopy.git", - "reference": "776f831124e9c62e1a2c601ecc52e776d8bb7220" + "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/776f831124e9c62e1a2c601ecc52e776d8bb7220", - "reference": "776f831124e9c62e1a2c601ecc52e776d8bb7220", + "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/7284c22080590fb39f2ffa3e9057f10a4ddd0e0c", + "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c", "shasum": "" }, "require": { "php": "^7.1 || ^8.0" }, - "replace": { - "myclabs/deep-copy": "self.version" + "conflict": { + "doctrine/collections": "<1.6.8", + "doctrine/common": "<2.13.3 || >=3,<3.2.2" }, "require-dev": { - "doctrine/collections": "^1.0", - "doctrine/common": "^2.6", - "phpunit/phpunit": "^7.1" + "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": { - "psr-4": { - "DeepCopy\\": "src/DeepCopy/" - }, "files": [ "src/DeepCopy/deep_copy.php" - ] + ], + "psr-4": { + "DeepCopy\\": "src/DeepCopy/" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -2192,7 +2729,7 @@ "type": "tidelift" } ], - "time": "2020-11-13T09:40:50+00:00" + "time": "2023-03-08T13:26:56+00:00" }, { "name": "netresearch/jsonmapper", @@ -2242,16 +2779,16 @@ }, { "name": "nikic/php-parser", - "version": "v4.13.2", + "version": "v4.16.0", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "210577fe3cf7badcc5814d99455df46564f3c077" + "reference": "19526a33fb561ef417e822e85f08a00db4059c17" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/210577fe3cf7badcc5814d99455df46564f3c077", - "reference": "210577fe3cf7badcc5814d99455df46564f3c077", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/19526a33fb561ef417e822e85f08a00db4059c17", + "reference": "19526a33fb561ef417e822e85f08a00db4059c17", "shasum": "" }, "require": { @@ -2290,7 +2827,7 @@ "parser", "php" ], - "time": "2021-11-30T19:35:32+00:00" + "time": "2023-06-25T14:52:30+00:00" }, { "name": "openlss/lib-array2xml", @@ -2390,29 +2927,30 @@ "keywords": [ "diff" ], + "abandoned": true, "time": "2020-10-14T08:39:05+00:00" }, { "name": "phpdocumentor/reflection-common", - "version": "2.1.0", + "version": "2.2.0", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionCommon.git", - "reference": "6568f4687e5b41b054365f9ae03fcb1ed5f2069b" + "reference": "1d01c49d4ed62f25aa84a747ad35d5a16924662b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/6568f4687e5b41b054365f9ae03fcb1ed5f2069b", - "reference": "6568f4687e5b41b054365f9ae03fcb1ed5f2069b", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/1d01c49d4ed62f25aa84a747ad35d5a16924662b", + "reference": "1d01c49d4ed62f25aa84a747ad35d5a16924662b", "shasum": "" }, "require": { - "php": ">=7.1" + "php": "^7.2 || ^8.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.x-dev" + "dev-2.x": "2.x-dev" } }, "autoload": { @@ -2439,45 +2977,42 @@ "reflection", "static analysis" ], - "time": "2020-04-27T09:25:28+00:00" + "time": "2020-06-27T09:03:43+00:00" }, { "name": "phpdocumentor/reflection-docblock", - "version": "4.3.4", + "version": "5.1.0", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "da3fd972d6bafd628114f7e7e036f45944b62e9c" + "reference": "cd72d394ca794d3466a3b2fc09d5a6c1dc86b47e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/da3fd972d6bafd628114f7e7e036f45944b62e9c", - "reference": "da3fd972d6bafd628114f7e7e036f45944b62e9c", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/cd72d394ca794d3466a3b2fc09d5a6c1dc86b47e", + "reference": "cd72d394ca794d3466a3b2fc09d5a6c1dc86b47e", "shasum": "" }, "require": { - "php": "^7.0", - "phpdocumentor/reflection-common": "^1.0.0 || ^2.0.0", - "phpdocumentor/type-resolver": "~0.4 || ^1.0.0", - "webmozart/assert": "^1.0" + "ext-filter": "^7.1", + "php": "^7.2", + "phpdocumentor/reflection-common": "^2.0", + "phpdocumentor/type-resolver": "^1.0", + "webmozart/assert": "^1" }, "require-dev": { - "doctrine/instantiator": "^1.0.5", - "mockery/mockery": "^1.0", - "phpdocumentor/type-resolver": "0.4.*", - "phpunit/phpunit": "^6.4" + "doctrine/instantiator": "^1", + "mockery/mockery": "^1" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "4.x-dev" + "dev-master": "5.x-dev" } }, "autoload": { "psr-4": { - "phpDocumentor\\Reflection\\": [ - "src/" - ] + "phpDocumentor\\Reflection\\": "src" } }, "notification-url": "https://packagist.org/downloads/", @@ -2488,38 +3023,41 @@ { "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": "2019-12-28T18:55:12+00:00" + "time": "2020-02-22T12:28:44+00:00" }, { "name": "phpdocumentor/type-resolver", - "version": "1.0.1", + "version": "1.6.1", "source": { "type": "git", "url": "https://github.com/phpDocumentor/TypeResolver.git", - "reference": "2e32a6d48972b2c1976ed5d8967145b6cec4a4a9" + "reference": "77a32518733312af16a44300404e945338981de3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/2e32a6d48972b2c1976ed5d8967145b6cec4a4a9", - "reference": "2e32a6d48972b2c1976ed5d8967145b6cec4a4a9", + "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/77a32518733312af16a44300404e945338981de3", + "reference": "77a32518733312af16a44300404e945338981de3", "shasum": "" }, "require": { - "php": "^7.1", + "php": "^7.2 || ^8.0", "phpdocumentor/reflection-common": "^2.0" }, "require-dev": { - "ext-tokenizer": "^7.1", - "mockery/mockery": "~1", - "phpunit/phpunit": "^7.0" + "ext-tokenizer": "*", + "psalm/phar": "^4.8" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.x-dev" + "dev-1.x": "1.x-dev" } }, "autoload": { @@ -2538,7 +3076,7 @@ } ], "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names", - "time": "2019-08-22T18:11:29+00:00" + "time": "2022-03-15T21:29:03+00:00" }, { "name": "phpspec/prophecy", @@ -3019,14 +3557,14 @@ }, "type": "library", "autoload": { - "psr-4": { - "Sabre\\Event\\": "lib/" - }, "files": [ "lib/coroutine.php", "lib/Loop/functions.php", "lib/Promise/functions.php" - ] + ], + "psr-4": { + "Sabre\\Event\\": "lib/" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -3058,23 +3596,23 @@ }, { "name": "sabre/uri", - "version": "2.2.2", + "version": "2.2.4", "source": { "type": "git", "url": "https://github.com/sabre-io/uri.git", - "reference": "7cb0f489578afad5006e85cd60f18ff33f2d440d" + "reference": "c0c9af9f7754e60a49ebd760e1708adc6d1510c0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sabre-io/uri/zipball/7cb0f489578afad5006e85cd60f18ff33f2d440d", - "reference": "7cb0f489578afad5006e85cd60f18ff33f2d440d", + "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.17.1", + "friendsofphp/php-cs-fixer": "~2.19.3", "phpstan/phpstan": "^0.12", "phpunit/phpunit": "^7.5 || ^8.5 || ^9.0" }, @@ -3106,20 +3644,20 @@ "uri", "url" ], - "time": "2021-11-04T09:29:58+00:00" + "time": "2022-09-19T12:25:28+00:00" }, { "name": "scssphp/scssphp", - "version": "v1.9.0", + "version": "v1.11.0", "source": { "type": "git", "url": "https://github.com/scssphp/scssphp.git", - "reference": "bc8bece4e5e176973a832f3763049ddbba16e6fd" + "reference": "33749d12c2569bb24071f94e9af828662dabb068" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/scssphp/scssphp/zipball/bc8bece4e5e176973a832f3763049ddbba16e6fd", - "reference": "bc8bece4e5e176973a832f3763049ddbba16e6fd", + "url": "https://api.github.com/repos/scssphp/scssphp/zipball/33749d12c2569bb24071f94e9af828662dabb068", + "reference": "33749d12c2569bb24071f94e9af828662dabb068", "shasum": "" }, "require": { @@ -3135,7 +3673,7 @@ "symfony/phpunit-bridge": "^5.1", "thoughtbot/bourbon": "^7.0", "twbs/bootstrap": "~5.0", - "twbs/bootstrap4": "4.6.0", + "twbs/bootstrap4": "4.6.1", "zurb/foundation": "~6.5" }, "suggest": { @@ -3146,6 +3684,12 @@ "bin/pscss" ], "type": "library", + "extra": { + "bamarni-bin": { + "forward-command": false, + "bin-links": false + } + }, "autoload": { "psr-4": { "ScssPhp\\ScssPhp\\": "src/" @@ -3176,7 +3720,7 @@ "scss", "stylesheet" ], - "time": "2021-12-13T11:55:16+00:00" + "time": "2022-09-02T21:24:55+00:00" }, { "name": "sebastian/code-unit-reverse-lookup", @@ -3699,28 +4243,31 @@ }, { "name": "symfony/polyfill-ctype", - "version": "v1.23.0", + "version": "v1.27.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "46cd95797e9df938fdd2b03693b5fca5e64b01ce" + "reference": "5bbc823adecdae860bb64756d639ecfec17b050a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/46cd95797e9df938fdd2b03693b5fca5e64b01ce", - "reference": "46cd95797e9df938fdd2b03693b5fca5e64b01ce", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/5bbc823adecdae860bb64756d639ecfec17b050a", + "reference": "5bbc823adecdae860bb64756d639ecfec17b050a", "shasum": "" }, "require": { "php": ">=7.1" }, + "provide": { + "ext-ctype": "*" + }, "suggest": { "ext-ctype": "For best performance" }, "type": "library", "extra": { "branch-alias": { - "dev-main": "1.23-dev" + "dev-main": "1.27-dev" }, "thanks": { "name": "symfony/polyfill", @@ -3728,12 +4275,12 @@ } }, "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Ctype\\": "" - }, "files": [ "bootstrap.php" - ] + ], + "psr-4": { + "Symfony\\Polyfill\\Ctype\\": "" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -3771,31 +4318,31 @@ "type": "tidelift" } ], - "time": "2021-02-19T12:13:01+00:00" + "time": "2022-11-03T14:55:06+00:00" }, { "name": "symfony/yaml", - "version": "v3.4.47", + "version": "v4.4.45", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "88289caa3c166321883f67fe5130188ebbb47094" + "reference": "aeccc4dc52a9e634f1d1eebeb21eacfdcff1053d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/88289caa3c166321883f67fe5130188ebbb47094", - "reference": "88289caa3c166321883f67fe5130188ebbb47094", + "url": "https://api.github.com/repos/symfony/yaml/zipball/aeccc4dc52a9e634f1d1eebeb21eacfdcff1053d", + "reference": "aeccc4dc52a9e634f1d1eebeb21eacfdcff1053d", "shasum": "" }, "require": { - "php": "^5.5.9|>=7.0.8", + "php": ">=7.1.3", "symfony/polyfill-ctype": "~1.8" }, "conflict": { "symfony/console": "<3.4" }, "require-dev": { - "symfony/console": "~3.4|~4.0" + "symfony/console": "^3.4|^4.0|^5.0" }, "suggest": { "symfony/console": "For validating YAML files using the lint command" @@ -3823,7 +4370,7 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony Yaml Component", + "description": "Loads and dumps YAML files", "homepage": "https://symfony.com", "funding": [ { @@ -3839,7 +4386,7 @@ "type": "tidelift" } ], - "time": "2020-10-24T10:57:07+00:00" + "time": "2022-08-02T15:47:23+00:00" }, { "name": "vimeo/psalm", @@ -3968,26 +4515,24 @@ }, { "name": "webmozart/glob", - "version": "4.1.0", + "version": "4.6.0", "source": { "type": "git", "url": "https://github.com/webmozarts/glob.git", - "reference": "3cbf63d4973cf9d780b93d2da8eec7e4a9e63bbe" + "reference": "3c17f7dec3d9d0e87b575026011f2e75a56ed655" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/webmozarts/glob/zipball/3cbf63d4973cf9d780b93d2da8eec7e4a9e63bbe", - "reference": "3cbf63d4973cf9d780b93d2da8eec7e4a9e63bbe", + "url": "https://api.github.com/repos/webmozarts/glob/zipball/3c17f7dec3d9d0e87b575026011f2e75a56ed655", + "reference": "3c17f7dec3d9d0e87b575026011f2e75a56ed655", "shasum": "" }, "require": { - "php": "^5.3.3|^7.0", - "webmozart/path-util": "^2.2" + "php": "^7.3 || ^8.0.0" }, "require-dev": { - "phpunit/phpunit": "^4.6", - "sebastian/version": "^1.0.1", - "symfony/filesystem": "^2.5" + "phpunit/phpunit": "^9.5", + "symfony/filesystem": "^5.3" }, "type": "library", "extra": { @@ -4011,7 +4556,7 @@ } ], "description": "A PHP implementation of Ant's glob.", - "time": "2015-12-29T11:14:33+00:00" + "time": "2022-05-24T19:45:58+00:00" }, { "name": "webmozart/path-util", @@ -4063,7 +4608,9 @@ ], "aliases": [], "minimum-stability": "stable", - "stability-flags": [], + "stability-flags": { + "gofabian/negotiation-middleware": 20 + }, "prefer-stable": false, "prefer-lowest": false, "platform": { @@ -4075,7 +4622,7 @@ }, "platform-dev": [], "platform-overrides": { - "php": "7.1.0" + "php": "7.3.0" }, "plugin-api-version": "1.1.0" } diff --git a/docs/Protocol.md b/docs/Protocol.md index 35d397b..2e1c74f 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 `forum`. Default is `all`. +- `account_type` (optional): An arbitrary account type string. Expected values are `all`, `people`, `news`, `organization` and `group`. Default is `all`. Query parameters: - `q`: The search query. - `page` (optional): The page number, default is 1. @@ -44,10 +44,11 @@ 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" + "last_activity": "2018-45", + "remote_follow": "https://friendica.mrpetovan.com/remote_follow/hypolite", + "subscribe": null }, ... ] diff --git a/public/assets/images/default-profile-sm.jpg b/public/assets/images/default-profile-sm.jpg index ea0030e..5733602 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 28971ae..ba97311 100644 --- a/src/classes/Controllers/Api/MatchSearch.php +++ b/src/classes/Controllers/Api/MatchSearch.php @@ -11,10 +11,6 @@ use Psr\Http\Message\ServerRequestInterface; */ class MatchSearch { - /** - * @var \Atlas\Pdo\Connection - */ - private $atlas; /** * @var \Friendica\Directory\Models\Profile */ @@ -25,12 +21,10 @@ 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; } @@ -53,7 +47,13 @@ class MatchSearch $values = ['query' => $query]; - $profiles = $this->profileModel->getListForDisplay($pager->getItemsPerPage(), $pager->getStart(), $sql_where, $values); + $profiles = $this->profileModel->getListForDisplay( + null, + $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 52ae50f..d7d8572 100644 --- a/src/classes/Controllers/Api/Photo.php +++ b/src/classes/Controllers/Api/Photo.php @@ -14,12 +14,18 @@ class Photo * @var \Atlas\Pdo\Connection */ private $atlas; + /** + * @var string + */ + private $defaultProfilePictureSmallPath; public function __construct( - \Atlas\Pdo\Connection $atlas + \Atlas\Pdo\Connection $atlas, + string $defaultProfilePictureSmallPath ) { $this->atlas = $atlas; + $this->defaultProfilePictureSmallPath = $defaultProfilePictureSmallPath; } public function render(Request $request, Response $response, array $args): Response @@ -30,7 +36,7 @@ class Photo ); if (!$data) { - $data = file_get_contents('public/images/default-profile-sm.jpg'); + $data = file_get_contents($this->defaultProfilePictureSmallPath); } //Try and cache our result. diff --git a/src/classes/Controllers/Api/Search.php b/src/classes/Controllers/Api/Search.php index a27fa82..ea39dd7 100644 --- a/src/classes/Controllers/Api/Search.php +++ b/src/classes/Controllers/Api/Search.php @@ -11,10 +11,6 @@ use Psr\Http\Message\ServerRequestInterface; */ class Search { - /** - * @var \Atlas\Pdo\Connection - */ - private $atlas; /** * @var \Friendica\Directory\Models\Profile */ @@ -25,12 +21,10 @@ 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; } @@ -64,7 +58,13 @@ AND `account_type` = :account_type'; $values['account_type'] = $account_type; } - $profiles = $this->profileModel->getListForDisplay($pager->getItemsPerPage(), $pager->getStart(), $sql_where, $values); + $profiles = $this->profileModel->getListForDisplay( + null, + $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 4de2e05..3e3fb3c 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] + bin/console install [-h|--help|-?] [-v] Description Install directory diff --git a/src/classes/Controllers/Console/UpdateDb.php b/src/classes/Controllers/Console/UpdateDb.php index 0f2c32e..9ac7c76 100644 --- a/src/classes/Controllers/Console/UpdateDb.php +++ b/src/classes/Controllers/Console/UpdateDb.php @@ -37,12 +37,14 @@ 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; @@ -56,16 +58,38 @@ HELP; return 0; } - if (count($this->args) > 1) { + if (count($this->args) > 2) { throw new \Asika\SimpleConsole\CommandArgsException('Too many arguments'); } - $this->out('Updating database schema to latest version...'); + $currentVersion = $this->migration->getCurrentVersion()['version']; - $this->migration->up(); + $this->out('Database schema currently in version ' . $currentVersion); - $this->out('Database schema migrated to version ' . $this->migration->getCurrentVersion()['version']); + 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; + } + $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 f4aaaec..84c5a1f 100644 --- a/src/classes/Controllers/Web/Directory.php +++ b/src/classes/Controllers/Web/Directory.php @@ -18,6 +18,10 @@ class Directory extends BaseController * @var \Atlas\Pdo\Connection */ private $atlas; + /** + * @var \Friendica\Directory\Models\Server + */ + private $serverModel; /** * @var \Friendica\Directory\Models\Profile */ @@ -37,6 +41,7 @@ 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, @@ -44,6 +49,7 @@ class Directory extends BaseController ) { $this->atlas = $atlas; + $this->serverModel = $serverModel; $this->profileModel = $profileModel; $this->accountTypeTabs = $accountTypeTabs; $this->renderer = $renderer; @@ -58,16 +64,22 @@ class Directory extends BaseController $pager = new Pager($this->l10n, $request, 20); - $condition = ''; + $sql_where = ''; $values = []; if (!empty($args['account_type'])) { - $condition = '`account_type` = :account_type'; + $sql_where = '`account_type` = :account_type'; $values = ['account_type' => $args['account_type']]; } - $profiles = $this->profileModel->getListForDisplay($pager->getItemsPerPage(), $pager->getStart(), $condition, $values); + $profiles = $this->profileModel->getListForDisplay( + $this->serverModel->getSubscribeUrlByProfile($request->getQueryParam('zrl', '')), + $pager->getItemsPerPage(), + $pager->getStart(), + $sql_where, + $values, + ); - $count = $this->profileModel->getCountForDisplay($condition, $values); + $count = $this->profileModel->getCountForDisplay($sql_where, $values); $vars = [ 'title' => $this->l10n->gettext('People'), @@ -82,7 +94,6 @@ 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 d70925a..fc6f5ff 100644 --- a/src/classes/Controllers/Web/Search.php +++ b/src/classes/Controllers/Web/Search.php @@ -13,6 +13,10 @@ class Search extends BaseController * @var \Atlas\Pdo\Connection */ private $atlas; + /** + * @var \Friendica\Directory\Models\Server + */ + private $serverModel; /** * @var \Friendica\Directory\Models\Profile */ @@ -32,6 +36,7 @@ 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, @@ -39,6 +44,7 @@ class Search extends BaseController ) { $this->atlas = $atlas; + $this->serverModel = $serverModel; $this->profileModel = $profileModel; $this->accountTypeTabs = $accountTypeTabs; $this->renderer = $renderer; @@ -89,7 +95,13 @@ AND `account_type` = :account_type'; $values['account_type'] = $account_type; } - $profiles = $this->profileModel->getListForDisplay($pager->getItemsPerPage(), $pager->getStart(), $sql_where, $values); + $profiles = $this->profileModel->getListForDisplay( + $this->serverModel->getSubscribeUrlByProfile($request->getQueryParam('zrl', '')), + $pager->getItemsPerPage(), + $pager->getStart(), + $sql_where, + $values, + ); $count = $this->profileModel->getCountForDisplay($sql_where, $values); @@ -106,7 +118,6 @@ 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 a4c1d78..580edb9 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 ($args['language']) { + if (!empty($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'], + 'language' => $args['language'] ?? null, '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 e8e5324..f2cc6a3 100644 --- a/src/classes/Models/Profile.php +++ b/src/classes/Models/Profile.php @@ -7,6 +7,13 @@ 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', @@ -74,7 +81,7 @@ class Profile extends \Friendica\Directory\Model ]; } - public function getListForDisplay(int $limit = 30, int $start = 0, string $condition = '', array $values = []): array + public function getListForDisplay(string $subscribeUrl = null, int $limit = 30, int $start = 0, string $condition = '', array $values = []): array { if ($condition) { $condition = 'AND ' . $condition; @@ -86,8 +93,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.`dfrn_request`, - p.`photo`, p.`tags`, p.`last_activity` + p.`pdesc`, p.`locality`, p.`region`, p.`country`, p.`profile_url`, + p.`photo`, p.`tags`, p.`last_activity`, s.`version` FROM `profile` p JOIN `server` s ON s.`id` = p.`server_id` AND s.`available` AND NOT s.`hidden` WHERE p.`available` @@ -98,6 +105,12 @@ 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 9f1ec5c..3e89603 100644 --- a/src/classes/Models/Server.php +++ b/src/classes/Models/Server.php @@ -41,4 +41,20 @@ 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 53c0f9e..68a9f38 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 \Atlas\Pdo\Connection + * @var \GuzzleHttp\ClientInterface */ - private $atlas; + private $http; /** * @var \Friendica\Directory\Models\ProfilePollQueue */ @@ -30,12 +30,12 @@ class Directory ]; public function __construct( - \Atlas\Pdo\Connection $atlas, + \GuzzleHttp\ClientInterface $http, \Friendica\Directory\Models\ProfilePollQueue $profilePollQueueModel, \Psr\Log\LoggerInterface $logger, array $settings) { - $this->atlas = $atlas; + $this->http = $http; $this->profilePollQueueModel = $profilePollQueueModel; $this->logger = $logger; $this->settings = array_merge($this->settings, $settings); @@ -82,35 +82,7 @@ class Directory $path = '/sync/pull/since/' . $last_polled; } - //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); + $pull_data = $this->http->get($directory_url . $path, ['timeout' => max($this->settings['probe_timeout'], 1)])->getBody()->getContents(); $data = json_decode($pull_data, true); diff --git a/src/classes/Pollers/Profile.php b/src/classes/Pollers/Profile.php index 70db56e..4d35d60 100644 --- a/src/classes/Pollers/Profile.php +++ b/src/classes/Pollers/Profile.php @@ -2,14 +2,15 @@ namespace Friendica\Directory\Pollers; -use Friendica\Directory\Utils\Network; +use Friendica\Directory\Models; +use Friendica\Directory\Utils; +use GuzzleHttp\Exception\RequestException; /** * @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; @@ -20,12 +21,17 @@ class Profile private $atlas; /** - * @var \Friendica\Directory\Models\Server + * @var \GuzzleHttp\ClientInterface + */ + private $http; + + /** + * @var Models\Server */ private $serverModel; /** - * @var \Friendica\Directory\Models\Profile + * @var Models\Profile */ private $profileModel; @@ -44,13 +50,15 @@ class Profile public function __construct( \Atlas\Pdo\Connection $atlas, - \Friendica\Directory\Models\Server $serverModel, - \Friendica\Directory\Models\Profile $profileModel, + \GuzzleHttp\ClientInterface $http, + Models\Server $serverModel, + Models\Profile $profileModel, \Psr\Log\LoggerInterface $logger, array $settings ) { $this->atlas = $atlas; + $this->http = $http; $this->serverModel = $serverModel; $this->profileModel = $profileModel; $this->logger = $logger; @@ -75,12 +83,12 @@ class Profile return false; } - if (!\Friendica\Directory\Utils\Network::isPublicHost($host)) { + if (!Utils\Network::isPublicHost($host)) { $this->logger->warning('Private/reserved IP in polled profile URL: ' . $profile_uri); return false; } - $profileUriInfo = \Friendica\Directory\Models\Profile::extractInfoFromProfileUrl($profile_uri); + $profileUriInfo = Models\Profile::extractInfoFromProfileUrl($profile_uri); if (!$profileUriInfo) { $this->logger->warning('Profile URI invalid'); return false; @@ -123,25 +131,38 @@ class Profile ); } - //Skip the profile scrape? - $noscrape = $server['noscrape_url']; + $available = false; $params = []; - if ($noscrape) { + + //Skip the profile scrape? + if ($server['noscrape_url']) { $this->logger->debug('Calling ' . $server['noscrape_url'] . '/' . $username); - $params = \Friendica\Directory\Utils\Scrape::retrieveNoScrapeData($server['noscrape_url'] . '/' . $username); - $noscrape = !!$params; //If the result was false, do a scrape after all. + 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. } - $available = true; - - 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); + 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 = !empty($params['fn']); } // Empty result is due to an offline site. @@ -177,9 +198,6 @@ 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.'); } @@ -193,16 +211,22 @@ class Profile return false; } - 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: + 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: { $account_type = 'People'; if (!empty($params['comm'])) { - $account_type = 'Forum'; + $account_type = 'Group'; } + break; + } + + default: $account_type = 'Unknown'; break; } $tags = []; @@ -232,7 +256,6 @@ 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, @@ -240,7 +263,7 @@ class Profile 'language' => $params['language'] ?? null, 'filled_fields'=> $filled_fields, 'last_activity'=> $params['last-activity'] ?? null, - 'available' => $available, + 'available' => [$available, \PDO::PARAM_BOOL], ]; $this->logger->debug(var_export($values, true)); @@ -254,7 +277,6 @@ class Profile `region` = :region, `country` = :country, `profile_url` = :profile_url, - `dfrn_request` = :dfrn_request, `photo` = :photo, `tags` = :tags, `addr` = :addr, @@ -274,7 +296,6 @@ class Profile `region` = :region, `country` = :country, `profile_url` = :profile_url, - `dfrn_request` = :dfrn_request, `photo` = :photo, `tags` = :tags, `addr` = :addr, @@ -308,23 +329,27 @@ class Profile $status = false; if ($profile_id) { - $img_str = \Friendica\Directory\Utils\Network::fetchURL($params['photo'], true); - $img = new \Friendica\Directory\Utils\Photo($img_str); - if ($img->getImage()) { - $img->scaleImageSquare(80); + try { + $img_str = $this->http->get($params['photo'])->getBody()->getContents(); + $img = new 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() - ] - ); + $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()]); } - $status = true; } $submit_end = microtime(true); @@ -361,9 +386,6 @@ 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 e6c160c..2b3d9be 100644 --- a/src/classes/Pollers/Server.php +++ b/src/classes/Pollers/Server.php @@ -2,8 +2,9 @@ namespace Friendica\Directory\Pollers; -use ByJG\Util\WebRequest; -use Friendica\Directory\Utils\Network; +use GuzzleHttp\Psr7\Uri; +use GuzzleHttp\Exception\RequestException; +use GuzzleHttp\TransferStats; /** * @author Hypolite Petovan @@ -14,6 +15,10 @@ class Server * @var \Atlas\Pdo\Connection */ private $atlas; + /** + * @var \GuzzleHttp\ClientInterface + */ + private $http; /** * @var \Friendica\Directory\Models\ProfilePollQueue */ @@ -41,6 +46,7 @@ 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, @@ -48,6 +54,7 @@ class Server array $settings) { $this->atlas = $atlas; + $this->http = $http; $this->profilePollQueueModel = $profilePollQueueModel; $this->serverModel = $serverModel; $this->simplecache = $simplecache; @@ -147,6 +154,10 @@ 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, @@ -161,20 +172,22 @@ 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' => $probe_result['data']['site_name'], + 'name' => substr($probe_result['data']['site_name'], 0, 255), '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'], - 'admin_profile' => $probe_result['data']['admin']['profile'], + 'admin_name' => $probe_result['data']['admin']['name'] ?? null, + 'admin_profile' => $probe_result['data']['admin']['profile'] ?? null, 'noscrape_url' => $probe_result['data']['no_scrape_url'] ?? null, + 'subscribe_url' => $subscribe ?? null, 'ssl_state' => $probe_result['ssl_state'] ] ); @@ -241,65 +254,50 @@ class Server private function getProbeResult(string $base_url): array { - //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); + $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; - //Probe the site. $probe_start = microtime(true); - $probe_data = curl_exec($handle); - $probe_end = 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; - //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, we probe again without strict SSL. + $options['verify'] = false; - //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); + $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]; } - //Gather more meta. - $time = round(($probe_end - $probe_start) * 1000); - $curl_info = curl_getinfo($handle); + $probe_end = microtime(true); - //Done with CURL now. - curl_close($handle); + $time = round(($probe_end - $probe_start) * 1000); try { $data = json_decode($probe_data, true); @@ -413,27 +411,24 @@ class Server function discoverPoco($base_url): void { - $pocoUrl = $base_url . '/poco'; + $uri = Uri::withQueryValues(new Uri($base_url . '/poco'), ['fields' => 'urls', 'count' => 1000]); - $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()); + try { + $response = $this->http->request('GET', $uri); + } catch (RequestException $e) { + $this->logger->info('Unsuccessful poco request: ' . $uri); return; } try { - $pocoFetchData = json_decode($pocoJsonData); + $pocoFetchData = json_decode($response->getBody()->getContents()); } catch (\Throwable $e) { - $this->logger->notice('Invalid JSON string for PoCo URL: ' . $webrequest->getLastFetchedUrl()); + $this->logger->notice('Invalid JSON string for PoCo URL: ' . $uri); return; } if (!isset($pocoFetchData->entry)) { - $this->logger->notice('Invalid JSON structure for PoCo URL: ' . $webrequest->getLastFetchedUrl()); + $this->logger->notice('Invalid JSON structure for PoCo URL: ' . $uri); return; } @@ -452,4 +447,45 @@ 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 7590b71..1c70ba6 100644 --- a/src/classes/Routes/Http/MatchSearch.php +++ b/src/classes/Routes/Http/MatchSearch.php @@ -10,7 +10,6 @@ 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 6afb643..8b1e6e1 100644 --- a/src/classes/Routes/Http/Photo.php +++ b/src/classes/Routes/Http/Photo.php @@ -10,7 +10,8 @@ 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->atlas, + $this->container->get('defaultProfilePictureSmallPath') ))->render($request, $response, $args); } } diff --git a/src/classes/Routes/Http/Search.php b/src/classes/Routes/Http/Search.php index b9db49d..ba4a533 100644 --- a/src/classes/Routes/Http/Search.php +++ b/src/classes/Routes/Http/Search.php @@ -10,7 +10,6 @@ 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 5d70edc..f5228b2 100644 --- a/src/classes/Routes/Web/Directory.php +++ b/src/classes/Routes/Web/Directory.php @@ -13,6 +13,7 @@ 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 d758053..324c5ba 100644 --- a/src/classes/Routes/Web/Search.php +++ b/src/classes/Routes/Web/Search.php @@ -13,6 +13,7 @@ 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 849b8f9..b2b37a9 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 = true; + $foundLocale = $language; break; } } - return $foundLocale ? $language : $foundLang ?: $locale; + return $foundLocale ?: $foundLang ?: $locale; } /** diff --git a/src/classes/Utils/Network.php b/src/classes/Utils/Network.php index 14b0c13..1542fc8 100644 --- a/src/classes/Utils/Network.php +++ b/src/classes/Utils/Network.php @@ -15,56 +15,6 @@ 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 2189b58..f9f31ac 100644 --- a/src/classes/Utils/Scrape.php +++ b/src/classes/Utils/Scrape.php @@ -2,6 +2,8 @@ namespace Friendica\Directory\Utils; +use GuzzleHttp\ClientInterface; + /** * @author Hypolite Petovan */ @@ -12,10 +14,10 @@ class Scrape * @param string $url * @return array|false */ - public static function retrieveNoScrapeData(string $url) + public static function retrieveNoScrapeData(ClientInterface $http, string $url) { $submit_noscrape_start = microtime(true); - $data = Network::fetchURL($url); + $data = $http->get($url)->getBody()->getContents(); $submit_noscrape_request_end = microtime(true); if (empty($data)) { @@ -42,7 +44,7 @@ class Scrape return $params; } - public static function retrieveProfileData(string $url, int $max_nodes = 3500): array + public static function retrieveProfileData(ClientInterface $http, string $url, int $max_nodes = 3500): array { $minNodes = 100; //Lets do at least 100 nodes per type. @@ -56,7 +58,7 @@ class Scrape $scrape_start = microtime(true); $params = []; - $html = Network::fetchURL($url, false, $timeout); + $html = $http->get($url, ['timeout' => $timeout])->getBody()->getContents();; $scrape_fetch_end = microtime(true); diff --git a/src/classes/Views/PhpRenderer.php b/src/classes/Views/PhpRenderer.php index 3df40ac..43205ad 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')); + $uri->withQueryKeyValue('zrl', $this->getAttribute('zrl'), false); $url = $uri->__toString(); } diff --git a/src/classes/Views/Widget/AccountTypeTabs.php b/src/classes/Views/Widget/AccountTypeTabs.php index b0b6c09..0dc234d 100644 --- a/src/classes/Views/Widget/AccountTypeTabs.php +++ b/src/classes/Views/Widget/AccountTypeTabs.php @@ -56,7 +56,9 @@ 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; - case 'Forum' : $title = $this->renderer->np__('account-type', 'Forum (%d)' , 'Forums (%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; 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 162ace8..5ab5608 100644 --- a/src/dependencies.php +++ b/src/dependencies.php @@ -89,6 +89,18 @@ $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 { @@ -106,7 +118,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('atlas'), + $c->get('http'), $c->get(\Friendica\Directory\Models\ProfilePollQueue::class), $c->get('logger'), $settings ?: [] @@ -117,6 +129,7 @@ $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'), @@ -128,6 +141,7 @@ $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.po b/src/lang/ar/LC_MESSAGES/strings.po index 3c9e69d..0526737 100644 --- a/src/lang/ar/LC_MESSAGES/strings.po +++ b/src/lang/ar/LC_MESSAGES/strings.po @@ -1,28 +1,25 @@ -# -# Translators: -# ButterflyOfFire, 2019 -# abidin toumi , 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: abidin toumi , 2021\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 "التالية" @@ -34,51 +31,57 @@ msgstr "الأولى" msgid "Last" msgstr "الأخيرة" -#: src\classes\Controllers\Web\Directory.php:73 +#: src\classes\Controllers\Web\Directory.php:85 msgid "People" msgstr "أشخاص" -#: src\classes\Controllers\Web\Search.php:64 +#: src\classes\Controllers\Web\Search.php:72 msgctxt "field" msgid "Language" msgstr "اللغة" -#: src\classes\Controllers\Web\Search.php:65 +#: src\classes\Controllers\Web\Search.php:73 msgctxt "field" msgid "Locality" msgstr "المنطقة" -#: src\classes\Controllers\Web\Search.php:66 +#: src\classes\Controllers\Web\Search.php:74 msgctxt "field" msgid "Region" msgstr "الإقليم" -#: src\classes\Controllers\Web\Search.php:67 +#: src\classes\Controllers\Web\Search.php:75 msgctxt "field" msgid "Country" msgstr "البلد" -#: src\classes\Controllers\Web\Servers.php:90 +#: src\classes\Controllers\Web\Servers.php:105 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 "دليل فرنديكا" -#: 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" @@ -106,11 +109,11 @@ msgstr[3] "%d نتائج لـ \"%s\"" msgstr[4] "%d نتيجة لـ \"%s\"" msgstr[5] "%dنتيجة لـ \"%s\"" -#: src\templates\servers.phtml:2 +#: src\templates\servers.phtml:7 msgid "Top servers pagination" msgstr "" -#: src\templates\servers.phtml:12 +#: src\templates\servers.phtml:17 msgid "Bottom servers pagination" msgstr "" @@ -127,23 +130,27 @@ 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:47 +#: src\templates\layout.phtml:65 +#: src\templates\sub\profile.phtml:57 msgid "Language" msgstr "اللغة" -#: src\templates\sub\profile.phtml:50 +#: src\templates\sub\profile.phtml:60 +#: src\templates\widget\popularserverlanguages.phtml:2 msgid "Filter by language" msgstr "رشح حسب اللغة" -#: src\templates\sub\profile.phtml:56 +#: src\templates\sub\profile.phtml:66 msgid "Location" msgstr "الموقع" -#: src\templates\sub\profile.phtml:69 +#: src\templates\sub\profile.phtml:79 msgid "Search Tag" msgstr "ابحث عن وسم" @@ -151,19 +158,23 @@ 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 "الإصدار الاختباري" @@ -171,15 +182,15 @@ msgstr "الإصدار الاختباري" msgid "Outdated Version" msgstr "إصدار قديم" -#: src\templates\sub\server.phtml:72 +#: src\templates\sub\server.phtml:69 msgid "Admin" msgstr "المدير" -#: src\templates\sub\server.phtml:79 +#: src\templates\sub\server.phtml:76 msgid "No description provided" msgstr "لم يقدم أي وصف" -#: src\templates\sub\server.phtml:82 +#: src\templates\sub\server.phtml:79 msgid "Visit Server" msgstr "زُر الخادم" @@ -187,7 +198,7 @@ msgstr "زُر الخادم" msgid "Popular Countries" msgstr "البلدان الشائعة" -#: src\templates\widget\popularlanguages.phtml:2 +#: src\templates\widget\popularprofilelanguages.phtml:2 msgid "Popular Languages" msgstr "اللغات الشائعة" @@ -195,7 +206,8 @@ 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 "اللغة الافتراضية" @@ -219,17 +231,6 @@ msgstr[3] "أشخاص (%d)" msgstr[4] "أشخاص (%d)" msgstr[5] "أشخاص (%d)" -#: src\classes\Views\Widget\AccountTypeTabs.php:59 -msgctxt "account-type" -msgid "Forum (%d)" -msgid_plural "Forums (%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 "الإحصائيات" @@ -243,18 +244,16 @@ 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 "من بين %s ملفا شخصيا عرف عن لغته هناك:" #: src\templates\statistics.phtml:27 @@ -262,15 +261,11 @@ 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 @@ -290,9 +285,7 @@ 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." +msgid "Out of those, there are %s profiles (%s) that opted in the public directory at least once." msgstr "" #: src\templates\statistics.phtml:35 @@ -303,23 +296,13 @@ msgstr "%s خادم متوفر (%s)" msgid "Friendica Directory version %s" msgstr "إصدار دليل فرنديكا %s" -#: 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 "" -"يوجد %s خادم عمومي (%s) مفتوح للستجيل. ألق " -"نظرة عليهم!" +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" @@ -361,14 +344,38 @@ msgstr[5] "%s مستخدم" msgid "None" msgstr "لا شيء" -#: src\templates\sub\server.phtml:59 src\templates\sub\server.phtml:63 +#: src\templates\sub\server.phtml:58 +#: src\templates\sub\server.phtml:62 msgid "Registration Policy" msgstr "سياسة التسجيل" -#: src\templates\sub\server.phtml:60 +#: src\templates\sub\server.phtml:59 msgid "By Approval" msgstr "يحتاج الموافقة" -#: src\templates\sub\server.phtml:64 +#: 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] "" +msgstr[3] "" +msgstr[4] "" +msgstr[5] "" + +#: 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/ca/LC_MESSAGES/strings.po b/src/lang/ca/LC_MESSAGES/strings.po index 518c6fd..c9ab323 100644 --- a/src/lang/ca/LC_MESSAGES/strings.po +++ b/src/lang/ca/LC_MESSAGES/strings.po @@ -1,27 +1,25 @@ -# -# 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" @@ -33,51 +31,57 @@ msgstr "Primer" msgid "Last" msgstr "Ultim" -#: src\classes\Controllers\Web\Directory.php:73 +#: src\classes\Controllers\Web\Directory.php:85 msgid "People" msgstr "gent" -#: src\classes\Controllers\Web\Search.php:64 +#: src\classes\Controllers\Web\Search.php:72 msgctxt "field" msgid "Language" msgstr "Llengua" -#: src\classes\Controllers\Web\Search.php:65 +#: src\classes\Controllers\Web\Search.php:73 msgctxt "field" msgid "Locality" msgstr "Localitat" -#: src\classes\Controllers\Web\Search.php:66 +#: src\classes\Controllers\Web\Search.php:74 msgctxt "field" msgid "Region" msgstr "Regió" -#: src\classes\Controllers\Web\Search.php:67 +#: src\classes\Controllers\Web\Search.php:75 msgctxt "field" msgid "Country" msgstr "País" -#: src\classes\Controllers\Web\Servers.php:90 +#: src\classes\Controllers\Web\Servers.php:105 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" @@ -101,11 +105,11 @@ msgid_plural "%d results for \"%s\"" msgstr[0] "" msgstr[1] "" -#: src\templates\servers.phtml:2 +#: src\templates\servers.phtml:7 msgid "Top servers pagination" msgstr "Paginació dels servidors principals" -#: src\templates\servers.phtml:12 +#: src\templates\servers.phtml:17 msgid "Bottom servers pagination" msgstr "Paginació dels servidors principals" @@ -122,23 +126,27 @@ 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:47 +#: src\templates\layout.phtml:65 +#: src\templates\sub\profile.phtml:57 msgid "Language" msgstr "Llenguatge " -#: src\templates\sub\profile.phtml:50 +#: src\templates\sub\profile.phtml:60 +#: src\templates\widget\popularserverlanguages.phtml:2 msgid "Filter by language" msgstr "" -#: src\templates\sub\profile.phtml:56 +#: src\templates\sub\profile.phtml:66 msgid "Location" msgstr "Localitat" -#: src\templates\sub\profile.phtml:69 +#: src\templates\sub\profile.phtml:79 msgid "Search Tag" msgstr "Etiqueta de cerca" @@ -146,19 +154,23 @@ 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ó" @@ -166,15 +178,15 @@ msgstr "Desenvolupar la versió" msgid "Outdated Version" msgstr "Versió obsoleta" -#: src\templates\sub\server.phtml:55 +#: src\templates\sub\server.phtml:69 msgid "Admin" msgstr "Administrador" -#: src\templates\sub\server.phtml:62 +#: src\templates\sub\server.phtml:76 msgid "No description provided" msgstr "No es proporciona cap descripció" -#: src\templates\sub\server.phtml:65 +#: src\templates\sub\server.phtml:79 msgid "Visit Server" msgstr "Visita servidor" @@ -182,7 +194,7 @@ msgstr "Visita servidor" msgid "Popular Countries" msgstr "Països populars" -#: src\templates\widget\popularlanguages.phtml:2 +#: src\templates\widget\popularprofilelanguages.phtml:2 msgid "Popular Languages" msgstr "Idiomes populars" @@ -190,7 +202,8 @@ 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" @@ -210,13 +223,6 @@ 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" @@ -230,39 +236,29 @@ 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:" @@ -270,8 +266,7 @@ 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" @@ -279,16 +274,11 @@ 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)" @@ -298,18 +288,70 @@ 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!" +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" msgstr "" diff --git a/src/lang/cs/LC_MESSAGES/strings.po b/src/lang/cs/LC_MESSAGES/strings.po index 737b6ed..082c5b4 100644 --- a/src/lang/cs/LC_MESSAGES/strings.po +++ b/src/lang/cs/LC_MESSAGES/strings.po @@ -1,27 +1,25 @@ -# -# 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ší" @@ -33,51 +31,57 @@ msgstr "První" msgid "Last" msgstr "Poslední" -#: src\classes\Controllers\Web\Directory.php:73 +#: src\classes\Controllers\Web\Directory.php:85 msgid "People" msgstr "Lidé" -#: src\classes\Controllers\Web\Search.php:64 +#: src\classes\Controllers\Web\Search.php:72 msgctxt "field" msgid "Language" msgstr "Jazyk" -#: src\classes\Controllers\Web\Search.php:65 +#: src\classes\Controllers\Web\Search.php:73 msgctxt "field" msgid "Locality" msgstr "Poloha" -#: src\classes\Controllers\Web\Search.php:66 +#: src\classes\Controllers\Web\Search.php:74 msgctxt "field" msgid "Region" msgstr "Region/kraj" -#: src\classes\Controllers\Web\Search.php:67 +#: src\classes\Controllers\Web\Search.php:75 msgctxt "field" msgid "Country" msgstr "Země" -#: src\classes\Controllers\Web\Servers.php:90 +#: src\classes\Controllers\Web\Servers.php:105 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" @@ -103,11 +107,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:2 +#: src\templates\servers.phtml:7 msgid "Top servers pagination" msgstr "Horní stránkování serverů" -#: src\templates\servers.phtml:12 +#: src\templates\servers.phtml:17 msgid "Bottom servers pagination" msgstr "Spodní stránkování serverů" @@ -124,23 +128,27 @@ 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:47 +#: src\templates\layout.phtml:65 +#: src\templates\sub\profile.phtml:57 msgid "Language" msgstr "Jazyk" -#: src\templates\sub\profile.phtml:50 +#: src\templates\sub\profile.phtml:60 +#: src\templates\widget\popularserverlanguages.phtml:2 msgid "Filter by language" msgstr "Filtrovat dle jazyka" -#: src\templates\sub\profile.phtml:56 +#: src\templates\sub\profile.phtml:66 msgid "Location" msgstr "Poloha" -#: src\templates\sub\profile.phtml:69 +#: src\templates\sub\profile.phtml:79 msgid "Search Tag" msgstr "Hledat podle štítku" @@ -148,19 +156,23 @@ 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" @@ -168,15 +180,15 @@ msgstr "Vývojová verze" msgid "Outdated Version" msgstr "Neaktuální verze" -#: src\templates\sub\server.phtml:55 +#: src\templates\sub\server.phtml:69 msgid "Admin" msgstr "Administrátor" -#: src\templates\sub\server.phtml:62 +#: src\templates\sub\server.phtml:76 msgid "No description provided" msgstr "Není zadán žádný popis" -#: src\templates\sub\server.phtml:65 +#: src\templates\sub\server.phtml:79 msgid "Visit Server" msgstr "Navštívit server" @@ -184,7 +196,7 @@ msgstr "Navštívit server" msgid "Popular Countries" msgstr "Populární země" -#: src\templates\widget\popularlanguages.phtml:2 +#: src\templates\widget\popularprofilelanguages.phtml:2 msgid "Popular Languages" msgstr "Populární jazyky" @@ -192,7 +204,8 @@ 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" @@ -214,15 +227,6 @@ 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" @@ -236,20 +240,16 @@ 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,20 +257,12 @@ 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:" @@ -289,12 +281,8 @@ 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)" @@ -304,18 +292,78 @@ 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!" +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" msgstr "" diff --git a/src/lang/da_DK/LC_MESSAGES/strings.mo b/src/lang/da_DK/LC_MESSAGES/strings.mo new file mode 100644 index 0000000..b3aa05f Binary files /dev/null and b/src/lang/da_DK/LC_MESSAGES/strings.mo differ diff --git a/src/lang/da_DK/LC_MESSAGES/strings.po b/src/lang/da_DK/LC_MESSAGES/strings.po new file mode 100644 index 0000000..5e5a60e --- /dev/null +++ b/src/lang/da_DK/LC_MESSAGES/strings.po @@ -0,0 +1,357 @@ +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 e4016e4..4b40c88 100644 --- a/src/lang/de/LC_MESSAGES/strings.po +++ b/src/lang/de/LC_MESSAGES/strings.po @@ -1,29 +1,25 @@ -# -# 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" @@ -35,51 +31,57 @@ msgstr "Erste" msgid "Last" msgstr "Letzte" -#: src\classes\Controllers\Web\Directory.php:73 +#: src\classes\Controllers\Web\Directory.php:85 msgid "People" msgstr "Leute" -#: src\classes\Controllers\Web\Search.php:64 +#: src\classes\Controllers\Web\Search.php:72 msgctxt "field" msgid "Language" msgstr "Sprache" -#: src\classes\Controllers\Web\Search.php:65 +#: src\classes\Controllers\Web\Search.php:73 msgctxt "field" msgid "Locality" msgstr "Wohnort" -#: src\classes\Controllers\Web\Search.php:66 +#: src\classes\Controllers\Web\Search.php:74 msgctxt "field" msgid "Region" msgstr "Region" -#: src\classes\Controllers\Web\Search.php:67 +#: src\classes\Controllers\Web\Search.php:75 msgctxt "field" msgid "Country" msgstr "Land" -#: src\classes\Controllers\Web\Servers.php:90 +#: src\classes\Controllers\Web\Servers.php:105 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" @@ -103,11 +105,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:2 +#: src\templates\servers.phtml:7 msgid "Top servers pagination" msgstr "Höchste Serverwertung" -#: src\templates\servers.phtml:12 +#: src\templates\servers.phtml:17 msgid "Bottom servers pagination" msgstr "Niedrigste Serverwertung" @@ -124,23 +126,27 @@ 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:47 +#: src\templates\layout.phtml:65 +#: src\templates\sub\profile.phtml:57 msgid "Language" msgstr "Sprache" -#: src\templates\sub\profile.phtml:50 +#: src\templates\sub\profile.phtml:60 +#: src\templates\widget\popularserverlanguages.phtml:2 msgid "Filter by language" msgstr "Filter nach Sprache" -#: src\templates\sub\profile.phtml:56 +#: src\templates\sub\profile.phtml:66 msgid "Location" msgstr "Ort" -#: src\templates\sub\profile.phtml:69 +#: src\templates\sub\profile.phtml:79 msgid "Search Tag" msgstr "Suchbegriff" @@ -148,19 +154,23 @@ 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" @@ -168,15 +178,15 @@ msgstr "Entwickler Version" msgid "Outdated Version" msgstr "Abgelaufene Version" -#: src\templates\sub\server.phtml:55 +#: src\templates\sub\server.phtml:69 msgid "Admin" msgstr "Admin" -#: src\templates\sub\server.phtml:62 +#: src\templates\sub\server.phtml:76 msgid "No description provided" msgstr "Keine Beschreibung angeboten" -#: src\templates\sub\server.phtml:65 +#: src\templates\sub\server.phtml:79 msgid "Visit Server" msgstr "Besuche den Server" @@ -184,7 +194,7 @@ msgstr "Besuche den Server" msgid "Popular Countries" msgstr "Häufige Länder" -#: src\templates\widget\popularlanguages.phtml:2 +#: src\templates\widget\popularprofilelanguages.phtml:2 msgid "Popular Languages" msgstr "Häufige Sprachen" @@ -192,7 +202,8 @@ 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" @@ -212,13 +223,6 @@ 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" @@ -232,20 +236,16 @@ 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,20 +253,12 @@ 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:" @@ -274,9 +266,7 @@ 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" @@ -287,12 +277,8 @@ 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)" @@ -302,22 +288,70 @@ 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!" +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" 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 2742946..5aa9f2b 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:73 +#: src\classes\Controllers\Web\Directory.php:85 msgid "People" msgstr "" -#: src\classes\Controllers\Web\Search.php:64 +#: src\classes\Controllers\Web\Search.php:72 msgctxt "field" msgid "Language" msgstr "" -#: src\classes\Controllers\Web\Search.php:65 +#: src\classes\Controllers\Web\Search.php:73 msgctxt "field" msgid "Locality" msgstr "" -#: src\classes\Controllers\Web\Search.php:66 +#: src\classes\Controllers\Web\Search.php:74 msgctxt "field" msgid "Region" msgstr "" -#: src\classes\Controllers\Web\Search.php:67 +#: src\classes\Controllers\Web\Search.php:75 msgctxt "field" msgid "Country" msgstr "" -#: src\classes\Controllers\Web\Servers.php:90 +#: src\classes\Controllers\Web\Servers.php:105 msgid "Public Servers" msgstr "" @@ -105,11 +105,11 @@ msgid_plural "%d results for \"%s\"" msgstr[0] "" msgstr[1] "" -#: src\templates\servers.phtml:2 +#: src\templates\servers.phtml:7 msgid "Top servers pagination" msgstr "" -#: src\templates\servers.phtml:12 +#: src\templates\servers.phtml:17 msgid "Bottom servers pagination" msgstr "" @@ -126,24 +126,27 @@ 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:47 +#: src\templates\sub\profile.phtml:57 msgid "Language" msgstr "" -#: src\templates\sub\profile.phtml:50 +#: src\templates\sub\profile.phtml:60 +#: src\templates\widget\popularserverlanguages.phtml:2 msgid "Filter by language" msgstr "" -#: src\templates\sub\profile.phtml:56 +#: src\templates\sub\profile.phtml:66 msgid "Location" msgstr "" -#: src\templates\sub\profile.phtml:69 +#: src\templates\sub\profile.phtml:79 msgid "Search Tag" msgstr "" @@ -175,15 +178,15 @@ msgstr "" msgid "Outdated Version" msgstr "" -#: src\templates\sub\server.phtml:72 +#: src\templates\sub\server.phtml:69 msgid "Admin" msgstr "" -#: src\templates\sub\server.phtml:79 +#: src\templates\sub\server.phtml:76 msgid "No description provided" msgstr "" -#: src\templates\sub\server.phtml:82 +#: src\templates\sub\server.phtml:79 msgid "Visit Server" msgstr "" @@ -191,7 +194,7 @@ msgstr "" msgid "Popular Countries" msgstr "" -#: src\templates\widget\popularlanguages.phtml:2 +#: src\templates\widget\popularprofilelanguages.phtml:2 msgid "Popular Languages" msgstr "" @@ -220,13 +223,6 @@ 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 "" @@ -292,10 +288,6 @@ 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 "" @@ -332,15 +324,34 @@ msgstr[1] "" msgid "None" msgstr "" -#: src\templates\sub\server.phtml:59 -#: src\templates\sub\server.phtml:63 +#: src\templates\sub\server.phtml:58 +#: src\templates\sub\server.phtml:62 msgid "Registration Policy" msgstr "" -#: src\templates\sub\server.phtml:60 +#: src\templates\sub\server.phtml:59 msgid "By Approval" msgstr "" -#: src\templates\sub\server.phtml:64 +#: 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] "" + +#: 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 2638e34..7738ced 100644 --- a/src/lang/en_GB/LC_MESSAGES/strings.po +++ b/src/lang/en_GB/LC_MESSAGES/strings.po @@ -1,27 +1,25 @@ -# -# 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" @@ -33,51 +31,57 @@ msgstr "First" msgid "Last" msgstr "Last" -#: src\classes\Controllers\Web\Directory.php:73 +#: src\classes\Controllers\Web\Directory.php:85 msgid "People" msgstr "People" -#: src\classes\Controllers\Web\Search.php:64 +#: src\classes\Controllers\Web\Search.php:72 msgctxt "field" msgid "Language" msgstr "Language" -#: src\classes\Controllers\Web\Search.php:65 +#: src\classes\Controllers\Web\Search.php:73 msgctxt "field" msgid "Locality" msgstr "Locality" -#: src\classes\Controllers\Web\Search.php:66 +#: src\classes\Controllers\Web\Search.php:74 msgctxt "field" msgid "Region" msgstr "Region" -#: src\classes\Controllers\Web\Search.php:67 +#: src\classes\Controllers\Web\Search.php:75 msgctxt "field" msgid "Country" msgstr "Country" -#: src\classes\Controllers\Web\Servers.php:90 +#: src\classes\Controllers\Web\Servers.php:105 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" @@ -101,11 +105,11 @@ msgid_plural "%d results for \"%s\"" msgstr[0] "%d result for \"%s\"" msgstr[1] "%d results for \"%s\"" -#: src\templates\servers.phtml:2 +#: src\templates\servers.phtml:7 msgid "Top servers pagination" msgstr "Top servers pagination" -#: src\templates\servers.phtml:12 +#: src\templates\servers.phtml:17 msgid "Bottom servers pagination" msgstr "Bottom servers pagination" @@ -122,23 +126,27 @@ 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:47 +#: src\templates\layout.phtml:65 +#: src\templates\sub\profile.phtml:57 msgid "Language" msgstr "Language" -#: src\templates\sub\profile.phtml:50 +#: src\templates\sub\profile.phtml:60 +#: src\templates\widget\popularserverlanguages.phtml:2 msgid "Filter by language" msgstr "Filter by language" -#: src\templates\sub\profile.phtml:56 +#: src\templates\sub\profile.phtml:66 msgid "Location" msgstr "Location" -#: src\templates\sub\profile.phtml:69 +#: src\templates\sub\profile.phtml:79 msgid "Search Tag" msgstr "Search tag" @@ -146,19 +154,23 @@ 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" @@ -166,15 +178,15 @@ msgstr "Develop version" msgid "Outdated Version" msgstr "Outdated version" -#: src\templates\sub\server.phtml:55 +#: src\templates\sub\server.phtml:69 msgid "Admin" msgstr "Admin" -#: src\templates\sub\server.phtml:62 +#: src\templates\sub\server.phtml:76 msgid "No description provided" msgstr "No description provided" -#: src\templates\sub\server.phtml:65 +#: src\templates\sub\server.phtml:79 msgid "Visit Server" msgstr "Visit server" @@ -182,7 +194,7 @@ msgstr "Visit server" msgid "Popular Countries" msgstr "Popular countries" -#: src\templates\widget\popularlanguages.phtml:2 +#: src\templates\widget\popularprofilelanguages.phtml:2 msgid "Popular Languages" msgstr "Popular languages" @@ -190,7 +202,8 @@ 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" @@ -210,13 +223,6 @@ 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" @@ -230,42 +236,29 @@ 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:" @@ -273,8 +266,7 @@ 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" @@ -285,12 +277,8 @@ 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)" @@ -300,22 +288,70 @@ 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!" +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" 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 34142c5..1cc51e4 100644 --- a/src/lang/et/LC_MESSAGES/strings.po +++ b/src/lang/et/LC_MESSAGES/strings.po @@ -1,27 +1,25 @@ -# -# 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" @@ -33,51 +31,57 @@ msgstr "Esimene" msgid "Last" msgstr "Viimane" -#: src\classes\Controllers\Web\Directory.php:73 +#: src\classes\Controllers\Web\Directory.php:85 msgid "People" msgstr "Inimesed" -#: src\classes\Controllers\Web\Search.php:64 +#: src\classes\Controllers\Web\Search.php:72 msgctxt "field" msgid "Language" msgstr "Keel" -#: src\classes\Controllers\Web\Search.php:65 +#: src\classes\Controllers\Web\Search.php:73 msgctxt "field" msgid "Locality" msgstr "Asukoht" -#: src\classes\Controllers\Web\Search.php:66 +#: src\classes\Controllers\Web\Search.php:74 msgctxt "field" msgid "Region" msgstr "Regioon" -#: src\classes\Controllers\Web\Search.php:67 +#: src\classes\Controllers\Web\Search.php:75 msgctxt "field" msgid "Country" msgstr "Riik" -#: src\classes\Controllers\Web\Servers.php:90 +#: src\classes\Controllers\Web\Servers.php:105 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" @@ -101,11 +105,11 @@ msgid_plural "%d results for \"%s\"" msgstr[0] "" msgstr[1] "" -#: src\templates\servers.phtml:2 +#: src\templates\servers.phtml:7 msgid "Top servers pagination" msgstr "" -#: src\templates\servers.phtml:12 +#: src\templates\servers.phtml:17 msgid "Bottom servers pagination" msgstr "" @@ -122,23 +126,27 @@ 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:47 +#: src\templates\layout.phtml:65 +#: src\templates\sub\profile.phtml:57 msgid "Language" msgstr "Keel" -#: src\templates\sub\profile.phtml:50 +#: src\templates\sub\profile.phtml:60 +#: src\templates\widget\popularserverlanguages.phtml:2 msgid "Filter by language" msgstr "Filtreeri keele järgi" -#: src\templates\sub\profile.phtml:56 +#: src\templates\sub\profile.phtml:66 msgid "Location" msgstr "Asukoht" -#: src\templates\sub\profile.phtml:69 +#: src\templates\sub\profile.phtml:79 msgid "Search Tag" msgstr "Otsingu tag" @@ -146,19 +154,23 @@ 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" @@ -166,15 +178,15 @@ msgstr "Arendusversioon" msgid "Outdated Version" msgstr "Aegunud versioon" -#: src\templates\sub\server.phtml:55 +#: src\templates\sub\server.phtml:69 msgid "Admin" msgstr "Adminn" -#: src\templates\sub\server.phtml:62 +#: src\templates\sub\server.phtml:76 msgid "No description provided" msgstr "Kirjeldus pole saadaval" -#: src\templates\sub\server.phtml:65 +#: src\templates\sub\server.phtml:79 msgid "Visit Server" msgstr "Külasta serverit" @@ -182,7 +194,7 @@ msgstr "Külasta serverit" msgid "Popular Countries" msgstr "Populaarsed riigid" -#: src\templates\widget\popularlanguages.phtml:2 +#: src\templates\widget\popularprofilelanguages.phtml:2 msgid "Popular Languages" msgstr "Populaarsed keeled" @@ -190,7 +202,8 @@ 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" @@ -210,13 +223,6 @@ 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" @@ -230,18 +236,16 @@ 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 @@ -249,15 +253,11 @@ 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,9 +277,7 @@ 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 @@ -290,18 +288,70 @@ 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!" +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" msgstr "" diff --git a/src/lang/fr/LC_MESSAGES/strings.po b/src/lang/fr/LC_MESSAGES/strings.po index 4a7ef93..7b8b4af 100644 --- a/src/lang/fr/LC_MESSAGES/strings.po +++ b/src/lang/fr/LC_MESSAGES/strings.po @@ -1,28 +1,25 @@ -# -# 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" @@ -34,51 +31,57 @@ msgstr "Début" msgid "Last" msgstr "Fin" -#: src\classes\Controllers\Web\Directory.php:73 +#: src\classes\Controllers\Web\Directory.php:85 msgid "People" msgstr "Utilisateurs" -#: src\classes\Controllers\Web\Search.php:64 +#: src\classes\Controllers\Web\Search.php:72 msgctxt "field" msgid "Language" msgstr "Langue" -#: src\classes\Controllers\Web\Search.php:65 +#: src\classes\Controllers\Web\Search.php:73 msgctxt "field" msgid "Locality" msgstr "Localité" -#: src\classes\Controllers\Web\Search.php:66 +#: src\classes\Controllers\Web\Search.php:74 msgctxt "field" msgid "Region" msgstr "Région" -#: src\classes\Controllers\Web\Search.php:67 +#: src\classes\Controllers\Web\Search.php:75 msgctxt "field" msgid "Country" msgstr "Pays" -#: src\classes\Controllers\Web\Servers.php:90 +#: src\classes\Controllers\Web\Servers.php:105 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" @@ -102,11 +105,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:2 +#: src\templates\servers.phtml:7 msgid "Top servers pagination" msgstr "Pagination des serveurs haute" -#: src\templates\servers.phtml:12 +#: src\templates\servers.phtml:17 msgid "Bottom servers pagination" msgstr "Pagination des serveurs basse" @@ -123,23 +126,27 @@ 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:47 +#: src\templates\layout.phtml:65 +#: src\templates\sub\profile.phtml:57 msgid "Language" msgstr "Langue" -#: src\templates\sub\profile.phtml:50 +#: src\templates\sub\profile.phtml:60 +#: src\templates\widget\popularserverlanguages.phtml:2 msgid "Filter by language" msgstr "Filtrer par langue" -#: src\templates\sub\profile.phtml:56 +#: src\templates\sub\profile.phtml:66 msgid "Location" msgstr "Localisation" -#: src\templates\sub\profile.phtml:69 +#: src\templates\sub\profile.phtml:79 msgid "Search Tag" msgstr "Rechercher ce tag" @@ -147,19 +154,23 @@ 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" @@ -167,15 +178,15 @@ msgstr "Version instable" msgid "Outdated Version" msgstr "Version périmée" -#: src\templates\sub\server.phtml:55 +#: src\templates\sub\server.phtml:69 msgid "Admin" msgstr "Administrateur" -#: src\templates\sub\server.phtml:62 +#: src\templates\sub\server.phtml:76 msgid "No description provided" msgstr "Pas de description fournie" -#: src\templates\sub\server.phtml:65 +#: src\templates\sub\server.phtml:79 msgid "Visit Server" msgstr "Visiter ce serveur" @@ -183,7 +194,7 @@ msgstr "Visiter ce serveur" msgid "Popular Countries" msgstr "Pays populaires" -#: src\templates\widget\popularlanguages.phtml:2 +#: src\templates\widget\popularprofilelanguages.phtml:2 msgid "Popular Languages" msgstr "Language populaires" @@ -191,7 +202,8 @@ 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" @@ -211,13 +223,6 @@ 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" @@ -231,18 +236,16 @@ 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 @@ -250,15 +253,11 @@ 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 @@ -278,9 +277,7 @@ 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 @@ -291,18 +288,70 @@ 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!" +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" msgstr "" diff --git a/src/lang/gd/LC_MESSAGES/strings.po b/src/lang/gd/LC_MESSAGES/strings.po index f5cb24a..75d4baf 100644 --- a/src/lang/gd/LC_MESSAGES/strings.po +++ b/src/lang/gd/LC_MESSAGES/strings.po @@ -1,27 +1,25 @@ -# -# 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" @@ -33,51 +31,57 @@ msgstr "Toiseach" msgid "Last" msgstr "Deireadh" -#: src\classes\Controllers\Web\Directory.php:73 +#: src\classes\Controllers\Web\Directory.php:85 msgid "People" msgstr "Daoine" -#: src\classes\Controllers\Web\Search.php:64 +#: src\classes\Controllers\Web\Search.php:72 msgctxt "field" msgid "Language" msgstr "Cànan" -#: src\classes\Controllers\Web\Search.php:65 +#: src\classes\Controllers\Web\Search.php:73 msgctxt "field" msgid "Locality" msgstr "Ionad" -#: src\classes\Controllers\Web\Search.php:66 +#: src\classes\Controllers\Web\Search.php:74 msgctxt "field" msgid "Region" msgstr "Sgìre" -#: src\classes\Controllers\Web\Search.php:67 +#: src\classes\Controllers\Web\Search.php:75 msgctxt "field" msgid "Country" msgstr "Dùthaich" -#: src\classes\Controllers\Web\Servers.php:90 +#: src\classes\Controllers\Web\Servers.php:105 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" @@ -103,11 +107,11 @@ msgstr[1] "%d thoradh airson “%s”" msgstr[2] "%d thoraidhean airson “%s”" msgstr[3] "%d toradh airson “%s”" -#: src\templates\servers.phtml:2 +#: src\templates\servers.phtml:7 msgid "Top servers pagination" msgstr "Duilleagachadh fhrithealaichean aig a’ bhàrr" -#: src\templates\servers.phtml:12 +#: src\templates\servers.phtml:17 msgid "Bottom servers pagination" msgstr "Duilleagachadh fhrithealaichean aig a’ bhonn" @@ -124,23 +128,27 @@ 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:47 +#: src\templates\layout.phtml:65 +#: src\templates\sub\profile.phtml:57 msgid "Language" msgstr "Cànan" -#: src\templates\sub\profile.phtml:50 +#: src\templates\sub\profile.phtml:60 +#: src\templates\widget\popularserverlanguages.phtml:2 msgid "Filter by language" msgstr "Criathraich a-rèir cànain" -#: src\templates\sub\profile.phtml:56 +#: src\templates\sub\profile.phtml:66 msgid "Location" msgstr "Ionad" -#: src\templates\sub\profile.phtml:69 +#: src\templates\sub\profile.phtml:79 msgid "Search Tag" msgstr "Taga luirg" @@ -148,19 +156,23 @@ 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" @@ -168,15 +180,15 @@ msgstr "Tionndadh leasachaidh" msgid "Outdated Version" msgstr "Seann-tionndadh" -#: src\templates\sub\server.phtml:72 +#: src\templates\sub\server.phtml:69 msgid "Admin" msgstr "Rianaire" -#: src\templates\sub\server.phtml:79 +#: src\templates\sub\server.phtml:76 msgid "No description provided" msgstr "Cha deach tuairisgeul a sholarachadh" -#: src\templates\sub\server.phtml:82 +#: src\templates\sub\server.phtml:79 msgid "Visit Server" msgstr "Tadhail air frithealaiche" @@ -184,7 +196,7 @@ msgstr "Tadhail air frithealaiche" msgid "Popular Countries" msgstr "Dùthchannan fèillmhor" -#: src\templates\widget\popularlanguages.phtml:2 +#: src\templates\widget\popularprofilelanguages.phtml:2 msgid "Popular Languages" msgstr "Cànanan fèillmhor" @@ -192,7 +204,8 @@ 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" @@ -214,15 +227,6 @@ 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" @@ -236,19 +240,16 @@ 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 @@ -256,20 +257,12 @@ 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:" @@ -277,8 +270,7 @@ 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" @@ -286,17 +278,11 @@ 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)" @@ -306,25 +292,13 @@ 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" @@ -360,14 +334,36 @@ msgstr[3] "%s cleachdaiche" msgid "None" msgstr "Chan eil gin" -#: src\templates\sub\server.phtml:59 src\templates\sub\server.phtml:63 +#: src\templates\sub\server.phtml:58 +#: src\templates\sub\server.phtml:62 msgid "Registration Policy" msgstr "Poileasaidh clàraidh" -#: src\templates\sub\server.phtml:60 +#: src\templates\sub\server.phtml:59 msgid "By Approval" msgstr "Le aontachadh" -#: src\templates\sub\server.phtml:64 +#: src\templates\sub\server.phtml:63 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.po b/src/lang/hu/LC_MESSAGES/strings.po index 84a06c1..541e26a 100644 --- a/src/lang/hu/LC_MESSAGES/strings.po +++ b/src/lang/hu/LC_MESSAGES/strings.po @@ -1,27 +1,25 @@ -# -# Translators: -# Balázs Úr, 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: 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 +#: 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 +#: src\classes\Content\Pager.php:173 +#: src\classes\Content\Pager.php:273 msgid "Next" msgstr "Következő" @@ -33,51 +31,57 @@ msgstr "Első" msgid "Last" msgstr "Utolsó" -#: src\classes\Controllers\Web\Directory.php:73 +#: src\classes\Controllers\Web\Directory.php:85 msgid "People" msgstr "Emberek" -#: src\classes\Controllers\Web\Search.php:64 +#: src\classes\Controllers\Web\Search.php:72 msgctxt "field" msgid "Language" msgstr "Nyelv" -#: src\classes\Controllers\Web\Search.php:65 +#: src\classes\Controllers\Web\Search.php:73 msgctxt "field" msgid "Locality" msgstr "Helység" -#: src\classes\Controllers\Web\Search.php:66 +#: src\classes\Controllers\Web\Search.php:74 msgctxt "field" msgid "Region" msgstr "Régió" -#: src\classes\Controllers\Web\Search.php:67 +#: src\classes\Controllers\Web\Search.php:75 msgctxt "field" msgid "Country" msgstr "Ország" -#: src\classes\Controllers\Web\Servers.php:90 +#: 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 +#: 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 +#: 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\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\layout.phtml:27 +#: src\templates\layout.phtml:47 #: src\templates\search.phtml:14 msgctxt "verb" msgid "Search" @@ -101,11 +105,11 @@ msgid_plural "%d results for \"%s\"" msgstr[0] "%d találat erre: „%s”" msgstr[1] "%d találat erre: „%s”" -#: src\templates\servers.phtml:2 +#: src\templates\servers.phtml:7 msgid "Top servers pagination" msgstr "Kiszolgálók lapszámozása felül" -#: src\templates\servers.phtml:12 +#: src\templates\servers.phtml:17 msgid "Bottom servers pagination" msgstr "Kiszolgálók lapszámozása alul" @@ -122,23 +126,27 @@ 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:47 +#: src\templates\layout.phtml:65 +#: src\templates\sub\profile.phtml:57 msgid "Language" msgstr "Nyelv" -#: src\templates\sub\profile.phtml:50 +#: 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:56 +#: src\templates\sub\profile.phtml:66 msgid "Location" msgstr "Hely" -#: src\templates\sub\profile.phtml:69 +#: src\templates\sub\profile.phtml:79 msgid "Search Tag" msgstr "Címke keresése" @@ -146,19 +154,23 @@ msgstr "Címke keresése" msgid "Account type tabs" msgstr "Fióktípus lapok" -#: 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 lapszámozása felül" -#: 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 lapszámozása alul" -#: 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 "Stabil verzió" -#: 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 "Fejlesztői verzió" @@ -166,15 +178,15 @@ msgstr "Fejlesztői verzió" msgid "Outdated Version" msgstr "Elavult verzió" -#: src\templates\sub\server.phtml:72 +#: src\templates\sub\server.phtml:69 msgid "Admin" msgstr "Adminisztrátor" -#: src\templates\sub\server.phtml:79 +#: src\templates\sub\server.phtml:76 msgid "No description provided" msgstr "Nincs leírás megadva" -#: src\templates\sub\server.phtml:82 +#: src\templates\sub\server.phtml:79 msgid "Visit Server" msgstr "Kiszolgáló meglátogatása" @@ -182,7 +194,7 @@ msgstr "Kiszolgáló meglátogatása" msgid "Popular Countries" msgstr "Népszerű országok" -#: src\templates\widget\popularlanguages.phtml:2 +#: src\templates\widget\popularprofilelanguages.phtml:2 msgid "Popular Languages" msgstr "Népszerű nyelvek" @@ -190,7 +202,8 @@ msgstr "Népszerű nyelvek" msgid "Popular Tags" msgstr "Népszerű címkék" -#: 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 "Alapértelmezett nyelv" @@ -210,13 +223,6 @@ msgid_plural "People (%d)" msgstr[0] "Emberek (%d)" msgstr[1] "Emberek (%d)" -#: src\classes\Views\Widget\AccountTypeTabs.php:59 -msgctxt "account-type" -msgid "Forum (%d)" -msgid_plural "Forums (%d)" -msgstr[0] "Fórum (%d)" -msgstr[1] "Fórumok (%d)" - #: src\templates\layout.phtml:97 msgid "Stats" msgstr "Statisztikák" @@ -230,42 +236,29 @@ 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." +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 +#: 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:" +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." +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." +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:" @@ -273,8 +266,7 @@ 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:" +msgstr "A nyelvüket jelentő %s kiszolgáló közül ezek az alábbiak:" #: src\templates\statistics.phtml:57 msgid "Versions" @@ -282,16 +274,11 @@ 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:" +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." +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)" @@ -301,25 +288,13 @@ msgstr "%s elérhető kiszolgáló (%s)" msgid "Friendica Directory version %s" msgstr "Friendica könyvtár verzió: %s" -#: src\templates\layout.phtml:94 -msgid "Source Code on GitHub" -msgstr "Forráskód a GitHubon" - #: 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!" +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!" +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" @@ -349,14 +324,34 @@ msgstr[1] "%s felhasználó" msgid "None" msgstr "Nincs" -#: src\templates\sub\server.phtml:59 src\templates\sub\server.phtml:63 +#: 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:60 +#: src\templates\sub\server.phtml:59 msgid "By Approval" msgstr "Jóváhagyás által" -#: src\templates\sub\server.phtml:64 +#: 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 0bbdbad..0abaa1f 100644 --- a/src/lang/it/LC_MESSAGES/strings.po +++ b/src/lang/it/LC_MESSAGES/strings.po @@ -1,28 +1,25 @@ -# -# 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" @@ -34,51 +31,57 @@ msgstr "Primo" msgid "Last" msgstr "Ultimo" -#: src\classes\Controllers\Web\Directory.php:73 +#: src\classes\Controllers\Web\Directory.php:85 msgid "People" msgstr "Persone" -#: src\classes\Controllers\Web\Search.php:64 +#: src\classes\Controllers\Web\Search.php:72 msgctxt "field" msgid "Language" msgstr "Lingua" -#: src\classes\Controllers\Web\Search.php:65 +#: src\classes\Controllers\Web\Search.php:73 msgctxt "field" msgid "Locality" msgstr "Località" -#: src\classes\Controllers\Web\Search.php:66 +#: src\classes\Controllers\Web\Search.php:74 msgctxt "field" msgid "Region" msgstr "Regione" -#: src\classes\Controllers\Web\Search.php:67 +#: src\classes\Controllers\Web\Search.php:75 msgctxt "field" msgid "Country" msgstr "Nazione" -#: src\classes\Controllers\Web\Servers.php:90 +#: src\classes\Controllers\Web\Servers.php:105 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" @@ -102,11 +105,11 @@ msgid_plural "%d results for \"%s\"" msgstr[0] "%drisultato per \"%s\"" msgstr[1] "%d risultati per \"%s\"" -#: src\templates\servers.phtml:2 +#: src\templates\servers.phtml:7 msgid "Top servers pagination" msgstr "Paginazione superiore server" -#: src\templates\servers.phtml:12 +#: src\templates\servers.phtml:17 msgid "Bottom servers pagination" msgstr "Paginazione inferiore server" @@ -123,23 +126,27 @@ 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:47 +#: src\templates\layout.phtml:65 +#: src\templates\sub\profile.phtml:57 msgid "Language" msgstr "Lingua" -#: src\templates\sub\profile.phtml:50 +#: src\templates\sub\profile.phtml:60 +#: src\templates\widget\popularserverlanguages.phtml:2 msgid "Filter by language" msgstr "Filtra per lingua" -#: src\templates\sub\profile.phtml:56 +#: src\templates\sub\profile.phtml:66 msgid "Location" msgstr "Posizione" -#: src\templates\sub\profile.phtml:69 +#: src\templates\sub\profile.phtml:79 msgid "Search Tag" msgstr "Cerca Tag" @@ -147,19 +154,23 @@ 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" @@ -167,15 +178,15 @@ msgstr "Versione di Sviluppo" msgid "Outdated Version" msgstr "Versione Obsoleta" -#: src\templates\sub\server.phtml:55 +#: src\templates\sub\server.phtml:69 msgid "Admin" msgstr "Amministratore" -#: src\templates\sub\server.phtml:62 +#: src\templates\sub\server.phtml:76 msgid "No description provided" msgstr "Nessuna descrizione fornita" -#: src\templates\sub\server.phtml:65 +#: src\templates\sub\server.phtml:79 msgid "Visit Server" msgstr "Visita il Server" @@ -183,7 +194,7 @@ msgstr "Visita il Server" msgid "Popular Countries" msgstr "Nazioni Popolari" -#: src\templates\widget\popularlanguages.phtml:2 +#: src\templates\widget\popularprofilelanguages.phtml:2 msgid "Popular Languages" msgstr "Lingue Popolari" @@ -191,7 +202,8 @@ 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" @@ -211,13 +223,6 @@ 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" @@ -231,20 +236,16 @@ 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 @@ -252,20 +253,12 @@ 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:" @@ -281,16 +274,11 @@ 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)" @@ -300,22 +288,70 @@ 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!" +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" 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 ae93aad..1c20ff8 100644 --- a/src/lang/ja/LC_MESSAGES/strings.po +++ b/src/lang/ja/LC_MESSAGES/strings.po @@ -1,27 +1,25 @@ -# -# 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 "次" @@ -33,51 +31,57 @@ msgstr "最初" msgid "Last" msgstr "最終" -#: src\classes\Controllers\Web\Directory.php:73 +#: src\classes\Controllers\Web\Directory.php:85 msgid "People" msgstr "人" -#: src\classes\Controllers\Web\Search.php:64 +#: src\classes\Controllers\Web\Search.php:72 msgctxt "field" msgid "Language" msgstr "言語" -#: src\classes\Controllers\Web\Search.php:65 +#: src\classes\Controllers\Web\Search.php:73 msgctxt "field" msgid "Locality" msgstr "局所性" -#: src\classes\Controllers\Web\Search.php:66 +#: src\classes\Controllers\Web\Search.php:74 msgctxt "field" msgid "Region" msgstr "地域" -#: src\classes\Controllers\Web\Search.php:67 +#: src\classes\Controllers\Web\Search.php:75 msgctxt "field" msgid "Country" msgstr "国" -#: src\classes\Controllers\Web\Servers.php:90 +#: src\classes\Controllers\Web\Servers.php:105 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" @@ -100,11 +104,11 @@ msgid "%d result for \"%s\"" msgid_plural "%d results for \"%s\"" msgstr[0] " \"%s\" : %d 件の結果" -#: src\templates\servers.phtml:2 +#: src\templates\servers.phtml:7 msgid "Top servers pagination" msgstr "トップサーバーのページネーション" -#: src\templates\servers.phtml:12 +#: src\templates\servers.phtml:17 msgid "Bottom servers pagination" msgstr "下部サーバーのページネーション" @@ -121,23 +125,27 @@ 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:47 +#: src\templates\layout.phtml:65 +#: src\templates\sub\profile.phtml:57 msgid "Language" msgstr "言語" -#: src\templates\sub\profile.phtml:50 +#: src\templates\sub\profile.phtml:60 +#: src\templates\widget\popularserverlanguages.phtml:2 msgid "Filter by language" msgstr "言語でフィルター" -#: src\templates\sub\profile.phtml:56 +#: src\templates\sub\profile.phtml:66 msgid "Location" msgstr "ロケーション" -#: src\templates\sub\profile.phtml:69 +#: src\templates\sub\profile.phtml:79 msgid "Search Tag" msgstr "検索タグ" @@ -145,19 +153,23 @@ 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 "バージョンを開発" @@ -165,15 +177,15 @@ msgstr "バージョンを開発" msgid "Outdated Version" msgstr "古いバージョン" -#: src\templates\sub\server.phtml:55 +#: src\templates\sub\server.phtml:69 msgid "Admin" msgstr "管理者" -#: src\templates\sub\server.phtml:62 +#: src\templates\sub\server.phtml:76 msgid "No description provided" msgstr "説明なし" -#: src\templates\sub\server.phtml:65 +#: src\templates\sub\server.phtml:79 msgid "Visit Server" msgstr "サーバーにアクセス" @@ -181,7 +193,7 @@ msgstr "サーバーにアクセス" msgid "Popular Countries" msgstr "人気の国" -#: src\templates\widget\popularlanguages.phtml:2 +#: src\templates\widget\popularprofilelanguages.phtml:2 msgid "Popular Languages" msgstr "人気のある言語" @@ -189,7 +201,8 @@ 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 "既定の言語" @@ -208,12 +221,6 @@ 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 "統計" @@ -227,18 +234,16 @@ 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 @@ -246,17 +251,12 @@ 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,11 +275,8 @@ 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)" @@ -289,18 +286,66 @@ 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!" +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" msgstr "" diff --git a/src/lang/nl/LC_MESSAGES/strings.po b/src/lang/nl/LC_MESSAGES/strings.po index 59c2d72..21e426a 100644 --- a/src/lang/nl/LC_MESSAGES/strings.po +++ b/src/lang/nl/LC_MESSAGES/strings.po @@ -1,27 +1,25 @@ -# -# 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" @@ -33,51 +31,57 @@ msgstr "Eerste" msgid "Last" msgstr "Laatste" -#: src\classes\Controllers\Web\Directory.php:73 +#: src\classes\Controllers\Web\Directory.php:85 msgid "People" msgstr "Mensen" -#: src\classes\Controllers\Web\Search.php:64 +#: src\classes\Controllers\Web\Search.php:72 msgctxt "field" msgid "Language" msgstr "Taal" -#: src\classes\Controllers\Web\Search.php:65 +#: src\classes\Controllers\Web\Search.php:73 msgctxt "field" msgid "Locality" msgstr "Stad" -#: src\classes\Controllers\Web\Search.php:66 +#: src\classes\Controllers\Web\Search.php:74 msgctxt "field" msgid "Region" msgstr "Regio" -#: src\classes\Controllers\Web\Search.php:67 +#: src\classes\Controllers\Web\Search.php:75 msgctxt "field" msgid "Country" msgstr "Land" -#: src\classes\Controllers\Web\Servers.php:90 +#: src\classes\Controllers\Web\Servers.php:105 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" @@ -101,11 +105,11 @@ msgid_plural "%d results for \"%s\"" msgstr[0] "%d resultaten voor \"%s\"" msgstr[1] "%d resultaten voor \"%s\"" -#: src\templates\servers.phtml:2 +#: src\templates\servers.phtml:7 msgid "Top servers pagination" msgstr "Server pagina boven" -#: src\templates\servers.phtml:12 +#: src\templates\servers.phtml:17 msgid "Bottom servers pagination" msgstr "Server paginatie beneden" @@ -122,23 +126,27 @@ 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:47 +#: src\templates\layout.phtml:65 +#: src\templates\sub\profile.phtml:57 msgid "Language" msgstr "Taal" -#: src\templates\sub\profile.phtml:50 +#: src\templates\sub\profile.phtml:60 +#: src\templates\widget\popularserverlanguages.phtml:2 msgid "Filter by language" msgstr "Filter op taal" -#: src\templates\sub\profile.phtml:56 +#: src\templates\sub\profile.phtml:66 msgid "Location" msgstr "Locatie" -#: src\templates\sub\profile.phtml:69 +#: src\templates\sub\profile.phtml:79 msgid "Search Tag" msgstr "Zoekwoord" @@ -146,19 +154,23 @@ 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" @@ -166,15 +178,15 @@ msgstr "Ontwikkelingsversie" msgid "Outdated Version" msgstr "Oude versie" -#: src\templates\sub\server.phtml:55 +#: src\templates\sub\server.phtml:69 msgid "Admin" msgstr "Administrator" -#: src\templates\sub\server.phtml:62 +#: src\templates\sub\server.phtml:76 msgid "No description provided" msgstr "Geen omschrijving toegevoegd" -#: src\templates\sub\server.phtml:65 +#: src\templates\sub\server.phtml:79 msgid "Visit Server" msgstr "Bezoek server" @@ -182,7 +194,7 @@ msgstr "Bezoek server" msgid "Popular Countries" msgstr "Populaire landen" -#: src\templates\widget\popularlanguages.phtml:2 +#: src\templates\widget\popularprofilelanguages.phtml:2 msgid "Popular Languages" msgstr "Populaire talen" @@ -190,7 +202,8 @@ 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" @@ -210,13 +223,6 @@ 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 "" @@ -230,18 +236,16 @@ 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 @@ -249,15 +253,11 @@ 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,9 +277,7 @@ 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 @@ -290,18 +288,70 @@ 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!" +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" msgstr "" diff --git a/src/lang/pl/LC_MESSAGES/strings.mo b/src/lang/pl/LC_MESSAGES/strings.mo index f4b847e..ec9d60c 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 c1d03b7..3d7bf08 100644 --- a/src/lang/pl/LC_MESSAGES/strings.po +++ b/src/lang/pl/LC_MESSAGES/strings.po @@ -1,84 +1,87 @@ -# -# Translators: -# Karol Kosek, 2018 -# Waldemar Stoczkowski, 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: Waldemar Stoczkowski, 2020\n" +"Last-Translator: Piotr Strębski , 2022\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 "Poprzedni" +msgstr "Poprzednia" -#: 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ępny" +msgstr "Następna" #: src\classes\Content\Pager.php:211 msgid "First" -msgstr "Pierwszy" +msgstr "Pierwsza" #: src\classes\Content\Pager.php:278 msgid "Last" -msgstr "Ostatni" +msgstr "Ostatnia" -#: src\classes\Controllers\Web\Directory.php:73 +#: src\classes\Controllers\Web\Directory.php:85 msgid "People" -msgstr "Przyjaciele" +msgstr "Ludzie" -#: src\classes\Controllers\Web\Search.php:64 +#: src\classes\Controllers\Web\Search.php:72 msgctxt "field" msgid "Language" msgstr "Język" -#: src\classes\Controllers\Web\Search.php:65 +#: src\classes\Controllers\Web\Search.php:73 msgctxt "field" msgid "Locality" msgstr "Miejscowość" -#: src\classes\Controllers\Web\Search.php:66 +#: src\classes\Controllers\Web\Search.php:74 msgctxt "field" msgid "Region" msgstr "Region" -#: src\classes\Controllers\Web\Search.php:67 +#: src\classes\Controllers\Web\Search.php:75 msgctxt "field" msgid "Country" msgstr "Kraj" -#: src\classes\Controllers\Web\Servers.php:90 +#: src\classes\Controllers\Web\Servers.php:105 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 "Wyszukiwane hasła" +msgstr "Wyszukiwanie 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" @@ -90,7 +93,7 @@ msgstr "Przełącz nawigację" #: src\templates\layout.phtml:55 msgid "Directory" -msgstr "Katalogi" +msgstr "Katalog" #: src\templates\layout.phtml:60 msgid "Public servers" @@ -104,17 +107,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:2 +#: src\templates\servers.phtml:7 msgid "Top servers pagination" -msgstr "Topowa paginacja serwerów" +msgstr "Górna paginacja serwerów" -#: src\templates\servers.phtml:12 +#: src\templates\servers.phtml:17 msgid "Bottom servers pagination" -msgstr "Dolny podział na serwery" +msgstr "Dolna paginacja serwerów" #: src\templates\sub\profile.phtml:5 msgid "Filter by locality" -msgstr "Filtruj według lokalizacji" +msgstr "Filtruj według położenia" #: src\templates\sub\profile.phtml:11 msgid "Filter by region" @@ -125,59 +128,67 @@ 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 "Śledzenie" +msgstr "Obserwuj" -#: src\templates\layout.phtml:65 src\templates\sub\profile.phtml:47 +#: src\templates\layout.phtml:65 +#: src\templates\sub\profile.phtml:57 msgid "Language" msgstr "Język" -#: src\templates\sub\profile.phtml:50 +#: src\templates\sub\profile.phtml:60 +#: src\templates\widget\popularserverlanguages.phtml:2 msgid "Filter by language" msgstr "Filtruj według języka" -#: src\templates\sub\profile.phtml:56 +#: src\templates\sub\profile.phtml:66 msgid "Location" -msgstr "Lokalizacja" +msgstr "Położenie" -#: src\templates\sub\profile.phtml:69 +#: src\templates\sub\profile.phtml:79 msgid "Search Tag" -msgstr "Wyszukaj tag" +msgstr "Wyszukaj znacznik" #: src\templates\sub\profiles.phtml:1 msgid "Account type tabs" -msgstr "Konta typu karty" +msgstr "Karty rodzajów kont" -#: 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 %s paginacja" +msgstr "Górna paginacja %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 "Dolna %s paginacja" +msgstr "Dolna paginacja %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 "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 "Rozwój wersji" +msgstr "Wersja rozwojowa" #: src\templates\sub\server.phtml:19 msgid "Outdated Version" msgstr "Przestarzała wersja" -#: src\templates\sub\server.phtml:55 +#: src\templates\sub\server.phtml:69 msgid "Admin" -msgstr "Admin" +msgstr "Administrator" -#: src\templates\sub\server.phtml:62 +#: src\templates\sub\server.phtml:76 msgid "No description provided" msgstr "Nie podano opisu" -#: src\templates\sub\server.phtml:65 +#: src\templates\sub\server.phtml:79 msgid "Visit Server" msgstr "Odwiedź serwer" @@ -185,17 +196,18 @@ msgstr "Odwiedź serwer" msgid "Popular Countries" msgstr "Popularne kraje" -#: src\templates\widget\popularlanguages.phtml:2 +#: src\templates\widget\popularprofilelanguages.phtml:2 msgid "Popular Languages" msgstr "Popularne języki" #: src\templates\widget\populartags.phtml:2 msgid "Popular Tags" -msgstr "Popularne tagi" +msgstr "Popularne znaczniki" -#: 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" @@ -210,19 +222,10 @@ msgstr "Wszystko" msgctxt "account-type" msgid "People (%d)" msgid_plural "People (%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)" +msgstr[0] "Osoba (%d)" +msgstr[1] "Osoby (%d)" +msgstr[2] "Osób (%d)" +msgstr[3] "Osób (%d)" #: src\templates\layout.phtml:97 msgid "Stats" @@ -237,19 +240,16 @@ 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 adresów." +msgid "This directory knows about %s distinct potential profile URLs." +msgstr "Ten katalog zna %s różne adresy URL potencjalnych profiló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,20 +257,12 @@ 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:" @@ -289,12 +281,8 @@ 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)" @@ -304,22 +292,78 @@ 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!" +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" 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 13be9c1..c8d57fd 100644 --- a/src/lang/ru/LC_MESSAGES/strings.po +++ b/src/lang/ru/LC_MESSAGES/strings.po @@ -1,27 +1,25 @@ -# -# 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 "Вперёд" @@ -33,51 +31,57 @@ msgstr "Начало" msgid "Last" msgstr "Конец" -#: src\classes\Controllers\Web\Directory.php:73 +#: src\classes\Controllers\Web\Directory.php:85 msgid "People" msgstr "Люди" -#: src\classes\Controllers\Web\Search.php:64 +#: src\classes\Controllers\Web\Search.php:72 msgctxt "field" msgid "Language" msgstr "Язык" -#: src\classes\Controllers\Web\Search.php:65 +#: src\classes\Controllers\Web\Search.php:73 msgctxt "field" msgid "Locality" msgstr "Область" -#: src\classes\Controllers\Web\Search.php:66 +#: src\classes\Controllers\Web\Search.php:74 msgctxt "field" msgid "Region" msgstr "Регион" -#: src\classes\Controllers\Web\Search.php:67 +#: src\classes\Controllers\Web\Search.php:75 msgctxt "field" msgid "Country" msgstr "Страна" -#: src\classes\Controllers\Web\Servers.php:90 +#: src\classes\Controllers\Web\Servers.php:105 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" @@ -103,11 +107,11 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: src\templates\servers.phtml:2 +#: src\templates\servers.phtml:7 msgid "Top servers pagination" msgstr "" -#: src\templates\servers.phtml:12 +#: src\templates\servers.phtml:17 msgid "Bottom servers pagination" msgstr "" @@ -124,23 +128,27 @@ 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:47 +#: src\templates\layout.phtml:65 +#: src\templates\sub\profile.phtml:57 msgid "Language" msgstr "Язык" -#: src\templates\sub\profile.phtml:50 +#: src\templates\sub\profile.phtml:60 +#: src\templates\widget\popularserverlanguages.phtml:2 msgid "Filter by language" msgstr "Фильтр по языку" -#: src\templates\sub\profile.phtml:56 +#: src\templates\sub\profile.phtml:66 msgid "Location" msgstr "Расположение" -#: src\templates\sub\profile.phtml:69 +#: src\templates\sub\profile.phtml:79 msgid "Search Tag" msgstr "" @@ -148,19 +156,23 @@ 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 "" @@ -168,15 +180,15 @@ msgstr "" msgid "Outdated Version" msgstr "" -#: src\templates\sub\server.phtml:55 +#: src\templates\sub\server.phtml:69 msgid "Admin" msgstr "" -#: src\templates\sub\server.phtml:62 +#: src\templates\sub\server.phtml:76 msgid "No description provided" msgstr "" -#: src\templates\sub\server.phtml:65 +#: src\templates\sub\server.phtml:79 msgid "Visit Server" msgstr "" @@ -184,7 +196,7 @@ msgstr "" msgid "Popular Countries" msgstr "" -#: src\templates\widget\popularlanguages.phtml:2 +#: src\templates\widget\popularprofilelanguages.phtml:2 msgid "Popular Languages" msgstr "" @@ -192,7 +204,8 @@ 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 "" @@ -214,15 +227,6 @@ 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 "" @@ -236,18 +240,16 @@ 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 @@ -255,15 +257,11 @@ 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 @@ -283,9 +281,7 @@ 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 @@ -296,18 +292,78 @@ 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!" +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" msgstr "" diff --git a/src/lang/sv/LC_MESSAGES/strings.mo b/src/lang/sv/LC_MESSAGES/strings.mo new file mode 100644 index 0000000..3a9a145 Binary files /dev/null and b/src/lang/sv/LC_MESSAGES/strings.mo differ diff --git a/src/lang/sv/LC_MESSAGES/strings.po b/src/lang/sv/LC_MESSAGES/strings.po new file mode 100644 index 0000000..d7036df --- /dev/null +++ b/src/lang/sv/LC_MESSAGES/strings.po @@ -0,0 +1,357 @@ +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 fc68ff9..0b9e754 100644 --- a/src/lang/th/LC_MESSAGES/strings.po +++ b/src/lang/th/LC_MESSAGES/strings.po @@ -1,27 +1,25 @@ -# -# 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 "ถัดไป" @@ -33,51 +31,57 @@ msgstr "แรก" msgid "Last" msgstr "สุดท้าย" -#: src\classes\Controllers\Web\Directory.php:73 +#: src\classes\Controllers\Web\Directory.php:85 msgid "People" msgstr "คน" -#: src\classes\Controllers\Web\Search.php:64 +#: src\classes\Controllers\Web\Search.php:72 msgctxt "field" msgid "Language" msgstr "ภาษา" -#: src\classes\Controllers\Web\Search.php:65 +#: src\classes\Controllers\Web\Search.php:73 msgctxt "field" msgid "Locality" msgstr "สถาน" -#: src\classes\Controllers\Web\Search.php:66 +#: src\classes\Controllers\Web\Search.php:74 msgctxt "field" msgid "Region" msgstr "แดน" -#: src\classes\Controllers\Web\Search.php:67 +#: src\classes\Controllers\Web\Search.php:75 msgctxt "field" msgid "Country" msgstr "ประเทศ" -#: src\classes\Controllers\Web\Servers.php:90 +#: src\classes\Controllers\Web\Servers.php:105 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" @@ -100,11 +104,11 @@ msgid "%d result for \"%s\"" msgid_plural "%d results for \"%s\"" msgstr[0] "%d ผลลัพธ์สำหรับ \"%s\"" -#: src\templates\servers.phtml:2 +#: src\templates\servers.phtml:7 msgid "Top servers pagination" msgstr "" -#: src\templates\servers.phtml:12 +#: src\templates\servers.phtml:17 msgid "Bottom servers pagination" msgstr "" @@ -121,23 +125,27 @@ 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:47 +#: src\templates\layout.phtml:65 +#: src\templates\sub\profile.phtml:57 msgid "Language" msgstr "ภาษา" -#: src\templates\sub\profile.phtml:50 +#: src\templates\sub\profile.phtml:60 +#: src\templates\widget\popularserverlanguages.phtml:2 msgid "Filter by language" msgstr "กรองตามภาษา" -#: src\templates\sub\profile.phtml:56 +#: src\templates\sub\profile.phtml:66 msgid "Location" msgstr "สถาน" -#: src\templates\sub\profile.phtml:69 +#: src\templates\sub\profile.phtml:79 msgid "Search Tag" msgstr "ค้นหาด้วยแท็ก" @@ -145,19 +153,23 @@ 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 "เวอร์ชันพัฒนา" @@ -165,15 +177,15 @@ msgstr "เวอร์ชันพัฒนา" msgid "Outdated Version" msgstr "เวอร์ชันล้าสมัย" -#: src\templates\sub\server.phtml:55 +#: src\templates\sub\server.phtml:69 msgid "Admin" msgstr "ผู้ดูแลระบบ" -#: src\templates\sub\server.phtml:62 +#: src\templates\sub\server.phtml:76 msgid "No description provided" msgstr "ไม่มีคำอธิบาย" -#: src\templates\sub\server.phtml:65 +#: src\templates\sub\server.phtml:79 msgid "Visit Server" msgstr "ไปที่เซิร์ฟเวอร์" @@ -181,7 +193,7 @@ msgstr "ไปที่เซิร์ฟเวอร์" msgid "Popular Countries" msgstr "ประเทศยอดนิยม" -#: src\templates\widget\popularlanguages.phtml:2 +#: src\templates\widget\popularprofilelanguages.phtml:2 msgid "Popular Languages" msgstr "ภาษายอดนิยม" @@ -189,7 +201,8 @@ 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 "ภาษาเริ่มต้น" @@ -208,12 +221,6 @@ 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 "" @@ -227,18 +234,16 @@ 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 @@ -246,15 +251,11 @@ 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 @@ -274,9 +275,7 @@ 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 @@ -287,18 +286,66 @@ 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!" +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" msgstr "" diff --git a/src/lang/zh_CN/LC_MESSAGES/strings.po b/src/lang/zh_CN/LC_MESSAGES/strings.po index e00e241..cb0980b 100644 --- a/src/lang/zh_CN/LC_MESSAGES/strings.po +++ b/src/lang/zh_CN/LC_MESSAGES/strings.po @@ -1,27 +1,25 @@ -# -# 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 "下一页" @@ -33,51 +31,57 @@ msgstr "第一页" msgid "Last" msgstr "最后一页" -#: src\classes\Controllers\Web\Directory.php:73 +#: src\classes\Controllers\Web\Directory.php:85 msgid "People" msgstr "" -#: src\classes\Controllers\Web\Search.php:64 +#: src\classes\Controllers\Web\Search.php:72 msgctxt "field" msgid "Language" msgstr "语言" -#: src\classes\Controllers\Web\Search.php:65 +#: src\classes\Controllers\Web\Search.php:73 msgctxt "field" msgid "Locality" msgstr "" -#: src\classes\Controllers\Web\Search.php:66 +#: src\classes\Controllers\Web\Search.php:74 msgctxt "field" msgid "Region" msgstr "地区" -#: src\classes\Controllers\Web\Search.php:67 +#: src\classes\Controllers\Web\Search.php:75 msgctxt "field" msgid "Country" msgstr "国家" -#: src\classes\Controllers\Web\Servers.php:90 +#: src\classes\Controllers\Web\Servers.php:105 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" @@ -100,11 +104,11 @@ msgid "%d result for \"%s\"" msgid_plural "%d results for \"%s\"" msgstr[0] "" -#: src\templates\servers.phtml:2 +#: src\templates\servers.phtml:7 msgid "Top servers pagination" msgstr "" -#: src\templates\servers.phtml:12 +#: src\templates\servers.phtml:17 msgid "Bottom servers pagination" msgstr "" @@ -121,23 +125,27 @@ 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:47 +#: src\templates\layout.phtml:65 +#: src\templates\sub\profile.phtml:57 msgid "Language" msgstr "语言" -#: src\templates\sub\profile.phtml:50 +#: src\templates\sub\profile.phtml:60 +#: src\templates\widget\popularserverlanguages.phtml:2 msgid "Filter by language" msgstr "按语言筛选" -#: src\templates\sub\profile.phtml:56 +#: src\templates\sub\profile.phtml:66 msgid "Location" msgstr "" -#: src\templates\sub\profile.phtml:69 +#: src\templates\sub\profile.phtml:79 msgid "Search Tag" msgstr "搜索标签" @@ -145,19 +153,23 @@ 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 "开发版" @@ -165,15 +177,15 @@ msgstr "开发版" msgid "Outdated Version" msgstr "旧稳定版" -#: src\templates\sub\server.phtml:55 +#: src\templates\sub\server.phtml:69 msgid "Admin" msgstr "管理员" -#: src\templates\sub\server.phtml:62 +#: src\templates\sub\server.phtml:76 msgid "No description provided" msgstr "没有提供说明" -#: src\templates\sub\server.phtml:65 +#: src\templates\sub\server.phtml:79 msgid "Visit Server" msgstr "访问服务" @@ -181,7 +193,7 @@ msgstr "访问服务" msgid "Popular Countries" msgstr "热门国家" -#: src\templates\widget\popularlanguages.phtml:2 +#: src\templates\widget\popularprofilelanguages.phtml:2 msgid "Popular Languages" msgstr "热门语言" @@ -189,7 +201,8 @@ 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 "默认语言" @@ -208,12 +221,6 @@ 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 "" @@ -227,18 +234,16 @@ 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 @@ -246,15 +251,11 @@ 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 @@ -274,9 +275,7 @@ 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 @@ -287,18 +286,66 @@ 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!" +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" msgstr "" diff --git a/src/settings.php b/src/settings.php index 2fe4e95..a1dd220 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'], + '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'], 'default' => 'en_US', 'path' => __DIR__ . '/lang' ], diff --git a/src/sql/migrations/down/0008.sql b/src/sql/migrations/down/0008.sql new file mode 100644 index 0000000..f69fc74 --- /dev/null +++ b/src/sql/migrations/down/0008.sql @@ -0,0 +1,3 @@ +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 new file mode 100644 index 0000000..fd6ce4a --- /dev/null +++ b/src/sql/migrations/down/0009.sql @@ -0,0 +1,3 @@ +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 new file mode 100644 index 0000000..d0cc568 --- /dev/null +++ b/src/sql/migrations/up/0009.sql @@ -0,0 +1,3 @@ +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 new file mode 100644 index 0000000..3875c11 --- /dev/null +++ b/src/sql/migrations/up/0010.sql @@ -0,0 +1,3 @@ +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 5ac846d..9ac9af6 100644 --- a/src/templates/layout.phtml +++ b/src/templates/layout.phtml @@ -91,7 +91,7 @@ __('Friendica Directory version %s', $version)?>
  • - __('Source Code on GitHub')?> + __("Source Code on Friendica's Forgejo")?>
  • __('Stats')?> diff --git a/src/templates/statistics.phtml b/src/templates/statistics.phtml index bf29ff5..237e143 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 5a651b3..68c67c0 100644 --- a/src/templates/sub/profile.phtml +++ b/src/templates/sub/profile.phtml @@ -26,12 +26,22 @@ if (!empty($profile['country'])) {
    - - + + p__('verb', 'Follow')?> - - escapeHtml($profile['name']) ?> + + + p__('verb', 'Follow')?> + + + + p__('verb', 'Follow')?> + + + + escapeHtml($profile['name']) ?> +

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

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

    - +
    e(Friendica\Directory\Utils\L10n::localeToLanguageString($profile['language'])) ?> @@ -50,26 +60,26 @@ if (!empty($profile['country'])) {
    - +
    - + - - + +
    - +
    - + escapeHtml($tag) ?> - +
    - + diff --git a/src/templates/sub/server.phtml b/src/templates/sub/server.phtml index f1cf79d..b92d7ed 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,7 +26,10 @@ $base_url_display = substr($base_url, strpos($base_url, '/') + 2);
    - e($server['name']); ?> + + e($server['name']); ?> + +
    @@ -56,7 +59,7 @@ $base_url_display = substr($base_url, strpos($base_url, '/') + 2); - __('By Approval')?> + __('By Approval')?> @@ -75,8 +78,6 @@ $base_url_display = substr($base_url, strpos($base_url, '/') + 2);

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

    - - __('Visit Server')?>