From 142b399c848a3ff5f3e0f452361d284a1b5dc135 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Mon, 24 Oct 2022 17:56:05 -0400 Subject: [PATCH 1/3] Reformat Module\Settings\UserExport - Import IHandleUserSessions and DbaDefinition object in constructor - Convert remaining double quotes to single quotes - Convert static methods to dynamic to use class properties - Remove unused POST permission from route --- src/Module/Settings/UserExport.php | 121 +++++++++++++++++------------ static/routes.config.php | 2 +- 2 files changed, 73 insertions(+), 50 deletions(-) diff --git a/src/Module/Settings/UserExport.php b/src/Module/Settings/UserExport.php index 095c694833..74bb517c39 100644 --- a/src/Module/Settings/UserExport.php +++ b/src/Module/Settings/UserExport.php @@ -23,20 +23,44 @@ namespace Friendica\Module\Settings; use Friendica\App; use Friendica\Core\Hook; +use Friendica\Core\L10n; use Friendica\Core\Renderer; +use Friendica\Core\Session\Capability\IHandleUserSessions; use Friendica\Core\System; use Friendica\Database\DBA; +use Friendica\Database\Definition\DbaDefinition; use Friendica\DI; +use Friendica\Model\Contact; use Friendica\Model\Item; use Friendica\Model\Post; use Friendica\Module\BaseSettings; +use Friendica\Module\Response; use Friendica\Network\HTTPException; +use Friendica\Network\HTTPException\ForbiddenException; +use Friendica\Network\HTTPException\InternalServerErrorException; +use Friendica\Network\HTTPException\ServiceUnavailableException; +use Friendica\Util\Profiler; +use Psr\Log\LoggerInterface; /** * Module to export user data **/ class UserExport extends BaseSettings { + /** @var IHandleUserSessions */ + private $session; + + /** @var DbaDefinition */ + private $dbaDefinition; + + public function __construct(DbaDefinition $dbaDefinition, IHandleUserSessions $session, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = []) + { + parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters); + + $this->session = $session; + $this->dbaDefinition = $dbaDefinition; + } + /** * Handle the request to export data. * At the moment one can export three different data set @@ -48,14 +72,16 @@ class UserExport extends BaseSettings * If there is an action required through the URL / path, react * accordingly and export the requested data. * + * @param array $request * @return string - * @throws HTTPException\ForbiddenException - * @throws HTTPException\InternalServerErrorException + * @throws ForbiddenException + * @throws InternalServerErrorException + * @throws ServiceUnavailableException */ protected function content(array $request = []): string { - if (!DI::userSession()->getLocalUserId()) { - throw new HTTPException\ForbiddenException(DI::l10n()->t('Permission denied.')); + if (!$this->session->getLocalUserId()) { + throw new HTTPException\ForbiddenException($this->l10n->t('Permission denied.')); } parent::content(); @@ -65,15 +91,15 @@ class UserExport extends BaseSettings * list of array( 'link url', 'link text', 'help text' ) */ $options = [ - ['settings/userexport/account', DI::l10n()->t('Export account'), DI::l10n()->t('Export your account info and contacts. Use this to make a backup of your account and/or to move it to another server.')], - ['settings/userexport/backup', DI::l10n()->t('Export all'), DI::l10n()->t("Export your account info, contacts and all your items as json. Could be a very big file, and could take a lot of time. Use this to make a full backup of your account \x28photos are not exported\x29")], - ['settings/userexport/contact', DI::l10n()->t('Export Contacts to CSV'), DI::l10n()->t("Export the list of the accounts you are following as CSV file. Compatible to e.g. Mastodon.")], + ['settings/userexport/account', $this->l10n->t('Export account'), $this->l10n->t('Export your account info and contacts. Use this to make a backup of your account and/or to move it to another server.')], + ['settings/userexport/backup', $this->l10n->t('Export all'), $this->l10n->t('Export your account info, contacts and all your items as json. Could be a very big file, and could take a lot of time. Use this to make a full backup of your account (photos are not exported)')], + ['settings/userexport/contact', $this->l10n->t('Export Contacts to CSV'), $this->l10n->t('Export the list of the accounts you are following as CSV file. Compatible to e.g. Mastodon.')], ]; Hook::callAll('uexport_options', $options); - $tpl = Renderer::getMarkupTemplate("settings/userexport.tpl"); + $tpl = Renderer::getMarkupTemplate('settings/userexport.tpl'); return Renderer::replaceMacros($tpl, [ - '$title' => DI::l10n()->t('Export personal data'), + '$title' => $this->l10n->t('Export personal data'), '$options' => $options ]); } @@ -88,29 +114,26 @@ class UserExport extends BaseSettings */ protected function rawContent(array $request = []) { - if (!DI::app()->isLoggedIn()) { - throw new HTTPException\ForbiddenException(DI::l10n()->t('Permission denied.')); + if (!$this->session->getLocalUserId()) { + throw new HTTPException\ForbiddenException($this->l10n->t('Permission denied.')); } - $args = DI::args(); - if ($args->getArgc() == 3) { - // @TODO Replace with router-provided arguments - $action = $args->get(2); - switch ($action) { - case "backup": - header("Content-type: application/json"); - header('Content-Disposition: attachment; filename="' . DI::app()->getLoggedInUserNickname() . '.' . $action . '"'); - self::exportAll(DI::userSession()->getLocalUserId()); + if (isset($this->parameters['action'])) { + switch ($this->parameters['action']) { + case 'backup': + header('Content-type: application/json'); + header('Content-Disposition: attachment; filename="' . DI::app()->getLoggedInUserNickname() . '.' . $this->parameters['action'] . '"'); + $this->echoAll($this->session->getLocalUserId()); break; - case "account": - header("Content-type: application/json"); - header('Content-Disposition: attachment; filename="' . DI::app()->getLoggedInUserNickname() . '.' . $action . '"'); - self::exportAccount(DI::userSession()->getLocalUserId()); + case 'account': + header('Content-type: application/json'); + header('Content-Disposition: attachment; filename="' . DI::app()->getLoggedInUserNickname() . '.' . $this->parameters['action'] . '"'); + $this->echoAccount($this->session->getLocalUserId()); break; - case "contact": - header("Content-type: application/csv"); + case 'contact': + header('Content-type: application/csv'); header('Content-Disposition: attachment; filename="' . DI::app()->getLoggedInUserNickname() . '-contacts.csv' . '"'); - self::exportContactsAsCSV(DI::userSession()->getLocalUserId()); + $this->echoContactsAsCSV($this->session->getLocalUserId()); break; } System::exit(); @@ -122,11 +145,11 @@ class UserExport extends BaseSettings * @return array * @throws \Exception */ - private static function exportMultiRow(string $query) + private function exportMultiRow(string $query): array { - $dbStructure = DI::dbaDefinition()->getAll(); + $dbStructure = $this->dbaDefinition->getAll(); - preg_match("/\s+from\s+`?([a-z\d_]+)`?/i", $query, $match); + preg_match('/\s+from\s+`?([a-z\d_]+)`?/i', $query, $match); $table = $match[1]; $result = []; @@ -154,11 +177,11 @@ class UserExport extends BaseSettings * @return array * @throws \Exception */ - private static function exportRow(string $query) + private function exportRow(string $query): array { - $dbStructure = DI::dbaDefinition()->getAll(); + $dbStructure = $this->dbaDefinition->getAll(); - preg_match("/\s+from\s+`?([a-z\d_]+)`?/i", $query, $match); + preg_match('/\s+from\s+`?([a-z\d_]+)`?/i', $query, $match); $table = $match[1]; $result = []; @@ -190,10 +213,10 @@ class UserExport extends BaseSettings * @param int $user_id * @throws \Exception */ - private static function exportContactsAsCSV(int $user_id) + private function echoContactsAsCSV(int $user_id) { if (!$user_id) { - throw new \RuntimeException(DI::l10n()->t('Permission denied.')); + throw new \RuntimeException($this->l10n->t('Permission denied.')); } // write the table header (like Mastodon) @@ -210,52 +233,52 @@ class UserExport extends BaseSettings * @param int $user_id * @throws \Exception */ - private static function exportAccount(int $user_id) + private function echoAccount(int $user_id) { if (!$user_id) { - throw new \RuntimeException(DI::l10n()->t('Permission denied.')); + throw new \RuntimeException($this->l10n->t('Permission denied.')); } - $user = self::exportRow( + $user = $this->exportRow( sprintf("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1", $user_id) ); - $contact = self::exportMultiRow( + $contact = $this->exportMultiRow( sprintf("SELECT * FROM `contact` WHERE `uid` = %d ", $user_id) ); - $profile = self::exportMultiRow( + $profile = $this->exportMultiRow( sprintf("SELECT *, 'default' AS `profile_name`, 1 AS `is-default` FROM `profile` WHERE `uid` = %d ", $user_id) ); - $profile_fields = self::exportMultiRow( + $profile_fields = $this->exportMultiRow( sprintf("SELECT * FROM `profile_field` WHERE `uid` = %d ", $user_id) ); - $photo = self::exportMultiRow( + $photo = $this->exportMultiRow( sprintf("SELECT * FROM `photo` WHERE uid = %d AND profile = 1", $user_id) ); foreach ($photo as &$p) { $p['data'] = bin2hex($p['data']); } - $pconfig = self::exportMultiRow( + $pconfig = $this->exportMultiRow( sprintf("SELECT * FROM `pconfig` WHERE uid = %d", $user_id) ); - $group = self::exportMultiRow( + $group = $this->exportMultiRow( sprintf("SELECT * FROM `group` WHERE uid = %d", $user_id) ); - $group_member = self::exportMultiRow( + $group_member = $this->exportMultiRow( sprintf("SELECT `group_member`.`gid`, `group_member`.`contact-id` FROM `group_member` INNER JOIN `group` ON `group`.`id` = `group_member`.`gid` WHERE `group`.`uid` = %d", $user_id) ); $output = [ 'version' => App::VERSION, 'schema' => DB_UPDATE_VERSION, - 'baseurl' => DI::baseUrl(), + 'baseurl' => $this->baseUrl, 'user' => $user, 'contact' => $contact, 'profile' => $profile, @@ -275,13 +298,13 @@ class UserExport extends BaseSettings * @param int $user_id * @throws \Exception */ - private static function exportAll(int $user_id) + private function echoAll(int $user_id) { if (!$user_id) { - throw new \RuntimeException(DI::l10n()->t('Permission denied.')); + throw new \RuntimeException($this->l10n->t('Permission denied.')); } - self::exportAccount($user_id); + $this->echoAccount($user_id); echo "\n"; $total = Post::count(['uid' => $user_id]); diff --git a/static/routes.config.php b/static/routes.config.php index e19e3b7570..47176868f5 100644 --- a/static/routes.config.php +++ b/static/routes.config.php @@ -574,7 +574,7 @@ return [ '/photo[/new]' => [Module\Settings\Profile\Photo\Index::class, [R::GET, R::POST]], '/photo/crop/{guid}' => [Module\Settings\Profile\Photo\Crop::class, [R::GET, R::POST]], ], - '/userexport[/{action}]' => [Module\Settings\UserExport::class, [R::GET, R::POST]], + '/userexport[/{action}]' => [Module\Settings\UserExport::class, [R::GET ]], ], '/network' => [ From dc2d96a502aafb54f0782eb0ffdc7a77ffe86667 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Mon, 24 Oct 2022 17:56:44 -0400 Subject: [PATCH 2/3] Fix condition for follows export - Select follows instead of followers - Filter out archived contacts --- src/Module/Settings/UserExport.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Module/Settings/UserExport.php b/src/Module/Settings/UserExport.php index 74bb517c39..85e1f75c65 100644 --- a/src/Module/Settings/UserExport.php +++ b/src/Module/Settings/UserExport.php @@ -222,7 +222,7 @@ class UserExport extends BaseSettings // write the table header (like Mastodon) echo "Account address, Show boosts\n"; // get all the contacts - $contacts = DBA::select('contact', ['addr', 'url'], ['uid' => $user_id, 'self' => false, 'rel' => [1, 3], 'deleted' => false]); + $contacts = DBA::select('contact', ['addr', 'url'], ['uid' => $user_id, 'self' => false, 'rel' => [Contact::SHARING, Contact::FRIEND], 'deleted' => false, 'archive' => false]); while ($contact = DBA::fetch($contacts)) { echo ($contact['addr'] ?: $contact['url']) . ", true\n"; } From 5f92473c6e2c21d8539bf21133a384b8997f3baf Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Mon, 24 Oct 2022 18:21:50 -0400 Subject: [PATCH 3/3] Update main translation file after changing a string --- view/lang/C/messages.po | 1298 +++++++++++++++++++-------------------- 1 file changed, 649 insertions(+), 649 deletions(-) diff --git a/view/lang/C/messages.po b/view/lang/C/messages.po index 134d580f01..2b4b3791fc 100644 --- a/view/lang/C/messages.po +++ b/view/lang/C/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 2022.12-dev\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-10-21 08:18+0000\n" +"POT-Creation-Date: 2022-10-24 18:18-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -43,10 +43,10 @@ msgstr "" msgid "Access to this profile has been restricted." msgstr "" -#: mod/cal.php:242 mod/events.php:375 src/Content/Nav.php:197 -#: src/Content/Nav.php:261 src/Module/BaseProfile.php:84 -#: src/Module/BaseProfile.php:95 view/theme/frio/theme.php:242 -#: view/theme/frio/theme.php:246 +#: mod/cal.php:242 mod/events.php:375 src/Content/Nav.php:196 +#: src/Content/Nav.php:260 src/Module/BaseProfile.php:84 +#: src/Module/BaseProfile.php:95 view/theme/frio/theme.php:241 +#: view/theme/frio/theme.php:245 msgid "Events" msgstr "" @@ -67,17 +67,17 @@ msgid "today" msgstr "" #: mod/cal.php:249 mod/events.php:385 src/Model/Event.php:461 -#: src/Util/Temporal.php:342 +#: src/Util/Temporal.php:341 msgid "month" msgstr "" #: mod/cal.php:250 mod/events.php:386 src/Model/Event.php:462 -#: src/Util/Temporal.php:343 +#: src/Util/Temporal.php:342 msgid "week" msgstr "" #: mod/cal.php:251 mod/events.php:387 src/Model/Event.php:463 -#: src/Util/Temporal.php:344 +#: src/Util/Temporal.php:343 msgid "day" msgstr "" @@ -86,8 +86,8 @@ msgid "list" msgstr "" #: mod/cal.php:264 src/Console/User.php:182 src/Model/User.php:663 -#: src/Module/Admin/Users/Active.php:73 src/Module/Admin/Users/Blocked.php:75 -#: src/Module/Admin/Users/Index.php:81 src/Module/Admin/Users/Pending.php:71 +#: src/Module/Admin/Users/Active.php:73 src/Module/Admin/Users/Blocked.php:74 +#: src/Module/Admin/Users/Index.php:80 src/Module/Admin/Users/Pending.php:71 #: src/Module/Api/Twitter/ContactEndpoint.php:74 msgid "User not found" msgstr "" @@ -144,10 +144,10 @@ msgstr "" #: src/Module/Settings/Display.php:119 #: src/Module/Settings/Profile/Photo/Crop.php:165 #: src/Module/Settings/Profile/Photo/Index.php:111 -#: src/Module/Settings/UserExport.php:58 src/Module/Settings/UserExport.php:92 -#: src/Module/Settings/UserExport.php:196 -#: src/Module/Settings/UserExport.php:216 -#: src/Module/Settings/UserExport.php:281 +#: src/Module/Settings/UserExport.php:84 src/Module/Settings/UserExport.php:118 +#: src/Module/Settings/UserExport.php:219 +#: src/Module/Settings/UserExport.php:239 +#: src/Module/Settings/UserExport.php:304 msgid "Permission denied." msgstr "" @@ -164,25 +164,25 @@ msgstr "" msgid "Save" msgstr "" -#: mod/editpost.php:92 mod/photos.php:1333 src/Content/Conversation.php:342 -#: src/Object/Post.php:993 +#: mod/editpost.php:92 mod/photos.php:1333 src/Content/Conversation.php:345 +#: src/Object/Post.php:992 msgid "Loading..." msgstr "" #: mod/editpost.php:93 mod/message.php:201 mod/message.php:357 -#: mod/wallmessage.php:140 src/Content/Conversation.php:343 +#: mod/wallmessage.php:140 src/Content/Conversation.php:346 msgid "Upload photo" msgstr "" -#: mod/editpost.php:94 src/Content/Conversation.php:344 +#: mod/editpost.php:94 src/Content/Conversation.php:347 msgid "upload photo" msgstr "" -#: mod/editpost.php:95 src/Content/Conversation.php:345 +#: mod/editpost.php:95 src/Content/Conversation.php:348 msgid "Attach file" msgstr "" -#: mod/editpost.php:96 src/Content/Conversation.php:346 +#: mod/editpost.php:96 src/Content/Conversation.php:349 msgid "attach file" msgstr "" @@ -211,31 +211,31 @@ msgstr "" msgid "audio link" msgstr "" -#: mod/editpost.php:103 src/Content/Conversation.php:356 +#: mod/editpost.php:103 src/Content/Conversation.php:359 #: src/Module/Item/Compose.php:200 msgid "Set your location" msgstr "" -#: mod/editpost.php:104 src/Content/Conversation.php:357 +#: mod/editpost.php:104 src/Content/Conversation.php:360 msgid "set location" msgstr "" -#: mod/editpost.php:105 src/Content/Conversation.php:358 +#: mod/editpost.php:105 src/Content/Conversation.php:361 msgid "Clear browser location" msgstr "" -#: mod/editpost.php:106 src/Content/Conversation.php:359 +#: mod/editpost.php:106 src/Content/Conversation.php:362 msgid "clear location" msgstr "" #: mod/editpost.php:107 mod/message.php:203 mod/message.php:360 -#: mod/photos.php:1484 mod/wallmessage.php:142 src/Content/Conversation.php:372 -#: src/Content/Conversation.php:718 src/Module/Item/Compose.php:204 -#: src/Object/Post.php:538 +#: mod/photos.php:1484 mod/wallmessage.php:142 src/Content/Conversation.php:375 +#: src/Content/Conversation.php:721 src/Module/Item/Compose.php:204 +#: src/Object/Post.php:537 msgid "Please wait" msgstr "" -#: mod/editpost.php:108 src/Content/Conversation.php:373 +#: mod/editpost.php:108 src/Content/Conversation.php:376 msgid "Permission settings" msgstr "" @@ -243,16 +243,16 @@ msgstr "" msgid "CC: email addresses" msgstr "" -#: mod/editpost.php:117 src/Content/Conversation.php:383 +#: mod/editpost.php:117 src/Content/Conversation.php:386 msgid "Public post" msgstr "" -#: mod/editpost.php:120 src/Content/Conversation.php:361 +#: mod/editpost.php:120 src/Content/Conversation.php:364 #: src/Module/Item/Compose.php:205 msgid "Set title" msgstr "" -#: mod/editpost.php:122 src/Content/Conversation.php:363 +#: mod/editpost.php:122 src/Content/Conversation.php:366 #: src/Module/Item/Compose.php:206 msgid "Categories (comma-separated list)" msgstr "" @@ -262,71 +262,71 @@ msgid "Example: bob@example.com, mary@example.com" msgstr "" #: mod/editpost.php:128 mod/events.php:514 mod/photos.php:1332 -#: mod/photos.php:1388 mod/photos.php:1462 src/Content/Conversation.php:387 -#: src/Module/Item/Compose.php:199 src/Object/Post.php:1003 +#: mod/photos.php:1388 mod/photos.php:1462 src/Content/Conversation.php:390 +#: src/Module/Item/Compose.php:199 src/Object/Post.php:1002 msgid "Preview" msgstr "" #: mod/editpost.php:130 mod/fbrowser.php:119 mod/fbrowser.php:146 #: mod/follow.php:144 mod/photos.php:999 mod/photos.php:1100 mod/tagrm.php:35 -#: mod/tagrm.php:127 mod/unfollow.php:97 src/Content/Conversation.php:390 +#: mod/tagrm.php:127 mod/unfollow.php:97 src/Content/Conversation.php:393 #: src/Module/Contact/Revoke.php:109 src/Module/RemoteFollow.php:128 #: src/Module/Security/TwoFactor/SignOut.php:126 msgid "Cancel" msgstr "" -#: mod/editpost.php:134 src/Content/Conversation.php:347 -#: src/Module/Item/Compose.php:190 src/Object/Post.php:994 +#: mod/editpost.php:134 src/Content/Conversation.php:350 +#: src/Module/Item/Compose.php:190 src/Object/Post.php:993 msgid "Bold" msgstr "" -#: mod/editpost.php:135 src/Content/Conversation.php:348 -#: src/Module/Item/Compose.php:191 src/Object/Post.php:995 +#: mod/editpost.php:135 src/Content/Conversation.php:351 +#: src/Module/Item/Compose.php:191 src/Object/Post.php:994 msgid "Italic" msgstr "" -#: mod/editpost.php:136 src/Content/Conversation.php:349 -#: src/Module/Item/Compose.php:192 src/Object/Post.php:996 +#: mod/editpost.php:136 src/Content/Conversation.php:352 +#: src/Module/Item/Compose.php:192 src/Object/Post.php:995 msgid "Underline" msgstr "" -#: mod/editpost.php:137 src/Content/Conversation.php:350 -#: src/Module/Item/Compose.php:193 src/Object/Post.php:997 +#: mod/editpost.php:137 src/Content/Conversation.php:353 +#: src/Module/Item/Compose.php:193 src/Object/Post.php:996 msgid "Quote" msgstr "" -#: mod/editpost.php:138 src/Content/Conversation.php:351 -#: src/Module/Item/Compose.php:194 src/Object/Post.php:998 +#: mod/editpost.php:138 src/Content/Conversation.php:354 +#: src/Module/Item/Compose.php:194 src/Object/Post.php:997 msgid "Code" msgstr "" -#: mod/editpost.php:139 src/Content/Conversation.php:353 -#: src/Module/Item/Compose.php:196 src/Object/Post.php:1000 +#: mod/editpost.php:139 src/Content/Conversation.php:356 +#: src/Module/Item/Compose.php:196 src/Object/Post.php:999 msgid "Link" msgstr "" -#: mod/editpost.php:140 src/Content/Conversation.php:354 -#: src/Module/Item/Compose.php:197 src/Object/Post.php:1001 +#: mod/editpost.php:140 src/Content/Conversation.php:357 +#: src/Module/Item/Compose.php:197 src/Object/Post.php:1000 msgid "Link or Media" msgstr "" -#: mod/editpost.php:143 src/Content/Conversation.php:397 -#: src/Content/Widget/VCard.php:114 src/Model/Profile.php:465 +#: mod/editpost.php:143 src/Content/Conversation.php:400 +#: src/Content/Widget/VCard.php:113 src/Model/Profile.php:465 #: src/Module/Admin/Logs/View.php:93 msgid "Message" msgstr "" -#: mod/editpost.php:144 src/Content/Conversation.php:398 +#: mod/editpost.php:144 src/Content/Conversation.php:401 #: src/Module/Settings/TwoFactor/Trusted.php:139 msgid "Browser" msgstr "" #: mod/editpost.php:145 mod/events.php:519 mod/photos.php:934 -#: mod/photos.php:1286 src/Content/Conversation.php:374 +#: mod/photos.php:1286 src/Content/Conversation.php:377 msgid "Permissions" msgstr "" -#: mod/editpost.php:147 src/Content/Conversation.php:400 +#: mod/editpost.php:147 src/Content/Conversation.php:403 msgid "Open Compose page" msgstr "" @@ -358,10 +358,10 @@ msgstr "" #: src/Module/Admin/Blocklist/Server/Add.php:136 #: src/Module/Admin/Blocklist/Server/Add.php:138 #: src/Module/Admin/Blocklist/Server/Import.php:128 -#: src/Module/Admin/Blocklist/Server/Index.php:84 -#: src/Module/Admin/Blocklist/Server/Index.php:85 -#: src/Module/Admin/Blocklist/Server/Index.php:113 -#: src/Module/Admin/Blocklist/Server/Index.php:114 +#: src/Module/Admin/Blocklist/Server/Index.php:82 +#: src/Module/Admin/Blocklist/Server/Index.php:83 +#: src/Module/Admin/Blocklist/Server/Index.php:111 +#: src/Module/Admin/Blocklist/Server/Index.php:112 #: src/Module/Admin/Item/Delete.php:69 src/Module/Debug/Probe.php:59 #: src/Module/Install.php:207 src/Module/Install.php:240 #: src/Module/Install.php:245 src/Module/Install.php:264 @@ -369,7 +369,7 @@ msgstr "" #: src/Module/Install.php:286 src/Module/Install.php:291 #: src/Module/Install.php:305 src/Module/Install.php:320 #: src/Module/Install.php:347 src/Module/Register.php:148 -#: src/Module/Security/TwoFactor/Verify.php:102 +#: src/Module/Security/TwoFactor/Verify.php:105 #: src/Module/Settings/TwoFactor/Index.php:140 #: src/Module/Settings/TwoFactor/Verify.php:154 msgid "Required" @@ -388,10 +388,10 @@ msgstr "" msgid "Description:" msgstr "" -#: mod/events.php:505 src/Content/Widget/VCard.php:105 src/Model/Event.php:80 +#: mod/events.php:505 src/Content/Widget/VCard.php:104 src/Model/Event.php:80 #: src/Model/Event.php:107 src/Model/Event.php:469 src/Model/Event.php:919 -#: src/Model/Profile.php:373 src/Module/Contact/Profile.php:371 -#: src/Module/Directory.php:147 src/Module/Notifications/Introductions.php:186 +#: src/Model/Profile.php:373 src/Module/Contact/Profile.php:370 +#: src/Module/Directory.php:147 src/Module/Notifications/Introductions.php:187 #: src/Module/Profile/Profile.php:193 msgid "Location:" msgstr "" @@ -408,7 +408,7 @@ msgstr "" #: mod/photos.php:916 mod/photos.php:1020 mod/photos.php:1290 #: mod/photos.php:1331 mod/photos.php:1387 mod/photos.php:1461 #: src/Module/Admin/Item/Source.php:60 src/Module/Contact/Advanced.php:132 -#: src/Module/Contact/Profile.php:329 +#: src/Module/Contact/Profile.php:328 #: src/Module/Debug/ActivityPubConversion.php:140 #: src/Module/Debug/Babel.php:313 src/Module/Debug/Localtime.php:64 #: src/Module/Debug/Probe.php:54 src/Module/Debug/WebFinger.php:51 @@ -416,9 +416,9 @@ msgstr "" #: src/Module/Install.php:252 src/Module/Install.php:294 #: src/Module/Install.php:331 src/Module/Invite.php:178 #: src/Module/Item/Compose.php:189 src/Module/Profile/Profile.php:246 -#: src/Module/Settings/Profile/Index.php:222 src/Object/Post.php:992 -#: view/theme/duepuntozero/config.php:86 view/theme/frio/config.php:172 -#: view/theme/quattro/config.php:88 view/theme/vier/config.php:136 +#: src/Module/Settings/Profile/Index.php:222 src/Object/Post.php:991 +#: view/theme/duepuntozero/config.php:85 view/theme/frio/config.php:171 +#: view/theme/quattro/config.php:87 view/theme/vier/config.php:135 msgid "Submit" msgstr "" @@ -435,8 +435,8 @@ msgstr "" msgid "Failed to remove event" msgstr "" -#: mod/fbrowser.php:61 src/Content/Nav.php:195 src/Module/BaseProfile.php:64 -#: view/theme/frio/theme.php:240 +#: mod/fbrowser.php:61 src/Content/Nav.php:194 src/Module/BaseProfile.php:64 +#: view/theme/frio/theme.php:239 msgid "Photos" msgstr "" @@ -469,9 +469,9 @@ msgstr "" msgid "OStatus support is disabled. Contact can't be added." msgstr "" -#: mod/follow.php:138 src/Content/Item.php:401 src/Content/Widget.php:81 +#: mod/follow.php:138 src/Content/Item.php:404 src/Content/Widget.php:80 #: src/Model/Contact.php:1194 src/Model/Contact.php:1205 -#: view/theme/vier/theme.php:199 +#: view/theme/vier/theme.php:198 msgid "Connect/Follow" msgstr "" @@ -485,14 +485,14 @@ msgstr "" #: mod/follow.php:141 mod/unfollow.php:100 #: src/Module/Admin/Blocklist/Contact.php:116 -#: src/Module/Contact/Profile.php:367 -#: src/Module/Notifications/Introductions.php:128 -#: src/Module/Notifications/Introductions.php:197 +#: src/Module/Contact/Profile.php:366 +#: src/Module/Notifications/Introductions.php:129 +#: src/Module/Notifications/Introductions.php:198 msgid "Profile URL" msgstr "" -#: mod/follow.php:142 src/Module/Contact/Profile.php:379 -#: src/Module/Notifications/Introductions.php:190 +#: mod/follow.php:142 src/Module/Contact/Profile.php:378 +#: src/Module/Notifications/Introductions.php:191 #: src/Module/Profile/Profile.php:206 msgid "Tags:" msgstr "" @@ -691,7 +691,7 @@ msgstr "" msgid "Profile Match" msgstr "" -#: mod/message.php:46 mod/message.php:129 src/Content/Nav.php:289 +#: mod/message.php:46 mod/message.php:129 src/Content/Nav.php:288 msgid "New Message" msgstr "" @@ -711,13 +711,13 @@ msgstr "" msgid "Message collection failure." msgstr "" -#: mod/message.php:123 src/Module/Notifications/Introductions.php:134 -#: src/Module/Notifications/Introductions.php:169 +#: mod/message.php:123 src/Module/Notifications/Introductions.php:135 +#: src/Module/Notifications/Introductions.php:170 #: src/Module/Notifications/Notification.php:85 msgid "Discard" msgstr "" -#: mod/message.php:136 src/Content/Nav.php:286 view/theme/frio/theme.php:247 +#: mod/message.php:136 src/Content/Nav.php:285 view/theme/frio/theme.php:246 msgid "Messages" msgstr "" @@ -1071,38 +1071,38 @@ msgstr "" #: mod/photos.php:1328 mod/photos.php:1384 mod/photos.php:1458 #: src/Module/Contact.php:547 src/Module/Item/Compose.php:188 -#: src/Object/Post.php:989 +#: src/Object/Post.php:988 msgid "This is you" msgstr "" #: mod/photos.php:1330 mod/photos.php:1386 mod/photos.php:1460 -#: src/Object/Post.php:532 src/Object/Post.php:991 +#: src/Object/Post.php:531 src/Object/Post.php:990 msgid "Comment" msgstr "" -#: mod/photos.php:1419 src/Content/Conversation.php:634 src/Object/Post.php:256 +#: mod/photos.php:1419 src/Content/Conversation.php:637 src/Object/Post.php:255 msgid "Select" msgstr "" -#: mod/photos.php:1420 mod/settings.php:350 src/Content/Conversation.php:635 -#: src/Module/Admin/Users/Active.php:139 src/Module/Admin/Users/Blocked.php:141 -#: src/Module/Admin/Users/Index.php:154 +#: mod/photos.php:1420 mod/settings.php:350 src/Content/Conversation.php:638 +#: src/Module/Admin/Users/Active.php:139 src/Module/Admin/Users/Blocked.php:140 +#: src/Module/Admin/Users/Index.php:153 msgid "Delete" msgstr "" -#: mod/photos.php:1481 src/Object/Post.php:379 +#: mod/photos.php:1481 src/Object/Post.php:378 msgid "Like" msgstr "" -#: mod/photos.php:1482 src/Object/Post.php:379 +#: mod/photos.php:1482 src/Object/Post.php:378 msgid "I like this (toggle)" msgstr "" -#: mod/photos.php:1483 src/Object/Post.php:380 +#: mod/photos.php:1483 src/Object/Post.php:379 msgid "Dislike" msgstr "" -#: mod/photos.php:1485 src/Object/Post.php:380 +#: mod/photos.php:1485 src/Object/Post.php:379 msgid "I don't like this (toggle)" msgstr "" @@ -1120,12 +1120,12 @@ msgstr "" #: mod/redir.php:56 mod/redir.php:130 src/Module/Contact/Advanced.php:70 #: src/Module/Contact/Advanced.php:109 src/Module/Contact/Contacts.php:53 -#: src/Module/Contact/Conversations.php:79 #: src/Module/Contact/Conversations.php:84 -#: src/Module/Contact/Conversations.php:89 src/Module/Contact/Media.php:43 -#: src/Module/Contact/Posts.php:73 src/Module/Contact/Posts.php:78 -#: src/Module/Contact/Posts.php:83 src/Module/Contact/Profile.php:143 -#: src/Module/Contact/Profile.php:148 src/Module/Contact/Profile.php:153 +#: src/Module/Contact/Conversations.php:89 +#: src/Module/Contact/Conversations.php:94 src/Module/Contact/Media.php:43 +#: src/Module/Contact/Posts.php:78 src/Module/Contact/Posts.php:83 +#: src/Module/Contact/Posts.php:88 src/Module/Contact/Profile.php:142 +#: src/Module/Contact/Profile.php:147 src/Module/Contact/Profile.php:152 #: src/Module/FriendSuggest.php:71 src/Module/FriendSuggest.php:109 #: src/Module/Group.php:97 src/Module/Group.php:106 msgid "Contact not found." @@ -1169,7 +1169,7 @@ msgid "Resubscribing to OStatus contacts" msgstr "" #: mod/repair_ostatus.php:46 src/Module/Debug/ActivityPubConversion.php:129 -#: src/Module/Debug/Babel.php:293 src/Module/Security/TwoFactor/Verify.php:99 +#: src/Module/Debug/Babel.php:293 src/Module/Security/TwoFactor/Verify.php:102 msgid "Error" msgid_plural "Errors" msgstr[0] "" @@ -1184,14 +1184,14 @@ msgid "Connected Apps" msgstr "" #: mod/settings.php:176 src/Module/Admin/Blocklist/Contact.php:106 -#: src/Module/Admin/Users/Active.php:129 src/Module/Admin/Users/Blocked.php:131 +#: 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:143 src/Module/Admin/Users/Index.php:163 +#: src/Module/Admin/Users/Index.php:142 src/Module/Admin/Users/Index.php:162 #: src/Module/Admin/Users/Pending.php:104 src/Module/Contact/Advanced.php:134 msgid "Name" msgstr "" -#: mod/settings.php:177 src/Content/Nav.php:215 +#: mod/settings.php:177 src/Content/Nav.php:214 msgid "Home Page" msgstr "" @@ -1389,7 +1389,7 @@ msgstr "" msgid "Action after import:" msgstr "" -#: mod/settings.php:350 src/Content/Nav.php:283 +#: mod/settings.php:350 src/Content/Nav.php:282 msgid "Mark as seen" msgstr "" @@ -1407,19 +1407,19 @@ msgid "" "hours." msgstr "" -#: mod/suggest.php:55 src/Content/Widget.php:84 view/theme/vier/theme.php:202 +#: mod/suggest.php:55 src/Content/Widget.php:83 view/theme/vier/theme.php:201 msgid "Friend Suggestions" msgstr "" -#: mod/tagger.php:77 src/Content/Item.php:301 src/Model/Item.php:2860 +#: mod/tagger.php:77 src/Content/Item.php:304 src/Model/Item.php:2860 msgid "photo" msgstr "" -#: mod/tagger.php:77 src/Content/Item.php:295 src/Content/Item.php:305 +#: mod/tagger.php:77 src/Content/Item.php:298 src/Content/Item.php:308 msgid "status" msgstr "" -#: mod/tagger.php:110 src/Content/Item.php:315 +#: mod/tagger.php:110 src/Content/Item.php:318 #, php-format msgid "%1$s tagged %2$s's %3$s with %4$s" msgstr "" @@ -1549,11 +1549,11 @@ msgid "" "your site allow private mail from unknown senders." msgstr "" -#: src/App.php:491 +#: src/App.php:497 msgid "No system theme config value set." msgstr "" -#: src/App.php:612 +#: src/App.php:618 msgid "Apologies but the website is unavailable at the moment." msgstr "" @@ -1571,16 +1571,16 @@ msgstr "" msgid "toggle mobile" msgstr "" -#: src/App/Router.php:283 +#: src/App/Router.php:288 #, php-format msgid "Method not allowed for this module. Allowed method(s): %s" msgstr "" -#: src/App/Router.php:285 src/Module/HTTPException/PageNotFound.php:49 +#: src/App/Router.php:290 src/Module/HTTPException/PageNotFound.php:49 msgid "Page not found." msgstr "" -#: src/App/Router.php:313 +#: src/App/Router.php:318 msgid "You must be logged in to use addons. " msgstr "" @@ -1594,17 +1594,17 @@ msgstr "" msgid "All contacts" msgstr "" -#: src/BaseModule.php:424 src/Content/Widget.php:236 src/Core/ACL.php:194 +#: src/BaseModule.php:424 src/Content/Widget.php:235 src/Core/ACL.php:194 #: src/Module/Contact.php:370 src/Module/PermissionTooltip.php:122 #: src/Module/PermissionTooltip.php:144 msgid "Followers" msgstr "" -#: src/BaseModule.php:429 src/Content/Widget.php:237 src/Module/Contact.php:371 +#: src/BaseModule.php:429 src/Content/Widget.php:236 src/Module/Contact.php:371 msgid "Following" msgstr "" -#: src/BaseModule.php:434 src/Content/Widget.php:238 src/Module/Contact.php:372 +#: src/BaseModule.php:434 src/Content/Widget.php:237 src/Module/Contact.php:372 msgid "Mutual friends" msgstr "" @@ -1762,12 +1762,12 @@ msgstr "" msgid "Enter new password: " msgstr "" -#: src/Console/User.php:210 src/Module/Security/PasswordTooLong.php:66 +#: src/Console/User.php:210 src/Module/Security/PasswordTooLong.php:69 #: src/Module/Settings/Account.php:75 msgid "Password update failed. Please try again." msgstr "" -#: src/Console/User.php:213 src/Module/Security/PasswordTooLong.php:69 +#: src/Console/User.php:213 src/Module/Security/PasswordTooLong.php:72 #: src/Module/Settings/Account.php:78 msgid "Password changed." msgstr "" @@ -1858,9 +1858,9 @@ msgid "RSS/Atom" msgstr "" #: src/Content/ContactSelector.php:129 src/Module/Admin/Users/Active.php:129 -#: src/Module/Admin/Users/Blocked.php:131 src/Module/Admin/Users/Create.php:73 -#: src/Module/Admin/Users/Deleted.php:88 src/Module/Admin/Users/Index.php:143 -#: src/Module/Admin/Users/Index.php:163 src/Module/Admin/Users/Pending.php:104 +#: src/Module/Admin/Users/Blocked.php:130 src/Module/Admin/Users/Create.php:73 +#: src/Module/Admin/Users/Deleted.php:88 src/Module/Admin/Users/Index.php:142 +#: src/Module/Admin/Users/Index.php:162 src/Module/Admin/Users/Pending.php:104 msgid "Email" msgstr "" @@ -1921,258 +1921,258 @@ msgstr "" msgid "%s (via %s)" msgstr "" -#: src/Content/Conversation.php:211 +#: src/Content/Conversation.php:214 #, php-format msgid "%s likes this." msgstr "" -#: src/Content/Conversation.php:214 +#: src/Content/Conversation.php:217 #, php-format msgid "%s doesn't like this." msgstr "" -#: src/Content/Conversation.php:217 +#: src/Content/Conversation.php:220 #, php-format msgid "%s attends." msgstr "" -#: src/Content/Conversation.php:220 +#: src/Content/Conversation.php:223 #, php-format msgid "%s doesn't attend." msgstr "" -#: src/Content/Conversation.php:223 +#: src/Content/Conversation.php:226 #, php-format msgid "%s attends maybe." msgstr "" -#: src/Content/Conversation.php:226 src/Content/Conversation.php:264 -#: src/Content/Conversation.php:878 +#: src/Content/Conversation.php:229 src/Content/Conversation.php:267 +#: src/Content/Conversation.php:881 #, php-format msgid "%s reshared this." msgstr "" -#: src/Content/Conversation.php:232 +#: src/Content/Conversation.php:235 msgid "and" msgstr "" -#: src/Content/Conversation.php:235 +#: src/Content/Conversation.php:238 #, php-format msgid "and %d other people" msgstr "" -#: src/Content/Conversation.php:243 +#: src/Content/Conversation.php:246 #, php-format msgid "%2$d people like this" msgstr "" -#: src/Content/Conversation.php:244 +#: src/Content/Conversation.php:247 #, php-format msgid "%s like this." msgstr "" -#: src/Content/Conversation.php:247 +#: src/Content/Conversation.php:250 #, php-format msgid "%2$d people don't like this" msgstr "" -#: src/Content/Conversation.php:248 +#: src/Content/Conversation.php:251 #, php-format msgid "%s don't like this." msgstr "" -#: src/Content/Conversation.php:251 +#: src/Content/Conversation.php:254 #, php-format msgid "%2$d people attend" msgstr "" -#: src/Content/Conversation.php:252 +#: src/Content/Conversation.php:255 #, php-format msgid "%s attend." msgstr "" -#: src/Content/Conversation.php:255 +#: src/Content/Conversation.php:258 #, php-format msgid "%2$d people don't attend" msgstr "" -#: src/Content/Conversation.php:256 +#: src/Content/Conversation.php:259 #, php-format msgid "%s don't attend." msgstr "" -#: src/Content/Conversation.php:259 +#: src/Content/Conversation.php:262 #, php-format msgid "%2$d people attend maybe" msgstr "" -#: src/Content/Conversation.php:260 +#: src/Content/Conversation.php:263 #, php-format msgid "%s attend maybe." msgstr "" -#: src/Content/Conversation.php:263 +#: src/Content/Conversation.php:266 #, php-format msgid "%2$d people reshared this" msgstr "" -#: src/Content/Conversation.php:311 +#: src/Content/Conversation.php:314 msgid "Visible to everybody" msgstr "" -#: src/Content/Conversation.php:312 src/Module/Item/Compose.php:198 -#: src/Object/Post.php:1002 +#: src/Content/Conversation.php:315 src/Module/Item/Compose.php:198 +#: src/Object/Post.php:1001 msgid "Please enter a image/video/audio/webpage URL:" msgstr "" -#: src/Content/Conversation.php:313 +#: src/Content/Conversation.php:316 msgid "Tag term:" msgstr "" -#: src/Content/Conversation.php:314 src/Module/Filer/SaveTag.php:73 +#: src/Content/Conversation.php:317 src/Module/Filer/SaveTag.php:73 msgid "Save to Folder:" msgstr "" -#: src/Content/Conversation.php:315 +#: src/Content/Conversation.php:318 msgid "Where are you right now?" msgstr "" -#: src/Content/Conversation.php:316 +#: src/Content/Conversation.php:319 msgid "Delete item(s)?" msgstr "" -#: src/Content/Conversation.php:328 src/Module/Item/Compose.php:175 +#: src/Content/Conversation.php:331 src/Module/Item/Compose.php:175 msgid "Created at" msgstr "" -#: src/Content/Conversation.php:338 +#: src/Content/Conversation.php:341 msgid "New Post" msgstr "" -#: src/Content/Conversation.php:341 +#: src/Content/Conversation.php:344 msgid "Share" msgstr "" -#: src/Content/Conversation.php:352 src/Module/Item/Compose.php:195 -#: src/Object/Post.php:999 +#: src/Content/Conversation.php:355 src/Module/Item/Compose.php:195 +#: src/Object/Post.php:998 msgid "Image" msgstr "" -#: src/Content/Conversation.php:355 +#: src/Content/Conversation.php:358 msgid "Video" msgstr "" -#: src/Content/Conversation.php:368 src/Module/Item/Compose.php:222 +#: src/Content/Conversation.php:371 src/Module/Item/Compose.php:222 msgid "Scheduled at" msgstr "" -#: src/Content/Conversation.php:662 src/Object/Post.php:244 +#: src/Content/Conversation.php:665 src/Object/Post.php:243 msgid "Pinned item" msgstr "" -#: src/Content/Conversation.php:678 src/Object/Post.php:486 -#: src/Object/Post.php:487 +#: src/Content/Conversation.php:681 src/Object/Post.php:485 +#: src/Object/Post.php:486 #, php-format msgid "View %s's profile @ %s" msgstr "" -#: src/Content/Conversation.php:691 src/Object/Post.php:474 +#: src/Content/Conversation.php:694 src/Object/Post.php:473 msgid "Categories:" msgstr "" -#: src/Content/Conversation.php:692 src/Object/Post.php:475 +#: src/Content/Conversation.php:695 src/Object/Post.php:474 msgid "Filed under:" msgstr "" -#: src/Content/Conversation.php:700 src/Object/Post.php:500 +#: src/Content/Conversation.php:703 src/Object/Post.php:499 #, php-format msgid "%s from %s" msgstr "" -#: src/Content/Conversation.php:716 +#: src/Content/Conversation.php:719 msgid "View in context" msgstr "" -#: src/Content/Conversation.php:781 +#: src/Content/Conversation.php:784 msgid "remove" msgstr "" -#: src/Content/Conversation.php:785 +#: src/Content/Conversation.php:788 msgid "Delete Selected Items" msgstr "" -#: src/Content/Conversation.php:850 src/Content/Conversation.php:853 -#: src/Content/Conversation.php:856 src/Content/Conversation.php:859 +#: src/Content/Conversation.php:853 src/Content/Conversation.php:856 +#: src/Content/Conversation.php:859 src/Content/Conversation.php:862 #, php-format msgid "You had been addressed (%s)." msgstr "" -#: src/Content/Conversation.php:862 +#: src/Content/Conversation.php:865 #, php-format msgid "You are following %s." msgstr "" -#: src/Content/Conversation.php:865 +#: src/Content/Conversation.php:868 msgid "You subscribed to one or more tags in this post." msgstr "" -#: src/Content/Conversation.php:880 +#: src/Content/Conversation.php:883 msgid "Reshared" msgstr "" -#: src/Content/Conversation.php:880 -#, php-format -msgid "Reshared by %s <%s>" -msgstr "" - #: src/Content/Conversation.php:883 #, php-format -msgid "%s is participating in this thread." +msgid "Reshared by %s <%s>" msgstr "" #: src/Content/Conversation.php:886 -msgid "Stored for general reasons" +#, php-format +msgid "%s is participating in this thread." msgstr "" #: src/Content/Conversation.php:889 +msgid "Stored for general reasons" +msgstr "" + +#: src/Content/Conversation.php:892 msgid "Global post" msgstr "" -#: src/Content/Conversation.php:892 +#: src/Content/Conversation.php:895 msgid "Sent via an relay server" msgstr "" -#: src/Content/Conversation.php:892 +#: src/Content/Conversation.php:895 #, php-format msgid "Sent via the relay server %s <%s>" msgstr "" -#: src/Content/Conversation.php:895 +#: src/Content/Conversation.php:898 msgid "Fetched" msgstr "" -#: src/Content/Conversation.php:895 +#: src/Content/Conversation.php:898 #, php-format msgid "Fetched because of %s <%s>" msgstr "" -#: src/Content/Conversation.php:898 +#: src/Content/Conversation.php:901 msgid "Stored because of a child post to complete this thread." msgstr "" -#: src/Content/Conversation.php:901 +#: src/Content/Conversation.php:904 msgid "Local delivery" msgstr "" -#: src/Content/Conversation.php:904 +#: src/Content/Conversation.php:907 msgid "Stored because of your activity (like, comment, star, ...)" msgstr "" -#: src/Content/Conversation.php:907 +#: src/Content/Conversation.php:910 msgid "Distributed" msgstr "" -#: src/Content/Conversation.php:910 +#: src/Content/Conversation.php:913 msgid "Pushed to us" msgstr "" @@ -2274,333 +2274,333 @@ msgstr "" msgid "Display membership date in profile" msgstr "" -#: src/Content/ForumManager.php:152 src/Content/Nav.php:242 -#: src/Content/Text/HTML.php:903 src/Content/Widget.php:525 +#: src/Content/ForumManager.php:151 src/Content/Nav.php:241 +#: src/Content/Text/HTML.php:903 src/Content/Widget.php:524 msgid "Forums" msgstr "" -#: src/Content/ForumManager.php:154 +#: src/Content/ForumManager.php:153 msgid "External link to forum" msgstr "" -#: src/Content/ForumManager.php:157 src/Content/Widget.php:504 +#: src/Content/ForumManager.php:156 src/Content/Widget.php:503 msgid "show less" msgstr "" -#: src/Content/ForumManager.php:158 src/Content/Widget.php:406 -#: src/Content/Widget.php:505 +#: src/Content/ForumManager.php:157 src/Content/Widget.php:405 +#: src/Content/Widget.php:504 msgid "show more" msgstr "" -#: src/Content/Item.php:292 src/Model/Item.php:2858 +#: src/Content/Item.php:295 src/Model/Item.php:2858 msgid "event" msgstr "" -#: src/Content/Item.php:384 view/theme/frio/theme.php:268 +#: src/Content/Item.php:387 view/theme/frio/theme.php:267 msgid "Follow Thread" msgstr "" -#: src/Content/Item.php:385 src/Model/Contact.php:1199 +#: src/Content/Item.php:388 src/Model/Contact.php:1199 msgid "View Status" msgstr "" -#: src/Content/Item.php:386 src/Content/Item.php:404 src/Model/Contact.php:1137 +#: src/Content/Item.php:389 src/Content/Item.php:407 src/Model/Contact.php:1137 #: src/Model/Contact.php:1191 src/Model/Contact.php:1200 #: src/Module/Directory.php:157 src/Module/Settings/Profile/Index.php:225 msgid "View Profile" msgstr "" -#: src/Content/Item.php:387 src/Model/Contact.php:1201 +#: src/Content/Item.php:390 src/Model/Contact.php:1201 msgid "View Photos" msgstr "" -#: src/Content/Item.php:388 src/Model/Contact.php:1192 +#: src/Content/Item.php:391 src/Model/Contact.php:1192 #: src/Model/Contact.php:1202 msgid "Network Posts" msgstr "" -#: src/Content/Item.php:389 src/Model/Contact.php:1193 +#: src/Content/Item.php:392 src/Model/Contact.php:1193 #: src/Model/Contact.php:1203 msgid "View Contact" msgstr "" -#: src/Content/Item.php:390 src/Model/Contact.php:1204 +#: src/Content/Item.php:393 src/Model/Contact.php:1204 msgid "Send PM" msgstr "" -#: src/Content/Item.php:391 src/Module/Admin/Blocklist/Contact.php:100 -#: src/Module/Admin/Users/Active.php:140 src/Module/Admin/Users/Index.php:155 -#: src/Module/Contact.php:401 src/Module/Contact/Profile.php:350 -#: src/Module/Contact/Profile.php:451 +#: src/Content/Item.php:394 src/Module/Admin/Blocklist/Contact.php:100 +#: src/Module/Admin/Users/Active.php:140 src/Module/Admin/Users/Index.php:154 +#: src/Module/Contact.php:401 src/Module/Contact/Profile.php:349 +#: src/Module/Contact/Profile.php:450 msgid "Block" msgstr "" -#: src/Content/Item.php:392 src/Module/Contact.php:402 -#: src/Module/Contact/Profile.php:351 src/Module/Contact/Profile.php:459 -#: src/Module/Notifications/Introductions.php:133 -#: src/Module/Notifications/Introductions.php:205 +#: src/Content/Item.php:395 src/Module/Contact.php:402 +#: src/Module/Contact/Profile.php:350 src/Module/Contact/Profile.php:458 +#: src/Module/Notifications/Introductions.php:134 +#: src/Module/Notifications/Introductions.php:206 #: src/Module/Notifications/Notification.php:89 msgid "Ignore" msgstr "" -#: src/Content/Item.php:396 src/Object/Post.php:455 +#: src/Content/Item.php:399 src/Object/Post.php:454 msgid "Languages" msgstr "" -#: src/Content/Nav.php:91 +#: src/Content/Nav.php:90 msgid "Nothing new here" msgstr "" -#: src/Content/Nav.php:95 src/Module/Special/HTTPException.php:50 +#: src/Content/Nav.php:94 src/Module/Special/HTTPException.php:50 msgid "Go back" msgstr "" -#: src/Content/Nav.php:96 +#: src/Content/Nav.php:95 msgid "Clear notifications" msgstr "" -#: src/Content/Nav.php:97 src/Content/Text/HTML.php:890 +#: src/Content/Nav.php:96 src/Content/Text/HTML.php:890 msgid "@name, !forum, #tags, content" msgstr "" -#: src/Content/Nav.php:186 src/Module/Security/Login.php:158 +#: src/Content/Nav.php:185 src/Module/Security/Login.php:158 msgid "Logout" msgstr "" -#: src/Content/Nav.php:186 +#: src/Content/Nav.php:185 msgid "End this session" msgstr "" -#: src/Content/Nav.php:188 src/Module/Bookmarklet.php:44 +#: src/Content/Nav.php:187 src/Module/Bookmarklet.php:44 #: src/Module/Security/Login.php:159 msgid "Login" msgstr "" -#: src/Content/Nav.php:188 +#: src/Content/Nav.php:187 msgid "Sign in" msgstr "" -#: src/Content/Nav.php:193 src/Module/BaseProfile.php:56 -#: src/Module/Contact.php:436 src/Module/Contact/Profile.php:382 -#: src/Module/Settings/TwoFactor/Index.php:119 view/theme/frio/theme.php:238 +#: src/Content/Nav.php:192 src/Module/BaseProfile.php:56 +#: src/Module/Contact.php:436 src/Module/Contact/Profile.php:381 +#: src/Module/Settings/TwoFactor/Index.php:119 view/theme/frio/theme.php:237 msgid "Status" msgstr "" -#: src/Content/Nav.php:193 src/Content/Nav.php:276 -#: view/theme/frio/theme.php:238 +#: src/Content/Nav.php:192 src/Content/Nav.php:275 +#: view/theme/frio/theme.php:237 msgid "Your posts and conversations" msgstr "" -#: src/Content/Nav.php:194 src/Module/BaseProfile.php:48 +#: src/Content/Nav.php:193 src/Module/BaseProfile.php:48 #: src/Module/BaseSettings.php:55 src/Module/Contact.php:460 -#: src/Module/Contact/Profile.php:384 src/Module/Profile/Profile.php:240 -#: src/Module/Welcome.php:57 view/theme/frio/theme.php:239 +#: src/Module/Contact/Profile.php:383 src/Module/Profile/Profile.php:240 +#: src/Module/Welcome.php:57 view/theme/frio/theme.php:238 msgid "Profile" msgstr "" -#: src/Content/Nav.php:194 view/theme/frio/theme.php:239 +#: src/Content/Nav.php:193 view/theme/frio/theme.php:238 msgid "Your profile page" msgstr "" -#: src/Content/Nav.php:195 view/theme/frio/theme.php:240 +#: src/Content/Nav.php:194 view/theme/frio/theme.php:239 msgid "Your photos" msgstr "" -#: src/Content/Nav.php:196 src/Module/BaseProfile.php:72 +#: src/Content/Nav.php:195 src/Module/BaseProfile.php:72 #: src/Module/BaseProfile.php:75 src/Module/Contact.php:452 -#: view/theme/frio/theme.php:241 +#: view/theme/frio/theme.php:240 msgid "Media" msgstr "" -#: src/Content/Nav.php:196 view/theme/frio/theme.php:241 +#: src/Content/Nav.php:195 view/theme/frio/theme.php:240 msgid "Your postings with media" msgstr "" -#: src/Content/Nav.php:197 view/theme/frio/theme.php:242 +#: src/Content/Nav.php:196 view/theme/frio/theme.php:241 msgid "Your events" msgstr "" -#: src/Content/Nav.php:198 +#: src/Content/Nav.php:197 msgid "Personal notes" msgstr "" -#: src/Content/Nav.php:198 +#: src/Content/Nav.php:197 msgid "Your personal notes" msgstr "" -#: src/Content/Nav.php:215 src/Content/Nav.php:276 +#: src/Content/Nav.php:214 src/Content/Nav.php:275 msgid "Home" msgstr "" -#: src/Content/Nav.php:219 src/Module/Register.php:168 +#: src/Content/Nav.php:218 src/Module/Register.php:168 #: src/Module/Security/Login.php:124 msgid "Register" msgstr "" -#: src/Content/Nav.php:219 +#: src/Content/Nav.php:218 msgid "Create an account" msgstr "" -#: src/Content/Nav.php:225 src/Module/Help.php:67 +#: src/Content/Nav.php:224 src/Module/Help.php:67 #: src/Module/Settings/TwoFactor/AppSpecific.php:128 #: src/Module/Settings/TwoFactor/Index.php:118 #: src/Module/Settings/TwoFactor/Recovery.php:106 -#: src/Module/Settings/TwoFactor/Verify.php:145 view/theme/vier/theme.php:244 +#: src/Module/Settings/TwoFactor/Verify.php:145 view/theme/vier/theme.php:243 msgid "Help" msgstr "" -#: src/Content/Nav.php:225 +#: src/Content/Nav.php:224 msgid "Help and documentation" msgstr "" -#: src/Content/Nav.php:229 +#: src/Content/Nav.php:228 msgid "Apps" msgstr "" -#: src/Content/Nav.php:229 +#: src/Content/Nav.php:228 msgid "Addon applications, utilities, games" msgstr "" -#: src/Content/Nav.php:233 src/Content/Text/HTML.php:888 +#: src/Content/Nav.php:232 src/Content/Text/HTML.php:888 #: src/Module/Admin/Logs/View.php:87 src/Module/Search/Index.php:111 msgid "Search" msgstr "" -#: src/Content/Nav.php:233 +#: src/Content/Nav.php:232 msgid "Search site content" msgstr "" -#: src/Content/Nav.php:236 src/Content/Text/HTML.php:897 +#: src/Content/Nav.php:235 src/Content/Text/HTML.php:897 msgid "Full Text" msgstr "" -#: src/Content/Nav.php:237 src/Content/Text/HTML.php:898 +#: src/Content/Nav.php:236 src/Content/Text/HTML.php:898 #: src/Content/Widget/TagCloud.php:68 msgid "Tags" msgstr "" -#: src/Content/Nav.php:238 src/Content/Nav.php:297 +#: src/Content/Nav.php:237 src/Content/Nav.php:296 #: src/Content/Text/HTML.php:899 src/Module/BaseProfile.php:125 #: src/Module/BaseProfile.php:128 src/Module/Contact.php:373 -#: src/Module/Contact.php:467 view/theme/frio/theme.php:249 +#: src/Module/Contact.php:467 view/theme/frio/theme.php:248 msgid "Contacts" msgstr "" -#: src/Content/Nav.php:257 +#: src/Content/Nav.php:256 msgid "Community" msgstr "" -#: src/Content/Nav.php:257 +#: src/Content/Nav.php:256 msgid "Conversations on this and other servers" msgstr "" -#: src/Content/Nav.php:261 src/Module/BaseProfile.php:87 -#: src/Module/BaseProfile.php:98 view/theme/frio/theme.php:246 +#: src/Content/Nav.php:260 src/Module/BaseProfile.php:87 +#: src/Module/BaseProfile.php:98 view/theme/frio/theme.php:245 msgid "Events and Calendar" msgstr "" -#: src/Content/Nav.php:264 +#: src/Content/Nav.php:263 msgid "Directory" msgstr "" -#: src/Content/Nav.php:264 +#: src/Content/Nav.php:263 msgid "People directory" msgstr "" -#: src/Content/Nav.php:266 src/Module/BaseAdmin.php:85 +#: src/Content/Nav.php:265 src/Module/BaseAdmin.php:85 msgid "Information" msgstr "" -#: src/Content/Nav.php:266 +#: src/Content/Nav.php:265 msgid "Information about this friendica instance" msgstr "" -#: src/Content/Nav.php:269 src/Module/Admin/Tos.php:76 +#: src/Content/Nav.php:268 src/Module/Admin/Tos.php:76 #: src/Module/BaseAdmin.php:96 src/Module/Register.php:176 #: src/Module/Tos.php:87 msgid "Terms of Service" msgstr "" -#: src/Content/Nav.php:269 +#: src/Content/Nav.php:268 msgid "Terms of Service of this Friendica instance" msgstr "" -#: src/Content/Nav.php:274 view/theme/frio/theme.php:245 +#: src/Content/Nav.php:273 view/theme/frio/theme.php:244 msgid "Network" msgstr "" -#: src/Content/Nav.php:274 view/theme/frio/theme.php:245 +#: src/Content/Nav.php:273 view/theme/frio/theme.php:244 msgid "Conversations from your friends" msgstr "" -#: src/Content/Nav.php:280 +#: src/Content/Nav.php:279 msgid "Introductions" msgstr "" -#: src/Content/Nav.php:280 +#: src/Content/Nav.php:279 msgid "Friend Requests" msgstr "" -#: src/Content/Nav.php:281 src/Module/BaseNotifications.php:149 -#: src/Module/Notifications/Introductions.php:74 +#: src/Content/Nav.php:280 src/Module/BaseNotifications.php:149 +#: src/Module/Notifications/Introductions.php:75 msgid "Notifications" msgstr "" -#: src/Content/Nav.php:282 +#: src/Content/Nav.php:281 msgid "See all notifications" msgstr "" -#: src/Content/Nav.php:283 +#: src/Content/Nav.php:282 msgid "Mark all system notifications as seen" msgstr "" -#: src/Content/Nav.php:286 view/theme/frio/theme.php:247 +#: src/Content/Nav.php:285 view/theme/frio/theme.php:246 msgid "Private mail" msgstr "" -#: src/Content/Nav.php:287 +#: src/Content/Nav.php:286 msgid "Inbox" msgstr "" -#: src/Content/Nav.php:288 +#: src/Content/Nav.php:287 msgid "Outbox" msgstr "" -#: src/Content/Nav.php:292 +#: src/Content/Nav.php:291 msgid "Accounts" msgstr "" -#: src/Content/Nav.php:292 +#: src/Content/Nav.php:291 msgid "Manage other pages" msgstr "" -#: src/Content/Nav.php:295 src/Module/Admin/Addons/Details.php:114 +#: src/Content/Nav.php:294 src/Module/Admin/Addons/Details.php:114 #: src/Module/Admin/Themes/Details.php:93 src/Module/BaseSettings.php:122 -#: src/Module/Welcome.php:52 view/theme/frio/theme.php:248 +#: src/Module/Welcome.php:52 view/theme/frio/theme.php:247 msgid "Settings" msgstr "" -#: src/Content/Nav.php:295 view/theme/frio/theme.php:248 +#: src/Content/Nav.php:294 view/theme/frio/theme.php:247 msgid "Account settings" msgstr "" -#: src/Content/Nav.php:297 view/theme/frio/theme.php:249 +#: src/Content/Nav.php:296 view/theme/frio/theme.php:248 msgid "Manage/edit friends and contacts" msgstr "" -#: src/Content/Nav.php:302 src/Module/BaseAdmin.php:126 +#: src/Content/Nav.php:301 src/Module/BaseAdmin.php:126 msgid "Admin" msgstr "" -#: src/Content/Nav.php:302 +#: src/Content/Nav.php:301 msgid "Site setup and configuration" msgstr "" -#: src/Content/Nav.php:305 +#: src/Content/Nav.php:304 msgid "Navigation" msgstr "" -#: src/Content/Nav.php:305 +#: src/Content/Nav.php:304 msgid "Site map" msgstr "" @@ -2672,150 +2672,150 @@ msgstr "" msgid "The end" msgstr "" -#: src/Content/Text/HTML.php:882 src/Content/Widget/VCard.php:110 +#: src/Content/Text/HTML.php:882 src/Content/Widget/VCard.php:109 #: src/Model/Profile.php:459 msgid "Follow" msgstr "" -#: src/Content/Widget.php:52 +#: src/Content/Widget.php:51 msgid "Add New Contact" msgstr "" -#: src/Content/Widget.php:53 +#: src/Content/Widget.php:52 msgid "Enter address or web location" msgstr "" -#: src/Content/Widget.php:54 +#: src/Content/Widget.php:53 msgid "Example: bob@example.com, http://example.com/barbara" msgstr "" -#: src/Content/Widget.php:56 +#: src/Content/Widget.php:55 msgid "Connect" msgstr "" -#: src/Content/Widget.php:73 +#: src/Content/Widget.php:72 #, php-format msgid "%d invitation available" msgid_plural "%d invitations available" msgstr[0] "" msgstr[1] "" -#: src/Content/Widget.php:79 view/theme/vier/theme.php:197 +#: src/Content/Widget.php:78 view/theme/vier/theme.php:196 msgid "Find People" msgstr "" -#: src/Content/Widget.php:80 view/theme/vier/theme.php:198 +#: src/Content/Widget.php:79 view/theme/vier/theme.php:197 msgid "Enter name or interest" msgstr "" -#: src/Content/Widget.php:82 view/theme/vier/theme.php:200 +#: src/Content/Widget.php:81 view/theme/vier/theme.php:199 msgid "Examples: Robert Morgenstein, Fishing" msgstr "" -#: src/Content/Widget.php:83 src/Module/Contact.php:394 -#: src/Module/Directory.php:96 view/theme/vier/theme.php:201 +#: src/Content/Widget.php:82 src/Module/Contact.php:394 +#: src/Module/Directory.php:96 view/theme/vier/theme.php:200 msgid "Find" msgstr "" -#: src/Content/Widget.php:85 view/theme/vier/theme.php:203 +#: src/Content/Widget.php:84 view/theme/vier/theme.php:202 msgid "Similar Interests" msgstr "" -#: src/Content/Widget.php:86 view/theme/vier/theme.php:204 +#: src/Content/Widget.php:85 view/theme/vier/theme.php:203 msgid "Random Profile" msgstr "" -#: src/Content/Widget.php:87 view/theme/vier/theme.php:205 +#: src/Content/Widget.php:86 view/theme/vier/theme.php:204 msgid "Invite Friends" msgstr "" -#: src/Content/Widget.php:88 src/Module/Directory.php:88 -#: view/theme/vier/theme.php:206 +#: src/Content/Widget.php:87 src/Module/Directory.php:88 +#: view/theme/vier/theme.php:205 msgid "Global Directory" msgstr "" -#: src/Content/Widget.php:90 view/theme/vier/theme.php:208 +#: src/Content/Widget.php:89 view/theme/vier/theme.php:207 msgid "Local Directory" msgstr "" -#: src/Content/Widget.php:212 src/Model/Group.php:587 +#: src/Content/Widget.php:211 src/Model/Group.php:587 #: src/Module/Contact.php:357 src/Module/Welcome.php:76 msgid "Groups" msgstr "" -#: src/Content/Widget.php:214 +#: src/Content/Widget.php:213 msgid "Everyone" msgstr "" -#: src/Content/Widget.php:243 +#: src/Content/Widget.php:242 msgid "Relationships" msgstr "" -#: src/Content/Widget.php:245 src/Module/Contact.php:309 +#: src/Content/Widget.php:244 src/Module/Contact.php:309 #: src/Module/Group.php:291 msgid "All Contacts" msgstr "" -#: src/Content/Widget.php:284 +#: src/Content/Widget.php:283 msgid "Protocols" msgstr "" -#: src/Content/Widget.php:286 +#: src/Content/Widget.php:285 msgid "All Protocols" msgstr "" -#: src/Content/Widget.php:314 +#: src/Content/Widget.php:313 msgid "Saved Folders" msgstr "" -#: src/Content/Widget.php:316 src/Content/Widget.php:347 +#: src/Content/Widget.php:315 src/Content/Widget.php:346 msgid "Everything" msgstr "" -#: src/Content/Widget.php:345 +#: src/Content/Widget.php:344 msgid "Categories" msgstr "" -#: src/Content/Widget.php:402 +#: src/Content/Widget.php:401 #, php-format msgid "%d contact in common" msgid_plural "%d contacts in common" msgstr[0] "" msgstr[1] "" -#: src/Content/Widget.php:498 +#: src/Content/Widget.php:497 msgid "Archives" msgstr "" -#: src/Content/Widget.php:522 +#: src/Content/Widget.php:521 msgid "Persons" msgstr "" -#: src/Content/Widget.php:523 +#: src/Content/Widget.php:522 msgid "Organisations" msgstr "" -#: src/Content/Widget.php:524 src/Model/Contact.php:1630 +#: src/Content/Widget.php:523 src/Model/Contact.php:1630 msgid "News" msgstr "" -#: src/Content/Widget.php:528 src/Module/Settings/Account.php:456 +#: src/Content/Widget.php:527 src/Module/Settings/Account.php:456 msgid "Account Types" msgstr "" -#: src/Content/Widget.php:529 src/Module/Admin/BaseUsers.php:51 +#: src/Content/Widget.php:528 src/Module/Admin/BaseUsers.php:51 msgid "All" msgstr "" -#: src/Content/Widget/CalendarExport.php:54 +#: src/Content/Widget/CalendarExport.php:56 msgid "Export" msgstr "" -#: src/Content/Widget/CalendarExport.php:55 +#: src/Content/Widget/CalendarExport.php:57 msgid "Export calendar as ical" msgstr "" -#: src/Content/Widget/CalendarExport.php:56 +#: src/Content/Widget/CalendarExport.php:58 msgid "Export calendar as csv" msgstr "" @@ -2823,52 +2823,52 @@ msgstr "" msgid "No contacts" msgstr "" -#: src/Content/Widget/ContactBlock.php:108 +#: src/Content/Widget/ContactBlock.php:110 #, php-format msgid "%d Contact" msgid_plural "%d Contacts" msgstr[0] "" msgstr[1] "" -#: src/Content/Widget/ContactBlock.php:125 +#: src/Content/Widget/ContactBlock.php:127 msgid "View Contacts" msgstr "" -#: src/Content/Widget/SavedSearches.php:48 +#: src/Content/Widget/SavedSearches.php:47 msgid "Remove term" msgstr "" -#: src/Content/Widget/SavedSearches.php:61 +#: src/Content/Widget/SavedSearches.php:60 msgid "Saved Searches" msgstr "" -#: src/Content/Widget/TrendingTags.php:51 +#: src/Content/Widget/TrendingTags.php:52 #, php-format msgid "Trending Tags (last %d hour)" msgid_plural "Trending Tags (last %d hours)" msgstr[0] "" msgstr[1] "" -#: src/Content/Widget/TrendingTags.php:52 +#: src/Content/Widget/TrendingTags.php:53 msgid "More Trending Tags" msgstr "" -#: src/Content/Widget/VCard.php:103 src/Model/Profile.php:378 -#: src/Module/Contact/Profile.php:373 src/Module/Profile/Profile.php:175 +#: src/Content/Widget/VCard.php:102 src/Model/Profile.php:378 +#: src/Module/Contact/Profile.php:372 src/Module/Profile/Profile.php:175 msgid "XMPP:" msgstr "" -#: src/Content/Widget/VCard.php:104 src/Model/Profile.php:379 -#: src/Module/Contact/Profile.php:375 src/Module/Profile/Profile.php:179 +#: src/Content/Widget/VCard.php:103 src/Model/Profile.php:379 +#: src/Module/Contact/Profile.php:374 src/Module/Profile/Profile.php:179 msgid "Matrix:" msgstr "" -#: src/Content/Widget/VCard.php:108 src/Model/Profile.php:471 -#: src/Module/Notifications/Introductions.php:200 +#: src/Content/Widget/VCard.php:107 src/Model/Profile.php:471 +#: src/Module/Notifications/Introductions.php:201 msgid "Network:" msgstr "" -#: src/Content/Widget/VCard.php:112 src/Model/Profile.php:461 +#: src/Content/Widget/VCard.php:111 src/Model/Profile.php:461 msgid "Unfollow" msgstr "" @@ -3593,8 +3593,8 @@ msgid "UnFollow" msgstr "" #: src/Model/Contact.php:1212 src/Module/Admin/Users/Pending.php:107 -#: src/Module/Notifications/Introductions.php:131 -#: src/Module/Notifications/Introductions.php:203 +#: src/Module/Notifications/Introductions.php:132 +#: src/Module/Notifications/Introductions.php:204 msgid "Approve" msgstr "" @@ -3863,8 +3863,8 @@ msgstr "" msgid "Homepage:" msgstr "" -#: src/Model/Profile.php:377 src/Module/Contact/Profile.php:377 -#: src/Module/Notifications/Introductions.php:188 +#: src/Model/Profile.php:377 src/Module/Contact/Profile.php:376 +#: src/Module/Notifications/Introductions.php:189 msgid "About:" msgstr "" @@ -4040,13 +4040,13 @@ msgstr "" msgid "Invalid OpenID url" msgstr "" -#: src/Model/User.php:997 src/Security/Authentication.php:240 +#: src/Model/User.php:997 src/Security/Authentication.php:239 msgid "" "We encountered a problem while logging in with the OpenID you provided. " "Please check the correct spelling of the ID." msgstr "" -#: src/Model/User.php:997 src/Security/Authentication.php:240 +#: src/Model/User.php:997 src/Security/Authentication.php:239 msgid "The error message was:" msgstr "" @@ -4291,15 +4291,15 @@ msgstr "" #: src/Module/Admin/Blocklist/Contact.php:94 #: src/Module/Admin/Blocklist/Server/Add.php:121 #: src/Module/Admin/Blocklist/Server/Import.php:117 -#: src/Module/Admin/Blocklist/Server/Index.php:93 +#: src/Module/Admin/Blocklist/Server/Index.php:91 #: src/Module/Admin/Federation.php:202 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:429 #: src/Module/Admin/Storage.php:138 src/Module/Admin/Summary.php:234 #: 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 -#: src/Module/Admin/Users/Blocked.php:138 src/Module/Admin/Users/Create.php:61 -#: src/Module/Admin/Users/Deleted.php:85 src/Module/Admin/Users/Index.php:150 +#: src/Module/Admin/Users/Blocked.php:137 src/Module/Admin/Users/Create.php:61 +#: src/Module/Admin/Users/Deleted.php:85 src/Module/Admin/Users/Index.php:149 #: src/Module/Admin/Users/Pending.php:101 msgid "Administration" msgstr "" @@ -4449,8 +4449,8 @@ msgid "Block Remote Contact" msgstr "" #: src/Module/Admin/Blocklist/Contact.php:98 -#: src/Module/Admin/Users/Active.php:138 src/Module/Admin/Users/Blocked.php:140 -#: src/Module/Admin/Users/Index.php:152 src/Module/Admin/Users/Pending.php:103 +#: src/Module/Admin/Users/Active.php:138 src/Module/Admin/Users/Blocked.php:139 +#: src/Module/Admin/Users/Index.php:151 src/Module/Admin/Users/Pending.php:103 msgid "select all" msgstr "" @@ -4459,9 +4459,9 @@ msgid "select none" msgstr "" #: src/Module/Admin/Blocklist/Contact.php:101 -#: src/Module/Admin/Users/Blocked.php:143 src/Module/Admin/Users/Index.php:157 -#: src/Module/Contact.php:401 src/Module/Contact/Profile.php:350 -#: src/Module/Contact/Profile.php:451 +#: src/Module/Admin/Users/Blocked.php:142 src/Module/Admin/Users/Index.php:156 +#: src/Module/Contact.php:401 src/Module/Contact/Profile.php:349 +#: src/Module/Contact/Profile.php:450 msgid "Unblock" msgstr "" @@ -4532,7 +4532,7 @@ msgid "Block A New Server Domain Pattern" msgstr "" #: src/Module/Admin/Blocklist/Server/Add.php:123 -#: src/Module/Admin/Blocklist/Server/Index.php:97 +#: src/Module/Admin/Blocklist/Server/Index.php:95 msgid "" "

The server domain pattern syntax is case-insensitive shell wildcard, " "comprising the following special characters:

\n" @@ -4543,7 +4543,7 @@ msgid "" msgstr "" #: src/Module/Admin/Blocklist/Server/Add.php:128 -#: src/Module/Admin/Blocklist/Server/Index.php:105 +#: src/Module/Admin/Blocklist/Server/Index.php:103 msgid "Check pattern" msgstr "" @@ -4575,12 +4575,12 @@ msgid "Add pattern to the blocklist" msgstr "" #: src/Module/Admin/Blocklist/Server/Add.php:136 -#: src/Module/Admin/Blocklist/Server/Index.php:114 +#: src/Module/Admin/Blocklist/Server/Index.php:112 msgid "Server Domain Pattern" msgstr "" #: src/Module/Admin/Blocklist/Server/Add.php:136 -#: src/Module/Admin/Blocklist/Server/Index.php:114 +#: src/Module/Admin/Blocklist/Server/Index.php:112 msgid "" "The domain pattern of the new server to add to the blocklist. Do not include " "the protocol." @@ -4643,7 +4643,7 @@ msgid "" msgstr "" #: src/Module/Admin/Blocklist/Server/Import.php:120 -#: src/Module/Admin/Blocklist/Server/Index.php:104 +#: src/Module/Admin/Blocklist/Server/Index.php:102 msgid "Upload file" msgstr "" @@ -4671,7 +4671,7 @@ msgstr[0] "" msgstr[1] "" #: src/Module/Admin/Blocklist/Server/Import.php:128 -#: src/Module/Admin/Blocklist/Server/Index.php:113 +#: src/Module/Admin/Blocklist/Server/Index.php:111 msgid "Server domain pattern blocklist CSV file" msgstr "" @@ -4693,63 +4693,63 @@ msgstr "" msgid "Replaces the current blocklist by the imported patterns." msgstr "" -#: src/Module/Admin/Blocklist/Server/Index.php:84 -#: src/Module/Admin/Blocklist/Server/Index.php:108 +#: src/Module/Admin/Blocklist/Server/Index.php:82 +#: src/Module/Admin/Blocklist/Server/Index.php:106 msgid "Blocked server domain pattern" msgstr "" -#: src/Module/Admin/Blocklist/Server/Index.php:85 -#: src/Module/Admin/Blocklist/Server/Index.php:109 src/Module/Friendica.php:83 +#: src/Module/Admin/Blocklist/Server/Index.php:83 +#: src/Module/Admin/Blocklist/Server/Index.php:107 src/Module/Friendica.php:83 msgid "Reason for the block" msgstr "" -#: src/Module/Admin/Blocklist/Server/Index.php:86 +#: src/Module/Admin/Blocklist/Server/Index.php:84 msgid "Delete server domain pattern" msgstr "" -#: src/Module/Admin/Blocklist/Server/Index.php:86 +#: src/Module/Admin/Blocklist/Server/Index.php:84 msgid "Check to delete this entry from the blocklist" msgstr "" -#: src/Module/Admin/Blocklist/Server/Index.php:94 +#: src/Module/Admin/Blocklist/Server/Index.php:92 msgid "Server Domain Pattern Blocklist" msgstr "" -#: src/Module/Admin/Blocklist/Server/Index.php:95 +#: src/Module/Admin/Blocklist/Server/Index.php:93 msgid "" "This page can be used to define a blocklist of server domain patterns from " "the federated network that are not allowed to interact with your node. For " "each domain pattern you should also provide the reason why you block it." msgstr "" -#: src/Module/Admin/Blocklist/Server/Index.php:96 +#: src/Module/Admin/Blocklist/Server/Index.php:94 msgid "" "The list of blocked server domain patterns will be made publically available " "on the /friendica page so that your users and " "people investigating communication problems can find the reason easily." msgstr "" -#: src/Module/Admin/Blocklist/Server/Index.php:102 +#: src/Module/Admin/Blocklist/Server/Index.php:100 msgid "Import server domain pattern blocklist" msgstr "" -#: src/Module/Admin/Blocklist/Server/Index.php:103 +#: src/Module/Admin/Blocklist/Server/Index.php:101 msgid "Add new entry to the blocklist" msgstr "" -#: src/Module/Admin/Blocklist/Server/Index.php:106 +#: src/Module/Admin/Blocklist/Server/Index.php:104 msgid "Save changes to the blocklist" msgstr "" -#: src/Module/Admin/Blocklist/Server/Index.php:107 +#: src/Module/Admin/Blocklist/Server/Index.php:105 msgid "Current Entries in the Blocklist" msgstr "" -#: src/Module/Admin/Blocklist/Server/Index.php:110 +#: src/Module/Admin/Blocklist/Server/Index.php:108 msgid "Delete entry from the blocklist" msgstr "" -#: src/Module/Admin/Blocklist/Server/Index.php:111 +#: src/Module/Admin/Blocklist/Server/Index.php:109 msgid "Delete entry from the blocklist?" msgstr "" @@ -4960,7 +4960,7 @@ msgid "Tag" msgstr "" #: src/Module/Admin/Item/Source.php:63 src/Module/Admin/Users/Active.php:129 -#: src/Module/Admin/Users/Blocked.php:131 src/Module/Admin/Users/Index.php:143 +#: src/Module/Admin/Users/Blocked.php:130 src/Module/Admin/Users/Index.php:142 msgid "Type" msgstr "" @@ -5056,7 +5056,7 @@ msgid "Search in logs" msgstr "" #: src/Module/Admin/Logs/View.php:89 -#: src/Module/Notifications/Notifications.php:139 +#: src/Module/Notifications/Notifications.php:140 msgid "Show all" msgstr "" @@ -6032,7 +6032,7 @@ msgid "" "received." msgstr "" -#: src/Module/Admin/Site.php:541 src/Module/Contact/Profile.php:275 +#: src/Module/Admin/Site.php:541 src/Module/Contact/Profile.php:274 #: src/Module/Settings/TwoFactor/Index.php:125 msgid "Disabled" msgstr "" @@ -6378,7 +6378,7 @@ msgid "" "of sections should be [h2] and below." msgstr "" -#: src/Module/Admin/Users/Active.php:45 src/Module/Admin/Users/Index.php:46 +#: src/Module/Admin/Users/Active.php:45 src/Module/Admin/Users/Index.php:45 #, php-format msgid "%s user blocked" msgid_plural "%s users blocked" @@ -6386,45 +6386,45 @@ msgstr[0] "" msgstr[1] "" #: src/Module/Admin/Users/Active.php:53 src/Module/Admin/Users/Active.php:88 -#: src/Module/Admin/Users/Blocked.php:55 src/Module/Admin/Users/Blocked.php:90 -#: src/Module/Admin/Users/Index.php:61 src/Module/Admin/Users/Index.php:96 +#: src/Module/Admin/Users/Blocked.php:54 src/Module/Admin/Users/Blocked.php:89 +#: src/Module/Admin/Users/Index.php:60 src/Module/Admin/Users/Index.php:95 msgid "You can't remove yourself" msgstr "" -#: src/Module/Admin/Users/Active.php:57 src/Module/Admin/Users/Blocked.php:59 -#: src/Module/Admin/Users/Index.php:65 +#: src/Module/Admin/Users/Active.php:57 src/Module/Admin/Users/Blocked.php:58 +#: src/Module/Admin/Users/Index.php:64 #, php-format msgid "%s user deleted" msgid_plural "%s users deleted" msgstr[0] "" msgstr[1] "" -#: src/Module/Admin/Users/Active.php:86 src/Module/Admin/Users/Blocked.php:88 -#: src/Module/Admin/Users/Index.php:94 +#: src/Module/Admin/Users/Active.php:86 src/Module/Admin/Users/Blocked.php:87 +#: src/Module/Admin/Users/Index.php:93 #, php-format msgid "User \"%s\" deleted" msgstr "" -#: src/Module/Admin/Users/Active.php:96 src/Module/Admin/Users/Index.php:104 +#: src/Module/Admin/Users/Active.php:96 src/Module/Admin/Users/Index.php:103 #, php-format msgid "User \"%s\" blocked" msgstr "" -#: src/Module/Admin/Users/Active.php:129 src/Module/Admin/Users/Blocked.php:131 -#: src/Module/Admin/Users/Deleted.php:88 src/Module/Admin/Users/Index.php:143 -#: src/Module/Admin/Users/Index.php:163 +#: src/Module/Admin/Users/Active.php:129 src/Module/Admin/Users/Blocked.php:130 +#: src/Module/Admin/Users/Deleted.php:88 src/Module/Admin/Users/Index.php:142 +#: src/Module/Admin/Users/Index.php:162 msgid "Register date" msgstr "" -#: src/Module/Admin/Users/Active.php:129 src/Module/Admin/Users/Blocked.php:131 -#: src/Module/Admin/Users/Deleted.php:88 src/Module/Admin/Users/Index.php:143 -#: src/Module/Admin/Users/Index.php:163 +#: src/Module/Admin/Users/Active.php:129 src/Module/Admin/Users/Blocked.php:130 +#: src/Module/Admin/Users/Deleted.php:88 src/Module/Admin/Users/Index.php:142 +#: src/Module/Admin/Users/Index.php:162 msgid "Last login" msgstr "" -#: src/Module/Admin/Users/Active.php:129 src/Module/Admin/Users/Blocked.php:131 -#: src/Module/Admin/Users/Deleted.php:88 src/Module/Admin/Users/Index.php:143 -#: src/Module/Admin/Users/Index.php:163 +#: src/Module/Admin/Users/Active.php:129 src/Module/Admin/Users/Blocked.php:130 +#: src/Module/Admin/Users/Deleted.php:88 src/Module/Admin/Users/Index.php:142 +#: src/Module/Admin/Users/Index.php:162 msgid "Last public item" msgstr "" @@ -6432,52 +6432,52 @@ msgstr "" msgid "Active Accounts" msgstr "" -#: src/Module/Admin/Users/Active.php:141 src/Module/Admin/Users/Blocked.php:142 -#: src/Module/Admin/Users/Index.php:156 +#: src/Module/Admin/Users/Active.php:141 src/Module/Admin/Users/Blocked.php:141 +#: src/Module/Admin/Users/Index.php:155 msgid "User blocked" msgstr "" -#: src/Module/Admin/Users/Active.php:142 src/Module/Admin/Users/Blocked.php:144 -#: src/Module/Admin/Users/Index.php:158 +#: src/Module/Admin/Users/Active.php:142 src/Module/Admin/Users/Blocked.php:143 +#: src/Module/Admin/Users/Index.php:157 msgid "Site admin" msgstr "" -#: src/Module/Admin/Users/Active.php:143 src/Module/Admin/Users/Blocked.php:145 -#: src/Module/Admin/Users/Index.php:159 +#: src/Module/Admin/Users/Active.php:143 src/Module/Admin/Users/Blocked.php:144 +#: src/Module/Admin/Users/Index.php:158 msgid "Account expired" msgstr "" -#: src/Module/Admin/Users/Active.php:144 src/Module/Admin/Users/Index.php:162 +#: src/Module/Admin/Users/Active.php:144 src/Module/Admin/Users/Index.php:161 msgid "Create a new user" msgstr "" -#: src/Module/Admin/Users/Active.php:150 src/Module/Admin/Users/Blocked.php:151 -#: src/Module/Admin/Users/Index.php:168 +#: src/Module/Admin/Users/Active.php:150 src/Module/Admin/Users/Blocked.php:150 +#: src/Module/Admin/Users/Index.php:167 msgid "" "Selected users will be deleted!\\n\\nEverything these users had posted on " "this site will be permanently deleted!\\n\\nAre you sure?" msgstr "" -#: src/Module/Admin/Users/Active.php:151 src/Module/Admin/Users/Blocked.php:152 -#: src/Module/Admin/Users/Index.php:169 +#: src/Module/Admin/Users/Active.php:151 src/Module/Admin/Users/Blocked.php:151 +#: src/Module/Admin/Users/Index.php:168 msgid "" "The user {0} will be deleted!\\n\\nEverything this user has posted on this " "site will be permanently deleted!\\n\\nAre you sure?" msgstr "" -#: src/Module/Admin/Users/Blocked.php:47 src/Module/Admin/Users/Index.php:53 +#: src/Module/Admin/Users/Blocked.php:46 src/Module/Admin/Users/Index.php:52 #, php-format msgid "%s user unblocked" msgid_plural "%s users unblocked" msgstr[0] "" msgstr[1] "" -#: src/Module/Admin/Users/Blocked.php:97 src/Module/Admin/Users/Index.php:110 +#: src/Module/Admin/Users/Blocked.php:96 src/Module/Admin/Users/Index.php:109 #, php-format msgid "User \"%s\" unblocked" msgstr "" -#: src/Module/Admin/Users/Blocked.php:139 +#: src/Module/Admin/Users/Blocked.php:138 msgid "Blocked Users" msgstr "" @@ -6509,16 +6509,16 @@ msgstr "" msgid "Users awaiting permanent deletion" msgstr "" -#: src/Module/Admin/Users/Deleted.php:88 src/Module/Admin/Users/Index.php:163 +#: src/Module/Admin/Users/Deleted.php:88 src/Module/Admin/Users/Index.php:162 msgid "Permanent deletion" msgstr "" -#: src/Module/Admin/Users/Index.php:151 src/Module/Admin/Users/Index.php:161 +#: src/Module/Admin/Users/Index.php:150 src/Module/Admin/Users/Index.php:160 #: src/Module/BaseAdmin.php:92 msgid "Users" msgstr "" -#: src/Module/Admin/Users/Index.php:153 +#: src/Module/Admin/Users/Index.php:152 msgid "User waiting for permanent deletion" msgstr "" @@ -6767,7 +6767,7 @@ msgstr "" msgid "Account" msgstr "" -#: src/Module/BaseSettings.php:48 src/Module/Security/TwoFactor/Verify.php:97 +#: src/Module/BaseSettings.php:48 src/Module/Security/TwoFactor/Verify.php:100 #: src/Module/Settings/TwoFactor/Index.php:117 msgid "Two-factor authentication" msgstr "" @@ -6784,7 +6784,7 @@ msgstr "" msgid "Connected apps" msgstr "" -#: src/Module/BaseSettings.php:106 src/Module/Settings/UserExport.php:76 +#: src/Module/BaseSettings.php:106 src/Module/Settings/UserExport.php:102 msgid "Export personal data" msgstr "" @@ -6820,7 +6820,7 @@ msgid "Only show blocked contacts" msgstr "" #: src/Module/Contact.php:333 src/Module/Contact.php:380 -#: src/Object/Post.php:339 +#: src/Object/Post.php:338 msgid "Ignored" msgstr "" @@ -6861,8 +6861,8 @@ msgstr "" msgid "Update" msgstr "" -#: src/Module/Contact.php:402 src/Module/Contact/Profile.php:351 -#: src/Module/Contact/Profile.php:459 +#: src/Module/Contact.php:402 src/Module/Contact/Profile.php:350 +#: src/Module/Contact/Profile.php:458 msgid "Unignore" msgstr "" @@ -6910,7 +6910,7 @@ msgstr "" msgid "Pending incoming contact request" msgstr "" -#: src/Module/Contact.php:555 src/Module/Contact/Profile.php:336 +#: src/Module/Contact.php:555 src/Module/Contact/Profile.php:335 #, php-format msgid "Visit %s's profile [%s]" msgstr "" @@ -6999,231 +6999,231 @@ msgid_plural "Contacts (%s)" msgstr[0] "" msgstr[1] "" -#: src/Module/Contact/Profile.php:129 +#: src/Module/Contact/Profile.php:128 msgid "Failed to update contact record." msgstr "" -#: src/Module/Contact/Profile.php:179 +#: src/Module/Contact/Profile.php:178 msgid "Contact has been unblocked" msgstr "" -#: src/Module/Contact/Profile.php:183 +#: src/Module/Contact/Profile.php:182 msgid "Contact has been blocked" msgstr "" -#: src/Module/Contact/Profile.php:195 +#: src/Module/Contact/Profile.php:194 msgid "Contact has been unignored" msgstr "" -#: src/Module/Contact/Profile.php:199 +#: src/Module/Contact/Profile.php:198 msgid "Contact has been ignored" msgstr "" -#: src/Module/Contact/Profile.php:231 +#: src/Module/Contact/Profile.php:230 #, php-format msgid "You are mutual friends with %s" msgstr "" -#: src/Module/Contact/Profile.php:232 +#: src/Module/Contact/Profile.php:231 #, php-format msgid "You are sharing with %s" msgstr "" -#: src/Module/Contact/Profile.php:233 +#: src/Module/Contact/Profile.php:232 #, php-format msgid "%s is sharing with you" msgstr "" -#: src/Module/Contact/Profile.php:249 +#: src/Module/Contact/Profile.php:248 msgid "Private communications are not available for this contact." msgstr "" -#: src/Module/Contact/Profile.php:251 +#: src/Module/Contact/Profile.php:250 msgid "Never" msgstr "" -#: src/Module/Contact/Profile.php:254 +#: src/Module/Contact/Profile.php:253 msgid "(Update was not successful)" msgstr "" -#: src/Module/Contact/Profile.php:254 +#: src/Module/Contact/Profile.php:253 msgid "(Update was successful)" msgstr "" -#: src/Module/Contact/Profile.php:256 src/Module/Contact/Profile.php:422 +#: src/Module/Contact/Profile.php:255 src/Module/Contact/Profile.php:421 msgid "Suggest friends" msgstr "" -#: src/Module/Contact/Profile.php:260 +#: src/Module/Contact/Profile.php:259 #, php-format msgid "Network type: %s" msgstr "" -#: src/Module/Contact/Profile.php:265 +#: src/Module/Contact/Profile.php:264 msgid "Communications lost with this contact!" msgstr "" -#: src/Module/Contact/Profile.php:271 +#: src/Module/Contact/Profile.php:270 msgid "Fetch further information for feeds" msgstr "" -#: src/Module/Contact/Profile.php:273 +#: src/Module/Contact/Profile.php:272 msgid "" "Fetch information like preview pictures, title and teaser from the feed " "item. You can activate this if the feed doesn't contain much text. Keywords " "are taken from the meta header in the feed item and are posted as hash tags." msgstr "" -#: src/Module/Contact/Profile.php:276 +#: src/Module/Contact/Profile.php:275 msgid "Fetch information" msgstr "" -#: src/Module/Contact/Profile.php:277 +#: src/Module/Contact/Profile.php:276 msgid "Fetch keywords" msgstr "" -#: src/Module/Contact/Profile.php:278 +#: src/Module/Contact/Profile.php:277 msgid "Fetch information and keywords" msgstr "" -#: src/Module/Contact/Profile.php:288 src/Module/Contact/Profile.php:294 -#: src/Module/Contact/Profile.php:299 src/Module/Contact/Profile.php:305 +#: src/Module/Contact/Profile.php:287 src/Module/Contact/Profile.php:293 +#: src/Module/Contact/Profile.php:298 src/Module/Contact/Profile.php:304 msgid "No mirroring" msgstr "" -#: src/Module/Contact/Profile.php:289 +#: src/Module/Contact/Profile.php:288 msgid "Mirror as forwarded posting" msgstr "" -#: src/Module/Contact/Profile.php:290 src/Module/Contact/Profile.php:300 -#: src/Module/Contact/Profile.php:306 +#: src/Module/Contact/Profile.php:289 src/Module/Contact/Profile.php:299 +#: src/Module/Contact/Profile.php:305 msgid "Mirror as my own posting" msgstr "" -#: src/Module/Contact/Profile.php:295 src/Module/Contact/Profile.php:301 +#: src/Module/Contact/Profile.php:294 src/Module/Contact/Profile.php:300 msgid "Native reshare" msgstr "" -#: src/Module/Contact/Profile.php:318 +#: src/Module/Contact/Profile.php:317 msgid "Contact Information / Notes" msgstr "" -#: src/Module/Contact/Profile.php:319 +#: src/Module/Contact/Profile.php:318 msgid "Contact Settings" msgstr "" -#: src/Module/Contact/Profile.php:327 +#: src/Module/Contact/Profile.php:326 msgid "Contact" msgstr "" -#: src/Module/Contact/Profile.php:331 +#: src/Module/Contact/Profile.php:330 msgid "Their personal note" msgstr "" -#: src/Module/Contact/Profile.php:333 +#: src/Module/Contact/Profile.php:332 msgid "Edit contact notes" msgstr "" -#: src/Module/Contact/Profile.php:337 +#: src/Module/Contact/Profile.php:336 msgid "Block/Unblock contact" msgstr "" -#: src/Module/Contact/Profile.php:338 +#: src/Module/Contact/Profile.php:337 msgid "Ignore contact" msgstr "" -#: src/Module/Contact/Profile.php:339 +#: src/Module/Contact/Profile.php:338 msgid "View conversations" msgstr "" -#: src/Module/Contact/Profile.php:344 +#: src/Module/Contact/Profile.php:343 msgid "Last update:" msgstr "" -#: src/Module/Contact/Profile.php:346 +#: src/Module/Contact/Profile.php:345 msgid "Update public posts" msgstr "" -#: src/Module/Contact/Profile.php:348 src/Module/Contact/Profile.php:432 +#: src/Module/Contact/Profile.php:347 src/Module/Contact/Profile.php:431 msgid "Update now" msgstr "" -#: src/Module/Contact/Profile.php:355 +#: src/Module/Contact/Profile.php:354 msgid "Currently blocked" msgstr "" -#: src/Module/Contact/Profile.php:356 +#: src/Module/Contact/Profile.php:355 msgid "Currently ignored" msgstr "" -#: src/Module/Contact/Profile.php:357 +#: src/Module/Contact/Profile.php:356 msgid "Currently archived" msgstr "" -#: src/Module/Contact/Profile.php:358 +#: src/Module/Contact/Profile.php:357 msgid "Awaiting connection acknowledge" msgstr "" -#: src/Module/Contact/Profile.php:359 -#: src/Module/Notifications/Introductions.php:191 +#: src/Module/Contact/Profile.php:358 +#: src/Module/Notifications/Introductions.php:192 msgid "Hide this contact from others" msgstr "" -#: src/Module/Contact/Profile.php:359 +#: src/Module/Contact/Profile.php:358 msgid "" "Replies/likes to your public posts may still be visible" msgstr "" -#: src/Module/Contact/Profile.php:360 +#: src/Module/Contact/Profile.php:359 msgid "Notification for new posts" msgstr "" -#: src/Module/Contact/Profile.php:360 +#: src/Module/Contact/Profile.php:359 msgid "Send a notification of every new post of this contact" msgstr "" -#: src/Module/Contact/Profile.php:362 +#: src/Module/Contact/Profile.php:361 msgid "Keyword Deny List" msgstr "" -#: src/Module/Contact/Profile.php:362 +#: src/Module/Contact/Profile.php:361 msgid "" "Comma separated list of keywords that should not be converted to hashtags, " "when \"Fetch information and keywords\" is selected" msgstr "" -#: src/Module/Contact/Profile.php:380 +#: src/Module/Contact/Profile.php:379 #: src/Module/Settings/TwoFactor/Index.php:139 msgid "Actions" msgstr "" -#: src/Module/Contact/Profile.php:388 +#: src/Module/Contact/Profile.php:387 msgid "Mirror postings from this contact" msgstr "" -#: src/Module/Contact/Profile.php:390 +#: src/Module/Contact/Profile.php:389 msgid "" "Mark this contact as remote_self, this will cause friendica to repost new " "entries from this contact." msgstr "" -#: src/Module/Contact/Profile.php:442 +#: src/Module/Contact/Profile.php:441 msgid "Refetch contact data" msgstr "" -#: src/Module/Contact/Profile.php:453 +#: src/Module/Contact/Profile.php:452 msgid "Toggle Blocked status" msgstr "" -#: src/Module/Contact/Profile.php:461 +#: src/Module/Contact/Profile.php:460 msgid "Toggle Ignored status" msgstr "" -#: src/Module/Contact/Profile.php:468 src/Module/Contact/Revoke.php:106 +#: src/Module/Contact/Profile.php:467 src/Module/Contact/Revoke.php:106 msgid "Revoke Follow" msgstr "" -#: src/Module/Contact/Profile.php:470 +#: src/Module/Contact/Profile.php:469 msgid "Revoke the follow from this contact" msgstr "" @@ -7250,7 +7250,7 @@ msgid "" msgstr "" #: src/Module/Contact/Revoke.php:108 -#: src/Module/Notifications/Introductions.php:143 +#: src/Module/Notifications/Introductions.php:144 #: src/Module/OAuth/Acknowledge.php:53 src/Module/Register.php:130 #: src/Module/Settings/TwoFactor/Trusted.php:125 msgid "Yes" @@ -7345,7 +7345,7 @@ msgstr "" msgid "Posts that mention or involve you" msgstr "" -#: src/Module/Conversation/Network.php:286 src/Object/Post.php:351 +#: src/Module/Conversation/Network.php:286 src/Object/Post.php:350 msgid "Starred" msgstr "" @@ -7661,11 +7661,11 @@ msgstr "" msgid "Site Directory" msgstr "" -#: src/Module/Filer/RemoveTag.php:102 +#: src/Module/Filer/RemoveTag.php:105 msgid "Item was not deleted" msgstr "" -#: src/Module/Filer/RemoveTag.php:112 +#: src/Module/Filer/RemoveTag.php:115 msgid "Item was not removed" msgstr "" @@ -8153,65 +8153,65 @@ msgstr "" msgid "A Decentralized Social Network" msgstr "" -#: src/Module/Notifications/Introductions.php:98 +#: src/Module/Notifications/Introductions.php:99 msgid "Show Ignored Requests" msgstr "" -#: src/Module/Notifications/Introductions.php:98 +#: src/Module/Notifications/Introductions.php:99 msgid "Hide Ignored Requests" msgstr "" -#: src/Module/Notifications/Introductions.php:114 -#: src/Module/Notifications/Introductions.php:177 +#: src/Module/Notifications/Introductions.php:115 +#: src/Module/Notifications/Introductions.php:178 msgid "Notification type:" msgstr "" -#: src/Module/Notifications/Introductions.php:117 +#: src/Module/Notifications/Introductions.php:118 msgid "Suggested by:" msgstr "" -#: src/Module/Notifications/Introductions.php:142 +#: src/Module/Notifications/Introductions.php:143 msgid "Claims to be known to you: " msgstr "" -#: src/Module/Notifications/Introductions.php:143 +#: src/Module/Notifications/Introductions.php:144 #: src/Module/OAuth/Acknowledge.php:54 src/Module/Register.php:131 #: src/Module/Settings/TwoFactor/Trusted.php:125 msgid "No" msgstr "" -#: src/Module/Notifications/Introductions.php:151 +#: src/Module/Notifications/Introductions.php:152 msgid "Shall your connection be bidirectional or not?" msgstr "" -#: src/Module/Notifications/Introductions.php:152 +#: src/Module/Notifications/Introductions.php:153 #, php-format msgid "" "Accepting %s as a friend allows %s to subscribe to your posts, and you will " "also receive updates from them in your news feed." msgstr "" -#: src/Module/Notifications/Introductions.php:153 +#: src/Module/Notifications/Introductions.php:154 #, php-format msgid "" "Accepting %s as a subscriber allows them to subscribe to your posts, but you " "will not receive updates from them in your news feed." msgstr "" -#: src/Module/Notifications/Introductions.php:155 +#: src/Module/Notifications/Introductions.php:156 msgid "Friend" msgstr "" -#: src/Module/Notifications/Introductions.php:156 +#: src/Module/Notifications/Introductions.php:157 msgid "Subscriber" msgstr "" -#: src/Module/Notifications/Introductions.php:215 +#: src/Module/Notifications/Introductions.php:216 msgid "No introductions." msgstr "" -#: src/Module/Notifications/Introductions.php:216 -#: src/Module/Notifications/Notifications.php:134 +#: src/Module/Notifications/Introductions.php:217 +#: src/Module/Notifications/Notifications.php:135 #, php-format msgid "No more %s notifications." msgstr "" @@ -8220,23 +8220,23 @@ msgstr "" msgid "You must be logged in to show this page." msgstr "" -#: src/Module/Notifications/Notifications.php:65 +#: src/Module/Notifications/Notifications.php:66 msgid "Network Notifications" msgstr "" -#: src/Module/Notifications/Notifications.php:71 +#: src/Module/Notifications/Notifications.php:72 msgid "System Notifications" msgstr "" -#: src/Module/Notifications/Notifications.php:77 +#: src/Module/Notifications/Notifications.php:78 msgid "Personal Notifications" msgstr "" -#: src/Module/Notifications/Notifications.php:83 +#: src/Module/Notifications/Notifications.php:84 msgid "Home Notifications" msgstr "" -#: src/Module/Notifications/Notifications.php:139 +#: src/Module/Notifications/Notifications.php:140 msgid "Show unread" msgstr "" @@ -8379,17 +8379,17 @@ msgstr "" msgid "j F" msgstr "" -#: src/Module/Profile/Profile.php:163 src/Util/Temporal.php:167 +#: src/Module/Profile/Profile.php:163 src/Util/Temporal.php:166 msgid "Birthday:" msgstr "" #: src/Module/Profile/Profile.php:166 src/Module/Settings/Profile/Index.php:245 -#: src/Util/Temporal.php:169 +#: src/Util/Temporal.php:168 msgid "Age: " msgstr "" #: src/Module/Profile/Profile.php:166 src/Module/Settings/Profile/Index.php:245 -#: src/Util/Temporal.php:169 +#: src/Util/Temporal.php:168 #, php-format msgid "%d year old" msgid_plural "%d years old" @@ -8493,7 +8493,7 @@ msgstr "" msgid "Please repeat your e-mail address:" msgstr "" -#: src/Module/Register.php:162 src/Module/Security/PasswordTooLong.php:98 +#: src/Module/Register.php:162 src/Module/Security/PasswordTooLong.php:101 #: src/Module/Settings/Account.php:570 msgid "New Password:" msgstr "" @@ -8502,7 +8502,7 @@ msgstr "" msgid "Leave empty for an auto generated password." msgstr "" -#: src/Module/Register.php:163 src/Module/Security/PasswordTooLong.php:99 +#: src/Module/Register.php:163 src/Module/Security/PasswordTooLong.php:102 #: src/Module/Settings/Account.php:571 msgid "Confirm:" msgstr "" @@ -8723,53 +8723,53 @@ msgid "" "account to add the OpenID to it." msgstr "" -#: src/Module/Security/PasswordTooLong.php:54 +#: src/Module/Security/PasswordTooLong.php:57 #: src/Module/Settings/Account.php:67 msgid "Passwords do not match." msgstr "" -#: src/Module/Security/PasswordTooLong.php:61 +#: src/Module/Security/PasswordTooLong.php:64 msgid "Password does not need changing." msgstr "" -#: src/Module/Security/PasswordTooLong.php:74 +#: src/Module/Security/PasswordTooLong.php:77 #: src/Module/Settings/Account.php:81 msgid "Password unchanged." msgstr "" -#: src/Module/Security/PasswordTooLong.php:88 +#: src/Module/Security/PasswordTooLong.php:91 msgid "Password Too Long" msgstr "" -#: src/Module/Security/PasswordTooLong.php:89 +#: src/Module/Security/PasswordTooLong.php:92 msgid "" "Since version 2022.09, we've realized that any password longer than 72 " "characters is truncated during hashing. To prevent any confusion about this " "behavior, please update your password to be fewer or equal to 72 characters." msgstr "" -#: src/Module/Security/PasswordTooLong.php:90 +#: src/Module/Security/PasswordTooLong.php:93 msgid "Update Password" msgstr "" -#: src/Module/Security/PasswordTooLong.php:97 +#: src/Module/Security/PasswordTooLong.php:100 #: src/Module/Settings/Account.php:572 msgid "Current Password:" msgstr "" -#: src/Module/Security/PasswordTooLong.php:97 +#: src/Module/Security/PasswordTooLong.php:100 #: src/Module/Settings/Account.php:572 msgid "Your current password to confirm the changes" msgstr "" -#: src/Module/Security/PasswordTooLong.php:98 +#: src/Module/Security/PasswordTooLong.php:101 #: src/Module/Settings/Account.php:555 msgid "" "Allowed characters are a-z, A-Z, 0-9 and special characters except white " "spaces, accentuated letters and colon (:)." msgstr "" -#: src/Module/Security/PasswordTooLong.php:98 +#: src/Module/Security/PasswordTooLong.php:101 #: src/Module/Settings/Account.php:556 msgid "Password length is limited to 72 characters." msgstr "" @@ -8780,7 +8780,7 @@ msgid "Remaining recovery codes: %d" msgstr "" #: src/Module/Security/TwoFactor/Recovery.php:80 -#: src/Module/Security/TwoFactor/Verify.php:78 +#: src/Module/Security/TwoFactor/Verify.php:81 #: src/Module/Settings/TwoFactor/Verify.php:94 msgid "Invalid code, please retry." msgstr "" @@ -8853,25 +8853,25 @@ msgstr "" msgid "Trust" msgstr "" -#: src/Module/Security/TwoFactor/Verify.php:98 +#: src/Module/Security/TwoFactor/Verify.php:101 msgid "" "

Open the two-factor authentication app on your device to get an " "authentication code and verify your identity.

" msgstr "" -#: src/Module/Security/TwoFactor/Verify.php:101 +#: src/Module/Security/TwoFactor/Verify.php:104 #, php-format msgid "" "If you do not have access to your authentication code you can use a two-factor recovery code." msgstr "" -#: src/Module/Security/TwoFactor/Verify.php:102 +#: src/Module/Security/TwoFactor/Verify.php:105 #: src/Module/Settings/TwoFactor/Verify.php:154 msgid "Please enter a code from your authentication app" msgstr "" -#: src/Module/Security/TwoFactor/Verify.php:103 +#: src/Module/Security/TwoFactor/Verify.php:106 msgid "Verify code and complete login" msgstr "" @@ -9461,9 +9461,9 @@ msgstr "" msgid "Content Settings" msgstr "" -#: src/Module/Settings/Display.php:204 view/theme/duepuntozero/config.php:87 -#: view/theme/frio/config.php:173 view/theme/quattro/config.php:89 -#: view/theme/vier/config.php:137 +#: src/Module/Settings/Display.php:204 view/theme/duepuntozero/config.php:86 +#: view/theme/frio/config.php:172 view/theme/quattro/config.php:88 +#: view/theme/vier/config.php:136 msgid "Theme settings" msgstr "" @@ -9614,8 +9614,8 @@ msgstr "" msgid "Location" msgstr "" -#: src/Module/Settings/Profile/Index.php:230 src/Util/Temporal.php:96 -#: src/Util/Temporal.php:98 +#: src/Module/Settings/Profile/Index.php:230 src/Util/Temporal.php:95 +#: src/Util/Temporal.php:97 msgid "Miscellaneous" msgstr "" @@ -10059,32 +10059,32 @@ msgstr "" msgid "Verify code and enable two-factor authentication" msgstr "" -#: src/Module/Settings/UserExport.php:68 +#: src/Module/Settings/UserExport.php:94 msgid "Export account" msgstr "" -#: src/Module/Settings/UserExport.php:68 +#: src/Module/Settings/UserExport.php:94 msgid "" "Export your account info and contacts. Use this to make a backup of your " "account and/or to move it to another server." msgstr "" -#: src/Module/Settings/UserExport.php:69 +#: src/Module/Settings/UserExport.php:95 msgid "Export all" msgstr "" -#: src/Module/Settings/UserExport.php:69 +#: src/Module/Settings/UserExport.php:95 msgid "" "Export your account info, contacts and all your items as json. Could be a " "very big file, and could take a lot of time. Use this to make a full backup " "of your account (photos are not exported)" msgstr "" -#: src/Module/Settings/UserExport.php:70 +#: src/Module/Settings/UserExport.php:96 msgid "Export Contacts to CSV" msgstr "" -#: src/Module/Settings/UserExport.php:70 +#: src/Module/Settings/UserExport.php:96 msgid "" "Export the list of the accounts you are following as CSV file. Compatible to " "e.g. Mastodon." @@ -10298,64 +10298,64 @@ msgid "" "features and resources." msgstr "" -#: src/Navigation/Notifications/Factory/FormattedNavNotification.php:135 +#: src/Navigation/Notifications/Factory/FormattedNavNotification.php:138 msgid "{0} wants to follow you" msgstr "" -#: src/Navigation/Notifications/Factory/FormattedNavNotification.php:137 +#: src/Navigation/Notifications/Factory/FormattedNavNotification.php:140 msgid "{0} has started following you" msgstr "" -#: src/Navigation/Notifications/Factory/FormattedNotify.php:93 +#: src/Navigation/Notifications/Factory/FormattedNotify.php:96 #, php-format msgid "%s liked %s's post" msgstr "" -#: src/Navigation/Notifications/Factory/FormattedNotify.php:105 +#: src/Navigation/Notifications/Factory/FormattedNotify.php:108 #, php-format msgid "%s disliked %s's post" msgstr "" -#: src/Navigation/Notifications/Factory/FormattedNotify.php:117 +#: src/Navigation/Notifications/Factory/FormattedNotify.php:120 #, php-format msgid "%s is attending %s's event" msgstr "" -#: src/Navigation/Notifications/Factory/FormattedNotify.php:129 +#: src/Navigation/Notifications/Factory/FormattedNotify.php:132 #, php-format msgid "%s is not attending %s's event" msgstr "" -#: src/Navigation/Notifications/Factory/FormattedNotify.php:141 +#: src/Navigation/Notifications/Factory/FormattedNotify.php:144 #, php-format msgid "%s may attending %s's event" msgstr "" -#: src/Navigation/Notifications/Factory/FormattedNotify.php:171 +#: src/Navigation/Notifications/Factory/FormattedNotify.php:174 #, php-format msgid "%s is now friends with %s" msgstr "" -#: src/Navigation/Notifications/Factory/FormattedNotify.php:338 -#: src/Navigation/Notifications/Factory/FormattedNotify.php:376 +#: src/Navigation/Notifications/Factory/FormattedNotify.php:341 +#: src/Navigation/Notifications/Factory/FormattedNotify.php:379 #, php-format msgid "%s commented on %s's post" msgstr "" -#: src/Navigation/Notifications/Factory/FormattedNotify.php:375 +#: src/Navigation/Notifications/Factory/FormattedNotify.php:378 #, php-format msgid "%s created a new post" msgstr "" -#: src/Navigation/Notifications/Factory/Introduction.php:134 +#: src/Navigation/Notifications/Factory/Introduction.php:137 msgid "Friend Suggestion" msgstr "" -#: src/Navigation/Notifications/Factory/Introduction.php:160 +#: src/Navigation/Notifications/Factory/Introduction.php:163 msgid "Friend/Connect Request" msgstr "" -#: src/Navigation/Notifications/Factory/Introduction.php:160 +#: src/Navigation/Notifications/Factory/Introduction.php:163 msgid "New Follower" msgstr "" @@ -10745,205 +10745,205 @@ msgstr "" msgid "%s posted an update." msgstr "" -#: src/Object/Post.php:136 +#: src/Object/Post.php:135 msgid "Private Message" msgstr "" -#: src/Object/Post.php:140 +#: src/Object/Post.php:139 msgid "Public Message" msgstr "" -#: src/Object/Post.php:144 +#: src/Object/Post.php:143 msgid "Unlisted Message" msgstr "" -#: src/Object/Post.php:179 +#: src/Object/Post.php:178 msgid "This entry was edited" msgstr "" -#: src/Object/Post.php:207 +#: src/Object/Post.php:206 msgid "Connector Message" msgstr "" -#: src/Object/Post.php:222 src/Object/Post.php:224 +#: src/Object/Post.php:221 src/Object/Post.php:223 msgid "Edit" msgstr "" -#: src/Object/Post.php:248 +#: src/Object/Post.php:247 msgid "Delete globally" msgstr "" -#: src/Object/Post.php:248 +#: src/Object/Post.php:247 msgid "Remove locally" msgstr "" -#: src/Object/Post.php:264 +#: src/Object/Post.php:263 #, php-format msgid "Block %s" msgstr "" -#: src/Object/Post.php:269 +#: src/Object/Post.php:268 msgid "Save to folder" msgstr "" -#: src/Object/Post.php:304 +#: src/Object/Post.php:303 msgid "I will attend" msgstr "" -#: src/Object/Post.php:304 +#: src/Object/Post.php:303 msgid "I will not attend" msgstr "" -#: src/Object/Post.php:304 +#: src/Object/Post.php:303 msgid "I might attend" msgstr "" -#: src/Object/Post.php:334 +#: src/Object/Post.php:333 msgid "Ignore thread" msgstr "" -#: src/Object/Post.php:335 +#: src/Object/Post.php:334 msgid "Unignore thread" msgstr "" -#: src/Object/Post.php:336 +#: src/Object/Post.php:335 msgid "Toggle ignore status" msgstr "" -#: src/Object/Post.php:346 +#: src/Object/Post.php:345 msgid "Add star" msgstr "" -#: src/Object/Post.php:347 +#: src/Object/Post.php:346 msgid "Remove star" msgstr "" -#: src/Object/Post.php:348 +#: src/Object/Post.php:347 msgid "Toggle star status" msgstr "" -#: src/Object/Post.php:359 +#: src/Object/Post.php:358 msgid "Pin" msgstr "" -#: src/Object/Post.php:360 +#: src/Object/Post.php:359 msgid "Unpin" msgstr "" -#: src/Object/Post.php:361 +#: src/Object/Post.php:360 msgid "Toggle pin status" msgstr "" -#: src/Object/Post.php:364 +#: src/Object/Post.php:363 msgid "Pinned" msgstr "" -#: src/Object/Post.php:369 +#: src/Object/Post.php:368 msgid "Add tag" msgstr "" -#: src/Object/Post.php:382 +#: src/Object/Post.php:381 msgid "Quote share this" msgstr "" -#: src/Object/Post.php:382 +#: src/Object/Post.php:381 msgid "Quote Share" msgstr "" -#: src/Object/Post.php:385 +#: src/Object/Post.php:384 msgid "Reshare this" msgstr "" -#: src/Object/Post.php:385 +#: src/Object/Post.php:384 msgid "Reshare" msgstr "" -#: src/Object/Post.php:386 +#: src/Object/Post.php:385 msgid "Cancel your Reshare" msgstr "" -#: src/Object/Post.php:386 +#: src/Object/Post.php:385 msgid "Unshare" msgstr "" -#: src/Object/Post.php:433 +#: src/Object/Post.php:432 #, php-format msgid "%s (Received %s)" msgstr "" -#: src/Object/Post.php:438 +#: src/Object/Post.php:437 msgid "Comment this item on your system" msgstr "" -#: src/Object/Post.php:438 +#: src/Object/Post.php:437 msgid "Remote comment" msgstr "" -#: src/Object/Post.php:459 +#: src/Object/Post.php:458 msgid "Share via ..." msgstr "" -#: src/Object/Post.php:459 +#: src/Object/Post.php:458 msgid "Share via external services" msgstr "" -#: src/Object/Post.php:488 +#: src/Object/Post.php:487 msgid "to" msgstr "" -#: src/Object/Post.php:489 +#: src/Object/Post.php:488 msgid "via" msgstr "" -#: src/Object/Post.php:490 +#: src/Object/Post.php:489 msgid "Wall-to-Wall" msgstr "" -#: src/Object/Post.php:491 +#: src/Object/Post.php:490 msgid "via Wall-To-Wall:" msgstr "" -#: src/Object/Post.php:533 +#: src/Object/Post.php:532 #, php-format msgid "Reply to %s" msgstr "" -#: src/Object/Post.php:536 +#: src/Object/Post.php:535 msgid "More" msgstr "" -#: src/Object/Post.php:554 +#: src/Object/Post.php:553 msgid "Notifier task is pending" msgstr "" -#: src/Object/Post.php:555 +#: src/Object/Post.php:554 msgid "Delivery to remote servers is pending" msgstr "" -#: src/Object/Post.php:556 +#: src/Object/Post.php:555 msgid "Delivery to remote servers is underway" msgstr "" -#: src/Object/Post.php:557 +#: src/Object/Post.php:556 msgid "Delivery to remote servers is mostly done" msgstr "" -#: src/Object/Post.php:558 +#: src/Object/Post.php:557 msgid "Delivery to remote servers is done" msgstr "" -#: src/Object/Post.php:578 +#: src/Object/Post.php:577 #, php-format msgid "%d comment" msgid_plural "%d comments" msgstr[0] "" msgstr[1] "" -#: src/Object/Post.php:579 +#: src/Object/Post.php:578 msgid "Show more" msgstr "" -#: src/Object/Post.php:580 +#: src/Object/Post.php:579 msgid "Show fewer" msgstr "" @@ -10970,20 +10970,20 @@ msgstr "" msgid "The folder %s must be writable by webserver." msgstr "" -#: src/Security/Authentication.php:226 +#: src/Security/Authentication.php:225 msgid "Login failed." msgstr "" -#: src/Security/Authentication.php:271 +#: src/Security/Authentication.php:270 msgid "Login failed. Please check your credentials." msgstr "" -#: src/Security/Authentication.php:382 +#: src/Security/Authentication.php:381 #, php-format msgid "Welcome %s" msgstr "" -#: src/Security/Authentication.php:383 +#: src/Security/Authentication.php:382 msgid "Please upload a profile photo." msgstr "" @@ -11010,73 +11010,73 @@ msgstr "" msgid "thanks" msgstr "" -#: src/Util/Temporal.php:171 +#: src/Util/Temporal.php:170 msgid "YYYY-MM-DD or MM-DD" msgstr "" -#: src/Util/Temporal.php:279 +#: src/Util/Temporal.php:278 #, php-format msgid "Time zone: %s Change in Settings" msgstr "" -#: src/Util/Temporal.php:318 src/Util/Temporal.php:325 +#: src/Util/Temporal.php:317 src/Util/Temporal.php:324 msgid "never" msgstr "" -#: src/Util/Temporal.php:332 +#: src/Util/Temporal.php:331 msgid "less than a second ago" msgstr "" -#: src/Util/Temporal.php:341 +#: src/Util/Temporal.php:340 msgid "year" msgstr "" -#: src/Util/Temporal.php:341 +#: src/Util/Temporal.php:340 msgid "years" msgstr "" -#: src/Util/Temporal.php:342 +#: src/Util/Temporal.php:341 msgid "months" msgstr "" -#: src/Util/Temporal.php:343 +#: src/Util/Temporal.php:342 msgid "weeks" msgstr "" -#: src/Util/Temporal.php:344 +#: src/Util/Temporal.php:343 msgid "days" msgstr "" -#: src/Util/Temporal.php:345 +#: src/Util/Temporal.php:344 msgid "hour" msgstr "" -#: src/Util/Temporal.php:345 +#: src/Util/Temporal.php:344 msgid "hours" msgstr "" -#: src/Util/Temporal.php:346 +#: src/Util/Temporal.php:345 msgid "minute" msgstr "" -#: src/Util/Temporal.php:346 +#: src/Util/Temporal.php:345 msgid "minutes" msgstr "" -#: src/Util/Temporal.php:347 +#: src/Util/Temporal.php:346 msgid "second" msgstr "" -#: src/Util/Temporal.php:347 +#: src/Util/Temporal.php:346 msgid "seconds" msgstr "" -#: src/Util/Temporal.php:357 +#: src/Util/Temporal.php:356 #, php-format msgid "in %1$d %2$s" msgstr "" -#: src/Util/Temporal.php:360 +#: src/Util/Temporal.php:359 #, php-format msgid "%1$d %2$s ago" msgstr "" @@ -11093,156 +11093,156 @@ msgstr "" msgid "Empty Post" msgstr "" -#: view/theme/duepuntozero/config.php:69 +#: view/theme/duepuntozero/config.php:68 msgid "default" msgstr "" -#: view/theme/duepuntozero/config.php:70 +#: view/theme/duepuntozero/config.php:69 msgid "greenzero" msgstr "" -#: view/theme/duepuntozero/config.php:71 +#: view/theme/duepuntozero/config.php:70 msgid "purplezero" msgstr "" -#: view/theme/duepuntozero/config.php:72 +#: view/theme/duepuntozero/config.php:71 msgid "easterbunny" msgstr "" -#: view/theme/duepuntozero/config.php:73 +#: view/theme/duepuntozero/config.php:72 msgid "darkzero" msgstr "" -#: view/theme/duepuntozero/config.php:74 +#: view/theme/duepuntozero/config.php:73 msgid "comix" msgstr "" -#: view/theme/duepuntozero/config.php:75 +#: view/theme/duepuntozero/config.php:74 msgid "slackr" msgstr "" -#: view/theme/duepuntozero/config.php:88 +#: view/theme/duepuntozero/config.php:87 msgid "Variations" msgstr "" -#: view/theme/frio/config.php:154 +#: view/theme/frio/config.php:153 msgid "Light (Accented)" msgstr "" -#: view/theme/frio/config.php:155 +#: view/theme/frio/config.php:154 msgid "Dark (Accented)" msgstr "" -#: view/theme/frio/config.php:156 +#: view/theme/frio/config.php:155 msgid "Black (Accented)" msgstr "" -#: view/theme/frio/config.php:168 +#: view/theme/frio/config.php:167 msgid "Note" msgstr "" -#: view/theme/frio/config.php:168 +#: view/theme/frio/config.php:167 msgid "Check image permissions if all users are allowed to see the image" msgstr "" -#: view/theme/frio/config.php:174 +#: view/theme/frio/config.php:173 msgid "Custom" msgstr "" -#: view/theme/frio/config.php:175 +#: view/theme/frio/config.php:174 msgid "Legacy" msgstr "" -#: view/theme/frio/config.php:176 +#: view/theme/frio/config.php:175 msgid "Accented" msgstr "" -#: view/theme/frio/config.php:177 +#: view/theme/frio/config.php:176 msgid "Select color scheme" msgstr "" -#: view/theme/frio/config.php:178 +#: view/theme/frio/config.php:177 msgid "Select scheme accent" msgstr "" -#: view/theme/frio/config.php:178 +#: view/theme/frio/config.php:177 msgid "Blue" msgstr "" -#: view/theme/frio/config.php:178 +#: view/theme/frio/config.php:177 msgid "Red" msgstr "" -#: view/theme/frio/config.php:178 +#: view/theme/frio/config.php:177 msgid "Purple" msgstr "" -#: view/theme/frio/config.php:178 +#: view/theme/frio/config.php:177 msgid "Green" msgstr "" -#: view/theme/frio/config.php:178 +#: view/theme/frio/config.php:177 msgid "Pink" msgstr "" -#: view/theme/frio/config.php:179 +#: view/theme/frio/config.php:178 msgid "Copy or paste schemestring" msgstr "" -#: view/theme/frio/config.php:179 +#: view/theme/frio/config.php:178 msgid "" "You can copy this string to share your theme with others. Pasting here " "applies the schemestring" msgstr "" -#: view/theme/frio/config.php:180 +#: view/theme/frio/config.php:179 msgid "Navigation bar background color" msgstr "" -#: view/theme/frio/config.php:181 +#: view/theme/frio/config.php:180 msgid "Navigation bar icon color " msgstr "" -#: view/theme/frio/config.php:182 +#: view/theme/frio/config.php:181 msgid "Link color" msgstr "" -#: view/theme/frio/config.php:183 +#: view/theme/frio/config.php:182 msgid "Set the background color" msgstr "" -#: view/theme/frio/config.php:184 +#: view/theme/frio/config.php:183 msgid "Content background opacity" msgstr "" -#: view/theme/frio/config.php:185 +#: view/theme/frio/config.php:184 msgid "Set the background image" msgstr "" -#: view/theme/frio/config.php:186 +#: view/theme/frio/config.php:185 msgid "Background image style" msgstr "" -#: view/theme/frio/config.php:189 +#: view/theme/frio/config.php:188 msgid "Always open Compose page" msgstr "" -#: view/theme/frio/config.php:189 +#: view/theme/frio/config.php:188 msgid "" "The New Post button always open the Compose page " "instead of the modal form. When this is disabled, the Compose page can be " "accessed with a middle click on the link or from the modal." msgstr "" -#: view/theme/frio/config.php:193 +#: view/theme/frio/config.php:192 msgid "Login page background image" msgstr "" -#: view/theme/frio/config.php:197 +#: view/theme/frio/config.php:196 msgid "Login page background color" msgstr "" -#: view/theme/frio/config.php:197 +#: view/theme/frio/config.php:196 msgid "Leave background image and color empty for theme defaults" msgstr "" @@ -11290,78 +11290,78 @@ msgstr "" msgid "Back to top" msgstr "" -#: view/theme/frio/theme.php:220 +#: view/theme/frio/theme.php:219 msgid "Guest" msgstr "" -#: view/theme/frio/theme.php:223 +#: view/theme/frio/theme.php:222 msgid "Visitor" msgstr "" -#: view/theme/quattro/config.php:90 +#: view/theme/quattro/config.php:89 msgid "Alignment" msgstr "" -#: view/theme/quattro/config.php:90 +#: view/theme/quattro/config.php:89 msgid "Left" msgstr "" -#: view/theme/quattro/config.php:90 +#: view/theme/quattro/config.php:89 msgid "Center" msgstr "" -#: view/theme/quattro/config.php:91 +#: view/theme/quattro/config.php:90 msgid "Color scheme" msgstr "" -#: view/theme/quattro/config.php:92 +#: view/theme/quattro/config.php:91 msgid "Posts font size" msgstr "" -#: view/theme/quattro/config.php:93 +#: view/theme/quattro/config.php:92 msgid "Textareas font size" msgstr "" -#: view/theme/vier/config.php:92 +#: view/theme/vier/config.php:91 msgid "Comma separated list of helper forums" msgstr "" -#: view/theme/vier/config.php:132 +#: view/theme/vier/config.php:131 msgid "don't show" msgstr "" -#: view/theme/vier/config.php:132 +#: view/theme/vier/config.php:131 msgid "show" msgstr "" -#: view/theme/vier/config.php:138 +#: view/theme/vier/config.php:137 msgid "Set style" msgstr "" -#: view/theme/vier/config.php:139 +#: view/theme/vier/config.php:138 msgid "Community Pages" msgstr "" -#: view/theme/vier/config.php:140 view/theme/vier/theme.php:152 +#: view/theme/vier/config.php:139 view/theme/vier/theme.php:151 msgid "Community Profiles" msgstr "" -#: view/theme/vier/config.php:141 +#: view/theme/vier/config.php:140 msgid "Help or @NewHere ?" msgstr "" -#: view/theme/vier/config.php:142 view/theme/vier/theme.php:323 +#: view/theme/vier/config.php:141 view/theme/vier/theme.php:322 msgid "Connect Services" msgstr "" -#: view/theme/vier/config.php:143 +#: view/theme/vier/config.php:142 msgid "Find Friends" msgstr "" -#: view/theme/vier/config.php:144 view/theme/vier/theme.php:179 +#: view/theme/vier/config.php:143 view/theme/vier/theme.php:178 msgid "Last users" msgstr "" -#: view/theme/vier/theme.php:238 +#: view/theme/vier/theme.php:237 msgid "Quick Start" msgstr ""