From e29618ee0df044b1ae292fb28a0a8fda34e63252 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Sat, 27 Oct 2012 03:54:44 -0700
Subject: contact group is now 'channel group'

---
 include/group.php                     |  8 ++++----
 mod/group.php                         | 18 +++++++++---------
 view/theme/duepuntozero/css/style.css |  4 ++--
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/include/group.php b/include/group.php
index 0df3a7b15..f26e9f5c1 100644
--- a/include/group.php
+++ b/include/group.php
@@ -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('Contact Groups'),
-		'$edittext'     => t('Edit contact group'),
-		'$createtext' 	=> t('Create a new contact group'),
-		'$ungrouped'    => (($every === 'contacts') ? t('Contacts not in any contact group') : ''),
+		'$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') : ''),
 		'$groups'		=> $groups,
 		'$add'			=> t('add'),
 	));
diff --git a/mod/group.php b/mod/group.php
index 69a7892c0..6b46e1193 100644
--- a/mod/group.php
+++ b/mod/group.php
@@ -44,7 +44,7 @@ function group_post(&$a) {
 			intval(local_user())
 		);
 		if(! count($r)) {
-			notice( t('Contact group not found.') . EOL );
+			notice( t('Channel group not found.') . EOL );
 			goaway($a->get_baseurl() . '/contacts');
 			return; // NOTREACHED
 		}
@@ -57,7 +57,7 @@ function group_post(&$a) {
 				intval($group['id'])
 			);
 			if($r)
-				info( t('Contact group name changed.') . EOL );
+				info( t('Channel group name changed.') . EOL );
 		}
 
 		$a->page['aside'] = group_side();
@@ -88,7 +88,7 @@ function group_content(&$a) {
 		
 		return replace_macros($tpl, $context + array(
 			'$title' => t('Create a group of contacts/friends.'),
-			'$gname' => array('groupname',t('Contact Group Name: '), '', ''),
+			'$gname' => array('groupname',t('Channel Group Name: '), '', ''),
 			'$gid' => 'new',
 			'$form_security_token' => get_form_security_token("group_edit"),
 		));
@@ -107,9 +107,9 @@ function group_content(&$a) {
 			if(count($r)) 
 				$result = group_rmv(local_user(),$r[0]['name']);
 			if($result)
-				info( t('Contact group removed.') . EOL);
+				info( t('Channel group removed.') . EOL);
 			else
-				notice( t('Unable to remove contact group.') . EOL);
+				notice( t('Unable to remove channel group.') . EOL);
 		}
 		goaway($a->get_baseurl() . '/group');
 		// NOTREACHED
@@ -134,7 +134,7 @@ function group_content(&$a) {
 			intval(local_user())
 		);
 		if(! count($r)) {
-			notice( t('Contact group not found.') . EOL );
+			notice( t('Channel group not found.') . EOL );
 			goaway($a->get_baseurl() . '/contacts');
 		}
 		$group = $r[0];
@@ -174,7 +174,7 @@ function group_content(&$a) {
 		
 		$context = $context + array(
 			'$title' => t('Contact Group Editor'),
-			'$gname' => array('groupname',t('Contact Group Name: '),$group['name'], ''),
+			'$gname' => array('groupname',t('Channel Group Name: '),$group['name'], ''),
 			'$gid' => $group['id'],
 			'$drop' => $drop_txt,
 			'$form_security_token' => get_form_security_token('group_edit'),
@@ -188,7 +188,7 @@ function group_content(&$a) {
 	$groupeditor = array(
 		'label_members' => t('Members'),
 		'members' => array(),
-		'label_contacts' => t('All Contacts'),
+		'label_contacts' => t('All Active Channels'),
 		'contacts' => array(),
 	);
 		
@@ -218,7 +218,7 @@ function group_content(&$a) {
 	}
 
 	$context['$groupeditor'] = $groupeditor;
-	$context['$desc'] = t('Click on a contact to add or remove.');
+	$context['$desc'] = t('Click on a channel to add or remove.');
 
 	if($change) {
 		$tpl = get_markup_template('groupeditor.tpl');
diff --git a/view/theme/duepuntozero/css/style.css b/view/theme/duepuntozero/css/style.css
index ea64ed4e7..a1a024c46 100644
--- a/view/theme/duepuntozero/css/style.css
+++ b/view/theme/duepuntozero/css/style.css
@@ -2981,8 +2981,8 @@ aside input[type='text'] {
 #lang-select-icon {
 	cursor: pointer;
 	position: absolute;
-	left: 0px;
-	top: 0px;
+	left: 4px;
+	top: 4px;
 	opacity: 0.2;
 	filter:alpha(opacity=20);
 }
-- 
cgit v1.2.3