Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-11-19 13:03:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #10296 from tobiasd/20210522-issue10293

Browse source 
mention the required function in the install wizard (issue10293)
This commit is contained in:
Michael Vogel 2021-05-23 08:52:51 +02:00 committed by GitHub
commit 03edb94447
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Core/Installer.php
View file

@ -465,7 +465,7 @@ class Installer
$status = $this->checkFunction('proc_open', $status = $this->checkFunction('proc_open',
DI::l10n()->t('Program execution functions'), DI::l10n()->t('Program execution functions'),
DI::l10n()->t('Error: Program execution functions required but not enabled.'), DI::l10n()->t('Error: Program execution functions (proc_open) required but not enabled.'),
true true
); );
$returnVal = $returnVal ? $status : false; $returnVal = $returnVal ? $status : false;

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

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: 2021.06-rc\n" "Project-Id-Version: 2021.06-rc\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-05-21 18:18+0000\n" "POT-Creation-Date: 2021-05-23 07:49+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -1117,11 +1117,11 @@ msgstr ""
msgid "Invalid profile URL." msgid "Invalid profile URL."
msgstr "" msgstr ""
#: mod/dfrn_request.php:355 src/Model/Contact.php:2159 #: mod/dfrn_request.php:355 src/Model/Contact.php:2164
msgid "Disallowed profile URL." msgid "Disallowed profile URL."
msgstr "" msgstr ""
#: mod/dfrn_request.php:361 src/Model/Contact.php:2164 #: mod/dfrn_request.php:361 src/Model/Contact.php:2169
#: src/Module/Friendica.php:80 #: src/Module/Friendica.php:80
msgid "Blocked domain" msgid "Blocked domain"
msgstr "" msgstr ""
@ -4072,7 +4072,8 @@ msgid "Program execution functions"
msgstr "" msgstr ""
#: src/Core/Installer.php:468 #: src/Core/Installer.php:468
msgid "Error: Program execution functions required but not enabled." msgid ""
"Error: Program execution functions (proc_open) required but not enabled."
msgstr "" msgstr ""
#: src/Core/Installer.php:474 #: src/Core/Installer.php:474
@ -4645,60 +4646,60 @@ msgstr ""
msgid "Forum" msgid "Forum"
msgstr "" msgstr ""
#: src/Model/Contact.php:2169 #: src/Model/Contact.php:2174
msgid "Connect URL missing." msgid "Connect URL missing."
msgstr "" msgstr ""
#: src/Model/Contact.php:2178 #: src/Model/Contact.php:2183
msgid "" msgid ""
"The contact could not be added. Please check the relevant network " "The contact could not be added. Please check the relevant network "
"credentials in your Settings -> Social Networks page." "credentials in your Settings -> Social Networks page."
msgstr "" msgstr ""
#: src/Model/Contact.php:2219 #: src/Model/Contact.php:2224
msgid "" msgid ""
"This site is not configured to allow communications with other networks." "This site is not configured to allow communications with other networks."
msgstr "" msgstr ""
#: src/Model/Contact.php:2220 src/Model/Contact.php:2233 #: src/Model/Contact.php:2225 src/Model/Contact.php:2238
msgid "No compatible communication protocols or feeds were discovered." msgid "No compatible communication protocols or feeds were discovered."
msgstr "" msgstr ""
#: src/Model/Contact.php:2231 #: src/Model/Contact.php:2236
msgid "The profile address specified does not provide adequate information." msgid "The profile address specified does not provide adequate information."
msgstr "" msgstr ""
#: src/Model/Contact.php:2236 #: src/Model/Contact.php:2241
msgid "An author or name was not found." msgid "An author or name was not found."
msgstr "" msgstr ""
#: src/Model/Contact.php:2239 #: src/Model/Contact.php:2244
msgid "No browser URL could be matched to this address." msgid "No browser URL could be matched to this address."
msgstr "" msgstr ""
#: src/Model/Contact.php:2242 #: src/Model/Contact.php:2247
msgid "" msgid ""
"Unable to match @-style Identity Address with a known protocol or email " "Unable to match @-style Identity Address with a known protocol or email "
"contact." "contact."
msgstr "" msgstr ""
#: src/Model/Contact.php:2243 #: src/Model/Contact.php:2248
msgid "Use mailto: in front of address to force email check." msgid "Use mailto: in front of address to force email check."
msgstr "" msgstr ""
#: src/Model/Contact.php:2249 #: src/Model/Contact.php:2254
msgid "" msgid ""
"The profile address specified belongs to a network which has been disabled " "The profile address specified belongs to a network which has been disabled "
"on this site." "on this site."
msgstr "" msgstr ""
#: src/Model/Contact.php:2254 #: src/Model/Contact.php:2259
msgid "" msgid ""
"Limited profile. This person will be unable to receive direct/personal " "Limited profile. This person will be unable to receive direct/personal "
"notifications from you." "notifications from you."
msgstr "" msgstr ""
#: src/Model/Contact.php:2313 #: src/Model/Contact.php:2318
msgid "Unable to retrieve contact information." msgid "Unable to retrieve contact information."
msgstr "" msgstr ""
@ -4845,7 +4846,7 @@ msgstr ""
msgid "View on separate page" msgid "View on separate page"
msgstr "" msgstr ""
#: src/Model/Mail.php:120 src/Model/Mail.php:258 #: src/Model/Mail.php:134 src/Model/Mail.php:272
msgid "[no subject]" msgid "[no subject]"
msgstr "" msgstr ""