diff --git a/CREDITS.md b/CREDITS.md
index 4a7d2bb5cc..0dd0a2267d 100644
--- a/CREDITS.md
+++ b/CREDITS.md
@@ -3,20 +3,22 @@ Credits for GNU social
The following is an incomplete list of developers
who've worked on GNU social, or its predecessors
StatusNet and Free Social. Apologies for any
-oversight; please let mattl@gnu.org know if
+oversight; please let mail@diogo.site know if
anyone's been overlooked in error.
-Current team
-------------
-* Matt Lee
-* Mikael Nordfeldth
+V2 team
+-------
* Diogo Cordeiro
-* Bruno Casteleiro
-* Miguel Dantas
* Alexei Sorokin
+* Bruno Casteleiro
+
+Credits for GNU social v1
+------------------------
+Leads
+* Mikael Nordfeldth
+* Matt Lee
Additional Contributors
------------------------
* Ciaran Gultnieks
* Michael Landers
* Ori Avtalion
@@ -46,7 +48,7 @@ Additional Contributors
* Blaine Cook
* Henry Story
* Melvin Carvalho
-* Stéphane Bérubé
+* Stéphane Bérubé (chimo)
* Akio
* Maiyannah Bishop
* Bob Mottram
@@ -55,7 +57,9 @@ Additional Contributors
* Moonman
* Normandy
* Verius
+* Diogo Peralta Cordeiro
* Daniel Supernault
+* Miguel Dantas
Credits for StatusNet
--------------
diff --git a/README.md b/README.md
index 17b512b9f8..ccbf80a8d3 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
# GNU social 2.0.x
-(c) 2010-2019 Free Software Foundation, Inc
+(c) 2010-2021 Free Software Foundation, Inc
This is the README file for GNU social, the free
software social networking platform. It includes
@@ -36,7 +36,7 @@ XMPP), and specially-designed desktop clients that
support the Twitter API.
GNU social supports open standards (such as OStatus
-) that lets users in
+ and ActivityPub ) that lets users in
different networks follow each other. It enables a
distributed social network spread all across the
Web.
@@ -102,34 +102,7 @@ unless you configured a separate logfile. This is
probably the first place to look if you're getting
weird behaviour from GNU social.
-If you're tracking the unstable version of
-GNU social in the git repository (see below), and you
-get a compilation error ("unexpected T_STRING") in
-the browser, check to see that you don't have any
-conflicts in your code.
-
-### Unstable version
-
-If you're adventurous or impatient, you may want
-to install the development version of GNU social.
-To get it, use the git version control tool
- like so:
-
- git clone https://notabug.org/diogo/gnu-social.git
-
-In the current phase of development it is probably
-recommended to use git as a means to stay up to date
-with the source code. You can choose between these
-branches:
-* 1.20.x "oldstable", few updates, well tested coded ( **recommended** )
-* master "stable", usually working well (should be safe)
-* nightly "testing", most updates, not always working as expected (can be dangerous)
-
-**IMPORTANT: We force push to the nightly branch, the nightly branch is intended for GNU social developers only.**
-
-To keep it up-to-date, use `git pull`. Watch for conflicts!
-
-As in any upgrade, do __not__ forget to run `/scripts/upgrade.php`.
+Do __not__ forget to run `/scripts/upgrade.php` if you're upgrading to this release.
## Further information
@@ -142,7 +115,7 @@ There are several ways to get more information about GNU social.
* GNU social has a bug tracker for any defects you may find, or ideas for
making things better.
-* Patches are welcome, preferrably to our repository on notabug.org.
+* Patches are welcome, preferably to our repository on notabug.org.
## Credits
@@ -150,11 +123,9 @@ An incomplete list of developers who've worked on GNU social,
or its predecessors StatusNet and Free Social has been made available
in `CREDITS.md`.
-### Current team
+### Release development team
-* Matt Lee
-* Mikael Nordfeldth
* Diogo Cordeiro
-* Bruno Casteleiro
-* Miguel Dantas
* Alexei Sorokin
+* Many important contributions from GNU social Summer of Code students such as Bruno Casteleiro and Hugo Sales.
+
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 0c686fdbb9..54037311bd 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -7,7 +7,7 @@ proceeded by the killing of the other Persian messengers.
## For users/sysadmins
### Web server changes
-- GS is now structurely divided in includes and public
+- GS is now structurally divided in includes and public
- New media handling system, new important settings, refer to CONFIGURE doc and web server conf
- `$config['site']['x-static-delivery']`
- You must also review the [attachments section of CONFIGURE](https://notabug.org/diogo/gnu-social/src/new_modules_system/DOCUMENTATION/SYSTEM_ADMINISTRATORS/CONFIGURE.md#attachments).
@@ -21,12 +21,9 @@ proceeded by the killing of the other Persian messengers.
### Federation
- Added ActivityPub support
- Enabled the search box to import remote notices and profiles
-- Direct messages
+- Direct messages are now via ActivityPub only
### Load and Storage
-- Improved Cronish
- - Run session garbage collection
- - Cleanup Email Registration
- New queues system
- Support for Redis was added
- Support for PostgreSQL was added
diff --git a/TODO.md b/TODO.md
index dda2622d07..2c424cb0e2 100644
--- a/TODO.md
+++ b/TODO.md
@@ -4,12 +4,30 @@ Hi! Thank you for your interest in contributing, please refer to
[DOCUMENTATION/DEVELOPERS](https://notabug.org/diogo/gnu-social/src/nightly/DOCUMENTATION/DEVELOPERS)
to learn how you can contribute.
-Our roadmap is available in the following Kanban board:
-[Kanban Board](https://kanban.diogo.site/?controller=BoardViewController&action=readonly&token=03795efb8138c4e7661a900c234c0df1bc3fc03cdfcda8619cd5d0e666de).
+## Pending
+
+### [Core]
+- Improve Cronish
+ - Run session garbage collection
+ - Cleanup Email Registration
+- [Security] Review confirmation codes
+```
+ my guess is that the author intent was that the admin wouldn't have to verify his account, but has misread the User::register docblock
+ [XRevan86] https://notabug.org/diogo/gnu-social/src/nightly/plugins/EmailRegistration/EmailRegistrationPlugin.php#L114
+ [XRevan86] https://notabug.org/diogo/gnu-social/src/nightly/classes/Confirm_address.php#L52-L68
+ [XRevan86] Here's why 13 symbols
+ [XRevan86] https://notabug.org/diogo/gnu-social/src/nightly/classes/User.php#L343-L349 I wonder why parts of the code reinvent the wheel.
+ [XRevan86] $result = Confirm_address::saveNew($user->id, $email, 'email');
+ [XRevan86] I think it can be replaced with that.
+ [XRevan86] https://notabug.org/diogo/gnu-social/src/nightly/actions/emailsettings.php#L357-L364
+ [XRevan86] https://notabug.org/diogo/gnu-social/src/nightly/actions/imsettings.php#L316-L325
+ [XRevan86] The last one is a bit different, as it's not email. But I think it still applies.
+ [XRevan86] diogo: Maybe saveNew can be extended to accept variable bitsize (or better charsize).
+ [XRevan86] https://notabug.org/diogo/gnu-social/src/nightly/actions/smssettings.php#L320-L328 then this also can be altered
+ [XRevan86] but with keeping the original 40 bitsize
+```
+- [Database] Move from Pear DB to [PDO_DataObject](https://github.com/roojs/PDO_DataObject)
There are more pending tasks/ideas to implement in this
[repo's issues](https://notabug.org/diogo/gnu-social/issues).
-So consider the issue tracker to be the full backlog, in the kanban board it's just what the
-[development team](https://notabug.org/diogo/gnu-social/src/nightly/CREDITS.md)
-is working on.
diff --git a/composer.lock b/composer.lock
index 6a9cb696b8..865391b408 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "4e2a2a7254378e2dc8be73be627b766b",
+ "content-hash": "f7c49732f6b0c37b67e783fc0d5535d2",
"packages": [
{
"name": "alchemy/binary-driver",
@@ -66,28 +66,34 @@
"binary",
"driver"
],
+ "support": {
+ "issues": "https://github.com/alchemy-fr/BinaryDriver/issues",
+ "source": "https://github.com/alchemy-fr/BinaryDriver/tree/master"
+ },
"time": "2020-02-12T19:35:11+00:00"
},
{
"name": "apereo/phpcas",
- "version": "1.3.8",
+ "version": "1.4.0",
"source": {
"type": "git",
"url": "https://github.com/apereo/phpCAS.git",
- "reference": "40c0769ce05a30c8172b36ceab11124375c8366e"
+ "reference": "ea27d122c4c7114006b33d15668c90f1904d53df"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/apereo/phpCAS/zipball/40c0769ce05a30c8172b36ceab11124375c8366e",
- "reference": "40c0769ce05a30c8172b36ceab11124375c8366e",
+ "url": "https://api.github.com/repos/apereo/phpCAS/zipball/ea27d122c4c7114006b33d15668c90f1904d53df",
+ "reference": "ea27d122c4c7114006b33d15668c90f1904d53df",
"shasum": ""
},
"require": {
"ext-curl": "*",
- "php": ">=5.4.0"
+ "php": ">=7.0.0",
+ "psr/log": "^1.0.0"
},
"require-dev": {
- "phpunit/phpunit": "~3.7.10"
+ "monolog/monolog": "^1.0.0",
+ "phpunit/phpunit": ">=4.8.35 <8"
},
"type": "library",
"extra": {
@@ -107,11 +113,16 @@
"authors": [
{
"name": "Joachim Fritschi",
- "homepage": "https://wiki.jasig.org/display/~fritschi"
+ "email": "jfritschi@freenet.de",
+ "homepage": "https://github.com/jfritschi"
},
{
"name": "Adam Franco",
- "homepage": "https://wiki.jasig.org/display/~adamfranco"
+ "homepage": "https://github.com/adamfranco"
+ },
+ {
+ "name": "Henry Pan",
+ "homepage": "https://github.com/phy25"
}
],
"description": "Provides a simple API for authenticating users against a CAS server",
@@ -121,20 +132,24 @@
"cas",
"jasig"
],
- "time": "2019-08-18T20:01:55+00:00"
+ "support": {
+ "issues": "https://github.com/apereo/phpCAS/issues",
+ "source": "https://github.com/apereo/phpCAS/tree/1.4.0"
+ },
+ "time": "2021-05-30T19:53:34+00:00"
},
{
"name": "composer/ca-bundle",
- "version": "1.2.7",
+ "version": "1.2.10",
"source": {
"type": "git",
"url": "https://github.com/composer/ca-bundle.git",
- "reference": "95c63ab2117a72f48f5a55da9740a3273d45b7fd"
+ "reference": "9fdb22c2e97a614657716178093cd1da90a64aa8"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/composer/ca-bundle/zipball/95c63ab2117a72f48f5a55da9740a3273d45b7fd",
- "reference": "95c63ab2117a72f48f5a55da9740a3273d45b7fd",
+ "url": "https://api.github.com/repos/composer/ca-bundle/zipball/9fdb22c2e97a614657716178093cd1da90a64aa8",
+ "reference": "9fdb22c2e97a614657716178093cd1da90a64aa8",
"shasum": ""
},
"require": {
@@ -143,14 +158,15 @@
"php": "^5.3.2 || ^7.0 || ^8.0"
},
"require-dev": {
- "phpunit/phpunit": "^4.8.35 || ^5.7 || 6.5 - 8",
+ "phpstan/phpstan": "^0.12.55",
"psr/log": "^1.0",
+ "symfony/phpunit-bridge": "^4.2 || ^5",
"symfony/process": "^2.5 || ^3.0 || ^4.0 || ^5.0"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.x-dev"
+ "dev-main": "1.x-dev"
}
},
"autoload": {
@@ -177,17 +193,26 @@
"ssl",
"tls"
],
+ "support": {
+ "irc": "irc://irc.freenode.org/composer",
+ "issues": "https://github.com/composer/ca-bundle/issues",
+ "source": "https://github.com/composer/ca-bundle/tree/1.2.10"
+ },
"funding": [
{
"url": "https://packagist.com",
"type": "custom"
},
+ {
+ "url": "https://github.com/composer",
+ "type": "github"
+ },
{
"url": "https://tidelift.com/funding/github/packagist/composer/composer",
"type": "tidelift"
}
],
- "time": "2020-04-08T08:27:21+00:00"
+ "time": "2021-06-07T13:58:28+00:00"
},
{
"name": "diogocomposer/xmpphp",
@@ -262,20 +287,23 @@
"xmpp",
"xmpphp"
],
+ "support": {
+ "source": "https://github.com/diogogithub/xmpphp/tree/v3.0.3"
+ },
"time": "2020-09-13T20:00:21+00:00"
},
{
"name": "doctrine/cache",
- "version": "1.10.2",
+ "version": "1.12.1",
"source": {
"type": "git",
"url": "https://github.com/doctrine/cache.git",
- "reference": "13e3381b25847283a91948d04640543941309727"
+ "reference": "4cf401d14df219fa6f38b671f5493449151c9ad8"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/cache/zipball/13e3381b25847283a91948d04640543941309727",
- "reference": "13e3381b25847283a91948d04640543941309727",
+ "url": "https://api.github.com/repos/doctrine/cache/zipball/4cf401d14df219fa6f38b671f5493449151c9ad8",
+ "reference": "4cf401d14df219fa6f38b671f5493449151c9ad8",
"shasum": ""
},
"require": {
@@ -286,20 +314,19 @@
},
"require-dev": {
"alcaeus/mongo-php-adapter": "^1.1",
- "doctrine/coding-standard": "^6.0",
+ "cache/integration-tests": "dev-master",
+ "doctrine/coding-standard": "^8.0",
"mongodb/mongodb": "^1.1",
- "phpunit/phpunit": "^7.0",
- "predis/predis": "~1.0"
+ "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0",
+ "predis/predis": "~1.0",
+ "psr/cache": "^1.0 || ^2.0 || ^3.0",
+ "symfony/cache": "^4.4 || ^5.2 || ^6.0@dev",
+ "symfony/var-exporter": "^4.4 || ^5.2 || ^6.0@dev"
},
"suggest": {
"alcaeus/mongo-php-adapter": "Required to use legacy MongoDB driver"
},
"type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "1.9.x-dev"
- }
- },
"autoload": {
"psr-4": {
"Doctrine\\Common\\Cache\\": "lib/Doctrine/Common/Cache"
@@ -344,6 +371,10 @@
"redis",
"xcache"
],
+ "support": {
+ "issues": "https://github.com/doctrine/cache/issues",
+ "source": "https://github.com/doctrine/cache/tree/1.12.1"
+ },
"funding": [
{
"url": "https://www.doctrine-project.org/sponsorship.html",
@@ -358,20 +389,20 @@
"type": "tidelift"
}
],
- "time": "2020-07-07T18:54:01+00:00"
+ "time": "2021-07-17T14:39:21+00:00"
},
{
"name": "embed/embed",
- "version": "v3.4.8",
+ "version": "3.4.17",
"source": {
"type": "git",
"url": "https://github.com/oscarotero/Embed.git",
- "reference": "96aab555e399769b9d12c3c362a4232563ccbe76"
+ "reference": "2c0e112f7332597ec6a55174f2353e04859ba356"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/oscarotero/Embed/zipball/96aab555e399769b9d12c3c362a4232563ccbe76",
- "reference": "96aab555e399769b9d12c3c362a4232563ccbe76",
+ "url": "https://api.github.com/repos/oscarotero/Embed/zipball/2c0e112f7332597ec6a55174f2353e04859ba356",
+ "reference": "2c0e112f7332597ec6a55174f2353e04859ba356",
"shasum": ""
},
"require": {
@@ -379,11 +410,11 @@
"ext-curl": "*",
"ext-dom": "*",
"ext-mbstring": "*",
- "php": "^5.6|^7.0"
+ "php": "^5.6|^7.0|^8.0"
},
"require-dev": {
"friendsofphp/php-cs-fixer": "^2.0",
- "phpunit/phpunit": "^4.8|^5.7"
+ "phpunit/phpunit": "^5.7|^6.0|^7.0"
},
"type": "library",
"autoload": {
@@ -412,7 +443,12 @@
"opengraph",
"twitter cards"
],
- "time": "2020-07-03T15:04:01+00:00"
+ "support": {
+ "email": "oom@oscarotero.com",
+ "issues": "https://github.com/oscarotero/Embed/issues",
+ "source": "https://github.com/oscarotero/Embed/tree/3.4.17"
+ },
+ "time": "2021-05-30T11:21:47+00:00"
},
{
"name": "evenement/evenement",
@@ -455,6 +491,10 @@
"event-dispatcher",
"event-emitter"
],
+ "support": {
+ "issues": "https://github.com/igorw/evenement/issues",
+ "source": "https://github.com/igorw/evenement/tree/master"
+ },
"time": "2017-07-23T21:35:13+00:00"
},
{
@@ -505,50 +545,54 @@
"keywords": [
"html"
],
+ "support": {
+ "issues": "https://github.com/ezyang/htmlpurifier/issues",
+ "source": "https://github.com/ezyang/htmlpurifier/tree/master"
+ },
"time": "2020-06-29T00:56:53+00:00"
},
{
"name": "guzzlehttp/psr7",
- "version": "1.6.1",
+ "version": "2.0.0",
"source": {
"type": "git",
"url": "https://github.com/guzzle/psr7.git",
- "reference": "239400de7a173fe9901b9ac7c06497751f00727a"
+ "reference": "1dc8d9cba3897165e16d12bb13d813afb1eb3fe7"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/guzzle/psr7/zipball/239400de7a173fe9901b9ac7c06497751f00727a",
- "reference": "239400de7a173fe9901b9ac7c06497751f00727a",
+ "url": "https://api.github.com/repos/guzzle/psr7/zipball/1dc8d9cba3897165e16d12bb13d813afb1eb3fe7",
+ "reference": "1dc8d9cba3897165e16d12bb13d813afb1eb3fe7",
"shasum": ""
},
"require": {
- "php": ">=5.4.0",
- "psr/http-message": "~1.0",
- "ralouphie/getallheaders": "^2.0.5 || ^3.0.0"
+ "php": "^7.2.5 || ^8.0",
+ "psr/http-factory": "^1.0",
+ "psr/http-message": "^1.0",
+ "ralouphie/getallheaders": "^3.0"
},
"provide": {
+ "psr/http-factory-implementation": "1.0",
"psr/http-message-implementation": "1.0"
},
"require-dev": {
- "ext-zlib": "*",
- "phpunit/phpunit": "~4.8.36 || ^5.7.27 || ^6.5.8"
+ "bamarni/composer-bin-plugin": "^1.4.1",
+ "http-interop/http-factory-tests": "^0.9",
+ "phpunit/phpunit": "^8.5.8 || ^9.3.10"
},
"suggest": {
- "zendframework/zend-httphandlerrunner": "Emit PSR-7 responses"
+ "laminas/laminas-httphandlerrunner": "Emit PSR-7 responses"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.6-dev"
+ "dev-master": "2.0-dev"
}
},
"autoload": {
"psr-4": {
"GuzzleHttp\\Psr7\\": "src/"
- },
- "files": [
- "src/functions_include.php"
- ]
+ }
},
"notification-url": "https://packagist.org/downloads/",
"license": [
@@ -563,6 +607,11 @@
{
"name": "Tobias Schultze",
"homepage": "https://github.com/Tobion"
+ },
+ {
+ "name": "Márk Sági-Kazár",
+ "email": "mark.sagikazar@gmail.com",
+ "homepage": "https://sagikazarmark.hu"
}
],
"description": "PSR-7 message implementation that also provides common utility methods",
@@ -576,7 +625,11 @@
"uri",
"url"
],
- "time": "2019-07-01T23:21:34+00:00"
+ "support": {
+ "issues": "https://github.com/guzzle/psr7/issues",
+ "source": "https://github.com/guzzle/psr7/tree/2.0.0"
+ },
+ "time": "2021-06-30T20:03:07+00:00"
},
{
"name": "hoa/consistency",
@@ -639,6 +692,14 @@
"keyword",
"library"
],
+ "support": {
+ "docs": "https://central.hoa-project.net/Documentation/Library/Consistency",
+ "email": "support@hoa-project.net",
+ "forum": "https://users.hoa-project.net/",
+ "irc": "irc://chat.freenode.net/hoaproject",
+ "issues": "https://github.com/hoaproject/Consistency/issues",
+ "source": "https://central.hoa-project.net/Resource/Library/Consistency"
+ },
"time": "2017-05-02T12:18:12+00:00"
},
{
@@ -695,6 +756,14 @@
"listener",
"observer"
],
+ "support": {
+ "docs": "https://central.hoa-project.net/Documentation/Library/Event",
+ "email": "support@hoa-project.net",
+ "forum": "https://users.hoa-project.net/",
+ "irc": "irc://chat.freenode.net/hoaproject",
+ "issues": "https://github.com/hoaproject/Event/issues",
+ "source": "https://central.hoa-project.net/Resource/Library/Event"
+ },
"time": "2017-01-13T15:30:50+00:00"
},
{
@@ -749,30 +818,38 @@
"exception",
"library"
],
+ "support": {
+ "docs": "https://central.hoa-project.net/Documentation/Library/Exception",
+ "email": "support@hoa-project.net",
+ "forum": "https://users.hoa-project.net/",
+ "irc": "irc://chat.freenode.net/hoaproject",
+ "issues": "https://github.com/hoaproject/Exception/issues",
+ "source": "https://central.hoa-project.net/Resource/Library/Exception"
+ },
"time": "2017-01-16T07:53:27+00:00"
},
{
"name": "intervention/image",
- "version": "2.5.1",
+ "version": "2.6.0",
"source": {
"type": "git",
"url": "https://github.com/Intervention/image.git",
- "reference": "abbf18d5ab8367f96b3205ca3c89fb2fa598c69e"
+ "reference": "a2d7238069bb01322f9c2a661449955434fec9c6"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/Intervention/image/zipball/abbf18d5ab8367f96b3205ca3c89fb2fa598c69e",
- "reference": "abbf18d5ab8367f96b3205ca3c89fb2fa598c69e",
+ "url": "https://api.github.com/repos/Intervention/image/zipball/a2d7238069bb01322f9c2a661449955434fec9c6",
+ "reference": "a2d7238069bb01322f9c2a661449955434fec9c6",
"shasum": ""
},
"require": {
"ext-fileinfo": "*",
- "guzzlehttp/psr7": "~1.1",
+ "guzzlehttp/psr7": "~1.1 || ^2.0",
"php": ">=5.4.0"
},
"require-dev": {
"mockery/mockery": "~0.9.2",
- "phpunit/phpunit": "^4.8 || ^5.7"
+ "phpunit/phpunit": "^4.8 || ^5.7 || ^7.5.15"
},
"suggest": {
"ext-gd": "to use GD library based image processing.",
@@ -819,20 +896,34 @@
"thumbnail",
"watermark"
],
- "time": "2019-11-02T09:15:47+00:00"
+ "support": {
+ "issues": "https://github.com/Intervention/image/issues",
+ "source": "https://github.com/Intervention/image/tree/2.6.0"
+ },
+ "funding": [
+ {
+ "url": "https://www.paypal.me/interventionphp",
+ "type": "custom"
+ },
+ {
+ "url": "https://github.com/Intervention",
+ "type": "github"
+ }
+ ],
+ "time": "2021-07-06T13:35:54+00:00"
},
{
"name": "masterminds/html5",
- "version": "2.7.3",
+ "version": "2.7.5",
"source": {
"type": "git",
"url": "https://github.com/Masterminds/html5-php.git",
- "reference": "aad73dbfefd71d46072138109ce1288d96c329cc"
+ "reference": "f640ac1bdddff06ea333a920c95bbad8872429ab"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/Masterminds/html5-php/zipball/aad73dbfefd71d46072138109ce1288d96c329cc",
- "reference": "aad73dbfefd71d46072138109ce1288d96c329cc",
+ "url": "https://api.github.com/repos/Masterminds/html5-php/zipball/f640ac1bdddff06ea333a920c95bbad8872429ab",
+ "reference": "f640ac1bdddff06ea333a920c95bbad8872429ab",
"shasum": ""
},
"require": {
@@ -842,9 +933,7 @@
"php": ">=5.3.0"
},
"require-dev": {
- "phpunit/phpunit": "^4.8.35",
- "sami/sami": "~2.0",
- "satooshi/php-coveralls": "1.0.*"
+ "phpunit/phpunit": "^4.8.35 || ^5.7.21 || ^6 || ^7"
},
"type": "library",
"extra": {
@@ -886,7 +975,11 @@
"serializer",
"xml"
],
- "time": "2020-07-05T07:53:37+00:00"
+ "support": {
+ "issues": "https://github.com/Masterminds/html5-php/issues",
+ "source": "https://github.com/Masterminds/html5-php/tree/2.7.5"
+ },
+ "time": "2021-07-01T14:25:37+00:00"
},
{
"name": "mf2/mf2",
@@ -942,6 +1035,10 @@
"parser",
"semantic"
],
+ "support": {
+ "issues": "https://github.com/microformats/php-mf2/issues",
+ "source": "https://github.com/microformats/php-mf2/tree/master"
+ },
"time": "2018-08-24T14:47:04+00:00"
},
{
@@ -991,6 +1088,10 @@
"keywords": [
"markdown"
],
+ "support": {
+ "issues": "https://github.com/michelf/php-markdown/issues",
+ "source": "https://github.com/michelf/php-markdown/tree/1.9.0"
+ },
"time": "2019-12-02T02:32:27+00:00"
},
{
@@ -1031,6 +1132,10 @@
}
],
"description": "Symfony filesystem extension to handle temporary files",
+ "support": {
+ "issues": "https://github.com/romainneutron/Temporary-Filesystem/issues",
+ "source": "https://github.com/romainneutron/Temporary-Filesystem/tree/2.4"
+ },
"time": "2020-02-17T15:27:36+00:00"
},
{
@@ -1080,6 +1185,10 @@
"auth",
"yadis"
],
+ "support": {
+ "issues": "https://github.com/openid/php-openid/issues",
+ "source": "https://github.com/openid/php-openid/tree/2.3.0"
+ },
"time": "2015-07-30T18:07:43+00:00"
},
{
@@ -1143,37 +1252,38 @@
"hex2bin",
"rfc4648"
],
+ "support": {
+ "email": "info@paragonie.com",
+ "issues": "https://github.com/paragonie/constant_time_encoding/issues",
+ "source": "https://github.com/paragonie/constant_time_encoding"
+ },
"time": "2018-04-30T17:57:16+00:00"
},
{
"name": "paragonie/random_compat",
- "version": "v2.0.18",
+ "version": "v9.99.100",
"source": {
"type": "git",
"url": "https://github.com/paragonie/random_compat.git",
- "reference": "0a58ef6e3146256cc3dc7cc393927bcc7d1b72db"
+ "reference": "996434e5492cb4c3edcb9168db6fbb1359ef965a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/paragonie/random_compat/zipball/0a58ef6e3146256cc3dc7cc393927bcc7d1b72db",
- "reference": "0a58ef6e3146256cc3dc7cc393927bcc7d1b72db",
+ "url": "https://api.github.com/repos/paragonie/random_compat/zipball/996434e5492cb4c3edcb9168db6fbb1359ef965a",
+ "reference": "996434e5492cb4c3edcb9168db6fbb1359ef965a",
"shasum": ""
},
"require": {
- "php": ">=5.2.0"
+ "php": ">= 7"
},
"require-dev": {
- "phpunit/phpunit": "4.*|5.*"
+ "phpunit/phpunit": "4.*|5.*",
+ "vimeo/psalm": "^1"
},
"suggest": {
"ext-libsodium": "Provides a modern crypto API that can be used to generate random bytes."
},
"type": "library",
- "autoload": {
- "files": [
- "lib/random.php"
- ]
- },
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
@@ -1192,7 +1302,12 @@
"pseudorandom",
"random"
],
- "time": "2019-01-03T20:59:08+00:00"
+ "support": {
+ "email": "info@paragonie.com",
+ "issues": "https://github.com/paragonie/random_compat/issues",
+ "source": "https://github.com/paragonie/random_compat"
+ },
+ "time": "2020-10-15T08:29:30+00:00"
},
{
"name": "pear/console_getopt",
@@ -1239,6 +1354,10 @@
}
],
"description": "More info available on: http://pear.php.net/package/Console_Getopt",
+ "support": {
+ "issues": "http://pear.php.net/bugs/search.php?cmd=display&package_name[]=Console_Getopt",
+ "source": "https://github.com/pear/Console_Getopt"
+ },
"time": "2019-11-20T18:27:48+00:00"
},
{
@@ -1323,6 +1442,10 @@
"video",
"video processing"
],
+ "support": {
+ "issues": "https://github.com/PHP-FFMpeg/PHP-FFMpeg/issues",
+ "source": "https://github.com/PHP-FFMpeg/PHP-FFMpeg/tree/master"
+ },
"time": "2020-03-29T09:57:10+00:00"
},
{
@@ -1340,14 +1463,13 @@
"shasum": ""
},
"require": {
- "paragonie/constant_time_encoding": "^1",
- "paragonie/random_compat": "^1.4|^2.0",
+ "paragonie/constant_time_encoding": "^1|^2",
+ "paragonie/random_compat": "^1.4|^2.0|^9.99.99",
"php": ">=5.6.1"
},
"require-dev": {
"phing/phing": "~2.7",
- "phpunit/phpunit": "^4.8.35|^5.7|^6.0",
- "sami/sami": "~2.0",
+ "phpunit/phpunit": "^5.7|^6.0|^9.4",
"squizlabs/php_codesniffer": "~2.0"
},
"suggest": {
@@ -1356,13 +1478,14 @@
"ext-mcrypt": "Install the Mcrypt extension in order to speed up a few other cryptographic operations.",
"ext-openssl": "Install the OpenSSL extension in order to speed up a wide variety of cryptographic operations."
},
+ "default-branch": true,
"type": "library",
"autoload": {
"files": [
"phpseclib/bootstrap.php"
],
"psr-4": {
- "phpseclib\\": "phpseclib/"
+ "phpseclib3\\": "phpseclib/"
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -1417,20 +1540,38 @@
"x.509",
"x509"
],
- "time": "2019-06-23T16:33:59+00:00"
+ "support": {
+ "issues": "https://github.com/phpseclib/phpseclib/issues",
+ "source": "https://github.com/phpseclib/phpseclib/tree/master"
+ },
+ "funding": [
+ {
+ "url": "https://github.com/terrafrost",
+ "type": "github"
+ },
+ {
+ "url": "https://www.patreon.com/phpseclib",
+ "type": "patreon"
+ },
+ {
+ "url": "https://tidelift.com/funding/github/packagist/phpseclib/phpseclib",
+ "type": "tidelift"
+ }
+ ],
+ "time": "2021-07-10T18:24:59+00:00"
},
{
"name": "predis/predis",
- "version": "v1.1.1",
+ "version": "v1.1.7",
"source": {
"type": "git",
- "url": "https://github.com/nrk/predis.git",
- "reference": "f0210e38881631afeafb56ab43405a92cafd9fd1"
+ "url": "https://github.com/predis/predis.git",
+ "reference": "b240daa106d4e02f0c5b7079b41e31ddf66fddf8"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/nrk/predis/zipball/f0210e38881631afeafb56ab43405a92cafd9fd1",
- "reference": "f0210e38881631afeafb56ab43405a92cafd9fd1",
+ "url": "https://api.github.com/repos/predis/predis/zipball/b240daa106d4e02f0c5b7079b41e31ddf66fddf8",
+ "reference": "b240daa106d4e02f0c5b7079b41e31ddf66fddf8",
"shasum": ""
},
"require": {
@@ -1457,17 +1598,88 @@
{
"name": "Daniele Alessandri",
"email": "suppakilla@gmail.com",
- "homepage": "http://clorophilla.net"
+ "homepage": "http://clorophilla.net",
+ "role": "Creator & Maintainer"
+ },
+ {
+ "name": "Till Krüss",
+ "homepage": "https://till.im",
+ "role": "Maintainer"
}
],
"description": "Flexible and feature-complete Redis client for PHP and HHVM",
- "homepage": "http://github.com/nrk/predis",
+ "homepage": "http://github.com/predis/predis",
"keywords": [
"nosql",
"predis",
"redis"
],
- "time": "2016-06-16T16:22:20+00:00"
+ "support": {
+ "issues": "https://github.com/predis/predis/issues",
+ "source": "https://github.com/predis/predis/tree/v1.1.7"
+ },
+ "funding": [
+ {
+ "url": "https://github.com/sponsors/tillkruss",
+ "type": "github"
+ }
+ ],
+ "time": "2021-04-04T19:34:46+00:00"
+ },
+ {
+ "name": "psr/http-factory",
+ "version": "1.0.1",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/php-fig/http-factory.git",
+ "reference": "12ac7fcd07e5b077433f5f2bee95b3a771bf61be"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/php-fig/http-factory/zipball/12ac7fcd07e5b077433f5f2bee95b3a771bf61be",
+ "reference": "12ac7fcd07e5b077433f5f2bee95b3a771bf61be",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=7.0.0",
+ "psr/http-message": "^1.0"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.0.x-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Psr\\Http\\Message\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "PHP-FIG",
+ "homepage": "http://www.php-fig.org/"
+ }
+ ],
+ "description": "Common interfaces for PSR-7 HTTP message factories",
+ "keywords": [
+ "factory",
+ "http",
+ "message",
+ "psr",
+ "psr-17",
+ "psr-7",
+ "request",
+ "response"
+ ],
+ "support": {
+ "source": "https://github.com/php-fig/http-factory/tree/master"
+ },
+ "time": "2019-04-30T12:38:16+00:00"
},
{
"name": "psr/http-message",
@@ -1517,20 +1729,23 @@
"request",
"response"
],
+ "support": {
+ "source": "https://github.com/php-fig/http-message/tree/master"
+ },
"time": "2016-08-06T14:39:51+00:00"
},
{
"name": "psr/log",
- "version": "1.1.3",
+ "version": "1.1.4",
"source": {
"type": "git",
"url": "https://github.com/php-fig/log.git",
- "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc"
+ "reference": "d49695b909c3b7628b6289db5479a1c204601f11"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/php-fig/log/zipball/0f73288fd15629204f9d42b7055f72dacbe811fc",
- "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc",
+ "url": "https://api.github.com/repos/php-fig/log/zipball/d49695b909c3b7628b6289db5479a1c204601f11",
+ "reference": "d49695b909c3b7628b6289db5479a1c204601f11",
"shasum": ""
},
"require": {
@@ -1554,7 +1769,7 @@
"authors": [
{
"name": "PHP-FIG",
- "homepage": "http://www.php-fig.org/"
+ "homepage": "https://www.php-fig.org/"
}
],
"description": "Common interface for logging libraries",
@@ -1564,7 +1779,10 @@
"psr",
"psr-3"
],
- "time": "2020-03-23T09:12:05+00:00"
+ "support": {
+ "source": "https://github.com/php-fig/log/tree/1.1.4"
+ },
+ "time": "2021-05-03T11:20:27+00:00"
},
{
"name": "ralouphie/getallheaders",
@@ -1604,6 +1822,10 @@
}
],
"description": "A polyfill for getallheaders.",
+ "support": {
+ "issues": "https://github.com/ralouphie/getallheaders/issues",
+ "source": "https://github.com/ralouphie/getallheaders/tree/develop"
+ },
"time": "2019-03-08T08:55:37+00:00"
},
{
@@ -1663,6 +1885,10 @@
"rabbitmq",
"stomp"
],
+ "support": {
+ "issues": "https://github.com/stomp-php/stomp-php/issues",
+ "source": "https://github.com/stomp-php/stomp-php/tree/master"
+ },
"funding": [
{
"url": "https://github.com/jmglsn",
@@ -1722,6 +1948,9 @@
],
"description": "Symfony Filesystem Component",
"homepage": "https://symfony.com",
+ "support": {
+ "source": "https://github.com/symfony/filesystem/tree/3.0"
+ },
"time": "2016-07-20T05:43:46+00:00"
},
{
@@ -1771,6 +2000,9 @@
],
"description": "Symfony Process Component",
"homepage": "https://symfony.com",
+ "support": {
+ "source": "https://github.com/symfony/process/tree/v2.8.50"
+ },
"time": "2018-11-11T11:18:13+00:00"
}
],
@@ -1832,6 +2064,10 @@
"cli",
"microframework"
],
+ "support": {
+ "issues": "https://github.com/Cilex/Cilex/issues",
+ "source": "https://github.com/Cilex/Cilex/tree/master"
+ },
"time": "2014-03-29T14:03:13+00:00"
},
{
@@ -1891,6 +2127,10 @@
"service-provider",
"silex"
],
+ "support": {
+ "issues": "https://github.com/Cilex/console-service-provider/issues",
+ "source": "https://github.com/Cilex/console-service-provider/tree/master"
+ },
"time": "2012-12-19T10:50:58+00:00"
},
{
@@ -1922,6 +2162,10 @@
],
"description": "Promoting the interoperability of container objects (DIC, SL, etc.)",
"homepage": "https://github.com/container-interop/container-interop",
+ "support": {
+ "issues": "https://github.com/container-interop/container-interop/issues",
+ "source": "https://github.com/container-interop/container-interop/tree/master"
+ },
"abandoned": "psr/container",
"time": "2017-02-14T19:40:03+00:00"
},
@@ -1956,37 +2200,40 @@
"MIT"
],
"description": "implementation of xdg base directory specification for php",
+ "support": {
+ "issues": "https://github.com/dnoegel/php-xdg-base-dir/issues",
+ "source": "https://github.com/dnoegel/php-xdg-base-dir/tree/v0.1.1"
+ },
"time": "2019-12-04T15:06:13+00:00"
},
{
"name": "doctrine/annotations",
- "version": "1.10.3",
+ "version": "1.13.1",
"source": {
"type": "git",
"url": "https://github.com/doctrine/annotations.git",
- "reference": "5db60a4969eba0e0c197a19c077780aadbc43c5d"
+ "reference": "e6e7b7d5b45a2f2abc5460cc6396480b2b1d321f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/annotations/zipball/5db60a4969eba0e0c197a19c077780aadbc43c5d",
- "reference": "5db60a4969eba0e0c197a19c077780aadbc43c5d",
+ "url": "https://api.github.com/repos/doctrine/annotations/zipball/e6e7b7d5b45a2f2abc5460cc6396480b2b1d321f",
+ "reference": "e6e7b7d5b45a2f2abc5460cc6396480b2b1d321f",
"shasum": ""
},
"require": {
"doctrine/lexer": "1.*",
"ext-tokenizer": "*",
- "php": "^7.1 || ^8.0"
+ "php": "^7.1 || ^8.0",
+ "psr/cache": "^1 || ^2 || ^3"
},
"require-dev": {
- "doctrine/cache": "1.*",
- "phpunit/phpunit": "^7.5"
+ "doctrine/cache": "^1.11 || ^2.0",
+ "doctrine/coding-standard": "^6.0 || ^8.1",
+ "phpstan/phpstan": "^0.12.20",
+ "phpunit/phpunit": "^7.5 || ^8.0 || ^9.1.5",
+ "symfony/cache": "^4.4 || ^5.2"
},
"type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "1.9.x-dev"
- }
- },
"autoload": {
"psr-4": {
"Doctrine\\Common\\Annotations\\": "lib/Doctrine/Common/Annotations"
@@ -2019,46 +2266,45 @@
}
],
"description": "Docblock Annotations Parser",
- "homepage": "http://www.doctrine-project.org",
+ "homepage": "https://www.doctrine-project.org/projects/annotations.html",
"keywords": [
"annotations",
"docblock",
"parser"
],
- "time": "2020-05-25T17:24:27+00:00"
+ "support": {
+ "issues": "https://github.com/doctrine/annotations/issues",
+ "source": "https://github.com/doctrine/annotations/tree/1.13.1"
+ },
+ "time": "2021-05-16T18:07:53+00:00"
},
{
"name": "doctrine/instantiator",
- "version": "1.3.1",
+ "version": "1.4.0",
"source": {
"type": "git",
"url": "https://github.com/doctrine/instantiator.git",
- "reference": "f350df0268e904597e3bd9c4685c53e0e333feea"
+ "reference": "d56bf6102915de5702778fe20f2de3b2fe570b5b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/instantiator/zipball/f350df0268e904597e3bd9c4685c53e0e333feea",
- "reference": "f350df0268e904597e3bd9c4685c53e0e333feea",
+ "url": "https://api.github.com/repos/doctrine/instantiator/zipball/d56bf6102915de5702778fe20f2de3b2fe570b5b",
+ "reference": "d56bf6102915de5702778fe20f2de3b2fe570b5b",
"shasum": ""
},
"require": {
"php": "^7.1 || ^8.0"
},
"require-dev": {
- "doctrine/coding-standard": "^6.0",
+ "doctrine/coding-standard": "^8.0",
"ext-pdo": "*",
"ext-phar": "*",
- "phpbench/phpbench": "^0.13",
- "phpstan/phpstan-phpunit": "^0.11",
- "phpstan/phpstan-shim": "^0.11",
- "phpunit/phpunit": "^7.0"
+ "phpbench/phpbench": "^0.13 || 1.0.0-alpha2",
+ "phpstan/phpstan": "^0.12",
+ "phpstan/phpstan-phpunit": "^0.12",
+ "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0"
},
"type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "1.2.x-dev"
- }
- },
"autoload": {
"psr-4": {
"Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/"
@@ -2072,7 +2318,7 @@
{
"name": "Marco Pivetta",
"email": "ocramius@gmail.com",
- "homepage": "http://ocramius.github.com/"
+ "homepage": "https://ocramius.github.io/"
}
],
"description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors",
@@ -2081,6 +2327,10 @@
"constructor",
"instantiate"
],
+ "support": {
+ "issues": "https://github.com/doctrine/instantiator/issues",
+ "source": "https://github.com/doctrine/instantiator/tree/1.4.0"
+ },
"funding": [
{
"url": "https://www.doctrine-project.org/sponsorship.html",
@@ -2095,7 +2345,7 @@
"type": "tidelift"
}
],
- "time": "2020-05-29T17:27:14+00:00"
+ "time": "2020-11-10T18:47:58+00:00"
},
{
"name": "doctrine/lexer",
@@ -2157,6 +2407,10 @@
"parser",
"php"
],
+ "support": {
+ "issues": "https://github.com/doctrine/lexer/issues",
+ "source": "https://github.com/doctrine/lexer/tree/1.2.1"
+ },
"funding": [
{
"url": "https://www.doctrine-project.org/sponsorship.html",
@@ -2217,6 +2471,10 @@
"markdown",
"parser"
],
+ "support": {
+ "issues": "https://github.com/erusev/parsedown/issues",
+ "source": "https://github.com/erusev/parsedown/tree/1.7.x"
+ },
"time": "2019-12-30T22:54:17+00:00"
},
{
@@ -2259,6 +2517,10 @@
"email": "jakub.onderka@gmail.com"
}
],
+ "support": {
+ "issues": "https://github.com/JakubOnderka/PHP-Console-Color/issues",
+ "source": "https://github.com/JakubOnderka/PHP-Console-Color/tree/master"
+ },
"abandoned": "php-parallel-lint/php-console-color",
"time": "2018-09-29T17:23:10+00:00"
},
@@ -2306,6 +2568,10 @@
}
],
"description": "Highlight PHP code in terminal",
+ "support": {
+ "issues": "https://github.com/JakubOnderka/PHP-Console-Highlighter/issues",
+ "source": "https://github.com/JakubOnderka/PHP-Console-Highlighter/tree/master"
+ },
"abandoned": "php-parallel-lint/php-console-highlighter",
"time": "2018-09-29T18:48:56+00:00"
},
@@ -2362,6 +2628,10 @@
"xml",
"yaml"
],
+ "support": {
+ "issues": "https://github.com/schmittjoh/metadata/issues",
+ "source": "https://github.com/schmittjoh/metadata/tree/1.x"
+ },
"time": "2018-10-26T12:40:10+00:00"
},
{
@@ -2397,6 +2667,10 @@
"Apache2"
],
"description": "A library for easily creating recursive-descent parsers.",
+ "support": {
+ "issues": "https://github.com/schmittjoh/parser-lib/issues",
+ "source": "https://github.com/schmittjoh/parser-lib/tree/1.0.0"
+ },
"time": "2012-11-18T18:08:43+00:00"
},
{
@@ -2476,20 +2750,24 @@
"serialization",
"xml"
],
+ "support": {
+ "issues": "https://github.com/schmittjoh/serializer/issues",
+ "source": "https://github.com/schmittjoh/serializer/tree/master"
+ },
"time": "2017-05-15T08:35:42+00:00"
},
{
"name": "monolog/monolog",
- "version": "1.25.5",
+ "version": "1.26.1",
"source": {
"type": "git",
"url": "https://github.com/Seldaek/monolog.git",
- "reference": "1817faadd1846cd08be9a49e905dc68823bc38c0"
+ "reference": "c6b00f05152ae2c9b04a448f99c7590beb6042f5"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/Seldaek/monolog/zipball/1817faadd1846cd08be9a49e905dc68823bc38c0",
- "reference": "1817faadd1846cd08be9a49e905dc68823bc38c0",
+ "url": "https://api.github.com/repos/Seldaek/monolog/zipball/c6b00f05152ae2c9b04a448f99c7590beb6042f5",
+ "reference": "c6b00f05152ae2c9b04a448f99c7590beb6042f5",
"shasum": ""
},
"require": {
@@ -2505,7 +2783,7 @@
"graylog2/gelf-php": "~1.0",
"php-amqplib/php-amqplib": "~2.4",
"php-console/php-console": "^3.1.3",
- "php-parallel-lint/php-parallel-lint": "^1.0",
+ "phpstan/phpstan": "^0.12.59",
"phpunit/phpunit": "~4.5",
"ruflin/elastica": ">=0.90 <3.0",
"sentry/sentry": "^0.13",
@@ -2525,11 +2803,6 @@
"sentry/sentry": "Allow sending log messages to a Sentry server"
},
"type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "2.0.x-dev"
- }
- },
"autoload": {
"psr-4": {
"Monolog\\": "src/Monolog"
@@ -2553,6 +2826,10 @@
"logging",
"psr-3"
],
+ "support": {
+ "issues": "https://github.com/Seldaek/monolog/issues",
+ "source": "https://github.com/Seldaek/monolog/tree/1.26.1"
+ },
"funding": [
{
"url": "https://github.com/Seldaek",
@@ -2563,20 +2840,20 @@
"type": "tidelift"
}
],
- "time": "2020-07-23T08:35:51+00:00"
+ "time": "2021-05-28T08:32:12+00:00"
},
{
"name": "myclabs/deep-copy",
- "version": "1.10.1",
+ "version": "1.10.2",
"source": {
"type": "git",
"url": "https://github.com/myclabs/DeepCopy.git",
- "reference": "969b211f9a51aa1f6c01d1d2aef56d3bd91598e5"
+ "reference": "776f831124e9c62e1a2c601ecc52e776d8bb7220"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/969b211f9a51aa1f6c01d1d2aef56d3bd91598e5",
- "reference": "969b211f9a51aa1f6c01d1d2aef56d3bd91598e5",
+ "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/776f831124e9c62e1a2c601ecc52e776d8bb7220",
+ "reference": "776f831124e9c62e1a2c601ecc52e776d8bb7220",
"shasum": ""
},
"require": {
@@ -2611,13 +2888,17 @@
"object",
"object graph"
],
+ "support": {
+ "issues": "https://github.com/myclabs/DeepCopy/issues",
+ "source": "https://github.com/myclabs/DeepCopy/tree/1.10.2"
+ },
"funding": [
{
"url": "https://tidelift.com/funding/github/packagist/myclabs/deep-copy",
"type": "tidelift"
}
],
- "time": "2020-06-29T13:22:24+00:00"
+ "time": "2020-11-13T09:40:50+00:00"
},
{
"name": "nikic/php-parser",
@@ -2662,6 +2943,10 @@
"parser",
"php"
],
+ "support": {
+ "issues": "https://github.com/nikic/PHP-Parser/issues",
+ "source": "https://github.com/nikic/PHP-Parser/tree/1.x"
+ },
"time": "2015-09-19T14:15:08+00:00"
},
{
@@ -2731,6 +3016,10 @@
"ssl",
"tls"
],
+ "support": {
+ "issues": "https://github.com/humbug/file_get_contents/issues",
+ "source": "https://github.com/humbug/file_get_contents/tree/master"
+ },
"time": "2018-02-12T18:47:17+00:00"
},
{
@@ -2783,32 +3072,38 @@
"self-update",
"update"
],
+ "support": {
+ "issues": "https://github.com/humbug/phar-updater/issues",
+ "source": "https://github.com/humbug/phar-updater/tree/1.0"
+ },
+ "abandoned": true,
"time": "2018-03-30T12:52:15+00:00"
},
{
"name": "phar-io/manifest",
- "version": "1.0.3",
+ "version": "2.0.1",
"source": {
"type": "git",
"url": "https://github.com/phar-io/manifest.git",
- "reference": "7761fcacf03b4d4f16e7ccb606d4879ca431fcf4"
+ "reference": "85265efd3af7ba3ca4b2a2c34dbfc5788dd29133"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phar-io/manifest/zipball/7761fcacf03b4d4f16e7ccb606d4879ca431fcf4",
- "reference": "7761fcacf03b4d4f16e7ccb606d4879ca431fcf4",
+ "url": "https://api.github.com/repos/phar-io/manifest/zipball/85265efd3af7ba3ca4b2a2c34dbfc5788dd29133",
+ "reference": "85265efd3af7ba3ca4b2a2c34dbfc5788dd29133",
"shasum": ""
},
"require": {
"ext-dom": "*",
"ext-phar": "*",
- "phar-io/version": "^2.0",
- "php": "^5.6 || ^7.0"
+ "ext-xmlwriter": "*",
+ "phar-io/version": "^3.0.1",
+ "php": "^7.2 || ^8.0"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.0.x-dev"
+ "dev-master": "2.0.x-dev"
}
},
"autoload": {
@@ -2838,24 +3133,28 @@
}
],
"description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)",
- "time": "2018-07-08T19:23:20+00:00"
+ "support": {
+ "issues": "https://github.com/phar-io/manifest/issues",
+ "source": "https://github.com/phar-io/manifest/tree/master"
+ },
+ "time": "2020-06-27T14:33:11+00:00"
},
{
"name": "phar-io/version",
- "version": "2.0.1",
+ "version": "3.1.0",
"source": {
"type": "git",
"url": "https://github.com/phar-io/version.git",
- "reference": "45a2ec53a73c70ce41d55cedef9063630abaf1b6"
+ "reference": "bae7c545bef187884426f042434e561ab1ddb182"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phar-io/version/zipball/45a2ec53a73c70ce41d55cedef9063630abaf1b6",
- "reference": "45a2ec53a73c70ce41d55cedef9063630abaf1b6",
+ "url": "https://api.github.com/repos/phar-io/version/zipball/bae7c545bef187884426f042434e561ab1ddb182",
+ "reference": "bae7c545bef187884426f042434e561ab1ddb182",
"shasum": ""
},
"require": {
- "php": "^5.6 || ^7.0"
+ "php": "^7.2 || ^8.0"
},
"type": "library",
"autoload": {
@@ -2885,7 +3184,11 @@
}
],
"description": "Library for handling version information and constraints",
- "time": "2018-07-08T19:19:57+00:00"
+ "support": {
+ "issues": "https://github.com/phar-io/version/issues",
+ "source": "https://github.com/phar-io/version/tree/3.1.0"
+ },
+ "time": "2021-02-23T14:00:09+00:00"
},
{
"name": "phpcollection/phpcollection",
@@ -2933,6 +3236,10 @@
"sequence",
"set"
],
+ "support": {
+ "issues": "https://github.com/schmittjoh/php-collection/issues",
+ "source": "https://github.com/schmittjoh/php-collection/tree/master"
+ },
"time": "2015-05-17T12:39:23+00:00"
},
{
@@ -2976,6 +3283,10 @@
"fileset",
"phpdoc"
],
+ "support": {
+ "issues": "https://github.com/phpDocumentor/Fileset/issues",
+ "source": "https://github.com/phpDocumentor/Fileset/tree/master"
+ },
"time": "2013-08-06T21:07:42+00:00"
},
{
@@ -3017,6 +3328,10 @@
"email": "mike.vanriel@naenius.com"
}
],
+ "support": {
+ "issues": "https://github.com/phpDocumentor/GraphViz/issues",
+ "source": "https://github.com/phpDocumentor/GraphViz/tree/master"
+ },
"time": "2016-02-02T13:00:08+00:00"
},
{
@@ -3107,6 +3422,10 @@
"documentation",
"phpdoc"
],
+ "support": {
+ "issues": "https://github.com/phpDocumentor/phpDocumentor/issues",
+ "source": "https://github.com/phpDocumentor/phpDocumentor/tree/v2.9.1"
+ },
"time": "2020-01-12T19:44:16+00:00"
},
{
@@ -3161,6 +3480,10 @@
"reflection",
"static analysis"
],
+ "support": {
+ "issues": "https://github.com/phpDocumentor/Reflection/issues",
+ "source": "https://github.com/phpDocumentor/Reflection/tree/master"
+ },
"time": "2016-05-21T08:42:32+00:00"
},
{
@@ -3210,6 +3533,10 @@
"email": "mike.vanriel@naenius.com"
}
],
+ "support": {
+ "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues",
+ "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/release/2.x"
+ },
"time": "2016-01-25T08:17:30+00:00"
},
{
@@ -3265,6 +3592,10 @@
"php",
"type"
],
+ "support": {
+ "issues": "https://github.com/schmittjoh/php-option/issues",
+ "source": "https://github.com/schmittjoh/php-option/tree/1.7.5"
+ },
"funding": [
{
"url": "https://github.com/GrahamCampbell",
@@ -3338,29 +3669,33 @@
"spy",
"stub"
],
+ "support": {
+ "issues": "https://github.com/phpspec/prophecy/issues",
+ "source": "https://github.com/phpspec/prophecy/tree/v1.10.3"
+ },
"time": "2020-03-05T15:02:03+00:00"
},
{
"name": "phpunit/php-code-coverage",
- "version": "7.0.10",
+ "version": "7.0.14",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-code-coverage.git",
- "reference": "f1884187926fbb755a9aaf0b3836ad3165b478bf"
+ "reference": "bb7c9a210c72e4709cdde67f8b7362f672f2225c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/f1884187926fbb755a9aaf0b3836ad3165b478bf",
- "reference": "f1884187926fbb755a9aaf0b3836ad3165b478bf",
+ "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/bb7c9a210c72e4709cdde67f8b7362f672f2225c",
+ "reference": "bb7c9a210c72e4709cdde67f8b7362f672f2225c",
"shasum": ""
},
"require": {
"ext-dom": "*",
"ext-xmlwriter": "*",
- "php": "^7.2",
+ "php": ">=7.2",
"phpunit/php-file-iterator": "^2.0.2",
"phpunit/php-text-template": "^1.2.1",
- "phpunit/php-token-stream": "^3.1.1",
+ "phpunit/php-token-stream": "^3.1.1 || ^4.0",
"sebastian/code-unit-reverse-lookup": "^1.0.1",
"sebastian/environment": "^4.2.2",
"sebastian/version": "^2.0.1",
@@ -3401,27 +3736,37 @@
"testing",
"xunit"
],
- "time": "2019-11-20T13:55:58+00:00"
+ "support": {
+ "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
+ "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/7.0.14"
+ },
+ "funding": [
+ {
+ "url": "https://github.com/sebastianbergmann",
+ "type": "github"
+ }
+ ],
+ "time": "2020-12-02T13:39:03+00:00"
},
{
"name": "phpunit/php-file-iterator",
- "version": "2.0.2",
+ "version": "2.0.3",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-file-iterator.git",
- "reference": "050bedf145a257b1ff02746c31894800e5122946"
+ "reference": "4b49fb70f067272b659ef0174ff9ca40fdaa6357"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/050bedf145a257b1ff02746c31894800e5122946",
- "reference": "050bedf145a257b1ff02746c31894800e5122946",
+ "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/4b49fb70f067272b659ef0174ff9ca40fdaa6357",
+ "reference": "4b49fb70f067272b659ef0174ff9ca40fdaa6357",
"shasum": ""
},
"require": {
- "php": "^7.1"
+ "php": ">=7.1"
},
"require-dev": {
- "phpunit/phpunit": "^7.1"
+ "phpunit/phpunit": "^8.5"
},
"type": "library",
"extra": {
@@ -3451,7 +3796,17 @@
"filesystem",
"iterator"
],
- "time": "2018-09-13T20:33:42+00:00"
+ "support": {
+ "issues": "https://github.com/sebastianbergmann/php-file-iterator/issues",
+ "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/2.0.3"
+ },
+ "funding": [
+ {
+ "url": "https://github.com/sebastianbergmann",
+ "type": "github"
+ }
+ ],
+ "time": "2020-11-30T08:25:21+00:00"
},
{
"name": "phpunit/php-text-template",
@@ -3492,27 +3847,31 @@
"keywords": [
"template"
],
+ "support": {
+ "issues": "https://github.com/sebastianbergmann/php-text-template/issues",
+ "source": "https://github.com/sebastianbergmann/php-text-template/tree/1.2.1"
+ },
"time": "2015-06-21T13:50:34+00:00"
},
{
"name": "phpunit/php-timer",
- "version": "2.1.2",
+ "version": "2.1.3",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-timer.git",
- "reference": "1038454804406b0b5f5f520358e78c1c2f71501e"
+ "reference": "2454ae1765516d20c4ffe103d85a58a9a3bd5662"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/1038454804406b0b5f5f520358e78c1c2f71501e",
- "reference": "1038454804406b0b5f5f520358e78c1c2f71501e",
+ "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/2454ae1765516d20c4ffe103d85a58a9a3bd5662",
+ "reference": "2454ae1765516d20c4ffe103d85a58a9a3bd5662",
"shasum": ""
},
"require": {
- "php": "^7.1"
+ "php": ">=7.1"
},
"require-dev": {
- "phpunit/phpunit": "^7.0"
+ "phpunit/phpunit": "^8.5"
},
"type": "library",
"extra": {
@@ -3541,33 +3900,43 @@
"keywords": [
"timer"
],
- "time": "2019-06-07T04:22:29+00:00"
+ "support": {
+ "issues": "https://github.com/sebastianbergmann/php-timer/issues",
+ "source": "https://github.com/sebastianbergmann/php-timer/tree/2.1.3"
+ },
+ "funding": [
+ {
+ "url": "https://github.com/sebastianbergmann",
+ "type": "github"
+ }
+ ],
+ "time": "2020-11-30T08:20:02+00:00"
},
{
"name": "phpunit/php-token-stream",
- "version": "3.1.1",
+ "version": "4.0.4",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-token-stream.git",
- "reference": "995192df77f63a59e47f025390d2d1fdf8f425ff"
+ "reference": "a853a0e183b9db7eed023d7933a858fa1c8d25a3"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/995192df77f63a59e47f025390d2d1fdf8f425ff",
- "reference": "995192df77f63a59e47f025390d2d1fdf8f425ff",
+ "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/a853a0e183b9db7eed023d7933a858fa1c8d25a3",
+ "reference": "a853a0e183b9db7eed023d7933a858fa1c8d25a3",
"shasum": ""
},
"require": {
"ext-tokenizer": "*",
- "php": "^7.1"
+ "php": "^7.3 || ^8.0"
},
"require-dev": {
- "phpunit/phpunit": "^7.0"
+ "phpunit/phpunit": "^9.0"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "3.1-dev"
+ "dev-master": "4.0-dev"
}
},
"autoload": {
@@ -3590,43 +3959,54 @@
"keywords": [
"tokenizer"
],
- "time": "2019-09-17T06:23:10+00:00"
+ "support": {
+ "issues": "https://github.com/sebastianbergmann/php-token-stream/issues",
+ "source": "https://github.com/sebastianbergmann/php-token-stream/tree/master"
+ },
+ "funding": [
+ {
+ "url": "https://github.com/sebastianbergmann",
+ "type": "github"
+ }
+ ],
+ "abandoned": true,
+ "time": "2020-08-04T08:28:15+00:00"
},
{
"name": "phpunit/phpunit",
- "version": "8.5.8",
+ "version": "8.5.17",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
- "reference": "34c18baa6a44f1d1fbf0338907139e9dce95b997"
+ "reference": "79067856d85421c56d413bd238d4e2cd6b0e54da"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/34c18baa6a44f1d1fbf0338907139e9dce95b997",
- "reference": "34c18baa6a44f1d1fbf0338907139e9dce95b997",
+ "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/79067856d85421c56d413bd238d4e2cd6b0e54da",
+ "reference": "79067856d85421c56d413bd238d4e2cd6b0e54da",
"shasum": ""
},
"require": {
- "doctrine/instantiator": "^1.2.0",
+ "doctrine/instantiator": "^1.3.1",
"ext-dom": "*",
"ext-json": "*",
"ext-libxml": "*",
"ext-mbstring": "*",
"ext-xml": "*",
"ext-xmlwriter": "*",
- "myclabs/deep-copy": "^1.9.1",
- "phar-io/manifest": "^1.0.3",
- "phar-io/version": "^2.0.1",
- "php": "^7.2",
- "phpspec/prophecy": "^1.8.1",
- "phpunit/php-code-coverage": "^7.0.7",
+ "myclabs/deep-copy": "^1.10.0",
+ "phar-io/manifest": "^2.0.1",
+ "phar-io/version": "^3.0.2",
+ "php": ">=7.2",
+ "phpspec/prophecy": "^1.10.3",
+ "phpunit/php-code-coverage": "^7.0.12",
"phpunit/php-file-iterator": "^2.0.2",
"phpunit/php-text-template": "^1.2.1",
"phpunit/php-timer": "^2.1.2",
"sebastian/comparator": "^3.0.2",
"sebastian/diff": "^3.0.2",
- "sebastian/environment": "^4.2.2",
- "sebastian/exporter": "^3.1.1",
+ "sebastian/environment": "^4.2.3",
+ "sebastian/exporter": "^3.1.2",
"sebastian/global-state": "^3.0.0",
"sebastian/object-enumerator": "^3.0.3",
"sebastian/resource-operations": "^2.0.1",
@@ -3673,6 +4053,10 @@
"testing",
"xunit"
],
+ "support": {
+ "issues": "https://github.com/sebastianbergmann/phpunit/issues",
+ "source": "https://github.com/sebastianbergmann/phpunit/tree/8.5.17"
+ },
"funding": [
{
"url": "https://phpunit.de/donate.html",
@@ -3683,7 +4067,7 @@
"type": "github"
}
],
- "time": "2020-06-22T07:06:58+00:00"
+ "time": "2021-06-23T05:12:43+00:00"
},
{
"name": "pimple/pimple",
@@ -3729,6 +4113,10 @@
"container",
"dependency injection"
],
+ "support": {
+ "issues": "https://github.com/silexphp/Pimple/issues",
+ "source": "https://github.com/silexphp/Pimple/tree/v1.1.1"
+ },
"time": "2013-11-22T08:30:29+00:00"
},
{
@@ -3775,31 +4163,29 @@
"psr",
"psr-6"
],
+ "support": {
+ "source": "https://github.com/php-fig/cache/tree/master"
+ },
"time": "2016-08-06T20:24:11+00:00"
},
{
"name": "psr/container",
- "version": "1.0.0",
+ "version": "1.1.1",
"source": {
"type": "git",
"url": "https://github.com/php-fig/container.git",
- "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f"
+ "reference": "8622567409010282b7aeebe4bb841fe98b58dcaf"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/php-fig/container/zipball/b7ce3b176482dbbc1245ebf52b181af44c2cf55f",
- "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f",
+ "url": "https://api.github.com/repos/php-fig/container/zipball/8622567409010282b7aeebe4bb841fe98b58dcaf",
+ "reference": "8622567409010282b7aeebe4bb841fe98b58dcaf",
"shasum": ""
},
"require": {
- "php": ">=5.3.0"
+ "php": ">=7.2.0"
},
"type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "1.0.x-dev"
- }
- },
"autoload": {
"psr-4": {
"Psr\\Container\\": "src/"
@@ -3812,7 +4198,7 @@
"authors": [
{
"name": "PHP-FIG",
- "homepage": "http://www.php-fig.org/"
+ "homepage": "https://www.php-fig.org/"
}
],
"description": "Common Container Interface (PHP FIG PSR-11)",
@@ -3824,7 +4210,11 @@
"container-interop",
"psr"
],
- "time": "2017-02-14T16:28:37+00:00"
+ "support": {
+ "issues": "https://github.com/php-fig/container/issues",
+ "source": "https://github.com/php-fig/container/tree/1.1.1"
+ },
+ "time": "2021-03-05T17:36:06+00:00"
},
{
"name": "psr/simple-cache",
@@ -3872,6 +4262,9 @@
"psr-16",
"simple-cache"
],
+ "support": {
+ "source": "https://github.com/php-fig/simple-cache/tree/master"
+ },
"time": "2017-10-23T01:57:42+00:00"
},
{
@@ -3946,27 +4339,31 @@
"interactive",
"shell"
],
+ "support": {
+ "issues": "https://github.com/bobthecow/psysh/issues",
+ "source": "https://github.com/bobthecow/psysh/tree/v0.9.12"
+ },
"time": "2019-12-06T14:19:43+00:00"
},
{
"name": "sebastian/code-unit-reverse-lookup",
- "version": "1.0.1",
+ "version": "1.0.2",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git",
- "reference": "4419fcdb5eabb9caa61a27c7a1db532a6b55dd18"
+ "reference": "1de8cd5c010cb153fcd68b8d0f64606f523f7619"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/4419fcdb5eabb9caa61a27c7a1db532a6b55dd18",
- "reference": "4419fcdb5eabb9caa61a27c7a1db532a6b55dd18",
+ "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/1de8cd5c010cb153fcd68b8d0f64606f523f7619",
+ "reference": "1de8cd5c010cb153fcd68b8d0f64606f523f7619",
"shasum": ""
},
"require": {
- "php": "^5.6 || ^7.0"
+ "php": ">=5.6"
},
"require-dev": {
- "phpunit/phpunit": "^5.7 || ^6.0"
+ "phpunit/phpunit": "^8.5"
},
"type": "library",
"extra": {
@@ -3991,29 +4388,39 @@
],
"description": "Looks up which function or method a line of code belongs to",
"homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/",
- "time": "2017-03-04T06:30:41+00:00"
+ "support": {
+ "issues": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/issues",
+ "source": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/tree/1.0.2"
+ },
+ "funding": [
+ {
+ "url": "https://github.com/sebastianbergmann",
+ "type": "github"
+ }
+ ],
+ "time": "2020-11-30T08:15:22+00:00"
},
{
"name": "sebastian/comparator",
- "version": "3.0.2",
+ "version": "3.0.3",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/comparator.git",
- "reference": "5de4fc177adf9bce8df98d8d141a7559d7ccf6da"
+ "reference": "1071dfcef776a57013124ff35e1fc41ccd294758"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/5de4fc177adf9bce8df98d8d141a7559d7ccf6da",
- "reference": "5de4fc177adf9bce8df98d8d141a7559d7ccf6da",
+ "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/1071dfcef776a57013124ff35e1fc41ccd294758",
+ "reference": "1071dfcef776a57013124ff35e1fc41ccd294758",
"shasum": ""
},
"require": {
- "php": "^7.1",
+ "php": ">=7.1",
"sebastian/diff": "^3.0",
"sebastian/exporter": "^3.1"
},
"require-dev": {
- "phpunit/phpunit": "^7.1"
+ "phpunit/phpunit": "^8.5"
},
"type": "library",
"extra": {
@@ -4031,6 +4438,10 @@
"BSD-3-Clause"
],
"authors": [
+ {
+ "name": "Sebastian Bergmann",
+ "email": "sebastian@phpunit.de"
+ },
{
"name": "Jeff Welch",
"email": "whatthejeff@gmail.com"
@@ -4042,10 +4453,6 @@
{
"name": "Bernhard Schussek",
"email": "bschussek@2bepublished.at"
- },
- {
- "name": "Sebastian Bergmann",
- "email": "sebastian@phpunit.de"
}
],
"description": "Provides the functionality to compare PHP values for equality",
@@ -4055,24 +4462,34 @@
"compare",
"equality"
],
- "time": "2018-07-12T15:12:46+00:00"
+ "support": {
+ "issues": "https://github.com/sebastianbergmann/comparator/issues",
+ "source": "https://github.com/sebastianbergmann/comparator/tree/3.0.3"
+ },
+ "funding": [
+ {
+ "url": "https://github.com/sebastianbergmann",
+ "type": "github"
+ }
+ ],
+ "time": "2020-11-30T08:04:30+00:00"
},
{
"name": "sebastian/diff",
- "version": "3.0.2",
+ "version": "3.0.3",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/diff.git",
- "reference": "720fcc7e9b5cf384ea68d9d930d480907a0c1a29"
+ "reference": "14f72dd46eaf2f2293cbe79c93cc0bc43161a211"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/720fcc7e9b5cf384ea68d9d930d480907a0c1a29",
- "reference": "720fcc7e9b5cf384ea68d9d930d480907a0c1a29",
+ "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/14f72dd46eaf2f2293cbe79c93cc0bc43161a211",
+ "reference": "14f72dd46eaf2f2293cbe79c93cc0bc43161a211",
"shasum": ""
},
"require": {
- "php": "^7.1"
+ "php": ">=7.1"
},
"require-dev": {
"phpunit/phpunit": "^7.5 || ^8.0",
@@ -4094,13 +4511,13 @@
"BSD-3-Clause"
],
"authors": [
- {
- "name": "Kore Nordmann",
- "email": "mail@kore-nordmann.de"
- },
{
"name": "Sebastian Bergmann",
"email": "sebastian@phpunit.de"
+ },
+ {
+ "name": "Kore Nordmann",
+ "email": "mail@kore-nordmann.de"
}
],
"description": "Diff implementation",
@@ -4111,24 +4528,34 @@
"unidiff",
"unified diff"
],
- "time": "2019-02-04T06:01:07+00:00"
+ "support": {
+ "issues": "https://github.com/sebastianbergmann/diff/issues",
+ "source": "https://github.com/sebastianbergmann/diff/tree/3.0.3"
+ },
+ "funding": [
+ {
+ "url": "https://github.com/sebastianbergmann",
+ "type": "github"
+ }
+ ],
+ "time": "2020-11-30T07:59:04+00:00"
},
{
"name": "sebastian/environment",
- "version": "4.2.3",
+ "version": "4.2.4",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/environment.git",
- "reference": "464c90d7bdf5ad4e8a6aea15c091fec0603d4368"
+ "reference": "d47bbbad83711771f167c72d4e3f25f7fcc1f8b0"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/464c90d7bdf5ad4e8a6aea15c091fec0603d4368",
- "reference": "464c90d7bdf5ad4e8a6aea15c091fec0603d4368",
+ "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/d47bbbad83711771f167c72d4e3f25f7fcc1f8b0",
+ "reference": "d47bbbad83711771f167c72d4e3f25f7fcc1f8b0",
"shasum": ""
},
"require": {
- "php": "^7.1"
+ "php": ">=7.1"
},
"require-dev": {
"phpunit/phpunit": "^7.5"
@@ -4164,24 +4591,34 @@
"environment",
"hhvm"
],
- "time": "2019-11-20T08:46:58+00:00"
+ "support": {
+ "issues": "https://github.com/sebastianbergmann/environment/issues",
+ "source": "https://github.com/sebastianbergmann/environment/tree/4.2.4"
+ },
+ "funding": [
+ {
+ "url": "https://github.com/sebastianbergmann",
+ "type": "github"
+ }
+ ],
+ "time": "2020-11-30T07:53:42+00:00"
},
{
"name": "sebastian/exporter",
- "version": "3.1.2",
+ "version": "3.1.3",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/exporter.git",
- "reference": "68609e1261d215ea5b21b7987539cbfbe156ec3e"
+ "reference": "6b853149eab67d4da22291d36f5b0631c0fd856e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/68609e1261d215ea5b21b7987539cbfbe156ec3e",
- "reference": "68609e1261d215ea5b21b7987539cbfbe156ec3e",
+ "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/6b853149eab67d4da22291d36f5b0631c0fd856e",
+ "reference": "6b853149eab67d4da22291d36f5b0631c0fd856e",
"shasum": ""
},
"require": {
- "php": "^7.0",
+ "php": ">=7.0",
"sebastian/recursion-context": "^3.0"
},
"require-dev": {
@@ -4231,24 +4668,34 @@
"export",
"exporter"
],
- "time": "2019-09-14T09:02:43+00:00"
+ "support": {
+ "issues": "https://github.com/sebastianbergmann/exporter/issues",
+ "source": "https://github.com/sebastianbergmann/exporter/tree/3.1.3"
+ },
+ "funding": [
+ {
+ "url": "https://github.com/sebastianbergmann",
+ "type": "github"
+ }
+ ],
+ "time": "2020-11-30T07:47:53+00:00"
},
{
"name": "sebastian/global-state",
- "version": "3.0.0",
+ "version": "3.0.1",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/global-state.git",
- "reference": "edf8a461cf1d4005f19fb0b6b8b95a9f7fa0adc4"
+ "reference": "474fb9edb7ab891665d3bfc6317f42a0a150454b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/edf8a461cf1d4005f19fb0b6b8b95a9f7fa0adc4",
- "reference": "edf8a461cf1d4005f19fb0b6b8b95a9f7fa0adc4",
+ "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/474fb9edb7ab891665d3bfc6317f42a0a150454b",
+ "reference": "474fb9edb7ab891665d3bfc6317f42a0a150454b",
"shasum": ""
},
"require": {
- "php": "^7.2",
+ "php": ">=7.2",
"sebastian/object-reflector": "^1.1.1",
"sebastian/recursion-context": "^3.0"
},
@@ -4285,24 +4732,34 @@
"keywords": [
"global state"
],
- "time": "2019-02-01T05:30:01+00:00"
+ "support": {
+ "issues": "https://github.com/sebastianbergmann/global-state/issues",
+ "source": "https://github.com/sebastianbergmann/global-state/tree/3.0.1"
+ },
+ "funding": [
+ {
+ "url": "https://github.com/sebastianbergmann",
+ "type": "github"
+ }
+ ],
+ "time": "2020-11-30T07:43:24+00:00"
},
{
"name": "sebastian/object-enumerator",
- "version": "3.0.3",
+ "version": "3.0.4",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/object-enumerator.git",
- "reference": "7cfd9e65d11ffb5af41198476395774d4c8a84c5"
+ "reference": "e67f6d32ebd0c749cf9d1dbd9f226c727043cdf2"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/7cfd9e65d11ffb5af41198476395774d4c8a84c5",
- "reference": "7cfd9e65d11ffb5af41198476395774d4c8a84c5",
+ "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/e67f6d32ebd0c749cf9d1dbd9f226c727043cdf2",
+ "reference": "e67f6d32ebd0c749cf9d1dbd9f226c727043cdf2",
"shasum": ""
},
"require": {
- "php": "^7.0",
+ "php": ">=7.0",
"sebastian/object-reflector": "^1.1.1",
"sebastian/recursion-context": "^3.0"
},
@@ -4332,24 +4789,34 @@
],
"description": "Traverses array structures and object graphs to enumerate all referenced objects",
"homepage": "https://github.com/sebastianbergmann/object-enumerator/",
- "time": "2017-08-03T12:35:26+00:00"
+ "support": {
+ "issues": "https://github.com/sebastianbergmann/object-enumerator/issues",
+ "source": "https://github.com/sebastianbergmann/object-enumerator/tree/3.0.4"
+ },
+ "funding": [
+ {
+ "url": "https://github.com/sebastianbergmann",
+ "type": "github"
+ }
+ ],
+ "time": "2020-11-30T07:40:27+00:00"
},
{
"name": "sebastian/object-reflector",
- "version": "1.1.1",
+ "version": "1.1.2",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/object-reflector.git",
- "reference": "773f97c67f28de00d397be301821b06708fca0be"
+ "reference": "9b8772b9cbd456ab45d4a598d2dd1a1bced6363d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/773f97c67f28de00d397be301821b06708fca0be",
- "reference": "773f97c67f28de00d397be301821b06708fca0be",
+ "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/9b8772b9cbd456ab45d4a598d2dd1a1bced6363d",
+ "reference": "9b8772b9cbd456ab45d4a598d2dd1a1bced6363d",
"shasum": ""
},
"require": {
- "php": "^7.0"
+ "php": ">=7.0"
},
"require-dev": {
"phpunit/phpunit": "^6.0"
@@ -4377,24 +4844,34 @@
],
"description": "Allows reflection of object attributes, including inherited and non-public ones",
"homepage": "https://github.com/sebastianbergmann/object-reflector/",
- "time": "2017-03-29T09:07:27+00:00"
+ "support": {
+ "issues": "https://github.com/sebastianbergmann/object-reflector/issues",
+ "source": "https://github.com/sebastianbergmann/object-reflector/tree/1.1.2"
+ },
+ "funding": [
+ {
+ "url": "https://github.com/sebastianbergmann",
+ "type": "github"
+ }
+ ],
+ "time": "2020-11-30T07:37:18+00:00"
},
{
"name": "sebastian/recursion-context",
- "version": "3.0.0",
+ "version": "3.0.1",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/recursion-context.git",
- "reference": "5b0cd723502bac3b006cbf3dbf7a1e3fcefe4fa8"
+ "reference": "367dcba38d6e1977be014dc4b22f47a484dac7fb"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/5b0cd723502bac3b006cbf3dbf7a1e3fcefe4fa8",
- "reference": "5b0cd723502bac3b006cbf3dbf7a1e3fcefe4fa8",
+ "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/367dcba38d6e1977be014dc4b22f47a484dac7fb",
+ "reference": "367dcba38d6e1977be014dc4b22f47a484dac7fb",
"shasum": ""
},
"require": {
- "php": "^7.0"
+ "php": ">=7.0"
},
"require-dev": {
"phpunit/phpunit": "^6.0"
@@ -4415,14 +4892,14 @@
"BSD-3-Clause"
],
"authors": [
- {
- "name": "Jeff Welch",
- "email": "whatthejeff@gmail.com"
- },
{
"name": "Sebastian Bergmann",
"email": "sebastian@phpunit.de"
},
+ {
+ "name": "Jeff Welch",
+ "email": "whatthejeff@gmail.com"
+ },
{
"name": "Adam Harvey",
"email": "aharvey@php.net"
@@ -4430,24 +4907,34 @@
],
"description": "Provides functionality to recursively process PHP variables",
"homepage": "http://www.github.com/sebastianbergmann/recursion-context",
- "time": "2017-03-03T06:23:57+00:00"
+ "support": {
+ "issues": "https://github.com/sebastianbergmann/recursion-context/issues",
+ "source": "https://github.com/sebastianbergmann/recursion-context/tree/3.0.1"
+ },
+ "funding": [
+ {
+ "url": "https://github.com/sebastianbergmann",
+ "type": "github"
+ }
+ ],
+ "time": "2020-11-30T07:34:24+00:00"
},
{
"name": "sebastian/resource-operations",
- "version": "2.0.1",
+ "version": "2.0.2",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/resource-operations.git",
- "reference": "4d7a795d35b889bf80a0cc04e08d77cedfa917a9"
+ "reference": "31d35ca87926450c44eae7e2611d45a7a65ea8b3"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/4d7a795d35b889bf80a0cc04e08d77cedfa917a9",
- "reference": "4d7a795d35b889bf80a0cc04e08d77cedfa917a9",
+ "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/31d35ca87926450c44eae7e2611d45a7a65ea8b3",
+ "reference": "31d35ca87926450c44eae7e2611d45a7a65ea8b3",
"shasum": ""
},
"require": {
- "php": "^7.1"
+ "php": ">=7.1"
},
"type": "library",
"extra": {
@@ -4472,24 +4959,34 @@
],
"description": "Provides a list of PHP built-in functions that operate on resources",
"homepage": "https://www.github.com/sebastianbergmann/resource-operations",
- "time": "2018-10-04T04:07:39+00:00"
+ "support": {
+ "issues": "https://github.com/sebastianbergmann/resource-operations/issues",
+ "source": "https://github.com/sebastianbergmann/resource-operations/tree/2.0.2"
+ },
+ "funding": [
+ {
+ "url": "https://github.com/sebastianbergmann",
+ "type": "github"
+ }
+ ],
+ "time": "2020-11-30T07:30:19+00:00"
},
{
"name": "sebastian/type",
- "version": "1.1.3",
+ "version": "1.1.4",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/type.git",
- "reference": "3aaaa15fa71d27650d62a948be022fe3b48541a3"
+ "reference": "0150cfbc4495ed2df3872fb31b26781e4e077eb4"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/3aaaa15fa71d27650d62a948be022fe3b48541a3",
- "reference": "3aaaa15fa71d27650d62a948be022fe3b48541a3",
+ "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/0150cfbc4495ed2df3872fb31b26781e4e077eb4",
+ "reference": "0150cfbc4495ed2df3872fb31b26781e4e077eb4",
"shasum": ""
},
"require": {
- "php": "^7.2"
+ "php": ">=7.2"
},
"require-dev": {
"phpunit/phpunit": "^8.2"
@@ -4518,7 +5015,17 @@
],
"description": "Collection of value objects that represent the types of the PHP type system",
"homepage": "https://github.com/sebastianbergmann/type",
- "time": "2019-07-02T08:10:15+00:00"
+ "support": {
+ "issues": "https://github.com/sebastianbergmann/type/issues",
+ "source": "https://github.com/sebastianbergmann/type/tree/1.1.4"
+ },
+ "funding": [
+ {
+ "url": "https://github.com/sebastianbergmann",
+ "type": "github"
+ }
+ ],
+ "time": "2020-11-30T07:25:11+00:00"
},
{
"name": "sebastian/version",
@@ -4561,6 +5068,10 @@
],
"description": "Library that helps with managing the version number of Git-hosted PHP projects",
"homepage": "https://github.com/sebastianbergmann/version",
+ "support": {
+ "issues": "https://github.com/sebastianbergmann/version/issues",
+ "source": "https://github.com/sebastianbergmann/version/tree/master"
+ },
"time": "2016-10-03T07:35:21+00:00"
},
{
@@ -4618,6 +5129,9 @@
],
"description": "Symfony Config Component",
"homepage": "https://symfony.com",
+ "support": {
+ "source": "https://github.com/symfony/config/tree/v2.8.50"
+ },
"time": "2018-11-26T09:38:12+00:00"
},
{
@@ -4679,6 +5193,9 @@
],
"description": "Symfony Console Component",
"homepage": "https://symfony.com",
+ "support": {
+ "source": "https://github.com/symfony/console/tree/v2.8.52"
+ },
"time": "2018-11-20T15:55:20+00:00"
},
{
@@ -4736,6 +5253,9 @@
],
"description": "Symfony Debug Component",
"homepage": "https://symfony.com",
+ "support": {
+ "source": "https://github.com/symfony/debug/tree/3.0"
+ },
"time": "2016-07-30T07:22:48+00:00"
},
{
@@ -4796,6 +5316,9 @@
],
"description": "Symfony EventDispatcher Component",
"homepage": "https://symfony.com",
+ "support": {
+ "source": "https://github.com/symfony/event-dispatcher/tree/v2.8.50"
+ },
"time": "2018-11-21T14:20:20+00:00"
},
{
@@ -4845,24 +5368,27 @@
],
"description": "Symfony Finder Component",
"homepage": "https://symfony.com",
+ "support": {
+ "source": "https://github.com/symfony/finder/tree/v2.8.50"
+ },
"time": "2018-11-11T11:18:13+00:00"
},
{
"name": "symfony/polyfill-ctype",
- "version": "v1.18.0",
+ "version": "v1.23.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-ctype.git",
- "reference": "1c302646f6efc070cd46856e600e5e0684d6b454"
+ "reference": "46cd95797e9df938fdd2b03693b5fca5e64b01ce"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/1c302646f6efc070cd46856e600e5e0684d6b454",
- "reference": "1c302646f6efc070cd46856e600e5e0684d6b454",
+ "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/46cd95797e9df938fdd2b03693b5fca5e64b01ce",
+ "reference": "46cd95797e9df938fdd2b03693b5fca5e64b01ce",
"shasum": ""
},
"require": {
- "php": ">=5.3.3"
+ "php": ">=7.1"
},
"suggest": {
"ext-ctype": "For best performance"
@@ -4870,7 +5396,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.18-dev"
+ "dev-main": "1.23-dev"
},
"thanks": {
"name": "symfony/polyfill",
@@ -4907,6 +5433,9 @@
"polyfill",
"portable"
],
+ "support": {
+ "source": "https://github.com/symfony/polyfill-ctype/tree/v1.23.0"
+ },
"funding": [
{
"url": "https://symfony.com/sponsor",
@@ -4921,24 +5450,24 @@
"type": "tidelift"
}
],
- "time": "2020-07-14T12:35:20+00:00"
+ "time": "2021-02-19T12:13:01+00:00"
},
{
"name": "symfony/polyfill-mbstring",
- "version": "v1.18.0",
+ "version": "v1.23.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-mbstring.git",
- "reference": "a6977d63bf9a0ad4c65cd352709e230876f9904a"
+ "reference": "2df51500adbaebdc4c38dea4c89a2e131c45c8a1"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/a6977d63bf9a0ad4c65cd352709e230876f9904a",
- "reference": "a6977d63bf9a0ad4c65cd352709e230876f9904a",
+ "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/2df51500adbaebdc4c38dea4c89a2e131c45c8a1",
+ "reference": "2df51500adbaebdc4c38dea4c89a2e131c45c8a1",
"shasum": ""
},
"require": {
- "php": ">=5.3.3"
+ "php": ">=7.1"
},
"suggest": {
"ext-mbstring": "For best performance"
@@ -4946,7 +5475,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.18-dev"
+ "dev-main": "1.23-dev"
},
"thanks": {
"name": "symfony/polyfill",
@@ -4984,6 +5513,9 @@
"portable",
"shim"
],
+ "support": {
+ "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.23.0"
+ },
"funding": [
{
"url": "https://symfony.com/sponsor",
@@ -4998,29 +5530,29 @@
"type": "tidelift"
}
],
- "time": "2020-07-14T12:35:20+00:00"
+ "time": "2021-05-27T09:27:20+00:00"
},
{
"name": "symfony/polyfill-php72",
- "version": "v1.18.0",
+ "version": "v1.23.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php72.git",
- "reference": "639447d008615574653fb3bc60d1986d7172eaae"
+ "reference": "9a142215a36a3888e30d0a9eeea9766764e96976"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/639447d008615574653fb3bc60d1986d7172eaae",
- "reference": "639447d008615574653fb3bc60d1986d7172eaae",
+ "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/9a142215a36a3888e30d0a9eeea9766764e96976",
+ "reference": "9a142215a36a3888e30d0a9eeea9766764e96976",
"shasum": ""
},
"require": {
- "php": ">=5.3.3"
+ "php": ">=7.1"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.18-dev"
+ "dev-main": "1.23-dev"
},
"thanks": {
"name": "symfony/polyfill",
@@ -5057,6 +5589,9 @@
"portable",
"shim"
],
+ "support": {
+ "source": "https://github.com/symfony/polyfill-php72/tree/v1.23.0"
+ },
"funding": [
{
"url": "https://symfony.com/sponsor",
@@ -5071,7 +5606,7 @@
"type": "tidelift"
}
],
- "time": "2020-07-14T12:35:20+00:00"
+ "time": "2021-05-27T09:17:38+00:00"
},
{
"name": "symfony/stopwatch",
@@ -5120,6 +5655,9 @@
],
"description": "Symfony Stopwatch Component",
"homepage": "https://symfony.com",
+ "support": {
+ "source": "https://github.com/symfony/stopwatch/tree/v2.8.52"
+ },
"time": "2018-11-11T11:18:13+00:00"
},
{
@@ -5184,6 +5722,9 @@
],
"description": "Symfony Translation Component",
"homepage": "https://symfony.com",
+ "support": {
+ "source": "https://github.com/symfony/translation/tree/3.0"
+ },
"time": "2016-07-30T07:22:48+00:00"
},
{
@@ -5258,6 +5799,9 @@
],
"description": "Symfony Validator Component",
"homepage": "https://symfony.com",
+ "support": {
+ "source": "https://github.com/symfony/validator/tree/v2.8.50"
+ },
"time": "2018-11-14T14:06:48+00:00"
},
{
@@ -5327,6 +5871,9 @@
"debug",
"dump"
],
+ "support": {
+ "source": "https://github.com/symfony/var-dumper/tree/4.0"
+ },
"time": "2018-07-26T11:22:46+00:00"
},
{
@@ -5367,6 +5914,10 @@
}
],
"description": "A small library for converting tokenized PHP source code into XML and potentially other formats",
+ "support": {
+ "issues": "https://github.com/theseer/tokenizer/issues",
+ "source": "https://github.com/theseer/tokenizer/tree/master"
+ },
"funding": [
{
"url": "https://github.com/theseer",
@@ -5377,20 +5928,20 @@
},
{
"name": "twig/twig",
- "version": "v1.43.0",
+ "version": "v1.44.4",
"source": {
"type": "git",
"url": "https://github.com/twigphp/Twig.git",
- "reference": "597a03e85a60af6feee4f5127f3ef4279a1694c3"
+ "reference": "4d400421528e9fa40caaffcf7824c172526dd99d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/twigphp/Twig/zipball/597a03e85a60af6feee4f5127f3ef4279a1694c3",
- "reference": "597a03e85a60af6feee4f5127f3ef4279a1694c3",
+ "url": "https://api.github.com/repos/twigphp/Twig/zipball/4d400421528e9fa40caaffcf7824c172526dd99d",
+ "reference": "4d400421528e9fa40caaffcf7824c172526dd99d",
"shasum": ""
},
"require": {
- "php": ">=7.1.3",
+ "php": ">=7.2.5",
"symfony/polyfill-ctype": "^1.8"
},
"require-dev": {
@@ -5400,7 +5951,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.43-dev"
+ "dev-master": "1.44-dev"
}
},
"autoload": {
@@ -5437,19 +5988,11 @@
"keywords": [
"templating"
],
+ "support": {
+ "issues": "https://github.com/twigphp/Twig/issues",
+ "source": "https://github.com/twigphp/Twig/tree/v1.44.4"
+ },
"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"
@@ -5459,34 +6002,39 @@
"type": "tidelift"
}
],
- "time": "2020-07-05T13:00:49+00:00"
+ "time": "2021-05-16T12:11:20+00:00"
},
{
"name": "webmozart/assert",
- "version": "1.9.1",
+ "version": "1.10.0",
"source": {
"type": "git",
- "url": "https://github.com/webmozart/assert.git",
- "reference": "bafc69caeb4d49c39fd0779086c03a3738cbb389"
+ "url": "https://github.com/webmozarts/assert.git",
+ "reference": "6964c76c7804814a842473e0c8fd15bab0f18e25"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/webmozart/assert/zipball/bafc69caeb4d49c39fd0779086c03a3738cbb389",
- "reference": "bafc69caeb4d49c39fd0779086c03a3738cbb389",
+ "url": "https://api.github.com/repos/webmozarts/assert/zipball/6964c76c7804814a842473e0c8fd15bab0f18e25",
+ "reference": "6964c76c7804814a842473e0c8fd15bab0f18e25",
"shasum": ""
},
"require": {
- "php": "^5.3.3 || ^7.0 || ^8.0",
+ "php": "^7.2 || ^8.0",
"symfony/polyfill-ctype": "^1.8"
},
"conflict": {
"phpstan/phpstan": "<0.12.20",
- "vimeo/psalm": "<3.9.1"
+ "vimeo/psalm": "<4.6.1 || 4.6.2"
},
"require-dev": {
- "phpunit/phpunit": "^4.8.36 || ^7.5.13"
+ "phpunit/phpunit": "^8.5.13"
},
"type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.10-dev"
+ }
+ },
"autoload": {
"psr-4": {
"Webmozart\\Assert\\": "src/"
@@ -5508,7 +6056,11 @@
"check",
"validate"
],
- "time": "2020-07-08T17:02:28+00:00"
+ "support": {
+ "issues": "https://github.com/webmozarts/assert/issues",
+ "source": "https://github.com/webmozarts/assert/tree/1.10.0"
+ },
+ "time": "2021-03-09T10:59:23+00:00"
},
{
"name": "zendframework/zend-cache",
@@ -5591,6 +6143,14 @@
"psr-6",
"zf"
],
+ "support": {
+ "chat": "https://zendframework-slack.herokuapp.com",
+ "docs": "https://docs.zendframework.com/zend-cache/",
+ "forum": "https://discourse.zendframework.com/c/questions/components",
+ "issues": "https://github.com/zendframework/zend-cache/issues",
+ "rss": "https://github.com/zendframework/zend-cache/releases.atom",
+ "source": "https://github.com/zendframework/zend-cache"
+ },
"abandoned": "laminas/laminas-cache",
"time": "2019-08-28T21:34:32+00:00"
},
@@ -5648,6 +6208,10 @@
"config",
"zf2"
],
+ "support": {
+ "issues": "https://github.com/zendframework/zend-config/issues",
+ "source": "https://github.com/zendframework/zend-config/tree/release-2.6.0"
+ },
"abandoned": "laminas/laminas-config",
"time": "2016-02-04T23:01:10+00:00"
},
@@ -5703,6 +6267,10 @@
"events",
"zf2"
],
+ "support": {
+ "issues": "https://github.com/zendframework/zend-eventmanager/issues",
+ "source": "https://github.com/zendframework/zend-eventmanager/tree/master"
+ },
"abandoned": "laminas/laminas-eventmanager",
"time": "2018-04-25T15:33:34+00:00"
},
@@ -5769,6 +6337,14 @@
"filter",
"zf"
],
+ "support": {
+ "chat": "https://zendframework-slack.herokuapp.com",
+ "docs": "https://docs.zendframework.com/zend-filter/",
+ "forum": "https://discourse.zendframework.com/c/questions/components",
+ "issues": "https://github.com/zendframework/zend-filter/issues",
+ "rss": "https://github.com/zendframework/zend-filter/releases.atom",
+ "source": "https://github.com/zendframework/zend-filter"
+ },
"abandoned": "laminas/laminas-filter",
"time": "2019-08-19T07:08:04+00:00"
},
@@ -5828,6 +6404,10 @@
"hydrator",
"zf2"
],
+ "support": {
+ "issues": "https://github.com/zendframework/zend-hydrator/issues",
+ "source": "https://github.com/zendframework/zend-hydrator/tree/release-1.1"
+ },
"abandoned": "laminas/laminas-hydrator",
"time": "2016-02-18T22:38:26+00:00"
},
@@ -5900,6 +6480,14 @@
"i18n",
"zf"
],
+ "support": {
+ "chat": "https://zendframework-slack.herokuapp.com",
+ "docs": "https://docs.zendframework.com/zend-i18n/",
+ "forum": "https://discourse.zendframework.com/c/questions/components",
+ "issues": "https://github.com/zendframework/zend-i18n/issues",
+ "rss": "https://github.com/zendframework/zend-i18n/releases.atom",
+ "source": "https://github.com/zendframework/zend-i18n"
+ },
"abandoned": "laminas/laminas-i18n",
"time": "2019-12-12T14:08:22+00:00"
},
@@ -5951,6 +6539,14 @@
"json",
"zf"
],
+ "support": {
+ "chat": "https://zendframework-slack.herokuapp.com",
+ "docs": "https://docs.zendframework.com/zend-json/",
+ "forum": "https://discourse.zendframework.com/c/questions/components",
+ "issues": "https://github.com/zendframework/zend-json/issues",
+ "rss": "https://github.com/zendframework/zend-json/releases.atom",
+ "source": "https://github.com/zendframework/zend-json"
+ },
"abandoned": "laminas/laminas-json",
"time": "2019-10-09T13:56:13+00:00"
},
@@ -6009,6 +6605,14 @@
"serializer",
"zf"
],
+ "support": {
+ "chat": "https://zendframework-slack.herokuapp.com",
+ "docs": "https://docs.zendframework.com/zend-serializer/",
+ "forum": "https://discourse.zendframework.com/c/questions/components",
+ "issues": "https://github.com/zendframework/zend-serializer/issues",
+ "rss": "https://github.com/zendframework/zend-serializer/releases.atom",
+ "source": "https://github.com/zendframework/zend-serializer"
+ },
"abandoned": "laminas/laminas-serializer",
"time": "2019-10-19T08:06:30+00:00"
},
@@ -6062,6 +6666,10 @@
"servicemanager",
"zf2"
],
+ "support": {
+ "issues": "https://github.com/zendframework/zend-servicemanager/issues",
+ "source": "https://github.com/zendframework/zend-servicemanager/tree/release-2.7.11"
+ },
"abandoned": "laminas/laminas-servicemanager",
"time": "2018-06-22T14:49:54+00:00"
},
@@ -6122,6 +6730,10 @@
"stdlib",
"zf2"
],
+ "support": {
+ "issues": "https://github.com/zendframework/zend-stdlib/issues",
+ "source": "https://github.com/zendframework/zend-stdlib/tree/release-2.7"
+ },
"abandoned": "laminas/laminas-stdlib",
"time": "2016-04-12T21:17:31+00:00"
},
@@ -6187,6 +6799,10 @@
],
"description": "The Base package provides the basic infrastructure that all packages rely on. Therefore every component relies on this package.",
"homepage": "https://github.com/zetacomponents",
+ "support": {
+ "issues": "https://github.com/zetacomponents/Base/issues",
+ "source": "https://github.com/zetacomponents/Base/tree/1.9.1"
+ },
"time": "2017-11-28T11:30:00+00:00"
},
{
@@ -6238,6 +6854,10 @@
],
"description": "The Document components provides a general conversion framework for different semantic document markup languages like XHTML, Docbook, RST and similar.",
"homepage": "https://github.com/zetacomponents",
+ "support": {
+ "issues": "https://github.com/zetacomponents/Document/issues",
+ "source": "https://github.com/zetacomponents/Document/tree/1.3.1"
+ },
"time": "2013-12-19T11:40:00+00:00"
}
],
@@ -6264,5 +6884,8 @@
"ext-xmlwriter": "*"
},
"platform-dev": [],
- "plugin-api-version": "1.1.0"
+ "platform-overrides": {
+ "php": "7.3.0"
+ },
+ "plugin-api-version": "2.0.0"
}
diff --git a/lib/util/framework.php b/lib/util/framework.php
index bfa8ba01f8..d6c1449dca 100644
--- a/lib/util/framework.php
+++ b/lib/util/framework.php
@@ -35,7 +35,7 @@ define('GNUSOCIAL_ENGINE_URL', 'https://gnusocial.rocks/');
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', 'alpha0'); // 'dev', 'alpha[0-9]+', 'beta[0-9]+', 'rc[0-9]+', 'release'
+define('GNUSOCIAL_LIFECYCLE', 'beta0'); // '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 52109ec534..1910b8cd9c 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: 2020-08-04 01:05+0100\n"
+"POT-Creation-Date: 2021-07-18 12:38+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 462ea9fd5b..33c9a52214 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: 2020-08-04 01:05+0100\n"
+"POT-Creation-Date: 2021-07-18 12:38+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -18,34 +18,63 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#. TRANS: Exception.
-#: classes/Activitypub_profile.php:393
+#: classes/Activitypub_profile.php:391
msgid "Not a valid WebFinger address (via cache)."
msgstr ""
#. TRANS: Exception.
-#: classes/Activitypub_profile.php:414
+#: classes/Activitypub_profile.php:412
msgid "Not a valid WebFinger address."
msgstr ""
#. TRANS: Exception. %s is a WebFinger address.
-#: classes/Activitypub_profile.php:454
+#: classes/Activitypub_profile.php:452
#, php-format
msgid "Could not find a valid profile for \"%s\"."
msgstr ""
+#. TRANS: Client error displayed when trying to mark a notice as favorite that already is a favorite.
+#: lib/models/Activitypub_like.php:75
+msgid "You have already favorited this!"
+msgstr ""
+
+#: lib/models/Activitypub_like.php:83
+msgid "Favor"
+msgstr ""
+
+#: lib/models/Activitypub_like.php:87
+#, php-format
+msgid "%1$s favorited something by %2$s: %3$s"
+msgstr ""
+
+#. TRANS: Client exception thrown when trying a view a notice the user has no access to.
+#: actions/apnotice.php:88
+msgid "Access restricted."
+msgstr ""
+
+#. TRANS: Server error displayed trying to show a notice without a connected profile.
+#: actions/apnotice.php:95
+msgid "Notice has no profile."
+msgstr ""
+
+#. TRANS: Client error displayed trying to show a deleted notice.
+#: actions/apnotice.php:176
+msgid "Notice deleted."
+msgstr ""
+
#. TRANS: Plugin description.
-#: ActivityPubPlugin.php:241
+#: ActivityPubPlugin.php:255
msgid ""
"Follow people across social networks that implement ActivityPub."
msgstr ""
-#: ActivityPubPlugin.php:415
+#: ActivityPubPlugin.php:431
msgid "Remote Profile"
msgstr ""
#. TRANS: Title. %s is a domain name.
-#: ActivityPubPlugin.php:920
+#: ActivityPubPlugin.php:998
#, php-format
msgid "Sent from %s via ActivityPub"
msgstr ""
diff --git a/plugins/ActivitySpam/locale/ActivitySpam.pot b/plugins/ActivitySpam/locale/ActivitySpam.pot
index 12eae85d26..9bba1fe36a 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: 2020-08-04 01:05+0100\n"
+"POT-Creation-Date: 2021-07-18 12:38+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 0d0d5e30b8..8a3f0bd2ab 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: 2020-08-04 01:05+0100\n"
+"POT-Creation-Date: 2021-07-18 12:38+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -59,16 +59,16 @@ msgid "Add to favorites"
msgstr ""
#. TRANS: Label for tally for number of times a notice was favored.
-#: AnonymousFavePlugin.php:165
+#: AnonymousFavePlugin.php:157
msgid "Favored"
msgstr ""
#. TRANS: Server exception.
-#: AnonymousFavePlugin.php:198 AnonymousFavePlugin.php:209
+#: AnonymousFavePlugin.php:206 AnonymousFavePlugin.php:217
msgid "Could not create anonymous user session."
msgstr ""
#. TRANS: Plugin description.
-#: AnonymousFavePlugin.php:284
+#: AnonymousFavePlugin.php:291
msgid "Allow anonymous users to favorite notices."
msgstr ""
diff --git a/plugins/AntiBrute/locale/AntiBrute.pot b/plugins/AntiBrute/locale/AntiBrute.pot
index 2554e30bae..081c749afe 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: 2020-08-04 01:05+0100\n"
+"POT-Creation-Date: 2021-07-18 12:38+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/ApiLogger/locale/ApiLogger.pot b/plugins/ApiLogger/locale/ApiLogger.pot
index 42ab88f4e5..d4f8cf4f75 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: 2020-08-04 01:05+0100\n"
+"POT-Creation-Date: 2021-07-18 12:38+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 60b5dd7928..340f757357 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: 2020-08-04 01:05+0100\n"
+"POT-Creation-Date: 2021-07-18 12:38+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 6d711f597c..5b52cbb411 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: 2020-08-04 01:05+0100\n"
+"POT-Creation-Date: 2021-07-18 12:38+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 9929d7fede..dbbd55717f 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: 2020-08-04 01:05+0100\n"
+"POT-Creation-Date: 2021-07-18 12:38+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/Blacklist/locale/Blacklist.pot b/plugins/Blacklist/locale/Blacklist.pot
index 187bd36f2d..8eade02d30 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: 2020-08-04 01:05+0100\n"
+"POT-Creation-Date: 2021-07-18 12:38+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -17,48 +17,6 @@ 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
@@ -129,3 +87,45 @@ 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 065112be2c..0eaf34f324 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: 2020-08-04 01:05+0100\n"
+"POT-Creation-Date: 2021-07-18 12:38+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 1f4bb4c001..d9b2a9d76c 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: 2020-08-04 01:05+0100\n"
+"POT-Creation-Date: 2021-07-18 12:38+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -18,36 +18,33 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#. TRANS: Client exception thrown when a bookmark is formatted incorrectly.
-#: classes/Bookmark.php:172
+#: classes/Bookmark.php:170
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
+#: classes/Bookmark.php:175
msgid "Expected exactly 1 link rel=related in a Bookmark, got 0."
msgstr ""
-#: classes/Bookmark.php:181
+#: classes/Bookmark.php:179
msgid "You must provide a non-empty title."
msgstr ""
-#: classes/Bookmark.php:184
+#: classes/Bookmark.php:182
msgid "Only web bookmarks can be posted (HTTP or HTTPS)."
msgstr ""
-#: classes/Bookmark.php:189
+#: classes/Bookmark.php:187
msgid "You have already bookmarked this URL."
msgstr ""
#. TRANS: Server exception thrown when a bookmark has multiple attachments.
-#: classes/Bookmark.php:230
+#: classes/Bookmark.php:228
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
+#: classes/Bookmark.php:344
#, php-format
msgid ""
"%2$s "
@@ -55,47 +52,6 @@ msgid ""
"span>"
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.
#: lib/deliciousbackupimporter.php:181
msgid "No tag in a ."
@@ -106,39 +62,6 @@ msgstr ""
msgid "Skipping private bookmark."
msgstr ""
-#. 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 "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."
@@ -151,6 +74,24 @@ msgstr ""
msgid "%1$s's bookmark for \"%2$s\""
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: Page title for sample plugin.
+#: actions/bookmarks.php:128
+msgid "Log in"
+msgstr ""
+
+#. TRANS: Page title for sample plugin. %s is a user nickname.
+#: actions/bookmarks.php:131
+#, php-format
+msgid "%s's bookmarks"
+msgstr ""
+
#. TRANS: Client exception thrown when an unknown URL is provided.
#: actions/noticebyurl.php:70
msgid "Unknown URL."
@@ -170,39 +111,6 @@ 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"
-msgstr ""
-
-#. TRANS: Page title for sample plugin. %s is a user nickname.
-#: actions/bookmarks.php:131
-#, php-format
-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
@@ -262,6 +170,33 @@ 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:64
+#, 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:70
+#, 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:76
+#, php-format
+msgid "File \"%s\" not readable."
+msgstr ""
+
#. TRANS: Success message after importing bookmarks.
#: actions/importdelicious.php:221
msgid ""
@@ -290,6 +225,21 @@ msgstr ""
msgid "Upload the file."
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: Plugin description.
#: BookmarkPlugin.php:189
msgid "Plugin for posting bookmarks. "
@@ -310,3 +260,50 @@ msgstr ""
msgctxt "TITLE"
msgid "Bookmark"
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: Field label on form for adding a new bookmark.
+#: forms/initialbookmark.php:78 forms/bookmark.php:118
+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:144
+msgctxt "LABEL"
+msgid "Title"
+msgstr ""
+
+#. TRANS: Field label on form for adding a new bookmark.
+#: forms/bookmark.php:156
+msgctxt "LABEL"
+msgid "Notes"
+msgstr ""
+
+#. TRANS: Field label on form for adding a new bookmark.
+#: forms/bookmark.php:167
+msgctxt "LABEL"
+msgid "Tags"
+msgstr ""
+
+#. TRANS: Field title on form for adding a new bookmark.
+#: forms/bookmark.php:170
+msgid "Comma- or space-separated list of tags."
+msgstr ""
+
+#. TRANS: Button text for action to save a new bookmark.
+#: forms/bookmark.php:196
+msgctxt "BUTTON"
+msgid "Save"
+msgstr ""
diff --git a/plugins/CacheLog/locale/CacheLog.pot b/plugins/CacheLog/locale/CacheLog.pot
index 572fb67b1d..489fccb476 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: 2020-08-04 01:05+0100\n"
+"POT-Creation-Date: 2021-07-18 12:38+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 40a26dfd91..2af3bead82 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: 2020-08-04 01:05+0100\n"
+"POT-Creation-Date: 2021-07-18 12:38+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -17,6 +17,22 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
+#. TRANS: Client error displayed when trying to log in while already logged on.
+#: actions/caslogin.php:29
+msgid "Already logged in."
+msgstr ""
+
+#. TRANS: Server error displayed when trying to log in with incorrect username or password.
+#. TRANS: Server error displayed when trying to log in with non-whitelisted user name (when whitelists are enabled.)
+#: actions/caslogin.php:41 actions/caslogin.php:46
+msgid "Incorrect username or password."
+msgstr ""
+
+#. TRANS: Server error displayed when login fails in CAS authentication plugin.
+#: actions/caslogin.php:52
+msgid "Error setting user. You are probably not authorized."
+msgstr ""
+
#. TRANS: Menu item. CAS is Central Authentication Service.
#: CasAuthenticationPlugin.php:65
msgid "CAS"
@@ -56,19 +72,3 @@ msgid ""
"The CAS Authentication plugin allows for StatusNet to handle authentication "
"through CAS (Central Authentication Service)."
msgstr ""
-
-#. TRANS: Client error displayed when trying to log in while already logged on.
-#: actions/caslogin.php:29
-msgid "Already logged in."
-msgstr ""
-
-#. TRANS: Server error displayed when trying to log in with incorrect username or password.
-#. TRANS: Server error displayed when trying to log in with non-whitelisted user name (when whitelists are enabled.)
-#: actions/caslogin.php:41 actions/caslogin.php:46
-msgid "Incorrect username or password."
-msgstr ""
-
-#. TRANS: Server error displayed when login fails in CAS authentication plugin.
-#: actions/caslogin.php:52
-msgid "Error setting user. You are probably not authorized."
-msgstr ""
diff --git a/plugins/ChooseTheme/locale/ChooseTheme.pot b/plugins/ChooseTheme/locale/ChooseTheme.pot
index 961a84cb5d..959d22eb5b 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: 2020-08-04 01:05+0100\n"
+"POT-Creation-Date: 2021-07-18 12:38+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -17,6 +17,22 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
+#. 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 ""
+
#. TRANS: Page title.
#: actions/choosethemesettings.php:37
msgid "Choose theme settings"
@@ -34,19 +50,3 @@ 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 e3bddf0dc9..d88a1d021c 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: 2020-08-04 01:05+0100\n"
+"POT-Creation-Date: 2021-07-18 12:38+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/Comet/locale/Comet.pot b/plugins/Comet/locale/Comet.pot
index 0e4621ad43..1140a5cd02 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: 2020-08-04 01:05+0100\n"
+"POT-Creation-Date: 2021-07-18 12:38+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/ConversationTree/locale/ConversationTree.pot b/plugins/ConversationTree/locale/ConversationTree.pot
index b78ea77f22..9ef5c7ec9d 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: 2020-08-04 01:05+0100\n"
+"POT-Creation-Date: 2021-07-18 12:38+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/Cronish/locale/Cronish.pot b/plugins/Cronish/locale/Cronish.pot
index 660a073182..6edce2891e 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: 2020-08-04 01:05+0100\n"
+"POT-Creation-Date: 2021-07-18 12:38+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
index 9f83e44977..482fe78149 100644
--- a/plugins/DBQueue/locale/DBQueue.pot
+++ b/plugins/DBQueue/locale/DBQueue.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-04 01:05+0100\n"
+"POT-Creation-Date: 2021-07-18 12:38+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/DefaultLayout/locale/DefaultLayout.pot b/plugins/DefaultLayout/locale/DefaultLayout.pot
index 84b8a830b6..08a1d5da18 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: 2020-08-04 01:05+0100\n"
+"POT-Creation-Date: 2021-07-18 12:38+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 1b0df822c3..fdb3452c0b 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: 2020-08-04 01:05+0100\n"
+"POT-Creation-Date: 2021-07-18 12:38+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 5dd1a38ed1..462bceb750 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: 2020-08-04 01:05+0100\n"
+"POT-Creation-Date: 2021-07-18 12:38+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -95,33 +95,6 @@ msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
msgstr[0] ""
msgstr[1] ""
-#. 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.
-#: actions/outbox.php:50
-#, php-format
-msgid "Outbox for %1$s - page %2$d"
-msgstr ""
-
-#. TRANS: Title for first page of outbox.
-#: actions/outbox.php:54
-#, php-format
-msgid "Outbox for %s"
-msgstr ""
-
-#. TRANS: Instructions for outbox.
-#: actions/outbox.php:84
-msgid "This is your outbox, which lists private messages you have sent."
-msgstr ""
-
#. TRANS: Client error displayed requesting a single message that does not exist.
#: actions/showmessage.php:63
msgid "No such message."
@@ -170,6 +143,33 @@ msgstr ""
msgid "This is your inbox, which lists your incoming private messages."
msgstr ""
+#. TRANS: Title for outbox for any but the fist page.
+#. TRANS: %1$s is the user nickname, %2$d is the page number.
+#: actions/outbox.php:50
+#, php-format
+msgid "Outbox for %1$s - page %2$d"
+msgstr ""
+
+#. TRANS: Title for first page of outbox.
+#: actions/outbox.php:54
+#, php-format
+msgid "Outbox for %s"
+msgstr ""
+
+#. TRANS: Instructions for outbox.
+#: actions/outbox.php:84
+msgid "This is your outbox, which lists private messages you have sent."
+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:99 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: Menu item in personal group navigation menu.
#: DirectMessagePlugin.php:149
msgctxt "MENU"
diff --git a/plugins/DirectionDetector/locale/DirectionDetector.pot b/plugins/DirectionDetector/locale/DirectionDetector.pot
index 4e7458d01e..20bdddeb37 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: 2020-08-04 01:05+0100\n"
+"POT-Creation-Date: 2021-07-18 12:38+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 19e991b22a..88abbda20d 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: 2020-08-04 01:05+0100\n"
+"POT-Creation-Date: 2021-07-18 12:38+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -17,21 +17,32 @@ 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
+#: lib/sortablesubscriptionlist.php:51 lib/sortablegrouplist.php:51
msgid "Nickname"
msgstr ""
#. TRANS: Column header in table for timestamp when user was created.
-#: lib/sortablegrouplist.php:53 lib/sortablesubscriptionlist.php:53
+#: lib/sortablesubscriptionlist.php:53 lib/sortablegrouplist.php:53
msgid "Created"
msgstr ""
-#. TRANS: Column header in table for members of a group.
-#: lib/sortablegrouplist.php:99
-msgid "Members"
-msgstr ""
-
#. TRANS: Column header for number of subscriptions.
#: lib/sortablesubscriptionlist.php:100
msgid "Subscriptions"
@@ -42,85 +53,9 @@ msgstr ""
msgid "Notices"
msgstr ""
-#. TRANS: Title for group directory page. %d is a page number.
-#: actions/groupdirectory.php:95
-#, php-format
-msgid "Group Directory, page %d"
-msgstr ""
-
-#. TRANS: Title for group directory page.
-#: actions/groupdirectory.php:98
-msgid "Group directory"
-msgstr ""
-
-#. TRANS: Title for group directory page when it is filtered.
-#. TRANS: %s is the filter string.
-#: actions/groupdirectory.php:103
-#, php-format
-msgid "Group directory - %s"
-msgstr ""
-
-#. TRANS: Title for group directory page when it is filtered.
-#. TRANS: %1$s is the filter string, %2$d is a page number.
-#: actions/groupdirectory.php:110
-#, php-format
-msgid "Group directory - %1$s, page %2$d"
-msgstr ""
-
-#. TRANS: Page instructions.
-#: actions/groupdirectory.php:125
-msgid ""
-"After you join a group you can send messages to all other members\n"
-"using the syntax \"!groupname\".\n"
-"\n"
-"Browse groups, or search for groups by their name, location or topic.\n"
-"Separate the terms by spaces; they must be three characters or more."
-msgstr ""
-
-#. TRANS: Link to create a new group on the group list page.
-#: actions/groupdirectory.php:184
-msgid "Create a new group"
-msgstr ""
-
-#. TRANS: Fieldset legend.
-#: actions/groupdirectory.php:244
-msgid "Search groups"
-msgstr ""
-
-#. TRANS: Field label for input of one or more keywords.
-#. TRANS: Field label for user directory filter.
-#: actions/groupdirectory.php:249 actions/userdirectory.php:241
-msgid "Keyword(s)"
-msgstr ""
-
-#. TRANS: Button text for searching group directory.
-#. TRANS: Button text.
-#: actions/groupdirectory.php:252 actions/userdirectory.php:244
-msgctxt "BUTTON"
-msgid "Search"
-msgstr ""
-
-#. TRANS: Empty list message for searching group directory.
-#. TRANS: %s is the search string.
-#: actions/groupdirectory.php:355
-#, php-format
-msgid "No groups starting with %s."
-msgstr ""
-
-#. TRANS: Empty list message for searching group directory.
-#. TRANS: Empty list message for user directory.
-#: actions/groupdirectory.php:359 actions/userdirectory.php:353
-msgid "No results."
-msgstr ""
-
-#. TRANS: Help text for searching group directory.
-#. TRANS: Standard search suggestions shown when a search does not give any results.
-#: actions/groupdirectory.php:361 actions/userdirectory.php:355
-msgid ""
-"* Make sure all words are spelled correctly.\n"
-"* Try different keywords.\n"
-"* Try more general keywords.\n"
-"* Try fewer keywords."
+#. TRANS: Column header in table for members of a group.
+#: lib/sortablegrouplist.php:99
+msgid "Members"
msgstr ""
#. TRANS: Page title for user directory. %d is a page number.
@@ -160,24 +95,89 @@ msgstr ""
msgid "Search site"
msgstr ""
+#. TRANS: Field label for user directory filter.
+#. TRANS: Field label for input of one or more keywords.
+#: actions/userdirectory.php:241 actions/groupdirectory.php:247
+msgid "Keyword(s)"
+msgstr ""
+
+#. TRANS: Button text.
+#. TRANS: Button text for searching group directory.
+#: actions/userdirectory.php:244 actions/groupdirectory.php:250
+msgctxt "BUTTON"
+msgid "Search"
+msgstr ""
+
#. TRANS: Empty list message for user directory.
#: actions/userdirectory.php:349
#, php-format
msgid "No users starting with %s"
msgstr ""
-#. TRANS: Menu item text for user directory.
-#: DirectoryPlugin.php:223
-msgctxt "MENU"
-msgid "People"
+#. TRANS: Empty list message for user directory.
+#. TRANS: Empty list message for searching group directory.
+#: actions/userdirectory.php:353 actions/groupdirectory.php:365
+msgid "No results."
msgstr ""
-#. TRANS: Menu item title for user directory.
-#: DirectoryPlugin.php:225
-msgid "People."
+#. TRANS: Standard search suggestions shown when a search does not give any results.
+#. TRANS: Help text for searching group directory.
+#: actions/userdirectory.php:355 actions/groupdirectory.php:367
+msgid ""
+"* Make sure all words are spelled correctly.\n"
+"* Try different keywords.\n"
+"* Try more general keywords.\n"
+"* Try fewer keywords."
msgstr ""
-#. TRANS: Plugin description.
-#: DirectoryPlugin.php:244
-msgid "Add a user directory."
+#. TRANS: Title for group directory page. %d is a page number.
+#: actions/groupdirectory.php:89
+#, php-format
+msgid "Group Directory, page %d"
+msgstr ""
+
+#. TRANS: Title for group directory page.
+#: actions/groupdirectory.php:92
+msgid "Group directory"
+msgstr ""
+
+#. TRANS: Title for group directory page when it is filtered.
+#. TRANS: %s is the filter string.
+#: actions/groupdirectory.php:97
+#, php-format
+msgid "Group directory - %s"
+msgstr ""
+
+#. TRANS: Title for group directory page when it is filtered.
+#. TRANS: %1$s is the filter string, %2$d is a page number.
+#: actions/groupdirectory.php:104
+#, php-format
+msgid "Group directory - %1$s, page %2$d"
+msgstr ""
+
+#. TRANS: Page instructions.
+#: actions/groupdirectory.php:119
+msgid ""
+"After you join a group you can send messages to all other members\n"
+"using the syntax \"!groupname\".\n"
+"\n"
+"Browse groups, or search for groups by their name, location or topic.\n"
+"Separate the terms by spaces; they must be three characters or more."
+msgstr ""
+
+#. TRANS: Link to create a new group on the group list page.
+#: actions/groupdirectory.php:180
+msgid "Create a new group"
+msgstr ""
+
+#. TRANS: Fieldset legend.
+#: actions/groupdirectory.php:242
+msgid "Search groups"
+msgstr ""
+
+#. TRANS: Empty list message for searching group directory.
+#. TRANS: %s is the search string.
+#: actions/groupdirectory.php:360
+#, php-format
+msgid "No groups starting with %s."
msgstr ""
diff --git a/plugins/DiskCache/locale/DiskCache.pot b/plugins/DiskCache/locale/DiskCache.pot
index 097db49181..216a0215a9 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: 2020-08-04 01:05+0100\n"
+"POT-Creation-Date: 2021-07-18 12:38+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:169
+#: DiskCachePlugin.php:170
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 ad70a4a487..770e9f90dd 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: 2020-08-04 01:05+0100\n"
+"POT-Creation-Date: 2021-07-18 12:38+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 1c40c65195..1a33b338a7 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: 2020-08-04 01:05+0100\n"
+"POT-Creation-Date: 2021-07-18 12:38+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -17,6 +17,42 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
+#: DomainWhitelistPlugin.php:86
+#, php-format
+msgid "Email address must be in this domain: %s."
+msgstr ""
+
+#: DomainWhitelistPlugin.php:93
+#, php-format
+msgid "Email address must be in one of these domains: %s."
+msgstr ""
+
+#. TRANS: Separator for whitelisted domains.
+#: DomainWhitelistPlugin.php:95
+msgctxt "SEPARATOR"
+msgid ", "
+msgstr ""
+
+#. TRANS: Exception thrown when an e-mail address does not match the site's domain whitelist.
+#: DomainWhitelistPlugin.php:108
+msgid "That email address is not allowed on this site."
+msgstr ""
+
+#. TRANS: Title for invitiation deletion dialog.
+#: DomainWhitelistPlugin.php:237
+msgid "Confirmation Required"
+msgstr ""
+
+#. TRANS: Confirmation text for invitation deletion dialog.
+#: DomainWhitelistPlugin.php:240
+msgid "Really delete this invitation?"
+msgstr ""
+
+#. TRANS: Plugin description.
+#: DomainWhitelistPlugin.php:277
+msgid "Restrict domains for email users."
+msgstr ""
+
#. TRANS: Form legend.
#: forms/whitelistinvite.php:89
msgid "Invite collegues"
@@ -47,43 +83,3 @@ msgstr ""
#: 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
-#, php-format
-msgid "Email address must be in this domain: %s."
-msgstr ""
-
-#. TRANS: Client exception thrown when a given e-mailaddress is not in the domain whitelist.
-#. TRANS: %s are whitelisted e-mail domains separated by comma's (localisable).
-#: DomainWhitelistPlugin.php:97
-#, php-format
-msgid "Email address must be in one of these domains: %s."
-msgstr ""
-
-#. TRANS: Separator for whitelisted domains.
-#: DomainWhitelistPlugin.php:99
-msgctxt "SEPARATOR"
-msgid ", "
-msgstr ""
-
-#. TRANS: Exception thrown when an e-mail address does not match the site's domain whitelist.
-#: DomainWhitelistPlugin.php:111
-msgid "That email address is not allowed on this site."
-msgstr ""
-
-#. TRANS: Title for invitiation deletion dialog.
-#: DomainWhitelistPlugin.php:240
-msgid "Confirmation Required"
-msgstr ""
-
-#. TRANS: Confirmation text for invitation deletion dialog.
-#: DomainWhitelistPlugin.php:243
-msgid "Really delete this invitation?"
-msgstr ""
-
-#. TRANS: Plugin description.
-#: DomainWhitelistPlugin.php:280
-msgid "Restrict domains for email users."
-msgstr ""
diff --git a/plugins/EmailAuthentication/locale/EmailAuthentication.pot b/plugins/EmailAuthentication/locale/EmailAuthentication.pot
index 93c1a20030..5f0279f188 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: 2020-08-04 01:05+0100\n"
+"POT-Creation-Date: 2021-07-18 12:38+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.
-#: EmailAuthenticationPlugin.php:62
+#: EmailAuthenticationPlugin.php:68
msgid ""
"The Email Authentication plugin allows users to login using their email "
"address."
diff --git a/plugins/EmailRegistration/locale/EmailRegistration.pot b/plugins/EmailRegistration/locale/EmailRegistration.pot
index 7563bbe8bb..21ae6d410d 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: 2020-08-04 01:05+0100\n"
+"POT-Creation-Date: 2021-07-18 12:38+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -17,94 +17,6 @@ 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
-#, php-format
-msgid ""
-"A user with that email address already exists. You can use the password recovery tool to recover a missing password."
-msgstr ""
-
-#. TRANS: Error text when trying to register with an invalid e-mail address.
-#: EmailRegistrationPlugin.php:108
-msgid "Not a valid email address."
-msgstr ""
-
-#. TRANS: Subject for confirmation e-mail.
-#. TRANS: %s is the StatusNet sitename.
-#: EmailRegistrationPlugin.php:152
-#, php-format
-msgid "Welcome to %s"
-msgstr ""
-
-#. TRANS: Plugin description.
-#: EmailRegistrationPlugin.php:185
-msgid "Use email only for registration."
-msgstr ""
-
#. TRANS: Client exception trown when registration by e-mail is not allowed.
#: actions/emailregister.php:84
msgid "Registration not allowed."
@@ -200,3 +112,91 @@ msgid ""
"%2$s\n"
"If it was not you, you can safely ignore this message."
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 ""
+
+#. 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
+#, php-format
+msgid ""
+"A user with that email address already exists. You can use the password recovery tool to recover a missing password."
+msgstr ""
+
+#. TRANS: Error text when trying to register with an invalid e-mail address.
+#: EmailRegistrationPlugin.php:108
+msgid "Not a valid email address."
+msgstr ""
+
+#. TRANS: Subject for confirmation e-mail.
+#. TRANS: %s is the StatusNet sitename.
+#: EmailRegistrationPlugin.php:152
+#, php-format
+msgid "Welcome to %s"
+msgstr ""
+
+#. TRANS: Plugin description.
+#: EmailRegistrationPlugin.php:185
+msgid "Use email only for registration."
+msgstr ""
diff --git a/plugins/EmailReminder/locale/EmailReminder.pot b/plugins/EmailReminder/locale/EmailReminder.pot
index 69b7e0cdc6..ed7b4a4d88 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: 2020-08-04 01:05+0100\n"
+"POT-Creation-Date: 2021-07-18 12:38+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -50,11 +50,11 @@ msgstr ""
msgid "Final reminder - you have been invited to join %s!"
msgstr ""
-#: scripts/sendemailreminder.php:68
-msgid "Unknown reminder type: "
-msgstr ""
-
#. TRANS: Plugin description.
#: EmailReminderPlugin.php:192
msgid "Send email reminders for various things."
msgstr ""
+
+#: scripts/sendemailreminder.php:68
+msgid "Unknown reminder type: "
+msgstr ""
diff --git a/plugins/EmailSummary/locale/EmailSummary.pot b/plugins/EmailSummary/locale/EmailSummary.pot
index 97a4a88ddf..240f3da0c3 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: 2020-08-04 01:05+0100\n"
+"POT-Creation-Date: 2021-07-18 12:38+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/Embed/locale/Embed.pot b/plugins/Embed/locale/Embed.pot
index 90e09a9c0e..3f5648fbfd 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: 2020-08-04 01:05+0100\n"
+"POT-Creation-Date: 2021-07-18 12:38+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -23,7 +23,11 @@ msgstr ""
msgid "Could not GET URL %s."
msgstr ""
+#: EmbedPlugin.php:557
+msgid "Untitled attachment"
+msgstr ""
+
#. TRANS: Plugin description.
-#: EmbedPlugin.php:687
+#: EmbedPlugin.php:722
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 4aca16e3d6..3313c8b9ab 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: 2020-08-04 01:05+0100\n"
+"POT-Creation-Date: 2021-07-18 12:38+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -118,6 +118,214 @@ msgstr ""
msgid "No end date for event."
msgstr ""
+#. 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: Plugin description.
+#: EventPlugin.php:110
+msgid "Event invitations and RSVPs."
+msgstr ""
+
+#. TRANS: Title for event application.
+#: EventPlugin.php:116
+msgctxt "TITLE"
+msgid "Event"
+msgstr ""
+
+#. TRANS: Exception thrown when event plugin comes across a unknown object type.
+#: EventPlugin.php:213
+msgid "Unknown object type."
+msgstr ""
+
+#. TRANS: Field label for event description.
+#: EventPlugin.php:340
+msgid "Time:"
+msgstr ""
+
+#. TRANS: Field label for event description.
+#: EventPlugin.php:357
+msgid "Location:"
+msgstr ""
+
+#. TRANS: Field label for event description.
+#: EventPlugin.php:365
+msgid "Description:"
+msgstr ""
+
+#. TRANS: Field label for event description.
+#: EventPlugin.php:375
+msgid "Attending:"
+msgstr ""
+
+#. TRANS: Content for a deleted RSVP list item (RSVP stands for "please respond").
+#: EventPlugin.php:418
+msgid "Deleted."
+msgstr ""
+
+#. TRANS: Menu item in sample plugin.
+#: EventPlugin.php:431
+msgid "Happenings"
+msgstr ""
+
+#. TRANS: Menu item title in sample plugin.
+#: EventPlugin.php:433
+msgid "A list of your events"
+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: 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: 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: Page title for sample plugin. %s is a user nickname.
+#: actions/events.php:20
+#, php-format
+msgid "%s's happenings"
+msgstr ""
+
+#. TRANS: Field label on form to RSVP ("please respond") for an event.
+#: forms/rsvp.php:98
+msgid "RSVP:"
+msgstr ""
+
+#: forms/rsvp.php:116
+msgctxt "BUTTON"
+msgid "Cancel"
+msgstr ""
+
+#. TRANS: Button text for RSVP ("please respond") reply to confirm attendence.
+#: forms/rsvp.php:119
+msgctxt "BUTTON"
+msgid "Yes"
+msgstr ""
+
+#. TRANS: Button text for RSVP ("please respond") reply to deny attendence.
+#: forms/rsvp.php:121
+msgctxt "BUTTON"
+msgid "No"
+msgstr ""
+
+#. TRANS: Button text for RSVP ("please respond") reply to indicate one might attend.
+#: forms/rsvp.php:123
+msgctxt "BUTTON"
+msgid "Maybe"
+msgstr ""
+
#. TRANS: Field label on event form.
#: forms/event.php:103
msgctxt "LABEL"
@@ -212,211 +420,3 @@ msgstr ""
msgctxt "BUTTON"
msgid "Save"
msgstr ""
-
-#. TRANS: Field label on form to RSVP ("please respond") for an event.
-#: forms/rsvp.php:98
-msgid "RSVP:"
-msgstr ""
-
-#: forms/rsvp.php:116
-msgctxt "BUTTON"
-msgid "Cancel"
-msgstr ""
-
-#. TRANS: Button text for RSVP ("please respond") reply to confirm attendence.
-#: forms/rsvp.php:119
-msgctxt "BUTTON"
-msgid "Yes"
-msgstr ""
-
-#. TRANS: Button text for RSVP ("please respond") reply to deny attendence.
-#: forms/rsvp.php:121
-msgctxt "BUTTON"
-msgid "No"
-msgstr ""
-
-#. TRANS: Button text for RSVP ("please respond") reply to indicate one might attend.
-#: forms/rsvp.php:123
-msgctxt "BUTTON"
-msgid "Maybe"
-msgstr ""
-
-#. 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: Page title for sample plugin. %s is a user nickname.
-#: actions/events.php:20
-#, php-format
-msgid "%s's happenings"
-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: 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: 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: 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: Plugin description.
-#: EventPlugin.php:110
-msgid "Event invitations and RSVPs."
-msgstr ""
-
-#. TRANS: Title for event application.
-#: EventPlugin.php:116
-msgctxt "TITLE"
-msgid "Event"
-msgstr ""
-
-#. TRANS: Exception thrown when event plugin comes across a unknown object type.
-#: EventPlugin.php:213
-msgid "Unknown object type."
-msgstr ""
-
-#. TRANS: Field label for event description.
-#: EventPlugin.php:340
-msgid "Time:"
-msgstr ""
-
-#. TRANS: Field label for event description.
-#: EventPlugin.php:357
-msgid "Location:"
-msgstr ""
-
-#. TRANS: Field label for event description.
-#: EventPlugin.php:365
-msgid "Description:"
-msgstr ""
-
-#. TRANS: Field label for event description.
-#: EventPlugin.php:375
-msgid "Attending:"
-msgstr ""
-
-#. TRANS: Content for a deleted RSVP list item (RSVP stands for "please respond").
-#: EventPlugin.php:418
-msgid "Deleted."
-msgstr ""
-
-#. TRANS: Menu item in sample plugin.
-#: EventPlugin.php:431
-msgid "Happenings"
-msgstr ""
-
-#. TRANS: Menu item title in sample plugin.
-#: EventPlugin.php:433
-msgid "A list of your events"
-msgstr ""
diff --git a/plugins/ExtendedProfile/locale/ExtendedProfile.pot b/plugins/ExtendedProfile/locale/ExtendedProfile.pot
index 84bc9d4b9a..1d3d3fcea4 100644
--- a/plugins/ExtendedProfile/locale/ExtendedProfile.pot
+++ b/plugins/ExtendedProfile/locale/ExtendedProfile.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-04 01:05+0100\n"
+"POT-Creation-Date: 2021-07-18 12:38+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -17,12 +17,100 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
+#: classes/GNUsocialProfileExtensionField.php:75
+msgid "Error creating new field."
+msgstr ""
+
#: classes/GNUsocialProfileExtensionResponse.php:74
msgid "Error creating new response."
msgstr ""
-#: classes/GNUsocialProfileExtensionField.php:75
-msgid "Error creating new field."
+#. TRANS: Title for extended profile entry deletion dialog.
+#: lib/extendedprofilewidget.php:84
+msgid "Confirmation Required"
+msgstr ""
+
+#. TRANS: Confirmation text for extended profile entry deletion dialog.
+#: lib/extendedprofilewidget.php:87
+msgid "Really delete this entry?"
+msgstr ""
+
+#. TRANS: Value between parentheses (phone number, website, or IM address).
+#: lib/extendedprofilewidget.php:171 lib/extendedprofilewidget.php:185
+#: lib/extendedprofilewidget.php:206
+#, php-format
+msgid "(%s)"
+msgstr ""
+
+#. TRANS: Field label in experience area of extended profile.
+#. TRANS: Field label in experience edit area of extended profile (which company does one work for).
+#: lib/extendedprofilewidget.php:329 lib/extendedprofilewidget.php:380
+msgid "Company"
+msgstr ""
+
+#. TRANS: Field label in extended profile (when did one start a position or education).
+#: lib/extendedprofilewidget.php:335 lib/extendedprofilewidget.php:388
+#: lib/extendedprofilewidget.php:434 lib/extendedprofilewidget.php:494
+msgid "Start"
+msgstr ""
+
+#. TRANS: Field label in extended profile (when did one end a position or education).
+#: lib/extendedprofilewidget.php:345 lib/extendedprofilewidget.php:396
+#: lib/extendedprofilewidget.php:444 lib/extendedprofilewidget.php:503
+msgid "End"
+msgstr ""
+
+#. TRANS: Field value in experience area of extended profile (one still holds a position).
+#: lib/extendedprofilewidget.php:360
+msgid "(Current)"
+msgstr ""
+
+#. TRANS: Checkbox label in experience edit area of extended profile (one still works at a company).
+#: lib/extendedprofilewidget.php:411
+msgid "Current"
+msgstr ""
+
+#. TRANS: Field label in education area of extended profile.
+#. TRANS: Field label in education edit area of extended profile.
+#. TRANS: Field label for extended profile properties.
+#: lib/extendedprofilewidget.php:424 lib/extendedprofilewidget.php:469
+#: lib/extendedprofile.php:254 lib/extendedprofile.php:267
+msgid "Institution"
+msgstr ""
+
+#. TRANS: Field label in extended profile for specifying an academic degree.
+#: lib/extendedprofilewidget.php:428 lib/extendedprofilewidget.php:477
+msgid "Degree"
+msgstr ""
+
+#. TRANS: Field label in education area of extended profile.
+#. TRANS: Field label in education edit area of extended profile.
+#: lib/extendedprofilewidget.php:431 lib/extendedprofilewidget.php:485
+#: actions/profilefieldsadminpanel.php:196
+msgid "Description"
+msgstr ""
+
+#. TRANS: Link description in extended profile page to add another profile element.
+#: lib/extendedprofilewidget.php:535
+msgid "Add another item"
+msgstr ""
+
+#. TRANS: Field label for undefined field in extended profile.
+#: lib/extendedprofilewidget.php:650
+#, php-format
+msgid "TYPE: %s"
+msgstr ""
+
+#. TRANS: Button text for saving extended profile properties.
+#: lib/extendedprofilewidget.php:665 actions/profilefieldsadminpanel.php:224
+msgctxt "BUTTON"
+msgid "Save"
+msgstr ""
+
+#. TRANS: .
+#. TRANS: Button title for saving extended profile properties.
+#: lib/extendedprofilewidget.php:670
+msgid "Save details"
msgstr ""
#. TRANS: Field label for extended profile properties.
@@ -45,14 +133,6 @@ msgstr ""
msgid "Employer"
msgstr ""
-#. TRANS: Field label for extended profile properties.
-#. TRANS: Field label in education area of extended profile.
-#. TRANS: Field label in education edit area of extended profile.
-#: lib/extendedprofile.php:254 lib/extendedprofile.php:267
-#: lib/extendedprofilewidget.php:426 lib/extendedprofilewidget.php:471
-msgid "Institution"
-msgstr ""
-
#. TRANS: Field label for extended profile properties.
#: lib/extendedprofile.php:313 lib/extendedprofile.php:362
msgid "Personal"
@@ -122,84 +202,58 @@ msgstr ""
msgid "Additional information"
msgstr ""
-#. TRANS: Title for extended profile entry deletion dialog.
-#: lib/extendedprofilewidget.php:85
-msgid "Confirmation Required"
+#. 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: Confirmation text for extended profile entry deletion dialog.
-#: lib/extendedprofilewidget.php:88
-msgid "Really delete this entry?"
+#. TRANS: Message given submitting a form with an unknown action.
+#: actions/profiledetailsettings.php:45
+msgid "Unexpected form submission."
msgstr ""
-#. TRANS: Value between parentheses (phone number, website, or IM address).
-#: lib/extendedprofilewidget.php:172 lib/extendedprofilewidget.php:185
-#: lib/extendedprofilewidget.php:209
+#. 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 "(%s)"
+msgid "You must supply a date for \"%s\"."
msgstr ""
-#. TRANS: Field label in experience area of extended profile.
-#. TRANS: Field label in experience edit area of extended profile (which company does one work for).
-#: lib/extendedprofilewidget.php:331 lib/extendedprofilewidget.php:382
-msgid "Company"
-msgstr ""
-
-#. TRANS: Field label in extended profile (when did one start a position or education).
-#: lib/extendedprofilewidget.php:337 lib/extendedprofilewidget.php:390
-#: lib/extendedprofilewidget.php:436 lib/extendedprofilewidget.php:496
-msgid "Start"
-msgstr ""
-
-#. TRANS: Field label in extended profile (when did one end a position or education).
-#: lib/extendedprofilewidget.php:347 lib/extendedprofilewidget.php:398
-#: lib/extendedprofilewidget.php:446 lib/extendedprofilewidget.php:505
-msgid "End"
-msgstr ""
-
-#. TRANS: Field value in experience area of extended profile (one still holds a position).
-#: lib/extendedprofilewidget.php:362
-msgid "(Current)"
-msgstr ""
-
-#. TRANS: Checkbox label in experience edit area of extended profile (one still works at a company).
-#: lib/extendedprofilewidget.php:413
-msgid "Current"
-msgstr ""
-
-#. TRANS: Field label in extended profile for specifying an academic degree.
-#: lib/extendedprofilewidget.php:430 lib/extendedprofilewidget.php:479
-msgid "Degree"
-msgstr ""
-
-#. TRANS: Field label in education area of extended profile.
-#. TRANS: Field label in education edit area of extended profile.
-#: lib/extendedprofilewidget.php:433 lib/extendedprofilewidget.php:487
-#: actions/profilefieldsadminpanel.php:196
-msgid "Description"
-msgstr ""
-
-#. TRANS: Link description in extended profile page to add another profile element.
-#: lib/extendedprofilewidget.php:537
-msgid "Add another item"
-msgstr ""
-
-#. TRANS: Field label for undefined field in extended profile.
-#: lib/extendedprofilewidget.php:652
+#. 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 "TYPE: %s"
+msgid "Invalid date entered for \"%1$s\": %2$s."
msgstr ""
-#. TRANS: Button text for saving extended profile properties.
-#: lib/extendedprofilewidget.php:667 actions/profilefieldsadminpanel.php:224
-msgctxt "BUTTON"
-msgid "Save"
+#. 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: .
-#. TRANS: Button title for saving extended profile properties.
-#: lib/extendedprofilewidget.php:672
-msgid "Save details"
+#. 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 ""
#: actions/profilefieldsadminpanel.php:39
@@ -293,60 +347,6 @@ msgstr ""
msgid "Edit"
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: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."
diff --git a/plugins/FFmpeg/locale/FFmpeg.pot b/plugins/FFmpeg/locale/FFmpeg.pot
index 023e887f6e..6cddd92825 100644
--- a/plugins/FFmpeg/locale/FFmpeg.pot
+++ b/plugins/FFmpeg/locale/FFmpeg.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-13 03:09+0100\n"
+"POT-Creation-Date: 2021-07-18 12:38+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.
-#: FFmpegPlugin.php:104
+#: FFmpegPlugin.php:155
msgid "Use PHP-FFMpeg for resizing animated GIFs"
msgstr ""
diff --git a/plugins/FeedPoller/locale/FeedPoller.pot b/plugins/FeedPoller/locale/FeedPoller.pot
index 07e568dfe5..9d2ce86b28 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: 2020-08-04 01:05+0100\n"
+"POT-Creation-Date: 2021-07-18 12:38+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 7d2fef933c..344342dcf8 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: 2020-08-04 01:05+0100\n"
+"POT-Creation-Date: 2021-07-18 12:38+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 dd638eced0..8bdfc6704c 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: 2020-08-04 01:05+0100\n"
+"POT-Creation-Date: 2021-07-18 12:38+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/ForceGroup/locale/ForceGroup.pot b/plugins/ForceGroup/locale/ForceGroup.pot
index 4c185bf58c..c16d9ec9e4 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: 2020-08-04 01:05+0100\n"
+"POT-Creation-Date: 2021-07-18 12:38+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/Geonames/locale/Geonames.pot b/plugins/Geonames/locale/Geonames.pot
index 7c4c313362..108cea977a 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: 2020-08-04 01:05+0100\n"
+"POT-Creation-Date: 2021-07-18 12:38+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/GroupFavorited/locale/GroupFavorited.pot b/plugins/GroupFavorited/locale/GroupFavorited.pot
index 3aaac00361..395d139ffc 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: 2020-08-04 01:05+0100\n"
+"POT-Creation-Date: 2021-07-18 12:38+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/GroupPrivateMessage/locale/GroupPrivateMessage.pot b/plugins/GroupPrivateMessage/locale/GroupPrivateMessage.pot
index d4bd524a97..f4a5eb2cf1 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: 2020-08-04 01:05+0100\n"
+"POT-Creation-Date: 2021-07-18 12:38+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -18,6 +18,32 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
+#. 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 set group privacy setting if group %s does not allow private messages.
#: classes/Group_privacy_settings.php:110
#, php-format
@@ -52,43 +78,13 @@ 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
+#: classes/Group_message.php:90 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
+#: classes/Group_message.php:106
#, 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."
@@ -96,131 +92,21 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Exception thrown when trying to send group private message to a non-existing group.
-#: classes/Group_message.php:153
+#: classes/Group_message.php:152
msgid "No group for group message."
msgstr ""
#. TRANS: Exception thrown when trying to send group private message without having a sender.
-#: classes/Group_message.php:163
+#: classes/Group_message.php:162
msgid "No sender for group message."
msgstr ""
-#. TRANS: Form legend for sending private message to group %s.
-#: forms/groupmessage.php:89
-#, php-format
-msgid "Message to %s"
-msgstr ""
-
-#. TRANS: Field label for private group message to group %s.
-#: forms/groupmessage.php:128
-#, php-format
-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.
-#: GroupPrivateMessagePlugin.php:114
-msgctxt "MENU"
-msgid "Inbox"
-msgstr ""
-
-#. TRANS: Menu title in group page.
-#: GroupPrivateMessagePlugin.php:116
-msgid "Private messages for this group."
-msgstr ""
-
-#. TRANS: Dropdown label in group settings page for if group allows private messages.
-#: GroupPrivateMessagePlugin.php:162
-msgid "Private messages"
-msgstr ""
-
-#. TRANS: Dropdown option in group settings page for allowing private messages.
-#: GroupPrivateMessagePlugin.php:164
-msgid "Sometimes"
-msgstr ""
-
-#. TRANS: Dropdown option in group settings page for allowing private messages.
-#: GroupPrivateMessagePlugin.php:166
-msgid "Always"
-msgstr ""
-
-#. TRANS: Dropdown option in group settings page for allowing private messages.
-#: GroupPrivateMessagePlugin.php:168
-msgid "Never"
-msgstr ""
-
-#. TRANS: Dropdown title in group settings page for if group allows private messages.
-#: GroupPrivateMessagePlugin.php:170
-msgid "Whether to allow private messages to this group."
-msgstr ""
-
-#. TRANS: Dropdown label in group settings page for who can send private messages to the group.
-#: GroupPrivateMessagePlugin.php:177
-msgid "Private senders"
-msgstr ""
-
-#. TRANS: Dropdown option in group settings page for who can send private messages.
-#: GroupPrivateMessagePlugin.php:179
-msgid "Everyone"
-msgstr ""
-
-#. TRANS: Dropdown option in group settings page for who can send private messages.
-#: GroupPrivateMessagePlugin.php:181
-msgid "Member"
-msgstr ""
-
-#. TRANS: Dropdown option in group settings page for who can send private messages.
-#: GroupPrivateMessagePlugin.php:183
-msgid "Admin"
-msgstr ""
-
-#. TRANS: Dropdown title in group settings page for who can send private messages to the group.
-#: GroupPrivateMessagePlugin.php:185
-msgid "Who can send private messages to the group."
-msgstr ""
-
-#. TRANS: Title for action in group actions list.
-#: GroupPrivateMessagePlugin.php:290
-msgid "Send a direct message to this group."
-msgstr ""
-
-#. TRANS: Link text for action in group actions list to send a private message to a group.
-#: GroupPrivateMessagePlugin.php:292
-msgctxt "LINKTEXT"
-msgid "Message"
-msgstr ""
-
-#. TRANS: Client exception thrown when a private group message has to be forced.
-#: GroupPrivateMessagePlugin.php:370
-msgid "Forced notice to private group message."
-msgstr ""
-
-#. TRANS: Indicator on the group page that the group is (essentially) private.
-#: GroupPrivateMessagePlugin.php:392
-msgid "Private"
-msgstr ""
-
-#. TRANS: Plugin description.
-#: GroupPrivateMessagePlugin.php:418
-msgid "Allow posting private messages to groups."
-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."
@@ -316,3 +202,113 @@ msgid ""
"This is the group inbox, which lists all incoming private messages for this "
"group."
msgstr ""
+
+#. TRANS: Menu item in group page.
+#: GroupPrivateMessagePlugin.php:114
+msgctxt "MENU"
+msgid "Inbox"
+msgstr ""
+
+#. TRANS: Menu title in group page.
+#: GroupPrivateMessagePlugin.php:116
+msgid "Private messages for this group."
+msgstr ""
+
+#. TRANS: Dropdown label in group settings page for if group allows private messages.
+#: GroupPrivateMessagePlugin.php:162
+msgid "Private messages"
+msgstr ""
+
+#. TRANS: Dropdown option in group settings page for allowing private messages.
+#: GroupPrivateMessagePlugin.php:164
+msgid "Sometimes"
+msgstr ""
+
+#. TRANS: Dropdown option in group settings page for allowing private messages.
+#: GroupPrivateMessagePlugin.php:166
+msgid "Always"
+msgstr ""
+
+#. TRANS: Dropdown option in group settings page for allowing private messages.
+#: GroupPrivateMessagePlugin.php:168
+msgid "Never"
+msgstr ""
+
+#. TRANS: Dropdown title in group settings page for if group allows private messages.
+#: GroupPrivateMessagePlugin.php:170
+msgid "Whether to allow private messages to this group."
+msgstr ""
+
+#. TRANS: Dropdown label in group settings page for who can send private messages to the group.
+#: GroupPrivateMessagePlugin.php:177
+msgid "Private senders"
+msgstr ""
+
+#. TRANS: Dropdown option in group settings page for who can send private messages.
+#: GroupPrivateMessagePlugin.php:179
+msgid "Everyone"
+msgstr ""
+
+#. TRANS: Dropdown option in group settings page for who can send private messages.
+#: GroupPrivateMessagePlugin.php:181
+msgid "Member"
+msgstr ""
+
+#. TRANS: Dropdown option in group settings page for who can send private messages.
+#: GroupPrivateMessagePlugin.php:183
+msgid "Admin"
+msgstr ""
+
+#. TRANS: Dropdown title in group settings page for who can send private messages to the group.
+#: GroupPrivateMessagePlugin.php:185
+msgid "Who can send private messages to the group."
+msgstr ""
+
+#. TRANS: Title for action in group actions list.
+#: GroupPrivateMessagePlugin.php:290
+msgid "Send a direct message to this group."
+msgstr ""
+
+#. TRANS: Link text for action in group actions list to send a private message to a group.
+#: GroupPrivateMessagePlugin.php:292
+msgctxt "LINKTEXT"
+msgid "Message"
+msgstr ""
+
+#. TRANS: Client exception thrown when a private group message has to be forced.
+#: GroupPrivateMessagePlugin.php:370
+msgid "Forced notice to private group message."
+msgstr ""
+
+#. TRANS: Indicator on the group page that the group is (essentially) private.
+#: GroupPrivateMessagePlugin.php:392
+msgid "Private"
+msgstr ""
+
+#. TRANS: Plugin description.
+#: GroupPrivateMessagePlugin.php:418
+msgid "Allow posting private messages to groups."
+msgstr ""
+
+#. TRANS: Form legend for sending private message to group %s.
+#: forms/groupmessage.php:89
+#, php-format
+msgid "Message to %s"
+msgstr ""
+
+#. TRANS: Field label for private group message to group %s.
+#: forms/groupmessage.php:128
+#, php-format
+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 ""
diff --git a/plugins/ImageMagick/locale/ImageMagick.pot b/plugins/ImageMagick/locale/ImageMagick.pot
index 7b4f38697a..bf909046ed 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: 2020-08-04 01:05+0100\n"
+"POT-Creation-Date: 2021-07-18 12:38+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.
-#: ImageMagickPlugin.php:145
+#: ImageMagickPlugin.php:78
msgid "Use ImageMagick for some more image support."
msgstr ""
diff --git a/plugins/Imap/locale/Imap.pot b/plugins/Imap/locale/Imap.pot
index 5514acf71c..fd9e9651b1 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: 2020-08-04 01:05+0100\n"
+"POT-Creation-Date: 2021-07-18 12:38+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -17,11 +17,6 @@ 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 ""
@@ -29,6 +24,11 @@ msgid ""
"\"get()\" method."
msgstr ""
+#. TRANS: E-mail subject in case of an error.
+#: lib/imapmailhandler.php:31
+msgid "Error"
+msgstr ""
+
#. TRANS: Exception thrown when configuration of the IMAP plugin is incorrect.
#: ImapPlugin.php:57
msgid "A mailbox must be specified."
diff --git a/plugins/InProcessCache/locale/InProcessCache.pot b/plugins/InProcessCache/locale/InProcessCache.pot
index 4403ec7f12..7cabfc108f 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: 2020-08-04 01:05+0100\n"
+"POT-Creation-Date: 2021-07-18 12:38+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/InfiniteScroll/locale/InfiniteScroll.pot b/plugins/InfiniteScroll/locale/InfiniteScroll.pot
index e870a917cb..19ad79e824 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: 2020-08-04 01:05+0100\n"
+"POT-Creation-Date: 2021-07-18 12:38+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/LRDD/locale/LRDD.pot b/plugins/LRDD/locale/LRDD.pot
index 85e79e1cbb..846f3c2bcb 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: 2020-08-04 01:05+0100\n"
+"POT-Creation-Date: 2021-07-18 12:38+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 ba67d8ba1f..29a1b6ad4c 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: 2020-08-04 01:05+0100\n"
+"POT-Creation-Date: 2021-07-18 12:38+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 845b8eea6e..b239e156a4 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: 2020-08-04 01:05+0100\n"
+"POT-Creation-Date: 2021-07-18 12:38+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 36efd3dea0..75a0cf31e1 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: 2020-08-04 01:05+0100\n"
+"POT-Creation-Date: 2021-07-18 12:38+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 8b77e8b786..f9afb2e2cc 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: 2020-08-04 01:05+0100\n"
+"POT-Creation-Date: 2021-07-18 12:38+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 64b6cbb401..9aef59b8c2 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: 2020-08-04 01:05+0100\n"
+"POT-Creation-Date: 2021-07-18 12:38+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -17,11 +17,6 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#. TRANS: Plugin description.
-#: LinkPreviewPlugin.php:42
-msgid "UI extension for previewing thumbnails from links."
-msgstr ""
-
#. TRANS: Client error displayed when the session token does not match or is not given.
#: actions/oembedproxy.php:58
msgid "There was a problem with your session token. Try again, please."
@@ -36,3 +31,8 @@ msgstr ""
#: actions/oembedproxy.php:71
msgid "Invalid URL."
msgstr ""
+
+#. TRANS: Plugin description.
+#: LinkPreviewPlugin.php:42
+msgid "UI extension for previewing thumbnails from links."
+msgstr ""
diff --git a/plugins/Linkback/locale/Linkback.pot b/plugins/Linkback/locale/Linkback.pot
index eac76341fe..95460ca495 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: 2020-08-04 01:05+0100\n"
+"POT-Creation-Date: 2021-07-18 12:38+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -17,62 +17,6 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#: lib/util.php:211
-msgid "linked to this from \n"
"Language-Team: LANGUAGE \n"
diff --git a/plugins/Mapstraction/locale/Mapstraction.pot b/plugins/Mapstraction/locale/Mapstraction.pot
index 94bd02d149..e327227402 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: 2020-08-04 01:05+0100\n"
+"POT-Creation-Date: 2021-07-18 12:38+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -17,6 +17,23 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
+#. 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
@@ -31,23 +48,6 @@ msgstr ""
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"
diff --git a/plugins/Memcached/locale/Memcached.pot b/plugins/Memcached/locale/Memcached.pot
index cc721a82cd..2ad465c9c4 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: 2020-08-04 01:05+0100\n"
+"POT-Creation-Date: 2021-07-18 12:38+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:270
+#: MemcachedPlugin.php:278
msgid ""
"Use Memcached to cache query results."
msgstr ""
diff --git a/plugins/MentionURL/locale/MentionURL.pot b/plugins/MentionURL/locale/MentionURL.pot
index 51bb9d0969..1e1e6abfd6 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: 2020-08-04 01:05+0100\n"
+"POT-Creation-Date: 2021-07-18 12:38+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 4f3060e451..e90141fc2c 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: 2020-08-04 01:05+0100\n"
+"POT-Creation-Date: 2021-07-18 12:38+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/MobileProfile/locale/MobileProfile.pot b/plugins/MobileProfile/locale/MobileProfile.pot
index bb79954dc0..ce9cf73b66 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: 2020-08-04 01:05+0100\n"
+"POT-Creation-Date: 2021-07-18 12:38+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 73f4cbf488..65207016c1 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: 2020-08-04 01:05+0100\n"
+"POT-Creation-Date: 2021-07-18 12:38+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 f8ca3130eb..3065b90e66 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: 2020-08-04 01:05+0100\n"
+"POT-Creation-Date: 2021-07-18 12:38+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/ModPlus/locale/ModPlus.pot b/plugins/ModPlus/locale/ModPlus.pot
index ec40cc16ea..c175ab2a77 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: 2020-08-04 01:05+0100\n"
+"POT-Creation-Date: 2021-07-18 12:38+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 e6c63dc4fd..25290a8650 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: 2020-08-04 01:05+0100\n"
+"POT-Creation-Date: 2021-07-18 12:38+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: Client exception thrown when notice content triggers the spam filter.
-#: MollomPlugin.php:87
+#: MollomPlugin.php:85
msgid "Spam Detected."
msgstr ""
diff --git a/plugins/Nodeinfo/locale/Nodeinfo.pot b/plugins/Nodeinfo/locale/Nodeinfo.pot
index c16a4bdad8..957f03de95 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: 2020-08-04 01:05+0100\n"
+"POT-Creation-Date: 2021-07-18 12:38+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 41ab19b23f..755de94a3e 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: 2020-08-04 01:05+0100\n"
+"POT-Creation-Date: 2021-07-18 12:38+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 616c2767a5..af77690df1 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: 2020-08-04 01:05+0100\n"
+"POT-Creation-Date: 2021-07-18 12:38+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -17,19 +17,10 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#. 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
+#. TRANS: Client exception. %s is a HTTP status code.
+#: classes/HubSub.php:233
#, php-format
-msgid "Unexpected HTTP status: %d"
+msgid "Hub subscriber verification returned HTTP %s."
msgstr ""
#. TRANS: Server exception. %s is a URI
@@ -79,96 +70,86 @@ msgid "Cannot find enough profile information to make a feed."
msgstr ""
#. TRANS: Server exception.
-#: classes/Ostatus_profile.php:1113
+#: classes/Ostatus_profile.php:1116
msgid "No author ID URI found."
msgstr ""
#. TRANS: Exception.
-#: classes/Ostatus_profile.php:1141
+#: classes/Ostatus_profile.php:1144
msgid "No profile URI."
msgstr ""
#. TRANS: Exception.
-#: classes/Ostatus_profile.php:1147
+#: classes/Ostatus_profile.php:1150
msgid "Local user cannot be referenced as remote."
msgstr ""
#. TRANS: Exception.
-#: classes/Ostatus_profile.php:1152
+#: classes/Ostatus_profile.php:1155
msgid "Local group cannot be referenced as remote."
msgstr ""
#. TRANS: Exception.
-#: classes/Ostatus_profile.php:1160
+#: classes/Ostatus_profile.php:1163
msgid "Local list cannot be referenced as remote."
msgstr ""
#. TRANS: Server exception.
-#: classes/Ostatus_profile.php:1221 classes/Ostatus_profile.php:1302
+#: classes/Ostatus_profile.php:1224 classes/Ostatus_profile.php:1305
msgid "Cannot save OStatus profile."
msgstr ""
#. TRANS: Server exception.
-#: classes/Ostatus_profile.php:1240 classes/Ostatus_profile.php:1280
+#: classes/Ostatus_profile.php:1243 classes/Ostatus_profile.php:1283
msgid "Cannot save local profile."
msgstr ""
#. TRANS: Server exception.
-#: classes/Ostatus_profile.php:1293
+#: classes/Ostatus_profile.php:1296
msgid "Cannot save local list."
msgstr ""
#. TRANS: Exception.
-#: classes/Ostatus_profile.php:1630
+#: classes/Ostatus_profile.php:1633
msgid "Not a valid webfinger address (via cache)."
msgstr ""
#. TRANS: Exception.
-#: classes/Ostatus_profile.php:1659 scripts/update_ostatus_profiles.php:152
+#: classes/Ostatus_profile.php:1662 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
+#: classes/Ostatus_profile.php:1743
#, php-format
msgid "Could not save profile for \"%s\"."
msgstr ""
#. TRANS: Exception. %s is a webfinger address.
-#: classes/Ostatus_profile.php:1760
+#: classes/Ostatus_profile.php:1763
#, 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
+#: classes/Ostatus_profile.php:1771 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
+#. 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 "Hub subscriber verification returned HTTP %s."
-msgstr ""
-
-#. TRANS: Exception.
-#: lib/magicenvelope.php:137
-msgid "Unable to locate signer public key."
-msgstr ""
-
-#. TRANS: Exception when public key was not properly formatted.
-#: lib/magicenvelope.php:161
-msgid "Incorrectly formatted public key element."
-msgstr ""
-
-#: lib/magicenvelope.php:260
-msgid "Salmon post must be an Atom entry."
-msgstr ""
-
-#. TRANS: Client error when incoming salmon slap signature does not verify cryptographically.
-#: lib/magicenvelope.php:362
-msgid "Salmon signature verification failed."
+msgid "Unexpected HTTP status: %d"
msgstr ""
#. TRANS: Client error. Do not translate "Content-type"
@@ -226,533 +207,23 @@ 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"
+#. TRANS: Exception.
+#: lib/magicenvelope.php:137
+msgid "Unable to locate signer public key."
msgstr ""
-#. TRANS: Client exception.
-#: actions/pushhub.php:66
-msgid "Publishing outside feeds not supported."
+#. TRANS: Exception when public key was not properly formatted.
+#: lib/magicenvelope.php:161
+msgid "Incorrectly formatted public key element."
msgstr ""
-#. TRANS: Client exception. %s is a mode.
-#: actions/pushhub.php:69
-#, php-format
-msgid "Unrecognized mode \"%s\"."
+#: lib/magicenvelope.php:260
+msgid "Salmon post must be an Atom entry."
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"
-msgstr ""
-
-#. TRANS: Tooltip for field label "Subscribe to".
-#: actions/ostatussub.php:97
-msgid ""
-"OStatus user's address, like nickname@example.com or http://example.net/"
-"nickname."
-msgstr ""
-
-#. TRANS: Button text.
-#: actions/ostatussub.php:136
-msgid "Join"
-msgstr ""
-
-#. TRANS: Tooltip for button "Join".
-#: actions/ostatussub.php:138
-msgctxt "BUTTON"
-msgid "Join this group"
-msgstr ""
-
-#. TRANS: Button text.
-#: actions/ostatussub.php:141
-msgctxt "BUTTON"
-msgid "Confirm"
-msgstr ""
-
-#. TRANS: Tooltip for button "Confirm".
-#: actions/ostatussub.php:143
-msgid "Subscribe to this user"
-msgstr ""
-
-#. TRANS: Extra paragraph in remote profile view when already subscribed.
-#: actions/ostatussub.php:164
-msgid "You are already subscribed to this user."
-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: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."
-msgstr ""
-
-#. TRANS: Error text.
-#: actions/ostatussub.php:271 actions/ostatussub.php:275
-#: actions/ostatussub.php:279 actions/ostatussub.php:283
-#: actions/ostatussub.php:287
-msgid ""
-"Sorry, we could not reach that feed. Please try that OStatus address again "
-"later."
-msgstr ""
-
-#. TRANS: Error text.
-#: actions/ostatussub.php:291
-msgid "Sorry, that feed is not Pubsubhubub enabled."
-msgstr ""
-
-#. TRANS: OStatus remote subscription dialog error.
-#. TRANS: OStatus remote group subscription dialog error.
-#: actions/ostatussub.php:328 actions/ostatuspeopletag.php:144
-msgid "Already subscribed!"
-msgstr ""
-
-#. TRANS: OStatus remote subscription dialog error.
-#: actions/ostatussub.php:333
-msgid "Remote subscription failed!"
-msgstr ""
-
-#. TRANS: Client error displayed when the session token does not match or is not given.
-#: actions/ostatussub.php:349 actions/ostatusinit.php:68
-msgid "There was a problem with your session token. Try again, please."
-msgstr ""
-
-#. TRANS: Form title.
-#: actions/ostatussub.php:375
-msgid "Subscribe to user"
-msgstr ""
-
-#. TRANS: Page title for OStatus remote subscription form.
-#: actions/ostatussub.php:395
-msgid "Confirm"
-msgstr ""
-
-#: actions/ostatussub.php:395
-msgid "Remote subscription"
-msgstr ""
-
-#. TRANS: Instructions.
-#: actions/ostatussub.php:407
-msgid ""
-"You can subscribe to users from other supported sites. Paste their address "
-"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 ""
-"The owner of this salmon endpoint was not in the context of the carried slap."
-msgstr ""
-
-#. TRANS: Client exception thrown when an undefied activity is performed.
-#: actions/usersalmon.php:95
-msgid "Cannot handle that kind of post."
-msgstr ""
-
-#. TRANS: Client exception.
-#: actions/usersalmon.php:136 actions/usersalmon.php:168
-msgid "Not a person object."
-msgstr ""
-
-#. TRANS: Client exception.
-#: actions/usersalmon.php:143
-msgid "Unidentified profile being listed."
-msgstr ""
-
-#. TRANS: Client exception.
-#: actions/usersalmon.php:148
-msgid "This user is not the one being listed."
-msgstr ""
-
-#. TRANS: Client exception.
-#: actions/usersalmon.php:158
-msgid "The listing could not be saved."
-msgstr ""
-
-#. TRANS: Client exception.
-#: actions/usersalmon.php:175
-msgid "Unidentified profile being unlisted."
-msgstr ""
-
-#. TRANS: Client exception.
-#: actions/usersalmon.php:180
-msgid "This user is not the one being unlisted."
-msgstr ""
-
-#. TRANS: Client exception.
-#: actions/usersalmon.php:191
-msgid "The listing could not be deleted."
-msgstr ""
-
-#. TRANS: Client exception.
-#: actions/usersalmon.php:212
-msgid "Cannot handle that kind of object for liking/faving."
-msgstr ""
-
-#. TRANS: Client exception. %s is an object ID.
-#: actions/usersalmon.php:219
-#, php-format
-msgid "Notice with ID %s unknown."
-msgstr ""
-
-#. TRANS: Client exception. %1$s is a notice ID, %2$s is a user ID.
-#: actions/usersalmon.php:224
-#, php-format
-msgid "Notice with ID %1$s not posted by %2$s."
-msgstr ""
-
-#. TRANS: Client error displayed when trying to list a local object as if it is remote.
-#: actions/ostatustag.php:40
-msgid "You can use the local list functionality!"
-msgstr ""
-
-#. TRANS: Header for listing a remote object. %s is a remote object's name.
-#: actions/ostatustag.php:54
-#, php-format
-msgid "List %s"
-msgstr ""
-
-#. TRANS: Button text to list a remote object.
-#: actions/ostatustag.php:56
-msgctxt "BUTTON"
-msgid "Go"
-msgstr ""
-
-#. TRANS: Field title.
-#: actions/ostatustag.php:70
-msgid "Nickname of the user you want to list."
-msgstr ""
-
-#. TRANS: Field title.
-#: actions/ostatustag.php:76
-msgid "Your account id (for example user@example.com)."
-msgstr ""
-
-#. TRANS: Title for an OStatus list.
-#: actions/ostatustag.php:121
-msgid "OStatus list"
-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
-msgid "No ID."
-msgstr ""
-
-#. TRANS: Client error.
-#: actions/groupsalmon.php:54
-msgid "Cannot accept remote posts for a remote group."
-msgstr ""
-
-#. TRANS: Client error.
-#: actions/groupsalmon.php:129
-msgid "Groups cannot join groups."
-msgstr ""
-
-#. TRANS: Client error displayed when trying to join a group the user is blocked from by a group admin.
-#: actions/groupsalmon.php:142
-msgid "You have been blocked from that group by the admin."
-msgstr ""
-
-#. TRANS: Server error. %1$s is a profile URI, %2$s is a group nickname.
-#: actions/groupsalmon.php:149
-#, php-format
-msgid "Could not join remote user %1$s to group %2$s."
-msgstr ""
-
-#. TRANS: Client error displayed when trying to have a group join another group.
-#: actions/groupsalmon.php:161
-msgid "Groups cannot be members of groups"
-msgstr ""
-
-#. TRANS: Server error. %1$s is a profile URI, %2$s is a group nickname.
-#: actions/groupsalmon.php:170
-#, php-format
-msgid "Could not remove remote user %1$s from group %2$s."
-msgstr ""
-
-#. TRANS: Client error displayed when trying to send a message to a remote list.
-#: actions/peopletagsalmon.php:54
-msgid "Cannot accept remote posts for a remote list."
-msgstr ""
-
-#. TRANS: Client error displayed when trying to subscribe a group to a list.
-#. TRANS: Client error displayed when trying to unsubscribe a group from a list.
-#: actions/peopletagsalmon.php:91 actions/peopletagsalmon.php:124
-msgid "Groups cannot subscribe to lists."
-msgstr ""
-
-#. TRANS: Server error displayed when subscribing a remote user to a list fails.
-#. TRANS: %1$s is a profile URI, %2$s is a list name.
-#: actions/peopletagsalmon.php:109
-#, php-format
-msgid "Could not subscribe remote user %1$s to list %2$s."
-msgstr ""
-
-#. TRANS: Client error displayed when trying to unsubscribe a remote user from a list fails.
-#. TRANS: %1$s is a profile URL, %2$s is a list name.
-#: actions/peopletagsalmon.php:133
-#, php-format
-msgid "Could not unsubscribe remote user %1$s from list %2$s."
-msgstr ""
-
-#. TRANS: Server exception thrown when referring to a non-existing or empty feed.
-#: actions/pushcallback.php:51
-msgid "Empty or invalid feed id."
-msgstr ""
-
-#. TRANS: Server exception. %s is a feed ID.
-#: actions/pushcallback.php:57
-#, php-format
-msgid "Unknown WebSub subscription feed id %s"
-msgstr ""
-
-#. TRANS: Client exception. %s is an invalid feed name.
-#: actions/pushcallback.php:96
-#, php-format
-msgid "Bad hub.topic feed \"%s\"."
-msgstr ""
-
-#. TRANS: Client exception. %s is an invalid topic.
-#: actions/pushcallback.php:103
-#, php-format
-msgid "Unexpected subscribe request for %s."
-msgstr ""
-
-#. TRANS: Client exception. %s is an invalid topic.
-#: actions/pushcallback.php:108
-#, php-format
-msgid "Unexpected unsubscribe request for %s."
+#. TRANS: Client error when incoming salmon slap signature does not verify cryptographically.
+#: lib/magicenvelope.php:362
+msgid "Salmon signature verification failed."
msgstr ""
#. TRANS: Link to subscribe to a remote entity.
@@ -765,6 +236,15 @@ msgstr ""
msgid "Invalid URI."
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.
+#: OStatusPlugin.php:293 actions/ostatussub.php:259 actions/ostatussub.php:267
+#: actions/ostatussub.php:297
+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."
+msgstr ""
+
#. TRANS: Title. %s is a domain name.
#: OStatusPlugin.php:658
#, php-format
@@ -917,3 +397,522 @@ msgid ""
"Follow people across social networks that implement OStatus."
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
+msgid "No ID."
+msgstr ""
+
+#. TRANS: Client error.
+#: actions/groupsalmon.php:45 actions/ostatusinit.php:226
+msgid "No such group."
+msgstr ""
+
+#. TRANS: Client error.
+#: actions/groupsalmon.php:54
+msgid "Cannot accept remote posts for a remote group."
+msgstr ""
+
+#. TRANS: Client error.
+#: actions/groupsalmon.php:129
+msgid "Groups cannot join groups."
+msgstr ""
+
+#. TRANS: Client error displayed when trying to join a group the user is blocked from by a group admin.
+#: actions/groupsalmon.php:142
+msgid "You have been blocked from that group by the admin."
+msgstr ""
+
+#. TRANS: Server error. %1$s is a profile URI, %2$s is a group nickname.
+#: actions/groupsalmon.php:149
+#, php-format
+msgid "Could not join remote user %1$s to group %2$s."
+msgstr ""
+
+#. TRANS: Client error displayed when trying to have a group join another group.
+#: actions/groupsalmon.php:161
+msgid "Groups cannot be members of groups"
+msgstr ""
+
+#. TRANS: Server error. %1$s is a profile URI, %2$s is a group nickname.
+#: actions/groupsalmon.php:170
+#, php-format
+msgid "Could not remove remote user %1$s from group %2$s."
+msgstr ""
+
+#. TRANS: Server exception thrown when referring to a non-existing or empty feed.
+#: actions/pushcallback.php:51
+msgid "Empty or invalid feed id."
+msgstr ""
+
+#. TRANS: Server exception. %s is a feed ID.
+#: actions/pushcallback.php:57
+#, php-format
+msgid "Unknown WebSub subscription feed id %s"
+msgstr ""
+
+#. TRANS: Client exception. %s is an invalid feed name.
+#: actions/pushcallback.php:96
+#, php-format
+msgid "Bad hub.topic feed \"%s\"."
+msgstr ""
+
+#. TRANS: Client exception. %s is an invalid topic.
+#: actions/pushcallback.php:103
+#, php-format
+msgid "Unexpected subscribe request for %s."
+msgstr ""
+
+#. TRANS: Client exception. %s is an invalid topic.
+#: actions/pushcallback.php:108
+#, php-format
+msgid "Unexpected unsubscribe request for %s."
+msgstr ""
+
+#. TRANS: Client exception.
+#: actions/usersalmon.php:69
+msgid ""
+"The owner of this salmon endpoint was not in the context of the carried slap."
+msgstr ""
+
+#. TRANS: Client exception thrown when an undefied activity is performed.
+#: actions/usersalmon.php:95
+msgid "Cannot handle that kind of post."
+msgstr ""
+
+#. TRANS: Client exception.
+#: actions/usersalmon.php:136 actions/usersalmon.php:168
+msgid "Not a person object."
+msgstr ""
+
+#. TRANS: Client exception.
+#: actions/usersalmon.php:143
+msgid "Unidentified profile being listed."
+msgstr ""
+
+#. TRANS: Client exception.
+#: actions/usersalmon.php:148
+msgid "This user is not the one being listed."
+msgstr ""
+
+#. TRANS: Client exception.
+#: actions/usersalmon.php:158
+msgid "The listing could not be saved."
+msgstr ""
+
+#. TRANS: Client exception.
+#: actions/usersalmon.php:175
+msgid "Unidentified profile being unlisted."
+msgstr ""
+
+#. TRANS: Client exception.
+#: actions/usersalmon.php:180
+msgid "This user is not the one being unlisted."
+msgstr ""
+
+#. TRANS: Client exception.
+#: actions/usersalmon.php:191
+msgid "The listing could not be deleted."
+msgstr ""
+
+#. TRANS: Client exception.
+#: actions/usersalmon.php:212
+msgid "Cannot handle that kind of object for liking/faving."
+msgstr ""
+
+#. TRANS: Client exception. %s is an object ID.
+#: actions/usersalmon.php:219
+#, php-format
+msgid "Notice with ID %s unknown."
+msgstr ""
+
+#. TRANS: Client exception. %1$s is a notice ID, %2$s is a user ID.
+#: actions/usersalmon.php:224
+#, php-format
+msgid "Notice with ID %1$s not posted by %2$s."
+msgstr ""
+
+#. TRANS: Client exception.
+#: actions/pushhub.php:64
+msgid "Publishing outside feeds not supported."
+msgstr ""
+
+#. TRANS: Client exception. %s is a mode.
+#: actions/pushhub.php:70
+#, php-format
+msgid "Unrecognized mode \"%s\"."
+msgstr ""
+
+#. TRANS: Client exception. %s is a topic.
+#: actions/pushhub.php:95
+#, php-format
+msgid ""
+"Unsupported hub.topic %s this hub only serves local user and group Atom "
+"feeds."
+msgstr ""
+
+#: actions/pushhub.php:105
+#, 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:115
+#, 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:171
+#, php-format
+msgid "Invalid hub.topic \"%s\". User does not exist."
+msgstr ""
+
+#. TRANS: Client exception. %s is a feed URL.
+#: actions/pushhub.php:182
+#, php-format
+msgid "Invalid hub.topic \"%s\". Local_group does not exist."
+msgstr ""
+
+#. TRANS: Client exception. %s is a feed URL.
+#: actions/pushhub.php:206
+#, 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:234
+#, php-format
+msgid "Invalid URL passed for %1$s: \"%2$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: Button text to continue joining a remote list.
+#. TRANS: Button text.
+#: actions/ostatuspeopletag.php:82 actions/ostatusgroup.php:83
+#: actions/ostatussub.php:101
+msgctxt "BUTTON"
+msgid "Continue"
+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: OStatus remote group subscription dialog error.
+#. TRANS: OStatus remote subscription dialog error.
+#: actions/ostatuspeopletag.php:144 actions/ostatussub.php:328
+msgid "Already subscribed!"
+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 error displayed when referring to a non-existing list.
+#. TRANS: Client error.
+#: actions/peopletagsalmon.php:45 actions/ostatusinit.php:241
+msgid "No such list."
+msgstr ""
+
+#. TRANS: Client error displayed when trying to send a message to a remote list.
+#: actions/peopletagsalmon.php:54
+msgid "Cannot accept remote posts for a remote list."
+msgstr ""
+
+#. TRANS: Client error displayed when trying to subscribe a group to a list.
+#. TRANS: Client error displayed when trying to unsubscribe a group from a list.
+#: actions/peopletagsalmon.php:91 actions/peopletagsalmon.php:124
+msgid "Groups cannot subscribe to lists."
+msgstr ""
+
+#. TRANS: Server error displayed when subscribing a remote user to a list fails.
+#. TRANS: %1$s is a profile URI, %2$s is a list name.
+#: actions/peopletagsalmon.php:109
+#, php-format
+msgid "Could not subscribe remote user %1$s to list %2$s."
+msgstr ""
+
+#. TRANS: Client error displayed when trying to unsubscribe a remote user from a list fails.
+#. TRANS: %1$s is a profile URL, %2$s is a list name.
+#: actions/peopletagsalmon.php:133
+#, php-format
+msgid "Could not unsubscribe remote user %1$s from list %2$s."
+msgstr ""
+
+#. TRANS: Client error displayed when trying to list a local object as if it is remote.
+#: actions/ostatustag.php:40
+msgid "You can use the local list functionality!"
+msgstr ""
+
+#. TRANS: Header for listing a remote object. %s is a remote object's name.
+#: actions/ostatustag.php:54
+#, php-format
+msgid "List %s"
+msgstr ""
+
+#. TRANS: Button text to list a remote object.
+#: actions/ostatustag.php:56
+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 error.
+#: actions/ostatusinit.php:44
+msgid "You can use the local subscription!"
+msgstr ""
+
+#. TRANS: Client error displayed when the session token does not match or is not given.
+#: actions/ostatusinit.php:68 actions/ostatussub.php:349
+msgid "There was a problem with your session token. Try again, please."
+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: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: Field label for a field that takes an OStatus user address.
+#: actions/ostatussub.php:94
+msgid "Subscribe to"
+msgstr ""
+
+#. TRANS: Tooltip for field label "Subscribe to".
+#: actions/ostatussub.php:97
+msgid ""
+"OStatus user's address, like nickname@example.com or http://example.net/"
+"nickname."
+msgstr ""
+
+#. TRANS: Button text.
+#: actions/ostatussub.php:136
+msgid "Join"
+msgstr ""
+
+#. TRANS: Tooltip for button "Join".
+#: actions/ostatussub.php:138
+msgctxt "BUTTON"
+msgid "Join this group"
+msgstr ""
+
+#. TRANS: Button text.
+#: actions/ostatussub.php:141
+msgctxt "BUTTON"
+msgid "Confirm"
+msgstr ""
+
+#. TRANS: Tooltip for button "Confirm".
+#: actions/ostatussub.php:143
+msgid "Subscribe to this user"
+msgstr ""
+
+#. TRANS: Extra paragraph in remote profile view when already subscribed.
+#: actions/ostatussub.php:164
+msgid "You are already subscribed to this user."
+msgstr ""
+
+#. TRANS: Error text.
+#: actions/ostatussub.php:271 actions/ostatussub.php:275
+#: actions/ostatussub.php:279 actions/ostatussub.php:283
+#: actions/ostatussub.php:287
+msgid ""
+"Sorry, we could not reach that feed. Please try that OStatus address again "
+"later."
+msgstr ""
+
+#. TRANS: Error text.
+#: actions/ostatussub.php:291
+msgid "Sorry, that feed is not Pubsubhubub enabled."
+msgstr ""
+
+#. TRANS: OStatus remote subscription dialog error.
+#: actions/ostatussub.php:333
+msgid "Remote subscription failed!"
+msgstr ""
+
+#. TRANS: Form title.
+#: actions/ostatussub.php:375
+msgid "Subscribe to user"
+msgstr ""
+
+#. TRANS: Page title for OStatus remote subscription form.
+#: actions/ostatussub.php:395
+msgid "Confirm"
+msgstr ""
+
+#: actions/ostatussub.php:395
+msgid "Remote subscription"
+msgstr ""
+
+#. TRANS: Instructions.
+#: actions/ostatussub.php:407
+msgid ""
+"You can subscribe to users from other supported sites. Paste their address "
+"or profile URI below:"
+msgstr ""
+
+#. TRANS: String in the gettext speed test script. Unimportant.
+#: tests/gettext-speedtest.php:58
+msgid "Feeds"
+msgstr ""
diff --git a/plugins/OfflineBackup/locale/OfflineBackup.pot b/plugins/OfflineBackup/locale/OfflineBackup.pot
index 853c570f42..c2aba62bd1 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: 2020-08-04 01:05+0100\n"
+"POT-Creation-Date: 2021-07-18 12:38+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/OpenExternalLinkTarget/locale/OpenExternalLinkTarget.pot b/plugins/OpenExternalLinkTarget/locale/OpenExternalLinkTarget.pot
index e57997e467..537fb80920 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: 2020-08-04 01:05+0100\n"
+"POT-Creation-Date: 2021-07-18 12:38+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 3723dcd1a1..da2a454a7d 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: 2020-08-04 01:05+0100\n"
+"POT-Creation-Date: 2021-07-18 12:38+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -17,6 +17,239 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
+#. TRANS: Client exception thrown when an action is not available.
+#: OpenIDPlugin.php:143
+msgid "Unavailable action."
+msgstr ""
+
+#. TRANS: Tooltip for main menu option "Login"
+#: OpenIDPlugin.php:192
+msgctxt "TOOLTIP"
+msgid "Login to the site."
+msgstr ""
+
+#. TRANS: Main menu option when not logged in to log in
+#: OpenIDPlugin.php:195
+msgctxt "MENU"
+msgid "Login"
+msgstr ""
+
+#. TRANS: Tooltip for main menu option "Help"
+#: OpenIDPlugin.php:200
+msgctxt "TOOLTIP"
+msgid "Help me!"
+msgstr ""
+
+#. TRANS: Main menu option for help on the StatusNet site
+#: OpenIDPlugin.php:203
+msgctxt "MENU"
+msgid "Help"
+msgstr ""
+
+#. TRANS: Tooltip for main menu option "Search"
+#: OpenIDPlugin.php:209
+msgctxt "TOOLTIP"
+msgid "Search for people or text."
+msgstr ""
+
+#. TRANS: Main menu option when logged in or when the StatusNet instance is not private
+#: OpenIDPlugin.php:212
+msgctxt "MENU"
+msgid "Search"
+msgstr ""
+
+#. TRANS: OpenID plugin menu item on site logon page.
+#. TRANS: OpenID plugin menu item on user settings page.
+#. TRANS: OpenID configuration menu item.
+#: OpenIDPlugin.php:269 OpenIDPlugin.php:305 OpenIDPlugin.php:479
+#: OpenIDPlugin.php:559
+msgctxt "MENU"
+msgid "OpenID"
+msgstr ""
+
+#. TRANS: OpenID plugin tooltip for logon menu item.
+#: OpenIDPlugin.php:271
+msgid "Login or register with OpenID."
+msgstr ""
+
+#. TRANS: OpenID plugin tooltip for user settings menu item.
+#: OpenIDPlugin.php:307
+msgid "Add or remove OpenIDs."
+msgstr ""
+
+#. TRANS: Page notice for logged in users to try and get them to add an OpenID account to their StatusNet account.
+#. TRANS: This message contains Markdown links in the form (description)[link].
+#: OpenIDPlugin.php:421
+#, php-format
+msgid ""
+"(Have an [OpenID](http://openid.net/)? [Add an OpenID to your account]"
+"(%%action.openidsettings%%)!"
+msgstr ""
+
+#. TRANS: Page notice for anonymous users to try and get them to register with an OpenID account.
+#. TRANS: This message contains Markdown links in the form (description)[link].
+#: OpenIDPlugin.php:426
+#, php-format
+msgid ""
+"(Have an [OpenID](http://openid.net/)? Try our [OpenID registration]"
+"(%%action.openidlogin%%)!)"
+msgstr ""
+
+#. TRANS: Page notice on the login page to try and get them to log on with an OpenID account.
+#. TRANS: This message contains Markdown links in the form (description)[link].
+#: OpenIDPlugin.php:434
+#, php-format
+msgid ""
+"(Have an [OpenID](http://openid.net/)? Try our [OpenID login](%%action."
+"openidlogin%%)!)"
+msgstr ""
+
+#. TRANS: Tooltip for OpenID configuration menu item.
+#: OpenIDPlugin.php:561
+msgid "OpenID configuration."
+msgstr ""
+
+#. TRANS: Plugin description.
+#: OpenIDPlugin.php:607
+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.
+#: OpenIDPlugin.php:657 actions/openidlogin.php:155
+#: actions/openidsettings.php:97
+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: 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: 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."
@@ -44,40 +277,12 @@ 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"
@@ -94,6 +299,70 @@ msgctxt "BUTTON"
msgid "Login"
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:136
+msgid "Just an OpenID provider. Nothing to see here, move along..."
+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: Status message in case the response from the OpenID provider is that the logon attempt was cancelled.
+#: actions/finishaddopenid.php:81 actions/finishopenidlogin.php:254
+#: actions/finishsynchopenid.php:76
+msgid "OpenID authentication cancelled."
+msgstr ""
+
+#. TRANS: OpenID authentication failed; display the error message. %s is the error message.
+#: actions/finishaddopenid.php:87 actions/finishopenidlogin.php:258
+#: actions/finishsynchopenid.php:82
+#, php-format
+msgid "OpenID authentication failed: %s."
+msgstr ""
+
+#. TRANS: OpenID authentication error.
+#. TRANS: Message displayed when OpenID authentication is aborted.
+#. TRANS: OpenID authentication error.
+#: actions/finishaddopenid.php:104 actions/finishopenidlogin.php:279
+#: actions/finishsynchopenid.php:99
+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: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: 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."
@@ -205,27 +474,6 @@ 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
@@ -258,182 +506,6 @@ msgstr ""
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"
@@ -562,171 +634,100 @@ msgstr ""
msgid "OpenID preferences saved."
msgstr ""
-#: openid.php:165
+#. 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: Title after getting the status of the OpenID authorisation request.
+#. TODO update after understanding the function ^
+#: actions/finishsynchopenid.php:152
+msgid "OpenID Synchronization"
+msgstr ""
+
+#: openid.php:162
msgid "No valid URL provided for OpenID."
msgstr ""
#. TRANS: OpenID plugin server error.
-#: openid.php:172
+#: openid.php:169
msgid "Cannot instantiate OpenID consumer object."
msgstr ""
#. TRANS: OpenID plugin message. Given when an OpenID is not valid.
-#: openid.php:183
+#: openid.php:180
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
+#: openid.php:185
#, 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
+#: openid.php:240
#, php-format
msgid "Could not redirect to server: %s."
msgstr ""
#. TRANS: OpenID plugin user instructions.
-#: openid.php:283
+#: openid.php:284
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
+#: openid.php:321
msgid "Error saving the profile."
msgstr ""
#. TRANS: OpenID plugin server error.
-#: openid.php:332
+#: openid.php:333
msgid "Error saving the user."
msgstr ""
#. TRANS: OpenID plugin client exception (403).
-#: openid.php:362
+#: openid.php:363
msgid "Unauthorized URL used for OpenID login."
msgstr ""
#. TRANS: Title
-#: openid.php:410
+#: openid.php:411
msgid "OpenID Login Submission"
msgstr ""
#. TRANS: OpenID plugin message used while requesting authorization user's OpenID login provider.
-#: openid.php:421
+#: openid.php:422
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
+#: openid.php:426
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."
-msgstr ""
-
-#. TRANS: Tooltip for main menu option "Login"
-#: OpenIDPlugin.php:192
-msgctxt "TOOLTIP"
-msgid "Login to the site."
-msgstr ""
-
-#. TRANS: Main menu option when not logged in to log in
-#: OpenIDPlugin.php:195
-msgctxt "MENU"
-msgid "Login"
-msgstr ""
-
-#. TRANS: Tooltip for main menu option "Help"
-#: OpenIDPlugin.php:200
-msgctxt "TOOLTIP"
-msgid "Help me!"
-msgstr ""
-
-#. TRANS: Main menu option for help on the StatusNet site
-#: OpenIDPlugin.php:203
-msgctxt "MENU"
-msgid "Help"
-msgstr ""
-
-#. TRANS: Tooltip for main menu option "Search"
-#: OpenIDPlugin.php:209
-msgctxt "TOOLTIP"
-msgid "Search for people or text."
-msgstr ""
-
-#. TRANS: Main menu option when logged in or when the StatusNet instance is not private
-#: OpenIDPlugin.php:212
-msgctxt "MENU"
-msgid "Search"
-msgstr ""
-
-#. TRANS: OpenID plugin menu item on site logon page.
-#. TRANS: OpenID plugin menu item on user settings page.
-#. TRANS: OpenID configuration menu item.
-#: OpenIDPlugin.php:269 OpenIDPlugin.php:305 OpenIDPlugin.php:479
-#: OpenIDPlugin.php:559
-msgctxt "MENU"
-msgid "OpenID"
-msgstr ""
-
-#. TRANS: OpenID plugin tooltip for logon menu item.
-#: OpenIDPlugin.php:271
-msgid "Login or register with OpenID."
-msgstr ""
-
-#. TRANS: OpenID plugin tooltip for user settings menu item.
-#: OpenIDPlugin.php:307
-msgid "Add or remove OpenIDs."
-msgstr ""
-
-#. TRANS: Page notice for logged in users to try and get them to add an OpenID account to their StatusNet account.
-#. TRANS: This message contains Markdown links in the form (description)[link].
-#: OpenIDPlugin.php:421
-#, php-format
-msgid ""
-"(Have an [OpenID](http://openid.net/)? [Add an OpenID to your account]"
-"(%%action.openidsettings%%)!"
-msgstr ""
-
-#. TRANS: Page notice for anonymous users to try and get them to register with an OpenID account.
-#. TRANS: This message contains Markdown links in the form (description)[link].
-#: OpenIDPlugin.php:426
-#, php-format
-msgid ""
-"(Have an [OpenID](http://openid.net/)? Try our [OpenID registration]"
-"(%%action.openidlogin%%)!)"
-msgstr ""
-
-#. TRANS: Page notice on the login page to try and get them to log on with an OpenID account.
-#. TRANS: This message contains Markdown links in the form (description)[link].
-#: OpenIDPlugin.php:434
-#, php-format
-msgid ""
-"(Have an [OpenID](http://openid.net/)? Try our [OpenID login](%%action."
-"openidlogin%%)!)"
-msgstr ""
-
-#. TRANS: Tooltip for OpenID configuration menu item.
-#: OpenIDPlugin.php:561
-msgid "OpenID configuration."
-msgstr ""
-
-#. TRANS: Plugin description.
-#: OpenIDPlugin.php:607
-msgid "Use OpenID to login to the site."
-msgstr ""
-
-#. TRANS: Field label.
-#: OpenIDPlugin.php:642
-msgid "OpenID provider"
-msgstr ""
diff --git a/plugins/OpportunisticQM/locale/OpportunisticQM.pot b/plugins/OpportunisticQM/locale/OpportunisticQM.pot
index 08f617948b..2be971c1b0 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: 2020-08-04 01:05+0100\n"
+"POT-Creation-Date: 2021-07-18 12:38+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/Orbited/locale/Orbited.pot b/plugins/Orbited/locale/Orbited.pot
index b2dc473825..413331f4b9 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: 2020-08-04 01:05+0100\n"
+"POT-Creation-Date: 2021-07-18 12:38+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/OverwriteThemeBackground/locale/OverwriteThemeBackground.pot b/plugins/OverwriteThemeBackground/locale/OverwriteThemeBackground.pot
index 4158658fb3..d3f3189e2d 100644
--- a/plugins/OverwriteThemeBackground/locale/OverwriteThemeBackground.pot
+++ b/plugins/OverwriteThemeBackground/locale/OverwriteThemeBackground.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-04 01:05+0100\n"
+"POT-Creation-Date: 2021-07-18 12:38+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/PiwikAnalytics/locale/PiwikAnalytics.pot b/plugins/PiwikAnalytics/locale/PiwikAnalytics.pot
index b9160280d4..b5ba7c7b6b 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: 2020-08-04 01:05+0100\n"
+"POT-Creation-Date: 2021-07-18 12:38+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 4dd8ca608d..38d221940c 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: 2020-08-04 01:05+0100\n"
+"POT-Creation-Date: 2021-07-18 12:38+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -42,35 +42,6 @@ msgstr ""
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.
#: actions/newpoll.php:64
msgid "New poll"
@@ -95,25 +66,6 @@ msgstr ""
msgid "Notice posted"
msgstr ""
-#. 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: 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.
#: actions/showpoll.php:59
msgid "No such poll."
@@ -139,6 +91,25 @@ msgstr ""
msgid "Set your poll preferences"
msgstr ""
+#. 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: Page title after sending a poll response.
+#: actions/respondpoll.php:162
+msgid "Poll results"
+msgstr ""
+
#. TRANS: Plugin description.
#: PollPlugin.php:132
msgid "Simple extension for supporting basic polls."
@@ -186,3 +157,32 @@ msgstr ""
#: PollPlugin.php:471
msgid "Poll data is missing"
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 ""
diff --git a/plugins/PostDebug/locale/PostDebug.pot b/plugins/PostDebug/locale/PostDebug.pot
index c5e98a3f5f..bc47abd89a 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: 2020-08-04 01:05+0100\n"
+"POT-Creation-Date: 2021-07-18 12:38+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 de8a7fe44d..4600854602 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: 2020-08-04 01:05+0100\n"
+"POT-Creation-Date: 2021-07-18 12:38+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 bdeef1bdd4..041a96a428 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: 2020-08-04 01:05+0100\n"
+"POT-Creation-Date: 2021-07-18 12:38+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -18,6 +18,36 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
+#. TRANS: Exception trown when getting a profile for a non-existing ID.
+#. TRANS: %s is the provided profile ID.
+#. TRANS: Exception thown when getting a profile with a non-existing ID.
+#. TRANS: %s is the non-existing profile ID.
+#: classes/QnA_Question.php:113 classes/QnA_Answer.php:151
+#, php-format
+msgid "No profile with ID %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: Exception thown when getting a question with a non-existing ID.
#. TRANS: %s is the non-existing question ID.
#: classes/QnA_Answer.php:140
@@ -25,15 +55,6 @@ msgstr ""
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
@@ -59,110 +80,6 @@ msgstr ""
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
@@ -181,6 +98,70 @@ msgstr ""
msgid "Answer data is missing."
msgstr ""
+#. TRANS: Title for Question page.
+#: actions/qnanewquestion.php:62
+msgid "New question"
+msgstr ""
+
+#. TRANS: Client exception thrown trying to create a Question while not logged in.
+#: actions/qnanewquestion.php:82
+msgid "You must be logged in to post a question."
+msgstr ""
+
+#. TRANS: Client exception thrown trying to create a question without a title.
+#: actions/qnanewquestion.php:128
+msgid "Question must have a title."
+msgstr ""
+
+#. TRANS: Page title after sending a notice.
+#: actions/qnanewquestion.php:153
+msgid "Question posted"
+msgstr ""
+
+#. TRANS: Page title for revising a question
+#: actions/qnareviseanswer.php:51
+msgid "Revise answer"
+msgstr ""
+
+#. TRANS: Client exception thrown trying to answer a question while not logged in.
+#: actions/qnareviseanswer.php:74 actions/qnavote.php:85
+#: actions/qnanewanswer.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:87
+msgid "Invalid or missing answer."
+msgstr ""
+
+#. TRANS: Form title for sending an answer.
+#: actions/qnareviseanswer.php:151
+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:190 actions/qnareviseanswer.php:226
+#: actions/qnavote.php:63 actions/qnanewanswer.php:62
+#: forms/qnashowanswer.php:113
+msgid "Answer"
+msgstr ""
+
+#. TRANS: Client exception thrown trying to respond to a non-existing question.
+#: actions/qnavote.php:97 actions/qnaclosequestion.php:88
+#: actions/qnanewanswer.php:101
+msgid "Invalid or missing question."
+msgstr ""
+
+#. TRANS: Page title after sending in a vote for a question or answer.
+#. TRANS: Page title after sending an answer.
+#: actions/qnavote.php:147 actions/qnaclosequestion.php:140
+#: actions/qnanewanswer.php:156
+msgid "Answers"
+msgstr ""
+
#. TRANS: Client exception thrown trying to view a non-existing question.
#: actions/qnashowquestion.php:70
msgid "No such question."
@@ -228,73 +209,6 @@ msgstr ""
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.
-#: actions/qnanewquestion.php:62
-msgid "New question"
-msgstr ""
-
-#. TRANS: Client exception thrown trying to create a Question while not logged in.
-#: actions/qnanewquestion.php:82
-msgid "You must be logged in to post a question."
-msgstr ""
-
-#. TRANS: Client exception thrown trying to create a question without a title.
-#: actions/qnanewquestion.php:128
-msgid "Question must have a title."
-msgstr ""
-
-#. TRANS: Page title after sending a notice.
-#: actions/qnanewquestion.php:153
-msgid "Question posted"
-msgstr ""
-
#. TRANS: Page title for close a question
#: actions/qnaclosequestion.php:52
msgid "Close question"
@@ -310,6 +224,91 @@ msgstr ""
msgid "You did not ask this question."
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: 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 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: 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: 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: Plugin description.
#: QnAPlugin.php:130
msgid "Question and Answers micro-app."
diff --git a/plugins/RSSCloud/locale/RSSCloud.pot b/plugins/RSSCloud/locale/RSSCloud.pot
index adf1ddefbd..dac74e9142 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: 2020-08-04 01:05+0100\n"
+"POT-Creation-Date: 2021-07-18 12:38+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -17,73 +17,71 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#. 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.
-#: actions/rsscloudrequestnotify.php:91
+#: actions/rsscloudrequestnotify.php:84
msgid "Request must be POST."
msgstr ""
#. TRANS: Form validation error displayed when HTTP POST is not used.
-#: actions/rsscloudrequestnotify.php:109
+#: actions/rsscloudrequestnotify.php:102
msgid "Only HTTP POST notifications are supported at this time."
msgstr ""
#. TRANS: List separator.
-#: actions/rsscloudrequestnotify.php:120
+#: actions/rsscloudrequestnotify.php:113
msgctxt "SEPARATOR"
msgid ", "
msgstr ""
-#. TRANS: Form validation error displayed when a request body is missing expected parameters.
-#. TRANS: %s is a list of parameters separated by a list separator (default: ", ").
-#: actions/rsscloudrequestnotify.php:123
+#: actions/rsscloudrequestnotify.php:117
#, php-format
msgid "The following parameters were missing from the request body: %s."
msgstr ""
#. TRANS: Form validation error displayed when not providing any valid profile feed URLs.
-#: actions/rsscloudrequestnotify.php:130
+#: actions/rsscloudrequestnotify.php:126
msgid ""
"You must provide at least one valid profile feed URL (url1, url2, url3 ... "
"urlN)."
msgstr ""
#. TRANS: Form validation error displayed when not providing a valid feed URL.
-#: actions/rsscloudrequestnotify.php:146
+#: actions/rsscloudrequestnotify.php:144
msgid "Feed subscription failed: Not a valid feed."
msgstr ""
#. TRANS: Form validation error displayed when feed subscription failed.
-#: actions/rsscloudrequestnotify.php:153
+#: actions/rsscloudrequestnotify.php:151
msgid ""
"Feed subscription failed: Notification handler does not respond correctly."
msgstr ""
#. TRANS: Success message after subscribing to one or more feeds.
-#: actions/rsscloudrequestnotify.php:168
+#: actions/rsscloudrequestnotify.php:166
msgid ""
"Thanks for the subscription. When the feed(s) update(s), you will be "
"notified."
msgstr ""
-#. 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:80
+msgid "A URL parameter is required."
+msgstr ""
+
+#. TRANS: Form validation error displayed when HTTP GET is not used.
+#: actions/loggingaggregator.php:88
+msgid "This resource requires an HTTP GET."
+msgstr ""
+
+#. TRANS: Form validation error displayed when HTTP POST is not used.
+#: actions/loggingaggregator.php:98
+msgid "This resource requires an HTTP POST."
+msgstr ""
+
+#. TRANS: Plugin description.
+#: RSSCloudPlugin.php:223
+msgid ""
+"The RSSCloud plugin enables your GNU social 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
index 7b7e535363..8c7133d3b4 100644
--- a/plugins/RedisCache/locale/RedisCache.pot
+++ b/plugins/RedisCache/locale/RedisCache.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-04 01:05+0100\n"
+"POT-Creation-Date: 2021-07-18 12:38+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.
-#: RedisCachePlugin.php:144
+#: RedisCachePlugin.php:188
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
index cdbf6a2459..b59fe7d518 100644
--- a/plugins/RedisQueue/locale/RedisQueue.pot
+++ b/plugins/RedisQueue/locale/RedisQueue.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-04 01:05+0100\n"
+"POT-Creation-Date: 2021-07-18 12:38+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/RegisterThrottle/locale/RegisterThrottle.pot b/plugins/RegisterThrottle/locale/RegisterThrottle.pot
index d9372ad7f5..68d00f917d 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: 2020-08-04 01:05+0100\n"
+"POT-Creation-Date: 2021-07-18 12:38+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -18,21 +18,21 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#. TRANS: Server exception thrown when no IP address can be found for a registation attempt.
-#: RegisterThrottlePlugin.php:117
+#: RegisterThrottlePlugin.php:114
msgid "Cannot find IP address."
msgstr ""
#. TRANS: Exception thrown when too many user have registered from one IP address within a given time frame.
-#: RegisterThrottlePlugin.php:133
+#: RegisterThrottlePlugin.php:129
msgid "Too many registrations. Take a break and try again later."
msgstr ""
#. TRANS: Exception thrown when attempting to register from an IP address from which silenced users have registered.
-#: RegisterThrottlePlugin.php:146
+#: RegisterThrottlePlugin.php:142
msgid "A banned user has registered from this address."
msgstr ""
#. TRANS: Plugin description.
-#: RegisterThrottlePlugin.php:249
+#: RegisterThrottlePlugin.php:251
msgid "Throttles excessive registration from a single IP address."
msgstr ""
diff --git a/plugins/RemoteFollow/locale/RemoteFollow.pot b/plugins/RemoteFollow/locale/RemoteFollow.pot
index 0adc26d27f..1c7895c225 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: 2020-08-04 01:05+0100\n"
+"POT-Creation-Date: 2021-07-18 12:38+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -17,21 +17,6 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#. TRANS: Link text for the follow button
-#: RemoteFollowPlugin.php:71
-msgid "Subscribe"
-msgstr ""
-
-#. TRANS: Plugin description.
-#: RemoteFollowPlugin.php:128
-msgid "Add remote-follow button support to GNU social"
-msgstr ""
-
-#. TRANS: Link text for link to remote subscribe.
-#: RemoteFollowPlugin.php:154
-msgid "Remote"
-msgstr ""
-
#. TRANS: Client error displayed when the user is logged in.
#: actions/remotefollowinit.php:47
msgid "You can use the local subscription!"
@@ -162,3 +147,18 @@ msgid ""
"You can subscribe to users from other supported sites. Paste their address "
"or profile URI below:"
msgstr ""
+
+#. TRANS: Link text for the follow button
+#: RemoteFollowPlugin.php:71
+msgid "Subscribe"
+msgstr ""
+
+#. TRANS: Plugin description.
+#: RemoteFollowPlugin.php:128
+msgid "Add remote-follow button support to GNU social"
+msgstr ""
+
+#. TRANS: Link text for link to remote subscribe.
+#: RemoteFollowPlugin.php:154
+msgid "Remote"
+msgstr ""
diff --git a/plugins/RequireValidatedEmail/locale/RequireValidatedEmail.pot b/plugins/RequireValidatedEmail/locale/RequireValidatedEmail.pot
index 3d824bfa38..419762d756 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: 2020-08-04 01:05+0100\n"
+"POT-Creation-Date: 2021-07-18 12:38+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -17,6 +17,25 @@ 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:108
+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:128
+msgid "You must provide an email address to register."
+msgstr ""
+
+#. TRANS: Plugin description.
+#: RequireValidatedEmailPlugin.php:234
+msgid "Disables posting without a validated email address."
+msgstr ""
+
+#: RequireValidatedEmailPlugin.php:253
+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."
@@ -98,22 +117,3 @@ 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 512325b0bc..a15019ff06 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: 2020-08-04 01:05+0100\n"
+"POT-Creation-Date: 2021-07-18 12:38+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 e0281ab72b..37dfc2024a 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: 2020-08-04 01:05+0100\n"
+"POT-Creation-Date: 2021-07-18 12:38+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 9e1843d4d7..db628fc301 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: 2020-08-04 01:05+0100\n"
+"POT-Creation-Date: 2021-07-18 12:38+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/SearchSub/locale/SearchSub.pot b/plugins/SearchSub/locale/SearchSub.pot
index 4d5fe7e1d9..1a06eaf007 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: 2020-08-04 01:05+0100\n"
+"POT-Creation-Date: 2021-07-18 12:38+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -17,79 +17,20 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#. TRANS: Module description.
-#: SearchSubPlugin.php:91
-msgid "Module to allow following all messages with a given search."
+#. TRANS: Error text shown a user tries to disable all a search subscriptions with track off command, but has none.
+#: lib/searchsubtrackingcommand.php:30 lib/searchsubtrackoffcommand.php:30
+msgid "You are not tracking any searches."
msgstr ""
-#. TRANS: SearchSub plugin menu item on user settings page.
-#. TRANS: Sub menu for searches.
-#: SearchSubPlugin.php:198 SearchSubPlugin.php:262
-msgctxt "MENU"
-msgid "Searches"
+#. TRANS: Separator for list of tracked searches.
+#: lib/searchsubtrackingcommand.php:40
+msgctxt "SEPARATOR"
+msgid "\", \""
msgstr ""
-#. 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."
+#: 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.
@@ -108,32 +49,6 @@ msgstr ""
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:30 lib/searchsubtrackingcommand.php:30
-msgid "You are not tracking any searches."
-msgstr ""
-
-#: 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:50
-msgid "Disabled all your search subscriptions."
-msgstr ""
-
-#. TRANS: Separator for list of tracked searches.
-#: lib/searchsubtrackingcommand.php:40
-msgctxt "SEPARATOR"
-msgid "\", \""
-msgstr ""
-
-#: lib/searchsubtrackingcommand.php:45
-#, php-format
-msgid "You are tracking searches for: \"%s\"."
-msgstr ""
-
#. 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
@@ -151,6 +66,21 @@ msgstr ""
msgid "You are no longer subscribed to the search \"%s\"."
msgstr ""
+#: 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:50
+msgid "Disabled all your search subscriptions."
+msgstr ""
+
+#. TRANS: Page title when search unsubscription succeeded.
+#: actions/searchunsub.php:59
+msgid "Unsubscribed"
+msgstr ""
+
#. TRANS: Client error displayed trying to perform any request method other than POST.
#. TRANS: Do not translate POST.
#: actions/searchsub.php:61
@@ -227,7 +157,77 @@ msgstr ""
msgid "\"%2$s\" since %3$s"
msgstr ""
-#. TRANS: Page title when search unsubscription succeeded.
-#: actions/searchunsub.php:59
-msgid "Unsubscribed"
+#. 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: 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: Module description.
+#: SearchSubPlugin.php:91
+msgid "Module 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:198 SearchSubPlugin.php:262
+msgctxt "MENU"
+msgid "Searches"
+msgstr ""
+
+#. 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 ""
diff --git a/plugins/SensitiveContent/locale/SensitiveContent.pot b/plugins/SensitiveContent/locale/SensitiveContent.pot
index 277a3cd922..1b71a86fad 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-08-04 01:05+0100\n"
+"POT-Creation-Date: 2021-07-18 12:38+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/ShareNotice/locale/ShareNotice.pot b/plugins/ShareNotice/locale/ShareNotice.pot
index ec310830b6..a722d3be05 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: 2020-08-04 01:05+0100\n"
+"POT-Creation-Date: 2021-07-18 12:38+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 af2df65d26..f1563399c3 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: 2020-08-04 01:05+0100\n"
+"POT-Creation-Date: 2021-07-18 12:38+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/SimpleUrl/locale/SimpleUrl.pot b/plugins/SimpleUrl/locale/SimpleUrl.pot
index a98abe2c9c..6cc0163606 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: 2020-08-04 01:05+0100\n"
+"POT-Creation-Date: 2021-07-18 12:38+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 ee80468a5f..022ddb0ad8 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: 2020-08-04 01:05+0100\n"
+"POT-Creation-Date: 2021-07-18 12:38+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -17,6 +17,21 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
+#. 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 ""
+
#. TRANS: Title for sitemap.
#: actions/sitemapadminpanel.php:47
msgid "Sitemap"
@@ -57,18 +72,3 @@ msgstr ""
#: 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 cff9ba6f68..ae8d994640 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: 2020-08-04 01:05+0100\n"
+"POT-Creation-Date: 2021-07-18 12:38+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/SphinxSearch/locale/SphinxSearch.pot b/plugins/SphinxSearch/locale/SphinxSearch.pot
index dbc679c63c..5cb7424769 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: 2020-08-04 01:05+0100\n"
+"POT-Creation-Date: 2021-07-18 12:38+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -17,6 +17,11 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
+#. TRANS: Server exception thrown when a database name cannot be identified.
+#: sphinxsearch.php:129
+msgid "Sphinx search could not identify database name."
+msgstr ""
+
#. TRANS: Server exception.
#: SphinxSearchPlugin.php:89
msgid "Sphinx PHP extension must be installed."
@@ -26,8 +31,3 @@ msgstr ""
#: SphinxSearchPlugin.php:120
msgid "Plugin for Sphinx search backend."
msgstr ""
-
-#. TRANS: Server exception thrown when a database name cannot be identified.
-#: sphinxsearch.php:129
-msgid "Sphinx search could not identify database name."
-msgstr ""
diff --git a/plugins/StompQueue/locale/StompQueue.pot b/plugins/StompQueue/locale/StompQueue.pot
index 3b98ccc4cf..f643846ece 100644
--- a/plugins/StompQueue/locale/StompQueue.pot
+++ b/plugins/StompQueue/locale/StompQueue.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-04 01:05+0100\n"
+"POT-Creation-Date: 2021-07-18 12:38+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/StoreRemoteMedia/locale/StoreRemoteMedia.pot b/plugins/StoreRemoteMedia/locale/StoreRemoteMedia.pot
index f8c391630d..19ef1ef875 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: 2020-08-04 01:05+0100\n"
+"POT-Creation-Date: 2021-07-18 12:38+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -17,7 +17,28 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
+#: StoreRemoteMediaPlugin.php:269 StoreRemoteMediaPlugin.php:300
+msgid "Remote file format was not identified as an image."
+msgstr ""
+
+#: StoreRemoteMediaPlugin.php:271
+msgid "Image file had impossible geometry (0 width or height)"
+msgstr ""
+
+#: StoreRemoteMediaPlugin.php:282
+msgid "Untitled attachment"
+msgstr ""
+
+#: StoreRemoteMediaPlugin.php:294
+msgid "Could not write downloaded file to disk."
+msgstr ""
+
+#: StoreRemoteMediaPlugin.php:361
+#, php-format
+msgid "Domain not in remote thumbnail source whitelist: %s"
+msgstr ""
+
#. TRANS: Plugin description.
-#: StoreRemoteMediaPlugin.php:220
+#: StoreRemoteMediaPlugin.php:379
msgid "Plugin for downloading remotely attached files to local server."
msgstr ""
diff --git a/plugins/StrictTransportSecurity/locale/StrictTransportSecurity.pot b/plugins/StrictTransportSecurity/locale/StrictTransportSecurity.pot
index 45d1591336..31bb728431 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: 2020-08-04 01:05+0100\n"
+"POT-Creation-Date: 2021-07-18 12:38+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 9f982148b7..e11a50fa4b 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: 2020-08-04 01:05+0100\n"
+"POT-Creation-Date: 2021-07-18 12:38+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -17,57 +17,6 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#. TRANS: Field label (URL expectected).
-#: forms/editmirror.php:84
-msgctxt "LABEL"
-msgid "Remote feed:"
-msgstr ""
-
-#. TRANS: Field label.
-#: forms/editmirror.php:89
-msgctxt "LABEL"
-msgid "Local user"
-msgstr ""
-
-#. TRANS: Fieldset legend for feed mirror setting.
-#: forms/editmirror.php:96
-msgid "Mirroring style"
-msgstr ""
-
-#. TRANS: Feed mirror style (radio button option).
-#: forms/editmirror.php:99
-msgid ""
-"Repeat: reference the original user's post (sometimes shows as \"RT @blah\")"
-msgstr ""
-
-#. TRANS: Feed mirror style (radio button option).
-#: forms/editmirror.php:101
-msgid "Repost the content under my account"
-msgstr ""
-
-#. TRANS: Button text to save feed mirror settings.
-#: forms/editmirror.php:121
-msgctxt "BUTTON"
-msgid "Save"
-msgstr ""
-
-#. TRANS: Button text to stop mirroring a feed.
-#: forms/editmirror.php:124
-msgctxt "BUTTON"
-msgid "Stop mirroring"
-msgstr ""
-
-#. TRANS: Field label.
-#: forms/addmirror.php:61
-msgid "Web page or feed URL:"
-msgstr ""
-
-#. TRANS: Button text for adding a feed.
-#: forms/addmirror.php:67
-msgctxt "BUTTON"
-msgid "Add feed"
-msgstr ""
-
#. TRANS: Name for possible feed provider.
#: lib/addmirrorwizard.php:83
msgid "RSS or Atom feed"
@@ -78,6 +27,11 @@ msgstr ""
msgid "Select a feed provider"
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: 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."
@@ -93,23 +47,6 @@ msgstr ""
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
@@ -148,6 +85,18 @@ msgstr ""
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: Plugin description.
#: SubMirrorPlugin.php:70
msgid "Pull feeds into your timeline!"
@@ -168,3 +117,54 @@ msgstr ""
#: SubMirrorPlugin.php:169
msgid "Mirrored feeds"
msgstr ""
+
+#. TRANS: Field label.
+#: forms/addmirror.php:61
+msgid "Web page or feed URL:"
+msgstr ""
+
+#. TRANS: Button text for adding a feed.
+#: forms/addmirror.php:67
+msgctxt "BUTTON"
+msgid "Add feed"
+msgstr ""
+
+#. TRANS: Field label (URL expectected).
+#: forms/editmirror.php:84
+msgctxt "LABEL"
+msgid "Remote feed:"
+msgstr ""
+
+#. TRANS: Field label.
+#: forms/editmirror.php:89
+msgctxt "LABEL"
+msgid "Local user"
+msgstr ""
+
+#. TRANS: Fieldset legend for feed mirror setting.
+#: forms/editmirror.php:96
+msgid "Mirroring style"
+msgstr ""
+
+#. TRANS: Feed mirror style (radio button option).
+#: forms/editmirror.php:99
+msgid ""
+"Repeat: reference the original user's post (sometimes shows as \"RT @blah\")"
+msgstr ""
+
+#. TRANS: Feed mirror style (radio button option).
+#: forms/editmirror.php:101
+msgid "Repost the content under my account"
+msgstr ""
+
+#. TRANS: Button text to save feed mirror settings.
+#: forms/editmirror.php:121
+msgctxt "BUTTON"
+msgid "Save"
+msgstr ""
+
+#. TRANS: Button text to stop mirroring a feed.
+#: forms/editmirror.php:124
+msgctxt "BUTTON"
+msgid "Stop mirroring"
+msgstr ""
diff --git a/plugins/SubscriptionThrottle/locale/SubscriptionThrottle.pot b/plugins/SubscriptionThrottle/locale/SubscriptionThrottle.pot
index 08b7b16bbe..54dbe2085e 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: 2020-08-04 01:05+0100\n"
+"POT-Creation-Date: 2021-07-18 12:38+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -18,16 +18,16 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#. TRANS: Exception thrown when subscribing too quickly.
-#: SubscriptionThrottlePlugin.php:75
+#: SubscriptionThrottlePlugin.php:63
msgid "Too many subscriptions. Take a break and try again later."
msgstr ""
#. TRANS: Exception thrown when joing groups too quickly.
-#: SubscriptionThrottlePlugin.php:101
+#: SubscriptionThrottlePlugin.php:88
msgid "Too many memberships. Take a break and try again later."
msgstr ""
#. TRANS: Plugin description.
-#: SubscriptionThrottlePlugin.php:170
+#: SubscriptionThrottlePlugin.php:157
msgid "Configurable limits for subscriptions and group memberships."
msgstr ""
diff --git a/plugins/TabFocus/locale/TabFocus.pot b/plugins/TabFocus/locale/TabFocus.pot
index 34c89e9ceb..175806d8b3 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: 2020-08-04 01:05+0100\n"
+"POT-Creation-Date: 2021-07-18 12:38+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 0f65845649..f3b30ba17c 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: 2020-08-04 01:05+0100\n"
+"POT-Creation-Date: 2021-07-18 12:38+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -17,18 +17,18 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#. TRANS: Title for inbox tag cloud section.
-#: lib/publictagcloudsection.php:45 lib/inboxtagcloudsection.php:50
-msgctxt "TITLE"
-msgid "Trends"
-msgstr ""
-
#. TRANS: Content displayed in a tag cloud section if there are no tags.
#: lib/tagcloudsection.php:56 lib/tagcloudsection.php:72
msgctxt "NOTAGS"
msgid "None"
msgstr ""
+#. TRANS: Title for inbox tag cloud section.
+#: lib/inboxtagcloudsection.php:50 lib/publictagcloudsection.php:45
+msgctxt "TITLE"
+msgid "Trends"
+msgstr ""
+
#. TRANS: Title for personal tag cloud section.
#: lib/personaltagcloudsection.php:48
msgctxt "TITLE"
diff --git a/plugins/TagSub/locale/TagSub.pot b/plugins/TagSub/locale/TagSub.pot
index 8d48166329..6609727ded 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: 2020-08-04 01:05+0100\n"
+"POT-Creation-Date: 2021-07-18 12:38+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -17,34 +17,6 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#. TRANS: Form legend.
-#: forms/tagsub.php:109
-msgid "Subscribe to this tag"
-msgstr ""
-
-#: forms/tagsub.php:137
-msgctxt "BUTTON"
-msgid "Subscribe"
-msgstr ""
-
-#: forms/tagsub.php:141
-msgid "Subscribe to this tag."
-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."
-msgstr ""
-
#. TRANS: Header for subscriptions overview for a user (first page).
#. TRANS: %s is a user nickname.
#: actions/tagsubs.php:51
@@ -95,6 +67,11 @@ msgstr ""
msgid "#%2$s since %3$s"
msgstr ""
+#. TRANS: Page title when tag unsubscription succeeded.
+#: actions/tagunsub.php:77
+msgid "Unsubscribed"
+msgstr ""
+
#. TRANS: Client error displayed trying to perform any request method other than POST.
#. TRANS: Do not translate POST.
#: actions/tagsub.php:79
@@ -121,11 +98,6 @@ msgstr ""
msgid "Subscribed"
msgstr ""
-#. TRANS: Page title when tag unsubscription succeeded.
-#: actions/tagunsub.php:77
-msgid "Unsubscribed"
-msgstr ""
-
#. TRANS: Plugin description.
#: TagSubPlugin.php:102
msgid "Plugin to allow following all messages with a given tag."
@@ -146,3 +118,31 @@ msgstr ""
#: TagSubPlugin.php:196
msgid "Tags"
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."
+msgstr ""
+
+#. TRANS: Form legend.
+#: forms/tagsub.php:109
+msgid "Subscribe to this tag"
+msgstr ""
+
+#: forms/tagsub.php:137
+msgctxt "BUTTON"
+msgid "Subscribe"
+msgstr ""
+
+#: forms/tagsub.php:141
+msgid "Subscribe to this tag."
+msgstr ""
diff --git a/plugins/TightUrl/locale/TightUrl.pot b/plugins/TightUrl/locale/TightUrl.pot
index ca4dd8dfde..c514eda528 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: 2020-08-04 01:05+0100\n"
+"POT-Creation-Date: 2021-07-18 12:38+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 27d2deaedd..5ebff48524 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: 2020-08-04 01:05+0100\n"
+"POT-Creation-Date: 2021-07-18 12:38+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -17,37 +17,30 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#. TRANS: Menu item in login navigation.
-#. TRANS: Menu item in connection settings navigation.
-#: TwitterBridgePlugin.php:149 TwitterBridgePlugin.php:174
-msgctxt "MENU"
-msgid "Twitter"
+#. TRANS: Mail subject after forwarding notices to Twitter has stopped working.
+#: twitter.php:477
+msgid "Your Twitter bridge has been disabled"
msgstr ""
-#. 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
+#: twitter.php:485
+#, 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 ""
+
+#: lib/twitterimport.php:116
+#, php-format
+msgid "RT @%1$s %2$s"
msgstr ""
#. TRANS: Server exception thrown when an invalid URL scheme is detected.
@@ -88,303 +81,6 @@ msgstr ""
msgid "Bad HTTP response code %1$s: %2$s."
msgstr ""
-#: lib/twitterimport.php:116
-#, php-format
-msgid "RT @%1$s %2$s"
-msgstr ""
-
-#. TRANS: Title for page with Twitter integration settings.
-#: actions/twittersettings.php:68
-msgid "Twitter settings"
-msgstr ""
-
-#. TRANS: Instructions for page with Twitter integration settings.
-#: actions/twittersettings.php:80
-msgid ""
-"Connect your Twitter account to share your updates with your Twitter friends "
-"and vice-versa."
-msgstr ""
-
-#. TRANS: Fieldset legend.
-#: actions/twittersettings.php:106
-msgid "Twitter account"
-msgstr ""
-
-#. TRANS: Form note when a Twitter account has been connected.
-#: actions/twittersettings.php:112
-msgid "Connected Twitter account"
-msgstr ""
-
-#. TRANS: Fieldset legend.
-#: actions/twittersettings.php:118
-msgid "Disconnect my account from Twitter"
-msgstr ""
-
-#. TRANS: Form guide. %s is a URL to the password settings.
-#. TRANS: This message contains a Markdown link in the form [description](link).
-#: actions/twittersettings.php:124
-#, php-format
-msgid ""
-"Disconnecting your Twitter account could make it impossible to log in! "
-"Please [set a password](%s) first."
-msgstr ""
-
-#. TRANS: Form instructions. %1$s is the StatusNet sitename.
-#: actions/twittersettings.php:133
-#, php-format
-msgid ""
-"Keep your %1$s account but disconnect from Twitter. You can use your %1$s "
-"password to log in."
-msgstr ""
-
-#. TRANS: Button text for disconnecting a Twitter account.
-#: actions/twittersettings.php:141
-msgctxt "BUTTON"
-msgid "Disconnect"
-msgstr ""
-
-#. TRANS: Fieldset legend.
-#: actions/twittersettings.php:149
-msgid "Preferences"
-msgstr ""
-
-#. TRANS: Checkbox label.
-#: actions/twittersettings.php:154
-msgid "Automatically send my notices to Twitter."
-msgstr ""
-
-#. TRANS: Checkbox label.
-#: actions/twittersettings.php:160
-msgid "Send local \"@\" replies to Twitter."
-msgstr ""
-
-#. TRANS: Checkbox label.
-#: actions/twittersettings.php:166
-msgid "Send local repeats to Twitter."
-msgstr ""
-
-#. TRANS: Checkbox label.
-#: actions/twittersettings.php:172
-msgid "Subscribe to my Twitter friends here."
-msgstr ""
-
-#. TRANS: Checkbox label.
-#: actions/twittersettings.php:180
-msgid "Import my friends timeline."
-msgstr ""
-
-#. TRANS: Button text for saving Twitter integration settings.
-#: actions/twittersettings.php:195 actions/twitteradminpanel.php:312
-msgctxt "BUTTON"
-msgid "Save"
-msgstr ""
-
-#. TRANS: Button text for adding Twitter integration.
-#: actions/twittersettings.php:198
-msgctxt "BUTTON"
-msgid "Add"
-msgstr ""
-
-#. TRANS: Client error displayed when the submitted form contains unexpected data.
-#: actions/twittersettings.php:233
-msgid "Unexpected form submission."
-msgstr ""
-
-#. TRANS: Error message possibly displayed when trying to remove a connected Twitter account when there isn't one connected.
-#: actions/twittersettings.php:245
-msgid "No Twitter connection to remove."
-msgstr ""
-
-#. TRANS: Server error displayed when trying to remove a connected Twitter account fails.
-#: actions/twittersettings.php:253
-msgid "Could not remove Twitter user."
-msgstr ""
-
-#. TRANS: Success message displayed after disconnecting a Twitter account.
-#: actions/twittersettings.php:260
-msgid "Twitter account disconnected."
-msgstr ""
-
-#. TRANS: Server error displayed when saving Twitter integration preferences fails.
-#: actions/twittersettings.php:279
-msgid "Your account is not linked to Twitter."
-msgstr ""
-
-#. TRANS: Server error displayed when saving Twitter integration preferences fails.
-#: actions/twittersettings.php:290
-msgid "Could not save Twitter preferences."
-msgstr ""
-
-#. TRANS: Success message after saving Twitter integration preferences.
-#: actions/twittersettings.php:298
-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."
-msgstr ""
-
-#. TRANS: Form validation error displayed when an unhandled error occurs.
-#: actions/twitterauthorization.php:108
-msgid "No known action for POST."
-msgstr ""
-
-#. TRANS: Server error displayed when linking to a Twitter account fails.
-#: actions/twitterauthorization.php:135 actions/twitterauthorization.php:177
-#: actions/twitterauthorization.php:248
-msgid "Could not link your Twitter account."
-msgstr ""
-
-#. TRANS: Server error displayed when linking to a Twitter account fails because of an incorrect oauth_token.
-#: actions/twitterauthorization.php:154
-msgid "Could not link your Twitter account: oauth_token mismatch."
-msgstr ""
-
-#. TRANS: Page instruction. %s is the StatusNet sitename.
-#: actions/twitterauthorization.php:257
-#, php-format
-msgid ""
-"This is the first time you have logged into %s so we must connect your "
-"Twitter account to a local account. You can either create a new account, or "
-"connect with your existing account, if you have one."
-msgstr ""
-
-#. TRANS: Page title.
-#: actions/twitterauthorization.php:263
-msgid "Twitter Account Setup"
-msgstr ""
-
-#. TRANS: Fieldset legend.
-#: actions/twitterauthorization.php:296
-msgid "Connection options"
-msgstr ""
-
-#. TRANS: Fieldset legend.
-#: actions/twitterauthorization.php:310
-msgid "Create new account"
-msgstr ""
-
-#. TRANS: Sub form introduction text.
-#: actions/twitterauthorization.php:313
-msgid "Create a new user with this nickname."
-msgstr ""
-
-#. TRANS: Field label.
-#: actions/twitterauthorization.php:321
-msgid "New nickname"
-msgstr ""
-
-#. TRANS: Field title for nickname field.
-#: actions/twitterauthorization.php:324
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
-msgstr ""
-
-#. TRANS: Field label.
-#: actions/twitterauthorization.php:328
-msgctxt "LABEL"
-msgid "Email"
-msgstr ""
-
-#. TRANS: Field title for e-mail address field.
-#: actions/twitterauthorization.php:330
-msgid "Used only for updates, announcements, and password recovery"
-msgstr ""
-
-#. TRANS: Button text for creating a new StatusNet account in the Twitter connect page.
-#: actions/twitterauthorization.php:339
-msgctxt "BUTTON"
-msgid "Create"
-msgstr ""
-
-#. TRANS: Fieldset legend.
-#: actions/twitterauthorization.php:346
-msgid "Connect existing account"
-msgstr ""
-
-#. TRANS: Sub form introduction text.
-#: actions/twitterauthorization.php:349
-msgid ""
-"If you already have an account, login with your username and password to "
-"connect it to your Twitter account."
-msgstr ""
-
-#. TRANS: Field label.
-#: actions/twitterauthorization.php:353
-msgid "Existing nickname"
-msgstr ""
-
-#. TRANS: Field label.
-#: actions/twitterauthorization.php:357
-msgid "Password"
-msgstr ""
-
-#. TRANS: Fieldset legend.
-#: actions/twitterauthorization.php:365
-msgid "License"
-msgstr ""
-
-#. TRANS: Text for license agreement checkbox.
-#. TRANS: %s is the license as configured for the StatusNet site.
-#: actions/twitterauthorization.php:376
-#, 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 text for connecting an existing StatusNet account in the Twitter connect page..
-#: actions/twitterauthorization.php:390
-msgctxt "BUTTON"
-msgid "Connect"
-msgstr ""
-
-#. TRANS: Client error displayed when trying to create a new user but a plugin aborted the process.
-#: actions/twitterauthorization.php:427
-msgid "Registration of new user was aborted, maybe you failed a captcha?"
-msgstr ""
-
-#. TRANS: Client error displayed when trying to create a new user while creating new users is not allowed.
-#: actions/twitterauthorization.php:433 actions/twitterauthorization.php:443
-msgid "Registration not allowed."
-msgstr ""
-
-#. TRANS: Client error displayed when trying to create a new user with an invalid invitation code.
-#: actions/twitterauthorization.php:451
-msgid "Not a valid invitation code."
-msgstr ""
-
-#. TRANS: Form validation error displayed when connecting an existing user to a Twitter user fails because
-#. TRANS: the provided username and/or password are incorrect.
-#: actions/twitterauthorization.php:503
-msgid "Invalid username or password."
-msgstr ""
-
-#. TRANS: Server error displayed connecting a user to a Twitter user has failed.
-#: actions/twitterauthorization.php:537
-msgid "Error connecting user to Twitter."
-msgstr ""
-
-#: actions/twitterauthorization.php:570
-msgid "No foreign link found for Twitter user"
-msgstr ""
-
#. TRANS: Page title for Twitter administration panel.
#: actions/twitteradminpanel.php:50
msgctxt "TITLE"
@@ -471,31 +167,330 @@ msgid ""
"be manually configured."
msgstr ""
+#. TRANS: Button text for saving Twitter integration settings.
+#: actions/twitteradminpanel.php:312 actions/twittersettings.php:195
+msgctxt "BUTTON"
+msgid "Save"
+msgstr ""
+
#. TRANS: Button title for saving the administrative Twitter bridge settings.
#: actions/twitteradminpanel.php:316
msgid "Save the Twitter bridge settings."
msgstr ""
-#. TRANS: Mail subject after forwarding notices to Twitter has stopped working.
-#: twitter.php:462
-msgid "Your Twitter bridge has been disabled"
+#. TRANS: Title for login using Twitter page.
+#: actions/twitterlogin.php:52
+msgctxt "TITLE"
+msgid "Twitter Login"
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
+#. 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: Title for page with Twitter integration settings.
+#: actions/twittersettings.php:68
+msgid "Twitter settings"
+msgstr ""
+
+#. TRANS: Instructions for page with Twitter integration settings.
+#: actions/twittersettings.php:80
+msgid ""
+"Connect your Twitter account to share your updates with your Twitter friends "
+"and vice-versa."
+msgstr ""
+
+#. TRANS: Fieldset legend.
+#: actions/twittersettings.php:106
+msgid "Twitter account"
+msgstr ""
+
+#. TRANS: Form note when a Twitter account has been connected.
+#: actions/twittersettings.php:112
+msgid "Connected Twitter account"
+msgstr ""
+
+#. TRANS: Fieldset legend.
+#: actions/twittersettings.php:118
+msgid "Disconnect my account from Twitter"
+msgstr ""
+
+#. TRANS: Form guide. %s is a URL to the password settings.
+#. TRANS: This message contains a Markdown link in the form [description](link).
+#: actions/twittersettings.php:124
#, php-format
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"
+"Disconnecting your Twitter account could make it impossible to log in! "
+"Please [set a password](%s) first."
+msgstr ""
+
+#. TRANS: Form instructions. %1$s is the StatusNet sitename.
+#: actions/twittersettings.php:133
+#, php-format
+msgid ""
+"Keep your %1$s account but disconnect from Twitter. You can use your %1$s "
+"password to log in."
+msgstr ""
+
+#. TRANS: Button text for disconnecting a Twitter account.
+#: actions/twittersettings.php:141
+msgctxt "BUTTON"
+msgid "Disconnect"
+msgstr ""
+
+#. TRANS: Fieldset legend.
+#: actions/twittersettings.php:149
+msgid "Preferences"
+msgstr ""
+
+#. TRANS: Checkbox label.
+#: actions/twittersettings.php:154
+msgid "Automatically send my notices to Twitter."
+msgstr ""
+
+#. TRANS: Checkbox label.
+#: actions/twittersettings.php:160
+msgid "Send local \"@\" replies to Twitter."
+msgstr ""
+
+#. TRANS: Checkbox label.
+#: actions/twittersettings.php:166
+msgid "Send local repeats to Twitter."
+msgstr ""
+
+#. TRANS: Checkbox label.
+#: actions/twittersettings.php:172
+msgid "Subscribe to my Twitter friends here."
+msgstr ""
+
+#. TRANS: Checkbox label.
+#: actions/twittersettings.php:180
+msgid "Import my friends timeline."
+msgstr ""
+
+#. TRANS: Button text for adding Twitter integration.
+#: actions/twittersettings.php:198
+msgctxt "BUTTON"
+msgid "Add"
+msgstr ""
+
+#. TRANS: Client error displayed when the submitted form contains unexpected data.
+#: actions/twittersettings.php:233
+msgid "Unexpected form submission."
+msgstr ""
+
+#. TRANS: Error message possibly displayed when trying to remove a connected Twitter account when there isn't one connected.
+#: actions/twittersettings.php:245
+msgid "No Twitter connection to remove."
+msgstr ""
+
+#. TRANS: Server error displayed when trying to remove a connected Twitter account fails.
+#: actions/twittersettings.php:253
+msgid "Could not remove Twitter user."
+msgstr ""
+
+#. TRANS: Success message displayed after disconnecting a Twitter account.
+#: actions/twittersettings.php:260
+msgid "Twitter account disconnected."
+msgstr ""
+
+#. TRANS: Server error displayed when saving Twitter integration preferences fails.
+#: actions/twittersettings.php:279
+msgid "Your account is not linked to Twitter."
+msgstr ""
+
+#. TRANS: Server error displayed when saving Twitter integration preferences fails.
+#: actions/twittersettings.php:290
+msgid "Could not save Twitter preferences."
+msgstr ""
+
+#. TRANS: Success message after saving Twitter integration preferences.
+#: actions/twittersettings.php:298
+msgid "Twitter preferences saved."
+msgstr ""
+
+#. TRANS: Form validation error displayed when the checkbox to agree to the license has not been checked.
+#: actions/twitterauthorization.php:93
+msgid "You cannot register if you do not agree to the license."
+msgstr ""
+
+#. TRANS: Form validation error displayed when an unhandled error occurs.
+#: actions/twitterauthorization.php:102
+msgid "No known action for POST."
+msgstr ""
+
+#. TRANS: Server error displayed when linking to a Twitter account fails.
+#: actions/twitterauthorization.php:130 actions/twitterauthorization.php:171
+#: actions/twitterauthorization.php:244
+msgid "Could not link your Twitter account."
+msgstr ""
+
+#. TRANS: Server error displayed when linking to a Twitter account fails because of an incorrect oauth_token.
+#: actions/twitterauthorization.php:149
+msgid "Could not link your Twitter account: oauth_token mismatch."
+msgstr ""
+
+#. TRANS: Page instruction. %s is the StatusNet sitename.
+#: actions/twitterauthorization.php:251
+#, php-format
+msgid ""
+"This is the first time you have logged into %s so we must connect your "
+"Twitter account to a local account. You can either create a new account, or "
+"connect with your existing account, if you have one."
+msgstr ""
+
+#. TRANS: Page title.
+#: actions/twitterauthorization.php:257
+msgid "Twitter Account Setup"
+msgstr ""
+
+#. TRANS: Fieldset legend.
+#: actions/twitterauthorization.php:290
+msgid "Connection options"
+msgstr ""
+
+#. TRANS: Fieldset legend.
+#: actions/twitterauthorization.php:306
+msgid "Create new account"
+msgstr ""
+
+#. TRANS: Sub form introduction text.
+#: actions/twitterauthorization.php:312
+msgid "Create a new user with this nickname."
+msgstr ""
+
+#: actions/twitterauthorization.php:323
+msgid "New nickname"
+msgstr ""
+
+#. TRANS: Field title for nickname field.
+#: actions/twitterauthorization.php:326
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
+msgstr ""
+
+#: actions/twitterauthorization.php:333
+msgctxt "LABEL"
+msgid "Email"
+msgstr ""
+
+#. TRANS: Field title for e-mail address field.
+#: actions/twitterauthorization.php:336
+msgid "Used only for updates, announcements, and password recovery"
+msgstr ""
+
+#. TRANS: Button text for creating a new StatusNet account in the Twitter connect page.
+#: actions/twitterauthorization.php:345
+msgctxt "BUTTON"
+msgid "Create"
+msgstr ""
+
+#. TRANS: Fieldset legend.
+#: actions/twitterauthorization.php:354
+msgid "Connect existing account"
+msgstr ""
+
+#. TRANS: Sub form introduction text.
+#: actions/twitterauthorization.php:360
+msgid ""
+"If you already have an account, login with your username and password to "
+"connect it to your Twitter account."
+msgstr ""
+
+#. TRANS: Field label.
+#: actions/twitterauthorization.php:365
+msgid "Existing nickname"
+msgstr ""
+
+#. TRANS: Field label.
+#: actions/twitterauthorization.php:369
+msgid "Password"
+msgstr ""
+
+#. TRANS: Fieldset legend.
+#: actions/twitterauthorization.php:379
+msgid "License"
+msgstr ""
+
+#. TRANS: Text for license agreement checkbox.
+#. TRANS: %s is the license as configured for the StatusNet site.
+#: actions/twitterauthorization.php:391
+#, 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 text for connecting an existing StatusNet account in the Twitter connect page..
+#: actions/twitterauthorization.php:405
+msgctxt "BUTTON"
+msgid "Connect"
+msgstr ""
+
+#. TRANS: Client error displayed when trying to create a new user but a plugin aborted the process.
+#: actions/twitterauthorization.php:442
+msgid "Registration of new user was aborted, maybe you failed a captcha?"
+msgstr ""
+
+#. TRANS: Client error displayed when trying to create a new user while creating new users is not allowed.
+#: actions/twitterauthorization.php:448 actions/twitterauthorization.php:458
+msgid "Registration not allowed."
+msgstr ""
+
+#. TRANS: Client error displayed when trying to create a new user with an invalid invitation code.
+#: actions/twitterauthorization.php:466
+msgid "Not a valid invitation code."
+msgstr ""
+
+#. TRANS: Form validation error displayed when connecting an existing user to a Twitter user fails because
+#. TRANS: the provided username and/or password are incorrect.
+#: actions/twitterauthorization.php:528
+msgid "Invalid username or password."
+msgstr ""
+
+#. TRANS: Server error displayed connecting a user to a Twitter user has failed.
+#: actions/twitterauthorization.php:564
+msgid "Error connecting user to Twitter."
+msgstr ""
+
+#: actions/twitterauthorization.php:597
+msgid "No foreign link found for Twitter user"
+msgstr ""
+
+#. 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: 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 ""
+"The Twitter \"bridge\" plugin allows integration of a StatusNet instance "
+"with Twitter."
msgstr ""
diff --git a/plugins/UnQueue/locale/UnQueue.pot b/plugins/UnQueue/locale/UnQueue.pot
index 5bca0f62b9..821c958352 100644
--- a/plugins/UnQueue/locale/UnQueue.pot
+++ b/plugins/UnQueue/locale/UnQueue.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-04 01:05+0100\n"
+"POT-Creation-Date: 2021-07-18 12:38+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/UserFlag/locale/UserFlag.pot b/plugins/UserFlag/locale/UserFlag.pot
index d9d84297ce..4faeace0fc 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: 2020-08-04 01:05+0100\n"
+"POT-Creation-Date: 2021-07-18 12:38+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -18,19 +18,57 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
-#: classes/User_flag_profile.php:110
+#: classes/User_flag_profile.php:109
#, 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"
+#. TRANS: AJAX form title for a flagged profile.
+#: actions/flagprofile.php:126
+msgid "Flagged for review"
msgstr ""
-#. TRANS: Form description for clearing flags from a profile.
-#: forms/clearflag.php:90
-msgid "Clear all flags"
+#. TRANS: Body text for AJAX form when a profile has been flagged for review.
+#. TRANS: Message added to a profile if it has been flagged for review.
+#: actions/flagprofile.php:130 UserFlagPlugin.php:141
+msgid "Flagged"
+msgstr ""
+
+#. TRANS: Error message displayed when trying to perform an action that requires a logged in user.
+#: actions/adminprofileflag.php:60
+msgid "Not logged in."
+msgstr ""
+
+#. TRANS: Error message displayed when trying to review profile flags while not authorised.
+#: actions/adminprofileflag.php:84
+msgid "You cannot review profile flags."
+msgstr ""
+
+#. TRANS: Title for page with a list of profiles that were flagged for review.
+#: actions/adminprofileflag.php:120
+msgid "Flagged profiles"
+msgstr ""
+
+#. TRANS: Header for moderation menu with action buttons for flagged profiles (like 'sandbox', 'silence', ...).
+#: actions/adminprofileflag.php:241
+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:389
+#, php-format
+msgid "Flagged by %1$s and %2$d other"
+msgid_plural "Flagged by %1$s and %2$d others"
+msgstr[0] ""
+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:393
+#, php-format
+msgid "Flagged by %s"
msgstr ""
#. TRANS: Form title for flagging a profile for review.
@@ -43,10 +81,14 @@ msgstr ""
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:141 actions/flagprofile.php:130
-msgid "Flagged"
+#. 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: Plugin description.
@@ -55,45 +97,3 @@ 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:68
-msgid "Not logged in."
-msgstr ""
-
-#. TRANS: Error message displayed when trying to review profile flags while not authorised.
-#: 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:128
-msgid "Flagged profiles"
-msgstr ""
-
-#. TRANS: Header for moderation menu with action buttons for flagged profiles (like 'sandbox', 'silence', ...).
-#: 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:393
-#, php-format
-msgid "Flagged by %1$s and %2$d other"
-msgid_plural "Flagged by %1$s and %2$d others"
-msgstr[0] ""
-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:397
-#, php-format
-msgid "Flagged by %s"
-msgstr ""
diff --git a/plugins/UserLimit/locale/UserLimit.pot b/plugins/UserLimit/locale/UserLimit.pot
index b0b2178771..44e8278606 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: 2020-08-04 01:05+0100\n"
+"POT-Creation-Date: 2021-07-18 12:38+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 d98b89ee4e..3a67e5ff62 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: 2020-08-04 01:05+0100\n"
+"POT-Creation-Date: 2021-07-18 12:38+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: Plugin description.
-#: WebFingerPlugin.php:230
-msgid "Adds WebFinger lookup to GNU Social"
-msgstr ""
-
#. TRANS: Error message when an object URI which we cannot find was requested
#: actions/webfinger.php:49
msgid "Resource not found in local database."
msgstr ""
+
+#. TRANS: Plugin description.
+#: WebFingerPlugin.php:230
+msgid "Adds WebFinger lookup to GNU Social"
+msgstr ""
diff --git a/plugins/WikiHashtags/locale/WikiHashtags.pot b/plugins/WikiHashtags/locale/WikiHashtags.pot
index a0c79057ef..bb90d34e8b 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: 2020-08-04 01:05+0100\n"
+"POT-Creation-Date: 2021-07-18 12:38+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 e5714f17dd..136cb0ecdb 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: 2020-08-04 01:05+0100\n"
+"POT-Creation-Date: 2021-07-18 12:38+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -18,32 +18,25 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#. TRANS: Plugin description.
-#: WikiHowProfilePlugin.php:62
+#: WikiHowProfilePlugin.php:49
msgid ""
"Fetches avatar and other profile information for WikiHow users when setting "
"up an account via OpenID."
msgstr ""
#. TRANS: Exception thrown when fetching a WikiHow profile page fails.
-#: WikiHowProfilePlugin.php:128
+#: WikiHowProfilePlugin.php:115
msgid "WikiHow profile page fetch failed."
msgstr ""
#. TRANS: Exception thrown when parsing a WikiHow profile page fails.
-#: WikiHowProfilePlugin.php:145
+#: WikiHowProfilePlugin.php:132
msgid "HTML parse failure during check for WikiHow avatar."
msgstr ""
#. TRANS: Server exception thrown when an avatar URL is invalid.
#. TRANS: %s is the invalid avatar URL.
-#: WikiHowProfilePlugin.php:178
+#: WikiHowProfilePlugin.php:165
#, php-format
msgid "Invalid avatar URL %s."
msgstr ""
-
-#. TRANS: Exception thrown when fetching an avatar from a URL fails.
-#. TRANS: %s is a URL.
-#: WikiHowProfilePlugin.php:188
-#, php-format
-msgid "Unable to fetch avatar from %s."
-msgstr ""
diff --git a/plugins/Xmpp/locale/Xmpp.pot b/plugins/Xmpp/locale/Xmpp.pot
index b42e143444..4143d97964 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: 2020-08-04 01:05+0100\n"
+"POT-Creation-Date: 2021-07-18 12:38+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -17,9 +17,7 @@ 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
+#: lib/xmppmanager.php:100 lib/xmppmanager.php:232
msgid "Send me a message to post a notice"
msgstr ""
diff --git a/vendor/apereo/phpcas/.codecov.yml b/vendor/apereo/phpcas/.codecov.yml
new file mode 100644
index 0000000000..ddfdd0effb
--- /dev/null
+++ b/vendor/apereo/phpcas/.codecov.yml
@@ -0,0 +1,17 @@
+codecov:
+ strict_yaml_branch: master
+
+coverage:
+ round: up
+ precision: 2
+ status:
+ project:
+ default:
+ target: "70%"
+ informational: true
+ patch: # temporarily disabled
+ default:
+ target: "70%"
+ informational: true
+
+comment: false
diff --git a/vendor/apereo/phpcas/.github/dependabot.yml b/vendor/apereo/phpcas/.github/dependabot.yml
new file mode 100644
index 0000000000..c630ffa6b3
--- /dev/null
+++ b/vendor/apereo/phpcas/.github/dependabot.yml
@@ -0,0 +1,7 @@
+version: 2
+updates:
+- package-ecosystem: composer
+ directory: "/"
+ schedule:
+ interval: daily
+ open-pull-requests-limit: 10
diff --git a/vendor/apereo/phpcas/CAS.php b/vendor/apereo/phpcas/CAS.php
index 8cd549ea35..f38e7b113a 100644
--- a/vendor/apereo/phpcas/CAS.php
+++ b/vendor/apereo/phpcas/CAS.php
@@ -27,4 +27,6 @@
* @link https://wiki.jasig.org/display/CASC/phpCAS
*/
-require_once dirname(__FILE__).'/source/CAS.php';
\ No newline at end of file
+require_once __DIR__.'/source/CAS.php';
+
+trigger_error('Including CAS.php is deprecated. Install phpCAS using composer instead.', E_USER_DEPRECATED);
diff --git a/vendor/apereo/phpcas/README.md b/vendor/apereo/phpcas/README.md
index f425edca84..0dbc9258af 100644
--- a/vendor/apereo/phpcas/README.md
+++ b/vendor/apereo/phpcas/README.md
@@ -6,22 +6,21 @@ users via a Central Authentication Service (CAS) server.
Please see the wiki website for more information:
-https://wiki.jasig.org/display/CASC/phpCAS
+https://apereo.github.io/phpCAS/
Api documentation can be found here:
-https://apereo.github.io/phpCAS/
+https://apereo.github.io/phpCAS/api/
[![Build Status](https://travis-ci.org/apereo/phpCAS.png)](https://travis-ci.org/apereo/phpCAS)
-
LICENSE
-------
-Copyright 2007-2015, JA-SIG, Inc.
-This project includes software developed by Jasig.
-http://www.jasig.org/
+Copyright 2007-2020, Apereo Foundation.
+This project includes software developed by Apereo Foundation.
+http://www.apereo.org/
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this software except in compliance with the License.
diff --git a/vendor/apereo/phpcas/composer.json b/vendor/apereo/phpcas/composer.json
index 603595b276..e6e504e9c0 100644
--- a/vendor/apereo/phpcas/composer.json
+++ b/vendor/apereo/phpcas/composer.json
@@ -1,29 +1,51 @@
{
- "name": "apereo/phpcas",
- "description": "Provides a simple API for authenticating users against a CAS server",
- "keywords": ["cas", "jasig", "apereo"],
- "homepage": "https://wiki.jasig.org/display/CASC/phpCAS",
- "type": "library",
- "license": "Apache-2.0",
- "authors": [
- {"name": "Joachim Fritschi", "homepage": "https://wiki.jasig.org/display/~fritschi"},
- {"name": "Adam Franco", "homepage": "https://wiki.jasig.org/display/~adamfranco"}
- ],
- "require": {
- "php": ">=5.4.0",
- "ext-curl": "*"
- },
- "require-dev": {
- "phpunit/phpunit": "~3.7.10"
- },
- "autoload": {
- "classmap": [
- "source/"
- ]
- },
- "extra": {
- "branch-alias": {
- "dev-master": "1.3.x-dev"
- }
- }
-}
+ "name" : "apereo/phpcas",
+ "description" : "Provides a simple API for authenticating users against a CAS server",
+ "keywords" : [
+ "cas",
+ "jasig",
+ "apereo"
+ ],
+ "homepage" : "https://wiki.jasig.org/display/CASC/phpCAS",
+ "type" : "library",
+ "license" : "Apache-2.0",
+ "authors" : [{
+ "name" : "Joachim Fritschi",
+ "homepage" : "https://github.com/jfritschi",
+ "email" : "jfritschi@freenet.de"
+ }, {
+ "name" : "Adam Franco",
+ "homepage" : "https://github.com/adamfranco"
+ }, {
+ "name" : "Henry Pan",
+ "homepage" : "https://github.com/phy25"
+ }
+ ],
+ "require" : {
+ "php" : ">=7.0.0",
+ "ext-curl" : "*",
+ "psr/log" : "^1.0.0"
+ },
+ "require-dev" : {
+ "monolog/monolog" : "^1.0.0",
+ "phpunit/phpunit" : ">=4.8.35 <8"
+ },
+ "autoload" : {
+ "classmap" : [
+ "source/"
+ ]
+ },
+ "autoload-dev" : {
+ "psr-4" : {
+ "PhpCas\\" : "test/CAS/"
+ }
+ },
+ "scripts" : {
+ "test" : "phpunit"
+ },
+ "extra" : {
+ "branch-alias" : {
+ "dev-master" : "1.3.x-dev"
+ }
+ }
+}
\ No newline at end of file
diff --git a/vendor/apereo/phpcas/phpunit.xml.dist b/vendor/apereo/phpcas/phpunit.xml.dist
new file mode 100644
index 0000000000..20cb6c62a0
--- /dev/null
+++ b/vendor/apereo/phpcas/phpunit.xml.dist
@@ -0,0 +1,21 @@
+
+
+
+
+
+ test/CAS/Tests/
+
+
+
+
+
+ source/
+
+
+
diff --git a/vendor/apereo/phpcas/source/CAS.php b/vendor/apereo/phpcas/source/CAS.php
index 343a3eb199..045c916264 100644
--- a/vendor/apereo/phpcas/source/CAS.php
+++ b/vendor/apereo/phpcas/source/CAS.php
@@ -35,6 +35,7 @@
* @ingroup public
*/
+use Psr\Log\LoggerInterface;
//
// hack by Vangelis Haniotakis to handle the absence of $_SERVER['REQUEST_URI']
@@ -44,11 +45,6 @@ if (!isset($_SERVER['REQUEST_URI']) && isset($_SERVER['SCRIPT_NAME']) && isset($
$_SERVER['REQUEST_URI'] = $_SERVER['SCRIPT_NAME'] . '?' . $_SERVER['QUERY_STRING'];
}
-// Add a E_USER_DEPRECATED for php versions <= 5.2
-if (!defined('E_USER_DEPRECATED')) {
- define('E_USER_DEPRECATED', E_USER_NOTICE);
-}
-
// ########################################################################
// CONSTANTS
@@ -61,7 +57,7 @@ if (!defined('E_USER_DEPRECATED')) {
/**
* phpCAS version. accessible for the user by phpCAS::getVersion().
*/
-define('PHPCAS_VERSION', '1.3.8');
+define('PHPCAS_VERSION', '1.4.0');
/**
* @addtogroup public
@@ -224,6 +220,8 @@ define("PHPCAS_LANG_JAPANESE", 'CAS_Languages_Japanese');
define("PHPCAS_LANG_SPANISH", 'CAS_Languages_Spanish');
define("PHPCAS_LANG_CATALAN", 'CAS_Languages_Catalan');
define("PHPCAS_LANG_CHINESE_SIMPLIFIED", 'CAS_Languages_ChineseSimplified');
+define("PHPCAS_LANG_GALEGO", 'CAS_Languages_Galego');
+define("PHPCAS_LANG_PORTUGUESE", 'CAS_Languages_Portuguese');
/** @} */
@@ -261,7 +259,7 @@ define('DEFAULT_DEBUG_DIR', gettmpdir()."/");
/** @} */
// include the class autoloader
-require_once dirname(__FILE__) . '/CAS/Autoload.php';
+require_once __DIR__ . '/CAS/Autoload.php';
/**
* The phpCAS class is a simple container for the phpCAS library. It provides CAS
@@ -330,12 +328,14 @@ class phpCAS
/**
* phpCAS client initializer.
*
- * @param string $server_version the version of the CAS server
- * @param string $server_hostname the hostname of the CAS server
- * @param int $server_port the port the CAS server is running on
- * @param string $server_uri the URI the CAS server is responding on
- * @param bool $changeSessionID Allow phpCAS to change the session_id (Single
- * Sign Out/handleLogoutRequests is based on that change)
+ * @param string $server_version the version of the CAS server
+ * @param string $server_hostname the hostname of the CAS server
+ * @param int $server_port the port the CAS server is running on
+ * @param string $server_uri the URI the CAS server is responding on
+ * @param bool $changeSessionID Allow phpCAS to change the session_id
+ * (Single Sign Out/handleLogoutRequests
+ * is based on that change)
+ * @param \SessionHandlerInterface $sessionHandler the session handler
*
* @return void a newly created CAS_Client object
* @note Only one of the phpCAS::client() and phpCAS::proxy functions should be
@@ -343,7 +343,7 @@ class phpCAS
* and phpCAS::setDebug()).
*/
public static function client($server_version, $server_hostname,
- $server_port, $server_uri, $changeSessionID = true
+ $server_port, $server_uri, $changeSessionID = true, \SessionHandlerInterface $sessionHandler = null
) {
phpCAS :: traceBegin();
if (is_object(self::$_PHPCAS_CLIENT)) {
@@ -363,7 +363,7 @@ class phpCAS
try {
self::$_PHPCAS_CLIENT = new CAS_Client(
$server_version, false, $server_hostname, $server_port, $server_uri,
- $changeSessionID
+ $changeSessionID, $sessionHandler
);
} catch (Exception $e) {
phpCAS :: error(get_class($e) . ': ' . $e->getMessage());
@@ -374,12 +374,14 @@ class phpCAS
/**
* phpCAS proxy initializer.
*
- * @param string $server_version the version of the CAS server
- * @param string $server_hostname the hostname of the CAS server
- * @param int $server_port the port the CAS server is running on
- * @param string $server_uri the URI the CAS server is responding on
- * @param bool $changeSessionID Allow phpCAS to change the session_id (Single
- * Sign Out/handleLogoutRequests is based on that change)
+ * @param string $server_version the version of the CAS server
+ * @param string $server_hostname the hostname of the CAS server
+ * @param string $server_port the port the CAS server is running on
+ * @param string $server_uri the URI the CAS server is responding on
+ * @param bool $changeSessionID Allow phpCAS to change the session_id
+ * (Single Sign Out/handleLogoutRequests
+ * is based on that change)
+ * @param \SessionHandlerInterface $sessionHandler the session handler
*
* @return void a newly created CAS_Client object
* @note Only one of the phpCAS::client() and phpCAS::proxy functions should be
@@ -387,7 +389,7 @@ class phpCAS
* and phpCAS::setDebug()).
*/
public static function proxy($server_version, $server_hostname,
- $server_port, $server_uri, $changeSessionID = true
+ $server_port, $server_uri, $changeSessionID = true, \SessionHandlerInterface $sessionHandler = null
) {
phpCAS :: traceBegin();
if (is_object(self::$_PHPCAS_CLIENT)) {
@@ -407,7 +409,7 @@ class phpCAS
try {
self::$_PHPCAS_CLIENT = new CAS_Client(
$server_version, true, $server_hostname, $server_port, $server_uri,
- $changeSessionID
+ $changeSessionID, $sessionHandler
);
} catch (Exception $e) {
phpCAS :: error(get_class($e) . ': ' . $e->getMessage());
@@ -435,6 +437,24 @@ class phpCAS
* @{
*/
+ /**
+ * Set/unset PSR-3 logger
+ *
+ * @param LoggerInterface $logger the PSR-3 logger used for logging, or
+ * null to stop logging.
+ *
+ * @return void
+ */
+ public static function setLogger($logger = null)
+ {
+ if (empty(self::$_PHPCAS_DEBUG['unique_id'])) {
+ self::$_PHPCAS_DEBUG['unique_id'] = substr(strtoupper(md5(uniqid(''))), 0, 4);
+ }
+ self::$_PHPCAS_DEBUG['logger'] = $logger;
+ self::$_PHPCAS_DEBUG['indent'] = 0;
+ phpCAS :: trace('START ('.date("Y-m-d H:i:s").') phpCAS-' . PHPCAS_VERSION . ' ******************');
+ }
+
/**
* Set/unset debug mode
*
@@ -442,9 +462,13 @@ class phpCAS
* to stop debugging.
*
* @return void
+ *
+ * @deprecated
*/
public static function setDebug($filename = '')
{
+ trigger_error('phpCAS::setDebug() is deprecated in favor of phpCAS::setLogger().', E_USER_DEPRECATED);
+
if ($filename != false && gettype($filename) != 'string') {
phpCAS :: error('type mismatched for parameter $dbg (should be false or the name of the log file)');
}
@@ -518,14 +542,7 @@ class phpCAS
$indent_str = ".";
- if (!empty(self::$_PHPCAS_DEBUG['filename'])) {
- // Check if file exists and modifiy file permissions to be only
- // readable by the webserver
- if (!file_exists(self::$_PHPCAS_DEBUG['filename'])) {
- touch(self::$_PHPCAS_DEBUG['filename']);
- // Chmod will fail on windows
- @chmod(self::$_PHPCAS_DEBUG['filename'], 0600);
- }
+ if (isset(self::$_PHPCAS_DEBUG['logger']) || !empty(self::$_PHPCAS_DEBUG['filename'])) {
for ($i = 0; $i < self::$_PHPCAS_DEBUG['indent']; $i++) {
$indent_str .= '| ';
@@ -533,7 +550,20 @@ class phpCAS
// allow for multiline output with proper identing. Usefull for
// dumping cas answers etc.
$str2 = str_replace("\n", "\n" . self::$_PHPCAS_DEBUG['unique_id'] . ' ' . $indent_str, $str);
- error_log(self::$_PHPCAS_DEBUG['unique_id'] . ' ' . $indent_str . $str2 . "\n", 3, self::$_PHPCAS_DEBUG['filename']);
+ $str3 = self::$_PHPCAS_DEBUG['unique_id'] . ' ' . $indent_str . $str2;
+ if (isset(self::$_PHPCAS_DEBUG['logger'])) {
+ self::$_PHPCAS_DEBUG['logger']->info($str3);
+ }
+ if (!empty(self::$_PHPCAS_DEBUG['filename'])) {
+ // Check if file exists and modifiy file permissions to be only
+ // readable by the webserver
+ if (!file_exists(self::$_PHPCAS_DEBUG['filename'])) {
+ touch(self::$_PHPCAS_DEBUG['filename']);
+ // Chmod will fail on windows
+ @chmod(self::$_PHPCAS_DEBUG['filename'], 0600);
+ }
+ error_log($str3 . "\n", 3, self::$_PHPCAS_DEBUG['filename']);
+ }
}
}
@@ -1869,6 +1899,14 @@ class phpCAS
}
}
+ /**
+ * @return CAS_Client
+ */
+ public static function getCasClient()
+ {
+ return self::$_PHPCAS_CLIENT;
+ }
+
/**
* For testing purposes, use this method to set the client to a test double
*
diff --git a/vendor/apereo/phpcas/source/CAS/Autoload.php b/vendor/apereo/phpcas/source/CAS/Autoload.php
index 5e9b140c78..ee803cbf1d 100644
--- a/vendor/apereo/phpcas/source/CAS/Autoload.php
+++ b/vendor/apereo/phpcas/source/CAS/Autoload.php
@@ -26,18 +26,24 @@ function CAS_autoload($class)
// Static to hold the Include Path to CAS
static $include_path;
// Check only for CAS classes
- if (substr($class, 0, 4) !== 'CAS_') {
+ if (substr($class, 0, 4) !== 'CAS_' && substr($class, 0, 7) !== 'PhpCas\\') {
return false;
}
+
// Setup the include path if it's not already set from a previous call
if (empty($include_path)) {
- $include_path = array(dirname(dirname(__FILE__)), dirname(dirname(__FILE__)) . '/../test/' );
+ $include_path = array(dirname(__DIR__));
}
// Declare local variable to store the expected full path to the file
-
foreach ($include_path as $path) {
- $file_path = $path . '/' . str_replace('_', '/', $class) . '.php';
+ $class_path = str_replace('_', DIRECTORY_SEPARATOR, $class);
+ // PhpCas namespace mapping
+ if (substr($class_path, 0, 7) === 'PhpCas\\') {
+ $class_path = 'CAS' . DIRECTORY_SEPARATOR . substr($class_path, 7);
+ }
+
+ $file_path = $path . DIRECTORY_SEPARATOR . $class_path . '.php';
$fp = @fopen($file_path, 'r', true);
if ($fp) {
fclose($fp);
@@ -54,6 +60,7 @@ function CAS_autoload($class)
return true;
}
}
+
$e = new Exception(
'Class ' . $class . ' could not be loaded from ' .
$file_path . ', file does not exist (Path="'
@@ -73,10 +80,10 @@ function CAS_autoload($class)
die ((string) $e);
}
-// set up __autoload
-if (!(spl_autoload_functions())
- || !in_array('CAS_autoload', spl_autoload_functions())
-) {
+// Set up autoload if not already configured by composer.
+if (!class_exists('CAS_Client'))
+{
+ trigger_error('phpCAS autoloader is deprecated. Install phpCAS using composer instead.', E_USER_DEPRECATED);
spl_autoload_register('CAS_autoload');
if (function_exists('__autoload')
&& !in_array('__autoload', spl_autoload_functions())
@@ -85,6 +92,4 @@ if (!(spl_autoload_functions())
// it to the autoload stack
spl_autoload_register('__autoload');
}
-}
-
-?>
+}
\ No newline at end of file
diff --git a/vendor/apereo/phpcas/source/CAS/Client.php b/vendor/apereo/phpcas/source/CAS/Client.php
index f06c154056..91374973c8 100644
--- a/vendor/apereo/phpcas/source/CAS/Client.php
+++ b/vendor/apereo/phpcas/source/CAS/Client.php
@@ -27,6 +27,7 @@
* @author Brett Bieber
* @author Joachim Fritschi
* @author Adam Franco
+ * @author Tobias Schiebeck
* @license http://www.apache.org/licenses/LICENSE-2.0 Apache License 2.0
* @link https://wiki.jasig.org/display/CASC/phpCAS
*/
@@ -43,6 +44,7 @@
* @author Brett Bieber
* @author Joachim Fritschi
* @author Adam Franco
+ * @author Tobias Schiebeck