From a9c365a5eb8bb99e7d7d773b1b2d1b3920409b07 Mon Sep 17 00:00:00 2001 From: Diogo Cordeiro Date: Tue, 4 Aug 2020 05:31:44 +0100 Subject: [PATCH] [VersionBump] 2.0.0alpha0 Ran composer update and locale updater --- composer.lock | 1837 +++----- lib/util/framework.php | 4 +- .../AccountManager/locale/AccountManager.pot | 2 +- plugins/ActivityPub/locale/ActivityPub.pot | 40 +- plugins/ActivitySpam/locale/ActivitySpam.pot | 2 +- .../AnonymousFave/locale/AnonymousFave.pot | 54 +- plugins/AntiBrute/locale/AntiBrute.pot | 4 +- plugins/ApiLogger/locale/ApiLogger.pot | 2 +- plugins/AutoSandbox/locale/AutoSandbox.pot | 2 +- plugins/Autocomplete/locale/Autocomplete.pot | 2 +- plugins/BitlyUrl/locale/BitlyUrl.pot | 124 +- plugins/Blacklist/locale/Blacklist.pot | 86 +- plugins/BlogspamNet/locale/BlogspamNet.pot | 2 +- plugins/Bookmark/locale/Bookmark.pot | 306 +- plugins/CacheLog/locale/CacheLog.pot | 2 +- .../locale/CasAuthentication.pot | 16 +- plugins/ChooseTheme/locale/ChooseTheme.pot | 32 +- .../locale/ClientSideShorten.pot | 12 +- plugins/Comet/locale/Comet.pot | 4 +- .../locale/ConversationTree.pot | 6 +- plugins/Cronish/locale/Cronish.pot | 2 +- plugins/DBQueue/locale/DBQueue.pot | 23 + .../DefaultLayout/locale/DefaultLayout.pot | 2 +- plugins/Diaspora/locale/Diaspora.pot | 2 +- .../DirectMessage/locale/DirectMessage.pot | 100 +- .../locale/DirectionDetector.pot | 2 +- plugins/Directory/locale/Directory.pot | 34 +- plugins/DiskCache/locale/DiskCache.pot | 4 +- .../locale/DomainStatusNetwork.pot | 2 +- .../locale/DomainWhitelist.pot | 64 +- .../locale/EmailAuthentication.pot | 2 +- .../locale/EmailRegistration.pot | 126 +- .../EmailReminder/locale/EmailReminder.pot | 18 +- plugins/EmailSummary/locale/EmailSummary.pot | 22 +- plugins/Embed/locale/Embed.pot | 12 +- plugins/Event/locale/Event.pot | 322 +- .../locale/ExtendedProfile.pot | 168 +- plugins/FeedPoller/locale/FeedPoller.pot | 2 +- plugins/FetchRemote/locale/FetchRemote.pot | 2 +- .../FollowEveryone/locale/FollowEveryone.pot | 7 +- plugins/ForceGroup/locale/ForceGroup.pot | 8 +- plugins/Geonames/locale/Geonames.pot | 12 +- .../GroupFavorited/locale/GroupFavorited.pot | 23 +- .../locale/GroupPrivateMessage.pot | 292 +- plugins/ImageMagick/locale/ImageMagick.pot | 2 +- plugins/Imap/locale/Imap.pot | 26 +- .../InProcessCache/locale/InProcessCache.pot | 4 +- .../InfiniteScroll/locale/InfiniteScroll.pot | 4 +- plugins/LRDD/locale/LRDD.pot | 2 +- .../locale/LdapAuthentication.pot | 2 +- .../locale/LdapAuthorization.pot | 2 +- plugins/LdapCommon/locale/LdapCommon.pot | 2 +- plugins/LilUrl/locale/LilUrl.pot | 2 +- plugins/LinkPreview/locale/LinkPreview.pot | 2 +- plugins/Linkback/locale/Linkback.pot | 42 +- plugins/LogFilter/locale/LogFilter.pot | 2 +- plugins/Mapstraction/locale/Mapstraction.pot | 64 +- plugins/Memcached/locale/Memcached.pot | 4 +- plugins/MentionURL/locale/MentionURL.pot | 2 +- plugins/Meteor/locale/Meteor.pot | 8 +- .../MobileProfile/locale/MobileProfile.pot | 2 +- plugins/ModHelper/locale/ModHelper.pot | 2 +- plugins/ModLog/locale/ModLog.pot | 4 +- plugins/ModPlus/locale/ModPlus.pot | 2 +- plugins/Mollom/locale/Mollom.pot | 2 +- plugins/Nodeinfo/locale/Nodeinfo.pot | 2 +- plugins/NoticeTitle/locale/NoticeTitle.pot | 2 +- plugins/OStatus/locale/OStatus.pot | 865 ++-- .../OfflineBackup/locale/OfflineBackup.pot | 8 +- .../locale/OpenExternalLinkTarget.pot | 2 +- plugins/OpenID/locale/OpenID.pot | 1235 +++--- .../locale/OpportunisticQM.pot | 4 +- plugins/Orbited/locale/Orbited.pot | 6 +- .../locale/OverwriteThemeBackground.pot | 100 + .../PiwikAnalytics/locale/PiwikAnalytics.pot | 2 +- plugins/Poll/locale/Poll.pot | 140 +- plugins/PostDebug/locale/PostDebug.pot | 2 +- plugins/PtitUrl/locale/PtitUrl.pot | 2 +- plugins/QnA/locale/QnA.pot | 427 +- plugins/RSSCloud/locale/RSSCloud.pot | 40 +- plugins/RedisCache/locale/RedisCache.pot | 23 + plugins/RedisQueue/locale/RedisQueue.pot | 23 + .../locale/RegisterThrottle.pot | 2 +- plugins/RemoteFollow/locale/RemoteFollow.pot | 79 +- .../locale/RequireValidatedEmail.pot | 40 +- .../locale/ReverseUsernameAuthentication.pot | 2 +- plugins/SQLProfile/locale/SQLProfile.pot | 2 +- plugins/SQLStats/locale/SQLStats.pot | 4 +- plugins/SearchSub/locale/SearchSub.pot | 276 +- .../locale/SensitiveContent.pot | 36 +- plugins/ShareNotice/locale/ShareNotice.pot | 2 +- .../SimpleCaptcha/locale/SimpleCaptcha.pot | 12 +- plugins/SimpleUrl/locale/SimpleUrl.pot | 2 +- plugins/Sitemap/locale/Sitemap.pot | 49 +- .../locale/SlicedFavorites.pot | 12 +- plugins/SphinxSearch/locale/SphinxSearch.pot | 2 +- plugins/StompQueue/locale/StompQueue.pot | 23 + .../locale/StoreRemoteMedia.pot | 2 +- .../locale/StrictTransportSecurity.pot | 2 +- plugins/SubMirror/locale/SubMirror.pot | 204 +- .../locale/SubscriptionThrottle.pot | 2 +- plugins/TabFocus/locale/TabFocus.pot | 2 +- plugins/TagCloud/locale/TagCloud.pot | 36 +- plugins/TagSub/locale/TagSub.pot | 68 +- plugins/TightUrl/locale/TightUrl.pot | 2 +- .../TwitterBridge/locale/TwitterBridge.pot | 174 +- plugins/UnQueue/locale/UnQueue.pot | 23 + plugins/UserFlag/locale/UserFlag.pot | 97 +- plugins/UserLimit/locale/UserLimit.pot | 2 +- plugins/WebFinger/locale/WebFinger.pot | 2 +- plugins/WikiHashtags/locale/WikiHashtags.pot | 2 +- .../WikiHowProfile/locale/WikiHowProfile.pot | 2 +- plugins/Xmpp/locale/Xmpp.pot | 42 +- vendor/composer/LICENSE | 69 +- vendor/composer/autoload_classmap.php | 6 +- vendor/composer/autoload_real.php | 3 + vendor/composer/autoload_static.php | 6 +- vendor/composer/ca-bundle/composer.json | 2 +- vendor/composer/ca-bundle/res/cacert.pem | 82 +- vendor/composer/ca-bundle/src/CaBundle.php | 19 +- vendor/composer/installed.json | 123 +- vendor/embed/embed/composer.json | 1 + .../embed/src/Providers/OEmbed/Deviantart.php | 2 +- .../embed/src/Providers/OEmbed/Embedly.php | 2 +- .../embed/src/Providers/OEmbed/EndPoint.php | 15 +- .../embed/src/Providers/OEmbed/Facebook.php | 4 +- .../embed/src/Providers/OEmbed/Iframely.php | 2 +- .../embed/src/Providers/OEmbed/Infogram.php | 2 +- .../embed/src/Providers/OEmbed/Instagram.php | 3 +- .../embed/src/Providers/OEmbed/Jsbin.php | 2 +- .../embed/src/Providers/OEmbed/Scribd.php | 2 +- .../embed/src/Providers/OEmbed/Spotify.php | 2 +- .../embed/src/Providers/OEmbed/WordPress.php | 9 - vendor/ezyang/htmlpurifier/INSTALL | 341 -- vendor/ezyang/htmlpurifier/INSTALL.fr.utf8 | 60 - vendor/ezyang/htmlpurifier/NEWS | 1224 ------ vendor/ezyang/htmlpurifier/TODO | 150 - vendor/ezyang/htmlpurifier/VERSION | 2 +- vendor/ezyang/htmlpurifier/WHATSNEW | 2 - vendor/ezyang/htmlpurifier/WYSIWYG | 20 - vendor/ezyang/htmlpurifier/composer.json | 5 +- .../extras/ConfigDoc/HTMLXSLTProcessor.php | 91 - vendor/ezyang/htmlpurifier/extras/FSTools.php | 164 - .../htmlpurifier/extras/FSTools/File.php | 141 - .../extras/HTMLPurifierExtras.auto.php | 11 - .../HTMLPurifierExtras.autoload-legacy.php | 15 - .../extras/HTMLPurifierExtras.autoload.php | 23 - .../extras/HTMLPurifierExtras.php | 31 - vendor/ezyang/htmlpurifier/extras/README | 32 - .../library/HTMLPurifier.includes.php | 2 +- .../htmlpurifier/library/HTMLPurifier.php | 7 +- .../HTMLPurifier/AttrDef/CSS/Number.php | 8 +- .../library/HTMLPurifier/Config.php | 16 +- .../HTMLPurifier/ConfigSchema/schema.ser | 2 +- .../library/HTMLPurifier/HTMLModule/Forms.php | 4 + .../HTMLModule/Tidy/XHTMLAndHTML4.php | 1 + .../Language/classes/en-x-test.php | 9 - .../Language/messages/en-x-test.php | 13 - .../Language/messages/en-x-testmini.php | 14 - .../HTMLPurifier/Printer/HTMLDefinition.php | 4 +- .../ezyang/htmlpurifier/maintenance/.htaccess | 7 - .../htmlpurifier/maintenance/PH5P.patch | 102 - .../ezyang/htmlpurifier/maintenance/PH5P.php | 3889 ----------------- .../htmlpurifier/maintenance/add-vimline.php | 130 - .../htmlpurifier/maintenance/common.php | 25 - .../maintenance/compile-doxygen.sh | 11 - .../maintenance/config-scanner.php | 155 - .../maintenance/flush-definition-cache.php | 42 - .../ezyang/htmlpurifier/maintenance/flush.sh | 8 - .../maintenance/generate-entity-file.php | 75 - .../maintenance/generate-includes.php | 192 - .../maintenance/generate-ph5p-patch.php | 22 - .../maintenance/generate-schema-cache.php | 45 - .../maintenance/generate-standalone.php | 159 - .../maintenance/merge-library.php | 11 - .../maintenance/old-extract-schema.php | 71 - .../maintenance/old-remove-require-once.php | 32 - .../maintenance/old-remove-schema-def.php | 32 - .../maintenance/regenerate-docs.sh | 5 - .../remove-trailing-whitespace.php | 37 - .../maintenance/rename-config.php | 84 - vendor/ezyang/htmlpurifier/package.php | 61 - vendor/ezyang/htmlpurifier/phpdoc.ini | 102 - vendor/ezyang/htmlpurifier/plugins/modx.txt | 112 - .../htmlpurifier/plugins/phorum/.gitignore | 2 - .../htmlpurifier/plugins/phorum/Changelog | 27 - .../htmlpurifier/plugins/phorum/INSTALL | 84 - .../ezyang/htmlpurifier/plugins/phorum/README | 45 - .../plugins/phorum/config.default.php | 58 - .../plugins/phorum/htmlpurifier.php | 316 -- .../plugins/phorum/htmlpurifier/LICENSE | 504 --- .../plugins/phorum/htmlpurifier/README | 3 - .../htmlpurifier/plugins/phorum/info.txt | 18 - .../plugins/phorum/init-config.php | 30 - .../plugins/phorum/migrate.bbcode.php | 31 - .../htmlpurifier/plugins/phorum/settings.php | 64 - .../plugins/phorum/settings/form.php | 95 - .../phorum/settings/migrate-sigs-form.php | 22 - .../plugins/phorum/settings/migrate-sigs.php | 79 - .../plugins/phorum/settings/save.php | 29 - .../htmlpurifier/test-settings.sample.php | 74 - .../htmlpurifier/test-settings.travis.php | 72 - .../htmlpurifier/tests/path2class.func.php | 15 - vendor/ezyang/htmlpurifier/update-for-release | 110 - vendor/masterminds/html5/.travis.yml | 1 + vendor/masterminds/html5/RELEASE.md | 14 + vendor/masterminds/html5/src/HTML5.php | 11 +- .../html5/src/HTML5/Parser/DOMTreeBuilder.php | 10 +- .../html5/src/HTML5/Parser/Tokenizer.php | 7 + .../src/HTML5/Serializer/OutputRules.php | 7 + .../test/HTML5/Parser/DOMTreeBuilderTest.php | 33 + .../html5/test/HTML5/Parser/TokenizerTest.php | 3 +- vendor/michelf/php-markdown/License.md | 2 +- .../michelf/php-markdown/Michelf/Markdown.php | 39 +- .../php-markdown/Michelf/MarkdownExtra.php | 285 +- .../Michelf/MarkdownInterface.php | 2 +- vendor/michelf/php-markdown/Readme.md | 44 +- vendor/michelf/php-markdown/Readme.php | 12 +- vendor/michelf/php-markdown/composer.json | 3 + vendor/pear/console_getopt/Console/Getopt.php | 18 +- vendor/pear/console_getopt/package.xml | 24 +- vendor/stomp-php/stomp-php/README.md | 2 +- vendor/stomp-php/stomp-php/run_phpunit.sh | 2 +- .../stomp-php/src/Broker/OpenMq/OpenMq.php | 6 +- .../stomp-php/src/Network/Connection.php | 10 +- .../stomp-php/src/Protocol/Protocol.php | 6 +- .../src/States/Meta/SubscriptionList.php | 6 + .../stomp-php/src/Transport/Parser.php | 1 + .../stomp-php/src/Util/IdGenerator.php | 3 + 229 files changed, 4505 insertions(+), 13941 deletions(-) create mode 100644 plugins/DBQueue/locale/DBQueue.pot create mode 100644 plugins/OverwriteThemeBackground/locale/OverwriteThemeBackground.pot create mode 100644 plugins/RedisCache/locale/RedisCache.pot create mode 100644 plugins/RedisQueue/locale/RedisQueue.pot create mode 100644 plugins/StompQueue/locale/StompQueue.pot create mode 100644 plugins/UnQueue/locale/UnQueue.pot delete mode 100644 vendor/embed/embed/src/Providers/OEmbed/WordPress.php delete mode 100644 vendor/ezyang/htmlpurifier/INSTALL delete mode 100644 vendor/ezyang/htmlpurifier/INSTALL.fr.utf8 delete mode 100644 vendor/ezyang/htmlpurifier/NEWS delete mode 100644 vendor/ezyang/htmlpurifier/TODO delete mode 100644 vendor/ezyang/htmlpurifier/WHATSNEW delete mode 100644 vendor/ezyang/htmlpurifier/WYSIWYG delete mode 100644 vendor/ezyang/htmlpurifier/extras/ConfigDoc/HTMLXSLTProcessor.php delete mode 100644 vendor/ezyang/htmlpurifier/extras/FSTools.php delete mode 100644 vendor/ezyang/htmlpurifier/extras/FSTools/File.php delete mode 100644 vendor/ezyang/htmlpurifier/extras/HTMLPurifierExtras.auto.php delete mode 100644 vendor/ezyang/htmlpurifier/extras/HTMLPurifierExtras.autoload-legacy.php delete mode 100644 vendor/ezyang/htmlpurifier/extras/HTMLPurifierExtras.autoload.php delete mode 100644 vendor/ezyang/htmlpurifier/extras/HTMLPurifierExtras.php delete mode 100644 vendor/ezyang/htmlpurifier/extras/README delete mode 100644 vendor/ezyang/htmlpurifier/library/HTMLPurifier/Language/classes/en-x-test.php delete mode 100644 vendor/ezyang/htmlpurifier/library/HTMLPurifier/Language/messages/en-x-test.php delete mode 100644 vendor/ezyang/htmlpurifier/library/HTMLPurifier/Language/messages/en-x-testmini.php delete mode 100644 vendor/ezyang/htmlpurifier/maintenance/.htaccess delete mode 100644 vendor/ezyang/htmlpurifier/maintenance/PH5P.patch delete mode 100644 vendor/ezyang/htmlpurifier/maintenance/PH5P.php delete mode 100644 vendor/ezyang/htmlpurifier/maintenance/add-vimline.php delete mode 100644 vendor/ezyang/htmlpurifier/maintenance/common.php delete mode 100755 vendor/ezyang/htmlpurifier/maintenance/compile-doxygen.sh delete mode 100644 vendor/ezyang/htmlpurifier/maintenance/config-scanner.php delete mode 100755 vendor/ezyang/htmlpurifier/maintenance/flush-definition-cache.php delete mode 100755 vendor/ezyang/htmlpurifier/maintenance/flush.sh delete mode 100755 vendor/ezyang/htmlpurifier/maintenance/generate-entity-file.php delete mode 100644 vendor/ezyang/htmlpurifier/maintenance/generate-includes.php delete mode 100644 vendor/ezyang/htmlpurifier/maintenance/generate-ph5p-patch.php delete mode 100644 vendor/ezyang/htmlpurifier/maintenance/generate-schema-cache.php delete mode 100755 vendor/ezyang/htmlpurifier/maintenance/generate-standalone.php delete mode 100755 vendor/ezyang/htmlpurifier/maintenance/merge-library.php delete mode 100644 vendor/ezyang/htmlpurifier/maintenance/old-extract-schema.php delete mode 100644 vendor/ezyang/htmlpurifier/maintenance/old-remove-require-once.php delete mode 100644 vendor/ezyang/htmlpurifier/maintenance/old-remove-schema-def.php delete mode 100755 vendor/ezyang/htmlpurifier/maintenance/regenerate-docs.sh delete mode 100644 vendor/ezyang/htmlpurifier/maintenance/remove-trailing-whitespace.php delete mode 100644 vendor/ezyang/htmlpurifier/maintenance/rename-config.php delete mode 100644 vendor/ezyang/htmlpurifier/package.php delete mode 100644 vendor/ezyang/htmlpurifier/phpdoc.ini delete mode 100644 vendor/ezyang/htmlpurifier/plugins/modx.txt delete mode 100644 vendor/ezyang/htmlpurifier/plugins/phorum/.gitignore delete mode 100644 vendor/ezyang/htmlpurifier/plugins/phorum/Changelog delete mode 100644 vendor/ezyang/htmlpurifier/plugins/phorum/INSTALL delete mode 100644 vendor/ezyang/htmlpurifier/plugins/phorum/README delete mode 100644 vendor/ezyang/htmlpurifier/plugins/phorum/config.default.php delete mode 100644 vendor/ezyang/htmlpurifier/plugins/phorum/htmlpurifier.php delete mode 100644 vendor/ezyang/htmlpurifier/plugins/phorum/htmlpurifier/LICENSE delete mode 100644 vendor/ezyang/htmlpurifier/plugins/phorum/htmlpurifier/README delete mode 100644 vendor/ezyang/htmlpurifier/plugins/phorum/info.txt delete mode 100644 vendor/ezyang/htmlpurifier/plugins/phorum/init-config.php delete mode 100644 vendor/ezyang/htmlpurifier/plugins/phorum/migrate.bbcode.php delete mode 100644 vendor/ezyang/htmlpurifier/plugins/phorum/settings.php delete mode 100644 vendor/ezyang/htmlpurifier/plugins/phorum/settings/form.php delete mode 100644 vendor/ezyang/htmlpurifier/plugins/phorum/settings/migrate-sigs-form.php delete mode 100644 vendor/ezyang/htmlpurifier/plugins/phorum/settings/migrate-sigs.php delete mode 100644 vendor/ezyang/htmlpurifier/plugins/phorum/settings/save.php delete mode 100644 vendor/ezyang/htmlpurifier/test-settings.sample.php delete mode 100644 vendor/ezyang/htmlpurifier/test-settings.travis.php delete mode 100644 vendor/ezyang/htmlpurifier/tests/path2class.func.php delete mode 100644 vendor/ezyang/htmlpurifier/update-for-release diff --git a/composer.lock b/composer.lock index adb75c7b72..7d497454dd 100644 --- a/composer.lock +++ b/composer.lock @@ -63,16 +63,16 @@ }, { "name": "composer/ca-bundle", - "version": "1.2.4", + "version": "1.2.7", "source": { "type": "git", "url": "https://github.com/composer/ca-bundle.git", - "reference": "10bb96592168a0f8e8f6dcde3532d9fa50b0b527" + "reference": "95c63ab2117a72f48f5a55da9740a3273d45b7fd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/ca-bundle/zipball/10bb96592168a0f8e8f6dcde3532d9fa50b0b527", - "reference": "10bb96592168a0f8e8f6dcde3532d9fa50b0b527", + "url": "https://api.github.com/repos/composer/ca-bundle/zipball/95c63ab2117a72f48f5a55da9740a3273d45b7fd", + "reference": "95c63ab2117a72f48f5a55da9740a3273d45b7fd", "shasum": "" }, "require": { @@ -83,7 +83,7 @@ "require-dev": { "phpunit/phpunit": "^4.8.35 || ^5.7 || 6.5 - 8", "psr/log": "^1.0", - "symfony/process": "^2.5 || ^3.0 || ^4.0" + "symfony/process": "^2.5 || ^3.0 || ^4.0 || ^5.0" }, "type": "library", "extra": { @@ -115,7 +115,17 @@ "ssl", "tls" ], - "time": "2019-08-30T08:44:50+00:00" + "funding": [ + { + "url": "https://packagist.com", + "type": "custom" + }, + { + "url": "https://tidelift.com/funding/github/packagist/composer/composer", + "type": "tidelift" + } + ], + "time": "2020-04-08T08:27:21+00:00" }, { "name": "diogocomposer/xmpphp", @@ -194,21 +204,22 @@ }, { "name": "embed/embed", - "version": "v3.4.2", + "version": "v3.4.8", "source": { "type": "git", "url": "https://github.com/oscarotero/Embed.git", - "reference": "dc1dc3c126f8a78acdae06b83f591c0728ea131d" + "reference": "96aab555e399769b9d12c3c362a4232563ccbe76" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/oscarotero/Embed/zipball/dc1dc3c126f8a78acdae06b83f591c0728ea131d", - "reference": "dc1dc3c126f8a78acdae06b83f591c0728ea131d", + "url": "https://api.github.com/repos/oscarotero/Embed/zipball/96aab555e399769b9d12c3c362a4232563ccbe76", + "reference": "96aab555e399769b9d12c3c362a4232563ccbe76", "shasum": "" }, "require": { "composer/ca-bundle": "^1.0", "ext-curl": "*", + "ext-dom": "*", "ext-mbstring": "*", "php": "^5.6|^7.0" }, @@ -243,20 +254,20 @@ "opengraph", "twitter cards" ], - "time": "2019-09-16T19:34:02+00:00" + "time": "2020-07-03T15:04:01+00:00" }, { "name": "ezyang/htmlpurifier", - "version": "v4.12.0", + "version": "v4.13.0", "source": { "type": "git", "url": "https://github.com/ezyang/htmlpurifier.git", - "reference": "a617e55bc62a87eec73bd456d146d134ad716f03" + "reference": "08e27c97e4c6ed02f37c5b2b20488046c8d90d75" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/a617e55bc62a87eec73bd456d146d134ad716f03", - "reference": "a617e55bc62a87eec73bd456d146d134ad716f03", + "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/08e27c97e4c6ed02f37c5b2b20488046c8d90d75", + "reference": "08e27c97e4c6ed02f37c5b2b20488046c8d90d75", "shasum": "" }, "require": { @@ -272,6 +283,9 @@ }, "files": [ "library/HTMLPurifier.composer.php" + ], + "exclude-from-classmap": [ + "/library/HTMLPurifier/Language/" ] }, "notification-url": "https://packagist.org/downloads/", @@ -290,7 +304,7 @@ "keywords": [ "html" ], - "time": "2019-10-28T03:44:26+00:00" + "time": "2020-06-29T00:56:53+00:00" }, { "name": "guzzlehttp/psr7", @@ -608,16 +622,16 @@ }, { "name": "masterminds/html5", - "version": "2.7.0", + "version": "2.7.3", "source": { "type": "git", "url": "https://github.com/Masterminds/html5-php.git", - "reference": "104443ad663d15981225f99532ba73c2f1d6b6f2" + "reference": "aad73dbfefd71d46072138109ce1288d96c329cc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Masterminds/html5-php/zipball/104443ad663d15981225f99532ba73c2f1d6b6f2", - "reference": "104443ad663d15981225f99532ba73c2f1d6b6f2", + "url": "https://api.github.com/repos/Masterminds/html5-php/zipball/aad73dbfefd71d46072138109ce1288d96c329cc", + "reference": "aad73dbfefd71d46072138109ce1288d96c329cc", "shasum": "" }, "require": { @@ -671,7 +685,7 @@ "serializer", "xml" ], - "time": "2019-07-25T07:03:26+00:00" + "time": "2020-07-05T07:53:37+00:00" }, { "name": "mf2/mf2", @@ -731,21 +745,24 @@ }, { "name": "michelf/php-markdown", - "version": "1.8.0", + "version": "1.9.0", "source": { "type": "git", "url": "https://github.com/michelf/php-markdown.git", - "reference": "01ab082b355bf188d907b9929cd99b2923053495" + "reference": "c83178d49e372ca967d1a8c77ae4e051b3a3c75c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/michelf/php-markdown/zipball/01ab082b355bf188d907b9929cd99b2923053495", - "reference": "01ab082b355bf188d907b9929cd99b2923053495", + "url": "https://api.github.com/repos/michelf/php-markdown/zipball/c83178d49e372ca967d1a8c77ae4e051b3a3c75c", + "reference": "c83178d49e372ca967d1a8c77ae4e051b3a3c75c", "shasum": "" }, "require": { "php": ">=5.3.0" }, + "require-dev": { + "phpunit/phpunit": ">=4.3 <5.8" + }, "type": "library", "autoload": { "psr-4": { @@ -773,7 +790,7 @@ "keywords": [ "markdown" ], - "time": "2018-01-15T00:49:33+00:00" + "time": "2019-12-02T02:32:27+00:00" }, { "name": "openid/php-openid", @@ -938,16 +955,16 @@ }, { "name": "pear/console_getopt", - "version": "v1.4.2", + "version": "v1.4.3", "source": { "type": "git", "url": "https://github.com/pear/Console_Getopt.git", - "reference": "6c77aeb625b32bd752e89ee17972d103588b90c0" + "reference": "a41f8d3e668987609178c7c4a9fe48fecac53fa0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pear/Console_Getopt/zipball/6c77aeb625b32bd752e89ee17972d103588b90c0", - "reference": "6c77aeb625b32bd752e89ee17972d103588b90c0", + "url": "https://api.github.com/repos/pear/Console_Getopt/zipball/a41f8d3e668987609178c7c4a9fe48fecac53fa0", + "reference": "a41f8d3e668987609178c7c4a9fe48fecac53fa0", "shasum": "" }, "type": "library", @@ -964,11 +981,6 @@ "BSD-2-Clause" ], "authors": [ - { - "name": "Greg Beaver", - "email": "cellog@php.net", - "role": "Helper" - }, { "name": "Andrei Zmievski", "email": "andrei@php.net", @@ -978,10 +990,15 @@ "name": "Stig Bakken", "email": "stig@php.net", "role": "Developer" + }, + { + "name": "Greg Beaver", + "email": "cellog@php.net", + "role": "Helper" } ], "description": "More info available on: http://pear.php.net/package/Console_Getopt", - "time": "2019-02-06T16:52:33+00:00" + "time": "2019-11-20T18:27:48+00:00" }, { "name": "phpseclib/phpseclib", @@ -1219,16 +1236,16 @@ }, { "name": "stomp-php/stomp-php", - "version": "4.5.2", + "version": "4.6.1", "source": { "type": "git", "url": "https://github.com/stomp-php/stomp-php.git", - "reference": "9238e4ddb1e7a5ddd673d090be52bdf9d7f225be" + "reference": "d55ba2b2c3ce0e3074b3aa15de1151fd13bb84e4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/stomp-php/stomp-php/zipball/9238e4ddb1e7a5ddd673d090be52bdf9d7f225be", - "reference": "9238e4ddb1e7a5ddd673d090be52bdf9d7f225be", + "url": "https://api.github.com/repos/stomp-php/stomp-php/zipball/d55ba2b2c3ce0e3074b3aa15de1151fd13bb84e4", + "reference": "d55ba2b2c3ce0e3074b3aa15de1151fd13bb84e4", "shasum": "" }, "require": { @@ -1274,7 +1291,17 @@ "rabbitmq", "stomp" ], - "time": "2019-07-26T16:38:20+00:00" + "funding": [ + { + "url": "https://github.com/jmglsn", + "type": "github" + }, + { + "url": "https://github.com/staabm", + "type": "github" + } + ], + "time": "2020-06-15T18:01:49+00:00" } ], "packages-dev": [ @@ -1425,29 +1452,30 @@ ], "description": "Promoting the interoperability of container objects (DIC, SL, etc.)", "homepage": "https://github.com/container-interop/container-interop", + "abandoned": "psr/container", "time": "2017-02-14T19:40:03+00:00" }, { "name": "dnoegel/php-xdg-base-dir", - "version": "0.1", + "version": "v0.1.1", "source": { "type": "git", "url": "https://github.com/dnoegel/php-xdg-base-dir.git", - "reference": "265b8593498b997dc2d31e75b89f053b5cc9621a" + "reference": "8f8a6e48c5ecb0f991c2fdcf5f154a47d85f9ffd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/dnoegel/php-xdg-base-dir/zipball/265b8593498b997dc2d31e75b89f053b5cc9621a", - "reference": "265b8593498b997dc2d31e75b89f053b5cc9621a", + "url": "https://api.github.com/repos/dnoegel/php-xdg-base-dir/zipball/8f8a6e48c5ecb0f991c2fdcf5f154a47d85f9ffd", + "reference": "8f8a6e48c5ecb0f991c2fdcf5f154a47d85f9ffd", "shasum": "" }, "require": { "php": ">=5.3.2" }, "require-dev": { - "phpunit/phpunit": "@stable" + "phpunit/phpunit": "~7.0|~6.0|~5.0|~4.8.35" }, - "type": "project", + "type": "library", "autoload": { "psr-4": { "XdgBaseDir\\": "src/" @@ -1458,25 +1486,26 @@ "MIT" ], "description": "implementation of xdg base directory specification for php", - "time": "2014-10-24T07:27:01+00:00" + "time": "2019-12-04T15:06:13+00:00" }, { "name": "doctrine/annotations", - "version": "v1.8.0", + "version": "1.10.3", "source": { "type": "git", "url": "https://github.com/doctrine/annotations.git", - "reference": "904dca4eb10715b92569fbcd79e201d5c349b6bc" + "reference": "5db60a4969eba0e0c197a19c077780aadbc43c5d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/annotations/zipball/904dca4eb10715b92569fbcd79e201d5c349b6bc", - "reference": "904dca4eb10715b92569fbcd79e201d5c349b6bc", + "url": "https://api.github.com/repos/doctrine/annotations/zipball/5db60a4969eba0e0c197a19c077780aadbc43c5d", + "reference": "5db60a4969eba0e0c197a19c077780aadbc43c5d", "shasum": "" }, "require": { "doctrine/lexer": "1.*", - "php": "^7.1" + "ext-tokenizer": "*", + "php": "^7.1 || ^8.0" }, "require-dev": { "doctrine/cache": "1.*", @@ -1485,7 +1514,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.7.x-dev" + "dev-master": "1.9.x-dev" } }, "autoload": { @@ -1526,24 +1555,24 @@ "docblock", "parser" ], - "time": "2019-10-01T18:55:10+00:00" + "time": "2020-05-25T17:24:27+00:00" }, { "name": "doctrine/instantiator", - "version": "1.3.0", + "version": "1.3.1", "source": { "type": "git", "url": "https://github.com/doctrine/instantiator.git", - "reference": "ae466f726242e637cebdd526a7d991b9433bacf1" + "reference": "f350df0268e904597e3bd9c4685c53e0e333feea" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/instantiator/zipball/ae466f726242e637cebdd526a7d991b9433bacf1", - "reference": "ae466f726242e637cebdd526a7d991b9433bacf1", + "url": "https://api.github.com/repos/doctrine/instantiator/zipball/f350df0268e904597e3bd9c4685c53e0e333feea", + "reference": "f350df0268e904597e3bd9c4685c53e0e333feea", "shasum": "" }, "require": { - "php": "^7.1" + "php": "^7.1 || ^8.0" }, "require-dev": { "doctrine/coding-standard": "^6.0", @@ -1582,24 +1611,38 @@ "constructor", "instantiate" ], - "time": "2019-10-21T16:45:58+00:00" + "funding": [ + { + "url": "https://www.doctrine-project.org/sponsorship.html", + "type": "custom" + }, + { + "url": "https://www.patreon.com/phpdoctrine", + "type": "patreon" + }, + { + "url": "https://tidelift.com/funding/github/packagist/doctrine%2Finstantiator", + "type": "tidelift" + } + ], + "time": "2020-05-29T17:27:14+00:00" }, { "name": "doctrine/lexer", - "version": "1.2.0", + "version": "1.2.1", "source": { "type": "git", "url": "https://github.com/doctrine/lexer.git", - "reference": "5242d66dbeb21a30dd8a3e66bf7a73b66e05e1f6" + "reference": "e864bbf5904cb8f5bb334f99209b48018522f042" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/lexer/zipball/5242d66dbeb21a30dd8a3e66bf7a73b66e05e1f6", - "reference": "5242d66dbeb21a30dd8a3e66bf7a73b66e05e1f6", + "url": "https://api.github.com/repos/doctrine/lexer/zipball/e864bbf5904cb8f5bb334f99209b48018522f042", + "reference": "e864bbf5904cb8f5bb334f99209b48018522f042", "shasum": "" }, "require": { - "php": "^7.2" + "php": "^7.2 || ^8.0" }, "require-dev": { "doctrine/coding-standard": "^6.0", @@ -1644,20 +1687,34 @@ "parser", "php" ], - "time": "2019-10-30T14:39:59+00:00" + "funding": [ + { + "url": "https://www.doctrine-project.org/sponsorship.html", + "type": "custom" + }, + { + "url": "https://www.patreon.com/phpdoctrine", + "type": "patreon" + }, + { + "url": "https://tidelift.com/funding/github/packagist/doctrine%2Flexer", + "type": "tidelift" + } + ], + "time": "2020-05-25T17:44:05+00:00" }, { "name": "erusev/parsedown", - "version": "1.7.3", + "version": "1.7.4", "source": { "type": "git", "url": "https://github.com/erusev/parsedown.git", - "reference": "6d893938171a817f4e9bc9e86f2da1e370b7bcd7" + "reference": "cb17b6477dfff935958ba01325f2e8a2bfa6dab3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/erusev/parsedown/zipball/6d893938171a817f4e9bc9e86f2da1e370b7bcd7", - "reference": "6d893938171a817f4e9bc9e86f2da1e370b7bcd7", + "url": "https://api.github.com/repos/erusev/parsedown/zipball/cb17b6477dfff935958ba01325f2e8a2bfa6dab3", + "reference": "cb17b6477dfff935958ba01325f2e8a2bfa6dab3", "shasum": "" }, "require": { @@ -1690,736 +1747,7 @@ "markdown", "parser" ], - "time": "2019-03-17T18:48:37+00:00" - }, - { - "name": "herrera-io/json", - "version": "1.0.3", - "source": { - "type": "git", - "url": "https://github.com/kherge-php/json.git", - "reference": "60c696c9370a1e5136816ca557c17f82a6fa83f1" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/kherge-php/json/zipball/60c696c9370a1e5136816ca557c17f82a6fa83f1", - "reference": "60c696c9370a1e5136816ca557c17f82a6fa83f1", - "shasum": "" - }, - "require": { - "ext-json": "*", - "justinrainbow/json-schema": ">=1.0,<2.0-dev", - "php": ">=5.3.3", - "seld/jsonlint": ">=1.0,<2.0-dev" - }, - "require-dev": { - "herrera-io/phpunit-test-case": "1.*", - "mikey179/vfsstream": "1.1.0", - "phpunit/phpunit": "3.7.*" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0-dev" - } - }, - "autoload": { - "files": [ - "src/lib/json_version.php" - ], - "psr-0": { - "Herrera\\Json": "src/lib" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Kevin Herrera", - "email": "kevin@herrera.io", - "homepage": "http://kevin.herrera.io" - } - ], - "description": "A library for simplifying JSON linting and validation.", - "homepage": "http://herrera-io.github.com/php-json", - "keywords": [ - "json", - "lint", - "schema", - "validate" - ], - "abandoned": "kherge/json", - "time": "2013-10-30T16:51:34+00:00" - }, - { - "name": "herrera-io/phar-update", - "version": "1.0.3", - "source": { - "type": "git", - "url": "https://github.com/kherge-abandoned/php-phar-update.git", - "reference": "00a79e1d5b8cf3c080a2e3becf1ddf7a7fea025b" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/kherge-abandoned/php-phar-update/zipball/00a79e1d5b8cf3c080a2e3becf1ddf7a7fea025b", - "reference": "00a79e1d5b8cf3c080a2e3becf1ddf7a7fea025b", - "shasum": "" - }, - "require": { - "herrera-io/json": "1.*", - "kherge/version": "1.*", - "php": ">=5.3.3" - }, - "require-dev": { - "herrera-io/phpunit-test-case": "1.*", - "mikey179/vfsstream": "1.1.0", - "phpunit/phpunit": "3.7.*" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0-dev" - } - }, - "autoload": { - "files": [ - "src/lib/constants.php" - ], - "psr-0": { - "Herrera\\Phar\\Update": "src/lib" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Kevin Herrera", - "email": "kevin@herrera.io", - "homepage": "http://kevin.herrera.io" - } - ], - "description": "A library for self-updating Phars.", - "homepage": "http://herrera-io.github.com/php-phar-update", - "keywords": [ - "phar", - "update" - ], - "abandoned": true, - "time": "2013-10-30T17:23:01+00:00" - }, - { - "name": "hoa/compiler", - "version": "3.17.08.08", - "source": { - "type": "git", - "url": "https://github.com/hoaproject/Compiler.git", - "reference": "aa09caf0bf28adae6654ca6ee415ee2f522672de" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/hoaproject/Compiler/zipball/aa09caf0bf28adae6654ca6ee415ee2f522672de", - "reference": "aa09caf0bf28adae6654ca6ee415ee2f522672de", - "shasum": "" - }, - "require": { - "hoa/consistency": "~1.0", - "hoa/exception": "~1.0", - "hoa/file": "~1.0", - "hoa/iterator": "~2.0", - "hoa/math": "~1.0", - "hoa/protocol": "~1.0", - "hoa/regex": "~1.0", - "hoa/visitor": "~2.0" - }, - "require-dev": { - "hoa/json": "~2.0", - "hoa/test": "~2.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.x-dev" - } - }, - "autoload": { - "psr-4": { - "Hoa\\Compiler\\": "." - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Ivan Enderlin", - "email": "ivan.enderlin@hoa-project.net" - }, - { - "name": "Hoa community", - "homepage": "https://hoa-project.net/" - } - ], - "description": "The Hoa\\Compiler library.", - "homepage": "https://hoa-project.net/", - "keywords": [ - "algebraic", - "ast", - "compiler", - "context-free", - "coverage", - "exhaustive", - "grammar", - "isotropic", - "language", - "lexer", - "library", - "ll1", - "llk", - "parser", - "pp", - "random", - "regular", - "rule", - "sampler", - "syntax", - "token", - "trace", - "uniform" - ], - "time": "2017-08-08T07:44:07+00:00" - }, - { - "name": "hoa/file", - "version": "1.17.07.11", - "source": { - "type": "git", - "url": "https://github.com/hoaproject/File.git", - "reference": "35cb979b779bc54918d2f9a4e02ed6c7a1fa67ca" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/hoaproject/File/zipball/35cb979b779bc54918d2f9a4e02ed6c7a1fa67ca", - "reference": "35cb979b779bc54918d2f9a4e02ed6c7a1fa67ca", - "shasum": "" - }, - "require": { - "hoa/consistency": "~1.0", - "hoa/event": "~1.0", - "hoa/exception": "~1.0", - "hoa/iterator": "~2.0", - "hoa/stream": "~1.0" - }, - "require-dev": { - "hoa/test": "~2.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.x-dev" - } - }, - "autoload": { - "psr-4": { - "Hoa\\File\\": "." - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Ivan Enderlin", - "email": "ivan.enderlin@hoa-project.net" - }, - { - "name": "Hoa community", - "homepage": "https://hoa-project.net/" - } - ], - "description": "The Hoa\\File library.", - "homepage": "https://hoa-project.net/", - "keywords": [ - "Socket", - "directory", - "file", - "finder", - "library", - "link", - "temporary" - ], - "time": "2017-07-11T07:42:15+00:00" - }, - { - "name": "hoa/iterator", - "version": "2.17.01.10", - "source": { - "type": "git", - "url": "https://github.com/hoaproject/Iterator.git", - "reference": "d1120ba09cb4ccd049c86d10058ab94af245f0cc" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/hoaproject/Iterator/zipball/d1120ba09cb4ccd049c86d10058ab94af245f0cc", - "reference": "d1120ba09cb4ccd049c86d10058ab94af245f0cc", - "shasum": "" - }, - "require": { - "hoa/consistency": "~1.0", - "hoa/exception": "~1.0" - }, - "require-dev": { - "hoa/test": "~2.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.x-dev" - } - }, - "autoload": { - "psr-4": { - "Hoa\\Iterator\\": "." - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Ivan Enderlin", - "email": "ivan.enderlin@hoa-project.net" - }, - { - "name": "Hoa community", - "homepage": "https://hoa-project.net/" - } - ], - "description": "The Hoa\\Iterator library.", - "homepage": "https://hoa-project.net/", - "keywords": [ - "iterator", - "library" - ], - "time": "2017-01-10T10:34:47+00:00" - }, - { - "name": "hoa/math", - "version": "1.17.05.16", - "source": { - "type": "git", - "url": "https://github.com/hoaproject/Math.git", - "reference": "7150785d30f5d565704912116a462e9f5bc83a0c" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/hoaproject/Math/zipball/7150785d30f5d565704912116a462e9f5bc83a0c", - "reference": "7150785d30f5d565704912116a462e9f5bc83a0c", - "shasum": "" - }, - "require": { - "hoa/compiler": "~3.0", - "hoa/consistency": "~1.0", - "hoa/exception": "~1.0", - "hoa/iterator": "~2.0", - "hoa/protocol": "~1.0", - "hoa/zformat": "~1.0" - }, - "require-dev": { - "hoa/test": "~2.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.x-dev" - } - }, - "autoload": { - "psr-4": { - "Hoa\\Math\\": "." - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Ivan Enderlin", - "email": "ivan.enderlin@hoa-project.net" - }, - { - "name": "Hoa community", - "homepage": "https://hoa-project.net/" - } - ], - "description": "The Hoa\\Math library.", - "homepage": "https://hoa-project.net/", - "keywords": [ - "arrangement", - "combination", - "combinatorics", - "counting", - "library", - "math", - "permutation", - "sampler", - "set" - ], - "time": "2017-05-16T08:02:17+00:00" - }, - { - "name": "hoa/protocol", - "version": "1.17.01.14", - "source": { - "type": "git", - "url": "https://github.com/hoaproject/Protocol.git", - "reference": "5c2cf972151c45f373230da170ea015deecf19e2" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/hoaproject/Protocol/zipball/5c2cf972151c45f373230da170ea015deecf19e2", - "reference": "5c2cf972151c45f373230da170ea015deecf19e2", - "shasum": "" - }, - "require": { - "hoa/consistency": "~1.0", - "hoa/exception": "~1.0" - }, - "require-dev": { - "hoa/test": "~2.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.x-dev" - } - }, - "autoload": { - "psr-4": { - "Hoa\\Protocol\\": "." - }, - "files": [ - "Wrapper.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Ivan Enderlin", - "email": "ivan.enderlin@hoa-project.net" - }, - { - "name": "Hoa community", - "homepage": "https://hoa-project.net/" - } - ], - "description": "The Hoa\\Protocol library.", - "homepage": "https://hoa-project.net/", - "keywords": [ - "library", - "protocol", - "resource", - "stream", - "wrapper" - ], - "time": "2017-01-14T12:26:10+00:00" - }, - { - "name": "hoa/regex", - "version": "1.17.01.13", - "source": { - "type": "git", - "url": "https://github.com/hoaproject/Regex.git", - "reference": "7e263a61b6fb45c1d03d8e5ef77668518abd5bec" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/hoaproject/Regex/zipball/7e263a61b6fb45c1d03d8e5ef77668518abd5bec", - "reference": "7e263a61b6fb45c1d03d8e5ef77668518abd5bec", - "shasum": "" - }, - "require": { - "hoa/consistency": "~1.0", - "hoa/exception": "~1.0", - "hoa/math": "~1.0", - "hoa/protocol": "~1.0", - "hoa/ustring": "~4.0", - "hoa/visitor": "~2.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.x-dev" - } - }, - "autoload": { - "psr-4": { - "Hoa\\Regex\\": "." - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Ivan Enderlin", - "email": "ivan.enderlin@hoa-project.net" - }, - { - "name": "Hoa community", - "homepage": "https://hoa-project.net/" - } - ], - "description": "The Hoa\\Regex library.", - "homepage": "https://hoa-project.net/", - "keywords": [ - "compiler", - "library", - "regex" - ], - "time": "2017-01-13T16:10:24+00:00" - }, - { - "name": "hoa/stream", - "version": "1.17.02.21", - "source": { - "type": "git", - "url": "https://github.com/hoaproject/Stream.git", - "reference": "3293cfffca2de10525df51436adf88a559151d82" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/hoaproject/Stream/zipball/3293cfffca2de10525df51436adf88a559151d82", - "reference": "3293cfffca2de10525df51436adf88a559151d82", - "shasum": "" - }, - "require": { - "hoa/consistency": "~1.0", - "hoa/event": "~1.0", - "hoa/exception": "~1.0", - "hoa/protocol": "~1.0" - }, - "require-dev": { - "hoa/test": "~2.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.x-dev" - } - }, - "autoload": { - "psr-4": { - "Hoa\\Stream\\": "." - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Ivan Enderlin", - "email": "ivan.enderlin@hoa-project.net" - }, - { - "name": "Hoa community", - "homepage": "https://hoa-project.net/" - } - ], - "description": "The Hoa\\Stream library.", - "homepage": "https://hoa-project.net/", - "keywords": [ - "Context", - "bucket", - "composite", - "filter", - "in", - "library", - "out", - "protocol", - "stream", - "wrapper" - ], - "time": "2017-02-21T16:01:06+00:00" - }, - { - "name": "hoa/ustring", - "version": "4.17.01.16", - "source": { - "type": "git", - "url": "https://github.com/hoaproject/Ustring.git", - "reference": "e6326e2739178799b1fe3fdd92029f9517fa17a0" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/hoaproject/Ustring/zipball/e6326e2739178799b1fe3fdd92029f9517fa17a0", - "reference": "e6326e2739178799b1fe3fdd92029f9517fa17a0", - "shasum": "" - }, - "require": { - "hoa/consistency": "~1.0", - "hoa/exception": "~1.0" - }, - "require-dev": { - "hoa/test": "~2.0" - }, - "suggest": { - "ext-iconv": "ext/iconv must be present (or a third implementation) to use Hoa\\Ustring::transcode().", - "ext-intl": "To get a better Hoa\\Ustring::toAscii() and Hoa\\Ustring::compareTo()." - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "4.x-dev" - } - }, - "autoload": { - "psr-4": { - "Hoa\\Ustring\\": "." - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Ivan Enderlin", - "email": "ivan.enderlin@hoa-project.net" - }, - { - "name": "Hoa community", - "homepage": "https://hoa-project.net/" - } - ], - "description": "The Hoa\\Ustring library.", - "homepage": "https://hoa-project.net/", - "keywords": [ - "library", - "search", - "string", - "unicode" - ], - "time": "2017-01-16T07:08:25+00:00" - }, - { - "name": "hoa/visitor", - "version": "2.17.01.16", - "source": { - "type": "git", - "url": "https://github.com/hoaproject/Visitor.git", - "reference": "c18fe1cbac98ae449e0d56e87469103ba08f224a" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/hoaproject/Visitor/zipball/c18fe1cbac98ae449e0d56e87469103ba08f224a", - "reference": "c18fe1cbac98ae449e0d56e87469103ba08f224a", - "shasum": "" - }, - "require": { - "hoa/consistency": "~1.0" - }, - "require-dev": { - "hoa/test": "~2.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.x-dev" - } - }, - "autoload": { - "psr-4": { - "Hoa\\Visitor\\": "." - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Ivan Enderlin", - "email": "ivan.enderlin@hoa-project.net" - }, - { - "name": "Hoa community", - "homepage": "https://hoa-project.net/" - } - ], - "description": "The Hoa\\Visitor library.", - "homepage": "https://hoa-project.net/", - "keywords": [ - "library", - "structure", - "visit", - "visitor" - ], - "time": "2017-01-16T07:02:03+00:00" - }, - { - "name": "hoa/zformat", - "version": "1.17.01.10", - "source": { - "type": "git", - "url": "https://github.com/hoaproject/Zformat.git", - "reference": "522c381a2a075d4b9dbb42eb4592dd09520e4ac2" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/hoaproject/Zformat/zipball/522c381a2a075d4b9dbb42eb4592dd09520e4ac2", - "reference": "522c381a2a075d4b9dbb42eb4592dd09520e4ac2", - "shasum": "" - }, - "require": { - "hoa/consistency": "~1.0", - "hoa/exception": "~1.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.x-dev" - } - }, - "autoload": { - "psr-4": { - "Hoa\\Zformat\\": "." - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Ivan Enderlin", - "email": "ivan.enderlin@hoa-project.net" - }, - { - "name": "Hoa community", - "homepage": "https://hoa-project.net/" - } - ], - "description": "The Hoa\\Zformat library.", - "homepage": "https://hoa-project.net/", - "keywords": [ - "library", - "parameter", - "zformat" - ], - "time": "2017-01-10T10:39:54+00:00" + "time": "2019-12-30T22:54:17+00:00" }, { "name": "jakub-onderka/php-console-color", @@ -2461,6 +1789,7 @@ "email": "jakub.onderka@gmail.com" } ], + "abandoned": "php-parallel-lint/php-console-color", "time": "2018-09-29T17:23:10+00:00" }, { @@ -2507,39 +1836,38 @@ } ], "description": "Highlight PHP code in terminal", + "abandoned": "php-parallel-lint/php-console-highlighter", "time": "2018-09-29T18:48:56+00:00" }, { "name": "jms/metadata", - "version": "2.1.0", + "version": "1.7.0", "source": { "type": "git", "url": "https://github.com/schmittjoh/metadata.git", - "reference": "8d8958103485c2cbdd9a9684c3869312ebdaf73a" + "reference": "e5854ab1aa643623dc64adde718a8eec32b957a8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/schmittjoh/metadata/zipball/8d8958103485c2cbdd9a9684c3869312ebdaf73a", - "reference": "8d8958103485c2cbdd9a9684c3869312ebdaf73a", + "url": "https://api.github.com/repos/schmittjoh/metadata/zipball/e5854ab1aa643623dc64adde718a8eec32b957a8", + "reference": "e5854ab1aa643623dc64adde718a8eec32b957a8", "shasum": "" }, "require": { - "php": "^7.2" + "php": ">=5.3.0" }, "require-dev": { - "doctrine/cache": "^1.0", - "doctrine/coding-standard": "^4.0", - "phpunit/phpunit": "^7.0", - "symfony/cache": "^3.1|^4.0" + "doctrine/cache": "~1.0", + "symfony/cache": "~3.1" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.x-dev" + "dev-master": "1.5.x-dev" } }, "autoload": { - "psr-4": { + "psr-0": { "Metadata\\": "src/" } }, @@ -2548,13 +1876,13 @@ "MIT" ], "authors": [ - { - "name": "Johannes M. Schmitt", - "email": "schmittjoh@gmail.com" - }, { "name": "Asmir Mustafic", "email": "goetas@gmail.com" + }, + { + "name": "Johannes M. Schmitt", + "email": "schmittjoh@gmail.com" } ], "description": "Class/method/property metadata management in PHP", @@ -2564,79 +1892,109 @@ "xml", "yaml" ], - "time": "2019-09-17T15:30:40+00:00" + "time": "2018-10-26T12:40:10+00:00" }, { - "name": "jms/serializer", - "version": "3.3.0", + "name": "jms/parser-lib", + "version": "1.0.0", "source": { "type": "git", - "url": "https://github.com/schmittjoh/serializer.git", - "reference": "4c1e4296734385af7718ca71ec0febb4815b4a87" + "url": "https://github.com/schmittjoh/parser-lib.git", + "reference": "c509473bc1b4866415627af0e1c6cc8ac97fa51d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/schmittjoh/serializer/zipball/4c1e4296734385af7718ca71ec0febb4815b4a87", - "reference": "4c1e4296734385af7718ca71ec0febb4815b4a87", + "url": "https://api.github.com/repos/schmittjoh/parser-lib/zipball/c509473bc1b4866415627af0e1c6cc8ac97fa51d", + "reference": "c509473bc1b4866415627af0e1c6cc8ac97fa51d", + "shasum": "" + }, + "require": { + "phpoption/phpoption": ">=0.9,<2.0-dev" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "psr-0": { + "JMS\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "Apache2" + ], + "description": "A library for easily creating recursive-descent parsers.", + "time": "2012-11-18T18:08:43+00:00" + }, + { + "name": "jms/serializer", + "version": "1.7.1", + "source": { + "type": "git", + "url": "https://github.com/schmittjoh/serializer.git", + "reference": "4fad8bbbe76e05de3b79ffa3db027058ed3813ff" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/schmittjoh/serializer/zipball/4fad8bbbe76e05de3b79ffa3db027058ed3813ff", + "reference": "4fad8bbbe76e05de3b79ffa3db027058ed3813ff", "shasum": "" }, "require": { "doctrine/annotations": "^1.0", "doctrine/instantiator": "^1.0.3", - "hoa/compiler": "^3.17.08.08", - "jms/metadata": "^2.0", - "php": "^7.2" + "jms/metadata": "~1.1", + "jms/parser-lib": "1.*", + "php": ">=5.5.0", + "phpcollection/phpcollection": "~0.1", + "phpoption/phpoption": "^1.1" }, "conflict": { - "hoa/consistency": "<1.17.05.02", - "hoa/core": "*", - "hoa/iterator": "<2.16.03.15" + "jms/serializer-bundle": "<1.2.1", + "twig/twig": "<1.12" }, "require-dev": { - "doctrine/coding-standard": "^5.0", "doctrine/orm": "~2.1", "doctrine/phpcr-odm": "^1.3|^2.0", "ext-pdo_sqlite": "*", "jackalope/jackalope-doctrine-dbal": "^1.1.5", - "phpunit/phpunit": "^7.5||^8.0", - "psr/container": "^1.0", - "symfony/dependency-injection": "^3.0|^4.0", - "symfony/expression-language": "^3.0|^4.0", - "symfony/filesystem": "^3.0|^4.0", - "symfony/form": "^3.0|^4.0", - "symfony/translation": "^3.0|^4.0", - "symfony/validator": "^3.1.9|^4.0", - "symfony/yaml": "^3.3|^4.0", - "twig/twig": "~1.34|~2.4" + "phpunit/phpunit": "^4.8|^5.0", + "propel/propel1": "~1.7", + "symfony/expression-language": "^2.6|^3.0", + "symfony/filesystem": "^2.1", + "symfony/form": "~2.1|^3.0", + "symfony/translation": "^2.1|^3.0", + "symfony/validator": "^2.2|^3.0", + "symfony/yaml": "^2.1|^3.0", + "twig/twig": "~1.12|~2.0" }, "suggest": { "doctrine/cache": "Required if you like to use cache functionality.", "doctrine/collections": "Required if you like to use doctrine collection types as ArrayCollection.", - "symfony/yaml": "Required if you'd like to use the YAML metadata format." + "symfony/yaml": "Required if you'd like to serialize data to YAML format." }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.3-dev" + "dev-master": "1.8-dev" } }, "autoload": { - "psr-4": { - "JMS\\Serializer\\": "src/" + "psr-0": { + "JMS\\Serializer": "src/" } }, "notification-url": "https://packagist.org/downloads/", "license": [ - "MIT" + "Apache-2.0" ], "authors": [ { "name": "Johannes M. Schmitt", "email": "schmittjoh@gmail.com" - }, - { - "name": "Asmir Mustafic", - "email": "goetas@gmail.com" } ], "description": "Library for (de-)serializing data of any complexity; supports XML, JSON, and YAML.", @@ -2648,129 +2006,20 @@ "serialization", "xml" ], - "time": "2019-09-20T14:24:07+00:00" - }, - { - "name": "justinrainbow/json-schema", - "version": "1.6.1", - "source": { - "type": "git", - "url": "https://github.com/justinrainbow/json-schema.git", - "reference": "cc84765fb7317f6b07bd8ac78364747f95b86341" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/cc84765fb7317f6b07bd8ac78364747f95b86341", - "reference": "cc84765fb7317f6b07bd8ac78364747f95b86341", - "shasum": "" - }, - "require": { - "php": ">=5.3.29" - }, - "require-dev": { - "json-schema/json-schema-test-suite": "1.1.0", - "phpdocumentor/phpdocumentor": "~2", - "phpunit/phpunit": "~3.7" - }, - "bin": [ - "bin/validate-json" - ], - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.6.x-dev" - } - }, - "autoload": { - "psr-4": { - "JsonSchema\\": "src/JsonSchema/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Bruno Prieto Reis", - "email": "bruno.p.reis@gmail.com" - }, - { - "name": "Justin Rainbow", - "email": "justin.rainbow@gmail.com" - }, - { - "name": "Igor Wiedler", - "email": "igor@wiedler.ch" - }, - { - "name": "Robert Schönthal", - "email": "seroscho@googlemail.com" - } - ], - "description": "A library to validate a json schema.", - "homepage": "https://github.com/justinrainbow/json-schema", - "keywords": [ - "json", - "schema" - ], - "time": "2016-01-25T15:43:01+00:00" - }, - { - "name": "kherge/version", - "version": "1.0.1", - "source": { - "type": "git", - "url": "https://github.com/kherge-abandoned/Version.git", - "reference": "f07cf83f8ce533be8f93d2893d96d674bbeb7e30" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/kherge-abandoned/Version/zipball/f07cf83f8ce533be8f93d2893d96d674bbeb7e30", - "reference": "f07cf83f8ce533be8f93d2893d96d674bbeb7e30", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0-dev" - } - }, - "autoload": { - "psr-0": { - "KevinGH\\Version": "src/lib/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Kevin Herrera", - "email": "me@kevingh.com" - } - ], - "description": "A parsing and comparison library for semantic versioning.", - "homepage": "http://github.com/kherge/Version", - "abandoned": true, - "time": "2012-08-16T17:13:03+00:00" + "time": "2017-05-15T08:35:42+00:00" }, { "name": "monolog/monolog", - "version": "1.25.2", + "version": "1.25.5", "source": { "type": "git", "url": "https://github.com/Seldaek/monolog.git", - "reference": "d5e2fb341cb44f7e2ab639d12a1e5901091ec287" + "reference": "1817faadd1846cd08be9a49e905dc68823bc38c0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/d5e2fb341cb44f7e2ab639d12a1e5901091ec287", - "reference": "d5e2fb341cb44f7e2ab639d12a1e5901091ec287", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/1817faadd1846cd08be9a49e905dc68823bc38c0", + "reference": "1817faadd1846cd08be9a49e905dc68823bc38c0", "shasum": "" }, "require": { @@ -2784,11 +2033,10 @@ "aws/aws-sdk-php": "^2.4.9 || ^3.0", "doctrine/couchdb": "~1.0@dev", "graylog2/gelf-php": "~1.0", - "jakub-onderka/php-parallel-lint": "0.9", "php-amqplib/php-amqplib": "~2.4", "php-console/php-console": "^3.1.3", + "php-parallel-lint/php-parallel-lint": "^1.0", "phpunit/phpunit": "~4.5", - "phpunit/phpunit-mock-objects": "2.3.0", "ruflin/elastica": ">=0.90 <3.0", "sentry/sentry": "^0.13", "swiftmailer/swiftmailer": "^5.3|^6.0" @@ -2835,24 +2083,34 @@ "logging", "psr-3" ], - "time": "2019-11-13T10:00:05+00:00" + "funding": [ + { + "url": "https://github.com/Seldaek", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/monolog/monolog", + "type": "tidelift" + } + ], + "time": "2020-07-23T08:35:51+00:00" }, { "name": "myclabs/deep-copy", - "version": "1.9.3", + "version": "1.10.1", "source": { "type": "git", "url": "https://github.com/myclabs/DeepCopy.git", - "reference": "007c053ae6f31bba39dfa19a7726f56e9763bbea" + "reference": "969b211f9a51aa1f6c01d1d2aef56d3bd91598e5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/007c053ae6f31bba39dfa19a7726f56e9763bbea", - "reference": "007c053ae6f31bba39dfa19a7726f56e9763bbea", + "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/969b211f9a51aa1f6c01d1d2aef56d3bd91598e5", + "reference": "969b211f9a51aa1f6c01d1d2aef56d3bd91598e5", "shasum": "" }, "require": { - "php": "^7.1" + "php": "^7.1 || ^8.0" }, "replace": { "myclabs/deep-copy": "self.version" @@ -2883,7 +2141,13 @@ "object", "object graph" ], - "time": "2019-08-09T12:45:53+00:00" + "funding": [ + { + "url": "https://tidelift.com/funding/github/packagist/myclabs/deep-copy", + "type": "tidelift" + } + ], + "time": "2020-06-29T13:22:24+00:00" }, { "name": "nikic/php-parser", @@ -2930,6 +2194,127 @@ ], "time": "2015-09-19T14:15:08+00:00" }, + { + "name": "padraic/humbug_get_contents", + "version": "1.1.2", + "source": { + "type": "git", + "url": "https://github.com/humbug/file_get_contents.git", + "reference": "dcb086060c9dd6b2f51d8f7a895500307110b7a7" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/humbug/file_get_contents/zipball/dcb086060c9dd6b2f51d8f7a895500307110b7a7", + "reference": "dcb086060c9dd6b2f51d8f7a895500307110b7a7", + "shasum": "" + }, + "require": { + "composer/ca-bundle": "^1.0", + "ext-openssl": "*", + "php": "^5.3 || ^7.0 || ^7.1 || ^7.2" + }, + "require-dev": { + "bamarni/composer-bin-plugin": "^1.1", + "mikey179/vfsstream": "^1.6", + "phpunit/phpunit": "^4.8 || ^5.7 || ^6.5" + }, + "type": "library", + "extra": { + "bamarni-bin": { + "bin-links": false + }, + "branch-alias": { + "dev-master": "2.0-dev" + } + }, + "autoload": { + "psr-4": { + "Humbug\\": "src/" + }, + "files": [ + "src/function.php", + "src/functions.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Pádraic Brady", + "email": "padraic.brady@gmail.com", + "homepage": "http://blog.astrumfutura.com" + }, + { + "name": "Théo Fidry", + "email": "theo.fidry@gmail.com" + } + ], + "description": "Secure wrapper for accessing HTTPS resources with file_get_contents for PHP 5.3+", + "homepage": "https://github.com/padraic/file_get_contents", + "keywords": [ + "download", + "file_get_contents", + "http", + "https", + "ssl", + "tls" + ], + "time": "2018-02-12T18:47:17+00:00" + }, + { + "name": "padraic/phar-updater", + "version": "v1.0.6", + "source": { + "type": "git", + "url": "https://github.com/humbug/phar-updater.git", + "reference": "d01d3b8f26e541ac9b9eeba1e18d005d852f7ff1" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/humbug/phar-updater/zipball/d01d3b8f26e541ac9b9eeba1e18d005d852f7ff1", + "reference": "d01d3b8f26e541ac9b9eeba1e18d005d852f7ff1", + "shasum": "" + }, + "require": { + "padraic/humbug_get_contents": "^1.0", + "php": ">=5.3.3" + }, + "require-dev": { + "phpunit/phpunit": "~4.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "psr-4": { + "Humbug\\SelfUpdate\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Pádraic Brady", + "email": "padraic.brady@gmail.com", + "homepage": "http://blog.astrumfutura.com" + } + ], + "description": "A thing to make PHAR self-updating easy and secure.", + "keywords": [ + "humbug", + "phar", + "self-update", + "update" + ], + "time": "2018-03-30T12:52:15+00:00" + }, { "name": "phar-io/manifest", "version": "1.0.3", @@ -3032,6 +2417,54 @@ "description": "Library for handling version information and constraints", "time": "2018-07-08T19:19:57+00:00" }, + { + "name": "phpcollection/phpcollection", + "version": "0.5.0", + "source": { + "type": "git", + "url": "https://github.com/schmittjoh/php-collection.git", + "reference": "f2bcff45c0da7c27991bbc1f90f47c4b7fb434a6" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/schmittjoh/php-collection/zipball/f2bcff45c0da7c27991bbc1f90f47c4b7fb434a6", + "reference": "f2bcff45c0da7c27991bbc1f90f47c4b7fb434a6", + "shasum": "" + }, + "require": { + "phpoption/phpoption": "1.*" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "0.4-dev" + } + }, + "autoload": { + "psr-0": { + "PhpCollection": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "Apache2" + ], + "authors": [ + { + "name": "Johannes M. Schmitt", + "email": "schmittjoh@gmail.com" + } + ], + "description": "General-Purpose Collection Library for PHP", + "keywords": [ + "collection", + "list", + "map", + "sequence", + "set" + ], + "time": "2015-05-17T12:39:23+00:00" + }, { "name": "phpdocumentor/fileset", "version": "1.0.0", @@ -3118,24 +2551,24 @@ }, { "name": "phpdocumentor/phpdocumentor", - "version": "v2.9.0", + "version": "v2.9.1", "source": { "type": "git", - "url": "https://github.com/phpDocumentor/phpDocumentor2.git", - "reference": "be607da0eef9b9249c43c5b4820d25d631c73667" + "url": "https://github.com/phpDocumentor/phpDocumentor.git", + "reference": "2e4f981a55ebe6f5db592d7da892d13d5b3c7816" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/phpDocumentor2/zipball/be607da0eef9b9249c43c5b4820d25d631c73667", - "reference": "be607da0eef9b9249c43c5b4820d25d631c73667", + "url": "https://api.github.com/repos/phpDocumentor/phpDocumentor/zipball/2e4f981a55ebe6f5db592d7da892d13d5b3c7816", + "reference": "2e4f981a55ebe6f5db592d7da892d13d5b3c7816", "shasum": "" }, "require": { "cilex/cilex": "~1.0", "erusev/parsedown": "~1.0", - "herrera-io/phar-update": "1.0.3", - "jms/serializer": ">=0.12", + "jms/serializer": ">=0.12 < 1.8.0", "monolog/monolog": "~1.6", + "padraic/phar-updater": "^1.0", "php": ">=5.3.3", "phpdocumentor/fileset": "~1.0", "phpdocumentor/graphviz": "~1.0", @@ -3148,6 +2581,7 @@ "symfony/stopwatch": "~2.3", "symfony/validator": "~2.2", "twig/twig": "~1.3", + "webmozart/assert": "^1.2", "zendframework/zend-cache": "~2.1", "zendframework/zend-config": "~2.1", "zendframework/zend-filter": "~2.1", @@ -3158,12 +2592,12 @@ "zetacomponents/document": ">=1.3.1" }, "require-dev": { - "behat/behat": "~3.0", + "behat/behat": "^3.0", "mikey179/vfsstream": "~1.2", - "mockery/mockery": "~0.9@dev", - "phpunit/phpunit": "~4.0", - "squizlabs/php_codesniffer": "~1.4", - "symfony/expression-language": "~2.4" + "mockery/mockery": "^0.9@dev", + "phpunit/phpunit": "^4.0", + "squizlabs/php_codesniffer": "^1.4", + "symfony/expression-language": "^2.4" }, "suggest": { "ext-twig": "Enabling the twig extension improves the generation of twig based templates.", @@ -3203,7 +2637,7 @@ "documentation", "phpdoc" ], - "time": "2016-05-22T09:50:56+00:00" + "time": "2020-01-12T19:44:16+00:00" }, { "name": "phpdocumentor/reflection", @@ -3309,34 +2743,99 @@ "time": "2016-01-25T08:17:30+00:00" }, { - "name": "phpspec/prophecy", - "version": "1.9.0", + "name": "phpoption/phpoption", + "version": "1.7.5", "source": { "type": "git", - "url": "https://github.com/phpspec/prophecy.git", - "reference": "f6811d96d97bdf400077a0cc100ae56aa32b9203" + "url": "https://github.com/schmittjoh/php-option.git", + "reference": "994ecccd8f3283ecf5ac33254543eb0ac946d525" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpspec/prophecy/zipball/f6811d96d97bdf400077a0cc100ae56aa32b9203", - "reference": "f6811d96d97bdf400077a0cc100ae56aa32b9203", + "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/994ecccd8f3283ecf5ac33254543eb0ac946d525", + "reference": "994ecccd8f3283ecf5ac33254543eb0ac946d525", + "shasum": "" + }, + "require": { + "php": "^5.5.9 || ^7.0 || ^8.0" + }, + "require-dev": { + "bamarni/composer-bin-plugin": "^1.4.1", + "phpunit/phpunit": "^4.8.35 || ^5.7.27 || ^6.5.6 || ^7.0 || ^8.0 || ^9.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.7-dev" + } + }, + "autoload": { + "psr-4": { + "PhpOption\\": "src/PhpOption/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "Apache-2.0" + ], + "authors": [ + { + "name": "Johannes M. Schmitt", + "email": "schmittjoh@gmail.com" + }, + { + "name": "Graham Campbell", + "email": "graham@alt-three.com" + } + ], + "description": "Option Type for PHP", + "keywords": [ + "language", + "option", + "php", + "type" + ], + "funding": [ + { + "url": "https://github.com/GrahamCampbell", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/phpoption/phpoption", + "type": "tidelift" + } + ], + "time": "2020-07-20T17:29:33+00:00" + }, + { + "name": "phpspec/prophecy", + "version": "v1.10.3", + "source": { + "type": "git", + "url": "https://github.com/phpspec/prophecy.git", + "reference": "451c3cd1418cf640de218914901e51b064abb093" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phpspec/prophecy/zipball/451c3cd1418cf640de218914901e51b064abb093", + "reference": "451c3cd1418cf640de218914901e51b064abb093", "shasum": "" }, "require": { "doctrine/instantiator": "^1.0.2", "php": "^5.3|^7.0", "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0|^5.0", - "sebastian/comparator": "^1.1|^2.0|^3.0", - "sebastian/recursion-context": "^1.0|^2.0|^3.0" + "sebastian/comparator": "^1.2.3|^2.0|^3.0|^4.0", + "sebastian/recursion-context": "^1.0|^2.0|^3.0|^4.0" }, "require-dev": { - "phpspec/phpspec": "^2.5|^3.2", + "phpspec/phpspec": "^2.5 || ^3.2", "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5 || ^7.1" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.8.x-dev" + "dev-master": "1.10.x-dev" } }, "autoload": { @@ -3369,20 +2868,20 @@ "spy", "stub" ], - "time": "2019-10-03T11:07:50+00:00" + "time": "2020-03-05T15:02:03+00:00" }, { "name": "phpunit/php-code-coverage", - "version": "7.0.8", + "version": "7.0.10", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "aa0d179a13284c7420fc281fc32750e6cc7c9e2f" + "reference": "f1884187926fbb755a9aaf0b3836ad3165b478bf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/aa0d179a13284c7420fc281fc32750e6cc7c9e2f", - "reference": "aa0d179a13284c7420fc281fc32750e6cc7c9e2f", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/f1884187926fbb755a9aaf0b3836ad3165b478bf", + "reference": "f1884187926fbb755a9aaf0b3836ad3165b478bf", "shasum": "" }, "require": { @@ -3432,7 +2931,7 @@ "testing", "xunit" ], - "time": "2019-09-17T06:24:36+00:00" + "time": "2019-11-20T13:55:58+00:00" }, { "name": "phpunit/php-file-iterator", @@ -3625,16 +3124,16 @@ }, { "name": "phpunit/phpunit", - "version": "8.4.3", + "version": "8.5.8", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "67f9e35bffc0dd52d55d565ddbe4230454fd6a4e" + "reference": "34c18baa6a44f1d1fbf0338907139e9dce95b997" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/67f9e35bffc0dd52d55d565ddbe4230454fd6a4e", - "reference": "67f9e35bffc0dd52d55d565ddbe4230454fd6a4e", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/34c18baa6a44f1d1fbf0338907139e9dce95b997", + "reference": "34c18baa6a44f1d1fbf0338907139e9dce95b997", "shasum": "" }, "require": { @@ -3678,7 +3177,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "8.4-dev" + "dev-master": "8.5-dev" } }, "autoload": { @@ -3704,7 +3203,17 @@ "testing", "xunit" ], - "time": "2019-11-06T09:42:23+00:00" + "funding": [ + { + "url": "https://phpunit.de/donate.html", + "type": "custom" + }, + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-06-22T07:06:58+00:00" }, { "name": "pimple/pimple", @@ -3849,16 +3358,16 @@ }, { "name": "psr/log", - "version": "1.1.2", + "version": "1.1.3", "source": { "type": "git", "url": "https://github.com/php-fig/log.git", - "reference": "446d54b4cb6bf489fc9d75f55843658e6f25d801" + "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/446d54b4cb6bf489fc9d75f55843658e6f25d801", - "reference": "446d54b4cb6bf489fc9d75f55843658e6f25d801", + "url": "https://api.github.com/repos/php-fig/log/zipball/0f73288fd15629204f9d42b7055f72dacbe811fc", + "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc", "shasum": "" }, "require": { @@ -3892,7 +3401,7 @@ "psr", "psr-3" ], - "time": "2019-11-01T11:05:21+00:00" + "time": "2020-03-23T09:12:05+00:00" }, { "name": "psr/simple-cache", @@ -3944,27 +3453,27 @@ }, { "name": "psy/psysh", - "version": "v0.9.9", + "version": "v0.9.12", "source": { "type": "git", "url": "https://github.com/bobthecow/psysh.git", - "reference": "9aaf29575bb8293206bb0420c1e1c87ff2ffa94e" + "reference": "90da7f37568aee36b116a030c5f99c915267edd4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/bobthecow/psysh/zipball/9aaf29575bb8293206bb0420c1e1c87ff2ffa94e", - "reference": "9aaf29575bb8293206bb0420c1e1c87ff2ffa94e", + "url": "https://api.github.com/repos/bobthecow/psysh/zipball/90da7f37568aee36b116a030c5f99c915267edd4", + "reference": "90da7f37568aee36b116a030c5f99c915267edd4", "shasum": "" }, "require": { - "dnoegel/php-xdg-base-dir": "0.1", + "dnoegel/php-xdg-base-dir": "0.1.*", "ext-json": "*", "ext-tokenizer": "*", "jakub-onderka/php-console-highlighter": "0.3.*|0.4.*", "nikic/php-parser": "~1.3|~2.0|~3.0|~4.0", "php": ">=5.4.0", - "symfony/console": "~2.3.10|^2.4.2|~3.0|~4.0", - "symfony/var-dumper": "~2.7|~3.0|~4.0" + "symfony/console": "~2.3.10|^2.4.2|~3.0|~4.0|~5.0", + "symfony/var-dumper": "~2.7|~3.0|~4.0|~5.0" }, "require-dev": { "bamarni/composer-bin-plugin": "^1.2", @@ -4014,7 +3523,7 @@ "interactive", "shell" ], - "time": "2018-10-13T15:16:03+00:00" + "time": "2019-12-06T14:19:43+00:00" }, { "name": "sebastian/code-unit-reverse-lookup", @@ -4183,16 +3692,16 @@ }, { "name": "sebastian/environment", - "version": "4.2.2", + "version": "4.2.3", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/environment.git", - "reference": "f2a2c8e1c97c11ace607a7a667d73d47c19fe404" + "reference": "464c90d7bdf5ad4e8a6aea15c091fec0603d4368" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/f2a2c8e1c97c11ace607a7a667d73d47c19fe404", - "reference": "f2a2c8e1c97c11ace607a7a667d73d47c19fe404", + "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/464c90d7bdf5ad4e8a6aea15c091fec0603d4368", + "reference": "464c90d7bdf5ad4e8a6aea15c091fec0603d4368", "shasum": "" }, "require": { @@ -4232,7 +3741,7 @@ "environment", "hhvm" ], - "time": "2019-05-05T09:05:15+00:00" + "time": "2019-11-20T08:46:58+00:00" }, { "name": "sebastian/exporter", @@ -4631,55 +4140,6 @@ "homepage": "https://github.com/sebastianbergmann/version", "time": "2016-10-03T07:35:21+00:00" }, - { - "name": "seld/jsonlint", - "version": "1.7.2", - "source": { - "type": "git", - "url": "https://github.com/Seldaek/jsonlint.git", - "reference": "e2e5d290e4d2a4f0eb449f510071392e00e10d19" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/e2e5d290e4d2a4f0eb449f510071392e00e10d19", - "reference": "e2e5d290e4d2a4f0eb449f510071392e00e10d19", - "shasum": "" - }, - "require": { - "php": "^5.3 || ^7.0" - }, - "require-dev": { - "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0" - }, - "bin": [ - "bin/jsonlint" - ], - "type": "library", - "autoload": { - "psr-4": { - "Seld\\JsonLint\\": "src/Seld/JsonLint/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Jordi Boggiano", - "email": "j.boggiano@seld.be", - "homepage": "http://seld.be" - } - ], - "description": "JSON Linter", - "keywords": [ - "json", - "linter", - "parser", - "validator" - ], - "time": "2019-10-24T14:27:39+00:00" - }, { "name": "symfony/config", "version": "v2.8.52", @@ -5015,16 +4475,16 @@ }, { "name": "symfony/polyfill-ctype", - "version": "v1.12.0", + "version": "v1.18.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "550ebaac289296ce228a706d0867afc34687e3f4" + "reference": "1c302646f6efc070cd46856e600e5e0684d6b454" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/550ebaac289296ce228a706d0867afc34687e3f4", - "reference": "550ebaac289296ce228a706d0867afc34687e3f4", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/1c302646f6efc070cd46856e600e5e0684d6b454", + "reference": "1c302646f6efc070cd46856e600e5e0684d6b454", "shasum": "" }, "require": { @@ -5036,7 +4496,11 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.12-dev" + "dev-master": "1.18-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" } }, "autoload": { @@ -5069,20 +4533,34 @@ "polyfill", "portable" ], - "time": "2019-08-06T08:03:45+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": "2020-07-14T12:35:20+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.12.0", + "version": "v1.18.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "b42a2f66e8f1b15ccf25652c3424265923eb4f17" + "reference": "a6977d63bf9a0ad4c65cd352709e230876f9904a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/b42a2f66e8f1b15ccf25652c3424265923eb4f17", - "reference": "b42a2f66e8f1b15ccf25652c3424265923eb4f17", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/a6977d63bf9a0ad4c65cd352709e230876f9904a", + "reference": "a6977d63bf9a0ad4c65cd352709e230876f9904a", "shasum": "" }, "require": { @@ -5094,7 +4572,11 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.12-dev" + "dev-master": "1.18-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" } }, "autoload": { @@ -5128,20 +4610,34 @@ "portable", "shim" ], - "time": "2019-08-06T08:03:45+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": "2020-07-14T12:35:20+00:00" }, { "name": "symfony/polyfill-php72", - "version": "v1.12.0", + "version": "v1.18.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php72.git", - "reference": "04ce3335667451138df4307d6a9b61565560199e" + "reference": "639447d008615574653fb3bc60d1986d7172eaae" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/04ce3335667451138df4307d6a9b61565560199e", - "reference": "04ce3335667451138df4307d6a9b61565560199e", + "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/639447d008615574653fb3bc60d1986d7172eaae", + "reference": "639447d008615574653fb3bc60d1986d7172eaae", "shasum": "" }, "require": { @@ -5150,7 +4646,11 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.12-dev" + "dev-master": "1.18-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" } }, "autoload": { @@ -5183,7 +4683,21 @@ "portable", "shim" ], - "time": "2019-08-06T08:03:45+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": "2020-07-14T12:35:20+00:00" }, { "name": "symfony/process", @@ -5492,23 +5006,23 @@ }, { "name": "theseer/tokenizer", - "version": "1.1.3", + "version": "1.2.0", "source": { "type": "git", "url": "https://github.com/theseer/tokenizer.git", - "reference": "11336f6f84e16a720dae9d8e6ed5019efa85a0f9" + "reference": "75a63c33a8577608444246075ea0af0d052e452a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/theseer/tokenizer/zipball/11336f6f84e16a720dae9d8e6ed5019efa85a0f9", - "reference": "11336f6f84e16a720dae9d8e6ed5019efa85a0f9", + "url": "https://api.github.com/repos/theseer/tokenizer/zipball/75a63c33a8577608444246075ea0af0d052e452a", + "reference": "75a63c33a8577608444246075ea0af0d052e452a", "shasum": "" }, "require": { "ext-dom": "*", "ext-tokenizer": "*", "ext-xmlwriter": "*", - "php": "^7.0" + "php": "^7.2 || ^8.0" }, "type": "library", "autoload": { @@ -5528,35 +5042,40 @@ } ], "description": "A small library for converting tokenized PHP source code into XML and potentially other formats", - "time": "2019-06-13T22:48:21+00:00" + "funding": [ + { + "url": "https://github.com/theseer", + "type": "github" + } + ], + "time": "2020-07-12T23:59:07+00:00" }, { "name": "twig/twig", - "version": "v1.42.4", + "version": "v1.43.0", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "e587180584c3d2d6cb864a0454e777bb6dcb6152" + "reference": "597a03e85a60af6feee4f5127f3ef4279a1694c3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/e587180584c3d2d6cb864a0454e777bb6dcb6152", - "reference": "e587180584c3d2d6cb864a0454e777bb6dcb6152", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/597a03e85a60af6feee4f5127f3ef4279a1694c3", + "reference": "597a03e85a60af6feee4f5127f3ef4279a1694c3", "shasum": "" }, "require": { - "php": ">=5.5.0", + "php": ">=7.1.3", "symfony/polyfill-ctype": "^1.8" }, "require-dev": { "psr/container": "^1.0", - "symfony/debug": "^3.4|^4.2", - "symfony/phpunit-bridge": "^4.4@dev|^5.0" + "symfony/phpunit-bridge": "^4.4.9|^5.0.9" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.42-dev" + "dev-master": "1.43-dev" } }, "autoload": { @@ -5580,7 +5099,6 @@ }, { "name": "Twig Team", - "homepage": "https://twig.symfony.com/contributors", "role": "Contributors" }, { @@ -5594,7 +5112,78 @@ "keywords": [ "templating" ], - "time": "2019-11-11T16:49:32+00:00" + "funding": [ + { + "url": "https://certification.symfony.com/", + "type": "custom" + }, + { + "url": "https://live.symfony.com/", + "type": "custom" + }, + { + "url": "https://symfony.com/cloud/", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/twig/twig", + "type": "tidelift" + } + ], + "time": "2020-07-05T13:00:49+00:00" + }, + { + "name": "webmozart/assert", + "version": "1.9.1", + "source": { + "type": "git", + "url": "https://github.com/webmozart/assert.git", + "reference": "bafc69caeb4d49c39fd0779086c03a3738cbb389" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/webmozart/assert/zipball/bafc69caeb4d49c39fd0779086c03a3738cbb389", + "reference": "bafc69caeb4d49c39fd0779086c03a3738cbb389", + "shasum": "" + }, + "require": { + "php": "^5.3.3 || ^7.0 || ^8.0", + "symfony/polyfill-ctype": "^1.8" + }, + "conflict": { + "phpstan/phpstan": "<0.12.20", + "vimeo/psalm": "<3.9.1" + }, + "require-dev": { + "phpunit/phpunit": "^4.8.36 || ^7.5.13" + }, + "type": "library", + "autoload": { + "psr-4": { + "Webmozart\\Assert\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Bernhard Schussek", + "email": "bschussek@gmail.com" + } + ], + "description": "Assertions to validate method input/output with nice error messages.", + "keywords": [ + "assert", + "check", + "validate" + ], + "time": "2020-07-08T17:02:28+00:00" }, { "name": "zendframework/zend-cache", @@ -5677,6 +5266,7 @@ "psr-6", "zf" ], + "abandoned": "laminas/laminas-cache", "time": "2019-08-28T21:34:32+00:00" }, { @@ -5733,6 +5323,7 @@ "config", "zf2" ], + "abandoned": "laminas/laminas-config", "time": "2016-02-04T23:01:10+00:00" }, { @@ -5787,6 +5378,7 @@ "events", "zf2" ], + "abandoned": "laminas/laminas-eventmanager", "time": "2018-04-25T15:33:34+00:00" }, { @@ -5852,6 +5444,7 @@ "filter", "zf" ], + "abandoned": "laminas/laminas-filter", "time": "2019-08-19T07:08:04+00:00" }, { @@ -5910,26 +5503,31 @@ "hydrator", "zf2" ], + "abandoned": "laminas/laminas-hydrator", "time": "2016-02-18T22:38:26+00:00" }, { "name": "zendframework/zend-i18n", - "version": "2.9.2", + "version": "2.10.1", "source": { "type": "git", "url": "https://github.com/zendframework/zend-i18n.git", - "reference": "e17a54b3aee333ab156958f570cde630acee8b07" + "reference": "84038e6a1838b611dcc491b1c40321fa4c3a123c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-i18n/zipball/e17a54b3aee333ab156958f570cde630acee8b07", - "reference": "e17a54b3aee333ab156958f570cde630acee8b07", + "url": "https://api.github.com/repos/zendframework/zend-i18n/zipball/84038e6a1838b611dcc491b1c40321fa4c3a123c", + "reference": "84038e6a1838b611dcc491b1c40321fa4c3a123c", "shasum": "" }, "require": { + "ext-intl": "*", "php": "^5.6 || ^7.0", "zendframework/zend-stdlib": "^2.7 || ^3.0" }, + "conflict": { + "phpspec/prophecy": "<1.9.0" + }, "require-dev": { "phpunit/phpunit": "^5.7.27 || ^6.5.14 || ^7.5.16", "zendframework/zend-cache": "^2.6.1", @@ -5942,7 +5540,6 @@ "zendframework/zend-view": "^2.6.3" }, "suggest": { - "ext-intl": "Required for most features of Zend\\I18n; included in default builds of PHP", "zendframework/zend-cache": "Zend\\Cache component", "zendframework/zend-config": "Zend\\Config component", "zendframework/zend-eventmanager": "You should install this package to use the events in the translator", @@ -5955,8 +5552,8 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.9.x-dev", - "dev-develop": "2.10.x-dev" + "dev-master": "2.10.x-dev", + "dev-develop": "2.11.x-dev" }, "zf": { "component": "Zend\\I18n", @@ -5978,7 +5575,8 @@ "i18n", "zf" ], - "time": "2019-09-30T12:04:37+00:00" + "abandoned": "laminas/laminas-i18n", + "time": "2019-12-12T14:08:22+00:00" }, { "name": "zendframework/zend-json", @@ -6028,6 +5626,7 @@ "json", "zf" ], + "abandoned": "laminas/laminas-json", "time": "2019-10-09T13:56:13+00:00" }, { @@ -6085,6 +5684,7 @@ "serializer", "zf" ], + "abandoned": "laminas/laminas-serializer", "time": "2019-10-19T08:06:30+00:00" }, { @@ -6137,6 +5737,7 @@ "servicemanager", "zf2" ], + "abandoned": "laminas/laminas-servicemanager", "time": "2018-06-22T14:49:54+00:00" }, { @@ -6196,6 +5797,7 @@ "stdlib", "zf2" ], + "abandoned": "laminas/laminas-stdlib", "time": "2016-04-12T21:17:31+00:00" }, { @@ -6336,5 +5938,6 @@ "ext-xml": "*", "ext-xmlwriter": "*" }, - "platform-dev": [] + "platform-dev": [], + "plugin-api-version": "1.1.0" } diff --git a/lib/util/framework.php b/lib/util/framework.php index a2cd185d9f..6be09e1cca 100644 --- a/lib/util/framework.php +++ b/lib/util/framework.php @@ -24,7 +24,7 @@ * @author Brion Vibber * @author Mikael Nordfeldth * @author Diogo Cordeiro - * @copyright 2010-2019 Free Software Foundation, Inc http://www.fsf.org + * @copyright 2010-2020 Free Software Foundation, Inc http://www.fsf.org * @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later */ @@ -35,7 +35,7 @@ define('GNUSOCIAL_ENGINE_URL', 'https://gnusocial.network/'); // Change to https define('GNUSOCIAL_ENGINE_REPO_URL', 'https://notabug.org/diogo/gnu-social/'); // Change to https://git.gnu.io/gnu/gnu-social define('GNUSOCIAL_BASE_VERSION', '2.0.0'); -define('GNUSOCIAL_LIFECYCLE', 'dev'); // 'dev', 'alpha[0-9]+', 'beta[0-9]+', 'rc[0-9]+', 'release' +define('GNUSOCIAL_LIFECYCLE', 'alpha0'); // 'dev', 'alpha[0-9]+', 'beta[0-9]+', 'rc[0-9]+', 'release' define('GNUSOCIAL_VERSION', GNUSOCIAL_BASE_VERSION . '-' . GNUSOCIAL_LIFECYCLE); diff --git a/plugins/AccountManager/locale/AccountManager.pot b/plugins/AccountManager/locale/AccountManager.pot index da49067657..52109ec534 100644 --- a/plugins/AccountManager/locale/AccountManager.pot +++ b/plugins/AccountManager/locale/AccountManager.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:51+0100\n" +"POT-Creation-Date: 2020-08-04 01:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/ActivityPub/locale/ActivityPub.pot b/plugins/ActivityPub/locale/ActivityPub.pot index 4499cc33b4..462ea9fd5b 100644 --- a/plugins/ActivityPub/locale/ActivityPub.pot +++ b/plugins/ActivityPub/locale/ActivityPub.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-06-12 01:23+0100\n" +"POT-Creation-Date: 2020-08-04 01:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,35 +17,35 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" +#. TRANS: Exception. +#: classes/Activitypub_profile.php:393 +msgid "Not a valid WebFinger address (via cache)." +msgstr "" + +#. TRANS: Exception. +#: classes/Activitypub_profile.php:414 +msgid "Not a valid WebFinger address." +msgstr "" + +#. TRANS: Exception. %s is a WebFinger address. +#: classes/Activitypub_profile.php:454 +#, php-format +msgid "Could not find a valid profile for \"%s\"." +msgstr "" + #. TRANS: Plugin description. -#: ActivityPubPlugin.php:212 +#: ActivityPubPlugin.php:241 msgid "" "Follow people across social networks that implement ActivityPub." msgstr "" -#: ActivityPubPlugin.php:254 +#: ActivityPubPlugin.php:415 msgid "Remote Profile" msgstr "" #. TRANS: Title. %s is a domain name. -#: ActivityPubPlugin.php:909 +#: ActivityPubPlugin.php:920 #, php-format msgid "Sent from %s via ActivityPub" msgstr "" - -#. TRANS: Exception. -#: classes/Activitypub_profile.php:355 -msgid "Not a valid webfinger address (via cache)." -msgstr "" - -#. TRANS: Exception. -#: classes/Activitypub_profile.php:376 -msgid "Not a valid webfinger address." -msgstr "" - -#. TRANS: Exception. %s is a webfinger address. -#: classes/Activitypub_profile.php:416 -#, php-format -msgid "Could not find a valid profile for \"%s\"." -msgstr "" diff --git a/plugins/ActivitySpam/locale/ActivitySpam.pot b/plugins/ActivitySpam/locale/ActivitySpam.pot index 986357f302..12eae85d26 100644 --- a/plugins/ActivitySpam/locale/ActivitySpam.pot +++ b/plugins/ActivitySpam/locale/ActivitySpam.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:51+0100\n" +"POT-Creation-Date: 2020-08-04 01:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/AnonymousFave/locale/AnonymousFave.pot b/plugins/AnonymousFave/locale/AnonymousFave.pot index 656fff4f2f..0d0d5e30b8 100644 --- a/plugins/AnonymousFave/locale/AnonymousFave.pot +++ b/plugins/AnonymousFave/locale/AnonymousFave.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:51+0100\n" +"POT-Creation-Date: 2020-08-04 01:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,19 +17,29 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#. TRANS: Label for tally for number of times a notice was favored. -#: AnonymousFavePlugin.php:165 -msgid "Favored" +#. TRANS: Server exception. +#. TRANS: %d is the notice ID (number). +#: classes/Fave_tally.php:89 classes/Fave_tally.php:118 +#, php-format +msgid "Could not update favorite tally for notice ID %d." msgstr "" #. TRANS: Server exception. -#: AnonymousFavePlugin.php:198 AnonymousFavePlugin.php:209 -msgid "Could not create anonymous user session." +#. TRANS: %d is the notice ID (number). +#: classes/Fave_tally.php:150 +#, php-format +msgid "Could not create favorite tally for notice ID %d." msgstr "" -#. TRANS: Plugin description. -#: AnonymousFavePlugin.php:284 -msgid "Allow anonymous users to favorite notices." +#. TRANS: Client error. +#: actions/anonfavor.php:58 +msgid "" +"Could not favor notice! Please make sure your browser has cookies enabled." +msgstr "" + +#. TRANS: Title. +#: actions/anonfavor.php:72 +msgid "Disfavor favorite" msgstr "" #. TRANS: Client error. @@ -48,27 +58,17 @@ msgstr "" msgid "Add to favorites" msgstr "" -#. TRANS: Client error. -#: actions/anonfavor.php:58 -msgid "" -"Could not favor notice! Please make sure your browser has cookies enabled." -msgstr "" - -#. TRANS: Title. -#: actions/anonfavor.php:72 -msgid "Disfavor favorite" +#. TRANS: Label for tally for number of times a notice was favored. +#: AnonymousFavePlugin.php:165 +msgid "Favored" msgstr "" #. TRANS: Server exception. -#. TRANS: %d is the notice ID (number). -#: classes/Fave_tally.php:96 classes/Fave_tally.php:125 -#, php-format -msgid "Could not update favorite tally for notice ID %d." +#: AnonymousFavePlugin.php:198 AnonymousFavePlugin.php:209 +msgid "Could not create anonymous user session." msgstr "" -#. TRANS: Server exception. -#. TRANS: %d is the notice ID (number). -#: classes/Fave_tally.php:156 -#, php-format -msgid "Could not create favorite tally for notice ID %d." +#. TRANS: Plugin description. +#: AnonymousFavePlugin.php:284 +msgid "Allow anonymous users to favorite notices." msgstr "" diff --git a/plugins/AntiBrute/locale/AntiBrute.pot b/plugins/AntiBrute/locale/AntiBrute.pot index a2d9fe6e22..2554e30bae 100644 --- a/plugins/AntiBrute/locale/AntiBrute.pot +++ b/plugins/AntiBrute/locale/AntiBrute.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:51+0100\n" +"POT-Creation-Date: 2020-08-04 01:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,6 +18,6 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" #. TRANS: Plugin description. -#: AntiBrutePlugin.php:80 +#: AntiBrutePlugin.php:82 msgid "Anti bruteforce method(s)." msgstr "" diff --git a/plugins/ApiLogger/locale/ApiLogger.pot b/plugins/ApiLogger/locale/ApiLogger.pot index a6bbb668eb..42ab88f4e5 100644 --- a/plugins/ApiLogger/locale/ApiLogger.pot +++ b/plugins/ApiLogger/locale/ApiLogger.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:51+0100\n" +"POT-Creation-Date: 2020-08-04 01:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/AutoSandbox/locale/AutoSandbox.pot b/plugins/AutoSandbox/locale/AutoSandbox.pot index f9188bba80..60b5dd7928 100644 --- a/plugins/AutoSandbox/locale/AutoSandbox.pot +++ b/plugins/AutoSandbox/locale/AutoSandbox.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:51+0100\n" +"POT-Creation-Date: 2020-08-04 01:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/Autocomplete/locale/Autocomplete.pot b/plugins/Autocomplete/locale/Autocomplete.pot index 5a049265f2..6d711f597c 100644 --- a/plugins/Autocomplete/locale/Autocomplete.pot +++ b/plugins/Autocomplete/locale/Autocomplete.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:51+0100\n" +"POT-Creation-Date: 2020-08-04 01:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/BitlyUrl/locale/BitlyUrl.pot b/plugins/BitlyUrl/locale/BitlyUrl.pot index 600277a9da..9929d7fede 100644 --- a/plugins/BitlyUrl/locale/BitlyUrl.pot +++ b/plugins/BitlyUrl/locale/BitlyUrl.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:51+0100\n" +"POT-Creation-Date: 2020-08-04 01:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,6 +17,67 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" +#. TRANS: Title of administration panel. +#: actions/bitlyadminpanel.php:47 +msgid "bit.ly URL shortening" +msgstr "" + +#. TRANS: Instructions for administration panel. +#. TRANS: This message contains Markdown links in the form [decsription](link). +#: actions/bitlyadminpanel.php:59 +msgid "" +"URL shortening with bit.ly requires [a bit.ly account and API key](http://" +"bit.ly/a/your_api_key). This verifies that this is an authorized account, " +"and allow you to use bit.ly's tracking features and custom domains." +msgstr "" + +#. TRANS: Client error displayed when using too long a key. +#: actions/bitlyadminpanel.php:125 +msgid "Invalid login. Maximum length is 255 characters." +msgstr "" + +#. TRANS: Client error displayed when using too long a key. +#: actions/bitlyadminpanel.php:132 +msgid "Invalid API key. Maximum length is 255 characters." +msgstr "" + +#. TRANS: Fieldset legend in administration panel for bit.ly username and API key. +#: actions/bitlyadminpanel.php:182 +msgctxt "LEGEND" +msgid "Credentials" +msgstr "" + +#. TRANS: Form guide in administration panel for bit.ly URL shortening. +#: actions/bitlyadminpanel.php:193 +msgid "Leave these empty to use global default credentials." +msgstr "" + +#. TRANS: Form guide in administration panel for bit.ly URL shortening. +#: actions/bitlyadminpanel.php:200 +msgid "If you leave these empty, bit.ly will be unavailable to users." +msgstr "" + +#. TRANS: Field label in administration panel for bit.ly URL shortening. +#: actions/bitlyadminpanel.php:209 +msgid "Login name" +msgstr "" + +#. TRANS: Field label in administration panel for bit.ly URL shortening. +#: actions/bitlyadminpanel.php:219 +msgid "API key" +msgstr "" + +#. TRANS: Button text to save setting in administration panel for bit.ly URL shortening. +#: actions/bitlyadminpanel.php:239 +msgctxt "BUTTON" +msgid "Save" +msgstr "" + +#. TRANS: Button title to save setting in administration panel for bit.ly URL shortening. +#: actions/bitlyadminpanel.php:243 +msgid "Save bit.ly settings" +msgstr "" + #. TRANS: Exception thrown when bit.ly URL shortening plugin was configured incorrectly. #: BitlyUrlPlugin.php:49 msgid "You must specify a serviceUrl for bit.ly URL shortening." @@ -37,64 +98,3 @@ msgstr "" #: BitlyUrlPlugin.php:201 msgid "bit.ly URL shortening." msgstr "" - -#. TRANS: Title of administration panel. -#: actions/bitlyadminpanel.php:53 -msgid "bit.ly URL shortening" -msgstr "" - -#. TRANS: Instructions for administration panel. -#. TRANS: This message contains Markdown links in the form [decsription](link). -#: actions/bitlyadminpanel.php:65 -msgid "" -"URL shortening with bit.ly requires [a bit.ly account and API key](http://" -"bit.ly/a/your_api_key). This verifies that this is an authorized account, " -"and allow you to use bit.ly's tracking features and custom domains." -msgstr "" - -#. TRANS: Client error displayed when using too long a key. -#: actions/bitlyadminpanel.php:131 -msgid "Invalid login. Maximum length is 255 characters." -msgstr "" - -#. TRANS: Client error displayed when using too long a key. -#: actions/bitlyadminpanel.php:138 -msgid "Invalid API key. Maximum length is 255 characters." -msgstr "" - -#. TRANS: Fieldset legend in administration panel for bit.ly username and API key. -#: actions/bitlyadminpanel.php:188 -msgctxt "LEGEND" -msgid "Credentials" -msgstr "" - -#. TRANS: Form guide in administration panel for bit.ly URL shortening. -#: actions/bitlyadminpanel.php:197 -msgid "Leave these empty to use global default credentials." -msgstr "" - -#. TRANS: Form guide in administration panel for bit.ly URL shortening. -#: actions/bitlyadminpanel.php:201 -msgid "If you leave these empty, bit.ly will be unavailable to users." -msgstr "" - -#. TRANS: Field label in administration panel for bit.ly URL shortening. -#: actions/bitlyadminpanel.php:209 -msgid "Login name" -msgstr "" - -#. TRANS: Field label in administration panel for bit.ly URL shortening. -#: actions/bitlyadminpanel.php:219 -msgid "API key" -msgstr "" - -#. TRANS: Button text to save setting in administration panel for bit.ly URL shortening. -#: actions/bitlyadminpanel.php:238 -msgctxt "BUTTON" -msgid "Save" -msgstr "" - -#. TRANS: Button title to save setting in administration panel for bit.ly URL shortening. -#: actions/bitlyadminpanel.php:242 -msgid "Save bit.ly settings" -msgstr "" diff --git a/plugins/Blacklist/locale/Blacklist.pot b/plugins/Blacklist/locale/Blacklist.pot index d91358b30f..187bd36f2d 100644 --- a/plugins/Blacklist/locale/Blacklist.pot +++ b/plugins/Blacklist/locale/Blacklist.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:51+0100\n" +"POT-Creation-Date: 2020-08-04 01:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,6 +17,48 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" +#. TRANS: Field label in blacklist plugin administration panel. +#: forms/blacklistadminpanel.php:60 +msgid "Nicknames" +msgstr "" + +#. TRANS: Field title in blacklist plugin administration panel. +#: forms/blacklistadminpanel.php:63 +msgid "Patterns of nicknames to block, one per line." +msgstr "" + +#. TRANS: Field label in blacklist plugin administration panel. +#: forms/blacklistadminpanel.php:70 +msgid "URLs" +msgstr "" + +#. TRANS: Field title in blacklist plugin administration panel. +#: forms/blacklistadminpanel.php:73 +msgid "Patterns of URLs to block, one per line." +msgstr "" + +#. TRANS: Button text in blacklist plugin administration panel to save settings. +#: forms/blacklistadminpanel.php:88 +msgctxt "BUTTON" +msgid "Save" +msgstr "" + +#. TRANS: Button title in blacklist plugin administration panel to save settings. +#: forms/blacklistadminpanel.php:92 +msgid "Save site settings." +msgstr "" + +#. TRANS: Title of blacklist plugin administration panel. +#: actions/blacklistadminpanel.php:51 +msgctxt "TITLE" +msgid "Blacklist" +msgstr "" + +#. TRANS: Instructions for blacklist plugin administration panel. +#: actions/blacklistadminpanel.php:62 +msgid "Blacklisted URLs and nicknames" +msgstr "" + #. TRANS: Exception thrown if the Blacklist plugin configuration is incorrect. #. TRANS: %1$s is a configuration section, %2$s is a configuration setting. #: BlacklistPlugin.php:110 @@ -87,45 +129,3 @@ msgstr "" #, php-format msgid "Cannot subscribe to nickname \"%s\"." msgstr "" - -#. TRANS: Title of blacklist plugin administration panel. -#: actions/blacklistadminpanel.php:51 -msgctxt "TITLE" -msgid "Blacklist" -msgstr "" - -#. TRANS: Instructions for blacklist plugin administration panel. -#: actions/blacklistadminpanel.php:62 -msgid "Blacklisted URLs and nicknames" -msgstr "" - -#. TRANS: Field label in blacklist plugin administration panel. -#: forms/blacklistadminpanel.php:60 -msgid "Nicknames" -msgstr "" - -#. TRANS: Field title in blacklist plugin administration panel. -#: forms/blacklistadminpanel.php:63 -msgid "Patterns of nicknames to block, one per line." -msgstr "" - -#. TRANS: Field label in blacklist plugin administration panel. -#: forms/blacklistadminpanel.php:70 -msgid "URLs" -msgstr "" - -#. TRANS: Field title in blacklist plugin administration panel. -#: forms/blacklistadminpanel.php:73 -msgid "Patterns of URLs to block, one per line." -msgstr "" - -#. TRANS: Button text in blacklist plugin administration panel to save settings. -#: forms/blacklistadminpanel.php:88 -msgctxt "BUTTON" -msgid "Save" -msgstr "" - -#. TRANS: Button title in blacklist plugin administration panel to save settings. -#: forms/blacklistadminpanel.php:92 -msgid "Save site settings." -msgstr "" diff --git a/plugins/BlogspamNet/locale/BlogspamNet.pot b/plugins/BlogspamNet/locale/BlogspamNet.pot index 3bcabc5ae7..065112be2c 100644 --- a/plugins/BlogspamNet/locale/BlogspamNet.pot +++ b/plugins/BlogspamNet/locale/BlogspamNet.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:51+0100\n" +"POT-Creation-Date: 2020-08-04 01:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/Bookmark/locale/Bookmark.pot b/plugins/Bookmark/locale/Bookmark.pot index 2a5acdf589..1f4bb4c001 100644 --- a/plugins/Bookmark/locale/Bookmark.pot +++ b/plugins/Bookmark/locale/Bookmark.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:51+0100\n" +"POT-Creation-Date: 2020-08-04 01:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,31 +17,83 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#. TRANS: Plugin description. -#: BookmarkPlugin.php:189 -msgid "Plugin for posting bookmarks. " +#. TRANS: Client exception thrown when a bookmark is formatted incorrectly. +#: classes/Bookmark.php:172 +msgid "Expected exactly 1 link rel=related in a Bookmark, got more than that." msgstr "" -#. TRANS: Link text in proile leading to import form. -#. TRANS: Title for page to import del.icio.us bookmark backups on. -#: BookmarkPlugin.php:232 actions/importdelicious.php:60 -msgid "Import del.icio.us bookmarks" +#. TRANS: Client exception thrown when a bookmark is formatted incorrectly. +#: classes/Bookmark.php:177 +msgid "Expected exactly 1 link rel=related in a Bookmark, got 0." msgstr "" -#. TRANS: Menu item in sample plugin. -#: BookmarkPlugin.php:260 -msgid "Bookmarks" +#: classes/Bookmark.php:181 +msgid "You must provide a non-empty title." msgstr "" -#. TRANS: Menu item title in sample plugin. -#: BookmarkPlugin.php:262 -msgid "A list of your bookmarks" +#: classes/Bookmark.php:184 +msgid "Only web bookmarks can be posted (HTTP or HTTPS)." msgstr "" -#. TRANS: Application title. -#: BookmarkPlugin.php:346 -msgctxt "TITLE" -msgid "Bookmark" +#: classes/Bookmark.php:189 +msgid "You have already bookmarked this URL." +msgstr "" + +#. TRANS: Server exception thrown when a bookmark has multiple attachments. +#: classes/Bookmark.php:230 +msgid "Bookmark notice with the wrong number of attachments." +msgstr "" + +#. TRANS: Rendered bookmark content. +#. TRANS: %1$s is a URL, %2$s the bookmark title, %3$s is the bookmark description, +#. TRANS: %4$s is space separated list of hash tags. +#: classes/Bookmark.php:339 +#, php-format +msgid "" +"%2$s " +"%3$s %4$s" +msgstr "" + +#. TRANS: Field label on form for adding a new bookmark. +#: forms/initialbookmark.php:78 forms/bookmark.php:121 +msgctxt "LABEL" +msgid "URL" +msgstr "" + +#. TRANS: Button text for action to save a new bookmark. +#: forms/initialbookmark.php:92 +msgctxt "BUTTON" +msgid "Add" +msgstr "" + +#. TRANS: Field label on form for adding a new bookmark. +#: forms/bookmark.php:143 +msgctxt "LABEL" +msgid "Title" +msgstr "" + +#. TRANS: Field label on form for adding a new bookmark. +#: forms/bookmark.php:153 +msgctxt "LABEL" +msgid "Notes" +msgstr "" + +#. TRANS: Field label on form for adding a new bookmark. +#: forms/bookmark.php:162 +msgctxt "LABEL" +msgid "Tags" +msgstr "" + +#. TRANS: Field title on form for adding a new bookmark. +#: forms/bookmark.php:165 +msgid "Comma- or space-separated list of tags." +msgstr "" + +#. TRANS: Button text for action to save a new bookmark. +#: forms/bookmark.php:188 +msgctxt "BUTTON" +msgid "Save" msgstr "" #. TRANS: Client exception thrown when a bookmark in an import file is incorrectly formatted. @@ -54,11 +106,49 @@ msgstr "" msgid "Skipping private bookmark." msgstr "" -#. TRANS: Title for mini-posting window loaded from bookmarklet. -#. TRANS: %s is the StatusNet site name. -#: actions/bookmarkpopup.php:57 +#. TRANS: Exception thrown when a file upload cannot be found. +#. TRANS: %s is the file that could not be found. +#. TRANS: Server exception thrown when a file upload cannot be found. +#. TRANS: %s is the file that could not be found. +#: scripts/importbookmarks.php:64 actions/importdelicious.php:170 #, php-format -msgid "Bookmark on %s" +msgid "No such file \"%s\"." +msgstr "" + +#. TRANS: Exception thrown when a file upload is incorrect. +#. TRANS: %s is the irregular file. +#. TRANS: Server exception thrown when a file upload is incorrect. +#. TRANS: %s is the irregular file. +#: scripts/importbookmarks.php:70 actions/importdelicious.php:176 +#, php-format +msgid "Not a regular file: \"%s\"." +msgstr "" + +#. TRANS: Exception thrown when a file upload is not readable. +#. TRANS: %s is the file that could not be read. +#. TRANS: Server exception thrown when a file upload is not readable. +#. TRANS: %s is the file that could not be read. +#: scripts/importbookmarks.php:76 actions/importdelicious.php:182 +#, php-format +msgid "File \"%s\" not readable." +msgstr "" + +#. TRANS: %s is the filename that contains a backup for a user. +#: scripts/importbookmarks.php:80 +#, php-format +msgid "Getting backup from file \"%s\"." +msgstr "" + +#. TRANS: Client exception thrown when referring to a non-existing bookmark. +#: actions/showbookmark.php:59 actions/showbookmark.php:67 +msgid "No such bookmark." +msgstr "" + +#. TRANS: Title for bookmark. +#. TRANS: %1$s is a user nickname, %2$s is a bookmark title. +#: actions/showbookmark.php:84 +#, php-format +msgid "%1$s's bookmark for \"%2$s\"" msgstr "" #. TRANS: Client exception thrown when an unknown URL is provided. @@ -80,6 +170,21 @@ msgstr "" msgid "Notices linking to %1$s, page %2$d" msgstr "" +#. TRANS: Title for action to create a new bookmark. +#: actions/newbookmark.php:57 +msgid "New bookmark" +msgstr "" + +#. TRANS: Client exception thrown when trying to create a new bookmark without a title. +#: actions/newbookmark.php:79 +msgid "Bookmark must have a title." +msgstr "" + +#. TRANS: Client exception thrown when trying to create a new bookmark without a URL. +#: actions/newbookmark.php:84 +msgid "Bookmark must have an URL." +msgstr "" + #. TRANS: Page title for sample plugin. #: actions/bookmarks.php:128 msgid "Log in" @@ -91,6 +196,19 @@ msgstr "" msgid "%s's bookmarks" msgstr "" +#. TRANS: Title for mini-posting window loaded from bookmarklet. +#. TRANS: %s is the StatusNet site name. +#: actions/bookmarkpopup.php:57 +#, php-format +msgid "Bookmark on %s" +msgstr "" + +#. TRANS: Title for page to import del.icio.us bookmark backups on. +#. TRANS: Link text in proile leading to import form. +#: actions/importdelicious.php:60 BookmarkPlugin.php:232 +msgid "Import del.icio.us bookmarks" +msgstr "" + #. TRANS: Client exception thrown when trying to import bookmarks without being logged in. #: actions/importdelicious.php:79 msgid "Only logged-in users can import del.icio.us backups." @@ -144,33 +262,6 @@ msgstr "" msgid "System error uploading file." msgstr "" -#. TRANS: Server exception thrown when a file upload cannot be found. -#. TRANS: %s is the file that could not be found. -#. TRANS: Exception thrown when a file upload cannot be found. -#. TRANS: %s is the file that could not be found. -#: actions/importdelicious.php:170 scripts/importbookmarks.php:68 -#, php-format -msgid "No such file \"%s\"." -msgstr "" - -#. TRANS: Server exception thrown when a file upload is incorrect. -#. TRANS: %s is the irregular file. -#. TRANS: Exception thrown when a file upload is incorrect. -#. TRANS: %s is the irregular file. -#: actions/importdelicious.php:176 scripts/importbookmarks.php:74 -#, php-format -msgid "Not a regular file: \"%s\"." -msgstr "" - -#. TRANS: Server exception thrown when a file upload is not readable. -#. TRANS: %s is the file that could not be read. -#. TRANS: Exception thrown when a file upload is not readable. -#. TRANS: %s is the file that could not be read. -#: actions/importdelicious.php:182 scripts/importbookmarks.php:80 -#, php-format -msgid "File \"%s\" not readable." -msgstr "" - #. TRANS: Success message after importing bookmarks. #: actions/importdelicious.php:221 msgid "" @@ -199,114 +290,23 @@ msgstr "" msgid "Upload the file." msgstr "" -#. TRANS: Title for action to create a new bookmark. -#: actions/newbookmark.php:57 -msgid "New bookmark" +#. TRANS: Plugin description. +#: BookmarkPlugin.php:189 +msgid "Plugin for posting bookmarks. " msgstr "" -#. TRANS: Client exception thrown when trying to create a new bookmark without a title. -#: actions/newbookmark.php:79 -msgid "Bookmark must have a title." +#. TRANS: Menu item in sample plugin. +#: BookmarkPlugin.php:260 +msgid "Bookmarks" msgstr "" -#. TRANS: Client exception thrown when trying to create a new bookmark without a URL. -#: actions/newbookmark.php:84 -msgid "Bookmark must have an URL." +#. TRANS: Menu item title in sample plugin. +#: BookmarkPlugin.php:262 +msgid "A list of your bookmarks" msgstr "" -#. TRANS: Client exception thrown when referring to a non-existing bookmark. -#: actions/showbookmark.php:59 actions/showbookmark.php:67 -msgid "No such bookmark." -msgstr "" - -#. TRANS: Title for bookmark. -#. TRANS: %1$s is a user nickname, %2$s is a bookmark title. -#: actions/showbookmark.php:84 -#, php-format -msgid "%1$s's bookmark for \"%2$s\"" -msgstr "" - -#. TRANS: Client exception thrown when a bookmark is formatted incorrectly. -#: classes/Bookmark.php:172 -msgid "Expected exactly 1 link rel=related in a Bookmark, got more than that." -msgstr "" - -#. TRANS: Client exception thrown when a bookmark is formatted incorrectly. -#: classes/Bookmark.php:177 -msgid "Expected exactly 1 link rel=related in a Bookmark, got 0." -msgstr "" - -#: classes/Bookmark.php:181 -msgid "You must provide a non-empty title." -msgstr "" - -#: classes/Bookmark.php:184 -msgid "Only web bookmarks can be posted (HTTP or HTTPS)." -msgstr "" - -#: classes/Bookmark.php:189 -msgid "You have already bookmarked this URL." -msgstr "" - -#. TRANS: Server exception thrown when a bookmark has multiple attachments. -#: classes/Bookmark.php:230 -msgid "Bookmark notice with the wrong number of attachments." -msgstr "" - -#. TRANS: Rendered bookmark content. -#. TRANS: %1$s is a URL, %2$s the bookmark title, %3$s is the bookmark description, -#. TRANS: %4$s is space separated list of hash tags. -#: classes/Bookmark.php:339 -#, php-format -msgid "" -"%2$s " -"%3$s %4$s" -msgstr "" - -#. TRANS: %s is the filename that contains a backup for a user. -#: scripts/importbookmarks.php:84 -#, php-format -msgid "Getting backup from file \"%s\"." -msgstr "" - -#. TRANS: Field label on form for adding a new bookmark. -#: forms/initialbookmark.php:78 forms/bookmark.php:121 -msgctxt "LABEL" -msgid "URL" -msgstr "" - -#. TRANS: Button text for action to save a new bookmark. -#: forms/initialbookmark.php:92 -msgctxt "BUTTON" -msgid "Add" -msgstr "" - -#. TRANS: Field label on form for adding a new bookmark. -#: forms/bookmark.php:143 -msgctxt "LABEL" -msgid "Title" -msgstr "" - -#. TRANS: Field label on form for adding a new bookmark. -#: forms/bookmark.php:153 -msgctxt "LABEL" -msgid "Notes" -msgstr "" - -#. TRANS: Field label on form for adding a new bookmark. -#: forms/bookmark.php:162 -msgctxt "LABEL" -msgid "Tags" -msgstr "" - -#. TRANS: Field title on form for adding a new bookmark. -#: forms/bookmark.php:165 -msgid "Comma- or space-separated list of tags." -msgstr "" - -#. TRANS: Button text for action to save a new bookmark. -#: forms/bookmark.php:188 -msgctxt "BUTTON" -msgid "Save" +#. TRANS: Application title. +#: BookmarkPlugin.php:346 +msgctxt "TITLE" +msgid "Bookmark" msgstr "" diff --git a/plugins/CacheLog/locale/CacheLog.pot b/plugins/CacheLog/locale/CacheLog.pot index d5de965788..572fb67b1d 100644 --- a/plugins/CacheLog/locale/CacheLog.pot +++ b/plugins/CacheLog/locale/CacheLog.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:51+0100\n" +"POT-Creation-Date: 2020-08-04 01:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/CasAuthentication/locale/CasAuthentication.pot b/plugins/CasAuthentication/locale/CasAuthentication.pot index 6713742835..40a26dfd91 100644 --- a/plugins/CasAuthentication/locale/CasAuthentication.pot +++ b/plugins/CasAuthentication/locale/CasAuthentication.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:51+0100\n" +"POT-Creation-Date: 2020-08-04 01:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,40 +18,40 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" #. TRANS: Menu item. CAS is Central Authentication Service. -#: CasAuthenticationPlugin.php:86 +#: CasAuthenticationPlugin.php:65 msgid "CAS" msgstr "" #. TRANS: Tooltip for menu item. CAS is Central Authentication Service. -#: CasAuthenticationPlugin.php:88 +#: CasAuthenticationPlugin.php:67 msgid "Login or register with CAS." msgstr "" #. TRANS: Invitation to users with a CAS account to log in using the service. #. TRANS: "[CAS login]" is a link description. (%%action.caslogin%%) is the URL. #. TRANS: These two elements may not be separated. -#: CasAuthenticationPlugin.php:104 +#: CasAuthenticationPlugin.php:83 #, php-format msgid "(Have an account with CAS? Try our [CAS login](%%action.caslogin%%)!)" msgstr "" #. TRANS: Exception thrown when the CAS Authentication plugin has been configured incorrectly. -#: CasAuthenticationPlugin.php:132 +#: CasAuthenticationPlugin.php:111 msgid "Specifying a server is required." msgstr "" #. TRANS: Exception thrown when the CAS Authentication plugin has been configured incorrectly. -#: CasAuthenticationPlugin.php:136 +#: CasAuthenticationPlugin.php:115 msgid "Specifying a port is required." msgstr "" #. TRANS: Exception thrown when the CAS Authentication plugin has been configured incorrectly. -#: CasAuthenticationPlugin.php:140 +#: CasAuthenticationPlugin.php:119 msgid "Specifying a path is required." msgstr "" #. TRANS: Plugin description. CAS is Central Authentication Service. -#: CasAuthenticationPlugin.php:161 +#: CasAuthenticationPlugin.php:140 msgid "" "The CAS Authentication plugin allows for StatusNet to handle authentication " "through CAS (Central Authentication Service)." diff --git a/plugins/ChooseTheme/locale/ChooseTheme.pot b/plugins/ChooseTheme/locale/ChooseTheme.pot index 1ef9f84aae..961a84cb5d 100644 --- a/plugins/ChooseTheme/locale/ChooseTheme.pot +++ b/plugins/ChooseTheme/locale/ChooseTheme.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:51+0100\n" +"POT-Creation-Date: 2020-08-04 01:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,20 +17,6 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#. TRANS: Module description. -#: ChooseThemeModule.php:44 -msgid "Allowing user to select the preferred theme." -msgstr "" - -#: ChooseThemeModule.php:63 -msgctxt "MENU" -msgid "Theme" -msgstr "" - -#: ChooseThemeModule.php:65 -msgid "Choose Theme" -msgstr "" - #. TRANS: Page title. #: actions/choosethemesettings.php:37 msgid "Choose theme settings" @@ -48,3 +34,19 @@ msgstr "" #: actions/choosethemesettings.php:138 msgid "Select a theme" msgstr "" + +#. TRANS: Module description. +#: ChooseThemePlugin.php:44 +msgid "Allowing user to select the preferred theme." +msgstr "" + +#. TRANS: Poll plugin menu item on user settings page. +#: ChooseThemePlugin.php:63 +msgctxt "MENU" +msgid "Theme" +msgstr "" + +#. TRANS: Poll plugin tooltip for user settings menu item. +#: ChooseThemePlugin.php:65 +msgid "Choose Theme" +msgstr "" diff --git a/plugins/ClientSideShorten/locale/ClientSideShorten.pot b/plugins/ClientSideShorten/locale/ClientSideShorten.pot index 09039af767..e3bddf0dc9 100644 --- a/plugins/ClientSideShorten/locale/ClientSideShorten.pot +++ b/plugins/ClientSideShorten/locale/ClientSideShorten.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:51+0100\n" +"POT-Creation-Date: 2020-08-04 01:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,14 +17,14 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" +#. TRANS: Client exception thrown when a text argument is not present. +#: actions/shorten.php:56 +msgid "\"text\" argument must be specified." +msgstr "" + #. TRANS: Plugin description. #: ClientSideShortenPlugin.php:67 msgid "" "ClientSideShorten causes the web interface's notice form to automatically " "shorten URLs as they entered, and before the notice is submitted." msgstr "" - -#. TRANS: Client exception thrown when a text argument is not present. -#: actions/shorten.php:56 -msgid "\"text\" argument must be specified." -msgstr "" diff --git a/plugins/Comet/locale/Comet.pot b/plugins/Comet/locale/Comet.pot index 7cc4244601..0e4621ad43 100644 --- a/plugins/Comet/locale/Comet.pot +++ b/plugins/Comet/locale/Comet.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:51+0100\n" +"POT-Creation-Date: 2020-08-04 01:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -19,6 +19,6 @@ msgstr "" #. TRANS: Plugin description message. Bayeux is a protocol for transporting asynchronous messages #. TRANS: and Comet is a web application model. -#: CometPlugin.php:118 +#: CometPlugin.php:123 msgid "Plugin to make updates using Comet and Bayeux." msgstr "" diff --git a/plugins/ConversationTree/locale/ConversationTree.pot b/plugins/ConversationTree/locale/ConversationTree.pot index 46a163ac83..b78ea77f22 100644 --- a/plugins/ConversationTree/locale/ConversationTree.pot +++ b/plugins/ConversationTree/locale/ConversationTree.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:51+0100\n" +"POT-Creation-Date: 2020-08-04 01:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,7 +17,7 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#. TRANS: Plugin description. -#: ConversationTreePlugin.php:44 +#. TRANS: Module description. +#: ConversationTreePlugin.php:50 msgid "Enables conversation tree view." msgstr "" diff --git a/plugins/Cronish/locale/Cronish.pot b/plugins/Cronish/locale/Cronish.pot index f15eb5ea52..660a073182 100644 --- a/plugins/Cronish/locale/Cronish.pot +++ b/plugins/Cronish/locale/Cronish.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:51+0100\n" +"POT-Creation-Date: 2020-08-04 01:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/DBQueue/locale/DBQueue.pot b/plugins/DBQueue/locale/DBQueue.pot new file mode 100644 index 0000000000..9f83e44977 --- /dev/null +++ b/plugins/DBQueue/locale/DBQueue.pot @@ -0,0 +1,23 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-08-04 01:05+0100\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#. TRANS: Plugin description. +#: DBQueuePlugin.php:48 +msgid "Plugin using the database as a backend for GNU social queues" +msgstr "" diff --git a/plugins/DefaultLayout/locale/DefaultLayout.pot b/plugins/DefaultLayout/locale/DefaultLayout.pot index 54a55095c3..84b8a830b6 100644 --- a/plugins/DefaultLayout/locale/DefaultLayout.pot +++ b/plugins/DefaultLayout/locale/DefaultLayout.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:51+0100\n" +"POT-Creation-Date: 2020-08-04 01:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/Diaspora/locale/Diaspora.pot b/plugins/Diaspora/locale/Diaspora.pot index cc924767a0..1b0df822c3 100644 --- a/plugins/Diaspora/locale/Diaspora.pot +++ b/plugins/Diaspora/locale/Diaspora.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:51+0100\n" +"POT-Creation-Date: 2020-08-04 01:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/DirectMessage/locale/DirectMessage.pot b/plugins/DirectMessage/locale/DirectMessage.pot index 649f062d91..5dd1a38ed1 100644 --- a/plugins/DirectMessage/locale/DirectMessage.pot +++ b/plugins/DirectMessage/locale/DirectMessage.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-21 10:51+0100\n" +"POT-Creation-Date: 2020-08-04 01:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,21 +18,34 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" -#. TRANS: Menu item in personal group navigation menu. -#: DirectMessagePlugin.php:134 -msgctxt "MENU" -msgid "Messages" +#. TRANS: A possible notice source (web interface). +#: lib/messagelistitem.php:127 +msgctxt "SOURCE" +msgid "web" msgstr "" -#. TRANS: Link text for link on user profile. -#: DirectMessagePlugin.php:167 -msgctxt "BUTTON" -msgid "Message" +#. TRANS: A possible notice source (XMPP). +#: lib/messagelistitem.php:129 +msgctxt "SOURCE" +msgid "xmpp" msgstr "" -#. TRANS: Plugin description. -#: DirectMessagePlugin.php:223 -msgid "Direct Message to other local users." +#. TRANS: A possible notice source (e-mail). +#: lib/messagelistitem.php:131 +msgctxt "SOURCE" +msgid "mail" +msgstr "" + +#. TRANS: A possible notice source (OpenMicroBlogging). +#: lib/messagelistitem.php:133 +msgctxt "SOURCE" +msgid "omb" +msgstr "" + +#. TRANS: A possible notice source (Application Programming Interface). +#: lib/messagelistitem.php:135 +msgctxt "SOURCE" +msgid "api" msgstr "" #. TRANS: Form legend for direct notice. @@ -82,35 +95,14 @@ msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d." msgstr[0] "" msgstr[1] "" -#. TRANS: A possible notice source (web interface). -#: lib/messagelistitem.php:127 -msgctxt "SOURCE" -msgid "web" -msgstr "" - -#. TRANS: A possible notice source (XMPP). -#: lib/messagelistitem.php:129 -msgctxt "SOURCE" -msgid "xmpp" -msgstr "" - -#. TRANS: A possible notice source (e-mail). -#: lib/messagelistitem.php:131 -msgctxt "SOURCE" -msgid "mail" -msgstr "" - -#. TRANS: A possible notice source (OpenMicroBlogging). -#: lib/messagelistitem.php:133 -msgctxt "SOURCE" -msgid "omb" -msgstr "" - -#. TRANS: A possible notice source (Application Programming Interface). -#: lib/messagelistitem.php:135 -msgctxt "SOURCE" -msgid "api" -msgstr "" +#. TRANS: Form validation error displayed when message content is too long. +#. TRANS: %d is the maximum number of characters for a message. +#: actions/newmessage.php:99 actions/apidirectmessagenew.php:99 +#, php-format +msgid "That's too long. Maximum message size is %d character." +msgid_plural "That's too long. Maximum message size is %d characters." +msgstr[0] "" +msgstr[1] "" #. TRANS: Title for outbox for any but the fist page. #. TRANS: %1$s is the user nickname, %2$d is the page number. @@ -159,15 +151,6 @@ msgstr "" msgid "Message from %1$s on %2$s" msgstr "" -#. TRANS: Form validation error displayed when message content is too long. -#. TRANS: %d is the maximum number of characters for a message. -#: actions/apidirectmessagenew.php:104 actions/newmessage.php:99 -#, php-format -msgid "That's too long. Maximum message size is %d character." -msgid_plural "That's too long. Maximum message size is %d characters." -msgstr[0] "" -msgstr[1] "" - #. TRANS: Title for all but the first page of the inbox page. #. TRANS: %1$s is the user's nickname, %2$s is the page number. #: actions/inbox.php:50 @@ -186,3 +169,20 @@ msgstr "" #: actions/inbox.php:85 msgid "This is your inbox, which lists your incoming private messages." msgstr "" + +#. TRANS: Menu item in personal group navigation menu. +#: DirectMessagePlugin.php:149 +msgctxt "MENU" +msgid "Messages" +msgstr "" + +#. TRANS: Link text for link on user profile. +#: DirectMessagePlugin.php:184 +msgctxt "BUTTON" +msgid "Message" +msgstr "" + +#. TRANS: Plugin description. +#: DirectMessagePlugin.php:246 +msgid "Direct Message to other local users." +msgstr "" diff --git a/plugins/DirectionDetector/locale/DirectionDetector.pot b/plugins/DirectionDetector/locale/DirectionDetector.pot index 6923c61b57..4e7458d01e 100644 --- a/plugins/DirectionDetector/locale/DirectionDetector.pot +++ b/plugins/DirectionDetector/locale/DirectionDetector.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:51+0100\n" +"POT-Creation-Date: 2020-08-04 01:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/Directory/locale/Directory.pot b/plugins/Directory/locale/Directory.pot index dcaf2c305c..19e991b22a 100644 --- a/plugins/Directory/locale/Directory.pot +++ b/plugins/Directory/locale/Directory.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:51+0100\n" +"POT-Creation-Date: 2020-08-04 01:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,22 +17,6 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#. TRANS: Menu item text for user directory. -#: DirectoryPlugin.php:223 -msgctxt "MENU" -msgid "People" -msgstr "" - -#. TRANS: Menu item title for user directory. -#: DirectoryPlugin.php:225 -msgid "People." -msgstr "" - -#. TRANS: Plugin description. -#: DirectoryPlugin.php:244 -msgid "Add a user directory." -msgstr "" - #. TRANS: Column header in table for user nickname. #: lib/sortablegrouplist.php:51 lib/sortablesubscriptionlist.php:51 msgid "Nickname" @@ -181,3 +165,19 @@ msgstr "" #, php-format msgid "No users starting with %s" msgstr "" + +#. TRANS: Menu item text for user directory. +#: DirectoryPlugin.php:223 +msgctxt "MENU" +msgid "People" +msgstr "" + +#. TRANS: Menu item title for user directory. +#: DirectoryPlugin.php:225 +msgid "People." +msgstr "" + +#. TRANS: Plugin description. +#: DirectoryPlugin.php:244 +msgid "Add a user directory." +msgstr "" diff --git a/plugins/DiskCache/locale/DiskCache.pot b/plugins/DiskCache/locale/DiskCache.pot index b95e63ce57..097db49181 100644 --- a/plugins/DiskCache/locale/DiskCache.pot +++ b/plugins/DiskCache/locale/DiskCache.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:51+0100\n" +"POT-Creation-Date: 2020-08-04 01:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,6 +18,6 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" #. TRANS: Plugin description. -#: DiskCachePlugin.php:174 +#: DiskCachePlugin.php:169 msgid "Plugin to implement cache interface with disk files." msgstr "" diff --git a/plugins/DomainStatusNetwork/locale/DomainStatusNetwork.pot b/plugins/DomainStatusNetwork/locale/DomainStatusNetwork.pot index db4022284c..ad70a4a487 100644 --- a/plugins/DomainStatusNetwork/locale/DomainStatusNetwork.pot +++ b/plugins/DomainStatusNetwork/locale/DomainStatusNetwork.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:51+0100\n" +"POT-Creation-Date: 2020-08-04 01:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/DomainWhitelist/locale/DomainWhitelist.pot b/plugins/DomainWhitelist/locale/DomainWhitelist.pot index 28cc31ce40..1c40c65195 100644 --- a/plugins/DomainWhitelist/locale/DomainWhitelist.pot +++ b/plugins/DomainWhitelist/locale/DomainWhitelist.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:51+0100\n" +"POT-Creation-Date: 2020-08-04 01:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,6 +17,37 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" +#. TRANS: Form legend. +#: forms/whitelistinvite.php:89 +msgid "Invite collegues" +msgstr "" + +#. TRANS: Field label for a personal message to send to invitees. +#: forms/whitelistinvite.php:106 +msgid "Personal message" +msgstr "" + +#. TRANS: Field title for a personal message to send to invitees. +#: forms/whitelistinvite.php:109 +msgid "Optionally add a personal message to the invitation." +msgstr "" + +#. TRANS: Link description to action to add another item to a list. +#: forms/whitelistinvite.php:158 +msgid "Add another item" +msgstr "" + +#. TRANS: Send button for inviting friends. +#: forms/whitelistinvite.php:172 +msgctxt "BUTTON" +msgid "Send" +msgstr "" + +#. TRANS: Submit button title. +#: forms/whitelistinvite.php:175 +msgid "Send invitations." +msgstr "" + #. TRANS: Client exception thrown when a given e-mailaddress is not in the domain whitelist. #. TRANS: %s is a whitelisted e-mail domain. #: DomainWhitelistPlugin.php:92 @@ -56,34 +87,3 @@ msgstr "" #: DomainWhitelistPlugin.php:280 msgid "Restrict domains for email users." msgstr "" - -#. TRANS: Form legend. -#: forms/whitelistinvite.php:89 -msgid "Invite collegues" -msgstr "" - -#. TRANS: Field label for a personal message to send to invitees. -#: forms/whitelistinvite.php:106 -msgid "Personal message" -msgstr "" - -#. TRANS: Field title for a personal message to send to invitees. -#: forms/whitelistinvite.php:109 -msgid "Optionally add a personal message to the invitation." -msgstr "" - -#. TRANS: Link description to action to add another item to a list. -#: forms/whitelistinvite.php:158 -msgid "Add another item" -msgstr "" - -#. TRANS: Send button for inviting friends. -#: forms/whitelistinvite.php:172 -msgctxt "BUTTON" -msgid "Send" -msgstr "" - -#. TRANS: Submit button title. -#: forms/whitelistinvite.php:175 -msgid "Send invitations." -msgstr "" diff --git a/plugins/EmailAuthentication/locale/EmailAuthentication.pot b/plugins/EmailAuthentication/locale/EmailAuthentication.pot index a27d30dc70..93c1a20030 100644 --- a/plugins/EmailAuthentication/locale/EmailAuthentication.pot +++ b/plugins/EmailAuthentication/locale/EmailAuthentication.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:51+0100\n" +"POT-Creation-Date: 2020-08-04 01:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/EmailRegistration/locale/EmailRegistration.pot b/plugins/EmailRegistration/locale/EmailRegistration.pot index 9112c6a55c..7563bbe8bb 100644 --- a/plugins/EmailRegistration/locale/EmailRegistration.pot +++ b/plugins/EmailRegistration/locale/EmailRegistration.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:51+0100\n" +"POT-Creation-Date: 2020-08-04 01:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,6 +17,68 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" +#. TRANS: Form instructions. +#: forms/emailregistration.php:61 +msgid "Enter your email address to register for an account." +msgstr "" + +#. TRANS: Field label on form for registering an account. +#: forms/emailregistration.php:69 +msgctxt "LABEL" +msgid "E-mail address" +msgstr "" + +#. TRANS: Button text for registering an account. +#. TRANS: Button text for action to register. +#: forms/emailregistration.php:93 forms/confirmregistration.php:164 +msgctxt "BUTTON" +msgid "Register" +msgstr "" + +#. TRANS: Form instructions. +#: forms/confirmregistration.php:67 +msgid "Enter a password to confirm your new account." +msgstr "" + +#. TRANS: Field label in e-mail registration form. +#: forms/confirmregistration.php:80 +msgctxt "LABEL" +msgid "User name" +msgstr "" + +#. TRANS: Field label. +#: forms/confirmregistration.php:92 +msgid "Email address" +msgstr "" + +#. TRANS: Field label on account registration page. +#: forms/confirmregistration.php:104 +msgid "Password" +msgstr "" + +#. TRANS: Field title on account registration page. +#: forms/confirmregistration.php:106 +msgid "6 or more characters." +msgstr "" + +#. TRANS: Field label on account registration page. In this field the password has to be entered a second time. +#: forms/confirmregistration.php:111 +msgctxt "PASSWORD" +msgid "Confirm" +msgstr "" + +#. TRANS: Field title on account registration page. +#: forms/confirmregistration.php:113 +msgid "Same as password above." +msgstr "" + +#: forms/confirmregistration.php:134 +#, php-format +msgid "" +"I agree to the Terms of service and Privacy policy of this site." +msgstr "" + #. TRANS: Error text when trying to register with an already registered e-mail address. #. TRANS: %s is the URL to recover password at. #: EmailRegistrationPlugin.php:94 @@ -138,65 +200,3 @@ msgid "" "%2$s\n" "If it was not you, you can safely ignore this message." msgstr "" - -#. TRANS: Form instructions. -#: forms/confirmregistration.php:67 -msgid "Enter a password to confirm your new account." -msgstr "" - -#. TRANS: Field label in e-mail registration form. -#: forms/confirmregistration.php:80 -msgctxt "LABEL" -msgid "User name" -msgstr "" - -#. TRANS: Field label. -#: forms/confirmregistration.php:92 -msgid "Email address" -msgstr "" - -#. TRANS: Field label on account registration page. -#: forms/confirmregistration.php:104 -msgid "Password" -msgstr "" - -#. TRANS: Field title on account registration page. -#: forms/confirmregistration.php:106 -msgid "6 or more characters." -msgstr "" - -#. TRANS: Field label on account registration page. In this field the password has to be entered a second time. -#: forms/confirmregistration.php:111 -msgctxt "PASSWORD" -msgid "Confirm" -msgstr "" - -#. TRANS: Field title on account registration page. -#: forms/confirmregistration.php:113 -msgid "Same as password above." -msgstr "" - -#: forms/confirmregistration.php:134 -#, php-format -msgid "" -"I agree to the Terms of service and Privacy policy of this site." -msgstr "" - -#. TRANS: Button text for action to register. -#. TRANS: Button text for registering an account. -#: forms/confirmregistration.php:164 forms/emailregistration.php:93 -msgctxt "BUTTON" -msgid "Register" -msgstr "" - -#. TRANS: Form instructions. -#: forms/emailregistration.php:61 -msgid "Enter your email address to register for an account." -msgstr "" - -#. TRANS: Field label on form for registering an account. -#: forms/emailregistration.php:69 -msgctxt "LABEL" -msgid "E-mail address" -msgstr "" diff --git a/plugins/EmailReminder/locale/EmailReminder.pot b/plugins/EmailReminder/locale/EmailReminder.pot index b7af904890..69b7e0cdc6 100644 --- a/plugins/EmailReminder/locale/EmailReminder.pot +++ b/plugins/EmailReminder/locale/EmailReminder.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:51+0100\n" +"POT-Creation-Date: 2020-08-04 01:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,9 +17,9 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#. TRANS: Plugin description. -#: EmailReminderPlugin.php:192 -msgid "Send email reminders for various things." +#. TRANS: Server exception thrown when a reminder record could not be inserted into the database. +#: classes/Email_reminder.php:88 +msgid "Database error inserting reminder record." msgstr "" #. TRANS: Subject for reminder e-mail. @@ -50,7 +50,11 @@ msgstr "" msgid "Final reminder - you have been invited to join %s!" msgstr "" -#. TRANS: Server exception thrown when a reminder record could not be inserted into the database. -#: classes/Email_reminder.php:88 -msgid "Database error inserting reminder record." +#: scripts/sendemailreminder.php:68 +msgid "Unknown reminder type: " +msgstr "" + +#. TRANS: Plugin description. +#: EmailReminderPlugin.php:192 +msgid "Send email reminders for various things." msgstr "" diff --git a/plugins/EmailSummary/locale/EmailSummary.pot b/plugins/EmailSummary/locale/EmailSummary.pot index 0e8be3bd9b..97a4a88ddf 100644 --- a/plugins/EmailSummary/locale/EmailSummary.pot +++ b/plugins/EmailSummary/locale/EmailSummary.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:51+0100\n" +"POT-Creation-Date: 2020-08-04 01:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,16 +17,6 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#. TRANS: Plugin description. -#: EmailSummaryPlugin.php:78 -msgid "Send an email summary of the inbox to users." -msgstr "" - -#. TRANS: Checkbox label in e-mail preferences form. -#: EmailSummaryPlugin.php:109 -msgid "Send me a periodic summary of updates from my network" -msgstr "" - #. TRANS: Subject for e-mail. #: lib/useremailsummaryhandler.php:123 #, php-format @@ -51,3 +41,13 @@ msgstr "" #, php-format msgid "change your email settings for %2$s" msgstr "" + +#. TRANS: Plugin description. +#: EmailSummaryPlugin.php:78 +msgid "Send an email summary of the inbox to users." +msgstr "" + +#. TRANS: Checkbox label in e-mail preferences form. +#: EmailSummaryPlugin.php:109 +msgid "Send me a periodic summary of updates from my network" +msgstr "" diff --git a/plugins/Embed/locale/Embed.pot b/plugins/Embed/locale/Embed.pot index 199d4849c0..90e09a9c0e 100644 --- a/plugins/Embed/locale/Embed.pot +++ b/plugins/Embed/locale/Embed.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:51+0100\n" +"POT-Creation-Date: 2020-08-04 01:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,13 +17,13 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#. TRANS: Plugin description. -#: EmbedPlugin.php:633 -msgid "Plugin for using and representing oEmbed, OpenGraph and other data." -msgstr "" - #. TRANS: Exception. %s is the URL we tried to GET. #: lib/embedhelper.php:87 #, php-format msgid "Could not GET URL %s." msgstr "" + +#. TRANS: Plugin description. +#: EmbedPlugin.php:687 +msgid "Plugin for using and representing oEmbed, OpenGraph and other data." +msgstr "" diff --git a/plugins/Event/locale/Event.pot b/plugins/Event/locale/Event.pot index a0e608931a..4aca16e3d6 100644 --- a/plugins/Event/locale/Event.pot +++ b/plugins/Event/locale/Event.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:51+0100\n" +"POT-Creation-Date: 2020-08-04 01:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,168 +17,19 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#. TRANS: 0 minutes abbreviated. Used in a list. -#: lib/eventtimelist.php:85 -msgid "(0 min)" -msgstr "" - -#. TRANS: 30 minutes abbreviated. Used in a list. -#: lib/eventtimelist.php:89 -msgid "(30 min)" -msgstr "" - -#. TRANS: 1 hour. Used in a list. -#: lib/eventtimelist.php:93 -msgid "(1 hour)" -msgstr "" - -#: lib/eventtimelist.php:98 -#, php-format -msgid "(%.1f hours)" -msgstr "" - -#: lib/eventtimelist.php:99 -#, php-format -msgid "(%d hours)" -msgstr "" - -#. TRANS: Title for new event form. -#: actions/newevent.php:55 -msgctxt "TITLE" -msgid "New event" -msgstr "" - -#. TRANS: Client exception thrown when trying to post an event without providing a title. -#: actions/newevent.php:64 -msgid "Event must have a title." -msgstr "" - -#. TRANS: Client exception thrown when trying to post an event without providing a start date. -#: actions/newevent.php:75 -msgid "Start date required." -msgstr "" - -#. TRANS: Client exception thrown when trying to post an event without providing a start time. -#: actions/newevent.php:80 -msgid "Event must have a start time." -msgstr "" - -#. TRANS: Client exception thrown when trying to post an event with a date that cannot be processed. -#. TRANS: %s is the data that could not be processed. -#: actions/newevent.php:87 actions/newevent.php:105 -#, php-format -msgid "Could not parse date %s." -msgstr "" - -#. TRANS: Client exception thrown when trying to post an event without providing an end date. -#: actions/newevent.php:93 -msgid "End date required." -msgstr "" - -#. TRANS: Client exception thrown when trying to post an event without providing an end time. -#: actions/newevent.php:98 -msgid "Event must have an end time." -msgstr "" - -#. TRANS: Client exception thrown when trying to post an event with an invalid (non-empty) URL. -#: actions/newevent.php:111 -msgid "An event URL must be a valid HTTP/HTTPS link." -msgstr "" - -#: actions/newevent.php:164 -msgid "Saved the event." -msgstr "" - -#. TRANS: Page title for sample plugin. %s is a user nickname. -#: actions/events.php:20 -#, php-format -msgid "%s's happenings" -msgstr "" - -#. TRANS: Error message displayed when trying to perform an action that requires a logged in user. -#: actions/timelist.php:65 -msgid "Not logged in." -msgstr "" - -#. TRANS: Client error when submitting a form with unexpected information. -#: actions/timelist.php:72 -msgid "Unexpected form submission." -msgstr "" - -#. TRANS: Client error displayed when using an action in a non-AJAX way. -#: actions/timelist.php:80 -msgid "This action is AJAX only." -msgstr "" - -#. TRANS: Client exception thrown when referring to a non-existing RSVP. -#. TRANS: RSVP stands for "Please reply". -#: actions/showrsvp.php:61 actions/showrsvp.php:77 -msgid "No such RSVP." -msgstr "" - -#. TRANS: Client exception thrown when referring to a non-existing event. -#: actions/showrsvp.php:68 -msgid "No such event." -msgstr "" - -#. TRANS: Title for event. -#. TRANS: %1$s is a user nickname, %2$s is an event title. -#: actions/showrsvp.php:94 -#, php-format -msgid "%1$s's RSVP for \"%2$s\"" -msgstr "" - -#. TRANS: Title for RSVP ("please respond") action. -#: actions/rsvp.php:52 -msgctxt "TITLE" -msgid "New RSVP" -msgstr "" - -#: actions/rsvp.php:81 -msgid "Cancelled RSVP" -msgstr "" - -#: actions/rsvp.php:91 -msgid "RSVP" -msgstr "" - -#: actions/rsvp.php:102 -msgid "Saved RSVP" -msgstr "" - -#. TRANS: Exception thrown when there are too many activity objects. -#: classes/Happening.php:108 -msgid "Too many activity objects." -msgstr "" - -#. TRANS: Exception thrown when event plugin comes across a non-event type object. -#: classes/Happening.php:113 -msgid "Wrong type for object." -msgstr "" - -#. TRANS: Exception thrown when has no start date -#: classes/Happening.php:146 -msgid "No start date for event." -msgstr "" - -#. TRANS: Exception thrown when has no end date -#: classes/Happening.php:150 -msgid "No end date for event." -msgstr "" - #. TRANS: Client exception thrown when trying to save an already existing RSVP ("please respond"). -#: classes/RSVP.php:143 +#: classes/RSVP.php:145 msgid "RSVP already exists." msgstr "" #. TRANS: Exception thrown when requesting an undefined verb for RSVP. -#: classes/RSVP.php:196 +#: classes/RSVP.php:198 #, php-format msgid "Unknown verb \"%s\"." msgstr "" #. TRANS: Exception thrown when requesting an undefined code for RSVP. -#: classes/RSVP.php:217 +#: classes/RSVP.php:219 #, php-format msgid "Unknown code \"%s\"." msgstr "" @@ -186,7 +37,7 @@ msgstr "" #. TRANS: HTML version of an RSVP ("please respond") status for a user. #. TRANS: %1$s is a profile URL, %2$s a profile name, #. TRANS: %3$s is an event URL, %4$s an event title. -#: classes/RSVP.php:321 +#: classes/RSVP.php:327 #, php-format msgid "" "%2$s is attending %2$s is not attending " @@ -206,7 +57,7 @@ msgstr "" #. TRANS: HTML version of an RSVP ("please respond") status for a user. #. TRANS: %1$s is a profile URL, %2$s a profile name, #. TRANS: %3$s is an event URL, %4$s an event title. -#: classes/RSVP.php:333 +#: classes/RSVP.php:339 #, php-format msgid "" "%2$s might attend \n" "Language-Team: LANGUAGE \n" @@ -17,33 +17,12 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#. TRANS: Module description. -#: ExtendedProfileModule.php:46 -msgid "UI extensions for additional profile fields." +#: classes/GNUsocialProfileExtensionResponse.php:74 +msgid "Error creating new response." msgstr "" -#. TRANS: Link text on user profile page leading to extended profile page. -#: ExtendedProfileModule.php:100 -msgid "More details..." -msgstr "" - -#. TRANS: Extended profile plugin menu item on user settings page. -#: ExtendedProfileModule.php:119 -msgctxt "MENU" -msgid "Full Profile" -msgstr "" - -#. TRANS: Extended profile plugin tooltip for user settings menu item. -#: ExtendedProfileModule.php:121 -msgid "Change your extended profile settings" -msgstr "" - -#: ExtendedProfileModule.php:206 -msgid "Profile Fields" -msgstr "" - -#: ExtendedProfileModule.php:207 -msgid "Custom profile fields" +#: classes/GNUsocialProfileExtensionField.php:75 +msgid "Error creating new field." msgstr "" #. TRANS: Field label for extended profile properties. @@ -223,60 +202,6 @@ msgstr "" msgid "Save details" msgstr "" -#. TRANS: Title for extended profile settings. -#. TRANS: %%site.name%% is the name of the site. -#: actions/profiledetailsettings.php:35 -msgid "Extended profile settings" -msgstr "" - -#. TRANS: Message given submitting a form with an unknown action. -#: actions/profiledetailsettings.php:59 -msgid "Unexpected form submission." -msgstr "" - -#. TRANS: Success message after saving extended profile details. -#: actions/profiledetailsettings.php:108 -msgid "Details saved." -msgstr "" - -#. TRANS: Exception thrown when no date was entered in a required date field. -#. TRANS: %s is the field name. -#: actions/profiledetailsettings.php:118 -#, php-format -msgid "You must supply a date for \"%s\"." -msgstr "" - -#. TRANS: Exception thrown on incorrect data input. -#. TRANS: %1$s is a field name, %2$s is the incorrect input. -#: actions/profiledetailsettings.php:130 -#, php-format -msgid "Invalid date entered for \"%1$s\": %2$s." -msgstr "" - -#. TRANS: Exception thrown when entering an invalid URL. -#. TRANS: %s is the invalid URL. -#: actions/profiledetailsettings.php:247 -#, php-format -msgid "Invalid URL: %s." -msgstr "" - -#. TRANS: Server error displayed when a field could not be saved in the database. -#: actions/profiledetailsettings.php:490 actions/profiledetailsettings.php:503 -msgid "Could not save profile details." -msgstr "" - -#. TRANS: Validation error in form for profile settings. -#. TRANS: %s is an invalid tag. -#: actions/profiledetailsettings.php:545 -#, php-format -msgid "Invalid tag: \"%s\"." -msgstr "" - -#. TRANS: Server error thrown when user profile settings could not be saved. -#: actions/profiledetailsettings.php:584 -msgid "Could not save profile." -msgstr "" - #: actions/profilefieldsadminpanel.php:39 msgid "Profile fields" msgstr "" @@ -368,10 +293,85 @@ msgstr "" msgid "Edit" msgstr "" -#: classes/GNUsocialProfileExtensionField.php:75 -msgid "Error creating new field." +#. TRANS: Title for extended profile settings. +#. TRANS: %%site.name%% is the name of the site. +#: actions/profiledetailsettings.php:35 +msgid "Extended profile settings" msgstr "" -#: classes/GNUsocialProfileExtensionResponse.php:73 -msgid "Error creating new response." +#. TRANS: Message given submitting a form with an unknown action. +#: actions/profiledetailsettings.php:45 +msgid "Unexpected form submission." +msgstr "" + +#. TRANS: Success message after saving extended profile details. +#: actions/profiledetailsettings.php:86 +msgid "Details saved." +msgstr "" + +#. TRANS: Exception thrown when no date was entered in a required date field. +#. TRANS: %s is the field name. +#: actions/profiledetailsettings.php:96 +#, php-format +msgid "You must supply a date for \"%s\"." +msgstr "" + +#. TRANS: Exception thrown on incorrect data input. +#. TRANS: %1$s is a field name, %2$s is the incorrect input. +#: actions/profiledetailsettings.php:108 +#, php-format +msgid "Invalid date entered for \"%1$s\": %2$s." +msgstr "" + +#. TRANS: Exception thrown when entering an invalid URL. +#. TRANS: %s is the invalid URL. +#: actions/profiledetailsettings.php:228 +#, php-format +msgid "Invalid URL: %s." +msgstr "" + +#. TRANS: Server error displayed when a field could not be saved in the database. +#: actions/profiledetailsettings.php:471 actions/profiledetailsettings.php:483 +msgid "Could not save profile details." +msgstr "" + +#. TRANS: Validation error in form for profile settings. +#. TRANS: %s is an invalid tag. +#: actions/profiledetailsettings.php:525 +#, php-format +msgid "Invalid tag: \"%s\"." +msgstr "" + +#. TRANS: Server error thrown when user profile settings could not be saved. +#: actions/profiledetailsettings.php:564 +msgid "Could not save profile." +msgstr "" + +#. TRANS: Module description. +#: ExtendedProfilePlugin.php:46 +msgid "UI extensions for additional profile fields." +msgstr "" + +#. TRANS: Link text on user profile page leading to extended profile page. +#: ExtendedProfilePlugin.php:100 +msgid "More details..." +msgstr "" + +#. TRANS: Extended profile plugin menu item on user settings page. +#: ExtendedProfilePlugin.php:119 +msgctxt "MENU" +msgid "Full Profile" +msgstr "" + +#. TRANS: Extended profile plugin tooltip for user settings menu item. +#: ExtendedProfilePlugin.php:121 +msgid "Change your extended profile settings" +msgstr "" + +#: ExtendedProfilePlugin.php:206 +msgid "Profile Fields" +msgstr "" + +#: ExtendedProfilePlugin.php:207 +msgid "Custom profile fields" msgstr "" diff --git a/plugins/FeedPoller/locale/FeedPoller.pot b/plugins/FeedPoller/locale/FeedPoller.pot index feea417a66..07e568dfe5 100644 --- a/plugins/FeedPoller/locale/FeedPoller.pot +++ b/plugins/FeedPoller/locale/FeedPoller.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:51+0100\n" +"POT-Creation-Date: 2020-08-04 01:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/FetchRemote/locale/FetchRemote.pot b/plugins/FetchRemote/locale/FetchRemote.pot index 3bb51b5b5c..7d2fef933c 100644 --- a/plugins/FetchRemote/locale/FetchRemote.pot +++ b/plugins/FetchRemote/locale/FetchRemote.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:51+0100\n" +"POT-Creation-Date: 2020-08-04 01:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/FollowEveryone/locale/FollowEveryone.pot b/plugins/FollowEveryone/locale/FollowEveryone.pot index f703ba70ff..dd638eced0 100644 --- a/plugins/FollowEveryone/locale/FollowEveryone.pot +++ b/plugins/FollowEveryone/locale/FollowEveryone.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:51+0100\n" +"POT-Creation-Date: 2020-08-04 01:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,12 +17,11 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#. TRANS: Checkbox label in form for profile settings. -#: FollowEveryonePlugin.php:136 +#: FollowEveryonePlugin.php:129 msgid "Follow everyone" msgstr "" #. TRANS: Plugin description. -#: FollowEveryonePlugin.php:178 +#: FollowEveryonePlugin.php:172 msgid "New users follow everyone at registration and are followed in return." msgstr "" diff --git a/plugins/ForceGroup/locale/ForceGroup.pot b/plugins/ForceGroup/locale/ForceGroup.pot index c646c391d9..4c185bf58c 100644 --- a/plugins/ForceGroup/locale/ForceGroup.pot +++ b/plugins/ForceGroup/locale/ForceGroup.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:51+0100\n" +"POT-Creation-Date: 2020-08-04 01:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,15 +17,13 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#. TRANS: Server exception. -#. TRANS: %1$s is a user nickname, %2$s is a group nickname. -#: ForceGroupModule.php:107 +#: ForceGroupPlugin.php:107 #, php-format msgid "Could not join user %1$s to group %2$s." msgstr "" #. TRANS: Module description. -#: ForceGroupModule.php:137 +#: ForceGroupPlugin.php:137 msgid "" "Allows forced group memberships and forces all notices to appear in groups " "that users were forced in." diff --git a/plugins/Geonames/locale/Geonames.pot b/plugins/Geonames/locale/Geonames.pot index 830c8a90d4..7c4c313362 100644 --- a/plugins/Geonames/locale/Geonames.pot +++ b/plugins/Geonames/locale/Geonames.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:51+0100\n" +"POT-Creation-Date: 2020-08-04 01:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,31 +18,31 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" #. TRANS: Exception thrown when a geo names service is not used because of a recent timeout. -#: GeonamesPlugin.php:441 +#: GeonamesPlugin.php:473 msgid "Skipping due to recent web service timeout." msgstr "" #. TRANS: Exception thrown when a geo names service does not return an expected response. #. TRANS: %s is an HTTP error code. -#: GeonamesPlugin.php:459 +#: GeonamesPlugin.php:491 #, php-format msgid "HTTP error code %s." msgstr "" #. TRANS: Exception thrown when a geo names service returns an empty body. -#: GeonamesPlugin.php:466 +#: GeonamesPlugin.php:498 msgid "Empty HTTP body in response." msgstr "" #. TRANS: Exception thrown when a geo names service return a specific error number and error text. #. TRANS: %1$s is an error code, %2$s is an error message. -#: GeonamesPlugin.php:484 +#: GeonamesPlugin.php:516 #, php-format msgid "Error #%1$s (\"%2$s\")." msgstr "" #. TRANS: Plugin description. -#: GeonamesPlugin.php:500 +#: GeonamesPlugin.php:532 msgid "" "Uses Geonames service to get human-" "readable names for locations based on user-provided lat/long pairs." diff --git a/plugins/GroupFavorited/locale/GroupFavorited.pot b/plugins/GroupFavorited/locale/GroupFavorited.pot index 8be3b56712..3aaac00361 100644 --- a/plugins/GroupFavorited/locale/GroupFavorited.pot +++ b/plugins/GroupFavorited/locale/GroupFavorited.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:51+0100\n" +"POT-Creation-Date: 2020-08-04 01:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,33 +17,32 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#. TRANS: Menu item in the group navigation page. -#: GroupFavoritedPlugin.php:53 -msgctxt "MENU" -msgid "Popular" -msgstr "" - #. TRANS: Tooltip for menu item in the group navigation page. #. TRANS: %s is the nickname of the group. -#: GroupFavoritedPlugin.php:56 +#: GroupFavoritedPlugin.php:63 #, php-format msgctxt "TOOLTIP" msgid "Popular notices in %s group" msgstr "" +#. TRANS: Menu item in the group navigation page. +#: GroupFavoritedPlugin.php:66 +msgctxt "MENU" +msgid "Popular" +msgstr "" + #. TRANS: Plugin description. -#: GroupFavoritedPlugin.php:80 +#: GroupFavoritedPlugin.php:90 msgid "This plugin adds a menu item for popular notices in groups." msgstr "" #. TRANS: %s is a group name. -#: actions/groupfavorited.php:48 +#: actions/groupfavorited.php:42 #, php-format msgid "Popular posts in %s group" msgstr "" -#. TRANS: %1$s is a group name, %2$s is a group number. -#: actions/groupfavorited.php:51 +#: actions/groupfavorited.php:46 #, php-format msgid "Popular posts in %1$s group, page %2$d" msgstr "" diff --git a/plugins/GroupPrivateMessage/locale/GroupPrivateMessage.pot b/plugins/GroupPrivateMessage/locale/GroupPrivateMessage.pot index 279d2aac7c..d4bd524a97 100644 --- a/plugins/GroupPrivateMessage/locale/GroupPrivateMessage.pot +++ b/plugins/GroupPrivateMessage/locale/GroupPrivateMessage.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:51+0100\n" +"POT-Creation-Date: 2020-08-04 01:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,116 +18,6 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" -#. TRANS: Succes message after sending private group message to group %s. -#: lib/groupmessagecommand.php:79 -#, php-format -msgid "Direct message to group %s sent." -msgstr "" - -#. TRANS: Client exception thrown when trying to view group inbox while not logged in. -#: actions/groupinbox.php:68 -msgid "Only for logged-in users." -msgstr "" - -#. TRANS: Client exception thrown when trying to view group inbox for non-existing group. -#. TRANS: Client exception thrown when trying to send a private group message to a non-existing group. -#: actions/groupinbox.php:84 actions/groupinbox.php:91 -#: actions/newgroupmessage.php:92 actions/newgroupmessage.php:99 -msgid "No such group." -msgstr "" - -#. TRANS: Client exception thrown when trying to view group inbox while not a member. -#: actions/groupinbox.php:96 -msgid "Only for members." -msgstr "" - -#. TRANS: Text of group inbox if no private messages were sent to it. -#: actions/groupinbox.php:130 -msgid "This group has not received any private messages." -msgstr "" - -#. TRANS: Title of inbox for group %s. -#: actions/groupinbox.php:174 -#, php-format -msgid "%s group inbox" -msgstr "" - -#. TRANS: Page title for any but first group page. -#. TRANS: %1$s is a group name, $2$s is a page number. -#: actions/groupinbox.php:178 -#, php-format -msgid "%1$s group inbox, page %2$d" -msgstr "" - -#. TRANS: Instructions for user inbox page. -#: actions/groupinbox.php:209 -msgid "" -"This is the group inbox, which lists all incoming private messages for this " -"group." -msgstr "" - -#. TRANS: Client exception thrown when trying to send a private group message while not logged in. -#: actions/newgroupmessage.php:70 -msgid "Must be logged in." -msgstr "" - -#. TRANS: Exception thrown when user %s is not allowed to send a private group message. -#. TRANS: Exception thrown when trying to send group private message without having the right to do that. -#. TRANS: %s is a user nickname. -#: actions/newgroupmessage.php:75 classes/Group_message.php:96 -#, php-format -msgid "User %s is not allowed to send private messages." -msgstr "" - -#. TRANS: Title after sending a private group message. -#: actions/newgroupmessage.php:136 -msgid "Message sent" -msgstr "" - -#. TRANS: Succes text after sending a direct message to group %s. -#: actions/newgroupmessage.php:142 -#, php-format -msgid "Direct message to %s sent." -msgstr "" - -#. TRANS: Title of form for new private group message. -#: actions/newgroupmessage.php:160 -#, php-format -msgid "New message to group %s" -msgstr "" - -#. TRANS: Client exception thrown when trying to view group private messages without being logged in. -#: actions/showgroupmessage.php:71 -msgid "Only logged-in users can view private messages." -msgstr "" - -#. TRANS: Client exception thrown when trying to view a non-existing group private message. -#: actions/showgroupmessage.php:81 -msgid "No such message." -msgstr "" - -#. TRANS: Server exception thrown when trying to view group private messages for a non-exsting group. -#: actions/showgroupmessage.php:88 -msgid "Group not found." -msgstr "" - -#. TRANS: Client exception thrown when trying to view a group private message without being a group member. -#: actions/showgroupmessage.php:93 -msgid "Cannot read message." -msgstr "" - -#. TRANS: Server exception thrown when trying to view a group private message without a sender. -#: actions/showgroupmessage.php:100 -msgid "No sender found." -msgstr "" - -#. TRANS: Title for private group message. -#. TRANS: %1$s is the sender name, %2$s is the group name, %3$s is a timestamp. -#: actions/showgroupmessage.php:123 -#, php-format -msgid "Message from %1$s to group %2$s on %3$s" -msgstr "" - #. TRANS: Exception thrown when trying to set group privacy setting if group %s does not allow private messages. #: classes/Group_privacy_settings.php:110 #, php-format @@ -162,6 +52,40 @@ msgstr "" msgid "Unknown privacy settings for group %s." msgstr "" +#. TRANS: Subject for direct-message notification email. +#. TRANS: %1$s is the sending user's nickname, %2$s is the group nickname. +#: classes/Group_message_profile.php:111 +#, php-format +msgid "New private message from %1$s to group %2$s" +msgstr "" + +#: classes/Group_message_profile.php:118 +#, php-format +msgid "" +"%1$s (%2$s) sent a private message to group %3$s:\n" +"\n" +"------------------------------------------------------\n" +"%4$s\n" +"------------------------------------------------------\n" +"\n" +"You can reply to their message here:\n" +"\n" +"%5$s\n" +"\n" +"Do not reply to this email; it will not get to them.\n" +"\n" +"With kind regards,\n" +"%6$s" +msgstr "" + +#. TRANS: Exception thrown when trying to send group private message without having the right to do that. +#. TRANS: %s is a user nickname. +#. TRANS: Exception thrown when user %s is not allowed to send a private group message. +#: classes/Group_message.php:96 actions/newgroupmessage.php:75 +#, php-format +msgid "User %s is not allowed to send private messages." +msgstr "" + #. TRANS: Exception thrown when trying to send group private message that is too long. #. TRANS: %d is the maximum meggage length. #: classes/Group_message.php:109 @@ -181,34 +105,33 @@ msgstr "" msgid "No sender for group message." msgstr "" -#. TRANS: Subject for direct-message notification email. -#. TRANS: %1$s is the sending user's nickname, %2$s is the group nickname. -#: classes/Group_message_profile.php:114 +#. TRANS: Form legend for sending private message to group %s. +#: forms/groupmessage.php:89 #, php-format -msgid "New private message from %1$s to group %2$s" +msgid "Message to %s" msgstr "" -#. TRANS: Body for direct-message notification email. -#. TRANS: %1$s is the sending user's long name, %2$s is the sending user's nickname, -#. TRANS: %3$s is the message content, %4$s a URL to the message, -#. TRANS: %5$s is the StatusNet sitename. -#: classes/Group_message_profile.php:120 +#. TRANS: Field label for private group message to group %s. +#: forms/groupmessage.php:128 #, php-format -msgid "" -"%1$s (%2$s) sent a private message to group %3$s:\n" -"\n" -"------------------------------------------------------\n" -"%4$s\n" -"------------------------------------------------------\n" -"\n" -"You can reply to their message here:\n" -"\n" -"%5$s\n" -"\n" -"Do not reply to this email; it will not get to them.\n" -"\n" -"With kind regards,\n" -"%6$s" +msgid "Direct message to %s" +msgstr "" + +#. TRANS: Indicator for number of chatacters still available for notice. +#: forms/groupmessage.php:141 +msgid "Available characters" +msgstr "" + +#. TRANS: Send button text for sending private group notice. +#: forms/groupmessage.php:162 +msgctxt "Send button for sending notice" +msgid "Send" +msgstr "" + +#. TRANS: Succes message after sending private group message to group %s. +#: lib/groupmessagecommand.php:79 +#, php-format +msgid "Direct message to group %s sent." msgstr "" #. TRANS: Menu item in group page. @@ -298,25 +221,98 @@ msgstr "" msgid "Allow posting private messages to groups." msgstr "" -#. TRANS: Form legend for sending private message to group %s. -#: forms/groupmessage.php:89 +#. TRANS: Client exception thrown when trying to send a private group message while not logged in. +#: actions/newgroupmessage.php:70 +msgid "Must be logged in." +msgstr "" + +#. TRANS: Client exception thrown when trying to send a private group message to a non-existing group. +#. TRANS: Client exception thrown when trying to view group inbox for non-existing group. +#: actions/newgroupmessage.php:92 actions/newgroupmessage.php:99 +#: actions/groupinbox.php:84 actions/groupinbox.php:91 +msgid "No such group." +msgstr "" + +#. TRANS: Title after sending a private group message. +#: actions/newgroupmessage.php:136 +msgid "Message sent" +msgstr "" + +#. TRANS: Succes text after sending a direct message to group %s. +#: actions/newgroupmessage.php:142 #, php-format -msgid "Message to %s" +msgid "Direct message to %s sent." msgstr "" -#. TRANS: Field label for private group message to group %s. -#: forms/groupmessage.php:128 +#. TRANS: Title of form for new private group message. +#: actions/newgroupmessage.php:160 #, php-format -msgid "Direct message to %s" +msgid "New message to group %s" msgstr "" -#. TRANS: Indicator for number of chatacters still available for notice. -#: forms/groupmessage.php:141 -msgid "Available characters" +#. TRANS: Client exception thrown when trying to view group private messages without being logged in. +#: actions/showgroupmessage.php:71 +msgid "Only logged-in users can view private messages." msgstr "" -#. TRANS: Send button text for sending private group notice. -#: forms/groupmessage.php:162 -msgctxt "Send button for sending notice" -msgid "Send" +#. TRANS: Client exception thrown when trying to view a non-existing group private message. +#: actions/showgroupmessage.php:81 +msgid "No such message." +msgstr "" + +#. TRANS: Server exception thrown when trying to view group private messages for a non-exsting group. +#: actions/showgroupmessage.php:88 +msgid "Group not found." +msgstr "" + +#. TRANS: Client exception thrown when trying to view a group private message without being a group member. +#: actions/showgroupmessage.php:93 +msgid "Cannot read message." +msgstr "" + +#. TRANS: Server exception thrown when trying to view a group private message without a sender. +#: actions/showgroupmessage.php:100 +msgid "No sender found." +msgstr "" + +#. TRANS: Title for private group message. +#. TRANS: %1$s is the sender name, %2$s is the group name, %3$s is a timestamp. +#: actions/showgroupmessage.php:123 +#, php-format +msgid "Message from %1$s to group %2$s on %3$s" +msgstr "" + +#. TRANS: Client exception thrown when trying to view group inbox while not logged in. +#: actions/groupinbox.php:68 +msgid "Only for logged-in users." +msgstr "" + +#. TRANS: Client exception thrown when trying to view group inbox while not a member. +#: actions/groupinbox.php:96 +msgid "Only for members." +msgstr "" + +#. TRANS: Text of group inbox if no private messages were sent to it. +#: actions/groupinbox.php:130 +msgid "This group has not received any private messages." +msgstr "" + +#. TRANS: Title of inbox for group %s. +#: actions/groupinbox.php:174 +#, php-format +msgid "%s group inbox" +msgstr "" + +#. TRANS: Page title for any but first group page. +#. TRANS: %1$s is a group name, $2$s is a page number. +#: actions/groupinbox.php:178 +#, php-format +msgid "%1$s group inbox, page %2$d" +msgstr "" + +#. TRANS: Instructions for user inbox page. +#: actions/groupinbox.php:209 +msgid "" +"This is the group inbox, which lists all incoming private messages for this " +"group." msgstr "" diff --git a/plugins/ImageMagick/locale/ImageMagick.pot b/plugins/ImageMagick/locale/ImageMagick.pot index 63d6cd58dc..7b4f38697a 100644 --- a/plugins/ImageMagick/locale/ImageMagick.pot +++ b/plugins/ImageMagick/locale/ImageMagick.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:51+0100\n" +"POT-Creation-Date: 2020-08-04 01:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/Imap/locale/Imap.pot b/plugins/Imap/locale/Imap.pot index 1927c4f58a..5514acf71c 100644 --- a/plugins/Imap/locale/Imap.pot +++ b/plugins/Imap/locale/Imap.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:51+0100\n" +"POT-Creation-Date: 2020-08-04 01:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,6 +17,18 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" +#. TRANS: E-mail subject in case of an error. +#: lib/imapmailhandler.php:31 +msgid "Error" +msgstr "" + +#. TRANS: Exception thrown when the ImapManager is used incorrectly in the code. +#: lib/imapmanager.php:52 +msgid "" +"ImapManager should be created using its constructor, not using the static " +"\"get()\" method." +msgstr "" + #. TRANS: Exception thrown when configuration of the IMAP plugin is incorrect. #: ImapPlugin.php:57 msgid "A mailbox must be specified." @@ -44,15 +56,3 @@ msgid "" "The IMAP plugin allows for StatusNet to check a POP or IMAP mailbox for " "incoming mail containing user posts." msgstr "" - -#. TRANS: E-mail subject in case of an error. -#: lib/imapmailhandler.php:31 -msgid "Error" -msgstr "" - -#. TRANS: Exception thrown when the ImapManager is used incorrectly in the code. -#: lib/imapmanager.php:52 -msgid "" -"ImapManager should be created using its constructor, not using the static " -"\"get()\" method." -msgstr "" diff --git a/plugins/InProcessCache/locale/InProcessCache.pot b/plugins/InProcessCache/locale/InProcessCache.pot index f0e9ce2b1c..4403ec7f12 100644 --- a/plugins/InProcessCache/locale/InProcessCache.pot +++ b/plugins/InProcessCache/locale/InProcessCache.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:51+0100\n" +"POT-Creation-Date: 2020-08-04 01:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,6 +18,6 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" #. TRANS: Plugin dscription. -#: InProcessCachePlugin.php:185 +#: InProcessCachePlugin.php:184 msgid "Additional in-process cache for plugins." msgstr "" diff --git a/plugins/InfiniteScroll/locale/InfiniteScroll.pot b/plugins/InfiniteScroll/locale/InfiniteScroll.pot index 460a279f89..e870a917cb 100644 --- a/plugins/InfiniteScroll/locale/InfiniteScroll.pot +++ b/plugins/InfiniteScroll/locale/InfiniteScroll.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 15:20+0100\n" +"POT-Creation-Date: 2020-08-04 01:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -20,7 +20,7 @@ msgstr "" #. TRANS: Plugin dscription. #: InfiniteScrollPlugin.php:51 msgid "" -"Infinite Scroll adds the following functionality to your GNU social " +"Infinite Scroll adds the following functionality to your StatusNet " "installation: When a user scrolls towards the bottom of the page, the next " "page of notices is automatically retrieved and appended. This means they " "never need to click \"Next Page\", which dramatically increases stickiness." diff --git a/plugins/LRDD/locale/LRDD.pot b/plugins/LRDD/locale/LRDD.pot index 1869e87da9..85e79e1cbb 100644 --- a/plugins/LRDD/locale/LRDD.pot +++ b/plugins/LRDD/locale/LRDD.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:51+0100\n" +"POT-Creation-Date: 2020-08-04 01:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/LdapAuthentication/locale/LdapAuthentication.pot b/plugins/LdapAuthentication/locale/LdapAuthentication.pot index 4b8d665589..ba67d8ba1f 100644 --- a/plugins/LdapAuthentication/locale/LdapAuthentication.pot +++ b/plugins/LdapAuthentication/locale/LdapAuthentication.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:51+0100\n" +"POT-Creation-Date: 2020-08-04 01:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/LdapAuthorization/locale/LdapAuthorization.pot b/plugins/LdapAuthorization/locale/LdapAuthorization.pot index 75a7cf8575..845b8eea6e 100644 --- a/plugins/LdapAuthorization/locale/LdapAuthorization.pot +++ b/plugins/LdapAuthorization/locale/LdapAuthorization.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:51+0100\n" +"POT-Creation-Date: 2020-08-04 01:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/LdapCommon/locale/LdapCommon.pot b/plugins/LdapCommon/locale/LdapCommon.pot index 6058057f02..36efd3dea0 100644 --- a/plugins/LdapCommon/locale/LdapCommon.pot +++ b/plugins/LdapCommon/locale/LdapCommon.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:51+0100\n" +"POT-Creation-Date: 2020-08-04 01:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/LilUrl/locale/LilUrl.pot b/plugins/LilUrl/locale/LilUrl.pot index c0208e6fbb..8b77e8b786 100644 --- a/plugins/LilUrl/locale/LilUrl.pot +++ b/plugins/LilUrl/locale/LilUrl.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:51+0100\n" +"POT-Creation-Date: 2020-08-04 01:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/LinkPreview/locale/LinkPreview.pot b/plugins/LinkPreview/locale/LinkPreview.pot index 3180f0fc25..64b6cbb401 100644 --- a/plugins/LinkPreview/locale/LinkPreview.pot +++ b/plugins/LinkPreview/locale/LinkPreview.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:51+0100\n" +"POT-Creation-Date: 2020-08-04 01:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/Linkback/locale/Linkback.pot b/plugins/Linkback/locale/Linkback.pot index 269e66c01f..eac76341fe 100644 --- a/plugins/Linkback/locale/Linkback.pot +++ b/plugins/Linkback/locale/Linkback.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:51+0100\n" +"POT-Creation-Date: 2020-08-04 01:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -25,26 +25,6 @@ msgstr "" msgid "Favor" msgstr "" -#: actions/webmention.php:42 actions/webmention.php:43 -msgid "\"source\" is missing" -msgstr "" - -#: actions/webmention.php:47 actions/webmention.php:48 -msgid "\"target\" is missing" -msgstr "" - -#: actions/webmention.php:53 actions/webmention.php:54 -msgid "Source does not link to target." -msgstr "" - -#: actions/webmention.php:59 actions/webmention.php:60 -msgid "Target not found" -msgstr "" - -#: actions/webmention.php:65 actions/webmention.php:66 -msgid "An error occured while saving." -msgstr "" - #. TRANS: Title of Linkback settings page for a user. #: actions/linkbacksettings.php:47 msgctxt "TITLE" @@ -73,6 +53,26 @@ msgstr "" msgid "Linkback preferences saved." msgstr "" +#: actions/webmention.php:42 actions/webmention.php:43 +msgid "\"source\" is missing" +msgstr "" + +#: actions/webmention.php:47 actions/webmention.php:48 +msgid "\"target\" is missing" +msgstr "" + +#: actions/webmention.php:53 actions/webmention.php:54 +msgid "Source does not link to target." +msgstr "" + +#: actions/webmention.php:59 actions/webmention.php:60 +msgid "Target not found" +msgstr "" + +#: actions/webmention.php:65 actions/webmention.php:66 +msgid "An error occured while saving." +msgstr "" + #. TRANS: Trackback title. #. TRANS: %1$s is a profile nickname, %2$s is a timestamp. #: LinkbackPlugin.php:318 diff --git a/plugins/LogFilter/locale/LogFilter.pot b/plugins/LogFilter/locale/LogFilter.pot index 61ef8352b7..568e5cfdba 100644 --- a/plugins/LogFilter/locale/LogFilter.pot +++ b/plugins/LogFilter/locale/LogFilter.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:51+0100\n" +"POT-Creation-Date: 2020-08-04 01:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/Mapstraction/locale/Mapstraction.pot b/plugins/Mapstraction/locale/Mapstraction.pot index 5a05a8db25..94bd02d149 100644 --- a/plugins/Mapstraction/locale/Mapstraction.pot +++ b/plugins/Mapstraction/locale/Mapstraction.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:51+0100\n" +"POT-Creation-Date: 2020-08-04 01:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,6 +17,37 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" +#. TRANS: Page title. +#. TRANS: %s is a user nickname. +#: actions/allmap.php:66 +#, php-format +msgid "%s friends map" +msgstr "" + +#. TRANS: Page title. +#. TRANS: %1$s is a user nickname, %2$d is a page number. +#: actions/allmap.php:72 +#, php-format +msgid "%1$s friends map, page %2$d" +msgstr "" + +#. TRANS: Client error displayed when referring to a non-existing user. +#: actions/map.php:72 +msgid "No such user." +msgstr "" + +#. TRANS: Error message displayed when referring to a user without a profile. +#: actions/map.php:79 +msgid "User has no profile." +msgstr "" + +#. TRANS: Title for map widget. +#. TRANS: %s is a user name. +#: actions/usermap.php:66 +#, php-format +msgid "%s map" +msgstr "" + #. TRANS: Header for Map widget that displays a map with geodata for notices. #: MapstractionPlugin.php:151 msgid "Map" @@ -33,34 +64,3 @@ msgid "" "Show maps of users' and friends' notices with Mapstraction." msgstr "" - -#. TRANS: Title for map widget. -#. TRANS: %s is a user name. -#: actions/usermap.php:66 -#, php-format -msgid "%s map" -msgstr "" - -#. TRANS: Client error displayed when referring to a non-existing user. -#: actions/map.php:72 -msgid "No such user." -msgstr "" - -#. TRANS: Error message displayed when referring to a user without a profile. -#: actions/map.php:79 -msgid "User has no profile." -msgstr "" - -#. TRANS: Page title. -#. TRANS: %s is a user nickname. -#: actions/allmap.php:66 -#, php-format -msgid "%s friends map" -msgstr "" - -#. TRANS: Page title. -#. TRANS: %1$s is a user nickname, %2$d is a page number. -#: actions/allmap.php:72 -#, php-format -msgid "%1$s friends map, page %2$d" -msgstr "" diff --git a/plugins/Memcached/locale/Memcached.pot b/plugins/Memcached/locale/Memcached.pot index ab4cdaae12..cc721a82cd 100644 --- a/plugins/Memcached/locale/Memcached.pot +++ b/plugins/Memcached/locale/Memcached.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:51+0100\n" +"POT-Creation-Date: 2020-08-04 01:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,7 +18,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" #. TRANS: Plugin description. -#: MemcachedPlugin.php:220 +#: MemcachedPlugin.php:270 msgid "" "Use Memcached to cache query results." msgstr "" diff --git a/plugins/MentionURL/locale/MentionURL.pot b/plugins/MentionURL/locale/MentionURL.pot index 4e1bea67ac..51bb9d0969 100644 --- a/plugins/MentionURL/locale/MentionURL.pot +++ b/plugins/MentionURL/locale/MentionURL.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:51+0100\n" +"POT-Creation-Date: 2020-08-04 01:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/Meteor/locale/Meteor.pot b/plugins/Meteor/locale/Meteor.pot index c6fd432798..4f3060e451 100644 --- a/plugins/Meteor/locale/Meteor.pot +++ b/plugins/Meteor/locale/Meteor.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:51+0100\n" +"POT-Creation-Date: 2020-08-04 01:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,18 +18,18 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" #. TRANS: Exception. %1$s is the control server, %2$s is the control port. -#: MeteorPlugin.php:129 +#: MeteorPlugin.php:141 #, php-format msgid "Could not connect to %1$s on %2$s." msgstr "" #. TRANS: Exception. %s is the Meteor message that could not be added. -#: MeteorPlugin.php:142 +#: MeteorPlugin.php:154 #, php-format msgid "Error adding meteor message \"%s\"." msgstr "" #. TRANS: Plugin description. -#: MeteorPlugin.php:173 +#: MeteorPlugin.php:186 msgid "Plugin to do \"real time\" updates using Meteor." msgstr "" diff --git a/plugins/MobileProfile/locale/MobileProfile.pot b/plugins/MobileProfile/locale/MobileProfile.pot index 1895d625f0..bb79954dc0 100644 --- a/plugins/MobileProfile/locale/MobileProfile.pot +++ b/plugins/MobileProfile/locale/MobileProfile.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:51+0100\n" +"POT-Creation-Date: 2020-08-04 01:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/ModHelper/locale/ModHelper.pot b/plugins/ModHelper/locale/ModHelper.pot index 60f05909d2..73f4cbf488 100644 --- a/plugins/ModHelper/locale/ModHelper.pot +++ b/plugins/ModHelper/locale/ModHelper.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:51+0100\n" +"POT-Creation-Date: 2020-08-04 01:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/ModLog/locale/ModLog.pot b/plugins/ModLog/locale/ModLog.pot index 38726aadfe..f8ca3130eb 100644 --- a/plugins/ModLog/locale/ModLog.pot +++ b/plugins/ModLog/locale/ModLog.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:51+0100\n" +"POT-Creation-Date: 2020-08-04 01:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,6 +17,6 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: ModLogPlugin.php:195 +#: ModLogPlugin.php:185 msgid "Show the moderation history for a profile in the sidebar" msgstr "" diff --git a/plugins/ModPlus/locale/ModPlus.pot b/plugins/ModPlus/locale/ModPlus.pot index 541fc08673..ec40cc16ea 100644 --- a/plugins/ModPlus/locale/ModPlus.pot +++ b/plugins/ModPlus/locale/ModPlus.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:51+0100\n" +"POT-Creation-Date: 2020-08-04 01:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/Mollom/locale/Mollom.pot b/plugins/Mollom/locale/Mollom.pot index a7a1f8c7f3..e6c63dc4fd 100644 --- a/plugins/Mollom/locale/Mollom.pot +++ b/plugins/Mollom/locale/Mollom.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:51+0100\n" +"POT-Creation-Date: 2020-08-04 01:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/Nodeinfo/locale/Nodeinfo.pot b/plugins/Nodeinfo/locale/Nodeinfo.pot index 0a16eb64b7..c16a4bdad8 100644 --- a/plugins/Nodeinfo/locale/Nodeinfo.pot +++ b/plugins/Nodeinfo/locale/Nodeinfo.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:51+0100\n" +"POT-Creation-Date: 2020-08-04 01:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/NoticeTitle/locale/NoticeTitle.pot b/plugins/NoticeTitle/locale/NoticeTitle.pot index f7bd37e68c..41ab19b23f 100644 --- a/plugins/NoticeTitle/locale/NoticeTitle.pot +++ b/plugins/NoticeTitle/locale/NoticeTitle.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:51+0100\n" +"POT-Creation-Date: 2020-08-04 01:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/OStatus/locale/OStatus.pot b/plugins/OStatus/locale/OStatus.pot index 0b85da203f..616c2767a5 100644 --- a/plugins/OStatus/locale/OStatus.pot +++ b/plugins/OStatus/locale/OStatus.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:51+0100\n" +"POT-Creation-Date: 2020-08-04 01:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,9 +17,139 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#. TRANS: String in the gettext speed test script. Unimportant. -#: tests/gettext-speedtest.php:58 -msgid "Feeds" +#. TRANS: Server exception. +#: classes/FeedSub.php:281 +msgid "Attempting to start WebSub subscription for feed with no hub." +msgstr "" + +#. TRANS: Server exception. +#: classes/FeedSub.php:325 +msgid "Attempting to end WebSub subscription for feed with no hub." +msgstr "" + +#: classes/FeedSub.php:439 +#, php-format +msgid "Unexpected HTTP status: %d" +msgstr "" + +#. TRANS: Server exception. %s is a URI +#: classes/Ostatus_profile.php:212 classes/Ostatus_profile.php:235 +#, php-format +msgid "Invalid ostatus_profile state: Two or more IDs set for %s." +msgstr "" + +#. TRANS: Server exception. %s is a URI +#: classes/Ostatus_profile.php:215 classes/Ostatus_profile.php:238 +#, php-format +msgid "Invalid ostatus_profile state: All IDs empty for %s." +msgstr "" + +#. TRANS: Server exception. +#: classes/Ostatus_profile.php:439 +msgid "" +"Invalid type passed to Ostatus_profile::notify. It must be XML string or " +"Activity entry." +msgstr "" + +#. TRANS: Exception. +#: classes/Ostatus_profile.php:473 +msgid "Unknown feed format." +msgstr "" + +#. TRANS: Exception. +#: classes/Ostatus_profile.php:494 +msgid "RSS feed without a channel." +msgstr "" + +#. TRANS: Exception. %s is a profile URL. +#: classes/Ostatus_profile.php:664 +#, php-format +msgid "Could not reach profile page %s." +msgstr "" + +#. TRANS: Exception. %s is a URL. +#: classes/Ostatus_profile.php:733 scripts/update_ostatus_profiles.php:127 +#, php-format +msgid "Could not find a feed URL for profile page %s." +msgstr "" + +#. TRANS: Feed sub exception. +#: classes/Ostatus_profile.php:845 +msgid "Cannot find enough profile information to make a feed." +msgstr "" + +#. TRANS: Server exception. +#: classes/Ostatus_profile.php:1113 +msgid "No author ID URI found." +msgstr "" + +#. TRANS: Exception. +#: classes/Ostatus_profile.php:1141 +msgid "No profile URI." +msgstr "" + +#. TRANS: Exception. +#: classes/Ostatus_profile.php:1147 +msgid "Local user cannot be referenced as remote." +msgstr "" + +#. TRANS: Exception. +#: classes/Ostatus_profile.php:1152 +msgid "Local group cannot be referenced as remote." +msgstr "" + +#. TRANS: Exception. +#: classes/Ostatus_profile.php:1160 +msgid "Local list cannot be referenced as remote." +msgstr "" + +#. TRANS: Server exception. +#: classes/Ostatus_profile.php:1221 classes/Ostatus_profile.php:1302 +msgid "Cannot save OStatus profile." +msgstr "" + +#. TRANS: Server exception. +#: classes/Ostatus_profile.php:1240 classes/Ostatus_profile.php:1280 +msgid "Cannot save local profile." +msgstr "" + +#. TRANS: Server exception. +#: classes/Ostatus_profile.php:1293 +msgid "Cannot save local list." +msgstr "" + +#. TRANS: Exception. +#: classes/Ostatus_profile.php:1630 +msgid "Not a valid webfinger address (via cache)." +msgstr "" + +#. TRANS: Exception. +#: classes/Ostatus_profile.php:1659 scripts/update_ostatus_profiles.php:152 +msgid "Not a valid webfinger address." +msgstr "" + +#. TRANS: Exception. %s is a webfinger address. +#: classes/Ostatus_profile.php:1740 +#, php-format +msgid "Could not save profile for \"%s\"." +msgstr "" + +#. TRANS: Exception. %s is a webfinger address. +#: classes/Ostatus_profile.php:1760 +#, php-format +msgid "Could not save OStatus profile for \"%s\"." +msgstr "" + +#. TRANS: Exception. %s is a webfinger address. +#: classes/Ostatus_profile.php:1768 scripts/update_ostatus_profiles.php:207 +#, php-format +msgid "Could not find a valid profile for \"%s\"." +msgstr "" + +#. TRANS: Client exception. %s is a HTTP status code. +#: classes/HubSub.php:233 +#, php-format +msgid "Hub subscriber verification returned HTTP %s." msgstr "" #. TRANS: Exception. @@ -96,6 +226,113 @@ msgstr "" msgid "This target does not understand unlist events." msgstr "" +#. TRANS: String in the gettext speed test script. Unimportant. +#: tests/gettext-speedtest.php:58 +msgid "Feeds" +msgstr "" + +#. TRANS: Client exception. +#: actions/pushhub.php:66 +msgid "Publishing outside feeds not supported." +msgstr "" + +#. TRANS: Client exception. %s is a mode. +#: actions/pushhub.php:69 +#, php-format +msgid "Unrecognized mode \"%s\"." +msgstr "" + +#. TRANS: Client exception. %s is a topic. +#: actions/pushhub.php:91 +#, php-format +msgid "" +"Unsupported hub.topic %s this hub only serves local user and group Atom " +"feeds." +msgstr "" + +#. TRANS: Client exception. %s is the invalid lease value. +#: actions/pushhub.php:98 +#, php-format +msgid "Invalid hub.lease \"%s\". It must be empty or positive integer." +msgstr "" + +#. TRANS: Client exception. %s is the invalid hub secret. +#: actions/pushhub.php:105 +#, php-format +msgid "Invalid hub.secret \"%s\". It must be under 200 bytes." +msgstr "" + +#. TRANS: Client exception. %s is a feed URL. +#: actions/pushhub.php:158 +#, php-format +msgid "Invalid hub.topic \"%s\". User does not exist." +msgstr "" + +#. TRANS: Client exception. %s is a feed URL. +#: actions/pushhub.php:166 +#, php-format +msgid "Invalid hub.topic \"%s\". Local_group does not exist." +msgstr "" + +#. TRANS: Client exception. %s is a feed URL. +#: actions/pushhub.php:187 +#, php-format +msgid "Invalid hub.topic %s; list does not exist." +msgstr "" + +#. TRANS: Client exception. +#. TRANS: %1$s is this argument to the method this exception occurs in, %2$s is a URL. +#: actions/pushhub.php:212 +#, php-format +msgid "Invalid URL passed for %1$s: \"%2$s\"" +msgstr "" + +#. TRANS: Field label. +#: actions/ostatusgroup.php:74 +msgid "Join group" +msgstr "" + +#. TRANS: Tooltip for field label "Join group". Do not translate the "example.net" +#. TRANS: domain name in the URL, as it is an official standard domain name for examples. +#: actions/ostatusgroup.php:78 +msgid "OStatus group's address, like http://example.net/group/nickname." +msgstr "" + +#. TRANS: Button text. +#. TRANS: Button text to continue joining a remote list. +#: actions/ostatusgroup.php:83 actions/ostatussub.php:101 +#: actions/ostatuspeopletag.php:82 +msgctxt "BUTTON" +msgid "Continue" +msgstr "" + +#. TRANS: Error text displayed when trying to join a remote group the user is already a member of. +#: actions/ostatusgroup.php:101 +msgid "You are already a member of this group." +msgstr "" + +#. TRANS: OStatus remote group subscription dialog error. +#: actions/ostatusgroup.php:134 +msgid "Already a member!" +msgstr "" + +#. TRANS: OStatus remote group subscription dialog error. +#: actions/ostatusgroup.php:144 +msgid "Remote group join failed!" +msgstr "" + +#. TRANS: Page title for OStatus remote group join form +#: actions/ostatusgroup.php:159 +msgid "Confirm joining remote group" +msgstr "" + +#. TRANS: Form instructions. +#: actions/ostatusgroup.php:170 +msgid "" +"You can subscribe to groups from other supported sites. Paste the group's " +"profile URI below:" +msgstr "" + #. TRANS: Field label for a field that takes an OStatus user address. #: actions/ostatussub.php:94 msgid "Subscribe to" @@ -108,14 +345,6 @@ msgid "" "nickname." msgstr "" -#. TRANS: Button text. -#. TRANS: Button text to continue joining a remote list. -#: actions/ostatussub.php:101 actions/ostatusgroup.php:83 -#: actions/ostatuspeopletag.php:82 -msgctxt "BUTTON" -msgid "Continue" -msgstr "" - #. TRANS: Button text. #: actions/ostatussub.php:136 msgid "Join" @@ -146,7 +375,7 @@ msgstr "" #. TRANS: Error message in OStatus plugin. Do not translate the domain names example.com #. TRANS: and example.net, as these are official standard domain names for use in examples. #: actions/ostatussub.php:259 actions/ostatussub.php:267 -#: actions/ostatussub.php:297 OStatusPlugin.php:256 +#: actions/ostatussub.php:297 OStatusPlugin.php:293 msgid "" "Sorry, we could not reach that address. Please make sure that the OStatus " "address is like nickname@example.com or http://example.net/nickname." @@ -203,6 +432,142 @@ msgid "" "or profile URI below:" msgstr "" +#. TRANS: Client error. +#: actions/ostatusinit.php:44 +msgid "You can use the local subscription!" +msgstr "" + +#. TRANS: Form title. +#: actions/ostatusinit.php:85 +msgctxt "TITLE" +msgid "Subscribe to user" +msgstr "" + +#. TRANS: Form legend. %s is a group name. +#: actions/ostatusinit.php:101 +#, php-format +msgid "Join group %s" +msgstr "" + +#. TRANS: Button text to join a group. +#: actions/ostatusinit.php:103 +msgctxt "BUTTON" +msgid "Join" +msgstr "" + +#. TRANS: Form legend. %1$s is a list, %2$s is a lister's name. +#: actions/ostatusinit.php:106 +#, php-format +msgid "Subscribe to list %1$s by %2$s" +msgstr "" + +#. TRANS: Button text to subscribe to a list. +#. TRANS: Button text to subscribe to a profile. +#: actions/ostatusinit.php:108 actions/ostatusinit.php:114 +msgctxt "BUTTON" +msgid "Subscribe" +msgstr "" + +#. TRANS: Form legend. %s is a nickname. +#: actions/ostatusinit.php:112 +#, php-format +msgid "Subscribe to %s" +msgstr "" + +#. TRANS: Field label. +#: actions/ostatusinit.php:129 +msgid "Group nickname" +msgstr "" + +#. TRANS: Field title. +#: actions/ostatusinit.php:131 +msgid "Nickname of the group you want to join." +msgstr "" + +#. TRANS: Field label. +#: actions/ostatusinit.php:134 actions/ostatustag.php:68 +msgid "User nickname" +msgstr "" + +#. TRANS: Field title. +#: actions/ostatusinit.php:136 +msgid "Nickname of the user you want to follow." +msgstr "" + +#. TRANS: Field label. +#: actions/ostatusinit.php:144 actions/ostatustag.php:74 +msgid "Profile Account" +msgstr "" + +#. TRANS: Tooltip for field label "Profile Account". +#: actions/ostatusinit.php:146 +msgid "Your account ID (e.g. user@example.com)." +msgstr "" + +#. TRANS: Client error. +#: actions/ostatusinit.php:169 +msgid "Must provide a remote profile." +msgstr "" + +#. TRANS: Client error. +#. TRANS: Client error displayed when remote profile address could not be confirmed. +#: actions/ostatusinit.php:192 actions/ostatustag.php:103 +msgid "Could not confirm remote profile address." +msgstr "" + +#. TRANS: Client error. +#: actions/ostatusinit.php:218 actions/ostatusinit.php:232 +msgid "No such user." +msgstr "" + +#. TRANS: Client error. +#: actions/ostatusinit.php:226 actions/groupsalmon.php:45 +msgid "No such group." +msgstr "" + +#. TRANS: Client error. +#. TRANS: Client error displayed when referring to a non-existing list. +#: actions/ostatusinit.php:241 actions/peopletagsalmon.php:45 +msgid "No such list." +msgstr "" + +#. TRANS: Client error. +#: actions/ostatusinit.php:244 +msgid "No local user or group nickname provided." +msgstr "" + +#. TRANS: Page title. +#: actions/ostatusinit.php:251 +msgid "OStatus Connect" +msgstr "" + +#. TRANS: Field label. +#: actions/ostatuspeopletag.php:74 +msgid "Subscribe to list" +msgstr "" + +#. TRANS: Field title. +#: actions/ostatuspeopletag.php:77 +msgid "Address of the OStatus list, like http://example.net/user/all/tag." +msgstr "" + +#. TRANS: Error text displayed when trying to subscribe to a list already a subscriber to. +#: actions/ostatuspeopletag.php:102 +msgid "You are already subscribed to this list." +msgstr "" + +#. TRANS: Page title for OStatus remote list subscription form +#: actions/ostatuspeopletag.php:165 +msgid "Confirm subscription to remote list" +msgstr "" + +#. TRANS: Instructions for OStatus list subscription form. +#: actions/ostatuspeopletag.php:177 +msgid "" +"You can subscribe to lists from other supported sites. Paste the list's URI " +"below:" +msgstr "" + #. TRANS: Client exception. #: actions/usersalmon.php:69 msgid "" @@ -283,224 +648,21 @@ msgctxt "BUTTON" msgid "Go" msgstr "" -#. TRANS: Field label. -#: actions/ostatustag.php:68 actions/ostatusinit.php:134 -msgid "User nickname" -msgstr "" - #. TRANS: Field title. #: actions/ostatustag.php:70 msgid "Nickname of the user you want to list." msgstr "" -#. TRANS: Field label. -#: actions/ostatustag.php:74 actions/ostatusinit.php:144 -msgid "Profile Account" -msgstr "" - #. TRANS: Field title. #: actions/ostatustag.php:76 msgid "Your account id (for example user@example.com)." msgstr "" -#. TRANS: Client error displayed when remote profile address could not be confirmed. -#. TRANS: Client error. -#: actions/ostatustag.php:103 actions/ostatusinit.php:192 -msgid "Could not confirm remote profile address." -msgstr "" - #. TRANS: Title for an OStatus list. #: actions/ostatustag.php:121 msgid "OStatus list" msgstr "" -#. TRANS: Client exception. -#: actions/pushhub.php:66 -msgid "Publishing outside feeds not supported." -msgstr "" - -#. TRANS: Client exception. %s is a mode. -#: actions/pushhub.php:69 -#, php-format -msgid "Unrecognized mode \"%s\"." -msgstr "" - -#. TRANS: Client exception. %s is a topic. -#: actions/pushhub.php:91 -#, php-format -msgid "" -"Unsupported hub.topic %s this hub only serves local user and group Atom " -"feeds." -msgstr "" - -#. TRANS: Client exception. %s is the invalid lease value. -#: actions/pushhub.php:98 -#, php-format -msgid "Invalid hub.lease \"%s\". It must be empty or positive integer." -msgstr "" - -#. TRANS: Client exception. %s is the invalid hub secret. -#: actions/pushhub.php:105 -#, php-format -msgid "Invalid hub.secret \"%s\". It must be under 200 bytes." -msgstr "" - -#. TRANS: Client exception. %s is a feed URL. -#: actions/pushhub.php:158 -#, php-format -msgid "Invalid hub.topic \"%s\". User does not exist." -msgstr "" - -#. TRANS: Client exception. %s is a feed URL. -#: actions/pushhub.php:166 -#, php-format -msgid "Invalid hub.topic \"%s\". Local_group does not exist." -msgstr "" - -#. TRANS: Client exception. %s is a feed URL. -#: actions/pushhub.php:187 -#, php-format -msgid "Invalid hub.topic %s; list does not exist." -msgstr "" - -#. TRANS: Client exception. -#. TRANS: %1$s is this argument to the method this exception occurs in, %2$s is a URL. -#: actions/pushhub.php:212 -#, php-format -msgid "Invalid URL passed for %1$s: \"%2$s\"" -msgstr "" - -#. TRANS: Client error. -#: actions/ostatusinit.php:44 -msgid "You can use the local subscription!" -msgstr "" - -#. TRANS: Form title. -#: actions/ostatusinit.php:85 -msgctxt "TITLE" -msgid "Subscribe to user" -msgstr "" - -#. TRANS: Form legend. %s is a group name. -#: actions/ostatusinit.php:101 -#, php-format -msgid "Join group %s" -msgstr "" - -#. TRANS: Button text to join a group. -#: actions/ostatusinit.php:103 -msgctxt "BUTTON" -msgid "Join" -msgstr "" - -#. TRANS: Form legend. %1$s is a list, %2$s is a lister's name. -#: actions/ostatusinit.php:106 -#, php-format -msgid "Subscribe to list %1$s by %2$s" -msgstr "" - -#. TRANS: Button text to subscribe to a list. -#. TRANS: Button text to subscribe to a profile. -#: actions/ostatusinit.php:108 actions/ostatusinit.php:114 -msgctxt "BUTTON" -msgid "Subscribe" -msgstr "" - -#. TRANS: Form legend. %s is a nickname. -#: actions/ostatusinit.php:112 -#, php-format -msgid "Subscribe to %s" -msgstr "" - -#. TRANS: Field label. -#: actions/ostatusinit.php:129 -msgid "Group nickname" -msgstr "" - -#. TRANS: Field title. -#: actions/ostatusinit.php:131 -msgid "Nickname of the group you want to join." -msgstr "" - -#. TRANS: Field title. -#: actions/ostatusinit.php:136 -msgid "Nickname of the user you want to follow." -msgstr "" - -#. TRANS: Tooltip for field label "Profile Account". -#: actions/ostatusinit.php:146 -msgid "Your account ID (e.g. user@example.com)." -msgstr "" - -#. TRANS: Client error. -#: actions/ostatusinit.php:169 -msgid "Must provide a remote profile." -msgstr "" - -#. TRANS: Client error. -#: actions/ostatusinit.php:218 actions/ostatusinit.php:232 -msgid "No such user." -msgstr "" - -#. TRANS: Client error. -#: actions/ostatusinit.php:226 actions/groupsalmon.php:45 -msgid "No such group." -msgstr "" - -#. TRANS: Client error. -#. TRANS: Client error displayed when referring to a non-existing list. -#: actions/ostatusinit.php:241 actions/peopletagsalmon.php:45 -msgid "No such list." -msgstr "" - -#. TRANS: Client error. -#: actions/ostatusinit.php:244 -msgid "No local user or group nickname provided." -msgstr "" - -#. TRANS: Page title. -#: actions/ostatusinit.php:251 -msgid "OStatus Connect" -msgstr "" - -#. TRANS: Field label. -#: actions/ostatusgroup.php:74 -msgid "Join group" -msgstr "" - -#. TRANS: Tooltip for field label "Join group". Do not translate the "example.net" -#. TRANS: domain name in the URL, as it is an official standard domain name for examples. -#: actions/ostatusgroup.php:78 -msgid "OStatus group's address, like http://example.net/group/nickname." -msgstr "" - -#. TRANS: Error text displayed when trying to join a remote group the user is already a member of. -#: actions/ostatusgroup.php:101 -msgid "You are already a member of this group." -msgstr "" - -#. TRANS: OStatus remote group subscription dialog error. -#: actions/ostatusgroup.php:134 -msgid "Already a member!" -msgstr "" - -#. TRANS: OStatus remote group subscription dialog error. -#: actions/ostatusgroup.php:144 -msgid "Remote group join failed!" -msgstr "" - -#. TRANS: Page title for OStatus remote group join form -#: actions/ostatusgroup.php:159 -msgid "Confirm joining remote group" -msgstr "" - -#. TRANS: Form instructions. -#: actions/ostatusgroup.php:170 -msgid "" -"You can subscribe to groups from other supported sites. Paste the group's " -"profile URI below:" -msgstr "" - #. TRANS: Client error. #. TRANS: Client error displayed trying to perform an action without providing an ID. #: actions/groupsalmon.php:38 actions/peopletagsalmon.php:38 @@ -593,365 +755,164 @@ msgstr "" msgid "Unexpected unsubscribe request for %s." msgstr "" -#. TRANS: Field label. -#: actions/ostatuspeopletag.php:74 -msgid "Subscribe to list" -msgstr "" - -#. TRANS: Field title. -#: actions/ostatuspeopletag.php:77 -msgid "Address of the OStatus list, like http://example.net/user/all/tag." -msgstr "" - -#. TRANS: Error text displayed when trying to subscribe to a list already a subscriber to. -#: actions/ostatuspeopletag.php:102 -msgid "You are already subscribed to this list." -msgstr "" - -#. TRANS: Page title for OStatus remote list subscription form -#: actions/ostatuspeopletag.php:165 -msgid "Confirm subscription to remote list" -msgstr "" - -#. TRANS: Instructions for OStatus list subscription form. -#: actions/ostatuspeopletag.php:177 -msgid "" -"You can subscribe to lists from other supported sites. Paste the list's URI " -"below:" -msgstr "" - -#. TRANS: Server exception. %s is a URI -#: classes/Ostatus_profile.php:195 classes/Ostatus_profile.php:218 -#, php-format -msgid "Invalid ostatus_profile state: Two or more IDs set for %s." -msgstr "" - -#. TRANS: Server exception. %s is a URI -#: classes/Ostatus_profile.php:198 classes/Ostatus_profile.php:221 -#, php-format -msgid "Invalid ostatus_profile state: All IDs empty for %s." -msgstr "" - -#. TRANS: Server exception. -#: classes/Ostatus_profile.php:419 -msgid "" -"Invalid type passed to Ostatus_profile::notify. It must be XML string or " -"Activity entry." -msgstr "" - -#. TRANS: Exception. -#: classes/Ostatus_profile.php:452 -msgid "Unknown feed format." -msgstr "" - -#. TRANS: Exception. -#: classes/Ostatus_profile.php:473 -msgid "RSS feed without a channel." -msgstr "" - -#. TRANS: Exception. %s is a profile URL. -#: classes/Ostatus_profile.php:645 -#, php-format -msgid "Could not reach profile page %s." -msgstr "" - -#. TRANS: Exception. %s is a URL. -#: classes/Ostatus_profile.php:710 scripts/update_ostatus_profiles.php:123 -#, php-format -msgid "Could not find a feed URL for profile page %s." -msgstr "" - -#. TRANS: Feed sub exception. -#: classes/Ostatus_profile.php:822 -msgid "Cannot find enough profile information to make a feed." -msgstr "" - -#. TRANS: Server exception. %s is a URL. -#: classes/Ostatus_profile.php:896 -#, php-format -msgid "Invalid avatar URL %s." -msgstr "" - -#. TRANS: Server exception. -#: classes/Ostatus_profile.php:1104 -msgid "No author ID URI found." -msgstr "" - -#. TRANS: Exception. -#: classes/Ostatus_profile.php:1132 -msgid "No profile URI." -msgstr "" - -#. TRANS: Exception. -#: classes/Ostatus_profile.php:1138 -msgid "Local user cannot be referenced as remote." -msgstr "" - -#. TRANS: Exception. -#: classes/Ostatus_profile.php:1143 -msgid "Local group cannot be referenced as remote." -msgstr "" - -#. TRANS: Exception. -#: classes/Ostatus_profile.php:1151 -msgid "Local list cannot be referenced as remote." -msgstr "" - -#. TRANS: Server exception. -#: classes/Ostatus_profile.php:1206 classes/Ostatus_profile.php:1245 -msgid "Cannot save local profile." -msgstr "" - -#. TRANS: Server exception. -#: classes/Ostatus_profile.php:1258 -msgid "Cannot save local list." -msgstr "" - -#. TRANS: Server exception. -#: classes/Ostatus_profile.php:1266 -msgid "Cannot save OStatus profile." -msgstr "" - -#. TRANS: Exception. -#: classes/Ostatus_profile.php:1592 -msgid "Not a valid webfinger address (via cache)." -msgstr "" - -#. TRANS: Exception. -#: classes/Ostatus_profile.php:1621 scripts/update_ostatus_profiles.php:148 -msgid "Not a valid webfinger address." -msgstr "" - -#. TRANS: Exception. %s is a webfinger address. -#: classes/Ostatus_profile.php:1700 -#, php-format -msgid "Could not save profile for \"%s\"." -msgstr "" - -#. TRANS: Exception. %s is a webfinger address. -#: classes/Ostatus_profile.php:1720 -#, php-format -msgid "Could not save OStatus profile for \"%s\"." -msgstr "" - -#. TRANS: Exception. %s is a webfinger address. -#: classes/Ostatus_profile.php:1728 scripts/update_ostatus_profiles.php:203 -#, php-format -msgid "Could not find a valid profile for \"%s\"." -msgstr "" - -#. TRANS: Server exception. -#: classes/Ostatus_profile.php:1773 -msgid "Could not store HTML content of long post as file." -msgstr "" - -#. TRANS: Server exception. -#. TRANS: %1$s is a protocol, %2$s is a URI. -#: classes/Ostatus_profile.php:1807 -#, php-format -msgid "Unrecognized URI protocol for profile: %1$s (%2$s)." -msgstr "" - -#. TRANS: Server exception. %s is a URI. -#: classes/Ostatus_profile.php:1813 -#, php-format -msgid "No URI protocol for profile: %s." -msgstr "" - -#. TRANS: Server exception. -#: classes/FeedSub.php:285 -msgid "Attempting to start WebSub subscription for feed with no hub." -msgstr "" - -#. TRANS: Server exception. -#: classes/FeedSub.php:328 -msgid "Attempting to end WebSub subscription for feed with no hub." -msgstr "" - -#: classes/FeedSub.php:442 -#, php-format -msgid "Unexpected HTTP status: %d" -msgstr "" - -#. TRANS: Client exception. %s is a HTTP status code. -#: classes/HubSub.php:233 -#, php-format -msgid "Hub subscriber verification returned HTTP %s." -msgstr "" - #. TRANS: Link to subscribe to a remote entity. -#. TRANS: Link text for a user to subscribe to an OStatus user. -#: OStatusPlugin.php:200 OStatusPlugin.php:221 OStatusPlugin.php:1331 +#: OStatusPlugin.php:229 OStatusPlugin.php:257 msgid "Subscribe" msgstr "" #. TRANS: Exception in OStatus when invalid URI was entered. -#: OStatusPlugin.php:249 +#: OStatusPlugin.php:287 msgid "Invalid URI." msgstr "" #. TRANS: Title. %s is a domain name. -#: OStatusPlugin.php:612 +#: OStatusPlugin.php:658 #, php-format msgid "Sent from %s via OStatus" msgstr "" #. TRANS: Title for unfollowing a remote profile. -#: OStatusPlugin.php:750 +#: OStatusPlugin.php:798 msgctxt "TITLE" msgid "Unfollow" msgstr "" -#. TRANS: Success message for unsubscribe from user attempt through OStatus. -#. TRANS: %1$s is the unsubscriber's name, %2$s is the unsubscribed user's name. -#: OStatusPlugin.php:753 +#: OStatusPlugin.php:802 #, php-format msgid "%1$s stopped following %2$s." msgstr "" #. TRANS: Title for joining a remote groep. -#: OStatusPlugin.php:800 +#: OStatusPlugin.php:852 msgctxt "TITLE" msgid "Join" msgstr "" -#. TRANS: Success message for subscribe to group attempt through OStatus. -#. TRANS: %1$s is the member name, %2$s is the subscribed group's name. -#: OStatusPlugin.php:803 +#: OStatusPlugin.php:856 #, php-format msgid "%1$s has joined group %2$s." msgstr "" #. TRANS: Exception thrown when joining a remote group fails. -#: OStatusPlugin.php:812 +#: OStatusPlugin.php:866 msgid "Failed joining remote group." msgstr "" #. TRANS: Title for leaving a remote group. -#: OStatusPlugin.php:854 +#: OStatusPlugin.php:910 msgctxt "TITLE" msgid "Leave" msgstr "" -#. TRANS: Success message for unsubscribe from group attempt through OStatus. -#. TRANS: %1$s is the member name, %2$s is the unsubscribed group's name. -#: OStatusPlugin.php:857 +#: OStatusPlugin.php:914 #, php-format msgid "%1$s has left group %2$s." msgstr "" #. TRANS: Title for following a remote list. -#: OStatusPlugin.php:900 +#: OStatusPlugin.php:960 msgctxt "TITLE" msgid "Follow list" msgstr "" -#. TRANS: Success message for remote list follow through OStatus. -#. TRANS: %1$s is the subscriber name, %2$s is the list, %3$s is the lister's name. -#: OStatusPlugin.php:903 +#: OStatusPlugin.php:964 #, php-format msgid "%1$s is now following people listed in %2$s by %3$s." msgstr "" #. TRANS: Exception thrown when subscription to remote list fails. -#: OStatusPlugin.php:913 +#: OStatusPlugin.php:975 msgid "Failed subscribing to remote list." msgstr "" #. TRANS: Title for unfollowing a remote list. -#: OStatusPlugin.php:952 +#: OStatusPlugin.php:1016 msgid "Unfollow list" msgstr "" -#. TRANS: Success message for remote list unfollow through OStatus. -#. TRANS: %1$s is the subscriber name, %2$s is the list, %3$s is the lister's name. -#: OStatusPlugin.php:955 +#: OStatusPlugin.php:1020 #, php-format msgid "%1$s stopped following the list %2$s by %3$s." msgstr "" #. TRANS: Title for listing a remote profile. -#: OStatusPlugin.php:1031 +#: OStatusPlugin.php:1100 msgctxt "TITLE" msgid "List" msgstr "" -#. TRANS: Success message for remote list addition through OStatus. -#. TRANS: %1$s is the list creator's name, %2$s is the added list member, %3$s is the list name. -#: OStatusPlugin.php:1034 +#: OStatusPlugin.php:1104 #, php-format msgid "%1$s listed %2$s in the list %3$s." msgstr "" #. TRANS: Title for unlisting a remote profile. -#: OStatusPlugin.php:1082 +#: OStatusPlugin.php:1156 msgctxt "TITLE" msgid "Unlist" msgstr "" -#. TRANS: Success message for remote list removal through OStatus. -#. TRANS: %1$s is the list creator's name, %2$s is the removed list member, %3$s is the list name. -#: OStatusPlugin.php:1085 +#: OStatusPlugin.php:1160 #, php-format msgid "%1$s removed %2$s from the list %3$s." msgstr "" #. TRANS: Title for unliking a remote notice. -#: OStatusPlugin.php:1132 +#: OStatusPlugin.php:1210 msgid "Unlike" msgstr "" -#. TRANS: Success message for remove a favorite notice through OStatus. -#. TRANS: %1$s is the unfavoring user's name, %2$s is URI to the no longer favored notice. -#: OStatusPlugin.php:1135 +#: OStatusPlugin.php:1214 #, php-format msgid "%1$s no longer likes %2$s." msgstr "" #. TRANS: Link text for link to remote subscribe. -#: OStatusPlugin.php:1215 +#: OStatusPlugin.php:1285 msgid "Remote" msgstr "" #. TRANS: Title for activity. -#: OStatusPlugin.php:1255 +#: OStatusPlugin.php:1328 msgid "Profile update" msgstr "" -#. TRANS: Ping text for remote profile update through OStatus. -#. TRANS: %s is user that updated their profile. -#: OStatusPlugin.php:1258 +#: OStatusPlugin.php:1332 #, php-format msgid "%s has updated their profile page." msgstr "" -#: OStatusPlugin.php:1293 +#: OStatusPlugin.php:1368 msgid "Pending" msgstr "" -#: OStatusPlugin.php:1294 +#: OStatusPlugin.php:1369 msgid "Active" msgstr "" -#: OStatusPlugin.php:1295 +#: OStatusPlugin.php:1370 +msgid "Unsubscribing" +msgstr "" + +#: OStatusPlugin.php:1371 msgid "Polling" msgstr "" -#: OStatusPlugin.php:1296 +#: OStatusPlugin.php:1372 msgid "Inactive" msgstr "" -#: OStatusPlugin.php:1299 +#: OStatusPlugin.php:1375 msgid "WebSub" msgstr "" #. TRANS: Link text for a user to list an OStatus user. -#: OStatusPlugin.php:1340 +#: OStatusPlugin.php:1412 msgid "List" msgstr "" #. TRANS: Plugin description. -#: OStatusPlugin.php:1365 +#: OStatusPlugin.php:1437 msgid "" "Follow people across social networks that implement OStatus." diff --git a/plugins/OfflineBackup/locale/OfflineBackup.pot b/plugins/OfflineBackup/locale/OfflineBackup.pot index adb90ac84f..853c570f42 100644 --- a/plugins/OfflineBackup/locale/OfflineBackup.pot +++ b/plugins/OfflineBackup/locale/OfflineBackup.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:51+0100\n" +"POT-Creation-Date: 2020-08-04 01:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,7 +17,7 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: lib/offlinebackupqueuehandler.php:105 +#: lib/offlinebackupqueuehandler.php:106 #, php-format msgctxt "" "The backup file you requested is ready for download.\n" @@ -27,7 +27,7 @@ msgctxt "" msgid "%s\n" msgstr "" -#. TRANS: Plugin description. -#: OfflineBackupPlugin.php:83 +#. TRANS: Module description. +#: OfflineBackupPlugin.php:86 msgid "Backup user data in offline queue and email when ready." msgstr "" diff --git a/plugins/OpenExternalLinkTarget/locale/OpenExternalLinkTarget.pot b/plugins/OpenExternalLinkTarget/locale/OpenExternalLinkTarget.pot index 847ef46410..e57997e467 100644 --- a/plugins/OpenExternalLinkTarget/locale/OpenExternalLinkTarget.pot +++ b/plugins/OpenExternalLinkTarget/locale/OpenExternalLinkTarget.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:51+0100\n" +"POT-Creation-Date: 2020-08-04 01:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/OpenID/locale/OpenID.pot b/plugins/OpenID/locale/OpenID.pot index 10f2815517..3723dcd1a1 100644 --- a/plugins/OpenID/locale/OpenID.pot +++ b/plugins/OpenID/locale/OpenID.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:51+0100\n" +"POT-Creation-Date: 2020-08-04 01:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,6 +17,618 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" +#. TRANS: Client error message trying to log on with OpenID while already logged on. +#: actions/openidlogin.php:33 actions/finishopenidlogin.php:37 +msgid "Already logged in." +msgstr "" + +#. TRANS: OpenID plugin message. Rememberme logins have to reauthenticate before changing any profile settings. +#. TRANS: "OpenID" is the display text for a link with URL "(%%doc.openid%%)". +#: actions/openidlogin.php:74 +#, php-format +msgid "" +"For security reasons, please re-login with your [OpenID](%%doc.openid%%) " +"before changing your settings." +msgstr "" + +#. TRANS: OpenID plugin message. +#. TRANS: "OpenID" is the display text for a link with URL "(%%doc.openid%%)". +#: actions/openidlogin.php:80 +#, php-format +msgid "Login with an [OpenID](%%doc.openid%%) account." +msgstr "" + +#. TRANS: OpenID plugin message. Title. +#: actions/openidlogin.php:114 +msgctxt "TITLE" +msgid "OpenID Login" +msgstr "" + +#. TRANS: OpenID plugin logon form legend. +#: actions/openidlogin.php:132 OpenIDPlugin.php:634 +msgctxt "LEGEND" +msgid "OpenID login" +msgstr "" + +#. TRANS: Field label. +#: actions/openidlogin.php:140 +msgctxt "LABEL" +msgid "OpenID provider" +msgstr "" + +#. TRANS: Form guide. +#: actions/openidlogin.php:149 OpenIDPlugin.php:651 +msgid "Enter your username." +msgstr "" + +#. TRANS: Form guide. +#: actions/openidlogin.php:151 OpenIDPlugin.php:653 +msgid "You will be sent to the provider's site for authentication." +msgstr "" + +#. TRANS: OpenID plugin logon form field label. +#: actions/openidlogin.php:155 actions/openidsettings.php:97 +#: OpenIDPlugin.php:657 +msgid "OpenID URL" +msgstr "" + +#. TRANS: OpenID plugin logon form field title. +#. TRANS: OpenID plugin logon form field instructions. +#: actions/openidlogin.php:158 OpenIDPlugin.php:660 +msgid "Your OpenID URL." +msgstr "" + +#. TRANS: OpenID plugin logon form checkbox label for setting to put the OpenID information in a cookie. +#: actions/openidlogin.php:163 +msgid "Remember me" +msgstr "" + +#. TRANS: OpenID plugin logon form field title. +#: actions/openidlogin.php:165 +msgid "Automatically login in the future; not for shared computers!" +msgstr "" + +#. TRANS: OpenID plugin logon form button label to start logon with the data provided in the logon form. +#: actions/openidlogin.php:170 +msgctxt "BUTTON" +msgid "Login" +msgstr "" + +#. TRANS: Message given when there is a problem with the user's session token. +#: actions/finishopenidlogin.php:42 +msgid "There was a problem with your session token. Try again, please." +msgstr "" + +#: actions/finishopenidlogin.php:49 +msgid "You cannot register if you do not agree to the license." +msgstr "" + +#: actions/finishopenidlogin.php:60 +msgid "An unknown error has occured." +msgstr "" + +#. TRANS: Instructions given after a first successful logon using OpenID. +#. TRANS: %s is the site name. +#: actions/finishopenidlogin.php:77 +#, php-format +msgid "" +"This is the first time you have logged into %s so we must connect your " +"OpenID to a local account. You can either create a new account, or connect " +"with your existing account, if you have one." +msgstr "" + +#. TRANS: Title +#: actions/finishopenidlogin.php:84 +msgctxt "TITLE" +msgid "OpenID Account Setup" +msgstr "" + +#. TRANS: Fieldset legend. +#: actions/finishopenidlogin.php:122 +msgid "Create new account" +msgstr "" + +#. TRANS: Form guide. +#: actions/finishopenidlogin.php:125 +msgid "Create a new user with this nickname." +msgstr "" + +#: actions/finishopenidlogin.php:134 +msgid "New nickname" +msgstr "" + +#. TRANS: Field title. +#: actions/finishopenidlogin.php:137 +msgid "1-64 lowercase letters or numbers, no punctuation or spaces." +msgstr "" + +#. TRANS: Field label. +#: actions/finishopenidlogin.php:141 +msgid "Email" +msgstr "" + +#. TRANS: Field title. +#: actions/finishopenidlogin.php:144 +msgid "Used only for updates, announcements, and password recovery." +msgstr "" + +#. TRANS: OpenID plugin link text. +#. TRANS: %s is a link to a license with the license name as link text. +#: actions/finishopenidlogin.php:161 +#, php-format +msgid "" +"My text and files are available under %s except this private data: password, " +"email address, IM address, and phone number." +msgstr "" + +#. TRANS: Button label in form in which to create a new user on the site for an OpenID. +#: actions/finishopenidlogin.php:174 +msgctxt "BUTTON" +msgid "Create" +msgstr "" + +#. TRANS: Used as form legend for form in which to connect an OpenID to an existing user on the site. +#: actions/finishopenidlogin.php:188 +msgid "Connect existing account" +msgstr "" + +#. TRANS: User instructions for form in which to connect an OpenID to an existing user on the site. +#: actions/finishopenidlogin.php:191 +msgid "" +"If you already have an account, login with your username and password to " +"connect it to your OpenID." +msgstr "" + +#. TRANS: Field label in form in which to connect an OpenID to an existing user on the site. +#: actions/finishopenidlogin.php:195 +msgid "Existing nickname" +msgstr "" + +#. TRANS: Field label in form in which to connect an OpenID to an existing user on the site. +#: actions/finishopenidlogin.php:199 +msgid "Password" +msgstr "" + +#. TRANS: Field label in form in which to connect an OpenID to an existing user on the site. +#: actions/finishopenidlogin.php:203 actions/openidsettings.php:110 +msgid "Synchronize Account" +msgstr "" + +#. TRANS: Form guide. +#: actions/finishopenidlogin.php:204 actions/openidsettings.php:113 +msgid "Synchronize GNU social profile with this OpenID identity." +msgstr "" + +#. TRANS: Button text in form in which to connect an OpenID to an existing user on the site. +#: actions/finishopenidlogin.php:208 +msgctxt "BUTTON" +msgid "Connect" +msgstr "" + +#. TRANS: Status message in case the response from the OpenID provider is that the logon attempt was cancelled. +#: actions/finishopenidlogin.php:254 actions/finishaddopenid.php:81 +#: actions/finishsynchopenid.php:76 +msgid "OpenID authentication cancelled." +msgstr "" + +#. TRANS: OpenID authentication failed; display the error message. %s is the error message. +#: actions/finishopenidlogin.php:258 actions/finishaddopenid.php:87 +#: actions/finishsynchopenid.php:82 +#, php-format +msgid "OpenID authentication failed: %s." +msgstr "" + +#. TRANS: Message displayed when OpenID authentication is aborted. +#. TRANS: OpenID authentication error. +#: actions/finishopenidlogin.php:279 actions/finishaddopenid.php:104 +#: actions/finishsynchopenid.php:99 +msgid "" +"OpenID authentication aborted: You are not allowed to login to this site." +msgstr "" + +#. TRANS: OpenID plugin message. No new user registration is allowed on the site. +#. TRANS: OpenID plugin message. No new user registration is allowed on the site without an invitation code, and none was provided. +#: actions/finishopenidlogin.php:335 actions/finishopenidlogin.php:344 +msgid "Registration not allowed." +msgstr "" + +#. TRANS: OpenID plugin message. No new user registration is allowed on the site without an invitation code, and the one provided was not valid. +#: actions/finishopenidlogin.php:351 +msgid "Not a valid invitation code." +msgstr "" + +#. TRANS: OpenID plugin server error. A stored OpenID cannot be retrieved. +#. TRANS: OpenID plugin server error. A stored OpenID cannot be found. +#: actions/finishopenidlogin.php:366 actions/finishopenidlogin.php:450 +msgid "Stored OpenID not found." +msgstr "" + +#. TRANS: OpenID plugin server error. +#: actions/finishopenidlogin.php:375 +msgid "Creating new account for OpenID that already has a user." +msgstr "" + +#. TRANS: OpenID plugin message. +#: actions/finishopenidlogin.php:438 +msgid "Invalid username or password." +msgstr "" + +#. TRANS: OpenID plugin server error. The user or user profile could not be saved. +#: actions/finishopenidlogin.php:457 +msgid "Error connecting user to OpenID." +msgstr "" + +#. TRANS: Error message displayed when trying to perform an action that requires a logged in user. +#: actions/finishaddopenid.php:60 actions/finishsynchopenid.php:55 +msgid "Not logged in." +msgstr "" + +#. TRANS: Message in case a user tries to add an OpenID that is already connected to them. +#: actions/finishaddopenid.php:115 +msgid "You already have this OpenID!" +msgstr "" + +#. TRANS: Message in case a user tries to add an OpenID that is already used by another user. +#: actions/finishaddopenid.php:118 +msgid "Someone else already has this OpenID." +msgstr "" + +#. TRANS: Message in case the OpenID object cannot be connected to the user. +#: actions/finishaddopenid.php:131 +msgid "Error connecting user." +msgstr "" + +#. TRANS: Message in case the user or the user profile cannot be saved in StatusNet. +#: actions/finishaddopenid.php:139 actions/finishsynchopenid.php:112 +msgid "Error updating profile." +msgstr "" + +#. TRANS: Title after getting the status of the OpenID authorisation request. +#: actions/finishaddopenid.php:181 +msgid "OpenID Login" +msgstr "" + +#. TRANS: Title after getting the status of the OpenID authorisation request. +#. TODO update after understanding the function ^ +#: actions/finishsynchopenid.php:152 +msgid "OpenID Synchronization" +msgstr "" + +#. TRANS: OpenID plugin client error given trying to add an unauthorised OpenID to a user (403). +#. TRANS: %s is a request identity. +#: actions/openidserver.php:113 +#, php-format +msgid "You are not authorized to use the identity %s." +msgstr "" + +#. TRANS: OpenID plugin client error given when not getting a response for a given OpenID provider (500). +#: actions/openidserver.php:134 +msgid "Just an OpenID provider. Nothing to see here, move along..." +msgstr "" + +#. TRANS: Title for OpenID bridge administration page. +#: actions/openidadminpanel.php:47 +msgctxt "TITLE" +msgid "OpenID Settings" +msgstr "" + +#. TRANS: Page instructions. +#: actions/openidadminpanel.php:58 +msgid "OpenID settings" +msgstr "" + +#. TRANS: Client error displayed when OpenID provider URL is too long. +#: actions/openidadminpanel.php:139 +msgid "Invalid provider URL. Maximum length is 255 characters." +msgstr "" + +#. TRANS: Client error displayed when Launchpad team name is too long. +#: actions/openidadminpanel.php:146 +msgid "Invalid team name. Maximum length is 255 characters." +msgstr "" + +#. TRANS: Fieldset legend. +#: actions/openidadminpanel.php:200 +msgctxt "LEGEND" +msgid "Trusted provider" +msgstr "" + +#. TRANS: Form guide. +#: actions/openidadminpanel.php:205 +msgid "" +"By default, users are allowed to authenticate with any OpenID provider. If " +"you are using your own OpenID service for shared sign-in, you can restrict " +"access to only your own users here." +msgstr "" + +#. TRANS: Field label. +#: actions/openidadminpanel.php:215 +msgid "Provider URL" +msgstr "" + +#. TRANS: Field title. +#: actions/openidadminpanel.php:217 +msgid "" +"All OpenID logins will be sent to this URL; other providers may not be used." +msgstr "" + +#: actions/openidadminpanel.php:226 +msgid "Append a username to base URL" +msgstr "" + +#. TRANS: Checkbox title. +#: actions/openidadminpanel.php:229 +msgid "" +"Login form will show the base URL and prompt for a username to add at the " +"end. Use when OpenID provider URL should be the profile page for individual " +"users." +msgstr "" + +#. TRANS: Field label. +#: actions/openidadminpanel.php:238 +msgid "Required team" +msgstr "" + +#. TRANS: Field title. +#: actions/openidadminpanel.php:240 +msgid "Only allow logins from users in the given team (Launchpad extension)." +msgstr "" + +#. TRANS: Fieldset legend. +#: actions/openidadminpanel.php:253 +msgctxt "LEGEND" +msgid "Options" +msgstr "" + +#: actions/openidadminpanel.php:262 +msgid "Enable OpenID-only mode" +msgstr "" + +#. TRANS: Checkbox title. +#: actions/openidadminpanel.php:265 +msgid "" +"Require all users to login via OpenID. Warning: disables password " +"authentication for all users!" +msgstr "" + +#. TRANS: Button text to save OpenID prefs +#: actions/openidadminpanel.php:285 actions/openidsettings.php:248 +msgctxt "BUTTON" +msgid "Save" +msgstr "" + +#. TRANS: Button title to save OpenID settings. +#: actions/openidadminpanel.php:289 +msgid "Save OpenID settings." +msgstr "" + +#. TRANS: Title for identity verification page. +#: actions/openidtrust.php:51 +msgid "OpenID Identity Verification" +msgstr "" + +#. TRANS: Client error when visiting page directly. +#: actions/openidtrust.php:69 +msgid "" +"This page should only be reached during OpenID processing, not directly." +msgstr "" + +#. TRANS: Page notice. %s is a trustroot name. +#: actions/openidtrust.php:118 +#, php-format +msgid "" +"%s has asked to verify your identity. Click Continue to verify your identity " +"and login without creating a new password." +msgstr "" + +#. TRANS: Button text to continue OpenID identity verification. +#. TRANS: button label for OAuth authorization page when needing OpenID authentication first. +#: actions/openidtrust.php:136 OpenIDPlugin.php:617 +msgctxt "BUTTON" +msgid "Continue" +msgstr "" + +#. TRANS: Button text to cancel OpenID identity verification. +#: actions/openidtrust.php:138 +msgctxt "BUTTON" +msgid "Cancel" +msgstr "" + +#. TRANS: Title of OpenID settings page for a user. +#: actions/openidsettings.php:49 +msgctxt "TITLE" +msgid "OpenID settings" +msgstr "" + +#. TRANS: Form instructions for OpenID settings. +#. TRANS: This message contains Markdown links in the form [description](link). +#: actions/openidsettings.php:61 +#, php-format +msgid "" +"[OpenID](%%doc.openid%%) lets you log into many sites with the same user " +"account. Manage your associated OpenIDs from here." +msgstr "" + +#. TRANS: Fieldset legend. +#: actions/openidsettings.php:90 +msgctxt "LEGEND" +msgid "Add OpenID" +msgstr "" + +#. TRANS: Form guide. +#: actions/openidsettings.php:100 +msgid "An OpenID URL which identifies you." +msgstr "" + +#. TRANS: Button text for adding an OpenID URL. +#: actions/openidsettings.php:118 +msgctxt "BUTTON" +msgid "Add" +msgstr "" + +#. TRANS: Header on OpenID settings page. +#: actions/openidsettings.php:130 +msgctxt "HEADER" +msgid "OpenID Actions" +msgstr "" + +#. TRANS: Form guide. +#: actions/openidsettings.php:137 +msgid "" +"You can't remove your main OpenID account without either adding a password " +"to your GNU social account or another OpenID account. You can synchronize " +"your profile with your OpenID by clicking the button labeled \"Synchronize\"." +msgstr "" + +#. TRANS: Button text to synchronize OpenID with the GS profile. +#. TRANS: Button text to sync an OpenID with the GS profile. +#: actions/openidsettings.php:154 actions/openidsettings.php:181 +msgctxt "BUTTON" +msgid "Synchronize" +msgstr "" + +#. TRANS: Form guide. +#: actions/openidsettings.php:163 +msgid "" +"You can remove an OpenID from your account by clicking the button labeled " +"\"Remove\". You can synchronize your profile with an OpenID by clicking the " +"button labeled \"Synchronize\"." +msgstr "" + +#. TRANS: Button text to remove an OpenID. +#. TRANS: Button text to remove an OpenID trustroot. +#: actions/openidsettings.php:183 actions/openidsettings.php:238 +msgctxt "BUTTON" +msgid "Remove" +msgstr "" + +#. TRANS: Fieldset legend. +#: actions/openidsettings.php:199 +msgid "OpenID Trusted Sites" +msgstr "" + +#. TRANS: Form guide. +#: actions/openidsettings.php:205 +msgid "" +"The following sites are allowed to access your identity and log you in. You " +"can remove a site from this list to deny it access to your OpenID." +msgstr "" + +#: actions/openidsettings.php:244 +msgctxt "LEGEND" +msgid "Preferences" +msgstr "" + +#. TRANS: Form validation error if no OpenID providers can be added. +#: actions/openidsettings.php:267 +msgid "Cannot add new providers." +msgstr "" + +#. TRANS: Unexpected form validation error. +#: actions/openidsettings.php:289 +msgid "No known action for POST." +msgstr "" + +#. TRANS: Form validation error when trying to remove a non-existing trustroot. +#: actions/openidsettings.php:311 +msgid "No such OpenID trustroot." +msgstr "" + +#. TRANS: Success message after removing trustroots. +#: actions/openidsettings.php:316 +msgid "Trustroots removed." +msgstr "" + +#. TRANS: Form validation error for a non-existing OpenID. +#: actions/openidsettings.php:333 actions/openidsettings.php:354 +msgid "No such OpenID." +msgstr "" + +#. TRANS: Form validation error if OpenID is connected to another user. +#: actions/openidsettings.php:337 +msgid "That OpenID does not belong to you." +msgstr "" + +#. TRANS: Success message after removing an OpenID. +#: actions/openidsettings.php:341 +msgid "OpenID removed." +msgstr "" + +#: actions/openidsettings.php:361 +msgid "Synchronized OpenID." +msgstr "" + +#: actions/openidsettings.php:393 +msgid "OpenID preferences saved." +msgstr "" + +#: openid.php:165 +msgid "No valid URL provided for OpenID." +msgstr "" + +#. TRANS: OpenID plugin server error. +#: openid.php:172 +msgid "Cannot instantiate OpenID consumer object." +msgstr "" + +#. TRANS: OpenID plugin message. Given when an OpenID is not valid. +#: openid.php:183 +msgid "Not a valid OpenID." +msgstr "" + +#. TRANS: OpenID plugin server error. Given when the OpenID authentication request fails. +#. TRANS: %s is the failure message. +#: openid.php:188 +#, php-format +msgid "OpenID failure: %s." +msgstr "" + +#. TRANS: OpenID plugin server error. Given when the OpenID authentication request cannot be redirected. +#. TRANS: %s is the failure message. +#: openid.php:243 +#, php-format +msgid "Could not redirect to server: %s." +msgstr "" + +#. TRANS: OpenID plugin user instructions. +#: openid.php:283 +msgid "" +"This form should automatically submit itself. If not, click the submit " +"button to go to your OpenID provider." +msgstr "" + +#. TRANS: OpenID plugin server error. +#: openid.php:320 +msgid "Error saving the profile." +msgstr "" + +#. TRANS: OpenID plugin server error. +#: openid.php:332 +msgid "Error saving the user." +msgstr "" + +#. TRANS: OpenID plugin client exception (403). +#: openid.php:362 +msgid "Unauthorized URL used for OpenID login." +msgstr "" + +#. TRANS: Title +#: openid.php:410 +msgid "OpenID Login Submission" +msgstr "" + +#. TRANS: OpenID plugin message used while requesting authorization user's OpenID login provider. +#: openid.php:421 +msgid "Requesting authorization from your login provider..." +msgstr "" + +#. TRANS: OpenID plugin message. User instruction while requesting authorization user's OpenID login provider. +#: openid.php:425 +msgid "" +"If you are not redirected to your login provider in a few seconds, try " +"pushing the button below." +msgstr "" + #. TRANS: Client exception thrown when an action is not available. #: OpenIDPlugin.php:143 msgid "Unavailable action." @@ -114,628 +726,7 @@ msgstr "" msgid "Use OpenID to login to the site." msgstr "" -#. TRANS: button label for OAuth authorization page when needing OpenID authentication first. -#. TRANS: Button text to continue OpenID identity verification. -#: OpenIDPlugin.php:617 actions/openidtrust.php:136 -msgctxt "BUTTON" -msgid "Continue" -msgstr "" - -#. TRANS: OpenID plugin logon form legend. -#: OpenIDPlugin.php:634 actions/openidlogin.php:132 -msgctxt "LEGEND" -msgid "OpenID login" -msgstr "" - #. TRANS: Field label. #: OpenIDPlugin.php:642 msgid "OpenID provider" msgstr "" - -#. TRANS: Form guide. -#: OpenIDPlugin.php:651 actions/openidlogin.php:149 -msgid "Enter your username." -msgstr "" - -#. TRANS: Form guide. -#: OpenIDPlugin.php:653 actions/openidlogin.php:151 -msgid "You will be sent to the provider's site for authentication." -msgstr "" - -#. TRANS: OpenID plugin logon form field label. -#. TRANS: Field label. -#: OpenIDPlugin.php:657 actions/openidlogin.php:155 -#: actions/openidsettings.php:103 -msgid "OpenID URL" -msgstr "" - -#. TRANS: OpenID plugin logon form field instructions. -#. TRANS: OpenID plugin logon form field title. -#: OpenIDPlugin.php:660 actions/openidlogin.php:158 -msgid "Your OpenID URL." -msgstr "" - -#. TRANS: Client error message trying to log on with OpenID while already logged on. -#: actions/openidlogin.php:33 actions/finishopenidlogin.php:37 -msgid "Already logged in." -msgstr "" - -#. TRANS: OpenID plugin message. Rememberme logins have to reauthenticate before changing any profile settings. -#. TRANS: "OpenID" is the display text for a link with URL "(%%doc.openid%%)". -#: actions/openidlogin.php:74 -#, php-format -msgid "" -"For security reasons, please re-login with your [OpenID](%%doc.openid%%) " -"before changing your settings." -msgstr "" - -#. TRANS: OpenID plugin message. -#. TRANS: "OpenID" is the display text for a link with URL "(%%doc.openid%%)". -#: actions/openidlogin.php:80 -#, php-format -msgid "Login with an [OpenID](%%doc.openid%%) account." -msgstr "" - -#. TRANS: OpenID plugin message. Title. -#: actions/openidlogin.php:114 -msgctxt "TITLE" -msgid "OpenID Login" -msgstr "" - -#. TRANS: Field label. -#: actions/openidlogin.php:140 -msgctxt "LABEL" -msgid "OpenID provider" -msgstr "" - -#. TRANS: OpenID plugin logon form checkbox label for setting to put the OpenID information in a cookie. -#: actions/openidlogin.php:163 -msgid "Remember me" -msgstr "" - -#. TRANS: OpenID plugin logon form field title. -#: actions/openidlogin.php:165 -msgid "Automatically login in the future; not for shared computers!" -msgstr "" - -#. TRANS: OpenID plugin logon form button label to start logon with the data provided in the logon form. -#: actions/openidlogin.php:170 -msgctxt "BUTTON" -msgid "Login" -msgstr "" - -#. TRANS: Title of OpenID settings page for a user. -#: actions/openidsettings.php:57 -msgctxt "TITLE" -msgid "OpenID settings" -msgstr "" - -#. TRANS: Form instructions for OpenID settings. -#. TRANS: This message contains Markdown links in the form [description](link). -#: actions/openidsettings.php:69 -#, php-format -msgid "" -"[OpenID](%%doc.openid%%) lets you log into many sites with the same user " -"account. Manage your associated OpenIDs from here." -msgstr "" - -#. TRANS: Fieldset legend. -#: actions/openidsettings.php:98 -msgctxt "LEGEND" -msgid "Add OpenID" -msgstr "" - -#. TRANS: Form guide. -#: actions/openidsettings.php:105 -msgid "An OpenID URL which identifies you." -msgstr "" - -#. TRANS: Field label. -#. TRANS: Field label in form in which to connect an OpenID to an existing user on the site. -#: actions/openidsettings.php:111 actions/finishopenidlogin.php:203 -msgid "Synchronize Account" -msgstr "" - -#. TRANS: Form guide. -#: actions/openidsettings.php:113 actions/finishopenidlogin.php:204 -msgid "Synchronize GNU social profile with this OpenID identity." -msgstr "" - -#. TRANS: Button text for adding an OpenID URL. -#: actions/openidsettings.php:117 -msgctxt "BUTTON" -msgid "Add" -msgstr "" - -#. TRANS: Header on OpenID settings page. -#: actions/openidsettings.php:129 -msgctxt "HEADER" -msgid "OpenID Actions" -msgstr "" - -#. TRANS: Form guide. -#: actions/openidsettings.php:134 -msgid "" -"You can't remove your main OpenID account without either adding a password " -"to your GNU social account or another OpenID account. You can synchronize " -"your profile with your OpenID by clicking the button labeled \"Synchronize\"." -msgstr "" - -#. TRANS: Button text to synchronize OpenID with the GS profile. -#. TRANS: Button text to sync an OpenID with the GS profile. -#: actions/openidsettings.php:150 actions/openidsettings.php:174 -msgctxt "BUTTON" -msgid "Synchronize" -msgstr "" - -#. TRANS: Form guide. -#: actions/openidsettings.php:157 -msgid "" -"You can remove an OpenID from your account by clicking the button labeled " -"\"Remove\". You can synchronize your profile with an OpenID by clicking the " -"button labeled \"Synchronize\"." -msgstr "" - -#. TRANS: Button text to remove an OpenID. -#. TRANS: Button text to remove an OpenID trustroot. -#: actions/openidsettings.php:176 actions/openidsettings.php:219 -msgctxt "BUTTON" -msgid "Remove" -msgstr "" - -#. TRANS: Fieldset legend. -#: actions/openidsettings.php:192 -msgid "OpenID Trusted Sites" -msgstr "" - -#. TRANS: Form guide. -#: actions/openidsettings.php:196 -msgid "" -"The following sites are allowed to access your identity and log you in. You " -"can remove a site from this list to deny it access to your OpenID." -msgstr "" - -#: actions/openidsettings.php:225 -msgctxt "LEGEND" -msgid "Preferences" -msgstr "" - -#. TRANS: Button text to save OpenID prefs -#. TRANS: Button text to save OpenID settings. -#: actions/openidsettings.php:229 actions/openidadminpanel.php:284 -msgctxt "BUTTON" -msgid "Save" -msgstr "" - -#. TRANS: Form validation error if no OpenID providers can be added. -#: actions/openidsettings.php:248 -msgid "Cannot add new providers." -msgstr "" - -#. TRANS: Unexpected form validation error. -#: actions/openidsettings.php:270 -msgid "No known action for POST." -msgstr "" - -#. TRANS: Form validation error when trying to remove a non-existing trustroot. -#: actions/openidsettings.php:292 -msgid "No such OpenID trustroot." -msgstr "" - -#. TRANS: Success message after removing trustroots. -#: actions/openidsettings.php:297 -msgid "Trustroots removed." -msgstr "" - -#. TRANS: Form validation error for a non-existing OpenID. -#: actions/openidsettings.php:314 actions/openidsettings.php:335 -msgid "No such OpenID." -msgstr "" - -#. TRANS: Form validation error if OpenID is connected to another user. -#: actions/openidsettings.php:318 -msgid "That OpenID does not belong to you." -msgstr "" - -#. TRANS: Success message after removing an OpenID. -#: actions/openidsettings.php:322 -msgid "OpenID removed." -msgstr "" - -#: actions/openidsettings.php:342 -msgid "Synchronized OpenID." -msgstr "" - -#: actions/openidsettings.php:374 -msgid "OpenID preferences saved." -msgstr "" - -#. TRANS: Error message displayed when trying to perform an action that requires a logged in user. -#: actions/finishaddopenid.php:66 actions/finishsynchopenid.php:55 -msgid "Not logged in." -msgstr "" - -#. TRANS: Status message in case the response from the OpenID provider is that the logon attempt was cancelled. -#: actions/finishaddopenid.php:87 actions/finishsynchopenid.php:76 -#: actions/finishopenidlogin.php:254 -msgid "OpenID authentication cancelled." -msgstr "" - -#. TRANS: OpenID authentication failed; display the error message. %s is the error message. -#: actions/finishaddopenid.php:93 actions/finishsynchopenid.php:82 -#: actions/finishopenidlogin.php:258 -#, php-format -msgid "OpenID authentication failed: %s." -msgstr "" - -#. TRANS: OpenID authentication error. -#. TRANS: Message displayed when OpenID authentication is aborted. -#: actions/finishaddopenid.php:110 actions/finishsynchopenid.php:99 -#: actions/finishopenidlogin.php:279 -msgid "" -"OpenID authentication aborted: You are not allowed to login to this site." -msgstr "" - -#. TRANS: Message in case a user tries to add an OpenID that is already connected to them. -#: actions/finishaddopenid.php:121 -msgid "You already have this OpenID!" -msgstr "" - -#. TRANS: Message in case a user tries to add an OpenID that is already used by another user. -#: actions/finishaddopenid.php:124 -msgid "Someone else already has this OpenID." -msgstr "" - -#. TRANS: Message in case the OpenID object cannot be connected to the user. -#: actions/finishaddopenid.php:137 -msgid "Error connecting user." -msgstr "" - -#. TRANS: Message in case the user or the user profile cannot be saved in StatusNet. -#: actions/finishaddopenid.php:145 actions/finishsynchopenid.php:112 -msgid "Error updating profile." -msgstr "" - -#. TRANS: Title after getting the status of the OpenID authorisation request. -#: actions/finishaddopenid.php:187 -msgid "OpenID Login" -msgstr "" - -#. TRANS: Title after getting the status of the OpenID authorisation request. -#. TODO update after understanding the function ^ -#: actions/finishsynchopenid.php:152 -msgid "OpenID Synchronization" -msgstr "" - -#. TRANS: Title for identity verification page. -#: actions/openidtrust.php:51 -msgid "OpenID Identity Verification" -msgstr "" - -#. TRANS: Client error when visiting page directly. -#: actions/openidtrust.php:69 -msgid "" -"This page should only be reached during OpenID processing, not directly." -msgstr "" - -#. TRANS: Page notice. %s is a trustroot name. -#: actions/openidtrust.php:118 -#, php-format -msgid "" -"%s has asked to verify your identity. Click Continue to verify your identity " -"and login without creating a new password." -msgstr "" - -#. TRANS: Button text to cancel OpenID identity verification. -#: actions/openidtrust.php:138 -msgctxt "BUTTON" -msgid "Cancel" -msgstr "" - -#. TRANS: OpenID plugin client error given trying to add an unauthorised OpenID to a user (403). -#. TRANS: %s is a request identity. -#: actions/openidserver.php:113 -#, php-format -msgid "You are not authorized to use the identity %s." -msgstr "" - -#. TRANS: OpenID plugin client error given when not getting a response for a given OpenID provider (500). -#: actions/openidserver.php:134 -msgid "Just an OpenID provider. Nothing to see here, move along..." -msgstr "" - -#. TRANS: Title for OpenID bridge administration page. -#: actions/openidadminpanel.php:53 -msgctxt "TITLE" -msgid "OpenID Settings" -msgstr "" - -#. TRANS: Page instructions. -#: actions/openidadminpanel.php:64 -msgid "OpenID settings" -msgstr "" - -#. TRANS: Client error displayed when OpenID provider URL is too long. -#: actions/openidadminpanel.php:145 -msgid "Invalid provider URL. Maximum length is 255 characters." -msgstr "" - -#. TRANS: Client error displayed when Launchpad team name is too long. -#: actions/openidadminpanel.php:152 -msgid "Invalid team name. Maximum length is 255 characters." -msgstr "" - -#. TRANS: Fieldset legend. -#: actions/openidadminpanel.php:206 -msgctxt "LEGEND" -msgid "Trusted provider" -msgstr "" - -#. TRANS: Form guide. -#: actions/openidadminpanel.php:209 -msgid "" -"By default, users are allowed to authenticate with any OpenID provider. If " -"you are using your own OpenID service for shared sign-in, you can restrict " -"access to only your own users here." -msgstr "" - -#. TRANS: Field label. -#: actions/openidadminpanel.php:218 -msgid "Provider URL" -msgstr "" - -#. TRANS: Field title. -#: actions/openidadminpanel.php:220 -msgid "" -"All OpenID logins will be sent to this URL; other providers may not be used." -msgstr "" - -#. TRANS: Checkbox label. -#: actions/openidadminpanel.php:228 -msgid "Append a username to base URL" -msgstr "" - -#. TRANS: Checkbox title. -#: actions/openidadminpanel.php:231 -msgid "" -"Login form will show the base URL and prompt for a username to add at the " -"end. Use when OpenID provider URL should be the profile page for individual " -"users." -msgstr "" - -#. TRANS: Field label. -#: actions/openidadminpanel.php:240 -msgid "Required team" -msgstr "" - -#. TRANS: Field title. -#: actions/openidadminpanel.php:242 -msgid "Only allow logins from users in the given team (Launchpad extension)." -msgstr "" - -#. TRANS: Fieldset legend. -#: actions/openidadminpanel.php:255 -msgctxt "LEGEND" -msgid "Options" -msgstr "" - -#. TRANS: Checkbox label. -#: actions/openidadminpanel.php:263 -msgid "Enable OpenID-only mode" -msgstr "" - -#. TRANS: Checkbox title. -#: actions/openidadminpanel.php:266 -msgid "" -"Require all users to login via OpenID. Warning: disables password " -"authentication for all users!" -msgstr "" - -#. TRANS: Button title to save OpenID settings. -#: actions/openidadminpanel.php:286 -msgid "Save OpenID settings." -msgstr "" - -#. TRANS: Message given when there is a problem with the user's session token. -#: actions/finishopenidlogin.php:42 -msgid "There was a problem with your session token. Try again, please." -msgstr "" - -#: actions/finishopenidlogin.php:49 -msgid "You cannot register if you do not agree to the license." -msgstr "" - -#: actions/finishopenidlogin.php:60 -msgid "An unknown error has occured." -msgstr "" - -#. TRANS: Instructions given after a first successful logon using OpenID. -#. TRANS: %s is the site name. -#: actions/finishopenidlogin.php:77 -#, php-format -msgid "" -"This is the first time you have logged into %s so we must connect your " -"OpenID to a local account. You can either create a new account, or connect " -"with your existing account, if you have one." -msgstr "" - -#. TRANS: Title -#: actions/finishopenidlogin.php:84 -msgctxt "TITLE" -msgid "OpenID Account Setup" -msgstr "" - -#. TRANS: Fieldset legend. -#: actions/finishopenidlogin.php:122 -msgid "Create new account" -msgstr "" - -#. TRANS: Form guide. -#: actions/finishopenidlogin.php:125 -msgid "Create a new user with this nickname." -msgstr "" - -#: actions/finishopenidlogin.php:134 -msgid "New nickname" -msgstr "" - -#. TRANS: Field title. -#: actions/finishopenidlogin.php:137 -msgid "1-64 lowercase letters or numbers, no punctuation or spaces." -msgstr "" - -#. TRANS: Field label. -#: actions/finishopenidlogin.php:141 -msgid "Email" -msgstr "" - -#. TRANS: Field title. -#: actions/finishopenidlogin.php:144 -msgid "Used only for updates, announcements, and password recovery." -msgstr "" - -#. TRANS: OpenID plugin link text. -#. TRANS: %s is a link to a license with the license name as link text. -#: actions/finishopenidlogin.php:161 -#, php-format -msgid "" -"My text and files are available under %s except this private data: password, " -"email address, IM address, and phone number." -msgstr "" - -#. TRANS: Button label in form in which to create a new user on the site for an OpenID. -#: actions/finishopenidlogin.php:174 -msgctxt "BUTTON" -msgid "Create" -msgstr "" - -#. TRANS: Used as form legend for form in which to connect an OpenID to an existing user on the site. -#: actions/finishopenidlogin.php:188 -msgid "Connect existing account" -msgstr "" - -#. TRANS: User instructions for form in which to connect an OpenID to an existing user on the site. -#: actions/finishopenidlogin.php:191 -msgid "" -"If you already have an account, login with your username and password to " -"connect it to your OpenID." -msgstr "" - -#. TRANS: Field label in form in which to connect an OpenID to an existing user on the site. -#: actions/finishopenidlogin.php:195 -msgid "Existing nickname" -msgstr "" - -#. TRANS: Field label in form in which to connect an OpenID to an existing user on the site. -#: actions/finishopenidlogin.php:199 -msgid "Password" -msgstr "" - -#. TRANS: Button text in form in which to connect an OpenID to an existing user on the site. -#: actions/finishopenidlogin.php:208 -msgctxt "BUTTON" -msgid "Connect" -msgstr "" - -#. TRANS: OpenID plugin message. No new user registration is allowed on the site. -#. TRANS: OpenID plugin message. No new user registration is allowed on the site without an invitation code, and none was provided. -#: actions/finishopenidlogin.php:335 actions/finishopenidlogin.php:344 -msgid "Registration not allowed." -msgstr "" - -#. TRANS: OpenID plugin message. No new user registration is allowed on the site without an invitation code, and the one provided was not valid. -#: actions/finishopenidlogin.php:351 -msgid "Not a valid invitation code." -msgstr "" - -#. TRANS: OpenID plugin server error. A stored OpenID cannot be retrieved. -#. TRANS: OpenID plugin server error. A stored OpenID cannot be found. -#: actions/finishopenidlogin.php:366 actions/finishopenidlogin.php:450 -msgid "Stored OpenID not found." -msgstr "" - -#. TRANS: OpenID plugin server error. -#: actions/finishopenidlogin.php:375 -msgid "Creating new account for OpenID that already has a user." -msgstr "" - -#. TRANS: OpenID plugin message. -#: actions/finishopenidlogin.php:438 -msgid "Invalid username or password." -msgstr "" - -#. TRANS: OpenID plugin server error. The user or user profile could not be saved. -#: actions/finishopenidlogin.php:457 -msgid "Error connecting user to OpenID." -msgstr "" - -#: openid.php:64 -msgid "Unknown DB type for OpenID." -msgstr "" - -#: openid.php:161 -msgid "No valid URL provided for OpenID." -msgstr "" - -#. TRANS: OpenID plugin server error. -#: openid.php:168 -msgid "Cannot instantiate OpenID consumer object." -msgstr "" - -#. TRANS: OpenID plugin message. Given when an OpenID is not valid. -#: openid.php:179 -msgid "Not a valid OpenID." -msgstr "" - -#. TRANS: OpenID plugin server error. Given when the OpenID authentication request fails. -#. TRANS: %s is the failure message. -#: openid.php:184 -#, php-format -msgid "OpenID failure: %s." -msgstr "" - -#. TRANS: OpenID plugin server error. Given when the OpenID authentication request cannot be redirected. -#. TRANS: %s is the failure message. -#: openid.php:233 -#, php-format -msgid "Could not redirect to server: %s." -msgstr "" - -#. TRANS: OpenID plugin user instructions. -#: openid.php:271 -msgid "" -"This form should automatically submit itself. If not, click the submit " -"button to go to your OpenID provider." -msgstr "" - -#. TRANS: OpenID plugin server error. -#: openid.php:307 -msgid "Error saving the profile." -msgstr "" - -#. TRANS: OpenID plugin server error. -#: openid.php:319 -msgid "Error saving the user." -msgstr "" - -#. TRANS: OpenID plugin client exception (403). -#: openid.php:349 -msgid "Unauthorized URL used for OpenID login." -msgstr "" - -#. TRANS: Title -#: openid.php:397 -msgid "OpenID Login Submission" -msgstr "" - -#. TRANS: OpenID plugin message used while requesting authorization user's OpenID login provider. -#: openid.php:408 -msgid "Requesting authorization from your login provider..." -msgstr "" - -#. TRANS: OpenID plugin message. User instruction while requesting authorization user's OpenID login provider. -#: openid.php:412 -msgid "" -"If you are not redirected to your login provider in a few seconds, try " -"pushing the button below." -msgstr "" diff --git a/plugins/OpportunisticQM/locale/OpportunisticQM.pot b/plugins/OpportunisticQM/locale/OpportunisticQM.pot index 66132da1e9..08f617948b 100644 --- a/plugins/OpportunisticQM/locale/OpportunisticQM.pot +++ b/plugins/OpportunisticQM/locale/OpportunisticQM.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:51+0100\n" +"POT-Creation-Date: 2020-08-04 01:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,6 +18,6 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" #. TRANS: Plugin description. -#: OpportunisticQMPlugin.php:48 +#: OpportunisticQMPlugin.php:45 msgid "Opportunistic queue manager plugin for background processing." msgstr "" diff --git a/plugins/Orbited/locale/Orbited.pot b/plugins/Orbited/locale/Orbited.pot index 2db1b9ced5..b2dc473825 100644 --- a/plugins/Orbited/locale/Orbited.pot +++ b/plugins/Orbited/locale/Orbited.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:51+0100\n" +"POT-Creation-Date: 2020-08-04 01:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,11 +18,11 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" #. TRANS: Server exception thrown when no connection can be made to a queue server. -#: OrbitedPlugin.php:112 +#: OrbitedPlugin.php:104 msgid "Failed to connect to queue server." msgstr "" #. TRANS: Plugin description. -#: OrbitedPlugin.php:172 +#: OrbitedPlugin.php:163 msgid "Plugin to make updates using Orbited and STOMP." msgstr "" diff --git a/plugins/OverwriteThemeBackground/locale/OverwriteThemeBackground.pot b/plugins/OverwriteThemeBackground/locale/OverwriteThemeBackground.pot new file mode 100644 index 0000000000..4158658fb3 --- /dev/null +++ b/plugins/OverwriteThemeBackground/locale/OverwriteThemeBackground.pot @@ -0,0 +1,100 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-08-04 01:05+0100\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#. TRANS: Plugin description for OverwriteThemeBackground plugin. +#: OverwriteThemeBackgroundPlugin.php:69 +msgid "A friendly plugin for overwriting your theme's background style." +msgstr "" + +#: OverwriteThemeBackgroundPlugin.php:100 +#: actions/overwritethemebackgroundadminpanel.php:44 +msgid "Overwrite Theme Background" +msgstr "" + +#: OverwriteThemeBackgroundPlugin.php:101 +#: actions/overwritethemebackgroundadminpanel.php:54 +msgid "Customize your theme's background easily" +msgstr "" + +#. TRANS: Client error displayed when a background URL is not valid. +#: actions/overwritethemebackgroundadminpanel.php:128 +msgid "Invalid background URL." +msgstr "" + +#. TRANS: Client error displayed when a SSL background URL is invalid. +#: actions/overwritethemebackgroundadminpanel.php:134 +msgid "Invalid SSL background URL." +msgstr "" + +#. TRANS: Fieldset legend for form to change background. +#: actions/overwritethemebackgroundadminpanel.php:186 +msgid "Background" +msgstr "" + +#. TRANS: Field label for GNU social site background. +#: actions/overwritethemebackgroundadminpanel.php:195 +msgid "Site background color" +msgstr "" + +#. TRANS: Field label for GNU social site background. +#: actions/overwritethemebackgroundadminpanel.php:208 +msgid "Site background" +msgstr "" + +#. TRANS: Field label for SSL GNU social site background. +#: actions/overwritethemebackgroundadminpanel.php:219 +msgid "SSL background" +msgstr "" + +#: actions/overwritethemebackgroundadminpanel.php:232 +msgid "Background repeat" +msgstr "" + +#: actions/overwritethemebackgroundadminpanel.php:235 +msgid "repeat horizontally and/or vertically" +msgstr "" + +#: actions/overwritethemebackgroundadminpanel.php:247 +msgid "Background attachment" +msgstr "" + +#: actions/overwritethemebackgroundadminpanel.php:250 +msgid "" +"Whether the background image should scroll or be fixed (will not scroll with " +"the rest of the page)" +msgstr "" + +#: actions/overwritethemebackgroundadminpanel.php:274 +msgid "Background position" +msgstr "" + +#: actions/overwritethemebackgroundadminpanel.php:277 +msgid "Sets the starting position of a background image" +msgstr "" + +#. TRANS: Button text for saving site settings. +#: actions/overwritethemebackgroundadminpanel.php:297 +msgctxt "BUTTON" +msgid "Save" +msgstr "" + +#. TRANS: Button title for saving site settings. +#: actions/overwritethemebackgroundadminpanel.php:301 +msgid "Save the site settings." +msgstr "" diff --git a/plugins/PiwikAnalytics/locale/PiwikAnalytics.pot b/plugins/PiwikAnalytics/locale/PiwikAnalytics.pot index 8dc25f1a9b..b9160280d4 100644 --- a/plugins/PiwikAnalytics/locale/PiwikAnalytics.pot +++ b/plugins/PiwikAnalytics/locale/PiwikAnalytics.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:51+0100\n" +"POT-Creation-Date: 2020-08-04 01:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/Poll/locale/Poll.pot b/plugins/Poll/locale/Poll.pot index 795f067fd0..4dd8ca608d 100644 --- a/plugins/Poll/locale/Poll.pot +++ b/plugins/Poll/locale/Poll.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:51+0100\n" +"POT-Creation-Date: 2020-08-04 01:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,29 +17,58 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#. TRANS: Page title for poll response. -#: actions/respondpoll.php:64 -msgid "Poll response" -msgstr "" - -#: actions/respondpoll.php:89 -msgid "You must be logged in to respond to a poll." -msgstr "" - -#. TRANS: Client exception thrown trying to respond to a non-existing poll. -#: actions/respondpoll.php:102 -msgid "Invalid or missing poll." -msgstr "" - -#. TRANS: Client exception thrown responding to a poll with an invalid answer. #. TRANS: Client exception thrown when responding to a poll with an invalid option. -#: actions/respondpoll.php:108 classes/Poll_response.php:135 +#. TRANS: Client exception thrown responding to a poll with an invalid answer. +#: classes/Poll_response.php:127 actions/respondpoll.php:108 msgid "Invalid poll selection." msgstr "" -#. TRANS: Page title after sending a poll response. -#: actions/respondpoll.php:162 -msgid "Poll results" +#. TRANS: Rendered version of the notice content voting for a poll. +#. TRANS: %s a link to the poll with the chosen option as link description. +#: classes/Poll_response.php:159 classes/Poll_response.php:165 +#, php-format +msgid "voted for \"%s\"" +msgstr "" + +#: classes/Poll.php:199 +#, php-format +msgid "Poll: %1$s %2$s" +msgstr "" + +#. TRANS: Rendered version of the notice content creating a poll. +#. TRANS: %s is a link to the poll with the question as link description. +#: classes/Poll.php:206 +#, php-format +msgid "Poll: %s" +msgstr "" + +#. TRANS: Field label on the page to create a poll. +#: forms/newpoll.php:109 +msgid "Question" +msgstr "" + +#. TRANS: Field title on the page to create a poll. +#: forms/newpoll.php:112 +msgid "What question are people answering?" +msgstr "" + +#. TRANS: Field label for an answer option on the page to create a poll. +#. TRANS: %d is the option number. +#: forms/newpoll.php:134 +#, php-format +msgid "Option %d" +msgstr "" + +#. TRANS: Button text for saving a new poll. +#: forms/newpoll.php:163 +msgctxt "BUTTON" +msgid "Save" +msgstr "" + +#. TRANS: Button text for submitting a poll response. +#: forms/pollresponse.php:126 +msgctxt "BUTTON" +msgid "Submit" msgstr "" #. TRANS: Title for poll page. @@ -66,14 +95,23 @@ msgstr "" msgid "Notice posted" msgstr "" -#. TRANS: Page title. -#: actions/pollsettings.php:44 -msgid "Poll settings" +#. TRANS: Page title for poll response. +#: actions/respondpoll.php:64 +msgid "Poll response" msgstr "" -#. TRANS: Page instructions. -#: actions/pollsettings.php:56 -msgid "Set your poll preferences" +#: actions/respondpoll.php:89 +msgid "You must be logged in to respond to a poll." +msgstr "" + +#. TRANS: Client exception thrown trying to respond to a non-existing poll. +#: actions/respondpoll.php:102 +msgid "Invalid or missing poll." +msgstr "" + +#. TRANS: Page title after sending a poll response. +#: actions/respondpoll.php:162 +msgid "Poll results" msgstr "" #. TRANS: Client exception thrown trying to view a non-existing poll. @@ -91,23 +129,14 @@ msgstr "" msgid "%1$s's poll: %2$s" msgstr "" -#: classes/Poll.php:205 -#, php-format -msgid "Poll: %1$s %2$s" +#. TRANS: Page title. +#: actions/pollsettings.php:44 +msgid "Poll settings" msgstr "" -#. TRANS: Rendered version of the notice content creating a poll. -#. TRANS: %s is a link to the poll with the question as link description. -#: classes/Poll.php:212 -#, php-format -msgid "Poll: %s" -msgstr "" - -#. TRANS: Rendered version of the notice content voting for a poll. -#. TRANS: %s a link to the poll with the chosen option as link description. -#: classes/Poll_response.php:167 classes/Poll_response.php:173 -#, php-format -msgid "voted for \"%s\"" +#. TRANS: Page instructions. +#: actions/pollsettings.php:56 +msgid "Set your poll preferences" msgstr "" #. TRANS: Plugin description. @@ -157,32 +186,3 @@ msgstr "" #: PollPlugin.php:471 msgid "Poll data is missing" msgstr "" - -#. TRANS: Button text for submitting a poll response. -#: forms/pollresponse.php:126 -msgctxt "BUTTON" -msgid "Submit" -msgstr "" - -#. TRANS: Field label on the page to create a poll. -#: forms/newpoll.php:109 -msgid "Question" -msgstr "" - -#. TRANS: Field title on the page to create a poll. -#: forms/newpoll.php:112 -msgid "What question are people answering?" -msgstr "" - -#. TRANS: Field label for an answer option on the page to create a poll. -#. TRANS: %d is the option number. -#: forms/newpoll.php:134 -#, php-format -msgid "Option %d" -msgstr "" - -#. TRANS: Button text for saving a new poll. -#: forms/newpoll.php:163 -msgctxt "BUTTON" -msgid "Save" -msgstr "" diff --git a/plugins/PostDebug/locale/PostDebug.pot b/plugins/PostDebug/locale/PostDebug.pot index 28aa6171f4..c5e98a3f5f 100644 --- a/plugins/PostDebug/locale/PostDebug.pot +++ b/plugins/PostDebug/locale/PostDebug.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:51+0100\n" +"POT-Creation-Date: 2020-08-04 01:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/PtitUrl/locale/PtitUrl.pot b/plugins/PtitUrl/locale/PtitUrl.pot index 4118982c80..de8a7fe44d 100644 --- a/plugins/PtitUrl/locale/PtitUrl.pot +++ b/plugins/PtitUrl/locale/PtitUrl.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:51+0100\n" +"POT-Creation-Date: 2020-08-04 01:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/QnA/locale/QnA.pot b/plugins/QnA/locale/QnA.pot index a60ab0f0f0..bdeef1bdd4 100644 --- a/plugins/QnA/locale/QnA.pot +++ b/plugins/QnA/locale/QnA.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:51+0100\n" +"POT-Creation-Date: 2020-08-04 01:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,6 +18,151 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" +#. TRANS: Exception thown when getting a question with a non-existing ID. +#. TRANS: %s is the non-existing question ID. +#: classes/QnA_Answer.php:140 +#, php-format +msgid "No question with ID %s" +msgstr "" + +#. TRANS: Exception thown when getting a profile with a non-existing ID. +#. TRANS: %s is the non-existing profile ID. +#. TRANS: Exception trown when getting a profile for a non-existing ID. +#. TRANS: %s is the provided profile ID. +#: classes/QnA_Answer.php:151 classes/QnA_Question.php:113 +#, php-format +msgid "No profile with ID %s" +msgstr "" + +#. TRANS: %s is the number of answer revisions. +#: classes/QnA_Answer.php:196 +#, php-format +msgid "%s revision" +msgid_plural "%s revisions" +msgstr[0] "" +msgstr[1] "" + +#. TRANS: Text for a question that was answered. +#. TRANS: %1$s is the user that answered, %2$s is the question title, +#. TRANS: %2$s is the answer content. +#: classes/QnA_Answer.php:216 +#, php-format +msgid "%1$s answered the question \"%2$s\": %3$s" +msgstr "" + +#. TRANS: Text for a question that was answered. +#. TRANS: %s is the question title. +#. TRANS: Rendered version of the notice content answering a question. +#. TRANS: %s a link to the question with question title as the link content. +#: classes/QnA_Answer.php:257 classes/QnA_Answer.php:264 +#, php-format +msgid "answered \"%s\"" +msgstr "" + +#. TRANS: Number of given answers to a question. +#. TRANS: %s is the number of given answers. +#: classes/QnA_Question.php:200 +#, php-format +msgid "%s answer" +msgid_plural "%s answers" +msgstr[0] "" +msgstr[1] "" + +#. TRANS: Notification that a question cannot be answered anymore because it is closed. +#: classes/QnA_Question.php:207 +msgid "This question is closed." +msgstr "" + +#. TRANS: Rendered version of the notice content creating a question. +#. TRANS: %s a link to the question as link description. +#: classes/QnA_Question.php:271 +#, php-format +msgid "Question: %s" +msgstr "" + +#. TRANS: Form legend for revising the answer. +#: forms/qnashowquestion.php:106 +msgctxt "LEGEND" +msgid "Question" +msgstr "" + +#. TRANS: Button text for closing a question. +#: forms/qnashowquestion.php:151 +msgctxt "BUTTON" +msgid "Close" +msgstr "" + +#. TRANS: Title for button text for closing a question. +#: forms/qnashowquestion.php:155 +msgid "Close the question to no one can answer it anymore." +msgstr "" + +#. TRANS: Form legend for showing the answer. +#. TRANS: Page title for and answer to a question. +#. TRANS: Page title after sending an answer. +#: forms/qnashowanswer.php:113 actions/qnanewanswer.php:62 +#: actions/qnavote.php:63 actions/qnareviseanswer.php:190 +#: actions/qnareviseanswer.php:226 +msgid "Answer" +msgstr "" + +#. TRANS: Button text for marking an answer as "best". +#: forms/qnashowanswer.php:150 +msgctxt "BUTTON" +msgid "Best" +msgstr "" + +#. TRANS: Title for button text marking an answer as "best". +#: forms/qnashowanswer.php:154 +msgid "Mark this answer as the best answer." +msgstr "" + +#. TRANS: Field label. +#: forms/qnanewanswer.php:114 +msgid "Enter your answer" +msgstr "" + +#. TRANS: Button text for submitting a poll response. +#: forms/qnanewanswer.php:125 +msgctxt "BUTTON" +msgid "Answer" +msgstr "" + +#. TRANS: Button text for submitting a poll response. +#. TRANS: Button text for submitting a revised answer. +#: forms/qnavote.php:118 forms/qnareviseanswer.php:119 +msgctxt "BUTTON" +msgid "Submit" +msgstr "" + +#. TRANS: Field label for a new question. +#: forms/qnanewquestion.php:110 +msgctxt "LABEL" +msgid "Title" +msgstr "" + +#. TRANS: Field title for a new question. +#: forms/qnanewquestion.php:113 +msgid "The title of your question." +msgstr "" + +#. TRANS: Field label for question details. +#: forms/qnanewquestion.php:122 +msgctxt "LABEL" +msgid "Description" +msgstr "" + +#. TRANS: Field title for question details. +#: forms/qnanewquestion.php:125 +msgid "Your question in detail." +msgstr "" + +#. TRANS: Button text for saving a new question. +#: forms/qnanewquestion.php:149 +msgctxt "BUTTON" +msgid "Save" +msgstr "" + #. TRANS: Exception thrown when performing an unexpected action on a question. #. TRANS: %s is the unpexpected object type. #: lib/qnalistitem.php:67 @@ -36,61 +181,6 @@ msgstr "" msgid "Answer data is missing." msgstr "" -#. TRANS: Page title for revising a question -#: actions/qnareviseanswer.php:62 -msgid "Revise answer" -msgstr "" - -#. TRANS: Client exception thrown trying to answer a question while not logged in. -#: actions/qnareviseanswer.php:85 actions/qnanewanswer.php:85 -#: actions/qnavote.php:85 -msgid "You must be logged in to answer to a question." -msgstr "" - -#. TRANS: Client exception thrown trying to respond to a non-existing question. -#: actions/qnareviseanswer.php:98 -msgid "Invalid or missing answer." -msgstr "" - -#. TRANS: Form title for sending an answer. -#: actions/qnareviseanswer.php:162 -msgctxt "TITLE" -msgid "Answer" -msgstr "" - -#. TRANS: Page title after sending an answer. -#. TRANS: Page title for and answer to a question. -#. TRANS: Form legend for showing the answer. -#: actions/qnareviseanswer.php:201 actions/qnareviseanswer.php:237 -#: actions/qnanewanswer.php:62 actions/qnavote.php:63 -#: forms/qnashowanswer.php:113 -msgid "Answer" -msgstr "" - -#. TRANS: Client exception thrown trying to respond to a non-existing question. -#: actions/qnanewanswer.php:101 actions/qnaclosequestion.php:99 -#: actions/qnavote.php:97 -msgid "Invalid or missing question." -msgstr "" - -#. TRANS: Page title after sending an answer. -#. TRANS: Page title after sending in a vote for a question or answer. -#: actions/qnanewanswer.php:156 actions/qnaclosequestion.php:152 -#: actions/qnavote.php:147 -msgid "Answers" -msgstr "" - -#. TRANS: Page title after an AJAX error occurs on the post answer page. -#: actions/qnanewanswer.php:207 -msgid "Ajax Error" -msgstr "" - -#. TRANS: Title for form to send answer to a question. -#: actions/qnanewanswer.php:230 -msgctxt "TITLE" -msgid "Your answer" -msgstr "" - #. TRANS: Client exception thrown trying to view a non-existing question. #: actions/qnashowquestion.php:70 msgid "No such question." @@ -120,19 +210,69 @@ msgstr "" msgid "%1$s's question: %2$s" msgstr "" -#. TRANS: Page title for close a question -#: actions/qnaclosequestion.php:63 -msgid "Close question" +#. TRANS: Client exception thrown when requesting a non-existing answer. +#. TRANS: Did we used to have it, and it got deleted? +#: actions/qnashowanswer.php:70 actions/qnashowanswer.php:84 +msgid "No such answer." msgstr "" -#. TRANS: Client exception thrown trying to close a question when not logged in -#: actions/qnaclosequestion.php:86 -msgid "You must be logged in to close a question." +#. TRANS: Client exception thrown when requesting an answer that has no connected question. +#: actions/qnashowanswer.php:77 +msgid "No question for this answer." msgstr "" -#. TRANS: Exception thrown trying to close another user's question. -#: actions/qnaclosequestion.php:135 -msgid "You did not ask this question." +#. TRANS: Page title. +#. TRANS: %1$s is the user who answered a question, %2$s is the question. +#: actions/qnashowanswer.php:124 +#, php-format +msgid "%1$s's answer to \"%2$s\"" +msgstr "" + +#. TRANS: Client exception thrown trying to answer a question while not logged in. +#: actions/qnanewanswer.php:85 actions/qnavote.php:85 +#: actions/qnareviseanswer.php:74 +msgid "You must be logged in to answer to a question." +msgstr "" + +#. TRANS: Client exception thrown trying to respond to a non-existing question. +#: actions/qnanewanswer.php:101 actions/qnavote.php:97 +#: actions/qnaclosequestion.php:88 +msgid "Invalid or missing question." +msgstr "" + +#. TRANS: Page title after sending an answer. +#. TRANS: Page title after sending in a vote for a question or answer. +#. TRANS: Page title after sending an answer. +#: actions/qnanewanswer.php:156 actions/qnavote.php:147 +#: actions/qnaclosequestion.php:140 +msgid "Answers" +msgstr "" + +#. TRANS: Page title after an AJAX error occurs on the post answer page. +#: actions/qnanewanswer.php:207 +msgid "Ajax Error" +msgstr "" + +#. TRANS: Title for form to send answer to a question. +#: actions/qnanewanswer.php:230 +msgctxt "TITLE" +msgid "Your answer" +msgstr "" + +#. TRANS: Page title for revising a question +#: actions/qnareviseanswer.php:51 +msgid "Revise answer" +msgstr "" + +#. TRANS: Client exception thrown trying to respond to a non-existing question. +#: actions/qnareviseanswer.php:87 +msgid "Invalid or missing answer." +msgstr "" + +#. TRANS: Form title for sending an answer. +#: actions/qnareviseanswer.php:151 +msgctxt "TITLE" +msgid "Answer" msgstr "" #. TRANS: Title for Question page. @@ -155,84 +295,19 @@ msgstr "" msgid "Question posted" msgstr "" -#. TRANS: Client exception thrown when requesting a non-existing answer. -#. TRANS: Did we used to have it, and it got deleted? -#: actions/qnashowanswer.php:70 actions/qnashowanswer.php:84 -msgid "No such answer." +#. TRANS: Page title for close a question +#: actions/qnaclosequestion.php:52 +msgid "Close question" msgstr "" -#. TRANS: Client exception thrown when requesting an answer that has no connected question. -#: actions/qnashowanswer.php:77 -msgid "No question for this answer." +#. TRANS: Client exception thrown trying to close a question when not logged in +#: actions/qnaclosequestion.php:75 +msgid "You must be logged in to close a question." msgstr "" -#. TRANS: Page title. -#. TRANS: %1$s is the user who answered a question, %2$s is the question. -#: actions/qnashowanswer.php:124 -#, php-format -msgid "%1$s's answer to \"%2$s\"" -msgstr "" - -#. TRANS: Exception thown when getting a question with a non-existing ID. -#. TRANS: %s is the non-existing question ID. -#: classes/QnA_Answer.php:148 -#, php-format -msgid "No question with ID %s" -msgstr "" - -#. TRANS: Exception thown when getting a profile with a non-existing ID. -#. TRANS: %s is the non-existing profile ID. -#. TRANS: Exception trown when getting a profile for a non-existing ID. -#. TRANS: %s is the provided profile ID. -#: classes/QnA_Answer.php:159 classes/QnA_Question.php:121 -#, php-format -msgid "No profile with ID %s" -msgstr "" - -#. TRANS: %s is the number of answer revisions. -#: classes/QnA_Answer.php:204 -#, php-format -msgid "%s revision" -msgid_plural "%s revisions" -msgstr[0] "" -msgstr[1] "" - -#. TRANS: Text for a question that was answered. -#. TRANS: %1$s is the user that answered, %2$s is the question title, -#. TRANS: %2$s is the answer content. -#: classes/QnA_Answer.php:224 -#, php-format -msgid "%1$s answered the question \"%2$s\": %3$s" -msgstr "" - -#. TRANS: Text for a question that was answered. -#. TRANS: %s is the question title. -#. TRANS: Rendered version of the notice content answering a question. -#. TRANS: %s a link to the question with question title as the link content. -#: classes/QnA_Answer.php:265 classes/QnA_Answer.php:272 -#, php-format -msgid "answered \"%s\"" -msgstr "" - -#. TRANS: Number of given answers to a question. -#. TRANS: %s is the number of given answers. -#: classes/QnA_Question.php:208 -#, php-format -msgid "%s answer" -msgid_plural "%s answers" -msgstr[0] "" -msgstr[1] "" - -#. TRANS: Notification that a question cannot be answered anymore because it is closed. -#: classes/QnA_Question.php:215 -msgid "This question is closed." -msgstr "" - -#. TRANS: Rendered version of the notice content creating a question. -#. TRANS: %s a link to the question as link description. -#: classes/QnA_Question.php:279 -#, php-format -msgid "Question: %s" +#. TRANS: Exception thrown trying to close another user's question. +#: actions/qnaclosequestion.php:124 +msgid "You did not ask this question." msgstr "" #. TRANS: Plugin description. @@ -287,77 +362,3 @@ msgstr "" #: QnAPlugin.php:391 msgid "more..." msgstr "" - -#. TRANS: Button text for submitting a revised answer. -#. TRANS: Button text for submitting a poll response. -#: forms/qnareviseanswer.php:119 forms/qnavote.php:118 -msgctxt "BUTTON" -msgid "Submit" -msgstr "" - -#. TRANS: Field label. -#: forms/qnanewanswer.php:114 -msgid "Enter your answer" -msgstr "" - -#. TRANS: Button text for submitting a poll response. -#: forms/qnanewanswer.php:125 -msgctxt "BUTTON" -msgid "Answer" -msgstr "" - -#. TRANS: Form legend for revising the answer. -#: forms/qnashowquestion.php:106 -msgctxt "LEGEND" -msgid "Question" -msgstr "" - -#. TRANS: Button text for closing a question. -#: forms/qnashowquestion.php:151 -msgctxt "BUTTON" -msgid "Close" -msgstr "" - -#. TRANS: Title for button text for closing a question. -#: forms/qnashowquestion.php:155 -msgid "Close the question to no one can answer it anymore." -msgstr "" - -#. TRANS: Field label for a new question. -#: forms/qnanewquestion.php:110 -msgctxt "LABEL" -msgid "Title" -msgstr "" - -#. TRANS: Field title for a new question. -#: forms/qnanewquestion.php:113 -msgid "The title of your question." -msgstr "" - -#. TRANS: Field label for question details. -#: forms/qnanewquestion.php:122 -msgctxt "LABEL" -msgid "Description" -msgstr "" - -#. TRANS: Field title for question details. -#: forms/qnanewquestion.php:125 -msgid "Your question in detail." -msgstr "" - -#. TRANS: Button text for saving a new question. -#: forms/qnanewquestion.php:149 -msgctxt "BUTTON" -msgid "Save" -msgstr "" - -#. TRANS: Button text for marking an answer as "best". -#: forms/qnashowanswer.php:150 -msgctxt "BUTTON" -msgid "Best" -msgstr "" - -#. TRANS: Title for button text marking an answer as "best". -#: forms/qnashowanswer.php:154 -msgid "Mark this answer as the best answer." -msgstr "" diff --git a/plugins/RSSCloud/locale/RSSCloud.pot b/plugins/RSSCloud/locale/RSSCloud.pot index a21ef61af9..adf1ddefbd 100644 --- a/plugins/RSSCloud/locale/RSSCloud.pot +++ b/plugins/RSSCloud/locale/RSSCloud.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:51+0100\n" +"POT-Creation-Date: 2020-08-04 01:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,12 +17,19 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#. TRANS: Plugin description. -#: RSSCloudPlugin.php:209 -msgid "" -"The RSSCloud plugin enables your StatusNet instance to publish real-time " -"updates for profile RSS feeds using the RSSCloud protocol." +#. TRANS: Form validation error displayed when a URL parameter is missing. +#: actions/loggingaggregator.php:86 +msgid "A URL parameter is required." +msgstr "" + +#. TRANS: Form validation error displayed when HTTP GET is not used. +#: actions/loggingaggregator.php:94 +msgid "This resource requires an HTTP GET." +msgstr "" + +#. TRANS: Form validation error displayed when HTTP POST is not used. +#: actions/loggingaggregator.php:104 +msgid "This resource requires an HTTP POST." msgstr "" #. TRANS: Form validation error displayed when POST is not used. @@ -73,17 +80,10 @@ msgid "" "notified." msgstr "" -#. TRANS: Form validation error displayed when a URL parameter is missing. -#: actions/loggingaggregator.php:86 -msgid "A URL parameter is required." -msgstr "" - -#. TRANS: Form validation error displayed when HTTP GET is not used. -#: actions/loggingaggregator.php:94 -msgid "This resource requires an HTTP GET." -msgstr "" - -#. TRANS: Form validation error displayed when HTTP POST is not used. -#: actions/loggingaggregator.php:104 -msgid "This resource requires an HTTP POST." +#. TRANS: Plugin description. +#: RSSCloudPlugin.php:209 +msgid "" +"The RSSCloud plugin enables your StatusNet instance to publish real-time " +"updates for profile RSS feeds using the RSSCloud protocol." msgstr "" diff --git a/plugins/RedisCache/locale/RedisCache.pot b/plugins/RedisCache/locale/RedisCache.pot new file mode 100644 index 0000000000..7b7e535363 --- /dev/null +++ b/plugins/RedisCache/locale/RedisCache.pot @@ -0,0 +1,23 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-08-04 01:05+0100\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#. TRANS: Plugin description. +#: RedisCachePlugin.php:144 +msgid "Plugin implementing Redis as a backend for GNU social caching" +msgstr "" diff --git a/plugins/RedisQueue/locale/RedisQueue.pot b/plugins/RedisQueue/locale/RedisQueue.pot new file mode 100644 index 0000000000..cdbf6a2459 --- /dev/null +++ b/plugins/RedisQueue/locale/RedisQueue.pot @@ -0,0 +1,23 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-08-04 01:05+0100\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#. TRANS: Plugin description. +#: RedisQueuePlugin.php:50 +msgid "Plugin implementing Redis as a backend for GNU social queues" +msgstr "" diff --git a/plugins/RegisterThrottle/locale/RegisterThrottle.pot b/plugins/RegisterThrottle/locale/RegisterThrottle.pot index e148711da6..d9372ad7f5 100644 --- a/plugins/RegisterThrottle/locale/RegisterThrottle.pot +++ b/plugins/RegisterThrottle/locale/RegisterThrottle.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:51+0100\n" +"POT-Creation-Date: 2020-08-04 01:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/RemoteFollow/locale/RemoteFollow.pot b/plugins/RemoteFollow/locale/RemoteFollow.pot index 298a3e8035..0adc26d27f 100644 --- a/plugins/RemoteFollow/locale/RemoteFollow.pot +++ b/plugins/RemoteFollow/locale/RemoteFollow.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-25 01:23+0100\n" +"POT-Creation-Date: 2020-08-04 01:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,146 +18,147 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" #. TRANS: Link text for the follow button -#: RemoteFollowPlugin.php:70 +#: RemoteFollowPlugin.php:71 msgid "Subscribe" msgstr "" #. TRANS: Plugin description. -#: RemoteFollowPlugin.php:127 +#: RemoteFollowPlugin.php:128 msgid "Add remote-follow button support to GNU social" msgstr "" #. TRANS: Link text for link to remote subscribe. -#: RemoteFollowPlugin:153 +#: RemoteFollowPlugin.php:154 msgid "Remote" msgstr "" #. TRANS: Client error displayed when the user is logged in. -#: remotefollowinit.php:46 +#: actions/remotefollowinit.php:47 msgid "You can use the local subscription!" msgstr "" #. TRANS: Client error displayed when targeting an invalid user. -#: remotefollowinit.php:55 +#: actions/remotefollowinit.php:56 msgid "No such user." msgstr "" #. TRANS: Error displayed when the session token does not match or is not given. -#: remotefollowinit.php:73, remotefollowsub.php:272 -msgid "" -"There was a problem with your session token. " -"Try again, please." +#. TRANS: Client error displayed when the session token does not match or is not given. +#: actions/remotefollowinit.php:74 actions/remotefollowsub.php:282 +msgid "There was a problem with your session token. Try again, please." msgstr "" #. TRANS: Error displayed when there is failure in connecting with the remote profile. -#: remotefollowinit.php:89 +#: actions/remotefollowinit.php:90 msgid "" -"There was a problem connecting with the remote profile. " -"Try again, please." +"There was a problem connecting with the remote profile. Try again, please." msgstr "" #. TRANS: Form legend. %s is a nickname. -#: remotefollowinit.php:100 +#: actions/remotefollowinit.php:101 +#, php-format msgid "Subscribe to %s" msgstr "" #. TRANS: Button text to subscribe to a profile. -#: remotefollowinit.php:102 +#: actions/remotefollowinit.php:103 msgctxt "BUTTON" msgid "Subscribe" msgstr "" #. TRANS: Field label. -#: remotefollowinit.php:118 +#: actions/remotefollowinit.php:119 msgid "User nickname" msgstr "" #. TRANS: Field title. -#: remotefollowinit.php:121 +#: actions/remotefollowinit.php:122 msgid "Nickname of the user you want to follow." msgstr "" #. TRANS: Field label. -#: remotefollowinit.php:127 +#: actions/remotefollowinit.php:128 msgid "Profile Account" msgstr "" #. TRANS: Tooltip for field label "Profile Account". -#: remotefollowinit.php:130 +#: actions/remotefollowinit.php:131 msgid "Your account ID (e.g. user@example.com)." msgstr "" #. TRANS: Form title. -#: remotefollowinit.php:148 +#: actions/remotefollowinit.php:149 msgctxt "TITLE" msgid "Subscribe to user" msgstr "" #. TRANS: Error displayed when there's failure in fetching the remote profile. -#: remotefollowsub.php:60 +#: actions/remotefollowsub.php:61 msgid "" -"Sorry, we could not reach that address. " -"Please make sure it is a valid address and try again later." +"Sorry, we could not reach that address. Please make sure it is a valid " +"address and try again later." msgstr "" #. TRANS: Field label for a field that takes an user address. -#: remotefollowsub.php:104 +#: actions/remotefollowsub.php:106 msgid "Subscribe to" msgstr "" #. TRANS: Tooltip for field label "Subscribe to". -#: remotefollowsub.php:107 -msgid "User\'s address, like nickname@example.com or http://example.net/nickname." +#: actions/remotefollowsub.php:109 +msgid "" +"User's address, like nickname@example.com or http://example.net/nickname." msgstr "" #. TRANS: Button text. -#: remotefollowsub.php:111 +#: actions/remotefollowsub.php:114 msgctxt "BUTTON" msgid "Continue" msgstr "" #. TRANS: Button text. -#: remotefollowsub.php:142 +#: actions/remotefollowsub.php:146 msgctxt "BUTTON" msgid "Confirm" msgstr "" #. TRANS: Tooltip for button "Confirm". -#: remotefollowsub.php:147 +#: actions/remotefollowsub.php:150 msgid "Subscribe to this user" msgstr "" #. TRANS: Extra paragraph in remote profile view when already subscribed. -#: remotefollowsub.php:165 +#: actions/remotefollowsub.php:171 msgid "You are already subscribed to this user." msgstr "" #. TRANS: Remote subscription dialog error. -#: remotefollowsub.php:252 +#: actions/remotefollowsub.php:262 msgid "Already subscribed!" msgstr "" #. TRANS: Remote subscription dialog error. -#: remotefollowsub.php:257 +#: actions/remotefollowsub.php:267 msgid "Remote subscription failed!" msgstr "" #. TRANS: Form title. -#: remotefollowsub.php:300 +#: actions/remotefollowsub.php:310 msgid "Subscribe to user" msgstr "" #. TRANS: Page title for remote subscription form. -#: remotefollowsub.php:319 +#: actions/remotefollowsub.php:329 msgid "Confirm" msgstr "" -#. TRANS: Page title for remote subscription form. -#: remotefollowsub.php:319 +#: actions/remotefollowsub.php:329 msgid "Remote subscription" msgstr "" #. TRANS: Instructions. -#: remotefollowsub.php:330 -msgid "You can subscribe to users from other supported sites. Paste their address or profile URI below" -msgstr "" \ No newline at end of file +#: actions/remotefollowsub.php:340 +msgid "" +"You can subscribe to users from other supported sites. Paste their address " +"or profile URI below:" +msgstr "" diff --git a/plugins/RequireValidatedEmail/locale/RequireValidatedEmail.pot b/plugins/RequireValidatedEmail/locale/RequireValidatedEmail.pot index 703264766b..3d824bfa38 100644 --- a/plugins/RequireValidatedEmail/locale/RequireValidatedEmail.pot +++ b/plugins/RequireValidatedEmail/locale/RequireValidatedEmail.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:51+0100\n" +"POT-Creation-Date: 2020-08-04 01:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,25 +17,6 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#. TRANS: Client exception thrown when trying to post notices before validating an e-mail address. -#: RequireValidatedEmailPlugin.php:110 -msgid "You must validate your email address before posting." -msgstr "" - -#. TRANS: Client exception thrown when trying to register without providing an e-mail address. -#: RequireValidatedEmailPlugin.php:130 -msgid "You must provide an email address to register." -msgstr "" - -#. TRANS: Plugin description. -#: RequireValidatedEmailPlugin.php:229 -msgid "Disables posting without a validated email address." -msgstr "" - -#: RequireValidatedEmailPlugin.php:248 -msgid "You must validate an email address before posting!" -msgstr "" - #. TRANS: Client exception thrown when trying to register while already logged in. #: actions/confirmfirstemail.php:70 msgid "You are already logged in." @@ -117,3 +98,22 @@ msgstr "" msgctxt "BUTTON" msgid "Save" msgstr "" + +#. TRANS: Client exception thrown when trying to post notices before validating an e-mail address. +#: RequireValidatedEmailPlugin.php:100 +msgid "You must validate your email address before posting." +msgstr "" + +#. TRANS: Client exception thrown when trying to register without providing an e-mail address. +#: RequireValidatedEmailPlugin.php:120 +msgid "You must provide an email address to register." +msgstr "" + +#. TRANS: Plugin description. +#: RequireValidatedEmailPlugin.php:221 +msgid "Disables posting without a validated email address." +msgstr "" + +#: RequireValidatedEmailPlugin.php:240 +msgid "You must validate an email address before posting!" +msgstr "" diff --git a/plugins/ReverseUsernameAuthentication/locale/ReverseUsernameAuthentication.pot b/plugins/ReverseUsernameAuthentication/locale/ReverseUsernameAuthentication.pot index 0ea2d10db6..512325b0bc 100644 --- a/plugins/ReverseUsernameAuthentication/locale/ReverseUsernameAuthentication.pot +++ b/plugins/ReverseUsernameAuthentication/locale/ReverseUsernameAuthentication.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:51+0100\n" +"POT-Creation-Date: 2020-08-04 01:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/SQLProfile/locale/SQLProfile.pot b/plugins/SQLProfile/locale/SQLProfile.pot index 358827990b..e0281ab72b 100644 --- a/plugins/SQLProfile/locale/SQLProfile.pot +++ b/plugins/SQLProfile/locale/SQLProfile.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:51+0100\n" +"POT-Creation-Date: 2020-08-04 01:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/SQLStats/locale/SQLStats.pot b/plugins/SQLStats/locale/SQLStats.pot index afca972000..9e1843d4d7 100644 --- a/plugins/SQLStats/locale/SQLStats.pot +++ b/plugins/SQLStats/locale/SQLStats.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:51+0100\n" +"POT-Creation-Date: 2020-08-04 01:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,6 +18,6 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" #. TRANS: Plugin decription. -#: SQLStatsPlugin.php:47 +#: SQLStatsPlugin.php:52 msgid "Debug tool to watch for poorly indexed DB queries." msgstr "" diff --git a/plugins/SearchSub/locale/SearchSub.pot b/plugins/SearchSub/locale/SearchSub.pot index 7e1a645ca9..4d5fe7e1d9 100644 --- a/plugins/SearchSub/locale/SearchSub.pot +++ b/plugins/SearchSub/locale/SearchSub.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:51+0100\n" +"POT-Creation-Date: 2020-08-04 01:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,100 +17,187 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#. TRANS: Error text shown a user tries to untrack a search query they're not subscribed to. -#. TRANS: %s is the keyword for the search. -#: lib/searchsubuntrackcommand.php:22 -#, php-format -msgid "You are not tracking the search \"%s\"." +#. TRANS: Module description. +#: SearchSubPlugin.php:91 +msgid "Module to allow following all messages with a given search." msgstr "" -#. TRANS: Message given having failed to cancel a search subscription by untrack command. -#. TRANS: %s is the keyword for the query. -#: lib/searchsubuntrackcommand.php:31 -#, php-format -msgid "Could not end a search subscription for query \"%s\"." +#. TRANS: SearchSub plugin menu item on user settings page. +#. TRANS: Sub menu for searches. +#: SearchSubPlugin.php:198 SearchSubPlugin.php:262 +msgctxt "MENU" +msgid "Searches" msgstr "" -#. TRANS: Message given having removed a search subscription by untrack command. -#. TRANS: %s is the keyword for the search. -#: lib/searchsubuntrackcommand.php:38 +#. TRANS: SearchSub plugin tooltip for user settings menu item. +#: SearchSubPlugin.php:200 +msgid "Configure search subscriptions" +msgstr "" + +#. TRANS: Help message for IM/SMS command "track " +#: SearchSubPlugin.php:239 +msgctxt "COMMANDHELP" +msgid "Start following notices matching the given search query." +msgstr "" + +#. TRANS: Help message for IM/SMS command "untrack " +#: SearchSubPlugin.php:241 +msgctxt "COMMANDHELP" +msgid "Stop following notices matching the given search query." +msgstr "" + +#. TRANS: Help message for IM/SMS command "track off" +#. TRANS: Help message for IM/SMS command "untrack all" +#: SearchSubPlugin.php:243 SearchSubPlugin.php:245 +msgctxt "COMMANDHELP" +msgid "Disable all tracked search subscriptions." +msgstr "" + +#. TRANS: Help message for IM/SMS command "tracks" +#. TRANS: Help message for IM/SMS command "tracking" +#: SearchSubPlugin.php:247 SearchSubPlugin.php:249 +msgctxt "COMMANDHELP" +msgid "List all your search subscriptions." +msgstr "" + +#. TRANS: Form legend. +#: forms/searchsub.php:94 +msgid "Subscribe to this search" +msgstr "" + +#. TRANS: Button text for subscribing to a search. +#: forms/searchsub.php:122 +msgctxt "BUTTON" +msgid "Subscribe" +msgstr "" + +#. TRANS: Button title for subscribing to a search. +#: forms/searchsub.php:126 +msgid "Subscribe to this search." +msgstr "" + +#. TRANS: Form legend. +#: forms/searchunsub.php:74 +msgid "Unsubscribe from this search" +msgstr "" + +#. TRANS: Button text for unsubscribing from a text search. +#: forms/searchunsub.php:88 +msgctxt "BUTTON" +msgid "Unsubscribe" +msgstr "" + +#. TRANS: Button title for unsubscribing from a text search. +#: forms/searchunsub.php:92 +msgid "Unsubscribe from this search." +msgstr "" + +#. TRANS: Error text shown a user tries to track a search query they're already subscribed to. +#: lib/searchsubtrackcommand.php:37 #, php-format -msgid "You are no longer subscribed to the search \"%s\"." +msgid "You are already tracking the search \"%s\"." +msgstr "" + +#: lib/searchsubtrackcommand.php:46 +#, php-format +msgid "Could not start a search subscription for query \"%s\"." +msgstr "" + +#: lib/searchsubtrackcommand.php:54 +#, php-format +msgid "You are subscribed to the search \"%s\"." msgstr "" #. TRANS: Error text shown a user tries to disable all a search subscriptions with track off command, but has none. -#: lib/searchsubtrackoffcommand.php:14 lib/searchsubtrackingcommand.php:14 +#: lib/searchsubtrackoffcommand.php:30 lib/searchsubtrackingcommand.php:30 msgid "You are not tracking any searches." msgstr "" -#. TRANS: Message given having failed to cancel one of the search subs with 'track off' command. -#. TRANS: %s is the search for which the subscription removal failed. -#: lib/searchsubtrackoffcommand.php:25 +#: lib/searchsubtrackoffcommand.php:42 #, php-format msgid "Error disabling search subscription for query \"%s\"." msgstr "" #. TRANS: Message given having disabled all search subscriptions with 'track off'. -#: lib/searchsubtrackoffcommand.php:32 +#: lib/searchsubtrackoffcommand.php:50 msgid "Disabled all your search subscriptions." msgstr "" #. TRANS: Separator for list of tracked searches. -#: lib/searchsubtrackingcommand.php:24 +#: lib/searchsubtrackingcommand.php:40 msgctxt "SEPARATOR" msgid "\", \"" msgstr "" -#. TRANS: Message given having disabled all search subscriptions with 'track off'. -#. TRANS: %s is a list of searches. Separator default is '", "'. -#: lib/searchsubtrackingcommand.php:28 +#: lib/searchsubtrackingcommand.php:45 #, php-format msgid "You are tracking searches for: \"%s\"." msgstr "" -#. TRANS: Error text shown a user tries to track a search query they're already subscribed to. -#: lib/searchsubtrackcommand.php:21 +#. TRANS: Error text shown a user tries to untrack a search query they're not subscribed to. +#. TRANS: %s is the keyword for the search. +#: lib/searchsubuntrackcommand.php:38 #, php-format -msgid "You are already tracking the search \"%s\"." +msgid "You are not tracking the search \"%s\"." msgstr "" -#. TRANS: Message given having failed to set up a search subscription by track command. -#: lib/searchsubtrackcommand.php:29 +#: lib/searchsubuntrackcommand.php:48 #, php-format -msgid "Could not start a search subscription for query \"%s\"." +msgid "Could not end a search subscription for query \"%s\"." msgstr "" -#. TRANS: Message given having added a search subscription by track command. -#: lib/searchsubtrackcommand.php:35 +#: lib/searchsubuntrackcommand.php:57 #, php-format -msgid "You are subscribed to the search \"%s\"." +msgid "You are no longer subscribed to the search \"%s\"." +msgstr "" + +#. TRANS: Client error displayed trying to perform any request method other than POST. +#. TRANS: Do not translate POST. +#: actions/searchsub.php:61 +msgid "This action only accepts POST requests." +msgstr "" + +#. TRANS: Client error displayed when the session token is not okay. +#: actions/searchsub.php:70 +msgid "There was a problem with your session token. Try again, please." +msgstr "" + +#. TRANS: Error message displayed when trying to perform an action that requires a logged in user. +#: actions/searchsub.php:80 +msgid "Not logged in." +msgstr "" + +#. TRANS: Client error displayed trying to subscribe to a non-existing profile. +#: actions/searchsub.php:89 +msgid "No such profile." +msgstr "" + +#. TRANS: Page title when search subscription succeeded. +#: actions/searchsub.php:116 +msgid "Subscribed" msgstr "" #. TRANS: Header for subscriptions overview for a user (first page). #. TRANS: %s is a user nickname. -#: actions/searchsubs.php:49 +#: actions/searchsubs.php:35 #, php-format msgid "%s's search subscriptions" msgstr "" -#. TRANS: Header for subscriptions overview for a user (not first page). -#. TRANS: %1$s is a user nickname, %2$d is the page number. -#: actions/searchsubs.php:53 +#: actions/searchsubs.php:40 #, php-format msgid "%1$s's search subscriptions, page %2$d" msgstr "" #. TRANS: Page notice for page with an overview of all search subscriptions #. TRANS: of the logged in user's own profile. -#: actions/searchsubs.php:65 +#: actions/searchsubs.php:55 msgid "" "You have subscribed to receive all notices on this site matching the " "following searches:" msgstr "" -#. TRANS: Page notice for page with an overview of all subscriptions of a user other -#. TRANS: than the logged in user. %s is the user nickname. -#: actions/searchsubs.php:70 +#: actions/searchsubs.php:64 #, php-format msgid "" "%s has subscribed to receive all notices on this site matching the following " @@ -130,120 +217,17 @@ msgstr "" #. TRANS: than the logged in user that has no search subscriptions. %s is the user nickname. #. TRANS: Subscription list text when looking at the subscriptions for a of a user that has none #. TRANS: as an anonymous user. %s is the user nickname. -#: actions/searchsubs.php:120 actions/searchsubs.php:126 +#: actions/searchsubs.php:120 actions/searchsubs.php:125 #, php-format msgid "%s is not subscribed to any searches." msgstr "" -#. TRANS: Search subscription list item. %1$s is a URL to a notice search, -#. TRANS: %2$s are the search criteria, %3$s is a datestring. #: actions/searchsubs.php:166 #, php-format msgid "\"%2$s\" since %3$s" msgstr "" -#. TRANS: Client error displayed trying to perform any request method other than POST. -#. TRANS: Do not translate POST. -#: actions/searchsub.php:78 -msgid "This action only accepts POST requests." -msgstr "" - -#. TRANS: Client error displayed when the session token is not okay. -#: actions/searchsub.php:87 -msgid "There was a problem with your session token. Try again, please." -msgstr "" - -#. TRANS: Error message displayed when trying to perform an action that requires a logged in user. -#: actions/searchsub.php:97 -msgid "Not logged in." -msgstr "" - -#. TRANS: Client error displayed trying to subscribe to a non-existing profile. -#: actions/searchsub.php:106 -msgid "No such profile." -msgstr "" - -#. TRANS: Page title when search subscription succeeded. -#: actions/searchsub.php:132 -msgid "Subscribed" -msgstr "" - #. TRANS: Page title when search unsubscription succeeded. -#: actions/searchunsub.php:76 +#: actions/searchunsub.php:59 msgid "Unsubscribed" msgstr "" - -#. TRANS: Plugin description. -#: SearchSubPlugin.php:99 -msgid "Plugin to allow following all messages with a given search." -msgstr "" - -#. TRANS: SearchSub plugin menu item on user settings page. -#. TRANS: Sub menu for searches. -#: SearchSubPlugin.php:202 SearchSubPlugin.php:265 -msgctxt "MENU" -msgid "Searches" -msgstr "" - -#. TRANS: SearchSub plugin tooltip for user settings menu item. -#: SearchSubPlugin.php:204 -msgid "Configure search subscriptions" -msgstr "" - -#. TRANS: Help message for IM/SMS command "track " -#: SearchSubPlugin.php:242 -msgctxt "COMMANDHELP" -msgid "Start following notices matching the given search query." -msgstr "" - -#. TRANS: Help message for IM/SMS command "untrack " -#: SearchSubPlugin.php:244 -msgctxt "COMMANDHELP" -msgid "Stop following notices matching the given search query." -msgstr "" - -#. TRANS: Help message for IM/SMS command "track off" -#. TRANS: Help message for IM/SMS command "untrack all" -#: SearchSubPlugin.php:246 SearchSubPlugin.php:248 -msgctxt "COMMANDHELP" -msgid "Disable all tracked search subscriptions." -msgstr "" - -#. TRANS: Help message for IM/SMS command "tracks" -#. TRANS: Help message for IM/SMS command "tracking" -#: SearchSubPlugin.php:250 SearchSubPlugin.php:252 -msgctxt "COMMANDHELP" -msgid "List all your search subscriptions." -msgstr "" - -#. TRANS: Form legend. -#: forms/searchsub.php:110 -msgid "Subscribe to this search" -msgstr "" - -#. TRANS: Button text for subscribing to a search. -#: forms/searchsub.php:134 -msgctxt "BUTTON" -msgid "Subscribe" -msgstr "" - -#. TRANS: Button title for subscribing to a search. -#: forms/searchsub.php:138 -msgid "Subscribe to this search." -msgstr "" - -#. TRANS: Form legend. -#: forms/searchunsub.php:90 -msgid "Unsubscribe from this search" -msgstr "" - -#. TRANS: Button text for unsubscribing from a text search. -#: forms/searchunsub.php:102 -msgctxt "BUTTON" -msgid "Unsubscribe" -msgstr "" - -#. TRANS: Button title for unsubscribing from a text search. -#: forms/searchunsub.php:106 -msgid "Unsubscribe from this search." -msgstr "" diff --git a/plugins/SensitiveContent/locale/SensitiveContent.pot b/plugins/SensitiveContent/locale/SensitiveContent.pot index 49fc2e21ac..277a3cd922 100644 --- a/plugins/SensitiveContent/locale/SensitiveContent.pot +++ b/plugins/SensitiveContent/locale/SensitiveContent.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-04-07 01:53+0100\n" +"POT-Creation-Date: 2020-08-04 01:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,32 +17,32 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: SensitiveContentPlugin.php:53 -msgid "Mark, hide/show sensitive notices like on Twitter." -msgstr "" - -#: SensitiveContentPlugin.php:135 -msgctxt "MENU" -msgid "Sensitive Content" -msgstr "" - -#: SensitiveContentPlugin.php:136 -msgid "Settings for display of sensitive content." -msgstr "" - -#: actions/sensitivecontentsettings.php:44 +#: actions/sensitivecontentsettings.php:42 msgid "Sensitive content settings" msgstr "" -#: actions/sensitivecontentsettings.php:49 +#: actions/sensitivecontentsettings.php:47 msgid "Set preferences for display of \"sensitive\" content" msgstr "" -#: actions/sensitivecontentsettings.php:80 +#: actions/sensitivecontentsettings.php:78 msgctxt "BUTTON" msgid "Save" msgstr "" -#: actions/sensitivecontentsettings.php:90 +#: actions/sensitivecontentsettings.php:88 msgid "Settings saved." msgstr "" + +#: SensitiveContentPlugin.php:51 +msgid "Mark, hide/show sensitive notices like on Twitter." +msgstr "" + +#: SensitiveContentPlugin.php:132 +msgctxt "MENU" +msgid "Sensitive Content" +msgstr "" + +#: SensitiveContentPlugin.php:133 +msgid "Settings for display of sensitive content." +msgstr "" diff --git a/plugins/ShareNotice/locale/ShareNotice.pot b/plugins/ShareNotice/locale/ShareNotice.pot index 0cfe901800..ec310830b6 100644 --- a/plugins/ShareNotice/locale/ShareNotice.pot +++ b/plugins/ShareNotice/locale/ShareNotice.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:51+0100\n" +"POT-Creation-Date: 2020-08-04 01:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/SimpleCaptcha/locale/SimpleCaptcha.pot b/plugins/SimpleCaptcha/locale/SimpleCaptcha.pot index b9bdc846fe..af2df65d26 100644 --- a/plugins/SimpleCaptcha/locale/SimpleCaptcha.pot +++ b/plugins/SimpleCaptcha/locale/SimpleCaptcha.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:51+0100\n" +"POT-Creation-Date: 2020-08-04 01:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,12 +18,12 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" #. TRANS: Field label. -#: SimpleCaptchaPlugin.php:41 +#: SimpleCaptchaPlugin.php:43 msgid "Captcha" msgstr "" #. TRANS: The instruction box for our simple captcha plugin -#: SimpleCaptchaPlugin.php:43 +#: SimpleCaptchaPlugin.php:45 #, php-format msgid "Copy this to the textbox: \"%s\"" msgstr "" @@ -31,15 +31,15 @@ msgstr "" #. TRANS: Placeholder in the text box #. name=id #. required -#: SimpleCaptchaPlugin.php:45 +#: SimpleCaptchaPlugin.php:47 msgid "Prove that you are sentient." msgstr "" -#: SimpleCaptchaPlugin.php:59 +#: SimpleCaptchaPlugin.php:61 msgid "Captcha does not match!" msgstr "" #. TRANS: Plugin description. -#: SimpleCaptchaPlugin.php:72 +#: SimpleCaptchaPlugin.php:74 msgid "A simple captcha to get rid of spambots." msgstr "" diff --git a/plugins/SimpleUrl/locale/SimpleUrl.pot b/plugins/SimpleUrl/locale/SimpleUrl.pot index 85605418d0..a98abe2c9c 100644 --- a/plugins/SimpleUrl/locale/SimpleUrl.pot +++ b/plugins/SimpleUrl/locale/SimpleUrl.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:51+0100\n" +"POT-Creation-Date: 2020-08-04 01:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/Sitemap/locale/Sitemap.pot b/plugins/Sitemap/locale/Sitemap.pot index baa2b3b899..ee80468a5f 100644 --- a/plugins/Sitemap/locale/Sitemap.pot +++ b/plugins/Sitemap/locale/Sitemap.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:51+0100\n" +"POT-Creation-Date: 2020-08-04 01:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,59 +17,58 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#. TRANS: Menu item title/tooltip -#: SitemapPlugin.php:161 -msgid "Sitemap configuration" -msgstr "" - -#. TRANS: Menu item for site administration -#: SitemapPlugin.php:163 -msgctxt "MENU" -msgid "Sitemap" -msgstr "" - -#. TRANS: Plugin description. -#: SitemapPlugin.php:188 -msgid "This plugin allows creation of sitemaps for Bing and Yahoo!." -msgstr "" - #. TRANS: Title for sitemap. -#: actions/sitemapadminpanel.php:53 +#: actions/sitemapadminpanel.php:47 msgid "Sitemap" msgstr "" #. TRANS: Instructions for sitemap. -#: actions/sitemapadminpanel.php:64 +#: actions/sitemapadminpanel.php:58 msgid "Sitemap settings for this StatusNet site" msgstr "" #. TRANS: Field label. -#: actions/sitemapadminpanel.php:167 +#: actions/sitemapadminpanel.php:162 msgid "Yahoo key" msgstr "" #. TRANS: Title for field label. -#: actions/sitemapadminpanel.php:169 +#: actions/sitemapadminpanel.php:164 msgid "Yahoo! Site Explorer verification key." msgstr "" #. TRANS: Field label. -#: actions/sitemapadminpanel.php:175 +#: actions/sitemapadminpanel.php:172 msgid "Bing key" msgstr "" #. TRANS: Title for field label. -#: actions/sitemapadminpanel.php:177 +#: actions/sitemapadminpanel.php:174 msgid "Bing Webmaster Tools verification key." msgstr "" #. TRANS: Submit button text to save sitemap settings. -#: actions/sitemapadminpanel.php:192 +#: actions/sitemapadminpanel.php:191 msgctxt "BUTTON" msgid "Save" msgstr "" #. TRANS: Submit button title to save sitemap settings. -#: actions/sitemapadminpanel.php:196 +#: actions/sitemapadminpanel.php:195 msgid "Save sitemap settings." msgstr "" + +#. TRANS: Menu item title/tooltip +#: SitemapPlugin.php:160 +msgid "Sitemap configuration" +msgstr "" + +#: SitemapPlugin.php:164 +msgctxt "MENU" +msgid "Sitemap" +msgstr "" + +#. TRANS: Plugin description. +#: SitemapPlugin.php:192 +msgid "This plugin allows creation of sitemaps for Bing and Yahoo!." +msgstr "" diff --git a/plugins/SlicedFavorites/locale/SlicedFavorites.pot b/plugins/SlicedFavorites/locale/SlicedFavorites.pot index 2441c10098..cff9ba6f68 100644 --- a/plugins/SlicedFavorites/locale/SlicedFavorites.pot +++ b/plugins/SlicedFavorites/locale/SlicedFavorites.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:51+0100\n" +"POT-Creation-Date: 2020-08-04 01:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,12 +17,12 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" +#. TRANS: Client exception. +#: actions/favoritedslice.php:52 +msgid "Unknown favorites slice." +msgstr "" + #. TRANS: Plugin description. #: SlicedFavoritesPlugin.php:110 msgid "Shows timelines of popular notices for defined subsets of users." msgstr "" - -#. TRANS: Client exception. -#: actions/favoritedslice.php:56 -msgid "Unknown favorites slice." -msgstr "" diff --git a/plugins/SphinxSearch/locale/SphinxSearch.pot b/plugins/SphinxSearch/locale/SphinxSearch.pot index 28b0a1a414..dbc679c63c 100644 --- a/plugins/SphinxSearch/locale/SphinxSearch.pot +++ b/plugins/SphinxSearch/locale/SphinxSearch.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:51+0100\n" +"POT-Creation-Date: 2020-08-04 01:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/StompQueue/locale/StompQueue.pot b/plugins/StompQueue/locale/StompQueue.pot new file mode 100644 index 0000000000..3b98ccc4cf --- /dev/null +++ b/plugins/StompQueue/locale/StompQueue.pot @@ -0,0 +1,23 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-08-04 01:05+0100\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#. TRANS: Plugin description. +#: StompQueuePlugin.php:71 +msgid "Plugin implementing STOMP as a backend for GNU social queues" +msgstr "" diff --git a/plugins/StoreRemoteMedia/locale/StoreRemoteMedia.pot b/plugins/StoreRemoteMedia/locale/StoreRemoteMedia.pot index eb2dd7885e..f8c391630d 100644 --- a/plugins/StoreRemoteMedia/locale/StoreRemoteMedia.pot +++ b/plugins/StoreRemoteMedia/locale/StoreRemoteMedia.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:51+0100\n" +"POT-Creation-Date: 2020-08-04 01:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/StrictTransportSecurity/locale/StrictTransportSecurity.pot b/plugins/StrictTransportSecurity/locale/StrictTransportSecurity.pot index faa6d76fa9..45d1591336 100644 --- a/plugins/StrictTransportSecurity/locale/StrictTransportSecurity.pot +++ b/plugins/StrictTransportSecurity/locale/StrictTransportSecurity.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:51+0100\n" +"POT-Creation-Date: 2020-08-04 01:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/SubMirror/locale/SubMirror.pot b/plugins/SubMirror/locale/SubMirror.pot index f087fdcf82..9f982148b7 100644 --- a/plugins/SubMirror/locale/SubMirror.pot +++ b/plugins/SubMirror/locale/SubMirror.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:51+0100\n" +"POT-Creation-Date: 2020-08-04 01:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,107 +17,6 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#. TRANS: Name for possible feed provider. -#: lib/addmirrorwizard.php:83 -msgid "RSS or Atom feed" -msgstr "" - -#. TRANS: Heading for feed mirroring selection form. -#: lib/addmirrorwizard.php:94 -msgid "Select a feed provider" -msgstr "" - -#. TRANS: Client error displayed when trying to edit an object that is not a feed mirror. -#: actions/editmirror.php:66 -msgid "Requested invalid profile to edit." -msgstr "" - -#. TRANS: Client error displayed when providing invalid input when editing a mirror. -#: actions/editmirror.php:85 -msgid "Bad form data." -msgstr "" - -#. TRANS: Client error thrown when a mirror request is made and no result is retrieved. -#: actions/editmirror.php:94 -msgid "The mirror request failed, because no result was retrieved." -msgstr "" - -#. TRANS: Client error displayed when entering an invalid URL for a feed. -#. TRANS: %s is the invalid feed URL. -#: actions/basemirror.php:71 -#, php-format -msgid "Invalid feed URL: %s." -msgstr "" - -#. TRANS: Error message returned to user when setting up feed mirroring, -#. TRANS: but we were unable to resolve the given URL to a working feed. -#: actions/basemirror.php:84 -msgid "Invalid profile for mirroring." -msgstr "" - -#. TRANS: Client error displayed when trying to mirror a GNU social group feed. -#: actions/basemirror.php:103 -msgid "Cannot mirror a GNU social group at this time." -msgstr "" - -#. TRANS: Client error displayed when trying to use another method than POST. -#: actions/basemirror.php:118 -msgid "This action only accepts POST requests." -msgstr "" - -#. TRANS: Client error displayed when the session token does not match or is not given. -#: actions/basemirror.php:126 -msgid "There was a problem with your session token. Try again, please." -msgstr "" - -#. TRANS: Error message displayed when trying to perform an action that requires a logged in user. -#: actions/basemirror.php:136 -msgid "Not logged in." -msgstr "" - -#. TRANS: Page title for subscribed feed mirror. -#: actions/basemirror.php:159 -msgid "Subscribed" -msgstr "" - -#. TRANS: Page title. -#: actions/mirrorsettings.php:40 -msgid "Feed mirror settings" -msgstr "" - -#. TRANS: Page instructions. -#: actions/mirrorsettings.php:52 -msgid "" -"You can mirror updates from many RSS and Atom feeds into your GNU social " -"timeline!" -msgstr "" - -#. TRANS: Exception thrown when a feed provider could not be recognised. -#: actions/addmirror.php:74 -msgid "Internal form error: Unrecognized feed provider." -msgstr "" - -#. TRANS: Plugin description. -#: SubMirrorPlugin.php:70 -msgid "Pull feeds into your timeline!" -msgstr "" - -#. TRANS: SubMirror plugin menu item on user settings page. -#: SubMirrorPlugin.php:90 -msgctxt "MENU" -msgid "Mirroring" -msgstr "" - -#. TRANS: SubMirror plugin tooltip for user settings menu item. -#: SubMirrorPlugin.php:92 -msgid "Configure mirroring of posts from other feeds" -msgstr "" - -#. TRANS: Label in profile statistics section, followed by a count. -#: SubMirrorPlugin.php:169 -msgid "Mirrored feeds" -msgstr "" - #. TRANS: Field label (URL expectected). #: forms/editmirror.php:84 msgctxt "LABEL" @@ -168,3 +67,104 @@ msgstr "" msgctxt "BUTTON" msgid "Add feed" msgstr "" + +#. TRANS: Name for possible feed provider. +#: lib/addmirrorwizard.php:83 +msgid "RSS or Atom feed" +msgstr "" + +#. TRANS: Heading for feed mirroring selection form. +#: lib/addmirrorwizard.php:94 +msgid "Select a feed provider" +msgstr "" + +#. TRANS: Client error displayed when trying to edit an object that is not a feed mirror. +#: actions/editmirror.php:66 +msgid "Requested invalid profile to edit." +msgstr "" + +#. TRANS: Client error displayed when providing invalid input when editing a mirror. +#: actions/editmirror.php:85 +msgid "Bad form data." +msgstr "" + +#. TRANS: Client error thrown when a mirror request is made and no result is retrieved. +#: actions/editmirror.php:94 +msgid "The mirror request failed, because no result was retrieved." +msgstr "" + +#. TRANS: Exception thrown when a feed provider could not be recognised. +#: actions/addmirror.php:74 +msgid "Internal form error: Unrecognized feed provider." +msgstr "" + +#. TRANS: Page title. +#: actions/mirrorsettings.php:40 +msgid "Feed mirror settings" +msgstr "" + +#. TRANS: Page instructions. +#: actions/mirrorsettings.php:52 +msgid "" +"You can mirror updates from many RSS and Atom feeds into your GNU social " +"timeline!" +msgstr "" + +#. TRANS: Client error displayed when entering an invalid URL for a feed. +#. TRANS: %s is the invalid feed URL. +#: actions/basemirror.php:71 +#, php-format +msgid "Invalid feed URL: %s." +msgstr "" + +#. TRANS: Error message returned to user when setting up feed mirroring, +#. TRANS: but we were unable to resolve the given URL to a working feed. +#: actions/basemirror.php:84 +msgid "Invalid profile for mirroring." +msgstr "" + +#. TRANS: Client error displayed when trying to mirror a GNU social group feed. +#: actions/basemirror.php:103 +msgid "Cannot mirror a GNU social group at this time." +msgstr "" + +#. TRANS: Client error displayed when trying to use another method than POST. +#: actions/basemirror.php:118 +msgid "This action only accepts POST requests." +msgstr "" + +#. TRANS: Client error displayed when the session token does not match or is not given. +#: actions/basemirror.php:126 +msgid "There was a problem with your session token. Try again, please." +msgstr "" + +#. TRANS: Error message displayed when trying to perform an action that requires a logged in user. +#: actions/basemirror.php:136 +msgid "Not logged in." +msgstr "" + +#. TRANS: Page title for subscribed feed mirror. +#: actions/basemirror.php:159 +msgid "Subscribed" +msgstr "" + +#. TRANS: Plugin description. +#: SubMirrorPlugin.php:70 +msgid "Pull feeds into your timeline!" +msgstr "" + +#. TRANS: SubMirror plugin menu item on user settings page. +#: SubMirrorPlugin.php:90 +msgctxt "MENU" +msgid "Mirroring" +msgstr "" + +#. TRANS: SubMirror plugin tooltip for user settings menu item. +#: SubMirrorPlugin.php:92 +msgid "Configure mirroring of posts from other feeds" +msgstr "" + +#. TRANS: Label in profile statistics section, followed by a count. +#: SubMirrorPlugin.php:169 +msgid "Mirrored feeds" +msgstr "" diff --git a/plugins/SubscriptionThrottle/locale/SubscriptionThrottle.pot b/plugins/SubscriptionThrottle/locale/SubscriptionThrottle.pot index 588edb7291..08b7b16bbe 100644 --- a/plugins/SubscriptionThrottle/locale/SubscriptionThrottle.pot +++ b/plugins/SubscriptionThrottle/locale/SubscriptionThrottle.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:51+0100\n" +"POT-Creation-Date: 2020-08-04 01:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/TabFocus/locale/TabFocus.pot b/plugins/TabFocus/locale/TabFocus.pot index f844bced68..34c89e9ceb 100644 --- a/plugins/TabFocus/locale/TabFocus.pot +++ b/plugins/TabFocus/locale/TabFocus.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:51+0100\n" +"POT-Creation-Date: 2020-08-04 01:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/TagCloud/locale/TagCloud.pot b/plugins/TagCloud/locale/TagCloud.pot index 9ff165f81d..0f65845649 100644 --- a/plugins/TagCloud/locale/TagCloud.pot +++ b/plugins/TagCloud/locale/TagCloud.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:51+0100\n" +"POT-Creation-Date: 2020-08-04 01:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,21 +17,10 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#. TRANS: Menu item in search group navigation panel. -#: TagCloudPlugin.php:29 -msgctxt "MENU" -msgid "Recent tags" -msgstr "" - -#. TRANS: Plugin description. -#: TagCloudPlugin.php:68 -msgid "Adds tag clouds to stream pages" -msgstr "" - -#. TRANS: Title for personal tag cloud section. -#: lib/personaltagcloudsection.php:54 +#. TRANS: Title for inbox tag cloud section. +#: lib/publictagcloudsection.php:45 lib/inboxtagcloudsection.php:50 msgctxt "TITLE" -msgid "Tags" +msgid "Trends" msgstr "" #. TRANS: Content displayed in a tag cloud section if there are no tags. @@ -40,8 +29,19 @@ msgctxt "NOTAGS" msgid "None" msgstr "" -#. TRANS: Title for inbox tag cloud section. -#: lib/inboxtagcloudsection.php:56 lib/publictagcloudsection.php:53 +#. TRANS: Title for personal tag cloud section. +#: lib/personaltagcloudsection.php:48 msgctxt "TITLE" -msgid "Trends" +msgid "Tags" +msgstr "" + +#. TRANS: Menu item in search group navigation panel. +#: TagCloudPlugin.php:43 +msgctxt "MENU" +msgid "Recent tags" +msgstr "" + +#. TRANS: Module description. +#: TagCloudPlugin.php:83 +msgid "Adds tag clouds to stream pages" msgstr "" diff --git a/plugins/TagSub/locale/TagSub.pot b/plugins/TagSub/locale/TagSub.pot index 81c38c3dda..8d48166329 100644 --- a/plugins/TagSub/locale/TagSub.pot +++ b/plugins/TagSub/locale/TagSub.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:51+0100\n" +"POT-Creation-Date: 2020-08-04 01:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,25 +17,32 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#. TRANS: Plugin description. -#: TagSubPlugin.php:102 -msgid "Plugin to allow following all messages with a given tag." +#. TRANS: Form legend. +#: forms/tagsub.php:109 +msgid "Subscribe to this tag" msgstr "" -#. TRANS: SubMirror plugin menu item on user settings page. -#: TagSubPlugin.php:177 -msgctxt "MENU" -msgid "Tags" +#: forms/tagsub.php:137 +msgctxt "BUTTON" +msgid "Subscribe" msgstr "" -#. TRANS: SubMirror plugin tooltip for user settings menu item. -#: TagSubPlugin.php:179 -msgid "Configure tag subscriptions" +#: forms/tagsub.php:141 +msgid "Subscribe to this tag." msgstr "" -#. TRANS: Menu item text for tags submenu. -#: TagSubPlugin.php:196 -msgid "Tags" +#. TRANS: Form legend. +#: forms/tagunsub.php:91 +msgid "Unsubscribe from this tag" +msgstr "" + +#: forms/tagunsub.php:105 +msgctxt "BUTTON" +msgid "Unsubscribe" +msgstr "" + +#: forms/tagunsub.php:109 +msgid "Unsubscribe from this tag." msgstr "" #. TRANS: Header for subscriptions overview for a user (first page). @@ -119,30 +126,23 @@ msgstr "" msgid "Unsubscribed" msgstr "" -#. TRANS: Form legend. -#: forms/tagsub.php:109 -msgid "Subscribe to this tag" +#. TRANS: Plugin description. +#: TagSubPlugin.php:102 +msgid "Plugin to allow following all messages with a given tag." msgstr "" -#: forms/tagsub.php:137 -msgctxt "BUTTON" -msgid "Subscribe" +#. TRANS: SubMirror plugin menu item on user settings page. +#: TagSubPlugin.php:177 +msgctxt "MENU" +msgid "Tags" msgstr "" -#: forms/tagsub.php:141 -msgid "Subscribe to this tag." +#. TRANS: SubMirror plugin tooltip for user settings menu item. +#: TagSubPlugin.php:179 +msgid "Configure tag subscriptions" msgstr "" -#. TRANS: Form legend. -#: forms/tagunsub.php:91 -msgid "Unsubscribe from this tag" -msgstr "" - -#: forms/tagunsub.php:105 -msgctxt "BUTTON" -msgid "Unsubscribe" -msgstr "" - -#: forms/tagunsub.php:109 -msgid "Unsubscribe from this tag." +#. TRANS: Menu item text for tags submenu. +#: TagSubPlugin.php:196 +msgid "Tags" msgstr "" diff --git a/plugins/TightUrl/locale/TightUrl.pot b/plugins/TightUrl/locale/TightUrl.pot index 303532a73c..ca4dd8dfde 100644 --- a/plugins/TightUrl/locale/TightUrl.pot +++ b/plugins/TightUrl/locale/TightUrl.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:51+0100\n" +"POT-Creation-Date: 2020-08-04 01:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/TwitterBridge/locale/TwitterBridge.pot b/plugins/TwitterBridge/locale/TwitterBridge.pot index 1120232229..27d2deaedd 100644 --- a/plugins/TwitterBridge/locale/TwitterBridge.pot +++ b/plugins/TwitterBridge/locale/TwitterBridge.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:51+0100\n" +"POT-Creation-Date: 2020-08-04 01:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,28 +17,37 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#. TRANS: Mail subject after forwarding notices to Twitter has stopped working. -#: twitter.php:462 -msgid "Your Twitter bridge has been disabled" +#. TRANS: Menu item in login navigation. +#. TRANS: Menu item in connection settings navigation. +#: TwitterBridgePlugin.php:149 TwitterBridgePlugin.php:174 +msgctxt "MENU" +msgid "Twitter" msgstr "" -#. TRANS: Mail body after forwarding notices to Twitter has stopped working. -#. TRANS: %1$ is the name of the user the mail is sent to, %2$s is a URL to the -#. TRANS: Twitter settings, %3$s is the StatusNet sitename. -#: twitter.php:469 -#, php-format +#. TRANS: Title for menu item in login navigation. +#: TwitterBridgePlugin.php:151 +msgid "Login or register using Twitter." +msgstr "" + +#. TRANS: Title for menu item in connection settings navigation. +#: TwitterBridgePlugin.php:176 +msgid "Twitter integration options" +msgstr "" + +#. TRANS: Menu item in administrative panel that leads to the Twitter bridge configuration. +#: TwitterBridgePlugin.php:276 +msgid "Twitter" +msgstr "" + +#. TRANS: Menu item title in administrative panel that leads to the Twitter bridge configuration. +#: TwitterBridgePlugin.php:278 +msgid "Twitter bridge configuration page." +msgstr "" + +#: TwitterBridgePlugin.php:303 msgid "" -"Hi, %1$s. We're sorry to inform you that your link to Twitter has been " -"disabled. We no longer seem to have permission to update your Twitter " -"status. Did you maybe revoke %3$s's access?\n" -"\n" -"You can re-enable your Twitter bridge by visiting your Twitter settings " -"page:\n" -"\n" -"\t%2$s\n" -"\n" -"Regards,\n" -"%3$s" +"The Twitter \"bridge\" plugin allows integration of a StatusNet instance " +"with Twitter." msgstr "" #. TRANS: Server exception thrown when an invalid URL scheme is detected. @@ -79,9 +88,7 @@ msgstr "" msgid "Bad HTTP response code %1$s: %2$s." msgstr "" -#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. -#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: lib/twitterimport.php:126 +#: lib/twitterimport.php:116 #, php-format msgid "RT @%1$s %2$s" msgstr "" @@ -167,8 +174,7 @@ msgid "Import my friends timeline." msgstr "" #. TRANS: Button text for saving Twitter integration settings. -#. TRANS: Button text for saving the administrative Twitter bridge settings. -#: actions/twittersettings.php:195 actions/twitteradminpanel.php:311 +#: actions/twittersettings.php:195 actions/twitteradminpanel.php:312 msgctxt "BUTTON" msgid "Save" msgstr "" @@ -214,6 +220,22 @@ msgstr "" msgid "Twitter preferences saved." msgstr "" +#. TRANS: Title for login using Twitter page. +#: actions/twitterlogin.php:52 +msgctxt "TITLE" +msgid "Twitter Login" +msgstr "" + +#. TRANS: Instructions for login using Twitter page. +#: actions/twitterlogin.php:58 +msgid "Login with your Twitter account" +msgstr "" + +#. TRANS: Alternative text for "sign in with Twitter" image. +#: actions/twitterlogin.php:68 +msgid "Sign in with Twitter" +msgstr "" + #. TRANS: Form validation error displayed when the checkbox to agree to the license has not been checked. #: actions/twitterauthorization.php:98 msgid "You cannot register if you do not agree to the license." @@ -363,145 +385,117 @@ msgstr "" msgid "No foreign link found for Twitter user" msgstr "" -#. TRANS: Title for login using Twitter page. -#: actions/twitterlogin.php:52 -msgctxt "TITLE" -msgid "Twitter Login" -msgstr "" - -#. TRANS: Instructions for login using Twitter page. -#: actions/twitterlogin.php:58 -msgid "Login with your Twitter account" -msgstr "" - -#. TRANS: Alternative text for "sign in with Twitter" image. -#: actions/twitterlogin.php:68 -msgid "Sign in with Twitter" -msgstr "" - #. TRANS: Page title for Twitter administration panel. -#: actions/twitteradminpanel.php:53 +#: actions/twitteradminpanel.php:50 msgctxt "TITLE" msgid "Twitter" msgstr "" #. TRANS: Instructions for Twitter bridge administration page. -#: actions/twitteradminpanel.php:64 +#: actions/twitteradminpanel.php:61 msgid "Twitter bridge settings" msgstr "" #. TRANS: Client error displayed when a consumer key is invalid because it is too long. -#: actions/twitteradminpanel.php:153 +#: actions/twitteradminpanel.php:150 msgid "Invalid consumer key. Maximum length is 255 characters." msgstr "" #. TRANS: Client error displayed when a consumer secret is invalid because it is too long. -#: actions/twitteradminpanel.php:160 +#: actions/twitteradminpanel.php:157 msgid "Invalid consumer secret. Maximum length is 255 characters." msgstr "" #. TRANS: Fieldset legend for Twitter application settings. -#: actions/twitteradminpanel.php:217 +#: actions/twitteradminpanel.php:214 msgid "Twitter application settings" msgstr "" #. TRANS: Field label for Twitter assigned consumer key. -#: actions/twitteradminpanel.php:224 +#: actions/twitteradminpanel.php:221 msgid "Consumer key" msgstr "" #. TRANS: Field title for Twitter assigned consumer key. -#: actions/twitteradminpanel.php:226 +#: actions/twitteradminpanel.php:223 msgid "The consumer key assigned by Twitter." msgstr "" #. TRANS: Field label for Twitter assigned consumer secret. -#: actions/twitteradminpanel.php:235 +#: actions/twitteradminpanel.php:232 msgid "Consumer secret" msgstr "" #. TRANS: Field title for Twitter assigned consumer secret. -#: actions/twitteradminpanel.php:237 +#: actions/twitteradminpanel.php:234 msgid "The consumer secret assigned by Twitter." msgstr "" #. TRANS: Form guide displayed when two required fields have already been provided. -#: actions/twitteradminpanel.php:248 +#: actions/twitteradminpanel.php:245 msgid "Note: A global consumer key and secret are set." msgstr "" #. TRANS: Field label for Twitter application name. -#: actions/twitteradminpanel.php:256 +#: actions/twitteradminpanel.php:253 msgid "Integration source" msgstr "" #. TRANS: Field title for Twitter application name. -#: actions/twitteradminpanel.php:258 +#: actions/twitteradminpanel.php:255 msgid "The name of your Twitter application." msgstr "" #. TRANS: Fieldset legend for Twitter integration options. -#: actions/twitteradminpanel.php:271 +#: actions/twitteradminpanel.php:268 msgid "Options" msgstr "" -#. TRANS: Checkbox label for global setting. -#: actions/twitteradminpanel.php:279 +#: actions/twitteradminpanel.php:277 msgid "Enable \"Sign-in with Twitter\"" msgstr "" #. TRANS: Checkbox title. -#: actions/twitteradminpanel.php:282 +#: actions/twitteradminpanel.php:280 msgid "This allow users to login with their Twitter credentials." msgstr "" -#. TRANS: Checkbox label for global setting. -#: actions/twitteradminpanel.php:290 +#: actions/twitteradminpanel.php:289 msgid "Enable Twitter import" msgstr "" #. TRANS: Checkbox title for global setting. -#: actions/twitteradminpanel.php:293 +#: actions/twitteradminpanel.php:292 msgid "" "Allow users to import their Twitter friends' timelines. Requires daemons to " "be manually configured." msgstr "" #. TRANS: Button title for saving the administrative Twitter bridge settings. -#: actions/twitteradminpanel.php:313 +#: actions/twitteradminpanel.php:316 msgid "Save the Twitter bridge settings." msgstr "" -#. TRANS: Menu item in login navigation. -#. TRANS: Menu item in connection settings navigation. -#: TwitterBridgePlugin.php:146 TwitterBridgePlugin.php:171 -msgctxt "MENU" -msgid "Twitter" +#. TRANS: Mail subject after forwarding notices to Twitter has stopped working. +#: twitter.php:462 +msgid "Your Twitter bridge has been disabled" msgstr "" -#. TRANS: Title for menu item in login navigation. -#: TwitterBridgePlugin.php:148 -msgid "Login or register using Twitter." -msgstr "" - -#. TRANS: Title for menu item in connection settings navigation. -#: TwitterBridgePlugin.php:173 -msgid "Twitter integration options" -msgstr "" - -#. TRANS: Menu item in administrative panel that leads to the Twitter bridge configuration. -#: TwitterBridgePlugin.php:274 -msgid "Twitter" -msgstr "" - -#. TRANS: Menu item title in administrative panel that leads to the Twitter bridge configuration. -#: TwitterBridgePlugin.php:276 -msgid "Twitter bridge configuration page." -msgstr "" - -#. TRANS: Plugin description. -#: TwitterBridgePlugin.php:300 +#. TRANS: Mail body after forwarding notices to Twitter has stopped working. +#. TRANS: %1$ is the name of the user the mail is sent to, %2$s is a URL to the +#. TRANS: Twitter settings, %3$s is the StatusNet sitename. +#: twitter.php:469 +#, php-format msgid "" -"The Twitter \"bridge\" plugin allows integration of a StatusNet instance " -"with Twitter." +"Hi, %1$s. We're sorry to inform you that your link to Twitter has been " +"disabled. We no longer seem to have permission to update your Twitter " +"status. Did you maybe revoke %3$s's access?\n" +"\n" +"You can re-enable your Twitter bridge by visiting your Twitter settings " +"page:\n" +"\n" +"\t%2$s\n" +"\n" +"Regards,\n" +"%3$s" msgstr "" diff --git a/plugins/UnQueue/locale/UnQueue.pot b/plugins/UnQueue/locale/UnQueue.pot new file mode 100644 index 0000000000..5bca0f62b9 --- /dev/null +++ b/plugins/UnQueue/locale/UnQueue.pot @@ -0,0 +1,23 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-08-04 01:05+0100\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#. TRANS: Plugin description. +#: UnQueuePlugin.php:46 +msgid "Plugin using the database as a backend for GNU social queues" +msgstr "" diff --git a/plugins/UserFlag/locale/UserFlag.pot b/plugins/UserFlag/locale/UserFlag.pot index 9fb9c4db6f..d9d84297ce 100644 --- a/plugins/UserFlag/locale/UserFlag.pot +++ b/plugins/UserFlag/locale/UserFlag.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:51+0100\n" +"POT-Creation-Date: 2020-08-04 01:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,43 +18,73 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" +#: classes/User_flag_profile.php:110 +#, php-format +msgid "Could not flag profile \"%d\" for review." +msgstr "" + +#. TRANS: Form title for action on a profile. +#: forms/clearflag.php:79 +msgid "Clear" +msgstr "" + +#. TRANS: Form description for clearing flags from a profile. +#: forms/clearflag.php:90 +msgid "Clear all flags" +msgstr "" + +#. TRANS: Form title for flagging a profile for review. +#: forms/flagprofile.php:81 +msgid "Flag" +msgstr "" + +#. TRANS: Form description. +#: forms/flagprofile.php:92 +msgid "Flag profile for review." +msgstr "" + #. TRANS: Message added to a profile if it has been flagged for review. #. TRANS: Body text for AJAX form when a profile has been flagged for review. -#: UserFlagPlugin.php:136 actions/flagprofile.php:127 +#: UserFlagPlugin.php:141 actions/flagprofile.php:130 msgid "Flagged" msgstr "" #. TRANS: Plugin description. -#: UserFlagPlugin.php:242 +#: UserFlagPlugin.php:247 msgid "" "This plugin allows flagging of profiles for review and reviewing flagged " "profiles." msgstr "" +#. TRANS: AJAX form title for a flagged profile. +#: actions/flagprofile.php:126 +msgid "Flagged for review" +msgstr "" + #. TRANS: Error message displayed when trying to perform an action that requires a logged in user. -#: actions/adminprofileflag.php:65 +#: actions/adminprofileflag.php:68 msgid "Not logged in." msgstr "" #. TRANS: Error message displayed when trying to review profile flags while not authorised. -#: actions/adminprofileflag.php:89 +#: actions/adminprofileflag.php:92 msgid "You cannot review profile flags." msgstr "" #. TRANS: Title for page with a list of profiles that were flagged for review. -#: actions/adminprofileflag.php:125 +#: actions/adminprofileflag.php:128 msgid "Flagged profiles" msgstr "" #. TRANS: Header for moderation menu with action buttons for flagged profiles (like 'sandbox', 'silence', ...). -#: actions/adminprofileflag.php:242 +#: actions/adminprofileflag.php:249 msgid "Moderate" msgstr "" #. TRANS: Message displayed on a profile if it has been flagged. #. TRANS: %1$s is a comma separated list of at most 5 user nicknames that flagged. #. TRANS: %2$d is a positive integer of additional flagging users. Also used for plural. -#: actions/adminprofileflag.php:388 +#: actions/adminprofileflag.php:393 #, php-format msgid "Flagged by %1$s and %2$d other" msgid_plural "Flagged by %1$s and %2$d others" @@ -63,56 +93,7 @@ msgstr[1] "" #. TRANS: Message displayed on a profile if it has been flagged. #. TRANS: %s is a comma separated list of at most 5 user nicknames that flagged. -#: actions/adminprofileflag.php:392 +#: actions/adminprofileflag.php:397 #, php-format msgid "Flagged by %s" msgstr "" - -#. TRANS: Server exception given when flags could not be cleared. -#. TRANS: %s is a profile nickname. -#: actions/clearflag.php:105 -#, php-format -msgid "Could not clear flags for profile \"%s\"." -msgstr "" - -#. TRANS: Title for AJAX form to indicated that flags were removed. -#: actions/clearflag.php:127 -msgid "Flags cleared" -msgstr "" - -#. TRANS: Body element for "flags cleared" form. -#: actions/clearflag.php:131 -msgid "Cleared" -msgstr "" - -#. TRANS: AJAX form title for a flagged profile. -#: actions/flagprofile.php:123 -msgid "Flagged for review" -msgstr "" - -#. TRANS: Server exception. -#. TRANS: %d is a profile ID (number). -#: classes/User_flag_profile.php:115 -#, php-format -msgid "Could not flag profile \"%d\" for review." -msgstr "" - -#. TRANS: Form title for action on a profile. -#: forms/clearflag.php:76 -msgid "Clear" -msgstr "" - -#. TRANS: Form description for clearing flags from a profile. -#: forms/clearflag.php:88 -msgid "Clear all flags" -msgstr "" - -#. TRANS: Form title for flagging a profile for review. -#: forms/flagprofile.php:78 -msgid "Flag" -msgstr "" - -#. TRANS: Form description. -#: forms/flagprofile.php:89 -msgid "Flag profile for review." -msgstr "" diff --git a/plugins/UserLimit/locale/UserLimit.pot b/plugins/UserLimit/locale/UserLimit.pot index 4b3a2981a9..b0b2178771 100644 --- a/plugins/UserLimit/locale/UserLimit.pot +++ b/plugins/UserLimit/locale/UserLimit.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:51+0100\n" +"POT-Creation-Date: 2020-08-04 01:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/WebFinger/locale/WebFinger.pot b/plugins/WebFinger/locale/WebFinger.pot index 2bd55dc5f9..d98b89ee4e 100644 --- a/plugins/WebFinger/locale/WebFinger.pot +++ b/plugins/WebFinger/locale/WebFinger.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:51+0100\n" +"POT-Creation-Date: 2020-08-04 01:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/WikiHashtags/locale/WikiHashtags.pot b/plugins/WikiHashtags/locale/WikiHashtags.pot index 0d18fbbf5d..a0c79057ef 100644 --- a/plugins/WikiHashtags/locale/WikiHashtags.pot +++ b/plugins/WikiHashtags/locale/WikiHashtags.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:51+0100\n" +"POT-Creation-Date: 2020-08-04 01:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/WikiHowProfile/locale/WikiHowProfile.pot b/plugins/WikiHowProfile/locale/WikiHowProfile.pot index 5ca6e36072..e5714f17dd 100644 --- a/plugins/WikiHowProfile/locale/WikiHowProfile.pot +++ b/plugins/WikiHowProfile/locale/WikiHowProfile.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:51+0100\n" +"POT-Creation-Date: 2020-08-04 01:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/Xmpp/locale/Xmpp.pot b/plugins/Xmpp/locale/Xmpp.pot index e856955960..b42e143444 100644 --- a/plugins/Xmpp/locale/Xmpp.pot +++ b/plugins/Xmpp/locale/Xmpp.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-14 14:51+0100\n" +"POT-Creation-Date: 2020-08-04 01:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,88 +17,88 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" +#. TRANS: Presence announcement for XMPP. +#. TRANS: Message for XMPP reconnect. +#: lib/xmppmanager.php:90 lib/xmppmanager.php:218 +msgid "Send me a message to post a notice" +msgstr "" + #. TRANS: Plugin display name. -#: XmppPlugin.php:65 +#: XmppPlugin.php:56 msgid "XMPP/Jabber" msgstr "" #. TRANS: Exception thrown when using too many @ signs in a Jabber ID. -#: XmppPlugin.php:169 +#: XmppPlugin.php:171 msgid "Invalid JID: too many @s." msgstr "" #. TRANS: Exception thrown when using @ sign not followed by a Jabber ID. -#: XmppPlugin.php:178 +#: XmppPlugin.php:180 msgid "Invalid JID: @ but no node" msgstr "" #. TRANS: Exception thrown when using too long a Jabber ID (>1023). -#: XmppPlugin.php:186 +#: XmppPlugin.php:188 msgid "Invalid JID: node too long." msgstr "" #. TRANS: Exception thrown when using an invalid Jabber ID. #. TRANS: %s is the invalid Jabber ID. -#: XmppPlugin.php:192 +#: XmppPlugin.php:195 #, php-format msgid "Invalid JID node \"%s\"." msgstr "" #. TRANS: Exception thrown when using too long a Jabber domain (>1023). -#: XmppPlugin.php:198 +#: XmppPlugin.php:201 msgid "Invalid JID: domain too long." msgstr "" #. TRANS: Exception thrown when using an invalid Jabber domain name. #. TRANS: %s is the invalid domain name. -#: XmppPlugin.php:203 +#: XmppPlugin.php:206 #, php-format msgid "Invalid JID domain name \"%s\"." msgstr "" #. TRANS: Exception thrown when using an invalid Jabber resource. #. TRANS: %s is the invalid resource. -#: XmppPlugin.php:214 +#: XmppPlugin.php:217 #, php-format msgid "Invalid JID resource \"%s\"." msgstr "" #. TRANS: Exception thrown when the plugin configuration is incorrect. -#: XmppPlugin.php:281 +#: XmppPlugin.php:265 msgid "You must specify a server in the configuration." msgstr "" #. TRANS: Exception thrown when the plugin configuration is incorrect. -#: XmppPlugin.php:285 +#: XmppPlugin.php:269 msgid "You must specify a port in the configuration." msgstr "" #. TRANS: Exception thrown when the plugin configuration is incorrect. -#: XmppPlugin.php:289 +#: XmppPlugin.php:273 msgid "You must specify a user in the configuration." msgstr "" #. TRANS: Exception thrown when the plugin configuration is incorrect. -#: XmppPlugin.php:293 +#: XmppPlugin.php:277 msgid "You must specify a password in the configuration." msgstr "" #. TRANS: Link description to notice in conversation. #. TRANS: %s is a notice ID. -#: XmppPlugin.php:359 +#: XmppPlugin.php:346 #, php-format msgid "[%u]" msgstr "" #. TRANS: Plugin description. -#: XmppPlugin.php:451 +#: XmppPlugin.php:442 msgid "" "The XMPP plugin allows users to send and receive notices over the XMPP/" "Jabber network." msgstr "" - -#. TRANS: Presence announcement for XMPP. -#. TRANS: Message for XMPP reconnect. -#: lib/xmppmanager.php:90 lib/xmppmanager.php:218 -msgid "Send me a message to post a notice" -msgstr "" diff --git a/vendor/composer/LICENSE b/vendor/composer/LICENSE index 4b615a3833..f27399a042 100644 --- a/vendor/composer/LICENSE +++ b/vendor/composer/LICENSE @@ -1,56 +1,21 @@ -Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Name: Composer -Upstream-Contact: Jordi Boggiano -Source: https://github.com/composer/composer -Files: * -Copyright: 2016, Nils Adermann - 2016, Jordi Boggiano -License: Expat +Copyright (c) Nils Adermann, Jordi Boggiano -Files: src/Composer/Util/TlsHelper.php -Copyright: 2016, Nils Adermann - 2016, Jordi Boggiano - 2013, Evan Coury -License: Expat and BSD-2-Clause +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is furnished +to do so, subject to the following conditions: -License: BSD-2-Clause - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - . - * Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - . - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - . - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON - ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. -License: Expat - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to deal - in the Software without restriction, including without limitation the rights - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the Software is furnished - to do so, subject to the following conditions: - . - The above copyright notice and this permission notice shall be included in all - copies or substantial portions of the Software. - . - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - THE SOFTWARE. diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php index c34c7a162a..21b21e158c 100644 --- a/vendor/composer/autoload_classmap.php +++ b/vendor/composer/autoload_classmap.php @@ -171,6 +171,7 @@ return array( 'Embed\\Adapters\\Sassmeister' => $vendorDir . '/embed/embed/src/Adapters/Sassmeister.php', 'Embed\\Adapters\\Slides' => $vendorDir . '/embed/embed/src/Adapters/Slides.php', 'Embed\\Adapters\\Snipplr' => $vendorDir . '/embed/embed/src/Adapters/Snipplr.php', + 'Embed\\Adapters\\Twitter' => $vendorDir . '/embed/embed/src/Adapters/Twitter.php', 'Embed\\Adapters\\Vimeo' => $vendorDir . '/embed/embed/src/Adapters/Vimeo.php', 'Embed\\Adapters\\Webpage' => $vendorDir . '/embed/embed/src/Adapters/Webpage.php', 'Embed\\Adapters\\Wikipedia' => $vendorDir . '/embed/embed/src/Adapters/Wikipedia.php', @@ -217,6 +218,7 @@ return array( 'Embed\\Providers\\OEmbed\\Jsbin' => $vendorDir . '/embed/embed/src/Providers/OEmbed/Jsbin.php', 'Embed\\Providers\\OEmbed\\Kickstarter' => $vendorDir . '/embed/embed/src/Providers/OEmbed/Kickstarter.php', 'Embed\\Providers\\OEmbed\\Meetup' => $vendorDir . '/embed/embed/src/Providers/OEmbed/Meetup.php', + 'Embed\\Providers\\OEmbed\\Mixcloud' => $vendorDir . '/embed/embed/src/Providers/OEmbed/Mixcloud.php', 'Embed\\Providers\\OEmbed\\Photobucket' => $vendorDir . '/embed/embed/src/Providers/OEmbed/Photobucket.php', 'Embed\\Providers\\OEmbed\\Poll' => $vendorDir . '/embed/embed/src/Providers/OEmbed/Poll.php', 'Embed\\Providers\\OEmbed\\Polldaddy' => $vendorDir . '/embed/embed/src/Providers/OEmbed/Polldaddy.php', @@ -226,12 +228,13 @@ return array( 'Embed\\Providers\\OEmbed\\Smugmug' => $vendorDir . '/embed/embed/src/Providers/OEmbed/Smugmug.php', 'Embed\\Providers\\OEmbed\\Soundcloud' => $vendorDir . '/embed/embed/src/Providers/OEmbed/Soundcloud.php', 'Embed\\Providers\\OEmbed\\Spotify' => $vendorDir . '/embed/embed/src/Providers/OEmbed/Spotify.php', + 'Embed\\Providers\\OEmbed\\Tiktok' => $vendorDir . '/embed/embed/src/Providers/OEmbed/Tiktok.php', 'Embed\\Providers\\OEmbed\\Tumblr' => $vendorDir . '/embed/embed/src/Providers/OEmbed/Tumblr.php', 'Embed\\Providers\\OEmbed\\Twitch' => $vendorDir . '/embed/embed/src/Providers/OEmbed/Twitch.php', 'Embed\\Providers\\OEmbed\\Twitter' => $vendorDir . '/embed/embed/src/Providers/OEmbed/Twitter.php', 'Embed\\Providers\\OEmbed\\Ustream' => $vendorDir . '/embed/embed/src/Providers/OEmbed/Ustream.php', 'Embed\\Providers\\OEmbed\\Vimeo' => $vendorDir . '/embed/embed/src/Providers/OEmbed/Vimeo.php', - 'Embed\\Providers\\OEmbed\\WordPress' => $vendorDir . '/embed/embed/src/Providers/OEmbed/WordPress.php', + 'Embed\\Providers\\OEmbed\\Wordpress' => $vendorDir . '/embed/embed/src/Providers/OEmbed/Wordpress.php', 'Embed\\Providers\\OEmbed\\Youtube' => $vendorDir . '/embed/embed/src/Providers/OEmbed/Youtube.php', 'Embed\\Providers\\OpenGraph' => $vendorDir . '/embed/embed/src/Providers/OpenGraph.php', 'Embed\\Providers\\Provider' => $vendorDir . '/embed/embed/src/Providers/Provider.php', @@ -426,7 +429,6 @@ return array( 'HTMLPurifier_Injector_SafeObject' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/Injector/SafeObject.php', 'HTMLPurifier_Language' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/Language.php', 'HTMLPurifier_LanguageFactory' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/LanguageFactory.php', - 'HTMLPurifier_Language_en_x_test' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/Language/classes/en-x-test.php', 'HTMLPurifier_Length' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/Length.php', 'HTMLPurifier_Lexer' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/Lexer.php', 'HTMLPurifier_Lexer_DOMLex' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/Lexer/DOMLex.php', diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index a49f27348e..0f757b5556 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -13,6 +13,9 @@ class ComposerAutoloaderInit444c3f31864f68a3f466e2c19837e185 } } + /** + * @return \Composer\Autoload\ClassLoader + */ public static function getLoader() { if (null !== self::$loader) { diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index 7914a5d114..73dc192f9d 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -310,6 +310,7 @@ class ComposerStaticInit444c3f31864f68a3f466e2c19837e185 'Embed\\Adapters\\Sassmeister' => __DIR__ . '/..' . '/embed/embed/src/Adapters/Sassmeister.php', 'Embed\\Adapters\\Slides' => __DIR__ . '/..' . '/embed/embed/src/Adapters/Slides.php', 'Embed\\Adapters\\Snipplr' => __DIR__ . '/..' . '/embed/embed/src/Adapters/Snipplr.php', + 'Embed\\Adapters\\Twitter' => __DIR__ . '/..' . '/embed/embed/src/Adapters/Twitter.php', 'Embed\\Adapters\\Vimeo' => __DIR__ . '/..' . '/embed/embed/src/Adapters/Vimeo.php', 'Embed\\Adapters\\Webpage' => __DIR__ . '/..' . '/embed/embed/src/Adapters/Webpage.php', 'Embed\\Adapters\\Wikipedia' => __DIR__ . '/..' . '/embed/embed/src/Adapters/Wikipedia.php', @@ -356,6 +357,7 @@ class ComposerStaticInit444c3f31864f68a3f466e2c19837e185 'Embed\\Providers\\OEmbed\\Jsbin' => __DIR__ . '/..' . '/embed/embed/src/Providers/OEmbed/Jsbin.php', 'Embed\\Providers\\OEmbed\\Kickstarter' => __DIR__ . '/..' . '/embed/embed/src/Providers/OEmbed/Kickstarter.php', 'Embed\\Providers\\OEmbed\\Meetup' => __DIR__ . '/..' . '/embed/embed/src/Providers/OEmbed/Meetup.php', + 'Embed\\Providers\\OEmbed\\Mixcloud' => __DIR__ . '/..' . '/embed/embed/src/Providers/OEmbed/Mixcloud.php', 'Embed\\Providers\\OEmbed\\Photobucket' => __DIR__ . '/..' . '/embed/embed/src/Providers/OEmbed/Photobucket.php', 'Embed\\Providers\\OEmbed\\Poll' => __DIR__ . '/..' . '/embed/embed/src/Providers/OEmbed/Poll.php', 'Embed\\Providers\\OEmbed\\Polldaddy' => __DIR__ . '/..' . '/embed/embed/src/Providers/OEmbed/Polldaddy.php', @@ -365,12 +367,13 @@ class ComposerStaticInit444c3f31864f68a3f466e2c19837e185 'Embed\\Providers\\OEmbed\\Smugmug' => __DIR__ . '/..' . '/embed/embed/src/Providers/OEmbed/Smugmug.php', 'Embed\\Providers\\OEmbed\\Soundcloud' => __DIR__ . '/..' . '/embed/embed/src/Providers/OEmbed/Soundcloud.php', 'Embed\\Providers\\OEmbed\\Spotify' => __DIR__ . '/..' . '/embed/embed/src/Providers/OEmbed/Spotify.php', + 'Embed\\Providers\\OEmbed\\Tiktok' => __DIR__ . '/..' . '/embed/embed/src/Providers/OEmbed/Tiktok.php', 'Embed\\Providers\\OEmbed\\Tumblr' => __DIR__ . '/..' . '/embed/embed/src/Providers/OEmbed/Tumblr.php', 'Embed\\Providers\\OEmbed\\Twitch' => __DIR__ . '/..' . '/embed/embed/src/Providers/OEmbed/Twitch.php', 'Embed\\Providers\\OEmbed\\Twitter' => __DIR__ . '/..' . '/embed/embed/src/Providers/OEmbed/Twitter.php', 'Embed\\Providers\\OEmbed\\Ustream' => __DIR__ . '/..' . '/embed/embed/src/Providers/OEmbed/Ustream.php', 'Embed\\Providers\\OEmbed\\Vimeo' => __DIR__ . '/..' . '/embed/embed/src/Providers/OEmbed/Vimeo.php', - 'Embed\\Providers\\OEmbed\\WordPress' => __DIR__ . '/..' . '/embed/embed/src/Providers/OEmbed/WordPress.php', + 'Embed\\Providers\\OEmbed\\Wordpress' => __DIR__ . '/..' . '/embed/embed/src/Providers/OEmbed/Wordpress.php', 'Embed\\Providers\\OEmbed\\Youtube' => __DIR__ . '/..' . '/embed/embed/src/Providers/OEmbed/Youtube.php', 'Embed\\Providers\\OpenGraph' => __DIR__ . '/..' . '/embed/embed/src/Providers/OpenGraph.php', 'Embed\\Providers\\Provider' => __DIR__ . '/..' . '/embed/embed/src/Providers/Provider.php', @@ -565,7 +568,6 @@ class ComposerStaticInit444c3f31864f68a3f466e2c19837e185 'HTMLPurifier_Injector_SafeObject' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/Injector/SafeObject.php', 'HTMLPurifier_Language' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/Language.php', 'HTMLPurifier_LanguageFactory' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/LanguageFactory.php', - 'HTMLPurifier_Language_en_x_test' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/Language/classes/en-x-test.php', 'HTMLPurifier_Length' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/Length.php', 'HTMLPurifier_Lexer' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/Lexer.php', 'HTMLPurifier_Lexer_DOMLex' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/Lexer/DOMLex.php', diff --git a/vendor/composer/ca-bundle/composer.json b/vendor/composer/ca-bundle/composer.json index faeeb7bb28..22de0a8921 100644 --- a/vendor/composer/ca-bundle/composer.json +++ b/vendor/composer/ca-bundle/composer.json @@ -29,7 +29,7 @@ "require-dev": { "phpunit/phpunit": "^4.8.35 || ^5.7 || 6.5 - 8", "psr/log": "^1.0", - "symfony/process": "^2.5 || ^3.0 || ^4.0" + "symfony/process": "^2.5 || ^3.0 || ^4.0 || ^5.0" }, "autoload": { "psr-4": { diff --git a/vendor/composer/ca-bundle/res/cacert.pem b/vendor/composer/ca-bundle/res/cacert.pem index 65be2181db..651694e8a3 100644 --- a/vendor/composer/ca-bundle/res/cacert.pem +++ b/vendor/composer/ca-bundle/res/cacert.pem @@ -1,7 +1,7 @@ ## ## Bundle of CA Root Certificates ## -## Certificate data from Mozilla as of: Wed Aug 28 03:12:10 2019 GMT +## Certificate data from Mozilla as of: Wed Jan 1 04:12:10 2020 GMT ## ## This is a bundle of X.509 certificates of public Certificate Authorities ## (CA). These were automatically extracted from Mozilla's root certificates @@ -14,7 +14,7 @@ ## Just configure this file as the SSLCACertificateFile. ## ## Conversion done with mk-ca-bundle.pl version 1.27. -## SHA256: fffa309937c3be940649293f749b8207fabc6eb224e50e4bb3f2c5e44e0d6a6b +## SHA256: f3bdcd74612952da8476a9d4147f50b29ad0710b7dd95b4c8690500209986d70 ## @@ -592,28 +592,6 @@ mNEVX58Svnw2Yzi9RKR/5CYrCsSXaQ3pjOLAEFe4yHYSkVXySGnYvCoCWw9E1CAx2/S6cCZdkGCe vEsXCS+0yx5DaMkHJ8HSXPfqIbloEpw8nL+e/IBcm2PN7EeqJSdnoDfzAIJ9VNep+OkuE6N36B9K -----END CERTIFICATE----- -Certplus Class 2 Primary CA -=========================== ------BEGIN CERTIFICATE----- -MIIDkjCCAnqgAwIBAgIRAIW9S/PY2uNp9pTXX8OlRCMwDQYJKoZIhvcNAQEFBQAwPTELMAkGA1UE -BhMCRlIxETAPBgNVBAoTCENlcnRwbHVzMRswGQYDVQQDExJDbGFzcyAyIFByaW1hcnkgQ0EwHhcN -OTkwNzA3MTcwNTAwWhcNMTkwNzA2MjM1OTU5WjA9MQswCQYDVQQGEwJGUjERMA8GA1UEChMIQ2Vy -dHBsdXMxGzAZBgNVBAMTEkNsYXNzIDIgUHJpbWFyeSBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEP -ADCCAQoCggEBANxQltAS+DXSCHh6tlJw/W/uz7kRy1134ezpfgSN1sxvc0NXYKwzCkTsA18cgCSR -5aiRVhKC9+Ar9NuuYS6JEI1rbLqzAr3VNsVINyPi8Fo3UjMXEuLRYE2+L0ER4/YXJQyLkcAbmXuZ -Vg2v7tK8R1fjeUl7NIknJITesezpWE7+Tt9avkGtrAjFGA7v0lPubNCdEgETjdyAYveVqUSISnFO -YFWe2yMZeVYHDD9jC1yw4r5+FfyUM1hBOHTE4Y+L3yasH7WLO7dDWWuwJKZtkIvEcupdM5i3y95e -e++U8Rs+yskhwcWYAqqi9lt3m/V+llU0HGdpwPFC40es/CgcZlUCAwEAAaOBjDCBiTAPBgNVHRME -CDAGAQH/AgEKMAsGA1UdDwQEAwIBBjAdBgNVHQ4EFgQU43Mt38sOKAze3bOkynm4jrvoMIkwEQYJ -YIZIAYb4QgEBBAQDAgEGMDcGA1UdHwQwMC4wLKAqoCiGJmh0dHA6Ly93d3cuY2VydHBsdXMuY29t -L0NSTC9jbGFzczIuY3JsMA0GCSqGSIb3DQEBBQUAA4IBAQCnVM+IRBnL39R/AN9WM2K191EBkOvD -P9GIROkkXe/nFL0gt5o8AP5tn9uQ3Nf0YtaLcF3n5QRIqWh8yfFC82x/xXp8HVGIutIKPidd3i1R -TtMTZGnkLuPT55sJmabglZvOGtd/vjzOUrMRFcEPF80Du5wlFbqidon8BvEY0JNLDnyCt6X09l/+ -7UCmnYR0ObncHoUW2ikbhiMAybuJfm6AiB4vFLQDJKgybwOaRywwvlbGp0ICcBvqQNi6BQNwB6SW -//1IMwrh3KWBkJtN3X3n57LNXMhqlfil9o3EXXgIvnsG1knPGTZQIy4I5p4FTUcY1Rbpsda2ENW7 -l7+ijrRU ------END CERTIFICATE----- - DST Root CA X3 ============== -----BEGIN CERTIFICATE----- @@ -921,28 +899,6 @@ PBS1xp81HlDQwY9qcEQCYsuuHWhBp6pX6FOqB9IG9tUUBguRA3UsbHK1YZWaDYu5Def131TN3ubY WyH8EZE0vkHve52Xdf+XlcCWWC/qu0bXu+TZLg== -----END CERTIFICATE----- -Deutsche Telekom Root CA 2 -========================== ------BEGIN CERTIFICATE----- -MIIDnzCCAoegAwIBAgIBJjANBgkqhkiG9w0BAQUFADBxMQswCQYDVQQGEwJERTEcMBoGA1UEChMT -RGV1dHNjaGUgVGVsZWtvbSBBRzEfMB0GA1UECxMWVC1UZWxlU2VjIFRydXN0IENlbnRlcjEjMCEG -A1UEAxMaRGV1dHNjaGUgVGVsZWtvbSBSb290IENBIDIwHhcNOTkwNzA5MTIxMTAwWhcNMTkwNzA5 -MjM1OTAwWjBxMQswCQYDVQQGEwJERTEcMBoGA1UEChMTRGV1dHNjaGUgVGVsZWtvbSBBRzEfMB0G -A1UECxMWVC1UZWxlU2VjIFRydXN0IENlbnRlcjEjMCEGA1UEAxMaRGV1dHNjaGUgVGVsZWtvbSBS -b290IENBIDIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCrC6M14IspFLEUha88EOQ5 -bzVdSq7d6mGNlUn0b2SjGmBmpKlAIoTZ1KXleJMOaAGtuU1cOs7TuKhCQN/Po7qCWWqSG6wcmtoI -KyUn+WkjR/Hg6yx6m/UTAtB+NHzCnjwAWav12gz1MjwrrFDa1sPeg5TKqAyZMg4ISFZbavva4VhY -AUlfckE8FQYBjl2tqriTtM2e66foai1SNNs671x1Udrb8zH57nGYMsRUFUQM+ZtV7a3fGAigo4aK -Se5TBY8ZTNXeWHmb0mocQqvF1afPaA+W5OFhmHZhyJF81j4A4pFQh+GdCuatl9Idxjp9y7zaAzTV -jlsB9WoHtxa2bkp/AgMBAAGjQjBAMB0GA1UdDgQWBBQxw3kbuvVT1xfgiXotF2wKsyudMzAPBgNV -HRMECDAGAQH/AgEFMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQUFAAOCAQEAlGRZrTlk5ynr -E/5aw4sTV8gEJPB0d8Bg42f76Ymmg7+Wgnxu1MM9756AbrsptJh6sTtU6zkXR34ajgv8HzFZMQSy -zhfzLMdiNlXiItiJVbSYSKpk+tYcNthEeFpaIzpXl/V6ME+un2pMSyuOoAPjPuCp1NJ70rOo4nI8 -rZ7/gFnkm0W09juwzTkZmDLl6iFhkOQxIY40sfcvNUqFENrnijchvllj4PKFiDFT1FQUhXB59C4G -dyd1Lx+4ivn+xbrYNuSD7Odlt79jWvNGr4GUN9RBjNYj1h7P9WgbRGOiWrqnNVmh5XAFmw4jV5mU -Cm26OWMohpLzGITY+9HPBVZkVw== ------END CERTIFICATE----- - Cybertrust Global Root ====================== -----BEGIN CERTIFICATE----- @@ -3474,3 +3430,37 @@ hcErulWuBurQB7Lcq9CClnXO0lD+mefPL5/ndtFhKvshuzHQqp9HpLIiyhY6UFfEW0NnxWViA0kB 60PZ2Pierc+xYw5F9KBaLJstxabArahH9CdMOA0uG0k7UvToiIMrVCjU8jVStDKDYmlkDJGcn5fq dBb9HxEGmpv0 -----END CERTIFICATE----- + +Entrust Root Certification Authority - G4 +========================================= +-----BEGIN CERTIFICATE----- +MIIGSzCCBDOgAwIBAgIRANm1Q3+vqTkPAAAAAFVlrVgwDQYJKoZIhvcNAQELBQAwgb4xCzAJBgNV +BAYTAlVTMRYwFAYDVQQKEw1FbnRydXN0LCBJbmMuMSgwJgYDVQQLEx9TZWUgd3d3LmVudHJ1c3Qu +bmV0L2xlZ2FsLXRlcm1zMTkwNwYDVQQLEzAoYykgMjAxNSBFbnRydXN0LCBJbmMuIC0gZm9yIGF1 +dGhvcml6ZWQgdXNlIG9ubHkxMjAwBgNVBAMTKUVudHJ1c3QgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1 +dGhvcml0eSAtIEc0MB4XDTE1MDUyNzExMTExNloXDTM3MTIyNzExNDExNlowgb4xCzAJBgNVBAYT +AlVTMRYwFAYDVQQKEw1FbnRydXN0LCBJbmMuMSgwJgYDVQQLEx9TZWUgd3d3LmVudHJ1c3QubmV0 +L2xlZ2FsLXRlcm1zMTkwNwYDVQQLEzAoYykgMjAxNSBFbnRydXN0LCBJbmMuIC0gZm9yIGF1dGhv +cml6ZWQgdXNlIG9ubHkxMjAwBgNVBAMTKUVudHJ1c3QgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhv +cml0eSAtIEc0MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAsewsQu7i0TD/pZJH4i3D +umSXbcr3DbVZwbPLqGgZ2K+EbTBwXX7zLtJTmeH+H17ZSK9dE43b/2MzTdMAArzE+NEGCJR5WIoV +3imz/f3ET+iq4qA7ec2/a0My3dl0ELn39GjUu9CH1apLiipvKgS1sqbHoHrmSKvS0VnM1n4j5pds +8ELl3FFLFUHtSUrJ3hCX1nbB76W1NhSXNdh4IjVS70O92yfbYVaCNNzLiGAMC1rlLAHGVK/XqsEQ +e9IFWrhAnoanw5CGAlZSCXqc0ieCU0plUmr1POeo8pyvi73TDtTUXm6Hnmo9RR3RXRv06QqsYJn7 +ibT/mCzPfB3pAqoEmh643IhuJbNsZvc8kPNXwbMv9W3y+8qh+CmdRouzavbmZwe+LGcKKh9asj5X +xNMhIWNlUpEbsZmOeX7m640A2Vqq6nPopIICR5b+W45UYaPrL0swsIsjdXJ8ITzI9vF01Bx7owVV +7rtNOzK+mndmnqxpkCIHH2E6lr7lmk/MBTwoWdPBDFSoWWG9yHJM6Nyfh3+9nEg2XpWjDrk4JFX8 +dWbrAuMINClKxuMrLzOg2qOGpRKX/YAr2hRC45K9PvJdXmd0LhyIRyk0X+IyqJwlN4y6mACXi0mW +Hv0liqzc2thddG5msP9E36EYxr5ILzeUePiVSj9/E15dWf10hkNjc0kCAwEAAaNCMEAwDwYDVR0T +AQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFJ84xFYjwznooHFs6FRM5Og6sb9n +MA0GCSqGSIb3DQEBCwUAA4ICAQAS5UKme4sPDORGpbZgQIeMJX6tuGguW8ZAdjwD+MlZ9POrYs4Q +jbRaZIxowLByQzTSGwv2LFPSypBLhmb8qoMi9IsabyZIrHZ3CL/FmFz0Jomee8O5ZDIBf9PD3Vht +7LGrhFV0d4QEJ1JrhkzO3bll/9bGXp+aEJlLdWr+aumXIOTkdnrG0CSqkM0gkLpHZPt/B7NTeLUK +YvJzQ85BK4FqLoUWlFPUa19yIqtRLULVAJyZv967lDtX/Zr1hstWO1uIAeV8KEsD+UmDfLJ/fOPt +jqF/YFOOVZ1QNBIPt5d7bIdKROf1beyAN/BYGW5KaHbwH5Lk6rWS02FREAutp9lfx1/cH6NcjKF+ +m7ee01ZvZl4HliDtC3T7Zk6LERXpgUl+b7DUUH8i119lAg2m9IUe2K4GS0qn0jFmwvjO5QimpAKW +RGhXxNUzzxkvFMSUHHuk2fCfDrGA4tGeEWSpiBE6doLlYsKA2KSD7ZPvfC+QsDJMlhVoSFLUmQjA +JOgc47OlIQ6SwJAfzyBfyjs4x7dtOvPmRLgOMWuIjnDrnBdSqEGULoe256YSxXXfW8AKbnuk5F6G ++TaU33fD6Q3AOfF5u0aOq0NZJ7cguyPpVkAh7DE9ZapD8j3fcEThuk0mEDuYn/PIjhs4ViFqUZPT +kcpG2om3PVODLAgfi49T3f+sHw== +-----END CERTIFICATE----- diff --git a/vendor/composer/ca-bundle/src/CaBundle.php b/vendor/composer/ca-bundle/src/CaBundle.php index ab6adf2a5d..ea8d7934fc 100644 --- a/vendor/composer/ca-bundle/src/CaBundle.php +++ b/vendor/composer/ca-bundle/src/CaBundle.php @@ -71,11 +71,11 @@ class CaBundle // If SSL_CERT_FILE env variable points to a valid certificate/bundle, use that. // This mimics how OpenSSL uses the SSL_CERT_FILE env variable. - $caBundlePaths[] = getenv('SSL_CERT_FILE'); + $caBundlePaths[] = self::getEnvVariable('SSL_CERT_FILE'); // If SSL_CERT_DIR env variable points to a valid certificate/bundle, use that. // This mimics how OpenSSL uses the SSL_CERT_FILE env variable. - $caBundlePaths[] = getenv('SSL_CERT_DIR'); + $caBundlePaths[] = self::getEnvVariable('SSL_CERT_DIR'); $caBundlePaths[] = ini_get('openssl.cafile'); $caBundlePaths[] = ini_get('openssl.capath'); @@ -92,6 +92,7 @@ class CaBundle '/etc/ssl/cert.pem', // OpenBSD '/usr/local/etc/ssl/cert.pem', // FreeBSD 10.x '/usr/local/etc/openssl/cert.pem', // OS X homebrew, openssl package + '/usr/local/etc/openssl@1.1/cert.pem', // OS X homebrew, openssl@1.1 package ); foreach($otherLocations as $location) { @@ -173,6 +174,7 @@ class CaBundle $isValid = !empty($contents); } else { + $contents = preg_replace("/^(\\-+(?:BEGIN|END))\\s+TRUSTED\\s+(CERTIFICATE\\-+)\$/m", '$1 $2', $contents); $isValid = (bool) openssl_x509_parse($contents); } @@ -298,6 +300,19 @@ EOT; self::$useOpensslParse = null; } + private static function getEnvVariable($name) + { + if (isset($_SERVER[$name])) { + return (string) $_SERVER[$name]; + } + + if (PHP_SAPI === 'cli' && ($value = getenv($name)) !== false && $value !== null) { + return (string) $value; + } + + return false; + } + private static function caFileUsable($certFile, LoggerInterface $logger = null) { return $certFile && @is_file($certFile) && @is_readable($certFile) && static::validateCaFile($certFile, $logger); diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index f0a99e8135..34ecc4fbd7 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -58,17 +58,17 @@ }, { "name": "composer/ca-bundle", - "version": "1.2.4", - "version_normalized": "1.2.4.0", + "version": "1.2.7", + "version_normalized": "1.2.7.0", "source": { "type": "git", "url": "https://github.com/composer/ca-bundle.git", - "reference": "10bb96592168a0f8e8f6dcde3532d9fa50b0b527" + "reference": "95c63ab2117a72f48f5a55da9740a3273d45b7fd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/ca-bundle/zipball/10bb96592168a0f8e8f6dcde3532d9fa50b0b527", - "reference": "10bb96592168a0f8e8f6dcde3532d9fa50b0b527", + "url": "https://api.github.com/repos/composer/ca-bundle/zipball/95c63ab2117a72f48f5a55da9740a3273d45b7fd", + "reference": "95c63ab2117a72f48f5a55da9740a3273d45b7fd", "shasum": "" }, "require": { @@ -79,9 +79,9 @@ "require-dev": { "phpunit/phpunit": "^4.8.35 || ^5.7 || 6.5 - 8", "psr/log": "^1.0", - "symfony/process": "^2.5 || ^3.0 || ^4.0" + "symfony/process": "^2.5 || ^3.0 || ^4.0 || ^5.0" }, - "time": "2019-08-30T08:44:50+00:00", + "time": "2020-04-08T08:27:21+00:00", "type": "library", "extra": { "branch-alias": { @@ -112,6 +112,16 @@ "certificate", "ssl", "tls" + ], + "funding": [ + { + "url": "https://packagist.com", + "type": "custom" + }, + { + "url": "https://tidelift.com/funding/github/packagist/composer/composer", + "type": "tidelift" + } ] }, { @@ -193,22 +203,23 @@ }, { "name": "embed/embed", - "version": "v3.4.2", - "version_normalized": "3.4.2.0", + "version": "v3.4.8", + "version_normalized": "3.4.8.0", "source": { "type": "git", "url": "https://github.com/oscarotero/Embed.git", - "reference": "dc1dc3c126f8a78acdae06b83f591c0728ea131d" + "reference": "96aab555e399769b9d12c3c362a4232563ccbe76" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/oscarotero/Embed/zipball/dc1dc3c126f8a78acdae06b83f591c0728ea131d", - "reference": "dc1dc3c126f8a78acdae06b83f591c0728ea131d", + "url": "https://api.github.com/repos/oscarotero/Embed/zipball/96aab555e399769b9d12c3c362a4232563ccbe76", + "reference": "96aab555e399769b9d12c3c362a4232563ccbe76", "shasum": "" }, "require": { "composer/ca-bundle": "^1.0", "ext-curl": "*", + "ext-dom": "*", "ext-mbstring": "*", "php": "^5.6|^7.0" }, @@ -216,7 +227,7 @@ "friendsofphp/php-cs-fixer": "^2.0", "phpunit/phpunit": "^4.8|^5.7" }, - "time": "2019-09-16T19:34:02+00:00", + "time": "2020-07-03T15:04:01+00:00", "type": "library", "installation-source": "dist", "autoload": { @@ -248,17 +259,17 @@ }, { "name": "ezyang/htmlpurifier", - "version": "v4.12.0", - "version_normalized": "4.12.0.0", + "version": "v4.13.0", + "version_normalized": "4.13.0.0", "source": { "type": "git", "url": "https://github.com/ezyang/htmlpurifier.git", - "reference": "a617e55bc62a87eec73bd456d146d134ad716f03" + "reference": "08e27c97e4c6ed02f37c5b2b20488046c8d90d75" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/a617e55bc62a87eec73bd456d146d134ad716f03", - "reference": "a617e55bc62a87eec73bd456d146d134ad716f03", + "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/08e27c97e4c6ed02f37c5b2b20488046c8d90d75", + "reference": "08e27c97e4c6ed02f37c5b2b20488046c8d90d75", "shasum": "" }, "require": { @@ -267,7 +278,7 @@ "require-dev": { "simpletest/simpletest": "dev-master#72de02a7b80c6bb8864ef9bf66d41d2f58f826bd" }, - "time": "2019-10-28T03:44:26+00:00", + "time": "2020-06-29T00:56:53+00:00", "type": "library", "installation-source": "dist", "autoload": { @@ -276,6 +287,9 @@ }, "files": [ "library/HTMLPurifier.composer.php" + ], + "exclude-from-classmap": [ + "/library/HTMLPurifier/Language/" ] }, "notification-url": "https://packagist.org/downloads/", @@ -621,17 +635,17 @@ }, { "name": "masterminds/html5", - "version": "2.7.0", - "version_normalized": "2.7.0.0", + "version": "2.7.3", + "version_normalized": "2.7.3.0", "source": { "type": "git", "url": "https://github.com/Masterminds/html5-php.git", - "reference": "104443ad663d15981225f99532ba73c2f1d6b6f2" + "reference": "aad73dbfefd71d46072138109ce1288d96c329cc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Masterminds/html5-php/zipball/104443ad663d15981225f99532ba73c2f1d6b6f2", - "reference": "104443ad663d15981225f99532ba73c2f1d6b6f2", + "url": "https://api.github.com/repos/Masterminds/html5-php/zipball/aad73dbfefd71d46072138109ce1288d96c329cc", + "reference": "aad73dbfefd71d46072138109ce1288d96c329cc", "shasum": "" }, "require": { @@ -645,7 +659,7 @@ "sami/sami": "~2.0", "satooshi/php-coveralls": "1.0.*" }, - "time": "2019-07-25T07:03:26+00:00", + "time": "2020-07-05T07:53:37+00:00", "type": "library", "extra": { "branch-alias": { @@ -748,23 +762,26 @@ }, { "name": "michelf/php-markdown", - "version": "1.8.0", - "version_normalized": "1.8.0.0", + "version": "1.9.0", + "version_normalized": "1.9.0.0", "source": { "type": "git", "url": "https://github.com/michelf/php-markdown.git", - "reference": "01ab082b355bf188d907b9929cd99b2923053495" + "reference": "c83178d49e372ca967d1a8c77ae4e051b3a3c75c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/michelf/php-markdown/zipball/01ab082b355bf188d907b9929cd99b2923053495", - "reference": "01ab082b355bf188d907b9929cd99b2923053495", + "url": "https://api.github.com/repos/michelf/php-markdown/zipball/c83178d49e372ca967d1a8c77ae4e051b3a3c75c", + "reference": "c83178d49e372ca967d1a8c77ae4e051b3a3c75c", "shasum": "" }, "require": { "php": ">=5.3.0" }, - "time": "2018-01-15T00:49:33+00:00", + "require-dev": { + "phpunit/phpunit": ">=4.3 <5.8" + }, + "time": "2019-12-02T02:32:27+00:00", "type": "library", "installation-source": "dist", "autoload": { @@ -963,20 +980,20 @@ }, { "name": "pear/console_getopt", - "version": "v1.4.2", - "version_normalized": "1.4.2.0", + "version": "v1.4.3", + "version_normalized": "1.4.3.0", "source": { "type": "git", "url": "https://github.com/pear/Console_Getopt.git", - "reference": "6c77aeb625b32bd752e89ee17972d103588b90c0" + "reference": "a41f8d3e668987609178c7c4a9fe48fecac53fa0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pear/Console_Getopt/zipball/6c77aeb625b32bd752e89ee17972d103588b90c0", - "reference": "6c77aeb625b32bd752e89ee17972d103588b90c0", + "url": "https://api.github.com/repos/pear/Console_Getopt/zipball/a41f8d3e668987609178c7c4a9fe48fecac53fa0", + "reference": "a41f8d3e668987609178c7c4a9fe48fecac53fa0", "shasum": "" }, - "time": "2019-02-06T16:52:33+00:00", + "time": "2019-11-20T18:27:48+00:00", "type": "library", "installation-source": "dist", "autoload": { @@ -992,11 +1009,6 @@ "BSD-2-Clause" ], "authors": [ - { - "name": "Greg Beaver", - "email": "cellog@php.net", - "role": "Helper" - }, { "name": "Andrei Zmievski", "email": "andrei@php.net", @@ -1006,6 +1018,11 @@ "name": "Stig Bakken", "email": "stig@php.net", "role": "Developer" + }, + { + "name": "Greg Beaver", + "email": "cellog@php.net", + "role": "Helper" } ], "description": "More info available on: http://pear.php.net/package/Console_Getopt" @@ -1254,17 +1271,17 @@ }, { "name": "stomp-php/stomp-php", - "version": "4.5.2", - "version_normalized": "4.5.2.0", + "version": "4.6.1", + "version_normalized": "4.6.1.0", "source": { "type": "git", "url": "https://github.com/stomp-php/stomp-php.git", - "reference": "9238e4ddb1e7a5ddd673d090be52bdf9d7f225be" + "reference": "d55ba2b2c3ce0e3074b3aa15de1151fd13bb84e4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/stomp-php/stomp-php/zipball/9238e4ddb1e7a5ddd673d090be52bdf9d7f225be", - "reference": "9238e4ddb1e7a5ddd673d090be52bdf9d7f225be", + "url": "https://api.github.com/repos/stomp-php/stomp-php/zipball/d55ba2b2c3ce0e3074b3aa15de1151fd13bb84e4", + "reference": "d55ba2b2c3ce0e3074b3aa15de1151fd13bb84e4", "shasum": "" }, "require": { @@ -1273,7 +1290,7 @@ "require-dev": { "phpunit/phpunit": "^5.7" }, - "time": "2019-07-26T16:38:20+00:00", + "time": "2020-06-15T18:01:49+00:00", "type": "library", "installation-source": "dist", "autoload": { @@ -1311,6 +1328,16 @@ "messaging", "rabbitmq", "stomp" + ], + "funding": [ + { + "url": "https://github.com/jmglsn", + "type": "github" + }, + { + "url": "https://github.com/staabm", + "type": "github" + } ] } ] diff --git a/vendor/embed/embed/composer.json b/vendor/embed/embed/composer.json index 4ac06a0bdb..2871136a95 100644 --- a/vendor/embed/embed/composer.json +++ b/vendor/embed/embed/composer.json @@ -26,6 +26,7 @@ "require": { "php": "^5.6|^7.0", "ext-curl": "*", + "ext-dom": "*", "ext-mbstring": "*", "composer/ca-bundle": "^1.0" }, diff --git a/vendor/embed/embed/src/Providers/OEmbed/Deviantart.php b/vendor/embed/embed/src/Providers/OEmbed/Deviantart.php index f883df7e02..fdf0d99ab0 100644 --- a/vendor/embed/embed/src/Providers/OEmbed/Deviantart.php +++ b/vendor/embed/embed/src/Providers/OEmbed/Deviantart.php @@ -19,7 +19,7 @@ class Deviantart extends EndPoint implements EndPointInterface { return Url::create(static::$endPoint) ->withQueryParameters([ - 'url' => (string) $this->response->getUrl(), + 'url' => (string) $this->getUrl(), 'format' => 'json', 'for' => 'embed', ]); diff --git a/vendor/embed/embed/src/Providers/OEmbed/Embedly.php b/vendor/embed/embed/src/Providers/OEmbed/Embedly.php index ada4fc36d3..37e3cd04f3 100644 --- a/vendor/embed/embed/src/Providers/OEmbed/Embedly.php +++ b/vendor/embed/embed/src/Providers/OEmbed/Embedly.php @@ -42,7 +42,7 @@ class Embedly implements EndPointInterface { return Url::create('http://api.embed.ly/1/oembed') ->withQueryParameters([ - 'url' => (string) $this->response->getUrl(), + 'url' => (string) $this->getUrl(), 'format' => 'json', 'key' => $this->key, ]); diff --git a/vendor/embed/embed/src/Providers/OEmbed/EndPoint.php b/vendor/embed/embed/src/Providers/OEmbed/EndPoint.php index 6b477cacf2..419ad58c01 100644 --- a/vendor/embed/embed/src/Providers/OEmbed/EndPoint.php +++ b/vendor/embed/embed/src/Providers/OEmbed/EndPoint.php @@ -12,6 +12,7 @@ use Embed\Http\Url; abstract class EndPoint { protected $response; + protected $url; protected static $pattern; protected static $endPoint; @@ -25,6 +26,10 @@ abstract class EndPoint if ($response->getUrl()->match(static::$pattern)) { return new static($response); } + + if ($response->getStartingUrl()->match(static::$pattern)) { + return new static($response, $response->getStartingUrl()); + } } /** @@ -32,9 +37,10 @@ abstract class EndPoint * * @param Response $response */ - protected function __construct(Response $response) + protected function __construct(Response $response, Url $url = null) { $this->response = $response; + $this->url = $url; } /** @@ -44,8 +50,13 @@ abstract class EndPoint { return Url::create(static::$endPoint) ->withQueryParameters([ - 'url' => (string) $this->response->getUrl(), + 'url' => (string) $this->getUrl(), 'format' => 'json', ]); } + + public function getUrl() + { + return $this->url ?: $this->response->getUrl(); + } } diff --git a/vendor/embed/embed/src/Providers/OEmbed/Facebook.php b/vendor/embed/embed/src/Providers/OEmbed/Facebook.php index 99c130126a..6cc03ce6fb 100644 --- a/vendor/embed/embed/src/Providers/OEmbed/Facebook.php +++ b/vendor/embed/embed/src/Providers/OEmbed/Facebook.php @@ -13,14 +13,14 @@ class Facebook extends EndPoint implements EndPointInterface */ public function getEndPoint() { - if ($this->response->getUrl()->match(['*/videos/*', '/video.php'])) { + if ($this->getUrl()->match(['*/videos/*', '/video.php'])) { $endPoint = Url::create('https://www.facebook.com/plugins/video/oembed.json'); } else { $endPoint = Url::create('https://www.facebook.com/plugins/post/oembed.json'); } return $endPoint->withQueryParameters([ - 'url' => (string) $this->response->getUrl(), + 'url' => (string) $this->getUrl(), 'format' => 'json', ]); } diff --git a/vendor/embed/embed/src/Providers/OEmbed/Iframely.php b/vendor/embed/embed/src/Providers/OEmbed/Iframely.php index d656ed510e..dde61f2897 100644 --- a/vendor/embed/embed/src/Providers/OEmbed/Iframely.php +++ b/vendor/embed/embed/src/Providers/OEmbed/Iframely.php @@ -42,7 +42,7 @@ class Iframely implements EndPointInterface { return Url::create('http://open.iframe.ly/api/oembed') ->withQueryParameters([ - 'url' => (string) $this->response->getUrl(), + 'url' => (string) $this->getUrl(), 'format' => 'json', 'api_key' => $this->key, ]); diff --git a/vendor/embed/embed/src/Providers/OEmbed/Infogram.php b/vendor/embed/embed/src/Providers/OEmbed/Infogram.php index aafc09c667..99dea39b2d 100644 --- a/vendor/embed/embed/src/Providers/OEmbed/Infogram.php +++ b/vendor/embed/embed/src/Providers/OEmbed/Infogram.php @@ -17,7 +17,7 @@ class Infogram extends EndPoint implements EndPointInterface */ public function getEndPoint() { - $url = $this->response->getUrl()->withScheme('https'); + $url = $this->getUrl()->withScheme('https'); return Url::create(static::$endPoint) ->withQueryParameters([ diff --git a/vendor/embed/embed/src/Providers/OEmbed/Instagram.php b/vendor/embed/embed/src/Providers/OEmbed/Instagram.php index 4da969b1a3..2ac552c8f4 100644 --- a/vendor/embed/embed/src/Providers/OEmbed/Instagram.php +++ b/vendor/embed/embed/src/Providers/OEmbed/Instagram.php @@ -9,6 +9,7 @@ class Instagram extends EndPoint implements EndPointInterface protected static $pattern = [ 'instagram.com/p/*', 'www.instagram.com/p/*', + 'instagr.am/p/*', ]; protected static $endPoint = 'https://api.instagram.com/oembed'; @@ -17,7 +18,7 @@ class Instagram extends EndPoint implements EndPointInterface */ public function getEndPoint() { - $url = $this->response->getUrl()->withScheme('http'); + $url = $this->getUrl()->withScheme('http'); return Url::create(static::$endPoint) ->withQueryParameters([ diff --git a/vendor/embed/embed/src/Providers/OEmbed/Jsbin.php b/vendor/embed/embed/src/Providers/OEmbed/Jsbin.php index aa258e3626..b6b11ee152 100644 --- a/vendor/embed/embed/src/Providers/OEmbed/Jsbin.php +++ b/vendor/embed/embed/src/Providers/OEmbed/Jsbin.php @@ -14,7 +14,7 @@ class Jsbin extends EndPoint implements EndPointInterface */ public function getEndPoint() { - $url = $this->response->getUrl()->withDirectoryPosition(2, 'embed'); + $url = $this->getUrl()->withDirectoryPosition(2, 'embed'); return Url::create(static::$endPoint) ->withQueryParameters([ diff --git a/vendor/embed/embed/src/Providers/OEmbed/Scribd.php b/vendor/embed/embed/src/Providers/OEmbed/Scribd.php index 83b5e65a52..7f0f328c16 100644 --- a/vendor/embed/embed/src/Providers/OEmbed/Scribd.php +++ b/vendor/embed/embed/src/Providers/OEmbed/Scribd.php @@ -17,7 +17,7 @@ class Scribd extends EndPoint implements EndPointInterface */ public function getEndPoint() { - $url = $this->response->getUrl()->withDirectoryPosition(0, 'doc'); + $url = $this->getUrl()->withDirectoryPosition(0, 'doc'); return Url::create(static::$endPoint) ->withQueryParameters([ diff --git a/vendor/embed/embed/src/Providers/OEmbed/Spotify.php b/vendor/embed/embed/src/Providers/OEmbed/Spotify.php index fe747fba3a..3ba14e4c3c 100644 --- a/vendor/embed/embed/src/Providers/OEmbed/Spotify.php +++ b/vendor/embed/embed/src/Providers/OEmbed/Spotify.php @@ -16,7 +16,7 @@ class Spotify extends EndPoint implements EndPointInterface { return Url::create(static::$endPoint) ->withQueryParameters([ - 'url' => (string) $this->response->getUrl()->withQueryParameters([]), + 'url' => (string) $this->getUrl()->withQueryParameters([]), 'format' => 'json' ]); } diff --git a/vendor/embed/embed/src/Providers/OEmbed/WordPress.php b/vendor/embed/embed/src/Providers/OEmbed/WordPress.php deleted file mode 100644 index 9808428b16..0000000000 --- a/vendor/embed/embed/src/Providers/OEmbed/WordPress.php +++ /dev/null @@ -1,9 +0,0 @@ - - -...and the character encoding from this code: - - - -If the character encoding declaration is missing, STOP NOW, and -read 'docs/enduser-utf8.html' (web accessible at -http://htmlpurifier.org/docs/enduser-utf8.html). In fact, even if it is -present, read this document anyway, as many websites specify their -document's character encoding incorrectly. - - ---------------------------------------------------------------------------- -3. Including the library - -The procedure is quite simple: - - require_once '/path/to/library/HTMLPurifier.auto.php'; - -This will setup an autoloader, so the library's files are only included -when you use them. - -Only the contents in the library/ folder are necessary, so you can remove -everything else when using HTML Purifier in a production environment. - -If you installed HTML Purifier via PEAR, all you need to do is: - - require_once 'HTMLPurifier.auto.php'; - -Please note that the usual PEAR practice of including just the classes you -want will not work with HTML Purifier's autoloading scheme. - -Advanced users, read on; other users can skip to section 4. - -Autoload compatibility ----------------------- - - HTML Purifier attempts to be as smart as possible when registering an - autoloader, but there are some cases where you will need to change - your own code to accomodate HTML Purifier. These are those cases: - - AN __autoload FUNCTION IS DECLARED AFTER OUR AUTOLOADER IS REGISTERED - spl_autoload_register() has the curious behavior of disabling - the existing __autoload() handler. Users need to explicitly - spl_autoload_register('__autoload'). Because we use SPL when it - is available, __autoload() will ALWAYS be disabled. If __autoload() - is declared before HTML Purifier is loaded, this is not a problem: - HTML Purifier will register the function for you. But if it is - declared afterwards, it will mysteriously not work. This - snippet of code (after your autoloader is defined) will fix it: - - spl_autoload_register('__autoload') - - -For better performance ----------------------- - - Opcode caches, which greatly speed up PHP initialization for scripts - with large amounts of code (HTML Purifier included), don't like - autoloaders. We offer an include file that includes all of HTML Purifier's - files in one go in an opcode cache friendly manner: - - // If /path/to/library isn't already in your include path, uncomment - // the below line: - // require '/path/to/library/HTMLPurifier.path.php'; - - require 'HTMLPurifier.includes.php'; - - Optional components still need to be included--you'll know if you try to - use a feature and you get a class doesn't exists error! The autoloader - can be used in conjunction with this approach to catch classes that are - missing. Simply add this afterwards: - - require 'HTMLPurifier.autoload.php'; - -Standalone version ------------------- - - HTML Purifier has a standalone distribution; you can also generate - a standalone file from the full version by running the script - maintenance/generate-standalone.php . The standalone version has the - benefit of having most of its code in one file, so parsing is much - faster and the library is easier to manage. - - If HTMLPurifier.standalone.php exists in the library directory, you - can use it like this: - - require '/path/to/HTMLPurifier.standalone.php'; - - This is equivalent to including HTMLPurifier.includes.php, except that - the contents of standalone/ will be added to your path. To override this - behavior, specify a new HTMLPURIFIER_PREFIX where standalone files can - be found (usually, this will be one directory up, the "true" library - directory in full distributions). Don't forget to set your path too! - - The autoloader can be added to the end to ensure the classes are - loaded when necessary; otherwise you can manually include them. - To use the autoloader, use this: - - require 'HTMLPurifier.autoload.php'; - -For advanced users ------------------- - - HTMLPurifier.auto.php performs a number of operations that can be done - individually. These are: - - HTMLPurifier.path.php - Puts /path/to/library in the include path. For high performance, - this should be done in php.ini. - - HTMLPurifier.autoload.php - Registers our autoload handler HTMLPurifier_Bootstrap::autoload($class). - - You can do these operations by yourself, if you like. - - ---------------------------------------------------------------------------- -4. Configuration - -HTML Purifier is designed to run out-of-the-box, but occasionally HTML -Purifier needs to be told what to do. If you answer no to any of these -questions, read on; otherwise, you can skip to the next section (or, if you're -into configuring things just for the heck of it, skip to 4.3). - -* Am I using UTF-8? -* Am I using XHTML 1.0 Transitional? - -If you answered no to any of these questions, instantiate a configuration -object and read on: - - $config = HTMLPurifier_Config::createDefault(); - - -4.1. Setting a different character encoding - -You really shouldn't use any other encoding except UTF-8, especially if you -plan to support multilingual websites (read section three for more details). -However, switching to UTF-8 is not always immediately feasible, so we can -adapt. - -HTML Purifier uses iconv to support other character encodings, as such, -any encoding that iconv supports -HTML Purifier supports with this code: - - $config->set('Core.Encoding', /* put your encoding here */); - -An example usage for Latin-1 websites (the most common encoding for English -websites): - - $config->set('Core.Encoding', 'ISO-8859-1'); - -Note that HTML Purifier's support for non-Unicode encodings is crippled by the -fact that any character not supported by that encoding will be silently -dropped, EVEN if it is ampersand escaped. If you want to work around -this, you are welcome to read docs/enduser-utf8.html for a fix, -but please be cognizant of the issues the "solution" creates (for this -reason, I do not include the solution in this document). - - -4.2. Setting a different doctype - -For those of you using HTML 4.01 Transitional, you can disable -XHTML output like this: - - $config->set('HTML.Doctype', 'HTML 4.01 Transitional'); - -Other supported doctypes include: - - * HTML 4.01 Strict - * HTML 4.01 Transitional - * XHTML 1.0 Strict - * XHTML 1.0 Transitional - * XHTML 1.1 - - -4.3. Other settings - -There are more configuration directives which can be read about -here: They're a bit boring, -but they can help out for those of you who like to exert maximum control over -your code. Some of the more interesting ones are configurable at the -demo and are well worth looking into -for your own system. - -For example, you can fine tune allowed elements and attributes, convert -relative URLs to absolute ones, and even autoparagraph input text! These -are, respectively, %HTML.Allowed, %URI.MakeAbsolute and %URI.Base, and -%AutoFormat.AutoParagraph. The %Namespace.Directive naming convention -translates to: - - $config->set('Namespace.Directive', $value); - -E.g. - - $config->set('HTML.Allowed', 'p,b,a[href],i'); - $config->set('URI.Base', 'http://www.example.com'); - $config->set('URI.MakeAbsolute', true); - $config->set('AutoFormat.AutoParagraph', true); - - ---------------------------------------------------------------------------- -5. Caching - -HTML Purifier generates some cache files (generally one or two) to speed up -its execution. For maximum performance, make sure that -library/HTMLPurifier/DefinitionCache/Serializer is writeable by the webserver. - -If you are in the library/ folder of HTML Purifier, you can set the -appropriate permissions using: - - chmod -R 0755 HTMLPurifier/DefinitionCache/Serializer - -If the above command doesn't work, you may need to assign write permissions -to group: - - chmod -R 0775 HTMLPurifier/DefinitionCache/Serializer - -You can also chmod files via your FTP client; this option -is usually accessible by right clicking the corresponding directory and -then selecting "chmod" or "file permissions". - -Starting with 2.0.1, HTML Purifier will generate friendly error messages -that will tell you exactly what you have to chmod the directory to, if in doubt, -follow its advice. - -If you are unable or unwilling to give write permissions to the cache -directory, you can either disable the cache (and suffer a performance -hit): - - $config->set('Core.DefinitionCache', null); - -Or move the cache directory somewhere else (no trailing slash): - - $config->set('Cache.SerializerPath', '/home/user/absolute/path'); - - ---------------------------------------------------------------------------- -6. Using the code - -The interface is mind-numbingly simple: - - $purifier = new HTMLPurifier($config); - $clean_html = $purifier->purify( $dirty_html ); - -That's it! For more examples, check out docs/examples/ (they aren't very -different though). Also, docs/enduser-slow.html gives advice on what to -do if HTML Purifier is slowing down your application. - - ---------------------------------------------------------------------------- -7. Quick install - -First, make sure library/HTMLPurifier/DefinitionCache/Serializer is -writable by the webserver (see Section 5: Caching above for details). -If your website is in UTF-8 and XHTML Transitional, use this code: - -purify($dirty_html); -?> - -If your website is in a different encoding or doctype, use this code: - -set('Core.Encoding', 'ISO-8859-1'); // replace with your encoding - $config->set('HTML.Doctype', 'HTML 4.01 Transitional'); // replace with your doctype - $purifier = new HTMLPurifier($config); - - $clean_html = $purifier->purify($dirty_html); -?> - - vim: et sw=4 sts=4 diff --git a/vendor/ezyang/htmlpurifier/INSTALL.fr.utf8 b/vendor/ezyang/htmlpurifier/INSTALL.fr.utf8 deleted file mode 100644 index 629387e2e5..0000000000 --- a/vendor/ezyang/htmlpurifier/INSTALL.fr.utf8 +++ /dev/null @@ -1,60 +0,0 @@ - -Installation - Comment installer HTML Purifier - -Attention : Ce document est encodé en UTF-8, si les lettres avec des accents -ne s'affichent pas, prenez un meilleur éditeur de texte. - -L'installation de HTML Purifier est très simple, parce qu'il n'a pas besoin -de configuration. Pour les utilisateurs impatients, le code se trouve dans le -pied de page, mais je recommande de lire le document. - -1. Compatibilité - -HTML Purifier fonctionne avec PHP 5. PHP 5.3 est la dernière version testée. -Il ne dépend pas d'autres librairies. - -Les extensions optionnelles sont iconv (généralement déjà installée) et tidy -(répendue aussi). Si vous utilisez UTF-8 et que vous ne voulez pas l'indentation, -vous pouvez utiliser HTML Purifier sans ces extensions. - - -2. Inclure la librairie - -Quand vous devez l'utilisez, incluez le : - - require_once('/path/to/library/HTMLPurifier.auto.php'); - -Ne pas l'inclure si ce n'est pas nécessaire, car HTML Purifier est lourd. - -HTML Purifier utilise "autoload". Si vous avez défini la fonction __autoload, -vous devez ajouter cette fonction : - - spl_autoload_register('__autoload') - -Plus d'informations dans le document "INSTALL". - -3. Installation rapide - -Si votre site Web est en UTF-8 et XHTML Transitional, utilisez : - -purify($html_a_purifier); -?> - -Sinon, utilisez : - -set('Core', 'Encoding', 'ISO-8859-1'); //Remplacez par votre - encodage - $config->set('Core', 'XHTML', true); //Remplacer par false si HTML 4.01 - $purificateur = new HTMLPurifier($config); - $html_propre = $purificateur->purify($html_a_purifier); -?> - - - vim: et sw=4 sts=4 diff --git a/vendor/ezyang/htmlpurifier/NEWS b/vendor/ezyang/htmlpurifier/NEWS deleted file mode 100644 index 3528350124..0000000000 --- a/vendor/ezyang/htmlpurifier/NEWS +++ /dev/null @@ -1,1224 +0,0 @@ -NEWS ( CHANGELOG and HISTORY ) HTMLPurifier -||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| - -= KEY ==================== - # Breaks back-compat - ! Feature - - Bugfix - + Sub-comment - . Internal change -========================== - -4.12.0, released 2019-10-27 -! PHP 7.4 is supported, thank you Witold Wasiczko, Mateuz Turcza and - Edi Modrić -- PHPDocs for HTMLModule::addElement() and Bool attr are fixed (thanks - Mateusz) - -4.11.0, released 2019-07-14 -# SafeScripting now matches case-sensitively against its whitelist (previously it was - case-insensitive.) Thanks Dimitri Gritsajuk - for reporting. -! New directive %Core.AllowParseManyTags which allows parsing of many nested tags. - Thanks M. Suzuki for contributing the patch. -! purifyArray now supports multidimensional arrays. Thanks - Sandro Miguel Marques for contributing this patch. -! initial and inherit settings available for width, height, and the min-/max- - versions thereof. Thanks Michael Kliewe for contributing - this patch. -! More color names are supported. Thanks Daijobou for contributing. -- Compatibility fixes for PHP 7.3, including new CI for PHP 7.3 - (thank you Lukas Neumann ) and removal of - reserved words in our constants (thanks Darko Hrgovic -- Compatibility fixes for HHVM. Thanks Mateusz Turcza for contributing - this fix. -- HTML Purifier now never defines __autoload, fixing #196. Thanks - Michael Kliewe for reporting. -- In some situations, Config.php would report an undefined index: class - error; this has been fixed. Thanks DiLong Fa for contributing - this fix. -- We no longer produce '; - - $frm->show(); -} - -function phorum_htmlpurifier_show_config_info() -{ - global $PHORUM; - - // update mod_htmlpurifier for housekeeping - phorum_htmlpurifier_commit_settings(); - - // politely tell user how to edit settings manually -?> -
How to edit settings for HTML Purifier module
-

- A config.php file exists in your mods/htmlpurifier/ - directory. This file contains your custom configuration: in order to - change it, please navigate to that file and edit it accordingly. - You can also set $GLOBALS['PHORUM']['mod_htmlpurifier']['wysiwyg'] - or $GLOBALS['PHORUM']['mod_htmlpurifier']['suppress_message'] -

-

- To use the web interface, delete config.php (or rename it to - config.php.bak). -

-

- Warning: Changing HTML Purifier's configuration will invalidate - the cache. Expect to see a flurry of database activity after you change - any of these settings. -

-hidden("module", "modsettings"); - $frm->hidden("mod", "htmlpurifier"); - $frm->hidden("migrate-sigs", "1"); - $frm->addbreak("Migrate user signatures to HTML"); - $frm->addMessage('This operation will migrate your users signatures - to HTML. This process is irreversible and must only be performed once. - Type in yes in the confirmation field to migrate.'); - if (!file_exists(dirname(__FILE__) . '/../migrate.php')) { - $frm->addMessage('Migration file does not exist, cannot migrate signatures. - Please check migrate.bbcode.php on how to create an appropriate file.'); - } else { - $frm->addrow('Confirm:', $frm->text_box("confirmation", "")); - } - $frm->show(); -} - -// vim: et sw=4 sts=4 diff --git a/vendor/ezyang/htmlpurifier/plugins/phorum/settings/migrate-sigs.php b/vendor/ezyang/htmlpurifier/plugins/phorum/settings/migrate-sigs.php deleted file mode 100644 index 5ea9cd0b81..0000000000 --- a/vendor/ezyang/htmlpurifier/plugins/phorum/settings/migrate-sigs.php +++ /dev/null @@ -1,79 +0,0 @@ -$PHORUM["mod_htmlpurifier"])); - $offset = 1; - } elseif (!empty($_GET['migrate-sigs']) && $PHORUM['mod_htmlpurifier']['migrate-sigs']) { - $offset = (int) $_GET['migrate-sigs']; - } - return $offset; -} - -function phorum_htmlpurifier_migrate_sigs($offset) -{ - global $PHORUM; - - if(!$offset) return; // bail out quick if $offset == 0 - - // theoretically, we could get rid of this multi-request - // doo-hickery if safe mode is off - @set_time_limit(0); // attempt to let this run - $increment = $PHORUM['mod_htmlpurifier']['migrate-sigs-increment']; - - require_once(dirname(__FILE__) . '/../migrate.php'); - // migrate signatures - // do this in batches so we don't run out of time/space - $end = $offset + $increment; - $user_ids = array(); - for ($i = $offset; $i < $end; $i++) { - $user_ids[] = $i; - } - $userinfos = phorum_db_user_get_fields($user_ids, 'signature'); - foreach ($userinfos as $i => $user) { - if (empty($user['signature'])) continue; - $sig = $user['signature']; - // perform standard Phorum processing on the sig - $sig = str_replace(array("&","<",">"), array("&","<",">"), $sig); - $sig = preg_replace("/<((http|https|ftp):\/\/[a-z0-9;\/\?:@=\&\$\-_\.\+!*'\(\),~%]+?)>/i", "$1", $sig); - // prepare fake data to pass to migration function - $fake_data = array(array("author"=>"", "email"=>"", "subject"=>"", 'body' => $sig)); - list($fake_message) = phorum_htmlpurifier_migrate($fake_data); - $user['signature'] = $fake_message['body']; - if (!phorum_api_user_save($user)) { - exit('Error while saving user data'); - } - } - unset($userinfos); // free up memory - - // query for highest ID in database - $type = $PHORUM['DBCONFIG']['type']; - $sql = "select MAX(user_id) from {$PHORUM['user_table']}"; - $row = phorum_db_interact(DB_RETURN_ROW, $sql); - $top_id = (int) $row[0]; - - $offset += $increment; - if ($offset > $top_id) { // test for end condition - echo 'Migration finished'; - $PHORUM['mod_htmlpurifier']['migrate-sigs'] = false; - phorum_htmlpurifier_commit_settings(); - return true; - } - $host = $_SERVER['HTTP_HOST']; - $uri = rtrim(dirname($_SERVER['PHP_SELF']), '/\\'); - $extra = 'admin.php?module=modsettings&mod=htmlpurifier&migrate-sigs=' . $offset; - // relies on output buffering to work - header("Location: http://$host$uri/$extra"); - exit; - -} - -// vim: et sw=4 sts=4 diff --git a/vendor/ezyang/htmlpurifier/plugins/phorum/settings/save.php b/vendor/ezyang/htmlpurifier/plugins/phorum/settings/save.php deleted file mode 100644 index 2aefaf83a0..0000000000 --- a/vendor/ezyang/htmlpurifier/plugins/phorum/settings/save.php +++ /dev/null @@ -1,29 +0,0 @@ -mods/htmlpurifier/config.php already exists. To change - settings, edit that file. To use the web form, delete that file.
"; - } else { - $config = phorum_htmlpurifier_get_config(true); - if (!isset($_POST['reset'])) $config->mergeArrayFromForm($_POST, 'config', $PHORUM['mod_htmlpurifier']['directives']); - $PHORUM['mod_htmlpurifier']['config'] = $config->getAll(); - } - $PHORUM['mod_htmlpurifier']['wysiwyg'] = !empty($_POST['wysiwyg']); - $PHORUM['mod_htmlpurifier']['suppress_message'] = !empty($_POST['suppress_message']); - if(!phorum_htmlpurifier_commit_settings()){ - $error="Database error while updating settings."; - } else { - echo "Settings Updated
"; - } -} - -function phorum_htmlpurifier_commit_settings() -{ - global $PHORUM; - return phorum_db_update_settings(array("mod_htmlpurifier"=>$PHORUM["mod_htmlpurifier"])); -} - -// vim: et sw=4 sts=4 diff --git a/vendor/ezyang/htmlpurifier/test-settings.sample.php b/vendor/ezyang/htmlpurifier/test-settings.sample.php deleted file mode 100644 index 480b66279b..0000000000 --- a/vendor/ezyang/htmlpurifier/test-settings.sample.php +++ /dev/null @@ -1,74 +0,0 @@ - 1) { - echo 'More than one release declaration in NEWS replaced' . PHP_EOL; - exit; - } - file_put_contents('NEWS', $news_c); -} - -// ...in Doxyfile -$doxyfile_c = preg_replace( - '/(?<=PROJECT_NUMBER {9}= )[^\s]+/m', // brittle - $version, - file_get_contents('Doxyfile'), - 1, $c -); -if (!$c) { - echo 'Could not update Doxyfile, missing PROJECT_NUMBER.' . PHP_EOL; - exit; -} -file_put_contents('Doxyfile', $doxyfile_c); - -// ...in HTMLPurifier.php -$htmlpurifier_c = file_get_contents('library/HTMLPurifier.php'); -$htmlpurifier_c = preg_replace( - '/HTML Purifier .+? - /', - "HTML Purifier $version - ", - $htmlpurifier_c, - 1, $c -); -if (!$c) { - echo 'Could not update HTMLPurifier.php, missing HTML Purifier [version] header.' . PHP_EOL; - exit; -} -$htmlpurifier_c = preg_replace( - '/public \$version = \'.+?\';/', - "public \$version = '$version';", - $htmlpurifier_c, - 1, $c -); -if (!$c) { - echo 'Could not update HTMLPurifier.php, missing public $version.' . PHP_EOL; - exit; -} -$htmlpurifier_c = preg_replace( - '/const VERSION = \'.+?\';/', - "const VERSION = '$version';", - $htmlpurifier_c, - 1, $c -); -if (!$c) { - echo 'Could not update HTMLPurifier.php, missing const $version.' . PHP_EOL; - exit; -} -file_put_contents('library/HTMLPurifier.php', $htmlpurifier_c); - -$config_c = file_get_contents('library/HTMLPurifier/Config.php'); -$config_c = preg_replace( - '/public \$version = \'.+?\';/', - "public \$version = '$version';", - $config_c, - 1, $c -); -if (!$c) { - echo 'Could not update Config.php, missing public $version.' . PHP_EOL; - exit; -} -file_put_contents('library/HTMLPurifier/Config.php', $config_c); - -passthru('maintenance/flush.sh'); - -if ($is_dev) echo "Review changes, write something in WHATSNEW and FOCUS, and then commit with log 'Release $version.'" . PHP_EOL; -else echo "Numbers updated to dev, no other modifications necessary!"; - -// vim: et sw=4 sts=4 diff --git a/vendor/masterminds/html5/.travis.yml b/vendor/masterminds/html5/.travis.yml index 469dc220ad..b7df4b88b2 100644 --- a/vendor/masterminds/html5/.travis.yml +++ b/vendor/masterminds/html5/.travis.yml @@ -18,6 +18,7 @@ matrix: - php: 7.2 - php: 7.3 env: BENCHMARK=1 + - php: 7.4snapshot fast_finish: true cache: diff --git a/vendor/masterminds/html5/RELEASE.md b/vendor/masterminds/html5/RELEASE.md index cd43e7b8cb..9aea42c3c6 100644 --- a/vendor/masterminds/html5/RELEASE.md +++ b/vendor/masterminds/html5/RELEASE.md @@ -1,5 +1,19 @@ # Release Notes +2.7.3 (2020-07-05) + +- #190: mitigate cyclic reference between output rules and the traverser objects + +2.7.2 (2020-07-01) + +- #187: Fixed memory leak in HTML5::saveHTML() +- #186: Add special case for end tag
+ +2.7.1 (2020-06-14) + +- #171: add PHP 7.4 job +- #178: Prevent infinite loop on un-terminated entity declaration at EOF + 2.7.0 (2019-07-25) - #164: Drop HHVM support diff --git a/vendor/masterminds/html5/src/HTML5.php b/vendor/masterminds/html5/src/HTML5.php index 6316e43a98..c857145fba 100644 --- a/vendor/masterminds/html5/src/HTML5.php +++ b/vendor/masterminds/html5/src/HTML5.php @@ -212,7 +212,10 @@ class HTML5 $trav = new Traverser($dom, $stream, $rules, $options); $trav->walk(); - + /* + * release the traverser to avoid cyclic references and allow PHP to free memory without waiting for gc_collect_cycles + */ + $rules->unsetTraverser(); if ($close) { fclose($stream); } @@ -234,6 +237,10 @@ class HTML5 $stream = fopen('php://temp', 'wb'); $this->save($dom, $stream, array_merge($this->defaultOptions, $options)); - return stream_get_contents($stream, -1, 0); + $html = stream_get_contents($stream, -1, 0); + + fclose($stream); + + return $html; } } diff --git a/vendor/masterminds/html5/src/HTML5/Parser/DOMTreeBuilder.php b/vendor/masterminds/html5/src/HTML5/Parser/DOMTreeBuilder.php index e9bca4e160..448dec77cf 100644 --- a/vendor/masterminds/html5/src/HTML5/Parser/DOMTreeBuilder.php +++ b/vendor/masterminds/html5/src/HTML5/Parser/DOMTreeBuilder.php @@ -474,8 +474,14 @@ class DOMTreeBuilder implements EventHandler { $lname = $this->normalizeTagName($name); - // Ignore closing tags for unary elements. - if (Elements::isA($name, Elements::VOID_TAG)) { + // Special case within 12.2.6.4.7: An end tag whose tag name is "br" should be treated as an opening tag + if ($name === 'br') { + $this->parseError('Closing tag encountered for void element br.'); + + $this->startTag('br'); + } + // Ignore closing tags for other unary elements. + elseif (Elements::isA($name, Elements::VOID_TAG)) { return; } diff --git a/vendor/masterminds/html5/src/HTML5/Parser/Tokenizer.php b/vendor/masterminds/html5/src/HTML5/Parser/Tokenizer.php index f4e96524bd..0fd1ee78ea 100644 --- a/vendor/masterminds/html5/src/HTML5/Parser/Tokenizer.php +++ b/vendor/masterminds/html5/src/HTML5/Parser/Tokenizer.php @@ -1111,6 +1111,13 @@ class Tokenizer if ('#' === $tok) { $tok = $this->scanner->next(); + if (false === $tok) { + $this->parseError('Expected &#DEC; &#HEX;, got EOF'); + $this->scanner->unconsume(1); + + return '&'; + } + // Hexidecimal encoding. // X[0-9a-fA-F]+; // x[0-9a-fA-F]+; diff --git a/vendor/masterminds/html5/src/HTML5/Serializer/OutputRules.php b/vendor/masterminds/html5/src/HTML5/Serializer/OutputRules.php index 1c4e8929a2..ec467f22cd 100644 --- a/vendor/masterminds/html5/src/HTML5/Serializer/OutputRules.php +++ b/vendor/masterminds/html5/src/HTML5/Serializer/OutputRules.php @@ -182,6 +182,13 @@ class OutputRules implements RulesInterface return $this; } + public function unsetTraverser() + { + $this->traverser = null; + + return $this; + } + public function document($dom) { $this->doctype(); diff --git a/vendor/masterminds/html5/test/HTML5/Parser/DOMTreeBuilderTest.php b/vendor/masterminds/html5/test/HTML5/Parser/DOMTreeBuilderTest.php index b5940c23a9..af79fdab42 100644 --- a/vendor/masterminds/html5/test/HTML5/Parser/DOMTreeBuilderTest.php +++ b/vendor/masterminds/html5/test/HTML5/Parser/DOMTreeBuilderTest.php @@ -133,6 +133,14 @@ class DOMTreeBuilderTest extends \Masterminds\HTML5\Tests\TestCase ', $doc->saveXML()); } + public function testEntityAtEndOfFile() + { + $fragment = $this->parseFragment('&#'); + $this->assertInstanceOf('DOMDocumentFragment', $fragment); + $this->assertSame('&#', $fragment->textContent); + $this->assertEquals('Line 1, Col 2: Expected &#DEC; &#HEX;, got EOF', $this->errors[0]); + } + public function testStrangeCapitalization() { $html = ' @@ -707,4 +715,29 @@ EOM; $this->assertSame('p', $audio->parentNode->nodeName); $this->assertSame(3, $audio->childNodes->length); } + + public function testClosingBr() + { + $html = << + + + testClosingBr + + +

+ This line ends with a normal line break
+ This line ends with a line break marked up as a closing tag
+

+ +> + +EOM; + + $dom = $this->parse($html); + + $this->assertSame(2, $dom->getElementsByTagName('br')->length); + $this->assertSame(1, $dom->getElementsByTagName('br')->item(0)->attributes->length); + $this->assertSame(0, $dom->getElementsByTagName('br')->item(1)->attributes->length); + } } diff --git a/vendor/masterminds/html5/test/HTML5/Parser/TokenizerTest.php b/vendor/masterminds/html5/test/HTML5/Parser/TokenizerTest.php index 153dd23083..6c906864d6 100644 --- a/vendor/masterminds/html5/test/HTML5/Parser/TokenizerTest.php +++ b/vendor/masterminds/html5/test/HTML5/Parser/TokenizerTest.php @@ -26,7 +26,8 @@ class TokenizerTest extends \Masterminds\HTML5\Tests\TestCase if (is_array($expects)) { $this->assertEquals($expects, $event['data'], "Event $type should equal " . print_r($expects, true) . ': ' . print_r($event, true)); } else { - $this->assertEquals($expects, $event['data'][0], "Event $type should equal $expects: " . print_r($event, true)); + $d = (is_array($event['data']) ? $event['data'][0] : null); + $this->assertEquals($expects, $d, "Event $type should equal $expects: " . print_r($event, true)); } } diff --git a/vendor/michelf/php-markdown/License.md b/vendor/michelf/php-markdown/License.md index b3df08f994..16bbd54000 100644 --- a/vendor/michelf/php-markdown/License.md +++ b/vendor/michelf/php-markdown/License.md @@ -1,5 +1,5 @@ PHP Markdown Lib -Copyright (c) 2004-2018 Michel Fortin +Copyright (c) 2004-2019 Michel Fortin All rights reserved. diff --git a/vendor/michelf/php-markdown/Michelf/Markdown.php b/vendor/michelf/php-markdown/Michelf/Markdown.php index e4c2c23615..43b3c79e85 100644 --- a/vendor/michelf/php-markdown/Michelf/Markdown.php +++ b/vendor/michelf/php-markdown/Michelf/Markdown.php @@ -4,7 +4,7 @@ * * @package php-markdown * @author Michel Fortin - * @copyright 2004-2018 Michel Fortin + * @copyright 2004-2019 Michel Fortin * @copyright (Original Markdown) 2004-2006 John Gruber */ @@ -18,7 +18,7 @@ class Markdown implements MarkdownInterface { * Define the package version * @var string */ - const MARKDOWNLIB_VERSION = "1.8.0"; + const MARKDOWNLIB_VERSION = "1.9.0"; /** * Simple function interface - Initialize the parser and return the result @@ -85,25 +85,25 @@ class Markdown implements MarkdownInterface { /** * Optional filter function for URLs - * @var callable + * @var callable|null */ public $url_filter_func = null; /** * Optional header id="" generation callback function. - * @var callable + * @var callable|null */ public $header_id_func = null; /** * Optional function for converting code block content to HTML - * @var callable + * @var callable|null */ public $code_block_content_func = null; /** * Optional function for converting code span content to HTML. - * @var callable + * @var callable|null */ public $code_span_content_func = null; @@ -767,16 +767,15 @@ class Markdown implements MarkdownInterface { * @return string */ protected function _doAnchors_inline_callback($matches) { - $whole_match = $matches[1]; $link_text = $this->runSpanGamut($matches[2]); - $url = $matches[3] == '' ? $matches[4] : $matches[3]; + $url = $matches[3] === '' ? $matches[4] : $matches[3]; $title =& $matches[7]; // If the URL was of the form it got caught by the HTML // tag parser and hashed. Need to reverse the process before using // the URL. $unhashed = $this->unhash($url); - if ($unhashed != $url) + if ($unhashed !== $url) $url = preg_replace('/^<(.*)>$/', '\1', $unhashed); $url = $this->encodeURLAttribute($url); @@ -952,7 +951,7 @@ class Markdown implements MarkdownInterface { return $matches[0]; } - $level = $matches[2]{0} == '=' ? 1 : 2; + $level = $matches[2][0] == '=' ? 1 : 2; // ID attribute generation $idAtt = $this->_generateIdFromHeaderValue($matches[1]); @@ -1218,7 +1217,7 @@ class Markdown implements MarkdownInterface { $codeblock = $matches[1]; $codeblock = $this->outdent($codeblock); - if ($this->code_block_content_func) { + if (is_callable($this->code_block_content_func)) { $codeblock = call_user_func($this->code_block_content_func, $codeblock, ""); } else { $codeblock = htmlspecialchars($codeblock, ENT_NOQUOTES); @@ -1237,7 +1236,7 @@ class Markdown implements MarkdownInterface { * @return string */ protected function makeCodeSpan($code) { - if ($this->code_span_content_func) { + if (is_callable($this->code_span_content_func)) { $code = call_user_func($this->code_span_content_func, $code); } else { $code = htmlspecialchars(trim($code), ENT_NOQUOTES); @@ -1358,7 +1357,7 @@ class Markdown implements MarkdownInterface { } else { // Other closing marker: close one em or strong and // change current token state to match the other - $token_stack[0] = str_repeat($token{0}, 3-$token_len); + $token_stack[0] = str_repeat($token[0], 3-$token_len); $tag = $token_len == 2 ? "strong" : "em"; $span = $text_stack[0]; $span = $this->runSpanGamut($span); @@ -1383,7 +1382,7 @@ class Markdown implements MarkdownInterface { } else { // Reached opening three-char emphasis marker. Push on token // stack; will be handled by the special condition above. - $em = $token{0}; + $em = $token[0]; $strong = "$em$em"; array_unshift($token_stack, $token); array_unshift($text_stack, ''); @@ -1576,11 +1575,11 @@ class Markdown implements MarkdownInterface { * This function is *not* suitable for attributes enclosed in single quotes. * * @param string $url - * @param string &$text Passed by reference + * @param string $text Passed by reference * @return string URL */ protected function encodeURLAttribute($url, &$text = null) { - if ($this->url_filter_func) { + if (is_callable($this->url_filter_func)) { $url = call_user_func($this->url_filter_func, $url); } @@ -1694,7 +1693,7 @@ class Markdown implements MarkdownInterface { * attribute special characters by Allan Odgaard. * * @param string $text - * @param string &$tail + * @param string $tail Passed by reference * @param integer $head_length * @return string */ @@ -1792,13 +1791,13 @@ class Markdown implements MarkdownInterface { * Handle $token provided by parseSpan by determining its nature and * returning the corresponding value that should replace it. * @param string $token - * @param string &$str + * @param string $str Passed by reference * @return string */ protected function handleSpanToken($token, &$str) { - switch ($token{0}) { + switch ($token[0]) { case "\\": - return $this->hashPart("&#". ord($token{1}). ";"); + return $this->hashPart("&#". ord($token[1]). ";"); case "`": // Search for end marker in remaining text. if (preg_match('/^(.*?[^`])'.preg_quote($token).'(?!`)(.*)$/sm', diff --git a/vendor/michelf/php-markdown/Michelf/MarkdownExtra.php b/vendor/michelf/php-markdown/Michelf/MarkdownExtra.php index a8f7f2c5de..62d25f38e1 100644 --- a/vendor/michelf/php-markdown/Michelf/MarkdownExtra.php +++ b/vendor/michelf/php-markdown/Michelf/MarkdownExtra.php @@ -4,7 +4,7 @@ * * @package php-markdown * @author Michel Fortin - * @copyright 2004-2018 Michel Fortin + * @copyright 2004-2019 Michel Fortin * @copyright (Original Markdown) 2004-2006 John Gruber */ @@ -25,11 +25,10 @@ class MarkdownExtra extends \Michelf\Markdown { public $fn_id_prefix = ""; /** - * Optional title attribute for footnote links and backlinks. + * Optional title attribute for footnote links. * @var string */ - public $fn_link_title = ""; - public $fn_backlink_title = ""; + public $fn_link_title = ""; /** * Optional class attribute for footnote links and backlinks. @@ -42,10 +41,22 @@ class MarkdownExtra extends \Michelf\Markdown { * Content to be displayed within footnote backlinks. The default is '↩'; * the U+FE0E on the end is a Unicode variant selector used to prevent iOS * from displaying the arrow character as an emoji. + * Optionally use '^^' and '%%' to refer to the footnote number and + * reference number respectively. {@see parseFootnotePlaceholders()} * @var string */ public $fn_backlink_html = '↩︎'; + /** + * Optional title and aria-label attributes for footnote backlinks for + * added accessibility (to ensure backlink uniqueness). + * Use '^^' and '%%' to refer to the footnote number and reference number + * respectively. {@see parseFootnotePlaceholders()} + * @var string + */ + public $fn_backlink_title = ""; + public $fn_backlink_label = ""; + /** * Class name for table cell alignment (%% replaced left/center/right) * For instance: 'go-%%' becomes 'go-left' or 'go-right' or 'go-center' @@ -79,6 +90,27 @@ class MarkdownExtra extends \Michelf\Markdown { */ public $hashtag_protection = false; + /** + * Determines whether footnotes should be appended to the end of the document. + * If true, footnote html can be retrieved from $this->footnotes_assembled. + * @var boolean + */ + public $omit_footnotes = false; + + + /** + * After parsing, the HTML for the list of footnotes appears here. + * This is available only if $omit_footnotes == true. + * + * Note: when placing the content of `footnotes_assembled` on the page, + * consider adding the attribute `role="doc-endnotes"` to the `div` or + * `section` that will enclose the list of footnotes so they are + * reachable to accessibility tools the same way they would be with the + * default HTML output. + * @var null|string + */ + public $footnotes_assembled = null; + /** * Parser implementation */ @@ -133,6 +165,12 @@ class MarkdownExtra extends \Michelf\Markdown { */ protected $footnote_counter = 1; + /** + * Ref attribute for links + * @var array + */ + protected $ref_attr = array(); + /** * Setting up Extra-specific variables. */ @@ -146,6 +184,7 @@ class MarkdownExtra extends \Michelf\Markdown { $this->abbr_desciptions = array(); $this->abbr_word_re = ''; $this->footnote_counter = 1; + $this->footnotes_assembled = null; foreach ($this->predef_abbr as $abbr_word => $abbr_desc) { if ($this->abbr_word_re) @@ -166,6 +205,9 @@ class MarkdownExtra extends \Michelf\Markdown { $this->abbr_desciptions = array(); $this->abbr_word_re = ''; + if ( ! $this->omit_footnotes ) + $this->footnotes_assembled = null; + parent::teardown(); } @@ -202,7 +244,9 @@ class MarkdownExtra extends \Michelf\Markdown { * @return string */ protected function doExtraAttributes($tag_name, $attr, $defaultIdValue = null, $classes = array()) { - if (empty($attr) && !$defaultIdValue && empty($classes)) return ""; + if (empty($attr) && !$defaultIdValue && empty($classes)) { + return ""; + } // Split on components preg_match_all('/[#.a-z][-_:a-zA-Z0-9=]+/', $attr, $matches); @@ -212,9 +256,9 @@ class MarkdownExtra extends \Michelf\Markdown { $attributes = array(); $id = false; foreach ($elements as $element) { - if ($element{0} == '.') { + if ($element[0] === '.') { $classes[] = substr($element, 1); - } else if ($element{0} == '#') { + } else if ($element[0] === '#') { if ($id === false) $id = substr($element, 1); } else if (strpos($element, '=') > 0) { $parts = explode('=', $element, 2); @@ -222,7 +266,9 @@ class MarkdownExtra extends \Michelf\Markdown { } } - if (!$id) $id = $defaultIdValue; + if ($id === false || $id === '') { + $id = $defaultIdValue; + } // Compose attributes as string $attr_str = ""; @@ -486,7 +532,6 @@ class MarkdownExtra extends \Michelf\Markdown { $tag = $parts[1]; // Tag to handle. $text = $parts[2]; // Remaining text after current tag. - $tag_re = preg_quote($tag); // For use in a regular expression. // Check for: Fenced code block marker. // Note: need to recheck the whole tag to disambiguate backtick @@ -508,14 +553,14 @@ class MarkdownExtra extends \Michelf\Markdown { } } // Check for: Indented code block. - else if ($tag{0} == "\n" || $tag{0} == " ") { + else if ($tag[0] === "\n" || $tag[0] === " ") { // Indented code block: pass it unchanged, will be handled // later. $parsed .= $tag; } // Check for: Code span marker // Note: need to check this after backtick fenced code blocks - else if ($tag{0} == "`") { + else if ($tag[0] === "`") { // Find corresponding end marker. $tag_re = preg_quote($tag); if (preg_match('{^(?>.+?|\n(?!\n))*?(?clean_tags_re . ')\b}', $tag) || - $tag{1} == '!' || $tag{1} == '?') + $tag[1] === '!' || $tag[1] === '?') { // Need to parse tag and following text using the HTML parser. // (don't check for markdown attribute) @@ -564,8 +609,11 @@ class MarkdownExtra extends \Michelf\Markdown { preg_match('{^) // Comments and Processing Instructions. if (preg_match('{^auto_close_tags_re . ')\b}', $tag) || - $tag{1} == '!' || $tag{1} == '?') + $tag[1] === '!' || $tag[1] === '?') { // Just add the tag to the block as if it was text. $block_text .= $tag; @@ -683,8 +732,11 @@ class MarkdownExtra extends \Michelf\Markdown { // Increase/decrease nested tag count. Only do so if // the tag's name match base tag's. if (preg_match('{^mode = $attr_m[2] . $attr_m[3]; - $span_mode = $this->mode == 'span' || $this->mode != 'block' && - preg_match('{^<(?:' . $this->contain_span_tags_re . ')\b}', $tag); + $mode = $attr_m[2] . $attr_m[3]; + $span_mode = $mode === 'span' || ($mode !== 'block' && + preg_match('{^<(?:' . $this->contain_span_tags_re . ')\b}', $tag)); // Calculate indent before tag. if (preg_match('/(?:^|\n)( *?)(?! ).*?$/', $block_text, $matches)) { @@ -729,8 +781,11 @@ class MarkdownExtra extends \Michelf\Markdown { } // Append tag content to parsed text. - if (!$span_mode) $parsed .= "\n\n$block_text\n\n"; - else $parsed .= "$block_text"; + if (!$span_mode) { + $parsed .= "\n\n$block_text\n\n"; + } else { + $parsed .= (string) $block_text; + } // Start over with a new block. $block_text = ""; @@ -875,16 +930,15 @@ class MarkdownExtra extends \Michelf\Markdown { * @return string */ protected function _doAnchors_inline_callback($matches) { - $whole_match = $matches[1]; $link_text = $this->runSpanGamut($matches[2]); - $url = $matches[3] == '' ? $matches[4] : $matches[3]; + $url = $matches[3] === '' ? $matches[4] : $matches[3]; $title =& $matches[7]; $attr = $this->doExtraAttributes("a", $dummy =& $matches[8]); // if the URL was of the form it got caught by the HTML // tag parser and hashed. Need to reverse the process before using the URL. $unhashed = $this->unhash($url); - if ($unhashed != $url) + if ($unhashed !== $url) $url = preg_replace('/^<(.*)>$/', '\1', $unhashed); $url = $this->encodeURLAttribute($url); @@ -967,7 +1021,7 @@ class MarkdownExtra extends \Michelf\Markdown { $alt_text = $matches[2]; $link_id = strtolower($matches[3]); - if ($link_id == "") { + if ($link_id === "") { $link_id = strtolower($alt_text); // for shortcut links like ![this][]. } @@ -980,8 +1034,9 @@ class MarkdownExtra extends \Michelf\Markdown { $title = $this->encodeAttribute($title); $result .= " title=\"$title\""; } - if (isset($this->ref_attr[$link_id])) + if (isset($this->ref_attr[$link_id])) { $result .= $this->ref_attr[$link_id]; + } $result .= $this->empty_element_suffix; $result = $this->hashPart($result); } @@ -999,9 +1054,8 @@ class MarkdownExtra extends \Michelf\Markdown { * @return string */ protected function _doImages_inline_callback($matches) { - $whole_match = $matches[1]; $alt_text = $matches[2]; - $url = $matches[3] == '' ? $matches[4] : $matches[3]; + $url = $matches[3] === '' ? $matches[4] : $matches[3]; $title =& $matches[7]; $attr = $this->doExtraAttributes("img", $dummy =& $matches[8]); @@ -1067,11 +1121,11 @@ class MarkdownExtra extends \Michelf\Markdown { * @return string */ protected function _doHeaders_callback_setext($matches) { - if ($matches[3] == '-' && preg_match('{^- }', $matches[1])) { + if ($matches[3] === '-' && preg_match('{^- }', $matches[1])) { return $matches[0]; } - $level = $matches[3]{0} == '=' ? 1 : 2; + $level = $matches[3][0] === '=' ? 1 : 2; $defaultId = is_callable($this->header_id_func) ? call_user_func($this->header_id_func, $matches[1]) : null; @@ -1174,8 +1228,7 @@ class MarkdownExtra extends \Michelf\Markdown { * @param string $alignname * @return string */ - protected function _doTable_makeAlignAttr($alignname) - { + protected function _doTable_makeAlignAttr($alignname) { if (empty($this->table_align_class_tmpl)) { return " align=\"$alignname\""; } @@ -1223,8 +1276,9 @@ class MarkdownExtra extends \Michelf\Markdown { $text = "\n"; $text .= "\n"; $text .= "\n"; - foreach ($headers as $n => $header) + foreach ($headers as $n => $header) { $text .= " " . $this->runSpanGamut(trim($header)) . "\n"; + } $text .= "\n"; $text .= "\n"; @@ -1242,8 +1296,9 @@ class MarkdownExtra extends \Michelf\Markdown { $row_cells = array_pad($row_cells, $col_count, ''); $text .= "\n"; - foreach ($row_cells as $n => $cell) + foreach ($row_cells as $n => $cell) { $text .= " " . $this->runSpanGamut(trim($cell)) . "\n"; + } $text .= "\n"; } $text .= "\n"; @@ -1411,8 +1466,6 @@ class MarkdownExtra extends \Michelf\Markdown { */ protected function doFencedCodeBlocks($text) { - $less_than_tab = $this->tab_width; - $text = preg_replace_callback('{ (?:\n|\A) # 1: Opening marker @@ -1465,9 +1518,10 @@ class MarkdownExtra extends \Michelf\Markdown { array($this, '_doFencedCodeBlocks_newlines'), $codeblock); $classes = array(); - if ($classname != "") { - if ($classname{0} == '.') + if ($classname !== "") { + if ($classname[0] === '.') { $classname = substr($classname, 1); + } $classes[] = $this->code_class_prefix . $classname; } $attr_str = $this->doExtraAttributes($this->code_attr_on_pre ? "pre" : "code", $attrs, null, $classes); @@ -1608,65 +1662,95 @@ class MarkdownExtra extends \Michelf\Markdown { $text = preg_replace_callback('{F\x1Afn:(.*?)\x1A:}', array($this, '_appendFootnotes_callback'), $text); - if (!empty($this->footnotes_ordered)) { - $text .= "\n\n"; - $text .= "
\n"; - $text .= "empty_element_suffix . "\n"; - $text .= "
    \n\n"; - - $attr = ""; - if ($this->fn_backlink_class != "") { - $class = $this->fn_backlink_class; - $class = $this->encodeAttribute($class); - $attr .= " class=\"$class\""; + if ( ! empty( $this->footnotes_ordered ) ) { + $this->_doFootnotes(); + if ( ! $this->omit_footnotes ) { + $text .= "\n\n"; + $text .= "
    \n"; + $text .= "empty_element_suffix . "\n"; + $text .= $this->footnotes_assembled; + $text .= "
    "; } - if ($this->fn_backlink_title != "") { - $title = $this->fn_backlink_title; - $title = $this->encodeAttribute($title); - $attr .= " title=\"$title\""; - $attr .= " aria-label=\"$title\""; - } - $attr .= " role=\"doc-backlink\""; - $backlink_text = $this->fn_backlink_html; - $num = 0; + } + return $text; + } - while (!empty($this->footnotes_ordered)) { - $footnote = reset($this->footnotes_ordered); - $note_id = key($this->footnotes_ordered); - unset($this->footnotes_ordered[$note_id]); - $ref_count = $this->footnotes_ref_count[$note_id]; - unset($this->footnotes_ref_count[$note_id]); - unset($this->footnotes[$note_id]); - $footnote .= "\n"; // Need to append newline before parsing. - $footnote = $this->runBlockGamut("$footnote\n"); - $footnote = preg_replace_callback('{F\x1Afn:(.*?)\x1A:}', - array($this, '_appendFootnotes_callback'), $footnote); + /** + * Generates the HTML for footnotes. Called by appendFootnotes, even if + * footnotes are not being appended. + * @return void + */ + protected function _doFootnotes() { + $attr = array(); + if ($this->fn_backlink_class !== "") { + $class = $this->fn_backlink_class; + $class = $this->encodeAttribute($class); + $attr['class'] = " class=\"$class\""; + } + $attr['role'] = " role=\"doc-backlink\""; + $num = 0; - $attr = str_replace("%%", ++$num, $attr); - $note_id = $this->encodeAttribute($note_id); + $text = "
      \n\n"; + while (!empty($this->footnotes_ordered)) { + $footnote = reset($this->footnotes_ordered); + $note_id = key($this->footnotes_ordered); + unset($this->footnotes_ordered[$note_id]); + $ref_count = $this->footnotes_ref_count[$note_id]; + unset($this->footnotes_ref_count[$note_id]); + unset($this->footnotes[$note_id]); - // Prepare backlink, multiple backlinks if multiple references - $backlink = "$backlink_text"; - for ($ref_num = 2; $ref_num <= $ref_count; ++$ref_num) { - $backlink .= " $backlink_text"; + $footnote .= "\n"; // Need to append newline before parsing. + $footnote = $this->runBlockGamut("$footnote\n"); + $footnote = preg_replace_callback('{F\x1Afn:(.*?)\x1A:}', + array($this, '_appendFootnotes_callback'), $footnote); + + $num++; + $note_id = $this->encodeAttribute($note_id); + + // Prepare backlink, multiple backlinks if multiple references + // Do not create empty backlinks if the html is blank + $backlink = ""; + if (!empty($this->fn_backlink_html)) { + for ($ref_num = 1; $ref_num <= $ref_count; ++$ref_num) { + if (!empty($this->fn_backlink_title)) { + $attr['title'] = ' title="' . $this->encodeAttribute($this->fn_backlink_title) . '"'; + } + if (!empty($this->fn_backlink_label)) { + $attr['label'] = ' aria-label="' . $this->encodeAttribute($this->fn_backlink_label) . '"'; + } + $parsed_attr = $this->parseFootnotePlaceholders( + implode('', $attr), + $num, + $ref_num + ); + $backlink_text = $this->parseFootnotePlaceholders( + $this->fn_backlink_html, + $num, + $ref_num + ); + $ref_count_mark = $ref_num > 1 ? $ref_num : ''; + $backlink .= " $backlink_text"; } - // Add backlink to last paragraph; create new paragraph if needed. + $backlink = trim($backlink); + } + + // Add backlink to last paragraph; create new paragraph if needed. + if (!empty($backlink)) { if (preg_match('{

      $}', $footnote)) { $footnote = substr($footnote, 0, -4) . " $backlink

      "; } else { $footnote .= "\n\n

      $backlink

      "; } - - $text .= "
    1. \n"; - $text .= $footnote . "\n"; - $text .= "
      2. \n\n"; } - $text .= "
    \n"; - $text .= "
"; + $text .= "
  • \n"; + $text .= $footnote . "\n"; + $text .= "
    • \n\n"; } - return $text; + $text .= "\n"; + + $this->footnotes_assembled = $text; } /** @@ -1693,12 +1777,12 @@ class MarkdownExtra extends \Michelf\Markdown { } $attr = ""; - if ($this->fn_link_class != "") { + if ($this->fn_link_class !== "") { $class = $this->fn_link_class; $class = $this->encodeAttribute($class); $attr .= " class=\"$class\""; } - if ($this->fn_link_title != "") { + if ($this->fn_link_title !== "") { $title = $this->fn_link_title; $title = $this->encodeAttribute($title); $attr .= " title=\"$title\""; @@ -1717,6 +1801,23 @@ class MarkdownExtra extends \Michelf\Markdown { return "[^" . $matches[1] . "]"; } + /** + * Build footnote label by evaluating any placeholders. + * - ^^ footnote number + * - %% footnote reference number (Nth reference to footnote number) + * @param string $label + * @param int $footnote_number + * @param int $reference_number + * @return string + */ + protected function parseFootnotePlaceholders($label, $footnote_number, $reference_number) { + return str_replace( + array('^^', '%%'), + array($footnote_number, $reference_number), + $label + ); + } + /** * Abbreviations - strips abbreviations from text, stores titles in hash @@ -1783,12 +1884,10 @@ class MarkdownExtra extends \Michelf\Markdown { $desc = $this->abbr_desciptions[$abbr]; if (empty($desc)) { return $this->hashPart("$abbr"); - } else { - $desc = $this->encodeAttribute($desc); - return $this->hashPart("$abbr"); } - } else { - return $matches[0]; + $desc = $this->encodeAttribute($desc); + return $this->hashPart("$abbr"); } + return $matches[0]; } } diff --git a/vendor/michelf/php-markdown/Michelf/MarkdownInterface.php b/vendor/michelf/php-markdown/Michelf/MarkdownInterface.php index 7fc0da06e2..0064524459 100644 --- a/vendor/michelf/php-markdown/Michelf/MarkdownInterface.php +++ b/vendor/michelf/php-markdown/Michelf/MarkdownInterface.php @@ -4,7 +4,7 @@ * * @package php-markdown * @author Michel Fortin - * @copyright 2004-2018 Michel Fortin + * @copyright 2004-2019 Michel Fortin * @copyright (Original Markdown) 2004-2006 John Gruber */ diff --git a/vendor/michelf/php-markdown/Readme.md b/vendor/michelf/php-markdown/Readme.md index c05cd93d47..e1eb306601 100644 --- a/vendor/michelf/php-markdown/Readme.md +++ b/vendor/michelf/php-markdown/Readme.md @@ -1,7 +1,7 @@ PHP Markdown ============ -PHP Markdown Lib 1.8.0 - 14 Jan 2018 +PHP Markdown Lib 1.9.0 - 1 Dec 2019 by Michel Fortin @@ -163,26 +163,54 @@ potential side effects, and future extensibility -- before deciding on acceptance or rejection. If you make a pull request that includes changes to the parser please add -tests for what is being changed to [MDTest][] and make a pull request there -too. +tests for what is being changed to the `test/` directory. This can be as +simple as adding a `.text` (input) file with a corresponding `.xhtml` +(output) file to proper category under `./test/resources/`. - [MDTest]: https://github.com/michelf/mdtest/ +Traditionally tests were in a separate repository, [MDTest](https://github.com/michelf/mdtest) +but they are now located here, alongside the source code. Donations --------- If you wish to make a donation that will help me devote more time to -PHP Markdown, please visit [michelf.ca/donate] or send Bitcoin to -[1HiuX34czvVPPdhXbUAsAu7pZcesniDCGH]. +PHP Markdown, please visit [michelf.ca/donate]. [michelf.ca/donate]: https://michelf.ca/donate/#!Thanks%20for%20PHP%20Markdown - [1HiuX34czvVPPdhXbUAsAu7pZcesniDCGH]: bitcoin:1HiuX34czvVPPdhXbUAsAu7pZcesniDCGH Version History --------------- +PHP Markdown Lib 1.9.0 (1 Dec 2019) + +* Added `fn_backlink_label` configuration variable to put some text in the + `aria-label` attribute. + (Thanks to Sunny Walker for the implementation.) + +* Occurances of "`^^`" in `fn_backlink_html`, `fn_backlink_class`, + `fn_backlink_title`, and `fn_backlink_label` will be replaced by the + corresponding footnote number in the HTML output. Occurances of "`%%`" will be + replaced by a number for the reference (footnotes can have multiple references). + (Thanks to Sunny Walker for the implementation.) + +* Added configuration variable `omit_footnotes`. When `true` footnotes are not + appended at the end of the generated HTML and the `footnotes_assembled` + variable will contain the HTML for the footnote list, allowing footnotes to be + moved somewhere else on the page. + (Thanks to James K. for the implementation.) + + Note: when placing the content of `footnotes_assembled` on the page, consider + adding the attribute `role="doc-endnotes"` to the `
    ` or `
    ` that will + enclose the list of footnotes so they are reachable to accessibility tools the + same way they would be with the default HTML output. + +* Fixed deprecation warnings from PHP about usage of curly braces to access + characters in text strings. + (Thanks to Remi Collet and Frans-Willem Post.) + + PHP Markdown Lib 1.8.0 (14 Jan 2018) * Autoloading with Composer now uses PSR-4. @@ -371,7 +399,7 @@ Copyright and License --------------------- PHP Markdown Lib -Copyright (c) 2004-2016 Michel Fortin +Copyright (c) 2004-2019 Michel Fortin All rights reserved. diff --git a/vendor/michelf/php-markdown/Readme.php b/vendor/michelf/php-markdown/Readme.php index e473d73364..726bbe3d30 100644 --- a/vendor/michelf/php-markdown/Readme.php +++ b/vendor/michelf/php-markdown/Readme.php @@ -9,7 +9,7 @@ spl_autoload_register(function($class){ require str_replace('\\', DIRECTORY_SEPARATOR, ltrim($class, '\\')).'.php'; }); // If using Composer, use this instead: -//require 'vendor/autoloader.php'; +//require 'vendor/autoload.php'; // Get Markdown class use Michelf\Markdown; @@ -21,13 +21,13 @@ $html = Markdown::defaultTransform($text); ?> - - PHP Markdown Lib - Readme - - + + PHP Markdown Lib - Readme + + - + diff --git a/vendor/michelf/php-markdown/composer.json b/vendor/michelf/php-markdown/composer.json index 6b1993d653..093507554b 100644 --- a/vendor/michelf/php-markdown/composer.json +++ b/vendor/michelf/php-markdown/composer.json @@ -22,5 +22,8 @@ }, "autoload": { "psr-4": { "Michelf\\": "Michelf/" } + }, + "require-dev": { + "phpunit/phpunit": ">=4.3 <5.8" } } diff --git a/vendor/pear/console_getopt/Console/Getopt.php b/vendor/pear/console_getopt/Console/Getopt.php index f8df71ce59..e5793bbb18 100644 --- a/vendor/pear/console_getopt/Console/Getopt.php +++ b/vendor/pear/console_getopt/Console/Getopt.php @@ -123,7 +123,7 @@ class Console_Getopt * erroneous POSIX fix. */ if ($version < 2) { - if (isset($args[0]{0}) && $args[0]{0} != '-') { + if (isset($args[0][0]) && $args[0][0] != '-') { array_shift($args); } } @@ -138,10 +138,10 @@ class Console_Getopt break; } - if ($arg{0} != '-' || (strlen($arg) > 1 && $arg{1} == '-' && !$long_options)) { + if ($arg[0] != '-' || (strlen($arg) > 1 && $arg[1] == '-' && !$long_options)) { $non_opts = array_merge($non_opts, array_slice($args, $i)); break; - } elseif (strlen($arg) > 1 && $arg{1} == '-') { + } elseif (strlen($arg) > 1 && $arg[1] == '-') { $error = Console_Getopt::_parseLongOption(substr($arg, 2), $long_options, $opts, @@ -186,11 +186,11 @@ class Console_Getopt protected static function _parseShortOption($arg, $short_options, &$opts, &$argIdx, $args, $skip_unknown) { for ($i = 0; $i < strlen($arg); $i++) { - $opt = $arg{$i}; + $opt = $arg[$i]; $opt_arg = null; /* Try to find the short option in the specifier string. */ - if (($spec = strstr($short_options, $opt)) === false || $arg{$i} == ':') { + if (($spec = strstr($short_options, $opt)) === false || $arg[$i] == ':') { if ($skip_unknown === true) { break; } @@ -199,8 +199,8 @@ class Console_Getopt return PEAR::raiseError($msg); } - if (strlen($spec) > 1 && $spec{1} == ':') { - if (strlen($spec) > 2 && $spec{2} == ':') { + if (strlen($spec) > 1 && $spec[1] == ':') { + if (strlen($spec) > 2 && $spec[2] == ':') { if ($i + 1 < strlen($arg)) { /* Option takes an optional argument. Use the remainder of the arg string if there is anything left. */ @@ -296,11 +296,11 @@ class Console_Getopt $next_option_rest = ''; } - if ($opt_rest != '' && $opt{0} != '=' && + if ($opt_rest != '' && $opt[0] != '=' && $i + 1 < count($long_options) && $opt == substr($long_options[$i+1], 0, $opt_len) && $next_option_rest != '' && - $next_option_rest{0} != '=') { + $next_option_rest[0] != '=') { $msg = "Console_Getopt: option --$opt is ambiguous"; return PEAR::raiseError($msg); diff --git a/vendor/pear/console_getopt/package.xml b/vendor/pear/console_getopt/package.xml index 3c8da769d6..d3fd784029 100644 --- a/vendor/pear/console_getopt/package.xml +++ b/vendor/pear/console_getopt/package.xml @@ -24,9 +24,9 @@ short and long options. no - 2019-02-06 + 2019-11-20 - 1.4.2 + 1.4.3 1.4.0 @@ -36,7 +36,8 @@ short and long options. BSD-2-Clause -* Remove use of each(), which is removed in PHP 8 +* PR #4: Fix PHP 7.4 deprecation: array/string curly braces access +* PR #5: fix phplint warnings @@ -75,6 +76,23 @@ short and long options. + + 2019-11-20 + + 1.4.3 + 1.4.0 + + + stable + stable + + BSD-2-Clause + + * PR #4: Fix PHP 7.4 deprecation: array/string curly braces access + * PR #5: fix phplint warnings + + + 2019-02-06 diff --git a/vendor/stomp-php/stomp-php/README.md b/vendor/stomp-php/stomp-php/README.md index 799fbf3a79..e1e97786b7 100644 --- a/vendor/stomp-php/stomp-php/README.md +++ b/vendor/stomp-php/stomp-php/README.md @@ -58,7 +58,7 @@ via composer: $ php composer.phar install The functional testsuite is divided into three broker versions. -Currently it's running on `ActiveMq` (Port 61010), `Apollo` (61020), `RabbitMq` (61030). +Currently it's running on `ActiveMq` (Port 61010), `Apollo` (61020), `RabbitMq` (61030), `Artemis` (61040). Apollo should be configured to use admin:password and RabbitMq to guest:guest. While ActiveMq must be configured to use no login at all. diff --git a/vendor/stomp-php/stomp-php/run_phpunit.sh b/vendor/stomp-php/stomp-php/run_phpunit.sh index b67275c9a0..9119adbecc 100755 --- a/vendor/stomp-php/stomp-php/run_phpunit.sh +++ b/vendor/stomp-php/stomp-php/run_phpunit.sh @@ -1,3 +1,3 @@ #!/usr/bin/env bash -./vendor/bin/phpunit --no-configuration tests/Unit/Stomp +./vendor/bin/phpunit --no-configuration tests/Unit diff --git a/vendor/stomp-php/stomp-php/src/Broker/OpenMq/OpenMq.php b/vendor/stomp-php/stomp-php/src/Broker/OpenMq/OpenMq.php index 61f8e5c06b..2c34640fe8 100644 --- a/vendor/stomp-php/stomp-php/src/Broker/OpenMq/OpenMq.php +++ b/vendor/stomp-php/stomp-php/src/Broker/OpenMq/OpenMq.php @@ -29,7 +29,11 @@ class OpenMq extends Protocol $ack = $this->createFrame('ACK'); $ack['transaction'] = $transactionId; if ($this->hasVersion(Version::VERSION_1_2)) { - $ack['id'] = $frame->getMessageId(); + if (isset($frame['ack'])) { + $ack['id'] = $frame['ack']; + } else { + $ack['id'] = $frame->getMessageId(); + } } else { $ack['message-id'] = $frame->getMessageId(); } diff --git a/vendor/stomp-php/stomp-php/src/Network/Connection.php b/vendor/stomp-php/stomp-php/src/Network/Connection.php index 566c332b23..361306dbe8 100755 --- a/vendor/stomp-php/stomp-php/src/Network/Connection.php +++ b/vendor/stomp-php/stomp-php/src/Network/Connection.php @@ -347,15 +347,15 @@ class Connection { $hosts = $this->getHostList(); + $lastException = null; while ($host = array_shift($hosts)) { try { return $this->connectSocket($host); } catch (ConnectionException $connectionException) { - if (empty($hosts)) { - throw new ConnectionException("Could not connect to a broker", [], $connectionException); - } + $lastException = $connectionException; } } + throw new ConnectionException("Could not connect to a broker", [], $lastException); } /** @@ -546,7 +546,7 @@ class Connection if ($frame = $this->parser->nextFrame()) { return $this->onFrame($frame); } - } while ($this->isDataOnStream()); + } while ($this->hasDataToRead()); return false; } @@ -684,7 +684,7 @@ class Connection $this->writeData(self::ALIVE, $timeout); } } - + /** * Immediately releases all allocated resources when the connection object gets destroyed. * diff --git a/vendor/stomp-php/stomp-php/src/Protocol/Protocol.php b/vendor/stomp-php/stomp-php/src/Protocol/Protocol.php index 0fd6310da9..c34fb74eb6 100644 --- a/vendor/stomp-php/stomp-php/src/Protocol/Protocol.php +++ b/vendor/stomp-php/stomp-php/src/Protocol/Protocol.php @@ -203,7 +203,11 @@ class Protocol $ack = $this->createFrame('ACK'); $ack['transaction'] = $transactionId; if ($this->hasVersion(Version::VERSION_1_2)) { - $ack['id'] = $frame->getMessageId(); + if (isset($frame['ack'])) { + $ack['id'] = $frame['ack']; + } else { + $ack['id'] = $frame->getMessageId(); + } } else { $ack['message-id'] = $frame->getMessageId(); if ($this->hasVersion(Version::VERSION_1_1)) { diff --git a/vendor/stomp-php/stomp-php/src/States/Meta/SubscriptionList.php b/vendor/stomp-php/stomp-php/src/States/Meta/SubscriptionList.php index 3ad8e0f404..c69359122e 100644 --- a/vendor/stomp-php/stomp-php/src/States/Meta/SubscriptionList.php +++ b/vendor/stomp-php/stomp-php/src/States/Meta/SubscriptionList.php @@ -56,6 +56,8 @@ class SubscriptionList implements IteratorAggregate, ArrayAccess, Countable /** * @inheritdoc + * + * @return \Iterator|Subscription[] */ public function getIterator() { @@ -64,6 +66,8 @@ class SubscriptionList implements IteratorAggregate, ArrayAccess, Countable /** * @inheritdoc + * + * @return bool */ public function offsetExists($offset) { @@ -72,6 +76,8 @@ class SubscriptionList implements IteratorAggregate, ArrayAccess, Countable /** * @inheritdoc + * + * @return Subscription */ public function offsetGet($offset) { diff --git a/vendor/stomp-php/stomp-php/src/Transport/Parser.php b/vendor/stomp-php/stomp-php/src/Transport/Parser.php index b36b02184b..15a84963f1 100644 --- a/vendor/stomp-php/stomp-php/src/Transport/Parser.php +++ b/vendor/stomp-php/stomp-php/src/Transport/Parser.php @@ -235,6 +235,7 @@ class Parser break; } + /** @phpstan-ignore-next-line */ if ($this->offset > 0) { // remove parsed buffer $this->buffer = substr($this->buffer, $this->offset); diff --git a/vendor/stomp-php/stomp-php/src/Util/IdGenerator.php b/vendor/stomp-php/stomp-php/src/Util/IdGenerator.php index b320d99396..cb14d177c7 100644 --- a/vendor/stomp-php/stomp-php/src/Util/IdGenerator.php +++ b/vendor/stomp-php/stomp-php/src/Util/IdGenerator.php @@ -8,6 +8,8 @@ namespace Stomp\Util; +use RuntimeException; + /** * IdGenerator generates Ids which are unique during the runtime scope. * @@ -34,6 +36,7 @@ class IdGenerator return $rand; } } + throw new RuntimeException('Message Id generation failed.'); } /**