Code standards + messages.po

This commit is contained in:
Michael 2023-09-09 09:30:55 +00:00
parent 013aee01f5
commit 9f027df909
3 changed files with 173 additions and 170 deletions

View file

@ -77,6 +77,7 @@ final class Timeline extends \Friendica\BaseFactory
public function getCommunities(bool $authenticated): Timelines public function getCommunities(bool $authenticated): Timelines
{ {
$page_style = $this->config->get('system', 'community_page_style'); $page_style = $this->config->get('system', 'community_page_style');
$tabs = []; $tabs = [];
if (($authenticated || in_array($page_style, [Community::LOCAL_AND_GLOBAL, Community::LOCAL])) && empty($this->config->get('system', 'singleuser'))) { if (($authenticated || in_array($page_style, [Community::LOCAL_AND_GLOBAL, Community::LOCAL])) && empty($this->config->get('system', 'singleuser'))) {

View file

@ -137,7 +137,7 @@ class Timeline extends BaseModule
$query_parameters['max_id'] = self::$max_id; $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])); $path_no_sharer = $path . '?' . http_build_query(array_merge($query_parameters, ['no_sharer' => true]));
return Renderer::replaceMacros(Renderer::getMarkupTemplate('widget/community_sharer.tpl'), [ return Renderer::replaceMacros(Renderer::getMarkupTemplate('widget/community_sharer.tpl'), [
'$title' => $this->l10n->t('Own Contacts'), '$title' => $this->l10n->t('Own Contacts'),
@ -185,6 +185,7 @@ class Timeline extends BaseModule
} }
} elseif (self::$selectedTab == TimelineEntity::FORYOU) { } elseif (self::$selectedTab == TimelineEntity::FORYOU) {
$cid = Contact::getPublicIdByUserId($uid); $cid = Contact::getPublicIdByUserId($uid);
$condition = [ $condition = [
"(`owner-id` IN (SELECT `cid` FROM `contact-relation` WHERE `relation-cid` = ? AND `relation-thread-score` > ?) OR "(`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 ((`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'); $maxpostperauthor = (int) $this->config->get('system', 'max_author_posts_community_page');
if ($maxpostperauthor != 0 && self::$selectedTab == 'local') { if ($maxpostperauthor != 0 && self::$selectedTab == 'local') {
$count = 1; $count = 1;
$previousauthor = ''; $previousauthor = '';
$numposts = 0; $numposts = 0;
$selected_items = []; $selected_items = [];
while (count($selected_items) < self::$itemsPerPage && ++$count < 50 && count($items) > 0) { while (count($selected_items) < self::$itemsPerPage && ++$count < 50 && count($items) > 0) {

View file

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: 2023.09-dev\n" "Project-Id-Version: 2023.09-dev\n"
"Report-Msgid-Bugs-To: \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" "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"
@ -292,7 +292,7 @@ msgid "Insert web link"
msgstr "" msgstr ""
#: mod/message.php:201 mod/message.php:357 mod/photos.php:1301 #: 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/Item/Compose.php:206 src/Module/Post/Edit.php:145
#: src/Module/Profile/UnkMail.php:154 src/Object/Post.php:578 #: src/Module/Profile/UnkMail.php:154 src/Object/Post.php:578
msgid "Please wait" msgid "Please wait"
@ -449,7 +449,7 @@ msgstr ""
msgid "%1$s was tagged in %2$s by %3$s" msgid "%1$s was tagged in %2$s by %3$s"
msgstr "" 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/Directory.php:48 src/Module/Profile/Photos.php:295
#: src/Module/Search/Index.php:65 #: src/Module/Search/Index.php:65
msgid "Public access denied." msgid "Public access denied."
@ -622,12 +622,12 @@ msgstr ""
msgid "Loading..." msgid "Loading..."
msgstr "" msgstr ""
#: mod/photos.php:1236 src/Content/Conversation.php:1461 #: mod/photos.php:1236 src/Content/Conversation.php:1463
#: src/Object/Post.php:260 #: src/Object/Post.php:260
msgid "Select" msgid "Select"
msgstr "" 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/Active.php:136
#: src/Module/Moderation/Users/Blocked.php:136 #: src/Module/Moderation/Users/Blocked.php:136
#: src/Module/Moderation/Users/Index.php:151 #: src/Module/Moderation/Users/Index.php:151
@ -792,7 +792,7 @@ msgstr ""
msgid "All contacts" msgid "All contacts"
msgstr "" 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/Content/Widget.php:239 src/Core/ACL.php:195 src/Module/Contact.php:415
#: src/Module/PermissionTooltip.php:127 src/Module/PermissionTooltip.php:149 #: src/Module/PermissionTooltip.php:127 src/Module/PermissionTooltip.php:149
msgid "Followers" msgid "Followers"
@ -956,7 +956,7 @@ msgstr ""
msgid "Enter user nickname: " msgid "Enter user nickname: "
msgstr "" 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/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
@ -1391,184 +1391,241 @@ msgstr ""
msgid "Open Compose page" msgid "Open Compose page"
msgstr "" msgstr ""
#: src/Content/Conversation.php:593 #: src/Content/Conversation.php:594
msgid "remove" msgid "remove"
msgstr "" msgstr ""
#: src/Content/Conversation.php:597 #: src/Content/Conversation.php:598
msgid "Delete Selected Items" msgid "Delete Selected Items"
msgstr "" msgstr ""
#: src/Content/Conversation.php:752 src/Content/Conversation.php:755 #: src/Content/Conversation.php:753 src/Content/Conversation.php:756
#: src/Content/Conversation.php:758 src/Content/Conversation.php:761 #: src/Content/Conversation.php:759 src/Content/Conversation.php:762
#: src/Content/Conversation.php:764 #: src/Content/Conversation.php:765
#, php-format #, php-format
msgid "You had been addressed (%s)." msgid "You had been addressed (%s)."
msgstr "" msgstr ""
#: src/Content/Conversation.php:767 #: src/Content/Conversation.php:768
#, php-format #, php-format
msgid "You are following %s." msgid "You are following %s."
msgstr "" msgstr ""
#: src/Content/Conversation.php:772 #: src/Content/Conversation.php:773
#, php-format #, php-format
msgid "You subscribed to %s." msgid "You subscribed to %s."
msgstr "" msgstr ""
#: src/Content/Conversation.php:774 #: src/Content/Conversation.php:775
msgid "You subscribed to one or more tags in this post." msgid "You subscribed to one or more tags in this post."
msgstr "" msgstr ""
#: src/Content/Conversation.php:794 #: src/Content/Conversation.php:795
#, php-format #, php-format
msgid "%s reshared this." msgid "%s reshared this."
msgstr "" msgstr ""
#: src/Content/Conversation.php:796 #: src/Content/Conversation.php:797
msgid "Reshared" msgid "Reshared"
msgstr "" msgstr ""
#: src/Content/Conversation.php:796 #: src/Content/Conversation.php:797
#, php-format #, php-format
msgid "Reshared by %s <%s>" msgid "Reshared by %s <%s>"
msgstr "" msgstr ""
#: src/Content/Conversation.php:799 #: src/Content/Conversation.php:800
#, php-format #, php-format
msgid "%s is participating in this thread." msgid "%s is participating in this thread."
msgstr "" msgstr ""
#: src/Content/Conversation.php:802 #: src/Content/Conversation.php:803
msgid "Stored for general reasons" msgid "Stored for general reasons"
msgstr "" msgstr ""
#: src/Content/Conversation.php:805 #: src/Content/Conversation.php:806
msgid "Global post" msgid "Global post"
msgstr "" msgstr ""
#: src/Content/Conversation.php:808 #: src/Content/Conversation.php:809
msgid "Sent via an relay server" msgid "Sent via an relay server"
msgstr "" msgstr ""
#: src/Content/Conversation.php:808 #: src/Content/Conversation.php:809
#, php-format #, php-format
msgid "Sent via the relay server %s <%s>" msgid "Sent via the relay server %s <%s>"
msgstr "" msgstr ""
#: src/Content/Conversation.php:811 #: src/Content/Conversation.php:812
msgid "Fetched" msgid "Fetched"
msgstr "" msgstr ""
#: src/Content/Conversation.php:811 #: src/Content/Conversation.php:812
#, php-format #, php-format
msgid "Fetched because of %s <%s>" msgid "Fetched because of %s <%s>"
msgstr "" msgstr ""
#: src/Content/Conversation.php:814 #: src/Content/Conversation.php:815
msgid "Stored because of a child post to complete this thread." msgid "Stored because of a child post to complete this thread."
msgstr "" msgstr ""
#: src/Content/Conversation.php:817 #: src/Content/Conversation.php:818
msgid "Local delivery" msgid "Local delivery"
msgstr "" msgstr ""
#: src/Content/Conversation.php:820 #: src/Content/Conversation.php:821
msgid "Stored because of your activity (like, comment, star, ...)" msgid "Stored because of your activity (like, comment, star, ...)"
msgstr "" msgstr ""
#: src/Content/Conversation.php:823 #: src/Content/Conversation.php:824
msgid "Distributed" msgid "Distributed"
msgstr "" msgstr ""
#: src/Content/Conversation.php:826 #: src/Content/Conversation.php:827
msgid "Pushed to us" msgid "Pushed to us"
msgstr "" msgstr ""
#: src/Content/Conversation.php:1489 src/Object/Post.php:247 #: src/Content/Conversation.php:1491 src/Object/Post.php:247
msgid "Pinned item" msgid "Pinned item"
msgstr "" 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 #: src/Object/Post.php:522
#, php-format #, php-format
msgid "View %s's profile @ %s" msgid "View %s's profile @ %s"
msgstr "" msgstr ""
#: src/Content/Conversation.php:1519 src/Object/Post.php:509 #: src/Content/Conversation.php:1521 src/Object/Post.php:509
msgid "Categories:" msgid "Categories:"
msgstr "" msgstr ""
#: src/Content/Conversation.php:1520 src/Object/Post.php:510 #: src/Content/Conversation.php:1522 src/Object/Post.php:510
msgid "Filed under:" msgid "Filed under:"
msgstr "" msgstr ""
#: src/Content/Conversation.php:1528 src/Object/Post.php:535 #: src/Content/Conversation.php:1530 src/Object/Post.php:535
#, php-format #, php-format
msgid "%s from %s" msgid "%s from %s"
msgstr "" msgstr ""
#: src/Content/Conversation.php:1544 #: src/Content/Conversation.php:1546
msgid "View in context" msgid "View in context"
msgstr "" msgstr ""
#: src/Content/Conversation/Factory/Channel.php:53 #: src/Content/Conversation/Factory/Timeline.php:59
msgid "For you" msgid "For you"
msgstr "" 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" msgid "Posts from contacts you interact with and who interact with you"
msgstr "" msgstr ""
#: src/Content/Conversation/Factory/Channel.php:54 #: src/Content/Conversation/Factory/Timeline.php:60
msgid "What's Hot" msgid "What's Hot"
msgstr "" msgstr ""
#: src/Content/Conversation/Factory/Channel.php:54 #: src/Content/Conversation/Factory/Timeline.php:60
msgid "Posts with a lot of interactions" msgid "Posts with a lot of interactions"
msgstr "" msgstr ""
#: src/Content/Conversation/Factory/Channel.php:55 #: src/Content/Conversation/Factory/Timeline.php:61
#, php-format #, php-format
msgid "Posts in %s" msgid "Posts in %s"
msgstr "" 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" msgid "Posts from your followers that you don't follow"
msgstr "" msgstr ""
#: src/Content/Conversation/Factory/Channel.php:57 #: src/Content/Conversation/Factory/Timeline.php:63
msgid "Sharers of sharers" msgid "Sharers of sharers"
msgstr "" 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" msgid "Posts from accounts that are followed by accounts that you follow"
msgstr "" msgstr ""
#: src/Content/Conversation/Factory/Channel.php:58 #: src/Content/Conversation/Factory/Timeline.php:64
msgid "Images" msgid "Images"
msgstr "" msgstr ""
#: src/Content/Conversation/Factory/Channel.php:58 #: src/Content/Conversation/Factory/Timeline.php:64
msgid "Posts with images" msgid "Posts with images"
msgstr "" msgstr ""
#: src/Content/Conversation/Factory/Channel.php:59 #: src/Content/Conversation/Factory/Timeline.php:65
msgid "Audio" msgid "Audio"
msgstr "" msgstr ""
#: src/Content/Conversation/Factory/Channel.php:59 #: src/Content/Conversation/Factory/Timeline.php:65
msgid "Posts with audio" msgid "Posts with audio"
msgstr "" msgstr ""
#: src/Content/Conversation/Factory/Channel.php:60 #: src/Content/Conversation/Factory/Timeline.php:66
msgid "Videos" msgid "Videos"
msgstr "" msgstr ""
#: src/Content/Conversation/Factory/Channel.php:60 #: src/Content/Conversation/Factory/Timeline.php:66
msgid "Posts with videos" msgid "Posts with videos"
msgstr "" 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 #: src/Content/Feature.php:96
msgid "General Features" msgid "General Features"
msgstr "" msgstr ""
@ -1683,7 +1740,7 @@ msgstr ""
#: src/Content/GroupManager.php:152 src/Content/Nav.php:278 #: src/Content/GroupManager.php:152 src/Content/Nav.php:278
#: src/Content/Text/HTML.php:880 src/Content/Widget.php:537 #: src/Content/Text/HTML.php:880 src/Content/Widget.php:537
#: src/Model/User.php:1274 #: src/Model/User.php:1273
msgid "Groups" msgid "Groups"
msgstr "" msgstr ""
@ -1948,19 +2005,19 @@ msgstr ""
msgid "Contacts" msgid "Contacts"
msgstr "" msgstr ""
#: src/Content/Nav.php:289 #: src/Content/Nav.php:290
msgid "Community" msgid "Community"
msgstr "" msgstr ""
#: src/Content/Nav.php:289 #: src/Content/Nav.php:290
msgid "Conversations on this and other servers" msgid "Conversations on this and other servers"
msgstr "" 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" msgid "Channels"
msgstr "" msgstr ""
#: src/Content/Nav.php:292 #: src/Content/Nav.php:294
msgid "Current posts, filtered by several rules" msgid "Current posts, filtered by several rules"
msgstr "" msgstr ""
@ -3547,145 +3604,145 @@ msgstr ""
msgid "Contact information and Social Networks" msgid "Contact information and Social Networks"
msgstr "" 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." msgid "SERIOUS ERROR: Generation of security keys failed."
msgstr "" msgstr ""
#: src/Model/User.php:621 src/Model/User.php:654 #: src/Model/User.php:620 src/Model/User.php:653
msgid "Login failed" msgid "Login failed"
msgstr "" msgstr ""
#: src/Model/User.php:686 #: src/Model/User.php:685
msgid "Not enough information to authenticate" msgid "Not enough information to authenticate"
msgstr "" msgstr ""
#: src/Model/User.php:807 #: src/Model/User.php:806
msgid "Password can't be empty" msgid "Password can't be empty"
msgstr "" msgstr ""
#: src/Model/User.php:849 #: src/Model/User.php:848
msgid "Empty passwords are not allowed." msgid "Empty passwords are not allowed."
msgstr "" msgstr ""
#: src/Model/User.php:853 #: src/Model/User.php:852
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:857 #: src/Model/User.php:856
msgid "The password length is limited to 72 characters." msgid "The password length is limited to 72 characters."
msgstr "" msgstr ""
#: src/Model/User.php:861 #: src/Model/User.php:860
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:1070 #: src/Model/User.php:1069
msgid "Passwords do not match. Password unchanged." msgid "Passwords do not match. Password unchanged."
msgstr "" msgstr ""
#: src/Model/User.php:1077 #: src/Model/User.php:1076
msgid "An invitation is required." msgid "An invitation is required."
msgstr "" msgstr ""
#: src/Model/User.php:1081 #: src/Model/User.php:1080
msgid "Invitation could not be verified." msgid "Invitation could not be verified."
msgstr "" msgstr ""
#: src/Model/User.php:1089 #: src/Model/User.php:1088
msgid "Invalid OpenID url" msgid "Invalid OpenID url"
msgstr "" msgstr ""
#: src/Model/User.php:1102 src/Security/Authentication.php:241 #: src/Model/User.php:1101 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:1102 src/Security/Authentication.php:241 #: src/Model/User.php:1101 src/Security/Authentication.php:241
msgid "The error message was:" msgid "The error message was:"
msgstr "" msgstr ""
#: src/Model/User.php:1108 #: src/Model/User.php:1107
msgid "Please enter the required information." msgid "Please enter the required information."
msgstr "" msgstr ""
#: src/Model/User.php:1122 #: src/Model/User.php:1121
#, 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:1129 #: src/Model/User.php:1128
#, 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:1133 #: src/Model/User.php:1132
#, 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:1141 #: src/Model/User.php:1140
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:1146 #: src/Model/User.php:1145
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:1150 #: src/Model/User.php:1149
msgid "Not a valid email address." msgid "Not a valid email address."
msgstr "" msgstr ""
#: src/Model/User.php:1153 #: src/Model/User.php:1152
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:1157 src/Model/User.php:1163 #: src/Model/User.php:1156 src/Model/User.php:1162
msgid "Cannot use that email." msgid "Cannot use that email."
msgstr "" msgstr ""
#: src/Model/User.php:1169 #: src/Model/User.php:1168
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:1177 src/Model/User.php:1234 #: src/Model/User.php:1176 src/Model/User.php:1233
msgid "Nickname is already registered. Please choose another." msgid "Nickname is already registered. Please choose another."
msgstr "" 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." msgid "An error occurred during registration. Please try again."
msgstr "" msgstr ""
#: src/Model/User.php:1248 #: src/Model/User.php:1247
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:1255 #: src/Model/User.php:1254
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:1260 #: src/Model/User.php:1259
msgid "Friends" msgid "Friends"
msgstr "" msgstr ""
#: src/Model/User.php:1264 #: src/Model/User.php:1263
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:1308 #: src/Model/User.php:1307
msgid "Profile Photos" msgid "Profile Photos"
msgstr "" msgstr ""
#: src/Model/User.php:1488 #: src/Model/User.php:1487
#, php-format #, php-format
msgid "" msgid ""
"\n" "\n"
@ -3693,7 +3750,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:1491 #: src/Model/User.php:1490
#, php-format #, php-format
msgid "" msgid ""
"\n" "\n"
@ -3731,12 +3788,12 @@ msgid ""
"\t\tThank you and welcome to %4$s." "\t\tThank you and welcome to %4$s."
msgstr "" msgstr ""
#: src/Model/User.php:1524 src/Model/User.php:1631 #: src/Model/User.php:1523 src/Model/User.php:1630
#, php-format #, php-format
msgid "Registration details for %s" msgid "Registration details for %s"
msgstr "" msgstr ""
#: src/Model/User.php:1544 #: src/Model/User.php:1543
#, php-format #, php-format
msgid "" msgid ""
"\n" "\n"
@ -3752,12 +3809,12 @@ msgid ""
"\t\t" "\t\t"
msgstr "" msgstr ""
#: src/Model/User.php:1563 #: src/Model/User.php:1562
#, php-format #, php-format
msgid "Registration at %s" msgid "Registration at %s"
msgstr "" msgstr ""
#: src/Model/User.php:1587 #: src/Model/User.php:1586
#, php-format #, php-format
msgid "" msgid ""
"\n" "\n"
@ -3766,7 +3823,7 @@ msgid ""
"\t\t\t" "\t\t\t"
msgstr "" msgstr ""
#: src/Model/User.php:1595 #: src/Model/User.php:1594
#, php-format #, php-format
msgid "" msgid ""
"\n" "\n"
@ -5878,7 +5935,7 @@ msgid "Contact not found."
msgstr "" msgstr ""
#: src/Module/Circle.php:102 src/Module/Contact/Contacts.php:66 #: 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." msgid "Invalid contact."
msgstr "" msgstr ""
@ -6189,7 +6246,7 @@ msgstr[0] ""
msgstr[1] "" msgstr[1] ""
#: src/Module/Contact/Follow.php:70 src/Module/Contact/Redir.php:62 #: 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/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/Display.php:96 src/Module/Item/Feed.php:59
#: src/Module/Item/Follow.php:41 src/Module/Item/Ignore.php:41 #: 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" msgid "Unable to unfollow this contact, please contact your administrator"
msgstr "" msgstr ""
#: src/Module/Conversation/Channel.php:165 #: src/Module/Conversation/Channel.php:122
#: src/Module/Conversation/Community.php:134 #: src/Module/Conversation/Community.php:126 src/Module/Search/Index.php:152
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/Search/Index.php:194 #: src/Module/Search/Index.php:194
msgid "No results." msgid "No results."
msgstr "" msgstr ""
#: src/Module/Conversation/Channel.php:226 #: src/Module/Conversation/Channel.php:160
msgid "Channel not available." msgid "Channel not available."
msgstr "" msgstr ""
#: src/Module/Conversation/Community.php:74 #: src/Module/Conversation/Community.php:92
msgid "" msgid ""
"This community stream shows all public posts received by this node. They may " "This community stream shows all public posts received by this node. They may "
"not reflect the opinions of this nodes users." "not reflect the opinions of this nodes users."
msgstr "" msgstr ""
#: src/Module/Conversation/Community.php:87 #: src/Module/Conversation/Community.php:180
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
msgid "Community option not available." msgid "Community option not available."
msgstr "" msgstr ""
#: src/Module/Conversation/Community.php:229 #: src/Module/Conversation/Community.php:196
msgid "Not available." msgid "Not available."
msgstr "" msgstr ""
#: src/Module/Conversation/Network.php:175 #: src/Module/Conversation/Network.php:224
msgid "No such circle" msgid "No such circle"
msgstr "" msgstr ""
#: src/Module/Conversation/Network.php:179 #: src/Module/Conversation/Network.php:228
#, php-format #, php-format
msgid "Circle: %s" msgid "Circle: %s"
msgstr "" msgstr ""
#: src/Module/Conversation/Network.php:257 #: src/Module/Conversation/Network.php:322
msgid "Latest Activity" msgid "Network feed not available."
msgstr "" msgstr ""
#: src/Module/Conversation/Network.php:260 #: src/Module/Conversation/Timeline.php:143
msgid "Sort by latest activity" msgid "Own Contacts"
msgstr "" msgstr ""
#: src/Module/Conversation/Network.php:265 #: src/Module/Conversation/Timeline.php:147
msgid "Latest Posts" msgid "Include"
msgstr "" msgstr ""
#: src/Module/Conversation/Network.php:268 #: src/Module/Conversation/Timeline.php:148
msgid "Sort by post received date" msgid "Hide"
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"
msgstr ""
#: src/Module/Conversation/Network.php:289 src/Object/Post.php:380
msgid "Starred"
msgstr ""
#: src/Module/Conversation/Network.php:292
msgid "Favourite Posts"
msgstr "" msgstr ""
#: src/Module/Credits.php:44 #: src/Module/Credits.php:44