merge upstream, slider work, refactor ping module, language selection work

This commit is contained in:
friendica
2012-07-13 07:09:29 -07:00
parent 599f3d2961
commit a20a637727
42 changed files with 11867 additions and 286 deletions

View File

@@ -236,10 +236,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('Groups'),
'$edittext' => t('Edit group'),
'$createtext' => t('Create a new group'),
'$ungrouped' => (($every === 'contacts') ? t('Contacts not in any group') : ''),
'$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') : ''),
'$groups' => $groups,
'$add' => t('add'),
));