tobias/friendica
1
0
Fork 0
Code Pull requests Activity

Dedicated circle name for groups

Browse source
This commit is contained in:
Michael 2023-06-25 20:37:11 +00:00
commit e562dbd59c
9 changed files with 274 additions and 234 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/Model/Circle.php
View file

@ -177,7 +177,7 @@ class Circle
public static function countUnseen() public static function countUnseen()
{ {
$stmt = DBA::p("SELECT `circle`.`id`, `circle`.`name`, $stmt = DBA::p("SELECT `circle`.`id`, `circle`.`name`,
(SELECT COUNT(*) FROM `post-user` (SELECT COUNT(*) FROM `post-user-view`
WHERE `uid` = ? WHERE `uid` = ?
AND `unseen` AND `unseen`
AND `contact-id` IN AND `contact-id` IN
@ -481,12 +481,13 @@ class Circle
* Returns a templated circle selection list * Returns a templated circle selection list
* *
* @param int $uid User id * @param int $uid User id
* @param int $gid An optional pre-selected circle * @param int $gid A pre-selected circle
* @param string $label An optional label of the list * @param string $id The id of the option group
* @param string $label The label of the option group
* @return string * @return string
* @throws \Exception * @throws \Exception
*/ */
public static function getSelectorHTML(int $uid, int $gid = 0, string $label = ''): string public static function getSelectorHTML(int $uid, int $gid, string $id, string $label): string
{ {
$display_circles = [ $display_circles = [
[ [
@ -508,11 +509,8 @@ class Circle
Logger::info('Got circles', $display_circles); Logger::info('Got circles', $display_circles);
if ($label == '') {
$label = DI::l10n()->t('Default privacy circle for new contacts');
}
$o = Renderer::replaceMacros(Renderer::getMarkupTemplate('circle_selection.tpl'), [ $o = Renderer::replaceMacros(Renderer::getMarkupTemplate('circle_selection.tpl'), [
'$id' => $id,
'$label' => $label, '$label' => $label,
'$circles' => $display_circles '$circles' => $display_circles
]); ]);

11
src/Model/Contact.php
View file

@ -3113,6 +3113,7 @@ class Contact
'network' => $ret['network'], 'network' => $ret['network'],
'baseurl' => $ret['baseurl'], 'baseurl' => $ret['baseurl'],
'gsid' => $ret['gsid'] ?? null, 'gsid' => $ret['gsid'] ?? null,
'contact-type' => $ret['account-type'] ?? self::TYPE_PERSON,
'protocol' => $protocol, 'protocol' => $protocol,
'pubkey' => $ret['pubkey'], 'pubkey' => $ret['pubkey'],
'rel' => $new_relation, 'rel' => $new_relation,
@ -3135,7 +3136,11 @@ class Contact
$contact_id = $contact['id']; $contact_id = $contact['id'];
$result['cid'] = $contact_id; $result['cid'] = $contact_id;
if ($contact['contact-type'] == self::TYPE_COMMUNITY) {
Circle::addMember(User::getDefaultGroupCircle($uid), $contact_id);
} else {
Circle::addMember(User::getDefaultCircle($uid), $contact_id); Circle::addMember(User::getDefaultCircle($uid), $contact_id);
}
// Update the avatar // Update the avatar
self::updateAvatar($contact_id, $ret['photo']); self::updateAvatar($contact_id, $ret['photo']);
@ -3265,7 +3270,7 @@ class Contact
Post\UserNotification::insertNotification($pub_contact['id'], Activity::FOLLOW, $importer['uid']); Post\UserNotification::insertNotification($pub_contact['id'], Activity::FOLLOW, $importer['uid']);
$contact_record = DBA::selectFirst('contact', ['id', 'network', 'name', 'url', 'photo'], ['id' => $contact_id]); $contact_record = DBA::selectFirst('contact', ['id', 'network', 'name', 'url', 'photo', 'contact-type'], ['id' => $contact_id]);
/// @TODO Encapsulate this into a function/method /// @TODO Encapsulate this into a function/method
$fields = ['uid', 'username', 'email', 'page-flags', 'notify-flags', 'language']; $fields = ['uid', 'username', 'email', 'page-flags', 'notify-flags', 'language'];
@ -3281,7 +3286,11 @@ class Contact
DI::intro()->save($intro); DI::intro()->save($intro);
} }
if ($contact_record['contact-type'] == self::TYPE_COMMUNITY) {
Circle::addMember(User::getDefaultGroupCircle($importer['uid']), $contact_record['id']);
} else {
Circle::addMember(User::getDefaultCircle($importer['uid']), $contact_record['id']); Circle::addMember(User::getDefaultCircle($importer['uid']), $contact_record['id']);
}
if (($user['notify-flags'] & Notification\Type::INTRO) && $user['page-flags'] == User::PAGE_FLAGS_NORMAL) { if (($user['notify-flags'] & Notification\Type::INTRO) && $user['page-flags'] == User::PAGE_FLAGS_NORMAL) {
DI::notify()->createFromArray([ DI::notify()->createFromArray([

25
src/Model/User.php
View file

@ -483,7 +483,7 @@ class User
} }
/** /**
* Returns the default circle for a given user and network * Returns the default circle for a given user
* *
* @param int $uid User id * @param int $uid User id
* *
@ -502,6 +502,24 @@ class User
return $default_circle; return $default_circle;
} }
/**
* Returns the default circle for groups for a given user
*
* @param int $uid User id
*
* @return int circle id
* @throws Exception
*/
public static function getDefaultGroupCircle(int $uid): int
{
$default_circle = DI::pConfig()->get($uid, 'system', 'default-group-gid');
if (empty($default_circle)) {
$default_circle = self::getDefaultCircle($uid);
}
return $default_circle;
}
/** /**
* Authenticate a user with a clear text password * Authenticate a user with a clear text password
* *
@ -1208,6 +1226,11 @@ class User
DBA::update('user', $fields, ['uid' => $uid]); DBA::update('user', $fields, ['uid' => $uid]);
$def_gid_groups = Circle::create($uid, DI::l10n()->t('Groups'));
if (!$def_gid_groups) {
DI::pConfig()->set($uid, 'system', 'default-group-gid', $def_gid_groups);
}
// if we have no OpenID photo try to look up an avatar // if we have no OpenID photo try to look up an avatar
if (!strlen($photo)) { if (!strlen($photo)) {
$photo = Network::lookupAvatarByEmail($email); $photo = Network::lookupAvatarByEmail($email);

4
src/Module/Conversation/Network.php
View file

@ -305,9 +305,9 @@ class Network extends BaseModule
protected function parseRequest(array $get) protected function parseRequest(array $get)
{ {
self::$circleId = $this->parameters['circle_id'] ?? 0; self::$circleId = (int)($this->parameters['circle_id'] ?? 0);
self::$groupContactId = $this->parameters['contact_id'] ?? 0; self::$groupContactId = (int)($this->parameters['contact_id'] ?? 0);
self::$selectedTab = self::getTimelineOrderBySession(DI::userSession(), DI::pConfig()); self::$selectedTab = self::getTimelineOrderBySession(DI::userSession(), DI::pConfig());

4
src/Module/Settings/Account.php
View file

@ -173,6 +173,7 @@ class Account extends BaseSettings
DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'system', 'unlisted', !empty($request['unlisted'])); DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'system', 'unlisted', !empty($request['unlisted']));
DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'system', 'accessible-photos', !empty($request['accessible-photos'])); DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'system', 'accessible-photos', !empty($request['accessible-photos']));
DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'system', 'default-group-gid', intval($request['circle-selection-group'] ?? $def_gid));
$fields = [ $fields = [
'allow_cid' => $str_contact_allow, 'allow_cid' => $str_contact_allow,
@ -592,7 +593,8 @@ class Account extends BaseSettings
'$blocktags' => ['blocktags', DI::l10n()->t('Allow friends to tag your posts?'), (intval($user['blocktags']) ? '0' : '1'), DI::l10n()->t('Your contacts can add additional tags to your posts.')], '$blocktags' => ['blocktags', DI::l10n()->t('Allow friends to tag your posts?'), (intval($user['blocktags']) ? '0' : '1'), DI::l10n()->t('Your contacts can add additional tags to your posts.')],
'$unkmail' => ['unkmail', DI::l10n()->t('Permit unknown people to send you private mail?'), $unkmail, DI::l10n()->t('Friendica network users may send you private messages even if they are not in your contact list.')], '$unkmail' => ['unkmail', DI::l10n()->t('Permit unknown people to send you private mail?'), $unkmail, DI::l10n()->t('Friendica network users may send you private messages even if they are not in your contact list.')],
'$cntunkmail' => ['cntunkmail', DI::l10n()->t('Maximum private messages per day from unknown people:'), $cntunkmail, DI::l10n()->t("(to prevent spam abuse)")], '$cntunkmail' => ['cntunkmail', DI::l10n()->t('Maximum private messages per day from unknown people:'), $cntunkmail, DI::l10n()->t("(to prevent spam abuse)")],
'$circle_select' => Circle::getSelectorHTML(DI::userSession()->getLocalUserId(), $user['def_gid']), '$circle_select' => Circle::getSelectorHTML(DI::userSession()->getLocalUserId(), $user['def_gid'], 'circle-selection', DI::l10n()->t('Default privacy circle for new contacts')),
'$circle_select_group' => Circle::getSelectorHTML(DI::userSession()->getLocalUserId(), DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'system', 'default-group-gid', $user['def_gid']), 'circle-selection-group', DI::l10n()->t('Default privacy circle for new group contacts')),
'$permissions' => DI::l10n()->t('Default Post Permissions'), '$permissions' => DI::l10n()->t('Default Post Permissions'),
'$aclselect' => ACL::getFullSelectorHTML(DI::page(), $a->getLoggedInUserId()), '$aclselect' => ACL::getFullSelectorHTML(DI::page(), $a->getLoggedInUserId()),

393
view/lang/C/messages.po
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-06-18 17:38+0000\n" "POT-Creation-Date: 2023-06-25 20:31+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"
@ -67,7 +67,7 @@ msgstr ""
#: src/Module/Profile/UnkMail.php:132 src/Module/Register.php:77 #: src/Module/Profile/UnkMail.php:132 src/Module/Register.php:77
#: src/Module/Register.php:90 src/Module/Register.php:206 #: src/Module/Register.php:90 src/Module/Register.php:206
#: src/Module/Register.php:245 src/Module/Search/Directory.php:37 #: src/Module/Register.php:245 src/Module/Search/Directory.php:37
#: src/Module/Settings/Account.php:50 src/Module/Settings/Account.php:407 #: src/Module/Settings/Account.php:50 src/Module/Settings/Account.php:408
#: src/Module/Settings/Delegation.php:41 src/Module/Settings/Delegation.php:71 #: src/Module/Settings/Delegation.php:41 src/Module/Settings/Delegation.php:71
#: src/Module/Settings/Display.php:69 src/Module/Settings/Display.php:151 #: src/Module/Settings/Display.php:69 src/Module/Settings/Display.php:151
#: src/Module/Settings/Profile/Photo/Crop.php:165 #: src/Module/Settings/Profile/Photo/Crop.php:165
@ -938,7 +938,7 @@ msgstr ""
msgid "Enter user nickname: " msgid "Enter user nickname: "
msgstr "" msgstr ""
#: src/Console/User.php:182 src/Model/User.php:663 #: src/Console/User.php:182 src/Model/User.php:681
#: 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
@ -1603,6 +1603,7 @@ msgstr ""
#: src/Content/GroupManager.php:152 src/Content/Nav.php:276 #: src/Content/GroupManager.php:152 src/Content/Nav.php:276
#: src/Content/Text/HTML.php:880 src/Content/Widget.php:541 #: src/Content/Text/HTML.php:880 src/Content/Widget.php:541
#: src/Model/User.php:1229
msgid "Groups" msgid "Groups"
msgstr "" msgstr ""
@ -1623,7 +1624,7 @@ msgstr ""
msgid "Create new group" msgid "Create new group"
msgstr "" msgstr ""
#: src/Content/Item.php:329 src/Model/Item.php:2986 #: src/Content/Item.php:329 src/Model/Item.php:2993
msgid "event" msgid "event"
msgstr "" msgstr ""
@ -1631,7 +1632,7 @@ msgstr ""
msgid "status" msgid "status"
msgstr "" msgstr ""
#: src/Content/Item.php:338 src/Model/Item.php:2988 #: src/Content/Item.php:338 src/Model/Item.php:2995
#: src/Module/Post/Tag/Add.php:123 #: src/Module/Post/Tag/Add.php:123
msgid "photo" msgid "photo"
msgstr "" msgstr ""
@ -2037,8 +2038,8 @@ msgid ""
"<a href=\"%1$s\" target=\"_blank\" rel=\"noopener noreferrer\">%2$s</a> %3$s" "<a href=\"%1$s\" target=\"_blank\" rel=\"noopener noreferrer\">%2$s</a> %3$s"
msgstr "" msgstr ""
#: src/Content/Text/BBCode.php:938 src/Model/Item.php:3718 #: src/Content/Text/BBCode.php:938 src/Model/Item.php:3725
#: src/Model/Item.php:3724 src/Model/Item.php:3725 #: src/Model/Item.php:3731 src/Model/Item.php:3732
msgid "Link to source" msgid "Link to source"
msgstr "" msgstr ""
@ -2141,7 +2142,7 @@ msgstr ""
msgid "Local Directory" msgid "Local Directory"
msgstr "" msgstr ""
#: src/Content/Widget.php:219 src/Model/Circle.php:596 #: src/Content/Widget.php:219 src/Model/Circle.php:594
#: src/Module/Contact.php:401 src/Module/Welcome.php:76 #: src/Module/Contact.php:401 src/Module/Welcome.php:76
msgid "Circles" msgid "Circles"
msgstr "" msgstr ""
@ -2210,7 +2211,7 @@ msgstr ""
msgid "News" msgid "News"
msgstr "" msgstr ""
#: src/Content/Widget.php:546 src/Module/Settings/Account.php:453 #: src/Content/Widget.php:546 src/Module/Settings/Account.php:454
msgid "Account Types" msgid "Account Types"
msgstr "" msgstr ""
@ -2998,40 +2999,36 @@ msgid ""
"not what you intended, please create another circle with a different name." "not what you intended, please create another circle with a different name."
msgstr "" msgstr ""
#: src/Model/Circle.php:512 #: src/Model/Circle.php:542
msgid "Default privacy circle for new contacts"
msgstr ""
#: src/Model/Circle.php:544
msgid "Everybody" msgid "Everybody"
msgstr "" msgstr ""
#: src/Model/Circle.php:563 #: src/Model/Circle.php:561
msgid "edit" msgid "edit"
msgstr "" msgstr ""
#: src/Model/Circle.php:595 #: src/Model/Circle.php:593
msgid "add" msgid "add"
msgstr "" msgstr ""
#: src/Model/Circle.php:600 #: src/Model/Circle.php:598
msgid "Edit circle" msgid "Edit circle"
msgstr "" msgstr ""
#: src/Model/Circle.php:601 src/Module/Circle.php:194 #: src/Model/Circle.php:599 src/Module/Circle.php:194
msgid "Contacts not in any circle" msgid "Contacts not in any circle"
msgstr "" msgstr ""
#: src/Model/Circle.php:603 #: src/Model/Circle.php:601
msgid "Create a new circle" msgid "Create a new circle"
msgstr "" msgstr ""
#: src/Model/Circle.php:604 src/Module/Circle.php:179 src/Module/Circle.php:202 #: src/Model/Circle.php:602 src/Module/Circle.php:179 src/Module/Circle.php:202
#: src/Module/Circle.php:277 #: src/Module/Circle.php:277
msgid "Circle Name: " msgid "Circle Name: "
msgstr "" msgstr ""
#: src/Model/Circle.php:605 #: src/Model/Circle.php:603
msgid "Edit circles" msgid "Edit circles"
msgstr "" msgstr ""
@ -3110,7 +3107,7 @@ msgid ""
"notifications from you." "notifications from you."
msgstr "" msgstr ""
#: src/Model/Contact.php:3131 #: src/Model/Contact.php:3132
msgid "Unable to retrieve contact information." msgid "Unable to retrieve contact information."
msgstr "" msgstr ""
@ -3215,81 +3212,81 @@ msgstr ""
msgid "Happy Birthday %s" msgid "Happy Birthday %s"
msgstr "" msgstr ""
#: src/Model/Item.php:2049 #: src/Model/Item.php:2056
#, php-format #, php-format
msgid "Detected languages in this post:\\n%s" msgid "Detected languages in this post:\\n%s"
msgstr "" msgstr ""
#: src/Model/Item.php:2990 #: src/Model/Item.php:2997
msgid "activity" msgid "activity"
msgstr "" msgstr ""
#: src/Model/Item.php:2992 #: src/Model/Item.php:2999
msgid "comment" msgid "comment"
msgstr "" msgstr ""
#: src/Model/Item.php:2995 src/Module/Post/Tag/Add.php:123 #: src/Model/Item.php:3002 src/Module/Post/Tag/Add.php:123
msgid "post" msgid "post"
msgstr "" msgstr ""
#: src/Model/Item.php:3165 #: src/Model/Item.php:3172
#, php-format #, php-format
msgid "%s is blocked" msgid "%s is blocked"
msgstr "" msgstr ""
#: src/Model/Item.php:3167 #: src/Model/Item.php:3174
#, php-format #, php-format
msgid "%s is ignored" msgid "%s is ignored"
msgstr "" msgstr ""
#: src/Model/Item.php:3169 #: src/Model/Item.php:3176
#, php-format #, php-format
msgid "Content from %s is collapsed" msgid "Content from %s is collapsed"
msgstr "" msgstr ""
#: src/Model/Item.php:3173 #: src/Model/Item.php:3180
#, php-format #, php-format
msgid "Content warning: %s" msgid "Content warning: %s"
msgstr "" msgstr ""
#: src/Model/Item.php:3625 #: src/Model/Item.php:3632
msgid "bytes" msgid "bytes"
msgstr "" msgstr ""
#: src/Model/Item.php:3656 #: src/Model/Item.php:3663
#, php-format #, php-format
msgid "%2$s (%3$d%%, %1$d vote)" msgid "%2$s (%3$d%%, %1$d vote)"
msgid_plural "%2$s (%3$d%%, %1$d votes)" msgid_plural "%2$s (%3$d%%, %1$d votes)"
msgstr[0] "" msgstr[0] ""
msgstr[1] "" msgstr[1] ""
#: src/Model/Item.php:3658 #: src/Model/Item.php:3665
#, php-format #, php-format
msgid "%2$s (%1$d vote)" msgid "%2$s (%1$d vote)"
msgid_plural "%2$s (%1$d votes)" msgid_plural "%2$s (%1$d votes)"
msgstr[0] "" msgstr[0] ""
msgstr[1] "" msgstr[1] ""
#: src/Model/Item.php:3663 #: src/Model/Item.php:3670
#, php-format #, php-format
msgid "%d voter. Poll end: %s" msgid "%d voter. Poll end: %s"
msgid_plural "%d voters. Poll end: %s" msgid_plural "%d voters. Poll end: %s"
msgstr[0] "" msgstr[0] ""
msgstr[1] "" msgstr[1] ""
#: src/Model/Item.php:3665 #: src/Model/Item.php:3672
#, php-format #, php-format
msgid "%d voter." msgid "%d voter."
msgid_plural "%d voters." msgid_plural "%d voters."
msgstr[0] "" msgstr[0] ""
msgstr[1] "" msgstr[1] ""
#: src/Model/Item.php:3667 #: src/Model/Item.php:3674
#, php-format #, php-format
msgid "Poll end: %s" msgid "Poll end: %s"
msgstr "" msgstr ""
#: src/Model/Item.php:3701 src/Model/Item.php:3702 #: src/Model/Item.php:3708 src/Model/Item.php:3709
msgid "View on separate page" msgid "View on separate page"
msgstr "" msgstr ""
@ -3446,145 +3443,145 @@ msgstr ""
msgid "Contact information and Social Networks" msgid "Contact information and Social Networks"
msgstr "" msgstr ""
#: src/Model/User.php:214 src/Model/User.php:1124 #: src/Model/User.php:214 src/Model/User.php:1142
msgid "SERIOUS ERROR: Generation of security keys failed." msgid "SERIOUS ERROR: Generation of security keys failed."
msgstr "" msgstr ""
#: src/Model/User.php:572 src/Model/User.php:605 #: src/Model/User.php:590 src/Model/User.php:623
msgid "Login failed" msgid "Login failed"
msgstr "" msgstr ""
#: src/Model/User.php:637 #: src/Model/User.php:655
msgid "Not enough information to authenticate" msgid "Not enough information to authenticate"
msgstr "" msgstr ""
#: src/Model/User.php:758 #: src/Model/User.php:776
msgid "Password can't be empty" msgid "Password can't be empty"
msgstr "" msgstr ""
#: src/Model/User.php:800 #: src/Model/User.php:818
msgid "Empty passwords are not allowed." msgid "Empty passwords are not allowed."
msgstr "" msgstr ""
#: src/Model/User.php:804 #: src/Model/User.php:822
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:808 #: src/Model/User.php:826
msgid "The password length is limited to 72 characters." msgid "The password length is limited to 72 characters."
msgstr "" msgstr ""
#: src/Model/User.php:812 #: src/Model/User.php:830
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:1007 #: src/Model/User.php:1025
msgid "Passwords do not match. Password unchanged." msgid "Passwords do not match. Password unchanged."
msgstr "" msgstr ""
#: src/Model/User.php:1014 #: src/Model/User.php:1032
msgid "An invitation is required." msgid "An invitation is required."
msgstr "" msgstr ""
#: src/Model/User.php:1018 #: src/Model/User.php:1036
msgid "Invitation could not be verified." msgid "Invitation could not be verified."
msgstr "" msgstr ""
#: src/Model/User.php:1026 #: src/Model/User.php:1044
msgid "Invalid OpenID url" msgid "Invalid OpenID url"
msgstr "" msgstr ""
#: src/Model/User.php:1039 src/Security/Authentication.php:241 #: src/Model/User.php:1057 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:1039 src/Security/Authentication.php:241 #: src/Model/User.php:1057 src/Security/Authentication.php:241
msgid "The error message was:" msgid "The error message was:"
msgstr "" msgstr ""
#: src/Model/User.php:1045 #: src/Model/User.php:1063
msgid "Please enter the required information." msgid "Please enter the required information."
msgstr "" msgstr ""
#: src/Model/User.php:1059 #: src/Model/User.php:1077
#, 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:1066 #: src/Model/User.php:1084
#, 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:1070 #: src/Model/User.php:1088
#, 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:1078 #: src/Model/User.php:1096
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:1083 #: src/Model/User.php:1101
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:1087 #: src/Model/User.php:1105
msgid "Not a valid email address." msgid "Not a valid email address."
msgstr "" msgstr ""
#: src/Model/User.php:1090 #: src/Model/User.php:1108
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:1094 src/Model/User.php:1100 #: src/Model/User.php:1112 src/Model/User.php:1118
msgid "Cannot use that email." msgid "Cannot use that email."
msgstr "" msgstr ""
#: src/Model/User.php:1106 #: src/Model/User.php:1124
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:1114 src/Model/User.php:1171 #: src/Model/User.php:1132 src/Model/User.php:1189
msgid "Nickname is already registered. Please choose another." msgid "Nickname is already registered. Please choose another."
msgstr "" msgstr ""
#: src/Model/User.php:1158 src/Model/User.php:1162 #: src/Model/User.php:1176 src/Model/User.php:1180
msgid "An error occurred during registration. Please try again." msgid "An error occurred during registration. Please try again."
msgstr "" msgstr ""
#: src/Model/User.php:1185 #: src/Model/User.php:1203
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:1192 #: src/Model/User.php:1210
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:1197 #: src/Model/User.php:1215
msgid "Friends" msgid "Friends"
msgstr "" msgstr ""
#: src/Model/User.php:1201 #: src/Model/User.php:1219
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:1240 #: src/Model/User.php:1263
msgid "Profile Photos" msgid "Profile Photos"
msgstr "" msgstr ""
#: src/Model/User.php:1435 #: src/Model/User.php:1458
#, php-format #, php-format
msgid "" msgid ""
"\n" "\n"
@ -3592,7 +3589,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:1438 #: src/Model/User.php:1461
#, php-format #, php-format
msgid "" msgid ""
"\n" "\n"
@ -3630,12 +3627,12 @@ msgid ""
"\t\tThank you and welcome to %4$s." "\t\tThank you and welcome to %4$s."
msgstr "" msgstr ""
#: src/Model/User.php:1471 src/Model/User.php:1578 #: src/Model/User.php:1494 src/Model/User.php:1601
#, php-format #, php-format
msgid "Registration details for %s" msgid "Registration details for %s"
msgstr "" msgstr ""
#: src/Model/User.php:1491 #: src/Model/User.php:1514
#, php-format #, php-format
msgid "" msgid ""
"\n" "\n"
@ -3651,12 +3648,12 @@ msgid ""
"\t\t" "\t\t"
msgstr "" msgstr ""
#: src/Model/User.php:1510 #: src/Model/User.php:1533
#, php-format #, php-format
msgid "Registration at %s" msgid "Registration at %s"
msgstr "" msgstr ""
#: src/Model/User.php:1534 #: src/Model/User.php:1557
#, php-format #, php-format
msgid "" msgid ""
"\n" "\n"
@ -3665,7 +3662,7 @@ msgid ""
"\t\t\t" "\t\t\t"
msgstr "" msgstr ""
#: src/Model/User.php:1542 #: src/Model/User.php:1565
#, php-format #, php-format
msgid "" msgid ""
"\n" "\n"
@ -3771,7 +3768,7 @@ msgstr ""
#: src/Module/Admin/Addons/Index.php:69 src/Module/Admin/Features.php:86 #: src/Module/Admin/Addons/Index.php:69 src/Module/Admin/Features.php:86
#: src/Module/Admin/Logs/Settings.php:87 src/Module/Admin/Site.php:401 #: src/Module/Admin/Logs/Settings.php:87 src/Module/Admin/Site.php:401
#: src/Module/Admin/Themes/Index.php:113 src/Module/Admin/Tos.php:86 #: src/Module/Admin/Themes/Index.php:113 src/Module/Admin/Tos.php:86
#: src/Module/Settings/Account.php:560 src/Module/Settings/Addons.php:78 #: src/Module/Settings/Account.php:561 src/Module/Settings/Addons.php:78
#: src/Module/Settings/Connectors.php:160 #: src/Module/Settings/Connectors.php:160
#: src/Module/Settings/Connectors.php:246 #: src/Module/Settings/Connectors.php:246
#: src/Module/Settings/Delegation.php:171 src/Module/Settings/Display.php:247 #: src/Module/Settings/Delegation.php:171 src/Module/Settings/Display.php:247
@ -7370,19 +7367,19 @@ msgstr ""
msgid "List of pending user deletions" msgid "List of pending user deletions"
msgstr "" msgstr ""
#: src/Module/Moderation/BaseUsers.php:119 src/Module/Settings/Account.php:491 #: src/Module/Moderation/BaseUsers.php:119 src/Module/Settings/Account.php:492
msgid "Normal Account Page" msgid "Normal Account Page"
msgstr "" msgstr ""
#: src/Module/Moderation/BaseUsers.php:120 src/Module/Settings/Account.php:498 #: src/Module/Moderation/BaseUsers.php:120 src/Module/Settings/Account.php:499
msgid "Soapbox Page" msgid "Soapbox Page"
msgstr "" msgstr ""
#: src/Module/Moderation/BaseUsers.php:121 src/Module/Settings/Account.php:505 #: src/Module/Moderation/BaseUsers.php:121 src/Module/Settings/Account.php:506
msgid "Public Group" msgid "Public Group"
msgstr "" msgstr ""
#: src/Module/Moderation/BaseUsers.php:122 src/Module/Settings/Account.php:512 #: src/Module/Moderation/BaseUsers.php:122 src/Module/Settings/Account.php:513
msgid "Automatic Friend Page" msgid "Automatic Friend Page"
msgstr "" msgstr ""
@ -7390,19 +7387,19 @@ msgstr ""
msgid "Private Group" msgid "Private Group"
msgstr "" msgstr ""
#: src/Module/Moderation/BaseUsers.php:126 src/Module/Settings/Account.php:463 #: src/Module/Moderation/BaseUsers.php:126 src/Module/Settings/Account.php:464
msgid "Personal Page" msgid "Personal Page"
msgstr "" msgstr ""
#: src/Module/Moderation/BaseUsers.php:127 src/Module/Settings/Account.php:470 #: src/Module/Moderation/BaseUsers.php:127 src/Module/Settings/Account.php:471
msgid "Organisation Page" msgid "Organisation Page"
msgstr "" msgstr ""
#: src/Module/Moderation/BaseUsers.php:128 src/Module/Settings/Account.php:477 #: src/Module/Moderation/BaseUsers.php:128 src/Module/Settings/Account.php:478
msgid "News Page" msgid "News Page"
msgstr "" msgstr ""
#: src/Module/Moderation/BaseUsers.php:129 src/Module/Settings/Account.php:484 #: src/Module/Moderation/BaseUsers.php:129 src/Module/Settings/Account.php:485
msgid "Community Group" msgid "Community Group"
msgstr "" msgstr ""
@ -8425,7 +8422,7 @@ msgid ""
"\"btn btn-sm pull-right\">Cancel</a>" "\"btn btn-sm pull-right\">Cancel</a>"
msgstr "" msgstr ""
#: src/Module/Profile/Profile.php:167 src/Module/Settings/Account.php:575 #: src/Module/Profile/Profile.php:167 src/Module/Settings/Account.php:576
msgid "Full Name:" msgid "Full Name:"
msgstr "" msgstr ""
@ -8634,7 +8631,7 @@ msgid "Please repeat your e-mail address:"
msgstr "" msgstr ""
#: src/Module/Register.php:162 src/Module/Security/PasswordTooLong.php:100 #: src/Module/Register.php:162 src/Module/Security/PasswordTooLong.php:100
#: src/Module/Settings/Account.php:566 #: src/Module/Settings/Account.php:567
msgid "New Password:" msgid "New Password:"
msgstr "" msgstr ""
@ -8643,7 +8640,7 @@ msgid "Leave empty for an auto generated password."
msgstr "" msgstr ""
#: src/Module/Register.php:163 src/Module/Security/PasswordTooLong.php:101 #: src/Module/Register.php:163 src/Module/Security/PasswordTooLong.php:101
#: src/Module/Settings/Account.php:567 #: src/Module/Settings/Account.php:568
msgid "Confirm:" msgid "Confirm:"
msgstr "" msgstr ""
@ -8861,24 +8858,24 @@ msgid "Update Password"
msgstr "" msgstr ""
#: src/Module/Security/PasswordTooLong.php:99 #: src/Module/Security/PasswordTooLong.php:99
#: src/Module/Settings/Account.php:568 #: src/Module/Settings/Account.php:569
msgid "Current Password:" msgid "Current Password:"
msgstr "" msgstr ""
#: src/Module/Security/PasswordTooLong.php:99 #: src/Module/Security/PasswordTooLong.php:99
#: src/Module/Settings/Account.php:568 #: src/Module/Settings/Account.php:569
msgid "Your current password to confirm the changes" msgid "Your current password to confirm the changes"
msgstr "" msgstr ""
#: src/Module/Security/PasswordTooLong.php:100 #: src/Module/Security/PasswordTooLong.php:100
#: src/Module/Settings/Account.php:552 #: src/Module/Settings/Account.php:553
msgid "" msgid ""
"Allowed characters are a-z, A-Z, 0-9 and special characters except white " "Allowed characters are a-z, A-Z, 0-9 and special characters except white "
"spaces and accentuated letters." "spaces and accentuated letters."
msgstr "" msgstr ""
#: src/Module/Security/PasswordTooLong.php:100 #: src/Module/Security/PasswordTooLong.php:100
#: src/Module/Settings/Account.php:553 #: src/Module/Settings/Account.php:554
msgid "Password length is limited to 72 characters." msgid "Password length is limited to 72 characters."
msgstr "" msgstr ""
@ -9003,99 +9000,99 @@ msgstr ""
msgid "Cannot change to that email." msgid "Cannot change to that email."
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:146 src/Module/Settings/Account.php:198 #: src/Module/Settings/Account.php:146 src/Module/Settings/Account.php:199
#: src/Module/Settings/Account.php:218 src/Module/Settings/Account.php:302 #: src/Module/Settings/Account.php:219 src/Module/Settings/Account.php:303
#: src/Module/Settings/Account.php:351 #: src/Module/Settings/Account.php:352
msgid "Settings were not updated." msgid "Settings were not updated."
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:363 #: src/Module/Settings/Account.php:364
msgid "Contact CSV file upload error" msgid "Contact CSV file upload error"
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:382 #: src/Module/Settings/Account.php:383
msgid "Importing Contacts done" msgid "Importing Contacts done"
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:395 #: src/Module/Settings/Account.php:396
msgid "Relocate message has been send to your contacts" msgid "Relocate message has been send to your contacts"
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:412 #: src/Module/Settings/Account.php:413
msgid "Unable to find your profile. Please contact your admin." msgid "Unable to find your profile. Please contact your admin."
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:454 #: src/Module/Settings/Account.php:455
msgid "Personal Page Subtypes" msgid "Personal Page Subtypes"
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:455 #: src/Module/Settings/Account.php:456
msgid "Community Group Subtypes" msgid "Community Group Subtypes"
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:465 #: src/Module/Settings/Account.php:466
msgid "Account for a personal profile." msgid "Account for a personal profile."
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:472 #: src/Module/Settings/Account.php:473
msgid "" msgid ""
"Account for an organisation that automatically approves contact requests as " "Account for an organisation that automatically approves contact requests as "
"\"Followers\"." "\"Followers\"."
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:479 #: src/Module/Settings/Account.php:480
msgid "" msgid ""
"Account for a news reflector that automatically approves contact requests as " "Account for a news reflector that automatically approves contact requests as "
"\"Followers\"." "\"Followers\"."
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:486 #: src/Module/Settings/Account.php:487
msgid "Account for community discussions." msgid "Account for community discussions."
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:493 #: src/Module/Settings/Account.php:494
msgid "" msgid ""
"Account for a regular personal profile that requires manual approval of " "Account for a regular personal profile that requires manual approval of "
"\"Friends\" and \"Followers\"." "\"Friends\" and \"Followers\"."
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:500 #: src/Module/Settings/Account.php:501
msgid "" msgid ""
"Account for a public profile that automatically approves contact requests as " "Account for a public profile that automatically approves contact requests as "
"\"Followers\"." "\"Followers\"."
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:507 #: src/Module/Settings/Account.php:508
msgid "Automatically approves all contact requests." msgid "Automatically approves all contact requests."
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:514 #: src/Module/Settings/Account.php:515
msgid "" msgid ""
"Account for a popular profile that automatically approves contact requests " "Account for a popular profile that automatically approves contact requests "
"as \"Friends\"." "as \"Friends\"."
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:519 #: src/Module/Settings/Account.php:520
msgid "Private Group [Experimental]" msgid "Private Group [Experimental]"
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:521 #: src/Module/Settings/Account.php:522
msgid "Requires manual approval of contact requests." msgid "Requires manual approval of contact requests."
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:530 #: src/Module/Settings/Account.php:531
msgid "OpenID:" msgid "OpenID:"
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:530 #: src/Module/Settings/Account.php:531
msgid "(Optional) Allow this OpenID to login to this account." msgid "(Optional) Allow this OpenID to login to this account."
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:538 #: src/Module/Settings/Account.php:539
msgid "Publish your profile in your local site directory?" msgid "Publish your profile in your local site directory?"
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:538 #: src/Module/Settings/Account.php:539
#, php-format #, php-format
msgid "" msgid ""
"Your profile will be published in this node's <a href=\"%s\">local " "Your profile will be published in this node's <a href=\"%s\">local "
@ -9103,89 +9100,89 @@ msgid ""
"system settings." "system settings."
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:544 #: src/Module/Settings/Account.php:545
#, php-format #, php-format
msgid "" msgid ""
"Your profile will also be published in the global friendica directories (e." "Your profile will also be published in the global friendica directories (e."
"g. <a href=\"%s\">%s</a>)." "g. <a href=\"%s\">%s</a>)."
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:557 #: src/Module/Settings/Account.php:558
msgid "Account Settings" msgid "Account Settings"
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:558 #: src/Module/Settings/Account.php:559
#, php-format #, php-format
msgid "Your Identity Address is <strong>'%s'</strong> or '%s'." msgid "Your Identity Address is <strong>'%s'</strong> or '%s'."
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:565 #: src/Module/Settings/Account.php:566
msgid "Password Settings" msgid "Password Settings"
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:567 #: src/Module/Settings/Account.php:568
msgid "Leave password fields blank unless changing" msgid "Leave password fields blank unless changing"
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:569 #: src/Module/Settings/Account.php:570
msgid "Password:" msgid "Password:"
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:569 #: src/Module/Settings/Account.php:570
msgid "Your current password to confirm the changes of the email address" msgid "Your current password to confirm the changes of the email address"
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:572 #: src/Module/Settings/Account.php:573
msgid "Delete OpenID URL" msgid "Delete OpenID URL"
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:574 #: src/Module/Settings/Account.php:575
msgid "Basic Settings" msgid "Basic Settings"
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:576 #: src/Module/Settings/Account.php:577
msgid "Email Address:" msgid "Email Address:"
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:577 #: src/Module/Settings/Account.php:578
msgid "Your Timezone:" msgid "Your Timezone:"
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:578 #: src/Module/Settings/Account.php:579
msgid "Your Language:" msgid "Your Language:"
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:578 #: src/Module/Settings/Account.php:579
msgid "" msgid ""
"Set the language we use to show you friendica interface and to send you " "Set the language we use to show you friendica interface and to send you "
"emails" "emails"
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:579 #: src/Module/Settings/Account.php:580
msgid "Default Post Location:" msgid "Default Post Location:"
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:580 #: src/Module/Settings/Account.php:581
msgid "Use Browser Location:" msgid "Use Browser Location:"
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:582 #: src/Module/Settings/Account.php:583
msgid "Security and Privacy Settings" msgid "Security and Privacy Settings"
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:584 #: src/Module/Settings/Account.php:585
msgid "Maximum Friend Requests/Day:" msgid "Maximum Friend Requests/Day:"
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:584 src/Module/Settings/Account.php:594 #: src/Module/Settings/Account.php:585 src/Module/Settings/Account.php:595
msgid "(to prevent spam abuse)" msgid "(to prevent spam abuse)"
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:586 #: src/Module/Settings/Account.php:587
msgid "Allow your profile to be searchable globally?" msgid "Allow your profile to be searchable globally?"
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:586 #: src/Module/Settings/Account.php:587
msgid "" msgid ""
"Activate this setting if you want others to easily find and follow you. Your " "Activate this setting if you want others to easily find and follow you. Your "
"profile will be searchable on remote systems. This setting also determines " "profile will be searchable on remote systems. This setting also determines "
@ -9193,43 +9190,43 @@ msgid ""
"indexed or not." "indexed or not."
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:587 #: src/Module/Settings/Account.php:588
msgid "Hide your contact/friend list from viewers of your profile?" msgid "Hide your contact/friend list from viewers of your profile?"
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:587 #: src/Module/Settings/Account.php:588
msgid "" msgid ""
"A list of your contacts is displayed on your profile page. Activate this " "A list of your contacts is displayed on your profile page. Activate this "
"option to disable the display of your contact list." "option to disable the display of your contact list."
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:588 #: src/Module/Settings/Account.php:589
msgid "Hide your public content from anonymous viewers" msgid "Hide your public content from anonymous viewers"
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:588 #: src/Module/Settings/Account.php:589
msgid "" msgid ""
"Anonymous visitors will only see your basic profile details. Your public " "Anonymous visitors will only see your basic profile details. Your public "
"posts and replies will still be freely accessible on the remote servers of " "posts and replies will still be freely accessible on the remote servers of "
"your followers and through relays." "your followers and through relays."
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:589 #: src/Module/Settings/Account.php:590
msgid "Make public posts unlisted" msgid "Make public posts unlisted"
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:589 #: src/Module/Settings/Account.php:590
msgid "" msgid ""
"Your public posts will not appear on the community pages or in search " "Your public posts will not appear on the community pages or in search "
"results, nor be sent to relay servers. However they can still appear on " "results, nor be sent to relay servers. However they can still appear on "
"public feeds on remote servers." "public feeds on remote servers."
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:590 #: src/Module/Settings/Account.php:591
msgid "Make all posted pictures accessible" msgid "Make all posted pictures accessible"
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:590 #: src/Module/Settings/Account.php:591
msgid "" msgid ""
"This option makes every posted picture accessible via the direct link. This " "This option makes every posted picture accessible via the direct link. This "
"is a workaround for the problem that most other networks can't handle " "is a workaround for the problem that most other networks can't handle "
@ -9237,233 +9234,241 @@ msgid ""
"public on your photo albums though." "public on your photo albums though."
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:591 #: src/Module/Settings/Account.php:592
msgid "Allow friends to post to your profile page?" msgid "Allow friends to post to your profile page?"
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:591 #: src/Module/Settings/Account.php:592
msgid "" msgid ""
"Your contacts may write posts on your profile wall. These posts will be " "Your contacts may write posts on your profile wall. These posts will be "
"distributed to your contacts" "distributed to your contacts"
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:592 #: src/Module/Settings/Account.php:593
msgid "Allow friends to tag your posts?" msgid "Allow friends to tag your posts?"
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:592 #: src/Module/Settings/Account.php:593
msgid "Your contacts can add additional tags to your posts." msgid "Your contacts can add additional tags to your posts."
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:593 #: src/Module/Settings/Account.php:594
msgid "Permit unknown people to send you private mail?" msgid "Permit unknown people to send you private mail?"
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:593 #: src/Module/Settings/Account.php:594
msgid "" msgid ""
"Friendica network users may send you private messages even if they are not " "Friendica network users may send you private messages even if they are not "
"in your contact list." "in your contact list."
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:594 #: src/Module/Settings/Account.php:595
msgid "Maximum private messages per day from unknown people:" msgid "Maximum private messages per day from unknown people:"
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:596 #: src/Module/Settings/Account.php:596
msgid "Default privacy circle for new contacts"
msgstr ""
#: src/Module/Settings/Account.php:597
msgid "Default privacy circle for new group contacts"
msgstr ""
#: src/Module/Settings/Account.php:598
msgid "Default Post Permissions" msgid "Default Post Permissions"
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:600 #: src/Module/Settings/Account.php:602
msgid "Expiration settings" msgid "Expiration settings"
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:601 #: src/Module/Settings/Account.php:603
msgid "Automatically expire posts after this many days:" msgid "Automatically expire posts after this many days:"
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:601 #: src/Module/Settings/Account.php:603
msgid "If empty, posts will not expire. Expired posts will be deleted" msgid "If empty, posts will not expire. Expired posts will be deleted"
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:602 #: src/Module/Settings/Account.php:604
msgid "Expire posts" msgid "Expire posts"
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:602 #: src/Module/Settings/Account.php:604
msgid "When activated, posts and comments will be expired." msgid "When activated, posts and comments will be expired."
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:603 #: src/Module/Settings/Account.php:605
msgid "Expire personal notes" msgid "Expire personal notes"
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:603 #: src/Module/Settings/Account.php:605
msgid "" msgid ""
"When activated, the personal notes on your profile page will be expired." "When activated, the personal notes on your profile page will be expired."
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:604 #: src/Module/Settings/Account.php:606
msgid "Expire starred posts" msgid "Expire starred posts"
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:604 #: src/Module/Settings/Account.php:606
msgid "" msgid ""
"Starring posts keeps them from being expired. That behaviour is overwritten " "Starring posts keeps them from being expired. That behaviour is overwritten "
"by this setting." "by this setting."
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:605 #: src/Module/Settings/Account.php:607
msgid "Only expire posts by others" msgid "Only expire posts by others"
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:605 #: src/Module/Settings/Account.php:607
msgid "" msgid ""
"When activated, your own posts never expire. Then the settings above are " "When activated, your own posts never expire. Then the settings above are "
"only valid for posts you received." "only valid for posts you received."
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:608 #: src/Module/Settings/Account.php:610
msgid "Notification Settings" msgid "Notification Settings"
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:609 #: src/Module/Settings/Account.php:611
msgid "Send a notification email when:" msgid "Send a notification email when:"
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:610 #: src/Module/Settings/Account.php:612
msgid "You receive an introduction" msgid "You receive an introduction"
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:611 #: src/Module/Settings/Account.php:613
msgid "Your introductions are confirmed" msgid "Your introductions are confirmed"
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:612 #: src/Module/Settings/Account.php:614
msgid "Someone writes on your profile wall" msgid "Someone writes on your profile wall"
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:613 #: src/Module/Settings/Account.php:615
msgid "Someone writes a followup comment" msgid "Someone writes a followup comment"
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:614 #: src/Module/Settings/Account.php:616
msgid "You receive a private message" msgid "You receive a private message"
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:615 #: src/Module/Settings/Account.php:617
msgid "You receive a friend suggestion" msgid "You receive a friend suggestion"
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:616 #: src/Module/Settings/Account.php:618
msgid "You are tagged in a post" msgid "You are tagged in a post"
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:618 #: src/Module/Settings/Account.php:620
msgid "Create a desktop notification when:" msgid "Create a desktop notification when:"
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:619 #: src/Module/Settings/Account.php:621
msgid "Someone tagged you" msgid "Someone tagged you"
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:620 #: src/Module/Settings/Account.php:622
msgid "Someone directly commented on your post" msgid "Someone directly commented on your post"
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:621 #: src/Module/Settings/Account.php:623
msgid "Someone liked your content" msgid "Someone liked your content"
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:621 src/Module/Settings/Account.php:622 #: src/Module/Settings/Account.php:623 src/Module/Settings/Account.php:624
msgid "Can only be enabled, when the direct comment notification is enabled." msgid "Can only be enabled, when the direct comment notification is enabled."
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:622 #: src/Module/Settings/Account.php:624
msgid "Someone shared your content" msgid "Someone shared your content"
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:623 #: src/Module/Settings/Account.php:625
msgid "Someone commented in your thread" msgid "Someone commented in your thread"
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:624 #: src/Module/Settings/Account.php:626
msgid "Someone commented in a thread where you commented" msgid "Someone commented in a thread where you commented"
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:625 #: src/Module/Settings/Account.php:627
msgid "Someone commented in a thread where you interacted" msgid "Someone commented in a thread where you interacted"
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:627 #: src/Module/Settings/Account.php:629
msgid "Activate desktop notifications" msgid "Activate desktop notifications"
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:627 #: src/Module/Settings/Account.php:629
msgid "Show desktop popup on new notifications" msgid "Show desktop popup on new notifications"
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:631 #: src/Module/Settings/Account.php:633
msgid "Text-only notification emails" msgid "Text-only notification emails"
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:633 #: src/Module/Settings/Account.php:635
msgid "Send text only notification emails, without the html part" msgid "Send text only notification emails, without the html part"
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:637 #: src/Module/Settings/Account.php:639
msgid "Show detailled notifications" msgid "Show detailled notifications"
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:639 #: src/Module/Settings/Account.php:641
msgid "" msgid ""
"Per default, notifications are condensed to a single notification per item. " "Per default, notifications are condensed to a single notification per item. "
"When enabled every notification is displayed." "When enabled every notification is displayed."
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:643 #: src/Module/Settings/Account.php:645
msgid "Show notifications of ignored contacts" msgid "Show notifications of ignored contacts"
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:645 #: src/Module/Settings/Account.php:647
msgid "" msgid ""
"You don't see posts from ignored contacts. But you still see their comments. " "You don't see posts from ignored contacts. But you still see their comments. "
"This setting controls if you want to still receive regular notifications " "This setting controls if you want to still receive regular notifications "
"that are caused by ignored contacts or not." "that are caused by ignored contacts or not."
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:648 #: src/Module/Settings/Account.php:650
msgid "Advanced Account/Page Type Settings" msgid "Advanced Account/Page Type Settings"
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:649 #: src/Module/Settings/Account.php:651
msgid "Change the behaviour of this account for special situations" msgid "Change the behaviour of this account for special situations"
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:652 #: src/Module/Settings/Account.php:654
msgid "Import Contacts" msgid "Import Contacts"
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:653 #: src/Module/Settings/Account.php:655
msgid "" msgid ""
"Upload a CSV file that contains the handle of your followed accounts in the " "Upload a CSV file that contains the handle of your followed accounts in the "
"first column you exported from the old account." "first column you exported from the old account."
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:654 #: src/Module/Settings/Account.php:656
msgid "Upload File" msgid "Upload File"
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:657 #: src/Module/Settings/Account.php:659
msgid "Relocate" msgid "Relocate"
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:658 #: src/Module/Settings/Account.php:660
msgid "" msgid ""
"If you have moved this profile from another server, and some of your " "If you have moved this profile from another server, and some of your "
"contacts don't receive your updates, try pushing this button." "contacts don't receive your updates, try pushing this button."
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:659 #: src/Module/Settings/Account.php:661
msgid "Resend relocate message to contacts" msgid "Resend relocate message to contacts"
msgstr "" msgstr ""

4
view/templates/circle_selection.tpl
View file

@ -1,7 +1,7 @@
<div class="field custom"> <div class="field custom">
<label for="circle-selection" id="circle-selection-lbl">{{$label}}</label> <label for="{{$id}}" id="circle-selection-lbl">{{$label}}</label>
<select name="circle-selection" id="circle-selection"> <select name="{{$id}}" id="{{$id}}">
{{foreach $circles as $circle}} {{foreach $circles as $circle}}
<option value="{{$circle.id}}"{{if $circle.selected}} selected="selected"{{/if}}>{{$circle.name}}</option> <option value="{{$circle.id}}"{{if $circle.selected}} selected="selected"{{/if}}>{{$circle.name}}</option>
{{/foreach}} {{/foreach}}

1
view/templates/settings/account.tpl
View file

@ -60,6 +60,7 @@
{{include file="field_input.tpl" field=$cntunkmail}} {{include file="field_input.tpl" field=$cntunkmail}}
{{$circle_select nofilter}} {{$circle_select nofilter}}
{{$circle_select_group nofilter}}
{{if not $is_community}} {{if not $is_community}}
<h3>{{$permissions}}</h3> <h3>{{$permissions}}</h3>

2
view/theme/frio/templates/settings/account.tpl
View file

@ -93,6 +93,8 @@
{{$circle_select nofilter}} {{$circle_select nofilter}}
{{$circle_select_group nofilter}}
{{if not $is_community}} {{if not $is_community}}
<h3>{{$permissions}}</h3> <h3>{{$permissions}}</h3>