diff --git a/boot.php b/boot.php index 60c8bf5a30..02579007a6 100644 --- a/boot.php +++ b/boot.php @@ -26,38 +26,3 @@ * communications are free and open and flow between alternate providers as * easily as email does today. */ - -use Friendica\Core\Session; - -/** - * Returns the user id of locally logged in user or false. - * - * @return int|bool user id or false - * @deprecated since version 2022.12, use Core\Session::getLocalUser() instead - */ -function local_user() -{ - return Session::getLocalUser(); -} - -/** - * Returns the public contact id of logged in user or false. - * - * @return int|bool public contact id or false - * @deprecated since version 2022.12, use Core\Session:: getPublicContact() instead - */ -function public_contact() -{ - return Session::getPublicContact(); -} - -/** - * Returns public contact id of authenticated site visitor or false - * - * @return int|bool visitor_id or false - * @deprecated since version 2022.12, use Core\Session:: getRemoteUser() instead - */ -function remote_user() -{ - return Session::getRemoteUser(); -} diff --git a/src/Module/Admin/Users/Active.php b/src/Module/Admin/Users/Active.php index 2188d4a591..20662a7e27 100644 --- a/src/Module/Admin/Users/Active.php +++ b/src/Module/Admin/Users/Active.php @@ -23,6 +23,7 @@ namespace Friendica\Module\Admin\Users; use Friendica\Content\Pager; use Friendica\Core\Renderer; +use Friendica\Core\Session; use Friendica\Database\DBA; use Friendica\DI; use Friendica\Model\User; @@ -47,7 +48,7 @@ class Active extends BaseUsers if (!empty($_POST['page_users_delete'])) { foreach ($users as $uid) { - if (local_user() != $uid) { + if (Session::getLocalUser() != $uid) { User::remove($uid); } else { DI::sysmsg()->addNotice(DI::l10n()->t('You can\'t remove yourself')); @@ -78,7 +79,7 @@ class Active extends BaseUsers switch ($action) { case 'delete': - if (local_user() != $uid) { + if (Session::getLocalUser() != $uid) { self::checkFormSecurityTokenRedirectOnError('admin/users/active', 'admin_users_active', 't'); // delete user User::remove($uid); diff --git a/src/Module/Admin/Users/Blocked.php b/src/Module/Admin/Users/Blocked.php index e8434d5e09..5ef9efcff4 100644 --- a/src/Module/Admin/Users/Blocked.php +++ b/src/Module/Admin/Users/Blocked.php @@ -23,6 +23,7 @@ namespace Friendica\Module\Admin\Users; use Friendica\Content\Pager; use Friendica\Core\Renderer; +use Friendica\Core\Session; use Friendica\Database\DBA; use Friendica\DI; use Friendica\Model\User; @@ -48,7 +49,7 @@ class Blocked extends BaseUsers if (!empty($_POST['page_users_delete'])) { foreach ($users as $uid) { - if (local_user() != $uid) { + if (Session::getLocalUser() != $uid) { User::remove($uid); } else { DI::sysmsg()->addNotice(DI::l10n()->t('You can\'t remove yourself')); @@ -79,7 +80,7 @@ class Blocked extends BaseUsers switch ($action) { case 'delete': - if (local_user() != $uid) { + if (Session::getLocalUser() != $uid) { self::checkFormSecurityTokenRedirectOnError('/admin/users/blocked', 'admin_users_blocked', 't'); // delete user User::remove($uid); diff --git a/src/Module/Profile/Contacts.php b/src/Module/Profile/Contacts.php index 544e1a2409..eab1c5cef6 100644 --- a/src/Module/Profile/Contacts.php +++ b/src/Module/Profile/Contacts.php @@ -50,7 +50,7 @@ class Contacts extends Module\BaseProfile throw new HTTPException\NotFoundException(DI::l10n()->t('User not found.')); } - $is_owner = $profile['uid'] == local_user(); + $is_owner = $profile['uid'] == Session::getLocalUser(); if ($profile['hide-friends'] && !$is_owner) { throw new HTTPException\ForbiddenException(DI::l10n()->t('Permission denied.')); @@ -60,7 +60,7 @@ class Contacts extends Module\BaseProfile $o = self::getTabsHTML($a, 'contacts', $is_owner, $profile['nickname'], $profile['hide-friends']); - $tabs = self::getContactFilterTabs('profile/' . $nickname, $type, Session::isAuthenticated() && $profile['uid'] != local_user()); + $tabs = self::getContactFilterTabs('profile/' . $nickname, $type, Session::isAuthenticated() && $profile['uid'] != Session::getLocalUser()); $condition = [ 'uid' => $profile['uid'], diff --git a/src/Module/Profile/Media.php b/src/Module/Profile/Media.php index f67fcbb438..d98021089d 100644 --- a/src/Module/Profile/Media.php +++ b/src/Module/Profile/Media.php @@ -21,6 +21,7 @@ namespace Friendica\Module\Profile; +use Friendica\Core\Session; use Friendica\DI; use Friendica\Model\Contact; use Friendica\Model\Profile as ProfileModel; @@ -42,7 +43,7 @@ class Media extends BaseProfile DI::page()['htmlhead'] .= '' . "\n"; } - $is_owner = local_user() == $profile['uid']; + $is_owner = Session::getLocalUser() == $profile['uid']; $o = self::getTabsHTML($a, 'media', $is_owner, $profile['nickname'], $profile['hide-friends']); diff --git a/src/Module/Profile/Profile.php b/src/Module/Profile/Profile.php index f5e904544c..bec9366ae5 100644 --- a/src/Module/Profile/Profile.php +++ b/src/Module/Profile/Profile.php @@ -84,11 +84,11 @@ class Profile extends BaseProfile $remote_contact_id = Session::getRemoteContactID($profile['uid']); - if (DI::config()->get('system', 'block_public') && !local_user() && !$remote_contact_id) { + if (DI::config()->get('system', 'block_public') && !Session::getLocalUser() && !$remote_contact_id) { return Login::form(); } - $is_owner = local_user() == $profile['uid']; + $is_owner = Session::getLocalUser() == $profile['uid']; if (!empty($profile['hidewall']) && !$is_owner && !$remote_contact_id) { throw new HTTPException\ForbiddenException(DI::l10n()->t('Access to this profile has been restricted.')); @@ -102,7 +102,7 @@ class Profile extends BaseProfile Nav::setSelected('home'); - $is_owner = local_user() == $profile['uid']; + $is_owner = Session::getLocalUser() == $profile['uid']; $o = self::getTabsHTML($a, 'profile', $is_owner, $profile['nickname'], $profile['hide-friends']); if (!empty($profile['hidewall']) && !$is_owner && !$remote_contact_id) { @@ -117,7 +117,7 @@ class Profile extends BaseProfile $view_as_contact_id = intval($_GET['viewas'] ?? 0); $view_as_contacts = Contact::selectToArray(['id', 'name'], [ - 'uid' => local_user(), + 'uid' => Session::getLocalUser(), 'rel' => [Contact::FOLLOWER, Contact::SHARING, Contact::FRIEND], 'network' => Protocol::DFRN, 'blocked' => false, @@ -247,7 +247,7 @@ class Profile extends BaseProfile '$submit' => DI::l10n()->t('Submit'), '$basic' => DI::l10n()->t('Basic'), '$advanced' => DI::l10n()->t('Advanced'), - '$is_owner' => $profile['uid'] == local_user(), + '$is_owner' => $profile['uid'] == Session::getLocalUser(), '$query_string' => DI::args()->getQueryString(), '$basic_fields' => $basic_fields, '$custom_fields' => $custom_fields, @@ -308,8 +308,8 @@ class Profile extends BaseProfile } // site block - $blocked = !local_user() && !$remote_contact_id && DI::config()->get('system', 'block_public'); - $userblock = !local_user() && !$remote_contact_id && $profile['hidewall']; + $blocked = !Session::getLocalUser() && !$remote_contact_id && DI::config()->get('system', 'block_public'); + $userblock = !Session::getLocalUser() && !$remote_contact_id && $profile['hidewall']; if (!$blocked && !$userblock) { $keywords = str_replace(['#', ',', ' ', ',,'], ['', ' ', ',', ','], $profile['pub_keywords'] ?? ''); if (strlen($keywords)) { diff --git a/src/Module/Profile/Schedule.php b/src/Module/Profile/Schedule.php index cac77c9c76..590786824c 100644 --- a/src/Module/Profile/Schedule.php +++ b/src/Module/Profile/Schedule.php @@ -24,6 +24,7 @@ namespace Friendica\Module\Profile; use Friendica\BaseModule; use Friendica\Content\Text\BBCode; use Friendica\Core\Renderer; +use Friendica\Core\Session; use Friendica\Database\DBA; use Friendica\DI; use Friendica\Model\Post; @@ -35,7 +36,7 @@ class Schedule extends BaseProfile { protected function post(array $request = []) { - if (!local_user()) { + if (!Session::getLocalUser()) { throw new HTTPException\ForbiddenException(DI::l10n()->t('Permission denied.')); } @@ -43,7 +44,7 @@ class Schedule extends BaseProfile throw new HTTPException\BadRequestException(); } - if (!DBA::exists('delayed-post', ['id' => $_REQUEST['delete'], 'uid' => local_user()])) { + if (!DBA::exists('delayed-post', ['id' => $_REQUEST['delete'], 'uid' => Session::getLocalUser()])) { throw new HTTPException\NotFoundException(); } @@ -52,7 +53,7 @@ class Schedule extends BaseProfile protected function content(array $request = []): string { - if (!local_user()) { + if (!Session::getLocalUser()) { throw new HTTPException\ForbiddenException(DI::l10n()->t('Permission denied.')); } @@ -61,7 +62,7 @@ class Schedule extends BaseProfile $o = self::getTabsHTML($a, 'schedule', true, $a->getLoggedInUserNickname(), false); $schedule = []; - $delayed = DBA::select('delayed-post', [], ['uid' => local_user()]); + $delayed = DBA::select('delayed-post', [], ['uid' => Session::getLocalUser()]); while ($row = DBA::fetch($delayed)) { $parameter = Post\Delayed::getParametersForid($row['id']); if (empty($parameter)) { diff --git a/src/Module/Profile/Status.php b/src/Module/Profile/Status.php index fa3f36e885..e10a958221 100644 --- a/src/Module/Profile/Status.php +++ b/src/Module/Profile/Status.php @@ -92,19 +92,19 @@ class Status extends BaseProfile $hashtags = $_GET['tag'] ?? ''; - if (DI::config()->get('system', 'block_public') && !local_user() && !Session::getRemoteContactID($profile['uid'])) { + if (DI::config()->get('system', 'block_public') && !Session::getLocalUser() && !Session::getRemoteContactID($profile['uid'])) { return Login::form(); } $o = ''; - if ($profile['uid'] == local_user()) { + if ($profile['uid'] == Session::getLocalUser()) { Nav::setSelected('home'); } $remote_contact = Session::getRemoteContactID($profile['uid']); - $is_owner = local_user() == $profile['uid']; - $last_updated_key = "profile:" . $profile['uid'] . ":" . local_user() . ":" . $remote_contact; + $is_owner = Session::getLocalUser() == $profile['uid']; + $last_updated_key = "profile:" . $profile['uid'] . ":" . Session::getLocalUser() . ":" . $remote_contact; if (!empty($profile['hidewall']) && !$is_owner && !$remote_contact) { DI::sysmsg()->addNotice(DI::l10n()->t('Access to this profile has been restricted.')); @@ -166,10 +166,10 @@ class Status extends BaseProfile } if (DI::mode()->isMobile()) { - $itemspage_network = DI::pConfig()->get(local_user(), 'system', 'itemspage_mobile_network', + $itemspage_network = DI::pConfig()->get(Session::getLocalUser(), 'system', 'itemspage_mobile_network', DI::config()->get('system', 'itemspage_network_mobile')); } else { - $itemspage_network = DI::pConfig()->get(local_user(), 'system', 'itemspage_network', + $itemspage_network = DI::pConfig()->get(Session::getLocalUser(), 'system', 'itemspage_network', DI::config()->get('system', 'itemspage_network')); } @@ -197,9 +197,9 @@ class Status extends BaseProfile } if ($is_owner) { - $unseen = Post::exists(['wall' => true, 'unseen' => true, 'uid' => local_user()]); + $unseen = Post::exists(['wall' => true, 'unseen' => true, 'uid' => Session::getLocalUser()]); if ($unseen) { - Item::update(['unseen' => false], ['wall' => true, 'unseen' => true, 'uid' => local_user()]); + Item::update(['unseen' => false], ['wall' => true, 'unseen' => true, 'uid' => Session::getLocalUser()]); } } diff --git a/src/Module/Search/Acl.php b/src/Module/Search/Acl.php index 9c854839e5..e8db9df533 100644 --- a/src/Module/Search/Acl.php +++ b/src/Module/Search/Acl.php @@ -27,6 +27,7 @@ use Friendica\Core\Hook; use Friendica\Core\Logger; use Friendica\Core\Protocol; use Friendica\Core\Search; +use Friendica\Core\Session; use Friendica\Core\System; use Friendica\Database\DBA; use Friendica\DI; @@ -51,7 +52,7 @@ class Acl extends BaseModule protected function rawContent(array $request = []) { - if (!local_user()) { + if (!Session::getLocalUser()) { throw new HTTPException\UnauthorizedException(DI::l10n()->t('You must be logged in to use this module.')); } @@ -113,8 +114,8 @@ class Acl extends BaseModule Logger::info('ACL {action} - {subaction} - start', ['module' => 'acl', 'action' => 'content', 'subaction' => 'search', 'search' => $search, 'type' => $type, 'conversation' => $conv_id]); $sql_extra = ''; - $condition = ["`uid` = ? AND NOT `deleted` AND NOT `pending` AND NOT `archive`", local_user()]; - $condition_group = ["`uid` = ? AND NOT `deleted`", local_user()]; + $condition = ["`uid` = ? AND NOT `deleted` AND NOT `pending` AND NOT `archive`", Session::getLocalUser()]; + $condition_group = ["`uid` = ? AND NOT `deleted`", Session::getLocalUser()]; if ($search != '') { $sql_extra = "AND `name` LIKE '%%" . DBA::escape($search) . "%%'"; @@ -176,7 +177,7 @@ class Acl extends BaseModule GROUP BY `group`.`name`, `group`.`id` ORDER BY `group`.`name` LIMIT ?, ?", - local_user(), + Session::getLocalUser(), $start, $count )); @@ -251,7 +252,7 @@ class Acl extends BaseModule $condition = ["`parent` = ?", $conv_id]; $params = ['order' => ['author-name' => true]]; - $authors = Post::selectForUser(local_user(), ['author-link'], $condition, $params); + $authors = Post::selectForUser(Session::getLocalUser(), ['author-link'], $condition, $params); $item_authors = []; while ($author = Post::fetch($authors)) { $item_authors[$author['author-link']] = $author['author-link']; diff --git a/src/Module/Search/Directory.php b/src/Module/Search/Directory.php index a088282cbe..a572dcd80a 100644 --- a/src/Module/Search/Directory.php +++ b/src/Module/Search/Directory.php @@ -22,6 +22,7 @@ namespace Friendica\Module\Search; use Friendica\Content\Widget; +use Friendica\Core\Session; use Friendica\DI; use Friendica\Module\BaseSearch; use Friendica\Module\Security\Login; @@ -33,7 +34,7 @@ class Directory extends BaseSearch { protected function content(array $request = []): string { - if (!local_user()) { + if (!Session::getLocalUser()) { DI::sysmsg()->addNotice(DI::l10n()->t('Permission denied.')); return Login::form(); } diff --git a/src/Module/Search/Filed.php b/src/Module/Search/Filed.php index c3ad3df1c8..5f3c30f9ba 100644 --- a/src/Module/Search/Filed.php +++ b/src/Module/Search/Filed.php @@ -26,6 +26,7 @@ use Friendica\Content\Pager; use Friendica\Content\Text\HTML; use Friendica\Content\Widget; use Friendica\Core\Renderer; +use Friendica\Core\Session; use Friendica\Database\DBA; use Friendica\DI; use Friendica\Model\Item; @@ -38,13 +39,13 @@ class Filed extends BaseSearch { protected function content(array $request = []): string { - if (!local_user()) { + if (!Session::getLocalUser()) { return Login::form(); } DI::page()['aside'] .= Widget::fileAs(DI::args()->getCommand(), $_GET['file'] ?? ''); - if (DI::pConfig()->get(local_user(), 'system', 'infinite_scroll') && ($_GET['mode'] ?? '') != 'minimal') { + if (DI::pConfig()->get(Session::getLocalUser(), 'system', 'infinite_scroll') && ($_GET['mode'] ?? '') != 'minimal') { $tpl = Renderer::getMarkupTemplate('infinite_scroll_head.tpl'); $o = Renderer::replaceMacros($tpl, ['$reload_uri' => DI::args()->getQueryString()]); } else { @@ -59,10 +60,10 @@ class Filed extends BaseSearch } if (DI::mode()->isMobile()) { - $itemspage_network = DI::pConfig()->get(local_user(), 'system', 'itemspage_mobile_network', + $itemspage_network = DI::pConfig()->get(Session::getLocalUser(), 'system', 'itemspage_mobile_network', DI::config()->get('system', 'itemspage_network_mobile')); } else { - $itemspage_network = DI::pConfig()->get(local_user(), 'system', 'itemspage_network', + $itemspage_network = DI::pConfig()->get(Session::getLocalUser(), 'system', 'itemspage_network', DI::config()->get('system', 'itemspage_network')); } @@ -70,7 +71,7 @@ class Filed extends BaseSearch $pager = new Pager(DI::l10n(), DI::args()->getQueryString(), $itemspage_network); - $term_condition = ['type' => Category::FILE, 'uid' => local_user()]; + $term_condition = ['type' => Category::FILE, 'uid' => Session::getLocalUser()]; if ($file) { $term_condition['name'] = $file; } @@ -93,14 +94,14 @@ class Filed extends BaseSearch if (count($posts) == 0) { return ''; } - $item_condition = ['uid' => [0, local_user()], 'uri-id' => $posts]; + $item_condition = ['uid' => [0, Session::getLocalUser()], 'uri-id' => $posts]; $item_params = ['order' => ['uri-id' => true, 'uid' => true]]; - $items = Post::toArray(Post::selectForUser(local_user(), Item::DISPLAY_FIELDLIST, $item_condition, $item_params)); + $items = Post::toArray(Post::selectForUser(Session::getLocalUser(), Item::DISPLAY_FIELDLIST, $item_condition, $item_params)); - $o .= DI::conversation()->create($items, 'filed', false, false, '', local_user()); + $o .= DI::conversation()->create($items, 'filed', false, false, '', Session::getLocalUser()); - if (DI::pConfig()->get(local_user(), 'system', 'infinite_scroll')) { + if (DI::pConfig()->get(Session::getLocalUser(), 'system', 'infinite_scroll')) { $o .= HTML::scrollLoader(); } else { $o .= $pager->renderMinimal($count); diff --git a/src/Module/Search/Index.php b/src/Module/Search/Index.php index 7dfdca39b4..131cb5292f 100644 --- a/src/Module/Search/Index.php +++ b/src/Module/Search/Index.php @@ -94,7 +94,7 @@ class Index extends BaseSearch } } - if (local_user()) { + if (Session::getLocalUser()) { DI::page()['aside'] .= Widget\SavedSearches::getHTML(Search::getSearchPath($search), $search); } @@ -161,10 +161,10 @@ class Index extends BaseSearch // No items will be shown if the member has a blocked profile wall. if (DI::mode()->isMobile()) { - $itemsPerPage = DI::pConfig()->get(local_user(), 'system', 'itemspage_mobile_network', + $itemsPerPage = DI::pConfig()->get(Session::getLocalUser(), 'system', 'itemspage_mobile_network', DI::config()->get('system', 'itemspage_network_mobile')); } else { - $itemsPerPage = DI::pConfig()->get(local_user(), 'system', 'itemspage_network', + $itemsPerPage = DI::pConfig()->get(Session::getLocalUser(), 'system', 'itemspage_network', DI::config()->get('system', 'itemspage_network')); } @@ -174,19 +174,19 @@ class Index extends BaseSearch if ($tag) { Logger::info('Start tag search.', ['q' => $search]); - $uriids = Tag::getURIIdListByTag($search, local_user(), $pager->getStart(), $pager->getItemsPerPage(), $last_uriid); - $count = Tag::countByTag($search, local_user()); + $uriids = Tag::getURIIdListByTag($search, Session::getLocalUser(), $pager->getStart(), $pager->getItemsPerPage(), $last_uriid); + $count = Tag::countByTag($search, Session::getLocalUser()); } else { Logger::info('Start fulltext search.', ['q' => $search]); - $uriids = Post\Content::getURIIdListBySearch($search, local_user(), $pager->getStart(), $pager->getItemsPerPage(), $last_uriid); - $count = Post\Content::countBySearch($search, local_user()); + $uriids = Post\Content::getURIIdListBySearch($search, Session::getLocalUser(), $pager->getStart(), $pager->getItemsPerPage(), $last_uriid); + $count = Post\Content::countBySearch($search, Session::getLocalUser()); } if (!empty($uriids)) { - $condition = ["(`uid` = ? OR (`uid` = ? AND NOT `global`))", 0, local_user()]; + $condition = ["(`uid` = ? OR (`uid` = ? AND NOT `global`))", 0, Session::getLocalUser()]; $condition = DBA::mergeConditions($condition, ['uri-id' => $uriids]); $params = ['order' => ['id' => true]]; - $items = Post::toArray(Post::selectForUser(local_user(), Item::DISPLAY_FIELDLIST, $condition, $params)); + $items = Post::toArray(Post::selectForUser(Session::getLocalUser(), Item::DISPLAY_FIELDLIST, $condition, $params)); } if (empty($items)) { @@ -196,7 +196,7 @@ class Index extends BaseSearch return $o; } - if (DI::pConfig()->get(local_user(), 'system', 'infinite_scroll')) { + if (DI::pConfig()->get(Session::getLocalUser(), 'system', 'infinite_scroll')) { $tpl = Renderer::getMarkupTemplate('infinite_scroll_head.tpl'); $o .= Renderer::replaceMacros($tpl, ['$reload_uri' => DI::args()->getQueryString()]); } @@ -213,9 +213,9 @@ class Index extends BaseSearch Logger::info('Start Conversation.', ['q' => $search]); - $o .= DI::conversation()->create($items, 'search', false, false, 'commented', local_user()); + $o .= DI::conversation()->create($items, 'search', false, false, 'commented', Session::getLocalUser()); - if (DI::pConfig()->get(local_user(), 'system', 'infinite_scroll')) { + if (DI::pConfig()->get(Session::getLocalUser(), 'system', 'infinite_scroll')) { $o .= HTML::scrollLoader(); } else { $o .= $pager->renderMinimal($count); @@ -254,9 +254,9 @@ class Index extends BaseSearch $search = $matches[1]; } - if (local_user()) { + if (Session::getLocalUser()) { // User-specific contact URL/address search - $contact_id = Contact::getIdForURL($search, local_user()); + $contact_id = Contact::getIdForURL($search, Session::getLocalUser()); if (!$contact_id) { // User-specific contact URL/address search and probe $contact_id = Contact::getIdForURL($search); @@ -293,9 +293,9 @@ class Index extends BaseSearch $search = Network::convertToIdn($search); - if (local_user()) { + if (Session::getLocalUser()) { // Post URL search - $item_id = Item::fetchByLink($search, local_user()); + $item_id = Item::fetchByLink($search, Session::getLocalUser()); if (!$item_id) { // If the user-specific search failed, we search and probe a public post $item_id = Item::fetchByLink($search); diff --git a/src/Module/Search/Saved.php b/src/Module/Search/Saved.php index cea0a9b1a5..784c8efbca 100644 --- a/src/Module/Search/Saved.php +++ b/src/Module/Search/Saved.php @@ -25,6 +25,7 @@ use Friendica\App; use Friendica\BaseModule; use Friendica\Core\L10n; use Friendica\Core\Search; +use Friendica\Core\Session; use Friendica\Database\Database; use Friendica\DI; use Friendica\Module\Response; @@ -50,10 +51,10 @@ class Saved extends BaseModule $return_url = $_GET['return_url'] ?? Search::getSearchPath($search); - if (local_user() && $search) { + if (Session::getLocalUser() && $search) { switch ($action) { case 'add': - $fields = ['uid' => local_user(), 'term' => $search]; + $fields = ['uid' => Session::getLocalUser(), 'term' => $search]; if (!$this->dba->exists('search', $fields)) { if (!$this->dba->insert('search', $fields)) { DI::sysmsg()->addNotice($this->t('Search term was not saved.')); @@ -64,7 +65,7 @@ class Saved extends BaseModule break; case 'remove': - if (!$this->dba->delete('search', ['uid' => local_user(), 'term' => $search])) { + if (!$this->dba->delete('search', ['uid' => Session::getLocalUser(), 'term' => $search])) { DI::sysmsg()->addNotice($this->t('Search term was not removed.')); } break; diff --git a/src/Module/Security/Login.php b/src/Module/Security/Login.php index 80320403a6..6728fc638b 100644 --- a/src/Module/Security/Login.php +++ b/src/Module/Security/Login.php @@ -27,6 +27,7 @@ use Friendica\Core\Config\Capability\IManageConfigValues; use Friendica\Core\Hook; use Friendica\Core\L10n; use Friendica\Core\Renderer; +use Friendica\Core\Session; use Friendica\Core\Session\Capability\IHandleSessions; use Friendica\DI; use Friendica\Module\Register; @@ -62,7 +63,7 @@ class Login extends BaseModule { $return_path = $request['return_path'] ?? $this->session->pop('return_path', '') ; - if (local_user()) { + if (Session::getLocalUser()) { $this->baseUrl->redirect($return_path); } @@ -126,7 +127,7 @@ class Login extends BaseModule ]; } - if (local_user()) { + if (Session::getLocalUser()) { $tpl = Renderer::getMarkupTemplate('logout.tpl'); } else { DI::page()['htmlhead'] .= Renderer::replaceMacros( diff --git a/src/Module/Security/Logout.php b/src/Module/Security/Logout.php index 82c176feb6..62949029b7 100644 --- a/src/Module/Security/Logout.php +++ b/src/Module/Security/Logout.php @@ -26,6 +26,7 @@ use Friendica\BaseModule; use Friendica\Core\Cache\Capability\ICanCache; use Friendica\Core\Hook; use Friendica\Core\L10n; +use Friendica\Core\Session; use Friendica\Core\Session\Capability\IHandleSessions; use Friendica\Core\System; use Friendica\DI; @@ -63,7 +64,7 @@ class Logout extends BaseModule protected function rawContent(array $request = []) { $visitor_home = null; - if (remote_user()) { + if (Session::getRemoteUser()) { $visitor_home = Profile::getMyURL(); $this->cache->delete('zrlInit:' . $visitor_home); } diff --git a/src/Module/Security/PasswordTooLong.php b/src/Module/Security/PasswordTooLong.php index 9de4a345bb..32008f0486 100644 --- a/src/Module/Security/PasswordTooLong.php +++ b/src/Module/Security/PasswordTooLong.php @@ -24,6 +24,7 @@ namespace Friendica\Module\Security; use Friendica\App; use Friendica\Core\L10n; use Friendica\Core\Renderer; +use Friendica\Core\Session; use Friendica\Database\DBA; use Friendica\Model\User; use Friendica\Module\Response; @@ -54,13 +55,13 @@ class PasswordTooLong extends \Friendica\BaseModule } // check if the old password was supplied correctly before changing it to the new value - User::getIdFromPasswordAuthentication(local_user(), $request['password_current']); + User::getIdFromPasswordAuthentication(Session::getLocalUser(), $request['password_current']); if (strlen($request['password_current']) <= 72) { throw new \Exception($this->l10n->t('Password does not need changing.')); } - $result = User::updatePassword(local_user(), $newpass); + $result = User::updatePassword(Session::getLocalUser(), $newpass); if (!DBA::isResult($result)) { throw new \Exception($this->l10n->t('Password update failed. Please try again.')); } diff --git a/src/Module/Security/TwoFactor/Recovery.php b/src/Module/Security/TwoFactor/Recovery.php index 38b341dad9..70fbaeccde 100644 --- a/src/Module/Security/TwoFactor/Recovery.php +++ b/src/Module/Security/TwoFactor/Recovery.php @@ -25,6 +25,7 @@ use Friendica\App; use Friendica\BaseModule; use Friendica\Core\L10n; use Friendica\Core\Renderer; +use Friendica\Core\Session; use Friendica\Core\Session\Capability\IHandleSessions; use Friendica\DI; use Friendica\Model\User; @@ -59,7 +60,7 @@ class Recovery extends BaseModule protected function post(array $request = []) { - if (!local_user()) { + if (!Session::getLocalUser()) { return; } @@ -68,10 +69,10 @@ class Recovery extends BaseModule $recovery_code = $_POST['recovery_code'] ?? ''; - if (RecoveryCode::existsForUser(local_user(), $recovery_code)) { - RecoveryCode::markUsedForUser(local_user(), $recovery_code); + if (RecoveryCode::existsForUser(Session::getLocalUser(), $recovery_code)) { + RecoveryCode::markUsedForUser(Session::getLocalUser(), $recovery_code); $this->session->set('2fa', true); - DI::sysmsg()->addInfo($this->t('Remaining recovery codes: %d', RecoveryCode::countValidForUser(local_user()))); + DI::sysmsg()->addInfo($this->t('Remaining recovery codes: %d', RecoveryCode::countValidForUser(Session::getLocalUser()))); $this->auth->setForUser($this->app, User::getById($this->app->getLoggedInUserId()), true, true); @@ -84,7 +85,7 @@ class Recovery extends BaseModule protected function content(array $request = []): string { - if (!local_user()) { + if (!Session::getLocalUser()) { $this->baseUrl->redirect(); } diff --git a/src/Module/Security/TwoFactor/SignOut.php b/src/Module/Security/TwoFactor/SignOut.php index ac6e9321f4..990266d189 100644 --- a/src/Module/Security/TwoFactor/SignOut.php +++ b/src/Module/Security/TwoFactor/SignOut.php @@ -25,6 +25,7 @@ use Friendica\App; use Friendica\BaseModule; use Friendica\Core\L10n; use Friendica\Core\Renderer; +use Friendica\Core\Session; use Friendica\Core\Session\Capability\IHandleSessions; use Friendica\DI; use Friendica\Model\User\Cookie; @@ -61,7 +62,7 @@ class SignOut extends BaseModule protected function post(array $request = []) { - if (!local_user() || !($this->cookie->get('2fa_cookie_hash'))) { + if (!Session::getLocalUser() || !($this->cookie->get('2fa_cookie_hash'))) { return; } @@ -80,7 +81,7 @@ class SignOut extends BaseModule $this->baseUrl->redirect(); break; case 'sign_out': - $this->trustedBrowserRepository->removeForUser(local_user(), $this->cookie->get('2fa_cookie_hash')); + $this->trustedBrowserRepository->removeForUser(Session::getLocalUser(), $this->cookie->get('2fa_cookie_hash')); $this->cookie->clear(); $this->session->clear(); @@ -95,7 +96,7 @@ class SignOut extends BaseModule protected function content(array $request = []): string { - if (!local_user() || !($this->cookie->get('2fa_cookie_hash'))) { + if (!Session::getLocalUser() || !($this->cookie->get('2fa_cookie_hash'))) { $this->baseUrl->redirect(); } diff --git a/src/Module/Security/TwoFactor/Trust.php b/src/Module/Security/TwoFactor/Trust.php index ed24c6b14c..3b64056c54 100644 --- a/src/Module/Security/TwoFactor/Trust.php +++ b/src/Module/Security/TwoFactor/Trust.php @@ -25,6 +25,7 @@ use Friendica\App; use Friendica\BaseModule; use Friendica\Core\L10n; use Friendica\Core\Renderer; +use Friendica\Core\Session; use Friendica\Core\Session\Capability\IHandleSessions; use Friendica\DI; use Friendica\Model\User; @@ -74,7 +75,7 @@ class Trust extends BaseModule protected function post(array $request = []) { - if (!local_user() || !$this->session->get('2fa')) { + if (!Session::getLocalUser() || !$this->session->get('2fa')) { $this->logger->info('Invalid call', ['request' => $request]); return; } @@ -87,7 +88,7 @@ class Trust extends BaseModule switch ($action) { case 'trust': case 'dont_trust': - $trustedBrowser = $this->trustedBrowserFactory->createForUserWithUserAgent(local_user(), $this->server['HTTP_USER_AGENT'], $action === 'trust'); + $trustedBrowser = $this->trustedBrowserFactory->createForUserWithUserAgent(Session::getLocalUser(), $this->server['HTTP_USER_AGENT'], $action === 'trust'); try { $this->trustedBrowserRepository->save($trustedBrowser); @@ -115,7 +116,7 @@ class Trust extends BaseModule protected function content(array $request = []): string { - if (!local_user() || !$this->session->get('2fa')) { + if (!Session::getLocalUser() || !$this->session->get('2fa')) { $this->baseUrl->redirect(); } diff --git a/src/Module/Security/TwoFactor/Verify.php b/src/Module/Security/TwoFactor/Verify.php index d0850aedcb..93a9fd4dea 100644 --- a/src/Module/Security/TwoFactor/Verify.php +++ b/src/Module/Security/TwoFactor/Verify.php @@ -26,6 +26,7 @@ use Friendica\BaseModule; use Friendica\Core\L10n; use Friendica\Core\PConfig\Capability\IManagePersonalConfigValues; use Friendica\Core\Renderer; +use Friendica\Core\Session; use Friendica\Core\Session\Capability\IHandleSessions; use Friendica\Module\Response; use Friendica\Util\Profiler; @@ -57,7 +58,7 @@ class Verify extends BaseModule protected function post(array $request = []) { - if (!local_user()) { + if (!Session::getLocalUser()) { return; } @@ -66,7 +67,7 @@ class Verify extends BaseModule $code = $request['verify_code'] ?? ''; - $valid = (new Google2FA())->verifyKey($this->pConfig->get(local_user(), '2fa', 'secret'), $code); + $valid = (new Google2FA())->verifyKey($this->pConfig->get(Session::getLocalUser(), '2fa', 'secret'), $code); // The same code can't be used twice even if it's valid if ($valid && $this->session->get('2fa') !== $code) { @@ -81,7 +82,7 @@ class Verify extends BaseModule protected function content(array $request = []): string { - if (!local_user()) { + if (!Session::getLocalUser()) { $this->baseUrl->redirect(); } diff --git a/src/Module/Settings/Account.php b/src/Module/Settings/Account.php index bb262ab1ab..81690afd0c 100644 --- a/src/Module/Settings/Account.php +++ b/src/Module/Settings/Account.php @@ -26,6 +26,7 @@ use Friendica\Core\ACL; use Friendica\Core\Logger; use Friendica\Core\Renderer; use Friendica\Core\Search; +use Friendica\Core\Session; use Friendica\Core\Worker; use Friendica\Database\DBA; use Friendica\DI; @@ -68,9 +69,9 @@ class Account extends BaseSettings } // check if the old password was supplied correctly before changing it to the new value - User::getIdFromPasswordAuthentication(local_user(), $request['opassword']); + User::getIdFromPasswordAuthentication(Session::getLocalUser(), $request['opassword']); - $result = User::updatePassword(local_user(), $newpass); + $result = User::updatePassword(Session::getLocalUser(), $newpass); if (!DBA::isResult($result)) { throw new Exception(DI::l10n()->t('Password update failed. Please try again.')); } @@ -103,7 +104,7 @@ class Account extends BaseSettings if ($email != $user['email']) { // check for the correct password try { - User::getIdFromPasswordAuthentication(local_user(), $request['mpassword']); + User::getIdFromPasswordAuthentication(Session::getLocalUser(), $request['mpassword']); } catch (Exception $ex) { $err .= DI::l10n()->t('Wrong Password.'); $email = $user['email']; @@ -145,7 +146,7 @@ class Account extends BaseSettings $fields['openidserver'] = ''; } - if (!User::update($fields, local_user())) { + if (!User::update($fields, Session::getLocalUser())) { DI::sysmsg()->addNotice(DI::l10n()->t('Settings were not updated.')); } @@ -174,8 +175,8 @@ class Account extends BaseSettings $str_group_deny = !empty($request['group_deny']) ? $aclFormatter->toString($request['group_deny']) : ''; $str_contact_deny = !empty($request['contact_deny']) ? $aclFormatter->toString($request['contact_deny']) : ''; - DI::pConfig()->set(local_user(), 'system', 'unlisted', !empty($request['unlisted'])); - DI::pConfig()->set(local_user(), 'system', 'accessible-photos', !empty($request['accessible-photos'])); + DI::pConfig()->set(Session::getLocalUser(), 'system', 'unlisted', !empty($request['unlisted'])); + DI::pConfig()->set(Session::getLocalUser(), 'system', 'accessible-photos', !empty($request['accessible-photos'])); $fields = [ 'allow_cid' => $str_contact_allow, @@ -197,7 +198,7 @@ class Account extends BaseSettings 'hide-friends' => $hide_friends ]; - if (!User::update($fields, local_user()) || !Profile::update($profile_fields, local_user())) { + if (!User::update($fields, Session::getLocalUser()) || !Profile::update($profile_fields, Session::getLocalUser())) { DI::sysmsg()->addNotice(DI::l10n()->t('Settings were not updated.')); } @@ -212,12 +213,12 @@ class Account extends BaseSettings $expire_starred = !empty($request['expire_starred']); $expire_network_only = !empty($request['expire_network_only']); - DI::pConfig()->set(local_user(), 'expire', 'items', $expire_items); - DI::pConfig()->set(local_user(), 'expire', 'notes', $expire_notes); - DI::pConfig()->set(local_user(), 'expire', 'starred', $expire_starred); - DI::pConfig()->set(local_user(), 'expire', 'network_only', $expire_network_only); + DI::pConfig()->set(Session::getLocalUser(), 'expire', 'items', $expire_items); + DI::pConfig()->set(Session::getLocalUser(), 'expire', 'notes', $expire_notes); + DI::pConfig()->set(Session::getLocalUser(), 'expire', 'starred', $expire_starred); + DI::pConfig()->set(Session::getLocalUser(), 'expire', 'network_only', $expire_network_only); - if (!User::update(['expire' => $expire], local_user())) { + if (!User::update(['expire' => $expire], Session::getLocalUser())) { DI::sysmsg()->addNotice(DI::l10n()->t('Settings were not updated.')); } @@ -272,7 +273,7 @@ class Account extends BaseSettings if (!empty($request['notify_activity_participation'])) { $notify_type = $notify_type | UserNotification::TYPE_ACTIVITY_PARTICIPATION; } - DI::pConfig()->set(local_user(), 'system', 'notify_type', $notify_type); + DI::pConfig()->set(Session::getLocalUser(), 'system', 'notify_type', $notify_type); if (!($notify_type & (UserNotification::TYPE_DIRECT_COMMENT + UserNotification::TYPE_DIRECT_THREAD_COMMENT))) { $notify_like = false; @@ -280,28 +281,28 @@ class Account extends BaseSettings } // Reset like notifications when they are going to be shown again - if (!DI::pConfig()->get(local_user(), 'system', 'notify_like') && $notify_like) { - DI::notification()->setAllSeenForUser(local_user(), ['vid' => Verb::getID(Activity::LIKE)]); + if (!DI::pConfig()->get(Session::getLocalUser(), 'system', 'notify_like') && $notify_like) { + DI::notification()->setAllSeenForUser(Session::getLocalUser(), ['vid' => Verb::getID(Activity::LIKE)]); } - DI::pConfig()->set(local_user(), 'system', 'notify_like', $notify_like); + DI::pConfig()->set(Session::getLocalUser(), 'system', 'notify_like', $notify_like); // Reset share notifications when they are going to be shown again - if (!DI::pConfig()->get(local_user(), 'system', 'notify_announce') && $notify_announce) { - DI::notification()->setAllSeenForUser(local_user(), ['vid' => Verb::getID(Activity::ANNOUNCE)]); + if (!DI::pConfig()->get(Session::getLocalUser(), 'system', 'notify_announce') && $notify_announce) { + DI::notification()->setAllSeenForUser(Session::getLocalUser(), ['vid' => Verb::getID(Activity::ANNOUNCE)]); } - DI::pConfig()->set(local_user(), 'system', 'notify_announce', $notify_announce); + DI::pConfig()->set(Session::getLocalUser(), 'system', 'notify_announce', $notify_announce); - DI::pConfig()->set(local_user(), 'system', 'email_textonly', !empty($request['email_textonly'])); - DI::pConfig()->set(local_user(), 'system', 'detailed_notif', !empty($request['detailed_notif'])); - DI::pConfig()->set(local_user(), 'system', 'notify_ignored', !empty($request['notify_ignored'])); + DI::pConfig()->set(Session::getLocalUser(), 'system', 'email_textonly', !empty($request['email_textonly'])); + DI::pConfig()->set(Session::getLocalUser(), 'system', 'detailed_notif', !empty($request['detailed_notif'])); + DI::pConfig()->set(Session::getLocalUser(), 'system', 'notify_ignored', !empty($request['notify_ignored'])); $fields = [ 'notify-flags' => $notify, ]; - if (!User::update($fields, local_user())) { + if (!User::update($fields, Session::getLocalUser())) { DI::sysmsg()->addNotice(DI::l10n()->t('Settings were not updated.')); } @@ -327,7 +328,7 @@ class Account extends BaseSettings $profile_fields = []; if ($account_type == User::ACCOUNT_TYPE_COMMUNITY) { - DI::pConfig()->set(local_user(), 'system', 'unlisted', true); + DI::pConfig()->set(Session::getLocalUser(), 'system', 'unlisted', true); $fields = [ 'allow_cid' => '', @@ -350,7 +351,7 @@ class Account extends BaseSettings 'account-type' => $account_type, ]); - if (!User::update($fields, local_user()) || !empty($profile_fields) && !Profile::update($profile_fields, local_user())) { + if (!User::update($fields, Session::getLocalUser()) || !empty($profile_fields) && !Profile::update($profile_fields, Session::getLocalUser())) { DI::sysmsg()->addNotice(DI::l10n()->t('Settings were not updated.')); } @@ -375,7 +376,7 @@ class Account extends BaseSettings // "http" or "@" to be present in the string. // All other fields from the row will be ignored if ((strpos($csvRow[0], '@') !== false) || Network::isValidHttpUrl($csvRow[0])) { - Worker::add(Worker::PRIORITY_MEDIUM, 'AddContact', local_user(), $csvRow[0]); + Worker::add(Worker::PRIORITY_MEDIUM, 'AddContact', Session::getLocalUser(), $csvRow[0]); } else { Logger::notice('Invalid account', ['url' => $csvRow[0]]); } @@ -394,7 +395,7 @@ class Account extends BaseSettings } if (!empty($request['relocate-submit'])) { - Worker::add(Worker::PRIORITY_HIGH, 'Notifier', Delivery::RELOCATION, local_user()); + Worker::add(Worker::PRIORITY_HIGH, 'Notifier', Delivery::RELOCATION, Session::getLocalUser()); DI::sysmsg()->addInfo(DI::l10n()->t("Relocate message has been send to your contacts")); DI::baseUrl()->redirect($redirectUrl); } @@ -406,11 +407,11 @@ class Account extends BaseSettings { parent::content(); - if (!local_user()) { + if (!Session::getLocalUser()) { throw new HTTPException\ForbiddenException(DI::l10n()->t('Permission denied.')); } - $profile = DBA::selectFirst('profile', [], ['uid' => local_user()]); + $profile = DBA::selectFirst('profile', [], ['uid' => Session::getLocalUser()]); if (!DBA::isResult($profile)) { DI::sysmsg()->addNotice(DI::l10n()->t('Unable to find your profile. Please contact your admin.')); return ''; @@ -433,10 +434,10 @@ class Account extends BaseSettings $unkmail = $user['unkmail']; $cntunkmail = $user['cntunkmail']; - $expire_items = DI::pConfig()->get(local_user(), 'expire', 'items', true); - $expire_notes = DI::pConfig()->get(local_user(), 'expire', 'notes', true); - $expire_starred = DI::pConfig()->get(local_user(), 'expire', 'starred', true); - $expire_network_only = DI::pConfig()->get(local_user(), 'expire', 'network_only', false); + $expire_items = DI::pConfig()->get(Session::getLocalUser(), 'expire', 'items', true); + $expire_notes = DI::pConfig()->get(Session::getLocalUser(), 'expire', 'notes', true); + $expire_starred = DI::pConfig()->get(Session::getLocalUser(), 'expire', 'starred', true); + $expire_network_only = DI::pConfig()->get(Session::getLocalUser(), 'expire', 'network_only', false); if (!strlen($user['timezone'])) { $timezone = $a->getTimeZone(); @@ -550,7 +551,7 @@ class Account extends BaseSettings /* Installed langs */ $lang_choices = DI::l10n()->getAvailableLanguages(); - $notify_type = DI::pConfig()->get(local_user(), 'system', 'notify_type'); + $notify_type = DI::pConfig()->get(Session::getLocalUser(), 'system', 'notify_type'); $passwordRules = DI::l10n()->t('Allowed characters are a-z, A-Z, 0-9 and special characters except white spaces, accentuated letters and colon (:).') . (PASSWORD_DEFAULT === PASSWORD_BCRYPT ? ' ' . DI::l10n()->t('Password length is limited to 72 characters.') : ''); @@ -562,7 +563,7 @@ class Account extends BaseSettings '$submit' => DI::l10n()->t('Save Settings'), '$baseurl' => DI::baseUrl()->get(true), - '$uid' => local_user(), + '$uid' => Session::getLocalUser(), '$form_security_token' => self::getFormSecurityToken('settings'), '$open' => $this->parameters['open'] ?? 'password', @@ -590,13 +591,13 @@ class Account extends BaseSettings '$profile_in_net_dir' => ['profile_in_netdirectory', DI::l10n()->t('Allow your profile to be searchable globally?'), $profile['net-publish'], DI::l10n()->t("Activate this setting if you want others to easily find and follow you. Your profile will be searchable on remote systems. This setting also determines whether Friendica will inform search engines that your profile should be indexed or not.") . $net_pub_desc], '$hide_friends' => ['hide-friends', DI::l10n()->t('Hide your contact/friend list from viewers of your profile?'), $profile['hide-friends'], DI::l10n()->t('A list of your contacts is displayed on your profile page. Activate this option to disable the display of your contact list.')], '$hide_wall' => ['hidewall', DI::l10n()->t('Hide your profile details from anonymous viewers?'), $user['hidewall'], DI::l10n()->t('Anonymous visitors will only see your profile picture, your display name and the nickname you are using on your profile page. Your public posts and replies will still be accessible by other means.')], - '$unlisted' => ['unlisted', DI::l10n()->t('Make public posts unlisted'), DI::pConfig()->get(local_user(), 'system', 'unlisted'), DI::l10n()->t('Your public posts will not appear on the community pages or in search results, nor be sent to relay servers. However they can still appear on public feeds on remote servers.')], - '$accessiblephotos' => ['accessible-photos', DI::l10n()->t('Make all posted pictures accessible'), DI::pConfig()->get(local_user(), 'system', 'accessible-photos'), DI::l10n()->t("This option makes every posted picture accessible via the direct link. This is a workaround for the problem that most other networks can't handle permissions on pictures. Non public pictures still won't be visible for the public on your photo albums though.")], + '$unlisted' => ['unlisted', DI::l10n()->t('Make public posts unlisted'), DI::pConfig()->get(Session::getLocalUser(), 'system', 'unlisted'), DI::l10n()->t('Your public posts will not appear on the community pages or in search results, nor be sent to relay servers. However they can still appear on public feeds on remote servers.')], + '$accessiblephotos' => ['accessible-photos', DI::l10n()->t('Make all posted pictures accessible'), DI::pConfig()->get(Session::getLocalUser(), 'system', 'accessible-photos'), DI::l10n()->t("This option makes every posted picture accessible via the direct link. This is a workaround for the problem that most other networks can't handle permissions on pictures. Non public pictures still won't be visible for the public on your photo albums though.")], '$blockwall' => ['blockwall', DI::l10n()->t('Allow friends to post to your profile page?'), (intval($user['blockwall']) ? '0' : '1'), DI::l10n()->t('Your contacts may write posts on your profile wall. These posts will be distributed to your contacts')], '$blocktags' => ['blocktags', DI::l10n()->t('Allow friends to tag your posts?'), (intval($user['blocktags']) ? '0' : '1'), DI::l10n()->t('Your contacts can add additional tags to your posts.')], '$unkmail' => ['unkmail', DI::l10n()->t('Permit unknown people to send you private mail?'), $unkmail, DI::l10n()->t('Friendica network users may send you private messages even if they are not in your contact list.')], '$cntunkmail' => ['cntunkmail', DI::l10n()->t('Maximum private messages per day from unknown people:'), $cntunkmail, DI::l10n()->t("(to prevent spam abuse)")], - '$group_select' => Group::displayGroupSelection(local_user(), $user['def_gid']), + '$group_select' => Group::displayGroupSelection(Session::getLocalUser(), $user['def_gid']), '$permissions' => DI::l10n()->t('Default Post Permissions'), '$aclselect' => ACL::getFullSelectorHTML(DI::page(), $a->getLoggedInUserId()), @@ -622,8 +623,8 @@ class Account extends BaseSettings '$lbl_notify' => DI::l10n()->t('Create a desktop notification when:'), '$notify_tagged' => ['notify_tagged', DI::l10n()->t('Someone tagged you'), is_null($notify_type) || $notify_type & UserNotification::TYPE_EXPLICIT_TAGGED, ''], '$notify_direct_comment' => ['notify_direct_comment', DI::l10n()->t('Someone directly commented on your post'), is_null($notify_type) || $notify_type & (UserNotification::TYPE_IMPLICIT_TAGGED + UserNotification::TYPE_DIRECT_COMMENT + UserNotification::TYPE_DIRECT_THREAD_COMMENT), ''], - '$notify_like' => ['notify_like', DI::l10n()->t('Someone liked your content'), DI::pConfig()->get(local_user(), 'system', 'notify_like'), DI::l10n()->t('Can only be enabled, when the direct comment notification is enabled.')], - '$notify_announce' => ['notify_announce', DI::l10n()->t('Someone shared your content'), DI::pConfig()->get(local_user(), 'system', 'notify_announce'), DI::l10n()->t('Can only be enabled, when the direct comment notification is enabled.')], + '$notify_like' => ['notify_like', DI::l10n()->t('Someone liked your content'), DI::pConfig()->get(Session::getLocalUser(), 'system', 'notify_like'), DI::l10n()->t('Can only be enabled, when the direct comment notification is enabled.')], + '$notify_announce' => ['notify_announce', DI::l10n()->t('Someone shared your content'), DI::pConfig()->get(Session::getLocalUser(), 'system', 'notify_announce'), DI::l10n()->t('Can only be enabled, when the direct comment notification is enabled.')], '$notify_thread_comment' => ['notify_thread_comment', DI::l10n()->t('Someone commented in your thread'), is_null($notify_type) || $notify_type & UserNotification::TYPE_THREAD_COMMENT, ''], '$notify_comment_participation' => ['notify_comment_participation', DI::l10n()->t('Someone commented in a thread where you commented'), is_null($notify_type) || $notify_type & UserNotification::TYPE_COMMENT_PARTICIPATION, ''], '$notify_activity_participation' => ['notify_activity_participation', DI::l10n()->t('Someone commented in a thread where you interacted'), is_null($notify_type) || $notify_type & UserNotification::TYPE_ACTIVITY_PARTICIPATION, ''], @@ -633,19 +634,19 @@ class Account extends BaseSettings '$email_textonly' => [ 'email_textonly', DI::l10n()->t('Text-only notification emails'), - DI::pConfig()->get(local_user(), 'system', 'email_textonly'), + DI::pConfig()->get(Session::getLocalUser(), 'system', 'email_textonly'), DI::l10n()->t('Send text only notification emails, without the html part') ], '$detailed_notif' => [ 'detailed_notif', DI::l10n()->t('Show detailled notifications'), - DI::pConfig()->get(local_user(), 'system', 'detailed_notif'), + DI::pConfig()->get(Session::getLocalUser(), 'system', 'detailed_notif'), DI::l10n()->t('Per default, notifications are condensed to a single notification per item. When enabled every notification is displayed.') ], '$notify_ignored' => [ 'notify_ignored', DI::l10n()->t('Show notifications of ignored contacts'), - DI::pConfig()->get(local_user(), 'system', 'notify_ignored', true), + DI::pConfig()->get(Session::getLocalUser(), 'system', 'notify_ignored', true), DI::l10n()->t("You don't see posts from ignored contacts. But you still see their comments. This setting controls if you want to still receive regular notifications that are caused by ignored contacts or not.") ], diff --git a/src/Module/Update/Network.php b/src/Module/Update/Network.php index 6d452b70c0..c8eefab918 100644 --- a/src/Module/Update/Network.php +++ b/src/Module/Update/Network.php @@ -21,6 +21,7 @@ namespace Friendica\Module\Update; +use Friendica\Core\Session; use Friendica\Core\System; use Friendica\DI; use Friendica\Model\Item; @@ -75,7 +76,7 @@ class Network extends NetworkModule $ordering = '`commented`'; } - $o = DI::conversation()->create($items, 'network', $profile_uid, false, $ordering, local_user()); + $o = DI::conversation()->create($items, 'network', $profile_uid, false, $ordering, Session::getLocalUser()); } System::htmlUpdateExit($o); diff --git a/view/lang/C/messages.po b/view/lang/C/messages.po index 33b83ca217..5694c785ee 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-17 09:33+0000\n" +"POT-Creation-Date: 2022-10-19 08:56+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,22 +18,22 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" -#: mod/cal.php:46 mod/cal.php:50 mod/follow.php:39 mod/redir.php:36 +#: mod/cal.php:46 mod/cal.php:50 mod/follow.php:40 mod/redir.php:36 #: mod/redir.php:177 src/Module/Conversation/Community.php:196 -#: src/Module/Debug/ItemBody.php:38 src/Module/Diaspora/Receive.php:57 -#: src/Module/Item/Follow.php:42 src/Module/Item/Ignore.php:41 +#: src/Module/Debug/ItemBody.php:39 src/Module/Diaspora/Receive.php:57 +#: src/Module/Item/Follow.php:42 src/Module/Item/Ignore.php:42 #: src/Module/Item/Pin.php:42 src/Module/Item/Pin.php:57 #: src/Module/Item/Star.php:43 msgid "Access denied." msgstr "" #: mod/cal.php:63 mod/cal.php:80 mod/photos.php:69 mod/photos.php:140 -#: mod/photos.php:798 src/Model/Profile.php:235 src/Module/Feed.php:72 +#: mod/photos.php:794 src/Model/Profile.php:235 src/Module/Feed.php:73 #: src/Module/HCard.php:52 src/Module/Profile/Common.php:41 #: src/Module/Profile/Common.php:52 src/Module/Profile/Contacts.php:40 -#: src/Module/Profile/Contacts.php:50 src/Module/Profile/Media.php:38 -#: src/Module/Profile/Status.php:59 src/Module/Register.php:267 -#: src/Module/RemoteFollow.php:58 +#: src/Module/Profile/Contacts.php:50 src/Module/Profile/Media.php:39 +#: src/Module/Profile/Status.php:59 src/Module/Register.php:268 +#: src/Module/RemoteFollow.php:59 msgid "User not found." msgstr "" @@ -43,51 +43,51 @@ msgstr "" msgid "Access to this profile has been restricted." msgstr "" -#: mod/cal.php:243 mod/events.php:374 src/Content/Nav.php:197 +#: mod/cal.php:243 mod/events.php:376 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:240 -#: view/theme/frio/theme.php:244 +#: src/Module/BaseProfile.php:95 view/theme/frio/theme.php:242 +#: view/theme/frio/theme.php:246 msgid "Events" msgstr "" -#: mod/cal.php:244 mod/events.php:375 +#: mod/cal.php:244 mod/events.php:377 msgid "View" msgstr "" -#: mod/cal.php:245 mod/events.php:377 +#: mod/cal.php:245 mod/events.php:379 msgid "Previous" msgstr "" -#: mod/cal.php:246 mod/events.php:378 src/Module/Install.php:214 +#: mod/cal.php:246 mod/events.php:380 src/Module/Install.php:214 msgid "Next" msgstr "" -#: mod/cal.php:249 mod/events.php:383 src/Model/Event.php:460 +#: mod/cal.php:249 mod/events.php:385 src/Model/Event.php:461 msgid "today" msgstr "" -#: mod/cal.php:250 mod/events.php:384 src/Model/Event.php:461 -#: src/Util/Temporal.php:338 +#: mod/cal.php:250 mod/events.php:386 src/Model/Event.php:462 +#: src/Util/Temporal.php:342 msgid "month" msgstr "" -#: mod/cal.php:251 mod/events.php:385 src/Model/Event.php:462 -#: src/Util/Temporal.php:339 +#: mod/cal.php:251 mod/events.php:387 src/Model/Event.php:463 +#: src/Util/Temporal.php:343 msgid "week" msgstr "" -#: mod/cal.php:252 mod/events.php:386 src/Model/Event.php:463 -#: src/Util/Temporal.php:340 +#: mod/cal.php:252 mod/events.php:388 src/Model/Event.php:464 +#: src/Util/Temporal.php:344 msgid "day" msgstr "" -#: mod/cal.php:253 mod/events.php:387 +#: mod/cal.php:253 mod/events.php:389 msgid "list" msgstr "" #: mod/cal.php:265 src/Console/User.php:182 src/Model/User.php:663 -#: 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/Admin/Users/Active.php:74 src/Module/Admin/Users/Blocked.php:75 +#: src/Module/Admin/Users/Index.php:81 src/Module/Admin/Users/Pending.php:71 #: src/Module/Api/Twitter/ContactEndpoint.php:74 msgid "User not found" msgstr "" @@ -104,7 +104,7 @@ msgstr "" msgid "calendar" msgstr "" -#: mod/display.php:143 mod/photos.php:802 +#: mod/display.php:143 mod/photos.php:798 #: src/Module/Conversation/Community.php:190 src/Module/Directory.php:49 #: src/Module/Search/Index.php:65 msgid "Public access denied." @@ -118,243 +118,243 @@ msgstr "" msgid "The feed for this item is unavailable." msgstr "" -#: mod/editpost.php:38 mod/events.php:217 mod/follow.php:56 mod/follow.php:130 -#: mod/item.php:182 mod/item.php:187 mod/item.php:866 mod/message.php:69 -#: mod/message.php:111 mod/notes.php:44 mod/ostatus_subscribe.php:33 -#: mod/photos.php:160 mod/photos.php:891 mod/repair_ostatus.php:31 -#: mod/settings.php:40 mod/settings.php:50 mod/settings.php:156 -#: mod/suggest.php:34 mod/uimport.php:33 mod/unfollow.php:35 -#: mod/unfollow.php:50 mod/unfollow.php:82 mod/wall_attach.php:67 +#: mod/editpost.php:39 mod/events.php:219 mod/follow.php:57 mod/follow.php:131 +#: mod/item.php:182 mod/item.php:187 mod/item.php:865 mod/message.php:70 +#: mod/message.php:115 mod/notes.php:45 mod/ostatus_subscribe.php:34 +#: mod/photos.php:160 mod/photos.php:887 mod/repair_ostatus.php:32 +#: mod/settings.php:41 mod/settings.php:51 mod/settings.php:157 +#: mod/suggest.php:35 mod/uimport.php:33 mod/unfollow.php:36 +#: mod/unfollow.php:51 mod/unfollow.php:83 mod/wall_attach.php:67 #: mod/wall_attach.php:69 mod/wall_upload.php:89 mod/wall_upload.php:91 #: mod/wallmessage.php:37 mod/wallmessage.php:56 mod/wallmessage.php:90 -#: mod/wallmessage.php:110 src/Module/Attach.php:56 src/Module/BaseApi.php:93 -#: src/Module/BaseNotifications.php:97 src/Module/Contact/Advanced.php:60 -#: src/Module/Delegation.php:119 src/Module/FollowConfirm.php:38 -#: src/Module/FriendSuggest.php:56 src/Module/Group.php:42 -#: src/Module/Group.php:85 src/Module/Invite.php:42 src/Module/Invite.php:131 -#: src/Module/Notifications/Notification.php:75 -#: src/Module/Notifications/Notification.php:106 +#: mod/wallmessage.php:110 src/Module/Attach.php:56 src/Module/BaseApi.php:94 +#: src/Module/BaseNotifications.php:98 src/Module/Contact/Advanced.php:61 +#: src/Module/Delegation.php:118 src/Module/FollowConfirm.php:39 +#: src/Module/FriendSuggest.php:58 src/Module/Group.php:43 +#: src/Module/Group.php:86 src/Module/Invite.php:43 src/Module/Invite.php:132 +#: src/Module/Notifications/Notification.php:77 +#: src/Module/Notifications/Notification.php:108 #: src/Module/Profile/Common.php:56 src/Module/Profile/Contacts.php:56 -#: src/Module/Profile/Schedule.php:39 src/Module/Profile/Schedule.php:56 -#: src/Module/Register.php:77 src/Module/Register.php:90 -#: src/Module/Register.php:206 src/Module/Register.php:245 -#: src/Module/Search/Directory.php:37 src/Module/Settings/Account.php:50 -#: src/Module/Settings/Account.php:410 src/Module/Settings/Delegation.php:42 +#: src/Module/Profile/Schedule.php:40 src/Module/Profile/Schedule.php:57 +#: src/Module/Register.php:78 src/Module/Register.php:91 +#: src/Module/Register.php:207 src/Module/Register.php:246 +#: src/Module/Search/Directory.php:38 src/Module/Settings/Account.php:51 +#: src/Module/Settings/Account.php:411 src/Module/Settings/Delegation.php:42 #: src/Module/Settings/Delegation.php:70 src/Module/Settings/Display.php:42 #: src/Module/Settings/Display.php:120 #: src/Module/Settings/Profile/Photo/Crop.php:166 #: src/Module/Settings/Profile/Photo/Index.php:112 -#: 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:59 src/Module/Settings/UserExport.php:93 +#: src/Module/Settings/UserExport.php:197 +#: src/Module/Settings/UserExport.php:217 +#: src/Module/Settings/UserExport.php:282 msgid "Permission denied." msgstr "" -#: mod/editpost.php:45 mod/editpost.php:55 +#: mod/editpost.php:46 mod/editpost.php:56 msgid "Item not found" msgstr "" -#: mod/editpost.php:64 +#: mod/editpost.php:65 msgid "Edit post" msgstr "" -#: mod/editpost.php:91 mod/notes.php:56 src/Content/Text/HTML.php:882 -#: src/Module/Admin/Storage.php:142 src/Module/Filer/SaveTag.php:73 +#: mod/editpost.php:92 mod/notes.php:57 src/Content/Text/HTML.php:882 +#: src/Module/Admin/Storage.php:142 src/Module/Filer/SaveTag.php:75 msgid "Save" msgstr "" -#: mod/editpost.php:92 mod/photos.php:1338 src/Content/Conversation.php:338 +#: mod/editpost.php:93 mod/photos.php:1334 src/Content/Conversation.php:340 #: src/Object/Post.php:993 msgid "Loading..." msgstr "" -#: mod/editpost.php:93 mod/message.php:198 mod/message.php:355 -#: mod/wallmessage.php:140 src/Content/Conversation.php:339 +#: mod/editpost.php:94 mod/message.php:202 mod/message.php:358 +#: mod/wallmessage.php:140 src/Content/Conversation.php:341 msgid "Upload photo" msgstr "" -#: mod/editpost.php:94 src/Content/Conversation.php:340 +#: mod/editpost.php:95 src/Content/Conversation.php:342 msgid "upload photo" msgstr "" -#: mod/editpost.php:95 src/Content/Conversation.php:341 +#: mod/editpost.php:96 src/Content/Conversation.php:343 msgid "Attach file" msgstr "" -#: mod/editpost.php:96 src/Content/Conversation.php:342 +#: mod/editpost.php:97 src/Content/Conversation.php:344 msgid "attach file" msgstr "" -#: mod/editpost.php:97 mod/message.php:199 mod/message.php:356 +#: mod/editpost.php:98 mod/message.php:203 mod/message.php:359 #: mod/wallmessage.php:141 msgid "Insert web link" msgstr "" -#: mod/editpost.php:98 +#: mod/editpost.php:99 msgid "web link" msgstr "" -#: mod/editpost.php:99 +#: mod/editpost.php:100 msgid "Insert video link" msgstr "" -#: mod/editpost.php:100 +#: mod/editpost.php:101 msgid "video link" msgstr "" -#: mod/editpost.php:101 +#: mod/editpost.php:102 msgid "Insert audio link" msgstr "" -#: mod/editpost.php:102 +#: mod/editpost.php:103 msgid "audio link" msgstr "" -#: mod/editpost.php:103 src/Content/Conversation.php:352 -#: src/Module/Item/Compose.php:200 +#: mod/editpost.php:104 src/Content/Conversation.php:354 +#: src/Module/Item/Compose.php:201 msgid "Set your location" msgstr "" -#: mod/editpost.php:104 src/Content/Conversation.php:353 +#: mod/editpost.php:105 src/Content/Conversation.php:355 msgid "set location" msgstr "" -#: mod/editpost.php:105 src/Content/Conversation.php:354 +#: mod/editpost.php:106 src/Content/Conversation.php:356 msgid "Clear browser location" msgstr "" -#: mod/editpost.php:106 src/Content/Conversation.php:355 +#: mod/editpost.php:107 src/Content/Conversation.php:357 msgid "clear location" msgstr "" -#: mod/editpost.php:107 mod/message.php:200 mod/message.php:358 -#: mod/photos.php:1489 mod/wallmessage.php:142 src/Content/Conversation.php:368 -#: src/Content/Conversation.php:714 src/Module/Item/Compose.php:204 +#: mod/editpost.php:108 mod/message.php:204 mod/message.php:361 +#: mod/photos.php:1485 mod/wallmessage.php:142 src/Content/Conversation.php:370 +#: src/Content/Conversation.php:716 src/Module/Item/Compose.php:205 #: src/Object/Post.php:538 msgid "Please wait" msgstr "" -#: mod/editpost.php:108 src/Content/Conversation.php:369 +#: mod/editpost.php:109 src/Content/Conversation.php:371 msgid "Permission settings" msgstr "" -#: mod/editpost.php:116 src/Core/ACL.php:326 +#: mod/editpost.php:117 src/Core/ACL.php:326 msgid "CC: email addresses" msgstr "" -#: mod/editpost.php:117 src/Content/Conversation.php:379 +#: mod/editpost.php:118 src/Content/Conversation.php:381 msgid "Public post" msgstr "" -#: mod/editpost.php:120 src/Content/Conversation.php:357 -#: src/Module/Item/Compose.php:205 +#: mod/editpost.php:121 src/Content/Conversation.php:359 +#: src/Module/Item/Compose.php:206 msgid "Set title" msgstr "" -#: mod/editpost.php:122 src/Content/Conversation.php:359 -#: src/Module/Item/Compose.php:206 +#: mod/editpost.php:123 src/Content/Conversation.php:361 +#: src/Module/Item/Compose.php:207 msgid "Categories (comma-separated list)" msgstr "" -#: mod/editpost.php:123 src/Core/ACL.php:327 +#: mod/editpost.php:124 src/Core/ACL.php:327 msgid "Example: bob@example.com, mary@example.com" msgstr "" -#: mod/editpost.php:128 mod/events.php:513 mod/photos.php:1337 -#: mod/photos.php:1393 mod/photos.php:1467 src/Content/Conversation.php:383 -#: src/Module/Item/Compose.php:199 src/Object/Post.php:1003 +#: mod/editpost.php:129 mod/events.php:515 mod/photos.php:1333 +#: mod/photos.php:1389 mod/photos.php:1463 src/Content/Conversation.php:385 +#: src/Module/Item/Compose.php:200 src/Object/Post.php:1003 msgid "Preview" msgstr "" -#: mod/editpost.php:130 mod/fbrowser.php:119 mod/fbrowser.php:146 -#: mod/follow.php:144 mod/photos.php:1004 mod/photos.php:1105 mod/tagrm.php:35 -#: mod/tagrm.php:127 mod/unfollow.php:97 src/Content/Conversation.php:386 -#: src/Module/Contact/Revoke.php:108 src/Module/RemoteFollow.php:127 -#: src/Module/Security/TwoFactor/SignOut.php:125 +#: mod/editpost.php:131 mod/fbrowser.php:120 mod/fbrowser.php:147 +#: mod/follow.php:145 mod/photos.php:1000 mod/photos.php:1101 mod/tagrm.php:36 +#: mod/tagrm.php:128 mod/unfollow.php:98 src/Content/Conversation.php:388 +#: src/Module/Contact/Revoke.php:110 src/Module/RemoteFollow.php:128 +#: src/Module/Security/TwoFactor/SignOut.php:127 msgid "Cancel" msgstr "" -#: mod/editpost.php:134 src/Content/Conversation.php:343 -#: src/Module/Item/Compose.php:190 src/Object/Post.php:994 +#: mod/editpost.php:135 src/Content/Conversation.php:345 +#: src/Module/Item/Compose.php:191 src/Object/Post.php:994 msgid "Bold" msgstr "" -#: mod/editpost.php:135 src/Content/Conversation.php:344 -#: src/Module/Item/Compose.php:191 src/Object/Post.php:995 +#: mod/editpost.php:136 src/Content/Conversation.php:346 +#: src/Module/Item/Compose.php:192 src/Object/Post.php:995 msgid "Italic" msgstr "" -#: mod/editpost.php:136 src/Content/Conversation.php:345 -#: src/Module/Item/Compose.php:192 src/Object/Post.php:996 +#: mod/editpost.php:137 src/Content/Conversation.php:347 +#: src/Module/Item/Compose.php:193 src/Object/Post.php:996 msgid "Underline" msgstr "" -#: mod/editpost.php:137 src/Content/Conversation.php:346 -#: src/Module/Item/Compose.php:193 src/Object/Post.php:997 +#: mod/editpost.php:138 src/Content/Conversation.php:348 +#: src/Module/Item/Compose.php:194 src/Object/Post.php:997 msgid "Quote" msgstr "" -#: mod/editpost.php:138 src/Content/Conversation.php:347 -#: src/Module/Item/Compose.php:194 src/Object/Post.php:998 +#: mod/editpost.php:139 src/Content/Conversation.php:349 +#: src/Module/Item/Compose.php:195 src/Object/Post.php:998 msgid "Code" msgstr "" -#: mod/editpost.php:139 src/Content/Conversation.php:349 -#: src/Module/Item/Compose.php:196 src/Object/Post.php:1000 +#: mod/editpost.php:140 src/Content/Conversation.php:351 +#: src/Module/Item/Compose.php:197 src/Object/Post.php:1000 msgid "Link" msgstr "" -#: mod/editpost.php:140 src/Content/Conversation.php:350 -#: src/Module/Item/Compose.php:197 src/Object/Post.php:1001 +#: mod/editpost.php:141 src/Content/Conversation.php:352 +#: src/Module/Item/Compose.php:198 src/Object/Post.php:1001 msgid "Link or Media" msgstr "" -#: mod/editpost.php:143 src/Content/Conversation.php:393 -#: src/Content/Widget/VCard.php:113 src/Model/Profile.php:466 +#: mod/editpost.php:144 src/Content/Conversation.php:395 +#: src/Content/Widget/VCard.php:114 src/Model/Profile.php:466 #: src/Module/Admin/Logs/View.php:93 msgid "Message" msgstr "" -#: mod/editpost.php:144 src/Content/Conversation.php:394 -#: src/Module/Settings/TwoFactor/Trusted.php:138 +#: mod/editpost.php:145 src/Content/Conversation.php:396 +#: src/Module/Settings/TwoFactor/Trusted.php:140 msgid "Browser" msgstr "" -#: mod/editpost.php:145 mod/events.php:518 mod/photos.php:939 -#: mod/photos.php:1291 src/Content/Conversation.php:370 +#: mod/editpost.php:146 mod/events.php:520 mod/photos.php:935 +#: mod/photos.php:1287 src/Content/Conversation.php:372 msgid "Permissions" msgstr "" -#: mod/editpost.php:147 src/Content/Conversation.php:396 +#: mod/editpost.php:148 src/Content/Conversation.php:398 msgid "Open Compose page" msgstr "" -#: mod/events.php:124 mod/events.php:126 +#: mod/events.php:125 mod/events.php:127 msgid "Event can not end before it has started." msgstr "" -#: mod/events.php:132 mod/events.php:134 +#: mod/events.php:133 mod/events.php:135 msgid "Event title and start time are required." msgstr "" -#: mod/events.php:376 +#: mod/events.php:378 msgid "Create New Event" msgstr "" -#: mod/events.php:474 src/Module/Admin/Logs/View.php:97 +#: mod/events.php:476 src/Module/Admin/Logs/View.php:97 msgid "Event details" msgstr "" -#: mod/events.php:475 +#: mod/events.php:477 msgid "Starting date and Title are required." msgstr "" -#: mod/events.php:476 mod/events.php:481 +#: mod/events.php:478 mod/events.php:483 msgid "Event Starts:" msgstr "" -#: mod/events.php:476 mod/events.php:506 +#: mod/events.php:478 mod/events.php:508 #: src/Module/Admin/Blocklist/Server/Add.php:136 #: src/Module/Admin/Blocklist/Server/Add.php:138 #: src/Module/Admin/Blocklist/Server/Import.php:128 @@ -362,156 +362,156 @@ msgstr "" #: 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/Item/Delete.php:69 src/Module/Debug/Probe.php:59 +#: src/Module/Admin/Item/Delete.php:69 src/Module/Debug/Probe.php:60 #: src/Module/Install.php:207 src/Module/Install.php:240 #: src/Module/Install.php:245 src/Module/Install.php:264 #: src/Module/Install.php:275 src/Module/Install.php:280 #: 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:101 +#: src/Module/Install.php:347 src/Module/Register.php:149 +#: src/Module/Security/TwoFactor/Verify.php:102 #: src/Module/Settings/TwoFactor/Index.php:141 -#: src/Module/Settings/TwoFactor/Verify.php:154 +#: src/Module/Settings/TwoFactor/Verify.php:155 msgid "Required" msgstr "" -#: mod/events.php:489 mod/events.php:512 +#: mod/events.php:491 mod/events.php:514 msgid "Finish date/time is not known or not relevant" msgstr "" -#: mod/events.php:491 mod/events.php:496 +#: mod/events.php:493 mod/events.php:498 msgid "Event Finishes:" msgstr "" -#: mod/events.php:502 src/Module/Profile/Profile.php:172 -#: src/Module/Settings/Profile/Index.php:238 +#: mod/events.php:504 src/Module/Profile/Profile.php:172 +#: src/Module/Settings/Profile/Index.php:239 msgid "Description:" msgstr "" -#: mod/events.php:504 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:374 src/Module/Contact/Profile.php:369 -#: src/Module/Directory.php:148 src/Module/Notifications/Introductions.php:185 +#: mod/events.php:506 src/Content/Widget/VCard.php:105 src/Model/Event.php:81 +#: src/Model/Event.php:108 src/Model/Event.php:470 src/Model/Event.php:920 +#: src/Model/Profile.php:374 src/Module/Contact/Profile.php:371 +#: src/Module/Directory.php:148 src/Module/Notifications/Introductions.php:187 #: src/Module/Profile/Profile.php:194 msgid "Location:" msgstr "" -#: mod/events.php:506 mod/events.php:508 +#: mod/events.php:508 mod/events.php:510 msgid "Title:" msgstr "" -#: mod/events.php:509 mod/events.php:510 +#: mod/events.php:511 mod/events.php:512 msgid "Share this event" msgstr "" -#: mod/events.php:515 mod/message.php:201 mod/message.php:357 -#: mod/photos.php:921 mod/photos.php:1025 mod/photos.php:1295 -#: mod/photos.php:1336 mod/photos.php:1392 mod/photos.php:1466 -#: src/Module/Admin/Item/Source.php:60 src/Module/Contact/Advanced.php:132 -#: src/Module/Contact/Profile.php:327 -#: src/Module/Debug/ActivityPubConversion.php:140 +#: mod/events.php:517 mod/message.php:205 mod/message.php:360 +#: mod/photos.php:917 mod/photos.php:1021 mod/photos.php:1291 +#: mod/photos.php:1332 mod/photos.php:1388 mod/photos.php:1462 +#: src/Module/Admin/Item/Source.php:60 src/Module/Contact/Advanced.php:133 +#: src/Module/Contact/Profile.php:329 +#: src/Module/Debug/ActivityPubConversion.php:141 #: src/Module/Debug/Babel.php:313 src/Module/Debug/Localtime.php:64 -#: src/Module/Debug/Probe.php:54 src/Module/Debug/WebFinger.php:51 -#: src/Module/Delegation.php:148 src/Module/FriendSuggest.php:144 +#: src/Module/Debug/Probe.php:55 src/Module/Debug/WebFinger.php:52 +#: src/Module/Delegation.php:147 src/Module/FriendSuggest.php:146 #: 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:247 -#: src/Module/Settings/Profile/Index.php:222 src/Object/Post.php:992 -#: view/theme/duepuntozero/config.php:69 view/theme/frio/config.php:171 -#: view/theme/quattro/config.php:71 view/theme/vier/config.php:119 +#: src/Module/Install.php:331 src/Module/Invite.php:179 +#: src/Module/Item/Compose.php:190 src/Module/Profile/Profile.php:247 +#: src/Module/Settings/Profile/Index.php:223 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 msgid "Submit" msgstr "" -#: mod/events.php:516 src/Module/Profile/Profile.php:248 +#: mod/events.php:518 src/Module/Profile/Profile.php:248 msgid "Basic" msgstr "" -#: mod/events.php:517 src/Module/Admin/Site.php:439 src/Module/Contact.php:477 +#: mod/events.php:519 src/Module/Admin/Site.php:439 src/Module/Contact.php:478 #: src/Module/Profile/Profile.php:249 msgid "Advanced" msgstr "" -#: mod/events.php:534 +#: mod/events.php:536 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:238 +#: mod/fbrowser.php:62 src/Content/Nav.php:195 src/Module/BaseProfile.php:64 +#: view/theme/frio/theme.php:240 msgid "Photos" msgstr "" -#: mod/fbrowser.php:121 mod/fbrowser.php:148 +#: mod/fbrowser.php:122 mod/fbrowser.php:149 #: src/Module/Settings/Profile/Photo/Index.php:129 msgid "Upload" msgstr "" -#: mod/fbrowser.php:143 +#: mod/fbrowser.php:144 msgid "Files" msgstr "" -#: mod/follow.php:74 mod/unfollow.php:96 src/Module/RemoteFollow.php:126 +#: mod/follow.php:75 mod/unfollow.php:97 src/Module/RemoteFollow.php:127 msgid "Submit Request" msgstr "" -#: mod/follow.php:84 +#: mod/follow.php:85 msgid "You already added this contact." msgstr "" -#: mod/follow.php:100 +#: mod/follow.php:101 msgid "The network type couldn't be detected. Contact can't be added." msgstr "" -#: mod/follow.php:108 +#: mod/follow.php:109 msgid "Diaspora support isn't enabled. Contact can't be added." msgstr "" -#: mod/follow.php:113 +#: mod/follow.php:114 msgid "OStatus support is disabled. Contact can't be added." msgstr "" -#: mod/follow.php:138 src/Content/Item.php:400 src/Content/Widget.php:80 +#: mod/follow.php:139 src/Content/Item.php:401 src/Content/Widget.php:81 #: src/Model/Contact.php:1169 src/Model/Contact.php:1180 -#: view/theme/vier/theme.php:181 +#: view/theme/vier/theme.php:199 msgid "Connect/Follow" msgstr "" -#: mod/follow.php:139 src/Module/RemoteFollow.php:125 +#: mod/follow.php:140 src/Module/RemoteFollow.php:126 msgid "Please answer the following:" msgstr "" -#: mod/follow.php:140 mod/unfollow.php:94 +#: mod/follow.php:141 mod/unfollow.php:95 msgid "Your Identity Address:" msgstr "" -#: mod/follow.php:141 mod/unfollow.php:100 +#: mod/follow.php:142 mod/unfollow.php:101 #: src/Module/Admin/Blocklist/Contact.php:116 -#: src/Module/Contact/Profile.php:365 -#: src/Module/Notifications/Introductions.php:127 -#: src/Module/Notifications/Introductions.php:196 +#: src/Module/Contact/Profile.php:367 +#: 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:377 -#: src/Module/Notifications/Introductions.php:189 +#: mod/follow.php:143 src/Module/Contact/Profile.php:379 +#: src/Module/Notifications/Introductions.php:191 #: src/Module/Profile/Profile.php:207 msgid "Tags:" msgstr "" -#: mod/follow.php:153 +#: mod/follow.php:154 #, php-format msgid "%s knows you" msgstr "" -#: mod/follow.php:154 +#: mod/follow.php:155 msgid "Add a personal note:" msgstr "" -#: mod/follow.php:163 mod/unfollow.php:109 src/Module/BaseProfile.php:59 -#: src/Module/Contact.php:447 +#: mod/follow.php:164 mod/unfollow.php:110 src/Module/BaseProfile.php:59 +#: src/Module/Contact.php:448 msgid "Status Messages and Posts" msgstr "" -#: mod/follow.php:191 +#: mod/follow.php:192 msgid "The contact could not be added." msgstr "" @@ -523,21 +523,21 @@ msgstr "" msgid "Empty post discarded." msgstr "" -#: mod/item.php:678 +#: mod/item.php:675 msgid "Post updated." msgstr "" -#: mod/item.php:688 mod/item.php:693 +#: mod/item.php:685 mod/item.php:690 msgid "Item wasn't stored." msgstr "" -#: mod/item.php:704 +#: mod/item.php:701 msgid "Item couldn't be fetched." msgstr "" -#: mod/item.php:844 src/Module/Admin/Themes/Details.php:39 -#: src/Module/Admin/Themes/Index.php:59 src/Module/Debug/ItemBody.php:42 -#: src/Module/Debug/ItemBody.php:57 +#: mod/item.php:841 src/Module/Admin/Themes/Details.php:39 +#: src/Module/Admin/Themes/Index.php:59 src/Module/Debug/ItemBody.php:43 +#: src/Module/Debug/ItemBody.php:58 msgid "Item not found." msgstr "" @@ -610,7 +610,7 @@ msgid "" "your email for further instructions." msgstr "" -#: mod/lostpass.php:130 src/Module/Security/Login.php:161 +#: mod/lostpass.php:130 src/Module/Security/Login.php:162 msgid "Nickname or Email: " msgstr "" @@ -618,7 +618,7 @@ msgstr "" msgid "Reset" msgstr "" -#: mod/lostpass.php:146 src/Module/Security/Login.php:173 +#: mod/lostpass.php:146 src/Module/Security/Login.php:174 msgid "Password Reset" msgstr "" @@ -679,142 +679,142 @@ msgstr "" msgid "Your password has been changed at %s" msgstr "" -#: mod/match.php:62 +#: mod/match.php:63 msgid "No keywords to match. Please add keywords to your profile." msgstr "" -#: mod/match.php:93 src/Module/BaseSearch.php:119 +#: mod/match.php:94 src/Module/BaseSearch.php:120 msgid "No matches" msgstr "" -#: mod/match.php:98 +#: mod/match.php:99 msgid "Profile Match" msgstr "" -#: mod/message.php:46 mod/message.php:126 src/Content/Nav.php:289 +#: mod/message.php:47 mod/message.php:130 src/Content/Nav.php:289 msgid "New Message" msgstr "" -#: mod/message.php:83 mod/wallmessage.php:70 +#: mod/message.php:84 mod/wallmessage.php:70 msgid "No recipient selected." msgstr "" -#: mod/message.php:87 +#: mod/message.php:89 msgid "Unable to locate contact information." msgstr "" -#: mod/message.php:90 mod/wallmessage.php:76 +#: mod/message.php:93 mod/wallmessage.php:76 msgid "Message could not be sent." msgstr "" -#: mod/message.php:93 mod/wallmessage.php:79 +#: mod/message.php:97 mod/wallmessage.php:79 msgid "Message collection failure." msgstr "" -#: mod/message.php:120 src/Module/Notifications/Introductions.php:133 -#: src/Module/Notifications/Introductions.php:168 -#: src/Module/Notifications/Notification.php:84 +#: mod/message.php:124 src/Module/Notifications/Introductions.php:135 +#: src/Module/Notifications/Introductions.php:170 +#: src/Module/Notifications/Notification.php:86 msgid "Discard" msgstr "" -#: mod/message.php:133 src/Content/Nav.php:286 view/theme/frio/theme.php:245 +#: mod/message.php:137 src/Content/Nav.php:286 view/theme/frio/theme.php:247 msgid "Messages" msgstr "" -#: mod/message.php:146 +#: mod/message.php:150 msgid "Conversation not found." msgstr "" -#: mod/message.php:151 +#: mod/message.php:155 msgid "Message was not deleted." msgstr "" -#: mod/message.php:166 +#: mod/message.php:170 msgid "Conversation was not removed." msgstr "" -#: mod/message.php:180 mod/message.php:286 mod/wallmessage.php:124 +#: mod/message.php:184 mod/message.php:290 mod/wallmessage.php:124 msgid "Please enter a link URL:" msgstr "" -#: mod/message.php:189 mod/wallmessage.php:129 +#: mod/message.php:193 mod/wallmessage.php:129 msgid "Send Private Message" msgstr "" -#: mod/message.php:190 mod/message.php:347 mod/wallmessage.php:131 +#: mod/message.php:194 mod/message.php:350 mod/wallmessage.php:131 msgid "To:" msgstr "" -#: mod/message.php:191 mod/message.php:348 mod/wallmessage.php:132 +#: mod/message.php:195 mod/message.php:351 mod/wallmessage.php:132 msgid "Subject:" msgstr "" -#: mod/message.php:195 mod/message.php:351 mod/wallmessage.php:138 -#: src/Module/Invite.php:171 +#: mod/message.php:199 mod/message.php:354 mod/wallmessage.php:138 +#: src/Module/Invite.php:172 msgid "Your message:" msgstr "" -#: mod/message.php:222 +#: mod/message.php:226 msgid "No messages." msgstr "" -#: mod/message.php:278 +#: mod/message.php:282 msgid "Message not available." msgstr "" -#: mod/message.php:323 +#: mod/message.php:327 msgid "Delete message" msgstr "" -#: mod/message.php:325 mod/message.php:457 +#: mod/message.php:329 mod/message.php:460 msgid "D, d M Y - g:i A" msgstr "" -#: mod/message.php:340 mod/message.php:454 +#: mod/message.php:344 mod/message.php:457 msgid "Delete conversation" msgstr "" -#: mod/message.php:342 +#: mod/message.php:346 msgid "" "No secure communications available. You may be able to " "respond from the sender's profile page." msgstr "" -#: mod/message.php:346 +#: mod/message.php:349 msgid "Send Reply" msgstr "" -#: mod/message.php:428 +#: mod/message.php:431 #, php-format msgid "Unknown sender - %s" msgstr "" -#: mod/message.php:430 +#: mod/message.php:433 #, php-format msgid "You and %s" msgstr "" -#: mod/message.php:432 +#: mod/message.php:435 #, php-format msgid "%s and You" msgstr "" -#: mod/message.php:460 +#: mod/message.php:463 #, php-format msgid "%d message" msgid_plural "%d messages" msgstr[0] "" msgstr[1] "" -#: mod/notes.php:51 src/Module/BaseProfile.php:106 +#: mod/notes.php:52 src/Module/BaseProfile.php:106 msgid "Personal Notes" msgstr "" -#: mod/notes.php:55 +#: mod/notes.php:56 msgid "Personal notes are visible only by yourself." msgstr "" -#: mod/ostatus_subscribe.php:38 +#: mod/ostatus_subscribe.php:39 msgid "Subscribing to contacts" msgstr "" @@ -842,7 +842,7 @@ msgstr "" msgid "Unsupported network" msgstr "" -#: mod/ostatus_subscribe.php:103 mod/repair_ostatus.php:51 +#: mod/ostatus_subscribe.php:103 mod/repair_ostatus.php:52 msgid "Done" msgstr "" @@ -858,7 +858,7 @@ msgstr "" msgid "ignored" msgstr "" -#: mod/ostatus_subscribe.php:127 mod/repair_ostatus.php:57 +#: mod/ostatus_subscribe.php:127 mod/repair_ostatus.php:58 msgid "Keep this window open until done." msgstr "" @@ -866,11 +866,11 @@ msgstr "" msgid "Photo Albums" msgstr "" -#: mod/photos.php:109 mod/photos.php:1584 +#: mod/photos.php:109 mod/photos.php:1580 msgid "Recent Photos" msgstr "" -#: mod/photos.php:111 mod/photos.php:1073 mod/photos.php:1586 +#: mod/photos.php:111 mod/photos.php:1069 mod/photos.php:1582 msgid "Upload New Photos" msgstr "" @@ -907,210 +907,210 @@ msgstr "" msgid "%1$s was tagged in %2$s by %3$s" msgstr "" -#: mod/photos.php:636 mod/photos.php:639 mod/photos.php:666 +#: mod/photos.php:632 mod/photos.php:635 mod/photos.php:662 #: mod/wall_upload.php:201 src/Module/Settings/Profile/Photo/Index.php:60 #, php-format msgid "Image exceeds size limit of %s" msgstr "" -#: mod/photos.php:642 +#: mod/photos.php:638 msgid "Image upload didn't complete, please try again" msgstr "" -#: mod/photos.php:645 +#: mod/photos.php:641 msgid "Image file is missing" msgstr "" -#: mod/photos.php:650 +#: mod/photos.php:646 msgid "" "Server can't accept new file upload at this time, please contact your " "administrator" msgstr "" -#: mod/photos.php:674 +#: mod/photos.php:670 msgid "Image file is empty." msgstr "" -#: mod/photos.php:689 mod/wall_upload.php:163 +#: mod/photos.php:685 mod/wall_upload.php:163 #: src/Module/Settings/Profile/Photo/Index.php:69 msgid "Unable to process image." msgstr "" -#: mod/photos.php:715 mod/wall_upload.php:226 +#: mod/photos.php:711 mod/wall_upload.php:226 #: src/Module/Settings/Profile/Photo/Index.php:96 msgid "Image upload failed." msgstr "" -#: mod/photos.php:807 +#: mod/photos.php:803 msgid "No photos selected" msgstr "" -#: mod/photos.php:876 +#: mod/photos.php:872 msgid "Access to this item is restricted." msgstr "" -#: mod/photos.php:931 +#: mod/photos.php:927 msgid "Upload Photos" msgstr "" -#: mod/photos.php:935 mod/photos.php:1021 +#: mod/photos.php:931 mod/photos.php:1017 msgid "New album name: " msgstr "" -#: mod/photos.php:936 +#: mod/photos.php:932 msgid "or select existing album:" msgstr "" -#: mod/photos.php:937 +#: mod/photos.php:933 msgid "Do not show a status post for this upload" msgstr "" -#: mod/photos.php:1002 +#: mod/photos.php:998 msgid "Do you really want to delete this photo album and all its photos?" msgstr "" -#: mod/photos.php:1003 mod/photos.php:1026 +#: mod/photos.php:999 mod/photos.php:1022 msgid "Delete Album" msgstr "" -#: mod/photos.php:1030 +#: mod/photos.php:1026 msgid "Edit Album" msgstr "" -#: mod/photos.php:1031 +#: mod/photos.php:1027 msgid "Drop Album" msgstr "" -#: mod/photos.php:1035 +#: mod/photos.php:1031 msgid "Show Newest First" msgstr "" -#: mod/photos.php:1037 +#: mod/photos.php:1033 msgid "Show Oldest First" msgstr "" -#: mod/photos.php:1058 mod/photos.php:1569 +#: mod/photos.php:1054 mod/photos.php:1565 msgid "View Photo" msgstr "" -#: mod/photos.php:1091 +#: mod/photos.php:1087 msgid "Permission denied. Access to this item may be restricted." msgstr "" -#: mod/photos.php:1093 +#: mod/photos.php:1089 msgid "Photo not available" msgstr "" -#: mod/photos.php:1103 +#: mod/photos.php:1099 msgid "Do you really want to delete this photo?" msgstr "" -#: mod/photos.php:1104 mod/photos.php:1296 +#: mod/photos.php:1100 mod/photos.php:1292 msgid "Delete Photo" msgstr "" -#: mod/photos.php:1196 +#: mod/photos.php:1192 msgid "View photo" msgstr "" -#: mod/photos.php:1198 +#: mod/photos.php:1194 msgid "Edit photo" msgstr "" -#: mod/photos.php:1199 +#: mod/photos.php:1195 msgid "Delete photo" msgstr "" -#: mod/photos.php:1200 +#: mod/photos.php:1196 msgid "Use as profile photo" msgstr "" -#: mod/photos.php:1207 +#: mod/photos.php:1203 msgid "Private Photo" msgstr "" -#: mod/photos.php:1213 +#: mod/photos.php:1209 msgid "View Full Size" msgstr "" -#: mod/photos.php:1264 +#: mod/photos.php:1260 msgid "Tags: " msgstr "" -#: mod/photos.php:1267 +#: mod/photos.php:1263 msgid "[Select tags to remove]" msgstr "" -#: mod/photos.php:1282 +#: mod/photos.php:1278 msgid "New album name" msgstr "" -#: mod/photos.php:1283 +#: mod/photos.php:1279 msgid "Caption" msgstr "" -#: mod/photos.php:1284 +#: mod/photos.php:1280 msgid "Add a Tag" msgstr "" -#: mod/photos.php:1284 +#: mod/photos.php:1280 msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" msgstr "" -#: mod/photos.php:1285 +#: mod/photos.php:1281 msgid "Do not rotate" msgstr "" -#: mod/photos.php:1286 +#: mod/photos.php:1282 msgid "Rotate CW (right)" msgstr "" -#: mod/photos.php:1287 +#: mod/photos.php:1283 msgid "Rotate CCW (left)" msgstr "" -#: mod/photos.php:1333 mod/photos.php:1389 mod/photos.php:1463 -#: src/Module/Contact.php:547 src/Module/Item/Compose.php:188 +#: mod/photos.php:1329 mod/photos.php:1385 mod/photos.php:1459 +#: src/Module/Contact.php:548 src/Module/Item/Compose.php:189 #: src/Object/Post.php:989 msgid "This is you" msgstr "" -#: mod/photos.php:1335 mod/photos.php:1391 mod/photos.php:1465 +#: mod/photos.php:1331 mod/photos.php:1387 mod/photos.php:1461 #: src/Object/Post.php:532 src/Object/Post.php:991 msgid "Comment" msgstr "" -#: mod/photos.php:1424 src/Content/Conversation.php:630 src/Object/Post.php:256 +#: mod/photos.php:1420 src/Content/Conversation.php:632 src/Object/Post.php:256 msgid "Select" msgstr "" -#: mod/photos.php:1425 mod/settings.php:350 src/Content/Conversation.php:631 -#: src/Module/Admin/Users/Active.php:139 src/Module/Admin/Users/Blocked.php:140 -#: src/Module/Admin/Users/Index.php:153 +#: mod/photos.php:1421 mod/settings.php:351 src/Content/Conversation.php:633 +#: src/Module/Admin/Users/Active.php:140 src/Module/Admin/Users/Blocked.php:141 +#: src/Module/Admin/Users/Index.php:154 msgid "Delete" msgstr "" -#: mod/photos.php:1486 src/Object/Post.php:379 +#: mod/photos.php:1482 src/Object/Post.php:379 msgid "Like" msgstr "" -#: mod/photos.php:1487 src/Object/Post.php:379 +#: mod/photos.php:1483 src/Object/Post.php:379 msgid "I like this (toggle)" msgstr "" -#: mod/photos.php:1488 src/Object/Post.php:380 +#: mod/photos.php:1484 src/Object/Post.php:380 msgid "Dislike" msgstr "" -#: mod/photos.php:1490 src/Object/Post.php:380 +#: mod/photos.php:1486 src/Object/Post.php:380 msgid "I don't like this (toggle)" msgstr "" -#: mod/photos.php:1512 +#: mod/photos.php:1508 msgid "Map" msgstr "" -#: mod/photos.php:1575 +#: mod/photos.php:1571 msgid "View Album" msgstr "" @@ -1118,177 +1118,177 @@ msgstr "" msgid "Bad Request." msgstr "" -#: mod/redir.php:57 mod/redir.php:131 src/Module/Contact/Advanced.php:70 -#: src/Module/Contact/Advanced.php:109 src/Module/Contact/Contacts.php:55 -#: src/Module/Contact/Conversations.php:78 -#: src/Module/Contact/Conversations.php:83 -#: src/Module/Contact/Conversations.php:88 src/Module/Contact/Media.php:43 -#: src/Module/Contact/Posts.php:72 src/Module/Contact/Posts.php:77 -#: src/Module/Contact/Posts.php:82 src/Module/Contact/Profile.php:141 -#: src/Module/Contact/Profile.php:146 src/Module/Contact/Profile.php:151 -#: src/Module/FriendSuggest.php:70 src/Module/FriendSuggest.php:108 -#: src/Module/Group.php:99 src/Module/Group.php:108 +#: mod/redir.php:57 mod/redir.php:131 src/Module/Contact/Advanced.php:71 +#: src/Module/Contact/Advanced.php:110 src/Module/Contact/Contacts.php:54 +#: 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/FriendSuggest.php:72 src/Module/FriendSuggest.php:110 +#: src/Module/Group.php:100 src/Module/Group.php:109 msgid "Contact not found." msgstr "" -#: mod/removeme.php:65 src/Navigation/Notifications/Repository/Notify.php:467 +#: mod/removeme.php:66 src/Navigation/Notifications/Repository/Notify.php:467 msgid "[Friendica System Notify]" msgstr "" -#: mod/removeme.php:65 +#: mod/removeme.php:66 msgid "User deleted their account" msgstr "" -#: mod/removeme.php:66 +#: mod/removeme.php:67 msgid "" "On your Friendica node an user deleted their account. Please ensure that " "their data is removed from the backups." msgstr "" -#: mod/removeme.php:67 +#: mod/removeme.php:68 #, php-format msgid "The user id is %d" msgstr "" -#: mod/removeme.php:101 mod/removeme.php:104 +#: mod/removeme.php:102 mod/removeme.php:105 msgid "Remove My Account" msgstr "" -#: mod/removeme.php:102 +#: mod/removeme.php:103 msgid "" "This will completely remove your account. Once this has been done it is not " "recoverable." msgstr "" -#: mod/removeme.php:103 +#: mod/removeme.php:104 msgid "Please enter your password for verification:" msgstr "" -#: mod/repair_ostatus.php:36 +#: mod/repair_ostatus.php:37 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:98 +#: mod/repair_ostatus.php:47 src/Module/Debug/ActivityPubConversion.php:130 +#: src/Module/Debug/Babel.php:293 src/Module/Security/TwoFactor/Verify.php:99 msgid "Error" msgid_plural "Errors" msgstr[0] "" msgstr[1] "" -#: mod/settings.php:122 +#: mod/settings.php:123 msgid "Failed to connect with email account using the settings provided." msgstr "" -#: mod/settings.php:175 +#: mod/settings.php:176 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:130 +#: mod/settings.php:177 src/Module/Admin/Blocklist/Contact.php:106 +#: src/Module/Admin/Users/Active.php:130 src/Module/Admin/Users/Blocked.php:131 #: src/Module/Admin/Users/Create.php:71 src/Module/Admin/Users/Deleted.php:88 -#: src/Module/Admin/Users/Index.php:142 src/Module/Admin/Users/Index.php:162 -#: src/Module/Admin/Users/Pending.php:104 src/Module/Contact/Advanced.php:134 +#: src/Module/Admin/Users/Index.php:143 src/Module/Admin/Users/Index.php:163 +#: src/Module/Admin/Users/Pending.php:104 src/Module/Contact/Advanced.php:135 msgid "Name" msgstr "" -#: mod/settings.php:177 src/Content/Nav.php:215 +#: mod/settings.php:178 src/Content/Nav.php:215 msgid "Home Page" msgstr "" -#: mod/settings.php:178 src/Module/Admin/Queue.php:78 +#: mod/settings.php:179 src/Module/Admin/Queue.php:78 msgid "Created" msgstr "" -#: mod/settings.php:179 +#: mod/settings.php:180 msgid "Remove authorization" msgstr "" -#: mod/settings.php:205 mod/settings.php:237 mod/settings.php:268 -#: mod/settings.php:352 src/Module/Admin/Addons/Index.php:69 +#: mod/settings.php:206 mod/settings.php:238 mod/settings.php:269 +#: mod/settings.php:353 src/Module/Admin/Addons/Index.php:69 #: src/Module/Admin/Features.php:87 src/Module/Admin/Logs/Settings.php:81 #: src/Module/Admin/Site.php:434 src/Module/Admin/Themes/Index.php:113 -#: src/Module/Admin/Tos.php:83 src/Module/Settings/Account.php:563 +#: src/Module/Admin/Tos.php:83 src/Module/Settings/Account.php:564 #: src/Module/Settings/Delegation.php:170 src/Module/Settings/Display.php:201 msgid "Save Settings" msgstr "" -#: mod/settings.php:213 +#: mod/settings.php:214 msgid "Addon Settings" msgstr "" -#: mod/settings.php:214 +#: mod/settings.php:215 msgid "No Addon settings configured" msgstr "" -#: mod/settings.php:235 +#: mod/settings.php:236 msgid "Additional Features" msgstr "" -#: mod/settings.php:273 +#: mod/settings.php:274 msgid "Diaspora (Socialhome, Hubzilla)" msgstr "" -#: mod/settings.php:273 mod/settings.php:274 +#: mod/settings.php:274 mod/settings.php:275 msgid "enabled" msgstr "" -#: mod/settings.php:273 mod/settings.php:274 +#: mod/settings.php:274 mod/settings.php:275 msgid "disabled" msgstr "" -#: mod/settings.php:273 mod/settings.php:274 +#: mod/settings.php:274 mod/settings.php:275 #, php-format msgid "Built-in support for %s connectivity is %s" msgstr "" -#: mod/settings.php:274 +#: mod/settings.php:275 msgid "OStatus (GNU Social)" msgstr "" -#: mod/settings.php:300 +#: mod/settings.php:301 msgid "Email access is disabled on this site." msgstr "" -#: mod/settings.php:305 mod/settings.php:350 +#: mod/settings.php:306 mod/settings.php:351 msgid "None" msgstr "" -#: mod/settings.php:311 src/Module/BaseSettings.php:78 +#: mod/settings.php:312 src/Module/BaseSettings.php:78 msgid "Social Networks" msgstr "" -#: mod/settings.php:316 +#: mod/settings.php:317 msgid "General Social Media Settings" msgstr "" -#: mod/settings.php:319 +#: mod/settings.php:320 msgid "Followed content scope" msgstr "" -#: mod/settings.php:321 +#: mod/settings.php:322 msgid "" "By default, conversations in which your follows participated but didn't " "start will be shown in your timeline. You can turn this behavior off, or " "expand it to the conversations in which your follows liked a post." msgstr "" -#: mod/settings.php:323 +#: mod/settings.php:324 msgid "Only conversations my follows started" msgstr "" -#: mod/settings.php:324 +#: mod/settings.php:325 msgid "Conversations my follows started or commented on (default)" msgstr "" -#: mod/settings.php:325 +#: mod/settings.php:326 msgid "Any conversation my follows interacted with, including likes" msgstr "" -#: mod/settings.php:328 +#: mod/settings.php:329 msgid "Enable Content Warning" msgstr "" -#: mod/settings.php:328 +#: mod/settings.php:329 msgid "" "Users on networks like Mastodon or Pleroma are able to set a content warning " "field which collapse their post by default. This enables the automatic " @@ -1296,144 +1296,144 @@ msgid "" "affect any other content filtering you eventually set up." msgstr "" -#: mod/settings.php:329 +#: mod/settings.php:330 msgid "Enable intelligent shortening" msgstr "" -#: mod/settings.php:329 +#: mod/settings.php:330 msgid "" "Normally the system tries to find the best link to add to shortened posts. " "If disabled, every shortened post will always point to the original " "friendica post." msgstr "" -#: mod/settings.php:330 +#: mod/settings.php:331 msgid "Enable simple text shortening" msgstr "" -#: mod/settings.php:330 +#: mod/settings.php:331 msgid "" "Normally the system shortens posts at the next line feed. If this option is " "enabled then the system will shorten the text at the maximum character limit." msgstr "" -#: mod/settings.php:331 +#: mod/settings.php:332 msgid "Attach the link title" msgstr "" -#: mod/settings.php:331 +#: mod/settings.php:332 msgid "" "When activated, the title of the attached link will be added as a title on " "posts to Diaspora. This is mostly helpful with \"remote-self\" contacts that " "share feed content." msgstr "" -#: mod/settings.php:332 +#: mod/settings.php:333 msgid "Your legacy ActivityPub/GNU Social account" msgstr "" -#: mod/settings.php:332 +#: mod/settings.php:333 msgid "" "If you enter your old account name from an ActivityPub based system or your " "GNU Social/Statusnet account name here (in the format user@domain.tld), your " "contacts will be added automatically. The field will be emptied when done." msgstr "" -#: mod/settings.php:335 +#: mod/settings.php:336 msgid "Repair OStatus subscriptions" msgstr "" -#: mod/settings.php:339 +#: mod/settings.php:340 msgid "Email/Mailbox Setup" msgstr "" -#: mod/settings.php:340 +#: mod/settings.php:341 msgid "" "If you wish to communicate with email contacts using this service " "(optional), please specify how to connect to your mailbox." msgstr "" -#: mod/settings.php:341 +#: mod/settings.php:342 msgid "Last successful email check:" msgstr "" -#: mod/settings.php:343 +#: mod/settings.php:344 msgid "IMAP server name:" msgstr "" -#: mod/settings.php:344 +#: mod/settings.php:345 msgid "IMAP port:" msgstr "" -#: mod/settings.php:345 +#: mod/settings.php:346 msgid "Security:" msgstr "" -#: mod/settings.php:346 +#: mod/settings.php:347 msgid "Email login name:" msgstr "" -#: mod/settings.php:347 +#: mod/settings.php:348 msgid "Email password:" msgstr "" -#: mod/settings.php:348 +#: mod/settings.php:349 msgid "Reply-to address:" msgstr "" -#: mod/settings.php:349 +#: mod/settings.php:350 msgid "Send public posts to all email contacts:" msgstr "" -#: mod/settings.php:350 +#: mod/settings.php:351 msgid "Action after import:" msgstr "" -#: mod/settings.php:350 src/Content/Nav.php:283 +#: mod/settings.php:351 src/Content/Nav.php:283 msgid "Mark as seen" msgstr "" -#: mod/settings.php:350 +#: mod/settings.php:351 msgid "Move to folder" msgstr "" -#: mod/settings.php:351 +#: mod/settings.php:352 msgid "Move to folder:" msgstr "" -#: mod/suggest.php:44 +#: mod/suggest.php:45 msgid "" "No suggestions available. If this is a new site, please try again in 24 " "hours." msgstr "" -#: mod/suggest.php:55 src/Content/Widget.php:83 view/theme/vier/theme.php:184 +#: mod/suggest.php:56 src/Content/Widget.php:84 view/theme/vier/theme.php:202 msgid "Friend Suggestions" msgstr "" -#: mod/tagger.php:78 src/Content/Item.php:300 src/Model/Item.php:2855 +#: mod/tagger.php:78 src/Content/Item.php:301 src/Model/Item.php:2861 msgid "photo" msgstr "" -#: mod/tagger.php:78 src/Content/Item.php:294 src/Content/Item.php:304 +#: mod/tagger.php:78 src/Content/Item.php:295 src/Content/Item.php:305 msgid "status" msgstr "" -#: mod/tagger.php:111 src/Content/Item.php:314 +#: mod/tagger.php:111 src/Content/Item.php:315 #, php-format msgid "%1$s tagged %2$s's %3$s with %4$s" msgstr "" -#: mod/tagrm.php:113 +#: mod/tagrm.php:114 msgid "Remove Item Tag" msgstr "" -#: mod/tagrm.php:115 +#: mod/tagrm.php:116 msgid "Select a tag to remove: " msgstr "" -#: mod/tagrm.php:126 src/Module/Settings/Delegation.php:179 -#: src/Module/Settings/TwoFactor/Trusted.php:142 +#: mod/tagrm.php:127 src/Module/Settings/Delegation.php:179 +#: src/Module/Settings/TwoFactor/Trusted.php:144 msgid "Remove" msgstr "" @@ -1441,13 +1441,13 @@ msgstr "" msgid "User imports on closed servers can only be done by an administrator." msgstr "" -#: mod/uimport.php:55 src/Module/Register.php:99 +#: mod/uimport.php:55 src/Module/Register.php:100 msgid "" "This site has exceeded the number of allowed daily account registrations. " "Please try again tomorrow." msgstr "" -#: mod/uimport.php:62 src/Module/Register.php:173 +#: mod/uimport.php:62 src/Module/Register.php:174 msgid "Import" msgstr "" @@ -1482,23 +1482,23 @@ msgid "" "select \"Export account\"" msgstr "" -#: mod/unfollow.php:65 mod/unfollow.php:134 +#: mod/unfollow.php:66 mod/unfollow.php:135 msgid "You aren't following this contact." msgstr "" -#: mod/unfollow.php:71 +#: mod/unfollow.php:72 msgid "Unfollowing is currently not supported by your network." msgstr "" -#: mod/unfollow.php:92 +#: mod/unfollow.php:93 msgid "Disconnect/Unfollow" msgstr "" -#: mod/unfollow.php:143 +#: mod/unfollow.php:144 msgid "Contact was successfully unfollowed" msgstr "" -#: mod/unfollow.php:146 +#: mod/unfollow.php:147 msgid "Unable to unfollow this contact, please contact your administrator" msgstr "" @@ -1549,38 +1549,38 @@ msgid "" "your site allow private mail from unknown senders." msgstr "" -#: src/App.php:473 +#: src/App.php:491 msgid "No system theme config value set." msgstr "" -#: src/App.php:594 +#: src/App.php:612 msgid "Apologies but the website is unavailable at the moment." msgstr "" -#: src/App/Page.php:281 +#: src/App/Page.php:282 msgid "Delete this item?" msgstr "" -#: src/App/Page.php:282 +#: src/App/Page.php:283 msgid "" "Block this author? They won't be able to follow you nor see your public " "posts, and you won't be able to see their posts and their notifications." msgstr "" -#: src/App/Page.php:352 +#: src/App/Page.php:353 msgid "toggle mobile" msgstr "" -#: src/App/Router.php:282 +#: src/App/Router.php:283 #, php-format msgid "Method not allowed for this module. Allowed method(s): %s" msgstr "" -#: src/App/Router.php:284 src/Module/HTTPException/PageNotFound.php:49 +#: src/App/Router.php:285 src/Module/HTTPException/PageNotFound.php:49 msgid "Page not found." msgstr "" -#: src/App/Router.php:312 +#: src/App/Router.php:313 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:235 src/Core/ACL.php:194 -#: src/Module/Contact.php:370 src/Module/PermissionTooltip.php:122 -#: src/Module/PermissionTooltip.php:144 +#: src/BaseModule.php:424 src/Content/Widget.php:236 src/Core/ACL.php:194 +#: src/Module/Contact.php:371 src/Module/PermissionTooltip.php:123 +#: src/Module/PermissionTooltip.php:145 msgid "Followers" msgstr "" -#: src/BaseModule.php:429 src/Content/Widget.php:236 src/Module/Contact.php:371 +#: src/BaseModule.php:429 src/Content/Widget.php:237 src/Module/Contact.php:372 msgid "Following" msgstr "" -#: src/BaseModule.php:434 src/Content/Widget.php:237 src/Module/Contact.php:372 +#: src/BaseModule.php:434 src/Content/Widget.php:238 src/Module/Contact.php:373 msgid "Mutual friends" msgstr "" @@ -1762,13 +1762,13 @@ msgstr "" msgid "Enter new password: " msgstr "" -#: src/Console/User.php:210 src/Module/Security/PasswordTooLong.php:65 -#: src/Module/Settings/Account.php:75 +#: src/Console/User.php:210 src/Module/Security/PasswordTooLong.php:66 +#: src/Module/Settings/Account.php:76 msgid "Password update failed. Please try again." msgstr "" -#: src/Console/User.php:213 src/Module/Security/PasswordTooLong.php:68 -#: src/Module/Settings/Account.php:78 +#: src/Console/User.php:213 src/Module/Security/PasswordTooLong.php:69 +#: src/Module/Settings/Account.php:79 msgid "Password changed." msgstr "" @@ -1857,10 +1857,10 @@ msgstr "" msgid "RSS/Atom" msgstr "" -#: src/Content/ContactSelector.php:129 src/Module/Admin/Users/Active.php:129 -#: 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 +#: src/Content/ContactSelector.php:129 src/Module/Admin/Users/Active.php:130 +#: 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 msgid "Email" msgstr "" @@ -1921,258 +1921,258 @@ msgstr "" msgid "%s (via %s)" msgstr "" -#: src/Content/Conversation.php:207 +#: src/Content/Conversation.php:209 #, php-format msgid "%s likes this." msgstr "" -#: src/Content/Conversation.php:210 +#: src/Content/Conversation.php:212 #, php-format msgid "%s doesn't like this." msgstr "" -#: src/Content/Conversation.php:213 +#: src/Content/Conversation.php:215 #, php-format msgid "%s attends." msgstr "" -#: src/Content/Conversation.php:216 +#: src/Content/Conversation.php:218 #, php-format msgid "%s doesn't attend." msgstr "" -#: src/Content/Conversation.php:219 +#: src/Content/Conversation.php:221 #, php-format msgid "%s attends maybe." msgstr "" -#: src/Content/Conversation.php:222 src/Content/Conversation.php:260 -#: src/Content/Conversation.php:874 +#: src/Content/Conversation.php:224 src/Content/Conversation.php:262 +#: src/Content/Conversation.php:876 #, php-format msgid "%s reshared this." msgstr "" -#: src/Content/Conversation.php:228 +#: src/Content/Conversation.php:230 msgid "and" msgstr "" -#: src/Content/Conversation.php:231 +#: src/Content/Conversation.php:233 #, php-format msgid "and %d other people" msgstr "" -#: src/Content/Conversation.php:239 +#: src/Content/Conversation.php:241 #, php-format msgid "%2$d people like this" msgstr "" -#: src/Content/Conversation.php:240 +#: src/Content/Conversation.php:242 #, php-format msgid "%s like this." msgstr "" -#: src/Content/Conversation.php:243 +#: src/Content/Conversation.php:245 #, php-format msgid "%2$d people don't like this" msgstr "" -#: src/Content/Conversation.php:244 +#: src/Content/Conversation.php:246 #, php-format msgid "%s don't like this." msgstr "" -#: src/Content/Conversation.php:247 +#: src/Content/Conversation.php:249 #, php-format msgid "%2$d people attend" msgstr "" -#: src/Content/Conversation.php:248 +#: src/Content/Conversation.php:250 #, php-format msgid "%s attend." msgstr "" -#: src/Content/Conversation.php:251 +#: src/Content/Conversation.php:253 #, php-format msgid "%2$d people don't attend" msgstr "" -#: src/Content/Conversation.php:252 +#: src/Content/Conversation.php:254 #, php-format msgid "%s don't attend." msgstr "" -#: src/Content/Conversation.php:255 +#: src/Content/Conversation.php:257 #, php-format msgid "%2$d people attend maybe" msgstr "" -#: src/Content/Conversation.php:256 +#: src/Content/Conversation.php:258 #, php-format msgid "%s attend maybe." msgstr "" -#: src/Content/Conversation.php:259 +#: src/Content/Conversation.php:261 #, php-format msgid "%2$d people reshared this" msgstr "" -#: src/Content/Conversation.php:307 +#: src/Content/Conversation.php:309 msgid "Visible to everybody" msgstr "" -#: src/Content/Conversation.php:308 src/Module/Item/Compose.php:198 +#: src/Content/Conversation.php:310 src/Module/Item/Compose.php:199 #: src/Object/Post.php:1002 msgid "Please enter a image/video/audio/webpage URL:" msgstr "" -#: src/Content/Conversation.php:309 +#: src/Content/Conversation.php:311 msgid "Tag term:" msgstr "" -#: src/Content/Conversation.php:310 src/Module/Filer/SaveTag.php:72 +#: src/Content/Conversation.php:312 src/Module/Filer/SaveTag.php:74 msgid "Save to Folder:" msgstr "" -#: src/Content/Conversation.php:311 +#: src/Content/Conversation.php:313 msgid "Where are you right now?" msgstr "" -#: src/Content/Conversation.php:312 +#: src/Content/Conversation.php:314 msgid "Delete item(s)?" msgstr "" -#: src/Content/Conversation.php:324 src/Module/Item/Compose.php:175 +#: src/Content/Conversation.php:326 src/Module/Item/Compose.php:176 msgid "Created at" msgstr "" -#: src/Content/Conversation.php:334 +#: src/Content/Conversation.php:336 msgid "New Post" msgstr "" -#: src/Content/Conversation.php:337 +#: src/Content/Conversation.php:339 msgid "Share" msgstr "" -#: src/Content/Conversation.php:348 src/Module/Item/Compose.php:195 +#: src/Content/Conversation.php:350 src/Module/Item/Compose.php:196 #: src/Object/Post.php:999 msgid "Image" msgstr "" -#: src/Content/Conversation.php:351 +#: src/Content/Conversation.php:353 msgid "Video" msgstr "" -#: src/Content/Conversation.php:364 src/Module/Item/Compose.php:222 +#: src/Content/Conversation.php:366 src/Module/Item/Compose.php:223 msgid "Scheduled at" msgstr "" -#: src/Content/Conversation.php:658 src/Object/Post.php:244 +#: src/Content/Conversation.php:660 src/Object/Post.php:244 msgid "Pinned item" msgstr "" -#: src/Content/Conversation.php:674 src/Object/Post.php:486 +#: src/Content/Conversation.php:676 src/Object/Post.php:486 #: src/Object/Post.php:487 #, php-format msgid "View %s's profile @ %s" msgstr "" -#: src/Content/Conversation.php:687 src/Object/Post.php:474 +#: src/Content/Conversation.php:689 src/Object/Post.php:474 msgid "Categories:" msgstr "" -#: src/Content/Conversation.php:688 src/Object/Post.php:475 +#: src/Content/Conversation.php:690 src/Object/Post.php:475 msgid "Filed under:" msgstr "" -#: src/Content/Conversation.php:696 src/Object/Post.php:500 +#: src/Content/Conversation.php:698 src/Object/Post.php:500 #, php-format msgid "%s from %s" msgstr "" -#: src/Content/Conversation.php:712 +#: src/Content/Conversation.php:714 msgid "View in context" msgstr "" -#: src/Content/Conversation.php:777 +#: src/Content/Conversation.php:779 msgid "remove" msgstr "" -#: src/Content/Conversation.php:781 +#: src/Content/Conversation.php:783 msgid "Delete Selected Items" msgstr "" -#: src/Content/Conversation.php:846 src/Content/Conversation.php:849 -#: src/Content/Conversation.php:852 src/Content/Conversation.php:855 +#: src/Content/Conversation.php:848 src/Content/Conversation.php:851 +#: src/Content/Conversation.php:854 src/Content/Conversation.php:857 #, php-format msgid "You had been addressed (%s)." msgstr "" -#: src/Content/Conversation.php:858 +#: src/Content/Conversation.php:860 #, php-format msgid "You are following %s." msgstr "" -#: src/Content/Conversation.php:861 +#: src/Content/Conversation.php:863 msgid "You subscribed to one or more tags in this post." msgstr "" -#: src/Content/Conversation.php:876 +#: src/Content/Conversation.php:878 msgid "Reshared" msgstr "" -#: src/Content/Conversation.php:876 +#: src/Content/Conversation.php:878 #, php-format msgid "Reshared by %s <%s>" msgstr "" -#: src/Content/Conversation.php:879 +#: src/Content/Conversation.php:881 #, php-format msgid "%s is participating in this thread." msgstr "" -#: src/Content/Conversation.php:882 +#: src/Content/Conversation.php:884 msgid "Stored for general reasons" msgstr "" -#: src/Content/Conversation.php:885 +#: src/Content/Conversation.php:887 msgid "Global post" msgstr "" -#: src/Content/Conversation.php:888 +#: src/Content/Conversation.php:890 msgid "Sent via an relay server" msgstr "" -#: src/Content/Conversation.php:888 +#: src/Content/Conversation.php:890 #, php-format msgid "Sent via the relay server %s <%s>" msgstr "" -#: src/Content/Conversation.php:891 +#: src/Content/Conversation.php:893 msgid "Fetched" msgstr "" -#: src/Content/Conversation.php:891 +#: src/Content/Conversation.php:893 #, php-format msgid "Fetched because of %s <%s>" msgstr "" -#: src/Content/Conversation.php:894 +#: src/Content/Conversation.php:896 msgid "Stored because of a child post to complete this thread." msgstr "" -#: src/Content/Conversation.php:897 +#: src/Content/Conversation.php:899 msgid "Local delivery" msgstr "" -#: src/Content/Conversation.php:900 +#: src/Content/Conversation.php:902 msgid "Stored because of your activity (like, comment, star, ...)" msgstr "" -#: src/Content/Conversation.php:903 +#: src/Content/Conversation.php:905 msgid "Distributed" msgstr "" -#: src/Content/Conversation.php:906 +#: src/Content/Conversation.php:908 msgid "Pushed to us" msgstr "" @@ -2274,76 +2274,76 @@ msgstr "" msgid "Display membership date in profile" msgstr "" -#: src/Content/ForumManager.php:151 src/Content/Nav.php:242 -#: src/Content/Text/HTML.php:903 src/Content/Widget.php:524 +#: src/Content/ForumManager.php:152 src/Content/Nav.php:242 +#: src/Content/Text/HTML.php:903 src/Content/Widget.php:525 msgid "Forums" msgstr "" -#: src/Content/ForumManager.php:153 +#: src/Content/ForumManager.php:154 msgid "External link to forum" msgstr "" -#: src/Content/ForumManager.php:156 src/Content/Widget.php:503 +#: src/Content/ForumManager.php:157 src/Content/Widget.php:504 msgid "show less" msgstr "" -#: src/Content/ForumManager.php:157 src/Content/Widget.php:405 -#: src/Content/Widget.php:504 +#: src/Content/ForumManager.php:158 src/Content/Widget.php:406 +#: src/Content/Widget.php:505 msgid "show more" msgstr "" -#: src/Content/Item.php:291 src/Model/Item.php:2853 +#: src/Content/Item.php:292 src/Model/Item.php:2859 msgid "event" msgstr "" -#: src/Content/Item.php:383 view/theme/frio/theme.php:266 +#: src/Content/Item.php:384 view/theme/frio/theme.php:268 msgid "Follow Thread" msgstr "" -#: src/Content/Item.php:384 src/Model/Contact.php:1174 +#: src/Content/Item.php:385 src/Model/Contact.php:1174 msgid "View Status" msgstr "" -#: src/Content/Item.php:385 src/Content/Item.php:403 src/Model/Contact.php:1112 +#: src/Content/Item.php:386 src/Content/Item.php:404 src/Model/Contact.php:1112 #: src/Model/Contact.php:1166 src/Model/Contact.php:1175 -#: src/Module/Directory.php:158 src/Module/Settings/Profile/Index.php:225 +#: src/Module/Directory.php:158 src/Module/Settings/Profile/Index.php:226 msgid "View Profile" msgstr "" -#: src/Content/Item.php:386 src/Model/Contact.php:1176 +#: src/Content/Item.php:387 src/Model/Contact.php:1176 msgid "View Photos" msgstr "" -#: src/Content/Item.php:387 src/Model/Contact.php:1167 +#: src/Content/Item.php:388 src/Model/Contact.php:1167 #: src/Model/Contact.php:1177 msgid "Network Posts" msgstr "" -#: src/Content/Item.php:388 src/Model/Contact.php:1168 +#: src/Content/Item.php:389 src/Model/Contact.php:1168 #: src/Model/Contact.php:1178 msgid "View Contact" msgstr "" -#: src/Content/Item.php:389 src/Model/Contact.php:1179 +#: src/Content/Item.php:390 src/Model/Contact.php:1179 msgid "Send PM" msgstr "" -#: src/Content/Item.php:390 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:348 -#: src/Module/Contact/Profile.php:449 +#: src/Content/Item.php:391 src/Module/Admin/Blocklist/Contact.php:100 +#: src/Module/Admin/Users/Active.php:141 src/Module/Admin/Users/Index.php:155 +#: src/Module/Contact.php:402 src/Module/Contact/Profile.php:350 +#: src/Module/Contact/Profile.php:451 msgid "Block" msgstr "" -#: src/Content/Item.php:391 src/Module/Contact.php:402 -#: src/Module/Contact/Profile.php:349 src/Module/Contact/Profile.php:457 -#: src/Module/Notifications/Introductions.php:132 -#: src/Module/Notifications/Introductions.php:204 -#: src/Module/Notifications/Notification.php:88 +#: src/Content/Item.php:392 src/Module/Contact.php:403 +#: src/Module/Contact/Profile.php:351 src/Module/Contact/Profile.php:459 +#: src/Module/Notifications/Introductions.php:134 +#: src/Module/Notifications/Introductions.php:206 +#: src/Module/Notifications/Notification.php:90 msgid "Ignore" msgstr "" -#: src/Content/Item.php:395 src/Object/Post.php:455 +#: src/Content/Item.php:396 src/Object/Post.php:455 msgid "Languages" msgstr "" @@ -2363,7 +2363,7 @@ msgstr "" msgid "@name, !forum, #tags, content" msgstr "" -#: src/Content/Nav.php:186 src/Module/Security/Login.php:158 +#: src/Content/Nav.php:186 src/Module/Security/Login.php:159 msgid "Logout" msgstr "" @@ -2371,8 +2371,8 @@ msgstr "" msgid "End this session" msgstr "" -#: src/Content/Nav.php:188 src/Module/Bookmarklet.php:44 -#: src/Module/Security/Login.php:159 +#: src/Content/Nav.php:188 src/Module/Bookmarklet.php:45 +#: src/Module/Security/Login.php:160 msgid "Login" msgstr "" @@ -2381,42 +2381,42 @@ msgid "Sign in" msgstr "" #: src/Content/Nav.php:193 src/Module/BaseProfile.php:56 -#: src/Module/Contact.php:436 src/Module/Contact/Profile.php:380 -#: src/Module/Settings/TwoFactor/Index.php:120 view/theme/frio/theme.php:236 +#: src/Module/Contact.php:437 src/Module/Contact/Profile.php:382 +#: src/Module/Settings/TwoFactor/Index.php:120 view/theme/frio/theme.php:238 msgid "Status" msgstr "" #: src/Content/Nav.php:193 src/Content/Nav.php:276 -#: view/theme/frio/theme.php:236 +#: view/theme/frio/theme.php:238 msgid "Your posts and conversations" msgstr "" #: src/Content/Nav.php:194 src/Module/BaseProfile.php:48 -#: src/Module/BaseSettings.php:55 src/Module/Contact.php:460 -#: src/Module/Contact/Profile.php:382 src/Module/Profile/Profile.php:241 -#: src/Module/Welcome.php:57 view/theme/frio/theme.php:237 +#: src/Module/BaseSettings.php:55 src/Module/Contact.php:461 +#: src/Module/Contact/Profile.php:384 src/Module/Profile/Profile.php:241 +#: src/Module/Welcome.php:57 view/theme/frio/theme.php:239 msgid "Profile" msgstr "" -#: src/Content/Nav.php:194 view/theme/frio/theme.php:237 +#: src/Content/Nav.php:194 view/theme/frio/theme.php:239 msgid "Your profile page" msgstr "" -#: src/Content/Nav.php:195 view/theme/frio/theme.php:238 +#: src/Content/Nav.php:195 view/theme/frio/theme.php:240 msgid "Your photos" msgstr "" #: src/Content/Nav.php:196 src/Module/BaseProfile.php:72 -#: src/Module/BaseProfile.php:75 src/Module/Contact.php:452 -#: view/theme/frio/theme.php:239 +#: src/Module/BaseProfile.php:75 src/Module/Contact.php:453 +#: view/theme/frio/theme.php:241 msgid "Media" msgstr "" -#: src/Content/Nav.php:196 view/theme/frio/theme.php:239 +#: src/Content/Nav.php:196 view/theme/frio/theme.php:241 msgid "Your postings with media" msgstr "" -#: src/Content/Nav.php:197 view/theme/frio/theme.php:240 +#: src/Content/Nav.php:197 view/theme/frio/theme.php:242 msgid "Your events" msgstr "" @@ -2432,8 +2432,8 @@ msgstr "" msgid "Home" msgstr "" -#: src/Content/Nav.php:219 src/Module/Register.php:168 -#: src/Module/Security/Login.php:124 +#: src/Content/Nav.php:219 src/Module/Register.php:169 +#: src/Module/Security/Login.php:125 msgid "Register" msgstr "" @@ -2442,10 +2442,10 @@ msgid "Create an account" msgstr "" #: src/Content/Nav.php:225 src/Module/Help.php:67 -#: src/Module/Settings/TwoFactor/AppSpecific.php:127 +#: src/Module/Settings/TwoFactor/AppSpecific.php:129 #: src/Module/Settings/TwoFactor/Index.php:119 -#: src/Module/Settings/TwoFactor/Recovery.php:105 -#: src/Module/Settings/TwoFactor/Verify.php:145 view/theme/vier/theme.php:226 +#: src/Module/Settings/TwoFactor/Recovery.php:107 +#: src/Module/Settings/TwoFactor/Verify.php:146 view/theme/vier/theme.php:244 msgid "Help" msgstr "" @@ -2481,8 +2481,8 @@ msgstr "" #: src/Content/Nav.php:238 src/Content/Nav.php:297 #: 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:247 +#: src/Module/BaseProfile.php:128 src/Module/Contact.php:374 +#: src/Module/Contact.php:468 view/theme/frio/theme.php:249 msgid "Contacts" msgstr "" @@ -2495,7 +2495,7 @@ 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:244 +#: src/Module/BaseProfile.php:98 view/theme/frio/theme.php:246 msgid "Events and Calendar" msgstr "" @@ -2516,7 +2516,7 @@ msgid "Information about this friendica instance" msgstr "" #: src/Content/Nav.php:269 src/Module/Admin/Tos.php:76 -#: src/Module/BaseAdmin.php:99 src/Module/Register.php:176 +#: src/Module/BaseAdmin.php:99 src/Module/Register.php:177 #: src/Module/Tos.php:87 msgid "Terms of Service" msgstr "" @@ -2525,11 +2525,11 @@ msgstr "" msgid "Terms of Service of this Friendica instance" msgstr "" -#: src/Content/Nav.php:274 view/theme/frio/theme.php:243 +#: src/Content/Nav.php:274 view/theme/frio/theme.php:245 msgid "Network" msgstr "" -#: src/Content/Nav.php:274 view/theme/frio/theme.php:243 +#: src/Content/Nav.php:274 view/theme/frio/theme.php:245 msgid "Conversations from your friends" msgstr "" @@ -2541,8 +2541,8 @@ msgstr "" msgid "Friend Requests" msgstr "" -#: src/Content/Nav.php:281 src/Module/BaseNotifications.php:148 -#: src/Module/Notifications/Introductions.php:73 +#: src/Content/Nav.php:281 src/Module/BaseNotifications.php:149 +#: src/Module/Notifications/Introductions.php:75 msgid "Notifications" msgstr "" @@ -2554,7 +2554,7 @@ msgstr "" msgid "Mark all system notifications as seen" msgstr "" -#: src/Content/Nav.php:286 view/theme/frio/theme.php:245 +#: src/Content/Nav.php:286 view/theme/frio/theme.php:247 msgid "Private mail" msgstr "" @@ -2576,15 +2576,15 @@ msgstr "" #: src/Content/Nav.php:295 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:246 +#: src/Module/Welcome.php:52 view/theme/frio/theme.php:248 msgid "Settings" msgstr "" -#: src/Content/Nav.php:295 view/theme/frio/theme.php:246 +#: src/Content/Nav.php:295 view/theme/frio/theme.php:248 msgid "Account settings" msgstr "" -#: src/Content/Nav.php:297 view/theme/frio/theme.php:247 +#: src/Content/Nav.php:297 view/theme/frio/theme.php:249 msgid "Manage/edit friends and contacts" msgstr "" @@ -2639,8 +2639,8 @@ msgid "" "%2$s %3$s" msgstr "" -#: src/Content/Text/BBCode.php:1263 src/Model/Item.php:3456 -#: src/Model/Item.php:3462 src/Model/Item.php:3463 +#: src/Content/Text/BBCode.php:1263 src/Model/Item.php:3462 +#: src/Model/Item.php:3468 src/Model/Item.php:3469 msgid "Link to source" msgstr "" @@ -2672,138 +2672,138 @@ msgstr "" msgid "The end" msgstr "" -#: src/Content/Text/HTML.php:882 src/Content/Widget/VCard.php:109 +#: src/Content/Text/HTML.php:882 src/Content/Widget/VCard.php:110 #: src/Model/Profile.php:460 msgid "Follow" msgstr "" -#: src/Content/Widget.php:51 +#: src/Content/Widget.php:52 msgid "Add New Contact" msgstr "" -#: src/Content/Widget.php:52 +#: src/Content/Widget.php:53 msgid "Enter address or web location" msgstr "" -#: src/Content/Widget.php:53 +#: src/Content/Widget.php:54 msgid "Example: bob@example.com, http://example.com/barbara" msgstr "" -#: src/Content/Widget.php:55 +#: src/Content/Widget.php:56 msgid "Connect" msgstr "" -#: src/Content/Widget.php:72 +#: src/Content/Widget.php:73 #, php-format msgid "%d invitation available" msgid_plural "%d invitations available" msgstr[0] "" msgstr[1] "" -#: src/Content/Widget.php:78 view/theme/vier/theme.php:179 +#: src/Content/Widget.php:79 view/theme/vier/theme.php:197 msgid "Find People" msgstr "" -#: src/Content/Widget.php:79 view/theme/vier/theme.php:180 +#: src/Content/Widget.php:80 view/theme/vier/theme.php:198 msgid "Enter name or interest" msgstr "" -#: src/Content/Widget.php:81 view/theme/vier/theme.php:182 +#: src/Content/Widget.php:82 view/theme/vier/theme.php:200 msgid "Examples: Robert Morgenstein, Fishing" msgstr "" -#: src/Content/Widget.php:82 src/Module/Contact.php:394 -#: src/Module/Directory.php:97 view/theme/vier/theme.php:183 +#: src/Content/Widget.php:83 src/Module/Contact.php:395 +#: src/Module/Directory.php:97 view/theme/vier/theme.php:201 msgid "Find" msgstr "" -#: src/Content/Widget.php:84 view/theme/vier/theme.php:185 +#: src/Content/Widget.php:85 view/theme/vier/theme.php:203 msgid "Similar Interests" msgstr "" -#: src/Content/Widget.php:85 view/theme/vier/theme.php:186 +#: src/Content/Widget.php:86 view/theme/vier/theme.php:204 msgid "Random Profile" msgstr "" -#: src/Content/Widget.php:86 view/theme/vier/theme.php:187 +#: src/Content/Widget.php:87 view/theme/vier/theme.php:205 msgid "Invite Friends" msgstr "" -#: src/Content/Widget.php:87 src/Module/Directory.php:89 -#: view/theme/vier/theme.php:188 +#: src/Content/Widget.php:88 src/Module/Directory.php:89 +#: view/theme/vier/theme.php:206 msgid "Global Directory" msgstr "" -#: src/Content/Widget.php:89 view/theme/vier/theme.php:190 +#: src/Content/Widget.php:90 view/theme/vier/theme.php:208 msgid "Local Directory" msgstr "" -#: src/Content/Widget.php:211 src/Model/Group.php:587 -#: src/Module/Contact.php:357 src/Module/Welcome.php:76 +#: src/Content/Widget.php:212 src/Model/Group.php:588 +#: src/Module/Contact.php:358 src/Module/Welcome.php:76 msgid "Groups" msgstr "" -#: src/Content/Widget.php:213 +#: src/Content/Widget.php:214 msgid "Everyone" msgstr "" -#: src/Content/Widget.php:242 +#: src/Content/Widget.php:243 msgid "Relationships" msgstr "" -#: src/Content/Widget.php:244 src/Module/Contact.php:309 -#: src/Module/Group.php:293 +#: src/Content/Widget.php:245 src/Module/Contact.php:310 +#: src/Module/Group.php:294 msgid "All Contacts" msgstr "" -#: src/Content/Widget.php:283 +#: src/Content/Widget.php:284 msgid "Protocols" msgstr "" -#: src/Content/Widget.php:285 +#: src/Content/Widget.php:286 msgid "All Protocols" msgstr "" -#: src/Content/Widget.php:313 +#: src/Content/Widget.php:314 msgid "Saved Folders" msgstr "" -#: src/Content/Widget.php:315 src/Content/Widget.php:346 +#: src/Content/Widget.php:316 src/Content/Widget.php:347 msgid "Everything" msgstr "" -#: src/Content/Widget.php:344 +#: src/Content/Widget.php:345 msgid "Categories" msgstr "" -#: src/Content/Widget.php:401 +#: src/Content/Widget.php:402 #, php-format msgid "%d contact in common" msgid_plural "%d contacts in common" msgstr[0] "" msgstr[1] "" -#: src/Content/Widget.php:497 +#: src/Content/Widget.php:498 msgid "Archives" msgstr "" -#: src/Content/Widget.php:521 +#: src/Content/Widget.php:522 msgid "Persons" msgstr "" -#: src/Content/Widget.php:522 +#: src/Content/Widget.php:523 msgid "Organisations" msgstr "" -#: src/Content/Widget.php:523 src/Model/Contact.php:1605 +#: src/Content/Widget.php:524 src/Model/Contact.php:1605 msgid "News" msgstr "" -#: src/Content/Widget.php:527 src/Module/Settings/Account.php:456 +#: src/Content/Widget.php:528 src/Module/Settings/Account.php:457 msgid "Account Types" msgstr "" -#: src/Content/Widget.php:528 src/Module/Admin/BaseUsers.php:51 +#: src/Content/Widget.php:529 src/Module/Admin/BaseUsers.php:52 msgid "All" msgstr "" @@ -2834,11 +2834,11 @@ msgstr[1] "" msgid "View Contacts" msgstr "" -#: src/Content/Widget/SavedSearches.php:47 +#: src/Content/Widget/SavedSearches.php:48 msgid "Remove term" msgstr "" -#: src/Content/Widget/SavedSearches.php:60 +#: src/Content/Widget/SavedSearches.php:61 msgid "Saved Searches" msgstr "" @@ -2853,22 +2853,22 @@ msgstr[1] "" msgid "More Trending Tags" msgstr "" -#: src/Content/Widget/VCard.php:102 src/Model/Profile.php:379 -#: src/Module/Contact/Profile.php:371 src/Module/Profile/Profile.php:176 +#: src/Content/Widget/VCard.php:103 src/Model/Profile.php:379 +#: src/Module/Contact/Profile.php:373 src/Module/Profile/Profile.php:176 msgid "XMPP:" msgstr "" -#: src/Content/Widget/VCard.php:103 src/Model/Profile.php:380 -#: src/Module/Contact/Profile.php:373 src/Module/Profile/Profile.php:180 +#: src/Content/Widget/VCard.php:104 src/Model/Profile.php:380 +#: src/Module/Contact/Profile.php:375 src/Module/Profile/Profile.php:180 msgid "Matrix:" msgstr "" -#: src/Content/Widget/VCard.php:107 src/Model/Profile.php:472 -#: src/Module/Notifications/Introductions.php:199 +#: src/Content/Widget/VCard.php:108 src/Model/Profile.php:472 +#: src/Module/Notifications/Introductions.php:201 msgid "Network:" msgstr "" -#: src/Content/Widget/VCard.php:111 src/Model/Profile.php:462 +#: src/Content/Widget/VCard.php:112 src/Model/Profile.php:462 msgid "Unfollow" msgstr "" @@ -2876,8 +2876,8 @@ msgstr "" msgid "Yourself" msgstr "" -#: src/Core/ACL.php:201 src/Module/PermissionTooltip.php:128 -#: src/Module/PermissionTooltip.php:150 +#: src/Core/ACL.php:201 src/Module/PermissionTooltip.php:129 +#: src/Module/PermissionTooltip.php:151 msgid "Mutuals" msgstr "" @@ -2885,8 +2885,8 @@ msgstr "" msgid "Post to Email" msgstr "" -#: src/Core/ACL.php:320 src/Module/PermissionTooltip.php:85 -#: src/Module/PermissionTooltip.php:197 +#: src/Core/ACL.php:320 src/Module/PermissionTooltip.php:86 +#: src/Module/PermissionTooltip.php:198 msgid "Public" msgstr "" @@ -2896,7 +2896,7 @@ msgid "" "community pages and by anyone with its link." msgstr "" -#: src/Core/ACL.php:322 src/Module/PermissionTooltip.php:93 +#: src/Core/ACL.php:322 src/Module/PermissionTooltip.php:94 msgid "Limited/Private" msgstr "" @@ -3237,142 +3237,142 @@ msgstr "" msgid "Could not connect to database." msgstr "" -#: src/Core/L10n.php:403 src/Model/Event.php:428 +#: src/Core/L10n.php:403 src/Model/Event.php:429 #: src/Module/Settings/Display.php:184 msgid "Monday" msgstr "" -#: src/Core/L10n.php:403 src/Model/Event.php:429 +#: src/Core/L10n.php:403 src/Model/Event.php:430 #: src/Module/Settings/Display.php:185 msgid "Tuesday" msgstr "" -#: src/Core/L10n.php:403 src/Model/Event.php:430 +#: src/Core/L10n.php:403 src/Model/Event.php:431 #: src/Module/Settings/Display.php:186 msgid "Wednesday" msgstr "" -#: src/Core/L10n.php:403 src/Model/Event.php:431 +#: src/Core/L10n.php:403 src/Model/Event.php:432 #: src/Module/Settings/Display.php:187 msgid "Thursday" msgstr "" -#: src/Core/L10n.php:403 src/Model/Event.php:432 +#: src/Core/L10n.php:403 src/Model/Event.php:433 #: src/Module/Settings/Display.php:188 msgid "Friday" msgstr "" -#: src/Core/L10n.php:403 src/Model/Event.php:433 +#: src/Core/L10n.php:403 src/Model/Event.php:434 #: src/Module/Settings/Display.php:189 msgid "Saturday" msgstr "" -#: src/Core/L10n.php:403 src/Model/Event.php:427 +#: src/Core/L10n.php:403 src/Model/Event.php:428 #: src/Module/Settings/Display.php:183 msgid "Sunday" msgstr "" -#: src/Core/L10n.php:407 src/Model/Event.php:448 +#: src/Core/L10n.php:407 src/Model/Event.php:449 msgid "January" msgstr "" -#: src/Core/L10n.php:407 src/Model/Event.php:449 +#: src/Core/L10n.php:407 src/Model/Event.php:450 msgid "February" msgstr "" -#: src/Core/L10n.php:407 src/Model/Event.php:450 +#: src/Core/L10n.php:407 src/Model/Event.php:451 msgid "March" msgstr "" -#: src/Core/L10n.php:407 src/Model/Event.php:451 +#: src/Core/L10n.php:407 src/Model/Event.php:452 msgid "April" msgstr "" -#: src/Core/L10n.php:407 src/Core/L10n.php:426 src/Model/Event.php:439 +#: src/Core/L10n.php:407 src/Core/L10n.php:426 src/Model/Event.php:440 msgid "May" msgstr "" -#: src/Core/L10n.php:407 src/Model/Event.php:452 +#: src/Core/L10n.php:407 src/Model/Event.php:453 msgid "June" msgstr "" -#: src/Core/L10n.php:407 src/Model/Event.php:453 +#: src/Core/L10n.php:407 src/Model/Event.php:454 msgid "July" msgstr "" -#: src/Core/L10n.php:407 src/Model/Event.php:454 +#: src/Core/L10n.php:407 src/Model/Event.php:455 msgid "August" msgstr "" -#: src/Core/L10n.php:407 src/Model/Event.php:455 +#: src/Core/L10n.php:407 src/Model/Event.php:456 msgid "September" msgstr "" -#: src/Core/L10n.php:407 src/Model/Event.php:456 +#: src/Core/L10n.php:407 src/Model/Event.php:457 msgid "October" msgstr "" -#: src/Core/L10n.php:407 src/Model/Event.php:457 +#: src/Core/L10n.php:407 src/Model/Event.php:458 msgid "November" msgstr "" -#: src/Core/L10n.php:407 src/Model/Event.php:458 +#: src/Core/L10n.php:407 src/Model/Event.php:459 msgid "December" msgstr "" -#: src/Core/L10n.php:422 src/Model/Event.php:420 +#: src/Core/L10n.php:422 src/Model/Event.php:421 msgid "Mon" msgstr "" -#: src/Core/L10n.php:422 src/Model/Event.php:421 +#: src/Core/L10n.php:422 src/Model/Event.php:422 msgid "Tue" msgstr "" -#: src/Core/L10n.php:422 src/Model/Event.php:422 +#: src/Core/L10n.php:422 src/Model/Event.php:423 msgid "Wed" msgstr "" -#: src/Core/L10n.php:422 src/Model/Event.php:423 +#: src/Core/L10n.php:422 src/Model/Event.php:424 msgid "Thu" msgstr "" -#: src/Core/L10n.php:422 src/Model/Event.php:424 +#: src/Core/L10n.php:422 src/Model/Event.php:425 msgid "Fri" msgstr "" -#: src/Core/L10n.php:422 src/Model/Event.php:425 +#: src/Core/L10n.php:422 src/Model/Event.php:426 msgid "Sat" msgstr "" -#: src/Core/L10n.php:422 src/Model/Event.php:419 +#: src/Core/L10n.php:422 src/Model/Event.php:420 msgid "Sun" msgstr "" -#: src/Core/L10n.php:426 src/Model/Event.php:435 +#: src/Core/L10n.php:426 src/Model/Event.php:436 msgid "Jan" msgstr "" -#: src/Core/L10n.php:426 src/Model/Event.php:436 +#: src/Core/L10n.php:426 src/Model/Event.php:437 msgid "Feb" msgstr "" -#: src/Core/L10n.php:426 src/Model/Event.php:437 +#: src/Core/L10n.php:426 src/Model/Event.php:438 msgid "Mar" msgstr "" -#: src/Core/L10n.php:426 src/Model/Event.php:438 +#: src/Core/L10n.php:426 src/Model/Event.php:439 msgid "Apr" msgstr "" -#: src/Core/L10n.php:426 src/Model/Event.php:440 +#: src/Core/L10n.php:426 src/Model/Event.php:441 msgid "Jun" msgstr "" -#: src/Core/L10n.php:426 src/Model/Event.php:441 +#: src/Core/L10n.php:426 src/Model/Event.php:442 msgid "Jul" msgstr "" -#: src/Core/L10n.php:426 src/Model/Event.php:442 +#: src/Core/L10n.php:426 src/Model/Event.php:443 msgid "Aug" msgstr "" @@ -3380,30 +3380,30 @@ msgstr "" msgid "Sep" msgstr "" -#: src/Core/L10n.php:426 src/Model/Event.php:444 +#: src/Core/L10n.php:426 src/Model/Event.php:445 msgid "Oct" msgstr "" -#: src/Core/L10n.php:426 src/Model/Event.php:445 +#: src/Core/L10n.php:426 src/Model/Event.php:446 msgid "Nov" msgstr "" -#: src/Core/L10n.php:426 src/Model/Event.php:446 +#: src/Core/L10n.php:426 src/Model/Event.php:447 msgid "Dec" msgstr "" -#: src/Core/Renderer.php:89 src/Core/Renderer.php:118 src/Core/Renderer.php:145 -#: src/Core/Renderer.php:179 src/Render/FriendicaSmartyEngine.php:60 +#: src/Core/Renderer.php:89 src/Core/Renderer.php:118 src/Core/Renderer.php:147 +#: src/Core/Renderer.php:181 src/Render/FriendicaSmartyEngine.php:60 msgid "" "Friendica can't display this page at the moment, please contact the " "administrator." msgstr "" -#: src/Core/Renderer.php:141 +#: src/Core/Renderer.php:143 msgid "template engine cannot be registered without a name." msgstr "" -#: src/Core/Renderer.php:175 +#: src/Core/Renderer.php:177 msgid "template engine is not registered!" msgstr "" @@ -3593,8 +3593,8 @@ msgid "UnFollow" msgstr "" #: src/Model/Contact.php:1187 src/Module/Admin/Users/Pending.php:107 -#: src/Module/Notifications/Introductions.php:130 -#: src/Module/Notifications/Introductions.php:202 +#: src/Module/Notifications/Introductions.php:132 +#: src/Module/Notifications/Introductions.php:204 msgid "Approve" msgstr "" @@ -3610,7 +3610,7 @@ msgstr "" msgid "Disallowed profile URL." msgstr "" -#: src/Model/Contact.php:2800 src/Module/Friendica.php:81 +#: src/Model/Contact.php:2800 src/Module/Friendica.php:82 msgid "Blocked domain" msgstr "" @@ -3666,186 +3666,186 @@ msgstr "" msgid "Unable to retrieve contact information." msgstr "" -#: src/Model/Event.php:52 +#: src/Model/Event.php:53 msgid "l F d, Y \\@ g:i A \\G\\M\\TP (e)" msgstr "" -#: src/Model/Event.php:73 src/Model/Event.php:90 src/Model/Event.php:467 -#: src/Model/Event.php:901 +#: src/Model/Event.php:74 src/Model/Event.php:91 src/Model/Event.php:468 +#: src/Model/Event.php:902 msgid "Starts:" msgstr "" -#: src/Model/Event.php:76 src/Model/Event.php:96 src/Model/Event.php:468 -#: src/Model/Event.php:905 +#: src/Model/Event.php:77 src/Model/Event.php:97 src/Model/Event.php:469 +#: src/Model/Event.php:906 msgid "Finishes:" msgstr "" -#: src/Model/Event.php:417 +#: src/Model/Event.php:418 msgid "all-day" msgstr "" -#: src/Model/Event.php:443 +#: src/Model/Event.php:444 msgid "Sept" msgstr "" -#: src/Model/Event.php:465 +#: src/Model/Event.php:466 msgid "No events to display" msgstr "" -#: src/Model/Event.php:581 +#: src/Model/Event.php:582 msgid "l, F j" msgstr "" -#: src/Model/Event.php:612 +#: src/Model/Event.php:613 msgid "Edit event" msgstr "" -#: src/Model/Event.php:613 +#: src/Model/Event.php:614 msgid "Duplicate event" msgstr "" -#: src/Model/Event.php:614 +#: src/Model/Event.php:615 msgid "Delete event" msgstr "" -#: src/Model/Event.php:857 src/Module/Debug/Localtime.php:38 +#: src/Model/Event.php:858 src/Module/Debug/Localtime.php:38 msgid "l F d, Y \\@ g:i A" msgstr "" -#: src/Model/Event.php:858 +#: src/Model/Event.php:859 msgid "D g:i A" msgstr "" -#: src/Model/Event.php:859 +#: src/Model/Event.php:860 msgid "g:i A" msgstr "" -#: src/Model/Event.php:920 src/Model/Event.php:922 +#: src/Model/Event.php:921 src/Model/Event.php:923 msgid "Show map" msgstr "" -#: src/Model/Event.php:921 +#: src/Model/Event.php:922 msgid "Hide map" msgstr "" -#: src/Model/Event.php:1014 -#, php-format -msgid "%s's birthday" -msgstr "" - #: src/Model/Event.php:1015 #, php-format +msgid "%s's birthday" +msgstr "" + +#: src/Model/Event.php:1016 +#, php-format msgid "Happy Birthday %s" msgstr "" -#: src/Model/Group.php:105 +#: src/Model/Group.php:106 msgid "" "A deleted group with this name was revived. Existing item permissions " "may apply to this group and any future members. If this is " "not what you intended, please create another group with a different name." msgstr "" -#: src/Model/Group.php:503 +#: src/Model/Group.php:504 msgid "Default privacy group for new contacts" msgstr "" -#: src/Model/Group.php:535 +#: src/Model/Group.php:536 msgid "Everybody" msgstr "" -#: src/Model/Group.php:554 +#: src/Model/Group.php:555 msgid "edit" msgstr "" -#: src/Model/Group.php:586 +#: src/Model/Group.php:587 msgid "add" msgstr "" -#: src/Model/Group.php:591 +#: src/Model/Group.php:592 msgid "Edit group" msgstr "" -#: src/Model/Group.php:592 src/Module/Group.php:194 +#: src/Model/Group.php:593 src/Module/Group.php:195 msgid "Contacts not in any group" msgstr "" -#: src/Model/Group.php:594 +#: src/Model/Group.php:595 msgid "Create a new group" msgstr "" -#: src/Model/Group.php:595 src/Module/Group.php:179 src/Module/Group.php:202 -#: src/Module/Group.php:277 +#: src/Model/Group.php:596 src/Module/Group.php:180 src/Module/Group.php:203 +#: src/Module/Group.php:278 msgid "Group Name: " msgstr "" -#: src/Model/Group.php:596 +#: src/Model/Group.php:597 msgid "Edit groups" msgstr "" -#: src/Model/Item.php:1965 +#: src/Model/Item.php:1971 #, php-format msgid "Detected languages in this post:\\n%s" msgstr "" -#: src/Model/Item.php:2857 +#: src/Model/Item.php:2863 msgid "activity" msgstr "" -#: src/Model/Item.php:2859 +#: src/Model/Item.php:2865 msgid "comment" msgstr "" -#: src/Model/Item.php:2862 +#: src/Model/Item.php:2868 msgid "post" msgstr "" -#: src/Model/Item.php:3005 +#: src/Model/Item.php:3011 #, php-format msgid "Content warning: %s" msgstr "" -#: src/Model/Item.php:3368 +#: src/Model/Item.php:3374 msgid "bytes" msgstr "" -#: src/Model/Item.php:3399 +#: src/Model/Item.php:3405 #, php-format msgid "%2$s (%3$d%%, %1$d vote)" msgid_plural "%2$s (%3$d%%, %1$d votes)" msgstr[0] "" msgstr[1] "" -#: src/Model/Item.php:3401 +#: src/Model/Item.php:3407 #, php-format msgid "%2$s (%1$d vote)" msgid_plural "%2$s (%1$d votes)" msgstr[0] "" msgstr[1] "" -#: src/Model/Item.php:3406 +#: src/Model/Item.php:3412 #, php-format msgid "%d voter. Poll end: %s" msgid_plural "%d voters. Poll end: %s" msgstr[0] "" msgstr[1] "" -#: src/Model/Item.php:3408 +#: src/Model/Item.php:3414 #, php-format msgid "%d voter." msgid_plural "%d voters." msgstr[0] "" msgstr[1] "" -#: src/Model/Item.php:3410 +#: src/Model/Item.php:3416 #, php-format msgid "Poll end: %s" msgstr "" -#: src/Model/Item.php:3444 src/Model/Item.php:3445 +#: src/Model/Item.php:3450 src/Model/Item.php:3451 msgid "View on separate page" msgstr "" -#: src/Model/Mail.php:137 src/Model/Mail.php:265 +#: src/Model/Mail.php:138 src/Model/Mail.php:266 msgid "[no subject]" msgstr "" @@ -3863,8 +3863,8 @@ msgstr "" msgid "Homepage:" msgstr "" -#: src/Model/Profile.php:378 src/Module/Contact/Profile.php:375 -#: src/Module/Notifications/Introductions.php:187 +#: src/Model/Profile.php:378 src/Module/Contact/Profile.php:377 +#: src/Module/Notifications/Introductions.php:189 msgid "About:" msgstr "" @@ -3949,7 +3949,7 @@ msgstr "" msgid "Title/Description:" msgstr "" -#: src/Model/Profile.php:1018 src/Module/Admin/Summary.php:234 +#: src/Model/Profile.php:1018 src/Module/Admin/Summary.php:235 msgid "Summary" msgstr "" @@ -4292,14 +4292,14 @@ msgstr "" #: 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/Federation.php:201 src/Module/Admin/Item/Delete.php:64 +#: 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:431 -#: src/Module/Admin/Storage.php:138 src/Module/Admin/Summary.php:233 +#: 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: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/Tos.php:75 src/Module/Admin/Users/Active.php:137 +#: 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/Pending.php:101 msgid "Administration" msgstr "" @@ -4345,81 +4345,81 @@ msgid "" "the open addon registry at %2$s" msgstr "" -#: src/Module/Admin/BaseUsers.php:54 +#: src/Module/Admin/BaseUsers.php:55 msgid "List of all users" msgstr "" -#: src/Module/Admin/BaseUsers.php:59 +#: src/Module/Admin/BaseUsers.php:60 msgid "Active" msgstr "" -#: src/Module/Admin/BaseUsers.php:62 +#: src/Module/Admin/BaseUsers.php:63 msgid "List of active accounts" msgstr "" -#: src/Module/Admin/BaseUsers.php:67 src/Module/Contact.php:317 -#: src/Module/Contact.php:377 +#: src/Module/Admin/BaseUsers.php:68 src/Module/Contact.php:318 +#: src/Module/Contact.php:378 msgid "Pending" msgstr "" -#: src/Module/Admin/BaseUsers.php:70 +#: src/Module/Admin/BaseUsers.php:71 msgid "List of pending registrations" msgstr "" -#: src/Module/Admin/BaseUsers.php:75 src/Module/Contact.php:325 -#: src/Module/Contact.php:378 +#: src/Module/Admin/BaseUsers.php:76 src/Module/Contact.php:326 +#: src/Module/Contact.php:379 msgid "Blocked" msgstr "" -#: src/Module/Admin/BaseUsers.php:78 +#: src/Module/Admin/BaseUsers.php:79 msgid "List of blocked users" msgstr "" -#: src/Module/Admin/BaseUsers.php:83 +#: src/Module/Admin/BaseUsers.php:84 msgid "Deleted" msgstr "" -#: src/Module/Admin/BaseUsers.php:86 +#: src/Module/Admin/BaseUsers.php:87 msgid "List of pending user deletions" msgstr "" -#: src/Module/Admin/BaseUsers.php:100 src/Module/Settings/Account.php:494 +#: src/Module/Admin/BaseUsers.php:101 src/Module/Settings/Account.php:495 msgid "Normal Account Page" msgstr "" -#: src/Module/Admin/BaseUsers.php:101 src/Module/Settings/Account.php:501 +#: src/Module/Admin/BaseUsers.php:102 src/Module/Settings/Account.php:502 msgid "Soapbox Page" msgstr "" -#: src/Module/Admin/BaseUsers.php:102 src/Module/Settings/Account.php:508 +#: src/Module/Admin/BaseUsers.php:103 src/Module/Settings/Account.php:509 msgid "Public Forum" msgstr "" -#: src/Module/Admin/BaseUsers.php:103 src/Module/Settings/Account.php:515 +#: src/Module/Admin/BaseUsers.php:104 src/Module/Settings/Account.php:516 msgid "Automatic Friend Page" msgstr "" -#: src/Module/Admin/BaseUsers.php:104 +#: src/Module/Admin/BaseUsers.php:105 msgid "Private Forum" msgstr "" -#: src/Module/Admin/BaseUsers.php:107 src/Module/Settings/Account.php:466 +#: src/Module/Admin/BaseUsers.php:108 src/Module/Settings/Account.php:467 msgid "Personal Page" msgstr "" -#: src/Module/Admin/BaseUsers.php:108 src/Module/Settings/Account.php:473 +#: src/Module/Admin/BaseUsers.php:109 src/Module/Settings/Account.php:474 msgid "Organisation Page" msgstr "" -#: src/Module/Admin/BaseUsers.php:109 src/Module/Settings/Account.php:480 +#: src/Module/Admin/BaseUsers.php:110 src/Module/Settings/Account.php:481 msgid "News Page" msgstr "" -#: src/Module/Admin/BaseUsers.php:110 src/Module/Settings/Account.php:487 +#: src/Module/Admin/BaseUsers.php:111 src/Module/Settings/Account.php:488 msgid "Community Forum" msgstr "" -#: src/Module/Admin/BaseUsers.php:111 +#: src/Module/Admin/BaseUsers.php:112 msgid "Relay" 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:139 -#: src/Module/Admin/Users/Index.php:151 src/Module/Admin/Users/Pending.php:103 +#: src/Module/Admin/Users/Active.php:139 src/Module/Admin/Users/Blocked.php:140 +#: src/Module/Admin/Users/Index.php:152 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:142 src/Module/Admin/Users/Index.php:156 -#: src/Module/Contact.php:401 src/Module/Contact/Profile.php:348 -#: src/Module/Contact/Profile.php:449 +#: src/Module/Admin/Users/Blocked.php:143 src/Module/Admin/Users/Index.php:157 +#: src/Module/Contact.php:402 src/Module/Contact/Profile.php:350 +#: src/Module/Contact/Profile.php:451 msgid "Unblock" msgstr "" @@ -4699,7 +4699,7 @@ 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:82 +#: src/Module/Admin/Blocklist/Server/Index.php:109 src/Module/Friendica.php:83 msgid "Reason for the block" msgstr "" @@ -4821,75 +4821,75 @@ msgstr "" msgid "Manage Additional Features" msgstr "" -#: src/Module/Admin/Federation.php:69 +#: src/Module/Admin/Federation.php:70 msgid "Other" msgstr "" -#: src/Module/Admin/Federation.php:141 src/Module/Admin/Federation.php:390 +#: src/Module/Admin/Federation.php:142 src/Module/Admin/Federation.php:391 msgid "unknown" msgstr "" -#: src/Module/Admin/Federation.php:174 +#: src/Module/Admin/Federation.php:175 #, php-format msgid "%2$s total system" msgid_plural "%2$s total systems" msgstr[0] "" msgstr[1] "" -#: src/Module/Admin/Federation.php:175 +#: src/Module/Admin/Federation.php:176 #, php-format msgid "%2$s active user last month" msgid_plural "%2$s active users last month" msgstr[0] "" msgstr[1] "" -#: src/Module/Admin/Federation.php:176 +#: src/Module/Admin/Federation.php:177 #, php-format msgid "%2$s active user last six months" msgid_plural "%2$s active users last six months" msgstr[0] "" msgstr[1] "" -#: src/Module/Admin/Federation.php:177 +#: src/Module/Admin/Federation.php:178 #, php-format msgid "%2$s registered user" msgid_plural "%2$s registered users" msgstr[0] "" msgstr[1] "" -#: src/Module/Admin/Federation.php:178 +#: src/Module/Admin/Federation.php:179 #, php-format msgid "%2$s locally created post or comment" msgid_plural "%2$s locally created posts and comments" msgstr[0] "" msgstr[1] "" -#: src/Module/Admin/Federation.php:181 +#: src/Module/Admin/Federation.php:182 #, php-format msgid "%2$s post per user" msgid_plural "%2$s posts per user" msgstr[0] "" msgstr[1] "" -#: src/Module/Admin/Federation.php:186 +#: src/Module/Admin/Federation.php:187 #, php-format msgid "%2$s user per system" msgid_plural "%2$s users per system" msgstr[0] "" msgstr[1] "" -#: src/Module/Admin/Federation.php:196 +#: src/Module/Admin/Federation.php:197 msgid "" "This page offers you some numbers to the known part of the federated social " "network your Friendica node is part of. These numbers are not complete but " "only reflect the part of the network your node is aware of." msgstr "" -#: src/Module/Admin/Federation.php:202 src/Module/BaseAdmin.php:90 +#: src/Module/Admin/Federation.php:203 src/Module/BaseAdmin.php:90 msgid "Federation Statistics" msgstr "" -#: src/Module/Admin/Federation.php:206 +#: src/Module/Admin/Federation.php:207 #, php-format msgid "" "Currently this node is aware of %2$s node (%3$s active users last month, " @@ -4959,8 +4959,8 @@ msgstr "" msgid "Tag" msgstr "" -#: src/Module/Admin/Item/Source.php:63 src/Module/Admin/Users/Active.php:129 -#: src/Module/Admin/Users/Blocked.php:130 src/Module/Admin/Users/Index.php:142 +#: src/Module/Admin/Item/Source.php:63 src/Module/Admin/Users/Active.php:130 +#: src/Module/Admin/Users/Blocked.php:131 src/Module/Admin/Users/Index.php:143 msgid "Type" msgstr "" @@ -5089,7 +5089,7 @@ msgid "Data" msgstr "" #: src/Module/Admin/Logs/View.php:99 -#: src/Module/Debug/ActivityPubConversion.php:57 +#: src/Module/Debug/ActivityPubConversion.php:58 msgid "Source" msgstr "" @@ -5246,7 +5246,7 @@ msgstr "" msgid "Republish users to directory" msgstr "" -#: src/Module/Admin/Site.php:436 src/Module/Register.php:152 +#: src/Module/Admin/Site.php:436 src/Module/Register.php:153 msgid "Registration" msgstr "" @@ -6032,7 +6032,7 @@ msgid "" "received." msgstr "" -#: src/Module/Admin/Site.php:543 src/Module/Contact/Profile.php:273 +#: src/Module/Admin/Site.php:543 src/Module/Contact/Profile.php:275 #: src/Module/Settings/TwoFactor/Index.php:126 msgid "Disabled" msgstr "" @@ -6121,12 +6121,12 @@ msgstr "" msgid "Database (legacy)" msgstr "" -#: src/Module/Admin/Summary.php:54 +#: src/Module/Admin/Summary.php:55 #, php-format msgid "Template engine (%s) error: %s" msgstr "" -#: src/Module/Admin/Summary.php:58 +#: src/Module/Admin/Summary.php:59 #, php-format msgid "" "Your DB still runs with MyISAM tables. You should change the engine type to " @@ -6137,7 +6137,7 @@ msgid "" "automatic conversion.
" msgstr "" -#: src/Module/Admin/Summary.php:63 +#: src/Module/Admin/Summary.php:64 #, php-format msgid "" "Your DB still runs with InnoDB tables in the Antelope file format. You " @@ -6148,7 +6148,7 @@ msgid "" "installation for an automatic conversion.
" msgstr "" -#: src/Module/Admin/Summary.php:73 +#: src/Module/Admin/Summary.php:74 #, php-format msgid "" "Your table_definition_cache is too low (%d). This can lead to the database " @@ -6156,39 +6156,39 @@ msgid "" "to %d. See here for more information.
" msgstr "" -#: src/Module/Admin/Summary.php:83 +#: src/Module/Admin/Summary.php:84 #, php-format msgid "" "There is a new version of Friendica available for download. Your current " "version is %1$s, upstream version is %2$s" msgstr "" -#: src/Module/Admin/Summary.php:92 +#: src/Module/Admin/Summary.php:93 msgid "" "The database update failed. Please run \"php bin/console.php dbstructure " "update\" from the command line and have a look at the errors that might " "appear." msgstr "" -#: src/Module/Admin/Summary.php:96 +#: src/Module/Admin/Summary.php:97 msgid "" "The last update failed. Please run \"php bin/console.php dbstructure update" "\" from the command line and have a look at the errors that might appear. " "(Some of the errors are possibly inside the logfile.)" msgstr "" -#: src/Module/Admin/Summary.php:101 +#: src/Module/Admin/Summary.php:102 msgid "The worker was never executed. Please check your database structure!" msgstr "" -#: src/Module/Admin/Summary.php:103 +#: src/Module/Admin/Summary.php:104 #, php-format msgid "" "The last worker execution was on %s UTC. This is older than one hour. Please " "check your crontab settings." msgstr "" -#: src/Module/Admin/Summary.php:108 +#: src/Module/Admin/Summary.php:109 #, php-format msgid "" "Friendica's configuration now is stored in config/local.config.php, please " @@ -6197,7 +6197,7 @@ msgid "" "with the transition." msgstr "" -#: src/Module/Admin/Summary.php:112 +#: src/Module/Admin/Summary.php:113 #, php-format msgid "" "Friendica's configuration now is stored in config/local.config.php, please " @@ -6206,7 +6206,7 @@ msgid "" "with the transition." msgstr "" -#: src/Module/Admin/Summary.php:118 +#: src/Module/Admin/Summary.php:119 #, php-format msgid "" "%s is not reachable on your system. This is a severe " @@ -6214,82 +6214,82 @@ msgid "" "href=\"%s\">the installation page for help." msgstr "" -#: src/Module/Admin/Summary.php:136 +#: src/Module/Admin/Summary.php:137 #, php-format msgid "The logfile '%s' is not usable. No logging possible (error: '%s')" msgstr "" -#: src/Module/Admin/Summary.php:150 +#: src/Module/Admin/Summary.php:151 #, php-format msgid "The debug logfile '%s' is not usable. No logging possible (error: '%s')" msgstr "" -#: src/Module/Admin/Summary.php:166 +#: src/Module/Admin/Summary.php:167 #, php-format msgid "" "Friendica's system.basepath was updated from '%s' to '%s'. Please remove the " "system.basepath from your db to avoid differences." msgstr "" -#: src/Module/Admin/Summary.php:174 +#: src/Module/Admin/Summary.php:175 #, php-format msgid "" "Friendica's current system.basepath '%s' is wrong and the config file '%s' " "isn't used." msgstr "" -#: src/Module/Admin/Summary.php:182 +#: src/Module/Admin/Summary.php:183 #, php-format msgid "" "Friendica's current system.basepath '%s' is not equal to the config file " "'%s'. Please fix your configuration." msgstr "" -#: src/Module/Admin/Summary.php:189 +#: src/Module/Admin/Summary.php:190 msgid "Normal Account" msgstr "" -#: src/Module/Admin/Summary.php:190 +#: src/Module/Admin/Summary.php:191 msgid "Automatic Follower Account" msgstr "" -#: src/Module/Admin/Summary.php:191 +#: src/Module/Admin/Summary.php:192 msgid "Public Forum Account" msgstr "" -#: src/Module/Admin/Summary.php:192 +#: src/Module/Admin/Summary.php:193 msgid "Automatic Friend Account" msgstr "" -#: src/Module/Admin/Summary.php:193 +#: src/Module/Admin/Summary.php:194 msgid "Blog Account" msgstr "" -#: src/Module/Admin/Summary.php:194 +#: src/Module/Admin/Summary.php:195 msgid "Private Forum Account" msgstr "" -#: src/Module/Admin/Summary.php:214 +#: src/Module/Admin/Summary.php:215 msgid "Message queues" msgstr "" -#: src/Module/Admin/Summary.php:220 +#: src/Module/Admin/Summary.php:221 msgid "Server Settings" msgstr "" -#: src/Module/Admin/Summary.php:236 +#: src/Module/Admin/Summary.php:237 msgid "Registered users" msgstr "" -#: src/Module/Admin/Summary.php:238 +#: src/Module/Admin/Summary.php:239 msgid "Pending registrations" msgstr "" -#: src/Module/Admin/Summary.php:239 +#: src/Module/Admin/Summary.php:240 msgid "Version" msgstr "" -#: src/Module/Admin/Summary.php:243 +#: src/Module/Admin/Summary.php:244 msgid "Active addons" msgstr "" @@ -6378,106 +6378,106 @@ msgid "" "of sections should be [h2] and below." msgstr "" -#: src/Module/Admin/Users/Active.php:45 src/Module/Admin/Users/Index.php:45 +#: src/Module/Admin/Users/Active.php:46 src/Module/Admin/Users/Index.php:46 #, php-format msgid "%s user blocked" msgid_plural "%s users blocked" msgstr[0] "" msgstr[1] "" -#: src/Module/Admin/Users/Active.php:53 src/Module/Admin/Users/Active.php:88 -#: 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 +#: src/Module/Admin/Users/Active.php:54 src/Module/Admin/Users/Active.php:89 +#: 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 msgid "You can't remove yourself" msgstr "" -#: src/Module/Admin/Users/Active.php:57 src/Module/Admin/Users/Blocked.php:58 -#: src/Module/Admin/Users/Index.php:64 +#: src/Module/Admin/Users/Active.php:58 src/Module/Admin/Users/Blocked.php:59 +#: src/Module/Admin/Users/Index.php:65 #, 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:87 -#: src/Module/Admin/Users/Index.php:93 +#: src/Module/Admin/Users/Active.php:87 src/Module/Admin/Users/Blocked.php:88 +#: src/Module/Admin/Users/Index.php:94 #, php-format msgid "User \"%s\" deleted" msgstr "" -#: src/Module/Admin/Users/Active.php:96 src/Module/Admin/Users/Index.php:103 +#: src/Module/Admin/Users/Active.php:97 src/Module/Admin/Users/Index.php:104 #, php-format msgid "User \"%s\" blocked" msgstr "" -#: 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 +#: src/Module/Admin/Users/Active.php:130 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 msgid "Register date" msgstr "" -#: 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 +#: src/Module/Admin/Users/Active.php:130 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 msgid "Last login" msgstr "" -#: 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 +#: src/Module/Admin/Users/Active.php:130 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 msgid "Last public item" msgstr "" -#: src/Module/Admin/Users/Active.php:137 +#: src/Module/Admin/Users/Active.php:138 msgid "Active Accounts" msgstr "" -#: src/Module/Admin/Users/Active.php:141 src/Module/Admin/Users/Blocked.php:141 -#: src/Module/Admin/Users/Index.php:155 +#: src/Module/Admin/Users/Active.php:142 src/Module/Admin/Users/Blocked.php:142 +#: src/Module/Admin/Users/Index.php:156 msgid "User blocked" msgstr "" -#: 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:144 #: src/Module/Admin/Users/Index.php:158 +msgid "Site admin" +msgstr "" + +#: src/Module/Admin/Users/Active.php:144 src/Module/Admin/Users/Blocked.php:145 +#: src/Module/Admin/Users/Index.php:159 msgid "Account expired" msgstr "" -#: src/Module/Admin/Users/Active.php:144 src/Module/Admin/Users/Index.php:161 +#: src/Module/Admin/Users/Active.php:145 src/Module/Admin/Users/Index.php:162 msgid "Create a new user" msgstr "" -#: 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:151 #: src/Module/Admin/Users/Index.php:168 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:152 src/Module/Admin/Users/Blocked.php:152 +#: src/Module/Admin/Users/Index.php:169 +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:46 src/Module/Admin/Users/Index.php:52 +#: src/Module/Admin/Users/Blocked.php:47 src/Module/Admin/Users/Index.php:53 #, php-format msgid "%s user unblocked" msgid_plural "%s users unblocked" msgstr[0] "" msgstr[1] "" -#: src/Module/Admin/Users/Blocked.php:96 src/Module/Admin/Users/Index.php:109 +#: src/Module/Admin/Users/Blocked.php:97 src/Module/Admin/Users/Index.php:110 #, php-format msgid "User \"%s\" unblocked" msgstr "" -#: src/Module/Admin/Users/Blocked.php:138 +#: src/Module/Admin/Users/Blocked.php:139 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:162 +#: src/Module/Admin/Users/Deleted.php:88 src/Module/Admin/Users/Index.php:163 msgid "Permanent deletion" msgstr "" -#: src/Module/Admin/Users/Index.php:150 src/Module/Admin/Users/Index.php:160 +#: src/Module/Admin/Users/Index.php:151 src/Module/Admin/Users/Index.php:161 #: src/Module/BaseAdmin.php:95 msgid "Users" msgstr "" -#: src/Module/Admin/Users/Index.php:152 +#: src/Module/Admin/Users/Index.php:153 msgid "User waiting for permanent deletion" msgstr "" @@ -6582,7 +6582,7 @@ msgstr "" msgid "Only starting posts can be bookmarked" msgstr "" -#: src/Module/Api/Mastodon/Statuses/Mute.php:50 +#: src/Module/Api/Mastodon/Statuses/Mute.php:51 msgid "Only starting posts can be muted" msgstr "" @@ -6595,7 +6595,7 @@ msgstr "" msgid "Only starting posts can be unbookmarked" msgstr "" -#: src/Module/Api/Mastodon/Statuses/Unmute.php:50 +#: src/Module/Api/Mastodon/Statuses/Unmute.php:51 msgid "Only starting posts can be unmuted" msgstr "" @@ -6608,11 +6608,11 @@ msgstr "" msgid "Contact not found" msgstr "" -#: src/Module/Apps.php:54 +#: src/Module/Apps.php:56 msgid "No installed applications." msgstr "" -#: src/Module/Apps.php:59 +#: src/Module/Apps.php:61 msgid "Applications" msgstr "" @@ -6694,7 +6694,7 @@ msgstr "" msgid "Babel" msgstr "" -#: src/Module/BaseAdmin.php:121 src/Module/Debug/ActivityPubConversion.php:137 +#: src/Module/BaseAdmin.php:121 src/Module/Debug/ActivityPubConversion.php:138 msgid "ActivityPub Conversion" msgstr "" @@ -6706,26 +6706,26 @@ msgstr "" msgid "User registrations waiting for confirmation" msgstr "" -#: src/Module/BaseApi.php:241 src/Module/BaseApi.php:257 -#: src/Module/BaseApi.php:273 +#: src/Module/BaseApi.php:242 src/Module/BaseApi.php:258 +#: src/Module/BaseApi.php:274 msgid "Too Many Requests" msgstr "" -#: src/Module/BaseApi.php:242 +#: src/Module/BaseApi.php:243 #, php-format msgid "Daily posting limit of %d post reached. The post was rejected." msgid_plural "Daily posting limit of %d posts reached. The post was rejected." msgstr[0] "" msgstr[1] "" -#: src/Module/BaseApi.php:258 +#: src/Module/BaseApi.php:259 #, php-format msgid "Weekly posting limit of %d post reached. The post was rejected." msgid_plural "Weekly posting limit of %d posts reached. The post was rejected." msgstr[0] "" msgstr[1] "" -#: src/Module/BaseApi.php:274 +#: src/Module/BaseApi.php:275 #, php-format msgid "Monthly posting limit of %d post reached. The post was rejected." msgid_plural "" @@ -6733,7 +6733,7 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: src/Module/BaseProfile.php:51 src/Module/Contact.php:463 +#: src/Module/BaseProfile.php:51 src/Module/Contact.php:464 msgid "Profile Details" msgstr "" @@ -6741,7 +6741,7 @@ msgstr "" msgid "Only You Can See This" msgstr "" -#: src/Module/BaseProfile.php:114 src/Module/Profile/Schedule.php:82 +#: src/Module/BaseProfile.php:114 src/Module/Profile/Schedule.php:83 msgid "Scheduled Posts" msgstr "" @@ -6753,12 +6753,12 @@ msgstr "" msgid "Tips for New Members" msgstr "" -#: src/Module/BaseSearch.php:69 +#: src/Module/BaseSearch.php:70 #, php-format msgid "People Search - %s" msgstr "" -#: src/Module/BaseSearch.php:79 +#: src/Module/BaseSearch.php:80 #, php-format msgid "Forum Search - %s" msgstr "" @@ -6767,7 +6767,7 @@ msgstr "" msgid "Account" msgstr "" -#: src/Module/BaseSettings.php:48 src/Module/Security/TwoFactor/Verify.php:96 +#: src/Module/BaseSettings.php:48 src/Module/Security/TwoFactor/Verify.php:97 #: src/Module/Settings/TwoFactor/Index.php:118 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:77 msgid "Export personal data" msgstr "" @@ -6792,467 +6792,467 @@ msgstr "" msgid "Remove account" msgstr "" -#: src/Module/Bookmarklet.php:54 +#: src/Module/Bookmarklet.php:55 msgid "This page is missing a url parameter." msgstr "" -#: src/Module/Bookmarklet.php:66 +#: src/Module/Bookmarklet.php:67 msgid "The post was created" msgstr "" -#: src/Module/Contact.php:88 +#: src/Module/Contact.php:89 #, php-format msgid "%d contact edited." msgid_plural "%d contacts edited." msgstr[0] "" msgstr[1] "" -#: src/Module/Contact.php:312 +#: src/Module/Contact.php:313 msgid "Show all contacts" msgstr "" -#: src/Module/Contact.php:320 +#: src/Module/Contact.php:321 msgid "Only show pending contacts" msgstr "" -#: src/Module/Contact.php:328 +#: src/Module/Contact.php:329 msgid "Only show blocked contacts" msgstr "" -#: src/Module/Contact.php:333 src/Module/Contact.php:380 +#: src/Module/Contact.php:334 src/Module/Contact.php:381 #: src/Object/Post.php:339 msgid "Ignored" msgstr "" -#: src/Module/Contact.php:336 +#: src/Module/Contact.php:337 msgid "Only show ignored contacts" msgstr "" -#: src/Module/Contact.php:341 src/Module/Contact.php:381 +#: src/Module/Contact.php:342 src/Module/Contact.php:382 msgid "Archived" msgstr "" -#: src/Module/Contact.php:344 +#: src/Module/Contact.php:345 msgid "Only show archived contacts" msgstr "" -#: src/Module/Contact.php:349 src/Module/Contact.php:379 +#: src/Module/Contact.php:350 src/Module/Contact.php:380 msgid "Hidden" msgstr "" -#: src/Module/Contact.php:352 +#: src/Module/Contact.php:353 msgid "Only show hidden contacts" msgstr "" -#: src/Module/Contact.php:360 +#: src/Module/Contact.php:361 msgid "Organize your contact groups" msgstr "" -#: src/Module/Contact.php:392 +#: src/Module/Contact.php:393 msgid "Search your contacts" msgstr "" -#: src/Module/Contact.php:393 src/Module/Search/Index.php:207 +#: src/Module/Contact.php:394 src/Module/Search/Index.php:207 #, php-format msgid "Results for: %s" msgstr "" -#: src/Module/Contact.php:400 +#: src/Module/Contact.php:401 msgid "Update" msgstr "" -#: src/Module/Contact.php:402 src/Module/Contact/Profile.php:349 -#: src/Module/Contact/Profile.php:457 +#: src/Module/Contact.php:403 src/Module/Contact/Profile.php:351 +#: src/Module/Contact/Profile.php:459 msgid "Unignore" msgstr "" -#: src/Module/Contact.php:404 +#: src/Module/Contact.php:405 msgid "Batch Actions" msgstr "" -#: src/Module/Contact.php:439 +#: src/Module/Contact.php:440 msgid "Conversations started by this contact" msgstr "" -#: src/Module/Contact.php:444 +#: src/Module/Contact.php:445 msgid "Posts and Comments" msgstr "" -#: src/Module/Contact.php:455 +#: src/Module/Contact.php:456 msgid "Posts containing media objects" msgstr "" -#: src/Module/Contact.php:470 +#: src/Module/Contact.php:471 msgid "View all known contacts" msgstr "" -#: src/Module/Contact.php:480 +#: src/Module/Contact.php:481 msgid "Advanced Contact Settings" msgstr "" -#: src/Module/Contact.php:514 +#: src/Module/Contact.php:515 msgid "Mutual Friendship" msgstr "" -#: src/Module/Contact.php:518 +#: src/Module/Contact.php:519 msgid "is a fan of yours" msgstr "" -#: src/Module/Contact.php:522 +#: src/Module/Contact.php:523 msgid "you are a fan of" msgstr "" -#: src/Module/Contact.php:540 +#: src/Module/Contact.php:541 msgid "Pending outgoing contact request" msgstr "" -#: src/Module/Contact.php:542 +#: src/Module/Contact.php:543 msgid "Pending incoming contact request" msgstr "" -#: src/Module/Contact.php:555 src/Module/Contact/Profile.php:334 +#: src/Module/Contact.php:556 src/Module/Contact/Profile.php:336 #, php-format msgid "Visit %s's profile [%s]" msgstr "" -#: src/Module/Contact/Advanced.php:99 +#: src/Module/Contact/Advanced.php:100 msgid "Contact update failed." msgstr "" -#: src/Module/Contact/Advanced.php:130 +#: src/Module/Contact/Advanced.php:131 msgid "Return to contact editor" msgstr "" -#: src/Module/Contact/Advanced.php:135 +#: src/Module/Contact/Advanced.php:136 msgid "Account Nickname" msgstr "" -#: src/Module/Contact/Advanced.php:136 +#: src/Module/Contact/Advanced.php:137 msgid "Account URL" msgstr "" -#: src/Module/Contact/Advanced.php:137 +#: src/Module/Contact/Advanced.php:138 msgid "Poll/Feed URL" msgstr "" -#: src/Module/Contact/Advanced.php:138 +#: src/Module/Contact/Advanced.php:139 msgid "New photo from this URL" msgstr "" -#: src/Module/Contact/Contacts.php:50 src/Module/Conversation/Network.php:187 -#: src/Module/Group.php:103 +#: src/Module/Contact/Contacts.php:49 src/Module/Conversation/Network.php:187 +#: src/Module/Group.php:104 msgid "Invalid contact." msgstr "" -#: src/Module/Contact/Contacts.php:73 +#: src/Module/Contact/Contacts.php:72 msgid "No known contacts." msgstr "" -#: src/Module/Contact/Contacts.php:87 src/Module/Profile/Common.php:98 +#: src/Module/Contact/Contacts.php:86 src/Module/Profile/Common.php:98 msgid "No common contacts." msgstr "" -#: src/Module/Contact/Contacts.php:99 src/Module/Profile/Contacts.php:96 +#: src/Module/Contact/Contacts.php:98 src/Module/Profile/Contacts.php:96 #, php-format msgid "Follower (%s)" msgid_plural "Followers (%s)" msgstr[0] "" msgstr[1] "" -#: src/Module/Contact/Contacts.php:103 src/Module/Profile/Contacts.php:99 +#: src/Module/Contact/Contacts.php:102 src/Module/Profile/Contacts.php:99 #, php-format msgid "Following (%s)" msgid_plural "Following (%s)" msgstr[0] "" msgstr[1] "" -#: src/Module/Contact/Contacts.php:107 src/Module/Profile/Contacts.php:102 +#: src/Module/Contact/Contacts.php:106 src/Module/Profile/Contacts.php:102 #, php-format msgid "Mutual friend (%s)" msgid_plural "Mutual friends (%s)" msgstr[0] "" msgstr[1] "" -#: src/Module/Contact/Contacts.php:109 src/Module/Profile/Contacts.php:104 +#: src/Module/Contact/Contacts.php:108 src/Module/Profile/Contacts.php:104 #, php-format msgid "These contacts both follow and are followed by %s." msgstr "" -#: src/Module/Contact/Contacts.php:115 src/Module/Profile/Common.php:86 +#: src/Module/Contact/Contacts.php:114 src/Module/Profile/Common.php:86 #, php-format msgid "Common contact (%s)" msgid_plural "Common contacts (%s)" msgstr[0] "" msgstr[1] "" -#: src/Module/Contact/Contacts.php:117 src/Module/Profile/Common.php:88 +#: src/Module/Contact/Contacts.php:116 src/Module/Profile/Common.php:88 #, php-format msgid "" "Both %s and yourself have publicly interacted with these " "contacts (follow, comment or likes on public posts)." msgstr "" -#: src/Module/Contact/Contacts.php:123 src/Module/Profile/Contacts.php:110 +#: src/Module/Contact/Contacts.php:122 src/Module/Profile/Contacts.php:110 #, php-format msgid "Contact (%s)" msgid_plural "Contacts (%s)" msgstr[0] "" msgstr[1] "" -#: src/Module/Contact/Profile.php:127 +#: src/Module/Contact/Profile.php:129 msgid "Failed to update contact record." msgstr "" -#: src/Module/Contact/Profile.php:177 +#: src/Module/Contact/Profile.php:179 msgid "Contact has been unblocked" msgstr "" -#: src/Module/Contact/Profile.php:181 +#: src/Module/Contact/Profile.php:183 msgid "Contact has been blocked" msgstr "" -#: src/Module/Contact/Profile.php:193 +#: src/Module/Contact/Profile.php:195 msgid "Contact has been unignored" msgstr "" -#: src/Module/Contact/Profile.php:197 +#: src/Module/Contact/Profile.php:199 msgid "Contact has been ignored" msgstr "" -#: src/Module/Contact/Profile.php:229 -#, php-format -msgid "You are mutual friends with %s" -msgstr "" - -#: src/Module/Contact/Profile.php:230 -#, php-format -msgid "You are sharing with %s" -msgstr "" - #: src/Module/Contact/Profile.php:231 #, php-format +msgid "You are mutual friends with %s" +msgstr "" + +#: src/Module/Contact/Profile.php:232 +#, php-format +msgid "You are sharing with %s" +msgstr "" + +#: src/Module/Contact/Profile.php:233 +#, php-format msgid "%s is sharing with you" msgstr "" -#: src/Module/Contact/Profile.php:247 +#: src/Module/Contact/Profile.php:249 msgid "Private communications are not available for this contact." msgstr "" -#: src/Module/Contact/Profile.php:249 +#: src/Module/Contact/Profile.php:251 msgid "Never" msgstr "" -#: src/Module/Contact/Profile.php:252 +#: src/Module/Contact/Profile.php:254 msgid "(Update was not successful)" msgstr "" -#: src/Module/Contact/Profile.php:252 +#: src/Module/Contact/Profile.php:254 msgid "(Update was successful)" msgstr "" -#: src/Module/Contact/Profile.php:254 src/Module/Contact/Profile.php:420 +#: src/Module/Contact/Profile.php:256 src/Module/Contact/Profile.php:422 msgid "Suggest friends" msgstr "" -#: src/Module/Contact/Profile.php:258 +#: src/Module/Contact/Profile.php:260 #, php-format msgid "Network type: %s" msgstr "" -#: src/Module/Contact/Profile.php:263 +#: src/Module/Contact/Profile.php:265 msgid "Communications lost with this contact!" msgstr "" -#: src/Module/Contact/Profile.php:269 +#: src/Module/Contact/Profile.php:271 msgid "Fetch further information for feeds" msgstr "" -#: src/Module/Contact/Profile.php:271 +#: src/Module/Contact/Profile.php:273 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:274 +#: src/Module/Contact/Profile.php:276 msgid "Fetch information" msgstr "" -#: src/Module/Contact/Profile.php:275 +#: src/Module/Contact/Profile.php:277 msgid "Fetch keywords" msgstr "" -#: src/Module/Contact/Profile.php:276 +#: src/Module/Contact/Profile.php:278 msgid "Fetch information and keywords" msgstr "" -#: src/Module/Contact/Profile.php:286 src/Module/Contact/Profile.php:292 -#: src/Module/Contact/Profile.php:297 src/Module/Contact/Profile.php:303 +#: src/Module/Contact/Profile.php:288 src/Module/Contact/Profile.php:294 +#: src/Module/Contact/Profile.php:299 src/Module/Contact/Profile.php:305 msgid "No mirroring" msgstr "" -#: src/Module/Contact/Profile.php:287 +#: src/Module/Contact/Profile.php:289 msgid "Mirror as forwarded posting" msgstr "" -#: src/Module/Contact/Profile.php:288 src/Module/Contact/Profile.php:298 -#: src/Module/Contact/Profile.php:304 +#: src/Module/Contact/Profile.php:290 src/Module/Contact/Profile.php:300 +#: src/Module/Contact/Profile.php:306 msgid "Mirror as my own posting" msgstr "" -#: src/Module/Contact/Profile.php:293 src/Module/Contact/Profile.php:299 +#: src/Module/Contact/Profile.php:295 src/Module/Contact/Profile.php:301 msgid "Native reshare" msgstr "" -#: src/Module/Contact/Profile.php:316 +#: src/Module/Contact/Profile.php:318 msgid "Contact Information / Notes" msgstr "" -#: src/Module/Contact/Profile.php:317 +#: src/Module/Contact/Profile.php:319 msgid "Contact Settings" msgstr "" -#: src/Module/Contact/Profile.php:325 +#: src/Module/Contact/Profile.php:327 msgid "Contact" msgstr "" -#: src/Module/Contact/Profile.php:329 +#: src/Module/Contact/Profile.php:331 msgid "Their personal note" msgstr "" -#: src/Module/Contact/Profile.php:331 +#: src/Module/Contact/Profile.php:333 msgid "Edit contact notes" msgstr "" -#: src/Module/Contact/Profile.php:335 +#: src/Module/Contact/Profile.php:337 msgid "Block/Unblock contact" msgstr "" -#: src/Module/Contact/Profile.php:336 +#: src/Module/Contact/Profile.php:338 msgid "Ignore contact" msgstr "" -#: src/Module/Contact/Profile.php:337 +#: src/Module/Contact/Profile.php:339 msgid "View conversations" msgstr "" -#: src/Module/Contact/Profile.php:342 +#: src/Module/Contact/Profile.php:344 msgid "Last update:" msgstr "" -#: src/Module/Contact/Profile.php:344 +#: src/Module/Contact/Profile.php:346 msgid "Update public posts" msgstr "" -#: src/Module/Contact/Profile.php:346 src/Module/Contact/Profile.php:430 +#: src/Module/Contact/Profile.php:348 src/Module/Contact/Profile.php:432 msgid "Update now" msgstr "" -#: src/Module/Contact/Profile.php:353 +#: src/Module/Contact/Profile.php:355 msgid "Currently blocked" msgstr "" -#: src/Module/Contact/Profile.php:354 +#: src/Module/Contact/Profile.php:356 msgid "Currently ignored" msgstr "" -#: src/Module/Contact/Profile.php:355 +#: src/Module/Contact/Profile.php:357 msgid "Currently archived" msgstr "" -#: src/Module/Contact/Profile.php:356 +#: src/Module/Contact/Profile.php:358 msgid "Awaiting connection acknowledge" msgstr "" -#: src/Module/Contact/Profile.php:357 -#: src/Module/Notifications/Introductions.php:190 +#: src/Module/Contact/Profile.php:359 +#: src/Module/Notifications/Introductions.php:192 msgid "Hide this contact from others" msgstr "" -#: src/Module/Contact/Profile.php:357 +#: src/Module/Contact/Profile.php:359 msgid "" "Replies/likes to your public posts may still be visible" msgstr "" -#: src/Module/Contact/Profile.php:358 +#: src/Module/Contact/Profile.php:360 msgid "Notification for new posts" msgstr "" -#: src/Module/Contact/Profile.php:358 +#: src/Module/Contact/Profile.php:360 msgid "Send a notification of every new post of this contact" msgstr "" -#: src/Module/Contact/Profile.php:360 +#: src/Module/Contact/Profile.php:362 msgid "Keyword Deny List" msgstr "" -#: src/Module/Contact/Profile.php:360 +#: src/Module/Contact/Profile.php:362 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:378 +#: src/Module/Contact/Profile.php:380 #: src/Module/Settings/TwoFactor/Index.php:140 msgid "Actions" msgstr "" -#: src/Module/Contact/Profile.php:386 +#: src/Module/Contact/Profile.php:388 msgid "Mirror postings from this contact" msgstr "" -#: src/Module/Contact/Profile.php:388 +#: src/Module/Contact/Profile.php:390 msgid "" "Mark this contact as remote_self, this will cause friendica to repost new " "entries from this contact." msgstr "" -#: src/Module/Contact/Profile.php:440 +#: src/Module/Contact/Profile.php:442 msgid "Refetch contact data" msgstr "" -#: src/Module/Contact/Profile.php:451 +#: src/Module/Contact/Profile.php:453 msgid "Toggle Blocked status" msgstr "" -#: src/Module/Contact/Profile.php:459 +#: src/Module/Contact/Profile.php:461 msgid "Toggle Ignored status" msgstr "" -#: src/Module/Contact/Profile.php:466 src/Module/Contact/Revoke.php:105 +#: src/Module/Contact/Profile.php:468 src/Module/Contact/Revoke.php:107 msgid "Revoke Follow" msgstr "" -#: src/Module/Contact/Profile.php:468 +#: src/Module/Contact/Profile.php:470 msgid "Revoke the follow from this contact" msgstr "" -#: src/Module/Contact/Revoke.php:62 +#: src/Module/Contact/Revoke.php:64 msgid "Unknown contact." msgstr "" -#: src/Module/Contact/Revoke.php:72 src/Module/Group.php:112 +#: src/Module/Contact/Revoke.php:74 src/Module/Group.php:113 msgid "Contact is deleted." msgstr "" -#: src/Module/Contact/Revoke.php:76 +#: src/Module/Contact/Revoke.php:78 msgid "Contact is being deleted." msgstr "" -#: src/Module/Contact/Revoke.php:90 +#: src/Module/Contact/Revoke.php:92 msgid "Follow was successfully revoked." msgstr "" -#: src/Module/Contact/Revoke.php:106 +#: src/Module/Contact/Revoke.php:108 msgid "" "Do you really want to revoke this contact's follow? This cannot be undone " "and they will have to manually follow you back again." msgstr "" -#: src/Module/Contact/Revoke.php:107 -#: src/Module/Notifications/Introductions.php:142 -#: src/Module/OAuth/Acknowledge.php:53 src/Module/Register.php:130 -#: src/Module/Settings/TwoFactor/Trusted.php:124 +#: src/Module/Contact/Revoke.php:109 +#: src/Module/Notifications/Introductions.php:144 +#: src/Module/OAuth/Acknowledge.php:53 src/Module/Register.php:131 +#: src/Module/Settings/TwoFactor/Trusted.php:126 msgid "Yes" msgstr "" @@ -7337,7 +7337,7 @@ msgid "Sort by post creation date" msgstr "" #: src/Module/Conversation/Network.php:279 -#: src/Module/Settings/Profile/Index.php:227 +#: src/Module/Settings/Profile/Index.php:228 msgid "Personal" msgstr "" @@ -7364,23 +7364,23 @@ msgid "" "code or the translation of Friendica. Thank you all!" msgstr "" -#: src/Module/Debug/ActivityPubConversion.php:53 +#: src/Module/Debug/ActivityPubConversion.php:54 msgid "Formatted" msgstr "" -#: src/Module/Debug/ActivityPubConversion.php:65 +#: src/Module/Debug/ActivityPubConversion.php:66 msgid "Activity" msgstr "" -#: src/Module/Debug/ActivityPubConversion.php:117 +#: src/Module/Debug/ActivityPubConversion.php:118 msgid "Object data" msgstr "" -#: src/Module/Debug/ActivityPubConversion.php:124 +#: src/Module/Debug/ActivityPubConversion.php:125 msgid "Result Item" msgstr "" -#: src/Module/Debug/ActivityPubConversion.php:138 +#: src/Module/Debug/ActivityPubConversion.php:139 msgid "Source activity" msgstr "" @@ -7560,12 +7560,12 @@ msgstr "" msgid "Twitter Source / Tweet URL (requires API key)" msgstr "" -#: src/Module/Debug/Feed.php:51 src/Module/Filer/SaveTag.php:46 -#: src/Module/Settings/Profile/Index.php:141 +#: src/Module/Debug/Feed.php:53 src/Module/Filer/SaveTag.php:48 +#: src/Module/Settings/Profile/Index.php:142 msgid "You must be logged in to use this module" msgstr "" -#: src/Module/Debug/Feed.php:76 +#: src/Module/Debug/Feed.php:78 msgid "Source URL" msgstr "" @@ -7598,50 +7598,50 @@ msgstr "" msgid "Please select your timezone:" msgstr "" -#: src/Module/Debug/Probe.php:38 src/Module/Debug/WebFinger.php:37 +#: src/Module/Debug/Probe.php:39 src/Module/Debug/WebFinger.php:38 msgid "Only logged in users are permitted to perform a probing." msgstr "" -#: src/Module/Debug/Probe.php:52 +#: src/Module/Debug/Probe.php:53 msgid "Probe Diagnostic" msgstr "" -#: src/Module/Debug/Probe.php:53 +#: src/Module/Debug/Probe.php:54 msgid "Output" msgstr "" -#: src/Module/Debug/Probe.php:56 +#: src/Module/Debug/Probe.php:57 msgid "Lookup address" msgstr "" -#: src/Module/Debug/WebFinger.php:50 +#: src/Module/Debug/WebFinger.php:51 msgid "Webfinger Diagnostic" msgstr "" -#: src/Module/Debug/WebFinger.php:52 +#: src/Module/Debug/WebFinger.php:53 msgid "Lookup address:" msgstr "" -#: src/Module/Delegation.php:111 +#: src/Module/Delegation.php:110 #, php-format msgid "You are now logged in as %s" msgstr "" -#: src/Module/Delegation.php:143 +#: src/Module/Delegation.php:142 msgid "Switch between your accounts" msgstr "" -#: src/Module/Delegation.php:144 +#: src/Module/Delegation.php:143 msgid "Manage your accounts" msgstr "" -#: src/Module/Delegation.php:145 +#: src/Module/Delegation.php:144 msgid "" "Toggle between different identities or community/group pages which share " "your account details or which you have been granted \"manage\" permissions" msgstr "" -#: src/Module/Delegation.php:146 +#: src/Module/Delegation.php:145 msgid "Select an identity to manage: " msgstr "" @@ -7661,159 +7661,159 @@ msgstr "" msgid "Site Directory" msgstr "" -#: src/Module/Filer/RemoveTag.php:101 +#: src/Module/Filer/RemoveTag.php:102 msgid "Item was not deleted" msgstr "" -#: src/Module/Filer/RemoveTag.php:111 +#: src/Module/Filer/RemoveTag.php:112 msgid "Item was not removed" msgstr "" -#: src/Module/Filer/SaveTag.php:72 +#: src/Module/Filer/SaveTag.php:74 msgid "- select -" msgstr "" -#: src/Module/FriendSuggest.php:81 +#: src/Module/FriendSuggest.php:83 msgid "Suggested contact not found." msgstr "" -#: src/Module/FriendSuggest.php:99 +#: src/Module/FriendSuggest.php:101 msgid "Friend suggestion sent." msgstr "" -#: src/Module/FriendSuggest.php:136 +#: src/Module/FriendSuggest.php:138 msgid "Suggest Friends" msgstr "" -#: src/Module/FriendSuggest.php:139 +#: src/Module/FriendSuggest.php:141 #, php-format msgid "Suggest a friend for %s" msgstr "" -#: src/Module/Friendica.php:62 +#: src/Module/Friendica.php:63 msgid "Installed addons/apps:" msgstr "" -#: src/Module/Friendica.php:67 +#: src/Module/Friendica.php:68 msgid "No installed addons/apps" msgstr "" -#: src/Module/Friendica.php:72 +#: src/Module/Friendica.php:73 #, php-format msgid "Read about the Terms of Service of this node." msgstr "" -#: src/Module/Friendica.php:79 +#: src/Module/Friendica.php:80 msgid "On this server the following remote servers are blocked." msgstr "" -#: src/Module/Friendica.php:84 +#: src/Module/Friendica.php:85 msgid "Download this list in CSV format" msgstr "" -#: src/Module/Friendica.php:98 +#: src/Module/Friendica.php:99 #, php-format msgid "" "This is Friendica, version %s that is running at the web location %s. The " "database version is %s, the post update version is %s." msgstr "" -#: src/Module/Friendica.php:103 +#: src/Module/Friendica.php:104 msgid "" "Please visit Friendi.ca to learn more " "about the Friendica project." msgstr "" -#: src/Module/Friendica.php:104 +#: src/Module/Friendica.php:105 msgid "Bug reports and issues: please visit" msgstr "" -#: src/Module/Friendica.php:104 +#: src/Module/Friendica.php:105 msgid "the bugtracker at github" msgstr "" -#: src/Module/Friendica.php:105 +#: src/Module/Friendica.php:106 msgid "" "Suggestions, praise, etc. - please email \"info\" at \"friendi - dot - ca" msgstr "" -#: src/Module/Group.php:58 +#: src/Module/Group.php:59 msgid "Could not create group." msgstr "" -#: src/Module/Group.php:69 src/Module/Group.php:215 src/Module/Group.php:239 +#: src/Module/Group.php:70 src/Module/Group.php:216 src/Module/Group.php:240 msgid "Group not found." msgstr "" -#: src/Module/Group.php:75 +#: src/Module/Group.php:76 msgid "Group name was not changed." msgstr "" -#: src/Module/Group.php:93 +#: src/Module/Group.php:94 msgid "Unknown group." msgstr "" -#: src/Module/Group.php:118 +#: src/Module/Group.php:119 msgid "Unable to add the contact to the group." msgstr "" -#: src/Module/Group.php:121 +#: src/Module/Group.php:122 msgid "Contact successfully added to group." msgstr "" -#: src/Module/Group.php:125 +#: src/Module/Group.php:126 msgid "Unable to remove the contact from the group." msgstr "" -#: src/Module/Group.php:128 +#: src/Module/Group.php:129 msgid "Contact successfully removed from group." msgstr "" -#: src/Module/Group.php:132 +#: src/Module/Group.php:133 msgid "Bad request." msgstr "" -#: src/Module/Group.php:171 +#: src/Module/Group.php:172 msgid "Save Group" msgstr "" -#: src/Module/Group.php:172 +#: src/Module/Group.php:173 msgid "Filter" msgstr "" -#: src/Module/Group.php:178 +#: src/Module/Group.php:179 msgid "Create a group of contacts/friends." msgstr "" -#: src/Module/Group.php:220 +#: src/Module/Group.php:221 msgid "Unable to remove group." msgstr "" -#: src/Module/Group.php:271 +#: src/Module/Group.php:272 msgid "Delete Group" msgstr "" -#: src/Module/Group.php:281 +#: src/Module/Group.php:282 msgid "Edit Group Name" msgstr "" -#: src/Module/Group.php:291 +#: src/Module/Group.php:292 msgid "Members" msgstr "" -#: src/Module/Group.php:294 +#: src/Module/Group.php:295 msgid "Group is empty" msgstr "" -#: src/Module/Group.php:307 +#: src/Module/Group.php:308 msgid "Remove contact from group" msgstr "" -#: src/Module/Group.php:328 +#: src/Module/Group.php:329 msgid "Click on a contact to add or remove." msgstr "" -#: src/Module/Group.php:342 +#: src/Module/Group.php:343 msgid "Add contact to group" msgstr "" @@ -7829,7 +7829,7 @@ msgstr "" msgid "Help:" msgstr "" -#: src/Module/Home.php:54 +#: src/Module/Home.php:55 #, php-format msgid "Welcome to %s" msgstr "" @@ -7990,40 +7990,40 @@ msgid "" "administrator email. This will allow you to enter the site admin panel." msgstr "" -#: src/Module/Invite.php:57 +#: src/Module/Invite.php:58 msgid "Total invitation limit exceeded." msgstr "" -#: src/Module/Invite.php:82 +#: src/Module/Invite.php:83 #, php-format msgid "%s : Not a valid email address." msgstr "" -#: src/Module/Invite.php:108 +#: src/Module/Invite.php:109 msgid "Please join us on Friendica" msgstr "" -#: src/Module/Invite.php:117 +#: src/Module/Invite.php:118 msgid "Invitation limit exceeded. Please contact your site administrator." msgstr "" -#: src/Module/Invite.php:121 +#: src/Module/Invite.php:122 #, php-format msgid "%s : Message delivery failed." msgstr "" -#: src/Module/Invite.php:125 +#: src/Module/Invite.php:126 #, php-format msgid "%d message sent." msgid_plural "%d messages sent." msgstr[0] "" msgstr[1] "" -#: src/Module/Invite.php:143 +#: src/Module/Invite.php:144 msgid "You have no more invitations available" msgstr "" -#: src/Module/Invite.php:150 +#: src/Module/Invite.php:151 #, php-format msgid "" "Visit %s for a list of public sites that you can join. Friendica members on " @@ -8031,14 +8031,14 @@ msgid "" "other social networks." msgstr "" -#: src/Module/Invite.php:152 +#: src/Module/Invite.php:153 #, php-format msgid "" "To accept this invitation, please visit and register at %s or any other " "public Friendica website." msgstr "" -#: src/Module/Invite.php:153 +#: src/Module/Invite.php:154 #, php-format msgid "" "Friendica sites all inter-connect to create a huge privacy-enhanced social " @@ -8047,88 +8047,88 @@ msgid "" "sites you can join." msgstr "" -#: src/Module/Invite.php:157 +#: src/Module/Invite.php:158 msgid "" "Our apologies. This system is not currently configured to connect with other " "public sites or invite members." msgstr "" -#: src/Module/Invite.php:160 +#: src/Module/Invite.php:161 msgid "" "Friendica sites all inter-connect to create a huge privacy-enhanced social " "web that is owned and controlled by its members. They can also connect with " "many traditional social networks." msgstr "" -#: src/Module/Invite.php:159 +#: src/Module/Invite.php:160 #, php-format msgid "To accept this invitation, please visit and register at %s." msgstr "" -#: src/Module/Invite.php:167 +#: src/Module/Invite.php:168 msgid "Send invitations" msgstr "" -#: src/Module/Invite.php:168 +#: src/Module/Invite.php:169 msgid "Enter email addresses, one per line:" msgstr "" -#: src/Module/Invite.php:172 +#: src/Module/Invite.php:173 msgid "" "You are cordially invited to join me and other close friends on Friendica - " "and help us to create a better social web." msgstr "" -#: src/Module/Invite.php:174 +#: src/Module/Invite.php:175 msgid "You will need to supply this invitation code: $invite_code" msgstr "" -#: src/Module/Invite.php:174 +#: src/Module/Invite.php:175 msgid "" "Once you have registered, please connect with me via my profile page at:" msgstr "" -#: src/Module/Invite.php:176 +#: src/Module/Invite.php:177 msgid "" "For more information about the Friendica project and why we feel it is " "important, please visit http://friendi.ca" msgstr "" -#: src/Module/Item/Compose.php:85 +#: src/Module/Item/Compose.php:86 msgid "Please enter a post body." msgstr "" -#: src/Module/Item/Compose.php:98 +#: src/Module/Item/Compose.php:99 msgid "This feature is only available with the frio theme." msgstr "" -#: src/Module/Item/Compose.php:122 +#: src/Module/Item/Compose.php:123 msgid "Compose new personal note" msgstr "" -#: src/Module/Item/Compose.php:131 +#: src/Module/Item/Compose.php:132 msgid "Compose new post" msgstr "" -#: src/Module/Item/Compose.php:187 +#: src/Module/Item/Compose.php:188 msgid "Visibility" msgstr "" -#: src/Module/Item/Compose.php:201 +#: src/Module/Item/Compose.php:202 msgid "Clear the location" msgstr "" -#: src/Module/Item/Compose.php:202 +#: src/Module/Item/Compose.php:203 msgid "Location services are unavailable on your device" msgstr "" -#: src/Module/Item/Compose.php:203 +#: src/Module/Item/Compose.php:204 msgid "" "Location services are disabled. Please check the website's permissions on " "your device" msgstr "" -#: src/Module/Item/Compose.php:209 +#: src/Module/Item/Compose.php:210 msgid "" "You can make this page always open when you use the New Post button in the " "Theme Customization settings." @@ -8153,70 +8153,70 @@ msgstr "" msgid "A Decentralized Social Network" msgstr "" -#: src/Module/Notifications/Introductions.php:97 +#: src/Module/Notifications/Introductions.php:99 msgid "Show Ignored Requests" msgstr "" -#: src/Module/Notifications/Introductions.php:97 +#: src/Module/Notifications/Introductions.php:99 msgid "Hide Ignored Requests" msgstr "" -#: src/Module/Notifications/Introductions.php:113 -#: src/Module/Notifications/Introductions.php:176 +#: src/Module/Notifications/Introductions.php:115 +#: src/Module/Notifications/Introductions.php:178 msgid "Notification type:" msgstr "" -#: src/Module/Notifications/Introductions.php:116 +#: src/Module/Notifications/Introductions.php:118 msgid "Suggested by:" msgstr "" -#: src/Module/Notifications/Introductions.php:141 +#: src/Module/Notifications/Introductions.php:143 msgid "Claims to be known to you: " msgstr "" -#: src/Module/Notifications/Introductions.php:142 -#: src/Module/OAuth/Acknowledge.php:54 src/Module/Register.php:131 -#: src/Module/Settings/TwoFactor/Trusted.php:124 +#: src/Module/Notifications/Introductions.php:144 +#: src/Module/OAuth/Acknowledge.php:54 src/Module/Register.php:132 +#: src/Module/Settings/TwoFactor/Trusted.php:126 msgid "No" msgstr "" -#: src/Module/Notifications/Introductions.php:150 +#: src/Module/Notifications/Introductions.php:152 msgid "Shall your connection be bidirectional or not?" msgstr "" -#: src/Module/Notifications/Introductions.php:151 +#: 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:152 +#: 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:154 +#: src/Module/Notifications/Introductions.php:156 msgid "Friend" msgstr "" -#: src/Module/Notifications/Introductions.php:155 +#: src/Module/Notifications/Introductions.php:157 msgid "Subscriber" msgstr "" -#: src/Module/Notifications/Introductions.php:214 +#: src/Module/Notifications/Introductions.php:216 msgid "No introductions." msgstr "" -#: src/Module/Notifications/Introductions.php:215 +#: src/Module/Notifications/Introductions.php:217 #: src/Module/Notifications/Notifications.php:134 #, php-format msgid "No more %s notifications." msgstr "" -#: src/Module/Notifications/Notification.php:134 +#: src/Module/Notifications/Notification.php:136 msgid "You must be logged in to show this page." msgstr "" @@ -8240,11 +8240,11 @@ msgstr "" msgid "Show unread" msgstr "" -#: src/Module/Notifications/Ping.php:226 +#: src/Module/Notifications/Ping.php:227 msgid "{0} requested registration" msgstr "" -#: src/Module/Notifications/Ping.php:237 +#: src/Module/Notifications/Ping.php:238 #, php-format msgid "{0} and %d others requested registration" msgstr "" @@ -8259,15 +8259,15 @@ msgid "" "and/or create new posts for you?" msgstr "" -#: src/Module/OAuth/Authorize.php:54 +#: src/Module/OAuth/Authorize.php:55 msgid "Unsupported or missing response type" msgstr "" -#: src/Module/OAuth/Authorize.php:59 src/Module/OAuth/Token.php:72 +#: src/Module/OAuth/Authorize.php:60 src/Module/OAuth/Token.php:72 msgid "Incomplete request data" msgstr "" -#: src/Module/OAuth/Authorize.php:106 +#: src/Module/OAuth/Authorize.php:107 #, php-format msgid "" "Please copy the following authentication code into your application and " @@ -8278,72 +8278,72 @@ msgstr "" msgid "Unsupported or missing grant type" msgstr "" -#: src/Module/PermissionTooltip.php:49 +#: src/Module/PermissionTooltip.php:50 #, php-format msgid "Wrong type \"%s\", expected one of: %s" msgstr "" -#: src/Module/PermissionTooltip.php:66 +#: src/Module/PermissionTooltip.php:67 msgid "Model not found" msgstr "" -#: src/Module/PermissionTooltip.php:89 +#: src/Module/PermissionTooltip.php:90 msgid "Unlisted" msgstr "" -#: src/Module/PermissionTooltip.php:107 +#: src/Module/PermissionTooltip.php:108 msgid "Remote privacy information not available." msgstr "" -#: src/Module/PermissionTooltip.php:116 +#: src/Module/PermissionTooltip.php:117 msgid "Visible to:" msgstr "" -#: src/Module/PermissionTooltip.php:200 +#: src/Module/PermissionTooltip.php:201 #, php-format msgid "Collection (%s)" msgstr "" -#: src/Module/PermissionTooltip.php:204 +#: src/Module/PermissionTooltip.php:205 #, php-format msgid "Followers (%s)" msgstr "" -#: src/Module/PermissionTooltip.php:223 +#: src/Module/PermissionTooltip.php:224 #, php-format msgid "%d more" msgstr "" -#: src/Module/PermissionTooltip.php:227 +#: src/Module/PermissionTooltip.php:228 #, php-format msgid "To: %s
" msgstr "" -#: src/Module/PermissionTooltip.php:230 +#: src/Module/PermissionTooltip.php:231 #, php-format msgid "CC: %s
" msgstr "" -#: src/Module/PermissionTooltip.php:233 +#: src/Module/PermissionTooltip.php:234 #, php-format msgid "BCC: %s
" msgstr "" -#: src/Module/Photo.php:128 +#: src/Module/Photo.php:129 msgid "The Photo is not available." msgstr "" -#: src/Module/Photo.php:141 +#: src/Module/Photo.php:142 #, php-format msgid "The Photo with id %s is not available." msgstr "" -#: src/Module/Photo.php:174 +#: src/Module/Photo.php:175 #, php-format msgid "Invalid external resource with url %s." msgstr "" -#: src/Module/Photo.php:176 +#: src/Module/Photo.php:177 #, php-format msgid "Invalid photo with id %s." msgstr "" @@ -8363,7 +8363,7 @@ msgid "" "\"btn btn-sm pull-right\">Cancel" msgstr "" -#: src/Module/Profile/Profile.php:144 src/Module/Settings/Account.php:579 +#: src/Module/Profile/Profile.php:144 src/Module/Settings/Account.php:580 msgid "Full Name:" msgstr "" @@ -8379,17 +8379,17 @@ msgstr "" msgid "j F" msgstr "" -#: src/Module/Profile/Profile.php:164 src/Util/Temporal.php:166 +#: src/Module/Profile/Profile.php:164 src/Util/Temporal.php:167 msgid "Birthday:" msgstr "" -#: src/Module/Profile/Profile.php:167 src/Module/Settings/Profile/Index.php:245 -#: src/Util/Temporal.php:168 +#: src/Module/Profile/Profile.php:167 src/Module/Settings/Profile/Index.php:246 +#: src/Util/Temporal.php:169 msgid "Age: " msgstr "" -#: src/Module/Profile/Profile.php:167 src/Module/Settings/Profile/Index.php:245 -#: src/Util/Temporal.php:168 +#: src/Module/Profile/Profile.php:167 src/Module/Settings/Profile/Index.php:246 +#: src/Util/Temporal.php:169 #, php-format msgid "%d year old" msgid_plural "%d years old" @@ -8410,202 +8410,202 @@ msgstr "" #: src/Module/Profile/Profile.php:326 src/Module/Profile/Profile.php:329 #: src/Module/Profile/Status.php:66 src/Module/Profile/Status.php:69 -#: src/Protocol/Feed.php:1026 src/Protocol/OStatus.php:1046 +#: src/Protocol/Feed.php:1028 src/Protocol/OStatus.php:1047 #, php-format msgid "%s's timeline" msgstr "" #: src/Module/Profile/Profile.php:327 src/Module/Profile/Status.php:67 -#: src/Protocol/Feed.php:1030 src/Protocol/OStatus.php:1051 +#: src/Protocol/Feed.php:1032 src/Protocol/OStatus.php:1052 #, php-format msgid "%s's posts" msgstr "" #: src/Module/Profile/Profile.php:328 src/Module/Profile/Status.php:68 -#: src/Protocol/Feed.php:1033 src/Protocol/OStatus.php:1055 +#: src/Protocol/Feed.php:1035 src/Protocol/OStatus.php:1056 #, php-format msgid "%s's comments" msgstr "" -#: src/Module/Profile/Schedule.php:84 +#: src/Module/Profile/Schedule.php:85 msgid "Scheduled" msgstr "" -#: src/Module/Profile/Schedule.php:85 +#: src/Module/Profile/Schedule.php:86 msgid "Content" msgstr "" -#: src/Module/Profile/Schedule.php:86 +#: src/Module/Profile/Schedule.php:87 msgid "Remove post" msgstr "" -#: src/Module/Register.php:84 +#: src/Module/Register.php:85 msgid "Only parent users can create additional accounts." msgstr "" -#: src/Module/Register.php:116 +#: src/Module/Register.php:117 msgid "" "You may (optionally) fill in this form via OpenID by supplying your OpenID " "and clicking \"Register\"." msgstr "" -#: src/Module/Register.php:117 +#: src/Module/Register.php:118 msgid "" "If you are not familiar with OpenID, please leave that field blank and fill " "in the rest of the items." msgstr "" -#: src/Module/Register.php:118 +#: src/Module/Register.php:119 msgid "Your OpenID (optional): " msgstr "" -#: src/Module/Register.php:127 +#: src/Module/Register.php:128 msgid "Include your profile in member directory?" msgstr "" -#: src/Module/Register.php:148 +#: src/Module/Register.php:149 msgid "Note for the admin" msgstr "" -#: src/Module/Register.php:148 +#: src/Module/Register.php:149 msgid "Leave a message for the admin, why you want to join this node" msgstr "" -#: src/Module/Register.php:149 +#: src/Module/Register.php:150 msgid "Membership on this site is by invitation only." msgstr "" -#: src/Module/Register.php:150 +#: src/Module/Register.php:151 msgid "Your invitation code: " msgstr "" -#: src/Module/Register.php:158 +#: src/Module/Register.php:159 msgid "Your Full Name (e.g. Joe Smith, real or real-looking): " msgstr "" -#: src/Module/Register.php:159 +#: src/Module/Register.php:160 msgid "" "Your Email Address: (Initial information will be send there, so this has to " "be an existing address.)" msgstr "" -#: src/Module/Register.php:160 +#: src/Module/Register.php:161 msgid "Please repeat your e-mail address:" msgstr "" -#: src/Module/Register.php:162 src/Module/Security/PasswordTooLong.php:97 -#: src/Module/Settings/Account.php:570 -msgid "New Password:" -msgstr "" - -#: src/Module/Register.php:162 -msgid "Leave empty for an auto generated password." -msgstr "" - #: src/Module/Register.php:163 src/Module/Security/PasswordTooLong.php:98 #: src/Module/Settings/Account.php:571 +msgid "New Password:" +msgstr "" + +#: src/Module/Register.php:163 +msgid "Leave empty for an auto generated password." +msgstr "" + +#: src/Module/Register.php:164 src/Module/Security/PasswordTooLong.php:99 +#: src/Module/Settings/Account.php:572 msgid "Confirm:" msgstr "" -#: src/Module/Register.php:164 +#: src/Module/Register.php:165 #, php-format msgid "" "Choose a profile nickname. This must begin with a text character. Your " "profile address on this site will then be \"nickname@%s\"." msgstr "" -#: src/Module/Register.php:165 +#: src/Module/Register.php:166 msgid "Choose a nickname: " msgstr "" -#: src/Module/Register.php:174 +#: src/Module/Register.php:175 msgid "Import your profile to this friendica instance" msgstr "" -#: src/Module/Register.php:181 +#: src/Module/Register.php:182 msgid "Note: This node explicitly contains adult content" msgstr "" -#: src/Module/Register.php:183 src/Module/Settings/Delegation.php:155 +#: src/Module/Register.php:184 src/Module/Settings/Delegation.php:155 msgid "Parent Password:" msgstr "" -#: src/Module/Register.php:183 src/Module/Settings/Delegation.php:155 +#: src/Module/Register.php:184 src/Module/Settings/Delegation.php:155 msgid "" "Please enter the password of the parent account to legitimize your request." msgstr "" -#: src/Module/Register.php:212 +#: src/Module/Register.php:213 msgid "Password doesn't match." msgstr "" -#: src/Module/Register.php:218 +#: src/Module/Register.php:219 msgid "Please enter your password." msgstr "" -#: src/Module/Register.php:260 +#: src/Module/Register.php:261 msgid "You have entered too much information." msgstr "" -#: src/Module/Register.php:283 +#: src/Module/Register.php:284 msgid "Please enter the identical mail address in the second field." msgstr "" -#: src/Module/Register.php:310 +#: src/Module/Register.php:311 msgid "The additional account was created." msgstr "" -#: src/Module/Register.php:335 +#: src/Module/Register.php:336 msgid "" "Registration successful. Please check your email for further instructions." msgstr "" -#: src/Module/Register.php:339 +#: src/Module/Register.php:340 #, php-format msgid "" "Failed to send email message. Here your accout details:
login: %s
" "password: %s

You can change your password after login." msgstr "" -#: src/Module/Register.php:345 +#: src/Module/Register.php:346 msgid "Registration successful." msgstr "" -#: src/Module/Register.php:350 src/Module/Register.php:357 +#: src/Module/Register.php:351 src/Module/Register.php:358 msgid "Your registration can not be processed." msgstr "" -#: src/Module/Register.php:356 +#: src/Module/Register.php:357 msgid "You have to leave a request note for the admin." msgstr "" -#: src/Module/Register.php:402 +#: src/Module/Register.php:403 msgid "Your registration is pending approval by the site owner." msgstr "" -#: src/Module/RemoteFollow.php:71 +#: src/Module/RemoteFollow.php:72 msgid "Profile unavailable." msgstr "" -#: src/Module/RemoteFollow.php:77 +#: src/Module/RemoteFollow.php:78 msgid "Invalid locator" msgstr "" -#: src/Module/RemoteFollow.php:84 +#: src/Module/RemoteFollow.php:85 msgid "The provided profile link doesn't seem to be valid" msgstr "" -#: src/Module/RemoteFollow.php:89 +#: src/Module/RemoteFollow.php:90 msgid "" "Remote subscription can't be done for your network. Please subscribe " "directly on your system." msgstr "" -#: src/Module/RemoteFollow.php:121 +#: src/Module/RemoteFollow.php:122 msgid "Friend/Connection Request" msgstr "" -#: src/Module/RemoteFollow.php:122 +#: src/Module/RemoteFollow.php:123 #, php-format msgid "" "Enter your Webfinger address (user@domain.tld) or profile URL here. If this " @@ -8613,18 +8613,18 @@ msgid "" "or %s directly on your system." msgstr "" -#: src/Module/RemoteFollow.php:123 +#: src/Module/RemoteFollow.php:124 #, php-format msgid "" "If you are not yet a member of the free social web, follow " "this link to find a public Friendica node and join us today." msgstr "" -#: src/Module/RemoteFollow.php:124 +#: src/Module/RemoteFollow.php:125 msgid "Your Webfinger address or profile URL:" msgstr "" -#: src/Module/Search/Acl.php:55 +#: src/Module/Search/Acl.php:56 msgid "You must be logged in to use this module." msgstr "" @@ -8641,69 +8641,69 @@ msgstr "" msgid "Items tagged with: %s" msgstr "" -#: src/Module/Search/Saved.php:58 +#: src/Module/Search/Saved.php:60 msgid "Search term was not saved." msgstr "" -#: src/Module/Search/Saved.php:61 +#: src/Module/Search/Saved.php:63 msgid "Search term already saved." msgstr "" -#: src/Module/Search/Saved.php:67 +#: src/Module/Search/Saved.php:69 msgid "Search term was not removed." msgstr "" -#: src/Module/Security/Login.php:123 +#: src/Module/Security/Login.php:124 msgid "Create a New Account" msgstr "" -#: src/Module/Security/Login.php:143 +#: src/Module/Security/Login.php:144 msgid "Your OpenID: " msgstr "" -#: src/Module/Security/Login.php:146 +#: src/Module/Security/Login.php:147 msgid "" "Please enter your username and password to add the OpenID to your existing " "account." msgstr "" -#: src/Module/Security/Login.php:148 +#: src/Module/Security/Login.php:149 msgid "Or login using OpenID: " msgstr "" -#: src/Module/Security/Login.php:162 +#: src/Module/Security/Login.php:163 msgid "Password: " msgstr "" -#: src/Module/Security/Login.php:163 +#: src/Module/Security/Login.php:164 msgid "Remember me" msgstr "" -#: src/Module/Security/Login.php:172 +#: src/Module/Security/Login.php:173 msgid "Forgot your password?" msgstr "" -#: src/Module/Security/Login.php:175 +#: src/Module/Security/Login.php:176 msgid "Website Terms of Service" msgstr "" -#: src/Module/Security/Login.php:176 +#: src/Module/Security/Login.php:177 msgid "terms of service" msgstr "" -#: src/Module/Security/Login.php:178 +#: src/Module/Security/Login.php:179 msgid "Website Privacy Policy" msgstr "" -#: src/Module/Security/Login.php:179 +#: src/Module/Security/Login.php:180 msgid "privacy policy" msgstr "" -#: src/Module/Security/Logout.php:83 -#: src/Module/Security/TwoFactor/SignOut.php:78 -#: src/Module/Security/TwoFactor/SignOut.php:86 -#: src/Module/Security/TwoFactor/SignOut.php:108 -#: src/Module/Security/TwoFactor/SignOut.php:115 +#: src/Module/Security/Logout.php:85 +#: src/Module/Security/TwoFactor/SignOut.php:80 +#: src/Module/Security/TwoFactor/SignOut.php:88 +#: src/Module/Security/TwoFactor/SignOut.php:110 +#: src/Module/Security/TwoFactor/SignOut.php:117 msgid "Logged out." msgstr "" @@ -8723,271 +8723,271 @@ msgid "" "account to add the OpenID to it." msgstr "" -#: src/Module/Security/PasswordTooLong.php:53 -#: src/Module/Settings/Account.php:67 +#: src/Module/Security/PasswordTooLong.php:54 +#: src/Module/Settings/Account.php:68 msgid "Passwords do not match." msgstr "" -#: src/Module/Security/PasswordTooLong.php:60 +#: src/Module/Security/PasswordTooLong.php:61 msgid "Password does not need changing." msgstr "" -#: src/Module/Security/PasswordTooLong.php:73 -#: src/Module/Settings/Account.php:81 +#: src/Module/Security/PasswordTooLong.php:74 +#: src/Module/Settings/Account.php:82 msgid "Password unchanged." msgstr "" -#: src/Module/Security/PasswordTooLong.php:87 +#: src/Module/Security/PasswordTooLong.php:88 msgid "Password Too Long" msgstr "" -#: src/Module/Security/PasswordTooLong.php:88 +#: src/Module/Security/PasswordTooLong.php:89 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:89 +#: src/Module/Security/PasswordTooLong.php:90 msgid "Update Password" msgstr "" -#: src/Module/Security/PasswordTooLong.php:96 -#: src/Module/Settings/Account.php:572 +#: src/Module/Security/PasswordTooLong.php:97 +#: src/Module/Settings/Account.php:573 msgid "Current Password:" msgstr "" -#: src/Module/Security/PasswordTooLong.php:96 -#: src/Module/Settings/Account.php:572 +#: src/Module/Security/PasswordTooLong.php:97 +#: src/Module/Settings/Account.php:573 msgid "Your current password to confirm the changes" msgstr "" -#: src/Module/Security/PasswordTooLong.php:97 -#: src/Module/Settings/Account.php:555 +#: src/Module/Security/PasswordTooLong.php:98 +#: src/Module/Settings/Account.php:556 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:97 -#: src/Module/Settings/Account.php:556 +#: src/Module/Security/PasswordTooLong.php:98 +#: src/Module/Settings/Account.php:557 msgid "Password length is limited to 72 characters." msgstr "" -#: src/Module/Security/TwoFactor/Recovery.php:73 +#: src/Module/Security/TwoFactor/Recovery.php:75 #, php-format msgid "Remaining recovery codes: %d" msgstr "" -#: src/Module/Security/TwoFactor/Recovery.php:79 -#: src/Module/Security/TwoFactor/Verify.php:77 -#: src/Module/Settings/TwoFactor/Verify.php:94 +#: src/Module/Security/TwoFactor/Recovery.php:81 +#: src/Module/Security/TwoFactor/Verify.php:78 +#: src/Module/Settings/TwoFactor/Verify.php:95 msgid "Invalid code, please retry." msgstr "" -#: src/Module/Security/TwoFactor/Recovery.php:98 +#: src/Module/Security/TwoFactor/Recovery.php:100 msgid "Two-factor recovery" msgstr "" -#: src/Module/Security/TwoFactor/Recovery.php:99 +#: src/Module/Security/TwoFactor/Recovery.php:101 msgid "" "

You can enter one of your one-time recovery codes in case you lost access " "to your mobile device.

" msgstr "" -#: src/Module/Security/TwoFactor/Recovery.php:100 +#: src/Module/Security/TwoFactor/Recovery.php:102 #, php-format msgid "" "Don’t have your phone? Enter a two-factor recovery code" msgstr "" -#: src/Module/Security/TwoFactor/Recovery.php:101 +#: src/Module/Security/TwoFactor/Recovery.php:103 msgid "Please enter a recovery code" msgstr "" -#: src/Module/Security/TwoFactor/Recovery.php:102 +#: src/Module/Security/TwoFactor/Recovery.php:104 msgid "Submit recovery code and complete login" msgstr "" -#: src/Module/Security/TwoFactor/SignOut.php:122 +#: src/Module/Security/TwoFactor/SignOut.php:124 msgid "Sign out of this browser?" msgstr "" -#: src/Module/Security/TwoFactor/SignOut.php:123 +#: src/Module/Security/TwoFactor/SignOut.php:125 msgid "" "

If you trust this browser, you will not be asked for verification code " "the next time you sign in.

" msgstr "" -#: src/Module/Security/TwoFactor/SignOut.php:124 +#: src/Module/Security/TwoFactor/SignOut.php:126 msgid "Sign out" msgstr "" -#: src/Module/Security/TwoFactor/SignOut.php:126 +#: src/Module/Security/TwoFactor/SignOut.php:128 msgid "Trust and sign out" msgstr "" -#: src/Module/Security/TwoFactor/Trust.php:95 +#: src/Module/Security/TwoFactor/Trust.php:97 msgid "Couldn't save browser to Cookie." msgstr "" -#: src/Module/Security/TwoFactor/Trust.php:140 +#: src/Module/Security/TwoFactor/Trust.php:142 msgid "Trust this browser?" msgstr "" -#: src/Module/Security/TwoFactor/Trust.php:141 +#: src/Module/Security/TwoFactor/Trust.php:143 msgid "" "

If you choose to trust this browser, you will not be asked for a " "verification code the next time you sign in.

" msgstr "" -#: src/Module/Security/TwoFactor/Trust.php:142 +#: src/Module/Security/TwoFactor/Trust.php:144 msgid "Not now" msgstr "" -#: src/Module/Security/TwoFactor/Trust.php:143 +#: src/Module/Security/TwoFactor/Trust.php:145 msgid "Don't trust" msgstr "" -#: src/Module/Security/TwoFactor/Trust.php:144 +#: src/Module/Security/TwoFactor/Trust.php:146 msgid "Trust" msgstr "" -#: src/Module/Security/TwoFactor/Verify.php:97 +#: src/Module/Security/TwoFactor/Verify.php:98 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:100 +#: src/Module/Security/TwoFactor/Verify.php:101 #, 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:101 -#: src/Module/Settings/TwoFactor/Verify.php:154 +#: src/Module/Security/TwoFactor/Verify.php:102 +#: src/Module/Settings/TwoFactor/Verify.php:155 msgid "Please enter a code from your authentication app" msgstr "" -#: src/Module/Security/TwoFactor/Verify.php:102 +#: src/Module/Security/TwoFactor/Verify.php:103 msgid "Verify code and complete login" msgstr "" -#: src/Module/Settings/Account.php:96 +#: src/Module/Settings/Account.php:97 msgid "Please use a shorter name." msgstr "" -#: src/Module/Settings/Account.php:99 +#: src/Module/Settings/Account.php:100 msgid "Name too short." msgstr "" -#: src/Module/Settings/Account.php:108 +#: src/Module/Settings/Account.php:109 msgid "Wrong Password." msgstr "" -#: src/Module/Settings/Account.php:113 +#: src/Module/Settings/Account.php:114 msgid "Invalid email." msgstr "" -#: src/Module/Settings/Account.php:119 +#: src/Module/Settings/Account.php:120 msgid "Cannot change to that email." msgstr "" -#: src/Module/Settings/Account.php:149 src/Module/Settings/Account.php:201 -#: src/Module/Settings/Account.php:221 src/Module/Settings/Account.php:305 -#: src/Module/Settings/Account.php:354 +#: src/Module/Settings/Account.php:150 src/Module/Settings/Account.php:202 +#: src/Module/Settings/Account.php:222 src/Module/Settings/Account.php:306 +#: src/Module/Settings/Account.php:355 msgid "Settings were not updated." msgstr "" -#: src/Module/Settings/Account.php:366 +#: src/Module/Settings/Account.php:367 msgid "Contact CSV file upload error" msgstr "" -#: src/Module/Settings/Account.php:385 +#: src/Module/Settings/Account.php:386 msgid "Importing Contacts done" msgstr "" -#: src/Module/Settings/Account.php:398 +#: src/Module/Settings/Account.php:399 msgid "Relocate message has been send to your contacts" msgstr "" -#: src/Module/Settings/Account.php:415 +#: src/Module/Settings/Account.php:416 msgid "Unable to find your profile. Please contact your admin." msgstr "" -#: src/Module/Settings/Account.php:457 +#: src/Module/Settings/Account.php:458 msgid "Personal Page Subtypes" msgstr "" -#: src/Module/Settings/Account.php:458 +#: src/Module/Settings/Account.php:459 msgid "Community Forum Subtypes" msgstr "" -#: src/Module/Settings/Account.php:468 +#: src/Module/Settings/Account.php:469 msgid "Account for a personal profile." msgstr "" -#: src/Module/Settings/Account.php:475 +#: src/Module/Settings/Account.php:476 msgid "" "Account for an organisation that automatically approves contact requests as " "\"Followers\"." msgstr "" -#: src/Module/Settings/Account.php:482 +#: src/Module/Settings/Account.php:483 msgid "" "Account for a news reflector that automatically approves contact requests as " "\"Followers\"." msgstr "" -#: src/Module/Settings/Account.php:489 +#: src/Module/Settings/Account.php:490 msgid "Account for community discussions." msgstr "" -#: src/Module/Settings/Account.php:496 +#: src/Module/Settings/Account.php:497 msgid "" "Account for a regular personal profile that requires manual approval of " "\"Friends\" and \"Followers\"." msgstr "" -#: src/Module/Settings/Account.php:503 +#: src/Module/Settings/Account.php:504 msgid "" "Account for a public profile that automatically approves contact requests as " "\"Followers\"." msgstr "" -#: src/Module/Settings/Account.php:510 +#: src/Module/Settings/Account.php:511 msgid "Automatically approves all contact requests." msgstr "" -#: src/Module/Settings/Account.php:517 +#: src/Module/Settings/Account.php:518 msgid "" "Account for a popular profile that automatically approves contact requests " "as \"Friends\"." msgstr "" -#: src/Module/Settings/Account.php:522 +#: src/Module/Settings/Account.php:523 msgid "Private Forum [Experimental]" msgstr "" -#: src/Module/Settings/Account.php:524 +#: src/Module/Settings/Account.php:525 msgid "Requires manual approval of contact requests." msgstr "" -#: src/Module/Settings/Account.php:533 +#: src/Module/Settings/Account.php:534 msgid "OpenID:" msgstr "" -#: src/Module/Settings/Account.php:533 +#: src/Module/Settings/Account.php:534 msgid "(Optional) Allow this OpenID to login to this account." msgstr "" -#: src/Module/Settings/Account.php:541 +#: src/Module/Settings/Account.php:542 msgid "Publish your profile in your local site directory?" msgstr "" -#: src/Module/Settings/Account.php:541 +#: src/Module/Settings/Account.php:542 #, php-format msgid "" "Your profile will be published in this node's local " @@ -8995,89 +8995,89 @@ msgid "" "system settings." msgstr "" -#: src/Module/Settings/Account.php:547 +#: src/Module/Settings/Account.php:548 #, php-format msgid "" "Your profile will also be published in the global friendica directories (e." "g. %s)." msgstr "" -#: src/Module/Settings/Account.php:560 +#: src/Module/Settings/Account.php:561 msgid "Account Settings" msgstr "" -#: src/Module/Settings/Account.php:561 +#: src/Module/Settings/Account.php:562 #, php-format msgid "Your Identity Address is '%s' or '%s'." msgstr "" -#: src/Module/Settings/Account.php:569 +#: src/Module/Settings/Account.php:570 msgid "Password Settings" msgstr "" -#: src/Module/Settings/Account.php:571 +#: src/Module/Settings/Account.php:572 msgid "Leave password fields blank unless changing" msgstr "" -#: src/Module/Settings/Account.php:573 +#: src/Module/Settings/Account.php:574 msgid "Password:" msgstr "" -#: src/Module/Settings/Account.php:573 +#: src/Module/Settings/Account.php:574 msgid "Your current password to confirm the changes of the email address" msgstr "" -#: src/Module/Settings/Account.php:576 +#: src/Module/Settings/Account.php:577 msgid "Delete OpenID URL" msgstr "" -#: src/Module/Settings/Account.php:578 +#: src/Module/Settings/Account.php:579 msgid "Basic Settings" msgstr "" -#: src/Module/Settings/Account.php:580 +#: src/Module/Settings/Account.php:581 msgid "Email Address:" msgstr "" -#: src/Module/Settings/Account.php:581 +#: src/Module/Settings/Account.php:582 msgid "Your Timezone:" msgstr "" -#: src/Module/Settings/Account.php:582 +#: src/Module/Settings/Account.php:583 msgid "Your Language:" msgstr "" -#: src/Module/Settings/Account.php:582 +#: src/Module/Settings/Account.php:583 msgid "" "Set the language we use to show you friendica interface and to send you " "emails" msgstr "" -#: src/Module/Settings/Account.php:583 +#: src/Module/Settings/Account.php:584 msgid "Default Post Location:" msgstr "" -#: src/Module/Settings/Account.php:584 +#: src/Module/Settings/Account.php:585 msgid "Use Browser Location:" msgstr "" -#: src/Module/Settings/Account.php:586 +#: src/Module/Settings/Account.php:587 msgid "Security and Privacy Settings" msgstr "" -#: src/Module/Settings/Account.php:588 +#: src/Module/Settings/Account.php:589 msgid "Maximum Friend Requests/Day:" msgstr "" -#: src/Module/Settings/Account.php:588 src/Module/Settings/Account.php:598 +#: src/Module/Settings/Account.php:589 src/Module/Settings/Account.php:599 msgid "(to prevent spam abuse)" msgstr "" -#: src/Module/Settings/Account.php:590 +#: src/Module/Settings/Account.php:591 msgid "Allow your profile to be searchable globally?" msgstr "" -#: src/Module/Settings/Account.php:590 +#: src/Module/Settings/Account.php:591 msgid "" "Activate this setting if you want others to easily find and follow you. Your " "profile will be searchable on remote systems. This setting also determines " @@ -9085,43 +9085,43 @@ msgid "" "indexed or not." msgstr "" -#: src/Module/Settings/Account.php:591 +#: src/Module/Settings/Account.php:592 msgid "Hide your contact/friend list from viewers of your profile?" msgstr "" -#: src/Module/Settings/Account.php:591 +#: src/Module/Settings/Account.php:592 msgid "" "A list of your contacts is displayed on your profile page. Activate this " "option to disable the display of your contact list." msgstr "" -#: src/Module/Settings/Account.php:592 +#: src/Module/Settings/Account.php:593 msgid "Hide your profile details from anonymous viewers?" msgstr "" -#: src/Module/Settings/Account.php:592 +#: src/Module/Settings/Account.php:593 msgid "" "Anonymous visitors will only see your profile picture, your display name and " "the nickname you are using on your profile page. Your public posts and " "replies will still be accessible by other means." msgstr "" -#: src/Module/Settings/Account.php:593 +#: src/Module/Settings/Account.php:594 msgid "Make public posts unlisted" msgstr "" -#: src/Module/Settings/Account.php:593 +#: src/Module/Settings/Account.php:594 msgid "" "Your public posts will not appear on the community pages or in search " "results, nor be sent to relay servers. However they can still appear on " "public feeds on remote servers." msgstr "" -#: src/Module/Settings/Account.php:594 +#: src/Module/Settings/Account.php:595 msgid "Make all posted pictures accessible" msgstr "" -#: src/Module/Settings/Account.php:594 +#: src/Module/Settings/Account.php:595 msgid "" "This option makes every posted picture accessible via the direct link. This " "is a workaround for the problem that most other networks can't handle " @@ -9129,233 +9129,233 @@ msgid "" "public on your photo albums though." msgstr "" -#: src/Module/Settings/Account.php:595 +#: src/Module/Settings/Account.php:596 msgid "Allow friends to post to your profile page?" msgstr "" -#: src/Module/Settings/Account.php:595 +#: src/Module/Settings/Account.php:596 msgid "" "Your contacts may write posts on your profile wall. These posts will be " "distributed to your contacts" msgstr "" -#: src/Module/Settings/Account.php:596 +#: src/Module/Settings/Account.php:597 msgid "Allow friends to tag your posts?" msgstr "" -#: src/Module/Settings/Account.php:596 +#: src/Module/Settings/Account.php:597 msgid "Your contacts can add additional tags to your posts." msgstr "" -#: src/Module/Settings/Account.php:597 +#: src/Module/Settings/Account.php:598 msgid "Permit unknown people to send you private mail?" msgstr "" -#: src/Module/Settings/Account.php:597 +#: src/Module/Settings/Account.php:598 msgid "" "Friendica network users may send you private messages even if they are not " "in your contact list." msgstr "" -#: src/Module/Settings/Account.php:598 +#: src/Module/Settings/Account.php:599 msgid "Maximum private messages per day from unknown people:" msgstr "" -#: src/Module/Settings/Account.php:600 +#: src/Module/Settings/Account.php:601 msgid "Default Post Permissions" msgstr "" -#: src/Module/Settings/Account.php:604 +#: src/Module/Settings/Account.php:605 msgid "Expiration settings" msgstr "" -#: src/Module/Settings/Account.php:605 +#: src/Module/Settings/Account.php:606 msgid "Automatically expire posts after this many days:" msgstr "" -#: src/Module/Settings/Account.php:605 +#: src/Module/Settings/Account.php:606 msgid "If empty, posts will not expire. Expired posts will be deleted" msgstr "" -#: src/Module/Settings/Account.php:606 +#: src/Module/Settings/Account.php:607 msgid "Expire posts" msgstr "" -#: src/Module/Settings/Account.php:606 +#: src/Module/Settings/Account.php:607 msgid "When activated, posts and comments will be expired." msgstr "" -#: src/Module/Settings/Account.php:607 +#: src/Module/Settings/Account.php:608 msgid "Expire personal notes" msgstr "" -#: src/Module/Settings/Account.php:607 +#: src/Module/Settings/Account.php:608 msgid "" "When activated, the personal notes on your profile page will be expired." msgstr "" -#: src/Module/Settings/Account.php:608 +#: src/Module/Settings/Account.php:609 msgid "Expire starred posts" msgstr "" -#: src/Module/Settings/Account.php:608 +#: src/Module/Settings/Account.php:609 msgid "" "Starring posts keeps them from being expired. That behaviour is overwritten " "by this setting." msgstr "" -#: src/Module/Settings/Account.php:609 +#: src/Module/Settings/Account.php:610 msgid "Only expire posts by others" msgstr "" -#: src/Module/Settings/Account.php:609 +#: src/Module/Settings/Account.php:610 msgid "" "When activated, your own posts never expire. Then the settings above are " "only valid for posts you received." msgstr "" -#: src/Module/Settings/Account.php:612 +#: src/Module/Settings/Account.php:613 msgid "Notification Settings" msgstr "" -#: src/Module/Settings/Account.php:613 +#: src/Module/Settings/Account.php:614 msgid "Send a notification email when:" msgstr "" -#: src/Module/Settings/Account.php:614 +#: src/Module/Settings/Account.php:615 msgid "You receive an introduction" msgstr "" -#: src/Module/Settings/Account.php:615 +#: src/Module/Settings/Account.php:616 msgid "Your introductions are confirmed" msgstr "" -#: src/Module/Settings/Account.php:616 +#: src/Module/Settings/Account.php:617 msgid "Someone writes on your profile wall" msgstr "" -#: src/Module/Settings/Account.php:617 +#: src/Module/Settings/Account.php:618 msgid "Someone writes a followup comment" msgstr "" -#: src/Module/Settings/Account.php:618 +#: src/Module/Settings/Account.php:619 msgid "You receive a private message" msgstr "" -#: src/Module/Settings/Account.php:619 +#: src/Module/Settings/Account.php:620 msgid "You receive a friend suggestion" msgstr "" -#: src/Module/Settings/Account.php:620 +#: src/Module/Settings/Account.php:621 msgid "You are tagged in a post" msgstr "" -#: src/Module/Settings/Account.php:622 +#: src/Module/Settings/Account.php:623 msgid "Create a desktop notification when:" msgstr "" -#: src/Module/Settings/Account.php:623 +#: src/Module/Settings/Account.php:624 msgid "Someone tagged you" msgstr "" -#: src/Module/Settings/Account.php:624 +#: src/Module/Settings/Account.php:625 msgid "Someone directly commented on your post" msgstr "" -#: src/Module/Settings/Account.php:625 +#: src/Module/Settings/Account.php:626 msgid "Someone liked your content" msgstr "" -#: src/Module/Settings/Account.php:625 src/Module/Settings/Account.php:626 +#: src/Module/Settings/Account.php:626 src/Module/Settings/Account.php:627 msgid "Can only be enabled, when the direct comment notification is enabled." msgstr "" -#: src/Module/Settings/Account.php:626 +#: src/Module/Settings/Account.php:627 msgid "Someone shared your content" msgstr "" -#: src/Module/Settings/Account.php:627 +#: src/Module/Settings/Account.php:628 msgid "Someone commented in your thread" msgstr "" -#: src/Module/Settings/Account.php:628 +#: src/Module/Settings/Account.php:629 msgid "Someone commented in a thread where you commented" msgstr "" -#: src/Module/Settings/Account.php:629 +#: src/Module/Settings/Account.php:630 msgid "Someone commented in a thread where you interacted" msgstr "" -#: src/Module/Settings/Account.php:631 +#: src/Module/Settings/Account.php:632 msgid "Activate desktop notifications" msgstr "" -#: src/Module/Settings/Account.php:631 +#: src/Module/Settings/Account.php:632 msgid "Show desktop popup on new notifications" msgstr "" -#: src/Module/Settings/Account.php:635 +#: src/Module/Settings/Account.php:636 msgid "Text-only notification emails" msgstr "" -#: src/Module/Settings/Account.php:637 +#: src/Module/Settings/Account.php:638 msgid "Send text only notification emails, without the html part" msgstr "" -#: src/Module/Settings/Account.php:641 +#: src/Module/Settings/Account.php:642 msgid "Show detailled notifications" msgstr "" -#: src/Module/Settings/Account.php:643 +#: src/Module/Settings/Account.php:644 msgid "" "Per default, notifications are condensed to a single notification per item. " "When enabled every notification is displayed." msgstr "" -#: src/Module/Settings/Account.php:647 +#: src/Module/Settings/Account.php:648 msgid "Show notifications of ignored contacts" msgstr "" -#: src/Module/Settings/Account.php:649 +#: src/Module/Settings/Account.php:650 msgid "" "You don't see posts from ignored contacts. But you still see their comments. " "This setting controls if you want to still receive regular notifications " "that are caused by ignored contacts or not." msgstr "" -#: src/Module/Settings/Account.php:652 +#: src/Module/Settings/Account.php:653 msgid "Advanced Account/Page Type Settings" msgstr "" -#: src/Module/Settings/Account.php:653 +#: src/Module/Settings/Account.php:654 msgid "Change the behaviour of this account for special situations" msgstr "" -#: src/Module/Settings/Account.php:656 +#: src/Module/Settings/Account.php:657 msgid "Import Contacts" msgstr "" -#: src/Module/Settings/Account.php:657 +#: src/Module/Settings/Account.php:658 msgid "" "Upload a CSV file that contains the handle of your followed accounts in the " "first column you exported from the old account." msgstr "" -#: src/Module/Settings/Account.php:658 +#: src/Module/Settings/Account.php:659 msgid "Upload File" msgstr "" -#: src/Module/Settings/Account.php:661 +#: src/Module/Settings/Account.php:662 msgid "Relocate" msgstr "" -#: src/Module/Settings/Account.php:662 +#: src/Module/Settings/Account.php:663 msgid "" "If you have moved this profile from another server, and some of your " "contacts don't receive your updates, try pushing this button." msgstr "" -#: src/Module/Settings/Account.php:663 +#: src/Module/Settings/Account.php:664 msgid "Resend relocate message to contacts" msgstr "" @@ -9461,9 +9461,9 @@ msgstr "" msgid "Content Settings" msgstr "" -#: src/Module/Settings/Display.php:205 view/theme/duepuntozero/config.php:70 -#: view/theme/frio/config.php:172 view/theme/quattro/config.php:72 -#: view/theme/vier/config.php:120 +#: src/Module/Settings/Display.php:205 view/theme/duepuntozero/config.php:87 +#: view/theme/frio/config.php:173 view/theme/quattro/config.php:89 +#: view/theme/vier/config.php:137 msgid "Theme settings" msgstr "" @@ -9562,133 +9562,133 @@ msgstr "" msgid "Beginning of week:" msgstr "" -#: src/Module/Settings/Profile/Index.php:83 +#: src/Module/Settings/Profile/Index.php:84 msgid "Profile Name is required." msgstr "" -#: src/Module/Settings/Profile/Index.php:131 +#: src/Module/Settings/Profile/Index.php:132 msgid "Profile couldn't be updated." msgstr "" -#: src/Module/Settings/Profile/Index.php:172 -#: src/Module/Settings/Profile/Index.php:192 -msgid "Label:" -msgstr "" - #: src/Module/Settings/Profile/Index.php:173 #: src/Module/Settings/Profile/Index.php:193 -msgid "Value:" +msgid "Label:" msgstr "" -#: src/Module/Settings/Profile/Index.php:183 -#: src/Module/Settings/Profile/Index.php:203 -msgid "Field Permissions" +#: src/Module/Settings/Profile/Index.php:174 +#: src/Module/Settings/Profile/Index.php:194 +msgid "Value:" msgstr "" #: src/Module/Settings/Profile/Index.php:184 #: src/Module/Settings/Profile/Index.php:204 +msgid "Field Permissions" +msgstr "" + +#: src/Module/Settings/Profile/Index.php:185 +#: src/Module/Settings/Profile/Index.php:205 msgid "(click to open/close)" msgstr "" -#: src/Module/Settings/Profile/Index.php:190 +#: src/Module/Settings/Profile/Index.php:191 msgid "Add a new profile field" msgstr "" -#: src/Module/Settings/Profile/Index.php:220 +#: src/Module/Settings/Profile/Index.php:221 msgid "Profile Actions" msgstr "" -#: src/Module/Settings/Profile/Index.php:221 +#: src/Module/Settings/Profile/Index.php:222 msgid "Edit Profile Details" msgstr "" -#: src/Module/Settings/Profile/Index.php:223 +#: src/Module/Settings/Profile/Index.php:224 msgid "Change Profile Photo" msgstr "" -#: src/Module/Settings/Profile/Index.php:228 +#: src/Module/Settings/Profile/Index.php:229 msgid "Profile picture" msgstr "" -#: src/Module/Settings/Profile/Index.php:229 +#: src/Module/Settings/Profile/Index.php:230 msgid "Location" msgstr "" -#: src/Module/Settings/Profile/Index.php:230 src/Util/Temporal.php:95 -#: src/Util/Temporal.php:97 +#: src/Module/Settings/Profile/Index.php:231 src/Util/Temporal.php:96 +#: src/Util/Temporal.php:98 msgid "Miscellaneous" msgstr "" -#: src/Module/Settings/Profile/Index.php:231 +#: src/Module/Settings/Profile/Index.php:232 msgid "Custom Profile Fields" msgstr "" -#: src/Module/Settings/Profile/Index.php:233 src/Module/Welcome.php:58 +#: src/Module/Settings/Profile/Index.php:234 src/Module/Welcome.php:58 msgid "Upload Profile Photo" msgstr "" -#: src/Module/Settings/Profile/Index.php:237 +#: src/Module/Settings/Profile/Index.php:238 msgid "Display name:" msgstr "" -#: src/Module/Settings/Profile/Index.php:240 +#: src/Module/Settings/Profile/Index.php:241 msgid "Street Address:" msgstr "" -#: src/Module/Settings/Profile/Index.php:241 +#: src/Module/Settings/Profile/Index.php:242 msgid "Locality/City:" msgstr "" -#: src/Module/Settings/Profile/Index.php:242 +#: src/Module/Settings/Profile/Index.php:243 msgid "Region/State:" msgstr "" -#: src/Module/Settings/Profile/Index.php:243 +#: src/Module/Settings/Profile/Index.php:244 msgid "Postal/Zip Code:" msgstr "" -#: src/Module/Settings/Profile/Index.php:244 +#: src/Module/Settings/Profile/Index.php:245 msgid "Country:" msgstr "" -#: src/Module/Settings/Profile/Index.php:246 +#: src/Module/Settings/Profile/Index.php:247 msgid "XMPP (Jabber) address:" msgstr "" -#: src/Module/Settings/Profile/Index.php:246 +#: src/Module/Settings/Profile/Index.php:247 msgid "The XMPP address will be published so that people can follow you there." msgstr "" -#: src/Module/Settings/Profile/Index.php:247 +#: src/Module/Settings/Profile/Index.php:248 msgid "Matrix (Element) address:" msgstr "" -#: src/Module/Settings/Profile/Index.php:247 +#: src/Module/Settings/Profile/Index.php:248 msgid "" "The Matrix address will be published so that people can follow you there." msgstr "" -#: src/Module/Settings/Profile/Index.php:248 +#: src/Module/Settings/Profile/Index.php:249 msgid "Homepage URL:" msgstr "" -#: src/Module/Settings/Profile/Index.php:249 +#: src/Module/Settings/Profile/Index.php:250 msgid "Public Keywords:" msgstr "" -#: src/Module/Settings/Profile/Index.php:249 +#: src/Module/Settings/Profile/Index.php:250 msgid "(Used for suggesting potential friends, can be seen by others)" msgstr "" -#: src/Module/Settings/Profile/Index.php:250 +#: src/Module/Settings/Profile/Index.php:251 msgid "Private Keywords:" msgstr "" -#: src/Module/Settings/Profile/Index.php:250 +#: src/Module/Settings/Profile/Index.php:251 msgid "(Used for searching profiles, never shown to others)" msgstr "" -#: src/Module/Settings/Profile/Index.php:251 +#: src/Module/Settings/Profile/Index.php:252 #, php-format msgid "" "

Custom fields appear on your profile page.

\n" @@ -9770,82 +9770,82 @@ msgstr "" msgid "select a photo from your photo albums" msgstr "" -#: src/Module/Settings/TwoFactor/AppSpecific.php:64 -#: src/Module/Settings/TwoFactor/Recovery.php:62 -#: src/Module/Settings/TwoFactor/Trusted.php:65 -#: src/Module/Settings/TwoFactor/Verify.php:68 +#: src/Module/Settings/TwoFactor/AppSpecific.php:66 +#: src/Module/Settings/TwoFactor/Recovery.php:64 +#: src/Module/Settings/TwoFactor/Trusted.php:67 +#: src/Module/Settings/TwoFactor/Verify.php:69 msgid "Please enter your password to access this page." msgstr "" -#: src/Module/Settings/TwoFactor/AppSpecific.php:82 +#: src/Module/Settings/TwoFactor/AppSpecific.php:84 msgid "App-specific password generation failed: The description is empty." msgstr "" -#: src/Module/Settings/TwoFactor/AppSpecific.php:85 +#: src/Module/Settings/TwoFactor/AppSpecific.php:87 msgid "" "App-specific password generation failed: This description already exists." msgstr "" -#: src/Module/Settings/TwoFactor/AppSpecific.php:89 +#: src/Module/Settings/TwoFactor/AppSpecific.php:91 msgid "New app-specific password generated." msgstr "" -#: src/Module/Settings/TwoFactor/AppSpecific.php:95 +#: src/Module/Settings/TwoFactor/AppSpecific.php:97 msgid "App-specific passwords successfully revoked." msgstr "" -#: src/Module/Settings/TwoFactor/AppSpecific.php:105 +#: src/Module/Settings/TwoFactor/AppSpecific.php:107 msgid "App-specific password successfully revoked." msgstr "" -#: src/Module/Settings/TwoFactor/AppSpecific.php:126 +#: src/Module/Settings/TwoFactor/AppSpecific.php:128 msgid "Two-factor app-specific passwords" msgstr "" -#: src/Module/Settings/TwoFactor/AppSpecific.php:128 +#: src/Module/Settings/TwoFactor/AppSpecific.php:130 msgid "" "

App-specific passwords are randomly generated passwords used instead your " "regular password to authenticate your account on third-party applications " "that don't support two-factor authentication.

" msgstr "" -#: src/Module/Settings/TwoFactor/AppSpecific.php:129 +#: src/Module/Settings/TwoFactor/AppSpecific.php:131 msgid "" "Make sure to copy your new app-specific password now. You won’t be able to " "see it again!" msgstr "" -#: src/Module/Settings/TwoFactor/AppSpecific.php:132 +#: src/Module/Settings/TwoFactor/AppSpecific.php:134 msgid "Description" msgstr "" -#: src/Module/Settings/TwoFactor/AppSpecific.php:133 +#: src/Module/Settings/TwoFactor/AppSpecific.php:135 msgid "Last Used" msgstr "" -#: src/Module/Settings/TwoFactor/AppSpecific.php:134 +#: src/Module/Settings/TwoFactor/AppSpecific.php:136 msgid "Revoke" msgstr "" -#: src/Module/Settings/TwoFactor/AppSpecific.php:135 +#: src/Module/Settings/TwoFactor/AppSpecific.php:137 msgid "Revoke All" msgstr "" -#: src/Module/Settings/TwoFactor/AppSpecific.php:138 +#: src/Module/Settings/TwoFactor/AppSpecific.php:140 msgid "" "When you generate a new app-specific password, you must use it right away, " "it will be shown to you once after you generate it." msgstr "" -#: src/Module/Settings/TwoFactor/AppSpecific.php:139 +#: src/Module/Settings/TwoFactor/AppSpecific.php:141 msgid "Generate new app-specific password" msgstr "" -#: src/Module/Settings/TwoFactor/AppSpecific.php:140 +#: src/Module/Settings/TwoFactor/AppSpecific.php:142 msgid "Friendiqa on my Fairphone 2..." msgstr "" -#: src/Module/Settings/TwoFactor/AppSpecific.php:141 +#: src/Module/Settings/TwoFactor/AppSpecific.php:143 msgid "Generate" msgstr "" @@ -9941,15 +9941,15 @@ msgstr "" msgid "Finish app configuration" msgstr "" -#: src/Module/Settings/TwoFactor/Recovery.php:78 +#: src/Module/Settings/TwoFactor/Recovery.php:80 msgid "New recovery codes successfully generated." msgstr "" -#: src/Module/Settings/TwoFactor/Recovery.php:104 +#: src/Module/Settings/TwoFactor/Recovery.php:106 msgid "Two-factor recovery codes" msgstr "" -#: src/Module/Settings/TwoFactor/Recovery.php:106 +#: src/Module/Settings/TwoFactor/Recovery.php:108 msgid "" "

Recovery codes can be used to access your account in the event you lose " "access to your device and cannot receive two-factor authentication codes." msgstr "" -#: src/Module/Settings/TwoFactor/Recovery.php:108 +#: src/Module/Settings/TwoFactor/Recovery.php:110 msgid "" "When you generate new recovery codes, you must copy the new codes. Your old " "codes won’t work anymore." msgstr "" -#: src/Module/Settings/TwoFactor/Recovery.php:109 +#: src/Module/Settings/TwoFactor/Recovery.php:111 msgid "Generate new recovery codes" msgstr "" -#: src/Module/Settings/TwoFactor/Recovery.php:111 +#: src/Module/Settings/TwoFactor/Recovery.php:113 msgid "Next: Verification" msgstr "" -#: src/Module/Settings/TwoFactor/Trusted.php:82 +#: src/Module/Settings/TwoFactor/Trusted.php:84 msgid "Trusted browsers successfully removed." msgstr "" -#: src/Module/Settings/TwoFactor/Trusted.php:92 +#: src/Module/Settings/TwoFactor/Trusted.php:94 msgid "Trusted browser successfully removed." msgstr "" -#: src/Module/Settings/TwoFactor/Trusted.php:134 +#: src/Module/Settings/TwoFactor/Trusted.php:136 msgid "Two-factor Trusted Browsers" msgstr "" -#: src/Module/Settings/TwoFactor/Trusted.php:135 +#: src/Module/Settings/TwoFactor/Trusted.php:137 msgid "" "Trusted browsers are individual browsers you chose to skip two-factor " "authentication to access Friendica. Please use this feature sparingly, as it " "can negate the benefit of two-factor authentication." msgstr "" -#: src/Module/Settings/TwoFactor/Trusted.php:136 +#: src/Module/Settings/TwoFactor/Trusted.php:138 msgid "Device" msgstr "" -#: src/Module/Settings/TwoFactor/Trusted.php:137 +#: src/Module/Settings/TwoFactor/Trusted.php:139 msgid "OS" msgstr "" -#: src/Module/Settings/TwoFactor/Trusted.php:139 +#: src/Module/Settings/TwoFactor/Trusted.php:141 msgid "Trusted" msgstr "" -#: src/Module/Settings/TwoFactor/Trusted.php:140 +#: src/Module/Settings/TwoFactor/Trusted.php:142 msgid "Created At" msgstr "" -#: src/Module/Settings/TwoFactor/Trusted.php:141 +#: src/Module/Settings/TwoFactor/Trusted.php:143 msgid "Last Use" msgstr "" -#: src/Module/Settings/TwoFactor/Trusted.php:143 +#: src/Module/Settings/TwoFactor/Trusted.php:145 msgid "Remove All" msgstr "" -#: src/Module/Settings/TwoFactor/Verify.php:90 +#: src/Module/Settings/TwoFactor/Verify.php:91 msgid "Two-factor authentication successfully activated." msgstr "" -#: src/Module/Settings/TwoFactor/Verify.php:124 +#: src/Module/Settings/TwoFactor/Verify.php:125 #, php-format msgid "" "

Or you can submit the authentication settings manually:

\n" @@ -10038,53 +10038,53 @@ msgid "" "" msgstr "" -#: src/Module/Settings/TwoFactor/Verify.php:144 +#: src/Module/Settings/TwoFactor/Verify.php:145 msgid "Two-factor code verification" msgstr "" -#: src/Module/Settings/TwoFactor/Verify.php:146 +#: src/Module/Settings/TwoFactor/Verify.php:147 msgid "" "

Please scan this QR Code with your authenticator app and submit the " "provided code.

" msgstr "" -#: src/Module/Settings/TwoFactor/Verify.php:148 +#: src/Module/Settings/TwoFactor/Verify.php:149 #, php-format msgid "" "

Or you can open the following URL in your mobile device:

%s

" msgstr "" -#: src/Module/Settings/TwoFactor/Verify.php:155 +#: src/Module/Settings/TwoFactor/Verify.php:156 msgid "Verify code and enable two-factor authentication" msgstr "" -#: src/Module/Settings/UserExport.php:68 +#: src/Module/Settings/UserExport.php:69 msgid "Export account" msgstr "" -#: src/Module/Settings/UserExport.php:68 +#: src/Module/Settings/UserExport.php:69 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:70 msgid "Export all" msgstr "" -#: src/Module/Settings/UserExport.php:69 +#: src/Module/Settings/UserExport.php:70 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:71 msgid "Export Contacts to CSV" msgstr "" -#: src/Module/Settings/UserExport.php:70 +#: src/Module/Settings/UserExport.php:71 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:134 +#: src/Navigation/Notifications/Factory/FormattedNavNotification.php:135 msgid "{0} wants to follow you" msgstr "" -#: src/Navigation/Notifications/Factory/FormattedNavNotification.php:136 +#: src/Navigation/Notifications/Factory/FormattedNavNotification.php:137 msgid "{0} has started following you" msgstr "" -#: src/Navigation/Notifications/Factory/FormattedNotify.php:91 +#: src/Navigation/Notifications/Factory/FormattedNotify.php:93 #, php-format msgid "%s liked %s's post" msgstr "" -#: src/Navigation/Notifications/Factory/FormattedNotify.php:103 +#: src/Navigation/Notifications/Factory/FormattedNotify.php:105 #, php-format msgid "%s disliked %s's post" msgstr "" -#: src/Navigation/Notifications/Factory/FormattedNotify.php:115 +#: src/Navigation/Notifications/Factory/FormattedNotify.php:117 #, php-format msgid "%s is attending %s's event" msgstr "" -#: src/Navigation/Notifications/Factory/FormattedNotify.php:127 +#: src/Navigation/Notifications/Factory/FormattedNotify.php:129 #, php-format msgid "%s is not attending %s's event" msgstr "" -#: src/Navigation/Notifications/Factory/FormattedNotify.php:139 +#: src/Navigation/Notifications/Factory/FormattedNotify.php:141 #, php-format msgid "%s may attending %s's event" msgstr "" -#: src/Navigation/Notifications/Factory/FormattedNotify.php:169 +#: src/Navigation/Notifications/Factory/FormattedNotify.php:171 #, php-format msgid "%s is now friends with %s" msgstr "" -#: src/Navigation/Notifications/Factory/FormattedNotify.php:336 -#: src/Navigation/Notifications/Factory/FormattedNotify.php:374 +#: src/Navigation/Notifications/Factory/FormattedNotify.php:338 +#: src/Navigation/Notifications/Factory/FormattedNotify.php:376 #, php-format msgid "%s commented on %s's post" msgstr "" -#: src/Navigation/Notifications/Factory/FormattedNotify.php:373 +#: src/Navigation/Notifications/Factory/FormattedNotify.php:375 #, php-format msgid "%s created a new post" msgstr "" -#: src/Navigation/Notifications/Factory/Introduction.php:133 +#: src/Navigation/Notifications/Factory/Introduction.php:134 msgid "Friend Suggestion" msgstr "" -#: src/Navigation/Notifications/Factory/Introduction.php:159 +#: src/Navigation/Notifications/Factory/Introduction.php:160 msgid "Friend/Connect Request" msgstr "" -#: src/Navigation/Notifications/Factory/Introduction.php:159 +#: src/Navigation/Notifications/Factory/Introduction.php:160 msgid "New Follower" msgstr "" @@ -10947,21 +10947,21 @@ msgstr "" msgid "Show fewer" msgstr "" -#: src/Protocol/OStatus.php:1471 +#: src/Protocol/OStatus.php:1472 #, php-format msgid "%s is now following %s." msgstr "" -#: src/Protocol/OStatus.php:1472 +#: src/Protocol/OStatus.php:1473 msgid "following" msgstr "" -#: src/Protocol/OStatus.php:1475 +#: src/Protocol/OStatus.php:1476 #, php-format msgid "%s stopped following %s." msgstr "" -#: src/Protocol/OStatus.php:1476 +#: src/Protocol/OStatus.php:1477 msgid "stopped following" msgstr "" @@ -10987,7 +10987,7 @@ msgstr "" msgid "Please upload a profile photo." msgstr "" -#: src/Util/EMailer/MailBuilder.php:259 +#: src/Util/EMailer/MailBuilder.php:260 msgid "Friendica Notification" msgstr "" @@ -11010,78 +11010,78 @@ msgstr "" msgid "thanks" msgstr "" -#: src/Util/Temporal.php:170 +#: src/Util/Temporal.php:171 msgid "YYYY-MM-DD or MM-DD" msgstr "" -#: src/Util/Temporal.php:278 +#: src/Util/Temporal.php:279 #, php-format msgid "Time zone: %s Change in Settings" msgstr "" -#: src/Util/Temporal.php:321 +#: src/Util/Temporal.php:318 src/Util/Temporal.php:325 msgid "never" msgstr "" -#: src/Util/Temporal.php:328 +#: src/Util/Temporal.php:332 msgid "less than a second ago" msgstr "" -#: src/Util/Temporal.php:337 +#: src/Util/Temporal.php:341 msgid "year" msgstr "" -#: src/Util/Temporal.php:337 +#: src/Util/Temporal.php:341 msgid "years" msgstr "" -#: src/Util/Temporal.php:338 +#: src/Util/Temporal.php:342 msgid "months" msgstr "" -#: src/Util/Temporal.php:339 +#: src/Util/Temporal.php:343 msgid "weeks" msgstr "" -#: src/Util/Temporal.php:340 +#: src/Util/Temporal.php:344 msgid "days" msgstr "" -#: src/Util/Temporal.php:341 +#: src/Util/Temporal.php:345 msgid "hour" msgstr "" -#: src/Util/Temporal.php:341 +#: src/Util/Temporal.php:345 msgid "hours" msgstr "" -#: src/Util/Temporal.php:342 +#: src/Util/Temporal.php:346 msgid "minute" msgstr "" -#: src/Util/Temporal.php:342 +#: src/Util/Temporal.php:346 msgid "minutes" msgstr "" -#: src/Util/Temporal.php:343 +#: src/Util/Temporal.php:347 msgid "second" msgstr "" -#: src/Util/Temporal.php:343 +#: src/Util/Temporal.php:347 msgid "seconds" msgstr "" -#: src/Util/Temporal.php:353 +#: src/Util/Temporal.php:357 #, php-format msgid "in %1$d %2$s" msgstr "" -#: src/Util/Temporal.php:356 +#: src/Util/Temporal.php:360 #, php-format msgid "%1$d %2$s ago" msgstr "" -#: src/Worker/Delivery.php:524 +#: src/Worker/Delivery.php:527 msgid "(no subject)" msgstr "" @@ -11093,156 +11093,156 @@ msgstr "" msgid "Empty Post" msgstr "" -#: view/theme/duepuntozero/config.php:52 +#: view/theme/duepuntozero/config.php:69 msgid "default" msgstr "" -#: view/theme/duepuntozero/config.php:53 +#: view/theme/duepuntozero/config.php:70 msgid "greenzero" msgstr "" -#: view/theme/duepuntozero/config.php:54 +#: view/theme/duepuntozero/config.php:71 msgid "purplezero" msgstr "" -#: view/theme/duepuntozero/config.php:55 +#: view/theme/duepuntozero/config.php:72 msgid "easterbunny" msgstr "" -#: view/theme/duepuntozero/config.php:56 +#: view/theme/duepuntozero/config.php:73 msgid "darkzero" msgstr "" -#: view/theme/duepuntozero/config.php:57 +#: view/theme/duepuntozero/config.php:74 msgid "comix" msgstr "" -#: view/theme/duepuntozero/config.php:58 +#: view/theme/duepuntozero/config.php:75 msgid "slackr" msgstr "" -#: view/theme/duepuntozero/config.php:71 +#: view/theme/duepuntozero/config.php:88 msgid "Variations" msgstr "" -#: view/theme/frio/config.php:153 +#: view/theme/frio/config.php:154 msgid "Light (Accented)" msgstr "" -#: view/theme/frio/config.php:154 +#: view/theme/frio/config.php:155 msgid "Dark (Accented)" msgstr "" -#: view/theme/frio/config.php:155 +#: view/theme/frio/config.php:156 msgid "Black (Accented)" msgstr "" -#: view/theme/frio/config.php:167 +#: view/theme/frio/config.php:168 msgid "Note" msgstr "" -#: view/theme/frio/config.php:167 +#: view/theme/frio/config.php:168 msgid "Check image permissions if all users are allowed to see the image" msgstr "" -#: view/theme/frio/config.php:173 +#: view/theme/frio/config.php:174 msgid "Custom" msgstr "" -#: view/theme/frio/config.php:174 +#: view/theme/frio/config.php:175 msgid "Legacy" msgstr "" -#: view/theme/frio/config.php:175 +#: view/theme/frio/config.php:176 msgid "Accented" msgstr "" -#: view/theme/frio/config.php:176 +#: view/theme/frio/config.php:177 msgid "Select color scheme" msgstr "" -#: view/theme/frio/config.php:177 +#: view/theme/frio/config.php:178 msgid "Select scheme accent" msgstr "" -#: view/theme/frio/config.php:177 +#: view/theme/frio/config.php:178 msgid "Blue" msgstr "" -#: view/theme/frio/config.php:177 +#: view/theme/frio/config.php:178 msgid "Red" msgstr "" -#: view/theme/frio/config.php:177 +#: view/theme/frio/config.php:178 msgid "Purple" msgstr "" -#: view/theme/frio/config.php:177 +#: view/theme/frio/config.php:178 msgid "Green" msgstr "" -#: view/theme/frio/config.php:177 +#: view/theme/frio/config.php:178 msgid "Pink" msgstr "" -#: view/theme/frio/config.php:178 +#: view/theme/frio/config.php:179 msgid "Copy or paste schemestring" msgstr "" -#: view/theme/frio/config.php:178 +#: view/theme/frio/config.php:179 msgid "" "You can copy this string to share your theme with others. Pasting here " "applies the schemestring" msgstr "" -#: view/theme/frio/config.php:179 +#: view/theme/frio/config.php:180 msgid "Navigation bar background color" msgstr "" -#: view/theme/frio/config.php:180 +#: view/theme/frio/config.php:181 msgid "Navigation bar icon color " msgstr "" -#: view/theme/frio/config.php:181 +#: view/theme/frio/config.php:182 msgid "Link color" msgstr "" -#: view/theme/frio/config.php:182 +#: view/theme/frio/config.php:183 msgid "Set the background color" msgstr "" -#: view/theme/frio/config.php:183 +#: view/theme/frio/config.php:184 msgid "Content background opacity" msgstr "" -#: view/theme/frio/config.php:184 +#: view/theme/frio/config.php:185 msgid "Set the background image" msgstr "" -#: view/theme/frio/config.php:185 +#: view/theme/frio/config.php:186 msgid "Background image style" msgstr "" -#: view/theme/frio/config.php:188 +#: view/theme/frio/config.php:189 msgid "Always open Compose page" msgstr "" -#: view/theme/frio/config.php:188 +#: view/theme/frio/config.php:189 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:192 +#: view/theme/frio/config.php:193 msgid "Login page background image" msgstr "" -#: view/theme/frio/config.php:196 +#: view/theme/frio/config.php:197 msgid "Login page background color" msgstr "" -#: view/theme/frio/config.php:196 +#: view/theme/frio/config.php:197 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:218 +#: view/theme/frio/theme.php:220 msgid "Guest" msgstr "" -#: view/theme/frio/theme.php:221 +#: view/theme/frio/theme.php:223 msgid "Visitor" msgstr "" -#: view/theme/quattro/config.php:73 +#: view/theme/quattro/config.php:90 msgid "Alignment" msgstr "" -#: view/theme/quattro/config.php:73 +#: view/theme/quattro/config.php:90 msgid "Left" msgstr "" -#: view/theme/quattro/config.php:73 +#: view/theme/quattro/config.php:90 msgid "Center" msgstr "" -#: view/theme/quattro/config.php:74 +#: view/theme/quattro/config.php:91 msgid "Color scheme" msgstr "" -#: view/theme/quattro/config.php:75 +#: view/theme/quattro/config.php:92 msgid "Posts font size" msgstr "" -#: view/theme/quattro/config.php:76 +#: view/theme/quattro/config.php:93 msgid "Textareas font size" msgstr "" -#: view/theme/vier/config.php:75 +#: view/theme/vier/config.php:92 msgid "Comma separated list of helper forums" msgstr "" -#: view/theme/vier/config.php:115 +#: view/theme/vier/config.php:132 msgid "don't show" msgstr "" -#: view/theme/vier/config.php:115 +#: view/theme/vier/config.php:132 msgid "show" msgstr "" -#: view/theme/vier/config.php:121 +#: view/theme/vier/config.php:138 msgid "Set style" msgstr "" -#: view/theme/vier/config.php:122 +#: view/theme/vier/config.php:139 msgid "Community Pages" msgstr "" -#: view/theme/vier/config.php:123 view/theme/vier/theme.php:134 +#: view/theme/vier/config.php:140 view/theme/vier/theme.php:152 msgid "Community Profiles" msgstr "" -#: view/theme/vier/config.php:124 +#: view/theme/vier/config.php:141 msgid "Help or @NewHere ?" msgstr "" -#: view/theme/vier/config.php:125 view/theme/vier/theme.php:305 +#: view/theme/vier/config.php:142 view/theme/vier/theme.php:323 msgid "Connect Services" msgstr "" -#: view/theme/vier/config.php:126 +#: view/theme/vier/config.php:143 msgid "Find Friends" msgstr "" -#: view/theme/vier/config.php:127 view/theme/vier/theme.php:161 +#: view/theme/vier/config.php:144 view/theme/vier/theme.php:179 msgid "Last users" msgstr "" -#: view/theme/vier/theme.php:220 +#: view/theme/vier/theme.php:238 msgid "Quick Start" msgstr ""