diff --git a/src/Module/Admin/Site.php b/src/Module/Admin/Site.php index f3ab67f98..0ce272444 100644 --- a/src/Module/Admin/Site.php +++ b/src/Module/Admin/Site.php @@ -199,7 +199,6 @@ class Site extends BaseAdmin $temppath = (!empty($_POST['temppath']) ? Strings::escapeTags(trim($_POST['temppath'])) : ''); $singleuser = (!empty($_POST['singleuser']) ? Strings::escapeTags(trim($_POST['singleuser'])) : ''); $only_tag_search = !empty($_POST['only_tag_search']); - $rino = (!empty($_POST['rino']) ? intval($_POST['rino']) : 0); $check_new_version_url = (!empty($_POST['check_new_version_url']) ? Strings::escapeTags(trim($_POST['check_new_version_url'])) : 'none'); $worker_queues = (!empty($_POST['worker_queues']) ? intval($_POST['worker_queues']) : 10); @@ -379,8 +378,6 @@ class Site extends BaseAdmin DI::config()->set('system', 'relay_deny_tags' , $relay_deny_tags); DI::config()->set('system', 'relay_user_tags' , $relay_user_tags); - DI::config()->set('system', 'rino_encrypt' , $rino); - DI::baseUrl()->redirect('admin/site' . $active_panel); } @@ -602,8 +599,6 @@ class Site extends BaseAdmin '$relocate_url' => ['relocate_url', DI::l10n()->t('New base url'), DI::baseUrl()->get(), DI::l10n()->t('Change base url for this server. Sends relocate message to all Friendica and Diaspora* contacts of all users.')], - '$rino' => ['rino', DI::l10n()->t('RINO Encryption'), intval(DI::config()->get('system', 'rino_encrypt')), DI::l10n()->t('Encryption layer between nodes.'), [0 => DI::l10n()->t('Disabled'), 1 => DI::l10n()->t('Enabled')]], - '$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_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.')], diff --git a/static/settings.config.php b/static/settings.config.php index 96ae421ff..53a00562d 100644 --- a/static/settings.config.php +++ b/static/settings.config.php @@ -180,12 +180,6 @@ return [ // If enabled, the tags from the saved searches will used for the "tags" subscription in addition to the "relay_server_tags". 'relay_user_tags' => true, - // rino_encrypt (Integer) - // Server-to-server private message encryption (RINO). - // Encryption will only be provided if this setting is set to a non zero value on both servers. - // Set to 0 to disable, 2 to enable, 1 is deprecated but won't need mcrypt. - 'rino_encrypt' => 2, - // temppath (String) // Custom temporary file directory 'temppath' => '', diff --git a/view/lang/C/messages.po b/view/lang/C/messages.po index ca35ff8c9..c358abf74 100644 --- a/view/lang/C/messages.po +++ b/view/lang/C/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 2021.09-rc\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-09-02 23:29+0200\n" +"POT-Creation-Date: 2021-09-05 18:33+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -104,7 +104,7 @@ msgstr "" msgid "View in context" msgstr "" -#: include/conversation.php:541 include/conversation.php:1143 +#: include/conversation.php:541 include/conversation.php:1146 #: mod/editpost.php:107 mod/message.php:203 mod/message.php:368 #: mod/photos.php:1524 mod/wallmessage.php:155 src/Module/Item/Compose.php:165 #: src/Object/Post.php:501 @@ -331,173 +331,173 @@ msgstr "" msgid "%2$d people reshared this" msgstr "" -#: include/conversation.php:1095 +#: include/conversation.php:1098 msgid "Visible to everybody" msgstr "" -#: include/conversation.php:1096 src/Module/Item/Compose.php:159 +#: include/conversation.php:1099 src/Module/Item/Compose.php:159 #: src/Object/Post.php:972 msgid "Please enter a image/video/audio/webpage URL:" msgstr "" -#: include/conversation.php:1097 +#: include/conversation.php:1100 msgid "Tag term:" msgstr "" -#: include/conversation.php:1098 src/Module/Filer/SaveTag.php:68 +#: include/conversation.php:1101 src/Module/Filer/SaveTag.php:68 msgid "Save to Folder:" msgstr "" -#: include/conversation.php:1099 +#: include/conversation.php:1102 msgid "Where are you right now?" msgstr "" -#: include/conversation.php:1100 +#: include/conversation.php:1103 msgid "Delete item(s)?" msgstr "" -#: include/conversation.php:1110 +#: include/conversation.php:1113 msgid "New Post" msgstr "" -#: include/conversation.php:1113 +#: include/conversation.php:1116 msgid "Share" msgstr "" -#: include/conversation.php:1114 mod/editpost.php:92 mod/photos.php:1373 +#: include/conversation.php:1117 mod/editpost.php:92 mod/photos.php:1373 #: src/Module/Contact/Poke.php:157 src/Object/Post.php:963 msgid "Loading..." msgstr "" -#: include/conversation.php:1115 mod/editpost.php:93 mod/message.php:201 +#: include/conversation.php:1118 mod/editpost.php:93 mod/message.php:201 #: mod/message.php:365 mod/wallmessage.php:153 msgid "Upload photo" msgstr "" -#: include/conversation.php:1116 mod/editpost.php:94 +#: include/conversation.php:1119 mod/editpost.php:94 msgid "upload photo" msgstr "" -#: include/conversation.php:1117 mod/editpost.php:95 +#: include/conversation.php:1120 mod/editpost.php:95 msgid "Attach file" msgstr "" -#: include/conversation.php:1118 mod/editpost.php:96 +#: include/conversation.php:1121 mod/editpost.php:96 msgid "attach file" msgstr "" -#: include/conversation.php:1119 src/Module/Item/Compose.php:151 +#: include/conversation.php:1122 src/Module/Item/Compose.php:151 #: src/Object/Post.php:964 msgid "Bold" msgstr "" -#: include/conversation.php:1120 src/Module/Item/Compose.php:152 +#: include/conversation.php:1123 src/Module/Item/Compose.php:152 #: src/Object/Post.php:965 msgid "Italic" msgstr "" -#: include/conversation.php:1121 src/Module/Item/Compose.php:153 +#: include/conversation.php:1124 src/Module/Item/Compose.php:153 #: src/Object/Post.php:966 msgid "Underline" msgstr "" -#: include/conversation.php:1122 src/Module/Item/Compose.php:154 +#: include/conversation.php:1125 src/Module/Item/Compose.php:154 #: src/Object/Post.php:967 msgid "Quote" msgstr "" -#: include/conversation.php:1123 src/Module/Item/Compose.php:155 +#: include/conversation.php:1126 src/Module/Item/Compose.php:155 #: src/Object/Post.php:968 msgid "Code" msgstr "" -#: include/conversation.php:1124 src/Module/Item/Compose.php:156 +#: include/conversation.php:1127 src/Module/Item/Compose.php:156 #: src/Object/Post.php:969 msgid "Image" msgstr "" -#: include/conversation.php:1125 src/Module/Item/Compose.php:157 +#: include/conversation.php:1128 src/Module/Item/Compose.php:157 #: src/Object/Post.php:970 msgid "Link" msgstr "" -#: include/conversation.php:1126 src/Module/Item/Compose.php:158 +#: include/conversation.php:1129 src/Module/Item/Compose.php:158 #: src/Object/Post.php:971 msgid "Link or Media" msgstr "" -#: include/conversation.php:1127 +#: include/conversation.php:1130 msgid "Video" msgstr "" -#: include/conversation.php:1128 mod/editpost.php:103 +#: include/conversation.php:1131 mod/editpost.php:103 #: src/Module/Item/Compose.php:161 msgid "Set your location" msgstr "" -#: include/conversation.php:1129 mod/editpost.php:104 +#: include/conversation.php:1132 mod/editpost.php:104 msgid "set location" msgstr "" -#: include/conversation.php:1130 mod/editpost.php:105 +#: include/conversation.php:1133 mod/editpost.php:105 msgid "Clear browser location" msgstr "" -#: include/conversation.php:1131 mod/editpost.php:106 +#: include/conversation.php:1134 mod/editpost.php:106 msgid "clear location" msgstr "" -#: include/conversation.php:1133 mod/editpost.php:120 +#: include/conversation.php:1136 mod/editpost.php:120 #: src/Module/Item/Compose.php:166 msgid "Set title" msgstr "" -#: include/conversation.php:1135 mod/editpost.php:122 +#: include/conversation.php:1138 mod/editpost.php:122 #: src/Module/Item/Compose.php:167 msgid "Categories (comma-separated list)" msgstr "" -#: include/conversation.php:1140 src/Module/Item/Compose.php:172 +#: include/conversation.php:1143 src/Module/Item/Compose.php:172 msgid "Scheduled at" msgstr "" -#: include/conversation.php:1144 mod/editpost.php:108 +#: include/conversation.php:1147 mod/editpost.php:108 msgid "Permission settings" msgstr "" -#: include/conversation.php:1145 mod/editpost.php:136 mod/events.php:583 +#: include/conversation.php:1148 mod/editpost.php:136 mod/events.php:583 #: mod/photos.php:965 mod/photos.php:1326 msgid "Permissions" msgstr "" -#: include/conversation.php:1154 mod/editpost.php:117 +#: include/conversation.php:1157 mod/editpost.php:117 msgid "Public post" msgstr "" -#: include/conversation.php:1158 mod/editpost.php:128 mod/events.php:578 +#: include/conversation.php:1161 mod/editpost.php:128 mod/events.php:578 #: mod/photos.php:1372 mod/photos.php:1428 mod/photos.php:1502 #: src/Module/Item/Compose.php:160 src/Object/Post.php:973 msgid "Preview" msgstr "" -#: include/conversation.php:1161 mod/editpost.php:130 mod/fbrowser.php:105 +#: include/conversation.php:1164 mod/editpost.php:130 mod/fbrowser.php:105 #: mod/fbrowser.php:134 mod/follow.php:144 mod/photos.php:1028 #: mod/photos.php:1134 mod/tagrm.php:37 mod/tagrm.php:129 mod/unfollow.php:97 #: src/Module/Contact.php:422 src/Module/RemoteFollow.php:116 msgid "Cancel" msgstr "" -#: include/conversation.php:1168 mod/editpost.php:134 +#: include/conversation.php:1171 mod/editpost.php:134 #: src/Content/Widget/VCard.php:107 src/Model/Profile.php:459 msgid "Message" msgstr "" -#: include/conversation.php:1169 mod/editpost.php:135 +#: include/conversation.php:1172 mod/editpost.php:135 #: src/Module/Settings/TwoFactor/Trusted.php:101 msgid "Browser" msgstr "" -#: include/conversation.php:1171 mod/editpost.php:138 +#: include/conversation.php:1174 mod/editpost.php:138 msgid "Open Compose page" msgstr "" @@ -1029,7 +1029,7 @@ msgstr "" msgid "Basic" msgstr "" -#: mod/events.php:582 src/Module/Admin/Site.php:506 src/Module/Contact.php:916 +#: mod/events.php:582 src/Module/Admin/Site.php:503 src/Module/Contact.php:916 #: src/Module/Profile/Profile.php:249 msgid "Advanced" msgstr "" @@ -1866,7 +1866,7 @@ msgstr "" #: mod/settings.php:482 mod/settings.php:575 mod/settings.php:712 #: src/Module/Admin/Addons/Index.php:69 src/Module/Admin/Features.php:87 -#: src/Module/Admin/Logs/Settings.php:82 src/Module/Admin/Site.php:501 +#: src/Module/Admin/Logs/Settings.php:82 src/Module/Admin/Site.php:498 #: src/Module/Admin/Themes/Index.php:113 src/Module/Admin/Tos.php:66 #: src/Module/Settings/Delegation.php:170 src/Module/Settings/Display.php:194 msgid "Save Settings" @@ -5049,7 +5049,7 @@ msgstr "" #: src/Module/Admin/Blocklist/Server.php:88 src/Module/Admin/Federation.php:159 #: src/Module/Admin/Item/Delete.php:65 src/Module/Admin/Logs/Settings.php:80 #: src/Module/Admin/Logs/View.php:84 src/Module/Admin/Queue.php:72 -#: src/Module/Admin/Site.php:498 src/Module/Admin/Storage.php:131 +#: src/Module/Admin/Site.php:495 src/Module/Admin/Storage.php:131 #: src/Module/Admin/Summary.php:232 src/Module/Admin/Themes/Details.php:90 #: src/Module/Admin/Themes/Index.php:111 src/Module/Admin/Tos.php:58 #: src/Module/Admin/Users/Active.php:136 src/Module/Admin/Users/Blocked.php:137 @@ -5603,464 +5603,464 @@ msgstr "" msgid "Relocation started. Could take a while to complete." msgstr "" -#: src/Module/Admin/Site.php:403 src/Module/Settings/Display.php:139 +#: src/Module/Admin/Site.php:400 src/Module/Settings/Display.php:139 msgid "No special theme for mobile devices" msgstr "" -#: src/Module/Admin/Site.php:420 src/Module/Settings/Display.php:149 +#: src/Module/Admin/Site.php:417 src/Module/Settings/Display.php:149 #, php-format msgid "%s - (Experimental)" msgstr "" -#: src/Module/Admin/Site.php:432 +#: src/Module/Admin/Site.php:429 msgid "No community page for local users" msgstr "" -#: src/Module/Admin/Site.php:433 +#: src/Module/Admin/Site.php:430 msgid "No community page" msgstr "" -#: src/Module/Admin/Site.php:434 +#: src/Module/Admin/Site.php:431 msgid "Public postings from users of this site" msgstr "" -#: src/Module/Admin/Site.php:435 +#: src/Module/Admin/Site.php:432 msgid "Public postings from the federated network" msgstr "" -#: src/Module/Admin/Site.php:436 +#: src/Module/Admin/Site.php:433 msgid "Public postings from local users and the federated network" msgstr "" -#: src/Module/Admin/Site.php:442 +#: src/Module/Admin/Site.php:439 msgid "Multi user instance" msgstr "" -#: src/Module/Admin/Site.php:469 +#: src/Module/Admin/Site.php:466 msgid "Closed" msgstr "" -#: src/Module/Admin/Site.php:470 +#: src/Module/Admin/Site.php:467 msgid "Requires approval" msgstr "" -#: src/Module/Admin/Site.php:471 +#: src/Module/Admin/Site.php:468 msgid "Open" msgstr "" -#: src/Module/Admin/Site.php:475 src/Module/Install.php:215 +#: src/Module/Admin/Site.php:472 src/Module/Install.php:215 msgid "No SSL policy, links will track page SSL state" msgstr "" -#: src/Module/Admin/Site.php:476 src/Module/Install.php:216 +#: src/Module/Admin/Site.php:473 src/Module/Install.php:216 msgid "Force all links to use SSL" msgstr "" -#: src/Module/Admin/Site.php:477 src/Module/Install.php:217 +#: src/Module/Admin/Site.php:474 src/Module/Install.php:217 msgid "Self-signed certificate, use SSL for local links only (discouraged)" msgstr "" -#: src/Module/Admin/Site.php:481 +#: src/Module/Admin/Site.php:478 msgid "Don't check" msgstr "" -#: src/Module/Admin/Site.php:482 +#: src/Module/Admin/Site.php:479 msgid "check the stable version" msgstr "" -#: src/Module/Admin/Site.php:483 +#: src/Module/Admin/Site.php:480 msgid "check the development version" msgstr "" -#: src/Module/Admin/Site.php:487 +#: src/Module/Admin/Site.php:484 msgid "none" msgstr "" -#: src/Module/Admin/Site.php:488 +#: src/Module/Admin/Site.php:485 msgid "Local contacts" msgstr "" -#: src/Module/Admin/Site.php:489 +#: src/Module/Admin/Site.php:486 msgid "Interactors" msgstr "" -#: src/Module/Admin/Site.php:499 src/Module/BaseAdmin.php:90 +#: src/Module/Admin/Site.php:496 src/Module/BaseAdmin.php:90 msgid "Site" msgstr "" -#: src/Module/Admin/Site.php:500 +#: src/Module/Admin/Site.php:497 msgid "General Information" msgstr "" -#: src/Module/Admin/Site.php:502 +#: src/Module/Admin/Site.php:499 msgid "Republish users to directory" msgstr "" -#: src/Module/Admin/Site.php:503 src/Module/Register.php:139 +#: src/Module/Admin/Site.php:500 src/Module/Register.php:139 msgid "Registration" msgstr "" -#: src/Module/Admin/Site.php:504 +#: src/Module/Admin/Site.php:501 msgid "File upload" msgstr "" -#: src/Module/Admin/Site.php:505 +#: src/Module/Admin/Site.php:502 msgid "Policies" msgstr "" -#: src/Module/Admin/Site.php:507 +#: src/Module/Admin/Site.php:504 msgid "Auto Discovered Contact Directory" msgstr "" -#: src/Module/Admin/Site.php:508 +#: src/Module/Admin/Site.php:505 msgid "Performance" msgstr "" -#: src/Module/Admin/Site.php:509 +#: src/Module/Admin/Site.php:506 msgid "Worker" msgstr "" -#: src/Module/Admin/Site.php:510 +#: src/Module/Admin/Site.php:507 msgid "Message Relay" msgstr "" -#: src/Module/Admin/Site.php:511 +#: src/Module/Admin/Site.php:508 msgid "" "Use the command \"console relay\" in the command line to add or remove " "relays." msgstr "" -#: src/Module/Admin/Site.php:512 +#: src/Module/Admin/Site.php:509 msgid "The system is not subscribed to any relays at the moment." msgstr "" -#: src/Module/Admin/Site.php:513 +#: src/Module/Admin/Site.php:510 msgid "The system is currently subscribed to the following relays:" msgstr "" -#: src/Module/Admin/Site.php:515 +#: src/Module/Admin/Site.php:512 msgid "Relocate Instance" msgstr "" -#: src/Module/Admin/Site.php:516 +#: src/Module/Admin/Site.php:513 msgid "" "Warning! Advanced function. Could make this server " "unreachable." msgstr "" -#: src/Module/Admin/Site.php:520 +#: src/Module/Admin/Site.php:517 msgid "Site name" msgstr "" -#: src/Module/Admin/Site.php:521 +#: src/Module/Admin/Site.php:518 msgid "Sender Email" msgstr "" -#: src/Module/Admin/Site.php:521 +#: src/Module/Admin/Site.php:518 msgid "" "The email address your server shall use to send notification emails from." msgstr "" -#: src/Module/Admin/Site.php:522 +#: src/Module/Admin/Site.php:519 msgid "Name of the system actor" msgstr "" -#: src/Module/Admin/Site.php:522 +#: src/Module/Admin/Site.php:519 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:523 +#: src/Module/Admin/Site.php:520 msgid "Banner/Logo" msgstr "" -#: src/Module/Admin/Site.php:524 +#: src/Module/Admin/Site.php:521 msgid "Email Banner/Logo" msgstr "" -#: src/Module/Admin/Site.php:525 +#: src/Module/Admin/Site.php:522 msgid "Shortcut icon" msgstr "" -#: src/Module/Admin/Site.php:525 +#: src/Module/Admin/Site.php:522 msgid "Link to an icon that will be used for browsers." msgstr "" -#: src/Module/Admin/Site.php:526 +#: src/Module/Admin/Site.php:523 msgid "Touch icon" msgstr "" -#: src/Module/Admin/Site.php:526 +#: src/Module/Admin/Site.php:523 msgid "Link to an icon that will be used for tablets and mobiles." msgstr "" -#: src/Module/Admin/Site.php:527 +#: src/Module/Admin/Site.php:524 msgid "Additional Info" msgstr "" -#: src/Module/Admin/Site.php:527 +#: src/Module/Admin/Site.php:524 #, 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:528 +#: src/Module/Admin/Site.php:525 msgid "System language" msgstr "" -#: src/Module/Admin/Site.php:529 +#: src/Module/Admin/Site.php:526 msgid "System theme" msgstr "" -#: src/Module/Admin/Site.php:529 +#: src/Module/Admin/Site.php:526 msgid "" "Default system theme - may be over-ridden by user profiles - Change default theme settings" msgstr "" -#: src/Module/Admin/Site.php:530 +#: src/Module/Admin/Site.php:527 msgid "Mobile system theme" msgstr "" -#: src/Module/Admin/Site.php:530 +#: src/Module/Admin/Site.php:527 msgid "Theme for mobile devices" msgstr "" -#: src/Module/Admin/Site.php:531 src/Module/Install.php:225 +#: src/Module/Admin/Site.php:528 src/Module/Install.php:225 msgid "SSL link policy" msgstr "" -#: src/Module/Admin/Site.php:531 src/Module/Install.php:227 +#: src/Module/Admin/Site.php:528 src/Module/Install.php:227 msgid "Determines whether generated links should be forced to use SSL" msgstr "" -#: src/Module/Admin/Site.php:532 +#: src/Module/Admin/Site.php:529 msgid "Force SSL" msgstr "" -#: src/Module/Admin/Site.php:532 +#: src/Module/Admin/Site.php:529 msgid "" "Force all Non-SSL requests to SSL - Attention: on some systems it could lead " "to endless loops." msgstr "" -#: src/Module/Admin/Site.php:533 +#: src/Module/Admin/Site.php:530 msgid "Show help entry from navigation menu" msgstr "" -#: src/Module/Admin/Site.php:533 +#: src/Module/Admin/Site.php:530 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:534 +#: src/Module/Admin/Site.php:531 msgid "Single user instance" msgstr "" -#: src/Module/Admin/Site.php:534 +#: src/Module/Admin/Site.php:531 msgid "Make this instance multi-user or single-user for the named user" msgstr "" -#: src/Module/Admin/Site.php:536 +#: src/Module/Admin/Site.php:533 msgid "Maximum image size" msgstr "" -#: src/Module/Admin/Site.php:536 +#: src/Module/Admin/Site.php:533 msgid "" "Maximum size in bytes of uploaded images. Default is 0, which means no " "limits." msgstr "" -#: src/Module/Admin/Site.php:537 +#: src/Module/Admin/Site.php:534 msgid "Maximum image length" msgstr "" -#: src/Module/Admin/Site.php:537 +#: src/Module/Admin/Site.php:534 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:538 +#: src/Module/Admin/Site.php:535 msgid "JPEG image quality" msgstr "" -#: src/Module/Admin/Site.php:538 +#: src/Module/Admin/Site.php:535 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:540 +#: src/Module/Admin/Site.php:537 msgid "Register policy" msgstr "" -#: src/Module/Admin/Site.php:541 +#: src/Module/Admin/Site.php:538 msgid "Maximum Daily Registrations" msgstr "" -#: src/Module/Admin/Site.php:541 +#: src/Module/Admin/Site.php:538 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:542 +#: src/Module/Admin/Site.php:539 msgid "Register text" msgstr "" -#: src/Module/Admin/Site.php:542 +#: src/Module/Admin/Site.php:539 msgid "" "Will be displayed prominently on the registration page. You can use BBCode " "here." msgstr "" -#: src/Module/Admin/Site.php:543 +#: src/Module/Admin/Site.php:540 msgid "Forbidden Nicknames" msgstr "" -#: src/Module/Admin/Site.php:543 +#: src/Module/Admin/Site.php:540 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:544 +#: src/Module/Admin/Site.php:541 msgid "Accounts abandoned after x days" msgstr "" -#: src/Module/Admin/Site.php:544 +#: src/Module/Admin/Site.php:541 msgid "" "Will not waste system resources polling external sites for abandonded " "accounts. Enter 0 for no time limit." msgstr "" -#: src/Module/Admin/Site.php:545 +#: src/Module/Admin/Site.php:542 msgid "Allowed friend domains" msgstr "" -#: src/Module/Admin/Site.php:545 +#: src/Module/Admin/Site.php:542 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:546 +#: src/Module/Admin/Site.php:543 msgid "Allowed email domains" msgstr "" -#: src/Module/Admin/Site.php:546 +#: src/Module/Admin/Site.php:543 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:547 +#: src/Module/Admin/Site.php:544 msgid "No OEmbed rich content" msgstr "" -#: src/Module/Admin/Site.php:547 +#: src/Module/Admin/Site.php:544 msgid "" "Don't show the rich content (e.g. embedded PDF), except from the domains " "listed below." msgstr "" -#: src/Module/Admin/Site.php:548 +#: src/Module/Admin/Site.php:545 msgid "Trusted third-party domains" msgstr "" -#: src/Module/Admin/Site.php:548 +#: src/Module/Admin/Site.php:545 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:549 +#: src/Module/Admin/Site.php:546 msgid "Block public" msgstr "" -#: src/Module/Admin/Site.php:549 +#: src/Module/Admin/Site.php:546 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:550 +#: src/Module/Admin/Site.php:547 msgid "Force publish" msgstr "" -#: src/Module/Admin/Site.php:550 +#: src/Module/Admin/Site.php:547 msgid "" "Check to force all profiles on this site to be listed in the site directory." msgstr "" -#: src/Module/Admin/Site.php:550 +#: src/Module/Admin/Site.php:547 msgid "Enabling this may violate privacy laws like the GDPR" msgstr "" -#: src/Module/Admin/Site.php:551 +#: src/Module/Admin/Site.php:548 msgid "Global directory URL" msgstr "" -#: src/Module/Admin/Site.php:551 +#: src/Module/Admin/Site.php:548 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:552 +#: src/Module/Admin/Site.php:549 msgid "Private posts by default for new users" msgstr "" -#: src/Module/Admin/Site.php:552 +#: src/Module/Admin/Site.php:549 msgid "" "Set default post permissions for all new members to the default privacy " "group rather than public." msgstr "" -#: src/Module/Admin/Site.php:553 +#: src/Module/Admin/Site.php:550 msgid "Don't include post content in email notifications" msgstr "" -#: src/Module/Admin/Site.php:553 +#: src/Module/Admin/Site.php:550 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:554 +#: src/Module/Admin/Site.php:551 msgid "Disallow public access to addons listed in the apps menu." msgstr "" -#: src/Module/Admin/Site.php:554 +#: src/Module/Admin/Site.php:551 msgid "" "Checking this box will restrict addons listed in the apps menu to members " "only." msgstr "" -#: src/Module/Admin/Site.php:555 +#: src/Module/Admin/Site.php:552 msgid "Don't embed private images in posts" msgstr "" -#: src/Module/Admin/Site.php:555 +#: src/Module/Admin/Site.php:552 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:556 +#: src/Module/Admin/Site.php:553 msgid "Explicit Content" msgstr "" -#: src/Module/Admin/Site.php:556 +#: src/Module/Admin/Site.php:553 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 " @@ -6069,235 +6069,235 @@ msgid "" "will be shown at the user registration page." msgstr "" -#: src/Module/Admin/Site.php:557 +#: src/Module/Admin/Site.php:554 msgid "Allow Users to set remote_self" msgstr "" -#: src/Module/Admin/Site.php:557 +#: src/Module/Admin/Site.php:554 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:558 +#: src/Module/Admin/Site.php:555 msgid "Enable multiple registrations" msgstr "" -#: src/Module/Admin/Site.php:558 +#: src/Module/Admin/Site.php:555 msgid "Enable users to register additional accounts for use as pages." msgstr "" -#: src/Module/Admin/Site.php:559 +#: src/Module/Admin/Site.php:556 msgid "Enable OpenID" msgstr "" -#: src/Module/Admin/Site.php:559 +#: src/Module/Admin/Site.php:556 msgid "Enable OpenID support for registration and logins." msgstr "" -#: src/Module/Admin/Site.php:560 +#: src/Module/Admin/Site.php:557 msgid "Enable Fullname check" msgstr "" -#: src/Module/Admin/Site.php:560 +#: src/Module/Admin/Site.php:557 msgid "" "Enable check to only allow users to register with a space between the first " "name and the last name in their full name." msgstr "" -#: src/Module/Admin/Site.php:561 +#: src/Module/Admin/Site.php:558 msgid "Community pages for visitors" msgstr "" -#: src/Module/Admin/Site.php:561 +#: src/Module/Admin/Site.php:558 msgid "" "Which community pages should be available for visitors. Local users always " "see both pages." msgstr "" -#: src/Module/Admin/Site.php:562 +#: src/Module/Admin/Site.php:559 msgid "Posts per user on community page" msgstr "" -#: src/Module/Admin/Site.php:562 +#: src/Module/Admin/Site.php:559 msgid "" "The maximum number of posts per user on the community page. (Not valid for " "\"Global Community\")" msgstr "" -#: src/Module/Admin/Site.php:564 +#: src/Module/Admin/Site.php:561 msgid "Enable Mail support" msgstr "" -#: src/Module/Admin/Site.php:564 +#: src/Module/Admin/Site.php:561 msgid "" "Enable built-in mail support to poll IMAP folders and to reply via mail." msgstr "" -#: src/Module/Admin/Site.php:565 +#: src/Module/Admin/Site.php:562 msgid "" "Mail support can't be enabled because the PHP IMAP module is not installed." msgstr "" -#: src/Module/Admin/Site.php:566 +#: src/Module/Admin/Site.php:563 msgid "Enable OStatus support" msgstr "" -#: src/Module/Admin/Site.php:566 +#: src/Module/Admin/Site.php:563 msgid "" "Enable built-in OStatus (StatusNet, GNU Social etc.) compatibility. All " "communications in OStatus are public." msgstr "" -#: src/Module/Admin/Site.php:568 +#: src/Module/Admin/Site.php:565 msgid "" "Diaspora support can't be enabled because Friendica was installed into a sub " "directory." msgstr "" -#: src/Module/Admin/Site.php:569 +#: src/Module/Admin/Site.php:566 msgid "Enable Diaspora support" msgstr "" -#: src/Module/Admin/Site.php:569 +#: src/Module/Admin/Site.php:566 msgid "" "Enable built-in Diaspora network compatibility for communicating with " "diaspora servers." msgstr "" -#: src/Module/Admin/Site.php:570 +#: src/Module/Admin/Site.php:567 msgid "Verify SSL" msgstr "" -#: src/Module/Admin/Site.php:570 +#: src/Module/Admin/Site.php:567 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:571 +#: src/Module/Admin/Site.php:568 msgid "Proxy user" msgstr "" -#: src/Module/Admin/Site.php:572 +#: src/Module/Admin/Site.php:569 msgid "Proxy URL" msgstr "" -#: src/Module/Admin/Site.php:573 +#: src/Module/Admin/Site.php:570 msgid "Network timeout" msgstr "" -#: src/Module/Admin/Site.php:573 +#: src/Module/Admin/Site.php:570 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)." msgstr "" -#: src/Module/Admin/Site.php:574 +#: src/Module/Admin/Site.php:571 msgid "Maximum Load Average" msgstr "" -#: src/Module/Admin/Site.php:574 +#: src/Module/Admin/Site.php:571 #, php-format msgid "" "Maximum system load before delivery and poll processes are deferred - " "default %d." msgstr "" -#: src/Module/Admin/Site.php:575 +#: src/Module/Admin/Site.php:572 msgid "Maximum Load Average (Frontend)" msgstr "" -#: src/Module/Admin/Site.php:575 +#: src/Module/Admin/Site.php:572 msgid "Maximum system load before the frontend quits service - default 50." msgstr "" -#: src/Module/Admin/Site.php:576 +#: src/Module/Admin/Site.php:573 msgid "Minimal Memory" msgstr "" -#: src/Module/Admin/Site.php:576 +#: src/Module/Admin/Site.php:573 msgid "" "Minimal free memory in MB for the worker. Needs access to /proc/meminfo - " "default 0 (deactivated)." msgstr "" -#: src/Module/Admin/Site.php:577 +#: src/Module/Admin/Site.php:574 msgid "Periodically optimize tables" msgstr "" -#: src/Module/Admin/Site.php:577 +#: src/Module/Admin/Site.php:574 msgid "Periodically optimize tables like the cache and the workerqueue" msgstr "" -#: src/Module/Admin/Site.php:579 +#: src/Module/Admin/Site.php:576 msgid "Discover followers/followings from contacts" msgstr "" -#: src/Module/Admin/Site.php:579 +#: src/Module/Admin/Site.php:576 msgid "" "If enabled, contacts are checked for their followers and following contacts." msgstr "" -#: src/Module/Admin/Site.php:580 +#: src/Module/Admin/Site.php:577 msgid "None - deactivated" msgstr "" -#: src/Module/Admin/Site.php:581 +#: src/Module/Admin/Site.php:578 msgid "" "Local contacts - contacts of our local contacts are discovered for their " "followers/followings." msgstr "" -#: src/Module/Admin/Site.php:582 +#: src/Module/Admin/Site.php:579 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:584 +#: src/Module/Admin/Site.php:581 msgid "Synchronize the contacts with the directory server" msgstr "" -#: src/Module/Admin/Site.php:584 +#: src/Module/Admin/Site.php:581 msgid "" "if enabled, the system will check periodically for new contacts on the " "defined directory server." msgstr "" -#: src/Module/Admin/Site.php:586 +#: src/Module/Admin/Site.php:583 msgid "Days between requery" msgstr "" -#: src/Module/Admin/Site.php:586 +#: src/Module/Admin/Site.php:583 msgid "Number of days after which a server is requeried for his contacts." msgstr "" -#: src/Module/Admin/Site.php:587 +#: src/Module/Admin/Site.php:584 msgid "Discover contacts from other servers" msgstr "" -#: src/Module/Admin/Site.php:587 +#: src/Module/Admin/Site.php:584 msgid "" "Periodically query other servers for contacts. The system queries Friendica, " "Mastodon and Hubzilla servers." msgstr "" -#: src/Module/Admin/Site.php:588 +#: src/Module/Admin/Site.php:585 msgid "Search the local directory" msgstr "" -#: src/Module/Admin/Site.php:588 +#: src/Module/Admin/Site.php:585 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:590 +#: src/Module/Admin/Site.php:587 msgid "Publish server information" msgstr "" -#: src/Module/Admin/Site.php:590 +#: src/Module/Admin/Site.php:587 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 " @@ -6305,50 +6305,50 @@ msgid "" "href=\"http://the-federation.info/\">the-federation.info for details." msgstr "" -#: src/Module/Admin/Site.php:592 +#: src/Module/Admin/Site.php:589 msgid "Check upstream version" msgstr "" -#: src/Module/Admin/Site.php:592 +#: src/Module/Admin/Site.php:589 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:593 +#: src/Module/Admin/Site.php:590 msgid "Suppress Tags" msgstr "" -#: src/Module/Admin/Site.php:593 +#: src/Module/Admin/Site.php:590 msgid "Suppress showing a list of hashtags at the end of the posting." msgstr "" -#: src/Module/Admin/Site.php:594 +#: src/Module/Admin/Site.php:591 msgid "Clean database" msgstr "" -#: src/Module/Admin/Site.php:594 +#: src/Module/Admin/Site.php:591 msgid "" "Remove old remote items, orphaned database records and old content from some " "other helper tables." msgstr "" -#: src/Module/Admin/Site.php:595 +#: src/Module/Admin/Site.php:592 msgid "Lifespan of remote items" msgstr "" -#: src/Module/Admin/Site.php:595 +#: src/Module/Admin/Site.php:592 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:596 +#: src/Module/Admin/Site.php:593 msgid "Lifespan of unclaimed items" msgstr "" -#: src/Module/Admin/Site.php:596 +#: src/Module/Admin/Site.php:593 msgid "" "When the database cleanup is enabled, this defines the days after which " "unclaimed remote items (mostly content from the relay) will be deleted. " @@ -6356,156 +6356,144 @@ msgid "" "items if set to 0." msgstr "" -#: src/Module/Admin/Site.php:597 +#: src/Module/Admin/Site.php:594 msgid "Lifespan of raw conversation data" msgstr "" -#: src/Module/Admin/Site.php:597 +#: src/Module/Admin/Site.php:594 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:598 +#: src/Module/Admin/Site.php:595 msgid "Maximum numbers of comments per post" msgstr "" -#: src/Module/Admin/Site.php:598 +#: src/Module/Admin/Site.php:595 msgid "How much comments should be shown for each post? Default value is 100." msgstr "" -#: src/Module/Admin/Site.php:599 +#: src/Module/Admin/Site.php:596 msgid "Maximum numbers of comments per post on the display page" msgstr "" -#: src/Module/Admin/Site.php:599 +#: src/Module/Admin/Site.php:596 msgid "" "How many comments should be shown on the single view for each post? Default " "value is 1000." msgstr "" -#: src/Module/Admin/Site.php:600 +#: src/Module/Admin/Site.php:597 msgid "Temp path" msgstr "" -#: src/Module/Admin/Site.php:600 +#: src/Module/Admin/Site.php:597 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:601 +#: src/Module/Admin/Site.php:598 msgid "Only search in tags" msgstr "" -#: src/Module/Admin/Site.php:601 +#: src/Module/Admin/Site.php:598 msgid "On large systems the text search can slow down the system extremely." msgstr "" -#: src/Module/Admin/Site.php:603 +#: src/Module/Admin/Site.php:600 msgid "New base url" msgstr "" -#: src/Module/Admin/Site.php:603 +#: src/Module/Admin/Site.php:600 msgid "" "Change base url for this server. Sends relocate message to all Friendica and " "Diaspora* contacts of all users." msgstr "" -#: src/Module/Admin/Site.php:605 -msgid "RINO Encryption" -msgstr "" - -#: src/Module/Admin/Site.php:605 -msgid "Encryption layer between nodes." -msgstr "" - -#: src/Module/Admin/Site.php:605 src/Module/Admin/Site.php:611 -#: src/Module/Contact.php:515 src/Module/Settings/TwoFactor/Index.php:118 -msgid "Disabled" -msgstr "" - -#: src/Module/Admin/Site.php:605 -msgid "Enabled" -msgstr "" - -#: src/Module/Admin/Site.php:607 +#: src/Module/Admin/Site.php:602 msgid "Maximum number of parallel workers" msgstr "" -#: src/Module/Admin/Site.php:607 +#: src/Module/Admin/Site.php:602 #, 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:608 +#: src/Module/Admin/Site.php:603 msgid "Enable fastlane" msgstr "" -#: src/Module/Admin/Site.php:608 +#: src/Module/Admin/Site.php:603 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:610 +#: src/Module/Admin/Site.php:605 msgid "Direct relay transfer" msgstr "" -#: src/Module/Admin/Site.php:610 +#: src/Module/Admin/Site.php:605 msgid "" "Enables the direct transfer to other servers without using the relay servers" msgstr "" -#: src/Module/Admin/Site.php:611 +#: src/Module/Admin/Site.php:606 msgid "Relay scope" msgstr "" -#: src/Module/Admin/Site.php:611 +#: src/Module/Admin/Site.php:606 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:611 +#: src/Module/Admin/Site.php:606 src/Module/Contact.php:515 +#: src/Module/Settings/TwoFactor/Index.php:118 +msgid "Disabled" +msgstr "" + +#: src/Module/Admin/Site.php:606 msgid "all" msgstr "" -#: src/Module/Admin/Site.php:611 +#: src/Module/Admin/Site.php:606 msgid "tags" msgstr "" -#: src/Module/Admin/Site.php:612 +#: src/Module/Admin/Site.php:607 msgid "Server tags" msgstr "" -#: src/Module/Admin/Site.php:612 +#: src/Module/Admin/Site.php:607 msgid "Comma separated list of tags for the \"tags\" subscription." msgstr "" -#: src/Module/Admin/Site.php:613 +#: src/Module/Admin/Site.php:608 msgid "Deny Server tags" msgstr "" -#: src/Module/Admin/Site.php:613 +#: src/Module/Admin/Site.php:608 msgid "Comma separated list of tags that are rejected." msgstr "" -#: src/Module/Admin/Site.php:614 +#: src/Module/Admin/Site.php:609 msgid "Allow user tags" msgstr "" -#: src/Module/Admin/Site.php:614 +#: src/Module/Admin/Site.php:609 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:617 +#: src/Module/Admin/Site.php:612 msgid "Start Relocation" msgstr "" diff --git a/view/templates/admin/site.tpl b/view/templates/admin/site.tpl index ff0640469..2b181ce18 100644 --- a/view/templates/admin/site.tpl +++ b/view/templates/admin/site.tpl @@ -86,7 +86,6 @@

{{$advanced}}

- {{include file="field_select.tpl" field=$rino}} {{include file="field_checkbox.tpl" field=$verifyssl}} {{include file="field_input.tpl" field=$proxy}} {{include file="field_input.tpl" field=$proxyuser}} diff --git a/view/theme/frio/templates/admin/site.tpl b/view/theme/frio/templates/admin/site.tpl index 5e167734d..18d702a33 100644 --- a/view/theme/frio/templates/admin/site.tpl +++ b/view/theme/frio/templates/admin/site.tpl @@ -185,7 +185,6 @@
- {{include file="field_select.tpl" field=$rino}} {{include file="field_checkbox.tpl" field=$verifyssl}} {{include file="field_input.tpl" field=$proxy}} {{include file="field_input.tpl" field=$proxyuser}}