diff --git a/include/enotify.php b/include/enotify.php index cfc03626f..d77ab448a 100644 --- a/include/enotify.php +++ b/include/enotify.php @@ -32,6 +32,7 @@ use Friendica\Model\Item; use Friendica\Model\Notification; use Friendica\Model\Post; use Friendica\Model\User; +use Friendica\Model\Verb; use Friendica\Protocol\Activity; /** @@ -69,8 +70,6 @@ function notification($params) return false; } - $nickname = $user['nickname']; - $params['notify_flags'] = $user['notify-flags']; $params['language'] = $user['language']; $params['to_name'] = $user['username']; @@ -100,26 +99,14 @@ function notification($params) $siteurl = DI::baseUrl()->get(true); $sitename = DI::config()->get('config', 'sitename'); - $hostname = DI::baseUrl()->getHostname(); - if (strpos($hostname, ':')) { - $hostname = substr($hostname, 0, strpos($hostname, ':')); - } - - // Creates a new email builder for the notification email - $emailBuilder = DI::emailer()->newNotifyMail(); - // with $params['show_in_notification_page'] == false, the notification isn't inserted into // the database, and an email is sent if applicable. // default, if not specified: true $show_in_notification_page = isset($params['show_in_notification_page']) ? $params['show_in_notification_page'] : true; - $emailBuilder->setHeader('X-Friendica-Account', '<' . $nickname . '@' . $hostname . '>'); - $title = $params['item']['title'] ?? ''; $body = $params['item']['body'] ?? ''; - $item_id = $params['item']['id'] ?? 0; - $uri_id = $params['item']['uri-id'] ?? 0; $parent_id = $params['item']['parent'] ?? 0; $parent_uri_id = $params['item']['parent-uri-id'] ?? 0; @@ -147,20 +134,21 @@ function notification($params) $show_in_notification_page = false; } - if ($params['type'] == Notification\Type::COMMENT || $params['type'] == Notification\Type::TAG_SELF) { - if (Post\ThreadUser::getIgnored($parent_uri_id, $params['uid'])) { - Logger::info('Thread is ignored', ['parent' => $parent_id, 'parent-uri-id' => $parent_uri_id]); - return false; - } - - // Check to see if there was already a tag notify or comment notify for this post. - // If so don't create a second notification - /// @todo In the future we should store the notification with the highest "value" and replace notifications + // Check to see if there was already a tag notify or comment notify for this post. + // If so don't create a second notification + if (in_array($params['type'], [Notification\Type::TAG_SELF, Notification\Type::COMMENT, Notification\Type::SHARE])) { $condition = ['type' => [Notification\Type::TAG_SELF, Notification\Type::COMMENT, Notification\Type::SHARE], 'link' => $params['link'], 'uid' => $params['uid']]; if (DBA::exists('notify', $condition)) { return false; } + } + + if ($params['type'] == Notification\Type::COMMENT || $params['type'] == Notification\Type::TAG_SELF) { + if (Post\ThreadUser::getIgnored($parent_uri_id, $params['uid'])) { + Logger::info('Thread is ignored', ['parent' => $parent_id, 'parent-uri-id' => $parent_uri_id]); + return false; + } // if it's a post figure out who's post it is. $item = null; @@ -442,6 +430,34 @@ function notification($params) } } + return notification_store_and_send($params, $sitelink, $tsitelink, $hsitelink, $title, $subject, $preamble, $epreamble, $body, $itemlink, $show_in_notification_page); +} + +function notification_store_and_send($params, $sitelink, $tsitelink, $hsitelink, $title, $subject, $preamble, $epreamble, $body, $itemlink, $show_in_notification_page) +{ + $item_id = $params['item']['id'] ?? 0; + $uri_id = $params['item']['uri-id'] ?? 0; + $parent_id = $params['item']['parent'] ?? 0; + $parent_uri_id = $params['item']['parent-uri-id'] ?? 0; + + // Ensure that the important fields are set at any time + $fields = ['nickname']; + $user = User::getById($params['uid'], $fields); + + $sitename = DI::config()->get('config', 'sitename'); + + $nickname = $user['nickname']; + + $hostname = DI::baseUrl()->getHostname(); + if (strpos($hostname, ':')) { + $hostname = substr($hostname, 0, strpos($hostname, ':')); + } + + // Creates a new email builder for the notification email + $emailBuilder = DI::emailer()->newNotifyMail(); + + $emailBuilder->setHeader('X-Friendica-Account', '<' . $nickname . '@' . $hostname . '>'); + $subject .= " (".$nickname."@".$hostname.")"; $h = [ @@ -529,8 +545,8 @@ function notification($params) DBA::insert('notify-threads', $fields); $emailBuilder->setHeader('Message-ID', $message_id); - $log_msg = "include/enotify: No previous notification found for this parent:\n" . - " parent: ${params['parent']}\n" . " uid : ${params['uid']}\n"; + $log_msg = "include/enotify: No previous notification found for this parent:\n" . + " parent: ${params['parent']}\n" . " uid : ${params['uid']}\n"; Logger::log($log_msg, Logger::DEBUG); } else { // If not, just "follow" the thread. @@ -587,6 +603,102 @@ function notification($params) return false; } +function notification_from_array(array $notification) +{ + if ($notification['type'] == Post\UserNotification::NOTIF_NONE) { + return false; + } + + $params = []; + $params['verb'] = Verb::getByID($notification['vid']); + + $params['uid'] = $notification['uid']; + $params['otype'] = Notification\ObjectType::ITEM; + + $user = User::getById($notification['uid']); + + $params['notify_flags'] = $user['notify-flags']; + $params['language'] = $user['language']; + $params['to_name'] = $user['username']; + $params['to_email'] = $user['email']; + + // from here on everything is in the recipients language + $l10n = DI::l10n()->withLang($user['language']); + + $contact = Contact::getById($notification['actor-id'], ['url', 'name', 'photo']); + if (DBA::isResult($contact)) { + $params['source_link'] = $params['origin_link'] = $contact['url']; + $params['source_name'] = $params['origin_name'] = $contact['name']; + $params['source_photo'] = $params['origin_photo'] = $contact['photo']; + } + + $item = Post::selectFirstForUser($notification['uid'], Item::ITEM_FIELDLIST, + ['uid' => [0, $notification['uid']], 'uri-id' => $notification['target-uri-id'], 'deleted' => false], + ['order' => ['uid' => true]]); + if (empty($item)) { + return false; + } + + $params['item'] = $item; + $params['parent'] = $item['parent']; + $params['link'] = DI::baseUrl() . '/display/' . urlencode($item['guid']); + + $subjectPrefix = $l10n->t('[Friendica:Notify]'); + + if (Post\ThreadUser::getIgnored($notification['parent-uri-id'], $notification['uid'])) { + Logger::info('Thread is ignored', ['parent-uri-id' => $notification['parent-uri-id']]); + return false; + } + + // Check to see if there was already a tag notify or comment notify for this post. + // If so don't create a second notification + $condition = ['type' => [Notification\Type::TAG_SELF, Notification\Type::COMMENT, Notification\Type::SHARE], + 'link' => $params['link'], 'uid' => $notification['uid']]; + if (DBA::exists('notify', $condition)) { + return false; + } + + $content = Plaintext::getPost($item, 70); + if (!empty($content['text'])) { + $title = '"' . trim(str_replace("\n", " ", $content['text'])) . '"'; + } else { + $title = $item['title']; + } + + // Some mail software relies on subject field for threading. + // So, we cannot have different subjects for notifications of the same thread. + // Before this we have the name of the replier on the subject rendering + // different subjects for messages on the same thread. + if ($notification['type'] == Post\UserNotification::NOTIF_EXPLICIT_TAGGED) { + $params['type'] = Notification\Type::TAG_SELF; + $subject = $l10n->t('%s %s tagged you', $subjectPrefix, $contact['name']); + } elseif ($notification['type'] == Post\UserNotification::NOTIF_SHARED) { + $params['type'] = Notification\Type::SHARE; + $subject = $l10n->t('%s %s shared a new post', $subjectPrefix, $contact['name']); + } else { + $params['type'] = Notification\Type::COMMENT; + $subject = $l10n->t('%1$s Comment to conversation #%2$d by %3$s', $subjectPrefix, $item['parent'], $contact['name']); + } + + $msg = Notification::getMessage($notification); + if (empty($msg)) { + return false; + } + + $preamble = $msg['plain']; + $epreamble = $msg['rich']; + + $sitename = DI::config()->get('config', 'sitename'); + $siteurl = DI::baseUrl()->get(true); + + $sitelink = $l10n->t('Please visit %s to view and/or reply to the conversation.'); + $tsitelink = sprintf($sitelink, $siteurl); + $hsitelink = sprintf($sitelink, '' . $sitename . ''); + $itemlink = $params['link']; + + return notification_store_and_send($params, $sitelink, $tsitelink, $hsitelink, $title, $subject, $preamble, $epreamble, $item['body'], $itemlink, true); +} + /** * Checks for users who should be notified * diff --git a/mod/settings.php b/mod/settings.php index ce556b8bf..3ff27e984 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -262,6 +262,9 @@ function settings_post(App $a) $unlisted = (($_POST['unlisted'] == 1) ? 1: 0); $accessiblephotos = (($_POST['accessible-photos'] == 1) ? 1: 0); + $notify_like = (($_POST['notify_like'] == 1) ? 1 : 0); + $notify_announce = (($_POST['notify_announce'] == 1) ? 1 : 0); + $email_textonly = (($_POST['email_textonly'] == 1) ? 1 : 0); $detailed_notif = (($_POST['detailed_notif'] == 1) ? 1 : 0); @@ -358,6 +361,9 @@ function settings_post(App $a) DI::pConfig()->set(local_user(), 'expire', 'photos', $expire_photos); DI::pConfig()->set(local_user(), 'expire', 'network_only', $expire_network_only); + DI::pConfig()->set(local_user(), 'system', 'notify_like', $notify_like); + DI::pConfig()->set(local_user(), 'system', 'notify_announce', $notify_announce); + DI::pConfig()->set(local_user(), 'system', 'email_textonly', $email_textonly); DI::pConfig()->set(local_user(), 'system', 'detailed_notif', $detailed_notif); DI::pConfig()->set(local_user(), 'system', 'notify_ignored', $notify_ignored); @@ -771,6 +777,10 @@ function settings_content(App $a) '$notify7' => ['notify7', DI::l10n()->t('You are tagged in a post'), ($notify & Notification\Type::TAG_SELF), Notification\Type::TAG_SELF, ''], '$notify8' => ['notify8', DI::l10n()->t('You are poked/prodded/etc. in a post'), ($notify & Notification\Type::POKE), Notification\Type::POKE, ''], + '$lbl_notify' => DI::l10n()->t('Create a desktop notification when:'), + '$notify_like' => ['notify_like', DI::l10n()->t('Someone liked your content'), DI::pConfig()->get(local_user(), 'system', 'notify_like'), ''], + '$notify_announce' => ['notify_announce', DI::l10n()->t('Someone shared your content'), DI::pConfig()->get(local_user(), 'system', 'notify_announce'), ''], + '$desktop_notifications' => ['desktop_notifications', DI::l10n()->t('Activate desktop notifications') , false, DI::l10n()->t('Show desktop popup on new notifications')], '$email_textonly' => ['email_textonly', DI::l10n()->t('Text-only notification emails'), diff --git a/src/Model/Notification.php b/src/Model/Notification.php index 880fa784a..78799f8f8 100644 --- a/src/Model/Notification.php +++ b/src/Model/Notification.php @@ -182,7 +182,7 @@ class Notification extends BaseModel return $message; } - $contact = Contact::getById($notification['actor-id']); + $causer = $contact = Contact::getById($notification['actor-id'], ['id', 'name', 'url']); if (empty($contact)) { Logger::info('Contact not found', ['contact' => $notification['actor-id']]); return $message; @@ -193,7 +193,7 @@ class Notification extends BaseModel $announce = Verb::getID(Activity::ANNOUNCE); $post = Verb::getID(Activity::POST); - if (in_array($notification['type'], [Post\UserNotification::NOTIF_THREAD_COMMENT, Post\UserNotification::NOTIF_COMMENT_PARTICIPATION])) { + if (in_array($notification['type'], [Post\UserNotification::NOTIF_THREAD_COMMENT, Post\UserNotification::NOTIF_COMMENT_PARTICIPATION, Post\UserNotification::NOTIF_EXPLICIT_TAGGED])) { $item = Post::selectFirst([], ['uri-id' => $notification['parent-uri-id'], 'uid' => [0, $notification['uid']]]); if (empty($item)) { Logger::info('Parent post not found', ['uri-id' => $notification['parent-uri-id']]); @@ -215,6 +215,14 @@ class Notification extends BaseModel } } + if (($notification['type'] == Post\UserNotification::NOTIF_SHARED) && !empty($item['causer-id'])) { + $causer = Contact::getById($item['causer-id'], ['id', 'name', 'url']); + if (empty($contact)) { + Logger::info('Causer not found', ['causer' => $item['causer-id']]); + return $message; + } + } + $link = DI::baseUrl() . '/display/' . urlencode($item['guid']); $content = Plaintext::getPost($item, 70); @@ -288,7 +296,11 @@ class Notification extends BaseModel break; case Post\UserNotification::NOTIF_SHARED: - if ($title != '') { + if (($causer['id'] != $contact['id']) && ($title != '')) { + $msg = $l10n->t('%1$s shared the post %2$s from %3$s'); + } elseif ($causer['id'] != $contact['id']) { + $msg = $l10n->t('%1$s shared a post from %3$s'); + } elseif ($title != '') { $msg = $l10n->t('%1$s shared the post %2$s'); } else { $msg = $l10n->t('%1$s shared a post'); @@ -300,15 +312,16 @@ class Notification extends BaseModel if (!empty($msg)) { // Name of the notification's causer - $message['causer'] = $contact['name']; + $message['causer'] = $causer['name']; // Format for the "ping" mechanism - $message['notification'] = sprintf($msg, '{0}', $title); + $message['notification'] = sprintf($msg, '{0}', $title, $contact['name']); // Plain text for the web push api - $message['plain'] = sprintf($msg, $contact['name'], $title); + $message['plain'] = sprintf($msg, $causer['name'], $title, $contact['name']); // Rich text for other purposes $message['rich'] = sprintf($msg, - '[url=' . $contact['url'] . ']' . $contact['name'] . '[/url]', - '[url=' . $link . ']' . $title . '[/url]'); + '[url=' . $causer['url'] . ']' . $causer['name'] . '[/url]', + '[url=' . $link . ']' . $title . '[/url]', + '[url=' . $contact['url'] . ']' . $contact['name'] . '[/url]'); } return $message; diff --git a/src/Model/Subscription.php b/src/Model/Subscription.php index e3bbadcbf..59e71307f 100644 --- a/src/Model/Subscription.php +++ b/src/Model/Subscription.php @@ -142,6 +142,21 @@ class Subscription $notification = DBA::selectFirst('notification', [], ['id' => $nid]); $type = Notification::getType($notification); + + $desktop_notification = !in_array($type, ['reblog', 'favourite']); + + if (DI::pConfig()->get($notification['uid'], 'system', 'notify_like') && ($type == 'favourite')) { + $desktop_notification = true; + } + + if (DI::pConfig()->get($notification['uid'], 'system', 'notify_announce') && ($type == 'reblog')) { + $desktop_notification = true; + } + + if ($desktop_notification) { + notification_from_array($notification); + } + if (empty($type)) { return; } diff --git a/view/lang/C/messages.po b/view/lang/C/messages.po index a68414198..d5207ba9e 100644 --- a/view/lang/C/messages.po +++ b/view/lang/C/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 2021.09-dev\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-08-19 13:57+0000\n" +"POT-Creation-Date: 2021-08-21 20:27+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -75,7 +75,7 @@ msgstr "" msgid "Select" msgstr "" -#: include/conversation.php:468 mod/photos.php:1460 mod/settings.php:574 +#: include/conversation.php:468 mod/photos.php:1460 mod/settings.php:580 #: src/Module/Admin/Users/Active.php:139 src/Module/Admin/Users/Blocked.php:140 #: src/Module/Admin/Users/Index.php:153 src/Module/Contact.php:849 #: src/Module/Contact.php:1140 @@ -501,280 +501,280 @@ msgstr "" msgid "Open Compose page" msgstr "" -#: include/enotify.php:51 +#: include/enotify.php:52 include/enotify.php:646 msgid "[Friendica:Notify]" msgstr "" -#: include/enotify.php:137 +#: include/enotify.php:124 #, php-format msgid "%s New mail received at %s" msgstr "" -#: include/enotify.php:139 +#: include/enotify.php:126 #, php-format msgid "%1$s sent you a new private message at %2$s." msgstr "" -#: include/enotify.php:140 +#: include/enotify.php:127 msgid "a private message" msgstr "" -#: include/enotify.php:140 +#: include/enotify.php:127 #, php-format msgid "%1$s sent you %2$s." msgstr "" -#: include/enotify.php:142 +#: include/enotify.php:129 #, php-format msgid "Please visit %s to view and/or reply to your private messages." msgstr "" -#: include/enotify.php:188 +#: include/enotify.php:176 #, php-format msgid "%1$s replied to you on %2$s's %3$s %4$s" msgstr "" -#: include/enotify.php:190 +#: include/enotify.php:178 #, php-format msgid "%1$s tagged you on %2$s's %3$s %4$s" msgstr "" -#: include/enotify.php:192 +#: include/enotify.php:180 #, php-format msgid "%1$s commented on %2$s's %3$s %4$s" msgstr "" -#: include/enotify.php:202 +#: include/enotify.php:190 #, php-format msgid "%1$s replied to you on your %2$s %3$s" msgstr "" -#: include/enotify.php:204 +#: include/enotify.php:192 #, php-format msgid "%1$s tagged you on your %2$s %3$s" msgstr "" -#: include/enotify.php:206 +#: include/enotify.php:194 #, php-format msgid "%1$s commented on your %2$s %3$s" msgstr "" -#: include/enotify.php:213 +#: include/enotify.php:201 #, php-format msgid "%1$s replied to you on their %2$s %3$s" msgstr "" -#: include/enotify.php:215 +#: include/enotify.php:203 #, php-format msgid "%1$s tagged you on their %2$s %3$s" msgstr "" -#: include/enotify.php:217 +#: include/enotify.php:205 #, php-format msgid "%1$s commented on their %2$s %3$s" msgstr "" -#: include/enotify.php:228 +#: include/enotify.php:216 include/enotify.php:674 #, php-format msgid "%s %s tagged you" msgstr "" -#: include/enotify.php:230 +#: include/enotify.php:218 #, php-format msgid "%1$s tagged you at %2$s" msgstr "" -#: include/enotify.php:232 +#: include/enotify.php:220 include/enotify.php:680 #, php-format msgid "%1$s Comment to conversation #%2$d by %3$s" msgstr "" -#: include/enotify.php:234 +#: include/enotify.php:222 #, php-format msgid "%s commented on an item/conversation you have been following." msgstr "" -#: include/enotify.php:239 include/enotify.php:254 include/enotify.php:279 -#: include/enotify.php:298 include/enotify.php:314 +#: include/enotify.php:227 include/enotify.php:242 include/enotify.php:267 +#: include/enotify.php:286 include/enotify.php:302 include/enotify.php:694 #, php-format msgid "Please visit %s to view and/or reply to the conversation." msgstr "" -#: include/enotify.php:246 +#: include/enotify.php:234 #, php-format msgid "%s %s posted to your profile wall" msgstr "" -#: include/enotify.php:248 +#: include/enotify.php:236 #, php-format msgid "%1$s posted to your profile wall at %2$s" msgstr "" -#: include/enotify.php:249 +#: include/enotify.php:237 #, php-format msgid "%1$s posted to [url=%2$s]your wall[/url]" msgstr "" -#: include/enotify.php:262 +#: include/enotify.php:250 include/enotify.php:677 #, php-format msgid "%s %s shared a new post" msgstr "" -#: include/enotify.php:264 +#: include/enotify.php:252 #, php-format msgid "%1$s shared a new post at %2$s" msgstr "" -#: include/enotify.php:265 +#: include/enotify.php:253 #, php-format msgid "%1$s [url=%2$s]shared a post[/url]." msgstr "" -#: include/enotify.php:270 +#: include/enotify.php:258 #, php-format msgid "%s %s shared a post from %s" msgstr "" -#: include/enotify.php:272 +#: include/enotify.php:260 #, php-format msgid "%1$s shared a post from %2$s at %3$s" msgstr "" -#: include/enotify.php:273 +#: include/enotify.php:261 #, php-format msgid "%1$s [url=%2$s]shared a post[/url] from %3$s." msgstr "" -#: include/enotify.php:286 +#: include/enotify.php:274 #, php-format msgid "%1$s %2$s poked you" msgstr "" -#: include/enotify.php:288 +#: include/enotify.php:276 #, php-format msgid "%1$s poked you at %2$s" msgstr "" -#: include/enotify.php:289 +#: include/enotify.php:277 #, php-format msgid "%1$s [url=%2$s]poked you[/url]." msgstr "" -#: include/enotify.php:306 +#: include/enotify.php:294 #, php-format msgid "%s %s tagged your post" msgstr "" -#: include/enotify.php:308 +#: include/enotify.php:296 #, php-format msgid "%1$s tagged your post at %2$s" msgstr "" -#: include/enotify.php:309 +#: include/enotify.php:297 #, php-format msgid "%1$s tagged [url=%2$s]your post[/url]" msgstr "" -#: include/enotify.php:321 +#: include/enotify.php:309 #, php-format msgid "%s Introduction received" msgstr "" -#: include/enotify.php:323 +#: include/enotify.php:311 #, php-format msgid "You've received an introduction from '%1$s' at %2$s" msgstr "" -#: include/enotify.php:324 +#: include/enotify.php:312 #, php-format msgid "You've received [url=%1$s]an introduction[/url] from %2$s." msgstr "" -#: include/enotify.php:329 include/enotify.php:375 +#: include/enotify.php:317 include/enotify.php:363 #, php-format msgid "You may visit their profile at %s" msgstr "" -#: include/enotify.php:331 +#: include/enotify.php:319 #, php-format msgid "Please visit %s to approve or reject the introduction." msgstr "" -#: include/enotify.php:338 +#: include/enotify.php:326 #, php-format msgid "%s A new person is sharing with you" msgstr "" -#: include/enotify.php:340 include/enotify.php:341 +#: include/enotify.php:328 include/enotify.php:329 #, php-format msgid "%1$s is sharing with you at %2$s" msgstr "" -#: include/enotify.php:348 +#: include/enotify.php:336 #, php-format msgid "%s You have a new follower" msgstr "" -#: include/enotify.php:350 include/enotify.php:351 +#: include/enotify.php:338 include/enotify.php:339 #, php-format msgid "You have a new follower at %2$s : %1$s" msgstr "" -#: include/enotify.php:364 +#: include/enotify.php:352 #, php-format msgid "%s Friend suggestion received" msgstr "" -#: include/enotify.php:366 +#: include/enotify.php:354 #, php-format msgid "You've received a friend suggestion from '%1$s' at %2$s" msgstr "" -#: include/enotify.php:367 +#: include/enotify.php:355 #, php-format msgid "You've received [url=%1$s]a friend suggestion[/url] for %2$s from %3$s." msgstr "" -#: include/enotify.php:373 +#: include/enotify.php:361 msgid "Name:" msgstr "" -#: include/enotify.php:374 +#: include/enotify.php:362 msgid "Photo:" msgstr "" -#: include/enotify.php:377 +#: include/enotify.php:365 #, php-format msgid "Please visit %s to approve or reject the suggestion." msgstr "" -#: include/enotify.php:385 include/enotify.php:400 +#: include/enotify.php:373 include/enotify.php:388 #, php-format msgid "%s Connection accepted" msgstr "" -#: include/enotify.php:387 include/enotify.php:402 +#: include/enotify.php:375 include/enotify.php:390 #, php-format msgid "'%1$s' has accepted your connection request at %2$s" msgstr "" -#: include/enotify.php:388 include/enotify.php:403 +#: include/enotify.php:376 include/enotify.php:391 #, php-format msgid "%2$s has accepted your [url=%1$s]connection request[/url]." msgstr "" -#: include/enotify.php:393 +#: include/enotify.php:381 msgid "" "You are now mutual friends and may exchange status updates, photos, and " "email without restriction." msgstr "" -#: include/enotify.php:395 +#: include/enotify.php:383 #, php-format msgid "Please visit %s if you wish to make any changes to this relationship." msgstr "" -#: include/enotify.php:408 +#: include/enotify.php:396 #, php-format msgid "" "'%1$s' has chosen to accept you a fan, which restricts some forms of " @@ -783,37 +783,37 @@ msgid "" "automatically." msgstr "" -#: include/enotify.php:410 +#: include/enotify.php:398 #, php-format msgid "" "'%1$s' may choose to extend this into a two-way or more permissive " "relationship in the future." msgstr "" -#: include/enotify.php:412 +#: include/enotify.php:400 #, php-format msgid "Please visit %s if you wish to make any changes to this relationship." msgstr "" -#: include/enotify.php:422 mod/removeme.php:63 +#: include/enotify.php:410 mod/removeme.php:63 msgid "[Friendica System Notify]" msgstr "" -#: include/enotify.php:422 +#: include/enotify.php:410 msgid "registration request" msgstr "" -#: include/enotify.php:424 +#: include/enotify.php:412 #, php-format msgid "You've received a registration request from '%1$s' at %2$s" msgstr "" -#: include/enotify.php:425 +#: include/enotify.php:413 #, php-format msgid "You've received a [url=%1$s]registration request[/url] from %2$s." msgstr "" -#: include/enotify.php:430 +#: include/enotify.php:418 #, php-format msgid "" "Full Name:\t%s\n" @@ -821,7 +821,7 @@ msgid "" "Login Name:\t%s (%s)" msgstr "" -#: include/enotify.php:436 +#: include/enotify.php:424 #, php-format msgid "Please visit %s to approve or reject the request." msgstr "" @@ -831,7 +831,7 @@ msgstr "" #: mod/message.php:69 mod/message.php:111 mod/notes.php:44 #: mod/ostatus_subscribe.php:32 mod/photos.php:163 mod/photos.php:917 #: mod/repair_ostatus.php:31 mod/settings.php:47 mod/settings.php:57 -#: mod/settings.php:415 mod/suggest.php:34 mod/uimport.php:32 +#: mod/settings.php:421 mod/suggest.php:34 mod/uimport.php:32 #: mod/unfollow.php:35 mod/unfollow.php:50 mod/unfollow.php:82 #: mod/wall_attach.php:78 mod/wall_attach.php:81 mod/wall_upload.php:99 #: mod/wall_upload.php:102 mod/wallmessage.php:35 mod/wallmessage.php:59 @@ -1870,43 +1870,43 @@ msgstr "" msgid "Password unchanged." msgstr "" -#: mod/settings.php:312 +#: mod/settings.php:315 msgid "Please use a shorter name." msgstr "" -#: mod/settings.php:315 +#: mod/settings.php:318 msgid "Name too short." msgstr "" -#: mod/settings.php:322 +#: mod/settings.php:325 msgid "Wrong Password." msgstr "" -#: mod/settings.php:327 +#: mod/settings.php:330 msgid "Invalid email." msgstr "" -#: mod/settings.php:333 +#: mod/settings.php:336 msgid "Cannot change to that email." msgstr "" -#: mod/settings.php:371 +#: mod/settings.php:377 msgid "Private forum has no privacy permissions. Using default privacy group." msgstr "" -#: mod/settings.php:374 +#: mod/settings.php:380 msgid "Private forum has no privacy permissions and no default privacy group." msgstr "" -#: mod/settings.php:393 +#: mod/settings.php:399 msgid "Settings were not updated." msgstr "" -#: mod/settings.php:434 +#: mod/settings.php:440 msgid "Connected Apps" msgstr "" -#: mod/settings.php:435 src/Module/Admin/Blocklist/Contact.php:90 +#: mod/settings.php:441 src/Module/Admin/Blocklist/Contact.php:90 #: src/Module/Admin/Users/Active.php:129 src/Module/Admin/Users/Blocked.php:130 #: src/Module/Admin/Users/Create.php:71 src/Module/Admin/Users/Deleted.php:88 #: src/Module/Admin/Users/Index.php:142 src/Module/Admin/Users/Index.php:162 @@ -1914,31 +1914,31 @@ msgstr "" msgid "Name" msgstr "" -#: mod/settings.php:436 src/Content/Nav.php:212 +#: mod/settings.php:442 src/Content/Nav.php:212 msgid "Home Page" msgstr "" -#: mod/settings.php:437 src/Module/Admin/Queue.php:78 +#: mod/settings.php:443 src/Module/Admin/Queue.php:78 msgid "Created" msgstr "" -#: mod/settings.php:438 +#: mod/settings.php:444 msgid "Remove authorization" msgstr "" -#: mod/settings.php:456 +#: mod/settings.php:462 msgid "Addon Settings" msgstr "" -#: mod/settings.php:457 +#: mod/settings.php:463 msgid "No Addon settings configured" msgstr "" -#: mod/settings.php:478 +#: mod/settings.php:484 msgid "Additional Features" msgstr "" -#: mod/settings.php:480 mod/settings.php:576 mod/settings.php:713 +#: mod/settings.php:486 mod/settings.php:582 mod/settings.php:719 #: src/Module/Admin/Addons/Index.php:69 src/Module/Admin/Features.php:87 #: src/Module/Admin/Logs/Settings.php:82 src/Module/Admin/Site.php:501 #: src/Module/Admin/Themes/Index.php:113 src/Module/Admin/Tos.php:66 @@ -1946,48 +1946,48 @@ msgstr "" msgid "Save Settings" msgstr "" -#: mod/settings.php:502 +#: mod/settings.php:508 msgid "Diaspora (Socialhome, Hubzilla)" msgstr "" -#: mod/settings.php:502 mod/settings.php:503 +#: mod/settings.php:508 mod/settings.php:509 msgid "enabled" msgstr "" -#: mod/settings.php:502 mod/settings.php:503 +#: mod/settings.php:508 mod/settings.php:509 msgid "disabled" msgstr "" -#: mod/settings.php:502 mod/settings.php:503 +#: mod/settings.php:508 mod/settings.php:509 #, php-format msgid "Built-in support for %s connectivity is %s" msgstr "" -#: mod/settings.php:503 +#: mod/settings.php:509 msgid "OStatus (GNU Social)" msgstr "" -#: mod/settings.php:534 +#: mod/settings.php:540 msgid "Email access is disabled on this site." msgstr "" -#: mod/settings.php:539 mod/settings.php:574 +#: mod/settings.php:545 mod/settings.php:580 msgid "None" msgstr "" -#: mod/settings.php:545 src/Module/BaseSettings.php:80 +#: mod/settings.php:551 src/Module/BaseSettings.php:80 msgid "Social Networks" msgstr "" -#: mod/settings.php:550 +#: mod/settings.php:556 msgid "General Social Media Settings" msgstr "" -#: mod/settings.php:551 +#: mod/settings.php:557 msgid "Accept only top level posts by contacts you follow" msgstr "" -#: mod/settings.php:551 +#: mod/settings.php:557 msgid "" "The system does an auto completion of threads when a comment arrives. This " "has got the side effect that you can receive posts that had been started by " @@ -1996,11 +1996,11 @@ msgid "" "posts from people you really do follow." msgstr "" -#: mod/settings.php:552 +#: mod/settings.php:558 msgid "Disable Content Warning" msgstr "" -#: mod/settings.php:552 +#: mod/settings.php:558 msgid "" "Users on networks like Mastodon or Pleroma are able to set a content warning " "field which collapse their post by default. This disables the automatic " @@ -2008,222 +2008,222 @@ msgid "" "any other content filtering you eventually set up." msgstr "" -#: mod/settings.php:553 +#: mod/settings.php:559 msgid "Disable intelligent shortening" msgstr "" -#: mod/settings.php:553 +#: mod/settings.php:559 msgid "" "Normally the system tries to find the best link to add to shortened posts. " "If this option is enabled then every shortened post will always point to the " "original friendica post." msgstr "" -#: mod/settings.php:554 +#: mod/settings.php:560 msgid "Enable simple text shortening" msgstr "" -#: mod/settings.php:554 +#: mod/settings.php:560 msgid "" "Normally the system shortens posts at the next line feed. If this option is " "enabled then the system will shorten the text at the maximum character limit." msgstr "" -#: mod/settings.php:555 +#: mod/settings.php:561 msgid "Attach the link title" msgstr "" -#: mod/settings.php:555 +#: mod/settings.php:561 msgid "" "When activated, the title of the attached link will be added as a title on " "posts to Diaspora. This is mostly helpful with \"remote-self\" contacts that " "share feed content." msgstr "" -#: mod/settings.php:556 +#: mod/settings.php:562 msgid "Your legacy ActivityPub/GNU Social account" msgstr "" -#: mod/settings.php:556 +#: mod/settings.php:562 msgid "" "If you enter your old account name from an ActivityPub based system or your " "GNU Social/Statusnet account name here (in the format user@domain.tld), your " "contacts will be added automatically. The field will be emptied when done." msgstr "" -#: mod/settings.php:559 +#: mod/settings.php:565 msgid "Repair OStatus subscriptions" msgstr "" -#: mod/settings.php:563 +#: mod/settings.php:569 msgid "Email/Mailbox Setup" msgstr "" -#: mod/settings.php:564 +#: mod/settings.php:570 msgid "" "If you wish to communicate with email contacts using this service " "(optional), please specify how to connect to your mailbox." msgstr "" -#: mod/settings.php:565 +#: mod/settings.php:571 msgid "Last successful email check:" msgstr "" -#: mod/settings.php:567 +#: mod/settings.php:573 msgid "IMAP server name:" msgstr "" -#: mod/settings.php:568 +#: mod/settings.php:574 msgid "IMAP port:" msgstr "" -#: mod/settings.php:569 +#: mod/settings.php:575 msgid "Security:" msgstr "" -#: mod/settings.php:570 +#: mod/settings.php:576 msgid "Email login name:" msgstr "" -#: mod/settings.php:571 +#: mod/settings.php:577 msgid "Email password:" msgstr "" -#: mod/settings.php:572 +#: mod/settings.php:578 msgid "Reply-to address:" msgstr "" -#: mod/settings.php:573 +#: mod/settings.php:579 msgid "Send public posts to all email contacts:" msgstr "" -#: mod/settings.php:574 +#: mod/settings.php:580 msgid "Action after import:" msgstr "" -#: mod/settings.php:574 src/Content/Nav.php:280 +#: mod/settings.php:580 src/Content/Nav.php:280 msgid "Mark as seen" msgstr "" -#: mod/settings.php:574 +#: mod/settings.php:580 msgid "Move to folder" msgstr "" -#: mod/settings.php:575 +#: mod/settings.php:581 msgid "Move to folder:" msgstr "" -#: mod/settings.php:589 +#: mod/settings.php:595 msgid "Unable to find your profile. Please contact your admin." msgstr "" -#: mod/settings.php:627 src/Content/Widget.php:533 +#: mod/settings.php:633 src/Content/Widget.php:533 msgid "Account Types" msgstr "" -#: mod/settings.php:628 +#: mod/settings.php:634 msgid "Personal Page Subtypes" msgstr "" -#: mod/settings.php:629 +#: mod/settings.php:635 msgid "Community Forum Subtypes" msgstr "" -#: mod/settings.php:636 src/Module/Admin/BaseUsers.php:106 +#: mod/settings.php:642 src/Module/Admin/BaseUsers.php:106 msgid "Personal Page" msgstr "" -#: mod/settings.php:637 +#: mod/settings.php:643 msgid "Account for a personal profile." msgstr "" -#: mod/settings.php:640 src/Module/Admin/BaseUsers.php:107 +#: mod/settings.php:646 src/Module/Admin/BaseUsers.php:107 msgid "Organisation Page" msgstr "" -#: mod/settings.php:641 +#: mod/settings.php:647 msgid "" "Account for an organisation that automatically approves contact requests as " "\"Followers\"." msgstr "" -#: mod/settings.php:644 src/Module/Admin/BaseUsers.php:108 +#: mod/settings.php:650 src/Module/Admin/BaseUsers.php:108 msgid "News Page" msgstr "" -#: mod/settings.php:645 +#: mod/settings.php:651 msgid "" "Account for a news reflector that automatically approves contact requests as " "\"Followers\"." msgstr "" -#: mod/settings.php:648 src/Module/Admin/BaseUsers.php:109 +#: mod/settings.php:654 src/Module/Admin/BaseUsers.php:109 msgid "Community Forum" msgstr "" -#: mod/settings.php:649 +#: mod/settings.php:655 msgid "Account for community discussions." msgstr "" -#: mod/settings.php:652 src/Module/Admin/BaseUsers.php:99 +#: mod/settings.php:658 src/Module/Admin/BaseUsers.php:99 msgid "Normal Account Page" msgstr "" -#: mod/settings.php:653 +#: mod/settings.php:659 msgid "" "Account for a regular personal profile that requires manual approval of " "\"Friends\" and \"Followers\"." msgstr "" -#: mod/settings.php:656 src/Module/Admin/BaseUsers.php:100 +#: mod/settings.php:662 src/Module/Admin/BaseUsers.php:100 msgid "Soapbox Page" msgstr "" -#: mod/settings.php:657 +#: mod/settings.php:663 msgid "" "Account for a public profile that automatically approves contact requests as " "\"Followers\"." msgstr "" -#: mod/settings.php:660 src/Module/Admin/BaseUsers.php:101 +#: mod/settings.php:666 src/Module/Admin/BaseUsers.php:101 msgid "Public Forum" msgstr "" -#: mod/settings.php:661 +#: mod/settings.php:667 msgid "Automatically approves all contact requests." msgstr "" -#: mod/settings.php:664 src/Module/Admin/BaseUsers.php:102 +#: mod/settings.php:670 src/Module/Admin/BaseUsers.php:102 msgid "Automatic Friend Page" msgstr "" -#: mod/settings.php:665 +#: mod/settings.php:671 msgid "" "Account for a popular profile that automatically approves contact requests " "as \"Friends\"." msgstr "" -#: mod/settings.php:668 +#: mod/settings.php:674 msgid "Private Forum [Experimental]" msgstr "" -#: mod/settings.php:669 +#: mod/settings.php:675 msgid "Requires manual approval of contact requests." msgstr "" -#: mod/settings.php:680 +#: mod/settings.php:686 msgid "OpenID:" msgstr "" -#: mod/settings.php:680 +#: mod/settings.php:686 msgid "(Optional) Allow this OpenID to login to this account." msgstr "" -#: mod/settings.php:688 +#: mod/settings.php:694 msgid "Publish your profile in your local site directory?" msgstr "" -#: mod/settings.php:688 +#: mod/settings.php:694 #, php-format msgid "" "Your profile will be published in this node's local " @@ -2231,115 +2231,115 @@ msgid "" "system settings." msgstr "" -#: mod/settings.php:694 +#: mod/settings.php:700 #, php-format msgid "" "Your profile will also be published in the global friendica directories (e." "g. %s)." msgstr "" -#: mod/settings.php:700 +#: mod/settings.php:706 #, php-format msgid "Your Identity Address is '%s' or '%s'." msgstr "" -#: mod/settings.php:711 +#: mod/settings.php:717 msgid "Account Settings" msgstr "" -#: mod/settings.php:719 +#: mod/settings.php:725 msgid "Password Settings" msgstr "" -#: mod/settings.php:720 src/Module/Register.php:149 +#: mod/settings.php:726 src/Module/Register.php:149 msgid "New Password:" msgstr "" -#: mod/settings.php:720 +#: mod/settings.php:726 msgid "" "Allowed characters are a-z, A-Z, 0-9 and special characters except white " "spaces, accentuated letters and colon (:)." msgstr "" -#: mod/settings.php:721 src/Module/Register.php:150 +#: mod/settings.php:727 src/Module/Register.php:150 msgid "Confirm:" msgstr "" -#: mod/settings.php:721 +#: mod/settings.php:727 msgid "Leave password fields blank unless changing" msgstr "" -#: mod/settings.php:722 +#: mod/settings.php:728 msgid "Current Password:" msgstr "" -#: mod/settings.php:722 +#: mod/settings.php:728 msgid "Your current password to confirm the changes" msgstr "" -#: mod/settings.php:723 +#: mod/settings.php:729 msgid "Password:" msgstr "" -#: mod/settings.php:723 +#: mod/settings.php:729 msgid "Your current password to confirm the changes of the email address" msgstr "" -#: mod/settings.php:726 +#: mod/settings.php:732 msgid "Delete OpenID URL" msgstr "" -#: mod/settings.php:728 +#: mod/settings.php:734 msgid "Basic Settings" msgstr "" -#: mod/settings.php:729 src/Module/Profile/Profile.php:144 +#: mod/settings.php:735 src/Module/Profile/Profile.php:144 msgid "Full Name:" msgstr "" -#: mod/settings.php:730 +#: mod/settings.php:736 msgid "Email Address:" msgstr "" -#: mod/settings.php:731 +#: mod/settings.php:737 msgid "Your Timezone:" msgstr "" -#: mod/settings.php:732 +#: mod/settings.php:738 msgid "Your Language:" msgstr "" -#: mod/settings.php:732 +#: mod/settings.php:738 msgid "" "Set the language we use to show you friendica interface and to send you " "emails" msgstr "" -#: mod/settings.php:733 +#: mod/settings.php:739 msgid "Default Post Location:" msgstr "" -#: mod/settings.php:734 +#: mod/settings.php:740 msgid "Use Browser Location:" msgstr "" -#: mod/settings.php:736 +#: mod/settings.php:742 msgid "Security and Privacy Settings" msgstr "" -#: mod/settings.php:738 +#: mod/settings.php:744 msgid "Maximum Friend Requests/Day:" msgstr "" -#: mod/settings.php:738 mod/settings.php:748 +#: mod/settings.php:744 mod/settings.php:754 msgid "(to prevent spam abuse)" msgstr "" -#: mod/settings.php:740 +#: mod/settings.php:746 msgid "Allow your profile to be searchable globally?" msgstr "" -#: mod/settings.php:740 +#: mod/settings.php:746 msgid "" "Activate this setting if you want others to easily find and follow you. Your " "profile will be searchable on remote systems. This setting also determines " @@ -2347,43 +2347,43 @@ msgid "" "indexed or not." msgstr "" -#: mod/settings.php:741 +#: mod/settings.php:747 msgid "Hide your contact/friend list from viewers of your profile?" msgstr "" -#: mod/settings.php:741 +#: mod/settings.php:747 msgid "" "A list of your contacts is displayed on your profile page. Activate this " "option to disable the display of your contact list." msgstr "" -#: mod/settings.php:742 +#: mod/settings.php:748 msgid "Hide your profile details from anonymous viewers?" msgstr "" -#: mod/settings.php:742 +#: mod/settings.php:748 msgid "" "Anonymous visitors will only see your profile picture, your display name and " "the nickname you are using on your profile page. Your public posts and " "replies will still be accessible by other means." msgstr "" -#: mod/settings.php:743 +#: mod/settings.php:749 msgid "Make public posts unlisted" msgstr "" -#: mod/settings.php:743 +#: mod/settings.php:749 msgid "" "Your public posts will not appear on the community pages or in search " "results, nor be sent to relay servers. However they can still appear on " "public feeds on remote servers." msgstr "" -#: mod/settings.php:744 +#: mod/settings.php:750 msgid "Make all posted pictures accessible" msgstr "" -#: mod/settings.php:744 +#: mod/settings.php:750 msgid "" "This option makes every posted picture accessible via the direct link. This " "is a workaround for the problem that most other networks can't handle " @@ -2391,209 +2391,221 @@ msgid "" "public on your photo albums though." msgstr "" -#: mod/settings.php:745 +#: mod/settings.php:751 msgid "Allow friends to post to your profile page?" msgstr "" -#: mod/settings.php:745 +#: mod/settings.php:751 msgid "" "Your contacts may write posts on your profile wall. These posts will be " "distributed to your contacts" msgstr "" -#: mod/settings.php:746 +#: mod/settings.php:752 msgid "Allow friends to tag your posts?" msgstr "" -#: mod/settings.php:746 +#: mod/settings.php:752 msgid "Your contacts can add additional tags to your posts." msgstr "" -#: mod/settings.php:747 +#: mod/settings.php:753 msgid "Permit unknown people to send you private mail?" msgstr "" -#: mod/settings.php:747 +#: mod/settings.php:753 msgid "" "Friendica network users may send you private messages even if they are not " "in your contact list." msgstr "" -#: mod/settings.php:748 +#: mod/settings.php:754 msgid "Maximum private messages per day from unknown people:" msgstr "" -#: mod/settings.php:750 +#: mod/settings.php:756 msgid "Default Post Permissions" msgstr "" -#: mod/settings.php:754 +#: mod/settings.php:760 msgid "Expiration settings" msgstr "" -#: mod/settings.php:755 +#: mod/settings.php:761 msgid "Automatically expire posts after this many days:" msgstr "" -#: mod/settings.php:755 +#: mod/settings.php:761 msgid "If empty, posts will not expire. Expired posts will be deleted" msgstr "" -#: mod/settings.php:756 +#: mod/settings.php:762 msgid "Expire posts" msgstr "" -#: mod/settings.php:756 +#: mod/settings.php:762 msgid "When activated, posts and comments will be expired." msgstr "" -#: mod/settings.php:757 +#: mod/settings.php:763 msgid "Expire personal notes" msgstr "" -#: mod/settings.php:757 +#: mod/settings.php:763 msgid "" "When activated, the personal notes on your profile page will be expired." msgstr "" -#: mod/settings.php:758 +#: mod/settings.php:764 msgid "Expire starred posts" msgstr "" -#: mod/settings.php:758 +#: mod/settings.php:764 msgid "" "Starring posts keeps them from being expired. That behaviour is overwritten " "by this setting." msgstr "" -#: mod/settings.php:759 +#: mod/settings.php:765 msgid "Expire photos" msgstr "" -#: mod/settings.php:759 +#: mod/settings.php:765 msgid "When activated, photos will be expired." msgstr "" -#: mod/settings.php:760 +#: mod/settings.php:766 msgid "Only expire posts by others" msgstr "" -#: mod/settings.php:760 +#: mod/settings.php:766 msgid "" "When activated, your own posts never expire. Then the settings above are " "only valid for posts you received." msgstr "" -#: mod/settings.php:763 +#: mod/settings.php:769 msgid "Notification Settings" msgstr "" -#: mod/settings.php:764 +#: mod/settings.php:770 msgid "Send a notification email when:" msgstr "" -#: mod/settings.php:765 +#: mod/settings.php:771 msgid "You receive an introduction" msgstr "" -#: mod/settings.php:766 +#: mod/settings.php:772 msgid "Your introductions are confirmed" msgstr "" -#: mod/settings.php:767 +#: mod/settings.php:773 msgid "Someone writes on your profile wall" msgstr "" -#: mod/settings.php:768 +#: mod/settings.php:774 msgid "Someone writes a followup comment" msgstr "" -#: mod/settings.php:769 +#: mod/settings.php:775 msgid "You receive a private message" msgstr "" -#: mod/settings.php:770 +#: mod/settings.php:776 msgid "You receive a friend suggestion" msgstr "" -#: mod/settings.php:771 +#: mod/settings.php:777 msgid "You are tagged in a post" msgstr "" -#: mod/settings.php:772 +#: mod/settings.php:778 msgid "You are poked/prodded/etc. in a post" msgstr "" -#: mod/settings.php:774 -msgid "Activate desktop notifications" -msgstr "" - -#: mod/settings.php:774 -msgid "Show desktop popup on new notifications" -msgstr "" - -#: mod/settings.php:776 -msgid "Text-only notification emails" -msgstr "" - -#: mod/settings.php:778 -msgid "Send text only notification emails, without the html part" -msgstr "" - #: mod/settings.php:780 -msgid "Show detailled notifications" +msgid "Create a desktop notification when:" +msgstr "" + +#: mod/settings.php:781 +msgid "Someone liked your content" msgstr "" #: mod/settings.php:782 +msgid "Someone shared your content" +msgstr "" + +#: mod/settings.php:784 +msgid "Activate desktop notifications" +msgstr "" + +#: mod/settings.php:784 +msgid "Show desktop popup on new notifications" +msgstr "" + +#: mod/settings.php:786 +msgid "Text-only notification emails" +msgstr "" + +#: mod/settings.php:788 +msgid "Send text only notification emails, without the html part" +msgstr "" + +#: mod/settings.php:790 +msgid "Show detailled notifications" +msgstr "" + +#: mod/settings.php:792 msgid "" "Per default, notifications are condensed to a single notification per item. " "When enabled every notification is displayed." msgstr "" -#: mod/settings.php:784 +#: mod/settings.php:794 msgid "Show notifications of ignored contacts" msgstr "" -#: mod/settings.php:786 +#: mod/settings.php:796 msgid "" "You don't see posts from ignored contacts. But you still see their comments. " "This setting controls if you want to still receive regular notifications " "that are caused by ignored contacts or not." msgstr "" -#: mod/settings.php:788 +#: mod/settings.php:798 msgid "Advanced Account/Page Type Settings" msgstr "" -#: mod/settings.php:789 +#: mod/settings.php:799 msgid "Change the behaviour of this account for special situations" msgstr "" -#: mod/settings.php:792 +#: mod/settings.php:802 msgid "Import Contacts" msgstr "" -#: mod/settings.php:793 +#: mod/settings.php:803 msgid "" "Upload a CSV file that contains the handle of your followed accounts in the " "first column you exported from the old account." msgstr "" -#: mod/settings.php:794 +#: mod/settings.php:804 msgid "Upload File" msgstr "" -#: mod/settings.php:796 +#: mod/settings.php:806 msgid "Relocate" msgstr "" -#: mod/settings.php:797 +#: mod/settings.php:807 msgid "" "If you have moved this profile from another server, and some of your " "contacts don't receive your updates, try pushing this button." msgstr "" -#: mod/settings.php:798 +#: mod/settings.php:808 msgid "Resend relocate message to contacts" msgstr "" @@ -4653,72 +4665,82 @@ msgstr "" msgid "[no subject]" msgstr "" -#: src/Model/Notification.php:233 +#: src/Model/Notification.php:241 #, php-format msgid "%1$s liked your comment %2$s" msgstr "" -#: src/Model/Notification.php:236 +#: src/Model/Notification.php:244 #, php-format msgid "%1$s liked your post %2$s" msgstr "" -#: src/Model/Notification.php:243 +#: src/Model/Notification.php:251 #, php-format msgid "%1$s disliked your comment %2$s" msgstr "" -#: src/Model/Notification.php:246 +#: src/Model/Notification.php:254 #, php-format msgid "%1$s disliked your post %2$s" msgstr "" -#: src/Model/Notification.php:253 +#: src/Model/Notification.php:261 #, php-format msgid "%1$s shared your comment %2$s" msgstr "" -#: src/Model/Notification.php:256 +#: src/Model/Notification.php:264 #, php-format msgid "%1$s shared your post %2$s" msgstr "" -#: src/Model/Notification.php:263 +#: src/Model/Notification.php:271 #, php-format msgid "%1$s tagged you on %2$s" msgstr "" -#: src/Model/Notification.php:267 +#: src/Model/Notification.php:275 #, php-format msgid "%1$s replied to you on %2$s" msgstr "" -#: src/Model/Notification.php:271 +#: src/Model/Notification.php:279 #, php-format msgid "%1$s commented in your thread %2$s" msgstr "" -#: src/Model/Notification.php:275 +#: src/Model/Notification.php:283 #, php-format msgid "%1$s commented on your comment %2$s" msgstr "" -#: src/Model/Notification.php:279 +#: src/Model/Notification.php:287 #, php-format msgid "%1$s commented in the thread %2$s" msgstr "" -#: src/Model/Notification.php:287 +#: src/Model/Notification.php:295 #, php-format msgid "%1$s commented on your thread %2$s" msgstr "" -#: src/Model/Notification.php:292 +#: src/Model/Notification.php:300 +#, php-format +msgid "%1$s shared the post %2$s from %3$s" +msgstr "" + +#: src/Model/Notification.php:302 +#, php-format +msgid "%1$s shared a post from %3$s" +msgstr "" + +#: src/Model/Notification.php:304 #, php-format msgid "%1$s shared the post %2$s" msgstr "" -#: src/Model/Notification.php:294 +#: src/Model/Notification.php:306 #, php-format msgid "%1$s shared a post" msgstr "" @@ -5075,7 +5097,7 @@ msgstr "" #: src/Module/Admin/Blocklist/Contact.php:78 #: src/Module/Admin/Blocklist/Server.php:88 src/Module/Admin/Federation.php:159 #: src/Module/Admin/Item/Delete.php:65 src/Module/Admin/Logs/Settings.php:80 -#: src/Module/Admin/Logs/View.php:64 src/Module/Admin/Queue.php:72 +#: src/Module/Admin/Logs/View.php:84 src/Module/Admin/Queue.php:72 #: src/Module/Admin/Site.php:498 src/Module/Admin/Storage.php:131 #: src/Module/Admin/Summary.php:232 src/Module/Admin/Themes/Details.php:90 #: src/Module/Admin/Themes/Index.php:111 src/Module/Admin/Tos.php:58 @@ -5568,21 +5590,21 @@ msgid "" "'display_errors' is to enable these options, set to '0' to disable them." msgstr "" -#: src/Module/Admin/Logs/View.php:40 +#: src/Module/Admin/Logs/View.php:71 #, php-format msgid "" "Error trying to open %1$s log file.\\r\\n
Check to see " "if file %1$s exist and is readable." msgstr "" -#: src/Module/Admin/Logs/View.php:44 +#: src/Module/Admin/Logs/View.php:80 #, php-format msgid "" "Couldn't open %1$s log file.\\r\\n
Check to see if file " "%1$s is readable." msgstr "" -#: src/Module/Admin/Logs/View.php:65 src/Module/BaseAdmin.php:110 +#: src/Module/Admin/Logs/View.php:85 src/Module/BaseAdmin.php:110 msgid "View Logs" msgstr "" diff --git a/view/templates/settings/settings.tpl b/view/templates/settings/settings.tpl index 772acd12e..c2ed1a942 100644 --- a/view/templates/settings/settings.tpl +++ b/view/templates/settings/settings.tpl @@ -98,6 +98,13 @@ {{include file="field_intcheckbox.tpl" field=$notify8}} +
{{$lbl_notify}}
+ +
+ {{include file="field_checkbox.tpl" field=$notify_like}} + {{include file="field_checkbox.tpl" field=$notify_announce}} +
+ {{include file="field_checkbox.tpl" field=$email_textonly}} {{include file="field_checkbox.tpl" field=$detailed_notif}} diff --git a/view/theme/frio/templates/settings/settings.tpl b/view/theme/frio/templates/settings/settings.tpl index 0e5ee7a08..5c66e4600 100644 --- a/view/theme/frio/templates/settings/settings.tpl +++ b/view/theme/frio/templates/settings/settings.tpl @@ -147,6 +147,13 @@ {{include file="field_intcheckbox.tpl" field=$notify8}} +
{{$lbl_notify}}
+ +
+ {{include file="field_checkbox.tpl" field=$notify_like}} + {{include file="field_checkbox.tpl" field=$notify_announce}} +
+ {{include file="field_checkbox.tpl" field=$email_textonly}} {{include file="field_checkbox.tpl" field=$detailed_notif}}