diff --git a/src/Module/Admin/Site.php b/src/Module/Admin/Site.php index 55f9b8d5c5..58b340a799 100644 --- a/src/Module/Admin/Site.php +++ b/src/Module/Admin/Site.php @@ -92,8 +92,10 @@ class Site extends BaseAdmin $private_addons = !empty($_POST['private_addons']); $disable_embedded = !empty($_POST['disable_embedded']); $allow_users_remote_self = !empty($_POST['allow_users_remote_self']); + $adjust_poll_frequency = !empty($_POST['adjust_poll_frequency']); $explicit_content = !empty($_POST['explicit_content']); $proxify_content = !empty($_POST['proxify_content']); + $local_search = !empty($_POST['local_search']); $cache_contact_avatar = !empty($_POST['cache_contact_avatar']); $enable_multi_reg = !empty($_POST['enable_multi_reg']); @@ -135,8 +137,10 @@ class Site extends BaseAdmin $compute_circle_counts = !empty($_POST['compute_circle_counts']); $check_new_version_url = (!empty($_POST['check_new_version_url']) ? trim($_POST['check_new_version_url']) : 'none'); - $worker_queues = (!empty($_POST['worker_queues']) ? intval($_POST['worker_queues']) : 10); - $worker_fastlane = !empty($_POST['worker_fastlane']); + $worker_queues = (!empty($_POST['worker_queues']) ? intval($_POST['worker_queues']) : 10); + $worker_load_cooldown = (!empty($_POST['worker_load_cooldown']) ? intval($_POST['worker_load_cooldown']) : 0); + $worker_fastlane = !empty($_POST['worker_fastlane']); + $decoupled_receiver = (!empty($_POST['decoupled_receiver']) ? intval(trim($_POST['decoupled_receiver'])) : false); $relay_directly = !empty($_POST['relay_directly']); $relay_scope = (!empty($_POST['relay_scope']) ? trim($_POST['relay_scope']) : ''); @@ -236,8 +240,10 @@ class Site extends BaseAdmin $transactionConfig->set('system', 'enotify_no_content' , $enotify_no_content); $transactionConfig->set('system', 'disable_embedded' , $disable_embedded); $transactionConfig->set('system', 'allow_users_remote_self', $allow_users_remote_self); + $transactionConfig->set('system', 'adjust_poll_frequency' , $adjust_poll_frequency); $transactionConfig->set('system', 'explicit_content' , $explicit_content); $transactionConfig->set('system', 'proxify_content' , $proxify_content); + $transactionConfig->set('system', 'local_search' , $local_search); $transactionConfig->set('system', 'cache_contact_avatar' , $cache_contact_avatar); $transactionConfig->set('system', 'check_new_version_url' , $check_new_version_url); @@ -282,8 +288,10 @@ class Site extends BaseAdmin $transactionConfig->set('system', 'only_tag_search' , $only_tag_search); $transactionConfig->set('system', 'compute_circle_counts', $compute_circle_counts); - $transactionConfig->set('system', 'worker_queues' , $worker_queues); - $transactionConfig->set('system', 'worker_fastlane' , $worker_fastlane); + $transactionConfig->set('system', 'worker_queues' , $worker_queues); + $transactionConfig->set('system', 'worker_load_cooldown', $worker_load_cooldown); + $transactionConfig->set('system', 'worker_fastlane' , $worker_fastlane); + $transactionConfig->set('system', 'decoupled_receiver' , $decoupled_receiver); $transactionConfig->set('system', 'relay_directly' , $relay_directly); $transactionConfig->set('system', 'relay_scope' , $relay_scope); @@ -460,8 +468,10 @@ class Site extends BaseAdmin '$disable_embedded' => ['disable_embedded', DI::l10n()->t('Don\'t embed private images in posts'), DI::config()->get('system', 'disable_embedded'), DI::l10n()->t('Don\'t replace locally-hosted private photos in posts with an embedded copy of the image. This means that contacts who receive posts containing private photos will have to authenticate and load each image, which may take a while.')], '$explicit_content' => ['explicit_content', DI::l10n()->t('Explicit Content'), DI::config()->get('system', 'explicit_content'), DI::l10n()->t('Set this to announce that your node is used mostly for explicit content that might not be suited for minors. This information will be published in the node information and might be used, e.g. by the global directory, to filter your node from listings of nodes to join. Additionally a note about this will be shown at the user registration page.')], '$proxify_content' => ['proxify_content', DI::l10n()->t('Proxify external content'), DI::config()->get('system', 'proxify_content'), DI::l10n()->t('Route external content via the proxy functionality. This is used for example for some OEmbed accesses and in some other rare cases.')], + '$local_search' => ['local_search', DI::l10n()->t('Only local search'), DI::config()->get('system', 'local_search'), DI::l10n()->t('Blocks search for users who are not logged in to prevent crawlers from blocking your system.')], '$cache_contact_avatar' => ['cache_contact_avatar', DI::l10n()->t('Cache contact avatars'), DI::config()->get('system', 'cache_contact_avatar'), DI::l10n()->t('Locally store the avatar pictures of the contacts. This uses a lot of storage space but it increases the performance.')], '$allow_users_remote_self'=> ['allow_users_remote_self', DI::l10n()->t('Allow Users to set remote_self'), DI::config()->get('system', 'allow_users_remote_self'), DI::l10n()->t('With checking this, every user is allowed to mark every contact as a remote_self in the repair contact dialog. Setting this flag on a contact causes mirroring every posting of that contact in the users stream.')], + '$adjust_poll_frequency' => ['adjust_poll_frequency', DI::l10n()->t('Adjust the feed poll frequency'), DI::config()->get('system', 'adjust_poll_frequency'), DI::l10n()->t('Automatically detect and set the best feed poll frequency.')], '$enable_multi_reg' => ['enable_multi_reg', DI::l10n()->t('Enable multiple registrations'), !DI::config()->get('system', 'block_extended_register'), DI::l10n()->t('Enable users to register additional accounts for use as pages.')], '$enable_openid' => ['enable_openid', DI::l10n()->t('Enable OpenID'), !DI::config()->get('system', 'no_openid'), DI::l10n()->t('Enable OpenID support for registration and logins.')], '$enable_regfullname' => ['enable_regfullname', DI::l10n()->t('Enable full name check'), !DI::config()->get('system', 'no_regfullname'), DI::l10n()->t('Prevents users from registering with a display name with fewer than two parts separated by spaces.')], @@ -510,7 +520,9 @@ class Site extends BaseAdmin '$compute_circle_counts' => ['compute_circle_counts', DI::l10n()->t('Generate counts per contact circle when calculating network count'), DI::config()->get('system', 'compute_circle_counts'), DI::l10n()->t('On systems with users that heavily use contact circles the query can be very expensive.')], '$worker_queues' => ['worker_queues', DI::l10n()->t('Maximum number of parallel workers'), DI::config()->get('system', 'worker_queues'), DI::l10n()->t('On shared hosters set this to %d. On larger systems, values of %d are great. Default value is %d.', 5, 20, 10)], + '$worker_load_cooldown' => ['worker_load_cooldown', DI::l10n()->t('Maximum load for workers'), DI::config()->get('system', 'worker_load_cooldown'), DI::l10n()->t('Maximum load that causes a cooldown before each worker function call.')], '$worker_fastlane' => ['worker_fastlane', DI::l10n()->t('Enable fastlane'), DI::config()->get('system', 'worker_fastlane'), DI::l10n()->t('When enabed, the fastlane mechanism starts an additional worker if processes with higher priority are blocked by processes of lower priority.')], + '$decoupled_receiver' => ['decoupled_receiver', DI::l10n()->t('Decoupled receiver'), DI::config()->get('system', 'decoupled_receiver'), DI::l10n()->t('Decouple incoming ActivityPub posts by processing them in the background via a worker process. Only enable this on fast systems.')], '$relay_directly' => ['relay_directly', DI::l10n()->t('Direct relay transfer'), DI::config()->get('system', 'relay_directly'), DI::l10n()->t('Enables the direct transfer to other servers without using the relay servers')], '$relay_scope' => ['relay_scope', DI::l10n()->t('Relay scope'), DI::config()->get('system', 'relay_scope'), DI::l10n()->t('Can be "all" or "tags". "all" means that every public post should be received. "tags" means that only posts with selected tags should be received.'), [Relay::SCOPE_NONE => DI::l10n()->t('Disabled'), Relay::SCOPE_ALL => DI::l10n()->t('all'), Relay::SCOPE_TAGS => DI::l10n()->t('tags')]], diff --git a/src/Object/Image.php b/src/Object/Image.php index 5e915d84f5..28fa636be2 100644 --- a/src/Object/Image.php +++ b/src/Object/Image.php @@ -612,6 +612,7 @@ class Image $dest = imagecreatetruecolor($max, $max); imagealphablending($dest, false); imagesavealpha($dest, true); + if ($this->type=='image/png') { imagefill($dest, 0, 0, imagecolorallocatealpha($dest, 0, 0, 0, 127)); // fill with alpha } diff --git a/static/defaults.config.php b/static/defaults.config.php index b6e26cb59b..e7bc123501 100644 --- a/static/defaults.config.php +++ b/static/defaults.config.php @@ -93,10 +93,6 @@ return [ 'php_path' => 'php', ], 'system' => [ - // adjust_poll_frequency (Boolean) - // Automatically detect and set the best feed poll frequency. - 'adjust_poll_frequency' => false, - // allowed_link_protocols (Array) // Allowed protocols in links URLs, add at your own risk. http(s) is always allowed. 'allowed_link_protocols' => ['ftp://', 'ftps://', 'mailto:', 'cid:', 'gopher://'], @@ -138,7 +134,7 @@ return [ // big_emojis (Boolean) // Display "Emoji Only" posts in big. - 'big_emojis' => false, + 'big_emojis' => true, // bulk_delivery (Boolean) // Delivers AP messages in a bulk (experimental) @@ -168,10 +164,6 @@ return [ // Whether to use Memcache, Memcached, Redis or APCu to store temporary cache. 'cache_driver' => 'database', - // decoupled_receiver (Boolean) - // Decouple incoming AP posts by doing the processing in the background. - 'decoupled_receiver' => false, - // distributed_cache_driver (database|memcache|memcached|redis) // Whether to use database, Memcache, Memcached or Redis as a distributed cache. 'distributed_cache_driver' => 'database', @@ -184,10 +176,6 @@ return [ // Allow to switch the configuration adapter to improve performances at the cost of memory consumption. 'config_adapter' => 'jit', - // curl_range_bytes (Integer) - // Maximum number of bytes that should be fetched. Default is 0, which mean "no limit". - 'curl_range_bytes' => 0, - // crawl_permit_period (Integer) // Period in seconds between allowed searches when the number of free searches is reached and "permit_crawling" is activated. 'crawl_permit_period' => 60, @@ -372,13 +360,9 @@ return [ // Used in conjunction with "block_public". 'local_block' => false, - // local_search (Boolean) - // Blocks search for users who are not logged in to prevent crawlers from blocking your system. - 'local_search' => false, - // local_tags (Boolean) // If activated, all hashtags will point to the local server. - 'local_tags' => false, + 'local_tags' => true, // lock_driver (semaphore|database|memcache|memcached|redis|apcu) // Whether to use semaphores, the database, Memcache, Memcached, Redis or APCu to handle locks. @@ -636,10 +620,6 @@ return [ // Transmit pending events upon accepted contact request for groups 'transmit_pending_events' => false, - // update_active_contacts (Boolean) - // When activated, only public contacts will be activated regularly that are used for example in items or tags. - 'update_active_contacts' => false, - // username_min_length (Integer) // The minimum character length a username can be. // This length is checked once the username has been trimmed and multiple spaces have been collapsed into one. @@ -677,10 +657,6 @@ return [ // List of minutes for the jobs per minute (JPM) calculation 'worker_jpm_range' => '1, 10, 60', - // worker_load_cooldown (Integer) - // Maximum load that causes a cooldown before each worker function call. - 'worker_load_cooldown' => 0, - // worker_load_exponent (Integer) // Default 3, which allows only 25% of the maximum worker queues when server load reaches around 37% of maximum load. // For a linear response where 25% of worker queues are allowed at 75% of maximum load, set this to 1. diff --git a/static/settings.config.php b/static/settings.config.php index 1ff4d5077b..fc96f1de17 100644 --- a/static/settings.config.php +++ b/static/settings.config.php @@ -56,6 +56,10 @@ return [ // Checks for missing entries in "post", "post-thread" or "post-thread-user" and creates them 'add_missing_posts' => false, + // adjust_poll_frequency (Boolean) + // Automatically detect and set the best feed poll frequency. + 'adjust_poll_frequency' => false, + // allowed_themes (Comma-separated list) // Themes users can change to in their settings. 'allowed_themes' => 'frio,vier', @@ -96,6 +100,10 @@ return [ // Enable/Disable Debugging (logging) 'debugging' => false, + // decoupled_receiver (Boolean) + // Decouple incoming AP posts by doing the processing in the background. + 'decoupled_receiver' => false, + // default_timezone (String) // Choose a default timezone. See https://secure.php.net/manual/en/timezones.php // It only applies to timestamps for anonymous viewers. @@ -127,6 +135,10 @@ return [ // Two-letters ISO 639-1 code. 'language' => 'en', + // local_search (Boolean) + // Blocks search for users who are not logged in to prevent crawlers from blocking your system. + 'local_search' => false, + // logfile (String) // The logfile for storing logs. // Can be a full path or a relative path to the Friendica home directory @@ -208,6 +220,10 @@ return [ // System theme name. 'theme' => 'frio', + // update_active_contacts (Boolean) + // When activated, only public contacts will be activated regularly that are used for example in items or tags. + 'update_active_contacts' => false, + // url (String) // The fully-qualified URL of this Friendica node. // Used by the worker in a non-HTTP execution environment. @@ -220,6 +236,10 @@ return [ // poco_requery_days (Integer) // Number of days after which a server is requeried for their contacts and servers it knows of. 'poco_requery_days' => 30, + + // worker_load_cooldown (Integer) + // Maximum load that causes a cooldown before each worker function call. + 'worker_load_cooldown' => 0, ], // Used in the admin settings to lock certain features diff --git a/view/lang/C/messages.po b/view/lang/C/messages.po index d6f4ea5841..342deb105f 100644 --- a/view/lang/C/messages.po +++ b/view/lang/C/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 2023.09-rc\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-11-28 12:50+0000\n" +"POT-Creation-Date: 2023-11-28 16:10+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -3936,7 +3936,7 @@ msgstr "" #: src/Module/Admin/Addons/Details.php:111 src/Module/Admin/Addons/Index.php:67 #: src/Module/Admin/Federation.php:214 src/Module/Admin/Logs/Settings.php:85 #: src/Module/Admin/Logs/View.php:83 src/Module/Admin/Queue.php:72 -#: src/Module/Admin/Site.php:400 src/Module/Admin/Storage.php:138 +#: src/Module/Admin/Site.php:408 src/Module/Admin/Storage.php:138 #: src/Module/Admin/Summary.php:196 src/Module/Admin/Themes/Details.php:90 #: src/Module/Admin/Themes/Index.php:111 src/Module/Admin/Tos.php:77 #: src/Module/Moderation/Users/Create.php:61 @@ -3974,7 +3974,7 @@ msgid "Addon %s failed to install." msgstr "" #: src/Module/Admin/Addons/Index.php:69 src/Module/Admin/Features.php:86 -#: src/Module/Admin/Logs/Settings.php:87 src/Module/Admin/Site.php:403 +#: src/Module/Admin/Logs/Settings.php:87 src/Module/Admin/Site.php:411 #: src/Module/Admin/Themes/Index.php:113 src/Module/Admin/Tos.php:86 #: src/Module/Settings/Account.php:541 src/Module/Settings/Addons.php:78 #: src/Module/Settings/Connectors.php:160 @@ -4174,8 +4174,8 @@ msgid "Enable Debugging" msgstr "" #: src/Module/Admin/Logs/Settings.php:91 src/Module/Admin/Logs/Settings.php:92 -#: src/Module/Admin/Logs/Settings.php:93 src/Module/Admin/Site.php:422 -#: src/Module/Admin/Site.php:430 +#: src/Module/Admin/Logs/Settings.php:93 src/Module/Admin/Site.php:430 +#: src/Module/Admin/Site.php:438 msgid "Read-only because it is set by an environment variable" msgstr "" @@ -4335,269 +4335,269 @@ msgstr "" msgid "Priority" msgstr "" -#: src/Module/Admin/Site.php:214 +#: src/Module/Admin/Site.php:218 #, php-format msgid "%s is no valid input for maximum image size" msgstr "" -#: src/Module/Admin/Site.php:315 src/Module/Settings/Display.php:215 +#: src/Module/Admin/Site.php:323 src/Module/Settings/Display.php:215 msgid "No special theme for mobile devices" msgstr "" -#: src/Module/Admin/Site.php:332 src/Module/Settings/Display.php:225 +#: src/Module/Admin/Site.php:340 src/Module/Settings/Display.php:225 #, php-format msgid "%s - (Experimental)" msgstr "" -#: src/Module/Admin/Site.php:344 +#: src/Module/Admin/Site.php:352 msgid "No community page" msgstr "" -#: src/Module/Admin/Site.php:345 +#: src/Module/Admin/Site.php:353 msgid "No community page for visitors" msgstr "" -#: src/Module/Admin/Site.php:346 +#: src/Module/Admin/Site.php:354 msgid "Public postings from users of this site" msgstr "" -#: src/Module/Admin/Site.php:347 +#: src/Module/Admin/Site.php:355 msgid "Public postings from the federated network" msgstr "" -#: src/Module/Admin/Site.php:348 +#: src/Module/Admin/Site.php:356 msgid "Public postings from local users and the federated network" msgstr "" -#: src/Module/Admin/Site.php:354 +#: src/Module/Admin/Site.php:362 msgid "Multi user instance" msgstr "" -#: src/Module/Admin/Site.php:377 +#: src/Module/Admin/Site.php:385 msgid "Closed" msgstr "" -#: src/Module/Admin/Site.php:378 +#: src/Module/Admin/Site.php:386 msgid "Requires approval" msgstr "" -#: src/Module/Admin/Site.php:379 +#: src/Module/Admin/Site.php:387 msgid "Open" msgstr "" -#: src/Module/Admin/Site.php:383 +#: src/Module/Admin/Site.php:391 msgid "Don't check" msgstr "" -#: src/Module/Admin/Site.php:384 +#: src/Module/Admin/Site.php:392 msgid "check the stable version" msgstr "" -#: src/Module/Admin/Site.php:385 +#: src/Module/Admin/Site.php:393 msgid "check the development version" msgstr "" -#: src/Module/Admin/Site.php:389 +#: src/Module/Admin/Site.php:397 msgid "none" msgstr "" -#: src/Module/Admin/Site.php:390 +#: src/Module/Admin/Site.php:398 msgid "Local contacts" msgstr "" -#: src/Module/Admin/Site.php:391 +#: src/Module/Admin/Site.php:399 msgid "Interactors" msgstr "" -#: src/Module/Admin/Site.php:401 src/Module/BaseAdmin.php:90 +#: src/Module/Admin/Site.php:409 src/Module/BaseAdmin.php:90 msgid "Site" msgstr "" -#: src/Module/Admin/Site.php:402 +#: src/Module/Admin/Site.php:410 msgid "General Information" msgstr "" -#: src/Module/Admin/Site.php:404 +#: src/Module/Admin/Site.php:412 msgid "Republish users to directory" msgstr "" -#: src/Module/Admin/Site.php:405 src/Module/Register.php:152 +#: src/Module/Admin/Site.php:413 src/Module/Register.php:152 msgid "Registration" msgstr "" -#: src/Module/Admin/Site.php:406 +#: src/Module/Admin/Site.php:414 msgid "File upload" msgstr "" -#: src/Module/Admin/Site.php:407 +#: src/Module/Admin/Site.php:415 msgid "Policies" msgstr "" -#: src/Module/Admin/Site.php:408 src/Module/Calendar/Event/Form.php:252 +#: src/Module/Admin/Site.php:416 src/Module/Calendar/Event/Form.php:252 #: src/Module/Contact.php:546 src/Module/Profile/Profile.php:276 msgid "Advanced" msgstr "" -#: src/Module/Admin/Site.php:409 +#: src/Module/Admin/Site.php:417 msgid "Auto Discovered Contact Directory" msgstr "" -#: src/Module/Admin/Site.php:410 +#: src/Module/Admin/Site.php:418 msgid "Performance" msgstr "" -#: src/Module/Admin/Site.php:411 +#: src/Module/Admin/Site.php:419 msgid "Worker" msgstr "" -#: src/Module/Admin/Site.php:412 +#: src/Module/Admin/Site.php:420 msgid "Message Relay" msgstr "" -#: src/Module/Admin/Site.php:413 +#: src/Module/Admin/Site.php:421 msgid "" "Use the command \"console relay\" in the command line to add or remove " "relays." msgstr "" -#: src/Module/Admin/Site.php:414 +#: src/Module/Admin/Site.php:422 msgid "The system is not subscribed to any relays at the moment." msgstr "" -#: src/Module/Admin/Site.php:415 +#: src/Module/Admin/Site.php:423 msgid "The system is currently subscribed to the following relays:" msgstr "" -#: src/Module/Admin/Site.php:417 +#: src/Module/Admin/Site.php:425 msgid "Relocate Node" msgstr "" -#: src/Module/Admin/Site.php:418 +#: src/Module/Admin/Site.php:426 msgid "" "Relocating your node enables you to change the DNS domain of this node and " "keep all the existing users and posts. This process takes a while and can " "only be started from the relocate console command like this:" msgstr "" -#: src/Module/Admin/Site.php:419 +#: src/Module/Admin/Site.php:427 msgid "(Friendica directory)# bin/console relocate https://newdomain.com" msgstr "" -#: src/Module/Admin/Site.php:422 +#: src/Module/Admin/Site.php:430 msgid "Site name" msgstr "" -#: src/Module/Admin/Site.php:423 +#: src/Module/Admin/Site.php:431 msgid "Sender Email" msgstr "" -#: src/Module/Admin/Site.php:423 +#: src/Module/Admin/Site.php:431 msgid "" "The email address your server shall use to send notification emails from." msgstr "" -#: src/Module/Admin/Site.php:424 +#: src/Module/Admin/Site.php:432 msgid "Name of the system actor" msgstr "" -#: src/Module/Admin/Site.php:424 +#: src/Module/Admin/Site.php:432 msgid "" "Name of the internal system account that is used to perform ActivityPub " "requests. This must be an unused username. If set, this can't be changed " "again." msgstr "" -#: src/Module/Admin/Site.php:425 +#: src/Module/Admin/Site.php:433 msgid "Banner/Logo" msgstr "" -#: src/Module/Admin/Site.php:426 +#: src/Module/Admin/Site.php:434 msgid "Email Banner/Logo" msgstr "" -#: src/Module/Admin/Site.php:427 +#: src/Module/Admin/Site.php:435 msgid "Shortcut icon" msgstr "" -#: src/Module/Admin/Site.php:427 +#: src/Module/Admin/Site.php:435 msgid "Link to an icon that will be used for browsers." msgstr "" -#: src/Module/Admin/Site.php:428 +#: src/Module/Admin/Site.php:436 msgid "Touch icon" msgstr "" -#: src/Module/Admin/Site.php:428 +#: src/Module/Admin/Site.php:436 msgid "Link to an icon that will be used for tablets and mobiles." msgstr "" -#: src/Module/Admin/Site.php:429 +#: src/Module/Admin/Site.php:437 msgid "Additional Info" msgstr "" -#: src/Module/Admin/Site.php:429 +#: src/Module/Admin/Site.php:437 #, php-format msgid "" "For public servers: you can add additional information here that will be " "listed at %s/servers." msgstr "" -#: src/Module/Admin/Site.php:430 +#: src/Module/Admin/Site.php:438 msgid "System language" msgstr "" -#: src/Module/Admin/Site.php:431 +#: src/Module/Admin/Site.php:439 msgid "System theme" msgstr "" -#: src/Module/Admin/Site.php:431 +#: src/Module/Admin/Site.php:439 #, php-format msgid "" "Default system theme - may be over-ridden by user profiles - Change default theme settings" msgstr "" -#: src/Module/Admin/Site.php:432 +#: src/Module/Admin/Site.php:440 msgid "Mobile system theme" msgstr "" -#: src/Module/Admin/Site.php:432 +#: src/Module/Admin/Site.php:440 msgid "Theme for mobile devices" msgstr "" -#: src/Module/Admin/Site.php:433 +#: src/Module/Admin/Site.php:441 msgid "Force SSL" msgstr "" -#: src/Module/Admin/Site.php:433 +#: src/Module/Admin/Site.php:441 msgid "" "Force all Non-SSL requests to SSL - Attention: on some systems it could lead " "to endless loops." msgstr "" -#: src/Module/Admin/Site.php:434 +#: src/Module/Admin/Site.php:442 msgid "Show help entry from navigation menu" msgstr "" -#: src/Module/Admin/Site.php:434 +#: src/Module/Admin/Site.php:442 msgid "" "Displays the menu entry for the Help pages from the navigation menu. It is " "always accessible by calling /help directly." msgstr "" -#: src/Module/Admin/Site.php:435 +#: src/Module/Admin/Site.php:443 msgid "Single user instance" msgstr "" -#: src/Module/Admin/Site.php:435 +#: src/Module/Admin/Site.php:443 msgid "Make this instance multi-user or single-user for the named user" msgstr "" -#: src/Module/Admin/Site.php:437 +#: src/Module/Admin/Site.php:445 msgid "Maximum image size" msgstr "" -#: src/Module/Admin/Site.php:437 +#: src/Module/Admin/Site.php:445 #, php-format msgid "" "Maximum size in bytes of uploaded images. Default is 0, which means no " @@ -4609,35 +4609,35 @@ msgid "" "to %s (%s byte)" msgstr "" -#: src/Module/Admin/Site.php:441 +#: src/Module/Admin/Site.php:449 msgid "Maximum image length" msgstr "" -#: src/Module/Admin/Site.php:441 +#: src/Module/Admin/Site.php:449 msgid "" "Maximum length in pixels of the longest side of uploaded images. Default is " "-1, which means no limits." msgstr "" -#: src/Module/Admin/Site.php:442 +#: src/Module/Admin/Site.php:450 msgid "JPEG image quality" msgstr "" -#: src/Module/Admin/Site.php:442 +#: src/Module/Admin/Site.php:450 msgid "" "Uploaded JPEGS will be saved at this quality setting [0-100]. Default is " "100, which is full quality." msgstr "" -#: src/Module/Admin/Site.php:444 +#: src/Module/Admin/Site.php:452 msgid "Register policy" msgstr "" -#: src/Module/Admin/Site.php:445 +#: src/Module/Admin/Site.php:453 msgid "Maximum Users" msgstr "" -#: src/Module/Admin/Site.php:445 +#: src/Module/Admin/Site.php:453 msgid "" "If defined, the register policy is automatically closed when the given " "number of users is reached and reopens the registry when the number drops " @@ -4645,168 +4645,168 @@ msgid "" "not when the policy is set to approval." msgstr "" -#: src/Module/Admin/Site.php:446 +#: src/Module/Admin/Site.php:454 msgid "Maximum Daily Registrations" msgstr "" -#: src/Module/Admin/Site.php:446 +#: src/Module/Admin/Site.php:454 msgid "" "If registration is permitted above, this sets the maximum number of new user " "registrations to accept per day. If register is set to closed, this setting " "has no effect." msgstr "" -#: src/Module/Admin/Site.php:447 +#: src/Module/Admin/Site.php:455 msgid "Register text" msgstr "" -#: src/Module/Admin/Site.php:447 +#: src/Module/Admin/Site.php:455 msgid "" "Will be displayed prominently on the registration page. You can use BBCode " "here." msgstr "" -#: src/Module/Admin/Site.php:448 +#: src/Module/Admin/Site.php:456 msgid "Forbidden Nicknames" msgstr "" -#: src/Module/Admin/Site.php:448 +#: src/Module/Admin/Site.php:456 msgid "" "Comma separated list of nicknames that are forbidden from registration. " "Preset is a list of role names according RFC 2142." msgstr "" -#: src/Module/Admin/Site.php:449 +#: src/Module/Admin/Site.php:457 msgid "Accounts abandoned after x days" msgstr "" -#: src/Module/Admin/Site.php:449 +#: src/Module/Admin/Site.php:457 msgid "" "Will not waste system resources polling external sites for abandonded " "accounts. Enter 0 for no time limit." msgstr "" -#: src/Module/Admin/Site.php:450 +#: src/Module/Admin/Site.php:458 msgid "Allowed friend domains" msgstr "" -#: src/Module/Admin/Site.php:450 +#: src/Module/Admin/Site.php:458 msgid "" "Comma separated list of domains which are allowed to establish friendships " "with this site. Wildcards are accepted. Empty to allow any domains" msgstr "" -#: src/Module/Admin/Site.php:451 +#: src/Module/Admin/Site.php:459 msgid "Allowed email domains" msgstr "" -#: src/Module/Admin/Site.php:451 +#: src/Module/Admin/Site.php:459 msgid "" "Comma separated list of domains which are allowed in email addresses for " "registrations to this site. Wildcards are accepted. Empty to allow any " "domains" msgstr "" -#: src/Module/Admin/Site.php:452 +#: src/Module/Admin/Site.php:460 msgid "No OEmbed rich content" msgstr "" -#: src/Module/Admin/Site.php:452 +#: src/Module/Admin/Site.php:460 msgid "" "Don't show the rich content (e.g. embedded PDF), except from the domains " "listed below." msgstr "" -#: src/Module/Admin/Site.php:453 +#: src/Module/Admin/Site.php:461 msgid "Trusted third-party domains" msgstr "" -#: src/Module/Admin/Site.php:453 +#: src/Module/Admin/Site.php:461 msgid "" "Comma separated list of domains from which content is allowed to be embedded " "in posts like with OEmbed. All sub-domains of the listed domains are allowed " "as well." msgstr "" -#: src/Module/Admin/Site.php:454 +#: src/Module/Admin/Site.php:462 msgid "Block public" msgstr "" -#: src/Module/Admin/Site.php:454 +#: src/Module/Admin/Site.php:462 msgid "" "Check to block public access to all otherwise public personal pages on this " "site unless you are currently logged in." msgstr "" -#: src/Module/Admin/Site.php:455 +#: src/Module/Admin/Site.php:463 msgid "Force publish" msgstr "" -#: src/Module/Admin/Site.php:455 +#: src/Module/Admin/Site.php:463 msgid "" "Check to force all profiles on this site to be listed in the site directory." msgstr "" -#: src/Module/Admin/Site.php:455 +#: src/Module/Admin/Site.php:463 msgid "Enabling this may violate privacy laws like the GDPR" msgstr "" -#: src/Module/Admin/Site.php:456 +#: src/Module/Admin/Site.php:464 msgid "Global directory URL" msgstr "" -#: src/Module/Admin/Site.php:456 +#: src/Module/Admin/Site.php:464 msgid "" "URL to the global directory. If this is not set, the global directory is " "completely unavailable to the application." msgstr "" -#: src/Module/Admin/Site.php:457 +#: src/Module/Admin/Site.php:465 msgid "Private posts by default for new users" msgstr "" -#: src/Module/Admin/Site.php:457 +#: src/Module/Admin/Site.php:465 msgid "" "Set default post permissions for all new members to the default privacy " "circle rather than public." msgstr "" -#: src/Module/Admin/Site.php:458 +#: src/Module/Admin/Site.php:466 msgid "Don't include post content in email notifications" msgstr "" -#: src/Module/Admin/Site.php:458 +#: src/Module/Admin/Site.php:466 msgid "" "Don't include the content of a post/comment/private message/etc. in the " "email notifications that are sent out from this site, as a privacy measure." msgstr "" -#: src/Module/Admin/Site.php:459 +#: src/Module/Admin/Site.php:467 msgid "Disallow public access to addons listed in the apps menu." msgstr "" -#: src/Module/Admin/Site.php:459 +#: src/Module/Admin/Site.php:467 msgid "" "Checking this box will restrict addons listed in the apps menu to members " "only." msgstr "" -#: src/Module/Admin/Site.php:460 +#: src/Module/Admin/Site.php:468 msgid "Don't embed private images in posts" msgstr "" -#: src/Module/Admin/Site.php:460 +#: src/Module/Admin/Site.php:468 msgid "" "Don't replace locally-hosted private photos in posts with an embedded copy " "of the image. This means that contacts who receive posts containing private " "photos will have to authenticate and load each image, which may take a while." msgstr "" -#: src/Module/Admin/Site.php:461 +#: src/Module/Admin/Site.php:469 msgid "Explicit Content" msgstr "" -#: src/Module/Admin/Site.php:461 +#: src/Module/Admin/Site.php:469 msgid "" "Set this to announce that your node is used mostly for explicit content that " "might not be suited for minors. This information will be published in the " @@ -4815,281 +4815,299 @@ msgid "" "will be shown at the user registration page." msgstr "" -#: src/Module/Admin/Site.php:462 +#: src/Module/Admin/Site.php:470 msgid "Proxify external content" msgstr "" -#: src/Module/Admin/Site.php:462 +#: src/Module/Admin/Site.php:470 msgid "" "Route external content via the proxy functionality. This is used for example " "for some OEmbed accesses and in some other rare cases." msgstr "" -#: src/Module/Admin/Site.php:463 +#: src/Module/Admin/Site.php:471 +msgid "Only local search" +msgstr "" + +#: src/Module/Admin/Site.php:471 +msgid "" +"Blocks search for users who are not logged in to prevent crawlers from " +"blocking your system." +msgstr "" + +#: src/Module/Admin/Site.php:472 msgid "Cache contact avatars" msgstr "" -#: src/Module/Admin/Site.php:463 +#: src/Module/Admin/Site.php:472 msgid "" "Locally store the avatar pictures of the contacts. This uses a lot of " "storage space but it increases the performance." msgstr "" -#: src/Module/Admin/Site.php:464 +#: src/Module/Admin/Site.php:473 msgid "Allow Users to set remote_self" msgstr "" -#: src/Module/Admin/Site.php:464 +#: src/Module/Admin/Site.php:473 msgid "" "With checking this, every user is allowed to mark every contact as a " "remote_self in the repair contact dialog. Setting this flag on a contact " "causes mirroring every posting of that contact in the users stream." msgstr "" -#: src/Module/Admin/Site.php:465 +#: src/Module/Admin/Site.php:474 +msgid "Adjust the feed poll frequency" +msgstr "" + +#: src/Module/Admin/Site.php:474 +msgid "Automatically detect and set the best feed poll frequency." +msgstr "" + +#: src/Module/Admin/Site.php:475 msgid "Enable multiple registrations" msgstr "" -#: src/Module/Admin/Site.php:465 +#: src/Module/Admin/Site.php:475 msgid "Enable users to register additional accounts for use as pages." msgstr "" -#: src/Module/Admin/Site.php:466 +#: src/Module/Admin/Site.php:476 msgid "Enable OpenID" msgstr "" -#: src/Module/Admin/Site.php:466 +#: src/Module/Admin/Site.php:476 msgid "Enable OpenID support for registration and logins." msgstr "" -#: src/Module/Admin/Site.php:467 +#: src/Module/Admin/Site.php:477 msgid "Enable full name check" msgstr "" -#: src/Module/Admin/Site.php:467 +#: src/Module/Admin/Site.php:477 msgid "" "Prevents users from registering with a display name with fewer than two " "parts separated by spaces." msgstr "" -#: src/Module/Admin/Site.php:468 +#: src/Module/Admin/Site.php:478 msgid "Email administrators on new registration" msgstr "" -#: src/Module/Admin/Site.php:468 +#: src/Module/Admin/Site.php:478 msgid "" "If enabled and the system is set to an open registration, an email for each " "new registration is sent to the administrators." msgstr "" -#: src/Module/Admin/Site.php:469 +#: src/Module/Admin/Site.php:479 msgid "Community pages for visitors" msgstr "" -#: src/Module/Admin/Site.php:469 +#: src/Module/Admin/Site.php:479 msgid "" "Which community pages should be available for visitors. Local users always " "see both pages." msgstr "" -#: src/Module/Admin/Site.php:470 +#: src/Module/Admin/Site.php:480 msgid "Posts per user on community page" msgstr "" -#: src/Module/Admin/Site.php:470 +#: src/Module/Admin/Site.php:480 msgid "" "The maximum number of posts per user on the community page. (Not valid for " "\"Global Community\")" msgstr "" -#: src/Module/Admin/Site.php:472 +#: src/Module/Admin/Site.php:482 msgid "Enable Mail support" msgstr "" -#: src/Module/Admin/Site.php:472 +#: src/Module/Admin/Site.php:482 msgid "" "Enable built-in mail support to poll IMAP folders and to reply via mail." msgstr "" -#: src/Module/Admin/Site.php:473 +#: src/Module/Admin/Site.php:483 msgid "" "Mail support can't be enabled because the PHP IMAP module is not installed." msgstr "" -#: src/Module/Admin/Site.php:474 +#: src/Module/Admin/Site.php:484 msgid "Enable OStatus support" msgstr "" -#: src/Module/Admin/Site.php:474 +#: src/Module/Admin/Site.php:484 msgid "" "Enable built-in OStatus (StatusNet, GNU Social etc.) compatibility. All " "communications in OStatus are public." msgstr "" -#: src/Module/Admin/Site.php:476 +#: src/Module/Admin/Site.php:486 msgid "" "Diaspora support can't be enabled because Friendica was installed into a sub " "directory." msgstr "" -#: src/Module/Admin/Site.php:477 +#: src/Module/Admin/Site.php:487 msgid "Enable Diaspora support" msgstr "" -#: src/Module/Admin/Site.php:477 +#: src/Module/Admin/Site.php:487 msgid "" "Enable built-in Diaspora network compatibility for communicating with " "diaspora servers." msgstr "" -#: src/Module/Admin/Site.php:478 +#: src/Module/Admin/Site.php:488 msgid "Verify SSL" msgstr "" -#: src/Module/Admin/Site.php:478 +#: src/Module/Admin/Site.php:488 msgid "" "If you wish, you can turn on strict certificate checking. This will mean you " "cannot connect (at all) to self-signed SSL sites." msgstr "" -#: src/Module/Admin/Site.php:479 +#: src/Module/Admin/Site.php:489 msgid "Proxy user" msgstr "" -#: src/Module/Admin/Site.php:479 +#: src/Module/Admin/Site.php:489 msgid "User name for the proxy server." msgstr "" -#: src/Module/Admin/Site.php:480 +#: src/Module/Admin/Site.php:490 msgid "Proxy URL" msgstr "" -#: src/Module/Admin/Site.php:480 +#: src/Module/Admin/Site.php:490 msgid "" "If you want to use a proxy server that Friendica should use to connect to " "the network, put the URL of the proxy here." msgstr "" -#: src/Module/Admin/Site.php:481 +#: src/Module/Admin/Site.php:491 msgid "Network timeout" msgstr "" -#: src/Module/Admin/Site.php:481 +#: src/Module/Admin/Site.php:491 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)." msgstr "" -#: src/Module/Admin/Site.php:482 +#: src/Module/Admin/Site.php:492 msgid "Maximum Load Average" msgstr "" -#: src/Module/Admin/Site.php:482 +#: src/Module/Admin/Site.php:492 #, php-format msgid "" "Maximum system load before delivery and poll processes are deferred - " "default %d." msgstr "" -#: src/Module/Admin/Site.php:483 +#: src/Module/Admin/Site.php:493 msgid "Minimal Memory" msgstr "" -#: src/Module/Admin/Site.php:483 +#: src/Module/Admin/Site.php:493 msgid "" "Minimal free memory in MB for the worker. Needs access to /proc/meminfo - " "default 0 (deactivated)." msgstr "" -#: src/Module/Admin/Site.php:484 +#: src/Module/Admin/Site.php:494 msgid "Periodically optimize tables" msgstr "" -#: src/Module/Admin/Site.php:484 +#: src/Module/Admin/Site.php:494 msgid "Periodically optimize tables like the cache and the workerqueue" msgstr "" -#: src/Module/Admin/Site.php:486 +#: src/Module/Admin/Site.php:496 msgid "Discover followers/followings from contacts" msgstr "" -#: src/Module/Admin/Site.php:486 +#: src/Module/Admin/Site.php:496 msgid "" "If enabled, contacts are checked for their followers and following contacts." msgstr "" -#: src/Module/Admin/Site.php:487 +#: src/Module/Admin/Site.php:497 msgid "None - deactivated" msgstr "" -#: src/Module/Admin/Site.php:488 +#: src/Module/Admin/Site.php:498 msgid "" "Local contacts - contacts of our local contacts are discovered for their " "followers/followings." msgstr "" -#: src/Module/Admin/Site.php:489 +#: src/Module/Admin/Site.php:499 msgid "" "Interactors - contacts of our local contacts and contacts who interacted on " "locally visible postings are discovered for their followers/followings." msgstr "" -#: src/Module/Admin/Site.php:491 +#: src/Module/Admin/Site.php:501 msgid "Only update contacts/servers with local data" msgstr "" -#: src/Module/Admin/Site.php:491 +#: src/Module/Admin/Site.php:501 msgid "" "If enabled, the system will only look for changes in contacts and servers " "that engaged on this system by either being in a contact list of a user or " "when posts or comments exists from the contact on this system." msgstr "" -#: src/Module/Admin/Site.php:492 +#: src/Module/Admin/Site.php:502 msgid "Synchronize the contacts with the directory server" msgstr "" -#: src/Module/Admin/Site.php:492 +#: src/Module/Admin/Site.php:502 msgid "" "if enabled, the system will check periodically for new contacts on the " "defined directory server." msgstr "" -#: src/Module/Admin/Site.php:494 +#: src/Module/Admin/Site.php:504 msgid "Discover contacts from other servers" msgstr "" -#: src/Module/Admin/Site.php:494 +#: src/Module/Admin/Site.php:504 msgid "" "Periodically query other servers for contacts and servers that they know of. " "The system queries Friendica, Mastodon and Hubzilla servers. Keep it " "deactivated on small machines to decrease the database size and load." msgstr "" -#: src/Module/Admin/Site.php:495 +#: src/Module/Admin/Site.php:505 msgid "Days between requery" msgstr "" -#: src/Module/Admin/Site.php:495 +#: src/Module/Admin/Site.php:505 msgid "" "Number of days after which a server is requeried for their contacts and " "servers it knows of. This is only used when the discovery is activated." msgstr "" -#: src/Module/Admin/Site.php:496 +#: src/Module/Admin/Site.php:506 msgid "Search the local directory" msgstr "" -#: src/Module/Admin/Site.php:496 +#: src/Module/Admin/Site.php:506 msgid "" "Search the local directory instead of the global directory. When searching " "locally, every search will be executed on the global directory in the " "background. This improves the search results when the search is repeated." msgstr "" -#: src/Module/Admin/Site.php:498 +#: src/Module/Admin/Site.php:508 msgid "Publish server information" msgstr "" -#: src/Module/Admin/Site.php:498 +#: src/Module/Admin/Site.php:508 msgid "" "If enabled, general server and usage data will be published. The data " "contains the name and version of the server, number of users with public " @@ -5097,50 +5115,50 @@ msgid "" "href=\"http://the-federation.info/\">the-federation.info for details." msgstr "" -#: src/Module/Admin/Site.php:500 +#: src/Module/Admin/Site.php:510 msgid "Check upstream version" msgstr "" -#: src/Module/Admin/Site.php:500 +#: src/Module/Admin/Site.php:510 msgid "" "Enables checking for new Friendica versions at github. If there is a new " "version, you will be informed in the admin panel overview." msgstr "" -#: src/Module/Admin/Site.php:501 +#: src/Module/Admin/Site.php:511 msgid "Suppress Tags" msgstr "" -#: src/Module/Admin/Site.php:501 +#: src/Module/Admin/Site.php:511 msgid "Suppress showing a list of hashtags at the end of the posting." msgstr "" -#: src/Module/Admin/Site.php:502 +#: src/Module/Admin/Site.php:512 msgid "Clean database" msgstr "" -#: src/Module/Admin/Site.php:502 +#: src/Module/Admin/Site.php:512 msgid "" "Remove old remote items, orphaned database records and old content from some " "other helper tables." msgstr "" -#: src/Module/Admin/Site.php:503 +#: src/Module/Admin/Site.php:513 msgid "Lifespan of remote items" msgstr "" -#: src/Module/Admin/Site.php:503 +#: src/Module/Admin/Site.php:513 msgid "" "When the database cleanup is enabled, this defines the days after which " "remote items will be deleted. Own items, and marked or filed items are " "always kept. 0 disables this behaviour." msgstr "" -#: src/Module/Admin/Site.php:504 +#: src/Module/Admin/Site.php:514 msgid "Lifespan of unclaimed items" msgstr "" -#: src/Module/Admin/Site.php:504 +#: src/Module/Admin/Site.php:514 msgid "" "When the database cleanup is enabled, this defines the days after which " "unclaimed remote items (mostly content from the relay) will be deleted. " @@ -5148,144 +5166,162 @@ msgid "" "items if set to 0." msgstr "" -#: src/Module/Admin/Site.php:505 +#: src/Module/Admin/Site.php:515 msgid "Lifespan of raw conversation data" msgstr "" -#: src/Module/Admin/Site.php:505 +#: src/Module/Admin/Site.php:515 msgid "" "The conversation data is used for ActivityPub and OStatus, as well as for " "debug purposes. It should be safe to remove it after 14 days, default is 90 " "days." msgstr "" -#: src/Module/Admin/Site.php:506 +#: src/Module/Admin/Site.php:516 msgid "Maximum numbers of comments per post" msgstr "" -#: src/Module/Admin/Site.php:506 +#: src/Module/Admin/Site.php:516 msgid "How much comments should be shown for each post? Default value is 100." msgstr "" -#: src/Module/Admin/Site.php:507 +#: src/Module/Admin/Site.php:517 msgid "Maximum numbers of comments per post on the display page" msgstr "" -#: src/Module/Admin/Site.php:507 +#: src/Module/Admin/Site.php:517 msgid "" "How many comments should be shown on the single view for each post? Default " "value is 1000." msgstr "" -#: src/Module/Admin/Site.php:508 +#: src/Module/Admin/Site.php:518 msgid "Temp path" msgstr "" -#: src/Module/Admin/Site.php:508 +#: src/Module/Admin/Site.php:518 msgid "" "If you have a restricted system where the webserver can't access the system " "temp path, enter another path here." msgstr "" -#: src/Module/Admin/Site.php:509 +#: src/Module/Admin/Site.php:519 msgid "Only search in tags" msgstr "" -#: src/Module/Admin/Site.php:509 +#: src/Module/Admin/Site.php:519 msgid "On large systems the text search can slow down the system extremely." msgstr "" -#: src/Module/Admin/Site.php:510 +#: src/Module/Admin/Site.php:520 msgid "Generate counts per contact circle when calculating network count" msgstr "" -#: src/Module/Admin/Site.php:510 +#: src/Module/Admin/Site.php:520 msgid "" "On systems with users that heavily use contact circles the query can be very " "expensive." msgstr "" -#: src/Module/Admin/Site.php:512 +#: src/Module/Admin/Site.php:522 msgid "Maximum number of parallel workers" msgstr "" -#: src/Module/Admin/Site.php:512 +#: src/Module/Admin/Site.php:522 #, php-format msgid "" "On shared hosters set this to %d. On larger systems, values of %d are great. " "Default value is %d." msgstr "" -#: src/Module/Admin/Site.php:513 +#: src/Module/Admin/Site.php:523 +msgid "Maximum load for workers" +msgstr "" + +#: src/Module/Admin/Site.php:523 +msgid "Maximum load that causes a cooldown before each worker function call." +msgstr "" + +#: src/Module/Admin/Site.php:524 msgid "Enable fastlane" msgstr "" -#: src/Module/Admin/Site.php:513 +#: src/Module/Admin/Site.php:524 msgid "" "When enabed, the fastlane mechanism starts an additional worker if processes " "with higher priority are blocked by processes of lower priority." msgstr "" -#: src/Module/Admin/Site.php:515 +#: src/Module/Admin/Site.php:525 +msgid "Decoupled receiver" +msgstr "" + +#: src/Module/Admin/Site.php:525 +msgid "" +"Decouple incoming ActivityPub posts by processing them in the background via " +"a worker process. Only enable this on fast systems." +msgstr "" + +#: src/Module/Admin/Site.php:527 msgid "Direct relay transfer" msgstr "" -#: src/Module/Admin/Site.php:515 +#: src/Module/Admin/Site.php:527 msgid "" "Enables the direct transfer to other servers without using the relay servers" msgstr "" -#: src/Module/Admin/Site.php:516 +#: src/Module/Admin/Site.php:528 msgid "Relay scope" msgstr "" -#: src/Module/Admin/Site.php:516 +#: src/Module/Admin/Site.php:528 msgid "" "Can be \"all\" or \"tags\". \"all\" means that every public post should be " "received. \"tags\" means that only posts with selected tags should be " "received." msgstr "" -#: src/Module/Admin/Site.php:516 src/Module/Contact/Profile.php:309 +#: src/Module/Admin/Site.php:528 src/Module/Contact/Profile.php:309 #: src/Module/Settings/TwoFactor/Index.php:146 msgid "Disabled" msgstr "" -#: src/Module/Admin/Site.php:516 +#: src/Module/Admin/Site.php:528 msgid "all" msgstr "" -#: src/Module/Admin/Site.php:516 +#: src/Module/Admin/Site.php:528 msgid "tags" msgstr "" -#: src/Module/Admin/Site.php:517 +#: src/Module/Admin/Site.php:529 msgid "Server tags" msgstr "" -#: src/Module/Admin/Site.php:517 +#: src/Module/Admin/Site.php:529 msgid "Comma separated list of tags for the \"tags\" subscription." msgstr "" -#: src/Module/Admin/Site.php:518 +#: src/Module/Admin/Site.php:530 msgid "Deny Server tags" msgstr "" -#: src/Module/Admin/Site.php:518 +#: src/Module/Admin/Site.php:530 msgid "Comma separated list of tags that are rejected." msgstr "" -#: src/Module/Admin/Site.php:519 +#: src/Module/Admin/Site.php:531 msgid "Allow user tags" msgstr "" -#: src/Module/Admin/Site.php:519 +#: src/Module/Admin/Site.php:531 msgid "" "If enabled, the tags from the saved searches will used for the \"tags\" " "subscription in addition to the \"relay_server_tags\"." msgstr "" -#: src/Module/Admin/Site.php:522 +#: src/Module/Admin/Site.php:534 msgid "Start Relocation" msgstr "" @@ -6002,7 +6038,7 @@ msgid "Contact not found." msgstr "" #: src/Module/Circle.php:102 src/Module/Contact/Contacts.php:66 -#: src/Module/Conversation/Network.php:232 +#: src/Module/Conversation/Network.php:231 msgid "Invalid contact." msgstr "" @@ -6788,11 +6824,11 @@ msgstr "" msgid "Not available." msgstr "" -#: src/Module/Conversation/Network.php:218 +#: src/Module/Conversation/Network.php:217 msgid "No such circle" msgstr "" -#: src/Module/Conversation/Network.php:222 +#: src/Module/Conversation/Network.php:221 #, php-format msgid "Circle: %s" msgstr "" @@ -6806,15 +6842,15 @@ msgstr "" msgid "Network feed not available." msgstr "" -#: src/Module/Conversation/Timeline.php:163 +#: src/Module/Conversation/Timeline.php:166 msgid "Own Contacts" msgstr "" -#: src/Module/Conversation/Timeline.php:167 +#: src/Module/Conversation/Timeline.php:170 msgid "Include" msgstr "" -#: src/Module/Conversation/Timeline.php:168 +#: src/Module/Conversation/Timeline.php:171 msgid "Hide" msgstr "" diff --git a/view/templates/admin/site.tpl b/view/templates/admin/site.tpl index 0440343ba2..752a8f1289 100644 --- a/view/templates/admin/site.tpl +++ b/view/templates/admin/site.tpl @@ -83,8 +83,10 @@ {{include file="field_checkbox.tpl" field=$private_addons}} {{include file="field_checkbox.tpl" field=$disable_embedded}} {{include file="field_checkbox.tpl" field=$allow_users_remote_self}} + {{include file="field_checkbox.tpl" field=$adjust_poll_frequency}} {{include file="field_checkbox.tpl" field=$explicit_content}} {{include file="field_checkbox.tpl" field=$proxify_content}} + {{include file="field_checkbox.tpl" field=$local_search}}

{{$advanced}}

@@ -125,7 +127,9 @@ {{include file="field_input.tpl" field=$maxloadavg}} {{include file="field_input.tpl" field=$min_memory}} {{include file="field_input.tpl" field=$worker_queues}} + {{include file="field_input.tpl" field=$worker_load_cooldown}} {{include file="field_checkbox.tpl" field=$worker_fastlane}} + {{include file="field_checkbox.tpl" field=$decoupled_receiver}}
diff --git a/view/theme/frio/templates/admin/site.tpl b/view/theme/frio/templates/admin/site.tpl index 002d65a1fd..08865e9bbe 100644 --- a/view/theme/frio/templates/admin/site.tpl +++ b/view/theme/frio/templates/admin/site.tpl @@ -163,8 +163,10 @@ {{include file="field_checkbox.tpl" field=$private_addons}} {{include file="field_checkbox.tpl" field=$disable_embedded}} {{include file="field_checkbox.tpl" field=$allow_users_remote_self}} + {{include file="field_checkbox.tpl" field=$adjust_poll_frequency}} {{include file="field_checkbox.tpl" field=$explicit_content}} {{include file="field_checkbox.tpl" field=$proxify_content}} + {{include file="field_checkbox.tpl" field=$local_search}}