bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity

Issue 11566: More detailled notification configuration

Browse source
This commit is contained in:
Michael 2022-06-05 11:41:08 +00:00
commit 57b8708425
10 changed files with 338 additions and 240 deletions
Download patch file Download diff file Expand all files Collapse all files

4
database.sql
View file

@ -1,6 +1,6 @@
-- ------------------------------------------ -- ------------------------------------------
-- Friendica 2022.05-rc (Siberian Iris) -- Friendica 2022.05-rc (Siberian Iris)
-- DB_UPDATE_VERSION 1465 -- DB_UPDATE_VERSION 1466
-- ------------------------------------------ -- ------------------------------------------
@ -1416,7 +1416,7 @@ CREATE TABLE IF NOT EXISTS `post-thread-user` (
CREATE TABLE IF NOT EXISTS `post-user-notification` ( CREATE TABLE IF NOT EXISTS `post-user-notification` (
`uri-id` int unsigned NOT NULL COMMENT 'Id of the item-uri table entry that contains the item uri', `uri-id` int unsigned NOT NULL COMMENT 'Id of the item-uri table entry that contains the item uri',
`uid` mediumint unsigned NOT NULL COMMENT 'Owner id which owns this copy of the item', `uid` mediumint unsigned NOT NULL COMMENT 'Owner id which owns this copy of the item',
`notification-type` tinyint unsigned NOT NULL DEFAULT 0 COMMENT '', `notification-type` smallint unsigned NOT NULL DEFAULT 0 COMMENT '',
PRIMARY KEY(`uid`,`uri-id`), PRIMARY KEY(`uid`,`uri-id`),
INDEX `uri-id` (`uri-id`), INDEX `uri-id` (`uri-id`),
FOREIGN KEY (`uri-id`) REFERENCES `item-uri` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE, FOREIGN KEY (`uri-id`) REFERENCES `item-uri` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE,

2
doc/database/db_post-user-notification.md
View file

@ -10,7 +10,7 @@ Fields
| ----------------- | --------------------------------------------------------- | ------------------ | ---- | --- | ------- | ----- | | ----------------- | --------------------------------------------------------- | ------------------ | ---- | --- | ------- | ----- |
| uri-id | Id of the item-uri table entry that contains the item uri | int unsigned | NO | PRI | NULL | | | uri-id | Id of the item-uri table entry that contains the item uri | int unsigned | NO | PRI | NULL | |
| uid | Owner id which owns this copy of the item | mediumint unsigned | NO | PRI | NULL | | | uid | Owner id which owns this copy of the item | mediumint unsigned | NO | PRI | NULL | |
| notification-type | | tinyint unsigned | NO | | 0 | | | notification-type | | smallint unsigned | NO | | 0 | |
Indexes Indexes
------------ ------------

24
src/Model/Post/UserNotification.php
View file

@ -34,7 +34,6 @@ use Friendica\Model\Post;
use Friendica\Model\Subscription; use Friendica\Model\Subscription;
use Friendica\Model\Tag; use Friendica\Model\Tag;
use Friendica\Model\User; use Friendica\Model\User;
use Friendica\Navigation\Notifications;
use Friendica\Network\HTTPException; use Friendica\Network\HTTPException;
use Friendica\Protocol\Activity; use Friendica\Protocol\Activity;
use Friendica\Util\Strings; use Friendica\Util\Strings;
@ -51,6 +50,7 @@ class UserNotification
const TYPE_ACTIVITY_PARTICIPATION = 32; const TYPE_ACTIVITY_PARTICIPATION = 32;
const TYPE_DIRECT_THREAD_COMMENT = 64; const TYPE_DIRECT_THREAD_COMMENT = 64;
const TYPE_SHARED = 128; const TYPE_SHARED = 128;
const TYPE_FOLLOW = 256;
/** /**
* Insert a new user notification entry * Insert a new user notification entry
@ -268,6 +268,14 @@ class UserNotification
} }
} }
if (($item['verb'] != Activity::ANNOUNCE) && self::checkFollowParticipation($item, $contacts)) {
$notification_type = $notification_type | self::TYPE_FOLLOW;
if (!$notified) {
self::insertNotificationByItem(self::TYPE_FOLLOW, $uid, $item);
$notified = true;
}
}
if (($item['verb'] != Activity::ANNOUNCE) && self::checkActivityParticipation($item, $contacts)) { if (($item['verb'] != Activity::ANNOUNCE) && self::checkActivityParticipation($item, $contacts)) {
$notification_type = $notification_type | self::TYPE_ACTIVITY_PARTICIPATION; $notification_type = $notification_type | self::TYPE_ACTIVITY_PARTICIPATION;
if (!$notified) { if (!$notified) {
@ -535,6 +543,20 @@ class UserNotification
return Post::exists($condition); return Post::exists($condition);
} }
/**
* Check if the user follows this thread
*
* @param array $item
* @param array $contacts Array of contact IDs
* @return bool The user follows the thread
* @throws Exception
*/
private static function checkFollowParticipation(array $item, array $contacts): bool
{
$condition = ['parent' => $item['parent'], 'author-id' => $contacts, 'deleted' => false, 'gravity' => GRAVITY_ACTIVITY, 'verb' => Activity::FOLLOW];
return Post::exists($condition);
}
/** /**
* Check if the user had interacted in this thread (Like, Dislike, ...) * Check if the user had interacted in this thread (Like, Dislike, ...)
* *

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

@ -267,6 +267,25 @@ class Account extends BaseSettings
DI::pConfig()->set(local_user(), 'system', 'notify_announce', $notify_announce); DI::pConfig()->set(local_user(), 'system', 'notify_announce', $notify_announce);
$notify_type = 0;
if (!empty($request['notify_tagged'])) {
$notify_type = $notify_type | 3;
}
if (!empty($request['notify_direct_comment'])) {
$notify_type = $notify_type | 72;
}
if (!empty($request['notify_thread_comment'])) {
$notify_type = $notify_type | 4;
}
if (!empty($request['notify_comment_participation'])) {
$notify_type = $notify_type | 16;
}
if (!empty($request['notify_activity_participation'])) {
$notify_type = $notify_type | 32;
}
DI::pConfig()->set(local_user(), 'system', 'notify_type', $notify_type);
DI::pConfig()->set(local_user(), 'system', 'email_textonly', !empty($request['email_textonly'])); DI::pConfig()->set(local_user(), 'system', 'email_textonly', !empty($request['email_textonly']));
DI::pConfig()->set(local_user(), 'system', 'detailed_notif', !empty($request['detailed_notif'])); DI::pConfig()->set(local_user(), 'system', 'detailed_notif', !empty($request['detailed_notif']));
DI::pConfig()->set(local_user(), 'system', 'notify_ignored', !empty($request['notify_ignored'])); DI::pConfig()->set(local_user(), 'system', 'notify_ignored', !empty($request['notify_ignored']));
@ -524,6 +543,8 @@ class Account extends BaseSettings
/* Installed langs */ /* Installed langs */
$lang_choices = DI::l10n()->getAvailableLanguages(); $lang_choices = DI::l10n()->getAvailableLanguages();
$notify_type = DI::pConfig()->get(local_user(), 'system', 'notify_type', 3 | 72 | 4 | 16 | 32);
$tpl = Renderer::getMarkupTemplate('settings/account.tpl'); $tpl = Renderer::getMarkupTemplate('settings/account.tpl');
$o = Renderer::replaceMacros($tpl, [ $o = Renderer::replaceMacros($tpl, [
'$ptitle' => DI::l10n()->t('Account Settings'), '$ptitle' => DI::l10n()->t('Account Settings'),
@ -593,6 +614,12 @@ class Account extends BaseSettings
'$notify_like' => ['notify_like', DI::l10n()->t('Someone liked your content'), DI::pConfig()->get(local_user(), 'system', 'notify_like'), ''], '$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'), ''], '$notify_announce' => ['notify_announce', DI::l10n()->t('Someone shared your content'), DI::pConfig()->get(local_user(), 'system', 'notify_announce'), ''],
'$notify_tagged' => ['notify_tagged', DI::l10n()->t('Someone tagged you'), $notify_type & 3, ''],
'$notify_direct_comment' => ['notify_direct_comment', DI::l10n()->t('Someone directly commented on your post'), $notify_type & 72, ''],
'$notify_thread_comment' => ['notify_thread_comment', DI::l10n()->t('Someone commented on your thread'), $notify_type & 4, ''],
'$notify_comment_participation' => ['notify_comment_participation', DI::l10n()->t('Someone commented in a thread where you commented'), $notify_type & 16, ''],
'$notify_activity_participation' => ['notify_activity_participation', DI::l10n()->t('Someone commented on a thread where you interacted'), $notify_type & 32, ''],
'$desktop_notifications' => ['desktop_notifications', DI::l10n()->t('Activate desktop notifications'), false, DI::l10n()->t('Show desktop popup on new notifications')], '$desktop_notifications' => ['desktop_notifications', DI::l10n()->t('Activate desktop notifications'), false, DI::l10n()->t('Show desktop popup on new notifications')],
'$email_textonly' => [ '$email_textonly' => [

5
src/Navigation/Notifications/Factory/Notification.php
View file

@ -148,7 +148,7 @@ class Notification extends BaseFactory implements ICanCreateFromTableRow
return $message; return $message;
} }
if (in_array($Notification->type, [Post\UserNotification::TYPE_THREAD_COMMENT, Post\UserNotification::TYPE_COMMENT_PARTICIPATION, Post\UserNotification::TYPE_ACTIVITY_PARTICIPATION, Post\UserNotification::TYPE_EXPLICIT_TAGGED])) { if (in_array($Notification->type, [Post\UserNotification::TYPE_THREAD_COMMENT, Post\UserNotification::TYPE_COMMENT_PARTICIPATION, Post\UserNotification::TYPE_ACTIVITY_PARTICIPATION, Post\UserNotification::TYPE_FOLLOW, Post\UserNotification::TYPE_EXPLICIT_TAGGED])) {
$item = Post::selectFirst([], ['uri-id' => $Notification->parentUriId, 'uid' => [0, $Notification->uid]], ['order' => ['uid' => true]]); $item = Post::selectFirst([], ['uri-id' => $Notification->parentUriId, 'uid' => [0, $Notification->uid]], ['order' => ['uid' => true]]);
if (empty($item)) { if (empty($item)) {
$this->logger->info('Parent post not found', ['uri-id' => $Notification->parentUriId]); $this->logger->info('Parent post not found', ['uri-id' => $Notification->parentUriId]);
@ -175,7 +175,7 @@ class Notification extends BaseFactory implements ICanCreateFromTableRow
} }
} }
if (in_array($Notification->type, [Post\UserNotification::TYPE_COMMENT_PARTICIPATION, Post\UserNotification::TYPE_ACTIVITY_PARTICIPATION, Post\UserNotification::TYPE_SHARED])) { if (in_array($Notification->type, [Post\UserNotification::TYPE_COMMENT_PARTICIPATION, Post\UserNotification::TYPE_ACTIVITY_PARTICIPATION, Post\UserNotification::TYPE_FOLLOW, Post\UserNotification::TYPE_SHARED])) {
$author = Contact::getById($item['author-id'], ['id', 'name', 'url', 'contact-type']); $author = Contact::getById($item['author-id'], ['id', 'name', 'url', 'contact-type']);
if (empty($author)) { if (empty($author)) {
$this->logger->info('Author not found', ['author' => $item['author-id']]); $this->logger->info('Author not found', ['author' => $item['author-id']]);
@ -276,6 +276,7 @@ class Notification extends BaseFactory implements ICanCreateFromTableRow
case Post\UserNotification::TYPE_COMMENT_PARTICIPATION: case Post\UserNotification::TYPE_COMMENT_PARTICIPATION:
case Post\UserNotification::TYPE_ACTIVITY_PARTICIPATION: case Post\UserNotification::TYPE_ACTIVITY_PARTICIPATION:
case Post\UserNotification::TYPE_FOLLOW;
if (($causer['id'] == $author['id']) && ($title != '')) { if (($causer['id'] == $author['id']) && ($title != '')) {
$msg = $l10n->t('%1$s commented in their thread %2$s'); $msg = $l10n->t('%1$s commented in their thread %2$s');
} elseif ($causer['id'] == $author['id']) { } elseif ($causer['id'] == $author['id']) {

20
src/Navigation/Notifications/Repository/Notify.php
View file

@ -663,7 +663,7 @@ class Notify extends BaseRepository
$type = \Friendica\Factory\Api\Mastodon\Notification::getType($Notification); $type = \Friendica\Factory\Api\Mastodon\Notification::getType($Notification);
} }
if (!in_array($type, [Notification::TYPE_RESHARE, Notification::TYPE_LIKE])) { if (in_array($Notification->type, [Model\Post\UserNotification::TYPE_FOLLOW])) {
return true; return true;
} }
@ -675,6 +675,24 @@ class Notify extends BaseRepository
return true; return true;
} }
$notify_type = $this->pConfig->get(local_user(), 'system', 'notify_type', 3 | 72 | 4 | 16 | 32);
if (($notify_type & 3) && in_array($Notification->type, [Model\Post\UserNotification::TYPE_EXPLICIT_TAGGED, Model\Post\UserNotification::TYPE_IMPLICIT_TAGGED])) {
return true;
}
if (($notify_type & 72) && in_array($Notification->type, [Model\Post\UserNotification::TYPE_DIRECT_COMMENT, Model\Post\UserNotification::TYPE_DIRECT_THREAD_COMMENT])) {
return true;
}
if (($notify_type & 4) && in_array($Notification->type, [Model\Post\UserNotification::TYPE_THREAD_COMMENT])) {
return true;
}
if (($notify_type & 16) && in_array($Notification->type, [Model\Post\UserNotification::TYPE_COMMENT_PARTICIPATION])) {
return true;
}
if (($notify_type & 32) && in_array($Notification->type, [Model\Post\UserNotification::TYPE_ACTIVITY_PARTICIPATION])) {
return true;
}
return false; return false;
} }

4
static/dbstructure.config.php
View file

@ -55,7 +55,7 @@
use Friendica\Database\DBA; use Friendica\Database\DBA;
if (!defined('DB_UPDATE_VERSION')) { if (!defined('DB_UPDATE_VERSION')) {
define('DB_UPDATE_VERSION', 1465); define('DB_UPDATE_VERSION', 1466);
} }
return [ return [
@ -1430,7 +1430,7 @@ return [
"fields" => [ "fields" => [
"uri-id" => ["type" => "int unsigned", "not null" => "1", "primary" => "1", "foreign" => ["item-uri" => "id"], "comment" => "Id of the item-uri table entry that contains the item uri"], "uri-id" => ["type" => "int unsigned", "not null" => "1", "primary" => "1", "foreign" => ["item-uri" => "id"], "comment" => "Id of the item-uri table entry that contains the item uri"],
"uid" => ["type" => "mediumint unsigned", "not null" => "1", "primary" => "1", "foreign" => ["user" => "uid"], "comment" => "Owner id which owns this copy of the item"], "uid" => ["type" => "mediumint unsigned", "not null" => "1", "primary" => "1", "foreign" => ["user" => "uid"], "comment" => "Owner id which owns this copy of the item"],
"notification-type" => ["type" => "tinyint unsigned", "not null" => "1", "default" => "0", "comment" => ""], "notification-type" => ["type" => "smallint unsigned", "not null" => "1", "default" => "0", "comment" => ""],
], ],
"indexes" => [ "indexes" => [
"PRIMARY" => ["uid", "uri-id"], "PRIMARY" => ["uid", "uri-id"],

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

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: 2022.05-rc\n" "Project-Id-Version: 2022.05-rc\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-06-01 22:09+0000\n" "POT-Creation-Date: 2022-06-05 11:15+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"
@ -28,7 +28,7 @@ msgid "Access denied."
msgstr "" msgstr ""
#: mod/cal.php:63 mod/cal.php:80 mod/photos.php:69 mod/photos.php:140 #: mod/cal.php:63 mod/cal.php:80 mod/photos.php:69 mod/photos.php:140
#: mod/photos.php:804 src/Model/Profile.php:231 src/Module/Feed.php:72 #: mod/photos.php:798 src/Model/Profile.php:231 src/Module/Feed.php:72
#: src/Module/HCard.php:52 src/Module/Profile/Common.php:41 #: src/Module/HCard.php:52 src/Module/Profile/Common.php:41
#: src/Module/Profile/Common.php:52 src/Module/Profile/Contacts.php:40 #: src/Module/Profile/Common.php:52 src/Module/Profile/Contacts.php:40
#: src/Module/Profile/Contacts.php:50 src/Module/Profile/Media.php:38 #: src/Module/Profile/Contacts.php:50 src/Module/Profile/Media.php:38
@ -37,7 +37,7 @@ msgstr ""
msgid "User not found." msgid "User not found."
msgstr "" msgstr ""
#: mod/cal.php:122 mod/display.php:246 src/Module/Profile/Profile.php:94 #: mod/cal.php:122 mod/display.php:247 src/Module/Profile/Profile.php:94
#: src/Module/Profile/Profile.php:109 src/Module/Profile/Status.php:110 #: src/Module/Profile/Profile.php:109 src/Module/Profile/Status.php:110
#: src/Module/Update/Profile.php:56 #: src/Module/Update/Profile.php:56
msgid "Access to this profile has been restricted." msgid "Access to this profile has been restricted."
@ -104,24 +104,24 @@ msgstr ""
msgid "calendar" msgid "calendar"
msgstr "" msgstr ""
#: mod/display.php:141 mod/photos.php:808 #: mod/display.php:142 mod/photos.php:802
#: src/Module/Conversation/Community.php:175 src/Module/Directory.php:49 #: src/Module/Conversation/Community.php:175 src/Module/Directory.php:49
#: src/Module/Search/Index.php:50 #: src/Module/Search/Index.php:50
msgid "Public access denied." msgid "Public access denied."
msgstr "" msgstr ""
#: mod/display.php:197 mod/display.php:271 #: mod/display.php:198 mod/display.php:272
msgid "The requested item doesn't exist or has been deleted." msgid "The requested item doesn't exist or has been deleted."
msgstr "" msgstr ""
#: mod/display.php:351 #: mod/display.php:352
msgid "The feed for this item is unavailable." msgid "The feed for this item is unavailable."
msgstr "" msgstr ""
#: mod/editpost.php:38 mod/events.php:217 mod/follow.php:56 mod/follow.php:130 #: mod/editpost.php:38 mod/events.php:217 mod/follow.php:56 mod/follow.php:130
#: mod/item.php:181 mod/item.php:186 mod/item.php:875 mod/message.php:69 #: mod/item.php:181 mod/item.php:186 mod/item.php:875 mod/message.php:69
#: mod/message.php:111 mod/notes.php:44 mod/ostatus_subscribe.php:33 #: mod/message.php:111 mod/notes.php:44 mod/ostatus_subscribe.php:33
#: mod/photos.php:160 mod/photos.php:897 mod/repair_ostatus.php:31 #: mod/photos.php:160 mod/photos.php:891 mod/repair_ostatus.php:31
#: mod/settings.php:40 mod/settings.php:50 mod/settings.php:156 #: mod/settings.php:40 mod/settings.php:50 mod/settings.php:156
#: mod/suggest.php:34 mod/uimport.php:33 mod/unfollow.php:35 #: mod/suggest.php:34 mod/uimport.php:33 mod/unfollow.php:35
#: mod/unfollow.php:50 mod/unfollow.php:82 mod/wall_attach.php:67 #: mod/unfollow.php:50 mod/unfollow.php:82 mod/wall_attach.php:67
@ -139,7 +139,7 @@ msgstr ""
#: src/Module/Register.php:77 src/Module/Register.php:90 #: src/Module/Register.php:77 src/Module/Register.php:90
#: src/Module/Register.php:206 src/Module/Register.php:245 #: src/Module/Register.php:206 src/Module/Register.php:245
#: src/Module/Search/Directory.php:37 src/Module/Settings/Account.php:48 #: src/Module/Search/Directory.php:37 src/Module/Settings/Account.php:48
#: src/Module/Settings/Account.php:384 src/Module/Settings/Delegation.php:42 #: src/Module/Settings/Account.php:403 src/Module/Settings/Delegation.php:42
#: src/Module/Settings/Delegation.php:70 src/Module/Settings/Display.php:42 #: src/Module/Settings/Delegation.php:70 src/Module/Settings/Display.php:42
#: src/Module/Settings/Display.php:120 #: src/Module/Settings/Display.php:120
#: src/Module/Settings/Profile/Photo/Crop.php:166 #: src/Module/Settings/Profile/Photo/Crop.php:166
@ -164,7 +164,7 @@ msgstr ""
msgid "Save" msgid "Save"
msgstr "" msgstr ""
#: mod/editpost.php:92 mod/photos.php:1344 src/Content/Conversation.php:338 #: mod/editpost.php:92 mod/photos.php:1338 src/Content/Conversation.php:338
#: src/Module/Contact/Poke.php:176 src/Object/Post.php:989 #: src/Module/Contact/Poke.php:176 src/Object/Post.php:989
msgid "Loading..." msgid "Loading..."
msgstr "" msgstr ""
@ -229,7 +229,7 @@ msgid "clear location"
msgstr "" msgstr ""
#: mod/editpost.php:107 mod/message.php:200 mod/message.php:358 #: mod/editpost.php:107 mod/message.php:200 mod/message.php:358
#: mod/photos.php:1495 mod/wallmessage.php:142 src/Content/Conversation.php:368 #: mod/photos.php:1489 mod/wallmessage.php:142 src/Content/Conversation.php:368
#: src/Content/Conversation.php:712 src/Module/Item/Compose.php:177 #: src/Content/Conversation.php:712 src/Module/Item/Compose.php:177
#: src/Object/Post.php:528 #: src/Object/Post.php:528
msgid "Please wait" msgid "Please wait"
@ -261,14 +261,14 @@ msgstr ""
msgid "Example: bob@example.com, mary@example.com" msgid "Example: bob@example.com, mary@example.com"
msgstr "" msgstr ""
#: mod/editpost.php:128 mod/events.php:513 mod/photos.php:1343 #: mod/editpost.php:128 mod/events.php:513 mod/photos.php:1337
#: mod/photos.php:1399 mod/photos.php:1473 src/Content/Conversation.php:383 #: mod/photos.php:1393 mod/photos.php:1467 src/Content/Conversation.php:383
#: src/Module/Item/Compose.php:172 src/Object/Post.php:999 #: src/Module/Item/Compose.php:172 src/Object/Post.php:999
msgid "Preview" msgid "Preview"
msgstr "" msgstr ""
#: mod/editpost.php:130 mod/fbrowser.php:118 mod/fbrowser.php:145 #: mod/editpost.php:130 mod/fbrowser.php:118 mod/fbrowser.php:145
#: mod/follow.php:144 mod/photos.php:1010 mod/photos.php:1111 mod/tagrm.php:35 #: mod/follow.php:144 mod/photos.php:1004 mod/photos.php:1105 mod/tagrm.php:35
#: mod/tagrm.php:127 mod/unfollow.php:97 src/Content/Conversation.php:386 #: mod/tagrm.php:127 mod/unfollow.php:97 src/Content/Conversation.php:386
#: src/Module/Contact/Revoke.php:108 src/Module/RemoteFollow.php:127 #: src/Module/Contact/Revoke.php:108 src/Module/RemoteFollow.php:127
msgid "Cancel" msgid "Cancel"
@ -310,7 +310,7 @@ msgid "Link or Media"
msgstr "" msgstr ""
#: mod/editpost.php:143 src/Content/Conversation.php:393 #: mod/editpost.php:143 src/Content/Conversation.php:393
#: src/Content/Widget/VCard.php:107 src/Model/Profile.php:462 #: src/Content/Widget/VCard.php:113 src/Model/Profile.php:462
#: src/Module/Admin/Logs/View.php:93 #: src/Module/Admin/Logs/View.php:93
msgid "Message" msgid "Message"
msgstr "" msgstr ""
@ -320,8 +320,8 @@ msgstr ""
msgid "Browser" msgid "Browser"
msgstr "" msgstr ""
#: mod/editpost.php:145 mod/events.php:518 mod/photos.php:945 #: mod/editpost.php:145 mod/events.php:518 mod/photos.php:939
#: mod/photos.php:1297 src/Content/Conversation.php:370 #: mod/photos.php:1291 src/Content/Conversation.php:370
msgid "Permissions" msgid "Permissions"
msgstr "" msgstr ""
@ -385,7 +385,7 @@ msgstr ""
msgid "Description:" msgid "Description:"
msgstr "" msgstr ""
#: mod/events.php:504 src/Content/Widget/VCard.php:98 src/Model/Event.php:80 #: mod/events.php:504 src/Content/Widget/VCard.php:104 src/Model/Event.php:80
#: src/Model/Event.php:107 src/Model/Event.php:466 src/Model/Event.php:915 #: src/Model/Event.php:107 src/Model/Event.php:466 src/Model/Event.php:915
#: src/Model/Profile.php:370 src/Module/Contact/Profile.php:369 #: src/Model/Profile.php:370 src/Module/Contact/Profile.php:369
#: src/Module/Directory.php:148 src/Module/Notifications/Introductions.php:185 #: src/Module/Directory.php:148 src/Module/Notifications/Introductions.php:185
@ -402,8 +402,8 @@ msgid "Share this event"
msgstr "" msgstr ""
#: mod/events.php:515 mod/message.php:201 mod/message.php:357 #: mod/events.php:515 mod/message.php:201 mod/message.php:357
#: mod/photos.php:927 mod/photos.php:1031 mod/photos.php:1301 #: mod/photos.php:921 mod/photos.php:1025 mod/photos.php:1295
#: mod/photos.php:1342 mod/photos.php:1398 mod/photos.php:1472 #: mod/photos.php:1336 mod/photos.php:1392 mod/photos.php:1466
#: src/Module/Admin/Item/Source.php:65 src/Module/Contact/Advanced.php:132 #: src/Module/Admin/Item/Source.php:65 src/Module/Contact/Advanced.php:132
#: src/Module/Contact/Poke.php:177 src/Module/Contact/Profile.php:327 #: src/Module/Contact/Poke.php:177 src/Module/Contact/Profile.php:327
#: src/Module/Debug/ActivityPubConversion.php:145 #: src/Module/Debug/ActivityPubConversion.php:145
@ -863,11 +863,11 @@ msgstr ""
msgid "Photo Albums" msgid "Photo Albums"
msgstr "" msgstr ""
#: mod/photos.php:109 mod/photos.php:1590 #: mod/photos.php:109 mod/photos.php:1584
msgid "Recent Photos" msgid "Recent Photos"
msgstr "" msgstr ""
#: mod/photos.php:111 mod/photos.php:1079 mod/photos.php:1592 #: mod/photos.php:111 mod/photos.php:1073 mod/photos.php:1586
msgid "Upload New Photos" msgid "Upload New Photos"
msgstr "" msgstr ""
@ -895,219 +895,219 @@ msgstr ""
msgid "Failed to delete the photo." msgid "Failed to delete the photo."
msgstr "" msgstr ""
#: mod/photos.php:559 #: mod/photos.php:553
msgid "a photo" msgid "a photo"
msgstr "" msgstr ""
#: mod/photos.php:559 #: mod/photos.php:553
#, php-format #, php-format
msgid "%1$s was tagged in %2$s by %3$s" msgid "%1$s was tagged in %2$s by %3$s"
msgstr "" msgstr ""
#: mod/photos.php:642 mod/photos.php:645 mod/photos.php:672 #: mod/photos.php:636 mod/photos.php:639 mod/photos.php:666
#: mod/wall_upload.php:201 src/Module/Settings/Profile/Photo/Index.php:60 #: mod/wall_upload.php:201 src/Module/Settings/Profile/Photo/Index.php:60
#, php-format #, php-format
msgid "Image exceeds size limit of %s" msgid "Image exceeds size limit of %s"
msgstr "" msgstr ""
#: mod/photos.php:648 #: mod/photos.php:642
msgid "Image upload didn't complete, please try again" msgid "Image upload didn't complete, please try again"
msgstr "" msgstr ""
#: mod/photos.php:651 #: mod/photos.php:645
msgid "Image file is missing" msgid "Image file is missing"
msgstr "" msgstr ""
#: mod/photos.php:656 #: mod/photos.php:650
msgid "" msgid ""
"Server can't accept new file upload at this time, please contact your " "Server can't accept new file upload at this time, please contact your "
"administrator" "administrator"
msgstr "" msgstr ""
#: mod/photos.php:680 #: mod/photos.php:674
msgid "Image file is empty." msgid "Image file is empty."
msgstr "" msgstr ""
#: mod/photos.php:695 mod/wall_upload.php:163 #: mod/photos.php:689 mod/wall_upload.php:163
#: src/Module/Settings/Profile/Photo/Index.php:69 #: src/Module/Settings/Profile/Photo/Index.php:69
msgid "Unable to process image." msgid "Unable to process image."
msgstr "" msgstr ""
#: mod/photos.php:721 mod/wall_upload.php:226 #: mod/photos.php:715 mod/wall_upload.php:226
#: src/Module/Settings/Profile/Photo/Index.php:96 #: src/Module/Settings/Profile/Photo/Index.php:96
msgid "Image upload failed." msgid "Image upload failed."
msgstr "" msgstr ""
#: mod/photos.php:813 #: mod/photos.php:807
msgid "No photos selected" msgid "No photos selected"
msgstr "" msgstr ""
#: mod/photos.php:882 #: mod/photos.php:876
msgid "Access to this item is restricted." msgid "Access to this item is restricted."
msgstr "" msgstr ""
#: mod/photos.php:937 #: mod/photos.php:931
msgid "Upload Photos" msgid "Upload Photos"
msgstr "" msgstr ""
#: mod/photos.php:941 mod/photos.php:1027 #: mod/photos.php:935 mod/photos.php:1021
msgid "New album name: " msgid "New album name: "
msgstr "" msgstr ""
#: mod/photos.php:942 #: mod/photos.php:936
msgid "or select existing album:" msgid "or select existing album:"
msgstr "" msgstr ""
#: mod/photos.php:943 #: mod/photos.php:937
msgid "Do not show a status post for this upload" msgid "Do not show a status post for this upload"
msgstr "" msgstr ""
#: mod/photos.php:1008 #: mod/photos.php:1002
msgid "Do you really want to delete this photo album and all its photos?" msgid "Do you really want to delete this photo album and all its photos?"
msgstr "" msgstr ""
#: mod/photos.php:1009 mod/photos.php:1032 #: mod/photos.php:1003 mod/photos.php:1026
msgid "Delete Album" msgid "Delete Album"
msgstr "" msgstr ""
#: mod/photos.php:1036 #: mod/photos.php:1030
msgid "Edit Album" msgid "Edit Album"
msgstr "" msgstr ""
#: mod/photos.php:1037 #: mod/photos.php:1031
msgid "Drop Album" msgid "Drop Album"
msgstr "" msgstr ""
#: mod/photos.php:1041 #: mod/photos.php:1035
msgid "Show Newest First" msgid "Show Newest First"
msgstr "" msgstr ""
#: mod/photos.php:1043 #: mod/photos.php:1037
msgid "Show Oldest First" msgid "Show Oldest First"
msgstr "" msgstr ""
#: mod/photos.php:1064 mod/photos.php:1575 #: mod/photos.php:1058 mod/photos.php:1569
msgid "View Photo" msgid "View Photo"
msgstr "" msgstr ""
#: mod/photos.php:1097 #: mod/photos.php:1091
msgid "Permission denied. Access to this item may be restricted." msgid "Permission denied. Access to this item may be restricted."
msgstr "" msgstr ""
#: mod/photos.php:1099 #: mod/photos.php:1093
msgid "Photo not available" msgid "Photo not available"
msgstr "" msgstr ""
#: mod/photos.php:1109 #: mod/photos.php:1103
msgid "Do you really want to delete this photo?" msgid "Do you really want to delete this photo?"
msgstr "" msgstr ""
#: mod/photos.php:1110 mod/photos.php:1302 #: mod/photos.php:1104 mod/photos.php:1296
msgid "Delete Photo" msgid "Delete Photo"
msgstr "" msgstr ""
#: mod/photos.php:1202 #: mod/photos.php:1196
msgid "View photo" msgid "View photo"
msgstr "" msgstr ""
#: mod/photos.php:1204 #: mod/photos.php:1198
msgid "Edit photo" msgid "Edit photo"
msgstr "" msgstr ""
#: mod/photos.php:1205 #: mod/photos.php:1199
msgid "Delete photo" msgid "Delete photo"
msgstr "" msgstr ""
#: mod/photos.php:1206 #: mod/photos.php:1200
msgid "Use as profile photo" msgid "Use as profile photo"
msgstr "" msgstr ""
#: mod/photos.php:1213 #: mod/photos.php:1207
msgid "Private Photo" msgid "Private Photo"
msgstr "" msgstr ""
#: mod/photos.php:1219 #: mod/photos.php:1213
msgid "View Full Size" msgid "View Full Size"
msgstr "" msgstr ""
#: mod/photos.php:1270 #: mod/photos.php:1264
msgid "Tags: " msgid "Tags: "
msgstr "" msgstr ""
#: mod/photos.php:1273 #: mod/photos.php:1267
msgid "[Select tags to remove]" msgid "[Select tags to remove]"
msgstr "" msgstr ""
#: mod/photos.php:1288 #: mod/photos.php:1282
msgid "New album name" msgid "New album name"
msgstr "" msgstr ""
#: mod/photos.php:1289 #: mod/photos.php:1283
msgid "Caption" msgid "Caption"
msgstr "" msgstr ""
#: mod/photos.php:1290 #: mod/photos.php:1284
msgid "Add a Tag" msgid "Add a Tag"
msgstr "" msgstr ""
#: mod/photos.php:1290 #: mod/photos.php:1284
msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
msgstr "" msgstr ""
#: mod/photos.php:1291 #: mod/photos.php:1285
msgid "Do not rotate" msgid "Do not rotate"
msgstr "" msgstr ""
#: mod/photos.php:1292 #: mod/photos.php:1286
msgid "Rotate CW (right)" msgid "Rotate CW (right)"
msgstr "" msgstr ""
#: mod/photos.php:1293 #: mod/photos.php:1287
msgid "Rotate CCW (left)" msgid "Rotate CCW (left)"
msgstr "" msgstr ""
#: mod/photos.php:1339 mod/photos.php:1395 mod/photos.php:1469 #: mod/photos.php:1333 mod/photos.php:1389 mod/photos.php:1463
#: src/Module/Contact.php:544 src/Module/Item/Compose.php:160 #: src/Module/Contact.php:544 src/Module/Item/Compose.php:160
#: src/Object/Post.php:985 #: src/Object/Post.php:985
msgid "This is you" msgid "This is you"
msgstr "" msgstr ""
#: mod/photos.php:1341 mod/photos.php:1397 mod/photos.php:1471 #: mod/photos.php:1335 mod/photos.php:1391 mod/photos.php:1465
#: src/Object/Post.php:522 src/Object/Post.php:987 #: src/Object/Post.php:522 src/Object/Post.php:987
msgid "Comment" msgid "Comment"
msgstr "" msgstr ""
#: mod/photos.php:1430 src/Content/Conversation.php:628 src/Object/Post.php:247 #: mod/photos.php:1424 src/Content/Conversation.php:628 src/Object/Post.php:247
msgid "Select" msgid "Select"
msgstr "" msgstr ""
#: mod/photos.php:1431 mod/settings.php:350 src/Content/Conversation.php:629 #: mod/photos.php:1425 mod/settings.php:350 src/Content/Conversation.php:629
#: src/Module/Admin/Users/Active.php:139 src/Module/Admin/Users/Blocked.php:140 #: src/Module/Admin/Users/Active.php:139 src/Module/Admin/Users/Blocked.php:140
#: src/Module/Admin/Users/Index.php:153 #: src/Module/Admin/Users/Index.php:153
msgid "Delete" msgid "Delete"
msgstr "" msgstr ""
#: mod/photos.php:1492 src/Object/Post.php:369 #: mod/photos.php:1486 src/Object/Post.php:369
msgid "Like" msgid "Like"
msgstr "" msgstr ""
#: mod/photos.php:1493 src/Object/Post.php:369 #: mod/photos.php:1487 src/Object/Post.php:369
msgid "I like this (toggle)" msgid "I like this (toggle)"
msgstr "" msgstr ""
#: mod/photos.php:1494 src/Object/Post.php:370 #: mod/photos.php:1488 src/Object/Post.php:370
msgid "Dislike" msgid "Dislike"
msgstr "" msgstr ""
#: mod/photos.php:1496 src/Object/Post.php:370 #: mod/photos.php:1490 src/Object/Post.php:370
msgid "I don't like this (toggle)" msgid "I don't like this (toggle)"
msgstr "" msgstr ""
#: mod/photos.php:1518 #: mod/photos.php:1512
msgid "Map" msgid "Map"
msgstr "" msgstr ""
#: mod/photos.php:1581 #: mod/photos.php:1575
msgid "View Album" msgid "View Album"
msgstr "" msgstr ""
@ -1128,36 +1128,36 @@ msgstr ""
msgid "Contact not found." msgid "Contact not found."
msgstr "" msgstr ""
#: mod/removeme.php:63 src/Navigation/Notifications/Repository/Notify.php:482 #: mod/removeme.php:65 src/Navigation/Notifications/Repository/Notify.php:482
msgid "[Friendica System Notify]" msgid "[Friendica System Notify]"
msgstr "" msgstr ""
#: mod/removeme.php:63 #: mod/removeme.php:65
msgid "User deleted their account" msgid "User deleted their account"
msgstr "" msgstr ""
#: mod/removeme.php:64 #: mod/removeme.php:66
msgid "" msgid ""
"On your Friendica node an user deleted their account. Please ensure that " "On your Friendica node an user deleted their account. Please ensure that "
"their data is removed from the backups." "their data is removed from the backups."
msgstr "" msgstr ""
#: mod/removeme.php:65 #: mod/removeme.php:67
#, php-format #, php-format
msgid "The user id is %d" msgid "The user id is %d"
msgstr "" msgstr ""
#: mod/removeme.php:99 mod/removeme.php:102 #: mod/removeme.php:101 mod/removeme.php:104
msgid "Remove My Account" msgid "Remove My Account"
msgstr "" msgstr ""
#: mod/removeme.php:100 #: mod/removeme.php:102
msgid "" msgid ""
"This will completely remove your account. Once this has been done it is not " "This will completely remove your account. Once this has been done it is not "
"recoverable." "recoverable."
msgstr "" msgstr ""
#: mod/removeme.php:101 #: mod/removeme.php:103
msgid "Please enter your password for verification:" msgid "Please enter your password for verification:"
msgstr "" msgstr ""
@ -1204,7 +1204,7 @@ msgstr ""
#: mod/settings.php:352 src/Module/Admin/Addons/Index.php:69 #: mod/settings.php:352 src/Module/Admin/Addons/Index.php:69
#: src/Module/Admin/Features.php:87 src/Module/Admin/Logs/Settings.php:81 #: src/Module/Admin/Features.php:87 src/Module/Admin/Logs/Settings.php:81
#: src/Module/Admin/Site.php:434 src/Module/Admin/Themes/Index.php:113 #: src/Module/Admin/Site.php:434 src/Module/Admin/Themes/Index.php:113
#: src/Module/Admin/Tos.php:83 src/Module/Settings/Account.php:532 #: src/Module/Admin/Tos.php:83 src/Module/Settings/Account.php:553
#: src/Module/Settings/Delegation.php:170 src/Module/Settings/Display.php:193 #: src/Module/Settings/Delegation.php:170 src/Module/Settings/Display.php:193
msgid "Save Settings" msgid "Save Settings"
msgstr "" msgstr ""
@ -2651,7 +2651,7 @@ msgstr ""
msgid "The end" msgid "The end"
msgstr "" msgstr ""
#: src/Content/Text/HTML.php:875 src/Content/Widget/VCard.php:103 #: src/Content/Text/HTML.php:875 src/Content/Widget/VCard.php:109
#: src/Model/Profile.php:456 #: src/Model/Profile.php:456
msgid "Follow" msgid "Follow"
msgstr "" msgstr ""
@ -2778,7 +2778,7 @@ msgstr ""
msgid "News" msgid "News"
msgstr "" msgstr ""
#: src/Content/Widget.php:525 src/Module/Settings/Account.php:430 #: src/Content/Widget.php:525 src/Module/Settings/Account.php:449
msgid "Account Types" msgid "Account Types"
msgstr "" msgstr ""
@ -2832,22 +2832,22 @@ msgstr[1] ""
msgid "More Trending Tags" msgid "More Trending Tags"
msgstr "" msgstr ""
#: src/Content/Widget/VCard.php:96 src/Model/Profile.php:375 #: src/Content/Widget/VCard.php:102 src/Model/Profile.php:375
#: src/Module/Contact/Profile.php:371 src/Module/Profile/Profile.php:176 #: src/Module/Contact/Profile.php:371 src/Module/Profile/Profile.php:176
msgid "XMPP:" msgid "XMPP:"
msgstr "" msgstr ""
#: src/Content/Widget/VCard.php:97 src/Model/Profile.php:376 #: src/Content/Widget/VCard.php:103 src/Model/Profile.php:376
#: src/Module/Contact/Profile.php:373 src/Module/Profile/Profile.php:180 #: src/Module/Contact/Profile.php:373 src/Module/Profile/Profile.php:180
msgid "Matrix:" msgid "Matrix:"
msgstr "" msgstr ""
#: src/Content/Widget/VCard.php:101 src/Model/Profile.php:468 #: src/Content/Widget/VCard.php:107 src/Model/Profile.php:468
#: src/Module/Notifications/Introductions.php:199 #: src/Module/Notifications/Introductions.php:199
msgid "Network:" msgid "Network:"
msgstr "" msgstr ""
#: src/Content/Widget/VCard.php:105 src/Model/Profile.php:458 #: src/Content/Widget/VCard.php:111 src/Model/Profile.php:458
msgid "Unfollow" msgid "Unfollow"
msgstr "" msgstr ""
@ -4368,19 +4368,19 @@ msgstr ""
msgid "List of pending user deletions" msgid "List of pending user deletions"
msgstr "" msgstr ""
#: src/Module/Admin/BaseUsers.php:100 src/Module/Settings/Account.php:468 #: src/Module/Admin/BaseUsers.php:100 src/Module/Settings/Account.php:487
msgid "Normal Account Page" msgid "Normal Account Page"
msgstr "" msgstr ""
#: src/Module/Admin/BaseUsers.php:101 src/Module/Settings/Account.php:475 #: src/Module/Admin/BaseUsers.php:101 src/Module/Settings/Account.php:494
msgid "Soapbox Page" msgid "Soapbox Page"
msgstr "" msgstr ""
#: src/Module/Admin/BaseUsers.php:102 src/Module/Settings/Account.php:482 #: src/Module/Admin/BaseUsers.php:102 src/Module/Settings/Account.php:501
msgid "Public Forum" msgid "Public Forum"
msgstr "" msgstr ""
#: src/Module/Admin/BaseUsers.php:103 src/Module/Settings/Account.php:489 #: src/Module/Admin/BaseUsers.php:103 src/Module/Settings/Account.php:508
msgid "Automatic Friend Page" msgid "Automatic Friend Page"
msgstr "" msgstr ""
@ -4388,19 +4388,19 @@ msgstr ""
msgid "Private Forum" msgid "Private Forum"
msgstr "" msgstr ""
#: src/Module/Admin/BaseUsers.php:107 src/Module/Settings/Account.php:440 #: src/Module/Admin/BaseUsers.php:107 src/Module/Settings/Account.php:459
msgid "Personal Page" msgid "Personal Page"
msgstr "" msgstr ""
#: src/Module/Admin/BaseUsers.php:108 src/Module/Settings/Account.php:447 #: src/Module/Admin/BaseUsers.php:108 src/Module/Settings/Account.php:466
msgid "Organisation Page" msgid "Organisation Page"
msgstr "" msgstr ""
#: src/Module/Admin/BaseUsers.php:109 src/Module/Settings/Account.php:454 #: src/Module/Admin/BaseUsers.php:109 src/Module/Settings/Account.php:473
msgid "News Page" msgid "News Page"
msgstr "" msgstr ""
#: src/Module/Admin/BaseUsers.php:110 src/Module/Settings/Account.php:461 #: src/Module/Admin/BaseUsers.php:110 src/Module/Settings/Account.php:480
msgid "Community Forum" msgid "Community Forum"
msgstr "" msgstr ""
@ -8241,7 +8241,7 @@ msgid ""
"\"btn btn-sm pull-right\">Cancel</a>" "\"btn btn-sm pull-right\">Cancel</a>"
msgstr "" msgstr ""
#: src/Module/Profile/Profile.php:144 src/Module/Settings/Account.php:548 #: src/Module/Profile/Profile.php:144 src/Module/Settings/Account.php:569
msgid "Full Name:" msgid "Full Name:"
msgstr "" msgstr ""
@ -8371,7 +8371,7 @@ msgstr ""
msgid "Please repeat your e-mail address:" msgid "Please repeat your e-mail address:"
msgstr "" msgstr ""
#: src/Module/Register.php:162 src/Module/Settings/Account.php:539 #: src/Module/Register.php:162 src/Module/Settings/Account.php:560
msgid "New Password:" msgid "New Password:"
msgstr "" msgstr ""
@ -8379,7 +8379,7 @@ msgstr ""
msgid "Leave empty for an auto generated password." msgid "Leave empty for an auto generated password."
msgstr "" msgstr ""
#: src/Module/Register.php:163 src/Module/Settings/Account.php:540 #: src/Module/Register.php:163 src/Module/Settings/Account.php:561
msgid "Confirm:" msgid "Confirm:"
msgstr "" msgstr ""
@ -8675,98 +8675,98 @@ msgid "Cannot change to that email."
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:147 src/Module/Settings/Account.php:199 #: src/Module/Settings/Account.php:147 src/Module/Settings/Account.php:199
#: src/Module/Settings/Account.php:219 src/Module/Settings/Account.php:279 #: src/Module/Settings/Account.php:219 src/Module/Settings/Account.php:298
#: src/Module/Settings/Account.php:328 #: src/Module/Settings/Account.php:347
msgid "Settings were not updated." msgid "Settings were not updated."
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:340 #: src/Module/Settings/Account.php:359
msgid "Contact CSV file upload error" msgid "Contact CSV file upload error"
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:359 #: src/Module/Settings/Account.php:378
msgid "Importing Contacts done" msgid "Importing Contacts done"
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:372 #: src/Module/Settings/Account.php:391
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:389 #: src/Module/Settings/Account.php:408
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:431 #: src/Module/Settings/Account.php:450
msgid "Personal Page Subtypes" msgid "Personal Page Subtypes"
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:432 #: src/Module/Settings/Account.php:451
msgid "Community Forum Subtypes" msgid "Community Forum Subtypes"
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:442 #: src/Module/Settings/Account.php:461
msgid "Account for a personal profile." msgid "Account for a personal profile."
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:449 #: src/Module/Settings/Account.php:468
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:456 #: src/Module/Settings/Account.php:475
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:463 #: src/Module/Settings/Account.php:482
msgid "Account for community discussions." msgid "Account for community discussions."
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:470 #: src/Module/Settings/Account.php:489
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:477 #: src/Module/Settings/Account.php:496
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:484 #: src/Module/Settings/Account.php:503
msgid "Automatically approves all contact requests." msgid "Automatically approves all contact requests."
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:491 #: src/Module/Settings/Account.php:510
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:496 #: src/Module/Settings/Account.php:515
msgid "Private Forum [Experimental]" msgid "Private Forum [Experimental]"
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:498 #: src/Module/Settings/Account.php:517
msgid "Requires manual approval of contact requests." msgid "Requires manual approval of contact requests."
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:507 #: src/Module/Settings/Account.php:526
msgid "OpenID:" msgid "OpenID:"
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:507 #: src/Module/Settings/Account.php:526
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:515 #: src/Module/Settings/Account.php:534
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:515 #: src/Module/Settings/Account.php:534
#, 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 "
@ -8774,103 +8774,103 @@ msgid ""
"system settings." "system settings."
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:521 #: src/Module/Settings/Account.php:540
#, 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:529 #: src/Module/Settings/Account.php:550
msgid "Account Settings" msgid "Account Settings"
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:530 #: src/Module/Settings/Account.php:551
#, 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:538 #: src/Module/Settings/Account.php:559
msgid "Password Settings" msgid "Password Settings"
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:539 #: src/Module/Settings/Account.php:560
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, accentuated letters and colon (:)." "spaces, accentuated letters and colon (:)."
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:540 #: src/Module/Settings/Account.php:561
msgid "Leave password fields blank unless changing" msgid "Leave password fields blank unless changing"
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:541 #: src/Module/Settings/Account.php:562
msgid "Current Password:" msgid "Current Password:"
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:541 #: src/Module/Settings/Account.php:562
msgid "Your current password to confirm the changes" msgid "Your current password to confirm the changes"
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:542 #: src/Module/Settings/Account.php:563
msgid "Password:" msgid "Password:"
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:542 #: src/Module/Settings/Account.php:563
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:545 #: src/Module/Settings/Account.php:566
msgid "Delete OpenID URL" msgid "Delete OpenID URL"
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:547 #: src/Module/Settings/Account.php:568
msgid "Basic Settings" msgid "Basic Settings"
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:549 #: src/Module/Settings/Account.php:570
msgid "Email Address:" msgid "Email Address:"
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:550 #: src/Module/Settings/Account.php:571
msgid "Your Timezone:" msgid "Your Timezone:"
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:551 #: src/Module/Settings/Account.php:572
msgid "Your Language:" msgid "Your Language:"
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:551 #: src/Module/Settings/Account.php:572
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:552 #: src/Module/Settings/Account.php:573
msgid "Default Post Location:" msgid "Default Post Location:"
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:553 #: src/Module/Settings/Account.php:574
msgid "Use Browser Location:" msgid "Use Browser Location:"
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:555 #: src/Module/Settings/Account.php:576
msgid "Security and Privacy Settings" msgid "Security and Privacy Settings"
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:557 #: src/Module/Settings/Account.php:578
msgid "Maximum Friend Requests/Day:" msgid "Maximum Friend Requests/Day:"
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:557 src/Module/Settings/Account.php:567 #: src/Module/Settings/Account.php:578 src/Module/Settings/Account.php:588
msgid "(to prevent spam abuse)" msgid "(to prevent spam abuse)"
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:559 #: src/Module/Settings/Account.php:580
msgid "Allow your profile to be searchable globally?" msgid "Allow your profile to be searchable globally?"
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:559 #: src/Module/Settings/Account.php:580
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 "
@ -8878,43 +8878,43 @@ msgid ""
"indexed or not." "indexed or not."
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:560 #: src/Module/Settings/Account.php:581
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:560 #: src/Module/Settings/Account.php:581
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:561 #: src/Module/Settings/Account.php:582
msgid "Hide your profile details from anonymous viewers?" msgid "Hide your profile details from anonymous viewers?"
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:561 #: src/Module/Settings/Account.php:582
msgid "" msgid ""
"Anonymous visitors will only see your profile picture, your display name and " "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 " "the nickname you are using on your profile page. Your public posts and "
"replies will still be accessible by other means." "replies will still be accessible by other means."
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:562 #: src/Module/Settings/Account.php:583
msgid "Make public posts unlisted" msgid "Make public posts unlisted"
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:562 #: src/Module/Settings/Account.php:583
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:563 #: src/Module/Settings/Account.php:584
msgid "Make all posted pictures accessible" msgid "Make all posted pictures accessible"
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:563 #: src/Module/Settings/Account.php:584
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 "
@ -8922,213 +8922,233 @@ msgid ""
"public on your photo albums though." "public on your photo albums though."
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:564 #: src/Module/Settings/Account.php:585
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:564 #: src/Module/Settings/Account.php:585
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:565 #: src/Module/Settings/Account.php:586
msgid "Allow friends to tag your posts?" msgid "Allow friends to tag your posts?"
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:565 #: src/Module/Settings/Account.php:586
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:566 #: src/Module/Settings/Account.php:587
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:566 #: src/Module/Settings/Account.php:587
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:567 #: src/Module/Settings/Account.php:588
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:569 #: src/Module/Settings/Account.php:590
msgid "Default Post Permissions" msgid "Default Post Permissions"
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:573 #: src/Module/Settings/Account.php:594
msgid "Expiration settings" msgid "Expiration settings"
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:574 #: src/Module/Settings/Account.php:595
msgid "Automatically expire posts after this many days:" msgid "Automatically expire posts after this many days:"
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:574 #: src/Module/Settings/Account.php:595
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:575 #: src/Module/Settings/Account.php:596
msgid "Expire posts" msgid "Expire posts"
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:575 #: src/Module/Settings/Account.php:596
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:576 #: src/Module/Settings/Account.php:597
msgid "Expire personal notes" msgid "Expire personal notes"
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:576 #: src/Module/Settings/Account.php:597
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:577 #: src/Module/Settings/Account.php:598
msgid "Expire starred posts" msgid "Expire starred posts"
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:577 #: src/Module/Settings/Account.php:598
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:578 #: src/Module/Settings/Account.php:599
msgid "Only expire posts by others" msgid "Only expire posts by others"
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:578 #: src/Module/Settings/Account.php:599
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:581 #: src/Module/Settings/Account.php:602
msgid "Notification Settings" msgid "Notification Settings"
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:582 #: src/Module/Settings/Account.php:603
msgid "Send a notification email when:" msgid "Send a notification email when:"
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:583 #: src/Module/Settings/Account.php:604
msgid "You receive an introduction" msgid "You receive an introduction"
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:584 #: src/Module/Settings/Account.php:605
msgid "Your introductions are confirmed" msgid "Your introductions are confirmed"
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:585 #: src/Module/Settings/Account.php:606
msgid "Someone writes on your profile wall" msgid "Someone writes on your profile wall"
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:586 #: src/Module/Settings/Account.php:607
msgid "Someone writes a followup comment" msgid "Someone writes a followup comment"
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:587 #: src/Module/Settings/Account.php:608
msgid "You receive a private message" msgid "You receive a private message"
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:588 #: src/Module/Settings/Account.php:609
msgid "You receive a friend suggestion" msgid "You receive a friend suggestion"
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:589 #: src/Module/Settings/Account.php:610
msgid "You are tagged in a post" msgid "You are tagged in a post"
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:590 #: src/Module/Settings/Account.php:611
msgid "You are poked/prodded/etc. in a post" msgid "You are poked/prodded/etc. in a post"
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:592 #: src/Module/Settings/Account.php:613
msgid "Create a desktop notification when:" msgid "Create a desktop notification when:"
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:593 #: src/Module/Settings/Account.php:614
msgid "Someone liked your content" msgid "Someone liked your content"
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:594 #: src/Module/Settings/Account.php:615
msgid "Someone shared your content" msgid "Someone shared your content"
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:596 #: src/Module/Settings/Account.php:617
msgid "Someone tagged you"
msgstr ""
#: src/Module/Settings/Account.php:618
msgid "Someone directly commented on your post"
msgstr ""
#: src/Module/Settings/Account.php:619
msgid "Someone commented on your thread"
msgstr ""
#: src/Module/Settings/Account.php:620
msgid "Someone commented in a thread where you commented"
msgstr ""
#: src/Module/Settings/Account.php:621
msgid "Someone commented on a thread where you interacted"
msgstr ""
#: src/Module/Settings/Account.php:623
msgid "Activate desktop notifications" msgid "Activate desktop notifications"
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:596 #: src/Module/Settings/Account.php:623
msgid "Show desktop popup on new notifications" msgid "Show desktop popup on new notifications"
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:600 #: src/Module/Settings/Account.php:627
msgid "Text-only notification emails" msgid "Text-only notification emails"
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:602 #: src/Module/Settings/Account.php:629
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:606 #: src/Module/Settings/Account.php:633
msgid "Show detailled notifications" msgid "Show detailled notifications"
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:608 #: src/Module/Settings/Account.php:635
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:612 #: src/Module/Settings/Account.php:639
msgid "Show notifications of ignored contacts" msgid "Show notifications of ignored contacts"
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:614 #: src/Module/Settings/Account.php:641
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:617 #: src/Module/Settings/Account.php:644
msgid "Advanced Account/Page Type Settings" msgid "Advanced Account/Page Type Settings"
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:618 #: src/Module/Settings/Account.php:645
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:621 #: src/Module/Settings/Account.php:648
msgid "Import Contacts" msgid "Import Contacts"
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:622 #: src/Module/Settings/Account.php:649
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:623 #: src/Module/Settings/Account.php:650
msgid "Upload File" msgid "Upload File"
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:626 #: src/Module/Settings/Account.php:653
msgid "Relocate" msgid "Relocate"
msgstr "" msgstr ""
#: src/Module/Settings/Account.php:627 #: src/Module/Settings/Account.php:654
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:628 #: src/Module/Settings/Account.php:655
msgid "Resend relocate message to contacts" msgid "Resend relocate message to contacts"
msgstr "" msgstr ""
@ -10132,132 +10152,132 @@ msgstr ""
msgid "New Follower" msgid "New Follower"
msgstr "" msgstr ""
#: src/Navigation/Notifications/Factory/Notification.php:130 #: src/Navigation/Notifications/Factory/Notification.php:134
#, php-format #, php-format
msgid "%1$s wants to follow you" msgid "%1$s wants to follow you"
msgstr "" msgstr ""
#: src/Navigation/Notifications/Factory/Notification.php:132 #: src/Navigation/Notifications/Factory/Notification.php:136
#, php-format #, php-format
msgid "%1$s has started following you" msgid "%1$s has started following you"
msgstr "" msgstr ""
#: src/Navigation/Notifications/Factory/Notification.php:196 #: src/Navigation/Notifications/Factory/Notification.php:200
#, php-format #, php-format
msgid "%1$s liked your comment on %2$s" msgid "%1$s liked your comment on %2$s"
msgstr "" msgstr ""
#: src/Navigation/Notifications/Factory/Notification.php:199 #: src/Navigation/Notifications/Factory/Notification.php:203
#, php-format #, php-format
msgid "%1$s liked your post %2$s" msgid "%1$s liked your post %2$s"
msgstr "" msgstr ""
#: src/Navigation/Notifications/Factory/Notification.php:206 #: src/Navigation/Notifications/Factory/Notification.php:210
#, php-format #, php-format
msgid "%1$s disliked your comment on %2$s" msgid "%1$s disliked your comment on %2$s"
msgstr "" msgstr ""
#: src/Navigation/Notifications/Factory/Notification.php:209 #: src/Navigation/Notifications/Factory/Notification.php:213
#, php-format #, php-format
msgid "%1$s disliked your post %2$s" msgid "%1$s disliked your post %2$s"
msgstr "" msgstr ""
#: src/Navigation/Notifications/Factory/Notification.php:216 #: src/Navigation/Notifications/Factory/Notification.php:220
#, php-format #, php-format
msgid "%1$s shared your comment %2$s" msgid "%1$s shared your comment %2$s"
msgstr "" msgstr ""
#: src/Navigation/Notifications/Factory/Notification.php:219 #: src/Navigation/Notifications/Factory/Notification.php:223
#, php-format #, php-format
msgid "%1$s shared your post %2$s" msgid "%1$s shared your post %2$s"
msgstr "" msgstr ""
#: src/Navigation/Notifications/Factory/Notification.php:223 #: src/Navigation/Notifications/Factory/Notification.php:227
#: src/Navigation/Notifications/Factory/Notification.php:292 #: src/Navigation/Notifications/Factory/Notification.php:297
#, php-format #, php-format
msgid "%1$s shared the post %2$s from %3$s" msgid "%1$s shared the post %2$s from %3$s"
msgstr "" msgstr ""
#: src/Navigation/Notifications/Factory/Notification.php:225 #: src/Navigation/Notifications/Factory/Notification.php:229
#: src/Navigation/Notifications/Factory/Notification.php:294 #: src/Navigation/Notifications/Factory/Notification.php:299
#, php-format #, php-format
msgid "%1$s shared a post from %3$s" msgid "%1$s shared a post from %3$s"
msgstr "" msgstr ""
#: src/Navigation/Notifications/Factory/Notification.php:227 #: src/Navigation/Notifications/Factory/Notification.php:231
#: src/Navigation/Notifications/Factory/Notification.php:296 #: src/Navigation/Notifications/Factory/Notification.php:301
#, php-format #, php-format
msgid "%1$s shared the post %2$s" msgid "%1$s shared the post %2$s"
msgstr "" msgstr ""
#: src/Navigation/Notifications/Factory/Notification.php:229 #: src/Navigation/Notifications/Factory/Notification.php:233
#: src/Navigation/Notifications/Factory/Notification.php:298 #: src/Navigation/Notifications/Factory/Notification.php:303
#, php-format #, php-format
msgid "%1$s shared a post" msgid "%1$s shared a post"
msgstr "" msgstr ""
#: src/Navigation/Notifications/Factory/Notification.php:237 #: src/Navigation/Notifications/Factory/Notification.php:241
#, php-format #, php-format
msgid "%1$s wants to attend your event %2$s" msgid "%1$s wants to attend your event %2$s"
msgstr "" msgstr ""
#: src/Navigation/Notifications/Factory/Notification.php:244 #: src/Navigation/Notifications/Factory/Notification.php:248
#, php-format #, php-format
msgid "%1$s does not want to attend your event %2$s" msgid "%1$s does not want to attend your event %2$s"
msgstr "" msgstr ""
#: src/Navigation/Notifications/Factory/Notification.php:251 #: src/Navigation/Notifications/Factory/Notification.php:255
#, php-format #, php-format
msgid "%1$s maybe wants to attend your event %2$s" msgid "%1$s maybe wants to attend your event %2$s"
msgstr "" msgstr ""
#: src/Navigation/Notifications/Factory/Notification.php:258 #: src/Navigation/Notifications/Factory/Notification.php:262
#, php-format #, php-format
msgid "%1$s tagged you on %2$s" msgid "%1$s tagged you on %2$s"
msgstr "" msgstr ""
#: src/Navigation/Notifications/Factory/Notification.php:262 #: src/Navigation/Notifications/Factory/Notification.php:266
#, php-format #, php-format
msgid "%1$s replied to you on %2$s" msgid "%1$s replied to you on %2$s"
msgstr "" msgstr ""
#: src/Navigation/Notifications/Factory/Notification.php:266 #: src/Navigation/Notifications/Factory/Notification.php:270
#, php-format #, php-format
msgid "%1$s commented in your thread %2$s" msgid "%1$s commented in your thread %2$s"
msgstr "" msgstr ""
#: src/Navigation/Notifications/Factory/Notification.php:270 #: src/Navigation/Notifications/Factory/Notification.php:274
#, php-format #, php-format
msgid "%1$s commented on your comment %2$s" msgid "%1$s commented on your comment %2$s"
msgstr "" msgstr ""
#: src/Navigation/Notifications/Factory/Notification.php:276 #: src/Navigation/Notifications/Factory/Notification.php:281
#, php-format #, php-format
msgid "%1$s commented in their thread %2$s" msgid "%1$s commented in their thread %2$s"
msgstr "" msgstr ""
#: src/Navigation/Notifications/Factory/Notification.php:278 #: src/Navigation/Notifications/Factory/Notification.php:283
#, php-format #, php-format
msgid "%1$s commented in their thread" msgid "%1$s commented in their thread"
msgstr "" msgstr ""
#: src/Navigation/Notifications/Factory/Notification.php:280 #: src/Navigation/Notifications/Factory/Notification.php:285
#, php-format #, php-format
msgid "%1$s commented in the thread %2$s from %3$s" msgid "%1$s commented in the thread %2$s from %3$s"
msgstr "" msgstr ""
#: src/Navigation/Notifications/Factory/Notification.php:282 #: src/Navigation/Notifications/Factory/Notification.php:287
#, php-format #, php-format
msgid "%1$s commented in the thread from %3$s" msgid "%1$s commented in the thread from %3$s"
msgstr "" msgstr ""
#: src/Navigation/Notifications/Factory/Notification.php:287 #: src/Navigation/Notifications/Factory/Notification.php:292
#, php-format #, php-format
msgid "%1$s commented on your thread %2$s" msgid "%1$s commented on your thread %2$s"
msgstr "" msgstr ""
#: src/Navigation/Notifications/Repository/Notify.php:221 #: src/Navigation/Notifications/Repository/Notify.php:221
#: src/Navigation/Notifications/Repository/Notify.php:724 #: src/Navigation/Notifications/Repository/Notify.php:742
msgid "[Friendica:Notify]" msgid "[Friendica:Notify]"
msgstr "" msgstr ""
@ -10301,7 +10321,7 @@ msgid "%1$s commented on their %2$s %3$s"
msgstr "" msgstr ""
#: src/Navigation/Notifications/Repository/Notify.php:333 #: src/Navigation/Notifications/Repository/Notify.php:333
#: src/Navigation/Notifications/Repository/Notify.php:758 #: src/Navigation/Notifications/Repository/Notify.php:776
#, php-format #, php-format
msgid "%1$s Comment to conversation #%2$d by %3$s" msgid "%1$s Comment to conversation #%2$d by %3$s"
msgstr "" msgstr ""
@ -10314,7 +10334,7 @@ msgstr ""
#: src/Navigation/Notifications/Repository/Notify.php:339 #: src/Navigation/Notifications/Repository/Notify.php:339
#: src/Navigation/Notifications/Repository/Notify.php:354 #: src/Navigation/Notifications/Repository/Notify.php:354
#: src/Navigation/Notifications/Repository/Notify.php:373 #: src/Navigation/Notifications/Repository/Notify.php:373
#: src/Navigation/Notifications/Repository/Notify.php:773 #: src/Navigation/Notifications/Repository/Notify.php:791
#, php-format #, php-format
msgid "Please visit %s to view and/or reply to the conversation." msgid "Please visit %s to view and/or reply to the conversation."
msgstr "" msgstr ""
@ -10502,12 +10522,12 @@ msgstr ""
msgid "Please visit %s to approve or reject the request." msgid "Please visit %s to approve or reject the request."
msgstr "" msgstr ""
#: src/Navigation/Notifications/Repository/Notify.php:752 #: src/Navigation/Notifications/Repository/Notify.php:770
#, php-format #, php-format
msgid "%s %s tagged you" msgid "%s %s tagged you"
msgstr "" msgstr ""
#: src/Navigation/Notifications/Repository/Notify.php:755 #: src/Navigation/Notifications/Repository/Notify.php:773
#, php-format #, php-format
msgid "%s %s shared a new post" msgid "%s %s shared a new post"
msgstr "" msgstr ""

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

@ -109,6 +109,11 @@
<div class="group"> <div class="group">
{{include file="field_checkbox.tpl" field=$notify_like}} {{include file="field_checkbox.tpl" field=$notify_like}}
{{include file="field_checkbox.tpl" field=$notify_announce}} {{include file="field_checkbox.tpl" field=$notify_announce}}
{{include file="field_checkbox.tpl" field=$notify_tagged}}
{{include file="field_checkbox.tpl" field=$notify_direct_comment}}
{{include file="field_checkbox.tpl" field=$notify_thread_comment}}
{{include file="field_checkbox.tpl" field=$notify_comment_participation}}
{{include file="field_checkbox.tpl" field=$notify_activity_participation}}
</div> </div>
{{include file="field_checkbox.tpl" field=$email_textonly}} {{include file="field_checkbox.tpl" field=$email_textonly}}

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

@ -160,6 +160,11 @@
<div class="group"> <div class="group">
{{include file="field_checkbox.tpl" field=$notify_like}} {{include file="field_checkbox.tpl" field=$notify_like}}
{{include file="field_checkbox.tpl" field=$notify_announce}} {{include file="field_checkbox.tpl" field=$notify_announce}}
{{include file="field_checkbox.tpl" field=$notify_tagged}}
{{include file="field_checkbox.tpl" field=$notify_direct_comment}}
{{include file="field_checkbox.tpl" field=$notify_thread_comment}}
{{include file="field_checkbox.tpl" field=$notify_comment_participation}}
{{include file="field_checkbox.tpl" field=$notify_activity_participation}}
</div> </div>
{{include file="field_checkbox.tpl" field=$email_textonly}} {{include file="field_checkbox.tpl" field=$email_textonly}}