Code standards + messages.po

diff --git a/src/Content/Conversation/Factory/Timeline.php b/src/Content/Conversation/Factory/Timeline.php
index 160e55d1cb9f91a83d9cf1a03e9d13d9cf40bfd6..817f6171316aea295b423dc464c36482531c19cd 100644 (file)
--- a/src/Content/Conversation/Factory/Timeline.php
+++ b/src/Content/Conversation/Factory/Timeline.php
@@ -77,6 +77,7 @@ final class Timeline extends \Friendica\BaseFactory
        public function getCommunities(bool $authenticated): Timelines
        {
                $page_style = $this->config->get('system', 'community_page_style');
+
                $tabs = [];
 
                if (($authenticated || in_array($page_style, [Community::LOCAL_AND_GLOBAL, Community::LOCAL])) && empty($this->config->get('system', 'singleuser'))) {

diff --git a/src/Module/Conversation/Timeline.php b/src/Module/Conversation/Timeline.php
index 8faa1c48a061102519c221eff4bdbf1d673299e9..49fcc062338c3c7ceaab356e52bb6dc08cc1e69d 100644 (file)
--- a/src/Module/Conversation/Timeline.php
+++ b/src/Module/Conversation/Timeline.php
@@ -137,7 +137,7 @@ class Timeline extends BaseModule
                        $query_parameters['max_id'] = self::$max_id;
                }
 
-               $path_all = $path . (!empty($query_parameters) ? '?' . http_build_query($query_parameters) : '');
+               $path_all       = $path . (!empty($query_parameters) ? '?' . http_build_query($query_parameters) : '');
                $path_no_sharer = $path . '?' . http_build_query(array_merge($query_parameters, ['no_sharer' => true]));
                return Renderer::replaceMacros(Renderer::getMarkupTemplate('widget/community_sharer.tpl'), [
                        '$title'           => $this->l10n->t('Own Contacts'),
@@ -185,6 +185,7 @@ class Timeline extends BaseModule
                        }
                } elseif (self::$selectedTab == TimelineEntity::FORYOU) {
                        $cid = Contact::getPublicIdByUserId($uid);
+
                        $condition = [
                                "(`owner-id` IN (SELECT `cid` FROM `contact-relation` WHERE `relation-cid` = ? AND `relation-thread-score` > ?) OR
                                ((`comments` >= ? OR `activities` >= ?) AND `owner-id` IN (SELECT `cid` FROM `contact-relation` WHERE `follows` AND `relation-cid` = ?)) OR
@@ -368,9 +369,9 @@ class Timeline extends BaseModule
 
                $maxpostperauthor = (int) $this->config->get('system', 'max_author_posts_community_page');
                if ($maxpostperauthor != 0 && self::$selectedTab == 'local') {
-                       $count = 1;
+                       $count          = 1;
                        $previousauthor = '';
-                       $numposts = 0;
+                       $numposts       = 0;
                        $selected_items = [];
 
                        while (count($selected_items) < self::$itemsPerPage && ++$count < 50 && count($items) > 0) {

diff --git a/view/lang/C/messages.po b/view/lang/C/messages.po
index 247a025e877f77e2760f9f69bfbec28d6886ad59..8dbb355954cda67b837b6b52a487620c362712c7 100644 (file)
--- a/view/lang/C/messages.po
+++ b/view/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 2023.09-dev\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-09-07 17:41+0000\n"
+"POT-Creation-Date: 2023-09-09 09:30+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -292,7 +292,7 @@ msgid "Insert web link"
 msgstr ""
 
 #: mod/message.php:201 mod/message.php:357 mod/photos.php:1301
-#: src/Content/Conversation.php:399 src/Content/Conversation.php:1546
+#: src/Content/Conversation.php:399 src/Content/Conversation.php:1548
 #: src/Module/Item/Compose.php:206 src/Module/Post/Edit.php:145
 #: src/Module/Profile/UnkMail.php:154 src/Object/Post.php:578
 msgid "Please wait"
@@ -449,7 +449,7 @@ msgstr ""
 msgid "%1$s was tagged in %2$s by %3$s"
 msgstr ""
 
-#: mod/photos.php:582 src/Module/Conversation/Community.php:189
+#: mod/photos.php:582 src/Module/Conversation/Community.php:160
 #: src/Module/Directory.php:48 src/Module/Profile/Photos.php:295
 #: src/Module/Search/Index.php:65
 msgid "Public access denied."
@@ -622,12 +622,12 @@ msgstr ""
 msgid "Loading..."
 msgstr ""
 
-#: mod/photos.php:1236 src/Content/Conversation.php:1461
+#: mod/photos.php:1236 src/Content/Conversation.php:1463
 #: src/Object/Post.php:260
 msgid "Select"
 msgstr ""
 
-#: mod/photos.php:1237 src/Content/Conversation.php:1462
+#: mod/photos.php:1237 src/Content/Conversation.php:1464
 #: src/Module/Moderation/Users/Active.php:136
 #: src/Module/Moderation/Users/Blocked.php:136
 #: src/Module/Moderation/Users/Index.php:151
@@ -792,7 +792,7 @@ msgstr ""
 msgid "All contacts"
 msgstr ""
 
-#: src/BaseModule.php:433 src/Content/Conversation/Factory/Channel.php:56
+#: src/BaseModule.php:433 src/Content/Conversation/Factory/Timeline.php:62
 #: src/Content/Widget.php:239 src/Core/ACL.php:195 src/Module/Contact.php:415
 #: src/Module/PermissionTooltip.php:127 src/Module/PermissionTooltip.php:149
 msgid "Followers"
@@ -956,7 +956,7 @@ msgstr ""
 msgid "Enter user nickname: "
 msgstr ""
 
-#: src/Console/User.php:182 src/Model/User.php:712
+#: src/Console/User.php:182 src/Model/User.php:711
 #: src/Module/Api/Twitter/ContactEndpoint.php:74
 #: src/Module/Moderation/Users/Active.php:71
 #: src/Module/Moderation/Users/Blocked.php:71
@@ -1391,184 +1391,241 @@ msgstr ""
 msgid "Open Compose page"
 msgstr ""
 
-#: src/Content/Conversation.php:593
+#: src/Content/Conversation.php:594
 msgid "remove"
 msgstr ""
 
-#: src/Content/Conversation.php:597
+#: src/Content/Conversation.php:598
 msgid "Delete Selected Items"
 msgstr ""
 
-#: src/Content/Conversation.php:752 src/Content/Conversation.php:755
-#: src/Content/Conversation.php:758 src/Content/Conversation.php:761
-#: src/Content/Conversation.php:764
+#: src/Content/Conversation.php:753 src/Content/Conversation.php:756
+#: src/Content/Conversation.php:759 src/Content/Conversation.php:762
+#: src/Content/Conversation.php:765
 #, php-format
 msgid "You had been addressed (%s)."
 msgstr ""
 
-#: src/Content/Conversation.php:767
+#: src/Content/Conversation.php:768
 #, php-format
 msgid "You are following %s."
 msgstr ""
 
-#: src/Content/Conversation.php:772
+#: src/Content/Conversation.php:773
 #, php-format
 msgid "You subscribed to %s."
 msgstr ""
 
-#: src/Content/Conversation.php:774
+#: src/Content/Conversation.php:775
 msgid "You subscribed to one or more tags in this post."
 msgstr ""
 
-#: src/Content/Conversation.php:794
+#: src/Content/Conversation.php:795
 #, php-format
 msgid "%s reshared this."
 msgstr ""
 
-#: src/Content/Conversation.php:796
+#: src/Content/Conversation.php:797
 msgid "Reshared"
 msgstr ""
 
-#: src/Content/Conversation.php:796
+#: src/Content/Conversation.php:797
 #, php-format
 msgid "Reshared by %s <%s>"
 msgstr ""
 
-#: src/Content/Conversation.php:799
+#: src/Content/Conversation.php:800
 #, php-format
 msgid "%s is participating in this thread."
 msgstr ""
 
-#: src/Content/Conversation.php:802
+#: src/Content/Conversation.php:803
 msgid "Stored for general reasons"
 msgstr ""
 
-#: src/Content/Conversation.php:805
+#: src/Content/Conversation.php:806
 msgid "Global post"
 msgstr ""
 
-#: src/Content/Conversation.php:808
+#: src/Content/Conversation.php:809
 msgid "Sent via an relay server"
 msgstr ""
 
-#: src/Content/Conversation.php:808
+#: src/Content/Conversation.php:809
 #, php-format
 msgid "Sent via the relay server %s <%s>"
 msgstr ""
 
-#: src/Content/Conversation.php:811
+#: src/Content/Conversation.php:812
 msgid "Fetched"
 msgstr ""
 
-#: src/Content/Conversation.php:811
+#: src/Content/Conversation.php:812
 #, php-format
 msgid "Fetched because of %s <%s>"
 msgstr ""
 
-#: src/Content/Conversation.php:814
+#: src/Content/Conversation.php:815
 msgid "Stored because of a child post to complete this thread."
 msgstr ""
 
-#: src/Content/Conversation.php:817
+#: src/Content/Conversation.php:818
 msgid "Local delivery"
 msgstr ""
 
-#: src/Content/Conversation.php:820
+#: src/Content/Conversation.php:821
 msgid "Stored because of your activity (like, comment, star, ...)"
 msgstr ""
 
-#: src/Content/Conversation.php:823
+#: src/Content/Conversation.php:824
 msgid "Distributed"
 msgstr ""
 
-#: src/Content/Conversation.php:826
+#: src/Content/Conversation.php:827
 msgid "Pushed to us"
 msgstr ""
 
-#: src/Content/Conversation.php:1489 src/Object/Post.php:247
+#: src/Content/Conversation.php:1491 src/Object/Post.php:247
 msgid "Pinned item"
 msgstr ""
 
-#: src/Content/Conversation.php:1506 src/Object/Post.php:521
+#: src/Content/Conversation.php:1508 src/Object/Post.php:521
 #: src/Object/Post.php:522
 #, php-format
 msgid "View %s's profile @ %s"
 msgstr ""
 
-#: src/Content/Conversation.php:1519 src/Object/Post.php:509
+#: src/Content/Conversation.php:1521 src/Object/Post.php:509
 msgid "Categories:"
 msgstr ""
 
-#: src/Content/Conversation.php:1520 src/Object/Post.php:510
+#: src/Content/Conversation.php:1522 src/Object/Post.php:510
 msgid "Filed under:"
 msgstr ""
 
-#: src/Content/Conversation.php:1528 src/Object/Post.php:535
+#: src/Content/Conversation.php:1530 src/Object/Post.php:535
 #, php-format
 msgid "%s from %s"
 msgstr ""
 
-#: src/Content/Conversation.php:1544
+#: src/Content/Conversation.php:1546
 msgid "View in context"
 msgstr ""
 
-#: src/Content/Conversation/Factory/Channel.php:53
+#: src/Content/Conversation/Factory/Timeline.php:59
 msgid "For you"
 msgstr ""
 
-#: src/Content/Conversation/Factory/Channel.php:53
+#: src/Content/Conversation/Factory/Timeline.php:59
 msgid "Posts from contacts you interact with and who interact with you"
 msgstr ""
 
-#: src/Content/Conversation/Factory/Channel.php:54
+#: src/Content/Conversation/Factory/Timeline.php:60
 msgid "What's Hot"
 msgstr ""
 
-#: src/Content/Conversation/Factory/Channel.php:54
+#: src/Content/Conversation/Factory/Timeline.php:60
 msgid "Posts with a lot of interactions"
 msgstr ""
 
-#: src/Content/Conversation/Factory/Channel.php:55
+#: src/Content/Conversation/Factory/Timeline.php:61
 #, php-format
 msgid "Posts in %s"
 msgstr ""
 
-#: src/Content/Conversation/Factory/Channel.php:56
+#: src/Content/Conversation/Factory/Timeline.php:62
 msgid "Posts from your followers that you don't follow"
 msgstr ""
 
-#: src/Content/Conversation/Factory/Channel.php:57
+#: src/Content/Conversation/Factory/Timeline.php:63
 msgid "Sharers of sharers"
 msgstr ""
 
-#: src/Content/Conversation/Factory/Channel.php:57
+#: src/Content/Conversation/Factory/Timeline.php:63
 msgid "Posts from accounts that are followed by accounts that you follow"
 msgstr ""
 
-#: src/Content/Conversation/Factory/Channel.php:58
+#: src/Content/Conversation/Factory/Timeline.php:64
 msgid "Images"
 msgstr ""
 
-#: src/Content/Conversation/Factory/Channel.php:58
+#: src/Content/Conversation/Factory/Timeline.php:64
 msgid "Posts with images"
 msgstr ""
 
-#: src/Content/Conversation/Factory/Channel.php:59
+#: src/Content/Conversation/Factory/Timeline.php:65
 msgid "Audio"
 msgstr ""
 
-#: src/Content/Conversation/Factory/Channel.php:59
+#: src/Content/Conversation/Factory/Timeline.php:65
 msgid "Posts with audio"
 msgstr ""
 
-#: src/Content/Conversation/Factory/Channel.php:60
+#: src/Content/Conversation/Factory/Timeline.php:66
 msgid "Videos"
 msgstr ""
 
-#: src/Content/Conversation/Factory/Channel.php:60
+#: src/Content/Conversation/Factory/Timeline.php:66
 msgid "Posts with videos"
 msgstr ""
 
+#: src/Content/Conversation/Factory/Timeline.php:83
+msgid "Local Community"
+msgstr ""
+
+#: src/Content/Conversation/Factory/Timeline.php:83
+msgid "Posts from local users on this server"
+msgstr ""
+
+#: src/Content/Conversation/Factory/Timeline.php:87
+msgid "Global Community"
+msgstr ""
+
+#: src/Content/Conversation/Factory/Timeline.php:87
+msgid "Posts from users of the whole federated network"
+msgstr ""
+
+#: src/Content/Conversation/Factory/Timeline.php:101
+msgid "Latest Activity"
+msgstr ""
+
+#: src/Content/Conversation/Factory/Timeline.php:101
+msgid "Sort by latest activity"
+msgstr ""
+
+#: src/Content/Conversation/Factory/Timeline.php:102
+msgid "Latest Posts"
+msgstr ""
+
+#: src/Content/Conversation/Factory/Timeline.php:102
+msgid "Sort by post received date"
+msgstr ""
+
+#: src/Content/Conversation/Factory/Timeline.php:103
+msgid "Latest Creation"
+msgstr ""
+
+#: src/Content/Conversation/Factory/Timeline.php:103
+msgid "Sort by post creation date"
+msgstr ""
+
+#: src/Content/Conversation/Factory/Timeline.php:104
+#: src/Module/Settings/Profile/Index.php:260
+msgid "Personal"
+msgstr ""
+
+#: src/Content/Conversation/Factory/Timeline.php:104
+msgid "Posts that mention or involve you"
+msgstr ""
+
+#: src/Content/Conversation/Factory/Timeline.php:105 src/Object/Post.php:380
+msgid "Starred"
+msgstr ""
+
+#: src/Content/Conversation/Factory/Timeline.php:105
+msgid "Favourite Posts"
+msgstr ""
+
 #: src/Content/Feature.php:96
 msgid "General Features"
 msgstr ""
@@ -1683,7 +1740,7 @@ msgstr ""
 
 #: src/Content/GroupManager.php:152 src/Content/Nav.php:278
 #: src/Content/Text/HTML.php:880 src/Content/Widget.php:537
-#: src/Model/User.php:1274
+#: src/Model/User.php:1273
 msgid "Groups"
 msgstr ""
 
@@ -1948,19 +2005,19 @@ msgstr ""
 msgid "Contacts"
 msgstr ""
 
-#: src/Content/Nav.php:289
+#: src/Content/Nav.php:290
 msgid "Community"
 msgstr ""
 
-#: src/Content/Nav.php:289
+#: src/Content/Nav.php:290
 msgid "Conversations on this and other servers"
 msgstr ""
 
-#: src/Content/Nav.php:292 src/Module/Settings/Display.php:257
+#: src/Content/Nav.php:294 src/Module/Settings/Display.php:257
 msgid "Channels"
 msgstr ""
 
-#: src/Content/Nav.php:292
+#: src/Content/Nav.php:294
 msgid "Current posts, filtered by several rules"
 msgstr ""
 
@@ -3547,145 +3604,145 @@ msgstr ""
 msgid "Contact information and Social Networks"
 msgstr ""
 
-#: src/Model/User.php:227 src/Model/User.php:1187
+#: src/Model/User.php:227 src/Model/User.php:1186
 msgid "SERIOUS ERROR: Generation of security keys failed."
 msgstr ""
 
-#: src/Model/User.php:621 src/Model/User.php:654
+#: src/Model/User.php:620 src/Model/User.php:653
 msgid "Login failed"
 msgstr ""
 
-#: src/Model/User.php:686
+#: src/Model/User.php:685
 msgid "Not enough information to authenticate"
 msgstr ""
 
-#: src/Model/User.php:807
+#: src/Model/User.php:806
 msgid "Password can't be empty"
 msgstr ""
 
-#: src/Model/User.php:849
+#: src/Model/User.php:848
 msgid "Empty passwords are not allowed."
 msgstr ""
 
-#: src/Model/User.php:853
+#: src/Model/User.php:852
 msgid ""
 "The new password has been exposed in a public data dump, please choose "
 "another."
 msgstr ""
 
-#: src/Model/User.php:857
+#: src/Model/User.php:856
 msgid "The password length is limited to 72 characters."
 msgstr ""
 
-#: src/Model/User.php:861
+#: src/Model/User.php:860
 msgid "The password can't contain white spaces nor accentuated letters"
 msgstr ""
 
-#: src/Model/User.php:1070
+#: src/Model/User.php:1069
 msgid "Passwords do not match. Password unchanged."
 msgstr ""
 
-#: src/Model/User.php:1077
+#: src/Model/User.php:1076
 msgid "An invitation is required."
 msgstr ""
 
-#: src/Model/User.php:1081
+#: src/Model/User.php:1080
 msgid "Invitation could not be verified."
 msgstr ""
 
-#: src/Model/User.php:1089
+#: src/Model/User.php:1088
 msgid "Invalid OpenID url"
 msgstr ""
 
-#: src/Model/User.php:1102 src/Security/Authentication.php:241
+#: src/Model/User.php:1101 src/Security/Authentication.php:241
 msgid ""
 "We encountered a problem while logging in with the OpenID you provided. "
 "Please check the correct spelling of the ID."
 msgstr ""
 
-#: src/Model/User.php:1102 src/Security/Authentication.php:241
+#: src/Model/User.php:1101 src/Security/Authentication.php:241
 msgid "The error message was:"
 msgstr ""
 
-#: src/Model/User.php:1108
+#: src/Model/User.php:1107
 msgid "Please enter the required information."
 msgstr ""
 
-#: src/Model/User.php:1122
+#: src/Model/User.php:1121
 #, php-format
 msgid ""
 "system.username_min_length (%s) and system.username_max_length (%s) are "
 "excluding each other, swapping values."
 msgstr ""
 
-#: src/Model/User.php:1129
+#: src/Model/User.php:1128
 #, php-format
 msgid "Username should be at least %s character."
 msgid_plural "Username should be at least %s characters."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/Model/User.php:1133
+#: src/Model/User.php:1132
 #, php-format
 msgid "Username should be at most %s character."
 msgid_plural "Username should be at most %s characters."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/Model/User.php:1141
+#: src/Model/User.php:1140
 msgid "That doesn't appear to be your full (First Last) name."
 msgstr ""
 
-#: src/Model/User.php:1146
+#: src/Model/User.php:1145
 msgid "Your email domain is not among those allowed on this site."
 msgstr ""
 
-#: src/Model/User.php:1150
+#: src/Model/User.php:1149
 msgid "Not a valid email address."
 msgstr ""
 
-#: src/Model/User.php:1153
+#: src/Model/User.php:1152
 msgid "The nickname was blocked from registration by the nodes admin."
 msgstr ""
 
-#: src/Model/User.php:1157 src/Model/User.php:1163
+#: src/Model/User.php:1156 src/Model/User.php:1162
 msgid "Cannot use that email."
 msgstr ""
 
-#: src/Model/User.php:1169
+#: src/Model/User.php:1168
 msgid "Your nickname can only contain a-z, 0-9 and _."
 msgstr ""
 
-#: src/Model/User.php:1177 src/Model/User.php:1234
+#: src/Model/User.php:1176 src/Model/User.php:1233
 msgid "Nickname is already registered. Please choose another."
 msgstr ""
 
-#: src/Model/User.php:1221 src/Model/User.php:1225
+#: src/Model/User.php:1220 src/Model/User.php:1224
 msgid "An error occurred during registration. Please try again."
 msgstr ""
 
-#: src/Model/User.php:1248
+#: src/Model/User.php:1247
 msgid "An error occurred creating your default profile. Please try again."
 msgstr ""
 
-#: src/Model/User.php:1255
+#: src/Model/User.php:1254
 msgid "An error occurred creating your self contact. Please try again."
 msgstr ""
 
-#: src/Model/User.php:1260
+#: src/Model/User.php:1259
 msgid "Friends"
 msgstr ""
 
-#: src/Model/User.php:1264
+#: src/Model/User.php:1263
 msgid ""
 "An error occurred creating your default contact circle. Please try again."
 msgstr ""
 
-#: src/Model/User.php:1308
+#: src/Model/User.php:1307
 msgid "Profile Photos"
 msgstr ""
 
-#: src/Model/User.php:1488
+#: src/Model/User.php:1487
 #, php-format
 msgid ""
 "\n"
@@ -3693,7 +3750,7 @@ msgid ""
 "\t\t\tthe administrator of %2$s has set up an account for you."
 msgstr ""
 
-#: src/Model/User.php:1491
+#: src/Model/User.php:1490
 #, php-format
 msgid ""
 "\n"
@@ -3731,12 +3788,12 @@ msgid ""
 "\t\tThank you and welcome to %4$s."
 msgstr ""
 
-#: src/Model/User.php:1524 src/Model/User.php:1631
+#: src/Model/User.php:1523 src/Model/User.php:1630
 #, php-format
 msgid "Registration details for %s"
 msgstr ""
 
-#: src/Model/User.php:1544
+#: src/Model/User.php:1543
 #, php-format
 msgid ""
 "\n"
@@ -3752,12 +3809,12 @@ msgid ""
 "\t\t"
 msgstr ""
 
-#: src/Model/User.php:1563
+#: src/Model/User.php:1562
 #, php-format
 msgid "Registration at %s"
 msgstr ""
 
-#: src/Model/User.php:1587
+#: src/Model/User.php:1586
 #, php-format
 msgid ""
 "\n"
@@ -3766,7 +3823,7 @@ msgid ""
 "\t\t\t"
 msgstr ""
 
-#: src/Model/User.php:1595
+#: src/Model/User.php:1594
 #, php-format
 msgid ""
 "\n"
@@ -5878,7 +5935,7 @@ msgid "Contact not found."
 msgstr ""
 
 #: src/Module/Circle.php:102 src/Module/Contact/Contacts.php:66
-#: src/Module/Conversation/Network.php:189
+#: src/Module/Conversation/Network.php:238
 msgid "Invalid contact."
 msgstr ""
 
@@ -6189,7 +6246,7 @@ msgstr[0] ""
 msgstr[1] ""
 
 #: src/Module/Contact/Follow.php:70 src/Module/Contact/Redir.php:62
-#: src/Module/Contact/Redir.php:222 src/Module/Conversation/Community.php:195
+#: src/Module/Contact/Redir.php:222 src/Module/Conversation/Community.php:166
 #: src/Module/Debug/ItemBody.php:38 src/Module/Diaspora/Receive.php:57
 #: src/Module/Item/Display.php:96 src/Module/Item/Feed.php:59
 #: src/Module/Item/Follow.php:41 src/Module/Item/Ignore.php:41
@@ -6583,109 +6640,53 @@ msgstr ""
 msgid "Unable to unfollow this contact, please contact your administrator"
 msgstr ""
 
-#: src/Module/Conversation/Channel.php:165
-#: src/Module/Conversation/Community.php:134
-msgid "Own Contacts"
-msgstr ""
-
-#: src/Module/Conversation/Channel.php:169
-#: src/Module/Conversation/Community.php:138
-msgid "Include"
-msgstr ""
-
-#: src/Module/Conversation/Channel.php:170
-#: src/Module/Conversation/Community.php:139
-msgid "Hide"
-msgstr ""
-
-#: src/Module/Conversation/Channel.php:186
-#: src/Module/Conversation/Community.php:157 src/Module/Search/Index.php:152
+#: src/Module/Conversation/Channel.php:122
+#: src/Module/Conversation/Community.php:126 src/Module/Search/Index.php:152
 #: src/Module/Search/Index.php:194
 msgid "No results."
 msgstr ""
 
-#: src/Module/Conversation/Channel.php:226
+#: src/Module/Conversation/Channel.php:160
 msgid "Channel not available."
 msgstr ""
 
-#: src/Module/Conversation/Community.php:74
+#: src/Module/Conversation/Community.php:92
 msgid ""
 "This community stream shows all public posts received by this node. They may "
 "not reflect the opinions of this node’s users."
 msgstr ""
 
-#: src/Module/Conversation/Community.php:87
-msgid "Local Community"
-msgstr ""
-
-#: src/Module/Conversation/Community.php:90
-msgid "Posts from local users on this server"
-msgstr ""
-
-#: src/Module/Conversation/Community.php:98
-msgid "Global Community"
-msgstr ""
-
-#: src/Module/Conversation/Community.php:101
-msgid "Posts from users of the whole federated network"
-msgstr ""
-
-#: src/Module/Conversation/Community.php:213
+#: src/Module/Conversation/Community.php:180
 msgid "Community option not available."
 msgstr ""
 
-#: src/Module/Conversation/Community.php:229
+#: src/Module/Conversation/Community.php:196
 msgid "Not available."
 msgstr ""
 
-#: src/Module/Conversation/Network.php:175
+#: src/Module/Conversation/Network.php:224
 msgid "No such circle"
 msgstr ""
 
-#: src/Module/Conversation/Network.php:179
+#: src/Module/Conversation/Network.php:228
 #, php-format
 msgid "Circle: %s"
 msgstr ""
 
-#: src/Module/Conversation/Network.php:257
-msgid "Latest Activity"
-msgstr ""
-
-#: src/Module/Conversation/Network.php:260
-msgid "Sort by latest activity"
+#: src/Module/Conversation/Network.php:322
+msgid "Network feed not available."
 msgstr ""
 
-#: src/Module/Conversation/Network.php:265
-msgid "Latest Posts"
-msgstr ""
-
-#: src/Module/Conversation/Network.php:268
-msgid "Sort by post received date"
-msgstr ""
-
-#: src/Module/Conversation/Network.php:273
-msgid "Latest Creation"
-msgstr ""
-
-#: src/Module/Conversation/Network.php:276
-msgid "Sort by post creation date"
-msgstr ""
-
-#: src/Module/Conversation/Network.php:281
-#: src/Module/Settings/Profile/Index.php:260
-msgid "Personal"
-msgstr ""
-
-#: src/Module/Conversation/Network.php:284
-msgid "Posts that mention or involve you"
+#: src/Module/Conversation/Timeline.php:143
+msgid "Own Contacts"
 msgstr ""
 
-#: src/Module/Conversation/Network.php:289 src/Object/Post.php:380
-msgid "Starred"
+#: src/Module/Conversation/Timeline.php:147
+msgid "Include"
 msgstr ""
 
-#: src/Module/Conversation/Network.php:292
-msgid "Favourite Posts"
+#: src/Module/Conversation/Timeline.php:148
+msgid "Hide"
 msgstr ""
 
 #: src/Module/Credits.php:44