added two help texts in the admin panel site config

diff --git a/src/Module/Admin/Site.php b/src/Module/Admin/Site.php
index 2bac3d79edf76532c9b97ce6def3fc55f833bcd1..0f440f253a2f5a93f3b5ab90139904161d3ccc1b 100644 (file)
--- a/src/Module/Admin/Site.php
+++ b/src/Module/Admin/Site.php
@@ -570,8 +570,8 @@ class Site extends BaseAdmin
                        '$diaspora_not_able'      => DI::l10n()->t('Diaspora support can\'t be enabled because Friendica was installed into a sub directory.'),
                        '$diaspora_enabled'       => ['diaspora_enabled', DI::l10n()->t('Enable Diaspora support'), DI::config()->get('system', 'diaspora_enabled', $diaspora_able), DI::l10n()->t('Enable built-in Diaspora network compatibility for communicating with diaspora servers.')],
                        '$verifyssl'              => ['verifyssl', DI::l10n()->t('Verify SSL'), DI::config()->get('system', 'verifyssl'), DI::l10n()->t('If you wish, you can turn on strict certificate checking. This will mean you cannot connect (at all) to self-signed SSL sites.')],
-                       '$proxyuser'              => ['proxyuser', DI::l10n()->t('Proxy user'), DI::config()->get('system', 'proxyuser'), ''],
-                       '$proxy'                  => ['proxy', DI::l10n()->t('Proxy URL'), DI::config()->get('system', 'proxy'), ''],
+                       '$proxyuser'              => ['proxyuser', DI::l10n()->t('Proxy user'), DI::config()->get('system', 'proxyuser'), DI::l10n()->t('User name for the proxy server.')],
+                       '$proxy'                  => ['proxy', DI::l10n()->t('Proxy URL'), DI::config()->get('system', 'proxy'), DI::l10n()->t('If you want to use a proxy server that Friendica should use to connect to the network, put the URL of the proxy here.')],
                        '$timeout'                => ['timeout', DI::l10n()->t('Network timeout'), DI::config()->get('system', 'curl_timeout'), DI::l10n()->t('Value is in seconds. Set to 0 for unlimited (not recommended).')],
                        '$maxloadavg'             => ['maxloadavg', DI::l10n()->t('Maximum Load Average'), DI::config()->get('system', 'maxloadavg'), DI::l10n()->t('Maximum system load before delivery and poll processes are deferred - default %d.', 20)],
                        '$min_memory'             => ['min_memory', DI::l10n()->t('Minimal Memory'), DI::config()->get('system', 'min_memory'), DI::l10n()->t('Minimal free memory in MB for the worker. Needs access to /proc/meminfo - default 0 (deactivated).')],

diff --git a/view/lang/C/messages.po b/view/lang/C/messages.po
index 210eb04542911ac040204671bdd5c4d89bf6f296..af98956ecb02bdb98b895c3896073c71e2890911 100644 (file)
--- a/view/lang/C/messages.po
+++ b/view/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 2022.05-dev\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-02-07 19:20+0000\n"
+"POT-Creation-Date: 2022-02-10 09:02+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -3169,7 +3169,7 @@ msgstr ""
 msgid "Local Directory"
 msgstr ""
 
-#: src/Content/Widget.php:207 src/Model/Group.php:507
+#: src/Content/Widget.php:207 src/Model/Group.php:508
 #: src/Module/Contact.php:354 src/Module/Welcome.php:76
 msgid "Groups"
 msgstr ""
@@ -3226,7 +3226,7 @@ msgstr ""
 msgid "Organisations"
 msgstr ""
 
-#: src/Content/Widget.php:522 src/Model/Contact.php:1494
+#: src/Content/Widget.php:522 src/Model/Contact.php:1471
 msgid "News"
 msgstr ""
 
@@ -4059,71 +4059,71 @@ msgstr ""
 msgid "Approve"
 msgstr ""
 
-#: src/Model/Contact.php:1490
+#: src/Model/Contact.php:1467
 msgid "Organisation"
 msgstr ""
 
-#: src/Model/Contact.php:1498
+#: src/Model/Contact.php:1475
 msgid "Forum"
 msgstr ""
 
-#: src/Model/Contact.php:2433
+#: src/Model/Contact.php:2410
 msgid "Disallowed profile URL."
 msgstr ""
 
-#: src/Model/Contact.php:2438 src/Module/Friendica.php:81
+#: src/Model/Contact.php:2415 src/Module/Friendica.php:81
 msgid "Blocked domain"
 msgstr ""
 
-#: src/Model/Contact.php:2443
+#: src/Model/Contact.php:2420
 msgid "Connect URL missing."
 msgstr ""
 
-#: src/Model/Contact.php:2452
+#: src/Model/Contact.php:2429
 msgid ""
 "The contact could not be added. Please check the relevant network "
 "credentials in your Settings -> Social Networks page."
 msgstr ""
 
-#: src/Model/Contact.php:2489
+#: src/Model/Contact.php:2466
 msgid "The profile address specified does not provide adequate information."
 msgstr ""
 
-#: src/Model/Contact.php:2491
+#: src/Model/Contact.php:2468
 msgid "No compatible communication protocols or feeds were discovered."
 msgstr ""
 
-#: src/Model/Contact.php:2494
+#: src/Model/Contact.php:2471
 msgid "An author or name was not found."
 msgstr ""
 
-#: src/Model/Contact.php:2497
+#: src/Model/Contact.php:2474
 msgid "No browser URL could be matched to this address."
 msgstr ""
 
-#: src/Model/Contact.php:2500
+#: src/Model/Contact.php:2477
 msgid ""
 "Unable to match @-style Identity Address with a known protocol or email "
 "contact."
 msgstr ""
 
-#: src/Model/Contact.php:2501
+#: src/Model/Contact.php:2478
 msgid "Use mailto: in front of address to force email check."
 msgstr ""
 
-#: src/Model/Contact.php:2507
+#: src/Model/Contact.php:2484
 msgid ""
 "The profile address specified belongs to a network which has been disabled "
 "on this site."
 msgstr ""
 
-#: src/Model/Contact.php:2512
+#: src/Model/Contact.php:2489
 msgid ""
 "Limited profile. This person will be unable to receive direct/personal "
 "notifications from you."
 msgstr ""
 
-#: src/Model/Contact.php:2571
+#: src/Model/Contact.php:2548
 msgid "Unable to retrieve contact information."
 msgstr ""
 
@@ -4199,47 +4199,47 @@ msgstr ""
 msgid "Happy Birthday %s"
 msgstr ""
 
-#: src/Model/Group.php:94
+#: src/Model/Group.php:95
 msgid ""
 "A deleted group with this name was revived. Existing item permissions "
 "<strong>may</strong> apply to this group and any future members. If this is "
 "not what you intended, please create another group with a different name."
 msgstr ""
 
-#: src/Model/Group.php:423
+#: src/Model/Group.php:424
 msgid "Default privacy group for new contacts"
 msgstr ""
 
-#: src/Model/Group.php:455
+#: src/Model/Group.php:456
 msgid "Everybody"
 msgstr ""
 
-#: src/Model/Group.php:474
+#: src/Model/Group.php:475
 msgid "edit"
 msgstr ""
 
-#: src/Model/Group.php:506
+#: src/Model/Group.php:507
 msgid "add"
 msgstr ""
 
-#: src/Model/Group.php:511
+#: src/Model/Group.php:512
 msgid "Edit group"
 msgstr ""
 
-#: src/Model/Group.php:512 src/Module/Group.php:194
+#: src/Model/Group.php:513 src/Module/Group.php:194
 msgid "Contacts not in any group"
 msgstr ""
 
-#: src/Model/Group.php:514
+#: src/Model/Group.php:515
 msgid "Create a new group"
 msgstr ""
 
-#: src/Model/Group.php:515 src/Module/Group.php:179 src/Module/Group.php:202
+#: src/Model/Group.php:516 src/Module/Group.php:179 src/Module/Group.php:202
 #: src/Module/Group.php:277
 msgid "Group Name: "
 msgstr ""
 
-#: src/Model/Group.php:516
+#: src/Model/Group.php:517
 msgid "Edit groups"
 msgstr ""
 
@@ -6027,10 +6027,20 @@ msgstr ""
 msgid "Proxy user"
 msgstr ""
 
+#: src/Module/Admin/Site.php:573
+msgid "User name for the proxy server."
+msgstr ""
+
 #: src/Module/Admin/Site.php:574
 msgid "Proxy URL"
 msgstr ""
 
+#: src/Module/Admin/Site.php:574
+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:575
 msgid "Network timeout"
 msgstr ""