friendica/friendica
6
0
Fork 1
mirror of https://github.com/friendica/friendica synced 2024-05-22 19:34:58 +02:00
Code Issues Packages Projects Releases 1 Wiki Activity

Merge pull request #13860 from annando/baseurl

Browse source 
Account type relay / fix missing baseurl for own contacts
This commit is contained in:
Hypolite Petovan 2024-01-29 18:17:31 -05:00 committed by GitHub
parent 25f2ad1b97 7432e47f7a
commit 0c583574e1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 192 additions and 144 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
doc/Channels.md
View file

@ -60,7 +60,8 @@ Additionally to the search for content, there are additional keywords that can b
* from - Use "from:nickname" or "from:nickname@domain.tld" to search for posts from a specific author. * from - Use "from:nickname" or "from:nickname@domain.tld" to search for posts from a specific author.
* to - Use "from:nickname" or "from:nickname@domain.tld" to search for posts with the given contact as receiver. * to - Use "from:nickname" or "from:nickname@domain.tld" to search for posts with the given contact as receiver.
* group - Use "from:nickname" or "from:nickname@domain.tld" to search for group post of the given group. * group - Use "group:nickname" or "group:nickname@domain.tld" to search for group post of the given group.
* application - Use "application:nickname" or "application:nickname@domain.tld" to search for posts that had been reshared by the given relay application.
* server - Use "server:hostname" to search for posts from a specific server. In the case of group postings, the search text contains both the hostname of the group server and the author's hostname. * server - Use "server:hostname" to search for posts from a specific server. In the case of group postings, the search text contains both the hostname of the group server and the author's hostname.
* source - The ActivityPub type of the post source. Use this for example to include or exclude group posts or posts from services (aka bots). * source - The ActivityPub type of the post source. Use this for example to include or exclude group posts or posts from services (aka bots).
* source:person - The post is created by a regular user account. * source:person - The post is created by a regular user account.

1
src/Content/Widget.php
View file

@ -535,6 +535,7 @@ class Widget
['ref' => 'organisation', 'name' => DI::l10n()->t('Organisations')], ['ref' => 'organisation', 'name' => DI::l10n()->t('Organisations')],
['ref' => 'news', 'name' => DI::l10n()->t('News')], ['ref' => 'news', 'name' => DI::l10n()->t('News')],
['ref' => 'community', 'name' => DI::l10n()->t('Groups')], ['ref' => 'community', 'name' => DI::l10n()->t('Groups')],
['ref' => 'relay', 'name' => DI::l10n()->t('Relays')],
]; ];
return self::filter( return self::filter(

1
src/Core/Search.php
View file

@ -245,6 +245,7 @@ class Search
'Group' => Contact::TYPE_COMMUNITY, 'Group' => Contact::TYPE_COMMUNITY,
'Organization' => Contact::TYPE_ORGANISATION, 'Organization' => Contact::TYPE_ORGANISATION,
'News' => Contact::TYPE_NEWS, 'News' => Contact::TYPE_NEWS,
'Relay' => Contact::TYPE_RELAY,
]; ];
return [ return [

9
src/Model/Contact.php
View file

@ -784,6 +784,7 @@ class Contact
'name-date' => DateTimeFormat::utcNow(), 'name-date' => DateTimeFormat::utcNow(),
'uri-date' => DateTimeFormat::utcNow(), 'uri-date' => DateTimeFormat::utcNow(),
'avatar-date' => DateTimeFormat::utcNow(), 'avatar-date' => DateTimeFormat::utcNow(),
'baseurl' => DI::baseUrl(),
'closeness' => 0 'closeness' => 0
]; ];
@ -819,7 +820,7 @@ class Contact
$fields = [ $fields = [
'id', 'uri-id', 'name', 'nick', 'location', 'about', 'keywords', 'avatar', 'prvkey', 'pubkey', 'manually-approve', 'id', 'uri-id', 'name', 'nick', 'location', 'about', 'keywords', 'avatar', 'prvkey', 'pubkey', 'manually-approve',
'xmpp', 'matrix', 'contact-type', 'forum', 'prv', 'avatar-date', 'url', 'nurl', 'unsearchable', 'xmpp', 'matrix', 'contact-type', 'forum', 'prv', 'avatar-date', 'url', 'nurl', 'unsearchable',
'photo', 'thumb', 'micro', 'header', 'addr', 'request', 'notify', 'poll', 'confirm', 'poco', 'network' 'photo', 'thumb', 'micro', 'header', 'addr', 'request', 'notify', 'poll', 'confirm', 'poco', 'network', 'baseurl', 'gsid'
]; ];
$self = DBA::selectFirst('contact', $fields, ['uid' => $uid, 'self' => true]); $self = DBA::selectFirst('contact', $fields, ['uid' => $uid, 'self' => true]);
if (!DBA::isResult($self)) { if (!DBA::isResult($self)) {
@ -902,6 +903,8 @@ class Contact
$fields['prv'] = $user['page-flags'] == User::PAGE_FLAGS_PRVGROUP; $fields['prv'] = $user['page-flags'] == User::PAGE_FLAGS_PRVGROUP;
$fields['unsearchable'] = !$profile['net-publish']; $fields['unsearchable'] = !$profile['net-publish'];
$fields['manually-approve'] = in_array($user['page-flags'], [User::PAGE_FLAGS_NORMAL, User::PAGE_FLAGS_PRVGROUP]); $fields['manually-approve'] = in_array($user['page-flags'], [User::PAGE_FLAGS_NORMAL, User::PAGE_FLAGS_PRVGROUP]);
$fields['baseurl'] = DI::baseUrl();
$fields['gsid'] = GServer::getID($fields['baseurl'], true);
$update = false; $update = false;
@ -1747,6 +1750,10 @@ class Contact
$account_type = DI::l10n()->t("Group"); $account_type = DI::l10n()->t("Group");
break; break;
case self::TYPE_RELAY:
$account_type = DI::l10n()->t("Relay");
break;
default: default:
$account_type = ""; $account_type = "";
break; break;

6
src/Model/Item.php
View file

@ -1448,9 +1448,11 @@ class Item
} }
$engagement_uri_id = Post\Engagement::storeFromItem($posted_item); $engagement_uri_id = Post\Engagement::storeFromItem($posted_item);
if (in_array($posted_item['gravity'], [self::GRAVITY_PARENT, self::GRAVITY_COMMENT])) { if (in_array($posted_item['gravity'], [self::GRAVITY_PARENT, self::GRAVITY_COMMENT])) {
Post\SearchIndex::insert($posted_item['uri-id'], $posted_item['network'], $posted_item['private'], $posted_item['created']); Post\SearchIndex::insert($posted_item['uri-id'], $posted_item['network'], $posted_item['private'], $posted_item['created']);
} elseif ($posted_item['verb'] == Activity::ANNOUNCE) {
Post\SearchIndex::update($posted_item['thr-parent-id']);
} }
if (($posted_item['gravity'] == self::GRAVITY_ACTIVITY) && ($posted_item['verb'] == Activity::ANNOUNCE) && ($posted_item['parent-uri-id'] == $posted_item['thr-parent-id'])) { if (($posted_item['gravity'] == self::GRAVITY_ACTIVITY) && ($posted_item['verb'] == Activity::ANNOUNCE) && ($posted_item['parent-uri-id'] == $posted_item['thr-parent-id'])) {
@ -1616,7 +1618,7 @@ class Item
} }
$languages = $item['language'] ? array_keys(json_decode($item['language'], true)) : []; $languages = $item['language'] ? array_keys(json_decode($item['language'], true)) : [];
foreach (Tag::getUIDListByURIId($item['uri-id']) as $uid => $tags) { foreach (Tag::getUIDListByURIId($item['uri-id']) as $uid => $tags) {
if (!empty($languages)) { if (!empty($languages)) {
$keep = false; $keep = false;

35
src/Model/Post/Engagement.php
View file

@ -38,7 +38,7 @@ use Friendica\Util\DateTimeFormat;
class Engagement class Engagement
{ {
const KEYWORDS = ['source', 'server', 'from', 'to', 'group', 'tag', 'network', 'platform', 'visibility', 'language']; const KEYWORDS = ['source', 'server', 'from', 'to', 'group', 'application', 'tag', 'network', 'platform', 'visibility', 'language'];
/** /**
* Store engagement data from an item array * Store engagement data from an item array
@ -188,7 +188,7 @@ class Engagement
if (!empty($item['author-gsid'])) { if (!empty($item['author-gsid'])) {
$gserver = DBA::selectFirst('gserver', ['platform', 'nurl'], ['id' => $item['author-gsid']]); $gserver = DBA::selectFirst('gserver', ['platform', 'nurl'], ['id' => $item['author-gsid']]);
$platform = preg_replace( '/[\W]/', '', $gserver['platform'] ?? ''); $platform = preg_replace('/[\W]/', '', $gserver['platform'] ?? '');
if (!empty($platform)) { if (!empty($platform)) {
$body .= ' platform_' . $platform; $body .= ' platform_' . $platform;
} }
@ -197,7 +197,7 @@ class Engagement
if (($item['owner-contact-type'] == Contact::TYPE_COMMUNITY) && !empty($item['owner-gsid']) && ($item['owner-gsid'] != ($item['author-gsid'] ?? 0))) { if (($item['owner-contact-type'] == Contact::TYPE_COMMUNITY) && !empty($item['owner-gsid']) && ($item['owner-gsid'] != ($item['author-gsid'] ?? 0))) {
$gserver = DBA::selectFirst('gserver', ['platform', 'nurl'], ['id' => $item['owner-gsid']]); $gserver = DBA::selectFirst('gserver', ['platform', 'nurl'], ['id' => $item['owner-gsid']]);
$platform = preg_replace( '/[\W]/', '', $gserver['platform'] ?? ''); $platform = preg_replace('/[\W]/', '', $gserver['platform'] ?? '');
if (!empty($platform) && !strpos($body, 'platform_' . $platform)) { if (!empty($platform) && !strpos($body, 'platform_' . $platform)) {
$body .= ' platform_' . $platform; $body .= ' platform_' . $platform;
} }
@ -230,6 +230,8 @@ class Engagement
if ($item['author-contact-type'] == Contact::TYPE_COMMUNITY) { if ($item['author-contact-type'] == Contact::TYPE_COMMUNITY) {
$body .= ' group_' . $item['author-nick'] . ' group_' . $item['author-addr']; $body .= ' group_' . $item['author-nick'] . ' group_' . $item['author-addr'];
} elseif ($item['author-contact-type'] == Contact::TYPE_RELAY) {
$body .= ' application_' . $item['author-nick'] . ' application_' . $item['author-addr'];
} elseif (in_array($item['author-contact-type'], [Contact::TYPE_PERSON, Contact::TYPE_NEWS, Contact::TYPE_ORGANISATION])) { } elseif (in_array($item['author-contact-type'], [Contact::TYPE_PERSON, Contact::TYPE_NEWS, Contact::TYPE_ORGANISATION])) {
$body .= ' from_' . $item['author-nick'] . ' from_' . $item['author-addr']; $body .= ' from_' . $item['author-nick'] . ' from_' . $item['author-addr'];
} }
@ -242,6 +244,8 @@ class Engagement
} }
} }
$body = self::addResharers($body, $item['uri-id']);
foreach ($receivers as $receiver) { foreach ($receivers as $receiver) {
$contact = Contact::getByURL($receiver, false, ['nick', 'addr', 'contact-type']); $contact = Contact::getByURL($receiver, false, ['nick', 'addr', 'contact-type']);
if (empty($contact)) { if (empty($contact)) {
@ -269,6 +273,31 @@ class Engagement
return BBCode::toSearchText($body, $item['uri-id']); return BBCode::toSearchText($body, $item['uri-id']);
} }
private static function addResharers(string $text, int $uri_id): string
{
$result = Post::selectPosts(['author-addr', 'author-nick', 'author-contact-type'],
['thr-parent-id' => $uri_id, 'gravity' => Item::GRAVITY_ACTIVITY, 'verb' => Activity::ANNOUNCE, 'author-contact-type' => [Contact::TYPE_RELAY, Contact::TYPE_COMMUNITY]]);
while ($reshare = Post::fetch($result)) {
switch ($reshare['author-contact-type']) {
case Contact::TYPE_RELAY:
$prefix = ' application_';
break;
case Contact::TYPE_COMMUNITY:
$prefix = ' group_';
break;
}
$nick = $prefix . $reshare['author-nick'];
$addr = $prefix . $reshare['author-addr'];
if (stripos($text, $addr) === false) {
$text .= $nick . $addr;
}
}
DBA::close($result);
return $text;
}
private static function getMediaType(int $uri_id): int private static function getMediaType(int $uri_id): int
{ {
$media = Post\Media::getByURIId($uri_id); $media = Post\Media::getByURIId($uri_id);

2
src/Model/Post/SearchIndex.php
View file

@ -63,7 +63,7 @@ class SearchIndex
*/ */
public static function update(int $uri_id) public static function update(int $uri_id)
{ {
$searchtext = Post\Engagement::getSearchTextForUriId($uri_id, true); $searchtext = Post\Engagement::getSearchTextForUriId($uri_id);
return DBA::update('post-searchindex', ['searchtext' => $searchtext], ['uri-id' => $uri_id]); return DBA::update('post-searchindex', ['searchtext' => $searchtext], ['uri-id' => $uri_id]);
} }

5
src/Model/User.php
View file

@ -127,6 +127,9 @@ class User
case 'community': case 'community':
return self::ACCOUNT_TYPE_COMMUNITY; return self::ACCOUNT_TYPE_COMMUNITY;
case 'relay':
return self::ACCOUNT_TYPE_RELAY;
} }
return null; return null;
} }
@ -477,7 +480,7 @@ class User
// Check for correct url and normalised nurl // Check for correct url and normalised nurl
$url = DI::baseUrl() . '/profile/' . $owner['nickname']; $url = DI::baseUrl() . '/profile/' . $owner['nickname'];
$repair = empty($owner['network']) || ($owner['url'] != $url) || ($owner['nurl'] != Strings::normaliseLink($owner['url'])); $repair = empty($owner['baseurl']) || empty($owner['network']) || ($owner['url'] != $url) || ($owner['nurl'] != Strings::normaliseLink($owner['url']));
if (!$repair) { if (!$repair) {
// Check if "addr" is present and correct // Check if "addr" is present and correct

274
view/lang/C/messages.po
View file

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: 2024.03-dev\n" "Project-Id-Version: 2024.03-dev\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-01-25 18:12+0000\n" "POT-Creation-Date: 2024-01-29 06:46+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -66,8 +66,8 @@ msgstr ""
#: src/Module/Register.php:77 src/Module/Register.php:90 #: src/Module/Register.php:77 src/Module/Register.php:90
#: src/Module/Register.php:206 src/Module/Register.php:245 #: src/Module/Register.php:206 src/Module/Register.php:245
#: src/Module/Search/Directory.php:37 src/Module/Settings/Account.php:50 #: src/Module/Search/Directory.php:37 src/Module/Settings/Account.php:50
#: src/Module/Settings/Account.php:386 src/Module/Settings/Channels.php:61 #: src/Module/Settings/Account.php:386 src/Module/Settings/Channels.php:62
#: src/Module/Settings/Channels.php:130 src/Module/Settings/Delegation.php:90 #: src/Module/Settings/Channels.php:131 src/Module/Settings/Delegation.php:90
#: src/Module/Settings/Display.php:90 src/Module/Settings/Display.php:197 #: src/Module/Settings/Display.php:90 src/Module/Settings/Display.php:197
#: src/Module/Settings/Profile/Photo/Crop.php:165 #: src/Module/Settings/Profile/Photo/Crop.php:165
#: src/Module/Settings/Profile/Photo/Index.php:112 #: src/Module/Settings/Profile/Photo/Index.php:112
@ -382,7 +382,7 @@ msgstr ""
#: mod/notes.php:57 src/Content/Text/HTML.php:860 #: mod/notes.php:57 src/Content/Text/HTML.php:860
#: src/Module/Admin/Storage.php:142 src/Module/Filer/SaveTag.php:74 #: src/Module/Admin/Storage.php:142 src/Module/Filer/SaveTag.php:74
#: src/Module/Post/Edit.php:129 src/Module/Settings/Channels.php:212 #: src/Module/Post/Edit.php:129 src/Module/Settings/Channels.php:213
msgid "Save" msgid "Save"
msgstr "" msgstr ""
@ -794,12 +794,12 @@ msgstr ""
#: src/BaseModule.php:439 src/Content/Conversation/Factory/Channel.php:46 #: src/BaseModule.php:439 src/Content/Conversation/Factory/Channel.php:46
#: src/Content/Widget.php:239 src/Core/ACL.php:195 src/Module/Contact.php:414 #: src/Content/Widget.php:239 src/Core/ACL.php:195 src/Module/Contact.php:414
#: src/Module/PermissionTooltip.php:141 src/Module/PermissionTooltip.php:163 #: src/Module/PermissionTooltip.php:141 src/Module/PermissionTooltip.php:163
#: src/Module/Settings/Channels.php:147 #: src/Module/Settings/Channels.php:148
msgid "Followers" msgid "Followers"
msgstr "" msgstr ""
#: src/BaseModule.php:444 src/Content/Widget.php:240 src/Module/Contact.php:417 #: src/BaseModule.php:444 src/Content/Widget.php:240 src/Module/Contact.php:417
#: src/Module/Settings/Channels.php:146 #: src/Module/Settings/Channels.php:147
msgid "Following" msgid "Following"
msgstr "" msgstr ""
@ -957,7 +957,7 @@ msgstr ""
msgid "Enter user nickname: " msgid "Enter user nickname: "
msgstr "" msgstr ""
#: src/Console/User.php:182 src/Model/User.php:816 #: src/Console/User.php:182 src/Model/User.php:819
#: src/Module/Api/Twitter/ContactEndpoint.php:74 #: src/Module/Api/Twitter/ContactEndpoint.php:74
#: src/Module/Moderation/Users/Active.php:71 #: src/Module/Moderation/Users/Active.php:71
#: src/Module/Moderation/Users/Blocked.php:71 #: src/Module/Moderation/Users/Blocked.php:71
@ -1559,7 +1559,7 @@ msgid "Posts from accounts that are followed by accounts that you follow"
msgstr "" msgstr ""
#: src/Content/Conversation/Factory/Channel.php:48 #: src/Content/Conversation/Factory/Channel.php:48
#: src/Module/Settings/Channels.php:184 src/Module/Settings/Channels.php:203 #: src/Module/Settings/Channels.php:185 src/Module/Settings/Channels.php:204
msgid "Images" msgid "Images"
msgstr "" msgstr ""
@ -1568,7 +1568,7 @@ msgid "Posts with images"
msgstr "" msgstr ""
#: src/Content/Conversation/Factory/Channel.php:49 #: src/Content/Conversation/Factory/Channel.php:49
#: src/Module/Settings/Channels.php:186 src/Module/Settings/Channels.php:205 #: src/Module/Settings/Channels.php:187 src/Module/Settings/Channels.php:206
msgid "Audio" msgid "Audio"
msgstr "" msgstr ""
@ -1577,7 +1577,7 @@ msgid "Posts with audio"
msgstr "" msgstr ""
#: src/Content/Conversation/Factory/Channel.php:50 #: src/Content/Conversation/Factory/Channel.php:50
#: src/Module/Settings/Channels.php:185 src/Module/Settings/Channels.php:204 #: src/Module/Settings/Channels.php:186 src/Module/Settings/Channels.php:205
msgid "Videos" msgid "Videos"
msgstr "" msgstr ""
@ -1594,7 +1594,7 @@ msgid "Posts from local users on this server"
msgstr "" msgstr ""
#: src/Content/Conversation/Factory/Community.php:47 #: src/Content/Conversation/Factory/Community.php:47
#: src/Module/Settings/Channels.php:139 src/Module/Settings/Channels.php:144 #: src/Module/Settings/Channels.php:140 src/Module/Settings/Channels.php:145
msgid "Global Community" msgid "Global Community"
msgstr "" msgstr ""
@ -1755,26 +1755,26 @@ msgid ""
"Contact birthday events are private to you." "Contact birthday events are private to you."
msgstr "" msgstr ""
#: src/Content/GroupManager.php:147 src/Content/Nav.php:278 #: src/Content/GroupManager.php:148 src/Content/Nav.php:278
#: src/Content/Text/HTML.php:881 src/Content/Widget.php:537 #: src/Content/Text/HTML.php:881 src/Content/Widget.php:537
#: src/Model/User.php:1378 #: src/Model/User.php:1381
msgid "Groups" msgid "Groups"
msgstr "" msgstr ""
#: src/Content/GroupManager.php:149 #: src/Content/GroupManager.php:150
msgid "External link to group" msgid "External link to group"
msgstr "" msgstr ""
#: src/Content/GroupManager.php:153 src/Content/Widget.php:512 #: src/Content/GroupManager.php:154 src/Content/Widget.php:512
msgid "show less" msgid "show less"
msgstr "" msgstr ""
#: src/Content/GroupManager.php:154 src/Content/Widget.php:410 #: src/Content/GroupManager.php:155 src/Content/Widget.php:410
#: src/Content/Widget.php:513 #: src/Content/Widget.php:513
msgid "show more" msgid "show more"
msgstr "" msgstr ""
#: src/Content/GroupManager.php:155 #: src/Content/GroupManager.php:156
msgid "Create new group" msgid "Create new group"
msgstr "" msgstr ""
@ -1800,31 +1800,31 @@ msgstr ""
msgid "Follow Thread" msgid "Follow Thread"
msgstr "" msgstr ""
#: src/Content/Item.php:430 src/Model/Contact.php:1247 #: src/Content/Item.php:430 src/Model/Contact.php:1250
msgid "View Status" msgid "View Status"
msgstr "" msgstr ""
#: src/Content/Item.php:431 src/Content/Item.php:452 src/Model/Contact.php:1181 #: src/Content/Item.php:431 src/Content/Item.php:452 src/Model/Contact.php:1184
#: src/Model/Contact.php:1238 src/Model/Contact.php:1248 #: src/Model/Contact.php:1241 src/Model/Contact.php:1251
#: src/Module/Directory.php:157 src/Module/Settings/Profile/Index.php:259 #: src/Module/Directory.php:157 src/Module/Settings/Profile/Index.php:259
msgid "View Profile" msgid "View Profile"
msgstr "" msgstr ""
#: src/Content/Item.php:432 src/Model/Contact.php:1249 #: src/Content/Item.php:432 src/Model/Contact.php:1252
msgid "View Photos" msgid "View Photos"
msgstr "" msgstr ""
#: src/Content/Item.php:433 src/Model/Contact.php:1216 #: src/Content/Item.php:433 src/Model/Contact.php:1219
#: src/Model/Profile.php:468 #: src/Model/Profile.php:468
msgid "Network Posts" msgid "Network Posts"
msgstr "" msgstr ""
#: src/Content/Item.php:434 src/Model/Contact.php:1240 #: src/Content/Item.php:434 src/Model/Contact.php:1243
#: src/Model/Contact.php:1251 #: src/Model/Contact.php:1254
msgid "View Contact" msgid "View Contact"
msgstr "" msgstr ""
#: src/Content/Item.php:435 src/Model/Contact.php:1252 #: src/Content/Item.php:435 src/Model/Contact.php:1255
msgid "Send PM" msgid "Send PM"
msgstr "" msgstr ""
@ -1854,13 +1854,13 @@ msgstr ""
msgid "Ignore %s server" msgid "Ignore %s server"
msgstr "" msgstr ""
#: src/Content/Item.php:443 src/Module/Settings/Channels.php:187 #: src/Content/Item.php:443 src/Module/Settings/Channels.php:188
#: src/Module/Settings/Channels.php:206 src/Object/Post.php:509 #: src/Module/Settings/Channels.php:207 src/Object/Post.php:509
msgid "Languages" msgid "Languages"
msgstr "" msgstr ""
#: src/Content/Item.php:449 src/Content/Widget.php:80 #: src/Content/Item.php:449 src/Content/Widget.php:80
#: src/Model/Contact.php:1241 src/Model/Contact.php:1253 #: src/Model/Contact.php:1244 src/Model/Contact.php:1256
#: src/Module/Contact/Follow.php:167 view/theme/vier/theme.php:195 #: src/Module/Contact/Follow.php:167 view/theme/vier/theme.php:195
msgid "Connect/Follow" msgid "Connect/Follow"
msgstr "" msgstr ""
@ -2058,7 +2058,7 @@ msgstr ""
msgid "Terms of Service of this Friendica instance" msgid "Terms of Service of this Friendica instance"
msgstr "" msgstr ""
#: src/Content/Nav.php:306 src/Module/Settings/Channels.php:145 #: src/Content/Nav.php:306 src/Module/Settings/Channels.php:146
#: view/theme/frio/theme.php:239 #: view/theme/frio/theme.php:239
msgid "Network" msgid "Network"
msgstr "" msgstr ""
@ -2368,20 +2368,24 @@ msgstr ""
msgid "Organisations" msgid "Organisations"
msgstr "" msgstr ""
#: src/Content/Widget.php:536 src/Model/Contact.php:1743 #: src/Content/Widget.php:536 src/Model/Contact.php:1746
msgid "News" msgid "News"
msgstr "" msgstr ""
#: src/Content/Widget.php:542 src/Module/Settings/Account.php:442 #: src/Content/Widget.php:538
msgid "Relays"
msgstr ""
#: src/Content/Widget.php:543 src/Module/Settings/Account.php:442
msgid "Account Types" msgid "Account Types"
msgstr "" msgstr ""
#: src/Content/Widget.php:544 src/Module/Moderation/BaseUsers.php:69 #: src/Content/Widget.php:545 src/Module/Moderation/BaseUsers.php:69
msgid "All" msgid "All"
msgstr "" msgstr ""
#: src/Content/Widget.php:591 src/Module/Admin/Site.php:472 #: src/Content/Widget.php:592 src/Module/Admin/Site.php:472
#: src/Module/BaseSettings.php:125 src/Module/Settings/Channels.php:208 #: src/Module/BaseSettings.php:125 src/Module/Settings/Channels.php:209
#: src/Module/Settings/Display.php:315 #: src/Module/Settings/Display.php:315
msgid "Channels" msgid "Channels"
msgstr "" msgstr ""
@ -2432,12 +2436,12 @@ msgstr[1] ""
msgid "More Trending Tags" msgid "More Trending Tags"
msgstr "" msgstr ""
#: src/Content/Widget/VCard.php:102 src/Model/Contact.php:1209 #: src/Content/Widget/VCard.php:102 src/Model/Contact.php:1212
#: src/Model/Profile.php:461 #: src/Model/Profile.php:461
msgid "Post to group" msgid "Post to group"
msgstr "" msgstr ""
#: src/Content/Widget/VCard.php:106 src/Model/Contact.php:1214 #: src/Content/Widget/VCard.php:106 src/Model/Contact.php:1217
#: src/Model/Profile.php:466 src/Module/Moderation/Item/Source.php:85 #: src/Model/Profile.php:466 src/Module/Moderation/Item/Source.php:85
msgid "Mention" msgid "Mention"
msgstr "" msgstr ""
@ -2465,13 +2469,13 @@ msgstr ""
msgid "Network:" msgid "Network:"
msgstr "" msgstr ""
#: src/Content/Widget/VCard.php:125 src/Model/Contact.php:1242 #: src/Content/Widget/VCard.php:125 src/Model/Contact.php:1245
#: src/Model/Contact.php:1254 src/Model/Profile.php:479 #: src/Model/Contact.php:1257 src/Model/Profile.php:479
#: src/Module/Contact/Profile.php:463 #: src/Module/Contact/Profile.php:463
msgid "Unfollow" msgid "Unfollow"
msgstr "" msgstr ""
#: src/Content/Widget/VCard.php:131 src/Model/Contact.php:1211 #: src/Content/Widget/VCard.php:131 src/Model/Contact.php:1214
#: src/Model/Profile.php:463 #: src/Model/Profile.php:463
msgid "View group" msgid "View group"
msgstr "" msgstr ""
@ -3241,82 +3245,86 @@ msgstr ""
msgid "Edit circles" msgid "Edit circles"
msgstr "" msgstr ""
#: src/Model/Contact.php:1261 src/Module/Moderation/Users/Pending.php:102 #: src/Model/Contact.php:1264 src/Module/Moderation/Users/Pending.php:102
#: src/Module/Notifications/Introductions.php:132 #: src/Module/Notifications/Introductions.php:132
#: src/Module/Notifications/Introductions.php:204 #: src/Module/Notifications/Introductions.php:204
msgid "Approve" msgid "Approve"
msgstr "" msgstr ""
#: src/Model/Contact.php:1739 #: src/Model/Contact.php:1742
msgid "Organisation" msgid "Organisation"
msgstr "" msgstr ""
#: src/Model/Contact.php:1747 #: src/Model/Contact.php:1750
msgid "Group" msgid "Group"
msgstr "" msgstr ""
#: src/Model/Contact.php:3050 #: src/Model/Contact.php:1754 src/Module/Moderation/BaseUsers.php:130
msgid "Relay"
msgstr ""
#: src/Model/Contact.php:3057
msgid "Disallowed profile URL." msgid "Disallowed profile URL."
msgstr "" msgstr ""
#: src/Model/Contact.php:3055 src/Module/Friendica.php:101 #: src/Model/Contact.php:3062 src/Module/Friendica.php:101
msgid "Blocked domain" msgid "Blocked domain"
msgstr "" msgstr ""
#: src/Model/Contact.php:3060 #: src/Model/Contact.php:3067
msgid "Connect URL missing." msgid "Connect URL missing."
msgstr "" msgstr ""
#: src/Model/Contact.php:3069 #: src/Model/Contact.php:3076
msgid "" msgid ""
"The contact could not be added. Please check the relevant network " "The contact could not be added. Please check the relevant network "
"credentials in your Settings -> Social Networks page." "credentials in your Settings -> Social Networks page."
msgstr "" msgstr ""
#: src/Model/Contact.php:3087 #: src/Model/Contact.php:3094
#, php-format #, php-format
msgid "Expected network %s does not match actual network %s" msgid "Expected network %s does not match actual network %s"
msgstr "" msgstr ""
#: src/Model/Contact.php:3104 #: src/Model/Contact.php:3111
msgid "The profile address specified does not provide adequate information." msgid "The profile address specified does not provide adequate information."
msgstr "" msgstr ""
#: src/Model/Contact.php:3106 #: src/Model/Contact.php:3113
msgid "No compatible communication protocols or feeds were discovered." msgid "No compatible communication protocols or feeds were discovered."
msgstr "" msgstr ""
#: src/Model/Contact.php:3109 #: src/Model/Contact.php:3116
msgid "An author or name was not found." msgid "An author or name was not found."
msgstr "" msgstr ""
#: src/Model/Contact.php:3112 #: src/Model/Contact.php:3119
msgid "No browser URL could be matched to this address." msgid "No browser URL could be matched to this address."
msgstr "" msgstr ""
#: src/Model/Contact.php:3115 #: src/Model/Contact.php:3122
msgid "" msgid ""
"Unable to match @-style Identity Address with a known protocol or email " "Unable to match @-style Identity Address with a known protocol or email "
"contact." "contact."
msgstr "" msgstr ""
#: src/Model/Contact.php:3116 #: src/Model/Contact.php:3123
msgid "Use mailto: in front of address to force email check." msgid "Use mailto: in front of address to force email check."
msgstr "" msgstr ""
#: src/Model/Contact.php:3122 #: src/Model/Contact.php:3129
msgid "" msgid ""
"The profile address specified belongs to a network which has been disabled " "The profile address specified belongs to a network which has been disabled "
"on this site." "on this site."
msgstr "" msgstr ""
#: src/Model/Contact.php:3127 #: src/Model/Contact.php:3134
msgid "" msgid ""
"Limited profile. This person will be unable to receive direct/personal " "Limited profile. This person will be unable to receive direct/personal "
"notifications from you." "notifications from you."
msgstr "" msgstr ""
#: src/Model/Contact.php:3193 #: src/Model/Contact.php:3200
msgid "Unable to retrieve contact information." msgid "Unable to retrieve contact information."
msgstr "" msgstr ""
@ -3663,145 +3671,145 @@ msgstr ""
msgid "Contact information and Social Networks" msgid "Contact information and Social Networks"
msgstr "" msgstr ""
#: src/Model/User.php:225 src/Model/User.php:1291 #: src/Model/User.php:228 src/Model/User.php:1294
msgid "SERIOUS ERROR: Generation of security keys failed." msgid "SERIOUS ERROR: Generation of security keys failed."
msgstr "" msgstr ""
#: src/Model/User.php:725 src/Model/User.php:758 #: src/Model/User.php:728 src/Model/User.php:761
msgid "Login failed" msgid "Login failed"
msgstr "" msgstr ""
#: src/Model/User.php:790 #: src/Model/User.php:793
msgid "Not enough information to authenticate" msgid "Not enough information to authenticate"
msgstr "" msgstr ""
#: src/Model/User.php:911 #: src/Model/User.php:914
msgid "Password can't be empty" msgid "Password can't be empty"
msgstr "" msgstr ""
#: src/Model/User.php:953 #: src/Model/User.php:956
msgid "Empty passwords are not allowed." msgid "Empty passwords are not allowed."
msgstr "" msgstr ""
#: src/Model/User.php:957 #: src/Model/User.php:960
msgid "" msgid ""
"The new password has been exposed in a public data dump, please choose " "The new password has been exposed in a public data dump, please choose "
"another." "another."
msgstr "" msgstr ""
#: src/Model/User.php:961 #: src/Model/User.php:964
msgid "The password length is limited to 72 characters." msgid "The password length is limited to 72 characters."
msgstr "" msgstr ""
#: src/Model/User.php:965 #: src/Model/User.php:968
msgid "The password can't contain white spaces nor accentuated letters" msgid "The password can't contain white spaces nor accentuated letters"
msgstr "" msgstr ""
#: src/Model/User.php:1174 #: src/Model/User.php:1177
msgid "Passwords do not match. Password unchanged." msgid "Passwords do not match. Password unchanged."
msgstr "" msgstr ""
#: src/Model/User.php:1181 #: src/Model/User.php:1184
msgid "An invitation is required." msgid "An invitation is required."
msgstr "" msgstr ""
#: src/Model/User.php:1185 #: src/Model/User.php:1188
msgid "Invitation could not be verified." msgid "Invitation could not be verified."
msgstr "" msgstr ""
#: src/Model/User.php:1193 #: src/Model/User.php:1196
msgid "Invalid OpenID url" msgid "Invalid OpenID url"
msgstr "" msgstr ""
#: src/Model/User.php:1206 src/Security/Authentication.php:241 #: src/Model/User.php:1209 src/Security/Authentication.php:241
msgid "" msgid ""
"We encountered a problem while logging in with the OpenID you provided. " "We encountered a problem while logging in with the OpenID you provided. "
"Please check the correct spelling of the ID." "Please check the correct spelling of the ID."
msgstr "" msgstr ""
#: src/Model/User.php:1206 src/Security/Authentication.php:241 #: src/Model/User.php:1209 src/Security/Authentication.php:241
msgid "The error message was:" msgid "The error message was:"
msgstr "" msgstr ""
#: src/Model/User.php:1212 #: src/Model/User.php:1215
msgid "Please enter the required information." msgid "Please enter the required information."
msgstr "" msgstr ""
#: src/Model/User.php:1226 #: src/Model/User.php:1229
#, php-format #, php-format
msgid "" msgid ""
"system.username_min_length (%s) and system.username_max_length (%s) are " "system.username_min_length (%s) and system.username_max_length (%s) are "
"excluding each other, swapping values." "excluding each other, swapping values."
msgstr "" msgstr ""
#: src/Model/User.php:1233 #: src/Model/User.php:1236
#, php-format #, php-format
msgid "Username should be at least %s character." msgid "Username should be at least %s character."
msgid_plural "Username should be at least %s characters." msgid_plural "Username should be at least %s characters."
msgstr[0] "" msgstr[0] ""
msgstr[1] "" msgstr[1] ""
#: src/Model/User.php:1237 #: src/Model/User.php:1240
#, php-format #, php-format
msgid "Username should be at most %s character." msgid "Username should be at most %s character."
msgid_plural "Username should be at most %s characters." msgid_plural "Username should be at most %s characters."
msgstr[0] "" msgstr[0] ""
msgstr[1] "" msgstr[1] ""
#: src/Model/User.php:1245 #: src/Model/User.php:1248
msgid "That doesn't appear to be your full (First Last) name." msgid "That doesn't appear to be your full (First Last) name."
msgstr "" msgstr ""
#: src/Model/User.php:1250 #: src/Model/User.php:1253
msgid "Your email domain is not among those allowed on this site." msgid "Your email domain is not among those allowed on this site."
msgstr "" msgstr ""
#: src/Model/User.php:1254 #: src/Model/User.php:1257
msgid "Not a valid email address." msgid "Not a valid email address."
msgstr "" msgstr ""
#: src/Model/User.php:1257 #: src/Model/User.php:1260
msgid "The nickname was blocked from registration by the nodes admin." msgid "The nickname was blocked from registration by the nodes admin."
msgstr "" msgstr ""
#: src/Model/User.php:1261 src/Model/User.php:1267 #: src/Model/User.php:1264 src/Model/User.php:1270
msgid "Cannot use that email." msgid "Cannot use that email."
msgstr "" msgstr ""
#: src/Model/User.php:1273 #: src/Model/User.php:1276
msgid "Your nickname can only contain a-z, 0-9 and _." msgid "Your nickname can only contain a-z, 0-9 and _."
msgstr "" msgstr ""
#: src/Model/User.php:1281 src/Model/User.php:1338 #: src/Model/User.php:1284 src/Model/User.php:1341
msgid "Nickname is already registered. Please choose another." msgid "Nickname is already registered. Please choose another."
msgstr "" msgstr ""
#: src/Model/User.php:1325 src/Model/User.php:1329 #: src/Model/User.php:1328 src/Model/User.php:1332
msgid "An error occurred during registration. Please try again." msgid "An error occurred during registration. Please try again."
msgstr "" msgstr ""
#: src/Model/User.php:1352 #: src/Model/User.php:1355
msgid "An error occurred creating your default profile. Please try again." msgid "An error occurred creating your default profile. Please try again."
msgstr "" msgstr ""
#: src/Model/User.php:1359 #: src/Model/User.php:1362
msgid "An error occurred creating your self contact. Please try again." msgid "An error occurred creating your self contact. Please try again."
msgstr "" msgstr ""
#: src/Model/User.php:1364 #: src/Model/User.php:1367
msgid "Friends" msgid "Friends"
msgstr "" msgstr ""
#: src/Model/User.php:1368 #: src/Model/User.php:1371
msgid "" msgid ""
"An error occurred creating your default contact circle. Please try again." "An error occurred creating your default contact circle. Please try again."
msgstr "" msgstr ""
#: src/Model/User.php:1412 #: src/Model/User.php:1415
msgid "Profile Photos" msgid "Profile Photos"
msgstr "" msgstr ""
#: src/Model/User.php:1594 #: src/Model/User.php:1597
#, php-format #, php-format
msgid "" msgid ""
"\n" "\n"
@ -3809,7 +3817,7 @@ msgid ""
"\t\t\tthe administrator of %2$s has set up an account for you." "\t\t\tthe administrator of %2$s has set up an account for you."
msgstr "" msgstr ""
#: src/Model/User.php:1597 #: src/Model/User.php:1600
#, php-format #, php-format
msgid "" msgid ""
"\n" "\n"
@ -3845,12 +3853,12 @@ msgid ""
"\t\tThank you and welcome to %4$s." "\t\tThank you and welcome to %4$s."
msgstr "" msgstr ""
#: src/Model/User.php:1629 src/Model/User.php:1735 #: src/Model/User.php:1632 src/Model/User.php:1738
#, php-format #, php-format
msgid "Registration details for %s" msgid "Registration details for %s"
msgstr "" msgstr ""
#: src/Model/User.php:1649 #: src/Model/User.php:1652
#, php-format #, php-format
msgid "" msgid ""
"\n" "\n"
@ -3866,12 +3874,12 @@ msgid ""
"\t\t" "\t\t"
msgstr "" msgstr ""
#: src/Model/User.php:1668 #: src/Model/User.php:1671
#, php-format #, php-format
msgid "Registration at %s" msgid "Registration at %s"
msgstr "" msgstr ""
#: src/Model/User.php:1692 #: src/Model/User.php:1695
#, php-format #, php-format
msgid "" msgid ""
"\n" "\n"
@ -3880,7 +3888,7 @@ msgid ""
"\t\t\t" "\t\t\t"
msgstr "" msgstr ""
#: src/Model/User.php:1700 #: src/Model/User.php:1703
#, php-format #, php-format
msgid "" msgid ""
"\n" "\n"
@ -3918,7 +3926,7 @@ msgid ""
"\t\t\tThank you and welcome to %2$s." "\t\t\tThank you and welcome to %2$s."
msgstr "" msgstr ""
#: src/Model/User.php:1762 #: src/Model/User.php:1765
msgid "" msgid ""
"User with delegates can't be removed, please remove delegate users first" "User with delegates can't be removed, please remove delegate users first"
msgstr "" msgstr ""
@ -6163,7 +6171,7 @@ msgstr ""
#: src/Module/Moderation/Blocklist/Server/Index.php:116 #: src/Module/Moderation/Blocklist/Server/Index.php:116
#: src/Module/Moderation/Item/Delete.php:67 src/Module/Register.php:148 #: src/Module/Moderation/Item/Delete.php:67 src/Module/Register.php:148
#: src/Module/Security/TwoFactor/Verify.php:101 #: src/Module/Security/TwoFactor/Verify.php:101
#: src/Module/Settings/Channels.php:177 src/Module/Settings/Channels.php:196 #: src/Module/Settings/Channels.php:178 src/Module/Settings/Channels.php:197
#: src/Module/Settings/TwoFactor/Index.php:161 #: src/Module/Settings/TwoFactor/Index.php:161
#: src/Module/Settings/TwoFactor/Verify.php:158 #: src/Module/Settings/TwoFactor/Verify.php:158
msgid "Required" msgid "Required"
@ -7044,21 +7052,21 @@ msgstr ""
msgid "Not available." msgid "Not available."
msgstr "" msgstr ""
#: src/Module/Conversation/Network.php:200 #: src/Module/Conversation/Network.php:206
msgid "No such circle" msgid "No such circle"
msgstr "" msgstr ""
#: src/Module/Conversation/Network.php:204 #: src/Module/Conversation/Network.php:210
#, php-format #, php-format
msgid "Circle: %s" msgid "Circle: %s"
msgstr "" msgstr ""
#: src/Module/Conversation/Network.php:223 #: src/Module/Conversation/Network.php:229
#, php-format #, php-format
msgid "Error %d (%s) while fetching the timeline." msgid "Error %d (%s) while fetching the timeline."
msgstr "" msgstr ""
#: src/Module/Conversation/Network.php:300 #: src/Module/Conversation/Network.php:306
msgid "Network feed not available." msgid "Network feed not available."
msgstr "" msgstr ""
@ -7416,7 +7424,7 @@ msgstr ""
#: src/Module/Friendica.php:102 #: src/Module/Friendica.php:102
#: src/Module/Moderation/Blocklist/Server/Index.php:87 #: src/Module/Moderation/Blocklist/Server/Index.php:87
#: src/Module/Moderation/Blocklist/Server/Index.php:111 #: src/Module/Moderation/Blocklist/Server/Index.php:111
#: src/Module/Settings/Channels.php:215 #: src/Module/Settings/Channels.php:216
msgid "Reason for the block" msgid "Reason for the block"
msgstr "" msgstr ""
@ -7894,10 +7902,6 @@ msgstr ""
msgid "Community Group" msgid "Community Group"
msgstr "" msgstr ""
#: src/Module/Moderation/BaseUsers.php:130
msgid "Relay"
msgstr ""
#: src/Module/Moderation/Blocklist/Contact.php:70 #: src/Module/Moderation/Blocklist/Contact.php:70
msgid "You can't block a local contact, please block the user instead" msgid "You can't block a local contact, please block the user instead"
msgstr "" msgstr ""
@ -8168,7 +8172,7 @@ msgstr ""
#: src/Module/Moderation/Blocklist/Server/Index.php:86 #: src/Module/Moderation/Blocklist/Server/Index.php:86
#: src/Module/Moderation/Blocklist/Server/Index.php:110 #: src/Module/Moderation/Blocklist/Server/Index.php:110
#: src/Module/Settings/Channels.php:214 #: src/Module/Settings/Channels.php:215
msgid "Blocked server domain pattern" msgid "Blocked server domain pattern"
msgstr "" msgstr ""
@ -10142,100 +10146,100 @@ msgstr ""
msgid "No Addon settings configured" msgid "No Addon settings configured"
msgstr "" msgstr ""
#: src/Module/Settings/Channels.php:137 #: src/Module/Settings/Channels.php:138
msgid "" msgid ""
"This page can be used to define the channels that will automatically be " "This page can be used to define the channels that will automatically be "
"reshared by your account." "reshared by your account."
msgstr "" msgstr ""
#: src/Module/Settings/Channels.php:142 #: src/Module/Settings/Channels.php:143
msgid "This page can be used to define your own channels." msgid "This page can be used to define your own channels."
msgstr "" msgstr ""
#: src/Module/Settings/Channels.php:169 #: src/Module/Settings/Channels.php:170
msgid "Publish" msgid "Publish"
msgstr "" msgstr ""
#: src/Module/Settings/Channels.php:169 #: src/Module/Settings/Channels.php:170
msgid "" msgid ""
"When selected, the channel results are reshared. This only works for public " "When selected, the channel results are reshared. This only works for public "
"ActivityPub posts from the public timeline or the user defined circles." "ActivityPub posts from the public timeline or the user defined circles."
msgstr "" msgstr ""
#: src/Module/Settings/Channels.php:177 src/Module/Settings/Channels.php:196 #: src/Module/Settings/Channels.php:178 src/Module/Settings/Channels.php:197
#: src/Module/Settings/Display.php:338 #: src/Module/Settings/Display.php:338
msgid "Label" msgid "Label"
msgstr "" msgstr ""
#: src/Module/Settings/Channels.php:178 src/Module/Settings/Channels.php:197 #: src/Module/Settings/Channels.php:179 src/Module/Settings/Channels.php:198
#: src/Module/Settings/Display.php:339 #: src/Module/Settings/Display.php:339
#: src/Module/Settings/TwoFactor/AppSpecific.php:137 #: src/Module/Settings/TwoFactor/AppSpecific.php:137
msgid "Description" msgid "Description"
msgstr "" msgstr ""
#: src/Module/Settings/Channels.php:179 src/Module/Settings/Channels.php:198 #: src/Module/Settings/Channels.php:180 src/Module/Settings/Channels.php:199
msgid "Access Key" msgid "Access Key"
msgstr "" msgstr ""
#: src/Module/Settings/Channels.php:180 src/Module/Settings/Channels.php:199 #: src/Module/Settings/Channels.php:181 src/Module/Settings/Channels.php:200
msgid "Circle/Channel" msgid "Circle/Channel"
msgstr "" msgstr ""
#: src/Module/Settings/Channels.php:181 src/Module/Settings/Channels.php:200 #: src/Module/Settings/Channels.php:182 src/Module/Settings/Channels.php:201
msgid "Include Tags" msgid "Include Tags"
msgstr "" msgstr ""
#: src/Module/Settings/Channels.php:182 src/Module/Settings/Channels.php:201 #: src/Module/Settings/Channels.php:183 src/Module/Settings/Channels.php:202
msgid "Exclude Tags" msgid "Exclude Tags"
msgstr "" msgstr ""
#: src/Module/Settings/Channels.php:183 src/Module/Settings/Channels.php:202 #: src/Module/Settings/Channels.php:184 src/Module/Settings/Channels.php:203
msgid "Full Text Search" msgid "Full Text Search"
msgstr "" msgstr ""
#: src/Module/Settings/Channels.php:187 src/Module/Settings/Channels.php:206 #: src/Module/Settings/Channels.php:188 src/Module/Settings/Channels.php:207
msgid "Select all languages that you want to see in this channel." msgid "Select all languages that you want to see in this channel."
msgstr "" msgstr ""
#: src/Module/Settings/Channels.php:189 #: src/Module/Settings/Channels.php:190
msgid "Delete channel" msgid "Delete channel"
msgstr "" msgstr ""
#: src/Module/Settings/Channels.php:189 #: src/Module/Settings/Channels.php:190
msgid "Check to delete this entry from the channel list" msgid "Check to delete this entry from the channel list"
msgstr "" msgstr ""
#: src/Module/Settings/Channels.php:196 #: src/Module/Settings/Channels.php:197
msgid "Short name for the channel. It is displayed on the channels widget." msgid "Short name for the channel. It is displayed on the channels widget."
msgstr "" msgstr ""
#: src/Module/Settings/Channels.php:197 #: src/Module/Settings/Channels.php:198
msgid "This should describe the content of the channel in a few word." msgid "This should describe the content of the channel in a few word."
msgstr "" msgstr ""
#: src/Module/Settings/Channels.php:198 #: src/Module/Settings/Channels.php:199
msgid "" msgid ""
"When you want to access this channel via an access key, you can define it " "When you want to access this channel via an access key, you can define it "
"here. Pay attention to not use an already used one." "here. Pay attention to not use an already used one."
msgstr "" msgstr ""
#: src/Module/Settings/Channels.php:199 #: src/Module/Settings/Channels.php:200
msgid "Select a circle or channel, that your channel should be based on." msgid "Select a circle or channel, that your channel should be based on."
msgstr "" msgstr ""
#: src/Module/Settings/Channels.php:200 #: src/Module/Settings/Channels.php:201
msgid "" msgid ""
"Comma separated list of tags. A post will be used when it contains any of " "Comma separated list of tags. A post will be used when it contains any of "
"the listed tags." "the listed tags."
msgstr "" msgstr ""
#: src/Module/Settings/Channels.php:201 #: src/Module/Settings/Channels.php:202
msgid "" msgid ""
"Comma separated list of tags. If a post contain any of these tags, then it " "Comma separated list of tags. If a post contain any of these tags, then it "
"will not be part of nthis channel." "will not be part of nthis channel."
msgstr "" msgstr ""
#: src/Module/Settings/Channels.php:202 #: src/Module/Settings/Channels.php:203
#, php-format #, php-format
msgid "" msgid ""
"Search terms for the body, supports the \"boolean mode\" operators from " "Search terms for the body, supports the \"boolean mode\" operators from "
@ -10243,35 +10247,35 @@ msgid ""
"keywords: %s" "keywords: %s"
msgstr "" msgstr ""
#: src/Module/Settings/Channels.php:203 #: src/Module/Settings/Channels.php:204
msgid "Check to display images in the channel." msgid "Check to display images in the channel."
msgstr "" msgstr ""
#: src/Module/Settings/Channels.php:204 #: src/Module/Settings/Channels.php:205
msgid "Check to display videos in the channel." msgid "Check to display videos in the channel."
msgstr "" msgstr ""
#: src/Module/Settings/Channels.php:205 #: src/Module/Settings/Channels.php:206
msgid "Check to display audio in the channel." msgid "Check to display audio in the channel."
msgstr "" msgstr ""
#: src/Module/Settings/Channels.php:210 #: src/Module/Settings/Channels.php:211
msgid "Add new entry to the channel list" msgid "Add new entry to the channel list"
msgstr "" msgstr ""
#: src/Module/Settings/Channels.php:211 #: src/Module/Settings/Channels.php:212
msgid "Add" msgid "Add"
msgstr "" msgstr ""
#: src/Module/Settings/Channels.php:213 #: src/Module/Settings/Channels.php:214
msgid "Current Entries in the channel list" msgid "Current Entries in the channel list"
msgstr "" msgstr ""
#: src/Module/Settings/Channels.php:216 #: src/Module/Settings/Channels.php:217
msgid "Delete entry from the channel list" msgid "Delete entry from the channel list"
msgstr "" msgstr ""
#: src/Module/Settings/Channels.php:217 #: src/Module/Settings/Channels.php:218
msgid "Delete entry from the channel list?" msgid "Delete entry from the channel list?"
msgstr "" msgstr ""