diff options
author | Mario <mario@mariovavti.com> | 2022-01-21 07:20:30 +0000 |
---|---|---|
committer | Mario <mario@mariovavti.com> | 2022-01-21 07:20:30 +0000 |
commit | c942bd67fe47cbb1e0f4513d888a2187f2234db5 (patch) | |
tree | fcdc2e5976423cd236eb477089b4602dc63a8845 /Zotlabs | |
parent | e9278c03c170f09da84df73326e864833d356fa5 (diff) | |
parent | b8dc3d74b6cd04576c0bfde7bd85122ddf5d1a93 (diff) | |
download | volse-hubzilla-c942bd67fe47cbb1e0f4513d888a2187f2234db5.tar.gz volse-hubzilla-c942bd67fe47cbb1e0f4513d888a2187f2234db5.tar.bz2 volse-hubzilla-c942bd67fe47cbb1e0f4513d888a2187f2234db5.zip |
Merge branch 'dev' into 7.0RC
Diffstat (limited to 'Zotlabs')
-rw-r--r-- | Zotlabs/Module/Removeme.php | 4 | ||||
-rw-r--r-- | Zotlabs/Module/Tokens.php | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Zotlabs/Module/Removeme.php b/Zotlabs/Module/Removeme.php index a0697675b..4d475ead6 100644 --- a/Zotlabs/Module/Removeme.php +++ b/Zotlabs/Module/Removeme.php @@ -57,8 +57,8 @@ class Removeme extends \Zotlabs\Web\Controller { $o .= replace_macros($tpl, array( '$basedir' => z_root(), '$hash' => $hash, - '$title' => t('Remove This Channel'), - '$desc' => [ t('WARNING: '), t('This channel will be completely removed from the network. '), t('This action is permanent and can not be undone!') ], + '$title' => t('Remove Channel'), + '$desc' => [ t('WARNING: '), t('This channel will be permanently removed. '), t('This action can not be undone!') ], '$passwd' => t('Please enter your password for verification:'), // '$global' => [ 'global', t('Remove this channel and all its clones from the network'), false, t('By default only the instance of the channel located on this hub will be removed from the network'), [ t('No'),t('Yes') ] ], '$submit' => t('Remove Channel') diff --git a/Zotlabs/Module/Tokens.php b/Zotlabs/Module/Tokens.php index 9de54f568..a41003f6b 100644 --- a/Zotlabs/Module/Tokens.php +++ b/Zotlabs/Module/Tokens.php @@ -258,7 +258,7 @@ class Tokens extends Controller { } } - $desc = t('Use this form to create temporary access identifiers to share things with non-members. These identities may be used in Access Control Lists and visitors may login using these credentials to access private content.'); + $desc = t('Use this form to create temporary access identifiers to share things with non-members. These identities may be used in privacy groups and visitors may login using these credentials to access private content.'); $pcat = new Permcat(local_channel()); $pcatlist = $pcat->listing(); |