Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge

2016-05-19 22:48:58 -07:00
parent 2cda18f354 3c5cb15432
commit a97e7b2758
3 changed files with 62 additions and 17 deletions
--- a/include/acl_selectors.php
+++ b/include/acl_selectors.php
@@ -269,6 +269,8 @@ function populate_acl($defaults = null,$show_jotnets = true, $emptyACL_descripti
 	$tpl = get_markup_template("acl_selector.tpl");
 	$o = replace_macros($tpl, array(
 		'$showall'         => $showall_caption,
+		'$onlyme'          => t('Only me'),
+		'$add_others'      => t('Add others'),
 		'$showallOrigin'   => $showall_origin,
 		'$showallIcon'     => $showall_icon,
 		'$select_label'    => t('Who can see this?'),