From: Art4 Date: Tue, 11 Feb 2025 07:57:29 +0000 (+0000) Subject: Merge branch 'develop' into introduce-phpmd X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=7d792600b4a176f112868828a323f40c010f75c0;p=friendica.git Merge branch 'develop' into introduce-phpmd --- 7d792600b4a176f112868828a323f40c010f75c0 diff --cc composer.json index 2fa4ee40e9,7b2ba01817..4437816604 --- a/composer.json +++ b/composer.json @@@ -70,7 -70,8 +70,8 @@@ "pragmarx/google2fa": "^5.0", "pragmarx/recovery": "^0.2", "psr/clock": "^1.0", -- "psr/container": "^2.0", ++ "psr/container": "^1.1|^2.0", + "psr/event-dispatcher": "^1.0", "psr/log": "^1.1", "seld/cli-prompt": "^1.0", "smarty/smarty": "^4", diff --cc composer.lock index e94662e123,3086ed7be9..e12cc6533c --- a/composer.lock +++ b/composer.lock @@@ -4,7 -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": "1398ab5832571c32982984ffe9bd810f", - "content-hash": "8ee8f9186d271b65b83c2ddbd12c5c03", ++ "content-hash": "b77bf714197f04022a5feb001bf07852", "packages": [ { "name": "asika/simple-console", @@@ -3139,6 -3139,6 +3139,9 @@@ "psr", "psr-6" ], ++ "support": { ++ "source": "https://github.com/php-fig/cache/tree/master" ++ }, "time": "2016-08-06T20:24:11+00:00" }, { @@@ -3187,27 -3187,27 +3190,22 @@@ }, { "name": "psr/container", -- "version": "2.0.2", ++ "version": "1.1.2", "source": { "type": "git", "url": "https://github.com/php-fig/container.git", -- "reference": "c71ecc56dfe541dbd90c5360474fbc405f8d5963" ++ "reference": "513e0666f7216c7459170d56df27dfcefe1689ea" }, "dist": { "type": "zip", -- "url": "https://api.github.com/repos/php-fig/container/zipball/c71ecc56dfe541dbd90c5360474fbc405f8d5963", -- "reference": "c71ecc56dfe541dbd90c5360474fbc405f8d5963", ++ "url": "https://api.github.com/repos/php-fig/container/zipball/513e0666f7216c7459170d56df27dfcefe1689ea", ++ "reference": "513e0666f7216c7459170d56df27dfcefe1689ea", "shasum": "" }, "require": { "php": ">=7.4.0" }, "type": "library", -- "extra": { -- "branch-alias": { -- "dev-master": "2.0.x-dev" -- } -- }, "autoload": { "psr-4": { "Psr\\Container\\": "src/" @@@ -3232,7 -3232,57 +3230,61 @@@ "container-interop", "psr" ], -- "time": "2021-11-05T16:47:00+00:00" ++ "support": { ++ "issues": "https://github.com/php-fig/container/issues", ++ "source": "https://github.com/php-fig/container/tree/1.1.2" ++ }, ++ "time": "2021-11-05T16:50:12+00:00" + }, + { + "name": "psr/event-dispatcher", + "version": "1.0.0", + "source": { + "type": "git", + "url": "https://github.com/php-fig/event-dispatcher.git", + "reference": "dbefd12671e8a14ec7f180cab83036ed26714bb0" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/event-dispatcher/zipball/dbefd12671e8a14ec7f180cab83036ed26714bb0", + "reference": "dbefd12671e8a14ec7f180cab83036ed26714bb0", + "shasum": "" + }, + "require": { + "php": ">=7.2.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\EventDispatcher\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "http://www.php-fig.org/" + } + ], + "description": "Standard interfaces for event handling.", + "keywords": [ + "events", + "psr", + "psr-14" + ], + "support": { + "issues": "https://github.com/php-fig/event-dispatcher/issues", + "source": "https://github.com/php-fig/event-dispatcher/tree/1.0.0" + }, + "time": "2019-01-08T18:20:26+00:00" }, { "name": "psr/http-client", @@@ -3430,6 -3480,6 +3482,9 @@@ "psr", "psr-3" ], ++ "support": { ++ "source": "https://github.com/php-fig/log/tree/1.1.4" ++ }, "time": "2021-05-03T11:20:27+00:00" }, { @@@ -3647,16 -3697,16 +3702,16 @@@ }, { "name": "symfony/deprecation-contracts", -- "version": "v2.5.2", ++ "version": "v2.5.4", "source": { "type": "git", "url": "https://github.com/symfony/deprecation-contracts.git", -- "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66" ++ "reference": "605389f2a7e5625f273b53960dc46aeaf9c62918" }, "dist": { "type": "zip", -- "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/e8b495ea28c1d97b5e0c121748d6f9b53d075c66", -- "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66", ++ "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/605389f2a7e5625f273b53960dc46aeaf9c62918", ++ "reference": "605389f2a7e5625f273b53960dc46aeaf9c62918", "shasum": "" }, "require": { @@@ -3664,12 -3714,12 +3719,12 @@@ }, "type": "library", "extra": { ++ "thanks": { ++ "url": "https://github.com/symfony/contracts", ++ "name": "symfony/contracts" ++ }, "branch-alias": { "dev-main": "2.5-dev" -- }, -- "thanks": { -- "name": "symfony/contracts", -- "url": "https://github.com/symfony/contracts" } }, "autoload": { @@@ -3693,6 -3743,170 +3748,173 @@@ ], "description": "A generic function and convention to trigger deprecation notices", "homepage": "https://symfony.com", ++ "support": { ++ "source": "https://github.com/symfony/deprecation-contracts/tree/v2.5.4" ++ }, + "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-01-02T09:53:40+00:00" ++ "time": "2024-09-25T14:11:13+00:00" + }, + { + "name": "symfony/event-dispatcher", + "version": "v5.4.45", + "source": { + "type": "git", + "url": "https://github.com/symfony/event-dispatcher.git", + "reference": "72982eb416f61003e9bb6e91f8b3213600dcf9e9" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/72982eb416f61003e9bb6e91f8b3213600dcf9e9", + "reference": "72982eb416f61003e9bb6e91f8b3213600dcf9e9", + "shasum": "" + }, + "require": { + "php": ">=7.2.5", + "symfony/deprecation-contracts": "^2.1|^3", + "symfony/event-dispatcher-contracts": "^2|^3", + "symfony/polyfill-php80": "^1.16" + }, + "conflict": { + "symfony/dependency-injection": "<4.4" + }, + "provide": { + "psr/event-dispatcher-implementation": "1.0", + "symfony/event-dispatcher-implementation": "2.0" + }, + "require-dev": { + "psr/log": "^1|^2|^3", + "symfony/config": "^4.4|^5.0|^6.0", + "symfony/dependency-injection": "^4.4|^5.0|^6.0", + "symfony/error-handler": "^4.4|^5.0|^6.0", + "symfony/expression-language": "^4.4|^5.0|^6.0", + "symfony/http-foundation": "^4.4|^5.0|^6.0", + "symfony/service-contracts": "^1.1|^2|^3", + "symfony/stopwatch": "^4.4|^5.0|^6.0" + }, + "suggest": { + "symfony/dependency-injection": "", + "symfony/http-kernel": "" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\EventDispatcher\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/event-dispatcher/tree/v5.4.45" + }, + "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": "2024-09-25T14:11:13+00:00" + }, + { + "name": "symfony/event-dispatcher-contracts", + "version": "v2.5.4", + "source": { + "type": "git", + "url": "https://github.com/symfony/event-dispatcher-contracts.git", + "reference": "e0fe3d79b516eb75126ac6fa4cbf19b79b08c99f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/e0fe3d79b516eb75126ac6fa4cbf19b79b08c99f", + "reference": "e0fe3d79b516eb75126ac6fa4cbf19b79b08c99f", + "shasum": "" + }, + "require": { + "php": ">=7.2.5", + "psr/event-dispatcher": "^1" + }, + "suggest": { + "symfony/event-dispatcher-implementation": "" + }, + "type": "library", + "extra": { + "thanks": { + "url": "https://github.com/symfony/contracts", + "name": "symfony/contracts" + }, + "branch-alias": { + "dev-main": "2.5-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Contracts\\EventDispatcher\\": "" + } + }, + "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": "Generic abstractions related to dispatching event", + "homepage": "https://symfony.com", + "keywords": [ + "abstractions", + "contracts", + "decoupling", + "interfaces", + "interoperability", + "standards" + ], + "support": { + "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v2.5.4" + }, "funding": [ { "url": "https://symfony.com/sponsor", @@@ -6644,533 -6647,6 +6946,559 @@@ ], "time": "2020-09-28T06:39:44+00:00" }, + { + "name": "symfony/config", + "version": "v5.4.46", + "source": { + "type": "git", + "url": "https://github.com/symfony/config.git", + "reference": "977c88a02d7d3f16904a81907531b19666a08e78" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/config/zipball/977c88a02d7d3f16904a81907531b19666a08e78", + "reference": "977c88a02d7d3f16904a81907531b19666a08e78", + "shasum": "" + }, + "require": { + "php": ">=7.2.5", + "symfony/deprecation-contracts": "^2.1|^3", + "symfony/filesystem": "^4.4|^5.0|^6.0", + "symfony/polyfill-ctype": "~1.8", + "symfony/polyfill-php80": "^1.16", + "symfony/polyfill-php81": "^1.22" + }, + "conflict": { + "symfony/finder": "<4.4" + }, + "require-dev": { + "symfony/event-dispatcher": "^4.4|^5.0|^6.0", + "symfony/finder": "^4.4|^5.0|^6.0", + "symfony/messenger": "^4.4|^5.0|^6.0", + "symfony/service-contracts": "^1.1|^2|^3", + "symfony/yaml": "^4.4|^5.0|^6.0" + }, + "suggest": { + "symfony/yaml": "To use the yaml reference dumper" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\Config\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Helps you find, load, combine, autofill and validate configuration values of any kind", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/config/tree/v5.4.46" + }, + "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": "2024-10-30T07:58:02+00:00" + }, + { + "name": "symfony/dependency-injection", - "version": "v3.2.14", ++ "version": "v5.4.48", + "source": { + "type": "git", + "url": "https://github.com/symfony/dependency-injection.git", - "reference": "d9f2e62e1a93d52ad4e4f6faaf66f6eef723d761" ++ "reference": "e5ca16dee39ef7d63e552ff0bf0a2526a1142c92" + }, + "dist": { + "type": "zip", - "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/d9f2e62e1a93d52ad4e4f6faaf66f6eef723d761", - "reference": "d9f2e62e1a93d52ad4e4f6faaf66f6eef723d761", ++ "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/e5ca16dee39ef7d63e552ff0bf0a2526a1142c92", ++ "reference": "e5ca16dee39ef7d63e552ff0bf0a2526a1142c92", + "shasum": "" + }, + "require": { - "php": ">=5.5.9" ++ "php": ">=7.2.5", ++ "psr/container": "^1.1.1", ++ "symfony/deprecation-contracts": "^2.1|^3", ++ "symfony/polyfill-php80": "^1.16", ++ "symfony/polyfill-php81": "^1.22", ++ "symfony/service-contracts": "^1.1.6|^2" + }, + "conflict": { - "symfony/yaml": "<3.2" ++ "ext-psr": "<1.1|>=2", ++ "symfony/config": "<5.3", ++ "symfony/finder": "<4.4", ++ "symfony/proxy-manager-bridge": "<4.4", ++ "symfony/yaml": "<4.4.26" ++ }, ++ "provide": { ++ "psr/container-implementation": "1.0", ++ "symfony/service-implementation": "1.0|2.0" + }, + "require-dev": { - "symfony/config": "~2.8|~3.0", - "symfony/expression-language": "~2.8|~3.0", - "symfony/yaml": "~3.2" ++ "symfony/config": "^5.3|^6.0", ++ "symfony/expression-language": "^4.4|^5.0|^6.0", ++ "symfony/yaml": "^4.4.26|^5.0|^6.0" + }, + "suggest": { + "symfony/config": "", + "symfony/expression-language": "For using expressions in service container configuration", ++ "symfony/finder": "For using double-star glob patterns or when GLOB_BRACE portability is required", + "symfony/proxy-manager-bridge": "Generate service proxies to lazy load them", + "symfony/yaml": "" + }, + "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.2-dev" - } - }, + "autoload": { + "psr-4": { + "Symfony\\Component\\DependencyInjection\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], - "description": "Symfony DependencyInjection Component", ++ "description": "Allows you to standardize and centralize the way objects are constructed in your application", + "homepage": "https://symfony.com", + "support": { - "source": "https://github.com/symfony/dependency-injection/tree/3.2" ++ "source": "https://github.com/symfony/dependency-injection/tree/v5.4.48" + }, - "time": "2017-07-28T15:22:55+00:00" ++ "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": "2024-11-20T10:51:57+00:00" + }, + { + "name": "symfony/filesystem", + "version": "v5.4.45", + "source": { + "type": "git", + "url": "https://github.com/symfony/filesystem.git", + "reference": "57c8294ed37d4a055b77057827c67f9558c95c54" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/57c8294ed37d4a055b77057827c67f9558c95c54", + "reference": "57c8294ed37d4a055b77057827c67f9558c95c54", + "shasum": "" + }, + "require": { + "php": ">=7.2.5", + "symfony/polyfill-ctype": "~1.8", + "symfony/polyfill-mbstring": "~1.8", + "symfony/polyfill-php80": "^1.16" + }, + "require-dev": { + "symfony/process": "^5.4|^6.4" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\Filesystem\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Provides basic utilities for the filesystem", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/filesystem/tree/v5.4.45" + }, + "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": "2024-10-22T13:05:35+00:00" + }, + { + "name": "symfony/polyfill-ctype", + "version": "v1.31.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-ctype.git", + "reference": "a3cc8b044a6ea513310cbd48ef7333b384945638" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/a3cc8b044a6ea513310cbd48ef7333b384945638", + "reference": "a3cc8b044a6ea513310cbd48ef7333b384945638", + "shasum": "" + }, + "require": { + "php": ">=7.2" + }, + "provide": { + "ext-ctype": "*" + }, + "suggest": { + "ext-ctype": "For best performance" + }, + "type": "library", + "extra": { + "thanks": { + "url": "https://github.com/symfony/polyfill", + "name": "symfony/polyfill" + } + }, + "autoload": { + "files": [ + "bootstrap.php" + ], + "psr-4": { + "Symfony\\Polyfill\\Ctype\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Gert de Pagter", + "email": "BackEndTea@gmail.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill for ctype functions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "ctype", + "polyfill", + "portable" + ], + "support": { + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.31.0" + }, + "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": "2024-09-09T11:45:10+00:00" + }, + { + "name": "symfony/polyfill-mbstring", + "version": "v1.31.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-mbstring.git", + "reference": "85181ba99b2345b0ef10ce42ecac37612d9fd341" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/85181ba99b2345b0ef10ce42ecac37612d9fd341", + "reference": "85181ba99b2345b0ef10ce42ecac37612d9fd341", + "shasum": "" + }, + "require": { + "php": ">=7.2" + }, + "provide": { + "ext-mbstring": "*" + }, + "suggest": { + "ext-mbstring": "For best performance" + }, + "type": "library", + "extra": { + "thanks": { + "url": "https://github.com/symfony/polyfill", + "name": "symfony/polyfill" + } + }, + "autoload": { + "files": [ + "bootstrap.php" + ], + "psr-4": { + "Symfony\\Polyfill\\Mbstring\\": "" + } + }, + "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 the Mbstring extension", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "mbstring", + "polyfill", + "portable", + "shim" + ], + "support": { + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.31.0" + }, + "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": "2024-09-09T11:45:10+00:00" + }, + { - "name": "symfony/polyfill-php80", ++ "name": "symfony/polyfill-php81", + "version": "v1.31.0", + "source": { + "type": "git", - "url": "https://github.com/symfony/polyfill-php80.git", - "reference": "60328e362d4c2c802a54fcbf04f9d3fb892b4cf8" ++ "url": "https://github.com/symfony/polyfill-php81.git", ++ "reference": "4a4cfc2d253c21a5ad0e53071df248ed48c6ce5c" + }, + "dist": { + "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/60328e362d4c2c802a54fcbf04f9d3fb892b4cf8", - "reference": "60328e362d4c2c802a54fcbf04f9d3fb892b4cf8", ++ "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/4a4cfc2d253c21a5ad0e53071df248ed48c6ce5c", ++ "reference": "4a4cfc2d253c21a5ad0e53071df248ed48c6ce5c", + "shasum": "" + }, + "require": { + "php": ">=7.2" + }, + "type": "library", + "extra": { + "thanks": { + "url": "https://github.com/symfony/polyfill", + "name": "symfony/polyfill" + } + }, + "autoload": { + "files": [ + "bootstrap.php" + ], + "psr-4": { - "Symfony\\Polyfill\\Php80\\": "" ++ "Symfony\\Polyfill\\Php81\\": "" + }, + "classmap": [ + "Resources/stubs" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ - { - "name": "Ion Bazan", - "email": "ion.bazan@gmail.com" - }, + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], - "description": "Symfony polyfill backporting some PHP 8.0+ features to lower PHP versions", ++ "description": "Symfony polyfill backporting some PHP 8.1+ features to lower PHP versions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "polyfill", + "portable", + "shim" + ], + "support": { - "source": "https://github.com/symfony/polyfill-php80/tree/v1.31.0" ++ "source": "https://github.com/symfony/polyfill-php81/tree/v1.31.0" + }, + "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": "2024-09-09T11:45:10+00:00" + }, + { - "name": "symfony/polyfill-php81", - "version": "v1.31.0", ++ "name": "symfony/service-contracts", ++ "version": "v2.5.4", + "source": { + "type": "git", - "url": "https://github.com/symfony/polyfill-php81.git", - "reference": "4a4cfc2d253c21a5ad0e53071df248ed48c6ce5c" ++ "url": "https://github.com/symfony/service-contracts.git", ++ "reference": "f37b419f7aea2e9abf10abd261832cace12e3300" + }, + "dist": { + "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/4a4cfc2d253c21a5ad0e53071df248ed48c6ce5c", - "reference": "4a4cfc2d253c21a5ad0e53071df248ed48c6ce5c", ++ "url": "https://api.github.com/repos/symfony/service-contracts/zipball/f37b419f7aea2e9abf10abd261832cace12e3300", ++ "reference": "f37b419f7aea2e9abf10abd261832cace12e3300", + "shasum": "" + }, + "require": { - "php": ">=7.2" ++ "php": ">=7.2.5", ++ "psr/container": "^1.1", ++ "symfony/deprecation-contracts": "^2.1|^3" ++ }, ++ "conflict": { ++ "ext-psr": "<1.1|>=2" ++ }, ++ "suggest": { ++ "symfony/service-implementation": "" + }, + "type": "library", + "extra": { + "thanks": { - "url": "https://github.com/symfony/polyfill", - "name": "symfony/polyfill" ++ "url": "https://github.com/symfony/contracts", ++ "name": "symfony/contracts" ++ }, ++ "branch-alias": { ++ "dev-main": "2.5-dev" + } + }, + "autoload": { - "files": [ - "bootstrap.php" - ], + "psr-4": { - "Symfony\\Polyfill\\Php81\\": "" - }, - "classmap": [ - "Resources/stubs" - ] ++ "Symfony\\Contracts\\Service\\": "" ++ } + }, + "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 8.1+ features to lower PHP versions", ++ "description": "Generic abstractions related to writing services", + "homepage": "https://symfony.com", + "keywords": [ - "compatibility", - "polyfill", - "portable", - "shim" ++ "abstractions", ++ "contracts", ++ "decoupling", ++ "interfaces", ++ "interoperability", ++ "standards" + ], + "support": { - "source": "https://github.com/symfony/polyfill-php81/tree/v1.31.0" ++ "source": "https://github.com/symfony/service-contracts/tree/v2.5.4" + }, + "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": "2024-09-09T11:45:10+00:00" ++ "time": "2024-09-25T14:11:13+00:00" + }, { "name": "theseer/tokenizer", "version": "1.2.3", diff --cc view/lang/C/messages.po index 05c0e9b7f4,b89c94b993..2cfc48efbc --- a/view/lang/C/messages.po +++ b/view/lang/C/messages.po @@@ -8,7 -8,7 +8,7 @@@ msgid " msgstr "" "Project-Id-Version: 2025.02-dev\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2025-01-23 21:29+0000\n" -"POT-Creation-Date: 2025-02-09 20:13+0000\n" ++"POT-Creation-Date: 2025-02-11 07:41+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@@ -45,7 -45,7 +45,7 @@@ msgid "Item not found. msgstr "" #: mod/item.php:447 mod/message.php:54 mod/message.php:100 mod/notes.php:34 --#: mod/photos.php:132 mod/photos.php:624 src/Model/Event.php:506 ++#: mod/photos.php:131 mod/photos.php:623 src/Model/Event.php:506 #: src/Module/Attach.php:40 src/Module/BaseApi.php:90 #: src/Module/BaseNotifications.php:83 src/Module/BaseSettings.php:38 #: src/Module/Calendar/Event/API.php:75 src/Module/Calendar/Event/Form.php:70 @@@ -289,8 -289,8 +289,8 @@@ msgstr " msgid "Please wait" msgstr "" --#: mod/message.php:189 mod/message.php:343 mod/photos.php:655 --#: mod/photos.php:775 mod/photos.php:1052 mod/photos.php:1093 ++#: mod/message.php:189 mod/message.php:343 mod/photos.php:654 ++#: mod/photos.php:774 mod/photos.php:1051 mod/photos.php:1093 #: mod/photos.php:1149 mod/photos.php:1229 #: src/Module/Calendar/Event/Form.php:236 src/Module/Contact/Advanced.php:118 #: src/Module/Contact/Profile.php:376 @@@ -377,9 -377,9 +377,9 @@@ msgstr " msgid "Save" msgstr "" --#: mod/photos.php:51 mod/photos.php:114 mod/photos.php:534 ++#: mod/photos.php:50 mod/photos.php:113 mod/photos.php:533 #: src/Model/Event.php:498 src/Model/Profile.php:211 - #: src/Module/Calendar/Export.php:60 src/Module/Calendar/Show.php:63 + #: src/Module/Calendar/Export.php:60 src/Module/Calendar/Show.php:62 #: src/Module/Feed.php:52 src/Module/HCard.php:37 #: src/Module/Profile/Common.php:50 src/Module/Profile/Common.php:59 #: src/Module/Profile/Contacts.php:52 src/Module/Profile/Contacts.php:60 @@@ -389,100 -389,100 +389,100 @@@ msgid "User not found." msgstr "" --#: mod/photos.php:88 src/Module/BaseProfile.php:53 ++#: mod/photos.php:87 src/Module/BaseProfile.php:53 #: src/Module/Profile/Photos.php:372 msgid "Photo Albums" msgstr "" --#: mod/photos.php:89 src/Module/Profile/Photos.php:373 ++#: mod/photos.php:88 src/Module/Profile/Photos.php:373 #: src/Module/Profile/Photos.php:393 msgid "Recent Photos" msgstr "" --#: mod/photos.php:91 mod/photos.php:823 src/Module/Profile/Photos.php:375 ++#: mod/photos.php:90 mod/photos.php:822 src/Module/Profile/Photos.php:375 #: src/Module/Profile/Photos.php:395 msgid "Upload New Photos" msgstr "" --#: mod/photos.php:103 src/Module/BaseSettings.php:60 ++#: mod/photos.php:102 src/Module/BaseSettings.php:60 #: src/Module/Profile/Photos.php:356 msgid "everybody" msgstr "" --#: mod/photos.php:139 ++#: mod/photos.php:138 msgid "Contact information unavailable" msgstr "" --#: mod/photos.php:168 ++#: mod/photos.php:167 msgid "Album not found." msgstr "" --#: mod/photos.php:224 ++#: mod/photos.php:223 msgid "Album successfully deleted" msgstr "" --#: mod/photos.php:226 ++#: mod/photos.php:225 msgid "Album was empty." msgstr "" --#: mod/photos.php:257 ++#: mod/photos.php:256 msgid "Failed to delete the photo." msgstr "" --#: mod/photos.php:501 ++#: mod/photos.php:500 msgid "a photo" msgstr "" --#: mod/photos.php:501 ++#: mod/photos.php:500 #, php-format msgid "%1$s was tagged in %2$s by %3$s" msgstr "" --#: mod/photos.php:538 src/Module/Conversation/Community.php:148 ++#: mod/photos.php:537 src/Module/Conversation/Community.php:148 #: src/Module/Directory.php:34 src/Module/Profile/Photos.php:290 #: src/Module/Search/Index.php:50 msgid "Public access denied." msgstr "" --#: mod/photos.php:543 ++#: mod/photos.php:542 msgid "No photos selected" msgstr "" --#: mod/photos.php:671 ++#: mod/photos.php:670 #, php-format msgid "The maximum accepted image size is %s" msgstr "" --#: mod/photos.php:678 ++#: mod/photos.php:677 msgid "Upload Photos" msgstr "" --#: mod/photos.php:682 mod/photos.php:771 ++#: mod/photos.php:681 mod/photos.php:770 msgid "New album name: " msgstr "" --#: mod/photos.php:683 ++#: mod/photos.php:682 msgid "or select existing album:" msgstr "" --#: mod/photos.php:684 ++#: mod/photos.php:683 msgid "Do not show a status post for this upload" msgstr "" --#: mod/photos.php:687 mod/photos.php:1048 src/Content/Conversation.php:391 ++#: mod/photos.php:686 mod/photos.php:1047 src/Content/Conversation.php:391 #: src/Module/Calendar/Event/Form.php:239 src/Module/Post/Edit.php:174 msgid "Permissions" msgstr "" --#: mod/photos.php:752 ++#: mod/photos.php:751 msgid "Do you really want to delete this photo album and all its photos?" msgstr "" --#: mod/photos.php:753 mod/photos.php:776 ++#: mod/photos.php:752 mod/photos.php:775 msgid "Delete Album" msgstr "" --#: mod/photos.php:754 mod/photos.php:854 src/Content/Conversation.php:406 ++#: mod/photos.php:753 mod/photos.php:853 src/Content/Conversation.php:406 #: src/Module/Contact/Follow.php:158 src/Module/Contact/Revoke.php:92 #: src/Module/Contact/Unfollow.php:112 #: src/Module/Media/Attachment/Browser.php:64 @@@ -492,99 -492,99 +492,99 @@@ msgid "Cancel" msgstr "" --#: mod/photos.php:780 ++#: mod/photos.php:779 msgid "Edit Album" msgstr "" --#: mod/photos.php:781 ++#: mod/photos.php:780 msgid "Drop Album" msgstr "" --#: mod/photos.php:785 ++#: mod/photos.php:784 msgid "Show Newest First" msgstr "" --#: mod/photos.php:787 ++#: mod/photos.php:786 msgid "Show Oldest First" msgstr "" --#: mod/photos.php:808 src/Module/Profile/Photos.php:343 ++#: mod/photos.php:807 src/Module/Profile/Photos.php:343 msgid "View Photo" msgstr "" --#: mod/photos.php:840 ++#: mod/photos.php:839 msgid "Permission denied. Access to this item may be restricted." msgstr "" --#: mod/photos.php:842 ++#: mod/photos.php:841 msgid "Photo not available" msgstr "" --#: mod/photos.php:852 ++#: mod/photos.php:851 msgid "Do you really want to delete this photo?" msgstr "" --#: mod/photos.php:853 mod/photos.php:1053 ++#: mod/photos.php:852 mod/photos.php:1052 msgid "Delete Photo" msgstr "" --#: mod/photos.php:951 ++#: mod/photos.php:950 msgid "View photo" msgstr "" --#: mod/photos.php:953 ++#: mod/photos.php:952 msgid "Edit photo" msgstr "" --#: mod/photos.php:954 ++#: mod/photos.php:953 msgid "Delete photo" msgstr "" --#: mod/photos.php:955 ++#: mod/photos.php:954 msgid "Use as profile photo" msgstr "" --#: mod/photos.php:962 ++#: mod/photos.php:961 msgid "Private Photo" msgstr "" --#: mod/photos.php:968 ++#: mod/photos.php:967 msgid "View Full Size" msgstr "" --#: mod/photos.php:1021 ++#: mod/photos.php:1020 msgid "Tags: " msgstr "" --#: mod/photos.php:1024 ++#: mod/photos.php:1023 msgid "[Select tags to remove]" msgstr "" --#: mod/photos.php:1039 ++#: mod/photos.php:1038 msgid "New album name" msgstr "" --#: mod/photos.php:1040 ++#: mod/photos.php:1039 msgid "Caption" msgstr "" --#: mod/photos.php:1041 ++#: mod/photos.php:1040 msgid "Add a Tag" msgstr "" --#: mod/photos.php:1041 ++#: mod/photos.php:1040 msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" msgstr "" --#: mod/photos.php:1042 ++#: mod/photos.php:1041 msgid "Do not rotate" msgstr "" --#: mod/photos.php:1043 ++#: mod/photos.php:1042 msgid "Rotate CW (right)" msgstr "" --#: mod/photos.php:1044 ++#: mod/photos.php:1043 msgid "Rotate CCW (left)" msgstr "" @@@ -646,7 -646,7 +646,7 @@@ msgstr " msgid "Map" msgstr "" - #: src/App.php:415 -#: src/App.php:442 ++#: src/App.php:451 msgid "Apologies but the website is unavailable at the moment." msgstr "" @@@ -747,17 -747,22 +747,22 @@@ msgstr " msgid "toggle mobile" msgstr "" - #: src/App/Router.php:286 + #: src/App/Page.php:356 src/Module/Admin/Logs/View.php:92 + #: view/theme/frio/php/minimal.php:39 view/theme/frio/php/standard.php:138 + msgid "Close" + msgstr "" + -#: src/App/Router.php:286 ++#: src/App/Router.php:287 #, php-format msgid "Method not allowed for this module. Allowed method(s): %s" msgstr "" --#: src/App/Router.php:288 src/Module/HTTPException/PageNotFound.php:35 ++#: src/App/Router.php:289 src/Module/HTTPException/PageNotFound.php:35 #: src/Module/Stats.php:56 msgid "Page not found." msgstr "" --#: src/App/Router.php:300 ++#: src/App/Router.php:301 msgid "You must be logged in to use addons. " msgstr "" @@@ -774,19 -779,19 +779,19 @@@ msgid "All contacts msgstr "" #: src/BaseModule.php:440 src/Content/Conversation/Factory/Channel.php:32 --#: src/Content/Widget.php:254 src/Core/ACL.php:182 src/Module/Contact.php:394 ++#: src/Content/Widget.php:257 src/Core/ACL.php:182 src/Module/Contact.php:394 #: src/Module/Privacy/PermissionTooltip.php:150 #: src/Module/Privacy/PermissionTooltip.php:172 #: src/Module/Settings/Channels.php:146 msgid "Followers" msgstr "" --#: src/BaseModule.php:445 src/Content/Widget.php:255 src/Module/Contact.php:397 ++#: src/BaseModule.php:445 src/Content/Widget.php:258 src/Module/Contact.php:397 #: src/Module/Settings/Channels.php:145 msgid "Following" msgstr "" --#: src/BaseModule.php:450 src/Content/Widget.php:256 src/Module/Contact.php:400 ++#: src/BaseModule.php:450 src/Content/Widget.php:259 src/Module/Contact.php:400 msgid "Mutual friends" msgstr "" @@@ -794,15 -799,15 +799,15 @@@ msgid "Common" msgstr "" --#: src/Console/Addon.php:163 src/Console/Addon.php:187 ++#: src/Console/Addon.php:164 src/Console/Addon.php:188 msgid "Addon not found" msgstr "" --#: src/Console/Addon.php:167 ++#: src/Console/Addon.php:168 msgid "Addon already enabled" msgstr "" --#: src/Console/Addon.php:191 ++#: src/Console/Addon.php:192 msgid "Addon already disabled" msgstr "" @@@ -1696,7 -1701,7 +1701,7 @@@ msgstr " msgid "Network Widgets" msgstr "" - #: src/Content/Feature.php:115 src/Content/Widget.php:230 -#: src/Content/Feature.php:126 src/Content/Widget.php:230 ++#: src/Content/Feature.php:126 src/Content/Widget.php:233 #: src/Model/Circle.php:587 src/Module/Contact.php:380 #: src/Module/Welcome.php:62 msgid "Circles" @@@ -1706,9 -1711,9 +1711,9 @@@ msgstr " msgid "Display posts that have been created by accounts of the selected circle." msgstr "" - #: src/Content/Feature.php:116 src/Content/GroupManager.php:130 - #: src/Content/Nav.php:264 src/Content/Text/HTML.php:868 - #: src/Content/Widget.php:555 src/Model/User.php:1393 + #: src/Content/Feature.php:127 src/Content/GroupManager.php:128 + #: src/Content/Nav.php:274 src/Content/Text/HTML.php:868 -#: src/Content/Widget.php:555 src/Model/User.php:1393 ++#: src/Content/Widget.php:558 src/Model/User.php:1393 msgid "Groups" msgstr "" @@@ -1716,7 -1721,7 +1721,7 @@@ msgid "Display posts that have been distributed by the selected group." msgstr "" - #: src/Content/Feature.php:117 src/Content/Widget.php:524 -#: src/Content/Feature.php:128 src/Content/Widget.php:524 ++#: src/Content/Feature.php:128 src/Content/Widget.php:527 msgid "Archives" msgstr "" @@@ -1724,7 -1729,7 +1729,7 @@@ msgid "Display an archive where posts can be selected by month and year." msgstr "" - #: src/Content/Feature.php:118 src/Content/Widget.php:303 -#: src/Content/Feature.php:129 src/Content/Widget.php:303 ++#: src/Content/Feature.php:129 src/Content/Widget.php:306 msgid "Protocols" msgstr "" @@@ -1732,7 -1737,7 +1737,7 @@@ msgid "Display posts with the selected protocols." msgstr "" - #: src/Content/Feature.php:119 src/Content/Widget.php:561 -#: src/Content/Feature.php:130 src/Content/Widget.php:561 ++#: src/Content/Feature.php:130 src/Content/Widget.php:564 #: src/Module/Settings/Account.php:391 msgid "Account Types" msgstr "" @@@ -1741,9 -1746,9 +1746,9 @@@ msgid "Display posts done by accounts with the selected account type." msgstr "" - #: src/Content/Feature.php:120 src/Content/Widget.php:610 -#: src/Content/Feature.php:131 src/Content/Widget.php:610 ++#: src/Content/Feature.php:131 src/Content/Widget.php:613 #: src/Module/Admin/Site.php:463 src/Module/BaseSettings.php:113 - #: src/Module/Settings/Channels.php:211 src/Module/Settings/Display.php:323 + #: src/Module/Settings/Channels.php:211 src/Module/Settings/Display.php:313 msgid "Channels" msgstr "" @@@ -1759,7 -1764,7 +1764,7 @@@ msgstr " msgid "Display posts that contain subscribed hashtags." msgstr "" - #: src/Content/Feature.php:122 src/Content/Widget.php:333 -#: src/Content/Feature.php:133 src/Content/Widget.php:333 ++#: src/Content/Feature.php:133 src/Content/Widget.php:336 msgid "Saved Folders" msgstr "" @@@ -1819,12 -1824,12 +1824,12 @@@ msgstr " msgid "External link to group" msgstr "" - #: src/Content/GroupManager.php:136 src/Content/Widget.php:530 -#: src/Content/GroupManager.php:134 src/Content/Widget.php:530 ++#: src/Content/GroupManager.php:134 src/Content/Widget.php:533 msgid "show less" msgstr "" - #: src/Content/GroupManager.php:137 src/Content/Widget.php:425 -#: src/Content/GroupManager.php:135 src/Content/Widget.php:425 --#: src/Content/Widget.php:531 ++#: src/Content/GroupManager.php:135 src/Content/Widget.php:428 ++#: src/Content/Widget.php:534 msgid "show more" msgstr "" @@@ -1917,7 -1922,7 +1922,7 @@@ msgstr " msgid "Search Text" msgstr "" --#: src/Content/Item.php:440 src/Content/Widget.php:66 ++#: src/Content/Item.php:440 src/Content/Widget.php:65 #: src/Model/Contact.php:1247 src/Model/Contact.php:1259 #: src/Module/Contact/Follow.php:152 view/theme/vier/theme.php:183 msgid "Connect/Follow" @@@ -2097,7 -2102,7 +2102,7 @@@ msgstr " msgid "People directory" msgstr "" - #: src/Content/Nav.php:284 src/Module/BaseAdmin.php:71 -#: src/Content/Nav.php:294 src/Module/BaseAdmin.php:71 ++#: src/Content/Nav.php:294 src/Module/BaseAdmin.php:70 #: src/Module/BaseModeration.php:97 msgid "Information" msgstr "" @@@ -2106,8 -2111,8 +2111,8 @@@ msgid "Information about this friendica instance" msgstr "" - #: src/Content/Nav.php:287 src/Module/Admin/Tos.php:64 - #: src/Module/BaseAdmin.php:81 src/Module/Register.php:169 + #: src/Content/Nav.php:297 src/Module/Admin/Tos.php:64 -#: src/Module/BaseAdmin.php:81 src/Module/Register.php:169 ++#: src/Module/BaseAdmin.php:80 src/Module/Register.php:169 #: src/Module/Tos.php:87 msgid "Terms of Service" msgstr "" @@@ -2173,7 -2178,7 +2178,7 @@@ msgstr " msgid "Manage other pages" msgstr "" - #: src/Content/Nav.php:313 src/Module/Admin/Addons/Details.php:98 -#: src/Content/Nav.php:323 src/Module/Admin/Addons/Details.php:98 ++#: src/Content/Nav.php:323 src/Module/Admin/Addons/Details.php:101 #: src/Module/Admin/Themes/Details.php:85 src/Module/BaseSettings.php:177 #: src/Module/Welcome.php:38 view/theme/frio/theme.php:231 msgid "Settings" @@@ -2187,7 -2192,7 +2192,7 @@@ msgstr " msgid "Manage/edit friends and contacts" msgstr "" - #: src/Content/Nav.php:320 src/Module/BaseAdmin.php:105 -#: src/Content/Nav.php:330 src/Module/BaseAdmin.php:105 ++#: src/Content/Nav.php:330 src/Module/BaseAdmin.php:114 msgid "Admin" msgstr "" @@@ -2242,8 -2247,8 +2247,8 @@@ msgstr " msgid "%2$s %3$s" msgstr "" - #: src/Content/Text/BBCode.php:926 src/Model/Item.php:3779 - #: src/Model/Item.php:3785 src/Model/Item.php:3786 -#: src/Content/Text/BBCode.php:926 src/Model/Item.php:4103 -#: src/Model/Item.php:4109 src/Model/Item.php:4110 ++#: src/Content/Text/BBCode.php:926 src/Model/Item.php:3787 ++#: src/Model/Item.php:3793 src/Model/Item.php:3794 msgid "Link to source" msgstr "" @@@ -2280,129 -2285,129 +2285,129 @@@ msgstr " msgid "Follow" msgstr "" --#: src/Content/Widget.php:37 ++#: src/Content/Widget.php:36 msgid "Add New Contact" msgstr "" --#: src/Content/Widget.php:38 ++#: src/Content/Widget.php:37 msgid "Enter address or web location" msgstr "" --#: src/Content/Widget.php:39 ++#: src/Content/Widget.php:38 msgid "Example: bob@example.com, http://example.com/barbara" msgstr "" --#: src/Content/Widget.php:41 ++#: src/Content/Widget.php:40 msgid "Connect" msgstr "" --#: src/Content/Widget.php:58 ++#: src/Content/Widget.php:57 #, php-format msgid "%d invitation available" msgid_plural "%d invitations available" msgstr[0] "" msgstr[1] "" --#: src/Content/Widget.php:64 view/theme/vier/theme.php:181 ++#: src/Content/Widget.php:63 view/theme/vier/theme.php:181 msgid "Find People" msgstr "" --#: src/Content/Widget.php:65 view/theme/vier/theme.php:182 ++#: src/Content/Widget.php:64 view/theme/vier/theme.php:182 msgid "Enter name or interest" msgstr "" --#: src/Content/Widget.php:67 view/theme/vier/theme.php:184 ++#: src/Content/Widget.php:66 view/theme/vier/theme.php:184 msgid "Examples: Robert Morgenstein, Fishing" msgstr "" --#: src/Content/Widget.php:68 src/Module/Contact.php:440 ++#: src/Content/Widget.php:67 src/Module/Contact.php:440 #: src/Module/Directory.php:82 view/theme/vier/theme.php:185 msgid "Find" msgstr "" --#: src/Content/Widget.php:69 src/Module/Contact/Suggestions.php:59 ++#: src/Content/Widget.php:68 src/Module/Contact/Suggestions.php:59 #: view/theme/vier/theme.php:186 msgid "Friend Suggestions" msgstr "" --#: src/Content/Widget.php:70 view/theme/vier/theme.php:187 ++#: src/Content/Widget.php:69 view/theme/vier/theme.php:187 msgid "Similar Interests" msgstr "" --#: src/Content/Widget.php:71 view/theme/vier/theme.php:188 ++#: src/Content/Widget.php:70 view/theme/vier/theme.php:188 msgid "Random Profile" msgstr "" --#: src/Content/Widget.php:72 view/theme/vier/theme.php:189 ++#: src/Content/Widget.php:71 view/theme/vier/theme.php:189 msgid "Invite Friends" msgstr "" --#: src/Content/Widget.php:73 src/Module/Directory.php:74 ++#: src/Content/Widget.php:72 src/Module/Directory.php:74 #: view/theme/vier/theme.php:190 msgid "Global Directory" msgstr "" --#: src/Content/Widget.php:75 view/theme/vier/theme.php:192 ++#: src/Content/Widget.php:74 view/theme/vier/theme.php:192 msgid "Local Directory" msgstr "" --#: src/Content/Widget.php:232 ++#: src/Content/Widget.php:235 msgid "Everyone" msgstr "" --#: src/Content/Widget.php:257 src/Module/Contact.php:403 ++#: src/Content/Widget.php:260 src/Module/Contact.php:403 msgid "No relationship" msgstr "" --#: src/Content/Widget.php:262 ++#: src/Content/Widget.php:265 msgid "Relationships" msgstr "" --#: src/Content/Widget.php:264 src/Module/Circle.php:281 ++#: src/Content/Widget.php:267 src/Module/Circle.php:281 #: src/Module/Contact.php:324 msgid "All Contacts" msgstr "" --#: src/Content/Widget.php:305 ++#: src/Content/Widget.php:308 msgid "All Protocols" msgstr "" --#: src/Content/Widget.php:335 src/Content/Widget.php:366 ++#: src/Content/Widget.php:338 src/Content/Widget.php:369 msgid "Everything" msgstr "" --#: src/Content/Widget.php:364 ++#: src/Content/Widget.php:367 msgid "Categories" msgstr "" --#: src/Content/Widget.php:421 ++#: src/Content/Widget.php:424 #, php-format msgid "%d contact in common" msgid_plural "%d contacts in common" msgstr[0] "" msgstr[1] "" --#: src/Content/Widget.php:532 ++#: src/Content/Widget.php:535 msgid "On this date" msgstr "" --#: src/Content/Widget.php:552 ++#: src/Content/Widget.php:555 msgid "Persons" msgstr "" --#: src/Content/Widget.php:553 ++#: src/Content/Widget.php:556 msgid "Organisations" msgstr "" --#: src/Content/Widget.php:554 src/Model/Contact.php:1757 ++#: src/Content/Widget.php:557 src/Model/Contact.php:1757 msgid "News" msgstr "" --#: src/Content/Widget.php:556 ++#: src/Content/Widget.php:559 msgid "Relays" msgstr "" --#: src/Content/Widget.php:563 src/Module/Moderation/BaseUsers.php:58 ++#: src/Content/Widget.php:566 src/Module/Moderation/BaseUsers.php:58 msgid "All" msgstr "" @@@ -3219,7 -3224,7 +3224,7 @@@ msgstr " msgid "Disallowed profile URL." msgstr "" --#: src/Model/Contact.php:3096 src/Module/Friendica.php:88 ++#: src/Model/Contact.php:3096 src/Module/Friendica.php:90 msgid "Blocked domain" msgstr "" @@@ -3421,44 -3426,44 +3426,44 @@@ msgstr " msgid "Sensitive content" msgstr "" - #: src/Model/Item.php:3679 -#: src/Model/Item.php:4003 ++#: src/Model/Item.php:3687 msgid "bytes" msgstr "" - #: src/Model/Item.php:3710 -#: src/Model/Item.php:4034 ++#: src/Model/Item.php:3718 #, php-format msgid "%2$s (%3$d%%, %1$d vote)" msgid_plural "%2$s (%3$d%%, %1$d votes)" msgstr[0] "" msgstr[1] "" - #: src/Model/Item.php:3712 -#: src/Model/Item.php:4036 ++#: src/Model/Item.php:3720 #, php-format msgid "%2$s (%1$d vote)" msgid_plural "%2$s (%1$d votes)" msgstr[0] "" msgstr[1] "" - #: src/Model/Item.php:3717 -#: src/Model/Item.php:4041 ++#: src/Model/Item.php:3725 #, php-format msgid "%d voter. Poll end: %s" msgid_plural "%d voters. Poll end: %s" msgstr[0] "" msgstr[1] "" - #: src/Model/Item.php:3719 -#: src/Model/Item.php:4043 ++#: src/Model/Item.php:3727 #, php-format msgid "%d voter." msgid_plural "%d voters." msgstr[0] "" msgstr[1] "" - #: src/Model/Item.php:3721 -#: src/Model/Item.php:4045 ++#: src/Model/Item.php:3729 #, php-format msgid "Poll end: %s" msgstr "" - #: src/Model/Item.php:3762 src/Model/Item.php:3763 -#: src/Model/Item.php:4086 src/Model/Item.php:4087 ++#: src/Model/Item.php:3770 src/Model/Item.php:3771 msgid "View on separate page" msgstr "" @@@ -3569,7 -3574,7 +3574,7 @@@ msgstr " msgid "Title/Description:" msgstr "" --#: src/Model/Profile.php:793 src/Module/Admin/Summary.php:174 ++#: src/Model/Profile.php:793 src/Module/Admin/Summary.php:184 #: src/Module/Moderation/Report/Create.php:266 #: src/Module/Moderation/Summary.php:65 msgid "Summary" @@@ -3855,71 -3860,71 +3860,71 @@@ msgstr " msgid "User with delegates can't be removed, please remove delegate users first" msgstr "" --#: src/Module/Admin/Addons/Details.php:49 ++#: src/Module/Admin/Addons/Details.php:48 msgid "Addon not found." msgstr "" --#: src/Module/Admin/Addons/Details.php:60 src/Module/Admin/Addons/Index.php:41 ++#: src/Module/Admin/Addons/Details.php:59 src/Module/Admin/Addons/Index.php:43 #, php-format msgid "Addon %s disabled." msgstr "" --#: src/Module/Admin/Addons/Details.php:63 src/Module/Admin/Addons/Index.php:43 ++#: src/Module/Admin/Addons/Details.php:62 src/Module/Admin/Addons/Index.php:45 #, php-format msgid "Addon %s enabled." msgstr "" --#: src/Module/Admin/Addons/Details.php:72 ++#: src/Module/Admin/Addons/Details.php:71 #: src/Module/Admin/Themes/Details.php:38 msgid "Disable" msgstr "" --#: src/Module/Admin/Addons/Details.php:75 - #: src/Module/Admin/Themes/Details.php:41 src/Module/Settings/Display.php:351 ++#: src/Module/Admin/Addons/Details.php:74 + #: src/Module/Admin/Themes/Details.php:41 src/Module/Settings/Display.php:341 msgid "Enable" msgstr "" --#: src/Module/Admin/Addons/Details.php:95 src/Module/Admin/Addons/Index.php:59 ++#: src/Module/Admin/Addons/Details.php:98 src/Module/Admin/Addons/Index.php:77 #: src/Module/Admin/Federation.php:213 src/Module/Admin/Logs/Settings.php:74 #: src/Module/Admin/Logs/View.php:71 src/Module/Admin/Queue.php:59 #: src/Module/Admin/Site.php:446 src/Module/Admin/Storage.php:124 --#: src/Module/Admin/Summary.php:173 src/Module/Admin/Themes/Details.php:82 ++#: src/Module/Admin/Summary.php:183 src/Module/Admin/Themes/Details.php:82 #: src/Module/Admin/Themes/Index.php:103 src/Module/Admin/Tos.php:63 #: src/Module/Moderation/Users/Create.php:47 #: src/Module/Moderation/Users/Pending.php:82 msgid "Administration" msgstr "" --#: src/Module/Admin/Addons/Details.php:96 src/Module/Admin/Addons/Index.php:60 --#: src/Module/BaseAdmin.php:78 src/Module/BaseSettings.php:127 ++#: src/Module/Admin/Addons/Details.php:99 src/Module/Admin/Addons/Index.php:78 ++#: src/Module/BaseAdmin.php:77 src/Module/BaseSettings.php:127 msgid "Addons" msgstr "" --#: src/Module/Admin/Addons/Details.php:97 ++#: src/Module/Admin/Addons/Details.php:100 #: src/Module/Admin/Themes/Details.php:84 msgid "Toggle" msgstr "" --#: src/Module/Admin/Addons/Details.php:104 ++#: src/Module/Admin/Addons/Details.php:113 #: src/Module/Admin/Themes/Details.php:92 msgid "Author: " msgstr "" --#: src/Module/Admin/Addons/Details.php:105 ++#: src/Module/Admin/Addons/Details.php:114 #: src/Module/Admin/Themes/Details.php:93 msgid "Maintainer: " msgstr "" --#: src/Module/Admin/Addons/Index.php:34 ++#: src/Module/Admin/Addons/Index.php:35 msgid "Addons reloaded" msgstr "" --#: src/Module/Admin/Addons/Index.php:45 ++#: src/Module/Admin/Addons/Index.php:47 #, php-format msgid "Addon %s failed to install." msgstr "" --#: src/Module/Admin/Addons/Index.php:61 src/Module/Admin/Features.php:69 ++#: src/Module/Admin/Addons/Index.php:79 src/Module/Admin/Features.php:69 #: src/Module/Admin/Logs/Settings.php:76 src/Module/Admin/Site.php:449 #: src/Module/Admin/Themes/Index.php:105 src/Module/Admin/Tos.php:72 #: src/Module/Settings/Account.php:507 src/Module/Settings/Addons.php:64 @@@ -3931,11 -3936,11 +3936,11 @@@ msgid "Save Settings" msgstr "" --#: src/Module/Admin/Addons/Index.php:62 ++#: src/Module/Admin/Addons/Index.php:80 msgid "Reload active addons" msgstr "" --#: src/Module/Admin/Addons/Index.php:66 ++#: src/Module/Admin/Addons/Index.php:84 #, php-format msgid "There are currently no addons available on your node. You can find the official addon repository at %1$s." msgstr "" @@@ -4083,7 -4088,7 +4088,7 @@@ msgstr[1] " msgid "This page offers you some numbers to the known part of the federated social network your Friendica node is part of. These numbers are not complete but only reflect the part of the network your node is aware of." msgstr "" --#: src/Module/Admin/Federation.php:214 src/Module/BaseAdmin.php:73 ++#: src/Module/Admin/Federation.php:214 src/Module/BaseAdmin.php:72 msgid "Federation Statistics" msgstr "" @@@ -4107,8 -4112,8 +4112,8 @@@ msgstr " msgid "PHP log currently disabled." msgstr "" --#: src/Module/Admin/Logs/Settings.php:75 src/Module/BaseAdmin.php:88 --#: src/Module/BaseAdmin.php:89 ++#: src/Module/Admin/Logs/Settings.php:75 src/Module/BaseAdmin.php:87 ++#: src/Module/BaseAdmin.php:88 msgid "Logs" msgstr "" @@@ -4156,7 -4161,7 +4161,7 @@@ msgstr " msgid "Couldn't open %1$s log file.
Check to see if file %1$s is readable." msgstr "" --#: src/Module/Admin/Logs/View.php:72 src/Module/BaseAdmin.php:90 ++#: src/Module/Admin/Logs/View.php:72 src/Module/BaseAdmin.php:89 msgid "View Logs" msgstr "" @@@ -4350,7 -4351,7 +4351,7 @@@ msgstr " msgid "Interactors" msgstr "" --#: src/Module/Admin/Site.php:447 src/Module/BaseAdmin.php:76 ++#: src/Module/Admin/Site.php:447 src/Module/BaseAdmin.php:75 msgid "Site" msgstr "" @@@ -5323,7 -5324,7 +5324,7 @@@ msgstr " msgid "Storage Configuration" msgstr "" --#: src/Module/Admin/Storage.php:127 src/Module/BaseAdmin.php:77 ++#: src/Module/Admin/Storage.php:127 src/Module/BaseAdmin.php:76 msgid "Storage" msgstr "" @@@ -5407,39 -5408,39 +5408,39 @@@ msgstr " msgid "Friendica's configuration now is stored in config/local.config.php, please copy config/local-sample.config.php and move your config from config/local.ini.php. See the Config help page for help with the transition." msgstr "" --#: src/Module/Admin/Summary.php:104 ++#: src/Module/Admin/Summary.php:105 #, php-format msgid "%s is not reachable on your system. This is a severe configuration issue that prevents server to server communication. See the installation page for help." msgstr "" --#: src/Module/Admin/Summary.php:128 ++#: src/Module/Admin/Summary.php:133 #, php-format msgid "Friendica's system.basepath was updated from '%s' to '%s'. Please remove the system.basepath from your db to avoid differences." msgstr "" --#: src/Module/Admin/Summary.php:136 ++#: src/Module/Admin/Summary.php:143 #, php-format msgid "Friendica's current system.basepath '%s' is wrong and the config file '%s' isn't used." msgstr "" --#: src/Module/Admin/Summary.php:144 ++#: src/Module/Admin/Summary.php:153 #, php-format msgid "Friendica's current system.basepath '%s' is not equal to the config file '%s'. Please fix your configuration." msgstr "" --#: src/Module/Admin/Summary.php:155 ++#: src/Module/Admin/Summary.php:165 msgid "Message queues" msgstr "" --#: src/Module/Admin/Summary.php:158 ++#: src/Module/Admin/Summary.php:168 msgid "Server Settings" msgstr "" --#: src/Module/Admin/Summary.php:176 ++#: src/Module/Admin/Summary.php:186 msgid "Version" msgstr "" --#: src/Module/Admin/Summary.php:180 ++#: src/Module/Admin/Summary.php:190 msgid "Active addons" msgstr "" @@@ -5463,7 -5464,7 +5464,7 @@@ msgid "Screenshot msgstr "" #: src/Module/Admin/Themes/Details.php:83 src/Module/Admin/Themes/Index.php:104 --#: src/Module/BaseAdmin.php:79 ++#: src/Module/BaseAdmin.php:78 msgid "Themes" msgstr "" @@@ -5580,76 -5581,76 +5581,76 @@@ msgstr " msgid "Item was not found." msgstr "" --#: src/Module/BaseAdmin.php:40 src/Module/BaseAdmin.php:44 ++#: src/Module/BaseAdmin.php:39 src/Module/BaseAdmin.php:43 #: src/Module/BaseModeration.php:66 src/Module/BaseModeration.php:70 msgid "Please login to continue." msgstr "" --#: src/Module/BaseAdmin.php:49 ++#: src/Module/BaseAdmin.php:48 msgid "You don't have access to administration pages." msgstr "" --#: src/Module/BaseAdmin.php:53 ++#: src/Module/BaseAdmin.php:52 msgid "Submanaged account can't access the administration pages. Please log back in as the main account." msgstr "" --#: src/Module/BaseAdmin.php:72 src/Module/BaseModeration.php:98 ++#: src/Module/BaseAdmin.php:71 src/Module/BaseModeration.php:98 msgid "Overview" msgstr "" --#: src/Module/BaseAdmin.php:75 src/Module/BaseModeration.php:101 ++#: src/Module/BaseAdmin.php:74 src/Module/BaseModeration.php:101 msgid "Configuration" msgstr "" --#: src/Module/BaseAdmin.php:80 src/Module/BaseSettings.php:98 ++#: src/Module/BaseAdmin.php:79 src/Module/BaseSettings.php:98 msgid "Additional features" msgstr "" --#: src/Module/BaseAdmin.php:83 ++#: src/Module/BaseAdmin.php:82 msgid "Database" msgstr "" --#: src/Module/BaseAdmin.php:84 ++#: src/Module/BaseAdmin.php:83 msgid "DB updates" msgstr "" --#: src/Module/BaseAdmin.php:85 ++#: src/Module/BaseAdmin.php:84 msgid "Inspect Deferred Workers" msgstr "" --#: src/Module/BaseAdmin.php:86 ++#: src/Module/BaseAdmin.php:85 msgid "Inspect worker Queue" msgstr "" --#: src/Module/BaseAdmin.php:92 src/Module/BaseModeration.php:109 ++#: src/Module/BaseAdmin.php:91 src/Module/BaseModeration.php:109 msgid "Diagnostics" msgstr "" --#: src/Module/BaseAdmin.php:93 ++#: src/Module/BaseAdmin.php:92 msgid "PHP Info" msgstr "" --#: src/Module/BaseAdmin.php:94 ++#: src/Module/BaseAdmin.php:93 msgid "probe address" msgstr "" --#: src/Module/BaseAdmin.php:95 ++#: src/Module/BaseAdmin.php:94 msgid "check webfinger" msgstr "" --#: src/Module/BaseAdmin.php:96 ++#: src/Module/BaseAdmin.php:95 msgid "Babel" msgstr "" --#: src/Module/BaseAdmin.php:97 src/Module/Debug/ActivityPubConversion.php:125 ++#: src/Module/BaseAdmin.php:96 src/Module/Debug/ActivityPubConversion.php:125 msgid "ActivityPub Conversion" msgstr "" --#: src/Module/BaseAdmin.php:106 ++#: src/Module/BaseAdmin.php:115 msgid "Addon Features" msgstr "" --#: src/Module/BaseAdmin.php:107 src/Module/BaseModeration.php:118 ++#: src/Module/BaseAdmin.php:116 src/Module/BaseModeration.php:118 msgid "User registrations waiting for confirmation" msgstr "" @@@ -7036,52 -7049,52 +7049,52 @@@ msgstr " msgid "Suggest a friend for %s" msgstr "" --#: src/Module/Friendica.php:69 ++#: src/Module/Friendica.php:71 msgid "Installed addons/apps:" msgstr "" --#: src/Module/Friendica.php:74 ++#: src/Module/Friendica.php:76 msgid "No installed addons/apps" msgstr "" --#: src/Module/Friendica.php:79 ++#: src/Module/Friendica.php:81 #, php-format msgid "Read about the Terms of Service of this node." msgstr "" --#: src/Module/Friendica.php:86 ++#: src/Module/Friendica.php:88 msgid "On this server the following remote servers are blocked." msgstr "" --#: src/Module/Friendica.php:89 ++#: src/Module/Friendica.php:91 #: src/Module/Moderation/Blocklist/Server/Index.php:76 #: src/Module/Moderation/Blocklist/Server/Index.php:100 #: src/Module/Settings/Channels.php:218 msgid "Reason for the block" msgstr "" --#: src/Module/Friendica.php:91 ++#: src/Module/Friendica.php:93 msgid "Download this list in CSV format" msgstr "" --#: src/Module/Friendica.php:105 ++#: src/Module/Friendica.php:108 #, php-format msgid "This is Friendica, version %s that is running at the web location %s. The database version is %s, the post update version is %s." msgstr "" --#: src/Module/Friendica.php:110 ++#: src/Module/Friendica.php:114 msgid "Please visit Friendi.ca to learn more about the Friendica project." msgstr "" --#: src/Module/Friendica.php:111 ++#: src/Module/Friendica.php:115 msgid "Bug reports and issues: please visit" msgstr "" --#: src/Module/Friendica.php:111 ++#: src/Module/Friendica.php:115 msgid "the bugtracker at github" msgstr "" --#: src/Module/Friendica.php:112 ++#: src/Module/Friendica.php:116 msgid "Suggestions, praise, etc. - please email \"info\" at \"friendi - dot - ca" msgstr ""