Commit c942bd67 authored by Mario's avatar Mario
Browse files

Merge branch 'dev' into 7.0RC

parents e9278c03 b8dc3d74
Pipeline #481935 passed with stage
in 1 minute and 27 seconds
......@@ -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')
......
......@@ -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();
......
This diff is collapsed.
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment