From 7d09ce86c4e4caa97e72ca6103c512368135667a Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sun, 15 May 2022 21:29:36 -0400 Subject: [PATCH 1/5] Move relocation feature in its separate class - Create Database->replaceInTableFields method --- src/Core/Relocate.php | 95 +++++++++++++++++++++++++++++++++++++++ src/Database/Database.php | 28 ++++++++++++ src/Module/Admin/Site.php | 72 +++++------------------------ 3 files changed, 134 insertions(+), 61 deletions(-) create mode 100644 src/Core/Relocate.php diff --git a/src/Core/Relocate.php b/src/Core/Relocate.php new file mode 100644 index 000000000..951bbaa03 --- /dev/null +++ b/src/Core/Relocate.php @@ -0,0 +1,95 @@ +. + * + */ + +namespace Friendica\Core; + +use Friendica\App; +use Friendica\Database; +use Friendica\Util\Strings; +use Friendica\Worker\Delivery; + +class Relocate +{ + /** + * @var App\BaseURL + */ + private $baseUrl; + /** + * @var Database\Database + */ + private $database; + /** + * @var Config\Capability\IManageConfigValues + */ + private $config; + + public function __construct(App\BaseURL $baseUrl, Database\Database $database, Config\Capability\IManageConfigValues $config) + { + $this->baseUrl = $baseUrl; + $this->database = $database; + $this->config = $config; + } + + /** + * Performs relocation + * + * @param string $new_url The new node URL, including the scheme + * @throws \Friendica\Network\HTTPException\InternalServerErrorException + */ + public function run(string $new_url) + { + $new_url = rtrim($new_url, '/'); + + $parsed = @parse_url($new_url); + if (!is_array($parsed) || empty($parsed['host']) || empty($parsed['scheme'])) { + throw new \InvalidArgumentException('Can not parse base URL. Must have at least ://'); + } + + /* steps: + * replace all "baseurl" to "new_url" in config, profile, term, items and contacts + * send relocate for every local user + * */ + $old_url = $this->baseUrl->get(true); + + // Generate host names for relocation the addresses in the format user@address.tld + $new_host = str_replace('http://', '@', Strings::normaliseLink($new_url)); + $old_host = str_replace('http://', '@', Strings::normaliseLink($old_url)); + + // update tables + // update profile links in the format "http://server.tld" + $this->database->replaceInTableFields('profile', ['photo', 'thumb'], $old_url, $new_url); + $this->database->replaceInTableFields('contact', ['photo', 'thumb', 'micro', 'url', 'nurl', 'alias', 'request', 'notify', 'poll', 'confirm', 'poco', 'avatar'], $old_url, $new_url); + $this->database->replaceInTableFields('post-content', ['body'], $old_url, $new_url); + + // update profile addresses in the format "user@server.tld" + $this->database->replaceInTableFields('contact', ['addr'], $old_host, $new_host); + + // update config + $this->config->set('system', 'url', $new_url); + $this->baseUrl->saveByURL($new_url); + + // send relocate + $users = $this->database->selectToArray('user', ['uid'], ['account_removed' => false, 'account_expired' => false]); + foreach ($users as $user) { + Worker::add(PRIORITY_HIGH, 'Notifier', Delivery::RELOCATION, $user['uid']); + } + } +} diff --git a/src/Database/Database.php b/src/Database/Database.php index 88d8d7d0f..711d546d8 100644 --- a/src/Database/Database.php +++ b/src/Database/Database.php @@ -1790,4 +1790,32 @@ class Database { array_walk($arr, [$this, 'escapeArrayCallback'], $add_quotation); } + + /** + * Replaces a string in the provided fields of the provided table + * + * @param string $table_name + * @param array $fields List of field names in the provided table + * @param string $search + * @param string $replace + * @throws \Exception + */ + public function replaceInTableFields(string $table_name, array $fields, string $search, string $replace) + { + $search = $this->escape($search); + $replace = $this->escape($replace); + + $upd = []; + foreach ($fields as $field) { + $field = DBA::quoteIdentifier($field); + $upd[] = "$field = REPLACE($field, '$search', '$replace')"; + } + + $upds = implode(', ', $upd); + + $r = $this->e(sprintf("UPDATE %s SET %s;", $table_name, $upds)); + if (!$this->isResult($r)) { + throw new \RuntimeException("Failed updating `$table_name`: " . $this->errorMessage()); + } + } } diff --git a/src/Module/Admin/Site.php b/src/Module/Admin/Site.php index 515fb53c8..50289ff21 100644 --- a/src/Module/Admin/Site.php +++ b/src/Module/Admin/Site.php @@ -22,6 +22,7 @@ namespace Friendica\Module\Admin; use Friendica\App; +use Friendica\Core\Relocate; use Friendica\Core\Renderer; use Friendica\Core\Search; use Friendica\Core\System; @@ -60,70 +61,19 @@ class Site extends BaseAdmin return; } - // relocate - // @TODO This file could benefit from moving this feature away in a Module\Admin\Relocate class for example - if (!empty($_POST['relocate']) && !empty($_POST['relocate_url']) && $_POST['relocate_url'] != "") { - $new_url = $_POST['relocate_url']; - $new_url = rtrim($new_url, "/"); + if (!empty($_POST['relocate']) && !empty($_POST['relocate_url'])) { + try { + $relocate = new Relocate(DI::baseUrl(), DI::dba(), DI::config()); + $relocate->run($_POST['relocate_url']); - $parsed = @parse_url($new_url); - if (!is_array($parsed) || empty($parsed['host']) || empty($parsed['scheme'])) { - notice(DI::l10n()->t("Can not parse base url. Must have at least ://")); - DI::baseUrl()->redirect('admin/site'); + info(DI::l10n()->t('Relocation started. Could take a while to complete.')); + } catch (\InvalidArgumentException $e) { + notice(DI::l10n()->t('Can not parse base url. Must have at least ://')); + } catch (\Throwable $e) { + notice(DI::l10n()->t('Unable to perform the relocation, please retry later or check the application logs.')); + notice($e->getMessage()); } - /* steps: - * replace all "baseurl" to "new_url" in config, profile, term, items and contacts - * send relocate for every local user - * */ - - $old_url = DI::baseUrl()->get(true); - - // Generate host names for relocation the addresses in the format user@address.tld - $new_host = str_replace("http://", "@", Strings::normaliseLink($new_url)); - $old_host = str_replace("http://", "@", Strings::normaliseLink($old_url)); - - function update_table(App $a, $table_name, $fields, $old_url, $new_url) - { - $dbold = DBA::escape($old_url); - $dbnew = DBA::escape($new_url); - - $upd = []; - foreach ($fields as $f) { - $upd[] = "`$f` = REPLACE(`$f`, '$dbold', '$dbnew')"; - } - - $upds = implode(", ", $upd); - - $r = DBA::e(sprintf("UPDATE %s SET %s;", $table_name, $upds)); - if (!DBA::isResult($r)) { - notice("Failed updating '$table_name': " . DBA::errorMessage()); - DI::baseUrl()->redirect('admin/site'); - } - } - - // update tables - // update profile links in the format "http://server.tld" - update_table($a, "profile", ['photo', 'thumb'], $old_url, $new_url); - update_table($a, "contact", ['photo', 'thumb', 'micro', 'url', 'nurl', 'alias', 'request', 'notify', 'poll', 'confirm', 'poco', 'avatar'], $old_url, $new_url); - update_table($a, "post-content", ['body'], $old_url, $new_url); - - // update profile addresses in the format "user@server.tld" - update_table($a, "contact", ['addr'], $old_host, $new_host); - - // update config - DI::config()->set('system', 'url', $new_url); - DI::baseUrl()->saveByURL($new_url); - - // send relocate - $usersStmt = DBA::select('user', ['uid'], ['account_removed' => false, 'account_expired' => false]); - while ($user = DBA::fetch($usersStmt)) { - Worker::add(PRIORITY_HIGH, 'Notifier', Delivery::RELOCATION, $user['uid']); - } - DBA::close($usersStmt); - - info(DI::l10n()->t("Relocation started. Could take a while to complete.")); - DI::baseUrl()->redirect('admin/site'); } // end relocate From f1630ebb05347f0ead366219c37e29451db1e05c Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sun, 15 May 2022 21:41:39 -0400 Subject: [PATCH 2/5] Add relocate console command --- src/Console/Relocate.php | 205 ++++++++++++++++++++++++++++++++++++++ src/Core/Console.php | 2 + src/Database/Database.php | 2 +- 3 files changed, 208 insertions(+), 1 deletion(-) create mode 100644 src/Console/Relocate.php diff --git a/src/Console/Relocate.php b/src/Console/Relocate.php new file mode 100644 index 000000000..c0054d396 --- /dev/null +++ b/src/Console/Relocate.php @@ -0,0 +1,205 @@ +. + * + */ + +namespace Friendica\Console; + +use Asika\SimpleConsole\Console; +use Friendica\Core\Config\Capability\IManageConfigValues; +use Friendica\Core\Worker; +use Friendica\Util\Strings; +use Friendica\Worker\Delivery; + +class Relocate extends Console +{ + protected $helpOptions = ['h', 'help', '?']; + + /** + * @var IManageConfigValues + */ + private $config; + /** + * @var \Friendica\App\BaseURL + */ + private $baseUrl; + /** + * @var \Friendica\Database\Database + */ + private $database; + + protected function getHelp() + { + $help = << [-h|--help|-?] [-v] + +Description + Warning! Advanced function. Could make this server unreachable. + + Change the base URL for this server. Sends relocation message to all the Friendica and Diaspora* contacts of all local users. + This process updates all the database fields that may contain a URL pointing at the current domain, as a result it takes + a while and the node will be in maintenance mode for the whole duration. + +Options + -h|--help|-? Show help information + -v Show more debug information. +HELP; + return $help; + } + + public function __construct(\Friendica\App\BaseURL $baseUrl, \Friendica\Database\Database $database, IManageConfigValues $config, $argv = null) + { + parent::__construct($argv); + + $this->baseUrl = $baseUrl; + $this->database = $database; + $this->config = $config; + } + + protected function doExecute() + { + if (count($this->args) == 0) { + $this->out($this->getHelp()); + return 0; + } + + if (count($this->args) > 1) { + throw new \Asika\SimpleConsole\CommandArgsException('Too many arguments'); + } + + $new_url = rtrim($this->getArgument(0), '/'); + + $parsed = @parse_url($new_url); + if (!is_array($parsed) || empty($parsed['host']) || empty($parsed['scheme'])) { + throw new \InvalidArgumentException('Can not parse new base URL. Must have at least ://'); + } + + $this->out(sprintf('Relocation started from %s to %s. Could take a while to complete.', $this->baseUrl->get(true), $this->getArgument(0))); + + $old_url = $this->baseUrl->get(true); + + // Generate host names for relocation the addresses in the format user@address.tld + $new_host = str_replace('http://', '@', Strings::normaliseLink($new_url)); + $old_host = str_replace('http://', '@', Strings::normaliseLink($old_url)); + + $this->out('Entering maintenance mode'); + $this->config->set('system', 'maintenance', true); + $this->config->set('system', 'maintenance_reason', 'Relocating node to ' . $new_url); + + try { + if (!$this->database->transaction()) { + throw new \Exception('Unable to start a transaction, please retry later.'); + } + + // update tables + $this->out('Updating apcontact table fields'); + $this->database->replaceInTableFields('apcontact', ['url', 'inbox', 'outbox', 'sharedinbox', 'photo', 'header', 'alias', 'subscribe', 'baseurl'], $old_url, $new_url); + $this->database->replaceInTableFields('apcontact', ['addr'], $old_host, $new_host); + + $this->out('Updating contact table fields'); + $this->database->replaceInTableFields('contact', ['photo', 'thumb', 'micro', 'url', 'alias', 'request', 'batch', 'notify', 'poll', 'subscribe', 'baseurl', 'confirm', 'poco', 'avatar', 'header'], $old_url, $new_url); + $this->database->replaceInTableFields('contact', ['nurl'], Strings::normaliseLink($old_url), Strings::normaliseLink($new_url)); + $this->database->replaceInTableFields('contact', ['addr'], $old_host, $new_host); + + $this->out('Updating conv table fields'); + $this->database->replaceInTableFields('conv', ['creator', 'recips'], $old_host, $new_host); + + $this->out('Updating delayed-post table fields'); + $this->database->replaceInTableFields('delayed-post', ['uri'], $old_url, $new_url); + + $this->out('Updating endpoint table fields'); + $this->database->replaceInTableFields('endpoint', ['url'], $old_url, $new_url); + + $this->out('Updating event table fields'); + $this->database->replaceInTableFields('event', ['uri'], $old_url, $new_url); + + $this->out('Updating fcontact table fields'); + $this->database->replaceInTableFields('fcontact', ['url', 'photo', 'request', 'batch', 'poll', 'confirm', 'alias'], $old_url, $new_url); + $this->database->replaceInTableFields('fcontact', ['addr'], $old_host, $new_host); + + $this->out('Updating fsuggest table fields'); + $this->database->replaceInTableFields('fsuggest', ['url', 'request', 'photo'], $old_url, $new_url); + + $this->out('Updating gserver table fields'); + $this->database->replaceInTableFields('gserver', ['url'], $old_url, $new_url); + $this->database->replaceInTableFields('gserver', ['nurl'], Strings::normaliseLink($old_url), Strings::normaliseLink($new_url)); + + $this->out('Updating inbox-status table fields'); + $this->database->replaceInTableFields('inbox-status', ['url'], $old_url, $new_url); + + $this->out('Updating item-uri table fields'); + $this->database->replaceInTableFields('item-uri', ['uri'], $old_url, $new_url); + + $this->out('Updating mail table fields'); + $this->database->replaceInTableFields('mail', ['from-photo', 'from-url', 'uri', 'thr-parent'], $old_url, $new_url); + $this->database->replaceInTableFields('mail', ['parent-uri'], $old_host, $new_host); + + $this->out('Updating notify table fields'); + $this->database->replaceInTableFields('notify', ['url', 'photo', 'link', 'msg', 'name_cache', 'msg_cache'], $old_url, $new_url); + + $this->out('Updating profile table fields'); + $this->database->replaceInTableFields('profile', ['photo', 'thumb'], $old_url, $new_url); + + $this->out('Updating post-content table fields'); + $this->database->replaceInTableFields('post-content', ['body', 'raw-body', 'rendered-html', 'target', 'plink'], $old_url, $new_url); + $this->database->replaceInTableFields('post-content', ['body', 'raw-body', 'rendered-html', 'target'], $old_host, $new_host); + + $this->out('Updating post-history table fields'); + $this->database->replaceInTableFields('post-history', ['body', 'raw-body', 'rendered-html', 'target', 'plink'], $old_url, $new_url); + $this->database->replaceInTableFields('post-history', ['body', 'raw-body', 'rendered-html', 'target'], $old_host, $new_host); + + $this->out('Updating post-link table fields'); + $this->database->replaceInTableFields('post-link', ['url'], $old_url, $new_url); + + $this->out('Updating post-media table fields'); + $this->database->replaceInTableFields('post-media', ['url', 'preview', 'author-url', 'author-image', 'publisher-url', 'publisher-image'], $old_url, $new_url); + + $this->out('Updating tag table fields'); + $this->database->replaceInTableFields('tag', ['url'], $old_url, $new_url); + + // update config + $this->out('Updating config values'); + $this->config->set('system', 'url', $new_url); + $this->baseUrl->saveByURL($new_url); + + $this->database->commit(); + } catch (\Throwable $e) { + $this->database->rollback(); + + $this->out('Process aborted with message: ' . $e->getMessage() . ' thrown in ' . $e->getFile() . ':' . $e->getLine()); + + return 1; + } finally { + $this->out('Leaving maintenance mode'); + $this->config->set('system', 'maintenance', false); + $this->config->set('system', 'maintenance_reason', ''); + } + + // send relocate + $this->out('Schedule relocation messages to remote Friendica and Diaspora hosts'); + $users = $this->database->selectToArray('user', ['uid'], ['account_removed' => false, 'account_expired' => false]); + foreach ($users as $user) { + Worker::add(PRIORITY_HIGH, 'Notifier', Delivery::RELOCATION, $user['uid']); + } + + return 0; + } +} diff --git a/src/Core/Console.php b/src/Core/Console.php index 828a0ea4d..be5f31598 100644 --- a/src/Core/Console.php +++ b/src/Core/Console.php @@ -65,6 +65,7 @@ Commands: po2php Generate a strings.php file from a messages.po file typo Checks for parse errors in Friendica files postupdate Execute pending post update scripts (can last days) + relocate Update node base URL serverblock Manage blocked servers storage Manage storage backend relay Manage ActivityPub relay servers @@ -97,6 +98,7 @@ HELP; 'postupdate' => Friendica\Console\PostUpdate::class, 'po2php' => Friendica\Console\PoToPhp::class, 'relay' => Friendica\Console\Relay::class, + 'relocate' => Friendica\Console\Relocate::class, 'serverblock' => Friendica\Console\ServerBlock::class, 'storage' => Friendica\Console\Storage::class, 'test' => Friendica\Console\Test::class, diff --git a/src/Database/Database.php b/src/Database/Database.php index 711d546d8..41733f5f9 100644 --- a/src/Database/Database.php +++ b/src/Database/Database.php @@ -1153,7 +1153,7 @@ class Database * * @return boolean Was the command executed successfully? */ - public function transaction() + public function transaction(): bool { if (!$this->performCommit()) { return false; From 1301a53f20a5164d484a3a83368d4eb9174523ae Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sun, 29 May 2022 13:14:31 -0400 Subject: [PATCH 3/5] Remove relocation form from Admin Site settings --- src/Core/Relocate.php | 95 ------------------------ src/Module/Admin/Site.php | 24 +----- view/templates/admin/site.tpl | 12 +-- view/theme/frio/templates/admin/site.tpl | 22 ++---- 4 files changed, 13 insertions(+), 140 deletions(-) delete mode 100644 src/Core/Relocate.php diff --git a/src/Core/Relocate.php b/src/Core/Relocate.php deleted file mode 100644 index 951bbaa03..000000000 --- a/src/Core/Relocate.php +++ /dev/null @@ -1,95 +0,0 @@ -. - * - */ - -namespace Friendica\Core; - -use Friendica\App; -use Friendica\Database; -use Friendica\Util\Strings; -use Friendica\Worker\Delivery; - -class Relocate -{ - /** - * @var App\BaseURL - */ - private $baseUrl; - /** - * @var Database\Database - */ - private $database; - /** - * @var Config\Capability\IManageConfigValues - */ - private $config; - - public function __construct(App\BaseURL $baseUrl, Database\Database $database, Config\Capability\IManageConfigValues $config) - { - $this->baseUrl = $baseUrl; - $this->database = $database; - $this->config = $config; - } - - /** - * Performs relocation - * - * @param string $new_url The new node URL, including the scheme - * @throws \Friendica\Network\HTTPException\InternalServerErrorException - */ - public function run(string $new_url) - { - $new_url = rtrim($new_url, '/'); - - $parsed = @parse_url($new_url); - if (!is_array($parsed) || empty($parsed['host']) || empty($parsed['scheme'])) { - throw new \InvalidArgumentException('Can not parse base URL. Must have at least ://'); - } - - /* steps: - * replace all "baseurl" to "new_url" in config, profile, term, items and contacts - * send relocate for every local user - * */ - $old_url = $this->baseUrl->get(true); - - // Generate host names for relocation the addresses in the format user@address.tld - $new_host = str_replace('http://', '@', Strings::normaliseLink($new_url)); - $old_host = str_replace('http://', '@', Strings::normaliseLink($old_url)); - - // update tables - // update profile links in the format "http://server.tld" - $this->database->replaceInTableFields('profile', ['photo', 'thumb'], $old_url, $new_url); - $this->database->replaceInTableFields('contact', ['photo', 'thumb', 'micro', 'url', 'nurl', 'alias', 'request', 'notify', 'poll', 'confirm', 'poco', 'avatar'], $old_url, $new_url); - $this->database->replaceInTableFields('post-content', ['body'], $old_url, $new_url); - - // update profile addresses in the format "user@server.tld" - $this->database->replaceInTableFields('contact', ['addr'], $old_host, $new_host); - - // update config - $this->config->set('system', 'url', $new_url); - $this->baseUrl->saveByURL($new_url); - - // send relocate - $users = $this->database->selectToArray('user', ['uid'], ['account_removed' => false, 'account_expired' => false]); - foreach ($users as $user) { - Worker::add(PRIORITY_HIGH, 'Notifier', Delivery::RELOCATION, $user['uid']); - } - } -} diff --git a/src/Module/Admin/Site.php b/src/Module/Admin/Site.php index 50289ff21..36824d511 100644 --- a/src/Module/Admin/Site.php +++ b/src/Module/Admin/Site.php @@ -61,23 +61,6 @@ class Site extends BaseAdmin return; } - if (!empty($_POST['relocate']) && !empty($_POST['relocate_url'])) { - try { - $relocate = new Relocate(DI::baseUrl(), DI::dba(), DI::config()); - $relocate->run($_POST['relocate_url']); - - info(DI::l10n()->t('Relocation started. Could take a while to complete.')); - } catch (\InvalidArgumentException $e) { - notice(DI::l10n()->t('Can not parse base url. Must have at least ://')); - } catch (\Throwable $e) { - notice(DI::l10n()->t('Unable to perform the relocation, please retry later or check the application logs.')); - notice($e->getMessage()); - } - - DI::baseUrl()->redirect('admin/site'); - } - // end relocate - $sitename = (!empty($_POST['sitename']) ? trim($_POST['sitename']) : ''); $sender_email = (!empty($_POST['sender_email']) ? trim($_POST['sender_email']) : ''); $banner = (!empty($_POST['banner']) ? trim($_POST['banner']) : false); @@ -462,8 +445,9 @@ class Site extends BaseAdmin '$no_relay_list' => DI::l10n()->t('The system is not subscribed to any relays at the moment.'), '$relay_list_title' => DI::l10n()->t('The system is currently subscribed to the following relays:'), '$relay_list' => Relay::getList(['url']), - '$relocate' => DI::l10n()->t('Relocate Instance'), - '$relocate_warning' => DI::l10n()->t('Warning! Advanced function. Could make this server unreachable.'), + '$relocate' => DI::l10n()->t('Relocate Node'), + '$relocate_msg' => DI::l10n()->t('Relocating your node enables you to change the DNS domain of this node and keep all the existing users and posts. This process takes a while and can only be started from the relocate console command like this:'), + '$relocate_cmd' => DI::l10n()->t('(Friendica directory)# bin/console relocate https://newdomain.com'), '$baseurl' => DI::baseUrl()->get(true), // name, label, value, help string, extra data... @@ -551,8 +535,6 @@ class Site extends BaseAdmin '$temppath' => ['temppath', DI::l10n()->t('Temp path'), DI::config()->get('system', 'temppath'), DI::l10n()->t('If you have a restricted system where the webserver can\'t access the system temp path, enter another path here.')], '$only_tag_search' => ['only_tag_search', DI::l10n()->t('Only search in tags'), DI::config()->get('system', 'only_tag_search'), DI::l10n()->t('On large systems the text search can slow down the system extremely.')], - '$relocate_url' => ['relocate_url', DI::l10n()->t('New base url'), DI::baseUrl()->get(), DI::l10n()->t('Change base url for this server. Sends relocate message to all Friendica and Diaspora* contacts of all users.')], - '$worker_queues' => ['worker_queues', DI::l10n()->t('Maximum number of parallel workers'), DI::config()->get('system', 'worker_queues'), DI::l10n()->t('On shared hosters set this to %d. On larger systems, values of %d are great. Default value is %d.', 5, 20, 10)], '$worker_fastlane' => ['worker_fastlane', DI::l10n()->t('Enable fastlane'), DI::config()->get('system', 'worker_fastlane'), DI::l10n()->t('When enabed, the fastlane mechanism starts an additional worker if processes with higher priority are blocked by processes of lower priority.')], diff --git a/view/templates/admin/site.tpl b/view/templates/admin/site.tpl index 6e2958b97..f23cc521e 100644 --- a/view/templates/admin/site.tpl +++ b/view/templates/admin/site.tpl @@ -148,14 +148,10 @@ - {{* separate form for relocate... *}} -
- +

{{$relocate}}

-

{{$relocate_warning nofilter}}

- {{include file="field_input.tpl" field=$relocate_url}} - -
- +

{{$relocate_msg}}

+

{{$relocate_cmd}}

+
diff --git a/view/theme/frio/templates/admin/site.tpl b/view/theme/frio/templates/admin/site.tpl index 3bd1a49af..f6a01b541 100644 --- a/view/theme/frio/templates/admin/site.tpl +++ b/view/theme/frio/templates/admin/site.tpl @@ -321,14 +321,7 @@ - -
- - - +
-
- {{$relocate_warning nofilter}} -
- {{include file="field_input.tpl" field=$relocate_url}} -
-
- +

+ {{$relocate_msg}} +

+

{{$relocate_cmd}}

- +
From 121d26999caf11af3deb15819b654b3e8e751629 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Mon, 16 May 2022 07:52:31 -0400 Subject: [PATCH 4/5] Updated main translation file after moving strings --- view/lang/C/messages.po | 833 ++++++++++++++++++++-------------------- 1 file changed, 410 insertions(+), 423 deletions(-) diff --git a/view/lang/C/messages.po b/view/lang/C/messages.po index 04eb82b2d..8b43b8a33 100644 --- a/view/lang/C/messages.po +++ b/view/lang/C/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 2022.05-rc\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-05-26 20:00+0000\n" +"POT-Creation-Date: 2022-05-29 13:18-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -37,7 +37,7 @@ msgstr "" msgid "User not found." msgstr "" -#: mod/cal.php:122 mod/display.php:240 src/Module/Profile/Profile.php:94 +#: mod/cal.php:122 mod/display.php:246 src/Module/Profile/Profile.php:94 #: src/Module/Profile/Profile.php:109 src/Module/Profile/Status.php:110 #: src/Module/Update/Profile.php:56 msgid "Access to this profile has been restricted." @@ -104,17 +104,17 @@ msgstr "" msgid "calendar" msgstr "" -#: mod/display.php:135 mod/photos.php:808 +#: mod/display.php:141 mod/photos.php:808 #: src/Module/Conversation/Community.php:175 src/Module/Directory.php:49 #: src/Module/Search/Index.php:50 msgid "Public access denied." msgstr "" -#: mod/display.php:191 mod/display.php:265 +#: mod/display.php:197 mod/display.php:271 msgid "The requested item doesn't exist or has been deleted." msgstr "" -#: mod/display.php:345 +#: mod/display.php:351 msgid "The feed for this item is unavailable." msgstr "" @@ -122,7 +122,7 @@ msgstr "" #: mod/item.php:181 mod/item.php:186 mod/item.php:875 mod/message.php:69 #: mod/message.php:111 mod/notes.php:44 mod/ostatus_subscribe.php:33 #: mod/photos.php:160 mod/photos.php:897 mod/repair_ostatus.php:31 -#: mod/settings.php:49 mod/settings.php:59 mod/settings.php:165 +#: mod/settings.php:40 mod/settings.php:50 mod/settings.php:156 #: mod/suggest.php:34 mod/uimport.php:33 mod/unfollow.php:35 #: mod/unfollow.php:50 mod/unfollow.php:82 mod/wall_attach.php:67 #: mod/wall_attach.php:69 mod/wall_upload.php:89 mod/wall_upload.php:91 @@ -164,25 +164,25 @@ msgstr "" msgid "Save" msgstr "" -#: mod/editpost.php:92 mod/photos.php:1344 src/Content/Conversation.php:340 +#: mod/editpost.php:92 mod/photos.php:1344 src/Content/Conversation.php:338 #: src/Module/Contact/Poke.php:176 src/Object/Post.php:989 msgid "Loading..." msgstr "" #: mod/editpost.php:93 mod/message.php:198 mod/message.php:355 -#: mod/wallmessage.php:140 src/Content/Conversation.php:341 +#: mod/wallmessage.php:140 src/Content/Conversation.php:339 msgid "Upload photo" msgstr "" -#: mod/editpost.php:94 src/Content/Conversation.php:342 +#: mod/editpost.php:94 src/Content/Conversation.php:340 msgid "upload photo" msgstr "" -#: mod/editpost.php:95 src/Content/Conversation.php:343 +#: mod/editpost.php:95 src/Content/Conversation.php:341 msgid "Attach file" msgstr "" -#: mod/editpost.php:96 src/Content/Conversation.php:344 +#: mod/editpost.php:96 src/Content/Conversation.php:342 msgid "attach file" msgstr "" @@ -211,31 +211,31 @@ msgstr "" msgid "audio link" msgstr "" -#: mod/editpost.php:103 src/Content/Conversation.php:354 +#: mod/editpost.php:103 src/Content/Conversation.php:352 #: src/Module/Item/Compose.php:173 msgid "Set your location" msgstr "" -#: mod/editpost.php:104 src/Content/Conversation.php:355 +#: mod/editpost.php:104 src/Content/Conversation.php:353 msgid "set location" msgstr "" -#: mod/editpost.php:105 src/Content/Conversation.php:356 +#: mod/editpost.php:105 src/Content/Conversation.php:354 msgid "Clear browser location" msgstr "" -#: mod/editpost.php:106 src/Content/Conversation.php:357 +#: mod/editpost.php:106 src/Content/Conversation.php:355 msgid "clear location" msgstr "" #: mod/editpost.php:107 mod/message.php:200 mod/message.php:358 -#: mod/photos.php:1495 mod/wallmessage.php:142 src/Content/Conversation.php:370 -#: src/Content/Conversation.php:714 src/Module/Item/Compose.php:177 +#: mod/photos.php:1495 mod/wallmessage.php:142 src/Content/Conversation.php:368 +#: src/Content/Conversation.php:712 src/Module/Item/Compose.php:177 #: src/Object/Post.php:528 msgid "Please wait" msgstr "" -#: mod/editpost.php:108 src/Content/Conversation.php:371 +#: mod/editpost.php:108 src/Content/Conversation.php:369 msgid "Permission settings" msgstr "" @@ -243,16 +243,16 @@ msgstr "" msgid "CC: email addresses" msgstr "" -#: mod/editpost.php:117 src/Content/Conversation.php:381 +#: mod/editpost.php:117 src/Content/Conversation.php:379 msgid "Public post" msgstr "" -#: mod/editpost.php:120 src/Content/Conversation.php:359 +#: mod/editpost.php:120 src/Content/Conversation.php:357 #: src/Module/Item/Compose.php:178 msgid "Set title" msgstr "" -#: mod/editpost.php:122 src/Content/Conversation.php:361 +#: mod/editpost.php:122 src/Content/Conversation.php:359 #: src/Module/Item/Compose.php:179 msgid "Categories (comma-separated list)" msgstr "" @@ -262,70 +262,70 @@ msgid "Example: bob@example.com, mary@example.com" msgstr "" #: mod/editpost.php:128 mod/events.php:513 mod/photos.php:1343 -#: mod/photos.php:1399 mod/photos.php:1473 src/Content/Conversation.php:385 +#: mod/photos.php:1399 mod/photos.php:1473 src/Content/Conversation.php:383 #: src/Module/Item/Compose.php:172 src/Object/Post.php:999 msgid "Preview" msgstr "" #: mod/editpost.php:130 mod/fbrowser.php:118 mod/fbrowser.php:145 #: mod/follow.php:144 mod/photos.php:1010 mod/photos.php:1111 mod/tagrm.php:35 -#: mod/tagrm.php:127 mod/unfollow.php:97 src/Content/Conversation.php:388 +#: mod/tagrm.php:127 mod/unfollow.php:97 src/Content/Conversation.php:386 #: src/Module/Contact/Revoke.php:108 src/Module/RemoteFollow.php:127 msgid "Cancel" msgstr "" -#: mod/editpost.php:134 src/Content/Conversation.php:345 +#: mod/editpost.php:134 src/Content/Conversation.php:343 #: src/Module/Item/Compose.php:163 src/Object/Post.php:990 msgid "Bold" msgstr "" -#: mod/editpost.php:135 src/Content/Conversation.php:346 +#: mod/editpost.php:135 src/Content/Conversation.php:344 #: src/Module/Item/Compose.php:164 src/Object/Post.php:991 msgid "Italic" msgstr "" -#: mod/editpost.php:136 src/Content/Conversation.php:347 +#: mod/editpost.php:136 src/Content/Conversation.php:345 #: src/Module/Item/Compose.php:165 src/Object/Post.php:992 msgid "Underline" msgstr "" -#: mod/editpost.php:137 src/Content/Conversation.php:348 +#: mod/editpost.php:137 src/Content/Conversation.php:346 #: src/Module/Item/Compose.php:166 src/Object/Post.php:993 msgid "Quote" msgstr "" -#: mod/editpost.php:138 src/Content/Conversation.php:349 +#: mod/editpost.php:138 src/Content/Conversation.php:347 #: src/Module/Item/Compose.php:167 src/Object/Post.php:994 msgid "Code" msgstr "" -#: mod/editpost.php:139 src/Content/Conversation.php:351 +#: mod/editpost.php:139 src/Content/Conversation.php:349 #: src/Module/Item/Compose.php:169 src/Object/Post.php:996 msgid "Link" msgstr "" -#: mod/editpost.php:140 src/Content/Conversation.php:352 +#: mod/editpost.php:140 src/Content/Conversation.php:350 #: src/Module/Item/Compose.php:170 src/Object/Post.php:997 msgid "Link or Media" msgstr "" -#: mod/editpost.php:143 src/Content/Conversation.php:395 +#: mod/editpost.php:143 src/Content/Conversation.php:393 #: src/Content/Widget/VCard.php:107 src/Model/Profile.php:462 #: src/Module/Admin/Logs/View.php:93 msgid "Message" msgstr "" -#: mod/editpost.php:144 src/Content/Conversation.php:396 +#: mod/editpost.php:144 src/Content/Conversation.php:394 #: src/Module/Settings/TwoFactor/Trusted.php:137 msgid "Browser" msgstr "" #: mod/editpost.php:145 mod/events.php:518 mod/photos.php:945 -#: mod/photos.php:1297 src/Content/Conversation.php:372 +#: mod/photos.php:1297 src/Content/Conversation.php:370 msgid "Permissions" msgstr "" -#: mod/editpost.php:147 src/Content/Conversation.php:398 +#: mod/editpost.php:147 src/Content/Conversation.php:396 msgid "Open Compose page" msgstr "" @@ -423,7 +423,7 @@ msgstr "" msgid "Basic" msgstr "" -#: mod/events.php:517 src/Module/Admin/Site.php:506 src/Module/Contact.php:474 +#: mod/events.php:517 src/Module/Admin/Site.php:439 src/Module/Contact.php:474 #: src/Module/Profile/Profile.php:249 msgid "Advanced" msgstr "" @@ -1077,11 +1077,11 @@ msgstr "" msgid "Comment" msgstr "" -#: mod/photos.php:1430 src/Content/Conversation.php:630 src/Object/Post.php:247 +#: mod/photos.php:1430 src/Content/Conversation.php:628 src/Object/Post.php:247 msgid "Select" msgstr "" -#: mod/photos.php:1431 mod/settings.php:359 src/Content/Conversation.php:631 +#: mod/photos.php:1431 mod/settings.php:350 src/Content/Conversation.php:629 #: src/Module/Admin/Users/Active.php:139 src/Module/Admin/Users/Blocked.php:140 #: src/Module/Admin/Users/Index.php:153 msgid "Delete" @@ -1128,7 +1128,7 @@ msgstr "" msgid "Contact not found." msgstr "" -#: mod/removeme.php:63 src/Navigation/Notifications/Repository/Notify.php:476 +#: mod/removeme.php:63 src/Navigation/Notifications/Repository/Notify.php:482 msgid "[Friendica System Notify]" msgstr "" @@ -1172,15 +1172,15 @@ msgid_plural "Errors" msgstr[0] "" msgstr[1] "" -#: mod/settings.php:131 +#: mod/settings.php:122 msgid "Failed to connect with email account using the settings provided." msgstr "" -#: mod/settings.php:184 +#: mod/settings.php:175 msgid "Connected Apps" msgstr "" -#: mod/settings.php:185 src/Module/Admin/Blocklist/Contact.php:106 +#: mod/settings.php:176 src/Module/Admin/Blocklist/Contact.php:106 #: src/Module/Admin/Users/Active.php:129 src/Module/Admin/Users/Blocked.php:130 #: src/Module/Admin/Users/Create.php:71 src/Module/Admin/Users/Deleted.php:88 #: src/Module/Admin/Users/Index.php:142 src/Module/Admin/Users/Index.php:162 @@ -1188,104 +1188,104 @@ msgstr "" msgid "Name" msgstr "" -#: mod/settings.php:186 src/Content/Nav.php:212 +#: mod/settings.php:177 src/Content/Nav.php:212 msgid "Home Page" msgstr "" -#: mod/settings.php:187 src/Module/Admin/Queue.php:78 +#: mod/settings.php:178 src/Module/Admin/Queue.php:78 msgid "Created" msgstr "" -#: mod/settings.php:188 +#: mod/settings.php:179 msgid "Remove authorization" msgstr "" -#: mod/settings.php:214 mod/settings.php:246 mod/settings.php:277 -#: mod/settings.php:361 src/Module/Admin/Addons/Index.php:69 +#: mod/settings.php:205 mod/settings.php:237 mod/settings.php:268 +#: mod/settings.php:352 src/Module/Admin/Addons/Index.php:69 #: src/Module/Admin/Features.php:87 src/Module/Admin/Logs/Settings.php:81 -#: src/Module/Admin/Site.php:501 src/Module/Admin/Themes/Index.php:113 +#: src/Module/Admin/Site.php:434 src/Module/Admin/Themes/Index.php:113 #: src/Module/Admin/Tos.php:83 src/Module/Settings/Account.php:532 #: src/Module/Settings/Delegation.php:170 src/Module/Settings/Display.php:193 msgid "Save Settings" msgstr "" -#: mod/settings.php:222 +#: mod/settings.php:213 msgid "Addon Settings" msgstr "" -#: mod/settings.php:223 +#: mod/settings.php:214 msgid "No Addon settings configured" msgstr "" -#: mod/settings.php:244 +#: mod/settings.php:235 msgid "Additional Features" msgstr "" -#: mod/settings.php:282 +#: mod/settings.php:273 msgid "Diaspora (Socialhome, Hubzilla)" msgstr "" -#: mod/settings.php:282 mod/settings.php:283 +#: mod/settings.php:273 mod/settings.php:274 msgid "enabled" msgstr "" -#: mod/settings.php:282 mod/settings.php:283 +#: mod/settings.php:273 mod/settings.php:274 msgid "disabled" msgstr "" -#: mod/settings.php:282 mod/settings.php:283 +#: mod/settings.php:273 mod/settings.php:274 #, php-format msgid "Built-in support for %s connectivity is %s" msgstr "" -#: mod/settings.php:283 +#: mod/settings.php:274 msgid "OStatus (GNU Social)" msgstr "" -#: mod/settings.php:309 +#: mod/settings.php:300 msgid "Email access is disabled on this site." msgstr "" -#: mod/settings.php:314 mod/settings.php:359 +#: mod/settings.php:305 mod/settings.php:350 msgid "None" msgstr "" -#: mod/settings.php:320 src/Module/BaseSettings.php:78 +#: mod/settings.php:311 src/Module/BaseSettings.php:78 msgid "Social Networks" msgstr "" -#: mod/settings.php:325 +#: mod/settings.php:316 msgid "General Social Media Settings" msgstr "" -#: mod/settings.php:328 +#: mod/settings.php:319 msgid "Followed content scope" msgstr "" -#: mod/settings.php:330 +#: mod/settings.php:321 msgid "" "By default, conversations in which your follows participated but didn't " "start will be shown in your timeline. You can turn this behavior off, or " "expand it to the conversations in which your follows liked a post." msgstr "" -#: mod/settings.php:332 +#: mod/settings.php:323 msgid "Only conversations my follows started" msgstr "" -#: mod/settings.php:333 +#: mod/settings.php:324 msgid "Conversations my follows started or commented on (default)" msgstr "" -#: mod/settings.php:334 +#: mod/settings.php:325 msgid "Any conversation my follows interacted with, including likes" msgstr "" -#: mod/settings.php:337 +#: mod/settings.php:328 msgid "Enable Content Warning" msgstr "" -#: mod/settings.php:337 +#: mod/settings.php:328 msgid "" "Users on networks like Mastodon or Pleroma are able to set a content warning " "field which collapse their post by default. This enables the automatic " @@ -1293,108 +1293,108 @@ msgid "" "affect any other content filtering you eventually set up." msgstr "" -#: mod/settings.php:338 +#: mod/settings.php:329 msgid "Enable intelligent shortening" msgstr "" -#: mod/settings.php:338 +#: mod/settings.php:329 msgid "" "Normally the system tries to find the best link to add to shortened posts. " "If disabled, every shortened post will always point to the original " "friendica post." msgstr "" -#: mod/settings.php:339 +#: mod/settings.php:330 msgid "Enable simple text shortening" msgstr "" -#: mod/settings.php:339 +#: mod/settings.php:330 msgid "" "Normally the system shortens posts at the next line feed. If this option is " "enabled then the system will shorten the text at the maximum character limit." msgstr "" -#: mod/settings.php:340 +#: mod/settings.php:331 msgid "Attach the link title" msgstr "" -#: mod/settings.php:340 +#: mod/settings.php:331 msgid "" "When activated, the title of the attached link will be added as a title on " "posts to Diaspora. This is mostly helpful with \"remote-self\" contacts that " "share feed content." msgstr "" -#: mod/settings.php:341 +#: mod/settings.php:332 msgid "Your legacy ActivityPub/GNU Social account" msgstr "" -#: mod/settings.php:341 +#: mod/settings.php:332 msgid "" "If you enter your old account name from an ActivityPub based system or your " "GNU Social/Statusnet account name here (in the format user@domain.tld), your " "contacts will be added automatically. The field will be emptied when done." msgstr "" -#: mod/settings.php:344 +#: mod/settings.php:335 msgid "Repair OStatus subscriptions" msgstr "" -#: mod/settings.php:348 +#: mod/settings.php:339 msgid "Email/Mailbox Setup" msgstr "" -#: mod/settings.php:349 +#: mod/settings.php:340 msgid "" "If you wish to communicate with email contacts using this service " "(optional), please specify how to connect to your mailbox." msgstr "" -#: mod/settings.php:350 +#: mod/settings.php:341 msgid "Last successful email check:" msgstr "" -#: mod/settings.php:352 +#: mod/settings.php:343 msgid "IMAP server name:" msgstr "" -#: mod/settings.php:353 +#: mod/settings.php:344 msgid "IMAP port:" msgstr "" -#: mod/settings.php:354 +#: mod/settings.php:345 msgid "Security:" msgstr "" -#: mod/settings.php:355 +#: mod/settings.php:346 msgid "Email login name:" msgstr "" -#: mod/settings.php:356 +#: mod/settings.php:347 msgid "Email password:" msgstr "" -#: mod/settings.php:357 +#: mod/settings.php:348 msgid "Reply-to address:" msgstr "" -#: mod/settings.php:358 +#: mod/settings.php:349 msgid "Send public posts to all email contacts:" msgstr "" -#: mod/settings.php:359 +#: mod/settings.php:350 msgid "Action after import:" msgstr "" -#: mod/settings.php:359 src/Content/Nav.php:280 +#: mod/settings.php:350 src/Content/Nav.php:280 msgid "Mark as seen" msgstr "" -#: mod/settings.php:359 +#: mod/settings.php:350 msgid "Move to folder" msgstr "" -#: mod/settings.php:360 +#: mod/settings.php:351 msgid "Move to folder:" msgstr "" @@ -1641,31 +1641,31 @@ msgstr "" msgid "The contact has been blocked from the node" msgstr "" -#: src/Console/MoveToAvatarCache.php:90 +#: src/Console/MoveToAvatarCache.php:91 msgid "The avatar cache needs to be enabled to use this command." msgstr "" -#: src/Console/MoveToAvatarCache.php:105 +#: src/Console/MoveToAvatarCache.php:109 #, php-format msgid "no resource in photo %s" msgstr "" -#: src/Console/MoveToAvatarCache.php:133 +#: src/Console/MoveToAvatarCache.php:137 #, php-format msgid "no photo with id %s" msgstr "" -#: src/Console/MoveToAvatarCache.php:142 +#: src/Console/MoveToAvatarCache.php:146 #, php-format msgid "no image data for photo with id %s" msgstr "" -#: src/Console/MoveToAvatarCache.php:151 +#: src/Console/MoveToAvatarCache.php:155 #, php-format msgid "invalid image for id %s" msgstr "" -#: src/Console/MoveToAvatarCache.php:164 +#: src/Console/MoveToAvatarCache.php:168 #, php-format msgid "Quit on invalid photo %s" msgstr "" @@ -1856,237 +1856,237 @@ msgstr "" msgid "%s (via %s)" msgstr "" -#: src/Content/Conversation.php:209 +#: src/Content/Conversation.php:207 #, php-format msgid "%s likes this." msgstr "" -#: src/Content/Conversation.php:212 +#: src/Content/Conversation.php:210 #, php-format msgid "%s doesn't like this." msgstr "" -#: src/Content/Conversation.php:215 +#: src/Content/Conversation.php:213 #, php-format msgid "%s attends." msgstr "" -#: src/Content/Conversation.php:218 +#: src/Content/Conversation.php:216 #, php-format msgid "%s doesn't attend." msgstr "" -#: src/Content/Conversation.php:221 +#: src/Content/Conversation.php:219 #, php-format msgid "%s attends maybe." msgstr "" -#: src/Content/Conversation.php:224 src/Content/Conversation.php:262 -#: src/Content/Conversation.php:874 +#: src/Content/Conversation.php:222 src/Content/Conversation.php:260 +#: src/Content/Conversation.php:872 #, php-format msgid "%s reshared this." msgstr "" -#: src/Content/Conversation.php:230 +#: src/Content/Conversation.php:228 msgid "and" msgstr "" -#: src/Content/Conversation.php:233 +#: src/Content/Conversation.php:231 #, php-format msgid "and %d other people" msgstr "" -#: src/Content/Conversation.php:241 +#: src/Content/Conversation.php:239 #, php-format msgid "%2$d people like this" msgstr "" -#: src/Content/Conversation.php:242 +#: src/Content/Conversation.php:240 #, php-format msgid "%s like this." msgstr "" -#: src/Content/Conversation.php:245 +#: src/Content/Conversation.php:243 #, php-format msgid "%2$d people don't like this" msgstr "" -#: src/Content/Conversation.php:246 +#: src/Content/Conversation.php:244 #, php-format msgid "%s don't like this." msgstr "" -#: src/Content/Conversation.php:249 +#: src/Content/Conversation.php:247 #, php-format msgid "%2$d people attend" msgstr "" -#: src/Content/Conversation.php:250 +#: src/Content/Conversation.php:248 #, php-format msgid "%s attend." msgstr "" -#: src/Content/Conversation.php:253 +#: src/Content/Conversation.php:251 #, php-format msgid "%2$d people don't attend" msgstr "" -#: src/Content/Conversation.php:254 +#: src/Content/Conversation.php:252 #, php-format msgid "%s don't attend." msgstr "" -#: src/Content/Conversation.php:257 +#: src/Content/Conversation.php:255 #, php-format msgid "%2$d people attend maybe" msgstr "" -#: src/Content/Conversation.php:258 +#: src/Content/Conversation.php:256 #, php-format msgid "%s attend maybe." msgstr "" -#: src/Content/Conversation.php:261 +#: src/Content/Conversation.php:259 #, php-format msgid "%2$d people reshared this" msgstr "" -#: src/Content/Conversation.php:309 +#: src/Content/Conversation.php:307 msgid "Visible to everybody" msgstr "" -#: src/Content/Conversation.php:310 src/Module/Item/Compose.php:171 +#: src/Content/Conversation.php:308 src/Module/Item/Compose.php:171 #: src/Object/Post.php:998 msgid "Please enter a image/video/audio/webpage URL:" msgstr "" -#: src/Content/Conversation.php:311 +#: src/Content/Conversation.php:309 msgid "Tag term:" msgstr "" -#: src/Content/Conversation.php:312 src/Module/Filer/SaveTag.php:72 +#: src/Content/Conversation.php:310 src/Module/Filer/SaveTag.php:72 msgid "Save to Folder:" msgstr "" -#: src/Content/Conversation.php:313 +#: src/Content/Conversation.php:311 msgid "Where are you right now?" msgstr "" -#: src/Content/Conversation.php:314 +#: src/Content/Conversation.php:312 msgid "Delete item(s)?" msgstr "" -#: src/Content/Conversation.php:326 src/Module/Item/Compose.php:143 +#: src/Content/Conversation.php:324 src/Module/Item/Compose.php:143 msgid "Created at" msgstr "" -#: src/Content/Conversation.php:336 +#: src/Content/Conversation.php:334 msgid "New Post" msgstr "" -#: src/Content/Conversation.php:339 +#: src/Content/Conversation.php:337 msgid "Share" msgstr "" -#: src/Content/Conversation.php:350 src/Module/Item/Compose.php:168 +#: src/Content/Conversation.php:348 src/Module/Item/Compose.php:168 #: src/Object/Post.php:995 msgid "Image" msgstr "" -#: src/Content/Conversation.php:353 +#: src/Content/Conversation.php:351 msgid "Video" msgstr "" -#: src/Content/Conversation.php:366 src/Module/Item/Compose.php:184 +#: src/Content/Conversation.php:364 src/Module/Item/Compose.php:184 msgid "Scheduled at" msgstr "" -#: src/Content/Conversation.php:658 src/Object/Post.php:235 +#: src/Content/Conversation.php:656 src/Object/Post.php:235 msgid "Pinned item" msgstr "" -#: src/Content/Conversation.php:674 src/Object/Post.php:476 +#: src/Content/Conversation.php:672 src/Object/Post.php:476 #: src/Object/Post.php:477 #, php-format msgid "View %s's profile @ %s" msgstr "" -#: src/Content/Conversation.php:687 src/Object/Post.php:464 +#: src/Content/Conversation.php:685 src/Object/Post.php:464 msgid "Categories:" msgstr "" -#: src/Content/Conversation.php:688 src/Object/Post.php:465 +#: src/Content/Conversation.php:686 src/Object/Post.php:465 msgid "Filed under:" msgstr "" -#: src/Content/Conversation.php:696 src/Object/Post.php:490 +#: src/Content/Conversation.php:694 src/Object/Post.php:490 #, php-format msgid "%s from %s" msgstr "" -#: src/Content/Conversation.php:712 +#: src/Content/Conversation.php:710 msgid "View in context" msgstr "" -#: src/Content/Conversation.php:777 +#: src/Content/Conversation.php:775 msgid "remove" msgstr "" -#: src/Content/Conversation.php:781 +#: src/Content/Conversation.php:779 msgid "Delete Selected Items" msgstr "" -#: src/Content/Conversation.php:846 src/Content/Conversation.php:849 -#: src/Content/Conversation.php:852 src/Content/Conversation.php:855 +#: src/Content/Conversation.php:844 src/Content/Conversation.php:847 +#: src/Content/Conversation.php:850 src/Content/Conversation.php:853 #, php-format msgid "You had been addressed (%s)." msgstr "" -#: src/Content/Conversation.php:858 +#: src/Content/Conversation.php:856 #, php-format msgid "You are following %s." msgstr "" -#: src/Content/Conversation.php:861 +#: src/Content/Conversation.php:859 msgid "Tagged" msgstr "" -#: src/Content/Conversation.php:876 +#: src/Content/Conversation.php:874 msgid "Reshared" msgstr "" -#: src/Content/Conversation.php:876 +#: src/Content/Conversation.php:874 #, php-format msgid "Reshared by %s <%s>" msgstr "" -#: src/Content/Conversation.php:879 +#: src/Content/Conversation.php:877 #, php-format msgid "%s is participating in this thread." msgstr "" -#: src/Content/Conversation.php:882 +#: src/Content/Conversation.php:880 msgid "Stored" msgstr "" -#: src/Content/Conversation.php:885 +#: src/Content/Conversation.php:883 msgid "Global" msgstr "" -#: src/Content/Conversation.php:888 +#: src/Content/Conversation.php:886 msgid "Relayed" msgstr "" -#: src/Content/Conversation.php:888 +#: src/Content/Conversation.php:886 #, php-format msgid "Relayed by %s <%s>" msgstr "" -#: src/Content/Conversation.php:891 +#: src/Content/Conversation.php:889 msgid "Fetched" msgstr "" -#: src/Content/Conversation.php:891 +#: src/Content/Conversation.php:889 #, php-format msgid "Fetched because of %s <%s>" msgstr "" @@ -4224,7 +4224,7 @@ msgstr "" #: src/Module/Admin/Blocklist/Server/Index.php:78 #: src/Module/Admin/Federation.php:196 src/Module/Admin/Item/Delete.php:64 #: src/Module/Admin/Logs/Settings.php:79 src/Module/Admin/Logs/View.php:84 -#: src/Module/Admin/Queue.php:72 src/Module/Admin/Site.php:498 +#: src/Module/Admin/Queue.php:72 src/Module/Admin/Site.php:431 #: src/Module/Admin/Storage.php:138 src/Module/Admin/Summary.php:233 #: src/Module/Admin/Themes/Details.php:90 src/Module/Admin/Themes/Index.php:111 #: src/Module/Admin/Tos.php:75 src/Module/Admin/Users/Active.php:136 @@ -4977,473 +4977,470 @@ msgstr "" msgid "Priority" msgstr "" -#: src/Module/Admin/Site.php:71 -msgid "Can not parse base url. Must have at least ://" -msgstr "" - -#: src/Module/Admin/Site.php:125 -msgid "Relocation started. Could take a while to complete." -msgstr "" - -#: src/Module/Admin/Site.php:403 src/Module/Settings/Display.php:138 +#: src/Module/Admin/Site.php:336 src/Module/Settings/Display.php:138 msgid "No special theme for mobile devices" msgstr "" -#: src/Module/Admin/Site.php:420 src/Module/Settings/Display.php:148 +#: src/Module/Admin/Site.php:353 src/Module/Settings/Display.php:148 #, php-format msgid "%s - (Experimental)" msgstr "" -#: src/Module/Admin/Site.php:432 +#: src/Module/Admin/Site.php:365 msgid "No community page for local users" msgstr "" -#: src/Module/Admin/Site.php:433 +#: src/Module/Admin/Site.php:366 msgid "No community page" msgstr "" -#: src/Module/Admin/Site.php:434 +#: src/Module/Admin/Site.php:367 msgid "Public postings from users of this site" msgstr "" -#: src/Module/Admin/Site.php:435 +#: src/Module/Admin/Site.php:368 msgid "Public postings from the federated network" msgstr "" -#: src/Module/Admin/Site.php:436 +#: src/Module/Admin/Site.php:369 msgid "Public postings from local users and the federated network" msgstr "" -#: src/Module/Admin/Site.php:442 +#: src/Module/Admin/Site.php:375 msgid "Multi user instance" msgstr "" -#: src/Module/Admin/Site.php:469 +#: src/Module/Admin/Site.php:402 msgid "Closed" msgstr "" -#: src/Module/Admin/Site.php:470 +#: src/Module/Admin/Site.php:403 msgid "Requires approval" msgstr "" -#: src/Module/Admin/Site.php:471 +#: src/Module/Admin/Site.php:404 msgid "Open" msgstr "" -#: src/Module/Admin/Site.php:475 src/Module/Install.php:222 +#: src/Module/Admin/Site.php:408 src/Module/Install.php:222 msgid "No SSL policy, links will track page SSL state" msgstr "" -#: src/Module/Admin/Site.php:476 src/Module/Install.php:223 +#: src/Module/Admin/Site.php:409 src/Module/Install.php:223 msgid "Force all links to use SSL" msgstr "" -#: src/Module/Admin/Site.php:477 src/Module/Install.php:224 +#: src/Module/Admin/Site.php:410 src/Module/Install.php:224 msgid "Self-signed certificate, use SSL for local links only (discouraged)" msgstr "" -#: src/Module/Admin/Site.php:481 +#: src/Module/Admin/Site.php:414 msgid "Don't check" msgstr "" -#: src/Module/Admin/Site.php:482 +#: src/Module/Admin/Site.php:415 msgid "check the stable version" msgstr "" -#: src/Module/Admin/Site.php:483 +#: src/Module/Admin/Site.php:416 msgid "check the development version" msgstr "" -#: src/Module/Admin/Site.php:487 +#: src/Module/Admin/Site.php:420 msgid "none" msgstr "" -#: src/Module/Admin/Site.php:488 +#: src/Module/Admin/Site.php:421 msgid "Local contacts" msgstr "" -#: src/Module/Admin/Site.php:489 +#: src/Module/Admin/Site.php:422 msgid "Interactors" msgstr "" -#: src/Module/Admin/Site.php:499 src/Module/BaseAdmin.php:90 +#: src/Module/Admin/Site.php:432 src/Module/BaseAdmin.php:90 msgid "Site" msgstr "" -#: src/Module/Admin/Site.php:500 +#: src/Module/Admin/Site.php:433 msgid "General Information" msgstr "" -#: src/Module/Admin/Site.php:502 +#: src/Module/Admin/Site.php:435 msgid "Republish users to directory" msgstr "" -#: src/Module/Admin/Site.php:503 src/Module/Register.php:152 +#: src/Module/Admin/Site.php:436 src/Module/Register.php:152 msgid "Registration" msgstr "" -#: src/Module/Admin/Site.php:504 +#: src/Module/Admin/Site.php:437 msgid "File upload" msgstr "" -#: src/Module/Admin/Site.php:505 +#: src/Module/Admin/Site.php:438 msgid "Policies" msgstr "" -#: src/Module/Admin/Site.php:507 +#: src/Module/Admin/Site.php:440 msgid "Auto Discovered Contact Directory" msgstr "" -#: src/Module/Admin/Site.php:508 +#: src/Module/Admin/Site.php:441 msgid "Performance" msgstr "" -#: src/Module/Admin/Site.php:509 +#: src/Module/Admin/Site.php:442 msgid "Worker" msgstr "" -#: src/Module/Admin/Site.php:510 +#: src/Module/Admin/Site.php:443 msgid "Message Relay" msgstr "" -#: src/Module/Admin/Site.php:511 +#: src/Module/Admin/Site.php:444 msgid "" "Use the command \"console relay\" in the command line to add or remove " "relays." msgstr "" -#: src/Module/Admin/Site.php:512 +#: src/Module/Admin/Site.php:445 msgid "The system is not subscribed to any relays at the moment." msgstr "" -#: src/Module/Admin/Site.php:513 +#: src/Module/Admin/Site.php:446 msgid "The system is currently subscribed to the following relays:" msgstr "" -#: src/Module/Admin/Site.php:515 -msgid "Relocate Instance" +#: src/Module/Admin/Site.php:448 +msgid "Relocate Node" msgstr "" -#: src/Module/Admin/Site.php:516 +#: src/Module/Admin/Site.php:449 msgid "" -"Warning! Advanced function. Could make this server " -"unreachable." +"Relocating your node enables you to change the DNS domain of this node and " +"keep all the existing users and posts. This process takes a while and can " +"only be started from the relocate console command like this:" msgstr "" -#: src/Module/Admin/Site.php:520 +#: src/Module/Admin/Site.php:450 +msgid "(Friendica directory)# bin/console relocate https://newdomain.com" +msgstr "" + +#: src/Module/Admin/Site.php:454 msgid "Site name" msgstr "" -#: src/Module/Admin/Site.php:521 +#: src/Module/Admin/Site.php:455 msgid "Sender Email" msgstr "" -#: src/Module/Admin/Site.php:521 +#: src/Module/Admin/Site.php:455 msgid "" "The email address your server shall use to send notification emails from." msgstr "" -#: src/Module/Admin/Site.php:522 +#: src/Module/Admin/Site.php:456 msgid "Name of the system actor" msgstr "" -#: src/Module/Admin/Site.php:522 +#: src/Module/Admin/Site.php:456 msgid "" "Name of the internal system account that is used to perform ActivityPub " "requests. This must be an unused username. If set, this can't be changed " "again." msgstr "" -#: src/Module/Admin/Site.php:523 +#: src/Module/Admin/Site.php:457 msgid "Banner/Logo" msgstr "" -#: src/Module/Admin/Site.php:524 +#: src/Module/Admin/Site.php:458 msgid "Email Banner/Logo" msgstr "" -#: src/Module/Admin/Site.php:525 +#: src/Module/Admin/Site.php:459 msgid "Shortcut icon" msgstr "" -#: src/Module/Admin/Site.php:525 +#: src/Module/Admin/Site.php:459 msgid "Link to an icon that will be used for browsers." msgstr "" -#: src/Module/Admin/Site.php:526 +#: src/Module/Admin/Site.php:460 msgid "Touch icon" msgstr "" -#: src/Module/Admin/Site.php:526 +#: src/Module/Admin/Site.php:460 msgid "Link to an icon that will be used for tablets and mobiles." msgstr "" -#: src/Module/Admin/Site.php:527 +#: src/Module/Admin/Site.php:461 msgid "Additional Info" msgstr "" -#: src/Module/Admin/Site.php:527 +#: src/Module/Admin/Site.php:461 #, php-format msgid "" "For public servers: you can add additional information here that will be " "listed at %s/servers." msgstr "" -#: src/Module/Admin/Site.php:528 +#: src/Module/Admin/Site.php:462 msgid "System language" msgstr "" -#: src/Module/Admin/Site.php:529 +#: src/Module/Admin/Site.php:463 msgid "System theme" msgstr "" -#: src/Module/Admin/Site.php:529 +#: src/Module/Admin/Site.php:463 #, php-format msgid "" "Default system theme - may be over-ridden by user profiles - Change default theme settings" msgstr "" -#: src/Module/Admin/Site.php:530 +#: src/Module/Admin/Site.php:464 msgid "Mobile system theme" msgstr "" -#: src/Module/Admin/Site.php:530 +#: src/Module/Admin/Site.php:464 msgid "Theme for mobile devices" msgstr "" -#: src/Module/Admin/Site.php:531 src/Module/Install.php:232 +#: src/Module/Admin/Site.php:465 src/Module/Install.php:232 msgid "SSL link policy" msgstr "" -#: src/Module/Admin/Site.php:531 src/Module/Install.php:234 +#: src/Module/Admin/Site.php:465 src/Module/Install.php:234 msgid "Determines whether generated links should be forced to use SSL" msgstr "" -#: src/Module/Admin/Site.php:532 +#: src/Module/Admin/Site.php:466 msgid "Force SSL" msgstr "" -#: src/Module/Admin/Site.php:532 +#: src/Module/Admin/Site.php:466 msgid "" "Force all Non-SSL requests to SSL - Attention: on some systems it could lead " "to endless loops." msgstr "" -#: src/Module/Admin/Site.php:533 +#: src/Module/Admin/Site.php:467 msgid "Show help entry from navigation menu" msgstr "" -#: src/Module/Admin/Site.php:533 +#: src/Module/Admin/Site.php:467 msgid "" "Displays the menu entry for the Help pages from the navigation menu. It is " "always accessible by calling /help directly." msgstr "" -#: src/Module/Admin/Site.php:534 +#: src/Module/Admin/Site.php:468 msgid "Single user instance" msgstr "" -#: src/Module/Admin/Site.php:534 +#: src/Module/Admin/Site.php:468 msgid "Make this instance multi-user or single-user for the named user" msgstr "" -#: src/Module/Admin/Site.php:536 +#: src/Module/Admin/Site.php:470 msgid "Maximum image size" msgstr "" -#: src/Module/Admin/Site.php:536 +#: src/Module/Admin/Site.php:470 msgid "" "Maximum size in bytes of uploaded images. Default is 0, which means no " "limits." msgstr "" -#: src/Module/Admin/Site.php:537 +#: src/Module/Admin/Site.php:471 msgid "Maximum image length" msgstr "" -#: src/Module/Admin/Site.php:537 +#: src/Module/Admin/Site.php:471 msgid "" "Maximum length in pixels of the longest side of uploaded images. Default is " "-1, which means no limits." msgstr "" -#: src/Module/Admin/Site.php:538 +#: src/Module/Admin/Site.php:472 msgid "JPEG image quality" msgstr "" -#: src/Module/Admin/Site.php:538 +#: src/Module/Admin/Site.php:472 msgid "" "Uploaded JPEGS will be saved at this quality setting [0-100]. Default is " "100, which is full quality." msgstr "" -#: src/Module/Admin/Site.php:540 +#: src/Module/Admin/Site.php:474 msgid "Register policy" msgstr "" -#: src/Module/Admin/Site.php:541 +#: src/Module/Admin/Site.php:475 msgid "Maximum Daily Registrations" msgstr "" -#: src/Module/Admin/Site.php:541 +#: src/Module/Admin/Site.php:475 msgid "" "If registration is permitted above, this sets the maximum number of new user " "registrations to accept per day. If register is set to closed, this setting " "has no effect." msgstr "" -#: src/Module/Admin/Site.php:542 +#: src/Module/Admin/Site.php:476 msgid "Register text" msgstr "" -#: src/Module/Admin/Site.php:542 +#: src/Module/Admin/Site.php:476 msgid "" "Will be displayed prominently on the registration page. You can use BBCode " "here." msgstr "" -#: src/Module/Admin/Site.php:543 +#: src/Module/Admin/Site.php:477 msgid "Forbidden Nicknames" msgstr "" -#: src/Module/Admin/Site.php:543 +#: src/Module/Admin/Site.php:477 msgid "" "Comma separated list of nicknames that are forbidden from registration. " "Preset is a list of role names according RFC 2142." msgstr "" -#: src/Module/Admin/Site.php:544 +#: src/Module/Admin/Site.php:478 msgid "Accounts abandoned after x days" msgstr "" -#: src/Module/Admin/Site.php:544 +#: src/Module/Admin/Site.php:478 msgid "" "Will not waste system resources polling external sites for abandonded " "accounts. Enter 0 for no time limit." msgstr "" -#: src/Module/Admin/Site.php:545 +#: src/Module/Admin/Site.php:479 msgid "Allowed friend domains" msgstr "" -#: src/Module/Admin/Site.php:545 +#: src/Module/Admin/Site.php:479 msgid "" "Comma separated list of domains which are allowed to establish friendships " "with this site. Wildcards are accepted. Empty to allow any domains" msgstr "" -#: src/Module/Admin/Site.php:546 +#: src/Module/Admin/Site.php:480 msgid "Allowed email domains" msgstr "" -#: src/Module/Admin/Site.php:546 +#: src/Module/Admin/Site.php:480 msgid "" "Comma separated list of domains which are allowed in email addresses for " "registrations to this site. Wildcards are accepted. Empty to allow any " "domains" msgstr "" -#: src/Module/Admin/Site.php:547 +#: src/Module/Admin/Site.php:481 msgid "No OEmbed rich content" msgstr "" -#: src/Module/Admin/Site.php:547 +#: src/Module/Admin/Site.php:481 msgid "" "Don't show the rich content (e.g. embedded PDF), except from the domains " "listed below." msgstr "" -#: src/Module/Admin/Site.php:548 +#: src/Module/Admin/Site.php:482 msgid "Trusted third-party domains" msgstr "" -#: src/Module/Admin/Site.php:548 +#: src/Module/Admin/Site.php:482 msgid "" "Comma separated list of domains from which content is allowed to be embedded " "in posts like with OEmbed. All sub-domains of the listed domains are allowed " "as well." msgstr "" -#: src/Module/Admin/Site.php:549 +#: src/Module/Admin/Site.php:483 msgid "Block public" msgstr "" -#: src/Module/Admin/Site.php:549 +#: src/Module/Admin/Site.php:483 msgid "" "Check to block public access to all otherwise public personal pages on this " "site unless you are currently logged in." msgstr "" -#: src/Module/Admin/Site.php:550 +#: src/Module/Admin/Site.php:484 msgid "Force publish" msgstr "" -#: src/Module/Admin/Site.php:550 +#: src/Module/Admin/Site.php:484 msgid "" "Check to force all profiles on this site to be listed in the site directory." msgstr "" -#: src/Module/Admin/Site.php:550 +#: src/Module/Admin/Site.php:484 msgid "Enabling this may violate privacy laws like the GDPR" msgstr "" -#: src/Module/Admin/Site.php:551 +#: src/Module/Admin/Site.php:485 msgid "Global directory URL" msgstr "" -#: src/Module/Admin/Site.php:551 +#: src/Module/Admin/Site.php:485 msgid "" "URL to the global directory. If this is not set, the global directory is " "completely unavailable to the application." msgstr "" -#: src/Module/Admin/Site.php:552 +#: src/Module/Admin/Site.php:486 msgid "Private posts by default for new users" msgstr "" -#: src/Module/Admin/Site.php:552 +#: src/Module/Admin/Site.php:486 msgid "" "Set default post permissions for all new members to the default privacy " "group rather than public." msgstr "" -#: src/Module/Admin/Site.php:553 +#: src/Module/Admin/Site.php:487 msgid "Don't include post content in email notifications" msgstr "" -#: src/Module/Admin/Site.php:553 +#: src/Module/Admin/Site.php:487 msgid "" "Don't include the content of a post/comment/private message/etc. in the " "email notifications that are sent out from this site, as a privacy measure." msgstr "" -#: src/Module/Admin/Site.php:554 +#: src/Module/Admin/Site.php:488 msgid "Disallow public access to addons listed in the apps menu." msgstr "" -#: src/Module/Admin/Site.php:554 +#: src/Module/Admin/Site.php:488 msgid "" "Checking this box will restrict addons listed in the apps menu to members " "only." msgstr "" -#: src/Module/Admin/Site.php:555 +#: src/Module/Admin/Site.php:489 msgid "Don't embed private images in posts" msgstr "" -#: src/Module/Admin/Site.php:555 +#: src/Module/Admin/Site.php:489 msgid "" "Don't replace locally-hosted private photos in posts with an embedded copy " "of the image. This means that contacts who receive posts containing private " "photos will have to authenticate and load each image, which may take a while." msgstr "" -#: src/Module/Admin/Site.php:556 +#: src/Module/Admin/Site.php:490 msgid "Explicit Content" msgstr "" -#: src/Module/Admin/Site.php:556 +#: src/Module/Admin/Site.php:490 msgid "" "Set this to announce that your node is used mostly for explicit content that " "might not be suited for minors. This information will be published in the " @@ -5452,257 +5449,257 @@ msgid "" "will be shown at the user registration page." msgstr "" -#: src/Module/Admin/Site.php:557 +#: src/Module/Admin/Site.php:491 msgid "Proxify external content" msgstr "" -#: src/Module/Admin/Site.php:557 +#: src/Module/Admin/Site.php:491 msgid "" "Route external content via the proxy functionality. This is used for example " "for some OEmbed accesses and in some other rare cases." msgstr "" -#: src/Module/Admin/Site.php:558 +#: src/Module/Admin/Site.php:492 msgid "Cache contact avatars" msgstr "" -#: src/Module/Admin/Site.php:558 +#: src/Module/Admin/Site.php:492 msgid "" "Locally store the avatar pictures of the contacts. This uses a lot of " "storage space but it increases the performance." msgstr "" -#: src/Module/Admin/Site.php:559 +#: src/Module/Admin/Site.php:493 msgid "Allow Users to set remote_self" msgstr "" -#: src/Module/Admin/Site.php:559 +#: src/Module/Admin/Site.php:493 msgid "" "With checking this, every user is allowed to mark every contact as a " "remote_self in the repair contact dialog. Setting this flag on a contact " "causes mirroring every posting of that contact in the users stream." msgstr "" -#: src/Module/Admin/Site.php:560 +#: src/Module/Admin/Site.php:494 msgid "Enable multiple registrations" msgstr "" -#: src/Module/Admin/Site.php:560 +#: src/Module/Admin/Site.php:494 msgid "Enable users to register additional accounts for use as pages." msgstr "" -#: src/Module/Admin/Site.php:561 +#: src/Module/Admin/Site.php:495 msgid "Enable OpenID" msgstr "" -#: src/Module/Admin/Site.php:561 +#: src/Module/Admin/Site.php:495 msgid "Enable OpenID support for registration and logins." msgstr "" -#: src/Module/Admin/Site.php:562 +#: src/Module/Admin/Site.php:496 msgid "Enable Fullname check" msgstr "" -#: src/Module/Admin/Site.php:562 +#: src/Module/Admin/Site.php:496 msgid "" "Enable check to only allow users to register with a space between the first " "name and the last name in their full name." msgstr "" -#: src/Module/Admin/Site.php:563 +#: src/Module/Admin/Site.php:497 msgid "Community pages for visitors" msgstr "" -#: src/Module/Admin/Site.php:563 +#: src/Module/Admin/Site.php:497 msgid "" "Which community pages should be available for visitors. Local users always " "see both pages." msgstr "" -#: src/Module/Admin/Site.php:564 +#: src/Module/Admin/Site.php:498 msgid "Posts per user on community page" msgstr "" -#: src/Module/Admin/Site.php:564 +#: src/Module/Admin/Site.php:498 msgid "" "The maximum number of posts per user on the community page. (Not valid for " "\"Global Community\")" msgstr "" -#: src/Module/Admin/Site.php:566 +#: src/Module/Admin/Site.php:500 msgid "Enable Mail support" msgstr "" -#: src/Module/Admin/Site.php:566 +#: src/Module/Admin/Site.php:500 msgid "" "Enable built-in mail support to poll IMAP folders and to reply via mail." msgstr "" -#: src/Module/Admin/Site.php:567 +#: src/Module/Admin/Site.php:501 msgid "" "Mail support can't be enabled because the PHP IMAP module is not installed." msgstr "" -#: src/Module/Admin/Site.php:568 +#: src/Module/Admin/Site.php:502 msgid "Enable OStatus support" msgstr "" -#: src/Module/Admin/Site.php:568 +#: src/Module/Admin/Site.php:502 msgid "" "Enable built-in OStatus (StatusNet, GNU Social etc.) compatibility. All " "communications in OStatus are public." msgstr "" -#: src/Module/Admin/Site.php:570 +#: src/Module/Admin/Site.php:504 msgid "" "Diaspora support can't be enabled because Friendica was installed into a sub " "directory." msgstr "" -#: src/Module/Admin/Site.php:571 +#: src/Module/Admin/Site.php:505 msgid "Enable Diaspora support" msgstr "" -#: src/Module/Admin/Site.php:571 +#: src/Module/Admin/Site.php:505 msgid "" "Enable built-in Diaspora network compatibility for communicating with " "diaspora servers." msgstr "" -#: src/Module/Admin/Site.php:572 +#: src/Module/Admin/Site.php:506 msgid "Verify SSL" msgstr "" -#: src/Module/Admin/Site.php:572 +#: src/Module/Admin/Site.php:506 msgid "" "If you wish, you can turn on strict certificate checking. This will mean you " "cannot connect (at all) to self-signed SSL sites." msgstr "" -#: src/Module/Admin/Site.php:573 +#: src/Module/Admin/Site.php:507 msgid "Proxy user" msgstr "" -#: src/Module/Admin/Site.php:573 +#: src/Module/Admin/Site.php:507 msgid "User name for the proxy server." msgstr "" -#: src/Module/Admin/Site.php:574 +#: src/Module/Admin/Site.php:508 msgid "Proxy URL" msgstr "" -#: src/Module/Admin/Site.php:574 +#: src/Module/Admin/Site.php:508 msgid "" "If you want to use a proxy server that Friendica should use to connect to " "the network, put the URL of the proxy here." msgstr "" -#: src/Module/Admin/Site.php:575 +#: src/Module/Admin/Site.php:509 msgid "Network timeout" msgstr "" -#: src/Module/Admin/Site.php:575 +#: src/Module/Admin/Site.php:509 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)." msgstr "" -#: src/Module/Admin/Site.php:576 +#: src/Module/Admin/Site.php:510 msgid "Maximum Load Average" msgstr "" -#: src/Module/Admin/Site.php:576 +#: src/Module/Admin/Site.php:510 #, php-format msgid "" "Maximum system load before delivery and poll processes are deferred - " "default %d." msgstr "" -#: src/Module/Admin/Site.php:577 +#: src/Module/Admin/Site.php:511 msgid "Minimal Memory" msgstr "" -#: src/Module/Admin/Site.php:577 +#: src/Module/Admin/Site.php:511 msgid "" "Minimal free memory in MB for the worker. Needs access to /proc/meminfo - " "default 0 (deactivated)." msgstr "" -#: src/Module/Admin/Site.php:578 +#: src/Module/Admin/Site.php:512 msgid "Periodically optimize tables" msgstr "" -#: src/Module/Admin/Site.php:578 +#: src/Module/Admin/Site.php:512 msgid "Periodically optimize tables like the cache and the workerqueue" msgstr "" -#: src/Module/Admin/Site.php:580 +#: src/Module/Admin/Site.php:514 msgid "Discover followers/followings from contacts" msgstr "" -#: src/Module/Admin/Site.php:580 +#: src/Module/Admin/Site.php:514 msgid "" "If enabled, contacts are checked for their followers and following contacts." msgstr "" -#: src/Module/Admin/Site.php:581 +#: src/Module/Admin/Site.php:515 msgid "None - deactivated" msgstr "" -#: src/Module/Admin/Site.php:582 +#: src/Module/Admin/Site.php:516 msgid "" "Local contacts - contacts of our local contacts are discovered for their " "followers/followings." msgstr "" -#: src/Module/Admin/Site.php:583 +#: src/Module/Admin/Site.php:517 msgid "" "Interactors - contacts of our local contacts and contacts who interacted on " "locally visible postings are discovered for their followers/followings." msgstr "" -#: src/Module/Admin/Site.php:585 +#: src/Module/Admin/Site.php:519 msgid "Synchronize the contacts with the directory server" msgstr "" -#: src/Module/Admin/Site.php:585 +#: src/Module/Admin/Site.php:519 msgid "" "if enabled, the system will check periodically for new contacts on the " "defined directory server." msgstr "" -#: src/Module/Admin/Site.php:587 +#: src/Module/Admin/Site.php:521 msgid "Days between requery" msgstr "" -#: src/Module/Admin/Site.php:587 +#: src/Module/Admin/Site.php:521 msgid "Number of days after which a server is requeried for his contacts." msgstr "" -#: src/Module/Admin/Site.php:588 +#: src/Module/Admin/Site.php:522 msgid "Discover contacts from other servers" msgstr "" -#: src/Module/Admin/Site.php:588 +#: src/Module/Admin/Site.php:522 msgid "" "Periodically query other servers for contacts. The system queries Friendica, " "Mastodon and Hubzilla servers." msgstr "" -#: src/Module/Admin/Site.php:589 +#: src/Module/Admin/Site.php:523 msgid "Search the local directory" msgstr "" -#: src/Module/Admin/Site.php:589 +#: src/Module/Admin/Site.php:523 msgid "" "Search the local directory instead of the global directory. When searching " "locally, every search will be executed on the global directory in the " "background. This improves the search results when the search is repeated." msgstr "" -#: src/Module/Admin/Site.php:591 +#: src/Module/Admin/Site.php:525 msgid "Publish server information" msgstr "" -#: src/Module/Admin/Site.php:591 +#: src/Module/Admin/Site.php:525 msgid "" "If enabled, general server and usage data will be published. The data " "contains the name and version of the server, number of users with public " @@ -5710,50 +5707,50 @@ msgid "" "href=\"http://the-federation.info/\">the-federation.info for details." msgstr "" -#: src/Module/Admin/Site.php:593 +#: src/Module/Admin/Site.php:527 msgid "Check upstream version" msgstr "" -#: src/Module/Admin/Site.php:593 +#: src/Module/Admin/Site.php:527 msgid "" "Enables checking for new Friendica versions at github. If there is a new " "version, you will be informed in the admin panel overview." msgstr "" -#: src/Module/Admin/Site.php:594 +#: src/Module/Admin/Site.php:528 msgid "Suppress Tags" msgstr "" -#: src/Module/Admin/Site.php:594 +#: src/Module/Admin/Site.php:528 msgid "Suppress showing a list of hashtags at the end of the posting." msgstr "" -#: src/Module/Admin/Site.php:595 +#: src/Module/Admin/Site.php:529 msgid "Clean database" msgstr "" -#: src/Module/Admin/Site.php:595 +#: src/Module/Admin/Site.php:529 msgid "" "Remove old remote items, orphaned database records and old content from some " "other helper tables." msgstr "" -#: src/Module/Admin/Site.php:596 +#: src/Module/Admin/Site.php:530 msgid "Lifespan of remote items" msgstr "" -#: src/Module/Admin/Site.php:596 +#: src/Module/Admin/Site.php:530 msgid "" "When the database cleanup is enabled, this defines the days after which " "remote items will be deleted. Own items, and marked or filed items are " "always kept. 0 disables this behaviour." msgstr "" -#: src/Module/Admin/Site.php:597 +#: src/Module/Admin/Site.php:531 msgid "Lifespan of unclaimed items" msgstr "" -#: src/Module/Admin/Site.php:597 +#: src/Module/Admin/Site.php:531 msgid "" "When the database cleanup is enabled, this defines the days after which " "unclaimed remote items (mostly content from the relay) will be deleted. " @@ -5761,144 +5758,134 @@ msgid "" "items if set to 0." msgstr "" -#: src/Module/Admin/Site.php:598 +#: src/Module/Admin/Site.php:532 msgid "Lifespan of raw conversation data" msgstr "" -#: src/Module/Admin/Site.php:598 +#: src/Module/Admin/Site.php:532 msgid "" "The conversation data is used for ActivityPub and OStatus, as well as for " "debug purposes. It should be safe to remove it after 14 days, default is 90 " "days." msgstr "" -#: src/Module/Admin/Site.php:599 +#: src/Module/Admin/Site.php:533 msgid "Maximum numbers of comments per post" msgstr "" -#: src/Module/Admin/Site.php:599 +#: src/Module/Admin/Site.php:533 msgid "How much comments should be shown for each post? Default value is 100." msgstr "" -#: src/Module/Admin/Site.php:600 +#: src/Module/Admin/Site.php:534 msgid "Maximum numbers of comments per post on the display page" msgstr "" -#: src/Module/Admin/Site.php:600 +#: src/Module/Admin/Site.php:534 msgid "" "How many comments should be shown on the single view for each post? Default " "value is 1000." msgstr "" -#: src/Module/Admin/Site.php:601 +#: src/Module/Admin/Site.php:535 msgid "Temp path" msgstr "" -#: src/Module/Admin/Site.php:601 +#: src/Module/Admin/Site.php:535 msgid "" "If you have a restricted system where the webserver can't access the system " "temp path, enter another path here." msgstr "" -#: src/Module/Admin/Site.php:602 +#: src/Module/Admin/Site.php:536 msgid "Only search in tags" msgstr "" -#: src/Module/Admin/Site.php:602 +#: src/Module/Admin/Site.php:536 msgid "On large systems the text search can slow down the system extremely." msgstr "" -#: src/Module/Admin/Site.php:604 -msgid "New base url" -msgstr "" - -#: src/Module/Admin/Site.php:604 -msgid "" -"Change base url for this server. Sends relocate message to all Friendica and " -"Diaspora* contacts of all users." -msgstr "" - -#: src/Module/Admin/Site.php:606 +#: src/Module/Admin/Site.php:538 msgid "Maximum number of parallel workers" msgstr "" -#: src/Module/Admin/Site.php:606 +#: src/Module/Admin/Site.php:538 #, php-format msgid "" "On shared hosters set this to %d. On larger systems, values of %d are great. " "Default value is %d." msgstr "" -#: src/Module/Admin/Site.php:607 +#: src/Module/Admin/Site.php:539 msgid "Enable fastlane" msgstr "" -#: src/Module/Admin/Site.php:607 +#: src/Module/Admin/Site.php:539 msgid "" "When enabed, the fastlane mechanism starts an additional worker if processes " "with higher priority are blocked by processes of lower priority." msgstr "" -#: src/Module/Admin/Site.php:609 +#: src/Module/Admin/Site.php:541 msgid "Direct relay transfer" msgstr "" -#: src/Module/Admin/Site.php:609 +#: src/Module/Admin/Site.php:541 msgid "" "Enables the direct transfer to other servers without using the relay servers" msgstr "" -#: src/Module/Admin/Site.php:610 +#: src/Module/Admin/Site.php:542 msgid "Relay scope" msgstr "" -#: src/Module/Admin/Site.php:610 +#: src/Module/Admin/Site.php:542 msgid "" "Can be \"all\" or \"tags\". \"all\" means that every public post should be " "received. \"tags\" means that only posts with selected tags should be " "received." msgstr "" -#: src/Module/Admin/Site.php:610 src/Module/Contact/Profile.php:273 +#: src/Module/Admin/Site.php:542 src/Module/Contact/Profile.php:273 #: src/Module/Settings/TwoFactor/Index.php:118 msgid "Disabled" msgstr "" -#: src/Module/Admin/Site.php:610 +#: src/Module/Admin/Site.php:542 msgid "all" msgstr "" -#: src/Module/Admin/Site.php:610 +#: src/Module/Admin/Site.php:542 msgid "tags" msgstr "" -#: src/Module/Admin/Site.php:611 +#: src/Module/Admin/Site.php:543 msgid "Server tags" msgstr "" -#: src/Module/Admin/Site.php:611 +#: src/Module/Admin/Site.php:543 msgid "Comma separated list of tags for the \"tags\" subscription." msgstr "" -#: src/Module/Admin/Site.php:612 +#: src/Module/Admin/Site.php:544 msgid "Deny Server tags" msgstr "" -#: src/Module/Admin/Site.php:612 +#: src/Module/Admin/Site.php:544 msgid "Comma separated list of tags that are rejected." msgstr "" -#: src/Module/Admin/Site.php:613 +#: src/Module/Admin/Site.php:545 msgid "Allow user tags" msgstr "" -#: src/Module/Admin/Site.php:613 +#: src/Module/Admin/Site.php:545 msgid "" "If enabled, the tags from the saved searches will used for the \"tags\" " "subscription in addition to the \"relay_server_tags\"." msgstr "" -#: src/Module/Admin/Site.php:616 +#: src/Module/Admin/Site.php:548 msgid "Start Relocation" msgstr "" @@ -8076,11 +8063,11 @@ msgstr "" msgid "Show unread" msgstr "" -#: src/Module/Notifications/Ping.php:218 +#: src/Module/Notifications/Ping.php:221 msgid "{0} requested registration" msgstr "" -#: src/Module/Notifications/Ping.php:229 +#: src/Module/Notifications/Ping.php:232 #, php-format msgid "{0} and %d others requested registration" msgstr "" @@ -10210,205 +10197,205 @@ msgstr "" msgid "%1$s commented on your thread %2$s" msgstr "" -#: src/Navigation/Notifications/Repository/Notify.php:215 -#: src/Navigation/Notifications/Repository/Notify.php:697 +#: src/Navigation/Notifications/Repository/Notify.php:221 +#: src/Navigation/Notifications/Repository/Notify.php:724 msgid "[Friendica:Notify]" msgstr "" -#: src/Navigation/Notifications/Repository/Notify.php:279 +#: src/Navigation/Notifications/Repository/Notify.php:285 #, php-format msgid "%s New mail received at %s" msgstr "" -#: src/Navigation/Notifications/Repository/Notify.php:281 +#: src/Navigation/Notifications/Repository/Notify.php:287 #, php-format msgid "%1$s sent you a new private message at %2$s." msgstr "" -#: src/Navigation/Notifications/Repository/Notify.php:282 +#: src/Navigation/Notifications/Repository/Notify.php:288 msgid "a private message" msgstr "" -#: src/Navigation/Notifications/Repository/Notify.php:282 +#: src/Navigation/Notifications/Repository/Notify.php:288 #, php-format msgid "%1$s sent you %2$s." msgstr "" -#: src/Navigation/Notifications/Repository/Notify.php:284 +#: src/Navigation/Notifications/Repository/Notify.php:290 #, php-format msgid "Please visit %s to view and/or reply to your private messages." msgstr "" -#: src/Navigation/Notifications/Repository/Notify.php:314 +#: src/Navigation/Notifications/Repository/Notify.php:320 #, php-format msgid "%1$s commented on %2$s's %3$s %4$s" msgstr "" -#: src/Navigation/Notifications/Repository/Notify.php:319 +#: src/Navigation/Notifications/Repository/Notify.php:325 #, php-format msgid "%1$s commented on your %2$s %3$s" msgstr "" -#: src/Navigation/Notifications/Repository/Notify.php:323 +#: src/Navigation/Notifications/Repository/Notify.php:329 #, php-format msgid "%1$s commented on their %2$s %3$s" msgstr "" -#: src/Navigation/Notifications/Repository/Notify.php:327 -#: src/Navigation/Notifications/Repository/Notify.php:731 +#: src/Navigation/Notifications/Repository/Notify.php:333 +#: src/Navigation/Notifications/Repository/Notify.php:758 #, php-format msgid "%1$s Comment to conversation #%2$d by %3$s" msgstr "" -#: src/Navigation/Notifications/Repository/Notify.php:329 +#: src/Navigation/Notifications/Repository/Notify.php:335 #, php-format msgid "%s commented on an item/conversation you have been following." msgstr "" -#: src/Navigation/Notifications/Repository/Notify.php:333 -#: src/Navigation/Notifications/Repository/Notify.php:348 -#: src/Navigation/Notifications/Repository/Notify.php:367 -#: src/Navigation/Notifications/Repository/Notify.php:746 +#: src/Navigation/Notifications/Repository/Notify.php:339 +#: src/Navigation/Notifications/Repository/Notify.php:354 +#: src/Navigation/Notifications/Repository/Notify.php:373 +#: src/Navigation/Notifications/Repository/Notify.php:773 #, php-format msgid "Please visit %s to view and/or reply to the conversation." msgstr "" -#: src/Navigation/Notifications/Repository/Notify.php:340 +#: src/Navigation/Notifications/Repository/Notify.php:346 #, php-format msgid "%s %s posted to your profile wall" msgstr "" -#: src/Navigation/Notifications/Repository/Notify.php:342 +#: src/Navigation/Notifications/Repository/Notify.php:348 #, php-format msgid "%1$s posted to your profile wall at %2$s" msgstr "" -#: src/Navigation/Notifications/Repository/Notify.php:343 +#: src/Navigation/Notifications/Repository/Notify.php:349 #, php-format msgid "%1$s posted to [url=%2$s]your wall[/url]" msgstr "" -#: src/Navigation/Notifications/Repository/Notify.php:355 +#: src/Navigation/Notifications/Repository/Notify.php:361 #, php-format msgid "%1$s %2$s poked you" msgstr "" -#: src/Navigation/Notifications/Repository/Notify.php:357 +#: src/Navigation/Notifications/Repository/Notify.php:363 #, php-format msgid "%1$s poked you at %2$s" msgstr "" -#: src/Navigation/Notifications/Repository/Notify.php:358 +#: src/Navigation/Notifications/Repository/Notify.php:364 #, php-format msgid "%1$s [url=%2$s]poked you[/url]." msgstr "" -#: src/Navigation/Notifications/Repository/Notify.php:375 +#: src/Navigation/Notifications/Repository/Notify.php:381 #, php-format msgid "%s Introduction received" msgstr "" -#: src/Navigation/Notifications/Repository/Notify.php:377 +#: src/Navigation/Notifications/Repository/Notify.php:383 #, php-format msgid "You've received an introduction from '%1$s' at %2$s" msgstr "" -#: src/Navigation/Notifications/Repository/Notify.php:378 +#: src/Navigation/Notifications/Repository/Notify.php:384 #, php-format msgid "You've received [url=%1$s]an introduction[/url] from %2$s." msgstr "" -#: src/Navigation/Notifications/Repository/Notify.php:383 -#: src/Navigation/Notifications/Repository/Notify.php:429 +#: src/Navigation/Notifications/Repository/Notify.php:389 +#: src/Navigation/Notifications/Repository/Notify.php:435 #, php-format msgid "You may visit their profile at %s" msgstr "" -#: src/Navigation/Notifications/Repository/Notify.php:385 +#: src/Navigation/Notifications/Repository/Notify.php:391 #, php-format msgid "Please visit %s to approve or reject the introduction." msgstr "" -#: src/Navigation/Notifications/Repository/Notify.php:392 +#: src/Navigation/Notifications/Repository/Notify.php:398 #, php-format msgid "%s A new person is sharing with you" msgstr "" -#: src/Navigation/Notifications/Repository/Notify.php:394 -#: src/Navigation/Notifications/Repository/Notify.php:395 +#: src/Navigation/Notifications/Repository/Notify.php:400 +#: src/Navigation/Notifications/Repository/Notify.php:401 #, php-format msgid "%1$s is sharing with you at %2$s" msgstr "" -#: src/Navigation/Notifications/Repository/Notify.php:402 +#: src/Navigation/Notifications/Repository/Notify.php:408 #, php-format msgid "%s You have a new follower" msgstr "" -#: src/Navigation/Notifications/Repository/Notify.php:404 -#: src/Navigation/Notifications/Repository/Notify.php:405 +#: src/Navigation/Notifications/Repository/Notify.php:410 +#: src/Navigation/Notifications/Repository/Notify.php:411 #, php-format msgid "You have a new follower at %2$s : %1$s" msgstr "" -#: src/Navigation/Notifications/Repository/Notify.php:418 +#: src/Navigation/Notifications/Repository/Notify.php:424 #, php-format msgid "%s Friend suggestion received" msgstr "" -#: src/Navigation/Notifications/Repository/Notify.php:420 +#: src/Navigation/Notifications/Repository/Notify.php:426 #, php-format msgid "You've received a friend suggestion from '%1$s' at %2$s" msgstr "" -#: src/Navigation/Notifications/Repository/Notify.php:421 +#: src/Navigation/Notifications/Repository/Notify.php:427 #, php-format msgid "You've received [url=%1$s]a friend suggestion[/url] for %2$s from %3$s." msgstr "" -#: src/Navigation/Notifications/Repository/Notify.php:427 +#: src/Navigation/Notifications/Repository/Notify.php:433 msgid "Name:" msgstr "" -#: src/Navigation/Notifications/Repository/Notify.php:428 +#: src/Navigation/Notifications/Repository/Notify.php:434 msgid "Photo:" msgstr "" -#: src/Navigation/Notifications/Repository/Notify.php:431 +#: src/Navigation/Notifications/Repository/Notify.php:437 #, php-format msgid "Please visit %s to approve or reject the suggestion." msgstr "" -#: src/Navigation/Notifications/Repository/Notify.php:439 -#: src/Navigation/Notifications/Repository/Notify.php:454 +#: src/Navigation/Notifications/Repository/Notify.php:445 +#: src/Navigation/Notifications/Repository/Notify.php:460 #, php-format msgid "%s Connection accepted" msgstr "" -#: src/Navigation/Notifications/Repository/Notify.php:441 -#: src/Navigation/Notifications/Repository/Notify.php:456 +#: src/Navigation/Notifications/Repository/Notify.php:447 +#: src/Navigation/Notifications/Repository/Notify.php:462 #, php-format msgid "'%1$s' has accepted your connection request at %2$s" msgstr "" -#: src/Navigation/Notifications/Repository/Notify.php:442 -#: src/Navigation/Notifications/Repository/Notify.php:457 +#: src/Navigation/Notifications/Repository/Notify.php:448 +#: src/Navigation/Notifications/Repository/Notify.php:463 #, php-format msgid "%2$s has accepted your [url=%1$s]connection request[/url]." msgstr "" -#: src/Navigation/Notifications/Repository/Notify.php:447 +#: src/Navigation/Notifications/Repository/Notify.php:453 msgid "" "You are now mutual friends and may exchange status updates, photos, and " "email without restriction." msgstr "" -#: src/Navigation/Notifications/Repository/Notify.php:449 +#: src/Navigation/Notifications/Repository/Notify.php:455 #, php-format msgid "Please visit %s if you wish to make any changes to this relationship." msgstr "" -#: src/Navigation/Notifications/Repository/Notify.php:462 +#: src/Navigation/Notifications/Repository/Notify.php:468 #, php-format msgid "" "'%1$s' has chosen to accept you a fan, which restricts some forms of " @@ -10417,33 +10404,33 @@ msgid "" "automatically." msgstr "" -#: src/Navigation/Notifications/Repository/Notify.php:464 +#: src/Navigation/Notifications/Repository/Notify.php:470 #, php-format msgid "" "'%1$s' may choose to extend this into a two-way or more permissive " "relationship in the future." msgstr "" -#: src/Navigation/Notifications/Repository/Notify.php:466 +#: src/Navigation/Notifications/Repository/Notify.php:472 #, php-format msgid "Please visit %s if you wish to make any changes to this relationship." msgstr "" -#: src/Navigation/Notifications/Repository/Notify.php:476 +#: src/Navigation/Notifications/Repository/Notify.php:482 msgid "registration request" msgstr "" -#: src/Navigation/Notifications/Repository/Notify.php:478 +#: src/Navigation/Notifications/Repository/Notify.php:484 #, php-format msgid "You've received a registration request from '%1$s' at %2$s" msgstr "" -#: src/Navigation/Notifications/Repository/Notify.php:479 +#: src/Navigation/Notifications/Repository/Notify.php:485 #, php-format msgid "You've received a [url=%1$s]registration request[/url] from %2$s." msgstr "" -#: src/Navigation/Notifications/Repository/Notify.php:484 +#: src/Navigation/Notifications/Repository/Notify.php:490 #, php-format msgid "" "Full Name:\t%s\n" @@ -10451,17 +10438,17 @@ msgid "" "Login Name:\t%s (%s)" msgstr "" -#: src/Navigation/Notifications/Repository/Notify.php:490 +#: src/Navigation/Notifications/Repository/Notify.php:496 #, php-format msgid "Please visit %s to approve or reject the request." msgstr "" -#: src/Navigation/Notifications/Repository/Notify.php:725 +#: src/Navigation/Notifications/Repository/Notify.php:752 #, php-format msgid "%s %s tagged you" msgstr "" -#: src/Navigation/Notifications/Repository/Notify.php:728 +#: src/Navigation/Notifications/Repository/Notify.php:755 #, php-format msgid "%s %s shared a new post" msgstr "" From 4c5d9e22a8d05a890422579032363331e3c9edc3 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sun, 29 May 2022 14:23:57 -0400 Subject: [PATCH 5/5] Propagate signature change of Database::transaction() --- tests/Util/Database/StaticDatabase.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Util/Database/StaticDatabase.php b/tests/Util/Database/StaticDatabase.php index 213d8a439..a6b2575f5 100644 --- a/tests/Util/Database/StaticDatabase.php +++ b/tests/Util/Database/StaticDatabase.php @@ -70,7 +70,7 @@ class StaticDatabase extends Database * * @return bool */ - public function transaction() + public function transaction(): bool { if (!$this->in_transaction && !$this->connection->beginTransaction()) { return false;