aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/contact_widgets.php4
-rw-r--r--include/group.php12
-rw-r--r--include/nav.php10
3 files changed, 13 insertions, 13 deletions
diff --git a/include/contact_widgets.php b/include/contact_widgets.php
index aeed63ebf..11b087ac5 100644
--- a/include/contact_widgets.php
+++ b/include/contact_widgets.php
@@ -26,12 +26,12 @@ function findpeople_widget() {
}
return replace_macros(get_markup_template('peoplefind.tpl'),array(
- '$findpeople' => t('Find People'),
+ '$findpeople' => t('Find Channels'),
'$desc' => t('Enter name or interest'),
'$label' => t('Connect/Follow'),
'$hint' => t('Examples: Robert Morgenstein, Fishing'),
'$findthem' => t('Find'),
- '$suggest' => t('Friend Suggestions'),
+ '$suggest' => t('Channel Suggestions'),
'$similar' => t('Similar Interests'),
'$random' => t('Random Profile'),
'$inv' => t('Invite Friends')
diff --git a/include/group.php b/include/group.php
index f26e9f5c1..085cefdb9 100644
--- a/include/group.php
+++ b/include/group.php
@@ -201,7 +201,7 @@ function mini_group_select($uid,$gid = 0) {
}
}
- logger('groups: ' . print_r($grps,true));
+ logger('mini_group_select: ' . print_r($grps,true), LOGGER_DATA);
$o = replace_macros(get_markup_template('group_selection.tpl'), array(
'$label' => t('Default privacy group for new contacts'),
@@ -223,7 +223,7 @@ function group_side($every="contacts",$each="group",$edit = false, $group_id = 0
$groups = array();
$groups[] = array(
- 'text' => t('Everybody'),
+ 'text' => t('All Connections'),
'id' => 0,
'selected' => (($group_id == 0) ? 'group-selected' : ''),
'href' => $every,
@@ -267,10 +267,10 @@ function group_side($every="contacts",$each="group",$edit = false, $group_id = 0
$tpl = get_markup_template("group_side.tpl");
$o = replace_macros($tpl, array(
- '$title' => t('Channel Groups'),
- '$edittext' => t('Edit channel group'),
- '$createtext' => t('Create a new channel group'),
- '$ungrouped' => (($every === 'contacts') ? t('Channels not in any group') : ''),
+ '$title' => t('Collections'),
+ '$edittext' => t('Edit collection'),
+ '$createtext' => t('Create a new collection'),
+ '$ungrouped' => (($every === 'contacts') ? t('Channels not in any collection') : ''),
'$groups' => $groups,
'$add' => t('add'),
));
diff --git a/include/nav.php b/include/nav.php
index be92af92a..bcad7e00d 100644
--- a/include/nav.php
+++ b/include/nav.php
@@ -149,18 +149,18 @@ EOT;
$nav['messages']['outbox']= array('message/sent', t('Outbox'), "", t('Outbox'));
$nav['messages']['new'] = array('message/new', t('New Message'), "", t('New Message'));
- $nav['manage'] = array('manage', t('Channel Manager'), "", t('Manage Your Channels'));
+ $nav['manage'] = array('manage', t('Channel Select'), "", t('Manage Your Channels'));
- $nav['settings'] = array('settings', t('Settings'),"", t('Account settings'));
- $nav['profiles'] = array('profiles', t('Profiles'),"", t('Manage/edit profiles'));
- $nav['contacts'] = array('connections', t('Connections'),"", t('Manage/edit friends and channels'));
+ $nav['settings'] = array('settings', t('Settings'),"", t('Account/Channel Settings'));
+ $nav['profiles'] = array('profiles', t('Profiles'),"", t('Manage/Edit Profiles'));
+ $nav['contacts'] = array('connections', t('Connections'),"", t('Manage/Edit Friends and Connections'));
}
/**
* Admin page
*/
if (is_site_admin()){
- $nav['admin'] = array('admin/', t('Admin'), "", t('Site setup and configuration'));
+ $nav['admin'] = array('admin/', t('Admin'), "", t('Site Setup and Configuration'));
}