aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2018-04-19 19:05:13 -0700
committerzotlabs <mike@macgirvin.com>2018-04-19 19:05:13 -0700
commitaea61bf03468d9cda1abff414e7118662a6acd06 (patch)
tree0f71a22227c5ca0b686e94f3bb7e2fd62654aec2 /Zotlabs
parent2254262cf0bc89fb671b71fafde795a6b596e17f (diff)
downloadvolse-hubzilla-aea61bf03468d9cda1abff414e7118662a6acd06.tar.gz
volse-hubzilla-aea61bf03468d9cda1abff414e7118662a6acd06.tar.bz2
volse-hubzilla-aea61bf03468d9cda1abff414e7118662a6acd06.zip
rename social - party to social - federation. Cleanup some of the documentation surrounding channels. This checkin contains translatable string changes.
Diffstat (limited to 'Zotlabs')
-rw-r--r--Zotlabs/Access/PermissionRoles.php4
-rw-r--r--Zotlabs/Module/New_channel.php4
2 files changed, 4 insertions, 4 deletions
diff --git a/Zotlabs/Access/PermissionRoles.php b/Zotlabs/Access/PermissionRoles.php
index a8a9ae462..9855a05c4 100644
--- a/Zotlabs/Access/PermissionRoles.php
+++ b/Zotlabs/Access/PermissionRoles.php
@@ -41,7 +41,7 @@ class PermissionRoles {
break;
- case 'social_party':
+ case 'social_federation':
$ret['perms_auto'] = false;
$ret['default_collection'] = false;
$ret['directory_publish'] = true;
@@ -281,7 +281,7 @@ class PermissionRoles {
static public function roles() {
$roles = [
t('Social Networking') => [
- 'social_party' => t('Social - Party'),
+ 'social_federation' => t('Social - Federation'),
'social' => t('Social - Mostly Public'),
'social_restricted' => t('Social - Restricted'),
'social_private' => t('Social - Private')
diff --git a/Zotlabs/Module/New_channel.php b/Zotlabs/Module/New_channel.php
index ea9f27447..60d0d7e0d 100644
--- a/Zotlabs/Module/New_channel.php
+++ b/Zotlabs/Module/New_channel.php
@@ -150,10 +150,10 @@ class New_channel extends \Zotlabs\Web\Controller {
$o = replace_macros(get_markup_template('new_channel.tpl'), array(
'$title' => t('Create Channel'),
- '$desc' => t('A channel is your identity on this network. It can represent a person, a blog, or a forum to name a few. Channels can make connections with other channels to share information with highly detailed permissions.'),
+ '$desc' => t('A channel is a unique network identity. It can represent a person (social network profile), a forum (group), a business or celebrity page, a newsfeed, and many other things. Channels can make connections with other channels to share information with each other.') . ' ' . t('The type of channel you create affects the basic privacy settings, the permissions that are granted to connections/friends, and also the channel\'s visibility across the network.'),
'$label_import' => t('or <a href="import">import an existing channel</a> from another location.'),
'$name' => $name,
- '$role' => $role,
+ '$role' => $role,
'$default_role' => $default_role,
'$nickname' => $nickname,
'$validate' => t('Validate'),