nupplaPhil/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #10644 from annando/issue-10640

Browse source 
Issue 10640: Use consistent settings to enable protocol support
This commit is contained in:
Hypolite Petovan 2021-08-30 17:36:52 -04:00 • committed by GitHub
commit 80ff11e626
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 322 additions and 311 deletions
Download patch file Download diff file Expand all files Collapse all files

9
mod/settings.php
View file

@ -92,11 +92,7 @@ function settings_post(App $a)
$mail_replyto = $_POST['mail_replyto'] ?? ''; $mail_replyto = $_POST['mail_replyto'] ?? '';
$mail_pubmail = $_POST['mail_pubmail'] ?? ''; $mail_pubmail = $_POST['mail_pubmail'] ?? '';
if ( if (function_exists('imap_open') && !DI::config()->get('system', 'imap_disabled')) {
!DI::config()->get('system', 'dfrn_only')
&& function_exists('imap_open')
&& !DI::config()->get('system', 'imap_disabled')
) {
$failed = false; $failed = false;
$r = q("SELECT * FROM `mailacct` WHERE `uid` = %d LIMIT 1", $r = q("SELECT * FROM `mailacct` WHERE `uid` = %d LIMIT 1",
intval(local_user()) intval(local_user())
@ -513,9 +509,6 @@ function settings_content(App $a)
} }
$mail_disabled = ((function_exists('imap_open') && (!DI::config()->get('system', 'imap_disabled'))) ? 0 : 1); $mail_disabled = ((function_exists('imap_open') && (!DI::config()->get('system', 'imap_disabled'))) ? 0 : 1);
if (DI::config()->get('system', 'dfrn_only')) {
$mail_disabled = 1;
}
if (!$mail_disabled) { if (!$mail_disabled) {
$r = q("SELECT * FROM `mailacct` WHERE `uid` = %d LIMIT 1", $r = q("SELECT * FROM `mailacct` WHERE `uid` = %d LIMIT 1",
local_user() local_user()

17
src/Module/Admin/Site.php
View file

@ -183,8 +183,8 @@ class Site extends BaseAdmin
$poco_discovery = (!empty($_POST['poco_discovery']) ? intval(trim($_POST['poco_discovery'])) : false); $poco_discovery = (!empty($_POST['poco_discovery']) ? intval(trim($_POST['poco_discovery'])) : false);
$poco_local_search = !empty($_POST['poco_local_search']); $poco_local_search = !empty($_POST['poco_local_search']);
$nodeinfo = !empty($_POST['nodeinfo']); $nodeinfo = !empty($_POST['nodeinfo']);
$dfrn_only = !empty($_POST['dfrn_only']); $mail_enabled = !empty($_POST['mail_enabled']);
$ostatus_disabled = !empty($_POST['ostatus_disabled']); $ostatus_enabled = !empty($_POST['ostatus_enabled']);
$diaspora_enabled = !empty($_POST['diaspora_enabled']); $diaspora_enabled = !empty($_POST['diaspora_enabled']);
$ssl_policy = (!empty($_POST['ssl_policy']) ? intval($_POST['ssl_policy']) : 0); $ssl_policy = (!empty($_POST['ssl_policy']) ? intval($_POST['ssl_policy']) : 0);
$force_ssl = !empty($_POST['force_ssl']); $force_ssl = !empty($_POST['force_ssl']);
@ -340,8 +340,8 @@ class Site extends BaseAdmin
DI::config()->set('system', 'proxyuser' , $proxyuser); DI::config()->set('system', 'proxyuser' , $proxyuser);
DI::config()->set('system', 'proxy' , $proxy); DI::config()->set('system', 'proxy' , $proxy);
DI::config()->set('system', 'curl_timeout' , $timeout); DI::config()->set('system', 'curl_timeout' , $timeout);
DI::config()->set('system', 'dfrn_only' , $dfrn_only); DI::config()->set('system', 'imap_disabled' , !$mail_enabled && function_exists('imap_open'));
DI::config()->set('system', 'ostatus_disabled' , $ostatus_disabled); DI::config()->set('system', 'ostatus_disabled' , !$ostatus_enabled);
DI::config()->set('system', 'diaspora_enabled' , $diaspora_enabled); DI::config()->set('system', 'diaspora_enabled' , $diaspora_enabled);
DI::config()->set('config', 'private_addons' , $private_addons); DI::config()->set('config', 'private_addons' , $private_addons);
@ -560,12 +560,13 @@ class Site extends BaseAdmin
'$no_regfullname' => ['no_regfullname', DI::l10n()->t('No Fullname check'), DI::config()->get('system', 'no_regfullname'), DI::l10n()->t('Allow users to register without a space between the first name and the last name in their full name.')], '$no_regfullname' => ['no_regfullname', DI::l10n()->t('No Fullname check'), DI::config()->get('system', 'no_regfullname'), DI::l10n()->t('Allow users to register without a space between the first name and the last name in their full name.')],
'$community_page_style' => ['community_page_style', DI::l10n()->t('Community pages for visitors'), DI::config()->get('system', 'community_page_style'), DI::l10n()->t('Which community pages should be available for visitors. Local users always see both pages.'), $community_page_style_choices], '$community_page_style' => ['community_page_style', DI::l10n()->t('Community pages for visitors'), DI::config()->get('system', 'community_page_style'), DI::l10n()->t('Which community pages should be available for visitors. Local users always see both pages.'), $community_page_style_choices],
'$max_author_posts_community_page' => ['max_author_posts_community_page', DI::l10n()->t('Posts per user on community page'), DI::config()->get('system', 'max_author_posts_community_page'), DI::l10n()->t('The maximum number of posts per user on the community page. (Not valid for "Global Community")')], '$max_author_posts_community_page' => ['max_author_posts_community_page', DI::l10n()->t('Posts per user on community page'), DI::config()->get('system', 'max_author_posts_community_page'), DI::l10n()->t('The maximum number of posts per user on the community page. (Not valid for "Global Community")')],
'$ostatus_disabled' => ['ostatus_disabled', DI::l10n()->t('Disable OStatus support'), DI::config()->get('system', 'ostatus_disabled'), DI::l10n()->t('Disable built-in OStatus (StatusNet, GNU Social etc.) compatibility. All communications in OStatus are public, so privacy warnings will be occasionally displayed.')], '$mail_able' => function_exists('imap_open'),
'$ostatus_not_able' => DI::l10n()->t('OStatus support can only be enabled if threading is enabled.'), '$mail_enabled' => ['mail_enabled', DI::l10n()->t('Enable Mail support'), !DI::config()->get('system', 'imap_disabled', !function_exists('imap_open')), DI::l10n()->t('Enable built-in mail support to poll IMAP folders and to reply via mail.')],
'$mail_not_able' => DI::l10n()->t('Mail support can\'t be enabled because the PHP IMAP module is not installed.'),
'$ostatus_enabled' => ['ostatus_enabled', DI::l10n()->t('Enable OStatus support'), !DI::config()->get('system', 'ostatus_disabled'), DI::l10n()->t('Enable built-in OStatus (StatusNet, GNU Social etc.) compatibility. All communications in OStatus are public.')],
'$diaspora_able' => $diaspora_able, '$diaspora_able' => $diaspora_able,
'$diaspora_not_able' => DI::l10n()->t('Diaspora support can\'t be enabled because Friendica was installed into a sub directory.'), '$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('Provide built-in Diaspora network compatibility.')], '$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.')],
'$dfrn_only' => ['dfrn_only', DI::l10n()->t('Only allow Friendica contacts'), DI::config()->get('system', 'dfrn_only'), DI::l10n()->t('All contacts must use Friendica protocols. All other built-in communication protocols disabled.')],
'$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.')], '$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'), ''], '$proxyuser' => ['proxyuser', DI::l10n()->t('Proxy user'), DI::config()->get('system', 'proxyuser'), ''],
'$proxy' => ['proxy', DI::l10n()->t('Proxy URL'), DI::config()->get('system', 'proxy'), ''], '$proxy' => ['proxy', DI::l10n()->t('Proxy URL'), DI::config()->get('system', 'proxy'), ''],

2
src/Module/NodeInfo120.php
View file

@ -72,7 +72,7 @@ class NodeInfo120 extends BaseModule
$nodeinfo['services']['inbound'][] = 'rss2.0'; $nodeinfo['services']['inbound'][] = 'rss2.0';
$nodeinfo['services']['outbound'][] = 'atom1.0'; $nodeinfo['services']['outbound'][] = 'atom1.0';
if (function_exists('imap_open') && !$config->get('system', 'imap_disabled') && !$config->get('system', 'dfrn_only')) { if (function_exists('imap_open') && !$config->get('system', 'imap_disabled')) {
$nodeinfo['services']['inbound'][] = 'imap'; $nodeinfo['services']['inbound'][] = 'imap';
} }

2
src/Module/NodeInfo210.php
View file

@ -72,7 +72,7 @@ class NodeInfo210 extends BaseModule
$nodeinfo['services']['inbound'][] = 'rss2.0'; $nodeinfo['services']['inbound'][] = 'rss2.0';
$nodeinfo['services']['outbound'][] = 'atom1.0'; $nodeinfo['services']['outbound'][] = 'atom1.0';
if (function_exists('imap_open') && !$config->get('system', 'imap_disabled') && !$config->get('system', 'dfrn_only')) { if (function_exists('imap_open') && !$config->get('system', 'imap_disabled')) {
$nodeinfo['services']['inbound'][] = 'imap'; $nodeinfo['services']['inbound'][] = 'imap';
} }

4
src/Worker/Delivery.php
View file

@ -394,7 +394,7 @@ class Delivery
Logger::notice('Deliver via Diaspora', ['target' => $target_item['id'], 'guid' => $target_item['guid'], 'to' => $loc]); Logger::notice('Deliver via Diaspora', ['target' => $target_item['id'], 'guid' => $target_item['guid'], 'to' => $loc]);
if (DI::config()->get('system', 'dfrn_only') || !DI::config()->get('system', 'diaspora_enabled')) { if (!DI::config()->get('system', 'diaspora_enabled')) {
return; return;
} }
@ -477,7 +477,7 @@ class Delivery
*/ */
private static function deliverMail($cmd, $contact, $owner, $target_item, $thr_parent) private static function deliverMail($cmd, $contact, $owner, $target_item, $thr_parent)
{ {
if (DI::config()->get('system','dfrn_only')) { if (DI::config()->get('system','imap_disabled')) {
return; return;
} }

2
src/Worker/Notifier.php
View file

@ -615,7 +615,7 @@ class Notifier
$url_recipients = array_filter($url_recipients); $url_recipients = array_filter($url_recipients);
// send salmon slaps to mentioned remote tags (@foo@example.com) in OStatus posts // send salmon slaps to mentioned remote tags (@foo@example.com) in OStatus posts
// They are especially used for notifications to OStatus users that don't follow us. // They are especially used for notifications to OStatus users that don't follow us.
if (!DI::config()->get('system', 'dfrn_only') && count($url_recipients) && ($public_message || $push_notify) && !empty($target_item)) { if (count($url_recipients) && ($public_message || $push_notify) && !empty($target_item)) {
$slap = OStatus::salmon($target_item, $owner); $slap = OStatus::salmon($target_item, $owner);
foreach ($url_recipients as $url) { foreach ($url_recipients as $url) {
Logger::info('Salmon delivery', ['item' => $target_id, 'to' => $url]); Logger::info('Salmon delivery', ['item' => $target_id, 'to' => $url]);

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

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: 2021.09-rc\n" "Project-Id-Version: 2021.09-rc\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-08-29 14:07+0200\n" "POT-Creation-Date: 2021-08-30 21:15+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -75,7 +75,7 @@ msgstr ""
msgid "Select" msgid "Select"
msgstr "" msgstr ""
#: include/conversation.php:468 mod/photos.php:1460 mod/settings.php:580 #: include/conversation.php:468 mod/photos.php:1460 mod/settings.php:573
#: src/Module/Admin/Users/Active.php:139 src/Module/Admin/Users/Blocked.php:140 #: src/Module/Admin/Users/Active.php:139 src/Module/Admin/Users/Blocked.php:140
#: src/Module/Admin/Users/Index.php:153 src/Module/Contact.php:849 #: src/Module/Admin/Users/Index.php:153 src/Module/Contact.php:849
#: src/Module/Contact.php:1140 #: src/Module/Contact.php:1140
@ -756,7 +756,7 @@ msgstr ""
#: mod/message.php:69 mod/message.php:111 mod/notes.php:44 #: mod/message.php:69 mod/message.php:111 mod/notes.php:44
#: mod/ostatus_subscribe.php:32 mod/photos.php:163 mod/photos.php:917 #: mod/ostatus_subscribe.php:32 mod/photos.php:163 mod/photos.php:917
#: mod/repair_ostatus.php:31 mod/settings.php:47 mod/settings.php:57 #: mod/repair_ostatus.php:31 mod/settings.php:47 mod/settings.php:57
#: mod/settings.php:421 mod/suggest.php:34 mod/uimport.php:32 #: mod/settings.php:417 mod/suggest.php:34 mod/uimport.php:32
#: mod/unfollow.php:35 mod/unfollow.php:50 mod/unfollow.php:82 #: mod/unfollow.php:35 mod/unfollow.php:50 mod/unfollow.php:82
#: mod/wall_attach.php:78 mod/wall_attach.php:81 mod/wall_upload.php:99 #: mod/wall_attach.php:78 mod/wall_attach.php:81 mod/wall_upload.php:99
#: mod/wall_upload.php:102 mod/wallmessage.php:35 mod/wallmessage.php:59 #: mod/wall_upload.php:102 mod/wallmessage.php:35 mod/wallmessage.php:59
@ -1764,75 +1764,75 @@ msgid_plural "Errors"
msgstr[0] "" msgstr[0] ""
msgstr[1] "" msgstr[1] ""
#: mod/settings.php:140 #: mod/settings.php:136
msgid "Failed to connect with email account using the settings provided." msgid "Failed to connect with email account using the settings provided."
msgstr "" msgstr ""
#: mod/settings.php:169 #: mod/settings.php:165
msgid "Contact CSV file upload error" msgid "Contact CSV file upload error"
msgstr "" msgstr ""
#: mod/settings.php:188 #: mod/settings.php:184
msgid "Importing Contacts done" msgid "Importing Contacts done"
msgstr "" msgstr ""
#: mod/settings.php:201 #: mod/settings.php:197
msgid "Relocate message has been send to your contacts" msgid "Relocate message has been send to your contacts"
msgstr "" msgstr ""
#: mod/settings.php:213 #: mod/settings.php:209
msgid "Passwords do not match." msgid "Passwords do not match."
msgstr "" msgstr ""
#: mod/settings.php:221 src/Console/User.php:210 #: mod/settings.php:217 src/Console/User.php:210
msgid "Password update failed. Please try again." msgid "Password update failed. Please try again."
msgstr "" msgstr ""
#: mod/settings.php:224 src/Console/User.php:213 #: mod/settings.php:220 src/Console/User.php:213
msgid "Password changed." msgid "Password changed."
msgstr "" msgstr ""
#: mod/settings.php:227 #: mod/settings.php:223
msgid "Password unchanged." msgid "Password unchanged."
msgstr "" msgstr ""
#: mod/settings.php:315 #: mod/settings.php:311
msgid "Please use a shorter name." msgid "Please use a shorter name."
msgstr "" msgstr ""
#: mod/settings.php:318 #: mod/settings.php:314
msgid "Name too short." msgid "Name too short."
msgstr "" msgstr ""
#: mod/settings.php:325 #: mod/settings.php:321
msgid "Wrong Password." msgid "Wrong Password."
msgstr "" msgstr ""
#: mod/settings.php:330 #: mod/settings.php:326
msgid "Invalid email." msgid "Invalid email."
msgstr "" msgstr ""
#: mod/settings.php:336 #: mod/settings.php:332
msgid "Cannot change to that email." msgid "Cannot change to that email."
msgstr "" msgstr ""
#: mod/settings.php:377 #: mod/settings.php:373
msgid "Private forum has no privacy permissions. Using default privacy group." msgid "Private forum has no privacy permissions. Using default privacy group."
msgstr "" msgstr ""
#: mod/settings.php:380 #: mod/settings.php:376
msgid "Private forum has no privacy permissions and no default privacy group." msgid "Private forum has no privacy permissions and no default privacy group."
msgstr "" msgstr ""
#: mod/settings.php:399 #: mod/settings.php:395
msgid "Settings were not updated." msgid "Settings were not updated."
msgstr "" msgstr ""
#: mod/settings.php:440 #: mod/settings.php:436
msgid "Connected Apps" msgid "Connected Apps"
msgstr "" msgstr ""
#: mod/settings.php:441 src/Module/Admin/Blocklist/Contact.php:90 #: mod/settings.php:437 src/Module/Admin/Blocklist/Contact.php:90
#: src/Module/Admin/Users/Active.php:129 src/Module/Admin/Users/Blocked.php:130 #: src/Module/Admin/Users/Active.php:129 src/Module/Admin/Users/Blocked.php:130
#: src/Module/Admin/Users/Create.php:71 src/Module/Admin/Users/Deleted.php:88 #: src/Module/Admin/Users/Create.php:71 src/Module/Admin/Users/Deleted.php:88
#: src/Module/Admin/Users/Index.php:142 src/Module/Admin/Users/Index.php:162 #: src/Module/Admin/Users/Index.php:142 src/Module/Admin/Users/Index.php:162
@ -1840,31 +1840,31 @@ msgstr ""
msgid "Name" msgid "Name"
msgstr "" msgstr ""
#: mod/settings.php:442 src/Content/Nav.php:212 #: mod/settings.php:438 src/Content/Nav.php:212
msgid "Home Page" msgid "Home Page"
msgstr "" msgstr ""
#: mod/settings.php:443 src/Module/Admin/Queue.php:78 #: mod/settings.php:439 src/Module/Admin/Queue.php:78
msgid "Created" msgid "Created"
msgstr "" msgstr ""
#: mod/settings.php:444 #: mod/settings.php:440
msgid "Remove authorization" msgid "Remove authorization"
msgstr "" msgstr ""
#: mod/settings.php:462 #: mod/settings.php:458
msgid "Addon Settings" msgid "Addon Settings"
msgstr "" msgstr ""
#: mod/settings.php:463 #: mod/settings.php:459
msgid "No Addon settings configured" msgid "No Addon settings configured"
msgstr "" msgstr ""
#: mod/settings.php:484 #: mod/settings.php:480
msgid "Additional Features" msgid "Additional Features"
msgstr "" msgstr ""
#: mod/settings.php:486 mod/settings.php:582 mod/settings.php:719 #: 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/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:501
#: src/Module/Admin/Themes/Index.php:113 src/Module/Admin/Tos.php:66 #: src/Module/Admin/Themes/Index.php:113 src/Module/Admin/Tos.php:66
@ -1872,48 +1872,48 @@ msgstr ""
msgid "Save Settings" msgid "Save Settings"
msgstr "" msgstr ""
#: mod/settings.php:508 #: mod/settings.php:504
msgid "Diaspora (Socialhome, Hubzilla)" msgid "Diaspora (Socialhome, Hubzilla)"
msgstr "" msgstr ""
#: mod/settings.php:508 mod/settings.php:509 #: mod/settings.php:504 mod/settings.php:505
msgid "enabled" msgid "enabled"
msgstr "" msgstr ""
#: mod/settings.php:508 mod/settings.php:509 #: mod/settings.php:504 mod/settings.php:505
msgid "disabled" msgid "disabled"
msgstr "" msgstr ""
#: mod/settings.php:508 mod/settings.php:509 #: mod/settings.php:504 mod/settings.php:505
#, php-format #, php-format
msgid "Built-in support for %s connectivity is %s" msgid "Built-in support for %s connectivity is %s"
msgstr "" msgstr ""
#: mod/settings.php:509 #: mod/settings.php:505
msgid "OStatus (GNU Social)" msgid "OStatus (GNU Social)"
msgstr "" msgstr ""
#: mod/settings.php:540 #: mod/settings.php:533
msgid "Email access is disabled on this site." msgid "Email access is disabled on this site."
msgstr "" msgstr ""
#: mod/settings.php:545 mod/settings.php:580 #: mod/settings.php:538 mod/settings.php:573
msgid "None" msgid "None"
msgstr "" msgstr ""
#: mod/settings.php:551 src/Module/BaseSettings.php:80 #: mod/settings.php:544 src/Module/BaseSettings.php:80
msgid "Social Networks" msgid "Social Networks"
msgstr "" msgstr ""
#: mod/settings.php:556 #: mod/settings.php:549
msgid "General Social Media Settings" msgid "General Social Media Settings"
msgstr "" msgstr ""
#: mod/settings.php:557 #: mod/settings.php:550
msgid "Accept only top level posts by contacts you follow" msgid "Accept only top level posts by contacts you follow"
msgstr "" msgstr ""
#: mod/settings.php:557 #: mod/settings.php:550
msgid "" msgid ""
"The system does an auto completion of threads when a comment arrives. This " "The system does an auto completion of threads when a comment arrives. This "
"has got the side effect that you can receive posts that had been started by " "has got the side effect that you can receive posts that had been started by "
@ -1922,11 +1922,11 @@ msgid ""
"posts from people you really do follow." "posts from people you really do follow."
msgstr "" msgstr ""
#: mod/settings.php:558 #: mod/settings.php:551
msgid "Disable Content Warning" msgid "Disable Content Warning"
msgstr "" msgstr ""
#: mod/settings.php:558 #: mod/settings.php:551
msgid "" msgid ""
"Users on networks like Mastodon or Pleroma are able to set a content warning " "Users on networks like Mastodon or Pleroma are able to set a content warning "
"field which collapse their post by default. This disables the automatic " "field which collapse their post by default. This disables the automatic "
@ -1934,222 +1934,222 @@ msgid ""
"any other content filtering you eventually set up." "any other content filtering you eventually set up."
msgstr "" msgstr ""
#: mod/settings.php:559 #: mod/settings.php:552
msgid "Disable intelligent shortening" msgid "Disable intelligent shortening"
msgstr "" msgstr ""
#: mod/settings.php:559 #: mod/settings.php:552
msgid "" msgid ""
"Normally the system tries to find the best link to add to shortened posts. " "Normally the system tries to find the best link to add to shortened posts. "
"If this option is enabled then every shortened post will always point to the " "If this option is enabled then every shortened post will always point to the "
"original friendica post." "original friendica post."
msgstr "" msgstr ""
#: mod/settings.php:560 #: mod/settings.php:553
msgid "Enable simple text shortening" msgid "Enable simple text shortening"
msgstr "" msgstr ""
#: mod/settings.php:560 #: mod/settings.php:553
msgid "" msgid ""
"Normally the system shortens posts at the next line feed. If this option is " "Normally the system shortens posts at the next line feed. If this option is "
"enabled then the system will shorten the text at the maximum character limit." "enabled then the system will shorten the text at the maximum character limit."
msgstr "" msgstr ""
#: mod/settings.php:561 #: mod/settings.php:554
msgid "Attach the link title" msgid "Attach the link title"
msgstr "" msgstr ""
#: mod/settings.php:561 #: mod/settings.php:554
msgid "" msgid ""
"When activated, the title of the attached link will be added as a title on " "When activated, the title of the attached link will be added as a title on "
"posts to Diaspora. This is mostly helpful with \"remote-self\" contacts that " "posts to Diaspora. This is mostly helpful with \"remote-self\" contacts that "
"share feed content." "share feed content."
msgstr "" msgstr ""
#: mod/settings.php:562 #: mod/settings.php:555
msgid "Your legacy ActivityPub/GNU Social account" msgid "Your legacy ActivityPub/GNU Social account"
msgstr "" msgstr ""
#: mod/settings.php:562 #: mod/settings.php:555
msgid "" msgid ""
"If you enter your old account name from an ActivityPub based system or your " "If you enter your old account name from an ActivityPub based system or your "
"GNU Social/Statusnet account name here (in the format user@domain.tld), your " "GNU Social/Statusnet account name here (in the format user@domain.tld), your "
"contacts will be added automatically. The field will be emptied when done." "contacts will be added automatically. The field will be emptied when done."
msgstr "" msgstr ""
#: mod/settings.php:565 #: mod/settings.php:558
msgid "Repair OStatus subscriptions" msgid "Repair OStatus subscriptions"
msgstr "" msgstr ""
#: mod/settings.php:569 #: mod/settings.php:562
msgid "Email/Mailbox Setup" msgid "Email/Mailbox Setup"
msgstr "" msgstr ""
#: mod/settings.php:570 #: mod/settings.php:563
msgid "" msgid ""
"If you wish to communicate with email contacts using this service " "If you wish to communicate with email contacts using this service "
"(optional), please specify how to connect to your mailbox." "(optional), please specify how to connect to your mailbox."
msgstr "" msgstr ""
#: mod/settings.php:571 #: mod/settings.php:564
msgid "Last successful email check:" msgid "Last successful email check:"
msgstr "" msgstr ""
#: mod/settings.php:573 #: mod/settings.php:566
msgid "IMAP server name:" msgid "IMAP server name:"
msgstr "" msgstr ""
#: mod/settings.php:574 #: mod/settings.php:567
msgid "IMAP port:" msgid "IMAP port:"
msgstr "" msgstr ""
#: mod/settings.php:575 #: mod/settings.php:568
msgid "Security:" msgid "Security:"
msgstr "" msgstr ""
#: mod/settings.php:576 #: mod/settings.php:569
msgid "Email login name:" msgid "Email login name:"
msgstr "" msgstr ""
#: mod/settings.php:577 #: mod/settings.php:570
msgid "Email password:" msgid "Email password:"
msgstr "" msgstr ""
#: mod/settings.php:578 #: mod/settings.php:571
msgid "Reply-to address:" msgid "Reply-to address:"
msgstr "" msgstr ""
#: mod/settings.php:579 #: mod/settings.php:572
msgid "Send public posts to all email contacts:" msgid "Send public posts to all email contacts:"
msgstr "" msgstr ""
#: mod/settings.php:580 #: mod/settings.php:573
msgid "Action after import:" msgid "Action after import:"
msgstr "" msgstr ""
#: mod/settings.php:580 src/Content/Nav.php:280 #: mod/settings.php:573 src/Content/Nav.php:280
msgid "Mark as seen" msgid "Mark as seen"
msgstr "" msgstr ""
#: mod/settings.php:580 #: mod/settings.php:573
msgid "Move to folder" msgid "Move to folder"
msgstr "" msgstr ""
#: mod/settings.php:581 #: mod/settings.php:574
msgid "Move to folder:" msgid "Move to folder:"
msgstr "" msgstr ""
#: mod/settings.php:595 #: mod/settings.php:588
msgid "Unable to find your profile. Please contact your admin." msgid "Unable to find your profile. Please contact your admin."
msgstr "" msgstr ""
#: mod/settings.php:633 src/Content/Widget.php:533 #: mod/settings.php:626 src/Content/Widget.php:533
msgid "Account Types" msgid "Account Types"
msgstr "" msgstr ""
#: mod/settings.php:634 #: mod/settings.php:627
msgid "Personal Page Subtypes" msgid "Personal Page Subtypes"
msgstr "" msgstr ""
#: mod/settings.php:635 #: mod/settings.php:628
msgid "Community Forum Subtypes" msgid "Community Forum Subtypes"
msgstr "" msgstr ""
#: mod/settings.php:642 src/Module/Admin/BaseUsers.php:106 #: mod/settings.php:635 src/Module/Admin/BaseUsers.php:106
msgid "Personal Page" msgid "Personal Page"
msgstr "" msgstr ""
#: mod/settings.php:643 #: mod/settings.php:636
msgid "Account for a personal profile." msgid "Account for a personal profile."
msgstr "" msgstr ""
#: mod/settings.php:646 src/Module/Admin/BaseUsers.php:107 #: mod/settings.php:639 src/Module/Admin/BaseUsers.php:107
msgid "Organisation Page" msgid "Organisation Page"
msgstr "" msgstr ""
#: mod/settings.php:647 #: mod/settings.php:640
msgid "" msgid ""
"Account for an organisation that automatically approves contact requests as " "Account for an organisation that automatically approves contact requests as "
"\"Followers\"." "\"Followers\"."
msgstr "" msgstr ""
#: mod/settings.php:650 src/Module/Admin/BaseUsers.php:108 #: mod/settings.php:643 src/Module/Admin/BaseUsers.php:108
msgid "News Page" msgid "News Page"
msgstr "" msgstr ""
#: mod/settings.php:651 #: mod/settings.php:644
msgid "" msgid ""
"Account for a news reflector that automatically approves contact requests as " "Account for a news reflector that automatically approves contact requests as "
"\"Followers\"." "\"Followers\"."
msgstr "" msgstr ""
#: mod/settings.php:654 src/Module/Admin/BaseUsers.php:109 #: mod/settings.php:647 src/Module/Admin/BaseUsers.php:109
msgid "Community Forum" msgid "Community Forum"
msgstr "" msgstr ""
#: mod/settings.php:655 #: mod/settings.php:648
msgid "Account for community discussions." msgid "Account for community discussions."
msgstr "" msgstr ""
#: mod/settings.php:658 src/Module/Admin/BaseUsers.php:99 #: mod/settings.php:651 src/Module/Admin/BaseUsers.php:99
msgid "Normal Account Page" msgid "Normal Account Page"
msgstr "" msgstr ""
#: mod/settings.php:659 #: mod/settings.php:652
msgid "" msgid ""
"Account for a regular personal profile that requires manual approval of " "Account for a regular personal profile that requires manual approval of "
"\"Friends\" and \"Followers\"." "\"Friends\" and \"Followers\"."
msgstr "" msgstr ""
#: mod/settings.php:662 src/Module/Admin/BaseUsers.php:100 #: mod/settings.php:655 src/Module/Admin/BaseUsers.php:100
msgid "Soapbox Page" msgid "Soapbox Page"
msgstr "" msgstr ""
#: mod/settings.php:663 #: mod/settings.php:656
msgid "" msgid ""
"Account for a public profile that automatically approves contact requests as " "Account for a public profile that automatically approves contact requests as "
"\"Followers\"." "\"Followers\"."
msgstr "" msgstr ""
#: mod/settings.php:666 src/Module/Admin/BaseUsers.php:101 #: mod/settings.php:659 src/Module/Admin/BaseUsers.php:101
msgid "Public Forum" msgid "Public Forum"
msgstr "" msgstr ""
#: mod/settings.php:667 #: mod/settings.php:660
msgid "Automatically approves all contact requests." msgid "Automatically approves all contact requests."
msgstr "" msgstr ""
#: mod/settings.php:670 src/Module/Admin/BaseUsers.php:102 #: mod/settings.php:663 src/Module/Admin/BaseUsers.php:102
msgid "Automatic Friend Page" msgid "Automatic Friend Page"
msgstr "" msgstr ""
#: mod/settings.php:671 #: mod/settings.php:664
msgid "" msgid ""
"Account for a popular profile that automatically approves contact requests " "Account for a popular profile that automatically approves contact requests "
"as \"Friends\"." "as \"Friends\"."
msgstr "" msgstr ""
#: mod/settings.php:674 #: mod/settings.php:667
msgid "Private Forum [Experimental]" msgid "Private Forum [Experimental]"
msgstr "" msgstr ""
#: mod/settings.php:675 #: mod/settings.php:668
msgid "Requires manual approval of contact requests." msgid "Requires manual approval of contact requests."
msgstr "" msgstr ""
#: mod/settings.php:686 #: mod/settings.php:679
msgid "OpenID:" msgid "OpenID:"
msgstr "" msgstr ""
#: mod/settings.php:686 #: mod/settings.php:679
msgid "(Optional) Allow this OpenID to login to this account." msgid "(Optional) Allow this OpenID to login to this account."
msgstr "" msgstr ""
#: mod/settings.php:694 #: mod/settings.php:687
msgid "Publish your profile in your local site directory?" msgid "Publish your profile in your local site directory?"
msgstr "" msgstr ""
#: mod/settings.php:694 #: mod/settings.php:687
#, php-format #, php-format
msgid "" msgid ""
"Your profile will be published in this node's <a href=\"%s\">local " "Your profile will be published in this node's <a href=\"%s\">local "
@ -2157,115 +2157,115 @@ msgid ""
"system settings." "system settings."
msgstr "" msgstr ""
#: mod/settings.php:700 #: mod/settings.php:693
#, php-format #, php-format
msgid "" msgid ""
"Your profile will also be published in the global friendica directories (e." "Your profile will also be published in the global friendica directories (e."
"g. <a href=\"%s\">%s</a>)." "g. <a href=\"%s\">%s</a>)."
msgstr "" msgstr ""
#: mod/settings.php:706 #: mod/settings.php:699
#, php-format #, php-format
msgid "Your Identity Address is <strong>'%s'</strong> or '%s'." msgid "Your Identity Address is <strong>'%s'</strong> or '%s'."
msgstr "" msgstr ""
#: mod/settings.php:717 #: mod/settings.php:710
msgid "Account Settings" msgid "Account Settings"
msgstr "" msgstr ""
#: mod/settings.php:725 #: mod/settings.php:718
msgid "Password Settings" msgid "Password Settings"
msgstr "" msgstr ""
#: mod/settings.php:726 src/Module/Register.php:149 #: mod/settings.php:719 src/Module/Register.php:149
msgid "New Password:" msgid "New Password:"
msgstr "" msgstr ""
#: mod/settings.php:726 #: mod/settings.php:719
msgid "" msgid ""
"Allowed characters are a-z, A-Z, 0-9 and special characters except white " "Allowed characters are a-z, A-Z, 0-9 and special characters except white "
"spaces, accentuated letters and colon (:)." "spaces, accentuated letters and colon (:)."
msgstr "" msgstr ""
#: mod/settings.php:727 src/Module/Register.php:150 #: mod/settings.php:720 src/Module/Register.php:150
msgid "Confirm:" msgid "Confirm:"
msgstr "" msgstr ""
#: mod/settings.php:727 #: mod/settings.php:720
msgid "Leave password fields blank unless changing" msgid "Leave password fields blank unless changing"
msgstr "" msgstr ""
#: mod/settings.php:728 #: mod/settings.php:721
msgid "Current Password:" msgid "Current Password:"
msgstr "" msgstr ""
#: mod/settings.php:728 #: mod/settings.php:721
msgid "Your current password to confirm the changes" msgid "Your current password to confirm the changes"
msgstr "" msgstr ""
#: mod/settings.php:729 #: mod/settings.php:722
msgid "Password:" msgid "Password:"
msgstr "" msgstr ""
#: mod/settings.php:729 #: mod/settings.php:722
msgid "Your current password to confirm the changes of the email address" msgid "Your current password to confirm the changes of the email address"
msgstr "" msgstr ""
#: mod/settings.php:732 #: mod/settings.php:725
msgid "Delete OpenID URL" msgid "Delete OpenID URL"
msgstr "" msgstr ""
#: mod/settings.php:734 #: mod/settings.php:727
msgid "Basic Settings" msgid "Basic Settings"
msgstr "" msgstr ""
#: mod/settings.php:735 src/Module/Profile/Profile.php:144 #: mod/settings.php:728 src/Module/Profile/Profile.php:144
msgid "Full Name:" msgid "Full Name:"
msgstr "" msgstr ""
#: mod/settings.php:736 #: mod/settings.php:729
msgid "Email Address:" msgid "Email Address:"
msgstr "" msgstr ""
#: mod/settings.php:737 #: mod/settings.php:730
msgid "Your Timezone:" msgid "Your Timezone:"
msgstr "" msgstr ""
#: mod/settings.php:738 #: mod/settings.php:731
msgid "Your Language:" msgid "Your Language:"
msgstr "" msgstr ""
#: mod/settings.php:738 #: mod/settings.php:731
msgid "" msgid ""
"Set the language we use to show you friendica interface and to send you " "Set the language we use to show you friendica interface and to send you "
"emails" "emails"
msgstr "" msgstr ""
#: mod/settings.php:739 #: mod/settings.php:732
msgid "Default Post Location:" msgid "Default Post Location:"
msgstr "" msgstr ""
#: mod/settings.php:740 #: mod/settings.php:733
msgid "Use Browser Location:" msgid "Use Browser Location:"
msgstr "" msgstr ""
#: mod/settings.php:742 #: mod/settings.php:735
msgid "Security and Privacy Settings" msgid "Security and Privacy Settings"
msgstr "" msgstr ""
#: mod/settings.php:744 #: mod/settings.php:737
msgid "Maximum Friend Requests/Day:" msgid "Maximum Friend Requests/Day:"
msgstr "" msgstr ""
#: mod/settings.php:744 mod/settings.php:754 #: mod/settings.php:737 mod/settings.php:747
msgid "(to prevent spam abuse)" msgid "(to prevent spam abuse)"
msgstr "" msgstr ""
#: mod/settings.php:746 #: mod/settings.php:739
msgid "Allow your profile to be searchable globally?" msgid "Allow your profile to be searchable globally?"
msgstr "" msgstr ""
#: mod/settings.php:746 #: mod/settings.php:739
msgid "" msgid ""
"Activate this setting if you want others to easily find and follow you. Your " "Activate this setting if you want others to easily find and follow you. Your "
"profile will be searchable on remote systems. This setting also determines " "profile will be searchable on remote systems. This setting also determines "
@ -2273,43 +2273,43 @@ msgid ""
"indexed or not." "indexed or not."
msgstr "" msgstr ""
#: mod/settings.php:747 #: mod/settings.php:740
msgid "Hide your contact/friend list from viewers of your profile?" msgid "Hide your contact/friend list from viewers of your profile?"
msgstr "" msgstr ""
#: mod/settings.php:747 #: mod/settings.php:740
msgid "" msgid ""
"A list of your contacts is displayed on your profile page. Activate this " "A list of your contacts is displayed on your profile page. Activate this "
"option to disable the display of your contact list." "option to disable the display of your contact list."
msgstr "" msgstr ""
#: mod/settings.php:748 #: mod/settings.php:741
msgid "Hide your profile details from anonymous viewers?" msgid "Hide your profile details from anonymous viewers?"
msgstr "" msgstr ""
#: mod/settings.php:748 #: mod/settings.php:741
msgid "" msgid ""
"Anonymous visitors will only see your profile picture, your display name and " "Anonymous visitors will only see your profile picture, your display name and "
"the nickname you are using on your profile page. Your public posts and " "the nickname you are using on your profile page. Your public posts and "
"replies will still be accessible by other means." "replies will still be accessible by other means."
msgstr "" msgstr ""
#: mod/settings.php:749 #: mod/settings.php:742
msgid "Make public posts unlisted" msgid "Make public posts unlisted"
msgstr "" msgstr ""
#: mod/settings.php:749 #: mod/settings.php:742
msgid "" msgid ""
"Your public posts will not appear on the community pages or in search " "Your public posts will not appear on the community pages or in search "
"results, nor be sent to relay servers. However they can still appear on " "results, nor be sent to relay servers. However they can still appear on "
"public feeds on remote servers." "public feeds on remote servers."
msgstr "" msgstr ""
#: mod/settings.php:750 #: mod/settings.php:743
msgid "Make all posted pictures accessible" msgid "Make all posted pictures accessible"
msgstr "" msgstr ""
#: mod/settings.php:750 #: mod/settings.php:743
msgid "" msgid ""
"This option makes every posted picture accessible via the direct link. This " "This option makes every posted picture accessible via the direct link. This "
"is a workaround for the problem that most other networks can't handle " "is a workaround for the problem that most other networks can't handle "
@ -2317,221 +2317,221 @@ msgid ""
"public on your photo albums though." "public on your photo albums though."
msgstr "" msgstr ""
#: mod/settings.php:751 #: mod/settings.php:744
msgid "Allow friends to post to your profile page?" msgid "Allow friends to post to your profile page?"
msgstr "" msgstr ""
#: mod/settings.php:751 #: mod/settings.php:744
msgid "" msgid ""
"Your contacts may write posts on your profile wall. These posts will be " "Your contacts may write posts on your profile wall. These posts will be "
"distributed to your contacts" "distributed to your contacts"
msgstr "" msgstr ""
#: mod/settings.php:752 #: mod/settings.php:745
msgid "Allow friends to tag your posts?" msgid "Allow friends to tag your posts?"
msgstr "" msgstr ""
#: mod/settings.php:752 #: mod/settings.php:745
msgid "Your contacts can add additional tags to your posts." msgid "Your contacts can add additional tags to your posts."
msgstr "" msgstr ""
#: mod/settings.php:753 #: mod/settings.php:746
msgid "Permit unknown people to send you private mail?" msgid "Permit unknown people to send you private mail?"
msgstr "" msgstr ""
#: mod/settings.php:753 #: mod/settings.php:746
msgid "" msgid ""
"Friendica network users may send you private messages even if they are not " "Friendica network users may send you private messages even if they are not "
"in your contact list." "in your contact list."
msgstr "" msgstr ""
#: mod/settings.php:754 #: mod/settings.php:747
msgid "Maximum private messages per day from unknown people:" msgid "Maximum private messages per day from unknown people:"
msgstr "" msgstr ""
#: mod/settings.php:756 #: mod/settings.php:749
msgid "Default Post Permissions" msgid "Default Post Permissions"
msgstr "" msgstr ""
#: mod/settings.php:760 #: mod/settings.php:753
msgid "Expiration settings" msgid "Expiration settings"
msgstr "" msgstr ""
#: mod/settings.php:761 #: mod/settings.php:754
msgid "Automatically expire posts after this many days:" msgid "Automatically expire posts after this many days:"
msgstr "" msgstr ""
#: mod/settings.php:761 #: mod/settings.php:754
msgid "If empty, posts will not expire. Expired posts will be deleted" msgid "If empty, posts will not expire. Expired posts will be deleted"
msgstr "" msgstr ""
#: mod/settings.php:762 #: mod/settings.php:755
msgid "Expire posts" msgid "Expire posts"
msgstr "" msgstr ""
#: mod/settings.php:762 #: mod/settings.php:755
msgid "When activated, posts and comments will be expired." msgid "When activated, posts and comments will be expired."
msgstr "" msgstr ""
#: mod/settings.php:763 #: mod/settings.php:756
msgid "Expire personal notes" msgid "Expire personal notes"
msgstr "" msgstr ""
#: mod/settings.php:763 #: mod/settings.php:756
msgid "" msgid ""
"When activated, the personal notes on your profile page will be expired." "When activated, the personal notes on your profile page will be expired."
msgstr "" msgstr ""
#: mod/settings.php:764 #: mod/settings.php:757
msgid "Expire starred posts" msgid "Expire starred posts"
msgstr "" msgstr ""
#: mod/settings.php:764 #: mod/settings.php:757
msgid "" msgid ""
"Starring posts keeps them from being expired. That behaviour is overwritten " "Starring posts keeps them from being expired. That behaviour is overwritten "
"by this setting." "by this setting."
msgstr "" msgstr ""
#: mod/settings.php:765 #: mod/settings.php:758
msgid "Expire photos" msgid "Expire photos"
msgstr "" msgstr ""
#: mod/settings.php:765 #: mod/settings.php:758
msgid "When activated, photos will be expired." msgid "When activated, photos will be expired."
msgstr "" msgstr ""
#: mod/settings.php:766 #: mod/settings.php:759
msgid "Only expire posts by others" msgid "Only expire posts by others"
msgstr "" msgstr ""
#: mod/settings.php:766 #: mod/settings.php:759
msgid "" msgid ""
"When activated, your own posts never expire. Then the settings above are " "When activated, your own posts never expire. Then the settings above are "
"only valid for posts you received." "only valid for posts you received."
msgstr "" msgstr ""
#: mod/settings.php:769 #: mod/settings.php:762
msgid "Notification Settings" msgid "Notification Settings"
msgstr "" msgstr ""
#: mod/settings.php:770 #: mod/settings.php:763
msgid "Send a notification email when:" msgid "Send a notification email when:"
msgstr "" msgstr ""
#: mod/settings.php:771 #: mod/settings.php:764
msgid "You receive an introduction" msgid "You receive an introduction"
msgstr "" msgstr ""
#: mod/settings.php:772 #: mod/settings.php:765
msgid "Your introductions are confirmed" msgid "Your introductions are confirmed"
msgstr "" msgstr ""
#: mod/settings.php:773 #: mod/settings.php:766
msgid "Someone writes on your profile wall" msgid "Someone writes on your profile wall"
msgstr "" msgstr ""
#: mod/settings.php:774 #: mod/settings.php:767
msgid "Someone writes a followup comment" msgid "Someone writes a followup comment"
msgstr "" msgstr ""
#: mod/settings.php:775 #: mod/settings.php:768
msgid "You receive a private message" msgid "You receive a private message"
msgstr "" msgstr ""
#: mod/settings.php:776 #: mod/settings.php:769
msgid "You receive a friend suggestion" msgid "You receive a friend suggestion"
msgstr "" msgstr ""
#: mod/settings.php:777 #: mod/settings.php:770
msgid "You are tagged in a post" msgid "You are tagged in a post"
msgstr "" msgstr ""
#: mod/settings.php:778 #: mod/settings.php:771
msgid "You are poked/prodded/etc. in a post" msgid "You are poked/prodded/etc. in a post"
msgstr "" msgstr ""
#: mod/settings.php:780 #: mod/settings.php:773
msgid "Create a desktop notification when:" msgid "Create a desktop notification when:"
msgstr "" msgstr ""
#: mod/settings.php:781 #: mod/settings.php:774
msgid "Someone liked your content" msgid "Someone liked your content"
msgstr "" msgstr ""
#: mod/settings.php:782 #: mod/settings.php:775
msgid "Someone shared your content" msgid "Someone shared your content"
msgstr "" msgstr ""
#: mod/settings.php:784 #: mod/settings.php:777
msgid "Activate desktop notifications" msgid "Activate desktop notifications"
msgstr "" msgstr ""
#: mod/settings.php:784 #: mod/settings.php:777
msgid "Show desktop popup on new notifications" msgid "Show desktop popup on new notifications"
msgstr "" msgstr ""
#: mod/settings.php:786 #: mod/settings.php:779
msgid "Text-only notification emails" msgid "Text-only notification emails"
msgstr "" msgstr ""
#: mod/settings.php:788 #: mod/settings.php:781
msgid "Send text only notification emails, without the html part" msgid "Send text only notification emails, without the html part"
msgstr "" msgstr ""
#: mod/settings.php:790 #: mod/settings.php:783
msgid "Show detailled notifications" msgid "Show detailled notifications"
msgstr "" msgstr ""
#: mod/settings.php:792 #: mod/settings.php:785
msgid "" msgid ""
"Per default, notifications are condensed to a single notification per item. " "Per default, notifications are condensed to a single notification per item. "
"When enabled every notification is displayed." "When enabled every notification is displayed."
msgstr "" msgstr ""
#: mod/settings.php:794 #: mod/settings.php:787
msgid "Show notifications of ignored contacts" msgid "Show notifications of ignored contacts"
msgstr "" msgstr ""
#: mod/settings.php:796 #: mod/settings.php:789
msgid "" msgid ""
"You don't see posts from ignored contacts. But you still see their comments. " "You don't see posts from ignored contacts. But you still see their comments. "
"This setting controls if you want to still receive regular notifications " "This setting controls if you want to still receive regular notifications "
"that are caused by ignored contacts or not." "that are caused by ignored contacts or not."
msgstr "" msgstr ""
#: mod/settings.php:798 #: mod/settings.php:791
msgid "Advanced Account/Page Type Settings" msgid "Advanced Account/Page Type Settings"
msgstr "" msgstr ""
#: mod/settings.php:799 #: mod/settings.php:792
msgid "Change the behaviour of this account for special situations" msgid "Change the behaviour of this account for special situations"
msgstr "" msgstr ""
#: mod/settings.php:802 #: mod/settings.php:795
msgid "Import Contacts" msgid "Import Contacts"
msgstr "" msgstr ""
#: mod/settings.php:803 #: mod/settings.php:796
msgid "" msgid ""
"Upload a CSV file that contains the handle of your followed accounts in the " "Upload a CSV file that contains the handle of your followed accounts in the "
"first column you exported from the old account." "first column you exported from the old account."
msgstr "" msgstr ""
#: mod/settings.php:804 #: mod/settings.php:797
msgid "Upload File" msgid "Upload File"
msgstr "" msgstr ""
#: mod/settings.php:806 #: mod/settings.php:799
msgid "Relocate" msgid "Relocate"
msgstr "" msgstr ""
#: mod/settings.php:807 #: mod/settings.php:800
msgid "" msgid ""
"If you have moved this profile from another server, and some of your " "If you have moved this profile from another server, and some of your "
"contacts don't receive your updates, try pushing this button." "contacts don't receive your updates, try pushing this button."
msgstr "" msgstr ""
#: mod/settings.php:808 #: mod/settings.php:801
msgid "Resend relocate message to contacts" msgid "Resend relocate message to contacts"
msgstr "" msgstr ""
@ -4384,63 +4384,63 @@ msgstr ""
msgid "Forum" msgid "Forum"
msgstr "" msgstr ""
#: src/Model/Contact.php:2330 #: src/Model/Contact.php:2331
msgid "Disallowed profile URL." msgid "Disallowed profile URL."
msgstr "" msgstr ""
#: src/Model/Contact.php:2335 src/Module/Friendica.php:81 #: src/Model/Contact.php:2336 src/Module/Friendica.php:81
msgid "Blocked domain" msgid "Blocked domain"
msgstr "" msgstr ""
#: src/Model/Contact.php:2340 #: src/Model/Contact.php:2341
msgid "Connect URL missing." msgid "Connect URL missing."
msgstr "" msgstr ""
#: src/Model/Contact.php:2349 #: src/Model/Contact.php:2350
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:2386 #: src/Model/Contact.php:2387
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:2388 #: src/Model/Contact.php:2389
msgid "No compatible communication protocols or feeds were discovered." msgid "No compatible communication protocols or feeds were discovered."
msgstr "" msgstr ""
#: src/Model/Contact.php:2391 #: src/Model/Contact.php:2392
msgid "An author or name was not found." msgid "An author or name was not found."
msgstr "" msgstr ""
#: src/Model/Contact.php:2394 #: src/Model/Contact.php:2395
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:2397 #: src/Model/Contact.php:2398
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:2398 #: src/Model/Contact.php:2399
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:2404 #: src/Model/Contact.php:2405
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:2409 #: src/Model/Contact.php:2410
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:2468 #: src/Model/Contact.php:2469
msgid "Unable to retrieve contact information." msgid "Unable to retrieve contact information."
msgstr "" msgstr ""
@ -6126,177 +6126,178 @@ msgid ""
"\"Global Community\")" "\"Global Community\")"
msgstr "" msgstr ""
#: src/Module/Admin/Site.php:563 #: src/Module/Admin/Site.php:564
msgid "Disable OStatus support" msgid "Enable Mail support"
msgstr ""
#: src/Module/Admin/Site.php:563
msgid ""
"Disable built-in OStatus (StatusNet, GNU Social etc.) compatibility. All "
"communications in OStatus are public, so privacy warnings will be "
"occasionally displayed."
msgstr "" msgstr ""
#: src/Module/Admin/Site.php:564 #: src/Module/Admin/Site.php:564
msgid "OStatus support can only be enabled if threading is enabled." msgid ""
"Enable built-in mail support to poll IMAP folders and to reply via mail."
msgstr ""
#: src/Module/Admin/Site.php:565
msgid ""
"Mail support can't be enabled because the PHP IMAP module is not installed."
msgstr "" msgstr ""
#: src/Module/Admin/Site.php:566 #: src/Module/Admin/Site.php:566
msgid "Enable OStatus support"
msgstr ""
#: src/Module/Admin/Site.php:566
msgid ""
"Enable built-in OStatus (StatusNet, GNU Social etc.) compatibility. All "
"communications in OStatus are public."
msgstr ""
#: src/Module/Admin/Site.php:568
msgid "" msgid ""
"Diaspora support can't be enabled because Friendica was installed into a sub " "Diaspora support can't be enabled because Friendica was installed into a sub "
"directory." "directory."
msgstr "" msgstr ""
#: src/Module/Admin/Site.php:567 #: src/Module/Admin/Site.php:569
msgid "Enable Diaspora support" msgid "Enable Diaspora support"
msgstr "" msgstr ""
#: src/Module/Admin/Site.php:567
msgid "Provide built-in Diaspora network compatibility."
msgstr ""
#: src/Module/Admin/Site.php:568
msgid "Only allow Friendica contacts"
msgstr ""
#: src/Module/Admin/Site.php:568
msgid ""
"All contacts must use Friendica protocols. All other built-in communication "
"protocols disabled."
msgstr ""
#: src/Module/Admin/Site.php:569 #: src/Module/Admin/Site.php:569
msgid ""
"Enable built-in Diaspora network compatibility for communicating with "
"diaspora servers."
msgstr ""
#: src/Module/Admin/Site.php:570
msgid "Verify SSL" msgid "Verify SSL"
msgstr "" msgstr ""
#: src/Module/Admin/Site.php:569 #: src/Module/Admin/Site.php:570
msgid "" msgid ""
"If you wish, you can turn on strict certificate checking. This will mean you " "If you wish, you can turn on strict certificate checking. This will mean you "
"cannot connect (at all) to self-signed SSL sites." "cannot connect (at all) to self-signed SSL sites."
msgstr "" msgstr ""
#: src/Module/Admin/Site.php:570 #: src/Module/Admin/Site.php:571
msgid "Proxy user" msgid "Proxy user"
msgstr "" msgstr ""
#: src/Module/Admin/Site.php:571 #: src/Module/Admin/Site.php:572
msgid "Proxy URL" msgid "Proxy URL"
msgstr "" msgstr ""
#: src/Module/Admin/Site.php:572 #: src/Module/Admin/Site.php:573
msgid "Network timeout" msgid "Network timeout"
msgstr "" msgstr ""
#: src/Module/Admin/Site.php:572 #: src/Module/Admin/Site.php:573
msgid "Value is in seconds. Set to 0 for unlimited (not recommended)." msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
msgstr "" msgstr ""
#: src/Module/Admin/Site.php:573 #: src/Module/Admin/Site.php:574
msgid "Maximum Load Average" msgid "Maximum Load Average"
msgstr "" msgstr ""
#: src/Module/Admin/Site.php:573 #: src/Module/Admin/Site.php:574
#, php-format #, php-format
msgid "" msgid ""
"Maximum system load before delivery and poll processes are deferred - " "Maximum system load before delivery and poll processes are deferred - "
"default %d." "default %d."
msgstr "" msgstr ""
#: src/Module/Admin/Site.php:574 #: src/Module/Admin/Site.php:575
msgid "Maximum Load Average (Frontend)" msgid "Maximum Load Average (Frontend)"
msgstr "" msgstr ""
#: src/Module/Admin/Site.php:574 #: src/Module/Admin/Site.php:575
msgid "Maximum system load before the frontend quits service - default 50." msgid "Maximum system load before the frontend quits service - default 50."
msgstr "" msgstr ""
#: src/Module/Admin/Site.php:575 #: src/Module/Admin/Site.php:576
msgid "Minimal Memory" msgid "Minimal Memory"
msgstr "" msgstr ""
#: src/Module/Admin/Site.php:575 #: src/Module/Admin/Site.php:576
msgid "" msgid ""
"Minimal free memory in MB for the worker. Needs access to /proc/meminfo - " "Minimal free memory in MB for the worker. Needs access to /proc/meminfo - "
"default 0 (deactivated)." "default 0 (deactivated)."
msgstr "" msgstr ""
#: src/Module/Admin/Site.php:576 #: src/Module/Admin/Site.php:577
msgid "Periodically optimize tables" msgid "Periodically optimize tables"
msgstr "" msgstr ""
#: src/Module/Admin/Site.php:576 #: src/Module/Admin/Site.php:577
msgid "Periodically optimize tables like the cache and the workerqueue" msgid "Periodically optimize tables like the cache and the workerqueue"
msgstr "" msgstr ""
#: src/Module/Admin/Site.php:578 #: src/Module/Admin/Site.php:579
msgid "Discover followers/followings from contacts" msgid "Discover followers/followings from contacts"
msgstr "" msgstr ""
#: src/Module/Admin/Site.php:578 #: src/Module/Admin/Site.php:579
msgid "" msgid ""
"If enabled, contacts are checked for their followers and following contacts." "If enabled, contacts are checked for their followers and following contacts."
msgstr "" msgstr ""
#: src/Module/Admin/Site.php:579 #: src/Module/Admin/Site.php:580
msgid "None - deactivated" msgid "None - deactivated"
msgstr "" msgstr ""
#: src/Module/Admin/Site.php:580 #: src/Module/Admin/Site.php:581
msgid "" msgid ""
"Local contacts - contacts of our local contacts are discovered for their " "Local contacts - contacts of our local contacts are discovered for their "
"followers/followings." "followers/followings."
msgstr "" msgstr ""
#: src/Module/Admin/Site.php:581 #: src/Module/Admin/Site.php:582
msgid "" msgid ""
"Interactors - contacts of our local contacts and contacts who interacted on " "Interactors - contacts of our local contacts and contacts who interacted on "
"locally visible postings are discovered for their followers/followings." "locally visible postings are discovered for their followers/followings."
msgstr "" msgstr ""
#: src/Module/Admin/Site.php:583 #: src/Module/Admin/Site.php:584
msgid "Synchronize the contacts with the directory server" msgid "Synchronize the contacts with the directory server"
msgstr "" msgstr ""
#: src/Module/Admin/Site.php:583 #: src/Module/Admin/Site.php:584
msgid "" msgid ""
"if enabled, the system will check periodically for new contacts on the " "if enabled, the system will check periodically for new contacts on the "
"defined directory server." "defined directory server."
msgstr "" msgstr ""
#: src/Module/Admin/Site.php:585 #: src/Module/Admin/Site.php:586
msgid "Days between requery" msgid "Days between requery"
msgstr "" msgstr ""
#: src/Module/Admin/Site.php:585 #: src/Module/Admin/Site.php:586
msgid "Number of days after which a server is requeried for his contacts." msgid "Number of days after which a server is requeried for his contacts."
msgstr "" msgstr ""
#: src/Module/Admin/Site.php:586 #: src/Module/Admin/Site.php:587
msgid "Discover contacts from other servers" msgid "Discover contacts from other servers"
msgstr "" msgstr ""
#: src/Module/Admin/Site.php:586 #: src/Module/Admin/Site.php:587
msgid "" msgid ""
"Periodically query other servers for contacts. The system queries Friendica, " "Periodically query other servers for contacts. The system queries Friendica, "
"Mastodon and Hubzilla servers." "Mastodon and Hubzilla servers."
msgstr "" msgstr ""
#: src/Module/Admin/Site.php:587 #: src/Module/Admin/Site.php:588
msgid "Search the local directory" msgid "Search the local directory"
msgstr "" msgstr ""
#: src/Module/Admin/Site.php:587 #: src/Module/Admin/Site.php:588
msgid "" msgid ""
"Search the local directory instead of the global directory. When searching " "Search the local directory instead of the global directory. When searching "
"locally, every search will be executed on the global directory in the " "locally, every search will be executed on the global directory in the "
"background. This improves the search results when the search is repeated." "background. This improves the search results when the search is repeated."
msgstr "" msgstr ""
#: src/Module/Admin/Site.php:589 #: src/Module/Admin/Site.php:590
msgid "Publish server information" msgid "Publish server information"
msgstr "" msgstr ""
#: src/Module/Admin/Site.php:589 #: src/Module/Admin/Site.php:590
msgid "" msgid ""
"If enabled, general server and usage data will be published. The data " "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 " "contains the name and version of the server, number of users with public "
@ -6304,50 +6305,50 @@ msgid ""
"href=\"http://the-federation.info/\">the-federation.info</a> for details." "href=\"http://the-federation.info/\">the-federation.info</a> for details."
msgstr "" msgstr ""
#: src/Module/Admin/Site.php:591 #: src/Module/Admin/Site.php:592
msgid "Check upstream version" msgid "Check upstream version"
msgstr "" msgstr ""
#: src/Module/Admin/Site.php:591 #: src/Module/Admin/Site.php:592
msgid "" msgid ""
"Enables checking for new Friendica versions at github. If there is a new " "Enables checking for new Friendica versions at github. If there is a new "
"version, you will be informed in the admin panel overview." "version, you will be informed in the admin panel overview."
msgstr "" msgstr ""
#: src/Module/Admin/Site.php:592 #: src/Module/Admin/Site.php:593
msgid "Suppress Tags" msgid "Suppress Tags"
msgstr "" msgstr ""
#: src/Module/Admin/Site.php:592 #: src/Module/Admin/Site.php:593
msgid "Suppress showing a list of hashtags at the end of the posting." msgid "Suppress showing a list of hashtags at the end of the posting."
msgstr "" msgstr ""
#: src/Module/Admin/Site.php:593 #: src/Module/Admin/Site.php:594
msgid "Clean database" msgid "Clean database"
msgstr "" msgstr ""
#: src/Module/Admin/Site.php:593 #: src/Module/Admin/Site.php:594
msgid "" msgid ""
"Remove old remote items, orphaned database records and old content from some " "Remove old remote items, orphaned database records and old content from some "
"other helper tables." "other helper tables."
msgstr "" msgstr ""
#: src/Module/Admin/Site.php:594 #: src/Module/Admin/Site.php:595
msgid "Lifespan of remote items" msgid "Lifespan of remote items"
msgstr "" msgstr ""
#: src/Module/Admin/Site.php:594 #: src/Module/Admin/Site.php:595
msgid "" msgid ""
"When the database cleanup is enabled, this defines the days after which " "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 " "remote items will be deleted. Own items, and marked or filed items are "
"always kept. 0 disables this behaviour." "always kept. 0 disables this behaviour."
msgstr "" msgstr ""
#: src/Module/Admin/Site.php:595 #: src/Module/Admin/Site.php:596
msgid "Lifespan of unclaimed items" msgid "Lifespan of unclaimed items"
msgstr "" msgstr ""
#: src/Module/Admin/Site.php:595 #: src/Module/Admin/Site.php:596
msgid "" msgid ""
"When the database cleanup is enabled, this defines the days after which " "When the database cleanup is enabled, this defines the days after which "
"unclaimed remote items (mostly content from the relay) will be deleted. " "unclaimed remote items (mostly content from the relay) will be deleted. "
@ -6355,156 +6356,156 @@ msgid ""
"items if set to 0." "items if set to 0."
msgstr "" msgstr ""
#: src/Module/Admin/Site.php:596 #: src/Module/Admin/Site.php:597
msgid "Lifespan of raw conversation data" msgid "Lifespan of raw conversation data"
msgstr "" msgstr ""
#: src/Module/Admin/Site.php:596 #: src/Module/Admin/Site.php:597
msgid "" msgid ""
"The conversation data is used for ActivityPub and OStatus, as well as for " "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 " "debug purposes. It should be safe to remove it after 14 days, default is 90 "
"days." "days."
msgstr "" msgstr ""
#: src/Module/Admin/Site.php:597 #: src/Module/Admin/Site.php:598
msgid "Maximum numbers of comments per post" msgid "Maximum numbers of comments per post"
msgstr "" msgstr ""
#: src/Module/Admin/Site.php:597 #: src/Module/Admin/Site.php:598
msgid "How much comments should be shown for each post? Default value is 100." msgid "How much comments should be shown for each post? Default value is 100."
msgstr "" msgstr ""
#: src/Module/Admin/Site.php:598 #: src/Module/Admin/Site.php:599
msgid "Maximum numbers of comments per post on the display page" msgid "Maximum numbers of comments per post on the display page"
msgstr "" msgstr ""
#: src/Module/Admin/Site.php:598 #: src/Module/Admin/Site.php:599
msgid "" msgid ""
"How many comments should be shown on the single view for each post? Default " "How many comments should be shown on the single view for each post? Default "
"value is 1000." "value is 1000."
msgstr "" msgstr ""
#: src/Module/Admin/Site.php:599 #: src/Module/Admin/Site.php:600
msgid "Temp path" msgid "Temp path"
msgstr "" msgstr ""
#: src/Module/Admin/Site.php:599 #: src/Module/Admin/Site.php:600
msgid "" msgid ""
"If you have a restricted system where the webserver can't access the system " "If you have a restricted system where the webserver can't access the system "
"temp path, enter another path here." "temp path, enter another path here."
msgstr "" msgstr ""
#: src/Module/Admin/Site.php:600 #: src/Module/Admin/Site.php:601
msgid "Only search in tags" msgid "Only search in tags"
msgstr "" msgstr ""
#: src/Module/Admin/Site.php:600 #: src/Module/Admin/Site.php:601
msgid "On large systems the text search can slow down the system extremely." msgid "On large systems the text search can slow down the system extremely."
msgstr "" msgstr ""
#: src/Module/Admin/Site.php:602 #: src/Module/Admin/Site.php:603
msgid "New base url" msgid "New base url"
msgstr "" msgstr ""
#: src/Module/Admin/Site.php:602 #: src/Module/Admin/Site.php:603
msgid "" msgid ""
"Change base url for this server. Sends relocate message to all Friendica and " "Change base url for this server. Sends relocate message to all Friendica and "
"Diaspora* contacts of all users." "Diaspora* contacts of all users."
msgstr "" msgstr ""
#: src/Module/Admin/Site.php:604 #: src/Module/Admin/Site.php:605
msgid "RINO Encryption" msgid "RINO Encryption"
msgstr "" msgstr ""
#: src/Module/Admin/Site.php:604 #: src/Module/Admin/Site.php:605
msgid "Encryption layer between nodes." msgid "Encryption layer between nodes."
msgstr "" msgstr ""
#: src/Module/Admin/Site.php:604 src/Module/Admin/Site.php:610 #: src/Module/Admin/Site.php:605 src/Module/Admin/Site.php:611
#: src/Module/Contact.php:515 src/Module/Settings/TwoFactor/Index.php:118 #: src/Module/Contact.php:515 src/Module/Settings/TwoFactor/Index.php:118
msgid "Disabled" msgid "Disabled"
msgstr "" msgstr ""
#: src/Module/Admin/Site.php:604 #: src/Module/Admin/Site.php:605
msgid "Enabled" msgid "Enabled"
msgstr "" msgstr ""
#: src/Module/Admin/Site.php:606 #: src/Module/Admin/Site.php:607
msgid "Maximum number of parallel workers" msgid "Maximum number of parallel workers"
msgstr "" msgstr ""
#: src/Module/Admin/Site.php:606 #: src/Module/Admin/Site.php:607
#, php-format #, php-format
msgid "" msgid ""
"On shared hosters set this to %d. On larger systems, values of %d are great. " "On shared hosters set this to %d. On larger systems, values of %d are great. "
"Default value is %d." "Default value is %d."
msgstr "" msgstr ""
#: src/Module/Admin/Site.php:607 #: src/Module/Admin/Site.php:608
msgid "Enable fastlane" msgid "Enable fastlane"
msgstr "" msgstr ""
#: src/Module/Admin/Site.php:607 #: src/Module/Admin/Site.php:608
msgid "" msgid ""
"When enabed, the fastlane mechanism starts an additional worker if processes " "When enabed, the fastlane mechanism starts an additional worker if processes "
"with higher priority are blocked by processes of lower priority." "with higher priority are blocked by processes of lower priority."
msgstr "" msgstr ""
#: src/Module/Admin/Site.php:609 #: src/Module/Admin/Site.php:610
msgid "Direct relay transfer" msgid "Direct relay transfer"
msgstr "" msgstr ""
#: src/Module/Admin/Site.php:609 #: src/Module/Admin/Site.php:610
msgid "" msgid ""
"Enables the direct transfer to other servers without using the relay servers" "Enables the direct transfer to other servers without using the relay servers"
msgstr "" msgstr ""
#: src/Module/Admin/Site.php:610 #: src/Module/Admin/Site.php:611
msgid "Relay scope" msgid "Relay scope"
msgstr "" msgstr ""
#: src/Module/Admin/Site.php:610 #: src/Module/Admin/Site.php:611
msgid "" msgid ""
"Can be \"all\" or \"tags\". \"all\" means that every public post should be " "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. \"tags\" means that only posts with selected tags should be "
"received." "received."
msgstr "" msgstr ""
#: src/Module/Admin/Site.php:610 #: src/Module/Admin/Site.php:611
msgid "all" msgid "all"
msgstr "" msgstr ""
#: src/Module/Admin/Site.php:610 #: src/Module/Admin/Site.php:611
msgid "tags" msgid "tags"
msgstr "" msgstr ""
#: src/Module/Admin/Site.php:611 #: src/Module/Admin/Site.php:612
msgid "Server tags" msgid "Server tags"
msgstr "" msgstr ""
#: src/Module/Admin/Site.php:611 #: src/Module/Admin/Site.php:612
msgid "Comma separated list of tags for the \"tags\" subscription." msgid "Comma separated list of tags for the \"tags\" subscription."
msgstr "" msgstr ""
#: src/Module/Admin/Site.php:612 #: src/Module/Admin/Site.php:613
msgid "Deny Server tags" msgid "Deny Server tags"
msgstr "" msgstr ""
#: src/Module/Admin/Site.php:612 #: src/Module/Admin/Site.php:613
msgid "Comma separated list of tags that are rejected." msgid "Comma separated list of tags that are rejected."
msgstr "" msgstr ""
#: src/Module/Admin/Site.php:613 #: src/Module/Admin/Site.php:614
msgid "Allow user tags" msgid "Allow user tags"
msgstr "" msgstr ""
#: src/Module/Admin/Site.php:613 #: src/Module/Admin/Site.php:614
msgid "" msgid ""
"If enabled, the tags from the saved searches will used for the \"tags\" " "If enabled, the tags from the saved searches will used for the \"tags\" "
"subscription in addition to the \"relay_server_tags\"." "subscription in addition to the \"relay_server_tags\"."
msgstr "" msgstr ""
#: src/Module/Admin/Site.php:616 #: src/Module/Admin/Site.php:617
msgid "Start Relocation" msgid "Start Relocation"
msgstr "" msgstr ""

14
view/templates/admin/site.tpl
View file

@ -56,17 +56,25 @@
{{include file="field_select.tpl" field=$community_page_style}} {{include file="field_select.tpl" field=$community_page_style}}
{{include file="field_input.tpl" field=$max_author_posts_community_page}} {{include file="field_input.tpl" field=$max_author_posts_community_page}}
{{include file="field_checkbox.tpl" field=$ostatus_disabled}} {{if $mail_able}}
{{include file="field_checkbox.tpl" field=$mail_enabled}}
{{else}}
<div class='field checkbox' id='div_id_{{$mail_enabled.0}}'>
<label for='id_{{$mail_enabled.0}}'>{{$mail_enabled.1}}</label>
<span class="field_help" role="tooltip" id="id_{{$mail_enabled.0}}">{{$mail_not_able}}</span>
</div>
{{/if}}
{{include file="field_checkbox.tpl" field=$ostatus_enabled}}
{{if $diaspora_able}} {{if $diaspora_able}}
{{include file="field_checkbox.tpl" field=$diaspora_enabled}} {{include file="field_checkbox.tpl" field=$diaspora_enabled}}
{{else}} {{else}}
<div class='field checkbox' id='div_id_{{$diaspora_enabled.0}}'> <div class='field checkbox' id='div_id_{{$diaspora_enabled.0}}'>
<label for='id_{{$diaspora_enabled.0}}'>{{$diaspora_enabled.1}}</label> <label for='id_{{$diaspora_enabled.0}}'>{{$diaspora_enabled.1}}</label>
<span id='id_{{$diaspora_enabled.0}}'>{{$diaspora_not_able}}</span> <span class="field_help" role="tooltip" id="id_{{diaspora_enabled.0}}">{{$diaspora_not_able}}</span>
</div> </div>
{{/if}} {{/if}}
{{include file="field_checkbox.tpl" field=$dfrn_only}}
{{include file="field_input.tpl" field=$global_directory}} {{include file="field_input.tpl" field=$global_directory}}
<div class="submit"><input type="submit" name="republish_directory" value="{{$republish}}"/></div> <div class="submit"><input type="submit" name="republish_directory" value="{{$republish}}"/></div>
{{include file="field_checkbox.tpl" field=$newuser_private}} {{include file="field_checkbox.tpl" field=$newuser_private}}

14
view/theme/frio/templates/admin/site.tpl
View file

@ -135,17 +135,25 @@
{{include file="field_select.tpl" field=$community_page_style}} {{include file="field_select.tpl" field=$community_page_style}}
{{include file="field_input.tpl" field=$max_author_posts_community_page}} {{include file="field_input.tpl" field=$max_author_posts_community_page}}
{{include file="field_checkbox.tpl" field=$ostatus_disabled}} {{if $mail_able}}
{{include file="field_checkbox.tpl" field=$mail_enabled}}
{{else}}
<div class="field checkbox" id="div_id_{{$mail_enabled.0}}">
<label for="id_{{$mail_enabled.0}}">{{$mail_enabled.1}}</label>
<span class="help-block" id="id_{{$mail_enabled.0}}" role="tooltip">{{$mail_not_able}}</span>
</div>
{{/if}}
{{include file="field_checkbox.tpl" field=$ostatus_enabled}}
{{if $diaspora_able}} {{if $diaspora_able}}
{{include file="field_checkbox.tpl" field=$diaspora_enabled}} {{include file="field_checkbox.tpl" field=$diaspora_enabled}}
{{else}} {{else}}
<div class="field checkbox" id="div_id_{{$diaspora_enabled.0}}"> <div class="field checkbox" id="div_id_{{$diaspora_enabled.0}}">
<label for="id_{{$diaspora_enabled.0}}">{{$diaspora_enabled.1}}</label> <label for="id_{{$diaspora_enabled.0}}">{{$diaspora_enabled.1}}</label>
<span id="id_{{$diaspora_enabled.0}}">{{$diaspora_not_able}}</span> <span class="help-block" id="id_{{$diaspora_enabled.0}}" role="tooltip">{{$diaspora_not_able}}</span>
</div> </div>
{{/if}} {{/if}}
{{include file="field_checkbox.tpl" field=$dfrn_only}}
{{include file="field_input.tpl" field=$global_directory}} {{include file="field_input.tpl" field=$global_directory}}
<p> <p>
<input type="submit" name="republish_directory" class="btn btn-primary" value="{{$republish}}"/> <input type="submit" name="republish_directory" class="btn btn-primary" value="{{$republish}}"/>

2
view/theme/vier/theme.php
View file

@ -285,7 +285,7 @@ function vier_community_info()
$r[] = ["photo" => "images/wordpress.png", "name" => "Wordpress"]; $r[] = ["photo" => "images/wordpress.png", "name" => "Wordpress"];
} }
if (function_exists("imap_open") && !DI::config()->get("system", "imap_disabled") && !DI::config()->get("system", "dfrn_only")) { if (function_exists("imap_open") && !DI::config()->get("system", "imap_disabled")) {
$r[] = ["photo" => "images/mail.png", "name" => "E-Mail"]; $r[] = ["photo" => "images/mail.png", "name" => "E-Mail"];
} }